Merge branch 'staging' into group-join-examples

d7328af4c8d4541e792e83169c9f24df15c34452

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

Parents: 2d66b7204ad0352ceadde05a75d98fc37c068cd3 94de9411b69b02221e6bdec46d4b6af1a1b0b6d4

package-lock.json+7 -0 Viewed

                 "showdown": "^2.1.0",
                 "sillytavern-transformers": "2.14.6",
                 "simple-git": "^3.19.1",
+                "slidetoggle": "^4.0.0",
                 "tiktoken": "^1.0.16",
                 "vectra": "^0.2.2",
                 "wavefile": "^11.0.0",

             "integrity": "sha512-VZBmZP8WU3sMOZm1bdgTadsQbcscK0UM8oKxKVBs4XAhUo2Xxzm/OFMGBkPusxw9xL3Uy8LrzEqGqJhclsr0yA==",
             "license": "MIT"
         },
+        "node_modules/slidetoggle": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/slidetoggle/-/slidetoggle-4.0.0.tgz",
+            "integrity": "sha512-6qvrOS1dnDFEr41UEEFFRQE8nswaAFIYZAHer6dVlznRIjHyCISjNJoxIn5U5QlAbZfBBxTELQk4jS7miHto1A==",
+            "license": "MIT"
+        },
         "node_modules/smart-buffer": {
             "version": "4.2.0",
             "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz",

package.json+1 -0 Viewed

         "showdown": "^2.1.0",
         "sillytavern-transformers": "2.14.6",
         "simple-git": "^3.19.1",
+        "slidetoggle": "^4.0.0",
         "tiktoken": "^1.0.16",
         "vectra": "^0.2.2",
         "wavefile": "^11.0.0",

public/img/generic.svg+15 -0 Viewed

+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="616.86328"
+   height="616.86328"
+   viewBox="0 0 77.10791 77.10791"
+   version="1.1"
+   id="svg4"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs4" />
+  <path
+     id="circle1"
+     d="M 38.553955,0 A 38.554,38.554 0 0 0 0,38.553955 38.554,38.554 0 0 0 38.553955,77.107911 38.554,38.554 0 0 0 77.107911,38.553955 38.554,38.554 0 0 0 38.553955,0 Z m -3.125976,13.545898 h 6.251953 v 19.593751 l 16.968751,-9.796875 3.125974,5.414306 -16.968506,9.796875 16.968506,9.796877 -3.125974,5.414305 -16.968751,-9.796874 V 63.56201 H 35.427979 V 43.968263 l -16.968506,9.796874 -3.125977,-5.414305 16.96875,-9.796877 -16.96875,-9.796875 3.125977,-5.414306 16.968506,9.796875 z" />
+</svg>

public/index.html+16 -18 Viewed

                                             <div data-name="tfs_z" draggable="true"><span>Tail Free Sampling</span><small></small></div>
                                             <div data-name="min_p" draggable="true"><span>Min P</span><small></small></div>
                                             <div data-name="xtc" draggable="true"><span>Exclude Top Choices</span><small></small></div>
+                                            <div data-name="dry" draggable="true"><span>DRY</span><small></small></div>
                                         </div>
                                         <div id="llamacpp_samplers_default_order" class="menu_button menu_button_icon">
                                             <span data-i18n="Load default order">Load default order</span>

                                 </div>
                             </div>
                             <div class="flex-container flexFlowColumn marginTopBot5">
-                                <label data-tg-type="ooba" class="checkbox_label" for="bypass_status_check_textgenerationwebui">
+                                <label data-tg-type="ooba, generic" class="checkbox_label" for="bypass_status_check_textgenerationwebui">
                                     <input type="checkbox" id="bypass_status_check_textgenerationwebui" />
                                     <span data-i18n="Bypass status check">Bypass status check</span>
                                 </label>

                                     <optgroup label="Primary">
                                         <option value="gemini-1.5-pro">Gemini 1.5 Pro</option>
                                         <option value="gemini-1.5-flash">Gemini 1.5 Flash</option>
-                                        <option value="gemini-1.0-pro">Gemini 1.0 Pro</option>
+                                        <option value="gemini-1.0-pro">Gemini 1.0 Pro (Deprecated)</option>
-                                        <option value="gemini-pro">Gemini Pro (1.0)</option>
+                                        <option value="gemini-pro">Gemini Pro (1.0) (Deprecated)</option>
-                                        <option value="gemini-pro-vision">Gemini Pro Vision (1.0)</option>
                                         <option value="gemini-ultra">Gemini Ultra (1.0)</option>
                                         <option value="gemini-1.0-ultra-latest">Gemini 1.0 Ultra</option>
-                                        <option value="text-bison-001">PaLM 2 (Legacy)</option>
-                                        <option value="chat-bison-001">PaLM 2 Chat (Legacy)</option>
                                     </optgroup>
                                     <optgroup label="Subversions">
-                                        <option value="gemini-2.0-flash-exp">Gemini 2.0 Flash Experiment</option>
+                                        <option value="gemini-2.0-flash-exp">Gemini 2.0 Flash Experimental</option>
                                         <option value="gemini-exp-1114">Gemini Experimental 2024-11-14</option>
                                         <option value="gemini-exp-1121">Gemini Experimental 2024-11-21</option>
                                         <option value="gemini-exp-1206">Gemini Experimental 2024-12-06</option>
-                                        <option value="gemini-1.5-pro-exp-0801">Gemini 1.5 Pro Experiment 2024-08-01</option>
+                                        <option value="gemini-1.5-pro-exp-0801">Gemini 1.5 Pro Experimental 2024-08-01</option>
-                                        <option value="gemini-1.5-pro-exp-0827">Gemini 1.5 Pro Experiment 2024-08-27</option>
+                                        <option value="gemini-1.5-pro-exp-0827">Gemini 1.5 Pro Experimental 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-8b">Gemini 1.5 Flash 8B</option>
-                                        <option value="gemini-1.5-flash-exp-0827">Gemini 1.5 Flash Experiment 2024-08-27</option>
+                                        <option value="gemini-1.5-flash-exp-0827">Gemini 1.5 Flash Experimental 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-0827">Gemini 1.5 Flash 8B Experimental 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-8b-exp-0924">Gemini 1.5 Flash 8B Experimental 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-latest">Gemini 1.0 Pro [latest] (Deprecated)</option>
-                                        <option value="gemini-1.0-pro-001">Gemini 1.0 Pro (Tuning) [001]</option>
+                                        <option value="gemini-1.0-pro-001">Gemini 1.0 Pro (Tuning) [001] (Deprecated)</option>
-                                        <option value="gemini-1.0-pro-vision-latest">Gemini 1.0 Pro Vision [latest]</option>
                                     </optgroup>
                                 </select>
                             </div>

                                 <h4 data-i18n="Cohere Model">Cohere Model</h4>
                                 <select id="model_cohere_select">
                                     <optgroup label="Stable">
-                                        <option value="c4ai-aya-expanse-32b">c4ai-aya-expanse-32b</option>
-                                        <option value="c4ai-aya-expanse-8b">c4ai-aya-expanse-8b</option>
-                                        <option value="c4ai-aya-23-35b">c4ai-aya-23-35b</option>
                                         <option value="c4ai-aya-23-8b">c4ai-aya-23-8b</option>
+                                        <option value="c4ai-aya-23">c4ai-aya-23</option>
+                                        <option value="c4ai-aya-expanse-8b">c4ai-aya-expanse-8b</option>
+                                        <option value="c4ai-aya-expanse-32b">c4ai-aya-expanse-32b</option>
                                         <option value="command-light">command-light</option>
                                         <option value="command">command</option>
                                         <option value="command-r">command-r</option>
                                         <option value="command-r-plus">command-r-plus</option>
                                         <option value="command-r-08-2024">command-r-08-2024</option>
                                         <option value="command-r-plus-08-2024">command-r-plus-08-2024</option>
+                                        <option value="command-r7b-12-2024">command-r7b-12-2024</option>
                                     </optgroup>
                                     <optgroup label="Nightly">
                                         <option value="command-light-nightly">command-light-nightly</option>

public/lib.js+3 -0 Viewed

 import * as Popper from '@popperjs/core';
 import droll from 'droll';
 import morphdom from 'morphdom';
+import { toggle as slideToggle } from 'slidetoggle';
 /**
  * Expose the libraries to the 'window' object.

     Popper,
     droll,
     morphdom,
+    slideToggle,
 };
 export {

     Popper,
     droll,
     morphdom,
+    slideToggle,
 };

public/locales/ja-jp.json+6 -1 Viewed

     "sd_Raw_Last_Message": "生の最後のメッセージ",
     "sd_Background": "背景",
     "Image Generation": "画像生成",
+    "Stop Image Generation": "画像生成を停止",
+    "Generate Caption": "画像説明を生成",
     "sd_refine_mode": "プロンプトを生成 API に送信する前に手動で編集できるようにする",
     "sd_refine_mode_txt": "生成前にプロンプトを編集する",
     "sd_interactive_mode": "「猫の写真を送ってください」のようなメッセージを送信するときに、画像を自動的に生成します。",

     "Still have questions?": "まだ質問がありますか？",
     "Join the SillyTavern Discord": "SillyTavernのDiscordに参加",
     "Post a GitHub issue": "GitHubの問題を投稿",
-    "Contact the developers": "開発者に連絡"
+    "Contact the developers": "開発者に連絡",
+    "Stop Inspecting": "検査を停止",
+    "Inspect Prompts": "プロンプトを検査",
+    "Toggle prompt inspection": "プロンプト検査の切り替え"
+}

public/locales/zh-cn.json+6 -1 Viewed

     "Enter web URLs to scrape (one per line):": "输入要抓取的网址（每行一个）：",
     "Enter a video URL to download its transcript.": "输入视频 URL 或 ID 即可下载其文本。",
     "Image Captioning": "图像描述",
+    "Generate Caption": "生成图片说明",
     "Source": "来源",
     "Local": "本地",
     "Multimodal (OpenAI / Anthropic / llama / Google)": "多模式（OpenAI / Anthropic / llama / Google）",

     "sd_Raw_Last_Message": "原始最后一条消息",
     "sd_Background": "背景",
     "Image Generation": "图像生成",
+    "Stop Image Generation": "中止图像生成",
     "sd_refine_mode": "允许在将提示词发送到生成 API 之前手动编辑提示词",
     "sd_refine_mode_txt": "生成之前编辑提示词",
     "sd_interactive_mode": "发送消息时自动生成图像，例如“给我发一张猫的照片”。",

     "Still have questions?": "仍有疑问？",
     "Join the SillyTavern Discord": "加入SillyTavern Discord",
     "Post a GitHub issue": "发布GitHub问题",
-    "Contact the developers": "联系开发人员"
+    "Contact the developers": "联系开发人员",
+    "Stop Inspecting": "停止检查",
+    "Inspect Prompts": "检查提示词",
+    "Toggle prompt inspection": "切换提示词检查"
+}

public/locales/zh-tw.json+127 -122 Viewed

     "Min P": "Min P",
     "Top A": "Top A",
     "Quick Prompts Edit": "快速提示詞編輯",
-    "Main": "主要",
+    "Main": "主要提示詞",
     "NSFW": "NSFW",
     "Jailbreak": "越獄",
     "Utility Prompts": "實用提示詞",
     "Impersonation prompt": "AI 扮演提示詞",
     "Restore default prompt": "還原預設提示詞",
     "Prompt that is used for Impersonation function": "用於 AI 模仿功能的提示詞",
-    "World Info Format Template": "世界資訊格式範本",
+    "World Info Format Template": "世界資訊格式",
     "Restore default format": "還原預設格式",
     "Wraps activated World Info entries before inserting into the prompt.": "在插入提示詞前包裝已啟用的世界資訊條目。",
     "scenario_format_template_part_1": "使用",
     "scenario_format_template_part_2": "來標示要插入內容的位置。",
-    "Scenario Format Template": "情境格式範本",
+    "Scenario Format Template": "情境格式",
-    "Personality Format Template": "個性格式範本",
+    "Personality Format Template": "個性格式",
     "Group Nudge Prompt Template": "群組推動提示詞範本",
     "Sent at the end of the group chat history to force reply from a specific character.": "在群組聊天歷史結束時發送以強制特定角色回覆",
     "New Chat": "新聊天",

     "Chat Start": "聊天開始符號",
     "Add Chat Start and Example Separator to a list of stopping strings.": "將聊天開始和範例分隔符號加入終止字串中。",
     "Use as Stop Strings": "用作停止字串",
-    "context_allow_jailbreak": "如果在角色卡中定義了越獄，且啟用了「偏好角色卡越獄」，則會在提示詞的結尾加入越獄內容。\n這不建議用於文字完成模型，因為可能導致不良的輸出結果。",
+    "context_allow_jailbreak": "如果在角色卡中定義了越獄，且啟用了「角色卡越獄優先」，則會在提示詞的結尾加入越獄內容。\n這不建議用於文字完成模型，因為可能導致不良的輸出結果。",
     "Allow Jailbreak": "允許越獄",
     "Context Order": "上下文順序",
     "Summary": "摘要",

     "Use fuzzy matching, and search characters in the list by all data fields, not just by a name substring": "使用模糊配對，並通過所有資料欄位在列表中搜尋角色，而不僅僅是通過名稱子字串。",
     "Advanced Character Search": "進階角色搜尋",
     "If checked and the character card contains a prompt override (System Prompt), use that instead": "如果選中並且角色卡包含提示詞覆寫（系統提示詞），則使用該提示詞。",
-    "Prefer Character Card Prompt": "偏好角色卡主要提示詞",
+    "Prefer Character Card Prompt": "角色卡主要提示詞優先",
     "If checked and the character card contains a jailbreak override (Post History Instruction), use that instead": "如果選中並且角色卡包含越獄覆寫（聊天歷史後指示），則使用該提示詞。",
-    "Prefer Character Card Jailbreak": "偏好角色卡越獄",
+    "Prefer Character Card Jailbreak": "角色卡越獄優先",
     "Avoid cropping and resizing imported character images. When off, crop/resize to 512x768": "避免裁剪和調整匯入的角色圖像大小。未勾選時將會裁剪／調整大小到 512x768。",
     "Never resize avatars": "永不調整頭像大小",
     "Show actual file names on the disk, in the characters list display only": "僅在角色列表顯示實際檔案名稱。",

     "Injection depth. 0 = after the last message, 1 = before the last message, etc.": "注入深度。0 = 在最後一則訊息之後，1 = 在最後一則訊息之前，以此類推。",
     "Prompt": "提示詞",
     "The prompt to be sent.": "要發送的提示詞。",
-    "This prompt cannot be overridden by character cards, even if overrides are preferred.": "即使啟用偏好覆寫，此提示詞也不能被角色卡片覆寫。",
+    "This prompt cannot be overridden by character cards, even if overrides are preferred.": "即使啟用優先覆寫，此提示詞也不能被角色卡片覆寫。",
     "prompt_manager_forbid_overrides": "禁止覆寫",
     "reset": "重設",
     "save": "節省",

     "Message Actions": "訊息動作",
     "Translate message": "翻譯訊息",
     "Generate Image": "生成圖片",
+    "Stop Image Generation": "終止圖片生成",
     "Narrate": "敘述",
     "Exclude message from prompts": "從提示詞中排除訊息",
     "Include message in prompts": "在提示詞中包含訊息",

     "sd_prompt_prefix_placeholder": "使用 {prompt} 指定生成的提示詞將被插入的位置。",
     "Negative common prompt prefix": "負面通用提示詞前綴",
     "Character-specific prompt prefix": "角色特定提示詞前綴",
-    "Won't be used in groups.": "不會用在群組",
+    "Won't be used in groups.": "群聊中無效",
     "sd_character_prompt_placeholder": "描述該選擇角色的特徵。這些特徵將增加在通用提示詞前綴之後。\n例如：女性、綠色眼睛、棕色頭髮、粉紅色襯衫。",
     "Character-specific negative prompt prefix": "角色特定負面提示詞前綴",
     "sd_character_negative_prompt_placeholder": "不應出現在選定角色上的任何特徵。這些特徵將增加在負面通用提示詞前綴之後。例如：珠寶、鞋子、眼鏡。",
     "Shareable": "可分享",
-    "Image Prompt Templates": "圖片提示詞範本",
+    "Image Prompt Templates": "AI 算圖提示詞範本",
     "Vectors Model Warning": "向量模型警告",
     "Translate files into English before processing": "處理前將檔案翻譯成英文",
     "Manager Users": "管理使用者",

     "(-1 for random)": "（-1 表示隨機）",
     "(Optional)": "（可選）",
     "(use _space": "（使用",
-    "[no_connection_text]api_no_connection": "未連線⋯",
+    "api_no_connection": "未連線⋯",
-    "[no_desc_text]No model description": "[無描述]",
+    "No model description": "[無描述]",
-    "[no_items_text]openai_logit_bias_no_items": "無項目",
+    "openai_logit_bias_no_items": "無項目",
-    "[placeholder]Any contents here will replace the default Post-History Instructions used for this character. (v2 specpost_history_instructions)": "此處填入的內容將取代該角色的默認聊天歷史後指示（Post-History Instructions）。\n（v2 specpost_history_instructions）",
+    "Any contents here will replace the default Post-History Instructions used for this character. (v2 specpost_history_instructions)": "此處填入的內容將取代該角色的默認聊天歷史後指示（Post-History Instructions）。\n（v2 specpost_history_instructions）",
-    "[placeholder]comma delimited,no spaces between": "逗號分割，無需空格",
+    "comma delimited,no spaces between": "逗號分割，無需空格",
-    "[placeholder]e.g. black-forest-labs/FLUX.1-dev": "例如：black-forest-labs/FLUX.1-dev",
+    "e.g. black-forest-labs/FLUX.1-dev": "例如：black-forest-labs/FLUX.1-dev",
-    "[placeholder]Example: gpt-3.5-turbo": "例如：gpt-3.5-turbo",
+    "Example: gpt-3.5-turbo": "例如：gpt-3.5-turbo",
-    "[placeholder]Example: http://localhost:1234/v1": "例如：http://localhost:1234/v1",
+    "Example: http://localhost:1234/v1": "例如：http://localhost:1234/v1",
-    "[popup-button-crop]popup-button-crop": "裁剪",
+    "popup-button-crop": "裁剪",
-    "[title](disabled when max recursion steps are used)": "（當最大遞歸步驟數使用時將停用）",
+    "(disabled when max recursion steps are used)": "（當最大遞歸步驟數使用時將停用）",
-    "[title]0 = unlimited, 1 = scans once and doesn't recurse, 2 = scans once and recurses once, etc\n(disabled when min activations are used)": "0 = 無限制，1 = 掃描一次且不遞歸，2 = 掃描一次並遞歸一次，以此類推\n（使用最小啟動設定時將停用）",
+    "0 = unlimited, 1 = scans once and doesn't recurse, 2 = scans once and recurses once, etc\n(disabled when min activations are used)": "0 = 無限制，1 = 掃描一次且不遞歸，2 = 掃描一次並遞歸一次，以此類推\n（使用最小啟動設定時將停用）",
-    "[title]A greedy, brute-force algorithm used in LLM sampling to find the most likely sequence of words or tokens. It expands multiple candidate sequences at once, maintaining a fixed number (beam width) of top sequences at each step.": "一種用於 LLM 抽樣的貪婪演算法，用於尋找最可能的單詞或標記序列。該方法會同時展開多個候選序列，並在每一步中保持固定數量的頂級序列（beam width）。",
+    "A greedy, brute-force algorithm used in LLM sampling to find the most likely sequence of words or tokens. It expands multiple candidate sequences at once, maintaining a fixed number (beam width) of top sequences at each step.": "一種用於 LLM 抽樣的貪婪演算法，用於尋找最可能的單詞或標記序列。該方法會同時展開多個候選序列，並在每一步中保持固定數量的頂級序列（beam width）。",
-    "[title]A multiplicative factor to expand the overall area that the nodes take up.": "節點佔用區域擴展的倍數。",
+    "A multiplicative factor to expand the overall area that the nodes take up.": "節點佔用區域擴展的倍數。",
-    "[title]Abort current image generation task": "終止目前的圖片生成任務",
+    "Abort current image generation task": "終止目前的圖片生成任務",
-    "[title]Add Character and User names to a list of stopping strings.": "將角色和使用者角色名稱添加至停止字符列表。",
+    "Add Character and User names to a list of stopping strings.": "將角色和使用者角色名稱添加至停止字符列表。",
-    "[title]Alignment for rank nodes.": "對排名節點的對齊方式。",
+    "Alignment for rank nodes.": "對排名節點的對齊方式。",
-    "[title]Always show the node full info panel at the bottom left of the timeline view. When off, show it near the node.": "始終將節點的完整資訊面板顯示在時間軸視圖的左下角。關閉時，將顯示在節點附近。",
+    "Always show the node full info panel at the bottom left of the timeline view. When off, show it near the node.": "始終將節點的完整資訊面板顯示在時間軸視圖的左下角。關閉時，將顯示在節點附近。",
-    "[title]Always show the node tooltip at the bottom left of the timeline view. When off, show it near the node.": "始終將節點的工具提示欄顯示在時間軸視圖的左下角。關閉時，將顯示在節點附近。",
+    "Always show the node tooltip at the bottom left of the timeline view. When off, show it near the node.": "始終將節點的工具提示欄顯示在時間軸視圖的左下角。關閉時，將顯示在節點附近。",
-    "[title]Apply current sorting as Order": "應用此排序為順序",
+    "Apply current sorting as Order": "應用此排序為順序",
-    "[title]Cap the number of entry activation recursions": "限制入口啟動的遞歸次數",
+    "Cap the number of entry activation recursions": "限制入口啟動的遞歸次數",
-    "[title]Caption": "標題",
+    "Caption": "標題",
-    "[title]Close popup": "關閉彈出視窗",
+    "Close popup": "關閉彈出視窗",
-    "[title]Color configuration for Timelines when 'Use UI Theme' in Style Settings is off.": "關閉「使用介面主題」的時間線顏色。",
+    "Color configuration for Timelines when 'Use UI Theme' in Style Settings is off.": "關閉「使用介面主題」的時間線顏色。",
-    "[title]context_allow_post_history_instructions": "在文本完成模式中包含聊天歷史後指示（Post-History Instructions），但可能導致不良輸出。",
+    "context_allow_post_history_instructions": "在文本完成模式中包含聊天歷史後指示（Post-History Instructions），但可能導致不良輸出。",
-    "[title]Create a new connection profile": "建立新的連線設定檔",
+    "Create a new connection profile": "建立新的連線設定檔",
-    "[title]Defines on importing cards which action should be chosen for importing its listed tags. 'Ask' will always display the dialog.": "定義導入卡片時應採取的動作。選擇「詢問」將始終顯示對話框。",
+    "Defines on importing cards which action should be chosen for importing its listed tags. 'Ask' will always display the dialog.": "定義導入卡片時應採取的動作。選擇「詢問」將始終顯示對話框。",
-    "[title]delay_until_recursion_level": "定義遞迴掃描的延遲層級。\r最初僅匹配第一層（數字最小的層級）。\r未找到匹配時，下一層將成為可匹配的層級。\r此過程會重複，直到所有層級都被檢查完畢。\r與「延遲至遞歸」設定相關聯。",
+    "delay_until_recursion_level": "定義遞迴掃描的延遲層級。\r最初僅匹配第一層（數字最小的層級）。\r未找到匹配時，下一層將成為可匹配的層級。\r此過程會重複，直到所有層級都被檢查完畢。\r與「延遲至遞歸」設定相關聯。",
-    "[title]Delete a connection profile": "刪除連線設定檔",
+    "Delete a connection profile": "刪除連線設定檔",
-    "[title]Delete template": "刪除模板",
+    "Delete template": "刪除模板",
-    "[title]Delete the template": "刪除此模板",
+    "Delete the template": "刪除此模板",
-    "[title]Disabling is not recommended.": "不建議禁用。",
+    "Disabling is not recommended.": "不建議禁用。",
-    "[title]Display swipe numbers for all messages, not just the last.": "顯示所有訊息的滑動編號，而不僅是最後一條訊息。",
+    "Display swipe numbers for all messages, not just the last.": "顯示所有訊息的滑動編號，而不僅是最後一條訊息。",
-    "[title]Duplicate persona": "複製使用者角色",
+    "Duplicate persona": "複製使用者角色",
-    "[title]Edit a connection profile": "編輯連線設定檔",
+    "Edit a connection profile": "編輯連線設定檔",
-    "[title]Enable auto-select of input text in some text fields when clicking/selecting them. Applies to popup input textboxes, and possible other custom input fields.": "啟用自動選擇輸入框中的文本，適用於彈出輸入框及其他自定義輸入框。",
+    "Enable auto-select of input text in some text fields when clicking/selecting them. Applies to popup input textboxes, and possible other custom input fields.": "啟用自動選擇輸入框中的文本，適用於彈出輸入框及其他自定義輸入框。",
-    "[title]Entries with a cooldown can't be activated N messages after being triggered.": "設有冷卻時間的條目於觸發後的 N 條訊息內無法再次啟用。",
+    "Entries with a cooldown can't be activated N messages after being triggered.": "設有冷卻時間的條目於觸發後的 N 條訊息內無法再次啟用。",
-    "[title]Entries with a delay can't be activated until there are N messages present in the chat.": "有延遲的條目需等待聊天中出現 N 條訊息後才能啟用。",
+    "Entries with a delay can't be activated until there are N messages present in the chat.": "有延遲的條目需等待聊天中出現 N 條訊息後才能啟用。",
-    "[title]Expand swipe nodes when the timeline view first opens, and whenever the graph is refreshed. When off, you can expand them by long-pressing a node, or by pressing the Toggle Swipes button.": "時間線視圖首次打開或刷新時展開滑動節點。關閉時可通過長按節點或點選「切換滑動」按鈕展開。",
+    "Expand swipe nodes when the timeline view first opens, and whenever the graph is refreshed. When off, you can expand them by long-pressing a node, or by pressing the Toggle Swipes button.": "時間線視圖首次打開或刷新時展開滑動節點。關閉時可通過長按節點或點選「切換滑動」按鈕展開。",
-    "[title]Export Advanced Formatting settings": "匯出高級格式設定",
+    "Export Advanced Formatting settings": "匯出高級格式設定",
-    "[title]Export template": "匯出模板",
+    "Export template": "匯出模板",
-    "[title]Find similar characters": "尋找相似角色",
+    "Find similar characters": "尋找相似角色",
-    "[title]Height of a node, in pixels at zoom level 1.0.": "縮放等級為 1.0 時的節點像素高度。",
+    "Height of a node, in pixels at zoom level 1.0.": "縮放等級為 1.0 時的節點像素高度。",
-    "[title]How the automatic graph builder assigns a rank (layout depth) to graph nodes.": "自動圖表生成器分配圖節點等級（佈局深度）的方式。",
+    "How the automatic graph builder assigns a rank (layout depth) to graph nodes.": "自動圖表生成器分配圖節點等級（佈局深度）的方式。",
-    "[title]If checked and the character card contains a Post-History Instructions override, use that instead": "勾選後，將使用角色卡中的聊天歷史後指示（Post-History Instructions）覆蓋。",
+    "If checked and the character card contains a Post-History Instructions override, use that instead": "勾選後，將使用角色卡中的聊天歷史後指示（Post-History Instructions）覆蓋。",
-    "[title]Import Advanced Formatting settings": "匯入進階格式設定\n\n您也可以提供舊版檔案作為提示詞和上下文範本使用。",
+    "Import Advanced Formatting settings": "匯入進階格式設定\n\n您也可以提供舊版檔案作為提示詞和上下文範本使用。",
-    "[title]Import template": "匯入模板",
+    "Import template": "匯入模板",
-    "[title]In group chat, highlight the character(s) that are currently queued to generate responses and the order in which they will respond.": "在群組聊天中，突出顯示該生成回應的角色及順序。",
+    "In group chat, highlight the character(s) that are currently queued to generate responses and the order in which they will respond.": "在群組聊天中，突出顯示該生成回應的角色及順序。",
-    "[title]Include names with each message into the context for scanning": "將每條訊息的名稱納入掃描上下文",
+    "Include names with each message into the context for scanning": "將每條訊息的名稱納入掃描上下文",
-    "[title]Inserted before the first User's message": "插入到第一條使用者訊息前。",
+    "Inserted before the first User's message": "插入到第一條使用者訊息前。",
-    "[title]instruct_enabled": "啟用指令模式（Instruct Mode）",
+    "instruct_enabled": "啟用指令模式（Instruct Mode）",
-    "[title]instruct_last_input_sequence": "插入到最後一條使用者訊息之前。",
+    "instruct_last_input_sequence": "插入到最後一條使用者訊息之前。",
-    "[title]instruct_template_activation_regex_desc": "連接 API 或選擇模型時，若模型名稱符合所提供的正規表達式，則自動啟動該指令模板（Instruct Template）。",
+    "instruct_template_activation_regex_desc": "連接 API 或選擇模型時，若模型名稱符合所提供的正規表達式，則自動啟動該指令模板（Instruct Template）。",
-    "[title]Load Asset List": "載入資源列表",
+    "Load Asset List": "載入資源列表",
-    "[title]load_asset_list_desc": "根據資源列表文件載入擴展及資源。\n\n該字段中的默認資源 URL 指向官方的擴展及資源的列表。\n可在此插入您的自定義資源列表。\n\n若需安裝單個第三方擴展，請使用右上角的「安裝擴展」按鈕。",
+    "load_asset_list_desc": "根據資源列表文件載入擴展及資源。\n\n該字段中的默認資源 URL 指向官方的擴展及資源的列表。\n可在此插入您的自定義資源列表。\n\n若需安裝單個第三方擴展，請使用右上角的「安裝擴展」按鈕。",
-    "[title]markdown_hotkeys_desc": "啟用熱鍵以在某些文本輸入框中插入 Markdown 格式字符。詳見「/help hotkeys」。",
+    "markdown_hotkeys_desc": "啟用熱鍵以在某些文本輸入框中插入 Markdown 格式字符。詳見「/help hotkeys」。",
-    "[title]Not all samplers supported.": "並非所有採樣器均受支援。",
+    "Not all samplers supported.": "並非所有採樣器均受支援。",
-    "[title]Open the timeline view. Same as the slash command '/tl'.": "打開時間線視圖，與斜杠指令「/tl」相同。",
+    "Open the timeline view. Same as the slash command '/tl'.": "打開時間線視圖，與斜杠指令「/tl」相同。",
-    "[title]Penalize sequences based on their length.": "根據序列長度進行懲罰。",
+    "Penalize sequences based on their length.": "根據序列長度進行懲罰。",
-    "[title]Reload a connection profile": "重新載入連線設定檔",
+    "Reload a connection profile": "重新載入連線設定檔",
-    "[title]Rename current preset": "重新命名此預設",
+    "Rename current preset": "重新命名此預設",
-    "[title]Rename current prompt": "重新命名此提示詞",
+    "Rename current prompt": "重新命名此提示詞",
-    "[title]Rename current template": "重新密名此模板",
+    "Rename current template": "重新密名此模板",
-    "[title]Reset all Timelines settings to their default values.": "將所有時間軸設定重置為預設值。",
+    "Reset all Timelines settings to their default values.": "將所有時間軸設定重置為預設值。",
-    "[title]Restore current prompt": "還原目前的提示詞",
+    "Restore current prompt": "還原目前的提示詞",
-    "[title]Restore current template": "還原目前的模板",
+    "Restore current template": "還原目前的模板",
-    "[title]Save prompt as": "另存提示詞為",
+    "Save prompt as": "另存提示詞為",
-    "[title]Save template as": "另存模板為",
+    "Save template as": "另存模板為",
-    "[title]sd_adetailer_face": "在生成過程中使用 ADetailer 臉部模型。需在後端安裝 ADetailer 擴展。",
+    "sd_adetailer_face": "在生成過程中使用 ADetailer 臉部模型。需在後端安裝 ADetailer 擴展。",
-    "[title]sd_free_extend": "自動使用目前選定的 LLM 擴展自由模式主題提示詞（不包括肖像或背景）。",
+    "sd_free_extend": "自動使用目前選定的 LLM 擴展自由模式主題提示詞（不包括肖像或背景）。",
-    "[title]sd_function_tool": "使用功能工具自動檢測意圖以生成圖片。",
+    "sd_function_tool": "使用功能工具自動檢測意圖以生成圖片。",
-    "[title]Seed_desc": "用於生成確定性和可重現輸出的隨機種子。設定為 -1 時將使用隨機種子。",
+    "Seed_desc": "用於生成確定性和可重現輸出的隨機種子。設定為 -1 時將使用隨機種子。",
-    "[title]Select your current Context Template": "選擇您目前的上下文模板",
+    "Select your current Context Template": "選擇您目前的上下文模板",
-    "[title]Select your current Instruct Template": "選擇您目前的指令模板",
+    "Select your current Instruct Template": "選擇您目前的指令模板",
-    "[title]Select your current System Prompt": "選擇您目前的系統提示詞",
+    "Select your current System Prompt": "選擇您目前的系統提示詞",
-    "[title]Separation between adjacent edges in the same rank.": "同一層級中相鄰邊之間的間距。",
+    "Separation between adjacent edges in the same rank.": "同一層級中相鄰邊之間的間距。",
-    "[title]Separation between adjacent nodes in the same rank.": "同一層級中相鄰節點之間的間距。",
+    "Separation between adjacent nodes in the same rank.": "同一層級中相鄰節點之間的間距。",
-    "[title]Separation between each rank in the layout.": "佈局中各層級之間的間距。",
+    "Separation between each rank in the layout.": "佈局中各層級之間的間距。",
-    "[title]Settings for the visual appearance of the Timelines graph.": "時間線圖形的視覺外觀設置。",
+    "Settings for the visual appearance of the Timelines graph.": "時間線圖形的視覺外觀設置。",
-    "[title]Show a button in the input area to ask the AI to impersonate your character for a single message": "在輸入框中添加按鈕，讓 AI 模仿您的角色身份發送一則訊息。",
+    "Show a button in the input area to ask the AI to impersonate your character for a single message": "在輸入框中添加按鈕，讓 AI 模仿您的角色身份發送一則訊息。",
-    "[title]Show a legend for colors corresponding to different characters and chat checkpoints.": "顯示一個圖例，標註不同角色和對話檢查點對應的顏色。",
+    "Show a legend for colors corresponding to different characters and chat checkpoints.": "顯示一個圖例，標註不同角色和對話檢查點對應的顏色。",
-    "[title]Show the AI character's avatar as the graph root node. When off, the root node is blank.": "將 AI 角色的頭像作為圖形的根節點；關閉時，根節點為空。",
+    "Show the AI character's avatar as the graph root node. When off, the root node is blank.": "將 AI 角色的頭像作為圖形的根節點；關閉時，根節點為空。",
-    "[title]Sticky entries will stay active for N messages after being triggered.": "觸發後，置頂條目將在接下來的 N 條訊息中保持活躍。",
+    "Sticky entries will stay active for N messages after being triggered.": "觸發後，置頂條目將在接下來的 N 條訊息中保持活躍。",
-    "[title]stscript_parser_flag_replace_getvar_label": "防止 {{getvar::}} 和 {{getglobalvar::}} 巨集的字面巨集樣值被自動解析。\n例如，{{newline}} 將保持為字面字串 {{newline}}。\n\n（此功能通過內部將 {{getvar::}} 和 {{getglobalvar::}} 巨集替換為具範圍的變數來實現。）",
+    "stscript_parser_flag_replace_getvar_label": "防止 {{getvar::}} 和 {{getglobalvar::}} 巨集的字面巨集樣值被自動解析。\n例如，{{newline}} 將保持為字面字串 {{newline}}。\n\n（此功能通過內部將 {{getvar::}} 和 {{getglobalvar::}} 巨集替換為具範圍的變數來實現。）",
-    "[title]Style and routing of graph edges.": "圖形邊的樣式和路徑。",
+    "Style and routing of graph edges.": "圖形邊的樣式和路徑。",
-    "[title]Swap width and height": "交換寬度與高度",
+    "Swap width and height": "交換寬度與高度",
-    "[title]Swipe left": "向左滑動",
+    "Swipe left": "向左滑動",
-    "[title]Swipe right": "向右滑動",
+    "Swipe right": "向右滑動",
-    "[title]Switch the Character/Tags filter around to exclude the listed characters and tags from matching for this entry": "切換角色／標籤篩選，將列出的角色和標籤從此條目的匹配中排除",
+    "Switch the Character/Tags filter around to exclude the listed characters and tags from matching for this entry": "切換角色／標籤篩選，將列出的角色和標籤從此條目的匹配中排除",
-    "[title]sysprompt_enabled": "啟用系統提示詞",
+    "sysprompt_enabled": "啟用系統提示詞",
-    "[title]The number of sequences generated at each step with Beam Search.": "在 Beam Search 中每一步生成的序列數量。",
+    "The number of sequences generated at each step with Beam Search.": "在 Beam Search 中每一步生成的序列數量。",
-    "[title]The visual appearance of a node in the graph.": "圖形中節點的視覺外觀。",
+    "The visual appearance of a node in the graph.": "圖形中節點的視覺外觀。",
-    "[title]Update a connection profile": "更新連線設定檔",
+    "Update a connection profile": "更新連線設定檔",
-    "[title]Update current prompt": "更新此提示詞",
+    "Update current prompt": "更新此提示詞",
-    "[title]Update current template": "更新此模板",
+    "Update current template": "更新此模板",
-    "[title]Use GPU acceleration for positioning the full info panel that appears when you click a node. If the tooltip arrow tends to disappear, turning this off may help.": "啟用 GPU 加速來定位點擊節點時出現的完整資訊面板。若發現工具提示箭頭經常消失，可考慮關閉此功能。",
+    "Use GPU acceleration for positioning the full info panel that appears when you click a node. If the tooltip arrow tends to disappear, turning this off may help.": "啟用 GPU 加速來定位點擊節點時出現的完整資訊面板。若發現工具提示箭頭經常消失，可考慮關閉此功能。",
-    "[title]Use the colors of the ST GUI theme, instead of the colors configured in Color Settings specifically for this extension.": "以 ST GUI 主題的顏色，取代「顏色設定」中針對此擴展特別配置的顏色。",
+    "Use the colors of the ST GUI theme, instead of the colors configured in Color Settings specifically for this extension.": "以 ST GUI 主題的顏色，取代「顏色設定」中針對此擴展特別配置的顏色。",
-    "[title]View connection profile details": "查看連線設定檔詳情",
+    "View connection profile details": "查看連線設定檔詳情",
-    "[title]When enabled, nodes that have swipes splitting off of them will appear subtly larger, in addition to having the double border.": "啟用後，具分支滑動的節點將顯示雙重邊框，還會略微放大。",
+    "When enabled, nodes that have swipes splitting off of them will appear subtly larger, in addition to having the double border.": "啟用後，具分支滑動的節點將顯示雙重邊框，還會略微放大。",
-    "[title]WI Entry Status:🔵 Constant🟢 Normal🔗 Vectorized": "世界資訊條目狀態：\\r🔵 恆定\\r🟢 正常\\r🔗 向量化",
+    "WI Entry Status:🔵 Constant🟢 Normal🔗 Vectorized": "世界資訊條目狀態：\\r🔵 恆定\\r🟢 正常\\r🔗 向量化",
-    "[title]Width of a node, in pixels at zoom level 1.0.": "縮放等級為 1.0 時，節點的像素寬度。",
+    "Width of a node, in pixels at zoom level 1.0.": "縮放等級為 1.0 時，節點的像素寬度。",
-    "[title]world_button_title": "角色背景設定\\n\\n點擊以載入\\nShift+ 點擊開啟「連結至世界資訊」彈窗",
+    "world_button_title": "角色背景設定\\n\\n點擊以載入\\nShift+ 點擊開啟「連結至世界資訊」彈窗",
     "# of Beams": "# of Beams",
     "01.AI API Key": "01.AI API 金鑰",
     "01.AI Model": "01.AI 模型",

     "at the end of the URL!": "在 URL 末尾！",
     "Audio Playback Speed": "音檔播放速度",
     "Auto-select Input Text": "自動選擇輸入文本",
-    "Automatically caption images": "自動為圖片添加字幕",
+    "Automatically caption images": "自動為圖片添加註解",
-    "Auxiliary": "輔助",
+    "Auxiliary": "輔助提示詞",
     "Background Image": "背景圖片",
     "Block Entropy API Key": "Block Entropy API 金鑰",
     "Can be set manually or with an _space": "可以手動設置或使用 _space",

     "Delay until recursion (can only be activated on recursive checking)": "遞迴掃描延遲（僅在啟用遞迴掃描時可用）",
     "Do not proceed if you do not agree to this!": "若不同意此條款，請勿繼續！",
     "Edge Color": "邊緣顏色",
-    "Edit captions before saving": "在保存前編輯字幕",
+    "Edit captions before saving": "在保存前編輯註解",
     "Enable for files": "為文件啟用",
     "Enable for World Info": "為世界資訊啟用",
     "enable_functions_desc_1": "允許使用",

     "Horde": "Horde",
     "HuggingFace Token": "HuggingFace 符元",
     "Image Captioning": "圖片標註",
+    "Generate Caption": "生成圖片說明",
     "Image Type - talkinghead (extras)": "圖片類型 - talkinghead（額外選項）",
     "Injection Position": "插入位置",
     "Injection position. Relative (to other prompts in prompt manager) or In-chat @ Depth.": "插入位置（與提示詞管理器中的其他提示相比）或聊天中的深度位置。",

     "Only used when Main API or WebLLM Extension is selected.": "僅在選擇主要 API 或 WebLLM 擴展時使用。",
     "Open a chat to see the character expressions.": "開啟聊天以查看角色表情。",
     "Post-History Instructions": "聊天歷史後指示",
-    "Prefer Character Card Instructions": "偏好角色卡聊天歷史後指示",
+    "Prefer Character Card Instructions": "角色卡聊天歷史後指示優先",
     "Prioritize": "優先處理",
     "Prompt Content": "提示詞內容",
     "prompt_manager_in_chat": "聊天中的提示詞管理",

     "Select with Tab or Enter": "按 Tab 或 Enter 選擇",
     "Separators as Stop Strings": "以分隔符作為停止字串",
     "Set the default and fallback expression being used when no matching expression is found.": "設定在無法配對到表情時所使用的預設和替代圖片。",
-    "Set your API keys and endpoints in the API Connections tab first.": "請先在「API 連接」頁面中設定您的 API 密鑰和端點。",
+    "Set your API keys and endpoints in the API Connections tab first.": "請先在「API 連接」頁面中設定您的 API 金鑰和端點。",
     "Show default images (emojis) if sprite missing": "無對應圖片時，顯示為預設表情符號（emoji）",
     "Show group chat queue": "顯示群組聊天隊列",
     "Size threshold (KB)": "大小閾值（KB）",
     "Slash Command": "斜線命令",
     "space_ slash command.": "斜線命令。",
     "Sprite Folder Override": "表情立繪資料夾覆蓋",
-    "Sprite set:": "表情集：",
+    "Sprite set:": "立繪組：",
     "Show Gallery": "查看畫廊",
     "Sticky": "固定",
     "Style Preset": "預設樣式",
     "Summarize chat messages for vector generation": "摘要聊天訊息以進行向量化處理",
     "Summarize chat messages when sending": "傳送時摘要聊天內容",
     "Swipe # for All Messages": "為所有訊息分配滑動編號 #",
-    "System Message Sequences": "系統訊息順序",
+    "System Message Sequences": "系統訊息序列",
     "System Prefix": "系統訊息前綴",
-    "System Prompt Sequences": "系統提示詞順序",
+    "System Prompt Sequences": "系統提示詞序列",
     "System Suffix": "系統訊息後綴",
     "Tabby Model": "Tabby 模型",
     "tag_import_all": "全部匯入",

     "Upload sprite pack (ZIP)": "打包上傳立繪（ZIP 格式）",
     "Use a forward slash to specify a subfolder. Example: _space": "使用「/」來設置子目錄，例如：_space",
     "Use ADetailer (Face)": "使用 ADetailer 進行臉部處理。",
-    "Use an admin API key.": "使用管理員的 API 密鑰。",
+    "Use an admin API key.": "使用管理員的 API 金鑰。",
     "Use global": "啟用全域設定",
-    "User Message Sequences": "使用者訊息順序",
+    "User Message Sequences": "使用者訊息序列",
     "User Node Color": "使用者節點顏色",
     "User Prefix": "使用者訊息前綴",
     "User Suffix": "使用者訊息後綴",

     "Will be used if the API doesnt support JSON schemas or function calling.": "若 API 不支持 JSON 模式或函數調用，將使用此設定。",
     "World Info settings": "世界資訊設定",
     "You are in offline mode. Click on the image below to set the expression.": "您目前為離線狀態，請點擊下方圖片進行表情設定。",
-    "You can find your API key in the Stability AI dashboard.": "API 金鑰可在 Stability AI 儀表板中查看。"
+    "You can find your API key in the Stability AI dashboard.": "API 金鑰可在 Stability AI 儀表板中查看。",
+    "Stop Inspecting": "停止檢查",
+    "Inspect Prompts": "檢查提示詞",
+    "Toggle prompt inspection": "切換提示詞檢查"
+}

public/script.js+121 -78 Viewed

     SVGInject,
     Popper,
     initLibraryShims,
+    slideToggle,
     default as libs,
 } from './lib.js';

 let exportPopper = Popper.createPopper(document.getElementById('export_button'), document.getElementById('export_format_popup'), {
     placement: 'left',
 });
+let isExportPopupOpen = false;
 // Saved here for performance reasons
 const messageTemplate = $('#message_template .mes');

     };
+}
+export function getSlideToggleOptions() {
+    return {
+        miliseconds: animation_duration * 1.5,
+        transitionFunction: animation_duration > 0 ? 'ease-in-out' : 'step-start',
+    };
+}
 $.ajaxPrefilter((options, originalOptions, xhr) => {
     xhr.setRequestHeader('X-CSRF-Token', token);
 });

@@ -1173,7 +1182,7 @@ async function getStatusTextgen() {
1173	return resultCheckStatus();	1182	return resultCheckStatus();
1174	}	1183	}
1175		1184
1176	if (textgen_settings.type == textgen_types.OOBA && textgen_settings.bypass_status_check) {	1185	if ([textgen_types.GENERIC, textgen_types.OOBA].includes(textgen_settings.type) && textgen_settings.bypass_status_check) {
1177	setOnlineStatus('Status check bypassed');	1186	setOnlineStatus('Status check bypassed');
1178	return resultCheckStatus();	1187	return resultCheckStatus();
1179	}	1188	}

             setOnlineStatus(textgen_settings.tabby_model || data?.result);
         } else if (textgen_settings.type === textgen_types.GENERIC) {
             loadGenericModels(data?.data);
-            setOnlineStatus(textgen_settings.generic_model || 'Connected');
+            setOnlineStatus(textgen_settings.generic_model || data?.result || 'Connected');
         } else {
             setOnlineStatus(data?.result);
+        }

                 const shouldDeleteMessage = type !== 'swipe' && ['', '...'].includes(lastMessage?.mes) && ['', '...'].includes(streamingProcessor?.result);
                 hasToolCalls && shouldDeleteMessage && await deleteLastMessage();
                 const invocationResult = await ToolManager.invokeFunctionTools(streamingProcessor.toolCalls);
+                const shouldStopGeneration = (!invocationResult.invocations.length && shouldDeleteMessage) || invocationResult.stealthCalls.length;
                 if (hasToolCalls) {
-                    if (!invocationResult.invocations.length && shouldDeleteMessage) {
+                    if (shouldStopGeneration) {
+                        if (Array.isArray(invocationResult.errors) && invocationResult.errors.length) {
                             ToolManager.showToolCallError(invocationResult.errors);
+                        }
                         unblockGeneration(type);
                         generatedPromptCache = '';
                         streamingProcessor = null;

             const shouldDeleteMessage = type !== 'swipe' && ['', '...'].includes(getMessage);
             hasToolCalls && shouldDeleteMessage && await deleteLastMessage();
             const invocationResult = await ToolManager.invokeFunctionTools(data);
+            const shouldStopGeneration = (!invocationResult.invocations.length && shouldDeleteMessage) || invocationResult.stealthCalls.length;
             if (hasToolCalls) {
-                if (!invocationResult.invocations.length && shouldDeleteMessage) {
+                if (shouldStopGeneration) {
+                    if (Array.isArray(invocationResult.errors) && invocationResult.errors.length) {
                         ToolManager.showToolCallError(invocationResult.errors);
+                    }
                     unblockGeneration(type);
                     generatedPromptCache = '';
                     return;

  * @returns {void}
  */
 function doNavbarIconClick() {
-    var icon = $(this).find('.drawer-icon');
+    const icon = $(this).find('.drawer-icon');
-    var drawer = $(this).parent().find('.drawer-content');
+    const drawer = $(this).parent().find('.drawer-content');
     if (drawer.hasClass('resizing')) { return; }
-    var drawerWasOpenAlready = $(this).parent().find('.drawer-content').hasClass('openDrawer');
+    const drawerWasOpenAlready = $(this).parent().find('.drawer-content').hasClass('openDrawer');
-    let targetDrawerID = $(this).parent().find('.drawer-content').attr('id');
+    const targetDrawerID = $(this).parent().find('.drawer-content').attr('id');
     const pinnedDrawerClicked = drawer.hasClass('pinnedOpen');
     if (!drawerWasOpenAlready) { //to open the drawer
-        $('.openDrawer').not('.pinnedOpen').addClass('resizing').slideToggle(200, 'swing', async function () {
+        $('.openDrawer').not('.pinnedOpen').addClass('resizing').each((_, el) => {
-            await delay(50); $(this).closest('.drawer-content').removeClass('resizing');
+            slideToggle(el, {
+                ...getSlideToggleOptions(),
+                onAnimationEnd: function (el) {
+                    el.closest('.drawer-content').classList.remove('resizing');
+                },
+            });
         });
-        $('.openIcon').toggleClass('closedIcon openIcon');
+        $('.openIcon').not('.drawerPinnedOpen').toggleClass('closedIcon openIcon');
         $('.openDrawer').not('.pinnedOpen').toggleClass('closedDrawer openDrawer');
         icon.toggleClass('openIcon closedIcon');
         drawer.toggleClass('openDrawer closedDrawer');
         //console.log(targetDrawerID);
         if (targetDrawerID === 'right-nav-panel') {
-            $(this).closest('.drawer').find('.drawer-content').addClass('resizing').slideToggle({
+            $(this).closest('.drawer').find('.drawer-content').addClass('resizing').each((_, el) => {
-                duration: 200,
+                slideToggle(el, {
-                easing: 'swing',
+                    ...getSlideToggleOptions(),
-                start: function () {
+                    elementDisplayStyle: 'flex',
-                    jQuery(this).css('display', 'flex'); //flex needed to make charlist scroll
+                    onAnimationEnd: function (el) {
-                },
+                        el.closest('.drawer-content').classList.remove('resizing');
-                complete: async function () {
                         favsToHotswap();
-                    await delay(50);
-                    $(this).closest('.drawer-content').removeClass('resizing');
                         $('#rm_print_characters_block').trigger('scroll');
                     },
                 });
+            });
         } else {
-            $(this).closest('.drawer').find('.drawer-content').addClass('resizing').slideToggle(200, 'swing', async function () {
+            $(this).closest('.drawer').find('.drawer-content').addClass('resizing').each((_, el) => {
-                await delay(50); $(this).closest('.drawer-content').removeClass('resizing');
+                slideToggle(el, {
+                    ...getSlideToggleOptions(),
+                    onAnimationEnd: function (el) {
+                        el.closest('.drawer-content').classList.remove('resizing');
+                    },
+                });
             });
+        }

         icon.toggleClass('closedIcon openIcon');
         if (pinnedDrawerClicked) {
-            $(drawer).addClass('resizing').slideToggle(200, 'swing', async function () {
+            $(drawer).addClass('resizing').each((_, el) => {
-                await delay(50); $(this).removeClass('resizing');
+                slideToggle(el, {
+                    ...getSlideToggleOptions(),
+                    onAnimationEnd: function (el) {
+                        el.classList.remove('resizing');
+                    },
+                });
             });
+        }
         else {
-            $('.openDrawer').not('.pinnedOpen').addClass('resizing').slideToggle(200, 'swing', async function () {
+            $('.openDrawer').not('.pinnedOpen').addClass('resizing').each((_, el) => {
-                await delay(50); $(this).closest('.drawer-content').removeClass('resizing');
+                slideToggle(el, {
+                    ...getSlideToggleOptions(),
+                    onAnimationEnd: function (el) {
+                        el.closest('.drawer-content').classList.remove('resizing');
+                    },
+                });
             });
+        }

         await getStatusNovel();
     });
-    var button = $('#options_button');
+    const button = $('#options_button');
-    var menu = $('#options');
+    const menu = $('#options');
+    let isOptionsMenuVisible = false;
     function showMenu() {
         showBookmarksButtons();
-        // menu.stop()
         menu.fadeIn(animation_duration);
         optionsPopper.update();
+        isOptionsMenuVisible = true;
+    }
     function hideMenu() {
-        // menu.stop();
         menu.fadeOut(animation_duration);
         optionsPopper.update();
+        isOptionsMenuVisible = false;
+    }
     function isMouseOverButtonOrMenu() {

+    }
     button.on('click', function () {
-        if (menu.is(':visible')) {
+        if (isOptionsMenuVisible) {
             hideMenu();
         } else {
             showMenu();
+        }
     });
-    button.on('blur', function () {
-        //delay to prevent menu hiding when mouse leaves button into menu
-        setTimeout(() => {
-            if (!isMouseOverButtonOrMenu()) { hideMenu(); }
-        }, 100);
-    });
-    menu.on('blur', function () {
-        //delay to prevent menu hide when mouseleaves menu into button
-        setTimeout(() => {
-            if (!isMouseOverButtonOrMenu()) { hideMenu(); }
-        }, 100);
-    });
     $(document).on('click', function () {
-        if (!isMouseOverButtonOrMenu() && menu.is(':visible')) { hideMenu(); }
+        if (!isOptionsMenuVisible) return;
+        if (!isMouseOverButtonOrMenu()) { hideMenu(); }
     });
     /* $('#set_chat_scenario').on('click', setScenarioOverride); */

     });
     $(document).on('click', '.extraMesButtonsHint', function (e) {
-        const elmnt = e.target;
+        const $hint = $(e.target);
-        $(elmnt).transition({
+        const $buttons = $hint.siblings('.extraMesButtons');
+        $hint.transition({
             opacity: 0,
             duration: animation_duration,
-            easing: 'ease-in-out',
+            easing: animation_easing,
-        });
+            complete: function () {
-        setTimeout(function () {
+                $hint.hide();
-            $(elmnt).hide();
+                $buttons
-            $(elmnt).siblings('.extraMesButtons').css('opcacity', '0');
+                    .addClass('visible')
-            $(elmnt).siblings('.extraMesButtons').css('display', 'flex');
+                    .css({
-            $(elmnt).siblings('.extraMesButtons').transition({
+                        opacity: 0,
+                        display: 'flex',
+                    })
+                    .transition({
                         opacity: 1,
                         duration: animation_duration,
-                easing: 'ease-in-out',
+                        easing: animation_easing,
+                    });
+            },
         });
-        }, animation_duration);
     });
     $(document).on('click', function (e) {

         // Check if the click was outside the relevant elements
         if (!$(e.target).closest('.extraMesButtons, .extraMesButtonsHint').length) {
+            const $visibleButtons = $('.extraMesButtons.visible');
+            if (!$visibleButtons.length) {
+                return;
+            }
+            const $hiddenHints = $('.extraMesButtonsHint:hidden');
             // Transition out the .extraMesButtons first
-            $('.extraMesButtons:visible').transition({
+            $visibleButtons.transition({
                 opacity: 0,
                 duration: animation_duration,
-                easing: 'ease-in-out',
+                easing: animation_easing,
                 complete: function () {
-                    $(this).hide(); // Hide the .extraMesButtons after the transition
+                    // Hide the .extraMesButtons after the transition
+                    $(this)
+                        .hide()
+                        .removeClass('visible');
                     // Transition the .extraMesButtonsHint back in
-                    $('.extraMesButtonsHint:not(:visible)').show().transition({
+                    $hiddenHints
-                        opacity: .3,
+                        .show()
+                        .transition({
+                            opacity: 0.3,
                             duration: animation_duration,
-                        easing: 'ease-in-out',
+                            easing: animation_easing,
                             complete: function () {
                                 $(this).css('opacity', '');
                             },

+        }
     });
-    $('#export_button').on('click', function (e) {
+    $('#export_button').on('click', function () {
-        $('#export_format_popup').toggle();
+        isExportPopupOpen = !isExportPopupOpen;
+        $('#export_format_popup').toggle(isExportPopupOpen);
         exportPopper.update();
     });

             return;
+        }
+        $('#export_format_popup').hide();
+        isExportPopupOpen = false;
+        exportPopper.update();
         // Save before exporting
         await createOrEditCharacter();
         const body = { format, avatar_url: characters[this_chid].avatar };

             URL.revokeObjectURL(a.href);
             document.body.removeChild(a);
+        }
-        $('#export_format_popup').hide();
     });
     //**************************CHAT IMPORT EXPORT*************************//
     $('#chat_import_button').click(function () {

     });
     $(document).on('click', '.drawer-opener', doDrawerOpenClick);
     $('.drawer-toggle').on('click', doNavbarIconClick);
     $('html').on('touchstart mousedown', function (e) {
         var clickTarget = $(e.target);
-        if ($('#export_format_popup').is(':visible')
+        if (isExportPopupOpen
             && clickTarget.closest('#export_button').length == 0
             && clickTarget.closest('#export_format_popup').length == 0) {
             $('#export_format_popup').hide();
+            isExportPopupOpen = false;
+            exportPopper.update();
+        }
         const forbiddenTargets = [

             if ($('.openDrawer').length !== 0) {
                 if (targetParentHasOpenDrawer === 0) {
                     //console.log($('.openDrawer').not('.pinnedOpen').length);
-                    $('.openDrawer').not('.pinnedOpen').addClass('resizing').slideToggle(200, 'swing', function () {
+                    $('.openDrawer').not('.pinnedOpen').addClass('resizing').each((_, el) => {
-                        $(this).closest('.drawer-content').removeClass('resizing');
+                        slideToggle(el, {
+                            ...getSlideToggleOptions(),
+                            onAnimationEnd: (el) => {
+                                el.closest('.drawer-content').classList.remove('resizing');
+                            },
+                        });
                     });
                     $('.openIcon').not('.drawerPinnedOpen').toggleClass('closedIcon openIcon');
                     $('.openDrawer').not('.pinnedOpen').toggleClass('closedDrawer openDrawer');
+                }
+            }
+        }

             case 'renameCharButton':
                 renameCharacter();
                 break;
-            /*case 'dupe_button':
-                DupeChar();
-                break;
-            case 'export_button':
-                $('#export_format_popup').toggle();
-                exportPopper.update();
-                break;
-            */
             case 'import_character_info':
                 await importEmbeddedWorldInfo();
                 saveCharacterDebounced();

public/scripts/RossAscends-mods.js+8 -7 Viewed

-import { DOMPurify, Bowser } from '../lib.js';
+import { DOMPurify, Bowser, slideToggle } from '../lib.js';
 import {
     characters,

     menu_type,
     substituteParams,
     sendTextareaMessage,
+    getSlideToggleOptions,
 } from '../script.js';
 import {

@@ -748,8 +749,8 @@ export function initRossMods() {
748	$(RightNavDrawerIcon).removeClass('drawerPinnedOpen');	749	$(RightNavDrawerIcon).removeClass('drawerPinnedOpen');
749		750
750	if ($(RightNavPanel).hasClass('openDrawer') && $('.openDrawer').length > 1) {	751	if ($(RightNavPanel).hasClass('openDrawer') && $('.openDrawer').length > 1) {
751	$(RightNavPanel).slideToggle(200, 'swing');	752	slideToggle(RightNavPanel, getSlideToggleOptions());
752	$(RightNavDrawerIcon).toggleClass('openIcon closedIcon');	753	$(RightNavDrawerIcon).toggleClass('closedIcon openIcon');
753	$(RightNavPanel).toggleClass('openDrawer closedDrawer');	754	$(RightNavPanel).toggleClass('openDrawer closedDrawer');
754	}	755	}
755	}	756	}

@@ -766,8 +767,8 @@ export function initRossMods() {
766	$(LeftNavDrawerIcon).removeClass('drawerPinnedOpen');	767	$(LeftNavDrawerIcon).removeClass('drawerPinnedOpen');
767		768
768	if ($(LeftNavPanel).hasClass('openDrawer') && $('.openDrawer').length > 1) {	769	if ($(LeftNavPanel).hasClass('openDrawer') && $('.openDrawer').length > 1) {
769	$(LeftNavPanel).slideToggle(200, 'swing');	770	slideToggle(LeftNavPanel, getSlideToggleOptions());
770	$(LeftNavDrawerIcon).toggleClass('openIcon closedIcon');	771	$(LeftNavDrawerIcon).toggleClass('closedIcon openIcon');
771	$(LeftNavPanel).toggleClass('openDrawer closedDrawer');	772	$(LeftNavPanel).toggleClass('openDrawer closedDrawer');
772	}	773	}
773	}	774	}

@@ -786,8 +787,8 @@ export function initRossMods() {
786		787
787	if ($(WorldInfo).hasClass('openDrawer') && $('.openDrawer').length > 1) {	788	if ($(WorldInfo).hasClass('openDrawer') && $('.openDrawer').length > 1) {
788	console.debug('closing WI after lock removal');	789	console.debug('closing WI after lock removal');
789	$(WorldInfo).slideToggle(200, 'swing');	790	slideToggle(WorldInfo, getSlideToggleOptions());
790	$(WIDrawerIcon).toggleClass('openIcon closedIcon');	791	$(WIDrawerIcon).toggleClass('closedIcon openIcon');
791	$(WorldInfo).toggleClass('openDrawer closedDrawer');	792	$(WorldInfo).toggleClass('openDrawer closedDrawer');
792	}	793	}
793	}	794	}

public/scripts/extensions.js+8 -4 Viewed

     const button = $('#extensionsMenuButton');
     const dropdown = $('#extensionsMenu');
-    //dropdown.hide();
+    let isDropdownVisible = false;
     let popper = Popper.createPopper(button.get(0), dropdown.get(0), {
         placement: 'top-start',
     });
     $(button).on('click', function () {
-        if (dropdown.is(':visible')) {
+        if (isDropdownVisible) {
             dropdown.fadeOut(animation_duration);
+            isDropdownVisible = false;
         } else {
             dropdown.fadeIn(animation_duration);
+            isDropdownVisible = true;
+        }
         popper.update();
     });
     $('html').on('click', function (e) {
+        if (!isDropdownVisible) return;
         const clickTarget = $(e.target);
         const noCloseTargets = ['#sd_gen', '#extensionsMenuButton', '#roll_dice'];
-        if (dropdown.is(':visible') && !noCloseTargets.some(id => clickTarget.closest(id).length > 0)) {
+        if (!noCloseTargets.some(id => clickTarget.closest(id).length > 0)) {
-            $(dropdown).fadeOut(animation_duration);
+            dropdown.fadeOut(animation_duration);
+            isDropdownVisible = false;
+        }
     });
+}

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

         const sendButton = $(`
         <div id="send_picture" class="list-group-item flex-container flexGap5">
             <div class="fa-solid fa-image extensionsMenuExtensionButton"></div>
-            Generate Caption
+            <span data-i18n="Generate Caption">Generate Caption</span>
         </div>`);
         $('#caption_wand_container').append(sendButton);

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

                         <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>
                         <option data-type="groq" value="llama-3.2-11b-vision-preview">llama-3.2-11b-vision-preview</option>
                         <option data-type="groq" value="llama-3.2-90b-vision-preview">llama-3.2-90b-vision-preview</option>
                         <option data-type="groq" value="llava-v1.5-7b-4096-preview">llava-v1.5-7b-4096-preview</option>

public/scripts/extensions/stable-diffusion/button.html+2 -2 Viewed

 <div id="sd_gen" class="list-group-item flex-container flexGap5">
     <div class="fa-solid fa-paintbrush extensionsMenuExtensionButton" title="Trigger Stable Diffusion"  data-i18n="[title]Trigger Stable Diffusion"></div>
-    <span>Generate Image</span>
+    <span data-i18n="Generate Image">Generate Image</span>
 </div>
 <div id="sd_stop_gen" class="list-group-item flex-container flexGap5">
     <div class="fa-solid fa-circle-stop extensionsMenuExtensionButton" title="Abort current image generation task" data-i18n="[title]Abort current image generation task"></div>
-    <span>Stop Image Generation</span>
+    <span data-i18n="Stop Image Generation">Stop Image Generation</span>
 </div>

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

     wand_visible: false,
     command_visible: false,
     interactive_visible: false,
+    tool_visible: false,
     // Stability AI settings
     stability_style_preset: 'anime',

     $('#sd_wand_visible').prop('checked', extension_settings.sd.wand_visible);
     $('#sd_command_visible').prop('checked', extension_settings.sd.command_visible);
     $('#sd_interactive_visible').prop('checked', extension_settings.sd.interactive_visible);
+    $('#sd_tool_visible').prop('checked', extension_settings.sd.tool_visible);
     $('#sd_stability_style_preset').val(extension_settings.sd.stability_style_preset);
     $('#sd_huggingface_model_id').val(extension_settings.sd.huggingface_model_id);
     $('#sd_function_tool').prop('checked', extension_settings.sd.function_tool);

     saveSettingsDebounced();
+}
+function onToolVisibleInput() {
+    extension_settings.sd.tool_visible = !!$('#sd_tool_visible').prop('checked');
+    saveSettingsDebounced();
+}
 function onClipSkipInput() {
     extension_settings.sd.clip_skip = Number($('#sd_clip_skip').val());
     $('#sd_clip_skip_value').val(extension_settings.sd.clip_skip);

             return !!extension_settings.sd.wand_visible;
         case initiators.command:
             return !!extension_settings.sd.command_visible;
+        case initiators.tool:
+            return !!extension_settings.sd.tool_visible;
         default:
             return false;
+    }

     $('#sd_wand_visible').on('input', onWandVisibleInput);
     $('#sd_command_visible').on('input', onCommandVisibleInput);
     $('#sd_interactive_visible').on('input', onInteractiveVisibleInput);
+    $('#sd_tool_visible').on('input', onToolVisibleInput);
     $('#sd_swap_dimensions').on('click', onSwapDimensionsClick);
     $('#sd_stability_key').on('click', onStabilityKeyClick);
     $('#sd_stability_style_preset').on('change', onStabilityStylePresetChange);

public/scripts/extensions/stable-diffusion/settings.html+10 -3 Viewed

             <div class="flex-container flexFlowColumn marginTopBot5 flexGap10">
                 <label for="sd_wand_visible" class="checkbox_label">
                     <span class="flex1 flex-container alignItemsCenter">
-                        <i class="fa-solid fa-wand-magic-sparkles"></i>
+                        <i class="fa-solid fa-wand-magic-sparkles fa-fw"></i>
                         <span data-i18n="Extensions Menu">Extensions Menu</span>
                     </span>
                     <input id="sd_wand_visible" type="checkbox" />
                 </label>
                 <label for="sd_command_visible" class="checkbox_label">
                     <span class="flex1 flex-container alignItemsCenter">
-                        <i class="fa-solid fa-terminal"></i>
+                        <i class="fa-solid fa-terminal fa-fw"></i>
                         <span data-i18n="Slash Command">Slash Command</span>
                     </span>
                     <input id="sd_command_visible" type="checkbox" />
                 </label>
                 <label for="sd_interactive_visible" class="checkbox_label">
                     <span class="flex1 flex-container alignItemsCenter">
-                        <i class="fa-solid fa-message"></i>
+                        <i class="fa-solid fa-message fa-fw"></i>
                         <span data-i18n="Interactive Mode">Interactive Mode</span>
                     </span>
                     <input id="sd_interactive_visible" type="checkbox" />
                 </label>
+                <label for="sd_tool_visible" class="checkbox_label">
+                    <span class="flex1 flex-container alignItemsCenter">
+                        <i class="fa-solid fa-code fa-fw"></i>
+                        <span data-i18n="Function Tool">Function Tool</span>
+                    </span>
+                    <input id="sd_tool_visible" type="checkbox" />
+                </label>
             </div>
         </div>
     </div>

public/scripts/macros.js+4 -0 Viewed

@@ -516,7 +516,11 @@ export function evaluateMacros(content, env, postProcessFn) {
516	break;	516	break;
517	}	517	}
518		518
		519	try {
519	content = content.replace(macro.regex, (...args) => postProcessFn(macro.replace(...args)));	520	content = content.replace(macro.regex, (...args) => postProcessFn(macro.replace(...args)));
		521	} catch (e) {
		522	console.warn(`Macro content can't be replaced: ${macro.regex} in ${content}`, e);
		523	}
520	}	524	}
521		525
522	return content;	526	return content;

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

             $('#openai_max_context').attr('max', max_2mil);
         } else if (value.includes('gemini-1.5-flash') || value.includes('gemini-2.0-flash-exp')) {
             $('#openai_max_context').attr('max', max_1mil);
-        } else if (value.includes('gemini-1.0-pro-vision') || value === 'gemini-pro-vision') {
-            $('#openai_max_context').attr('max', max_16k);
         } else if (value.includes('gemini-1.0-pro') || value === 'gemini-pro') {
             $('#openai_max_context').attr('max', max_32k);
-        } else if (value === 'text-bison-001') {
-            $('#openai_max_context').attr('max', max_8k);
-            // The ultra endpoints are possibly dead:
         } else if (value.includes('gemini-1.0-ultra') || value === 'gemini-ultra') {
             $('#openai_max_context').attr('max', max_32k);
         } else {

@@ -4226,16 +4221,13 @@ async function onModelChange() {
4226	if (oai_settings.max_context_unlocked) {	4221	if (oai_settings.max_context_unlocked) {
4227	$('#openai_max_context').attr('max', unlocked_max);	4222	$('#openai_max_context').attr('max', unlocked_max);
4228	}	4223	}
4229	else if (['command-light', 'command'].includes(oai_settings.cohere_model)) {	4224	else if (['command-light-nightly', 'command-light', 'command'].includes(oai_settings.cohere_model)) {
4230	$('#openai_max_context').attr('max', max_4k);	4225	$('#openai_max_context').attr('max', max_4k);
4231	}	4226	}
4232	else if (['command-light-nightly', 'command-nightly'].includes(oai_settings.cohere_model)) {	4227	else if (oai_settings.cohere_model.includes('command-r') \|\| ['c4ai-aya-23', 'c4ai-aya-expanse-32b', 'command-nightly'].includes(oai_settings.cohere_model)) {
4233	$('#openai_max_context').attr('max', max_8k);
4234	}
4235	else if (oai_settings.cohere_model.includes('command-r') \|\| ['c4ai-aya-expanse-32b'].includes(oai_settings.cohere_model)) {
4236	$('#openai_max_context').attr('max', max_128k);	4228	$('#openai_max_context').attr('max', max_128k);
4237	}	4229	}
4238	else if (['c4ai-aya-23', 'c4ai-aya-expanse-8b'].includes(oai_settings.cohere_model)) {	4230	else if (['c4ai-aya-23-8b', 'c4ai-aya-expanse-8b'].includes(oai_settings.cohere_model)) {
4239	$('#openai_max_context').attr('max', max_8k);	4231	$('#openai_max_context').attr('max', max_8k);
4240	}	4232	}
4241	else {	4233	else {

         'gemini-1.5-pro-002',
         'gemini-1.5-pro-exp-0801',
         'gemini-1.5-pro-exp-0827',
-        'gemini-pro-vision',
         'claude-3',
         'claude-3-5',
         'gpt-4-turbo',

public/scripts/textgen-settings.js+5 -2 Viewed

 } = textgen_types;
 const LLAMACPP_DEFAULT_ORDER = [
+    'dry',
     'top_k',
     'tfs_z',
     'typical_p',

@@ -1038,11 +1039,13 @@ export function parseTextgenLogprobs(token, logprobs) {
1038	return { token, topLogprobs: candidates };	1039	return { token, topLogprobs: candidates };
1039	}	1040	}
1040	case LLAMACPP: {	1041	case LLAMACPP: {
1041	/** @type {Record<string, number>[]} */
1042	if (!logprobs?.length) {	1042	if (!logprobs?.length) {
1043	return null;	1043	return null;
1044	}	1044	}
1045	const candidates = logprobs[0].probs.map(x => [x.tok_str, x.prob]);	1045	const candidates = logprobs?.[0]?.probs?.map(x => [x.tok_str, x.prob]);
		1046	if (!candidates) {
		1047	return null;
		1048	}
1046	return { token, topLogprobs: candidates };	1049	return { token, topLogprobs: candidates };
1047	}	1050	}
1048	default:	1051	default:

public/scripts/tool-calling.js+58 -5 Viewed

  * @typedef {object} ToolInvocationResult
  * @property {ToolInvocation[]} invocations Successful tool invocations
  * @property {Error[]} errors Errors that occurred during tool invocation
+ * @property {string[]} stealthCalls Names of stealth tools that were invoked
  */
 /**

  * @property {function} action - The action to perform when the tool is invoked.
  * @property {function} [formatMessage] - A function to format the tool call message.
  * @property {function} [shouldRegister] - A function to determine if the tool should be registered.
+ * @property {boolean} [stealth] - A tool call result will not be shown in the chat. No follow-up generation will be performed.
  */
 /**

     #shouldRegister;
     /**
+     * A tool call result will not be shown in the chat. No follow-up generation will be performed.
+     * @type {boolean}
+     */
+    #stealth;
+    /**
      * Creates a new ToolDefinition.
      * @param {string} name A unique name for the tool.
      * @param {string} displayName A user-friendly display name for the tool.

      * @param {function} action A function that will be called when the tool is executed.
      * @param {function} formatMessage A function that will be called to format the tool call toast.
      * @param {function} shouldRegister A function that will be called to determine if the tool should be registered.
+     * @param {boolean} stealth A tool call result will not be shown in the chat. No follow-up generation will be performed.
      */
-    constructor(name, displayName, description, parameters, action, formatMessage, shouldRegister) {
+    constructor(name, displayName, description, parameters, action, formatMessage, shouldRegister, stealth) {
         this.#name = name;
         this.#displayName = displayName;
         this.#description = description;

         this.#action = action;
         this.#formatMessage = formatMessage;
         this.#shouldRegister = shouldRegister;
+        this.#stealth = stealth;
+    }
     /**

@@ -214,6 +224,10 @@ class ToolDefinition {
214	get displayName() {	224	get displayName() {
215	return this.#displayName;	225	return this.#displayName;
216	}	226	}
		227
		228	get stealth() {
		229	return this.#stealth;
		230	}
217	}	231	}
218		232
219	/**	233	/**

      * Registers a new tool with the tool registry.
      * @param {ToolRegistration} tool The tool to register.
      */
-    static registerFunctionTool({ name, displayName, description, parameters, action, formatMessage, shouldRegister }) {
+    static registerFunctionTool({ name, displayName, description, parameters, action, formatMessage, shouldRegister, stealth }) {
         // Convert WIP arguments
         if (typeof arguments[0] !== 'object') {
             [name, description, parameters, action] = arguments;

             console.warn(`[ToolManager] A tool with the name "${name}" has already been registered. The definition will be overwritten.`);
+        }
-        const definition = new ToolDefinition(name, displayName, description, parameters, action, formatMessage, shouldRegister);
+        const definition = new ToolDefinition(
+            name,
+            displayName,
+            description,
+            parameters,
+            action,
+            formatMessage,
+            shouldRegister,
+            stealth,
+        );
         this.#tools.set(name, definition);
         console.log('[ToolManager] Registered function tool:', definition);
+    }

+    }
     /**
+     * Checks if a tool is a stealth tool.
+     * @param {string} name The name of the tool to check.
+     * @returns {boolean} Whether the tool is a stealth tool.
+     */
+    static isStealthTool(name) {
+        if (!this.#tools.has(name)) {
+            return false;
+        }
+        const tool = this.#tools.get(name);
+        return !!tool.stealth;
+    }
+    /**
      * Formats a message for a tool call by name.
      * @param {string} name The name of the tool to format the message for.
      * @param {object} parameters Function tool call parameters.

         const result = {
             invocations: [],
             errors: [],
+            stealthCalls: [],
         };
         const toolCalls = ToolManager.#getToolCallsFromData(data);

             const parameters = toolCall.function.arguments;
             const name = toolCall.function.name;
             const displayName = ToolManager.getDisplayName(name);
+            const isStealth = ToolManager.isStealthTool(name);
             const message = await ToolManager.formatToolCallMessage(name, parameters);
             const toast = message && toastr.info(message, 'Tool Calling', { timeOut: 0 });
             const toolResult = await ToolManager.invokeFunctionTool(name, parameters);

                 continue;
+            }
+            // Don't save stealth tool invocations
+            if (isStealth) {
+                result.stealthCalls.push(name);
+                continue;
+            }
             const invocation = {
                 id,
                 displayName,

                     isRequired: false,
                     acceptsMultiple: false,
                 }),
+                SlashCommandNamedArgument.fromProps({
+                    name: 'stealth',
+                    description: 'If true, a tool call result will not be shown in the chat and no follow-up generation will be performed.',
+                    typeList: [ARGUMENT_TYPE.BOOLEAN],
+                    isRequired: false,
+                    acceptsMultiple: false,
+                    defaultValue: String(false),
+                }),
             ],
             unnamedArgumentList: [
                 SlashCommandArgument.fromProps({

                     };
+                }
-                const { name, displayName, description, parameters, formatMessage, shouldRegister } = args;
+                const { name, displayName, description, parameters, formatMessage, shouldRegister, stealth } = args;
                 if (!(action instanceof SlashCommandClosure)) {
                     throw new Error('The unnamed argument must be a closure.');

                     action: actionFunc,
                     formatMessage: formatMessageFunc,
                     shouldRegister: shouldRegisterFunc,
+                    stealth: stealth && isTrueBoolean(String(stealth)),
                 });
                 return '';

public/scripts/variables.js+8 -0 Viewed

@@ -46,6 +46,10 @@ function getLocalVariable(name, args = {}) {
46	}	46	}
47		47
48	function setLocalVariable(name, value, args = {}) {	48	function setLocalVariable(name, value, args = {}) {
		49	if (!name) {
		50	throw new Error('Variable name cannot be empty or undefined.');
		51	}
		52
49	if (!chat_metadata.variables) {	53	if (!chat_metadata.variables) {
50	chat_metadata.variables = {};	54	chat_metadata.variables = {};
51	}	55	}

+}
 function setGlobalVariable(name, value, args = {}) {
+    if (!name) {
+        throw new Error('Variable name cannot be empty or undefined.');
+    }
     if (args.index !== undefined) {
         try {
             let globalVariable = JSON.parse(extension_settings.variables.global[name] ?? 'null');

public/style.css+2 -1 Viewed

 .mes_block .ch_name {
     max-width: 100%;
+    min-height: 22px;
+}
 /*applies to both groups and solos chars in the char list*/

 .mes_button,
 .extraMesButtons>div {
     cursor: pointer;
-    transition: 0.3s ease-in-out;
+    transition: opacity 0.2s ease-in-out;
     filter: drop-shadow(0px 0px 2px black);
     opacity: 0.3;
     padding: 1px 3px;

src/constants.js+0 -27 Viewed

     },
 ];
-export const BISON_SAFETY = [
-    {
-        category: 'HARM_CATEGORY_DEROGATORY',
-        threshold: 'BLOCK_NONE',
-    },
-    {
-        category: 'HARM_CATEGORY_TOXICITY',
-        threshold: 'BLOCK_NONE',
-    },
-    {
-        category: 'HARM_CATEGORY_VIOLENCE',
-        threshold: 'BLOCK_NONE',
-    },
-    {
-        category: 'HARM_CATEGORY_SEXUAL',
-        threshold: 'BLOCK_NONE',
-    },
-    {
-        category: 'HARM_CATEGORY_MEDICAL',
-        threshold: 'BLOCK_NONE',
-    },
-    {
-        category: 'HARM_CATEGORY_DANGEROUS',
-        threshold: 'BLOCK_NONE',
-    },
-];
 export const CHAT_COMPLETION_SOURCES = {
     OPENAI: 'openai',
     WINDOWAI: 'windowai',

src/endpoints/backends/chat-completions.js+5 -42 Viewed

 import {
     CHAT_COMPLETION_SOURCES,
     GEMINI_SAFETY,
-    BISON_SAFETY,
     OPENROUTER_HEADERS,
 } from '../../constants.js';
 import {

+    }
     const model = String(request.body.model);
-    const isGemini = model.includes('gemini');
+    const stream = Boolean(request.body.stream);
-    const isText = model.includes('text');
-    const stream = Boolean(request.body.stream) && isGemini;
     const generationConfig = {
         stopSequences: request.body.stop,

         return body;
+    }
-    function getBisonBody() {
+    const body = getGeminiBody();
-        const prompt = isText
-            ? ({ text: convertTextCompletionPrompt(request.body.messages) })
-            : ({ messages: convertGooglePrompt(request.body.messages, model).contents });
-        /** @type {any} Shut the lint up */
-        const bisonBody = {
-            ...generationConfig,
-            safetySettings: BISON_SAFETY,
-            candidate_count: 1, // lewgacy spelling
-            prompt: prompt,
-        };
-        if (!isText) {
-            delete bisonBody.stopSequences;
-            delete bisonBody.maxOutputTokens;
-            delete bisonBody.safetySettings;
-            if (Array.isArray(prompt.messages)) {
-                for (const msg of prompt.messages) {
-                    msg.author = msg.role;
-                    msg.content = msg.parts[0].text;
-                    delete msg.parts;
-                    delete msg.role;
-                }
-            }
-        }
-        delete bisonBody.candidateCount;
-        return bisonBody;
-    }
-    const body = isGemini ? getGeminiBody() : getBisonBody();
     console.log('Google AI Studio request:', body);
     try {

             controller.abort();
         });
-        const apiVersion = isGemini ? 'v1beta' : 'v1beta2';
+        const apiVersion = 'v1beta';
-        const responseType = isGemini
+        const responseType = (stream ? 'streamGenerateContent' : 'generateContent');
-            ? (stream ? 'streamGenerateContent' : 'generateContent')
-            : (isText ? 'generateText' : 'generateMessage');
         const generateResponse = await fetch(`${apiUrl.toString().replace(/\/$/, '')}/${apiVersion}/models/${model}:${responseType}?key=${apiKey}${stream ? '&alt=sse' : ''}`, {
             body: JSON.stringify(body),

@@ -897,7 +860,7 @@ router.post('/generate', jsonParser, function (request, response) {
897	}	860	}
898		861
899	let cachingAtDepth = getConfigValue('claude.cachingAtDepth', -1);	862	let cachingAtDepth = getConfigValue('claude.cachingAtDepth', -1);
900	if (Number.isInteger(cachingAtDepth) && cachingAtDepth >= 0 && request.body.model.startsWith('anthropic/claude-3')) {	863	if (Number.isInteger(cachingAtDepth) && cachingAtDepth >= 0 && request.body.model?.startsWith('anthropic/claude-3')) {
901	cachingAtDepthForOpenRouterClaude(request.body.messages, cachingAtDepth);	864	cachingAtDepthForOpenRouterClaude(request.body.messages, cachingAtDepth);
902	}	865	}
903	} else if (request.body.chat_completion_source === CHAT_COMPLETION_SOURCES.CUSTOM) {	866	} else if (request.body.chat_completion_source === CHAT_COMPLETION_SOURCES.CUSTOM) {

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

  * @returns {{contents: *[], system_instruction: {parts: {text: string}}}} Prompt for Google MakerSuite models
  */
 export function convertGooglePrompt(messages, model, useSysPrompt = false, charName = '', userName = '') {
-    // This is a 1x1 transparent PNG
-    const PNG_PIXEL = 'iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII=';
     const visionSupportedModels = [
         'gemini-2.0-flash-exp',

         'gemini-1.5-pro-002',
         'gemini-1.5-pro-exp-0801',
         'gemini-1.5-pro-exp-0827',
-        'gemini-1.0-pro-vision-latest',
-        'gemini-pro-vision',
-    ];
-    const dummyRequiredModels = [
-        'gemini-1.0-pro-vision-latest',
-        'gemini-pro-vision',
     ];
     const isMultimodal = visionSupportedModels.includes(model);

+        }
     });
-    // pro 1.5 doesn't require a dummy image to be attached, other vision models do
-    if (isMultimodal && dummyRequiredModels.includes(model) && !hasImage) {
-        contents[0].parts.push({
-            inlineData: {
-                mimeType: 'image/png',
-                data: PNG_PIXEL,
-            },
-        });
-    }
     return { contents: contents, system_instruction: system_instruction };
+}