Add Tool Call Recurse Limit slider to Chat Completion settings (#5518) * feat: add Tool Call Recurse Limit slider to Chat/Message Handling settings Agent-Logs-Url: https://github.com/SillyTavern/SillyTavern/sessions/ecbde89f-8f4d-4e91-9189-a998d12ca76b Co-authored-by: Cohee1207 <18619528+Cohee1207@users.noreply.github.com> * feat: move tool call recurse limit to openai_settings under Chat Completion settings Agent-Logs-Url: https://github.com/SillyTavern/SillyTavern/sessions/132e4c28-9564-47cd-92c1-e8ab50d88905 Co-authored-by: Cohee1207 <18619528+Cohee1207@users.noreply.github.com> * refactor: use CSS :has() selector instead of JS toggle for tool_call_recurse_limit_block visibility Agent-Logs-Url: https://github.com/SillyTavern/SillyTavern/sessions/c562deb5-05ce-4ebf-84a0-9eeea9d24433 Co-authored-by: Cohee1207 <18619528+Cohee1207@users.noreply.github.com> * fix: wrap tool_call_recurse_limit_block in range-block for correct layout Agent-Logs-Url: https://github.com/SillyTavern/SillyTavern/sessions/4d25a367-ac12-4e54-83b0-1543eb6f370a Co-authored-by: Cohee1207 <18619528+Cohee1207@users.noreply.github.com> * fix: data-i18n attribute --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: Cohee1207 <18619528+Cohee1207@users.noreply.github.com>

7948886c1d6577ee771aab694847e3dfb3c85980

Copilot <198982749+Copilot@users.noreply.github.com>

Signed
Parents: 0a493cad89969edfadb4c9a174eb0c58045675f1
4 files changed, +28 -14Ignore whitespace
package-lock.json+0 -14
@@ -549,7 +549,6 @@
549549 "resolved": "https://registry.npmjs.org/@jimp/custom/-/custom-0.22.12.tgz",
550550 "integrity": "sha512-xcmww1O/JFP2MrlGUMd3Q78S3Qu6W3mYTXYuIqFq33EorgYHV/HqymHfXy9GjiCJ7OI+7lWx6nYFOzU7M4rd1Q==",
551551 "license": "MIT",
552- "peer": true,
553552 "dependencies": {
554553 "@jimp/core": "^0.22.12"
555554 }
@@ -1011,7 +1010,6 @@
10111010 "resolved": "https://registry.npmjs.org/@jimp/plugin-resize/-/plugin-resize-1.6.0.tgz",
10121011 "integrity": "sha512-uSUD1mqXN9i1SGSz5ov3keRZ7S9L32/mAQG08wUwZiEi5FpbV0K8A8l1zkazAIZi9IJzLlTauRNU41Mi8IF9fA==",
10131012 "license": "MIT",
1014- "peer": true,
10151013 "dependencies": {
10161014 "@jimp/core": "1.6.0",
10171015 "@jimp/types": "1.6.0",
@@ -1043,7 +1041,6 @@
10431041 "resolved": "https://registry.npmjs.org/@jimp/plugin-scale/-/plugin-scale-0.22.12.tgz",
10441042 "integrity": "sha512-dghs92qM6MhHj0HrV2qAwKPMklQtjNpoYgAB94ysYpsXslhRTiPisueSIELRwZGEr0J0VUxpUY7HgJwlSIgGZw==",
10451043 "license": "MIT",
1046- "peer": true,
10471044 "dependencies": {
10481045 "@jimp/utils": "^0.22.12"
10491046 },
@@ -1139,7 +1136,6 @@
11391136 "resolved": "https://registry.npmjs.org/@jimp/plugin-blit/-/plugin-blit-0.22.12.tgz",
11401137 "integrity": "sha512-xslz2ZoFZOPLY8EZ4dC29m168BtDx95D6K80TzgUi8gqT7LY6CsajWO0FAxDwHz6h0eomHMfyGX0stspBrTKnQ==",
11411138 "license": "MIT",
1142- "peer": true,
11431139 "dependencies": {
11441140 "@jimp/utils": "^0.22.12"
11451141 },
@@ -1176,7 +1172,6 @@
11761172 "resolved": "https://registry.npmjs.org/@jimp/plugin-color/-/plugin-color-0.22.12.tgz",
11771173 "integrity": "sha512-xImhTE5BpS8xa+mAN6j4sMRWaUgUDLoaGHhJhpC+r7SKKErYDR0WQV4yCE4gP+N0gozD0F3Ka1LUSaMXrn7ZIA==",
11781174 "license": "MIT",
1179- "peer": true,
11801175 "dependencies": {
11811176 "@jimp/utils": "^0.22.12",
11821177 "tinycolor2": "^1.6.0"
@@ -1220,7 +1215,6 @@
12201215 "resolved": "https://registry.npmjs.org/@jimp/plugin-crop/-/plugin-crop-0.22.12.tgz",
12211216 "integrity": "sha512-FNuUN0OVzRCozx8XSgP9MyLGMxNHHJMFt+LJuFjn1mu3k0VQxrzqbN06yIl46TVejhyAhcq5gLzqmSCHvlcBVw==",
12221217 "license": "MIT",
1223- "peer": true,
12241218 "dependencies": {
12251219 "@jimp/utils": "^0.22.12"
12261220 },
@@ -1308,7 +1302,6 @@
13081302 "resolved": "https://registry.npmjs.org/@jimp/plugin-resize/-/plugin-resize-0.22.12.tgz",
13091303 "integrity": "sha512-3NyTPlPbTnGKDIbaBgQ3HbE6wXbAlFfxHVERmrbqAi8R3r6fQPxpCauA8UVDnieg5eo04D0T8nnnNIX//i/sXg==",
13101304 "license": "MIT",
1311- "peer": true,
13121305 "dependencies": {
13131306 "@jimp/utils": "^0.22.12"
13141307 },
@@ -1321,7 +1314,6 @@
13211314 "resolved": "https://registry.npmjs.org/@jimp/plugin-rotate/-/plugin-rotate-0.22.12.tgz",
13221315 "integrity": "sha512-9YNEt7BPAFfTls2FGfKBVgwwLUuKqy+E8bDGGEsOqHtbuhbshVGxN2WMZaD4gh5IDWvR+emmmPPWGgaYNYt1gA==",
13231316 "license": "MIT",
1324- "peer": true,
13251317 "dependencies": {
13261318 "@jimp/utils": "^0.22.12"
13271319 },
@@ -1922,7 +1914,6 @@
19221914 "integrity": "sha512-Crp6WY9aTYP3qPi2wGDo9iUe/rceX01UMhnF1jmwDcKCFM6cx7YhGP/Mpr3y9AASpfHixIG0E6azCcL5OcDHsQ==",
19231915 "dev": true,
19241916 "license": "MIT",
1925- "peer": true,
19261917 "dependencies": {
19271918 "@types/body-parser": "*",
19281919 "@types/express-serve-static-core": "^4.17.33",
@@ -2612,7 +2603,6 @@
26122603 "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.16.0.tgz",
26132604 "integrity": "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw==",
26142605 "license": "MIT",
2615- "peer": true,
26162606 "bin": {
26172607 "acorn": "bin/acorn"
26182608 },
@@ -3232,7 +3222,6 @@
32323222 }
32333223 ],
32343224 "license": "MIT",
3235- "peer": true,
32363225 "dependencies": {
32373226 "baseline-browser-mapping": "^2.9.0",
32383227 "caniuse-lite": "^1.0.30001759",
@@ -4567,7 +4556,6 @@
45674556 "deprecated": "This version is no longer supported. Please see https://eslint.org/version-support for other options.",
45684557 "dev": true,
45694558 "license": "MIT",
4570- "peer": true,
45714559 "dependencies": {
45724560 "@eslint-community/eslint-utils": "^4.2.0",
45734561 "@eslint-community/regexpp": "^4.6.1",
@@ -8125,7 +8113,6 @@
81258113 "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.18.0.tgz",
81268114 "integrity": "sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==",
81278115 "license": "MIT",
8128- "peer": true,
81298116 "dependencies": {
81308117 "fast-deep-equal": "^3.1.3",
81318118 "fast-uri": "^3.0.1",
@@ -9143,7 +9130,6 @@
91439130 "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
91449131 "dev": true,
91459132 "license": "Apache-2.0",
9146- "peer": true,
91479133 "bin": {
91489134 "tsc": "bin/tsc",
91499135 "tsserver": "bin/tsserver"
public/css/toggle-dependent.css+4 -0
@@ -565,6 +565,10 @@ label[for="bind_preset_to_connection"]:has(input:checked) {
565565 display: none;
566566}
567567
568+#openai_settings:has(#openai_function_calling:not(:checked)) #tool_call_recurse_limit_block {
569+ display: none;
570+}
571+
568572#adaptive_p_block:has([data-tg-samplers="adaptive_target"][style*="display: none"]):has([data-tg-samplers="adaptive_decay"][style*="display: none"]) {
569573 display: none;
570574}
public/index.html+14 -0
@@ -2011,6 +2011,20 @@
20112011 <span data-i18n="enable_functions_desc_3">Can be utilized by various extensions to provide additional functionality.</span>
20122012 <strong data-i18n="enable_functions_desc_4">Not supported when Prompt Post-Processing with "no tools" is used!</strong>
20132013 </div>
2014+ <div id="tool_call_recurse_limit_block" class="range-block wide100p">
2015+ <div class="range-block-title">
2016+ <small data-i18n="Tool Call Recurse Limit">Tool Call Recurse Limit</small>
2017+ <div class="fa-solid fa-circle-info opacity50p margin5" data-i18n="[title]Maximum number of tool call recursion steps per generation." title="Maximum number of tool call recursion steps per generation."></div>
2018+ </div>
2019+ <div class="range-block-range-and-counter">
2020+ <div class="range-block-range">
2021+ <input type="range" id="tool_call_recurse_limit" name="tool_call_recurse_limit" min="1" max="50" step="1">
2022+ </div>
2023+ <div class="range-block-counter">
2024+ <input type="number" min="1" max="50" step="1" data-for="tool_call_recurse_limit" id="tool_call_recurse_limit_counter">
2025+ </div>
2026+ </div>
2027+ </div>
20142028 </div>
20152029 <div class="range-block" data-source="openrouter,custom">
20162030 <div class="flex-container flexFlowColumn wide100p textAlignCenter marginTop10">
public/scripts/openai.js+10 -0
@@ -383,6 +383,7 @@ export const settingsToUpdate = {
383383 continue_prefill: ['#continue_prefill', 'continue_prefill', true, false],
384384 continue_postfix: ['#continue_postfix', 'continue_postfix', false, false],
385385 function_calling: ['#openai_function_calling', 'function_calling', true, false],
386+ tool_call_recurse_limit: ['#tool_call_recurse_limit', 'tool_call_recurse_limit', false, false],
386387 show_thoughts: ['#openai_show_thoughts', 'show_thoughts', true, false],
387388 reasoning_effort: ['#openai_reasoning_effort', 'reasoning_effort', false, false],
388389 verbosity: ['#openai_verbosity', 'verbosity', false, false],
@@ -492,6 +493,7 @@ const default_settings = {
492493 bypass_status_check: false,
493494 continue_prefill: false,
494495 function_calling: false,
496+ tool_call_recurse_limit: 5,
495497 names_behavior: character_names_behavior.DEFAULT,
496498 continue_postfix: continue_postfix_types.SPACE,
497499 custom_prompt_post_processing: custom_prompt_post_processing_types.NONE,
@@ -4224,6 +4226,7 @@ function loadOpenAISettings(data, settings) {
42244226 setNamesBehaviorControls();
42254227 setContinuePostfixControls();
42264228 setToolReasoningControls();
4229+ ToolManager.RECURSE_LIMIT = oai_settings.tool_call_recurse_limit;
42274230
42284231 $('#openrouter_providers_chat').trigger('change');
42294232 $('#openrouter_quantizations_chat').trigger('change');
@@ -6826,6 +6829,13 @@ export function initOpenAI() {
68266829 saveSettingsDebounced();
68276830 });
68286831
6832+ $('#tool_call_recurse_limit').on('input', function () {
6833+ oai_settings.tool_call_recurse_limit = Number($(this).val());
6834+ $('#tool_call_recurse_limit_counter').val(oai_settings.tool_call_recurse_limit);
6835+ ToolManager.RECURSE_LIMIT = oai_settings.tool_call_recurse_limit;
6836+ saveSettingsDebounced();
6837+ });
6838+
68296839 $('#tool_reasoning_mode').on('input', function () {
68306840 oai_settings.tool_reasoning_mode = getToolReasoningMode({
68316841 ...oai_settings,