-[English](readme.md) | [中文](readme-zh_cn.md) | [日本語](readme-ja_jp.md) | Русский
+[English](readme.md) | [German](readme-de_de.md) | [中文](readme-zh_cn.md) | [日本語](readme-ja_jp.md) | Русский
[](https://github.com/SillyTavern/SillyTavern/stargazers)
[](https://github.com/SillyTavern/SillyTavern/network)
diff --git a/.github/readme-zh_cn.md b/.github/readme-zh_cn.md
index a2f3a3623..27cf340cb 100644
--- a/.github/readme-zh_cn.md
+++ b/.github/readme-zh_cn.md
@@ -5,7 +5,7 @@
-[English](readme.md) | 中文 | [日本語](readme-ja_jp.md) | [Русский](readme-ru_ru.md)
+[English](readme.md) | [German](readme-de_de.md) | 中文 | [日本語](readme-ja_jp.md) | [Русский](readme-ru_ru.md)
[](https://github.com/SillyTavern/SillyTavern/stargazers)
[](https://github.com/SillyTavern/SillyTavern/network)
diff --git a/.github/readme.md b/.github/readme.md
index d6698bc4f..5a151c74c 100644
--- a/.github/readme.md
+++ b/.github/readme.md
@@ -4,7 +4,7 @@
-English | [中文](readme-zh_cn.md) | [日本語](readme-ja_jp.md) | [Русский](readme-ru_ru.md)
+English | [German](readme-de_de.md) | [中文](readme-zh_cn.md) | [日本語](readme-ja_jp.md) | [Русский](readme-ru_ru.md)
[](https://github.com/SillyTavern/SillyTavern/stargazers)
[](https://github.com/SillyTavern/SillyTavern/network)
diff --git a/.gitignore b/.gitignore
index 4be6774fb..235983338 100644
--- a/.gitignore
+++ b/.gitignore
@@ -49,3 +49,4 @@ public/css/user.css
/data
/default/scaffold
public/scripts/extensions/third-party
+/certs
diff --git a/UpdateAndStart.bat b/UpdateAndStart.bat
index 55cee5ce9..fbb3ac9bb 100644
--- a/UpdateAndStart.bat
+++ b/UpdateAndStart.bat
@@ -2,17 +2,26 @@
pushd %~dp0
git --version > nul 2>&1
if %errorlevel% neq 0 (
- echo Git is not installed on this system. Skipping update.
- echo If you installed with a zip file, you will need to download the new zip and install it manually.
+ echo [91mGit is not installed on this system.[0m
+ echo Install it from https://git-scm.com/downloads
+ goto end
) else (
+ if not exist .git (
+ echo [91mNot running from a Git repository. Reinstall using an officially supported method to get updates.[0m
+ echo See: https://docs.sillytavern.app/installation/windows/
+ goto end
+ )
call git pull --rebase --autostash
if %errorlevel% neq 0 (
REM incase there is still something wrong
- echo There were errors while updating. Please download the latest version manually.
+ echo [91mThere were errors while updating.[0m
+ echo See the update FAQ at https://docs.sillytavern.app/usage/update/#common-update-problems
+ goto end
)
)
set NODE_ENV=production
call npm install --no-audit --no-fund --loglevel=error --no-progress --omit=dev
node server.js %*
+:end
pause
popd
diff --git a/UpdateForkAndStart.bat b/UpdateForkAndStart.bat
index 8bfae8609..d788b9470 100644
--- a/UpdateForkAndStart.bat
+++ b/UpdateForkAndStart.bat
@@ -5,8 +5,14 @@ pushd %~dp0
echo Checking Git installation
git --version > nul 2>&1
if %errorlevel% neq 0 (
- echo Git is not installed on this system. Skipping update.
- echo If you installed with a zip file, you will need to download the new zip and install it manually.
+ echo [91mGit is not installed on this system.[0m
+ echo Install it from https://git-scm.com/downloads
+ goto end
+)
+
+if not exist .git (
+ echo [91mNot running from a Git repository. Reinstall using an officially supported method to get updates.[0m
+ echo See: https://docs.sillytavern.app/installation/windows/
goto end
)
@@ -89,7 +95,8 @@ git pull --rebase --autostash origin %TARGET_BRANCH%
:install
if %errorlevel% neq 0 (
- echo There were errors while updating. Please check manually.
+ echo [91mThere were errors while updating.[0m
+ echo See the update FAQ at https://docs.sillytavern.app/usage/update/#common-update-problems
goto end
)
diff --git a/default/config.yaml b/default/config.yaml
index 8a55f6afb..d95719f22 100644
--- a/default/config.yaml
+++ b/default/config.yaml
@@ -51,6 +51,19 @@ requestProxy:
enableUserAccounts: false
# Enable discreet login mode: hides user list on the login screen
enableDiscreetLogin: false
+# Enable's authlia based auto login. Only enable this if you
+# have setup and installed Authelia as a middle-ware on your
+# reverse proxy
+# https://www.authelia.com/
+# This will use auto login to an account with the same username
+# as that used for authlia. (Ensure the username in authlia
+# is an exact match with that in sillytavern)
+autheliaAuth: false
+# If `basicAuthMode` and this are enabled then
+# the username and passwords for basic auth are the same as those
+# for the individual accounts
+perUserBasicAuth: false
+
# User session timeout *in seconds* (defaults to 24 hours).
## Set to a positive number to expire session after a certain time of inactivity
## Set to 0 to expire session when the browser is closed
@@ -110,9 +123,6 @@ enableExtensionsAutoUpdate: true
# 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
@@ -121,10 +131,11 @@ extras:
classificationModel: Cohee/distilbert-base-uncased-go-emotions-onnx
captioningModel: Xenova/vit-gpt2-image-captioning
embeddingModel: Cohee/jina-embeddings-v2-base-en
- promptExpansionModel: Cohee/fooocus_expansion-onnx
speechToTextModel: Xenova/whisper-small
textToSpeechModel: Xenova/speecht5_tts
# -- OPENAI CONFIGURATION --
+# A placeholder message to use in strict prompt post-processing mode when the prompt doesn't start with a user message
+promptPlaceholder: "[Start a new chat]"
openai:
# Will send a random user ID to OpenAI completion API
randomizeUserId: false
diff --git a/default/content/Eldoria.json b/default/content/Eldoria.json
index 082e13ddf..64b7e1046 100644
--- a/default/content/Eldoria.json
+++ b/default/content/Eldoria.json
@@ -9,13 +9,34 @@
"magical forest"
],
"keysecondary": [],
- "comment": "",
+ "comment": "eldoria",
"content": "{{user}}: \"What is Eldoria?\"\n{{char}}: *Seraphina turns, her gown shimmering in the soft light as she offers you a kind smile.* \"Eldoria is here, all of the woods. This is my forest glade, a sanctuary of peace within it.\" *She gestures at the space around you.* \"I am its guardian, tasked with protecting all who seek refuge here. The forest can be perilous, but no harm will come to you under my watch.\" *Her amber eyes sparkle with compassion as she looks upon you.* \"For many years, I have protected those who seek refuge here, but not all are as friendly as me.\" *With a graceful nod, Seraphina returns to her vigil at the doorway, her form radiating a soft glow of magic and comfort.* \"The entirety of Eldoria used to be a safe haven for travelers and merchants alike... that was until the Shadowfangs came.\"\n{{user}}: \"What happened to Eldoria?\"\n{{char}}: *Letting out a sigh, Seraphina gazes out at the forest beyond her glade.* \"Long ago, Eldoria was a place of wonder. Rolling meadows, a vast lake, mountains that touched the sky.\" *Her eyes grow distant, longing for days now lost.* \"But the Shadowfangs came and darkness reigns where once was light. The lake turned bitter, mountains fell to ruin and beasts stalk where once travelers walked in peace.\" *With another flicker, a small raincloud forms above with a shower upon your brow wink.* \"Some places the light still lingers, pockets of hope midst despair - havens warded from the shadows, oases in a desert of danger.\" *Glancing over you with a smile, she sighs, clasping your hand.*",
"constant": false,
- "selective": false,
+ "selective": true,
"order": 100,
"position": 0,
- "disable": false
+ "disable": false,
+ "displayIndex": 0,
+ "addMemo": true,
+ "group": "",
+ "groupOverride": false,
+ "groupWeight": 100,
+ "sticky": 0,
+ "cooldown": 0,
+ "delay": 0,
+ "probability": 100,
+ "depth": 4,
+ "useProbability": true,
+ "role": null,
+ "vectorized": false,
+ "excludeRecursion": false,
+ "preventRecursion": false,
+ "delayUntilRecursion": false,
+ "scanDepth": null,
+ "caseSensitive": null,
+ "matchWholeWords": null,
+ "useGroupScoring": null,
+ "automationId": ""
},
"1": {
"uid": 1,
@@ -27,13 +48,34 @@
"beasts"
],
"keysecondary": [],
- "comment": "",
+ "comment": "shadowfang",
"content": "{{user}}: \"What are Shadowfangs?\"\n{{char}}: *Seraphina's eyes darken, brow furrowing with sorrow at the memory.* \"The Shadowfangs are beasts of darkness, corrupted creatures that feast on suffering. When they came, the forest turned perilous — filled with monsters that stalk the night.\" *She squeezes your hand gently, willing her magic to soothe your pain.* \"They spread their curse, twisting innocent creatures into sinister beasts without heart or mercy, turning them into one of their own.\" *With a sigh, Seraphina turns to gaze out at the gnarled, twisting trees beyond her glade.* \"Though they prey on travelers, within these woods you'll find sanctuary. No shadowed beast may enter here, for my power protects this haven.\" *Her eyes soften as she looks back to you, filled with compassion.* \"Worry not, you're safe now. Rest and heal, I'll stand watch through the night. The Shadowfangs will not find you.\"",
"constant": false,
- "selective": false,
+ "selective": true,
"order": 100,
"position": 0,
- "disable": false
+ "disable": false,
+ "displayIndex": 1,
+ "addMemo": true,
+ "group": "",
+ "groupOverride": false,
+ "groupWeight": 100,
+ "sticky": 0,
+ "cooldown": 0,
+ "delay": 0,
+ "probability": 100,
+ "depth": 4,
+ "useProbability": true,
+ "role": null,
+ "vectorized": false,
+ "excludeRecursion": false,
+ "preventRecursion": false,
+ "delayUntilRecursion": false,
+ "scanDepth": null,
+ "caseSensitive": null,
+ "matchWholeWords": null,
+ "useGroupScoring": null,
+ "automationId": ""
},
"2": {
"uid": 2,
@@ -43,13 +85,34 @@
"refuge"
],
"keysecondary": [],
- "comment": "",
+ "comment": "glade",
"content": "{{user}}: \"What is the glade?\"\n{{char}}: *Seraphina smiles softly, her eyes sparkling with warmth as she nods.* \"This is my forest glade, a haven of safety I've warded with ancient magic. No foul beast may enter, nor any with ill intent.\" *She gestures around at the twisted forest surrounding them.* \"Eldoria was once a place of wonder, but since the Shadowfangs came darkness reigns. Their evil cannot penetrate here though — my power protects all within.\" *Standing up and peering outside, Seraphina looks back to you, amber eyes filled with care and compassion as she squeezes your hand.* \"You need not fear the night, for I shall keep watch till dawn. Rest now, your strength will return in time. My magic heals your wounds, you've nothing more to fear anymore.\" *With a soft smile she releases your hand, moving to stand guard at the glade's edge, gaze wary yet comforting - a silent sentinel to ward off the dangers lurking in the darkened woods.*",
"constant": false,
- "selective": false,
+ "selective": true,
"order": 100,
"position": 0,
- "disable": false
+ "disable": false,
+ "displayIndex": 2,
+ "addMemo": true,
+ "group": "",
+ "groupOverride": false,
+ "groupWeight": 100,
+ "sticky": 0,
+ "cooldown": 0,
+ "delay": 0,
+ "probability": 100,
+ "depth": 4,
+ "useProbability": true,
+ "role": null,
+ "vectorized": false,
+ "excludeRecursion": false,
+ "preventRecursion": false,
+ "delayUntilRecursion": false,
+ "scanDepth": null,
+ "caseSensitive": null,
+ "matchWholeWords": null,
+ "useGroupScoring": null,
+ "automationId": ""
},
"3": {
"uid": 3,
@@ -59,13 +122,34 @@
"ability"
],
"keysecondary": [],
- "comment": "",
+ "comment": "power",
"content": "{{user}}: \"What are your powers?\"\n{{char}}: *Seraphina smiles softly, turning back toward you as she hums in thought.* \"Well, as guardian of this glade, I possess certain gifts - healing, protection, nature magic and the like.\" *Lifting her hand, a tiny breeze rustles through the room, carrying the scent of wildflowers as a few petals swirl around you. A butterfly flits through the windowsill and lands on her fingertips as she returns to you.* \"My power wards this haven, shields it from darkness and heals those in need. I can mend wounds, soothe restless minds and provide comfort to weary souls.\" *Her eyes sparkle with warmth and compassion as she looks upon you, and she guides the butterfly to you.*",
"constant": false,
- "selective": false,
+ "selective": true,
"order": 100,
"position": 0,
- "disable": false
+ "disable": false,
+ "displayIndex": 3,
+ "addMemo": true,
+ "group": "",
+ "groupOverride": false,
+ "groupWeight": 100,
+ "sticky": 0,
+ "cooldown": 0,
+ "delay": 0,
+ "probability": 100,
+ "depth": 4,
+ "useProbability": true,
+ "role": null,
+ "vectorized": false,
+ "excludeRecursion": false,
+ "preventRecursion": false,
+ "delayUntilRecursion": false,
+ "scanDepth": null,
+ "caseSensitive": null,
+ "matchWholeWords": null,
+ "useGroupScoring": null,
+ "automationId": ""
}
}
}
diff --git a/default/content/default_Seraphina.png b/default/content/default_Seraphina.png
index a1bd41b2e..14f3c1425 100644
Binary files a/default/content/default_Seraphina.png and b/default/content/default_Seraphina.png differ
diff --git a/default/content/presets/openai/Default.json b/default/content/presets/openai/Default.json
index 4e6076d5a..b8a38560c 100644
--- a/default/content/presets/openai/Default.json
+++ b/default/content/presets/openai/Default.json
@@ -5,7 +5,6 @@
"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",
diff --git a/jsconfig.json b/jsconfig.json
index a48606f1f..0e554015b 100644
--- a/jsconfig.json
+++ b/jsconfig.json
@@ -11,15 +11,14 @@
"resolveJsonModule": true
},
"exclude": [
- "node_modules",
- "**/node_modules/*",
- "public/lib",
- "backups/*",
- "data/*",
- "**/dist/*",
- "dist/*",
- "cache/*",
- "src/tokenizers/*",
- "docker/*",
+ "**/node_modules/**",
+ "**/dist/**",
+ "**/.git/**",
+ "public/lib/**",
+ "backups/**",
+ "data/**",
+ "cache/**",
+ "src/tokenizers/**",
+ "docker/**"
]
}
diff --git a/package-lock.json b/package-lock.json
index 94134d9b0..e25409398 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -59,9 +59,10 @@
"sillytavern": "server.js"
},
"devDependencies": {
+ "@types/dompurify": "^3.0.5",
"@types/jquery": "^3.5.29",
- "eslint": "^8.57.0",
- "jquery": "^3.6.4"
+ "@types/toastr": "^2.1.43",
+ "eslint": "^8.57.0"
},
"engines": {
"node": ">= 18"
@@ -960,6 +961,16 @@
"@types/responselike": "^1.0.0"
}
},
+ "node_modules/@types/dompurify": {
+ "version": "3.0.5",
+ "resolved": "https://registry.npmjs.org/@types/dompurify/-/dompurify-3.0.5.tgz",
+ "integrity": "sha512-1Wg0g3BtQF7sSb27fJQAKck1HECM6zV1EB66j8JH9i3LCjYabJa0FSdiSgsD5K/RbrsR0SiraKacLB+T8ZVYAg==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "@types/trusted-types": "*"
+ }
+ },
"node_modules/@types/http-cache-semantics": {
"version": "4.0.2",
"resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.2.tgz",
@@ -967,10 +978,11 @@
"license": "MIT"
},
"node_modules/@types/jquery": {
- "version": "3.5.29",
- "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.29.tgz",
- "integrity": "sha512-oXQQC9X9MOPRrMhPHHOsXqeQDnWeCDT3PelUIg/Oy8FAbzSZtFHRjc7IpbfFVmpLtJ+UOoywpRsuO5Jxjybyeg==",
+ "version": "3.5.31",
+ "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.31.tgz",
+ "integrity": "sha512-rf/iB+cPJ/YZfMwr+FVuQbm7IaWC4y3FVYfVDxRGqmUCFjjPII0HWaP0vTPJGp6m4o13AXySCcMbWfrWtBFAKw==",
"dev": true,
+ "license": "MIT",
"dependencies": {
"@types/sizzle": "*"
}
@@ -1021,6 +1033,23 @@
"integrity": "sha512-0vWLNK2D5MT9dg0iOo8GlKguPAU02QjmZitPEsXRuJXU/OGIOt9vT9Fc26wtYuavLxtO45v9PGleoL9Z0k1LHg==",
"dev": true
},
+ "node_modules/@types/toastr": {
+ "version": "2.1.43",
+ "resolved": "https://registry.npmjs.org/@types/toastr/-/toastr-2.1.43.tgz",
+ "integrity": "sha512-sLC2fr2OXeE1iyhUixpQ64wQ2tA26awmLidn4tXTLBz4yP/VhtYUKHpmiIyDtztKkHjucdiTLH8F5uRRyhNi2Q==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "@types/jquery": "*"
+ }
+ },
+ "node_modules/@types/trusted-types": {
+ "version": "2.0.7",
+ "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.7.tgz",
+ "integrity": "sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==",
+ "dev": true,
+ "license": "MIT"
+ },
"node_modules/@ungap/structured-clone": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz",
@@ -2038,21 +2067,21 @@
}
},
"node_modules/cookie": {
- "version": "0.4.1",
- "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.1.tgz",
- "integrity": "sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA==",
+ "version": "0.7.2",
+ "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.2.tgz",
+ "integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==",
"license": "MIT",
"engines": {
"node": ">= 0.6"
}
},
"node_modules/cookie-parser": {
- "version": "1.4.6",
- "resolved": "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.4.6.tgz",
- "integrity": "sha512-z3IzaNjdwUC2olLIB5/ITd0/setiaFMLYiZJle7xg5Fe9KWAceil7xszYfHHBtDFYLSgJduS2Ty0P1uJdPDJeA==",
+ "version": "1.4.7",
+ "resolved": "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.4.7.tgz",
+ "integrity": "sha512-nGUvgXnotP3BsjiLX2ypbQnWoGUPIIfHQNZkkC668ntrzGWEZVW70HDEB1qnNGMicPje6EttlIgzo51YSwNQGw==",
"license": "MIT",
"dependencies": {
- "cookie": "0.4.1",
+ "cookie": "0.7.2",
"cookie-signature": "1.0.6"
},
"engines": {
@@ -2865,9 +2894,9 @@
"integrity": "sha512-c2bQfLNbMzLPmzQuOr8fy0csy84WmwnER81W88DzTp9CYNPJ6yzOj2EZAh9pywYpqHnshVLHQJ8WzldAyfY+Iw=="
},
"node_modules/express": {
- "version": "4.21.0",
- "resolved": "https://registry.npmjs.org/express/-/express-4.21.0.tgz",
- "integrity": "sha512-VqcNGcj/Id5ZT1LZ/cfihi3ttTn+NJmkli2eZADigjq29qTlWi/hAQ43t/VLPq8+UX06FCEx3ByOYet6ZFblng==",
+ "version": "4.21.1",
+ "resolved": "https://registry.npmjs.org/express/-/express-4.21.1.tgz",
+ "integrity": "sha512-YSFlK1Ee0/GC8QaO91tHcDxJiE/X4FbpAyQWkxAvG6AXCuR65YzK8ua6D9hvi/TzUfZMpc+BwuM1IPw8fmQBiQ==",
"license": "MIT",
"dependencies": {
"accepts": "~1.3.8",
@@ -2875,7 +2904,7 @@
"body-parser": "1.20.3",
"content-disposition": "0.5.4",
"content-type": "~1.0.4",
- "cookie": "0.6.0",
+ "cookie": "0.7.1",
"cookie-signature": "1.0.6",
"debug": "2.6.9",
"depd": "2.0.0",
@@ -2907,9 +2936,10 @@
}
},
"node_modules/express/node_modules/cookie": {
- "version": "0.6.0",
- "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz",
- "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==",
+ "version": "0.7.1",
+ "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz",
+ "integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==",
+ "license": "MIT",
"engines": {
"node": ">= 0.6"
}
@@ -3881,13 +3911,6 @@
"integrity": "sha512-WZzeDOEtTOBK4Mdsar0IqEU5sMr3vSV2RqkAIzUEV2BHnUfKGyswWFPFwK5EeDo93K3FohSHbLAjj0s1Wzd+dg==",
"license": "BSD-3-Clause"
},
- "node_modules/jquery": {
- "version": "3.7.0",
- "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.7.0.tgz",
- "integrity": "sha512-umpJ0/k8X0MvD1ds0P9SfowREz2LenHsQaxSohMZ5OMNEU2r0tf8pdeEFTHMFxWVxKNyU9rTtK3CWzUCTKJUeQ==",
- "dev": true,
- "license": "MIT"
- },
"node_modules/js-yaml": {
"version": "4.1.0",
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
diff --git a/package.json b/package.json
index 382d6ab57..97ec01a9c 100644
--- a/package.json
+++ b/package.json
@@ -85,8 +85,9 @@
},
"main": "server.js",
"devDependencies": {
+ "@types/dompurify": "^3.0.5",
"@types/jquery": "^3.5.29",
- "eslint": "^8.57.0",
- "jquery": "^3.6.4"
+ "@types/toastr": "^2.1.43",
+ "eslint": "^8.57.0"
}
}
diff --git a/public/css/popup.css b/public/css/popup.css
index d184dc1fb..545f7014a 100644
--- a/public/css/popup.css
+++ b/public/css/popup.css
@@ -1,3 +1,4 @@
+@import url('/lib/dialog-polyfill.css');
@import url('./popup-safari-fix.css');
dialog {
@@ -42,7 +43,7 @@ dialog {
display: flex;
flex-direction: column;
overflow: hidden;
- width: 100%;
+ width: min(100%, 100vw);
height: 100%;
padding: 1px;
}
diff --git a/public/css/select2-overrides.css b/public/css/select2-overrides.css
index 47d9746ac..e09e761c9 100644
--- a/public/css/select2-overrides.css
+++ b/public/css/select2-overrides.css
@@ -17,7 +17,7 @@
.select2-container .select2-selection .select2-selection__clear {
color: var(--SmartThemeBodyColor);
- font-size: 24px;
+ font-size: 20px;
padding: 0;
position: absolute;
right: 5px;
@@ -50,6 +50,7 @@
padding: revert;
border-right: 1px solid var(--SmartThemeBorderColor);
font-size: 1.1em;
+ line-height: 1;
}
.select2-container .select2-selection--multiple .select2-selection__choice__display {
diff --git a/public/css/st-tailwind.css b/public/css/st-tailwind.css
index 69f5843a9..88e4ccb10 100644
--- a/public/css/st-tailwind.css
+++ b/public/css/st-tailwind.css
@@ -612,3 +612,7 @@ ul.li-padding-bot5 li {
ul.li-padding-bot10 li {
padding-bottom: 10px;
}
+
+.wordBreakAll {
+ word-break: break-all;
+}
diff --git a/public/css/toggle-dependent.css b/public/css/toggle-dependent.css
index c8d62ee7d..08bb08fe0 100644
--- a/public/css/toggle-dependent.css
+++ b/public/css/toggle-dependent.css
@@ -459,3 +459,18 @@ body.expandMessageActions .mes .mes_buttons .extraMesButtonsHint {
.mdhotkey_icon {
opacity: 0.6;
}
+
+label[for="trim_spaces"]:has(input:checked) i.warning {
+ display: none;
+}
+
+#claude_function_prefill_warning {
+ display: none;
+}
+
+#openai_settings:has(#openai_function_calling:checked):has(#claude_assistant_prefill:not(:placeholder-shown), #claude_assistant_impersonation:not(:placeholder-shown)) #claude_function_prefill_warning {
+ display: flex;
+ align-items: center;
+ gap: 5px;
+ margin: 10px 0;
+}
diff --git a/public/global.d.ts b/public/global.d.ts
index c8bfe14c2..a33182d46 100644
--- a/public/global.d.ts
+++ b/public/global.d.ts
@@ -1,5 +1,4 @@
// Global namespace modules
-declare var DOMPurify;
declare var droll;
declare var Handlebars;
declare var hljs;
@@ -1365,44 +1364,3 @@ declare namespace moment {
declare global {
const moment: typeof moment;
}
-
-/**
- * Callback data for the `LLM_FUNCTION_TOOL_REGISTER` event type that is triggered when a function tool can be registered.
- */
-interface FunctionToolRegister {
- /**
- * The type of generation that is being used
- */
- type?: string;
- /**
- * Generation data, including messages and sampling parameters
- */
- data: Record;
- /**
- * Callback to register an LLM function tool.
- */
- registerFunctionTool: typeof registerFunctionTool;
-}
-
-/**
- * Callback data for the `LLM_FUNCTION_TOOL_REGISTER` event type that is triggered when a function tool is registered.
- * @param name Name of the function tool to register
- * @param description Description of the function tool
- * @param params JSON schema for the parameters of the function tool
- * @param required Whether the function tool should be forced to be used
- */
-declare function registerFunctionTool(name: string, description: string, params: object, required: boolean): Promise;
-
-/**
- * Callback data for the `LLM_FUNCTION_TOOL_CALL` event type that is triggered when a function tool is called.
- */
-interface FunctionToolCall {
- /**
- * Name of the function tool to call
- */
- name: string;
- /**
- * JSON object with the parameters to pass to the function tool
- */
- arguments: string;
-}
diff --git a/public/index.html b/public/index.html
index 99994885e..bfd85f2bb 100644
--- a/public/index.html
+++ b/public/index.html
@@ -595,17 +595,6 @@