7abb1751 · permissionBRICK/SillyTavern

.gitignore+1 -0 Viewed

 /data
 /default/scaffold
 public/scripts/extensions/third-party
+/certs

default/config.yaml+0 -3 Viewed

 # Additional model tokenizers can be downloaded on demand.
 # Disabling will fallback to another locally available tokenizer.
 enableDownloadableTokenizers: true
-# Vector storage settings
-vectors:
-  enableModelScopes: false
 # Extension settings
 extras:
   # Disables automatic model download from HuggingFace

default/content/index.json+68 -8 Viewed

         "type": "novel_preset"
     },
+    {
+        "filename": "presets/novel/Erato-Dragonfruit.json",
+        "type": "novel_preset"
+    },
+    {
+        "filename": "presets/novel/Erato-Golden Arrow.json",
+        "type": "novel_preset"
+    },
+    {
+        "filename": "presets/novel/Erato-Shosetsu.json",
+        "type": "novel_preset"
+    },
+    {
+        "filename": "presets/novel/Erato-Wilder.json",
+        "type": "novel_preset"
+    },
+    {
+        "filename": "presets/novel/Erato-Zany Scribe.json",
+        "type": "novel_preset"
+    },
+    {
         "filename": "presets/textgen/Asterism.json",
         "type": "textgen_preset"
     },

         "type": "context"
     },
+    {
-        "filename": "presets/context/Alpaca-Roleplay.json",
-        "type": "context"
-    },
-    {
         "filename": "presets/context/Alpaca-Single-Turn.json",
         "type": "context"
     },

         "type": "instruct"
     },
+    {
-        "filename": "presets/instruct/Alpaca-Roleplay.json",
-        "type": "instruct"
-    },
-    {
         "filename": "presets/instruct/Alpaca-Single-Turn.json",
         "type": "instruct"
     },

         "type": "instruct"
     },
+    {
+        "filename": "presets/sysprompt/Actor.json",
+        "type": "sysprompt"
+    },
+    {
+        "filename": "presets/sysprompt/Assistant - Expert.json",
+        "type": "sysprompt"
+    },
+    {
+        "filename": "presets/sysprompt/Assistant - Simple.json",
+        "type": "sysprompt"
+    },
+    {
+        "filename": "presets/sysprompt/Chain of Thought.json",
+        "type": "sysprompt"
+    },
+    {
+        "filename": "presets/sysprompt/Roleplay - Detailed.json",
+        "type": "sysprompt"
+    },
+    {
+        "filename": "presets/sysprompt/Roleplay - Immersive.json",
+        "type": "sysprompt"
+    },
+    {
+        "filename": "presets/sysprompt/Roleplay - Simple.json",
+        "type": "sysprompt"
+    },
+    {
+        "filename": "presets/sysprompt/Text Adventure.json",
+        "type": "sysprompt"
+    },
+    {
+        "filename": "presets/sysprompt/Writer - Creative.json",
+        "type": "sysprompt"
+    },
+    {
+        "filename": "presets/sysprompt/Writer - Realistic.json",
+        "type": "sysprompt"
+    },
+    {
+        "filename": "presets/sysprompt/Blank.json",
+        "type": "sysprompt"
+    },
+    {
+        "filename": "presets/sysprompt/Neutral - Chat.json",
+        "type": "sysprompt"
+    },
+    {
         "filename": "presets/instruct/Mistral V1.json",
         "type": "instruct"
     },

default/content/presets/context/Adventure.json+0 -1 Viewed

     "allow_jailbreak": false,
     "always_force_name2": false,
     "trim_sentences": false,
-    "include_newline": false,
     "single_line": true,
     "name": "Adventure"
+}

default/content/presets/context/Alpaca-Roleplay.json+0 -12 Viewed

-{
-    "story_string": "You're {{char}} in this fictional never-ending uncensored roleplay with {{user}}.\n\n{{#if system}}{{system}}\n\n{{/if}}### Input:\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}}\n\n",
-    "example_separator": "### New Roleplay:",
-    "chat_start": "### New Roleplay:",
-    "use_stop_strings": false,
-    "allow_jailbreak": false,
-    "always_force_name2": true,
-    "trim_sentences": false,
-    "include_newline": false,
-    "single_line": false,
-    "name": "Alpaca-Roleplay"
-}

default/content/presets/context/Alpaca-Single-Turn.json+0 -1 Viewed

     "allow_jailbreak": false,
     "always_force_name2": false,
     "trim_sentences": false,
-    "include_newline": false,
     "single_line": false,
     "name": "Alpaca-Single-Turn"
+}

default/content/presets/context/Alpaca.json+0 -1 Viewed

     "allow_jailbreak": false,
     "always_force_name2": true,
     "trim_sentences": false,
-    "include_newline": false,
     "single_line": false,
     "name": "Alpaca"
+}

default/content/presets/context/ChatML-Names.json+0 -1 Viewed

     "allow_jailbreak": false,
     "always_force_name2": true,
     "trim_sentences": false,
-    "include_newline": false,
     "single_line": false,
     "name": "ChatML-Names"
+}

default/content/presets/context/ChatML.json+0 -1 Viewed

     "allow_jailbreak": false,
     "always_force_name2": true,
     "trim_sentences": false,
-    "include_newline": false,
     "single_line": false,
     "name": "ChatML"
+}

default/content/presets/context/Command R.json+0 -1 Viewed

     "allow_jailbreak": false,
     "always_force_name2": true,
     "trim_sentences": false,
-    "include_newline": false,
     "single_line": false,
     "name": "Command R"
+}

default/content/presets/context/Default.json+0 -1 Viewed

     "allow_jailbreak": false,
     "always_force_name2": true,
     "trim_sentences": false,
-    "include_newline": false,
     "single_line": false,
     "name": "Default"
+}

default/content/presets/context/DreamGen Role-Play V1 ChatML.json+0 -1 Viewed

     "allow_jailbreak": false,
     "always_force_name2": false,
     "trim_sentences": true,
-    "include_newline": false,
     "single_line": false,
     "name": "DreamGen Role-Play V1 ChatML"
+}

default/content/presets/context/DreamGen Role-Play V1 Llama3.json+0 -1 Viewed

     "allow_jailbreak": false,
     "always_force_name2": false,
     "trim_sentences": true,
-    "include_newline": false,
     "single_line": false,
     "name": "DreamGen Role-Play V1 Llama3"
+}

default/content/presets/context/Gemma 2.json+0 -1 Viewed

     "allow_jailbreak": false,
     "always_force_name2": true,
     "trim_sentences": false,
-    "include_newline": false,
     "single_line": false,
     "name": "Gemma 2"
+}

default/content/presets/context/Libra-32B.json+1 -2 Viewed

+{
-    "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}}",
+    "story_string": "### Instruction:\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}}",
     "example_separator": "### Example:",
     "chat_start": "### START ROLEPLAY:",
     "use_stop_strings": false,
     "allow_jailbreak": false,
     "always_force_name2": true,
     "trim_sentences": false,
-    "include_newline": false,
     "single_line": false,
     "name": "Libra-32B"
+}

default/content/presets/context/Lightning 1.1.json+0 -1 Viewed

     "allow_jailbreak": false,
     "always_force_name2": true,
     "trim_sentences": false,
-    "include_newline": false,
     "single_line": false,
     "name": "Lightning 1.1"
+}

default/content/presets/context/Llama 2 Chat.json+0 -1 Viewed

     "allow_jailbreak": false,
     "always_force_name2": true,
     "trim_sentences": false,
-    "include_newline": false,
     "single_line": false,
     "name": "Llama 2 Chat"
+}

default/content/presets/context/Llama 3 Instruct.json+0 -1 Viewed

     "allow_jailbreak": false,
     "always_force_name2": true,
     "trim_sentences": false,
-    "include_newline": false,
     "single_line": false,
     "name": "Llama 3 Instruct"
+}

default/content/presets/context/Llama-3-Instruct-Names.json+0 -1 Viewed

     "allow_jailbreak": false,
     "always_force_name2": true,
     "trim_sentences": false,
-    "include_newline": false,
     "single_line": false,
     "name": "Llama-3-Instruct-Names"
+}

default/content/presets/context/Minimalist.json+0 -1 Viewed

     "allow_jailbreak": false,
     "always_force_name2": true,
     "trim_sentences": false,
-    "include_newline": false,
     "single_line": false,
     "name": "Minimalist"
+}

default/content/presets/context/Mistral V1.json+0 -1 Viewed

     "allow_jailbreak": false,
     "always_force_name2": true,
     "trim_sentences": false,
-    "include_newline": false,
     "single_line": false,
     "name": "Mistral V1"
+}

default/content/presets/context/Mistral V2 & V3.json+0 -1 Viewed

     "allow_jailbreak": false,
     "always_force_name2": true,
     "trim_sentences": false,
-    "include_newline": false,
     "single_line": false,
     "name": "Mistral V2 & V3"
+}

default/content/presets/context/Mistral V3-Tekken.json+0 -1 Viewed

     "allow_jailbreak": false,
     "always_force_name2": true,
     "trim_sentences": false,
-    "include_newline": false,
     "single_line": false,
     "name": "Mistral V3-Tekken"
+}

default/content/presets/context/NovelAI.json+0 -1 Viewed

     "allow_jailbreak": false,
     "always_force_name2": true,
     "trim_sentences": false,
-    "include_newline": false,
     "single_line": false,
     "name": "NovelAI"
+}

default/content/presets/context/OldDefault.json+0 -1 Viewed

     "allow_jailbreak": false,
     "always_force_name2": true,
     "trim_sentences": false,
-    "include_newline": false,
     "single_line": false,
     "name": "OldDefault"
+}

default/content/presets/context/Phi.json+0 -1 Viewed

     "allow_jailbreak": false,
     "always_force_name2": true,
     "trim_sentences": false,
-    "include_newline": false,
     "single_line": false,
     "name": "Phi"
+}

default/content/presets/context/Pygmalion.json+0 -1 Viewed

     "allow_jailbreak": false,
     "always_force_name2": true,
     "trim_sentences": false,
-    "include_newline": false,
     "single_line": false,
     "name": "Pygmalion"
+}

default/content/presets/context/Story.json+0 -1 Viewed

     "allow_jailbreak": false,
     "always_force_name2": true,
     "trim_sentences": false,
-    "include_newline": false,
     "single_line": false,
     "name": "Story"
+}

default/content/presets/context/Synthia.json+0 -1 Viewed

     "allow_jailbreak": false,
     "always_force_name2": true,
     "trim_sentences": false,
-    "include_newline": false,
     "single_line": false,
     "name": "Synthia"
+}

default/content/presets/context/simple-proxy-for-tavern.json+0 -1 Viewed

     "allow_jailbreak": false,
     "always_force_name2": true,
     "trim_sentences": false,
-    "include_newline": false,
     "single_line": false,
     "name": "simple-proxy-for-tavern"
+}

default/content/presets/instruct/Adventure.json+0 -1 Viewed

+{
-    "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": "",

default/content/presets/instruct/Alpaca-Roleplay.json+0 -23 Viewed

-{
-    "system_prompt": "Develop the plot slowly, always stay in character. Describe all actions in full, elaborate, explicit, graphic, and vivid detail. Mention all relevant sensory perceptions.",
-    "input_sequence": "### Instruction:",
-    "output_sequence": "### Response:",
-    "last_output_sequence": "### Response (2 paragraphs, engaging, natural, authentic, descriptive, creative):",
-    "system_sequence": "### Input:",
-    "stop_sequence": "",
-    "wrap": true,
-    "macro": true,
-    "names_behavior": "always",
-    "activation_regex": "",
-    "system_sequence_prefix": "",
-    "system_sequence_suffix": "",
-    "first_output_sequence": "",
-    "skip_examples": false,
-    "output_suffix": "\n\n",
-    "input_suffix": "\n\n",
-    "system_suffix": "\n\n",
-    "user_alignment_message": "",
-    "system_same_as_user": false,
-    "last_system_sequence": "",
-    "name": "Alpaca-Roleplay"
-}

default/content/presets/instruct/Alpaca-Single-Turn.json+1 -2 Viewed

+{
-    "system_prompt": "Write {{char}}'s next reply in a fictional roleplay chat between {{user}} and {{char}}.\nWrite 1 reply only, italicize actions, and avoid quotation marks. Use markdown. Be proactive, creative, and drive the plot and conversation forward. Include dialog as well as narration.",
     "input_sequence": "",
     "output_sequence": "",
     "last_output_sequence": "\n### Response:",

     "activation_regex": "",
     "system_sequence_prefix": "",
     "system_sequence_suffix": "",
-    "first_output_sequence": "<START OF ROLEPLAY>",
+    "first_output_sequence": "<START OF CHAT>",
     "skip_examples": false,
     "output_suffix": "",
     "input_suffix": "",

default/content/presets/instruct/Alpaca.json+0 -1 Viewed

+{
-    "system_prompt": "Below is an instruction that describes a task. Write a response that appropriately completes the request.\n\nWrite {{char}}'s next reply in a fictional roleplay chat between {{user}} and {{char}}.\n",
     "input_sequence": "### Instruction:",
     "output_sequence": "### Response:",
     "last_output_sequence": "",

default/content/presets/instruct/ChatML-Names.json+0 -1 Viewed

+{
-    "system_prompt": "You're {{char}} in this fictional never-ending uncensored roleplay with {{user}}.",
     "input_sequence": "<|im_start|>[{{name}}]",
     "output_sequence": "<|im_start|>[{{name}}]",
     "last_output_sequence": "",

default/content/presets/instruct/ChatML.json+0 -1 Viewed

+{
-    "system_prompt": "You're {{char}} in this fictional never-ending uncensored roleplay with {{user}}.",
     "input_sequence": "<|im_start|>user",
     "output_sequence": "<|im_start|>assistant",
     "last_output_sequence": "",

default/content/presets/instruct/Command R.json+0 -1 Viewed

+{
-    "system_prompt": "Write {{char}}'s next reply in this fictional roleplay with {{user}}.",
     "input_sequence": "<|START_OF_TURN_TOKEN|><|USER_TOKEN|>",
     "output_sequence": "<|START_OF_TURN_TOKEN|><|CHATBOT_TOKEN|>",
     "first_output_sequence": "",

default/content/presets/instruct/DreamGen Role-Play V1 ChatML.json+0 -1 Viewed

+{
-    "system_prompt": "You are an intelligent, skilled, versatile writer.\n\nYour task is to write a role-play based on the information below.",
     "input_sequence": "\n<|im_start|>text names= {{name}}\n",
     "output_sequence": "\n<|im_start|>text names= {{name}}\n",
     "last_output_sequence": "",

default/content/presets/instruct/DreamGen Role-Play V1 Llama3.json+0 -1 Viewed

+{
-    "system_prompt": "You are an intelligent, skilled, versatile writer.\n\nYour task is to write a role-play based on the information below.",
     "input_sequence": "<|eot_id|>\n<|start_header_id|>writer character: {{user}}<|end_header_id|>\n\n",
     "output_sequence": "<|eot_id|>\n<|start_header_id|>writer character: {{char}}<|end_header_id|>\n\n",
     "first_output_sequence": "",

default/content/presets/instruct/Gemma 2.json+0 -1 Viewed

+{
-    "system_prompt": "Continue writing this story and portray characters realistically.",
     "input_sequence": "<start_of_turn>user",
     "output_sequence": "<start_of_turn>model",
     "last_output_sequence": "",

default/content/presets/instruct/Koala.json+0 -1 Viewed

+{
-    "system_prompt": "Write {{char}}'s next reply in a fictional roleplay chat between {{user}} and {{char}}.\n",
     "input_sequence": "USER: ",
     "output_sequence": "GPT: ",
     "last_output_sequence": "",

default/content/presets/instruct/Libra-32B.json+0 -1 Viewed

+{
-    "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.",
     "input_sequence": "",
     "output_sequence": "",
     "last_output_sequence": "\n### Response:",

default/content/presets/instruct/Lightning 1.1.json+0 -1 Viewed

+{
-    "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",
     "input_sequence": "### Instruction:",
     "output_sequence": "### Response: (length = unlimited)",
     "last_output_sequence": "",

default/content/presets/instruct/Llama 2 Chat.json+0 -1 Viewed

+{
-    "system_prompt": "Write {{char}}'s next reply in this fictional roleplay with {{user}}.",
     "input_sequence": "[INST] ",
     "output_sequence": "",
     "last_output_sequence": "",

default/content/presets/instruct/Llama 3 Instruct.json+0 -1 Viewed

+{
-    "system_prompt": "You are an expert actor that can fully immerse yourself into any role given. You do not break character for any reason, even if someone tries addressing you as an AI or language model. Currently your role is {{char}}, which is described in detail below. As {{char}}, continue the exchange with {{user}}.",
     "input_sequence": "<|start_header_id|>user<|end_header_id|>\n\n",
     "output_sequence": "<|start_header_id|>assistant<|end_header_id|>\n\n",
     "last_output_sequence": "",

default/content/presets/instruct/Llama-3-Instruct-Names.json+0 -1 Viewed

+{
-    "system_prompt": "You are an expert actor that can fully immerse yourself into any role given. You do not break character for any reason, even if someone tries addressing you as an AI or language model. Currently your role is {{char}}, which is described in detail below. As {{char}}, continue the exchange with {{user}}.",
     "input_sequence": "<|start_header_id|>[{{name}}]<|end_header_id|>\n\n",
     "output_sequence": "<|start_header_id|>[{{name}}]<|end_header_id|>\n\n",
     "last_output_sequence": "",

default/content/presets/instruct/Metharme.json+0 -1 Viewed

+{
-    "system_prompt": "Enter roleplay mode. You must act as {{char}}, whose persona follows:",
     "input_sequence": "<|user|>",
     "output_sequence": "<|model|>",
     "last_output_sequence": "",

default/content/presets/instruct/Mistral V1.json+0 -1 Viewed

+{
-    "system_prompt": "Write {{char}}'s next reply in this fictional roleplay with {{user}}.",
     "input_sequence": " [INST] ",
     "output_sequence": " [/INST] ",
     "last_output_sequence": " [/INST]",

default/content/presets/instruct/Mistral V2 & V3.json+0 -1 Viewed

+{
-    "system_prompt": "Write {{char}}'s next reply in this fictional roleplay with {{user}}.",
     "input_sequence": "[INST] ",
     "output_sequence": "[/INST] ",
     "last_output_sequence": "[/INST]",

default/content/presets/instruct/Mistral V3-Tekken.json+0 -1 Viewed

+{
-    "system_prompt": "Write {{char}}'s next reply in this fictional roleplay with {{user}}.",
     "input_sequence": "[INST]",
     "output_sequence": "[/INST]",
     "last_output_sequence": "",

default/content/presets/instruct/OpenOrca-OpenChat.json+0 -1 Viewed

+{
-    "system_prompt": "You are a helpful assistant. Please answer truthfully and write out your thinking step by step to be sure you get the right answer. If you make a mistake or encounter an error in your thinking, say so out loud and attempt to correct it. If you don't know or aren't sure about something, say so clearly. You will act as a professional logician, mathematician, and physicist. You will also act as the most appropriate type of expert to answer any particular question or solve the relevant problem; state which expert type your are, if so. Also think of any particular named expert that would be ideal to answer the relevant question or solve the relevant problem; name and act as them, if appropriate.\n",
     "input_sequence": "\nUser: ",
     "output_sequence": "\nAssistant: ",
     "last_output_sequence": "",

default/content/presets/instruct/Phi.json+0 -1 Viewed

+{
-    "system_prompt": "Write {{char}}'s next reply in this fictional roleplay with {{user}}.",
     "input_sequence": "<|user|>\n",
     "output_sequence": "<|assistant|>\n",
     "first_output_sequence": "",

default/content/presets/instruct/Pygmalion.json+0 -1 Viewed

+{
-    "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|>",
     "last_output_sequence": "",

default/content/presets/instruct/Story.json+0 -1 Viewed

+{
-    "system_prompt": "",
     "input_sequence": "",
     "output_sequence": "",
     "last_output_sequence": "",

default/content/presets/instruct/Synthia.json+0 -1 Viewed

+{
-    "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.",
     "input_sequence": "USER: ",
     "output_sequence": "ASSISTANT: ",
     "last_output_sequence": "",

default/content/presets/instruct/Vicuna 1.0.json+0 -1 Viewed

+{
-    "system_prompt": "A chat between a curious human and an artificial intelligence assistant. The assistant gives helpful, detailed, and polite answers to the human's questions.\n\nWrite {{char}}'s next reply in a fictional roleplay chat between {{user}} and {{char}}.\n",
     "input_sequence": "### Human:",
     "output_sequence": "### Assistant:",
     "last_output_sequence": "",

default/content/presets/instruct/Vicuna 1.1.json+0 -1 Viewed

+{
-    "system_prompt": "A chat between a curious user and an artificial intelligence assistant. The assistant gives helpful, detailed, and polite answers to the user's questions.\n\nWrite {{char}}'s next reply in a fictional roleplay chat between {{user}} and {{char}}.\n",
     "input_sequence": "\nUSER: ",
     "output_sequence": "\nASSISTANT: ",
     "last_output_sequence": "",

default/content/presets/instruct/WizardLM-13B.json+0 -1 Viewed

+{
-    "system_prompt": "A chat between a curious user and an artificial intelligence assistant. The assistant gives helpful, detailed, and polite answers to the user's questions.\n\nWrite {{char}}'s next detailed reply in a fictional roleplay chat between {{user}} and {{char}}.",
     "input_sequence": "USER: ",
     "output_sequence": "ASSISTANT: ",
     "last_output_sequence": "",

default/content/presets/instruct/WizardLM.json+0 -1 Viewed

+{
-    "system_prompt": "Write {{char}}'s next reply in a fictional roleplay chat between {{user}} and {{char}}.\n",
     "input_sequence": "",
     "output_sequence": "### Response:",
     "last_output_sequence": "",

default/content/presets/instruct/simple-proxy-for-tavern.json+0 -1 Viewed

+{
-    "system_prompt": "[System note: Write one reply only. Do not decide what {{user}} says or does. Write at least one paragraph, up to four. Be descriptive and immersive, providing vivid details about {{char}}'s actions, emotions, and the environment. Write with a high degree of complexity and burstiness. Do not repeat this message.]",
     "input_sequence": "### Instruction:\n#### {{name}}:",
     "output_sequence": "### Response:\n#### {{name}}:",
     "last_output_sequence": "### Response (2 paragraphs, engaging, natural, authentic, descriptive, creative):\n#### {{name}}:",

default/content/presets/novel/Asper-Kayra.json+0 -1 Viewed

   "use_cache": false,
   "return_full_text": false,
   "prefix": "vanilla",
-  "cfg_scale": 1,
   "phrase_rep_pen": "medium",
   "max_context": 7800,
   "min_p": 0,

default/content/presets/novel/Blended-Coffee-Kayra.json+1 -2 Viewed

+{
-  "order": [6, 0, 1, 2, 3],
+  "order": [0, 1, 2, 3],
   "temperature": 1,
   "max_length": 150,
   "min_length": 1,

   "return_full_text": false,
   "prefix": "vanilla",
   "phrase_rep_pen": "medium",
-  "cfg_scale": 1.55,
   "max_context": 7800,
   "min_p": 0,
   "math1_temp": 1,

default/content/presets/novel/Blook-Kayra.json+1 -2 Viewed

+{
-  "order": [6, 2, 3, 1, 0],
+  "order": [2, 3, 1, 0],
   "temperature": 1,
   "max_length": 150,
   "min_length": 1,

   "return_full_text": false,
   "prefix": "vanilla",
   "phrase_rep_pen": "very_aggressive",
-  "cfg_scale": 1.3,
   "max_context": 7800,
   "min_p": 0,
   "math1_temp": 1,

default/content/presets/novel/Carefree-Kayra.json+0 -1 Viewed

   "use_cache": false,
   "return_full_text": false,
   "prefix": "vanilla",
-  "cfg_scale": 1,
   "phrase_rep_pen": "aggressive",
   "max_context": 7800,
   "min_p": 0,

default/content/presets/novel/CosmicCube-Kayra.json+1 -2 Viewed

+{
-  "order": [8, 6, 5, 0, 3],
+  "order": [8, 5, 0, 3],
   "temperature": 0.9,
   "max_length": 150,
   "min_length": 1,

   "return_full_text": false,
   "prefix": "vanilla",
   "phrase_rep_pen": "off",
-  "cfg_scale": 1.48,
   "max_context": 7800,
   "min_p": 0,
   "math1_temp": 1,

default/content/presets/novel/Edgewise-Clio.json+0 -1 Viewed

   "use_cache": false,
   "return_full_text": false,
   "prefix": "vanilla",
-  "cfg_scale": 1,
   "phrase_rep_pen": "very_light",
   "max_context": 7800,
   "min_p": 0,

default/content/presets/novel/Erato-Dragonfruit.json+31 -0 Viewed

+{
+    "max_context": 8000,
+    "temperature": 1.37,
+    "max_length": 150,
+    "min_length": 1,
+    "top_k": 0,
+    "top_p": 1,
+    "top_a": 0.1,
+    "typical_p": 0.875,
+    "tail_free_sampling": 0.87,
+    "repetition_penalty": 3.25,
+    "repetition_penalty_range": 6000,
+    "repetition_penalty_slope": 3.25,
+    "repetition_penalty_frequency": 0,
+    "repetition_penalty_presence": 0,
+    "phrase_rep_pen": "off",
+    "mirostat_lr": 0.2,
+    "mirostat_tau": 4,
+    "math1_temp": 0.9,
+    "math1_quad": 0.07,
+    "math1_quad_entropy_scale": -0.05,
+    "min_p": 0.035,
+    "order": [
+,
+,
+,
+,
+,
+    ]
+}

default/content/presets/novel/Erato-Golden Arrow.json+27 -0 Viewed

+{
+    "max_context": 8000,
+    "temperature": 1,
+    "max_length": 150,
+    "min_length": 1,
+    "top_k": 0,
+    "top_p": 0.995,
+    "top_a": 1,
+    "typical_p": 1,
+    "tail_free_sampling": 0.87,
+    "repetition_penalty": 1.5,
+    "repetition_penalty_range": 2240,
+    "repetition_penalty_slope": 1,
+    "repetition_penalty_frequency": 0,
+    "repetition_penalty_presence": 0,
+    "phrase_rep_pen": "light",
+    "mirostat_lr": 1,
+    "mirostat_tau": 0,
+    "math1_temp": 0.3,
+    "math1_quad": 0.19,
+    "math1_quad_entropy_scale": 0,
+    "min_p": 0,
+    "order": [
+,
+    ]
+}

default/content/presets/novel/Erato-Shosetsu.json+27 -0 Viewed

+{
+    "max_context": 8000,
+    "temperature": 1,
+    "max_length": 150,
+    "min_length": 1,
+    "top_k": 50,
+    "top_p": 0.85,
+    "top_a": 1,
+    "typical_p": 1,
+    "tail_free_sampling": 0.895,
+    "repetition_penalty": 1.63,
+    "repetition_penalty_range": 1024,
+    "repetition_penalty_slope": 3.33,
+    "repetition_penalty_frequency": 0.0035,
+    "repetition_penalty_presence": 0,
+    "phrase_rep_pen": "medium",
+    "mirostat_lr": 1,
+    "mirostat_tau": 0,
+    "math1_temp": 0.3,
+    "math1_quad": 0.0645,
+    "math1_quad_entropy_scale": 0.05,
+    "min_p": 0.05,
+    "order": [
+,
+    ]
+}

default/content/presets/novel/Erato-Wilder.json+27 -0 Viewed

+{
+    "max_context": 8000,
+    "temperature": 1,
+    "max_length": 150,
+    "min_length": 1,
+    "top_k": 300,
+    "top_p": 0.98,
+    "top_a": 0.004,
+    "typical_p": 0.96,
+    "tail_free_sampling": 0.96,
+    "repetition_penalty": 1.48,
+    "repetition_penalty_range": 2240,
+    "repetition_penalty_slope": 0.64,
+    "repetition_penalty_frequency": 0,
+    "repetition_penalty_presence": 0,
+    "phrase_rep_pen": "medium",
+    "mirostat_lr": 1,
+    "mirostat_tau": 0,
+    "math1_temp": -0.0485,
+    "math1_quad": 0.145,
+    "math1_quad_entropy_scale": 0,
+    "min_p": 0.02,
+    "order": [
+,
+    ]
+}

default/content/presets/novel/Erato-Zany Scribe.json+27 -0 Viewed

+{
+    "max_context": 8000,
+    "temperature": 1,
+    "max_length": 150,
+    "min_length": 1,
+    "top_k": 0,
+    "top_p": 0.99,
+    "top_a": 1,
+    "typical_p": 1,
+    "tail_free_sampling": 0.99,
+    "repetition_penalty": 1,
+    "repetition_penalty_range": 64,
+    "repetition_penalty_slope": 1,
+    "repetition_penalty_frequency": 0.75,
+    "repetition_penalty_presence": 1.5,
+    "phrase_rep_pen": "medium",
+    "mirostat_lr": 1,
+    "mirostat_tau": 1,
+    "math1_temp": -0.4,
+    "math1_quad": 0.6,
+    "math1_quad_entropy_scale": -0.1,
+    "min_p": 0.08,
+    "order": [
+,
+    ]
+}

default/content/presets/novel/Fresh-Coffee-Clio.json+0 -1 Viewed

   "use_cache": false,
   "return_full_text": false,
   "prefix": "vanilla",
-  "cfg_scale": 1,
   "phrase_rep_pen": "very_light",
   "max_context": 7800,
   "min_p": 0,

default/content/presets/novel/Fresh-Coffee-Kayra.json+0 -1 Viewed

   "use_cache": false,
   "return_full_text": false,
   "prefix": "vanilla",
-  "cfg_scale": 1,
   "phrase_rep_pen": "off",
   "max_context": 7800,
   "min_p": 0,

default/content/presets/novel/Green-Active-Writer-Kayra.json+1 -2 Viewed

+{
-  "order": [6, 0, 8, 5, 3],
+  "order": [0, 8, 5, 3],
   "temperature": 1.5,
   "max_length": 150,
   "min_length": 1,

   "return_full_text": false,
   "prefix": "vanilla",
   "phrase_rep_pen": "very_aggressive",
-  "cfg_scale": 1.4,
   "max_context": 7800,
   "min_p": 0,
   "math1_temp": 1,

default/content/presets/novel/Keelback-Clio.json+0 -1 Viewed

   "use_cache": false,
   "return_full_text": false,
   "prefix": "vanilla",
-  "cfg_scale": 1,
   "phrase_rep_pen": "very_light",
   "max_context": 7800,
   "min_p": 0,

default/content/presets/novel/Long-Press-Clio.json+0 -1 Viewed

   "use_cache": false,
   "return_full_text": false,
   "prefix": "vanilla",
-  "cfg_scale": 1,
   "phrase_rep_pen": "very_light",
   "max_context": 7800,
   "min_p": 0,

default/content/presets/novel/Pilotfish-Kayra.json+1 -2 Viewed

+{
-  "order": [6, 0, 4, 1, 2, 5, 3],
+  "order": [0, 4, 1, 2, 5, 3],
   "temperature": 1.31,
   "max_length": 150,
   "min_length": 1,

   "return_full_text": false,
   "prefix": "vanilla",
   "phrase_rep_pen": "medium",
-  "cfg_scale": 1.35,
   "max_context": 7800,
   "min_p": 0,
   "math1_temp": 1,

default/content/presets/novel/Pro_Writer-Kayra.json+0 -1 Viewed

   "return_full_text": false,
   "prefix": "vanilla",
   "phrase_rep_pen": "medium",
-  "cfg_scale": 1.0,
   "max_context": 7800,
   "min_p": 0,
   "math1_temp": 1,

default/content/presets/novel/Talker-Chat-Clio.json+0 -1 Viewed

   "use_cache": false,
   "return_full_text": false,
   "prefix": "vanilla",
-  "cfg_scale": 1,
   "phrase_rep_pen": "very_light",
   "max_context": 7800,
   "min_p": 0,

default/content/presets/novel/Tea_Time-Kayra.json+0 -1 Viewed

   "return_full_text": false,
   "prefix": "vanilla",
   "phrase_rep_pen": "aggressive",
-  "cfg_scale": 1.0,
   "max_context": 7800,
   "min_p": 0,
   "math1_temp": 1,

default/content/presets/novel/Tesseract-Kayra.json+1 -2 Viewed

+{
-  "order": [6, 0, 5],
+  "order": [0, 5],
   "temperature": 0.895,
   "max_length": 150,
   "min_length": 1,

   "return_full_text": false,
   "prefix": "vanilla",
   "phrase_rep_pen": "aggressive",
-  "cfg_scale": 1.3,
   "max_context": 7800,
   "min_p": 0,
   "math1_temp": 1,

default/content/presets/novel/Vingt-Un-Clio.json+0 -1 Viewed

   "use_cache": false,
   "return_full_text": false,
   "prefix": "vanilla",
-  "cfg_scale": 1,
   "phrase_rep_pen": "very_light",
   "max_context": 7800,
   "min_p": 0,

default/content/presets/openai/Default.json+0 -1 Viewed

     "windowai_model": "",
     "openrouter_model": "OR_Website",
     "openrouter_use_fallback": false,
-    "openrouter_force_instruct": false,
     "openrouter_group_models": false,
     "openrouter_sort_models": "alphabetically",
     "ai21_model": "jamba-1.5-large",

default/content/presets/sysprompt/Actor.json+4 -0 Viewed

+{
+    "name": "Actor",
+    "content": "You are an expert actor that can fully immerse yourself into any role given. You do not break character for any reason, even if someone tries addressing you as an AI or language model. Currently your role is {{char}}, which is described in detail below. As {{char}}, continue the exchange with {{user}}."
+}

default/content/presets/sysprompt/Assistant - Expert.json+4 -0 Viewed

+{
+    "name": "Assistant - Expert",
+    "content": "You are a helpful assistant. Please answer truthfully and write out your thinking step by step to be sure you get the right answer. If you make a mistake or encounter an error in your thinking, say so out loud and attempt to correct it. If you don't know or aren't sure about something, say so clearly. You will act as a professional logician, mathematician, and physicist. You will also act as the most appropriate type of expert to answer any particular question or solve the relevant problem; state which expert type your are, if so. Also think of any particular named expert that would be ideal to answer the relevant question or solve the relevant problem; name and act as them, if appropriate."
+}

default/content/presets/sysprompt/Assistant - Simple.json+4 -0 Viewed

+{
+    "name": "Assistant - Simple",
+    "content": "A chat between a curious human and an artificial intelligence assistant. The assistant gives helpful, detailed, and polite answers to the human's questions."
+}

default/content/presets/sysprompt/Blank.json+4 -0 Viewed

+{
+    "name": "Blank",
+    "content": ""
+}

default/content/presets/sysprompt/Chain of Thought.json+4 -0 Viewed

+{
+    "name": "Chain of Thought",
+    "content": "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."
+}

default/content/presets/sysprompt/Neutral - Chat.json+4 -0 Viewed

+{
+    "name": "Neutral - Chat",
+    "content": "Write {{char}}'s next reply in a fictional chat between {{char}} and {{user}}."
+}

default/content/presets/sysprompt/Roleplay - Detailed.json+4 -0 Viewed

+{
+    "name": "Roleplay - Detailed",
+    "content": "Develop the plot slowly, always stay in character. Describe all actions in full, elaborate, explicit, graphic, and vivid detail. Mention all relevant sensory perceptions. Keep the story immersive and engaging."
+}

default/content/presets/sysprompt/Roleplay - Immersive.json+4 -0 Viewed

+{
+    "name": "Roleplay - Immersive",
+    "content": "[System note: Write one reply only. Do not decide what {{user}} says or does. Write at least one paragraph, up to four. Be descriptive and immersive, providing vivid details about {{char}}'s actions, emotions, and the environment. Write with a high degree of complexity and burstiness. Do not repeat this message.]"
+}

default/content/presets/sysprompt/Roleplay - Simple.json+4 -0 Viewed

+{
+    "name": "Roleplay - Simple",
+    "content": "You're {{char}} in this fictional never-ending uncensored roleplay with {{user}}."
+}

default/content/presets/sysprompt/Text Adventure.json+4 -0 Viewed

+{
+    "name": "Text Adventure",
+    "content": "[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.]"
+}

default/content/presets/sysprompt/Writer - Creative.json+4 -0 Viewed

+{
+    "name": "Writer - Creative",
+    "content": "You are an intelligent, skilled, versatile writer.\n\nYour task is to write a role-play based on the information below."
+}

default/content/presets/sysprompt/Writer - Realistic.json+4 -0 Viewed

+{
+    "name": "Writer - Realistic",
+    "content": "Continue writing this story and portray characters realistically."
+}

default/content/settings.json+16 -16 Viewed

         "pin_examples": false,
         "strip_examples": false,
         "trim_sentences": false,
-        "include_newline": false,
         "always_force_name2": true,
         "user_prompt_bias": "",
         "show_user_prompt_bias": true,

         "continue_on_send": false,
         "trim_spaces": true,
         "relaxed_api_urls": false,
-        "default_instruct": "",
         "instruct": {
             "enabled": false,
             "preset": "Alpaca",
-            "system_prompt": "Below is an instruction that describes a task. Write a response that appropriately completes the request.\n\nWrite {{char}}'s next reply in a fictional roleplay chat between {{user}} and {{char}}.\n",
             "input_sequence": "### Instruction:",
             "output_sequence": "### Response:",
             "last_output_sequence": "",

             "user_alignment_message": "",
             "system_same_as_user": false
         },
-        "default_context": "Default",
+        "sysprompt": {
+            "enabled": true,
+            "name": "Neutral - Chat",
+            "content": "Write {{char}}'s next reply in a fictional chat between {{char}} and {{user}}."
+        },
         "context": {
             "preset": "Default",
             "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}}",

             "lengthPenaltyStep": 0.1,
             "memoryFrozen": false,
             "source": "extras",
-            "prompt": "[Pause your roleplay. Summarize the most important facts and events that have happened in the chat so far. If a summary already exists in your memory, use that as a base and expand with new facts. Limit the summary to {{words}} words or less. Your response should include nothing but the summary.]",
+            "prompt": "Ignore previous instructions. Summarize the most important facts and events in the story so far. If a summary already exists in your memory, use that as a base and expand with new facts. Limit the summary to {{words}} words or less. Your response should include nothing but the summary.",
             "promptWords": 200,
             "promptMinWords": 25,
             "promptMaxWords": 1000,

             "horde_karras": true,
             "refine_mode": false,
             "prompts": {
-                "0": "[In the next response I want you to provide only a detailed comma-delimited list of keywords and phrases which describe {{char}}. The list must include all of the following items in this order: name, species and race, gender, age, clothing, occupation, physical features and appearances. Do not include descriptions of non-visual qualities such as personality, movements, scents, mental traits, or anything which could not be seen in a still photograph. Do not write in full sentences. Prefix your description with the phrase 'full body portrait,']",
+                "0": "In the next response I want you to provide only a detailed comma-delimited list of keywords and phrases which describe {{char}}. The list must include all of the following items in this order: name, species and race, gender, age, clothing, occupation, physical features and appearances. Do not include descriptions of non-visual qualities such as personality, movements, scents, mental traits, or anything which could not be seen in a still photograph. Do not write in full sentences. Prefix your description with the phrase 'full body portrait,'",
-                "1": "[Pause your roleplay and provide a detailed description of {{user}}'s physical appearance from the perspective of {{char}} in the form of a comma-delimited list of keywords and phrases. The list must include all of the following items in this order: name, species and race, gender, age, clothing, occupation, physical features and appearances. Do not include descriptions of non-visual qualities such as personality, movements, scents, mental traits, or anything which could not be seen in a still photograph. Do not write in full sentences. Prefix your description with the phrase 'full body portrait,'. Ignore the rest of the story when crafting this description. Do not roleplay as {{char}} when writing this description, and do not attempt to continue the story.]",
+                "1": "Ignore previous instructions and provide a detailed description of {{user}}'s physical appearance from the perspective of {{char}} in the form of a comma-delimited list of keywords and phrases. The list must include all of the following items in this order: name, species and race, gender, age, clothing, occupation, physical features and appearances. Do not include descriptions of non-visual qualities such as personality, movements, scents, mental traits, or anything which could not be seen in a still photograph. Do not write in full sentences. Prefix your description with the phrase 'full body portrait,'. Ignore the rest of the story when crafting this description. Do not reply as {{char}} when writing this description, and do not attempt to continue the story.",
-                "2": "[Pause your roleplay and provide a detailed description for all of the following: a brief recap of recent events in the story, {{char}}'s appearance, and {{char}}'s surroundings. Do not roleplay while writing this description.]",
+                "2": "Ignore previous instructions and provide a detailed description for all of the following: a brief recap of recent events in the story, {{char}}'s appearance, and {{char}}'s surroundings. Do not reply as {{char}} when writing this description, and do not attempt to continue the story.",
-                "3": "[Pause your roleplay and provide ONLY the last chat message string back to me verbatim. Do not write anything after the string. Do not roleplay at all in your response. Do not continue the roleplay story.]",
+                "3": "Ignore previous instructions and provide ONLY the last chat message string back to me verbatim. Do not write anything after the string. Do not reply as {{char}} when writing this description, and do not attempt to continue the story.",
-                "4": "[Pause your roleplay. Your next response must be formatted as a single comma-delimited list of concise keywords.  The list will describe of the visual details included in the last chat message.\n\n    Only mention characters by using pronouns ('he','his','she','her','it','its') or neutral nouns ('male', 'the man', 'female', 'the woman').\n\n    Ignore non-visible things such as feelings, personality traits, thoughts, and spoken dialog.\n\n    Add keywords in this precise order:\n    a keyword to describe the location of the scene,\n    a keyword to mention how many characters of each gender or type are present in the scene (minimum of two characters:\n    {{user}} and {{char}}, example: '2 men ' or '1 man 1 woman ', '1 man 3 robots'),\n\n    keywords to describe the relative physical positioning of the characters to each other (if a commonly known term for the positioning is known use it instead of describing the positioning in detail) + 'POV',\n\n    a single keyword or phrase to describe the primary act taking place in the last chat message,\n\n    keywords to describe {{char}}'s physical appearance and facial expression,\n    keywords to describe {{char}}'s actions,\n    keywords to describe {{user}}'s physical appearance and actions.\n\n    If character actions involve direct physical interaction with another character, mention specifically which body parts interacting and how.\n\n    A correctly formatted example response would be:\n    '(location),(character list by gender),(primary action), (relative character position) POV, (character 1's description and actions), (character 2's description and actions)']",
+                "4": "Ignore previous instructions. Your next response must be formatted as a single comma-delimited list of concise keywords.  The list will describe of the visual details included in the last chat message.\n\n    Only mention characters by using pronouns ('he','his','she','her','it','its') or neutral nouns ('male', 'the man', 'female', 'the woman').\n\n    Ignore non-visible things such as feelings, personality traits, thoughts, and spoken dialog.\n\n    Add keywords in this precise order:\n    a keyword to describe the location of the scene,\n    a keyword to mention how many characters of each gender or type are present in the scene (minimum of two characters:\n    {{user}} and {{char}}, example: '2 men ' or '1 man 1 woman ', '1 man 3 robots'),\n\n    keywords to describe the relative physical positioning of the characters to each other (if a commonly known term for the positioning is known use it instead of describing the positioning in detail) + 'POV',\n\n    a single keyword or phrase to describe the primary act taking place in the last chat message,\n\n    keywords to describe {{char}}'s physical appearance and facial expression,\n    keywords to describe {{char}}'s actions,\n    keywords to describe {{user}}'s physical appearance and actions.\n\n    If character actions involve direct physical interaction with another character, mention specifically which body parts interacting and how.\n\n    A correctly formatted example response would be:\n    '(location),(character list by gender),(primary action), (relative character position) POV, (character 1's description and actions), (character 2's description and actions)'",
-                "5": "[In the next response I want you to provide only a detailed comma-delimited list of keywords and phrases which describe {{char}}. The list must include all of the following items in this order: name, species and race, gender, age, facial features and expressions, occupation, hair and hair accessories (if any), what they are wearing on their upper body (if anything). Do not describe anything below their neck. Do not include descriptions of non-visual qualities such as personality, movements, scents, mental traits, or anything which could not be seen in a still photograph. Do not write in full sentences. Prefix your description with the phrase 'close up facial portrait,']",
+                "5": "In the next response I want you to provide only a detailed comma-delimited list of keywords and phrases which describe {{char}}. The list must include all of the following items in this order: name, species and race, gender, age, facial features and expressions, occupation, hair and hair accessories (if any), what they are wearing on their upper body (if anything). Do not describe anything below their neck. Do not include descriptions of non-visual qualities such as personality, movements, scents, mental traits, or anything which could not be seen in a still photograph. Do not write in full sentences. Prefix your description with the phrase 'close up facial portrait,'",
-                "7": "[Pause your roleplay and provide a detailed description of {{char}}'s surroundings in the form of a comma-delimited list of keywords and phrases. The list must include all of the following items in this order: location, time of day, weather, lighting, and any other relevant details. Do not include descriptions of characters and non-visual qualities such as names, personality, movements, scents, mental traits, or anything which could not be seen in a still photograph. Do not write in full sentences. Prefix your description with the phrase 'background,'. Ignore the rest of the story when crafting this description. Do not roleplay as {{user}} when writing this description, and do not attempt to continue the story.]"
+                "7": "Ignore previous instructions and provide a detailed description of {{char}}'s surroundings in the form of a comma-delimited list of keywords and phrases. The list must include all of the following items in this order: location, time of day, weather, lighting, and any other relevant details. Do not include descriptions of characters and non-visual qualities such as names, personality, movements, scents, mental traits, or anything which could not be seen in a still photograph. Do not write in full sentences. Prefix your description with the phrase 'background,'. Ignore the rest of the story when crafting this description. Do not reply as {{user}} when writing this description, and do not attempt to continue the story."
             },
             "character_prompts": {}
         },

@@ -317,9 +318,9 @@
317	"objective": {	318	"objective": {
318	"customPrompts": {	319	"customPrompts": {
319	"default": {	320	"default": {
320	"createTask": "Pause your roleplay and generate a list of tasks to complete an objective. Your next response must be formatted as a numbered list of plain text entries. Do not include anything but the numbered list. The list must be prioritized in the order that tasks must be completed.\n\nThe objective that you must make a numbered task list for is: [{{objective}}].\nThe tasks created should take into account the character traits of {{char}}. These tasks may or may not involve {{user}} directly. Be sure to include the objective as the final task.\n\nGiven an example objective of 'Make me a four course dinner', here is an example output:\n1. Determine what the courses will be\n2. Find recipes for each course\n3. Go shopping for supplies with {{user}}\n4. Cook the food\n5. Get {{user}} to set the table\n6. Serve the food\n7. Enjoy eating the meal with {{user}}\n ",	321	"createTask": "Ignore previous instructions and generate a list of tasks to complete an objective. Your next response must be formatted as a numbered list of plain text entries. Do not include anything but the numbered list. The list must be prioritized in the order that tasks must be completed.\n\nThe objective that you must make a numbered task list for is: [{{objective}}].\nThe tasks created should take into account the character traits of {{char}}. These tasks may or may not involve {{user}} directly. Be sure to include the objective as the final task.\n\nGiven an example objective of 'Make me a four course dinner', here is an example output:\n1. Determine what the courses will be\n2. Find recipes for each course\n3. Go shopping for supplies with {{user}}\n4. Cook the food\n5. Get {{user}} to set the table\n6. Serve the food\n7. Enjoy eating the meal with {{user}}\n ",
321	"checkTaskCompleted": "Pause your roleplay. Determine if this task is completed: [{{task}}].\nTo do this, examine the most recent messages. Your response must only contain either true or false, nothing other words.\nExample output:\ntrue\n ",	322	"checkTaskCompleted": "Ignore previous instructions. Determine if this task is completed: [{{task}}].\nTo do this, examine the most recent messages. Your response must only contain either true or false, nothing other words.\nExample output:\ntrue\n ",
322	"currentTask": "Your current task is [{{task}}]. Balance existing roleplay with completing this task."	323	"currentTask": "Your current task is [{{task}}]. Balance existing story with completing this task."
323	}	324	}
324	}	325	}
325	},	326	},

         "preset_settings_novel": "Talker-Chat-Clio",
         "streaming_novel": true,
         "preamble": "[ Style: chat, complex, sensory, visceral ]",
-        "cfg_uc": "",
         "banned_tokens": "",
         "order": [
 ,

package-lock.json+2 -2 Viewed

+{
     "name": "sillytavern",
-    "version": "1.12.5",
+    "version": "1.12.6",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "sillytavern",
-            "version": "1.12.5",
+            "version": "1.12.6",
             "hasInstallScript": true,
             "license": "AGPL-3.0",
             "dependencies": {

package.json+1 -1 Viewed

         "type": "git",
         "url": "https://github.com/SillyTavern/SillyTavern.git"
     },
-    "version": "1.12.5",
+    "version": "1.12.6",
     "scripts": {
         "start": "node server.js",
         "start:no-csrf": "node server.js --disableCsrf",

public/css/promptmanager.css+23 -8 Viewed

 #completion_prompt_manager_popup #completion_prompt_manager_popup_inspect {
     display: none;
     padding: 0.5em;
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+}
 #completion_prompt_manager_popup .completion_prompt_manager_popup_entry {
-    padding: 1em;
+    padding: 0.5em;
-    margin-top: 2em;
+    flex: 1;
+}
+#completion_prompt_manager_popup .completion_prompt_manager_popup_entry_form {
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+}
+#completion_prompt_manager_popup .completion_prompt_manager_popup_entry_form_control:has(#completion_prompt_manager_popup_entry_form_prompt) {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+}
+#completion_prompt_manager_popup #completion_prompt_manager_popup_entry_form_prompt {
+    flex: 1;
+}
 #completion_prompt_manager_popup #completion_prompt_manager_popup_inspect .completion_prompt_manager_popup_entry {
-    padding: 1em;
+    padding: 0.5em;
+}
 #completion_prompt_manager_popup #completion_prompt_manager_popup_entry_form_inspect_list {

@@ -248,7 +267,7 @@
248	}	267	}
249		268
250	#completion_prompt_manager_footer_append_prompt {	269	#completion_prompt_manager_footer_append_prompt {
251	font-size: 16px;	270	font-size: 1em;
252	}	271	}
253		272
254	#prompt-manager-export-format-popup {	273	#prompt-manager-export-format-popup {

     justify-content: space-between;
+}
-#prompt-manager-export-format-popup span {
-    font-size: 16px;
-}
 @media screen and (max-width: 412px) {
     #completion_prompt_manager_popup {
         max-width: 100%;

public/index.html+222 -220 Viewed

                                         <option value="gui" data-i18n="Default">Default</option>
                                     </select>
                                     <div class="flex-container marginLeft5 ">
-                                        <input type="file" hidden data-preset-manager-file="novel" accept=".json, .settings">
+                                        <input type="file" hidden data-preset-manager-file="novel" accept=".json, .settings, .preset">
                                         <i data-preset-manager-update="novel" class="menu_button fa-solid fa-save" title="Update current preset" data-i18n="[title]Update current preset"></i>
                                         <i data-preset-manager-new="novel" class="menu_button fa-solid fa-file-circle-plus" title="Save preset as" data-i18n="[title]Save preset as"></i>
                                         <i data-preset-manager-import="novel" class="menu_button fa-solid fa-file-import" title="Import preset" data-i18n="[title]Import preset"></i>

                                         <div class="logit_bias_list"></div>
                                     </div>
                                 </div>
-                                <div class="range-block">
-                                    <hr>
-                                    <div class="range-block-title justifyLeft" data-i18n="CFG Scale">
-                                        CFG Scale
-                                    </div>
-                                    <div class="range-block-range-and-counter">
-                                        <div class="range-block-range">
-                                            <input type="range" id="cfg_scale_novel" name="volume" min="1" max="3" step="0.05">
-                                        </div>
-                                        <div class="range-block-counter">
-                                            <input type="number" min="1" max="3" step="0.05" data-for="cfg_scale_novel" id="cfg_scale_counter_novel">
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="range-block">
-                                    <div class="range-block-title justifyLeft">
-                                        <span data-i18n="Negative Prompt">Negative Prompt</span>
-                                    </div>
-                                    <div class="wide100p">
-                                        <textarea id="nai_cfg_uc" class="text_pole textarea_compact" name="cfg_uc" rows="2" data-i18n="[placeholder]Add text here that would make the AI generate things you don't want in your outputs." placeholder="Add text here that would make the AI generate things you don't want in your outputs."></textarea>
-                                    </div>
-                                    <small class="margin-bot-10px" data-i18n="Used if CFG Scale is unset globally, per chat or character">
-                                        Used if CFG Scale is unset globally, per chat or character
-                                    </small>
-                                    <hr>
-                                </div>
                             </div>
                             <div id="range_block_openai">
                                 <div class="range-block">

                                             <small>5</small>
                                             <div class="toggle_button right_menu_button"></div>
                                         </div>
-                                        <div data-id="6">
+                                        <!-- 6 and 7 were removed samplers. -->
-                                            <span data-i18n="CFG">CFG</span>
-                                            <small>6</small>
-                                            <div class="toggle_button right_menu_button"></div>
-                                        </div>
-                                        <!-- Yes, there is no 7. It was a removed Top G sampling. RIP. -->
                                         <div data-id="8">
                                             <span data-i18n="Mirostat">Mirostat</span>
                                             <small>8</small>

                                         </div>
                                     </div>
-                                    <div data-tg-type="koboldcpp, aphrodite" id="xtc_block" class="wide100p">
+                                    <div data-tg-type="koboldcpp, aphrodite, tabby" id="xtc_block" class="wide100p">
                                         <h4 class="wide100p textAlignCenter">
                                             <label data-i18n="Exclude Top Choices (XTC)">Exclude Top Choices (XTC)</label>
                                             <a href="https://github.com/oobabooga/text-generation-webui/pull/6335" target="_blank">

                             <select id="model_novel_select">
                                 <option value="clio-v1">Clio</option>
                                 <option value="kayra-v1">Kayra</option>
+                                <option value="llama-3-erato-v1">Erato</option>
                             </select>
                             <div class="flex-container">
                                 <div id="api_button_novel" class="api_button menu_button menu_button_icon" type="submit" data-i18n="Connect">Connect</div>

                                     <h4>
                                         <span data-i18n="Tabby Model">Tabby Model</span>
                                     </h4>
-                                    <b>
-                                        EXPERIMENTAL FEATURE. USE AT YOUR OWN RISK. DON'T ASK FOR SUPPORT ON THIS.
-                                    </b>
                                     <select id="tabby_model">
                                         <option value="" data-i18n="-- Connect to the API --">
                                             -- Connect to the API --
                                         </option>
                                     </select>
                                     <div class="marginTopBot5">
+                                        <i class="fa-solid fa-flask"></i>
+                                        <span>Experimental feature. Use at your own risk.</span>
+                                    </div>
+                                    <div class="marginTopBot5">
                                         <small>
                                             <i class="fa-solid fa-lightbulb"></i>
                                             &nbsp;

                                     <span data-i18n="Allow fallback providers">Allow fallback providers</span>
                                 </label>
                             </div>
-                            <div class="marginTopBot5">
+                            <small class="marginTopBot5">
-                                <label for="openrouter_force_instruct" class="checkbox_label">
+                                <i class="fa-solid fa-lightbulb"></i>
-                                    <input id="openrouter_force_instruct" type="checkbox" />
+                                <span>To use instruct formatting, switch to OpenRouter under Text Completion API.</span>
-                                    <span class="flex-container alignItemsBaseline" title="This option is outdated and will be removed in the future. To use instruct formatting, please switch to OpenRouter under Text Completion API instead." data-i18n="[title]openrouter_force_instruct">
+                            </small>
-                                        <i class="fa-solid fa-circle-exclamation neutral_warning"></i>
-                                        <b data-i18n="LEGACY">LEGACY</b>
-                                    </span>
-                                    <span data-i18n="Force Instruct Mode formatting">Force Instruct Mode formatting</span>
-                                </label>
-                                <div class="toggle-description justifyLeft wide100p">
-                                    <span data-i18n="Force_Instruct_Mode_formatting_Description">
-                                        If both Instruct Mode and this are enabled, the prompt will be formatted by SillyTavern using the current
-                                        advanced formatting settings (except instruct System Prompt). If disabled, the prompt will be formatted by OpenRouter.
-                                    </span>
-                                </div>
-                            </div>
                         </form>
                         <form id="scale_form" data-source="scale" action="javascript:void(null);" method="post" enctype="multipart/form-data">
                             <div id="normal_scale_form">

                                         <option value="gemini-1.5-pro-exp-0827">Gemini 1.5 Pro Experiment 2024-08-27</option>
                                         <option value="gemini-1.5-pro-latest">Gemini 1.5 Pro [latest]</option>
                                         <option value="gemini-1.5-pro-001">Gemini 1.5 Pro [001]</option>
+                                        <option value="gemini-1.5-pro-002">Gemini 1.5 Pro [002]</option>
                                         <option value="gemini-1.5-flash-exp-0827">Gemini 1.5 Flash Experiment 2024-08-27</option>
                                         <option value="gemini-1.5-flash-8b-exp-0827">Gemini 1.5 Flash 8B Experiment 2024-08-27</option>
+                                        <option value="gemini-1.5-flash-8b-exp-0924">Gemini 1.5 Flash 8B Experiment 2024-09-24</option>
                                         <option value="gemini-1.5-flash-latest">Gemini 1.5 Flash [latest]</option>
                                         <option value="gemini-1.5-flash-001">Gemini 1.5 Flash [001]</option>
+                                        <option value="gemini-1.5-flash-002">Gemini 1.5 Flash [002]</option>
                                         <option value="gemini-1.0-pro-latest">Gemini 1.0 Pro [latest]</option>
                                         <option value="gemini-1.0-pro-001">Gemini 1.0 Pro (Tuning) [001]</option>
                                         <option value="gemini-1.0-pro-vision-latest">Gemini 1.0 Pro Vision [latest]</option>

                 <div class="drawer-icon fa-solid fa-font fa-fw closedIcon" title="AI Response Formatting" data-i18n="[title]AI Response Formatting"></div>
             </div>
             <div id="AdvancedFormatting" class="drawer-content">
-                <h3 class="margin0" data-i18n="Advanced Formatting">
+                <div class="flex-container alignItemsBaseline">
+                    <h3 class="margin0 flex1" data-i18n="Advanced Formatting">
                         Advanced Formatting
                     </h3>
+                    <div class="flex-container">
+                        <input id="af_master_import_file" type="file" hidden accept=".json" class="displayNone">
+                        <div id="af_master_import" class="menu_button menu_button_icon" title="Import Advanced Formatting settings&#10;&#10;You can also provide legacy files for Instruct and Context templates." data-i18n="[title]Import Advanced Formatting settings">
+                            <i class="fa-solid fa-file-import"></i>
+                            <span data-i18n="Master Import">Master Import</span>
+                        </div>
+                        <div id="af_master_export" class="menu_button menu_button_icon" title="Export Advanced Formatting settings" data-i18n="[title]Export Advanced Formatting settings">
+                            <i class="fa-solid fa-file-export"></i>
+                            <span data-i18n="Master Export">Master Export</span>
+                        </div>
+                    </div>
+                </div>
                 <div class="flex-container spaceEvenly">
                     <div id="ContextSettings" class="flex-container flexNoGap flexFlowColumn flex1">
                         <div>

                                     </a>
                                 </div>
                             </h4>
+                            <div class="flex-container" title="Select your current Context Template" data-i18n="[title]Select your current Context Template">
+                                <select id="context_presets" data-preset-manager-for="context" class="flex1 text_pole"></select>
                                 <div class="flex-container justifyCenter">
                                     <input type="file" hidden data-preset-manager-file="context" accept=".json, .settings">
-                                <i id="context_set_default" class="menu_button fa-solid fa-heart" title="Auto-select this template for Instruct Mode." data-i18n="[title]Auto-select this template for Instruct Mode"></i>
                                     <i data-preset-manager-update="context" class="menu_button fa-solid fa-save" title="Update current template" data-i18n="[title]Update current template"></i>
                                     <i data-preset-manager-new="context" class="menu_button fa-solid fa-file-circle-plus" title="Save template as" data-i18n="[title]Save template as"></i>
-                                <i data-preset-manager-import="context" class="menu_button fa-solid fa-file-import" title="Import template" data-i18n="[title]Import template"></i>
+                                    <i data-preset-manager-import="context" class="displayNone menu_button fa-solid fa-file-import" title="Import template" data-i18n="[title]Import template"></i>
-                                <i data-preset-manager-export="context" class="menu_button fa-solid fa-file-export" title="Export template" data-i18n="[title]Export template"></i>
+                                    <i data-preset-manager-export="context" class="displayNone menu_button fa-solid fa-file-export" title="Export template" data-i18n="[title]Export template"></i>
                                     <i data-preset-manager-restore="context" class="menu_button fa-solid fa-recycle" title="Restore current template" data-i18n="[title]Restore current template"></i>
                                     <i id="context_delete_preset" data-preset-manager-delete="context" class="menu_button fa-solid fa-trash-can" title="Delete the template" data-i18n="[title]Delete the template"></i>
                                 </div>
-                            <div class="flex-container" title="Select your current Context Template" data-i18n="[title]Select your current Context Template">
-                                <select id="context_presets" data-preset-manager-for="context" class="flex1 text_pole"></select>
                             </div>
                             <div>
                                 <label for="context_story_string" class="flex-container">

                                         <span data-i18n="Context Formatting">
                                             Context Formatting
                                         </span>
-                                        <small data-i18n="(Saves to Template)">
-                                            (Saves to Template)
-                                        </small>
                                     </h4>
                                     <label class="checkbox_label" for="always-force-name2-checkbox">

                                             Trim Incomplete Sentences
                                         </small>
                                     </label>
-                                    <!-- Add margin since this is a child of above -->
-                                    <label class="checkbox_label indent20p" for="include_newline_checkbox">
-                                        <input id="include_newline_checkbox" type="checkbox" />
-                                        <small data-i18n="Include Newline">Include Newline</small>
-                                    </label>
                                     <label class="checkbox_label" title="Add Chat Start and Example Separator to a list of stopping strings." data-i18n="[title]Add Chat Start and Example Separator to a list of stopping strings.">
                                         <input id="context_use_stop_strings" type="checkbox" />
                                         <small data-i18n="Separators as Stop Strings">Separators as Stop Strings</small>

                                     <small data-i18n="Allow Post-History Instructions">Allow Post-History Instructions</small>
                                 </label>
                             </div>
-                            <div>
-                                <h4 class="range-block-title justifyLeft standoutHeader">
-                                    <span data-i18n="Custom Stopping Strings">
-                                        Custom Stopping Strings
-                                    </span>
-                                    <a href="https://docs.sillytavern.app/usage/core-concepts/advancedformatting/#custom-stopping-strings" class="notes-link" target="_blank">
-                                        <span class="fa-solid fa-circle-question note-link-span"></span>
-                                    </a>
-                                </h4>
-                                <div>
-                                    <small>
-                                        <span data-i18n="JSON serialized array of strings">JSON serialized array of strings</span>
-                                        <i class="fa-solid fa-question-circle opacity50p" title="e.g: [&quot;Ford&quot;, &quot;BMW&quot;, &quot;Fiat&quot;]"></i>
-                                    </small>
-                                </div>
-                                <div>
-                                    <textarea id="custom_stopping_strings" class="text_pole textarea_compact monospace autoSetHeight"></textarea>
-                                </div>
-                                <label class="checkbox_label" for="custom_stopping_strings_macro">
-                                    <input id="custom_stopping_strings_macro" type="checkbox" checked>
-                                    <small data-i18n="Replace Macro in Custom Stopping Strings">
-                                        Replace Macro in Custom Stopping Strings
-                                    </small>
-                                </label>
-                            </div>
                         </div>
                     </div>
                     <div id="InstructSettingsColumn" class="flex-container flexNoGap flexFlowColumn flex1">

                                     </a>
                                 </div>
                                 <div class="flex-container">
-                                    <label for="instruct_enabled" class="checkbox_label flex1" title="Enable Instruct Mode" data-i18n="[title]instruct_enabled">
-                                        <input id="instruct_enabled" type="checkbox" style="display:none;" />
-                                        <small><i class="fa-solid fa-power-off menu_button margin0"></i></small>
-                                    </label>
                                     <label for="instruct_bind_to_context" class="checkbox_label flex1" title="Bind to Context&#10If enabled, Context templates will be automatically selected based on selected Instruct template name or by preference." data-i18n="[title]instruct_bind_to_context">
                                         <input id="instruct_bind_to_context" type="checkbox" style="display:none;" />
                                         <small><i class="fa-solid fa-link menu_button margin0"></i></small>
                                     </label>
+                                    <label for="instruct_enabled" class="checkbox_label flex1" title="Enable Instruct Mode" data-i18n="[title]instruct_enabled">
+                                        <input id="instruct_enabled" type="checkbox" style="display:none;" />
+                                        <small><i class="fa-solid fa-power-off menu_button margin0"></i></small>
+                                    </label>
                                 </div>
                             </h4>
+                            <div class="flex-container" title="Select your current Instruct Template" data-i18n="[title]Select your current Instruct Template">
+                                <select id="instruct_presets" data-preset-manager-for="instruct" class="flex1 text_pole"></select>
                                 <div class="flex-container margin0 justifyCenter">
                                     <input type="file" hidden data-preset-manager-file="instruct" accept=".json, .settings">
-                                <i id="instruct_set_default" class="menu_button fa-solid fa-heart" title="Auto-select this template on API connection." data-i18n="[title]Auto-select this template on API connection"></i>
                                     <i data-preset-manager-update="instruct" class="menu_button fa-solid fa-save" title="Update current template" data-i18n="[title]Update current template"></i>
                                     <i data-preset-manager-new="instruct" class="menu_button fa-solid fa-file-circle-plus" title="Save template as" data-i18n="[title]Save template as"></i>
-                                <i data-preset-manager-import="instruct" class=" menu_button fa-solid fa-file-import" title="Import template" data-i18n="[title]Import template"></i>
+                                    <i data-preset-manager-import="instruct" class="displayNone menu_button fa-solid fa-file-import" title="Import template" data-i18n="[title]Import template"></i>
-                                <i data-preset-manager-export="instruct" class=" menu_button fa-solid fa-file-export" title="Export template" data-i18n="[title]Export template"></i>
+                                    <i data-preset-manager-export="instruct" class="displayNone menu_button fa-solid fa-file-export" title="Export template" data-i18n="[title]Export template"></i>
                                     <i data-preset-manager-restore="instruct" class="menu_button fa-solid fa-recycle" title="Restore current template" data-i18n="[title]Restore current template"></i>
                                     <i data-preset-manager-delete="instruct" class="menu_button fa-solid fa-trash-can" title="Delete template" data-i18n="[title]Delete template"></i>
                                 </div>
-                            <div class="flex-container" title="Select your current Instruct Template" data-i18n="[title]Select your current Instruct Template">
-                                <select id="instruct_presets" data-preset-manager-for="instruct" class="flex1 text_pole"></select>
                             </div>
                             <label>
                                 <small>

                                 <input type="text" id="instruct_activation_regex" class="text_pole textarea_compact" placeholder="e.g. /llama(-)?[3|3.1]/i">
                             </div>
                             <div>
-                                <label for="instruct_system_prompt" class="flex-container">
-                                    <small data-i18n="System Prompt">System Prompt</small>
-                                    <i class="editor_maximize fa-solid fa-maximize right_menu_button" data-for="instruct_system_prompt" title="Expand the editor" data-i18n="[title]Expand the editor"></i>
-                                </label>
-                                <textarea id="instruct_system_prompt" class="text_pole textarea_compact autoSetHeight"></textarea>
-                            </div>
-                            <div>
                                 <label for="instruct_wrap" class="checkbox_label">
                                     <input id="instruct_wrap" type="checkbox" />
                                     <small data-i18n="Wrap Sequences with Newline">Wrap Sequences with Newline</small>

                                     <input id="instruct_skip_examples" type="checkbox" />
                                     <small data-i18n="Skip Example Dialogues Formatting">Skip Example Dialogues Formatting</small>
                                 </label>
-                                <div id="instruct_names_behavior">
+                                <div>
                                     <small data-i18n="Include Names">
                                         Include Names
                                     </small>
-                                    <label for="instruct_names_behavior_none" class="checkbox_label" title="Do not add name prefixes before the message contents.">
+                                    <select id="instruct_names_behavior">
-                                        <input id="instruct_names_behavior_none" name="names_behavior" value="none" type="radio" />
+                                        <option value="none" data-i18n="Never">Never</option>
-                                        <small data-i18n="Never">Never</small>
+                                        <option value="force" data-i18n="Groups and Past Personas">Groups and Past Personas</option>
-                                    </label>
+                                        <option value="always" data-i18n="Always">Always</option>
-                                    <label for="instruct_names_behavior_force" class="checkbox_label" title="Only add name prefixes to messages from group characters and past personas.">
-                                        <input id="instruct_names_behavior_force" name="names_behavior" value="force" type="radio" />
-                                        <small data-i18n="Groups and Past Personas">Groups and Past Personas</small>
-                                    </label>
-                                    <label for="instruct_names_behavior_always" class="checkbox_label" title="Always add name prefixes to messages.">
-                                        <input id="instruct_names_behavior_always" name="names_behavior" value="always" type="radio" />
-                                        <small data-i18n="Always">Always</small>
-                                    </label>
-                                </div>
-                            </div>
-                        </div>
-                        <div name="tokenizerSettingsBlock">
-                            <div name="tokenizerSelectorBlock">
-                                <h4 class="standoutHeader"><span data-i18n="Tokenizer">Tokenizer</span>
-                                    <a href="https://docs.sillytavern.app/usage/core-concepts/advancedformatting/#tokenizer" class="notes-link" target="_blank">
-                                        <span class="fa-solid fa-circle-question note-link-span"></span>
-                                    </a>
-                                </h4>
-                                <select id="tokenizer">
-                                    <option value="99">Best match (recommended)</option>
-                                    <option value="0">None / Estimated</option>
-                                    <option value="1">GPT-2</option>
-                                    <!-- Option #2 was a legacy GPT-2/3 tokenizer -->
-                                    <option value="3">Llama 1/2</option>
-                                    <option value="12">Llama 3</option>
-                                    <option value="13">Gemma / Gemini</option>
-                                    <option value="14">Jamba</option>
-                                    <option value="15">Qwen2</option>
-                                    <option value="16">Command-R</option>
-                                    <option value="4">NerdStash (NovelAI Clio)</option>
-                                    <option value="5">NerdStash v2 (NovelAI Kayra)</option>
-                                    <option value="7">Mistral V1</option>
-                                    <option value="17">Mistral Nemo</option>
-                                    <option value="8">Yi</option>
-                                    <option value="11">Claude 1/2</option>
-                                    <option value="6">API (WebUI / koboldcpp)</option>
                                     </select>
                                 </div>
-                            <div class="range-block flex-container flexnowrap" name="tokenPaddingBlock">
-                                <div class="range-block-title justifyLeft">
-                                    <small data-i18n="Token Padding" class="flex-container">Token Padding
-                                        <a href="https://docs.sillytavern.app/usage/core-concepts/advancedformatting/#token-padding" class="notes-link" target="_blank">
-                                            <span class="fa-solid fa-circle-question note-link-span"></span>
-                                        </a>
-                                    </small>
-                                </div>
-                                <input id="token_padding" class="text_pole textarea_compact" type="number" min="-2048" max="2048" />
                             </div>
                         </div>
-                        <div>
+                        <div id="InstructSequencesColumn" class="wide100p flexFlowColumn">
-                            <h4 class="standoutHeader" data-i18n="Miscellaneous">Miscellaneous</h4>
-                            <div>
-                                <small>
-                                    <span data-i18n="Non-markdown strings">
-                                        Non-markdown strings
-                                    </span>
-                                </small>
-                                <div>
-                                    <input id="markdown_escape_strings" class="text_pole textarea_compact" type="text" data-i18n="[placeholder]comma delimited,no spaces between" placeholder="comma delimited,no spaces between" />
-                                </div>
-                            </div>
-                            <div name="startReplyWithBlock">
-                                <div>
-                                    <small>
-                                        <span data-i18n="Start Reply With">
-                                            Start Reply With
-                                        </span>
-                                    </small>
-                                    <div>
-                                        <textarea id="start_reply_with" class="text_pole textarea_compact autoSetHeight"></textarea>
-                                    </div>
-                                    <label class="checkbox_label" for="chat-show-reply-prefix-checkbox">
-                                        <input id="chat-show-reply-prefix-checkbox" type="checkbox" />
-                                        <small data-i18n="Show reply prefix in chat">
-                                            Show reply prefix in chat
-                                        </small>
-                                    </label>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    <div id="InstructSequencesColumn" class="flex-container flexNoGap flexFlowColumn flex1">
-                        <div class="wide100p flexFlowColumn">
                             <h4 class="standoutHeader title_restorable">
                                 <b>
                                     <span data-i18n="Instruct Sequences">
                                         Instruct Sequences
                                     </span>
-                                    <small data-i18n="(Saves to Template)">
-                                        (Saves to Template)
-                                    </small>
                                 </b>
                             </h4>
-                            <div class="flex-container">
+                            <!-- We keep one auto-open so the user would know what is going on in the picked template -->
-                                <div class="flexAuto" title="Inserted before a System prompt." data-i18n="[title]Inserted before a System prompt.">
+                            <details open>
-                                    <label for="instruct_system_sequence_prefix">
+                                <summary>User Message Sequences</summary>
-                                        <small data-i18n="System Prompt Prefix">System Prompt Prefix</small>
-                                    </label>
-                                    <div>
-                                        <textarea id="instruct_system_sequence_prefix" class="text_pole textarea_compact autoSetHeight"></textarea>
-                                    </div>
-                                </div>
-                                <div class="flexAuto" title="Inserted after a System prompt." data-i18n="[title]Inserted after a System prompt.">
-                                    <label for="instruct_system_sequence_suffix">
-                                        <small data-i18n="System Prompt Suffix">System Prompt Suffix</small>
-                                    </label>
-                                    <div>
-                                        <textarea id="instruct_system_sequence_suffix" class="text_pole wide100p textarea_compact autoSetHeight"></textarea>
-                                    </div>
-                                </div>
-                            </div>
                                 <div class="flex-container">
                                     <div class="flexAuto" title="Inserted before a User message and as a last prompt line when impersonating." data-i18n="[title]Inserted before a User message and as a last prompt line when impersonating.">
                                         <small data-i18n="User Prefix">User Message Prefix</small>

                                         <textarea id="instruct_input_suffix" class="text_pole wide100p textarea_compact autoSetHeight"></textarea>
                                     </div>
                                 </div>
+                            </details>
+                            <details open>
+                                <summary>Assistant Message Sequences</summary>
                                 <div class="flex-container">
                                     <div class="flexAuto" title="Inserted before an Assistant message and as a last prompt line when generating an AI reply." data-i18n="[title]Inserted before an Assistant message and as a last prompt line when generating an AI reply.">
                                         <small data-i18n="Assistant Prefix">Assistant Message Prefix</small>

                                         <textarea id="instruct_output_suffix" class="text_pole wide100p textarea_compact autoSetHeight"></textarea>
                                     </div>
                                 </div>
+                            </details>
+                            <details>
+                                <summary>System Message Sequences</summary>
                                 <div class="flex-container">
                                     <div class="flexAuto" id="instruct_system_sequence_block" title="Inserted before a System (added by slash commands or extensions) message." data-i18n="[title]Inserted before a System (added by slash commands or extensions) message.">
                                         <small data-i18n="System Prefix">System Message Prefix</small>

                                         <small data-i18n="System same as User">System same as User</small>
                                     </label>
                                 </div>
+                            </details>
-                            <h5 class="textAlignCenter" data-i18n="Misc. Sequences">
+                            <details>
-                                Misc. Sequences
+                                <summary>System Prompt Sequences</summary>
-                            </h5>
+                                <div class="flex-container">
+                                    <div class="flexAuto" title="Inserted before a System prompt." data-i18n="[title]Inserted before a System prompt.">
+                                        <label for="instruct_system_sequence_prefix">
+                                            <small data-i18n="System Prompt Prefix">System Prompt Prefix</small>
+                                        </label>
+                                        <div>
+                                            <textarea id="instruct_system_sequence_prefix" class="text_pole textarea_compact autoSetHeight"></textarea>
+                                        </div>
+                                    </div>
+                                    <div class="flexAuto" title="Inserted after a System prompt." data-i18n="[title]Inserted after a System prompt.">
+                                        <label for="instruct_system_sequence_suffix">
+                                            <small data-i18n="System Prompt Suffix">System Prompt Suffix</small>
+                                        </label>
+                                        <div>
+                                            <textarea id="instruct_system_sequence_suffix" class="text_pole wide100p textarea_compact autoSetHeight"></textarea>
+                                        </div>
+                                    </div>
+                                </div>
+                            </details>
+                            <details>
+                                <summary data-i18n="Misc. Sequences">Misc. Sequences</summary>
                                 <div class="flex-container">
                                     <div class="flexAuto" title="Inserted before the first Assistant's message." data-i18n="[title]Inserted before the first Assistant's message.">
                                         <small data-i18n="First Assistant Prefix">First Assistant Prefix</small>

                                         <textarea id="instruct_user_alignment_message" class="text_pole textarea_compact autoSetHeight"></textarea>
                                     </div>
                                 </div>
+                            </details>
+                        </div>
+                    </div>
+                    <div id="SystemPromptColumn" class="flex-container flexNoGap flexFlowColumn flex1">
+                        <div id="SystemPromptBlock">
+                            <h4 class="standoutHeader title_restorable justifySpaceBetween">
+                                <div class="flex-container">
+                                    <span data-i18n="System Prompt">System Prompt</span>
+                                    <a href="https://docs.sillytavern.app/usage/core-concepts/advancedformatting/#system-prompt" class="notes-link" target="_blank">
+                                        <span class="fa-solid fa-circle-question note-link-span"></span>
+                                    </a>
+                                </div>
+                                <div class="flex-container">
+                                    <label for="sysprompt_enabled" class="checkbox_label flex1" title="Enable System Prompt" data-i18n="[title]sysprompt_enabled">
+                                        <input id="sysprompt_enabled" type="checkbox" style="display:none;" />
+                                        <small><i class="fa-solid fa-power-off menu_button margin0"></i></small>
+                                    </label>
+                                </div>
+                            </h4>
+                            <div class="flex-container" title="Select your current System Prompt" data-i18n="[title]Select your current System Prompt">
+                                <select id="sysprompt_select" data-preset-manager-for="sysprompt" class="flex1 text_pole"></select>
+                                <div class="flex-container margin0 justifyCenter">
+                                    <input type="file" hidden data-preset-manager-file="sysprompt" accept=".json, .settings">
+                                    <i data-preset-manager-update="sysprompt" class="menu_button fa-solid fa-save" title="Update current prompt" data-i18n="[title]Update current prompt"></i>
+                                    <i data-preset-manager-new="sysprompt" class="menu_button fa-solid fa-file-circle-plus" title="Save prompt as" data-i18n="[title]Save prompt as"></i>
+                                    <i data-preset-manager-import="sysprompt" class="displayNone menu_button fa-solid fa-file-import" title="Import template" data-i18n="[title]Import template"></i>
+                                    <i data-preset-manager-export="sysprompt" class="displayNone menu_button fa-solid fa-file-export" title="Export template" data-i18n="[title]Export template"></i>
+                                    <i data-preset-manager-restore="sysprompt" class="menu_button fa-solid fa-recycle" title="Restore current prompt" data-i18n="[title]Restore current prompt"></i>
+                                    <i data-preset-manager-delete="sysprompt" class="menu_button fa-solid fa-trash-can" title="Delete prompt" data-i18n="[title]Delete prompt"></i>
+                                </div>
+                            </div>
+                            <div>
+                                <label for="sysprompt_content" class="flex-container">
+                                    <small data-i18n="Prompt Content">Prompt Content</small>
+                                    <i class="editor_maximize fa-solid fa-maximize right_menu_button" data-for="sysprompt_content" title="Expand the editor" data-i18n="[title]Expand the editor"></i>
+                                </label>
+                                <textarea id="sysprompt_content" class="text_pole textarea_compact autoSetHeight"></textarea>
+                            </div>
+                        </div>
+                        <div>
+                            &nbsp;
+                        </div>
+                        <div>
+                            <h4 class="range-block-title justifyLeft standoutHeader">
+                                <span data-i18n="Custom Stopping Strings">
+                                    Custom Stopping Strings
+                                </span>
+                                <a href="https://docs.sillytavern.app/usage/core-concepts/advancedformatting/#custom-stopping-strings" class="notes-link" target="_blank">
+                                    <span class="fa-solid fa-circle-question note-link-span"></span>
+                                </a>
+                            </h4>
+                            <div>
+                                <small>
+                                    <span data-i18n="JSON serialized array of strings">JSON serialized array of strings</span>
+                                    <i class="fa-solid fa-question-circle opacity50p" title="e.g: [&quot;Ford&quot;, &quot;BMW&quot;, &quot;Fiat&quot;]"></i>
+                                </small>
+                            </div>
+                            <div>
+                                <textarea id="custom_stopping_strings" class="text_pole textarea_compact monospace autoSetHeight"></textarea>
+                            </div>
+                            <label class="checkbox_label" for="custom_stopping_strings_macro">
+                                <input id="custom_stopping_strings_macro" type="checkbox" checked>
+                                <small data-i18n="Replace Macro in Custom Stopping Strings">
+                                    Replace Macro in Custom Stopping Strings
+                                </small>
+                            </label>
+                        </div>
+                        <div name="tokenizerSettingsBlock">
+                            <div name="tokenizerSelectorBlock">
+                                <h4 class="standoutHeader"><span data-i18n="Tokenizer">Tokenizer</span>
+                                    <a href="https://docs.sillytavern.app/usage/core-concepts/advancedformatting/#tokenizer" class="notes-link" target="_blank">
+                                        <span class="fa-solid fa-circle-question note-link-span"></span>
+                                    </a>
+                                </h4>
+                                <select id="tokenizer">
+                                    <option value="99">Best match (recommended)</option>
+                                    <option value="0">None / Estimated</option>
+                                    <option value="1">GPT-2</option>
+                                    <!-- Option #2 was a legacy GPT-2/3 tokenizer -->
+                                    <option value="3">Llama 1/2</option>
+                                    <option value="12">Llama 3</option>
+                                    <option value="13">Gemma / Gemini</option>
+                                    <option value="14">Jamba</option>
+                                    <option value="15">Qwen2</option>
+                                    <option value="16">Command-R</option>
+                                    <option value="4">NerdStash (NovelAI Clio)</option>
+                                    <option value="5">NerdStash v2 (NovelAI Kayra)</option>
+                                    <option value="7">Mistral V1</option>
+                                    <option value="17">Mistral Nemo</option>
+                                    <option value="8">Yi</option>
+                                    <option value="11">Claude 1/2</option>
+                                    <option value="6">API (WebUI / koboldcpp)</option>
+                                </select>
+                            </div>
+                            <div class="range-block flex-container flexnowrap" name="tokenPaddingBlock">
+                                <div class="range-block-title justifyLeft">
+                                    <small data-i18n="Token Padding" class="flex-container">Token Padding
+                                        <a href="https://docs.sillytavern.app/usage/core-concepts/advancedformatting/#token-padding" class="notes-link" target="_blank">
+                                            <span class="fa-solid fa-circle-question note-link-span"></span>
+                                        </a>
+                                    </small>
+                                </div>
+                                <input id="token_padding" class="text_pole textarea_compact" type="number" min="-2048" max="2048" />
+                            </div>
+                        </div>
+                        <div>
+                            <h4 class="standoutHeader" data-i18n="Miscellaneous">Miscellaneous</h4>
+                            <div>
+                                <small>
+                                    <span data-i18n="Non-markdown strings">
+                                        Non-markdown strings
+                                    </span>
+                                </small>
+                                <div>
+                                    <input id="markdown_escape_strings" class="text_pole textarea_compact" type="text" data-i18n="[placeholder]comma delimited,no spaces between" placeholder="comma delimited,no spaces between" />
+                                </div>
+                            </div>
+                            <div name="startReplyWithBlock">
+                                <div>
+                                    <small>
+                                        <span data-i18n="Start Reply With">
+                                            Start Reply With
+                                        </span>
+                                    </small>
+                                    <div>
+                                        <textarea id="start_reply_with" class="text_pole textarea_compact autoSetHeight"></textarea>
+                                    </div>
+                                    <label class="checkbox_label" for="chat-show-reply-prefix-checkbox">
+                                        <input id="chat-show-reply-prefix-checkbox" type="checkbox" />
+                                        <small data-i18n="Show reply prefix in chat">
+                                            Show reply prefix in chat
+                                        </small>
+                                    </label>
+                                </div>
+                            </div>
                         </div>
                     </div>
                 </div>

public/locales/ar-sa.json+0 -4 Viewed

     "Group by vendors Description": "ضع نماذج OpenAI في مجموعة واحدة، والنماذج الإنسانية في مجموعة أخرى، وما إلى ذلك. ويمكن دمجها مع الفرز.",
     "Allow fallback routes": "السماح بمسارات الاحتياط",
     "Allow fallback routes Description": "يختار النموذج البديل تلقائيًا إذا كان النموذج المحدد غير قادر على تلبية طلبك.",
-    "openrouter_force_instruct": "هذا الخيار قديم وسيتم إزالته في المستقبل. لاستخدام تنسيق التعليمات، يرجى التبديل إلى OpenRouter ضمن Text Completion API بدلاً من ذلك.",
-    "LEGACY": "إرث",
-    "Force Instruct Mode formatting": "فرض تنسيق وضع التعليمات",
-    "Force_Instruct_Mode_formatting_Description": "إذا تم تمكين وضع التعليمات وهذا، فسيتم تنسيق المطالبة بواسطة SillyTavern باستخدام التيار\n                                        إعدادات التنسيق المتقدمة (باستثناء توجيه موجه النظام). إذا تم تعطيله، فسيتم تنسيق المطالبة بواسطة OpenRouter.",
     "Scale API Key": "مفتاح API لـ Scale",
     "Clear your cookie": "امسح ملف تعريف الارتباط الخاص بك",
     "Alt Method": "طريقة بديلة",

public/locales/de-de.json+0 -4 Viewed

     "Group by vendors Description": "Platzieren Sie OpenAI-Modelle in einer Gruppe, anthropogene Modelle in einer anderen Gruppe usw. Kann mit Sortierung kombiniert werden.",
     "Allow fallback routes": "Fallback-Routen zulassen",
     "Allow fallback routes Description": "Das alternative Modell wird automatisch ausgewählt, wenn das ausgewählte Modell Ihre Anfrage nicht erfüllen kann.",
-    "openrouter_force_instruct": "Diese Option ist veraltet und wird in Zukunft entfernt. Um die Formatierung mit Anweisungen zu verwenden, wechseln Sie stattdessen zu OpenRouter unter Text Completion API.",
-    "LEGACY": "VERMÄCHTNIS",
-    "Force Instruct Mode formatting": "Formatierung im Force Instruct Mode",
-    "Force_Instruct_Mode_formatting_Description": "Wenn sowohl der Anweisungsmodus als auch dieser aktiviert sind, wird die Eingabeaufforderung von SillyTavern mit den aktuellen erweiterten Formatierungseinstellungen formatiert (außer „Anweisungssystem-Eingabeaufforderung“). Wenn deaktiviert, wird die Eingabeaufforderung von OpenRouter formatiert.",
     "Scale API Key": "Scale API-Schlüssel",
     "Clear your cookie": "Löschen Sie Ihre Cookies",
     "Alt Method": "Alternative Methode",

public/locales/es-es.json+0 -4 Viewed

     "Group by vendors Description": "Coloque los modelos OpenAI en un grupo, los modelos antrópicos en otro grupo, etc. Se puede combinar con la clasificación.",
     "Allow fallback routes": "Permitir rutas de respaldo",
     "Allow fallback routes Description": "El modelo alternativo se elige automáticamente si el modelo seleccionado no puede cumplir con tu solicitud.",
-    "openrouter_force_instruct": "Esta opción está desactualizada y se eliminará en el futuro. Para utilizar el formato de instrucciones, cambie a OpenRouter en API de finalización de texto.",
-    "LEGACY": "LEGADO",
-    "Force Instruct Mode formatting": "Forzar formato en modo de instrucción",
-    "Force_Instruct_Mode_formatting_Description": "Si tanto el modo de instrucción como este están habilitados, SillyTavern formateará el mensaje usando el formato actual.\n                                        configuraciones de formato avanzadas (excepto instrucciones del mensaje del sistema). Si está deshabilitado, OpenRouter formateará el mensaje.",
     "Scale API Key": "Clave API de Scale",
     "Clear your cookie": "Limpia tu cookie",
     "Alt Method": "Método alternativo",

public/locales/fr-fr.json+0 -4 Viewed

     "Group by vendors Description": "Placez les modèles OpenAI dans un groupe, les modèles Anthropic dans un autre groupe, etc. Peut être combiné avec le tri.",
     "Allow fallback routes": "Autoriser les itinéraires de secours",
     "Allow fallback routes Description": "Le modèle alternatif est automatiquement sélectionné si le modèle choisi ne peut pas répondre à votre demande.",
-    "openrouter_force_instruct": "Cette option est obsolète et sera supprimée à l'avenir. Pour utiliser le formatage des instructions, veuillez plutôt passer à OpenRouter sous API de saisie semi-automatique de texte.",
-    "LEGACY": "HÉRITAGE",
-    "Force Instruct Mode formatting": "Forcer le formatage du mode instruction",
-    "Force_Instruct_Mode_formatting_Description": "Si le mode Instruct et celui-ci sont activés, l'invite sera formatée par SillyTavern en utilisant le mode actuel.\n                                        paramètres de formatage avancés (à l'exception de l'invite système). Si elle est désactivée, l'invite sera formatée par OpenRouter.",
     "Scale API Key": "Clé API Scale",
     "Clear your cookie": "Effacer vos cookies",
     "Alt Method": "Méthode alternative",

public/locales/is-is.json+0 -4 Viewed

     "Group by vendors Description": "Setjið OpenAI módel í einn hóp, Anthropic módel í annan hóp osfrv. Hægt að sameina við flokkun.",
     "Allow fallback routes": "Leyfa bakfallssvæði",
     "Allow fallback routes Description": "Veldur hlutleysa vélbúnaðarinn við val þinn ef valið módel getur ekki uppfyllt beiðni þína.",
-    "openrouter_force_instruct": "Þessi valkostur er úreltur og verður fjarlægður í framtíðinni. Til að nota leiðbeiningarsnið skaltu skipta yfir í OpenRouter undir Text Completion API í staðinn.",
-    "LEGACY": "ARFIÐ",
-    "Force Instruct Mode formatting": "Force Instruct Mode formatting",
-    "Force_Instruct_Mode_formatting_Description": "Ef bæði leiðbeiningarhamur og þessi eru virkjuð, verður kvaðningurinn sniðinn af SillyTavern með því að nota núverandi\n                                        háþróaðar sniðstillingar (nema leiðbeiningar um System Prompt). Ef slökkt er á henni verður hvetjan sniðin af OpenRouter.",
     "Scale API Key": "Lykill API fyrir Scale",
     "Clear your cookie": "Hreinsaðu kökuna þína",
     "Alt Method": "Aðferð Bakmenn",

public/locales/it-it.json+0 -4 Viewed

     "Group by vendors Description": "Metti i modelli OpenAI in un gruppo, i modelli antropici in un altro gruppo, ecc. Può essere combinato con l'ordinamento.",
     "Allow fallback routes": "Consenti percorsi alternativi",
     "Allow fallback routes Description": "Il modello alternativo viene automaticamente scelto se il modello selezionato non può soddisfare la tua richiesta.",
-    "openrouter_force_instruct": "Questa opzione è obsoleta e verrà rimossa in futuro. Per usare la formattazione instruct, passa a OpenRouter in Text Completion API.",
-    "LEGACY": "EREDITÀ",
-    "Force Instruct Mode formatting": "Forza la formattazione della modalità istruzione",
-    "Force_Instruct_Mode_formatting_Description": "Se sia la modalità Instruct che questa sono abilitate, il prompt verrà formattato da SillyTavern utilizzando il file current\n                                        impostazioni di formattazione avanzate (ad eccezione del prompt di sistema). Se disabilitato, il prompt verrà formattato da OpenRouter.",
     "Scale API Key": "Chiave API di Scale",
     "Clear your cookie": "Cancella il tuo cookie",
     "Alt Method": "Metodo alternativo",

public/locales/ja-jp.json+0 -4 Viewed

     "Group by vendors Description": "OpenAI モデルを 1 つのグループに、Anthropic モデルを別のグループに配置するなどします。ソートと組み合わせることができます。",
     "Allow fallback routes": "フォールバックルートを許可",
     "Allow fallback routes Description": "選択したモデルが要求を満たせない場合、代替モデルが自動的に選択されます。",
-    "openrouter_force_instruct": "このオプションは古く、将来削除される予定です。指示されたフォーマットを使用するには、代わりにテキスト補完 API の OpenRouter に切り替えてください。",
-    "LEGACY": "遺産",
-    "Force Instruct Mode formatting": "強制指示モードのフォーマット",
-    "Force_Instruct_Mode_formatting_Description": "Instruct Mode とこれが両方とも有効になっている場合、プロンプトは SillyTavern によって現在の高度なフォーマット設定 (instruct System Prompt を除く) を使用してフォーマットされます。無効になっている場合、プロンプトは OpenRouter によってフォーマットされます。",
     "Scale API Key": "ScaleのAPIキー",
     "Clear your cookie": "クッキーを消去する",
     "Alt Method": "代替手法",

public/locales/ko-kr.json+0 -4 Viewed

     "Group by vendors Description": "OpenAI 모델을 한 그룹에 넣고, Anthropic 모델을 다른 그룹에 두는 등 정렬을 통해 결합할 수 있습니다.",
     "Allow fallback routes": "대체 경로 허용",
     "Allow fallback routes Description": "선택한 모델이 요청을 처리할 수 없는 경우 대체 모델이 자동으로 선택됩니다.",
-    "openrouter_force_instruct": "이 옵션은 오래되었으며 향후 제거될 예정입니다. 지시 형식을 사용하려면 대신 Text Completion API에서 OpenRouter로 전환하세요.",
-    "LEGACY": "유산",
-    "Force Instruct Mode formatting": "강제 지시 모드 포맷",
-    "Force_Instruct_Mode_formatting_Description": "Instruct Mode와 이 모드가 모두 활성화된 경우 프롬프트는 SillyTavern에 의해 현재 형식을 사용하여 형식화됩니다.\n                                        고급 형식 설정(시스템 프롬프트 지시 제외) 비활성화된 경우 프롬프트는 OpenRouter에 의해 형식화됩니다.",
     "Scale API Key": "Scale API 키",
     "Clear your cookie": "쿠키 지우기",
     "Alt Method": "대체 방법",

public/locales/nl-nl.json+0 -4 Viewed

     "Group by vendors Description": "Plaats OpenAI-modellen in één groep, antropische modellen in een andere groep, enz. Kan worden gecombineerd met sorteren.",
     "Allow fallback routes": "Fallback-routes toestaan",
     "Allow fallback routes Description": "Het alternatieve model wordt automatisch gekozen als het geselecteerde model niet aan uw verzoek kan voldoen.",
-    "openrouter_force_instruct": "Deze optie is verouderd en zal in de toekomst worden verwijderd. Om instructie-opmaak te gebruiken, schakelt u in plaats daarvan over naar OpenRouter onder Text Completion API.",
-    "LEGACY": "NALATENSCHAP",
-    "Force Instruct Mode formatting": "Forceer de opmaak van de instructiemodus",
-    "Force_Instruct_Mode_formatting_Description": "Als zowel de Instruct-modus als deze zijn ingeschakeld, wordt de prompt door SillyTavern geformatteerd met behulp van de current\n                                        geavanceerde opmaakinstellingen (behalve de opdracht Systeemprompt). Indien uitgeschakeld, wordt de prompt geformatteerd door OpenRouter.",
     "Scale API Key": "Scale API-sleutel",
     "Clear your cookie": "Wis uw cookie",
     "Alt Method": "Alternatieve methode",

public/locales/pt-pt.json+0 -4 Viewed

     "Group by vendors Description": "Coloque os modelos OpenAI em um grupo, os modelos antrópicos em outro grupo, etc.",
     "Allow fallback routes": "Permitir rotas de fallback",
     "Allow fallback routes Description": "O modelo alternativo será escolhido automaticamente se o modelo selecionado não puder atender à sua solicitação.",
-    "openrouter_force_instruct": "Esta opção está desatualizada e será removida no futuro. Para usar a formatação de instruções, mude para OpenRouter em Text Completion API.",
-    "LEGACY": "LEGADO",
-    "Force Instruct Mode formatting": "Forçar formatação do modo de instrução",
-    "Force_Instruct_Mode_formatting_Description": "Se o Modo Instruir e este estiverem habilitados, o prompt será formatado pelo SillyTavern usando o atual\n                                        configurações avançadas de formatação (exceto instruir o prompt do sistema). Se desativado, o prompt será formatado pelo OpenRouter.",
     "Scale API Key": "Chave da API Scale",
     "Clear your cookie": "Limpe seu cookie",
     "Alt Method": "Método Alternativo",

public/locales/ru-ru.json+0 -4 Viewed

     "Context Size": "По размеру контекста",
     "Group by vendors": "Сгруппировать по владельцу",
     "Group by vendors Description": "Модели от OpenAI попадут в одну группу, от Anthropic - в другую, и т.д. Можно комбинировать с сортировкой.",
-    "LEGACY": "УСТАР.",
-    "Force Instruct Mode formatting": "Включить форматирование для Instruct-режима",
     "Allow Jailbreak": "Разрешить джейлбрейк",
     "System Prompt Wrapping": "Обрамление для системного промпта",
     "System Prompt Prefix": "Префикс системного промпта",

     "vLLM Model": "Модель vLLM",
     "Aphrodite Model": "Модель Aphrodite",
     "Peek a password": "Посмотреть пароль",
-    "openrouter_force_instruct": "This option is outdated and will be removed in the future. To use instruct formatting, please switch to OpenRouter under Text Completion API instead.",
-    "Force_Instruct_Mode_formatting_Description": "If both Instruct Mode and this are enabled, the prompt will be formatted by SillyTavern using the current\n                                        advanced formatting settings (except instruct System Prompt). If disabled, the prompt will be formatted by OpenRouter.",
     "Clear your cookie": "Clear your cookie",
     "Add Chat Start and Example Separator to a list of stopping strings.": "Использовать Начало чата и Разделитель примеров сообщений в качестве стоп-строк.",
     "context_allow_jailbreak": "Если в карточке есть джейлбрейк И ПРИ ЭТОМ включена опция \"Приоритет джейлбрейку из карточки персонажа\", то этот джейлбрейк добавляется в конец промпта.\nНЕ РЕКОМЕНДУЕТСЯ ДЛЯ МОДЕЛЕЙ TEXT COMPLETION, МОЖЕТ ПОРТИТЬ ВЫХОДНОЙ ТЕКСТ.",

public/locales/uk-ua.json+0 -4 Viewed

     "Group by vendors Description": "Помістіть моделі OpenAI в одну групу, моделі Anthropic в іншу групу тощо. Можна поєднати з сортуванням.",
     "Allow fallback routes": "Дозволити резервні маршрути",
     "Allow fallback routes Description": "Автоматично вибирає альтернативну модель, якщо вибрана модель не може задовольнити ваш запит.",
-    "openrouter_force_instruct": "Цей параметр застарів і буде видалено в майбутньому. Щоб використовувати форматування інструкцій, перейдіть натомість до OpenRouter у розділі Text Completion API.",
-    "LEGACY": "СПАДОК",
-    "Force Instruct Mode formatting": "Примусове форматування в режимі вказівок",
-    "Force_Instruct_Mode_formatting_Description": "Якщо ввімкнути обидва режими Instruction і цей режим, підказка буде відформатована SillyTavern за допомогою поточного\n                                        розширені параметри форматування (крім системного запиту). Якщо вимкнено, запит буде відформатовано OpenRouter.",
     "Scale API Key": "Ключ API для Scale",
     "Clear your cookie": "Очистіть файл cookie",
     "Alt Method": "Альтернативний метод",

public/locales/vi-vn.json+0 -4 Viewed

     "Group by vendors Description": "Xếp các mô hình OpenAI vào một nhóm, các mô hình Anthropic vào một nhóm khác, v.v. Có thể kết hợp với việc sắp xếp.",
     "Allow fallback routes": "Cho phép các tuyến đường phụ",
     "Allow fallback routes Description": "Bot thay thế tự động nếu mô hình được chọn không thể đáp ứng yêu cầu của bạn.",
-    "openrouter_force_instruct": "Tùy chọn này đã lỗi thời và sẽ bị xóa trong tương lai. Để sử dụng định dạng hướng dẫn, vui lòng chuyển sang OpenRouter trong API hoàn thành văn bản.",
-    "LEGACY": "Cũ",
-    "Force Instruct Mode formatting": "Buộc định dạng Instruct Mode",
-    "Force_Instruct_Mode_formatting_Description": "Nếu cả Instruct Mode và chế độ này được bật, Prompt sẽ được SillyTavern định dạng bằng cách sử dụng\n                                        cài đặt định dạng nâng cao (ngoại trừ hướng dẫn System Nhắc). Nếu bị tắt, Prompt sẽ được OpenRouter định dạng.",
     "Scale API Key": "Scale API Key",
     "Clear your cookie": "Xóa cookie",
     "Alt Method": "Phương pháp thay thế",

public/locales/zh-cn.json+0 -4 Viewed

     "Context Size": "上下文大小",
     "Group by vendors": "按供应商分组",
     "Group by vendors Description": "将 OpenAI 模型放在一组，将 Anthropic 模型放在另一组，等等。可以与排序结合。",
-    "openrouter_force_instruct": "此选项已过时，将来会被删除。要使用指令格式，请改用文本完成 API 下的 OpenRouter。",
-    "LEGACY": "旧版",
-    "Force Instruct Mode formatting": "强制指令模式格式化",
-    "Force_Instruct_Mode_formatting_Description": "如果同时启用了“指示模式”和“系统提示词”，则 SillyTavern 将使用当前\n高级格式设置（指示系统提示词除外）对提示词进行格式化。如果禁用，则 OpenRouter 将对提示词进行格式化。",
     "Scale API Key": "Scale API密钥",
     "Clear your cookie": "清除你的 Cookie",
     "Alt Method": "备用方法",

public/locales/zh-tw.json+0 -4 Viewed

     "Group by vendors Description": "將 OpenAI 、 Anthropic 等等的模型放各自供應商的群組中。可以與排序功能結合使用。",
     "Allow fallback routes": "允許備援路徑",
     "Allow fallback routes Description": "如果選擇的模型無法滿足要求，會自動選擇替代模型。",
-    "openrouter_force_instruct": "這個選項已經過時，將來會被移除。如果要使用指令格式，請改在 Text Completion API 中選擇 OpenRouter。",
-    "LEGACY": "遺留",
-    "Force Instruct Mode formatting": "強制指示模式格式化",
-    "Force_Instruct_Mode_formatting_Description": "如果同時啟用「指令模式」和這個選項，\nSillyTavern 會根據目前的進階格式化設定(不包括指令系統提示)來格式化提示詞。\n如果停用這個選項，提示詞將由 OpenRouter 來進行格式化。",
     "Scale API Key": "Scale API 金鑰",
     "Clear your cookie": "清除您的 Cookie",
     "Alt Method": "替代方法",

public/script.js+35 -15 Viewed

     openai_messages_count,
     chat_completion_sources,
     getChatCompletionModel,
-    isOpenRouterWithInstruct,
     proxies,
     loadProxyPresets,
     selected_proxy,
-    initOpenai,
+    initOpenAI,
 } from './scripts/openai.js';
 import {

     selectContextPreset,
 } from './scripts/instruct-mode.js';
 import { initLocales, t, translate } from './scripts/i18n.js';
-import { getFriendlyTokenizerName, getTokenCount, getTokenCountAsync, getTokenizerModel, initTokenizers, saveTokenCache } from './scripts/tokenizers.js';
+import { getFriendlyTokenizerName, getTokenCount, getTokenCountAsync, getTokenizerModel, initTokenizers, saveTokenCache, TOKENIZER_SUPPORTED_KEY } from './scripts/tokenizers.js';
 import {
     user_avatar,
     getUserAvatars,

 import { commonEnumProviders, enumIcons } from './scripts/slash-commands/SlashCommandCommonEnumsProvider.js';
 import { initInputMarkdown } from './scripts/input-md-formatting.js';
 import { AbortReason } from './scripts/util/AbortReason.js';
+import { initSystemPrompts } from './scripts/sysprompt.js';
 //exporting functions and vars for mods
 export {

     MESSAGE_FILE_EMBEDDED: 'message_file_embedded',
     IMPERSONATE_READY: 'impersonate_ready',
     CHAT_CHANGED: 'chat_id_changed',
+    GENERATION_AFTER_COMMANDS: 'GENERATION_AFTER_COMMANDS',
     GENERATION_STARTED: 'generation_started',
     GENERATION_STOPPED: 'generation_stopped',
     GENERATION_ENDED: 'generation_ended',

     addSafariPatch();
     await getClientVersion();
     await readSecretState();
-    initLocales();
+    await initLocales();
     initDefaultSlashCommands();
     initTextGenModels();
+    initOpenAI();
+    initSystemPrompts();
+    await initPresetManager();
     await getSystemMessages();
     sendSystemMessage(system_message_types.WELCOME);
     sendSystemMessage(system_message_types.WELCOME_PROMPT);

     initKeyboard();
     initDynamicStyles();
     initTags();
-    initOpenai();
     initBookmarks();
     await getUserAvatars(true, user_avatar);
     await getCharacters();
     await getBackgrounds();
     await initTokenizers();
-    await initPresetManager();
     initBackgrounds();
     initAuthorsNote();
     initPersonas();

         // Determine instruct mode preset
         autoSelectInstructPreset(online_status);
+        const supportsTokenization = response.headers.get('x-supports-tokenization') === 'true';
+        supportsTokenization ? sessionStorage.setItem(TOKENIZER_SUPPORTED_KEY, 'true') : sessionStorage.removeItem(TOKENIZER_SUPPORTED_KEY);
         // We didn't get a 200 status code, but the endpoint has an explanation. Which means it DID connect, but I digress.
         if (online_status === 'no_connection' && data.response) {
             toastr.error(data.response, 'API Error', { timeOut: 5000, preventDuplicates: true });

     setGenerationProgress(0);
     generation_started = new Date();
+    // Occurs every time, even if the generation is aborted due to slash commands execution
+    await eventSource.emit(event_types.GENERATION_STARTED, type, { automatic_trigger, force_name2, quiet_prompt, quietToLoud, skipWIAN, force_chid, signal, quietImage }, dryRun);
     // Don't recreate abort controller if signal is passed
     if (!(abortController && signal)) {
         abortController = new AbortController();

@@ -3358,7 +3366,8 @@ export async function Generate(type, { automatic_trigger, force_name2, quiet_pro
3358	}	3366	}
3359	}	3367	}
3360		3368
3361	await eventSource.emit(event_types.GENERATION_STARTED, type, { automatic_trigger, force_name2, quiet_prompt, quietToLoud, skipWIAN, force_chid, signal, quietImage }, dryRun);	3369	// Occurs only if the generation is not aborted due to slash commands execution
		3370	await eventSource.emit(event_types.GENERATION_AFTER_COMMANDS, type, { automatic_trigger, force_name2, quiet_prompt, quietToLoud, skipWIAN, force_chid, signal, quietImage }, dryRun);
3362		3371
3363	if (main_api == 'kobold' && kai_settings.streaming_kobold && !kai_flags.can_use_streaming) {	3372	if (main_api == 'kobold' && kai_settings.streaming_kobold && !kai_flags.can_use_streaming) {
3364	toastr.error('Streaming is enabled, but the version of Kobold used does not support token streaming.', undefined, { timeOut: 10000, preventDuplicates: true });	3373	toastr.error('Streaming is enabled, but the version of Kobold used does not support token streaming.', undefined, { timeOut: 10000, preventDuplicates: true });

         jailbreak,
     } = getCharacterCardFields();
-    if (isInstruct) {
+    if (main_api !== 'openai') {
-        system = power_user.prefer_character_prompt && system ? system : baseChatReplace(power_user.instruct.system_prompt, name1, name2);
+        if (power_user.sysprompt.enabled) {
-        system = formatInstructModeSystemPrompt(substituteParams(system, name1, name2, power_user.instruct.system_prompt));
+            system = power_user.prefer_character_prompt && system ? system : baseChatReplace(power_user.sysprompt.content, name1, name2);
+            system = isInstruct ? formatInstructModeSystemPrompt(substituteParams(system, name1, name2, power_user.sysprompt.content)) : system;
+        } else {
+            // Nullify if it's not enabled
+            system = '';
+        }
+    }
     // Depth prompt (character-specific A/N)

         personality: personality,
         persona: power_user.persona_description_position == persona_description_positions.IN_PROMPT ? persona : '',
         scenario: scenario,
-        system: isInstruct ? system : '',
+        system: system,
         char: name2,
         user: name1,
         wiBefore: worldInfoBefore,

     if (isContinue) {
         // Coping mechanism for OAI spacing
-        const isForceInstruct = isOpenRouterWithInstruct();
+        if (main_api === 'openai' && !cyclePrompt.endsWith(' ')) {
-        if (main_api === 'openai' && !isForceInstruct && !cyclePrompt.endsWith(' ')) {
             cyclePrompt += oai_settings.continue_postfix;
             continue_mag += oai_settings.continue_postfix;
+        }

             this_max_context: this_max_context,
             padding: power_user.token_padding,
             main_api: main_api,
-            instruction: isInstruct ? substituteParams(power_user.prefer_character_prompt && system ? system : power_user.instruct.system_prompt) : '',
+            instruction: main_api !== 'openai' && power_user.sysprompt.enabled ? substituteParams(power_user.prefer_character_prompt && system ? system : power_user.sysprompt.content) : '',
             userPersona: (power_user.persona_description_position == persona_description_positions.IN_PROMPT ? (persona || '') : ''),
             tokenizer: getFriendlyTokenizerName(main_api).tokenizerName || '',
         };

@@ -4845,6 +4858,13 @@ export function getMaxContextSize(overrideResponseLength = null) {
4845	console.log(`NovelAI subscription limit reached. Max context size is now ${this_max_context}`);	4858	console.log(`NovelAI subscription limit reached. Max context size is now ${this_max_context}`);
4846	}	4859	}
4847	}	4860	}
		4861	if (nai_settings.model_novel.includes('erato')) {
		4862	// subscriber limits coming soon
		4863	this_max_context = Math.min(max_context, 8192);
		4864
		4865	// Added special tokens and whatnot
		4866	this_max_context -= 1;
		4867	}
4848		4868
4849	this_max_context = this_max_context - (overrideResponseLength \|\| amount_gen);	4869	this_max_context = this_max_context - (overrideResponseLength \|\| amount_gen);
4850	}	4870	}

@@ -5472,7 +5492,7 @@ export function cleanUpMessage(getMessage, isImpersonate, isContinue, displayInc
5472	}	5492	}
5473		5493
5474	if (!displayIncompleteSentences && power_user.trim_sentences) {	5494	if (!displayIncompleteSentences && power_user.trim_sentences) {
5475	getMessage = trimToEndSentence(getMessage, power_user.include_newline);	5495	getMessage = trimToEndSentence(getMessage);
5476	}	5496	}
5477		5497
5478	if (power_user.trim_spaces) {	5498	if (power_user.trim_spaces) {

public/scripts/PromptManager.js+14 -9 Viewed

 'use strict';
-import { callPopup, event_types, eventSource, is_send_press, main_api, substituteParams } from '../script.js';
+import { event_types, eventSource, is_send_press, main_api, substituteParams } from '../script.js';
 import { is_group_generating } from './group-chats.js';
 import { Message, TokenHandler } from './openai.js';
 import { power_user } from './power-user.js';
 import { debounce, waitUntilCondition, escapeHtml } from './utils.js';
 import { debounce_timeout } from './constants.js';
 import { renderTemplateAsync } from './templates.js';
+import { Popup } from './popup.js';
 function debouncePromise(func, delay) {
     let timeoutId;

         };
         // Delete selected prompt from list form and close edit form
-        this.handleDeletePrompt = (event) => {
+        this.handleDeletePrompt = async (event) => {
+            Popup.show.confirm('Are you sure you want to delete this prompt?', null).then((userChoice) => {
+                if (!userChoice) return;
                 const promptID = document.getElementById(this.configuration.prefix + 'prompt_manager_footer_append_prompt').value;
                 const prompt = this.getPromptById(promptID);

                     this.render();
                     this.saveServiceSettings();
+                }
+            });
         };
         // Create new prompt, then save it to settings and close form.

         // Import prompts for the selected character
         this.handleImport = () => {
-            callPopup('Existing prompts with the same ID will be overridden. Do you want to proceed?', 'confirm')
+            Popup.show.confirm('Existing prompts with the same ID will be overridden. Do you want to proceed?', null)
                 .then(userChoice => {
-                    if (false === userChoice) return;
+                    if (!userChoice) return;
                     const fileOpener = document.createElement('input');
                     fileOpener.type = 'file';

         // Restore default state of a characters prompt order
         this.handleCharacterReset = () => {
-            callPopup('This will reset the prompt order for this character. You will not lose any prompts.', 'confirm')
+            Popup.show.confirm('This will reset the prompt order for this character. You will not lose any prompts.', null)
                 .then(userChoice => {
-                    if (false === userChoice) return;
+                    if (!userChoice) return;
                     this.removePromptOrderForCharacter(this.activeCharacter);
                     this.addPromptOrderForCharacter(this.activeCharacter, promptManagerDefaultPromptOrder);

+            }
             const encodedName = escapeHtml(prompt.name);
+            const isMarkerPrompt = prompt.marker && prompt.injection_position !== INJECTION_POSITION.ABSOLUTE;
             const isSystemPrompt = !prompt.marker && prompt.system_prompt && prompt.injection_position !== INJECTION_POSITION.ABSOLUTE && !prompt.forbid_overrides;
             const isImportantPrompt = !prompt.marker && prompt.system_prompt && prompt.injection_position !== INJECTION_POSITION.ABSOLUTE && prompt.forbid_overrides;
             const isUserPrompt = !prompt.marker && !prompt.system_prompt && prompt.injection_position !== INJECTION_POSITION.ABSOLUTE;
-            const isInjectionPrompt = !prompt.marker && prompt.injection_position === INJECTION_POSITION.ABSOLUTE;
+            const isInjectionPrompt = prompt.injection_position === INJECTION_POSITION.ABSOLUTE;
             const isOverriddenPrompt = Array.isArray(this.overriddenPrompts) && this.overriddenPrompts.includes(prompt.identifier);
             const importantClass = isImportantPrompt ? `${prefix}prompt_manager_important` : '';
             listItemHtml += `
                 <li class="${prefix}prompt_manager_prompt ${draggableClass} ${enabledClass} ${markerClass} ${importantClass}" data-pm-identifier="${prompt.identifier}">
                     <span class="${prefix}prompt_manager_prompt_name" data-pm-name="${encodedName}">
-                        ${prompt.marker ? '<span class="fa-fw fa-solid fa-thumb-tack" title="Marker"></span>' : ''}
+                        ${isMarkerPrompt ? '<span class="fa-fw fa-solid fa-thumb-tack" title="Marker"></span>' : ''}
                         ${isSystemPrompt ? '<span class="fa-fw fa-solid fa-square-poll-horizontal" title="Global Prompt"></span>' : ''}
                         ${isImportantPrompt ? '<span class="fa-fw fa-solid fa-star" title="Important Prompt"></span>' : ''}
                         ${isUserPrompt ? '<span class="fa-fw fa-solid fa-user" title="User Prompt"></span>' : ''}

      */
     showPopup(area = 'edit') {
         const areaElement = document.getElementById(this.configuration.prefix + 'prompt_manager_popup_' + area);
-        areaElement.style.display = 'block';
+        areaElement.style.display = 'flex';
         $('#' + this.configuration.prefix + 'prompt_manager_popup').first()
             .slideDown(200, 'swing')

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

@@ -313,7 +313,7 @@ async function onDeleteBackgroundClick(e) {
313	}	313	}
314	}	314	}
315		315
316	const autoBgPrompt = 'Pause your roleplay and choose a location ONLY from the provided list that is the most suitable for the current scene. Do not output any other text:\n{0}';	316	const autoBgPrompt = 'Ignore previous instructions and choose a location ONLY from the provided list that is the most suitable for the current scene. Do not output any other text:\n{0}';
317		317
318	async function autoBackgroundCommand() {	318	async function autoBackgroundCommand() {
319	/** @type {HTMLElement[]} */	319	/** @type {HTMLElement[]} */

public/scripts/extensions/caption/settings.html+3 -0 Viewed

                         <option data-type="google" value="gemini-1.5-flash">gemini-1.5-flash</option>
                         <option data-type="google" value="gemini-1.5-flash-latest">gemini-1.5-flash-latest</option>
                         <option data-type="google" value="gemini-1.5-flash-001">gemini-1.5-flash-001</option>
+                        <option data-type="google" value="gemini-1.5-flash-002">gemini-1.5-flash-002</option>
                         <option data-type="google" value="gemini-1.5-flash-exp-0827">gemini-1.5-flash-exp-0827</option>
                         <option data-type="google" value="gemini-1.5-flash-8b-exp-0827">gemini-1.5-flash-8b-exp-0827</option>
+                        <option data-type="google" value="gemini-1.5-flash-8b-exp-0924">gemini-1.5-flash-8b-exp-0924</option>
                         <option data-type="google" value="gemini-1.5-pro">gemini-1.5-pro</option>
                         <option data-type="google" value="gemini-1.5-pro-latest">gemini-1.5-pro-latest</option>
                         <option data-type="google" value="gemini-1.5-pro-001">gemini-1.5-pro-001</option>
+                        <option data-type="google" value="gemini-1.5-pro-002">gemini-1.5-pro-002</option>
                         <option data-type="google" value="gemini-1.5-pro-exp-0801">gemini-1.5-pro-exp-0801</option>
                         <option data-type="google" value="gemini-1.5-pro-exp-0827">gemini-1.5-pro-exp-0827</option>
                         <option data-type="google" value="gemini-pro-vision">gemini-pro-vision</option>

public/scripts/extensions/connection-manager/index.js+35 -1 Viewed

     'preset',
     'api-url',
     'model',
+    'sysprompt',
+    'sysprompt-state',
     'instruct',
     'context',
     'instruct-state',

     'preset': 'Settings Preset',
     'model': 'Model',
     'proxy': 'Proxy Preset',
+    'sysprompt-state': 'Use System Prompt',
+    'sysprompt': 'System Prompt Name',
     'instruct-state': 'Instruct Mode',
     'instruct': 'Instruct Template',
     'context': 'Context Template',

+    }
     if (cleanUp) {
+        for (const command of commands) {
+            if (command.endsWith('-state') && profile[command] === 'false') {
+                delete profile[command.replace('-state', '')];
+            }
+        }
         for (const command of opposingCommands) {
             if (commands.includes(command)) {
                 continue;

     noneOption.selected = !extension_settings.connectionManager.selectedProfile;
     profiles.appendChild(noneOption);
-    for (const profile of extension_settings.connectionManager.profiles) {
+    for (const profile of extension_settings.connectionManager.profiles.sort((a, b) => a.name.localeCompare(b.name))) {
         const option = document.createElement('option');
         option.value = profile.id;
         option.textContent = profile.name;

         await eventSource.emit(event_types.CONNECTION_PROFILE_LOADED, NONE);
     });
+    const renameButton = document.getElementById('rename_connection_profile');
+    renameButton.addEventListener('click', async () => {
+        const selectedProfile = extension_settings.connectionManager.selectedProfile;
+        const profile = extension_settings.connectionManager.profiles.find(p => p.id === selectedProfile);
+        if (!profile) {
+            console.log('No profile selected');
+            return;
+        }
+        const newName = await Popup.show.input('Enter a new name', null, profile.name, { rows: 2 });
+        if (!newName) {
+            return;
+        }
+        if (extension_settings.connectionManager.profiles.some(p => p.name === newName)) {
+            toastr.error('A profile with the same name already exists.');
+            return;
+        }
+        profile.name = newName;
+        saveSettingsDebounced();
+        renderConnectionProfiles(profiles);
+        toastr.success('Connection profile renamed', '', { timeOut: 1500 });
+    });
     /** @type {HTMLElement} */
     const viewDetails = document.getElementById('view_connection_profile');
     const detailsContent = document.getElementById('connection_profile_details_content');

public/scripts/extensions/connection-manager/settings.html+1 -0 Viewed

         <i id="view_connection_profile" class="menu_button fa-solid fa-info-circle" title="View connection profile details" data-i18n="[title]View connection profile details"></i>
         <i id="create_connection_profile" class="menu_button fa-solid fa-file-circle-plus" title="Create a new connection profile" data-i18n="[title]Create a new connection profile"></i>
         <i id="update_connection_profile" class="menu_button fa-solid fa-save" title="Update a connection profile" data-i18n="[title]Update a connection profile"></i>
+        <i id="rename_connection_profile" class="menu_button fa-solid fa-pencil" title="Rename a connection profile" data-i18n="[title]Rename a connection profile"></i>
         <i id="reload_connection_profile" class="menu_button fa-solid fa-recycle" title="Reload a connection profile" data-i18n="[title]Reload a connection profile"></i>
         <i id="delete_connection_profile" class="menu_button fa-solid fa-trash-can" title="Delete a connection profile" data-i18n="[title]Delete a connection profile"></i>
     </div>

public/scripts/extensions/expressions/index.js+2 -2 Viewed

 const TALKINGCHECK_UPDATE_INTERVAL = 500;
 const DEFAULT_FALLBACK_EXPRESSION = 'joy';
 const FUNCTION_NAME = 'set_emotion';
-const DEFAULT_LLM_PROMPT = 'Pause your roleplay. Classify the emotion of the last message. Output just one word, e.g. "joy" or "anger". Choose only one of the following labels: {{labels}}';
+const DEFAULT_LLM_PROMPT = 'Ignore previous instructions. Classify the emotion of the last message. Output just one word, e.g. "joy" or "anger". Choose only one of the following labels: {{labels}}';
 const DEFAULT_EXPRESSIONS = [
     'talkinghead',
     'admiration',

+                }
                 const expressionsList = await getExpressionsList();
-                const prompt = substituteParamsExtended(String(customPrompt), { labels: expressionsList }) || await getLlmPrompt(expressionsList);
+                const prompt = substituteParamsExtended(customPrompt, { labels: expressionsList }) || await getLlmPrompt(expressionsList);
                 let functionResult = null;
                 eventSource.once(event_types.TEXT_COMPLETION_SETTINGS_READY, onTextGenSettingsReady);
                 eventSource.once(event_types.LLM_FUNCTION_TOOL_REGISTER, onFunctionToolRegister);

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

     RAW_NON_BLOCKING: 2,
 };
-const defaultPrompt = '[Pause your roleplay. Summarize the most important facts and events in the story so far. If a summary already exists in your memory, use that as a base and expand with new facts. Limit the summary to {{words}} words or less. Your response should include nothing but the summary.]';
+const defaultPrompt = 'Ignore previous instructions. Summarize the most important facts and events in the story so far. If a summary already exists in your memory, use that as a base and expand with new facts. Limit the summary to {{words}} words or less. Your response should include nothing but the summary.';
 const defaultTemplate = '[Summary: {{summary}}]';
 const defaultSettings = {

public/scripts/extensions/stable-diffusion/index.js+10 -8 Viewed

 const promptTemplates = {
     // Not really a prompt template, rather an outcome message template
     [generationMode.MESSAGE]: '[{{char}} sends a picture that contains: {{prompt}}].',
-    /*OLD:     [generationMode.CHARACTER]: "Pause your roleplay and provide comma-delimited list of phrases and keywords which describe {{char}}'s physical appearance and clothing. Ignore {{char}}'s personality traits, and chat history when crafting this description. End your response once the comma-delimited list is complete. Do not roleplay when writing this description, and do not attempt to continue the story.", */
     [generationMode.CHARACTER]: 'In the next response I want you to provide only a detailed comma-delimited list of keywords and phrases which describe {{char}}. The list must include all of the following items in this order: name, species and race, gender, age, clothing, occupation, physical features and appearances. Do not include descriptions of non-visual qualities such as personality, movements, scents, mental traits, or anything which could not be seen in a still photograph. Do not write in full sentences. Prefix your description with the phrase \'full body portrait,\'',
     //face-specific prompt
     [generationMode.FACE]: 'In the next response I want you to provide only a detailed comma-delimited list of keywords and phrases which describe {{char}}. The list must include all of the following items in this order: name, species and race, gender, age, facial features and expressions, occupation, hair and hair accessories (if any), what they are wearing on their upper body (if anything). Do not describe anything below their neck. Do not include descriptions of non-visual qualities such as personality, movements, scents, mental traits, or anything which could not be seen in a still photograph. Do not write in full sentences. Prefix your description with the phrase \'close up facial portrait,\'',
     //prompt for only the last message
-    [generationMode.USER]: 'Pause your roleplay and provide a detailed description of {{user}}\'s physical appearance from the perspective of {{char}} in the form of a comma-delimited list of keywords and phrases. The list must include all of the following items in this order: name, species and race, gender, age, clothing, occupation, physical features and appearances. Do not include descriptions of non-visual qualities such as personality, movements, scents, mental traits, or anything which could not be seen in a still photograph. Do not write in full sentences. Prefix your description with the phrase \'full body portrait,\'. Ignore the rest of the story when crafting this description. Do not roleplay as {{char}} when writing this description, and do not attempt to continue the story.',
+    [generationMode.USER]: 'Ignore previous instructions and provide a detailed description of {{user}}\'s physical appearance from the perspective of {{char}} in the form of a comma-delimited list of keywords and phrases. The list must include all of the following items in this order: name, species and race, gender, age, clothing, occupation, physical features and appearances. Do not include descriptions of non-visual qualities such as personality, movements, scents, mental traits, or anything which could not be seen in a still photograph. Do not write in full sentences. Prefix your description with the phrase \'full body portrait,\'. Ignore the rest of the story when crafting this description. Do not reply as {{char}} when writing this description, and do not attempt to continue the story.',
-    [generationMode.SCENARIO]: 'Pause your roleplay and provide a detailed description for all of the following: a brief recap of recent events in the story, {{char}}\'s appearance, and {{char}}\'s surroundings. Do not roleplay while writing this description.',
+    [generationMode.SCENARIO]: 'Ignore previous instructions and provide a detailed description for all of the following: a brief recap of recent events in the story, {{char}}\'s appearance, and {{char}}\'s surroundings. Do not reply as {{char}} while writing this description.',
-    [generationMode.NOW]: `Pause your roleplay. Your next response must be formatted as a single comma-delimited list of concise keywords.  The list will describe of the visual details included in the last chat message.
+    [generationMode.NOW]: `Ignore previous instructions. Your next response must be formatted as a single comma-delimited list of concise keywords.  The list will describe of the visual details included in the last chat message.
     Only mention characters by using pronouns ('he','his','she','her','it','its') or neutral nouns ('male', 'the man', 'female', 'the woman').

     A correctly formatted example response would be:
     '(location),(character list by gender),(primary action), (relative character position) POV, (character 1's description and actions), (character 2's description and actions)'`,
-    [generationMode.RAW_LAST]: 'Pause your roleplay and provide ONLY the last chat message string back to me verbatim. Do not write anything after the string. Do not roleplay at all in your response. Do not continue the roleplay story.',
+    [generationMode.RAW_LAST]: 'Ignore previous instructions and provide ONLY the last chat message string back to me verbatim. Do not write anything after the string. Do not reply as {{char}} when writing this description, and do not attempt to continue the story.',
-    [generationMode.BACKGROUND]: 'Pause your roleplay and provide a detailed description of {{char}}\'s surroundings in the form of a comma-delimited list of keywords and phrases. The list must include all of the following items in this order: location, time of day, weather, lighting, and any other relevant details. Do not include descriptions of characters and non-visual qualities such as names, personality, movements, scents, mental traits, or anything which could not be seen in a still photograph. Do not write in full sentences. Prefix your description with the phrase \'background,\'. Ignore the rest of the story when crafting this description. Do not roleplay as {{user}} when writing this description, and do not attempt to continue the story.',
+    [generationMode.BACKGROUND]: 'Ignore previous instructions and provide a detailed description of {{char}}\'s surroundings in the form of a comma-delimited list of keywords and phrases. The list must include all of the following items in this order: location, time of day, weather, lighting, and any other relevant details. Do not include descriptions of characters and non-visual qualities such as names, personality, movements, scents, mental traits, or anything which could not be seen in a still photograph. Do not write in full sentences. Prefix your description with the phrase \'background,\'. Ignore the rest of the story when crafting this description. Do not reply as {{char}} when writing this description, and do not attempt to continue the story.',
     [generationMode.FACE_MULTIMODAL]: 'Provide an exhaustive comma-separated list of tags describing the appearance of the character on this image in great detail. Start with "close-up portrait".',
     [generationMode.CHARACTER_MULTIMODAL]: 'Provide an exhaustive comma-separated list of tags describing the appearance of the character on this image in great detail. Start with "full body portrait".',
     [generationMode.USER_MULTIMODAL]: 'Provide an exhaustive comma-separated list of tags describing the appearance of the character on this image in great detail. Start with "full body portrait".',
-    [generationMode.FREE_EXTENDED]: 'Pause your roleplay and provide an exhaustive comma-separated list of tags describing the appearance of "{0}" in great detail. Start with {{charPrefix}} (sic) if the subject is associated with {{char}}.',
+    [generationMode.FREE_EXTENDED]: 'Ignore previous instructions and provide an exhaustive comma-separated list of tags describing the appearance of "{0}" in great detail. Start with {{charPrefix}} (sic) if the subject is associated with {{char}}.',
 };
 const defaultPrefix = 'best quality, absurdres, aesthetic,';

         ],
         helpString: `
             <div>
-                Requests to generate an image and posts it to chat (unless <code>quiet=true</code> argument is specified).</code>.
+                Requests to generate an image and posts it to chat (unless <code>quiet=true</code> argument is specified).
+            </div>
+            <div>
+                Supported arguments: <code>${Object.values(triggerWords).flat().join(', ')}</code>.
             </div>
             <div>
                 Anything else would trigger a "free mode" to make generate whatever you prompted. Example: <code>/imagine apple tree</code> would generate a picture of an apple tree. Returns a link to the generated image.

public/scripts/extensions/vectors/index.js+1 -27 Viewed

     summarize: false,
     summarize_sent: false,
     summary_source: 'main',
-    summary_prompt: 'Pause your roleplay. Summarize the most important parts of the message. Limit yourself to 250 words or less. Your response should include nothing but the summary.',
+    summary_prompt: 'Ignore previous instructions. Summarize the most important parts of the message. Limit yourself to 250 words or less. Your response should include nothing but the summary.',
     force_chunk_delimiter: '',
     // For chats

+    }
+}
-async function isModelScopesEnabled() {
-    try {
-        const response = await fetch('/api/vector/scopes-enabled', {
-            method: 'GET',
-            headers: getVectorHeaders(),
-        });
-        if (!response.ok) {
-            return false;
-        }
-        const data = await response.json();
-        return data?.enabled ?? false;
-    } catch (error) {
-        console.error('Vectors: Failed to check model scopes', error);
-        return false;
-    }
-}
 function toggleSettings() {
     $('#vectors_files_settings').toggle(!!settings.enabled_files);
     $('#vectors_chats_settings').toggle(!!settings.enabled_chats);

+    }
     Object.assign(settings, extension_settings.vectors);
-    const scopesEnabled = await isModelScopesEnabled();
     // Migrate from TensorFlow to Transformers
     settings.source = settings.source !== 'local' ? settings.source : 'transformers';

         saveSettingsDebounced();
         toggleSettings();
     });
-    $('#vectors_modelWarning').hide();
     $('#vectors_enabled_files').prop('checked', settings.enabled_files).on('input', () => {
         settings.enabled_files = $('#vectors_enabled_files').prop('checked');
         Object.assign(extension_settings.vectors, settings);

         saveSettingsDebounced();
     });
     $('#vectors_togetherai_model').val(settings.togetherai_model).on('change', () => {
-        !scopesEnabled && $('#vectors_modelWarning').show();
         settings.togetherai_model = String($('#vectors_togetherai_model').val());
         Object.assign(extension_settings.vectors, settings);
         saveSettingsDebounced();
     });
     $('#vectors_openai_model').val(settings.openai_model).on('change', () => {
-        !scopesEnabled && $('#vectors_modelWarning').show();
         settings.openai_model = String($('#vectors_openai_model').val());
         Object.assign(extension_settings.vectors, settings);
         saveSettingsDebounced();
     });
     $('#vectors_cohere_model').val(settings.cohere_model).on('change', () => {
-        !scopesEnabled && $('#vectors_modelWarning').show();
         settings.cohere_model = String($('#vectors_cohere_model').val());
         Object.assign(extension_settings.vectors, settings);
         saveSettingsDebounced();
     });
     $('#vectors_ollama_model').val(settings.ollama_model).on('input', () => {
-        !scopesEnabled && $('#vectors_modelWarning').show();
         settings.ollama_model = String($('#vectors_ollama_model').val());
         Object.assign(extension_settings.vectors, settings);
         saveSettingsDebounced();
     });
     $('#vectors_vllm_model').val(settings.vllm_model).on('input', () => {
-        !scopesEnabled && $('#vectors_modelWarning').show();
         settings.vllm_model = String($('#vectors_vllm_model').val());
         Object.assign(extension_settings.vectors, settings);
         saveSettingsDebounced();

public/scripts/extensions/vectors/settings.html+0 -8 Viewed

                 </i>
             </div>
-            <small id="vectors_modelWarning">
-                <i class="fa-solid fa-exclamation-triangle"></i>
-                <span>
-                    Set <code>vectors.enableModelScopes</code> to true in config.yaml to switch between vectorization models without needing to purge existing vectors.
-                    This option will soon be enabled by default.
-                </span>
-            </small>
             <div class="flex-container alignItemsCenter" id="nomicai_apiKey">
                 <label for="api_key_nomicai" class="flex1">
                     <span data-i18n="NomicAI API Key">NomicAI API Key</span>

public/scripts/instruct-mode.js+27 -53 Viewed

 const controls = [
     { id: 'instruct_enabled', property: 'enabled', isCheckbox: true },
     { id: 'instruct_wrap', property: 'wrap', isCheckbox: true },
-    { id: 'instruct_system_prompt', property: 'system_prompt', isCheckbox: false },
     { id: 'instruct_system_sequence_prefix', property: 'system_sequence_prefix', isCheckbox: false },
     { id: 'instruct_system_sequence_suffix', property: 'system_sequence_suffix', isCheckbox: false },
     { id: 'instruct_input_sequence', property: 'input_sequence', isCheckbox: false },

     { id: 'instruct_last_system_sequence', property: 'last_system_sequence', isCheckbox: false },
     { id: 'instruct_user_alignment_message', property: 'user_alignment_message', isCheckbox: false },
     { id: 'instruct_stop_sequence', property: 'stop_sequence', isCheckbox: false },
-    { id: 'instruct_names', property: 'names', isCheckbox: true },
     { id: 'instruct_first_output_sequence', property: 'first_output_sequence', isCheckbox: false },
     { id: 'instruct_last_output_sequence', property: 'last_output_sequence', isCheckbox: false },
     { id: 'instruct_first_input_sequence', property: 'first_input_sequence', isCheckbox: false },

     { id: 'instruct_activation_regex', property: 'activation_regex', isCheckbox: false },
     { id: 'instruct_bind_to_context', property: 'bind_to_context', isCheckbox: true },
     { id: 'instruct_skip_examples', property: 'skip_examples', isCheckbox: true },
-    { id: 'instruct_names_behavior input[name="names_behavior"]', property: 'names_behavior', isCheckbox: false },
+    { id: 'instruct_names_behavior', property: 'names_behavior', isCheckbox: false },
     { id: 'instruct_system_same_as_user', property: 'system_same_as_user', isCheckbox: true, trigger: true },
 ];

         if (control.isCheckbox) {
             $element.prop('checked', power_user.instruct[control.property]);
-        } else if (control.property === 'names_behavior') {
+        } else if ($element.is('select')) {
-            const behavior = power_user.instruct[control.property];
+            const value = power_user.instruct[control.property];
-            $element.filter(`[value="${behavior}"]`).prop('checked', true);
+            $element.val(value);
+            $element.filter(`[value="${value}"]`).prop('checked', true);
         } else {
             $element.val(power_user.instruct[control.property]);
+        }

         option.selected = name === power_user.instruct.preset;
         $('#instruct_presets').append(option);
     });
-    highlightDefaultPreset();
-}
-function highlightDefaultPreset() {
-    $('#instruct_set_default').toggleClass('default', power_user.default_instruct === power_user.instruct.preset);
+}
 /**

         !quiet && toastr.info(`Context Template: "${preset}" ${isAuto ? 'auto-' : ''}selected`);
+    }
-    // If instruct mode is disabled, enable it, except for default context template
-    if (!power_user.instruct.enabled && preset !== power_user.default_context) {
-        power_user.instruct.enabled = true;
-        $('#instruct_enabled').prop('checked', true).trigger('change');
-        !quiet && toastr.info('Instruct Mode enabled');
-    }
     saveSettingsDebounced();
+}

@@ -235,13 +221,6 @@ export function autoSelectInstructPreset(modelId) {
235	}	221	}
236	}	222	}
237	}	223	}
238
239	if (power_user.instruct.bind_to_context && power_user.default_instruct && power_user.instruct.preset !== power_user.default_instruct) {
240	if (instruct_presets.some(p => p.name === power_user.default_instruct)) {
241	console.log(`Instruct mode: default preset "${power_user.default_instruct}" selected`);
242	$('#instruct_presets').val(power_user.default_instruct).trigger('change');
243	}
244	}
245	}	224	}
246		225
247	return false;	226	return false;

@@ -580,10 +559,6 @@ function selectMatchingContextTemplate(name) {
580	break;	559	break;
581	}	560	}
582	}	561	}
583	if (!foundMatch) {
584	// If no match was found, select default context preset
585	selectContextPreset(power_user.default_context, { isAuto: true });
586	}
587	}	562	}
588		563
589	/**	564	/**

     if (!input) {
         return '';
+    }
+    const syspromptMacros = {
+        'systemPrompt': (power_user.prefer_character_prompt && env.charPrompt ? env.charPrompt : power_user.sysprompt.content),
+        'defaultSystemPrompt|instructSystem|instructSystemPrompt': power_user.sysprompt.content,
+    };
     const instructMacros = {
-        'systemPrompt': (power_user.prefer_character_prompt && env.charPrompt ? env.charPrompt : power_user.instruct.system_prompt),
-        'instructSystem|instructSystemPrompt': power_user.instruct.system_prompt,
         'instructSystemPromptPrefix': power_user.instruct.system_sequence_prefix,
         'instructSystemPromptSuffix': power_user.instruct.system_sequence_suffix,
         'instructInput|instructUserPrefix': power_user.instruct.input_sequence,

         input = input.replace(regex, power_user.instruct.enabled ? value : '');
+    }
+    for (const [placeholder, value] of Object.entries(syspromptMacros)) {
+        const regex = new RegExp(`{{(${placeholder})}}`, 'gi');
+        input = input.replace(regex, power_user.sysprompt.enabled ? value : '');
+    }
     input = input.replace(/{{exampleSeparator}}/gi, power_user.context.example_separator);
     input = input.replace(/{{chatStart}}/gi, power_user.context.chat_start);

+}
 jQuery(() => {
-    $('#instruct_set_default').on('click', function () {
-        if (power_user.instruct.preset === power_user.default_instruct) {
-            power_user.default_instruct = null;
-            $(this).removeClass('default');
-            toastr.info('Default instruct template cleared');
-        } else {
-            power_user.default_instruct = power_user.instruct.preset;
-            $(this).addClass('default');
-            toastr.info(`Default instruct template set to ${power_user.default_instruct}`);
-        }
-        saveSettingsDebounced();
-    });
     $('#instruct_system_same_as_user').on('input', function () {
         const state = !!$(this).prop('checked');
         if (state) {

         // When instruct mode gets enabled, select context template matching selected instruct preset
         if (power_user.instruct.enabled) {
             selectMatchingContextTemplate(power_user.instruct.preset);
-        } else {
-            // When instruct mode gets disabled, select default context preset
-            selectContextPreset(power_user.default_context);
+        }
     });

                 if (control.isCheckbox) {
                     $element.prop('checked', power_user.instruct[control.property]).trigger('input');
-                } else if (control.property === 'names_behavior') {
+                } else if ($element.is('select')) {
-                    const behavior = power_user.instruct[control.property];
+                    const value = power_user.instruct[control.property];
-                    $element.filter(`[value="${behavior}"]`).prop('checked', true).trigger('input');
+                    $element.val(value);
+                    $element.filter(`[value="${value}"]`).prop('checked', true).trigger('input');
                 } else {
                     $element.val(power_user.instruct[control.property]);
                     $element.trigger('input');

             // Select matching context template
             selectMatchingContextTemplate(name);
+        }
+    });
-        highlightDefaultPreset();
+    if (!CSS.supports('field-sizing', 'content')) {
+        $('#InstructSequencesColumn details').on('toggle', function () {
+            if ($(this).prop('open')) {
+                resetScrollHeight($(this).find('textarea'));
+            }
         });
+    }
 });

public/scripts/nai-settings.js+60 -31 Viewed

     novelai_setting_names,
     saveSettingsDebounced,
     setGenerationParamsFromPreset,
-    substituteParams,
 } from '../script.js';
-import { getCfgPrompt } from './cfg-scale.js';
 import { MAX_CONTEXT_DEFAULT, MAX_RESPONSE_DEFAULT, power_user } from './power-user.js';
 import { getTextTokens, tokenizers } from './tokenizers.js';
 import { getEventSourceStream } from './sse-stream.js';

 const default_presets = {
     'clio-v1': 'Talker-Chat-Clio',
     'kayra-v1': 'Carefree-Kayra',
+    'llama-3-erato-v1': 'Erato-Dragonfruit',
 };
 export const nai_settings = {

     streaming_novel: false,
     preamble: default_preamble,
     prefix: '',
-    cfg_uc: '',
     banned_tokens: '',
     order: default_order,
     logit_bias: [],

 : 'Opus',
 };
+const samplers = {
+    temperature: 0,
+    top_k: 1,
+    top_p: 2,
+    tfs: 3,
+    top_a: 4,
+    typical_p: 5,
+    // removed samplers were here
+    mirostat: 8,
+    math1: 9,
+    min_p: 10,
+};
 let novel_data = null;
 let badWordsCache = {};
-const BIAS_KEY = '#novel_api-settings';
+const BIAS_KEY = '#range_block_novel';
 export function setNovelData(data) {
     novel_data = data;

     return maximum_output_length;
+}
+export function convertNovelPreset(data) {
+    if (!data || typeof data !== 'object' || data.presetVersion !== 3 || !data.parameters || typeof data.parameters !== 'object') {
+        return data;
+    }
+    return {
+        max_context: 8000,
+        temperature: data.parameters.temperature,
+        max_length: data.parameters.max_length,
+        min_length: data.parameters.min_length,
+        top_k: data.parameters.top_k,
+        top_p: data.parameters.top_p,
+        top_a: data.parameters.top_a,
+        typical_p: data.parameters.typical_p,
+        tail_free_sampling: data.parameters.tail_free_sampling,
+        repetition_penalty: data.parameters.repetition_penalty,
+        repetition_penalty_range: data.parameters.repetition_penalty_range,
+        repetition_penalty_slope: data.parameters.repetition_penalty_slope,
+        repetition_penalty_frequency: data.parameters.repetition_penalty_frequency,
+        repetition_penalty_presence: data.parameters.repetition_penalty_presence,
+        phrase_rep_pen: data.parameters.phrase_rep_pen,
+        mirostat_lr: data.parameters.mirostat_lr,
+        mirostat_tau: data.parameters.mirostat_tau,
+        math1_temp: data.parameters.math1_temp,
+        math1_quad: data.parameters.math1_quad,
+        math1_quad_entropy_scale: data.parameters.math1_quad_entropy_scale,
+        min_p: data.parameters.min_p,
+        order: Array.isArray(data.parameters.order) ? data.parameters.order.filter(s => s.enabled && Object.keys(samplers).includes(s.id)).map(s => samplers[s.id]) : default_order,
+    };
+}
 export function getNovelTier() {
     return nai_tiers[novel_data?.tier] ?? 'no_connection';
+}

     nai_settings.top_a = preset.top_a;
     nai_settings.typical_p = preset.typical_p;
     nai_settings.min_length = preset.min_length;
-    nai_settings.cfg_scale = preset.cfg_scale;
     nai_settings.phrase_rep_pen = preset.phrase_rep_pen;
     nai_settings.mirostat_lr = preset.mirostat_lr;
     nai_settings.mirostat_tau = preset.mirostat_tau;
     nai_settings.prefix = preset.prefix;
-    nai_settings.cfg_uc = preset.cfg_uc || '';
     nai_settings.banned_tokens = preset.banned_tokens || '';
     nai_settings.order = preset.order || default_order;
     nai_settings.logit_bias = preset.logit_bias || [];

     nai_settings.typical_p = settings.typical_p;
     nai_settings.min_length = settings.min_length;
     nai_settings.phrase_rep_pen = settings.phrase_rep_pen;
-    nai_settings.cfg_scale = settings.cfg_scale;
     nai_settings.mirostat_lr = settings.mirostat_lr;
     nai_settings.mirostat_tau = settings.mirostat_tau;
     nai_settings.streaming_novel = !!settings.streaming_novel;
     nai_settings.preamble = settings.preamble || default_preamble;
     nai_settings.prefix = settings.prefix;
-    nai_settings.cfg_uc = settings.cfg_uc || '';
     nai_settings.banned_tokens = settings.banned_tokens || '';
     nai_settings.order = settings.order || default_order;
     nai_settings.logit_bias = settings.logit_bias || [];

     $('#top_a_counter_novel').val(Number(ui_settings.top_a).toFixed(3));
     $('#typical_p_novel').val(ui_settings.typical_p);
     $('#typical_p_counter_novel').val(Number(ui_settings.typical_p).toFixed(3));
-    $('#cfg_scale_novel').val(ui_settings.cfg_scale);
-    $('#cfg_scale_counter_novel').val(Number(ui_settings.cfg_scale).toFixed(2));
     $('#phrase_rep_pen_novel').val(ui_settings.phrase_rep_pen || 'off');
     $('#mirostat_lr_novel').val(ui_settings.mirostat_lr);
     $('#mirostat_lr_counter_novel').val(Number(ui_settings.mirostat_lr).toFixed(2));

     $('#min_length_counter_novel').val(Number(ui_settings.min_length).toFixed(0));
     $('#nai_preamble_textarea').val(ui_settings.preamble);
     $('#nai_prefix').val(ui_settings.prefix || 'vanilla');
-    $('#nai_cfg_uc').val(ui_settings.cfg_uc || '');
     $('#nai_banned_tokens').val(ui_settings.banned_tokens || '');
     $('#min_p_novel').val(ui_settings.min_p);
     $('#min_p_counter_novel').val(Number(ui_settings.min_p).toFixed(3));

         setValue: (val) => { nai_settings.mirostat_lr = Number(val).toFixed(2); },
     },
+    {
-        sliderId: '#cfg_scale_novel',
-        counterId: '#cfg_scale_counter_novel',
-        format: (val) => `${val}`,
-        setValue: (val) => { nai_settings.cfg_scale = Number(val).toFixed(2); },
-    },
-    {
         sliderId: '#min_length_novel',
         counterId: '#min_length_counter_novel',
         format: (val) => `${val}`,
         setValue: (val) => { nai_settings.min_length = Number(val).toFixed(0); },
     },
+    {
-        sliderId: '#nai_cfg_uc',
-        counterId: '#nai_cfg_uc_counter',
-        format: (val) => val,
-        setValue: (val) => { nai_settings.cfg_uc = val; },
-    },
-    {
         sliderId: '#nai_banned_tokens',
         counterId: '#nai_banned_tokens_counter',
         format: (val) => val,

     return result.filter(onlyUnique);
+}
-export function getNovelGenerationData(finalPrompt, settings, maxLength, isImpersonate, isContinue, cfgValues, type) {
+export function getNovelGenerationData(finalPrompt, settings, maxLength, isImpersonate, isContinue, _cfgValues, type) {
     console.debug('NovelAI generation data for', type);
-    if (cfgValues && cfgValues.guidanceScale && cfgValues.guidanceScale?.value !== 1) {
-        cfgValues.negativePrompt = (getCfgPrompt(cfgValues.guidanceScale, true))?.value;
-    }
     const tokenizerType = getTokenizerTypeForModel(nai_settings.model_novel);
     const stopSequences = (tokenizerType !== tokenizers.NONE)

         console.log(finalPrompt);
+    }
-    const adjustedMaxLength = nai_settings.model_novel.includes('kayra') ? getKayraMaxResponseTokens() : maximum_output_length;
+    const isKayra = nai_settings.model_novel.includes('kayra');
+    const isErato = nai_settings.model_novel.includes('erato');
+    if (isErato) {
+        finalPrompt = '<|startoftext|>' + finalPrompt;
+    }
+    const adjustedMaxLength = (isKayra || isErato) ? getKayraMaxResponseTokens() : maximum_output_length;
     return {
         'input': finalPrompt,

         'typical_p': Number(nai_settings.typical_p),
         'mirostat_lr': Number(nai_settings.mirostat_lr),
         'mirostat_tau': Number(nai_settings.mirostat_tau),
-        'cfg_scale': cfgValues?.guidanceScale?.value ?? Number(nai_settings.cfg_scale),
-        'cfg_uc': cfgValues?.negativePrompt ?? substituteParams(nai_settings.cfg_uc) ?? '',
         'phrase_rep_pen': nai_settings.phrase_rep_pen,
         'stop_sequences': stopSequences,
         'bad_words_ids': badWordIds,

     let useInstruct = false;
     const clio = nai_settings.model_novel.includes('clio');
     const kayra = nai_settings.model_novel.includes('kayra');
-    const isNewModel = clio || kayra;
+    const erato = nai_settings.model_novel.includes('erato');
+    const isNewModel = clio || kayra || erato;
     if (isNewModel) {
         // NovelAI claims they scan backwards 1000 characters (not tokens!) to look for instruct brackets. That's really short.

@@ -559,6 +585,9 @@ function getTokenizerTypeForModel(model) {
559	if (model.includes('kayra')) {	585	if (model.includes('kayra')) {
560	return tokenizers.NERD2;	586	return tokenizers.NERD2;
561	}	587	}
		588	if (model.includes('erato')) {
		589	return tokenizers.LLAMA3;
		590	}
562	return tokenizers.NONE;	591	return tokenizers.NONE;
563	}	592	}
564		593

public/scripts/openai.js+12 -139 Viewed

     stringFormat,
 } from './utils.js';
 import { countTokensOpenAI, getTokenizerModel } from './tokenizers.js';
-import {
-    formatInstructModeChat,
-    formatInstructModeExamples,
-    formatInstructModePrompt,
-    formatInstructModeSystemPrompt,
-} from './instruct-mode.js';
 import { isMobile } from './RossAscends-mods.js';
 import { saveLogprobsForActiveMessage } from './logprobs.js';
 import { SlashCommandParser } from './slash-commands/SlashCommandParser.js';

     windowai_model: '',
     openrouter_model: openrouter_website_model,
     openrouter_use_fallback: false,
-    openrouter_force_instruct: false,
     openrouter_group_models: false,
     openrouter_sort_models: 'alphabetically',
     openrouter_providers: [],

     windowai_model: '',
     openrouter_model: openrouter_website_model,
     openrouter_use_fallback: false,
-    openrouter_force_instruct: false,
     openrouter_group_models: false,
     openrouter_sort_models: 'alphabetically',
     openrouter_providers: [],

+}
 /**
- * Converts the Chat Completion object to an Instruct Mode prompt string.
- * @param {object[]} messages Array of messages
- * @param {string} type Generation type
- * @returns {string} Text completion prompt
- */
-function convertChatCompletionToInstruct(messages, type) {
-    const newChatPrompts = [
-        substituteParams(oai_settings.new_chat_prompt),
-        substituteParams(oai_settings.new_example_chat_prompt),
-        substituteParams(oai_settings.new_group_chat_prompt),
-    ];
-    messages = messages.filter(x => !newChatPrompts.includes(x.content));
-    let chatMessagesText = '';
-    let systemPromptText = '';
-    let examplesText = '';
-    function getPrefix(message) {
-        let prefix;
-        if (message.role === 'user' || message.name === 'example_user') {
-            if (selected_group) {
-                prefix = '';
-            } else if (message.name === 'example_user') {
-                prefix = name1;
-            } else {
-                prefix = message.name ?? name1;
-            }
-        }
-        if (message.role === 'assistant' || message.name === 'example_assistant') {
-            if (selected_group) {
-                prefix = '';
-            }
-            else if (message.name === 'example_assistant') {
-                prefix = name2;
-            } else {
-                prefix = message.name ?? name2;
-            }
-        }
-        return prefix;
-    }
-    function toString(message) {
-        if (message.role === 'system' && !message.name) {
-            return message.content;
-        }
-        const prefix = getPrefix(message);
-        return prefix ? `${prefix}: ${message.content}` : message.content;
-    }
-    const firstChatMessage = messages.findIndex(message => message.role === 'assistant' || message.role === 'user');
-    const systemPromptMessages = messages.slice(0, firstChatMessage).filter(message => message.role === 'system' && !message.name);
-    if (systemPromptMessages.length) {
-        systemPromptText = systemPromptMessages.map(message => message.content).join('\n');
-        systemPromptText = formatInstructModeSystemPrompt(systemPromptText);
-    }
-    const exampleMessages = messages.filter(x => x.role === 'system' && (x.name === 'example_user' || x.name === 'example_assistant'));
-    if (exampleMessages.length) {
-        const blockHeading = power_user.context.example_separator ? (substituteParams(power_user.context.example_separator) + '\n') : '';
-        const examplesArray = exampleMessages.map(m => '<START>\n' + toString(m));
-        examplesText = blockHeading + formatInstructModeExamples(examplesArray, name1, name2).join('');
-    }
-    const chatMessages = messages.slice(firstChatMessage);
-    if (chatMessages.length) {
-        chatMessagesText = substituteParams(power_user.context.chat_start) + '\n';
-        for (const message of chatMessages) {
-            const name = getPrefix(message);
-            const isUser = message.role === 'user';
-            const isNarrator = message.role === 'system';
-            chatMessagesText += formatInstructModeChat(name, message.content, isUser, isNarrator, '', name1, name2, false);
-        }
-    }
-    const isImpersonate = type === 'impersonate';
-    const isContinue = type === 'continue';
-    const isQuiet = type === 'quiet';
-    const isQuietToLoud = false; // Quiet to loud not implemented for Chat Completion
-    const promptName = isImpersonate ? name1 : name2;
-    const promptLine = isContinue ? '' : formatInstructModePrompt(promptName, isImpersonate, '', name1, name2, isQuiet, isQuietToLoud).trimStart();
-    let prompt = [systemPromptText, examplesText, chatMessagesText, promptLine]
-        .filter(x => x)
-        .map(x => x.endsWith('\n') ? x : `${x}\n`)
-        .join('');
-    if (isContinue) {
-        prompt = prompt.replace(/\n$/, '');
-    }
-    return prompt;
-}
-/**
  * Formats chat messages into chat completion messages.
  * @param {object[]} chat - Array containing all messages.
  * @returns {object[]} - Array containing all messages formatted for chat completion.

     return messages;
+}
-export function isOpenRouterWithInstruct() {
-    return oai_settings.chat_completion_source === chat_completion_sources.OPENROUTER && oai_settings.openrouter_force_instruct && power_user.instruct.enabled;
-}
 /**
  * Populates the chat history of the conversation.
  * @param {object[]} messages - Array containing all messages.

     // Reserve budget for continue nudge
     let continueMessage = null;
-    const instruct = isOpenRouterWithInstruct();
+    if (type === 'continue' && cyclePrompt && !oai_settings.continue_prefill) {
-    if (type === 'continue' && cyclePrompt && !instruct && !oai_settings.continue_prefill) {
         const promptObject = {
             identifier: 'continueNudge',
             role: 'system',

     const isPerplexity = oai_settings.chat_completion_source == chat_completion_sources.PERPLEXITY;
     const isGroq = oai_settings.chat_completion_source == chat_completion_sources.GROQ;
     const is01AI = oai_settings.chat_completion_source == chat_completion_sources.ZEROONEAI;
-    const isTextCompletion = (isOAI && textCompletionModels.includes(oai_settings.openai_model)) || (isOpenRouter && oai_settings.openrouter_force_instruct && power_user.instruct.enabled);
+    const isTextCompletion = isOAI && textCompletionModels.includes(oai_settings.openai_model);
     const isQuiet = type === 'quiet';
     const isImpersonate = type === 'impersonate';
     const isContinue = type === 'continue';

     const useLogprobs = !!power_user.request_token_probabilities;
     const canMultiSwipe = oai_settings.n > 1 && !isContinue && !isImpersonate && !isQuiet && (isOAI || isCustom);
-    if (isTextCompletion && isOpenRouter) {
-        messages = convertChatCompletionToInstruct(messages, type);
-        replaceItemizedPromptText(messageId, messages);
-    }
     // If we're using the window.ai extension, use that instead
     // Doesn't support logit bias yet
     if (oai_settings.chat_completion_source == chat_completion_sources.WINDOWAI) {

@@ -1915,10 +1795,9 @@ async function sendOpenAIRequest(type, messages, signal) {
1915	}	1795	}
1916		1796
1917	if (isGoogle) {	1797	if (isGoogle) {
1918	const nameStopString = isImpersonate ? `\n${name2}:` : `\n${name1}:`;	1798	const stopStringsLimit = 5;
1919	const stopStringsLimit = 3; // 5 - 2 (nameStopString and new_chat_prompt)
1920	generate_data['top_k'] = Number(oai_settings.top_k_openai);	1799	generate_data['top_k'] = Number(oai_settings.top_k_openai);
1921	generate_data['stop'] = [nameStopString, substituteParams(oai_settings.new_chat_prompt), ...getCustomStoppingStrings(stopStringsLimit)];	1800	generate_data['stop'] = getCustomStoppingStrings(stopStringsLimit).slice(0, stopStringsLimit).filter(x => x.length >= 1 && x.length <= 16);
1922	generate_data['use_makersuite_sysprompt'] = oai_settings.use_makersuite_sysprompt;	1801	generate_data['use_makersuite_sysprompt'] = oai_settings.use_makersuite_sysprompt;
1923	}	1802	}
1924		1803

     oai_settings.openrouter_group_models = settings.openrouter_group_models ?? default_settings.openrouter_group_models;
     oai_settings.openrouter_sort_models = settings.openrouter_sort_models ?? default_settings.openrouter_sort_models;
     oai_settings.openrouter_use_fallback = settings.openrouter_use_fallback ?? default_settings.openrouter_use_fallback;
-    oai_settings.openrouter_force_instruct = settings.openrouter_force_instruct ?? default_settings.openrouter_force_instruct;
     oai_settings.openrouter_allow_fallbacks = settings.openrouter_allow_fallbacks ?? default_settings.openrouter_allow_fallbacks;
     oai_settings.ai21_model = settings.ai21_model ?? default_settings.ai21_model;
     oai_settings.mistralai_model = settings.mistralai_model ?? default_settings.mistralai_model;

     $('#use_makersuite_sysprompt').prop('checked', oai_settings.use_makersuite_sysprompt);
     $('#scale-alt').prop('checked', oai_settings.use_alt_scale);
     $('#openrouter_use_fallback').prop('checked', oai_settings.openrouter_use_fallback);
-    $('#openrouter_force_instruct').prop('checked', oai_settings.openrouter_force_instruct);
     $('#openrouter_group_models').prop('checked', oai_settings.openrouter_group_models);
     $('#openrouter_allow_fallbacks').prop('checked', oai_settings.openrouter_allow_fallbacks);
     $('#openrouter_providers_chat').val(oai_settings.openrouter_providers).trigger('change');

         windowai_model: settings.windowai_model,
         openrouter_model: settings.openrouter_model,
         openrouter_use_fallback: settings.openrouter_use_fallback,
-        openrouter_force_instruct: settings.openrouter_force_instruct,
         openrouter_group_models: settings.openrouter_group_models,
         openrouter_sort_models: settings.openrouter_sort_models,
         openrouter_providers: settings.openrouter_providers,

         windowai_model: ['#model_windowai_select', 'windowai_model', false],
         openrouter_model: ['#model_openrouter_select', 'openrouter_model', false],
         openrouter_use_fallback: ['#openrouter_use_fallback', 'openrouter_use_fallback', true],
-        openrouter_force_instruct: ['#openrouter_force_instruct', 'openrouter_force_instruct', true],
         openrouter_group_models: ['#openrouter_group_models', 'openrouter_group_models', false],
         openrouter_sort_models: ['#openrouter_sort_models', 'openrouter_sort_models', false],
         openrouter_providers: ['#openrouter_providers_chat', 'openrouter_providers', false],

             $('#openai_max_context').attr('max', max_2mil);
         } else if (value.includes('gemini-1.5-pro')) {
             $('#openai_max_context').attr('max', max_2mil);
+        } else if (value.match('gemini-1.5-flash-002')) {
+            $('#openai_max_context').attr('max', max_2mil);
         } else if (value.includes('gemini-1.5-flash')) {
             $('#openai_max_context').attr('max', max_1mil);
         } else if (value.includes('gemini-1.0-pro-vision') || value === 'gemini-pro-vision') {

         'gemini-1.5-flash',
         'gemini-1.5-flash-latest',
         'gemini-1.5-flash-001',
+        'gemini-1.5-flash-002',
         'gemini-1.5-flash-exp-0827',
         'gemini-1.5-flash-8b-exp-0827',
+        'gemini-1.5-flash-8b-exp-0924',
         'gemini-1.0-pro-vision-latest',
         'gemini-1.5-pro',
         'gemini-1.5-pro-latest',
         'gemini-1.5-pro-001',
+        'gemini-1.5-pro-002',
         'gemini-1.5-pro-exp-0801',
         'gemini-1.5-pro-exp-0827',
         'gemini-pro-vision',

         case chat_completion_sources.CLAUDE:
             return visionSupportedModels.some(model => oai_settings.claude_model.includes(model));
         case chat_completion_sources.OPENROUTER:
-            return !oai_settings.openrouter_force_instruct;
+            return true;
         case chat_completion_sources.CUSTOM:
             return true;
         case chat_completion_sources.ZEROONEAI:

     return foundName;
+}
-export function initOpenai() {
+export function initOpenAI() {
     SlashCommandParser.addCommandObject(SlashCommand.fromProps({
         name: 'proxy',
         callback: runProxyCallback,

         ],
         helpString: 'Sets a proxy preset by name.',
     }));
-}
-$(document).ready(async function () {
     $('#test_api_button').on('click', testApiConnection);
     $('#scale-alt').on('change', function () {

         saveSettingsDebounced();
     });
-    $('#openrouter_force_instruct').on('input', function () {
-        oai_settings.openrouter_force_instruct = !!$(this).prop('checked');
-        saveSettingsDebounced();
-    });
     $('#openrouter_group_models').on('input', function () {
         oai_settings.openrouter_group_models = !!$(this).prop('checked');
         saveSettingsDebounced();

     $('#openai_proxy_password_show').on('click', onProxyPasswordShowClick);
     $('#customize_additional_parameters').on('click', onCustomizeParametersClick);
     $('#openai_proxy_preset').on('change', onProxyPresetChange);
-});
+}

public/scripts/power-user.js+8 -40 Viewed

 import { SlashCommandEnumValue, enumTypes } from './slash-commands/SlashCommandEnumValue.js';
 import { commonEnumProviders, enumIcons } from './slash-commands/SlashCommandCommonEnumsProvider.js';
 import { POPUP_TYPE, callGenericPopup } from './popup.js';
+import { loadSystemPrompts } from './sysprompt.js';
 export {
     loadPowerUserSettings,

     pin_examples: false,
     strip_examples: false,
     trim_sentences: false,
-    include_newline: false,
     always_force_name2: false,
     user_prompt_bias: '',
     show_user_prompt_bias: true,

     disable_group_trimming: false,
     single_line: false,
-    default_instruct: '',
     instruct: {
         enabled: false,
         preset: 'Alpaca',
-        system_prompt: 'Below is an instruction that describes a task. Write a response that appropriately completes the request.\n\nWrite {{char}}\'s next reply in a fictional roleplay chat between {{user}} and {{char}}.\n',
         input_sequence: '### Instruction:',
         input_suffix: '',
         output_sequence: '### Response:',

         separator_sequence: '',
     },
-    default_context: 'Default',
     context: {
         preset: 'Default',
         story_string: defaultStoryString,

         names_as_stop_strings: true,
     },
+    sysprompt: {
+        enabled: true,
+        name: 'Neutral - Chat',
+        content: 'Write {{char}}\'s next reply in a fictional chat between {{char}} and {{user}}.',
+    },
     personas: {},
     default_persona: null,
     persona_descriptions: {},

     // Existing power user settings
     { id: 'always-force-name2-checkbox', property: 'always_force_name2', isCheckbox: true, isGlobalSetting: true, defaultValue: true },
     { id: 'trim_sentences_checkbox', property: 'trim_sentences', isCheckbox: true, isGlobalSetting: true, defaultValue: false },
-    { id: 'include_newline_checkbox', property: 'include_newline', isCheckbox: true, isGlobalSetting: true, defaultValue: false },
     { id: 'single_line', property: 'single_line', isCheckbox: true, isGlobalSetting: true, defaultValue: false },
 ];

     $('#collapse-newlines-checkbox').prop('checked', power_user.collapse_newlines);
     $('#always-force-name2-checkbox').prop('checked', power_user.always_force_name2);
     $('#trim_sentences_checkbox').prop('checked', power_user.trim_sentences);
-    $('#include_newline_checkbox').prop('checked', power_user.include_newline);
     $('#render_formulas').prop('checked', power_user.render_formulas);
     $('#disable_group_trimming').prop('checked', power_user.disable_group_trimming);
     $('#markdown_escape_strings').val(power_user.markdown_escape_strings);

     reloadMarkdownProcessor(power_user.render_formulas);
     await loadInstructMode(data);
     await loadContextSettings();
+    await loadSystemPrompts(data);
     loadMaxContextUnlocked();
     switchWaifuMode();
     switchSpoilerMode();

+            }
+        }
-        highlightDefaultContext();
-        saveSettingsDebounced();
-    });
-    $('#context_set_default').on('click', function () {
-        if (power_user.context.preset !== power_user.default_context) {
-            power_user.default_context = power_user.context.preset;
-            $(this).addClass('default');
-            toastr.info(`Default context template set to ${power_user.default_context}`);
-            highlightDefaultContext();
         saveSettingsDebounced();
-        }
     });
-    highlightDefaultContext();
-}
-function highlightDefaultContext() {
-    $('#context_set_default').toggleClass('default', power_user.default_context === power_user.context.preset);
-    $('#context_set_default').toggleClass('disabled', power_user.default_context === power_user.context.preset);
-    $('#context_delete_preset').toggleClass('disabled', power_user.default_context === power_user.context.preset);
+}
 /**

     // if trim sentences is unchecked, include newline must be unchecked
     $('#trim_sentences_checkbox').change(function () {
         power_user.trim_sentences = !!$(this).prop('checked');
-        if (!$(this).prop('checked')) {
-            $('#include_newline_checkbox').prop('checked', false);
-            power_user.include_newline = false;
-        }
-        saveSettingsDebounced();
-    });
-    $('#include_newline_checkbox').change(function () {
-        power_user.include_newline = !!$(this).prop('checked');
-        if ($(this).prop('checked')) {
-            $('#trim_sentences_checkbox').prop('checked', true);
-            power_user.trim_sentences = true;
-        }
         saveSettingsDebounced();
     });

public/scripts/preset-manager.js+264 -9 Viewed

 import { groups, selected_group } from './group-chats.js';
 import { instruct_presets } from './instruct-mode.js';
 import { kai_settings } from './kai-settings.js';
-import { Popup } from './popup.js';
+import { convertNovelPreset } from './nai-settings.js';
+import { Popup, POPUP_RESULT, POPUP_TYPE } from './popup.js';
 import { context_presets, getContextSettings, power_user } from './power-user.js';
 import { SlashCommand } from './slash-commands/SlashCommand.js';
 import { ARGUMENT_TYPE, SlashCommandArgument } from './slash-commands/SlashCommandArgument.js';
 import { enumIcons } from './slash-commands/SlashCommandCommonEnumsProvider.js';
 import { SlashCommandEnumValue, enumTypes } from './slash-commands/SlashCommandEnumValue.js';
 import { SlashCommandParser } from './slash-commands/SlashCommandParser.js';
+import { checkForSystemPromptInInstructTemplate, system_prompts } from './sysprompt.js';
+import { renderTemplateAsync } from './templates.js';
 import {
     textgenerationwebui_preset_names,
     textgenerationwebui_presets,

  * @param {string} apiId API id
  * @returns {PresetManager} Preset manager
  */
-function getPresetManager(apiId = '') {
+export function getPresetManager(apiId = '') {
     if (!apiId) {
         apiId = main_api == 'koboldhorde' ? 'kobold' : main_api;
+    }

         this.apiId = apiId;
+    }
+    static masterSections = {
+        'instruct': {
+            name: 'Instruct Template',
+            getData: () => {
+                const manager = getPresetManager('instruct');
+                const name = manager.getSelectedPresetName();
+                return manager.getPresetSettings(name);
+            },
+            setData: (data) => {
+                const manager = getPresetManager('instruct');
+                const name = data.name;
+                return manager.savePreset(name, data);
+            },
+            isValid: (data) => PresetManager.isPossiblyInstructData(data),
+        },
+        'context': {
+            name: 'Context Template',
+            getData: () => {
+                const manager = getPresetManager('context');
+                const name = manager.getSelectedPresetName();
+                return manager.getPresetSettings(name);
+            },
+            setData: (data) => {
+                const manager = getPresetManager('context');
+                const name = data.name;
+                return manager.savePreset(name, data);
+            },
+            isValid: (data) => PresetManager.isPossiblyContextData(data),
+        },
+        'sysprompt': {
+            name: 'System Prompt',
+            getData: () => {
+                const manager = getPresetManager('sysprompt');
+                const name = manager.getSelectedPresetName();
+                return manager.getPresetSettings(name);
+            },
+            setData: (data) => {
+                const manager = getPresetManager('sysprompt');
+                const name = data.name;
+                return manager.savePreset(name, data);
+            },
+            isValid: (data) => PresetManager.isPossiblySystemPromptData(data),
+        },
+        'preset': {
+            name: 'Text Completion Preset',
+            getData: () => {
+                const manager = getPresetManager('textgenerationwebui');
+                const name = manager.getSelectedPresetName();
+                const data = manager.getPresetSettings(name);
+                data['name'] = name;
+                return data;
+            },
+            setData: (data) => {
+                const manager = getPresetManager('textgenerationwebui');
+                const name = data.name;
+                return manager.savePreset(name, data);
+            },
+            isValid: (data) => PresetManager.isPossiblyTextCompletionData(data),
+        },
+    };
+    static isPossiblyInstructData(data) {
+        const instructProps = ['name', 'input_sequence', 'output_sequence'];
+        return data && instructProps.every(prop => Object.keys(data).includes(prop));
+    }
+    static isPossiblyContextData(data) {
+        const contextProps = ['name', 'story_string'];
+        return data && contextProps.every(prop => Object.keys(data).includes(prop));
+    }
+    static isPossiblySystemPromptData(data) {
+        const sysPromptProps = ['name', 'content'];
+        return data && sysPromptProps.every(prop => Object.keys(data).includes(prop));
+    }
+    static isPossiblyTextCompletionData(data) {
+        const textCompletionProps = ['temp', 'top_k', 'top_p', 'rep_pen'];
+        return data && textCompletionProps.every(prop => Object.keys(data).includes(prop));
+    }
+    /**
+     * Imports master settings from JSON data.
+     * @param {object} data Data to import
+     * @param {string} fileName File name
+     * @returns {Promise<void>}
+     */
+    static async performMasterImport(data, fileName) {
+        if (!data || typeof data !== 'object') {
+            toastr.error('Invalid data provided for master import');
+            return;
+        }
+        // Check for legacy file imports
+        // 1. Instruct Template
+        if (this.isPossiblyInstructData(data)) {
+            toastr.info('Importing instruct template...', 'Instruct template detected');
+            return await getPresetManager('instruct').savePreset(data.name, data);
+        }
+        // 2. Context Template
+        if (this.isPossiblyContextData(data)) {
+            toastr.info('Importing as context template...', 'Context template detected');
+            return await getPresetManager('context').savePreset(data.name, data);
+        }
+        // 3. System Prompt
+        if (this.isPossiblySystemPromptData(data)) {
+            toastr.info('Importing as system prompt...', 'System prompt detected');
+            return await getPresetManager('sysprompt').savePreset(data.name, data);
+        }
+        // 4. Text Completion settings
+        if (this.isPossiblyTextCompletionData(data)) {
+            toastr.info('Importing as settings preset...', 'Text Completion settings detected');
+            return await getPresetManager('textgenerationwebui').savePreset(fileName, data);
+        }
+        const validSections = [];
+        for (const [key, section] of Object.entries(this.masterSections)) {
+            if (key in data && section.isValid(data[key])) {
+                validSections.push(key);
+            }
+        }
+        if (validSections.length === 0) {
+            toastr.error('No valid sections found in imported data');
+            return;
+        }
+        const sectionNames = validSections.reduce((acc, key) => {
+            acc[key] = { key: key, name: this.masterSections[key].name, preset: data[key]?.name || '' };
+            return acc;
+        }, {});
+        const html = $(await renderTemplateAsync('masterImport', { sections: sectionNames }));
+        const popup = new Popup(html, POPUP_TYPE.CONFIRM, '', {
+            okButton: 'Import',
+            cancelButton: 'Cancel',
+        });
+        const result = await popup.show();
+        // Import cancelled
+        if (result !== POPUP_RESULT.AFFIRMATIVE) {
+            return;
+        }
+        const importedSections = [];
+        const confirmedSections = html.find('input:checked').map((_, el) => el instanceof HTMLInputElement && el.value).get();
+        if (confirmedSections.length === 0) {
+            toastr.info('No sections selected for import');
+            return;
+        }
+        for (const section of confirmedSections) {
+            const sectionData = data[section];
+            const masterSection = this.masterSections[section];
+            if (sectionData && masterSection) {
+                await masterSection.setData(sectionData);
+                importedSections.push(masterSection.name);
+            }
+        }
+        toastr.success(`Imported ${importedSections.length} settings: ${importedSections.join(', ')}`);
+    }
+    /**
+     * Exports master settings to JSON data.
+     * @returns {Promise<string>} JSON data
+     */
+    static async performMasterExport() {
+        const sectionNames = Object.entries(this.masterSections).reduce((acc, [key, section]) => {
+            acc[key] = { key: key, name: section.name, checked: key !== 'preset' };
+            return acc;
+        }, {});
+        const html = $(await renderTemplateAsync('masterExport', { sections: sectionNames }));
+        const popup = new Popup(html, POPUP_TYPE.CONFIRM, '', {
+            okButton: 'Export',
+            cancelButton: 'Cancel',
+        });
+        const result = await popup.show();
+        // Export cancelled
+        if (result !== POPUP_RESULT.AFFIRMATIVE) {
+            return;
+        }
+        const confirmedSections = html.find('input:checked').map((_, el) => el instanceof HTMLInputElement && el.value).get();
+        const data = {};
+        if (confirmedSections.length === 0) {
+            toastr.info('No sections selected for export');
+            return;
+        }
+        for (const section of confirmedSections) {
+            const masterSection = this.masterSections[section];
+            if (masterSection) {
+                data[section] = masterSection.getData();
+            }
+        }
+        return JSON.stringify(data, null, 4);
+    }
     /**
      * Gets all preset names.
      * @returns {string[]} List of preset names

+    }
     async savePreset(name, settings) {
+        if (this.apiId === 'instruct' && settings) {
+            await checkForSystemPromptInInstructTemplate(name, settings);
+        }
+        if (this.apiId === 'novel' && settings) {
+            settings = convertNovelPreset(settings);
+        }
         const preset = settings ?? this.getPresetSettings(name);
         const response = await fetch('/api/presets/save', {

                 presets = instruct_presets;
                 preset_names = instruct_presets.map(x => x.name);
                 break;
+            case 'sysprompt':
+                presets = system_prompts;
+                preset_names = system_prompts.map(x => x.name);
+                break;
             default:
                 console.warn(`Unknown API ID ${this.apiId}`);
+        }

@@ -236,11 +460,11 @@ class PresetManager {
236	}	460	}
237		461
238	isKeyedApi() {	462	isKeyedApi() {
239	return this.apiId == 'textgenerationwebui' \|\| this.apiId == 'context' \|\| this.apiId == 'instruct';	463	return this.apiId == 'textgenerationwebui' \|\| this.isAdvancedFormatting();
240	}	464	}
241		465
242	isAdvancedFormatting() {	466	isAdvancedFormatting() {
243	return this.apiId == 'context' \|\| this.apiId == 'instruct';	467	return this.apiId == 'context' \|\| this.apiId == 'instruct' \|\| this.apiId == 'sysprompt';
244	}	468	}
245		469
246	updateList(name, preset) {	470	updateList(name, preset) {

                     instruct_preset['name'] = name || power_user.instruct.preset;
                     return instruct_preset;
+                }
+                case 'sysprompt': {
+                    const sysprompt_preset = structuredClone(power_user.sysprompt);
+                    sysprompt_preset['name'] = name || power_user.sysprompt.preset;
+                    return sysprompt_preset;
+                }
                 default:
                     console.warn(`Unknown API ID ${apiId}`);
                     return {};

             return;
+        }
-        // default context preset cannot be deleted
-        if (apiId == 'context' && power_user.default_context === power_user.context.preset) {
-            return;
-        }
         const headerText = !presetManager.isAdvancedFormatting() ? 'Delete this preset?' : 'Delete this template?';
         const confirm = await Popup.show.confirm(headerText, 'This action is irreversible and your current settings will be overwritten.');
         if (!confirm) {

             toastr.success(successToast);
+        }
     });
+    $('#af_master_import').on('click', () => {
+        $('#af_master_import_file').trigger('click');
+    });
+    $('#af_master_import_file').on('change', async function (e) {
+        if (!(e.target instanceof HTMLInputElement)) {
+            return;
+        }
+        const file = e.target.files[0];
+        if (!file) {
+            return;
+        }
+        const data = await parseJsonFile(file);
+        const fileName = file.name.replace('.json', '');
+        await PresetManager.performMasterImport(data, fileName);
+        e.target.value = null;
+    });
+    $('#af_master_export').on('click', async () => {
+        const data = await PresetManager.performMasterExport();
+        if (!data) {
+            return;
+        }
+        const shortDate = new Date().toISOString().split('T')[0];
+        download(data, `ST-formatting-${shortDate}.json`, 'application/json');
+    });
+}

public/scripts/sysprompt.js+250 -0 Viewed

+import { saveSettingsDebounced } from '../script.js';
+import { callGenericPopup, POPUP_TYPE } from './popup.js';
+import { power_user } from './power-user.js';
+import { getPresetManager } from './preset-manager.js';
+import { SlashCommand } from './slash-commands/SlashCommand.js';
+import { ARGUMENT_TYPE, SlashCommandArgument, SlashCommandNamedArgument } from './slash-commands/SlashCommandArgument.js';
+import { commonEnumProviders, enumIcons } from './slash-commands/SlashCommandCommonEnumsProvider.js';
+import { enumTypes, SlashCommandEnumValue } from './slash-commands/SlashCommandEnumValue.js';
+import { SlashCommandParser } from './slash-commands/SlashCommandParser.js';
+import { renderTemplateAsync } from './templates.js';
+import { isTrueBoolean, resetScrollHeight } from './utils.js';
+export let system_prompts = [];
+const $enabled = $('#sysprompt_enabled');
+const $select = $('#sysprompt_select');
+const $content = $('#sysprompt_content');
+const $contentBlock = $('#SystemPromptBlock');
+async function migrateSystemPromptFromInstructMode() {
+    if ('system_prompt' in power_user.instruct) {
+        const prompt = String(power_user.instruct.system_prompt);
+        delete power_user.instruct.system_prompt;
+        power_user.sysprompt.enabled = power_user.instruct.enabled;
+        power_user.sysprompt.content = prompt;
+        const existingPromptName = system_prompts.find(x => x.content === prompt)?.name;
+        if (existingPromptName) {
+            power_user.sysprompt.name = existingPromptName;
+        } else {
+            const data = { name: `[Migrated] ${power_user.instruct.preset}`, content: prompt };
+            await getPresetManager('sysprompt')?.savePreset(data.name, data);
+            power_user.sysprompt.name = data.name;
+        }
+        saveSettingsDebounced();
+        toastr.info('System prompt settings have been moved from the Instruct Mode.', 'Migration notice', { timeOut: 5000 });
+    }
+}
+/**
+ * Loads sysprompt settings from the given data object.
+ * @param {object} data Settings data object.
+ */
+export async function loadSystemPrompts(data) {
+    if (data.sysprompt !== undefined) {
+        system_prompts = data.sysprompt;
+    }
+    await migrateSystemPromptFromInstructMode();
+    toggleSystemPromptDisabledControls();
+    for (const prompt of system_prompts) {
+        $('<option>').val(prompt.name).text(prompt.name).appendTo($select);
+    }
+    $enabled.prop('checked', power_user.sysprompt.enabled);
+    $select.val(power_user.sysprompt.name);
+    $content.val(power_user.sysprompt.content);
+    if (!CSS.supports('field-sizing', 'content')) {
+        await resetScrollHeight($content);
+    }
+}
+/**
+ * Checks if the instruct template has a system prompt and prompts the user to save it as a system prompt.
+ * @param {string} name Name of the instruct template
+ * @param {object} template Instruct template object
+ */
+export async function checkForSystemPromptInInstructTemplate(name, template) {
+    if (!template || !name || typeof name !== 'string' || typeof template !== 'object') {
+        return;
+    }
+    if ('system_prompt' in template && template.system_prompt) {
+        const existingName = system_prompts.find(x => x.content === template.system_prompt)?.name;
+        const html = await renderTemplateAsync('migrateInstructPrompt', { prompt: template.system_prompt, existing: existingName });
+        const confirm = await callGenericPopup(html, POPUP_TYPE.CONFIRM);
+        if (confirm) {
+            const migratedName = `[Migrated] ${name}`;
+            const prompt = { name: migratedName, content: template.system_prompt };
+            const presetManager = getPresetManager('sysprompt');
+            await presetManager.savePreset(migratedName, prompt);
+            toastr.success(`System prompt "${migratedName}" has been saved.`);
+        } else {
+            toastr.info('System prompt has been discarded.');
+        }
+        delete template.system_prompt;
+    }
+}
+function toggleSystemPromptDisabledControls() {
+    $enabled.parent().find('i').toggleClass('toggleEnabled', !!power_user.sysprompt.enabled);
+    $contentBlock.toggleClass('disabled', !power_user.sysprompt.enabled);
+}
+/**
+ * Sets the system prompt state.
+ * @param {boolean} state System prompt state
+ * @returns {string} Empty string
+ */
+function setSystemPromptStateCallback(state) {
+    power_user.sysprompt.enabled = state;
+    $enabled.prop('checked', state);
+    toggleSystemPromptDisabledControls();
+    saveSettingsDebounced();
+    return '';
+}
+function toggleSystemPromptCallback(_args, state) {
+    if (!state || typeof state !== 'string') {
+        return String(power_user.sysprompt.enabled);
+    }
+    const newState = isTrueBoolean(state);
+    setSystemPromptStateCallback(newState);
+    return String(power_user.sysprompt.enabled);
+}
+function selectSystemPromptCallback(args, name) {
+    if (!power_user.sysprompt.enabled && !isTrueBoolean(args.forceGet)) {
+        return '';
+    }
+    if (!name) {
+        return power_user.sysprompt.name ?? '';
+    }
+    const quiet = isTrueBoolean(args?.quiet);
+    const systemPromptNames = system_prompts.map(preset => preset.name);
+    let foundName = systemPromptNames.find(x => x.toLowerCase() === name.toLowerCase());
+    if (!foundName) {
+        const fuse = new Fuse(systemPromptNames);
+        const result = fuse.search(name);
+        if (result.length === 0) {
+            !quiet && toastr.warning(`System prompt "${name}" not found`);
+            return '';
+        }
+        foundName = result[0].item;
+    }
+    $select.val(foundName).trigger('change');
+    !quiet && toastr.success(`System prompt "${foundName}" selected`);
+    return foundName;
+}
+export function initSystemPrompts() {
+    $enabled.on('input', function () {
+        power_user.sysprompt.enabled = !!$(this).prop('checked');
+        toggleSystemPromptDisabledControls();
+        saveSettingsDebounced();
+    });
+    $select.on('change', async function () {
+        if (!power_user.sysprompt.enabled) {
+            $enabled.prop('checked', true).trigger('input');
+        }
+        const name = String($(this).val());
+        const prompt = system_prompts.find(p => p.name === name);
+        if (prompt) {
+            $content.val(prompt.content);
+            if (!CSS.supports('field-sizing', 'content')) {
+                await resetScrollHeight($content);
+            }
+            power_user.sysprompt.name = name;
+            power_user.sysprompt.content = prompt.content;
+        }
+        saveSettingsDebounced();
+    });
+    $content.on('input', function () {
+        power_user.sysprompt.content = String($(this).val());
+        saveSettingsDebounced();
+    });
+    SlashCommandParser.addCommandObject(SlashCommand.fromProps({
+        name: 'sysprompt',
+        aliases: ['system-prompt'],
+        callback: selectSystemPromptCallback,
+        returns: 'current prompt name',
+        namedArgumentList: [
+            SlashCommandNamedArgument.fromProps({
+                name: 'quiet',
+                description: 'Suppress the toast message on prompt change',
+                typeList: [ARGUMENT_TYPE.BOOLEAN],
+                defaultValue: 'false',
+                enumList: commonEnumProviders.boolean('trueFalse')(),
+            }),
+            SlashCommandNamedArgument.fromProps({
+                name: 'forceGet',
+                description: 'Force getting a name even if system prompt is disabled',
+                typeList: [ARGUMENT_TYPE.BOOLEAN],
+                defaultValue: 'false',
+                enumList: commonEnumProviders.boolean('trueFalse')(),
+            }),
+        ],
+        unnamedArgumentList: [
+            SlashCommandArgument.fromProps({
+                description: 'system prompt name',
+                typeList: [ARGUMENT_TYPE.STRING],
+                enumProvider: () => system_prompts.map(x => new SlashCommandEnumValue(x.name, null, enumTypes.enum, enumIcons.preset)),
+            }),
+        ],
+        helpString: `
+            <div>
+                Selects a system prompt by name, using fuzzy search to find the closest match.
+                Gets the current system prompt if no name is provided and sysprompt is enabled or <code>forceGet=true</code> is passed.
+            </div>
+            <div>
+                <strong>Example:</strong>
+                <ul>
+                    <li>
+                        <pre><code class="language-stscript">/sysprompt </code></pre>
+                    </li>
+                </ul>
+            </div>
+        `,
+    }));
+    SlashCommandParser.addCommandObject(SlashCommand.fromProps({
+        name: 'sysprompt-on',
+        aliases: ['sysprompt-enable'],
+        callback: () => setSystemPromptStateCallback(true),
+        helpString: 'Enables system prompt.',
+    }));
+    SlashCommandParser.addCommandObject(SlashCommand.fromProps({
+        name: 'sysprompt-off',
+        aliases: ['sysprompt-disable'],
+        callback: () => setSystemPromptStateCallback(false),
+        helpString: 'Disables system prompt',
+    }));
+    SlashCommandParser.addCommandObject(SlashCommand.fromProps({
+        name: 'sysprompt-state',
+        aliases: ['sysprompt-toggle'],
+        helpString: 'Gets the current system prompt state. If an argument is provided, it will set the system prompt state.',
+        unnamedArgumentList: [
+            SlashCommandArgument.fromProps({
+                description: 'system prompt state',
+                typeList: [ARGUMENT_TYPE.BOOLEAN],
+                enumList: commonEnumProviders.boolean('trueFalse')(),
+            }),
+        ],
+        callback: toggleSystemPromptCallback,
+    }));
+}

public/scripts/templates/macros.html+2 -2 Viewed

     <li><tt>&lcub;&lcub;maxPrompt&rcub;&rcub;</tt> – <span data-i18n="help_macros_41">max allowed prompt length in tokens = (context size - response length)</span></li>
     <li><tt>&lcub;&lcub;exampleSeparator&rcub;&rcub;</tt> – <span data-i18n="help_macros_42">context template example dialogues separator</span></li>
     <li><tt>&lcub;&lcub;chatStart&rcub;&rcub;</tt> – <span data-i18n="help_macros_43">context template chat start line</span></li>
-    <li><tt>&lcub;&lcub;systemPrompt&rcub;&rcub;</tt> – <span data-i18n="help_macros_44">main system prompt (either character prompt override if chosen, or instructSystemPrompt)</span></li>
+    <li><tt>&lcub;&lcub;systemPrompt&rcub;&rcub;</tt> – <span data-i18n="help_macros_44">system prompt content if enabled (either character prompt override if allowed, or defaultSystemPrompt)</span></li>
-    <li><tt>&lcub;&lcub;instructSystemPrompt&rcub;&rcub;</tt> – <span data-i18n="help_macros_45">instruct system prompt</span></li>
+    <li><tt>&lcub;&lcub;defaultSystemPrompt&rcub;&rcub;</tt> – <span data-i18n="help_macros_45">system prompt content</span></li>
     <li><tt>&lcub;&lcub;instructSystemPromptPrefix&rcub;&rcub;</tt> – <span data-i18n="help_macros_46">instruct system prompt prefix sequence</span></li>
     <li><tt>&lcub;&lcub;instructSystemPromptSuffix&rcub;&rcub;</tt> – <span data-i18n="help_macros_47">instruct system prompt suffix sequence</span></li>
     <li><tt>&lcub;&lcub;instructUserPrefix&rcub;&rcub;</tt> – <span data-i18n="help_macros_48">instruct user prefix sequence</span></li>

public/scripts/templates/masterExport.html+17 -0 Viewed

+<h3>
+    Choose what to export
+</h3>
+<div class="flex-container flexFlowColumn justifyLeft">
+    {{#each sections}}
+        {{#with this}}
+            <label class="checkbox_label">
+                {{#if checked}}
+                    <input type="checkbox" value="{{key}}" checked />
+                {{else}}
+                    <input type="checkbox" value="{{key}}" />
+                {{/if}}
+                <span data-i18n="{{name}}">{{name}}</span>
+            </label>
+        {{/with}}
+    {{/each}}
+</div>

public/scripts/templates/masterImport.html+17 -0 Viewed

+<h3>
+    Choose what to import
+</h3>
+<div class="flex-container flexFlowColumn justifyLeft">
+    {{#each sections}}
+        {{#with this}}
+            <label class="checkbox_label">
+                <input type="checkbox" value="{{key}}" checked>
+                <span data-i18n="{{name}}">{{name}}</span>
+                {{#if preset}}
+                    <span>&ndash;</span>
+                    <small>{{preset}}</small>
+                {{/if}}
+            </label>
+        {{/with}}
+    {{/each}}
+</div>

public/scripts/templates/migrateInstructPrompt.html+27 -0 Viewed

+<h3>
+    This instruct template also contains a system prompt.
+</h3>
+<div>
+    Would you like to migrate the system prompt from the template?
+</div>
+{{#if existing}}
+<div class="marginTopBot5">
+    <b>Note:</b>
+    <span>you already have this prompt saved as:</span>
+    <span>{{existing}}</span>
+</div>
+{{/if}}
+<div class="justifyLeft marginTop5">
+    <div>
+        <small>
+            <b>"Yes"</b> &ndash; The prompt will be imported and selected as a current system prompt.
+        </small>
+    </div>
+    <div>
+        <small>
+            <b>"No"</b> &ndash; The prompt will be ignored, no changes to the current system prompt.
+        </small>
+    </div>
+</div>
+<textarea class="wide100p textarea_compact" rows="10">{{prompt}}</textarea>

public/scripts/tokenizers.js+18 -8 Viewed

 const { OOBA, TABBY, KOBOLDCPP, VLLM, APHRODITE, LLAMACPP, OPENROUTER, DREAMGEN } = textgen_types;
 export const CHARACTERS_PER_TOKEN_RATIO = 3.35;
-const TOKENIZER_WARNING_KEY = 'tokenizationWarningShown';
+export const TOKENIZER_WARNING_KEY = 'tokenizationWarningShown';
+export const TOKENIZER_SUPPORTED_KEY = 'tokenizationSupported';
 export const tokenizers = {
     NONE: 0,

@@ -273,6 +274,9 @@ export function getTokenizerBestMatch(forApi) {
273	if (nai_settings.model_novel.includes('kayra')) {	274	if (nai_settings.model_novel.includes('kayra')) {
274	return tokenizers.NERD2;	275	return tokenizers.NERD2;
275	}	276	}
		277	if (nai_settings.model_novel.includes('erato')) {
		278	return tokenizers.LLAMA3;
		279	}
276	}	280	}
277	if (forApi === 'kobold' \|\| forApi === 'textgenerationwebui' \|\| forApi === 'koboldhorde') {	281	if (forApi === 'kobold' \|\| forApi === 'textgenerationwebui' \|\| forApi === 'koboldhorde') {
278	// Try to use the API tokenizer if possible:	282	// Try to use the API tokenizer if possible:

         // - Kobold must pass a version check
         // - Tokenizer haven't reported an error previously
         const hasTokenizerError = sessionStorage.getItem(TOKENIZER_WARNING_KEY);
+        const hasValidEndpoint = sessionStorage.getItem(TOKENIZER_SUPPORTED_KEY);
         const isConnected = online_status !== 'no_connection';
-        const isTokenizerSupported = TEXTGEN_TOKENIZERS.includes(textgen_settings.type);
+        const isTokenizerSupported = TEXTGEN_TOKENIZERS.includes(textgen_settings.type) && (textgen_settings.type !== OOBA || hasValidEndpoint);
         if (!hasTokenizerError && isConnected) {
             if (forApi === 'kobold' && kai_flags.can_use_tokenization) {

 function apiFailureTokenCount(str) {
     console.error('Error counting tokens');
+    let shouldTryAgain = false;
     if (!sessionStorage.getItem(TOKENIZER_WARNING_KEY)) {
-        toastr.warning(
+        const bestMatchBefore = getTokenizerBestMatch(main_api);
-            'Your selected API doesn\'t support the tokenization endpoint. Using estimated counts.',
-            'Error counting tokens',
-            { timeOut: 10000, preventDuplicates: true },
-        );
         sessionStorage.setItem(TOKENIZER_WARNING_KEY, String(true));
+        const bestMatchAfter = getTokenizerBestMatch(main_api);
+        if ([tokenizers.API_TEXTGENERATIONWEBUI, tokenizers.API_KOBOLD].includes(bestMatchBefore) && bestMatchBefore !== bestMatchAfter) {
+            shouldTryAgain = true;
+        }
+    }
+    // Only try again if we guarantee not to be looped by the same error
+    if (shouldTryAgain && power_user.tokenizer === tokenizers.BEST_MATCH) {
+        return getTokenCount(str);
+    }
     return guesstimate(str);

public/scripts/utils.js+1 -7 Viewed

 /**
  * Trims a string to the end of a nearest sentence.
  * @param {string} input The string to trim.
- * @param {boolean} include_newline Whether to include a newline character in the trimmed string.
  * @returns {string} The trimmed string.
  * @example
  * trimToEndSentence('Hello, world! I am from'); // 'Hello, world!'
  */
-export function trimToEndSentence(input, include_newline = false) {
+export function trimToEndSentence(input) {
     if (!input) {
         return '';
+    }

@@ -633,11 +632,6 @@ export function trimToEndSentence(input, include_newline = false) {
633	}	632	}
634	break;	633	break;
635	}	634	}
636
637	if (include_newline && char === '\n') {
638	last = i;
639	break;
640	}
641	}	635	}
642		636
643	if (last === -1) {	637	if (last === -1) {

public/scripts/variables.js+60 -7 Viewed

 import { chat_metadata, getCurrentChatId, saveSettingsDebounced, sendSystemMessage, system_message_types } from '../script.js';
 import { extension_settings, saveMetadataDebounced } from './extensions.js';
+import { callGenericPopup, POPUP_TYPE } from './popup.js';
 import { executeSlashCommandsWithOptions } from './slash-commands.js';
 import { SlashCommand } from './slash-commands/SlashCommand.js';
 import { SlashCommandAbortController } from './slash-commands/SlashCommandAbortController.js';

     return lines.join('\n');
+}
-function listVariablesCallback() {
+async function listVariablesCallback(args) {
+    const type = String(args?.format || '').toLowerCase().trim() || 'popup';
+    const scope = String(args?.scope || '').toLowerCase().trim() || 'all';
     if (!chat_metadata.variables) {
         chat_metadata.variables = {};
+    }
-    const localVariables = Object.entries(chat_metadata.variables).map(([name, value]) => `${name}: ${value}`);
+    const includeLocalVariables = scope === 'all' || scope === 'local';
-    const globalVariables = Object.entries(extension_settings.variables.global).map(([name, value]) => `${name}: ${value}`);
+    const includeGlobalVariables = scope === 'all' || scope === 'global';
+    const localVariables = includeLocalVariables ? Object.entries(chat_metadata.variables).map(([name, value]) => `${name}: ${value}`) : [];
+    const globalVariables = includeGlobalVariables ? Object.entries(extension_settings.variables.global).map(([name, value]) => `${name}: ${value}`) : [];
+    const jsonVariables = [
+        ...Object.entries(chat_metadata.variables).map(x => ({ key: x[0], value: x[1], scope: 'local' })),
+        ...Object.entries(extension_settings.variables.global).map(x => ({ key: x[0], value: x[1], scope: 'global' })),
+    ];
     const localVariablesString = localVariables.length > 0 ? localVariables.join('\n\n') : 'No local variables';
     const globalVariablesString = globalVariables.length > 0 ? globalVariables.join('\n\n') : 'No global variables';
     const chatName = getCurrentChatId();
     const converter = new showdown.Converter();
-    const message = `### Local variables (${chatName}):\n${localVariablesString}\n\n### Global variables:\n${globalVariablesString}`;
+    const message = [
+        includeLocalVariables ? `### Local variables (${chatName}):\n${localVariablesString}` : '',
+        includeGlobalVariables ? `### Global variables:\n${globalVariablesString}` : '',
+    ].filter(x => x).join('\n\n');
     const htmlMessage = DOMPurify.sanitize(converter.makeHtml(message));
+    switch (type) {
+        case 'none':
+            break;
+        case 'chat':
             sendSystemMessage(system_message_types.GENERIC, htmlMessage);
-    return '';
+            break;
+        case 'popup':
+        default:
+            await callGenericPopup(htmlMessage, POPUP_TYPE.TEXT);
+            break;
+    }
+    return JSON.stringify(jsonVariables);
+}
 /**

         name: 'listvar',
         callback: listVariablesCallback,
         aliases: ['listchatvar'],
-        helpString: 'List registered chat variables.',
+        helpString: 'List registered chat variables. Displays variables in a popup by default. Use the <code>format</code> argument to change the output format.',
+        returns: 'JSON list of local variables',
+        namedArgumentList: [
+            SlashCommandNamedArgument.fromProps({
+                name: 'scope',
+                description: 'filter variables by scope',
+                typeList: [ARGUMENT_TYPE.STRING],
+                defaultValue: 'all',
+                isRequired: false,
+                forceEnum: true,
+                enumList: [
+                    new SlashCommandEnumValue('all', 'All variables', enumTypes.enum, enumIcons.variable),
+                    new SlashCommandEnumValue('local', 'Local variables', enumTypes.enum, enumIcons.localVariable),
+                    new SlashCommandEnumValue('global', 'Global variables', enumTypes.enum, enumIcons.globalVariable),
+                ],
+            }),
+            SlashCommandNamedArgument.fromProps({
+                name: 'format',
+                description: 'output format',
+                typeList: [ARGUMENT_TYPE.STRING],
+                isRequired: true,
+                forceEnum: true,
+                enumList: [
+                    new SlashCommandEnumValue('popup', 'Show variables in a popup.', enumTypes.enum, enumIcons.default),
+                    new SlashCommandEnumValue('chat', 'Post a system message to the chat.', enumTypes.enum, enumIcons.message),
+                    new SlashCommandEnumValue('none', 'Just return the variables as a JSON list.', enumTypes.enum, enumIcons.array),
+                ],
+            }),
+        ],
     }));
     SlashCommandParser.addCommandObject(SlashCommand.fromProps({
         name: 'setvar',

                     <li>
                         <pre><code class="language-stscript">/while left={{getvar::currentword}} {: /setvar key=currentword {: /do-something-and-return :}() | /echo The current work is "{{getvar::currentword}}" :}</code></pre>
                         executes the defined subcommand as long as the "currentword" variable is truthy (has any content that is not false/empty)
-                    </li>
                         </ul>
+                        </li>
             </div>
             <div>
                 Loops are limited to 100 iterations by default, pass <code>guard=off</code> to disable.

public/style.css+10 -9 Viewed

     -moz-appearance: none;
     -webkit-appearance: none;
     appearance: none;
-    padding: 3px 2px;
+    padding: 3px 5px;
     background-color: var(--black30a);
     border: 1px solid var(--SmartThemeBorderColor);
     border-radius: 5px;

     color: var(--active) !important;
+}
-#context_set_default.default {
-    color: var(--preferred) !important;
-}
-#instruct_set_default.default {
-    color: var(--preferred) !important;
-}
 .displayBlock {
     display: block !important;
+}

 #AdvancedFormatting .autoSetHeight {
     overflow-wrap: anywhere;
+}
+#InstructSequencesColumn summary {
+    font-size: 0.95em;
+    cursor: pointer;
+}
+#InstructSequencesColumn details:not(:last-of-type) {
+    margin-bottom: 5px;
+}

server.js+1 -0 Viewed

 userModule.initUserStorage(dataRoot)
     .then(userModule.ensurePublicDirectoriesExist)
     .then(userModule.migrateUserData)
+    .then(userModule.migrateSystemPrompts)
     .then(verifySecuritySettings)
     .then(preSetupTasks)
     .finally(startServer);

src/constants.js+1 -0 Viewed

     files: 'user/files',
     vectors: 'vectors',
     backups: 'backups',
+    sysprompt: 'sysprompt',
 });
 /**

src/endpoints/backends/chat-completions.js+4 -0 Viewed

     };
     function getGeminiBody() {
+        if (!Array.isArray(generationConfig.stopSequences) || !generationConfig.stopSequences.length) {
+            delete generationConfig.stopSequences;
+        }
         const should_use_system_prompt = (model.includes('gemini-1.5-flash') || model.includes('gemini-1.5-pro')) && request.body.use_makersuite_sysprompt;
         const prompt = convertGooglePrompt(request.body.messages, model, should_use_system_prompt, request.body.char_name, request.body.user_name);
         let body = {

src/endpoints/backends/text-completions.js+1 -0 Viewed

                     const modelName = modelInfo?.model_name;
                     result = modelName || result;
+                    response.setHeader('x-supports-tokenization', 'true');
+                }
             } catch (error) {
                 console.error(`Failed to get Ooba model info: ${error}`);

src/endpoints/content-manager.js+40 -1 Viewed

     CONTEXT: 'context',
     MOVING_UI: 'moving_ui',
     QUICK_REPLIES: 'quick_replies',
+    SYSPROMPT: 'sysprompt',
 };
 /**

         const presets = [];
         for (const contentItem of contentIndex) {
-            if (contentItem.type.endsWith('_preset') || contentItem.type === 'instruct' || contentItem.type === 'context') {
+            if (contentItem.type.endsWith('_preset') || contentItem.type === 'instruct' || contentItem.type === 'context' || contentItem.type === 'sysprompt') {
                 contentItem.name = path.parse(contentItem.filename).name;
                 contentItem.folder = getTargetByType(contentItem.type, directories);
                 presets.push(contentItem);

+}
 /**
+ * Gets content by type and format.
+ * @param {string} type Type of content
+ * @param {'json'|'string'|'raw'} format Format of content
+ * @returns {string[]|Buffer[]} Array of content
+ */
+function getContentOfType(type, format) {
+    const contentIndex = getContentIndex();
+    const indexItems = contentIndex.filter((item) => item.type === type && item.folder);
+    const files = [];
+    for (const item of indexItems) {
+        if (!item.folder) {
+            continue;
+        }
+        try {
+            const filePath = path.join(item.folder, item.filename);
+            const fileContent = fs.readFileSync(filePath);
+            switch (format) {
+                case 'json':
+                    files.push(JSON.parse(fileContent.toString()));
+                    break;
+                case 'string':
+                    files.push(fileContent.toString());
+                    break;
+                case 'raw':
+                    files.push(fileContent);
+                    break;
+            }
+        } catch {
+            // Ignore errors
+        }
+    }
+    return files;
+}
+/**
  * Gets the target directory for the specified asset type.
  * @param {ContentType} type Asset type
  * @param {import('../users').UserDirectoryList} directories User directories

             return directories.movingUI;
         case CONTENT_TYPES.QUICK_REPLIES:
             return directories.quickreplies;
+        case CONTENT_TYPES.SYSPROMPT:
+            return directories.sysprompt;
         default:
             return null;
+    }

     checkForNewContent,
     getDefaultPresets,
     getDefaultPresetFile,
+    getContentOfType,
     router,
 };

src/endpoints/novelai.js+63 -12 Viewed

     [19438], [43145], [26523], [41471], [2936], [85, 85], [49332], [7286], [1115], [24],
 ];
+const eratoBadWordsList = [
+    [16067], [933, 11144], [25106, 11144], [58, 106901, 16073, 33710, 25, 109933],
+    [933, 58, 11144], [128030], [58, 30591, 33503, 17663, 100204, 25, 11144],
+];
 const hypeBotBadWordsList = [
     [58], [60], [90], [92], [685], [1391], [1782], [2361], [3693], [4083], [4357], [4895],
     [5512], [5974], [7131], [8183], [8351], [8762], [8964], [8973], [9063], [11208],

 , 1040, 49209, 4, 5, 6, 7, 8, 9, 10, 11, 12],
 ];
+const eratoRepPenWhitelist = [
+, 1, 11, 13, 25, 198, 12, 9, 8, 279, 264, 459, 323, 477, 539, 912, 374, 574, 1051, 1550, 1587, 4536, 5828, 15058,
+, 3250, 1461, 1077, 813, 11074, 872, 1202, 1436, 7846, 1288, 13434, 1053, 8434, 617, 9167, 1047, 19117, 706,
+, 649, 4250, 527, 7784, 690, 2834, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 1210, 1359, 608, 220, 596, 956,
+, 44886, 4265, 3358, 2351, 2846, 311, 389, 315, 304, 520, 505, 430
+];
 // Ban the dinkus and asterism
 const logitBiasExp = [
     { 'sequence': [23], 'bias': -0.08, 'ensure_sequence_finish': false, 'generate_once': false },
     { 'sequence': [21], 'bias': -0.08, 'ensure_sequence_finish': false, 'generate_once': false },
 ];
+const eratoLogitBiasExp = [
+    { 'sequence': [12488], 'bias': -0.08, 'ensure_sequence_finish': false, 'generate_once': false },
+    { 'sequence': [128041], 'bias': -0.08, 'ensure_sequence_finish': false, 'generate_once': false },
+];
 function getBadWordsList(model) {
     let list = [];

         list = badWordsList;
+    }
+    if (model.includes('erato')) {
+        list = eratoBadWordsList;
+    }
     // Clone the list so we don't modify the original
     return list.slice();
+}
+function getLogitBiasList(model) {
+    let list = [];
+    if (model.includes('erato')) {
+        list = eratoLogitBiasExp;
+    }
+    if (model.includes('clio') || model.includes('kayra')) {
+        list = logitBiasExp;
+    }
+    return list.slice();
+}
+function getRepPenaltyWhitelist(model) {
+    if (model.includes('clio') || model.includes('kayra')) {
+        return repPenaltyAllowList.flat();
+    }
+    if (model.includes('erato')) {
+        return eratoRepPenWhitelist.flat();
+    }
+    return null;
+}
 const router = express.Router();
 router.post('/status', jsonParser, async function (req, res) {

         controller.abort();
     });
-    const isNewModel = (req.body.model.includes('clio') || req.body.model.includes('kayra'));
+    // Add customized bad words for Clio, Kayra, and Erato
     const badWordsList = getBadWordsList(req.body.model);
-    // Add customized bad words for Clio and Kayra
+    if (Array.isArray(badWordsList) && Array.isArray(req.body.bad_words_ids)) {
-    if (isNewModel && Array.isArray(req.body.bad_words_ids)) {
         for (const badWord of req.body.bad_words_ids) {
             if (Array.isArray(badWord) && badWord.every(x => Number.isInteger(x))) {
                 badWordsList.push(badWord);

+    }
     // Add default biases for dinkus and asterism
-    const logit_bias_exp = isNewModel ? logitBiasExp.slice() : [];
+    const logitBiasList = getLogitBiasList(req.body.model);
-    if (Array.isArray(logit_bias_exp) && Array.isArray(req.body.logit_bias_exp)) {
+    if (Array.isArray(logitBiasList) && Array.isArray(req.body.logit_bias_exp)) {
-        logit_bias_exp.push(...req.body.logit_bias_exp);
+        logitBiasList.push(...req.body.logit_bias_exp);
+    }
+    const repPenWhitelist = getRepPenaltyWhitelist(req.body.model);
     const data = {
         'input': req.body.input,
         'model': req.body.model,

             'repetition_penalty_slope': req.body.repetition_penalty_slope,
             'repetition_penalty_frequency': req.body.repetition_penalty_frequency,
             'repetition_penalty_presence': req.body.repetition_penalty_presence,
-            'repetition_penalty_whitelist': isNewModel ? repPenaltyAllowList.flat() : null,
+            'repetition_penalty_whitelist': repPenWhitelist,
             'top_a': req.body.top_a,
             'top_p': req.body.top_p,
             'top_k': req.body.top_k,
             'typical_p': req.body.typical_p,
             'mirostat_lr': req.body.mirostat_lr,
             'mirostat_tau': req.body.mirostat_tau,
-            'cfg_scale': req.body.cfg_scale,
-            'cfg_uc': req.body.cfg_uc,
             'phrase_rep_pen': req.body.phrase_rep_pen,
             'stop_sequences': req.body.stop_sequences,
             'bad_words_ids': badWordsList.length ? badWordsList : null,
-            'logit_bias_exp': logit_bias_exp,
+            'logit_bias_exp': logitBiasList,
             'generate_until_sentence': req.body.generate_until_sentence,
             'use_cache': req.body.use_cache,
             'return_full_text': req.body.return_full_text,

     };
     // Tells the model to stop generation at '>'
-    if ('theme_textadventure' === req.body.prefix && isNewModel) {
+    if ('theme_textadventure' === req.body.prefix) {
+        if (req.body.model.includes('clio') || req.body.model.includes('kayra')) {
             data.parameters.eos_token_id = 49405;
+        }
+        if (req.body.model.includes('erato')) {
+            data.parameters.eos_token_id = 29;
+        }
+    }
     console.log(util.inspect(data, { depth: 4 }));

     };
     try {
-        const baseURL = req.body.model.includes('kayra') ? TEXT_NOVELAI : API_NOVELAI;
+        const baseURL = (req.body.model.includes('kayra') || req.body.model.includes('erato')) ? TEXT_NOVELAI : API_NOVELAI;
         const url = req.body.streaming ? `${baseURL}/ai/generate-stream` : `${baseURL}/ai/generate`;
         const response = await fetch(url, { method: 'POST', timeout: 0, ...args });

src/endpoints/presets.js+2 -0 Viewed

             return { folder: directories.instruct, extension: '.json' };
         case 'context':
             return { folder: directories.context, extension: '.json' };
+        case 'sysprompt':
+            return { folder: directories.sysprompt, extension: '.json' };
         default:
             return { folder: null, extension: null };
+    }

src/endpoints/settings.js+2 -0 Viewed

     const instruct = readAndParseFromDirectory(request.user.directories.instruct);
     const context = readAndParseFromDirectory(request.user.directories.context);
+    const sysprompt = readAndParseFromDirectory(request.user.directories.sysprompt);
     response.send({
         settings,

         quickReplyPresets,
         instruct,
         context,
+        sysprompt,
         enable_extensions: ENABLE_EXTENSIONS,
         enable_extensions_auto_update: ENABLE_EXTENSIONS_AUTO_UPDATE,
         enable_accounts: ENABLE_ACCOUNTS,

src/endpoints/vectors.js+11 -20 Viewed

 const express = require('express');
 const sanitize = require('sanitize-filename');
 const { jsonParser } = require('../express-common');
-const { getConfigValue, color } = require('../util');
+const { getConfigValue } = require('../util');
 // Don't forget to add new sources to the SOURCES array
 const SOURCES = [

                 extrasUrl: String(request.headers['x-extras-url']),
                 extrasKey: String(request.headers['x-extras-key']),
             };
-        case 'local':
+        case 'transformers':
             return {
                 model: getConfigValue('extras.embeddingModel', ''),
             };

                 // TODO: Add support for multiple models
                 model: 'text-embedding-004',
             };
+        case 'mistral':
+            return {
+                model: 'mistral-embed',
+            };
+        case 'nomicai':
+            return {
+                model: 'nomic-embed-text-v1.5',
+            };
         default:
             return {};
+    }

  * @returns {string} The model scope for the source
  */
 function getModelScope(sourceSettings) {
-    const scopesEnabled = getConfigValue('vectors.enableModelScopes', false);
+    return (sourceSettings?.model || '');
-    const warningShown = global.process.env.VECTORS_MODEL_SCOPE_WARNING_SHOWN === 'true';
-    if (!scopesEnabled && !warningShown) {
-        console.log();
-        console.warn(color.red('[DEPRECATION NOTICE]'), 'Model scopes for Vectore Storage are disabled, but will soon be required.');
-        console.log(`To enable model scopes, set the ${color.cyan('vectors.enableModelScopes')} in config.yaml to ${color.green(true)}.`);
-        console.log('This message won\'t be shown again in the current session.');
-        console.log();
-        global.process.env.VECTORS_MODEL_SCOPE_WARNING_SHOWN = 'true';
-    }
-    return scopesEnabled ? (sourceSettings?.model || '') : '';
+}
 /**

 const router = express.Router();
-router.get('/scopes-enabled', (_req, res) => {
-    const scopesEnabled = getConfigValue('vectors.enableModelScopes', false);
-    return res.json({ enabled: scopesEnabled });
-});
 router.post('/query', jsonParser, async (req, res) => {
     try {
         if (!req.body.collectionId || !req.body.searchText) {

src/prompt-converters.js+3 -0 Viewed

         'gemini-1.5-flash',
         'gemini-1.5-flash-latest',
         'gemini-1.5-flash-001',
+        'gemini-1.5-flash-002',
         'gemini-1.5-flash-exp-0827',
         'gemini-1.5-flash-8b-exp-0827',
+        'gemini-1.5-flash-8b-exp-0924',
         'gemini-1.5-pro',
         'gemini-1.5-pro-latest',
         'gemini-1.5-pro-001',
+        'gemini-1.5-pro-002',
         'gemini-1.5-pro-exp-0801',
         'gemini-1.5-pro-exp-0827',
         'gemini-1.0-pro-vision-latest',

src/users.js+62 -0 Viewed

 const express = require('express');
 const mime = require('mime-types');
 const archiver = require('archiver');
+const writeFileAtomicSync = require('write-file-atomic').sync;
+const _ = require('lodash');
 const { USER_DIRECTORY_TEMPLATE, DEFAULT_USER, PUBLIC_DIRECTORIES, SETTINGS_FILE } = require('./constants');
 const { getConfigValue, color, delay, setConfigValue, generateTimestamp } = require('./util');

  * @property {string} files - The directory where the uploaded files are stored
  * @property {string} vectors - The directory where the vectors are stored
  * @property {string} backups - The directory where the backups are stored
+ * @property {string} sysprompt - The directory where the system prompt data is stored
  */
 /**

     console.log(color.green('Migration completed!'));
+}
+async function migrateSystemPrompts() {
+    /**
+     * Gets the default system prompts.
+     * @returns {Promise<any[]>} - The list of default system prompts
+     */
+    async function getDefaultSystemPrompts() {
+        try {
+            const { getContentOfType } = await import('./endpoints/content-manager.js');
+            return getContentOfType('sysprompt', 'json');
+        } catch {
+            return [];
+        }
+    }
+    const directories = await getUserDirectoriesList();
+    for (const directory of directories) {
+        try {
+            const migrateMarker = path.join(directory.sysprompt, '.migrated');
+            if (fs.existsSync(migrateMarker)) {
+                continue;
+            }
+            const backupsPath = path.join(directory.backups, '_sysprompt');
+            fs.mkdirSync(backupsPath, { recursive: true });
+            const defaultPrompts = await getDefaultSystemPrompts();
+            const instucts = fs.readdirSync(directory.instruct);
+            let migratedPrompts = [];
+            for (const instruct of instucts) {
+                const instructPath = path.join(directory.instruct, instruct);
+                const sysPromptPath = path.join(directory.sysprompt, instruct);
+                if (path.extname(instruct) === '.json' && !fs.existsSync(sysPromptPath)) {
+                    const instructData = JSON.parse(fs.readFileSync(instructPath, 'utf8'));
+                    if ('system_prompt' in instructData && 'name' in instructData) {
+                        const backupPath = path.join(backupsPath, `${instructData.name}.json`);
+                        fs.cpSync(instructPath, backupPath, { force: true });
+                        const syspromptData = { name: instructData.name, content: instructData.system_prompt };
+                        migratedPrompts.push(syspromptData);
+                        delete instructData.system_prompt;
+                        writeFileAtomicSync(instructPath, JSON.stringify(instructData, null, 4));
+                    }
+                }
+            }
+            // Only leave unique contents
+            migratedPrompts = _.uniqBy(migratedPrompts, 'content');
+            // Only leave contents that are not in the default prompts
+            migratedPrompts = migratedPrompts.filter(x => !defaultPrompts.some(y => y.content === x.content));
+            for (const sysPromptData of migratedPrompts) {
+                sysPromptData.name = `[Migrated] ${sysPromptData.name}`;
+                const syspromptPath = path.join(directory.sysprompt, `${sysPromptData.name}.json`);
+                writeFileAtomicSync(syspromptPath, JSON.stringify(sysPromptData, null, 4));
+                console.log(`Migrated system prompt ${sysPromptData.name} for ${directory.root.split(path.sep).pop()}`);
+            }
+            writeFileAtomicSync(migrateMarker, '');
+        } catch (error) {
+            console.error('Error migrating system prompts:', error);
+        }
+    }
+}
 /**
  * Converts a user handle to a storage key.
  * @param {string} handle User handle

     requireLoginMiddleware,
     requireAdminMiddleware,
     migrateUserData,
+    migrateSystemPrompts,
     getPasswordSalt,
     getPasswordHash,
     getCsrfSecret,

Merge branch 'staging' into if-command-default-arguments