sillytavern-utils-lib 1.0.65 → 1.0.66

package/dist/prompt-builder.cjs

@@ -1,6 +1,6 @@
-"use strict";var Et=Object.defineProperty;var Rt=(m,i,o)=>i in m?Et(m,i,{enumerable:!0,configurable:!0,writable:!0,value:o}):m[i]=o;var A=(m,i,o)=>Rt(m,typeof i!="symbol"?i+"":i,o);Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const s=require("./config.cjs"),St=require("./tokenizer.cjs"),gt=require("../../../regex/engine.js"),dt=require("../../../../world-info.js"),a=require("../../../../../script.js"),_t=require("../../../../power-user.js"),ht=require("../../../../group-chats.js");class Ot{constructor(i){A(this,"messages",[]);A(this,"tokenizer");A(this,"maxContext");A(this,"currentTokenCount",0);this.tokenizer=new St.Tokenizer,this.maxContext=i}getTokenCount(i){var o,g;return i.content?((g=(o=i.source)==null?void 0:o.extra)==null?void 0:g.token_count)??this.tokenizer.encode(i.content).length:0}canFit(i){return this.currentTokenCount+this.getTokenCount(i)<=this.maxContext}add(i){if(!i.content)return!0;const o=this.getTokenCount(i);return this.currentTokenCount+o>this.maxContext?!1:(this.messages.push(i),this.currentTokenCount+=o,!0)}addFront(i){if(!i.content)return!0;const o=this.getTokenCount(i);return this.currentTokenCount+o>this.maxContext?!1:(this.messages.unshift(i),this.currentTokenCount+=o,!0)}addMany(i){const o=i.filter(u=>u.content),g=o.map(u=>this.getTokenCount(u)),U=g.reduce((u,P)=>u+P,0);if(this.currentTokenCount+U<=this.maxContext)return this.messages.push(...o),this.currentTokenCount+=U,!0;let b=0;const f=[];for(let u=o.length-1;u>=0;u--){const P=o[u],v=g[u];if(this.currentTokenCount+b+v<=this.maxContext)f.unshift(P),b+=v;else break}return f.length>0&&(this.messages.push(...f),this.currentTokenCount+=b),f.length===o.length}insert(i,o){if(!o.content)return!0;const g=this.getTokenCount(o);return this.currentTokenCount+g>this.maxContext?!1:(this.messages.splice(i,0,o),this.currentTokenCount+=g,!0)}getMessages(){return this.messages}}async function At(m,{targetCharacterId:i,presetName:o,instructName:g,contextName:U,syspromptName:b,maxContext:f,includeNames:u,ignoreCharacterFields:P,ignoreAuthorNote:v,ignoreWorldInfo:Q,messageIndexesBetween:k}={}){var Z,tt,et,ot,nt,st,rt,it,at,pt,ct,lt,ut,mt;if(!["textgenerationwebui","openai"].includes(m))throw new Error("Unsupported API");const n=SillyTavern.getContext();let{description:$,personality:q,persona:J,scenario:z,mesExamples:Pt,system:y,jailbreak:yt}=P?{description:"",personality:"",persona:"",scenario:"",mesExamples:"",system:"",jailbreak:""}:n.getCharacterCardFields({chid:i});const E=m==="textgenerationwebui"?(Z=n.getPresetManager("instruct"))==null?void 0:Z.getCompletionPresetByName(g):void 0,H=!!(E!=null&&E.enabled);let x=s.st_parseMesExamples(Pt,H);function xt(){var e,l;if(typeof f=="number")return f;if(!f||f==="active"||!o)return s.st_getMaxContextSize();if(typeof f=="number")return f;let t;if(m==="textgenerationwebui"){const r=(e=n.getPresetManager("textgenerationwebui"))==null?void 0:e.getCompletionPresetByName(o);t=r==null?void 0:r.max_length}else{const r=(l=n.getPresetManager("openai"))==null?void 0:l.getCompletionPresetByName(o);t=r==null?void 0:r.openai_max_context}return typeof t=="number"?t:s.st_getMaxContextSize()}let M=[];const W=xt();if(W<=0)return{result:[],warnings:M};const c=new Ot(W),Mt=n.ToolManager.isToolCallingSupported(),K=(k==null?void 0:k.start)??0,L=k!=null&&k.end?k.end+1:void 0;let w=K===-1&&L===0?[]:n.chat.slice(K,L).filter(t=>{var e;return!t.is_system||Mt&&Array.isArray((e=t.extra)==null?void 0:e.tool_invocations)});w=await Promise.all(w.map(async(t,e)=>{var j,D;let l=t.mes,r=t.is_user?gt.regex_placement.USER_INPUT:gt.regex_placement.AI_OUTPUT,p={isPrompt:!0,depth:w.length-e-1},d=s.st_getRegexedString(l,r,p);return d=await s.st_appendFileContent(t,d),(j=t==null?void 0:t.extra)!=null&&j.append_title&&((D=t==null?void 0:t.extra)!=null&&D.title)&&(d=`${d}
+"use strict";var Re=Object.defineProperty;var Se=(u,r,o)=>r in u?Re(u,r,{enumerable:!0,configurable:!0,writable:!0,value:o}):u[r]=o;var U=(u,r,o)=>Se(u,typeof r!="symbol"?r+"":r,o);Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const n=require("./config.cjs"),Oe=require("./tokenizer.cjs"),I=require("./prompt-message-utils.cjs"),de=require("../../../regex/engine.js"),_e=require("../../../../world-info.js"),a=require("../../../../../script.js"),he=require("../../../../power-user.js"),Pe=require("../../../../group-chats.js");class Ae{constructor(r){U(this,"messages",[]);U(this,"tokenizer");U(this,"maxContext");U(this,"currentTokenCount",0);this.tokenizer=new Oe.Tokenizer,this.maxContext=r}getTokenCount(r){var m,g;const o=I.getMessageText(r);return o?((g=(m=r.source)==null?void 0:m.extra)==null?void 0:g.token_count)??this.tokenizer.encode(o).length:0}canFit(r){return this.currentTokenCount+this.getTokenCount(r)<=this.maxContext}add(r){const o=I.sanitizePromptMessage(r);if(!o)return!0;r=o;const m=this.getTokenCount(r);return this.currentTokenCount+m>this.maxContext?!1:(this.messages.push(r),this.currentTokenCount+=m,!0)}addFront(r){const o=I.sanitizePromptMessage(r);if(!o)return!0;r=o;const m=this.getTokenCount(r);return this.currentTokenCount+m>this.maxContext?!1:(this.messages.unshift(r),this.currentTokenCount+=m,!0)}addMany(r){const o=I.sanitizePromptMessages(r),m=o.map(d=>this.getTokenCount(d)),g=m.reduce((d,y)=>d+y,0);if(this.currentTokenCount+g<=this.maxContext)return this.messages.push(...o),this.currentTokenCount+=g,!0;let v=0;const f=[];for(let d=o.length-1;d>=0;d--){const y=o[d],E=m[d];if(this.currentTokenCount+v+E<=this.maxContext)f.unshift(y),v+=E;else break}return f.length>0&&(this.messages.push(...f),this.currentTokenCount+=v),f.length===o.length}insert(r,o){const m=I.sanitizePromptMessage(o);if(!m)return!0;o=m;const g=this.getTokenCount(o);return this.currentTokenCount+g>this.maxContext?!1:(this.messages.splice(r,0,o),this.currentTokenCount+=g,!0)}getMessages(){return this.messages}}async function Ue(u,{targetCharacterId:r,presetName:o,instructName:m,contextName:g,syspromptName:v,maxContext:f,includeNames:d,ignoreCharacterFields:y,ignoreAuthorNote:E,ignoreWorldInfo:J,messageIndexesBetween:w}={}){var ee,te,oe,se,ne,re,ie,ae,pe,ce,le,me,ue,fe;if(!["textgenerationwebui","openai"].includes(u))throw new Error("Unsupported API");const s=SillyTavern.getContext();let{description:F,personality:$,persona:K,scenario:H,mesExamples:ye,system:x,jailbreak:xe}=y?{description:"",personality:"",persona:"",scenario:"",mesExamples:"",system:"",jailbreak:""}:s.getCharacterCardFields({chid:r});const R=u==="textgenerationwebui"?(ee=s.getPresetManager("instruct"))==null?void 0:ee.getCompletionPresetByName(m):void 0,W=!!(R!=null&&R.enabled);let M=n.st_parseMesExamples(ye,W);function Me(){var t,l;if(typeof f=="number")return f;if(!f||f==="active"||!o)return n.st_getMaxContextSize();if(typeof f=="number")return f;let e;if(u==="textgenerationwebui"){const i=(t=s.getPresetManager("textgenerationwebui"))==null?void 0:t.getCompletionPresetByName(o);e=i==null?void 0:i.max_length}else{const i=(l=s.getPresetManager("openai"))==null?void 0:l.getCompletionPresetByName(o);e=i==null?void 0:i.openai_max_context}return typeof e=="number"?e:n.st_getMaxContextSize()}let C=[];const G=Me();if(G<=0)return{result:[],warnings:C};const c=new Ae(G),Ce=s.ToolManager.isToolCallingSupported(),L=(w==null?void 0:w.start)??0,V=w!=null&&w.end?w.end+1:void 0;let b=L===-1&&V===0?[]:s.chat.slice(L,V).filter(e=>{var t;return!e.is_system||Ce&&Array.isArray((t=e.extra)==null?void 0:t.tool_invocations)});b=await Promise.all(b.map(async(e,t)=>{var z,D;let l=e.mes,i=e.is_user?de.regex_placement.USER_INPUT:de.regex_placement.AI_OUTPUT,p={isPrompt:!0,depth:b.length-t-1},_=n.st_getRegexedString(l,i,p);return _=await n.st_appendFileContent(e,_),(z=e==null?void 0:e.extra)!=null&&z.append_title&&((D=e==null?void 0:e.extra)!=null&&D.title)&&(_=`${_}
 
-${t.extra.title}`),{...t,mes:d,index:e}}));const Ct=w.map(t=>dt.world_info_include_names?`${t.name}: ${t.mes}`:t.mes).reverse(),{worldInfoString:Ut,worldInfoBefore:I,worldInfoAfter:N,worldInfoExamples:Tt,worldInfoDepth:kt,anBefore:V,anAfter:X}=Q?{worldInfoString:"",worldInfoBefore:"",worldInfoAfter:"",worldInfoExamples:[],worldInfoDepth:[],anBefore:[],anAfter:[]}:await n.getWorldInfoPrompt(Ct,W,!1);for(const t of Tt){const e=t.content;if(e.length===0)continue;const l=s.st_baseChatReplace(e,a.name1,a.name2),r=s.st_parseMesExamples(l,H);t.position===dt.wi_anchor_position.before?x.unshift(...r):x.push(...r)}function Y(){const t=[];for(let e=w.length-1;e>=0;e--){const l=w[e],r=l.name==="System"&&!l.is_user?"system":l.is_user?"user":"assistant";t.unshift({role:r,content:u&&r!="system"?`${l.name}: ${l.mes}`:l.mes,source:l})}c.addMany(t)}if(m==="textgenerationwebui"){const t=[...x];x&&(x=s.st_formatInstructModeExamples(x,a.name1,a.name2));const e=(tt=n.getPresetManager("sysprompt"))==null?void 0:tt.getCompletionPresetByName(b);e&&(y=n.powerUserSettings.prefer_character_prompt&&y?y:s.st_baseChatReplace(e.content,a.name1,a.name2),y=H?s.st_formatInstructModeSystemPrompt(n.substituteParams(y,a.name1,a.name2,e.content),E):y);const l={description:$,personality:q,persona:n.powerUserSettings.persona_description_position==_t.persona_description_positions.IN_PROMPT?J:"",scenario:z,system:y,char:a.name2,user:a.name1,wiBefore:I,wiAfter:N,loreBefore:I,loreAfter:N,mesExamples:x.join(""),mesExamplesRaw:t.join("")},r=(et=n.getPresetManager("context"))==null?void 0:et.getCompletionPresetByName(U);let p=s.st_renderStoryString(l,{customInstructSettings:E,customStoryString:r==null?void 0:r.story_string});p&&c.add({role:"system",content:p,ignoreInstruct:!0}),Y()}else{let t=function(h){const T=_.find(G=>G.identifier===h);if(T)return T;const ft=p.prompts.find(G=>G.identifier===h);if(ft)return ft},e=s.st_setOpenAIMessages(w),l=s.st_setOpenAIMessageExamples(x);async function r(){let[h,T]=await s.st_prepareOpenAIMessages({name2:a.name2,charDescription:$,charPersonality:q,Scenario:z,worldInfoBefore:I,worldInfoAfter:N,extensionPrompts:n.extensionPrompts,bias:"",type:"normal",quietPrompt:void 0,quietImage:void 0,cyclePrompt:"",systemPromptOverride:y,jailbreakPromptOverride:yt,personaDescription:J,messages:e,messageExamples:l},!1);c.addMany(h)}if(!o)return M.push("No preset name provided. Using default preset."),await r(),{result:c.getMessages(),warnings:M};const p=(ot=n.getPresetManager("openai"))==null?void 0:ot.getCompletionPresetByName(o);if(!p)return console.warn(`Preset not found: ${o}. Using current preset.`),M.push(`Preset not found: ${o}. Using current preset.`),r(),{result:c.getMessages(),warnings:M};let d=(nt=p.prompt_order)==null?void 0:nt.find(h=>h.character_id===a.this_chid);if(!d&&p.prompt_order&&p.prompt_order.length>0&&(d=p.prompt_order[p.prompt_order.length-1]),!d)return console.warn(`No prompt order found for preset: ${o}. Using current preset.`),M.push(`No prompt order found for preset: ${o}. Using current preset.`),r(),{result:c.getMessages(),warnings:M};const j=z&&p.scenario_format?n.substituteParams(p.scenario_format):"",D=q&&p.personality_format?n.substituteParams(p.personality_format):"",bt=n.substituteParams(p.group_nudge_prompt),vt=p.impersonation_prompt?n.substituteParams(p.impersonation_prompt):"",_=[];Q||_.push({role:"system",content:s.st_formatWorldInfo(I,{wiFormat:p.wi_format}),identifier:"worldInfoBefore"},{role:"system",content:s.st_formatWorldInfo(N,{wiFormat:p.wi_format}),identifier:"worldInfoAfter"}),P||_.push({role:"system",content:$,identifier:"charDescription"},{role:"system",content:D,identifier:"charPersonality"},{role:"system",content:j,identifier:"scenario"}),_.push({role:"system",content:vt,identifier:"impersonate"},{role:"system",content:bt,identifier:"groupNudge"});const R=n.extensionPrompts["1_memory"];R&&R.value&&_.push({role:s.st_getPromptRole(R.role),content:R.value,identifier:"summary",position:s.st_getPromptPosition(R.position)});const S=n.extensionPrompts["2_floating_prompt"];!v&&S&&S.value&&_.push({role:s.st_getPromptRole(S.role),content:S.value,identifier:"authorsNote",position:s.st_getPromptPosition(S.position)});const B=n.extensionPrompts["3_vectors"];B&&B.value&&_.push({role:"system",content:B.value,identifier:"vectorsMemory",position:s.st_getPromptPosition(B.position)});const O=n.extensionPrompts["4_vectors_data_bank"];O&&O.value&&_.push({role:s.st_getPromptRole(O.role),content:O.value,identifier:"vectorsDataBank",position:s.st_getPromptPosition(O.position)});const F=n.extensionPrompts.chromadb;F&&F.value&&_.push({role:"system",content:F.value,identifier:"smartContext",position:s.st_getPromptPosition(F.position)}),!P&&n.powerUserSettings.persona_description&&n.powerUserSettings.persona_description_position===_t.persona_description_positions.IN_PROMPT&&_.push({role:"system",content:n.powerUserSettings.persona_description,identifier:"personaDescription"}),d.order.forEach(h=>{if(!h.enabled)return;const T=t(h.identifier);if(T&&T.content){c.add({role:T.role??"system",content:n.substituteParams(T.content)});return}h.identifier==="chatHistory"&&Y()})}const wt=["1_memory","2_floating_prompt","3_vectors","4_vectors_data_bank","chromadb","PERSONA_DESCRIPTION","QUIET_PROMPT","DEPTH_PROMPT"];for(const t in n.extensionPrompts)if(Object.hasOwn(n.extensionPrompts,t)){const e=n.extensionPrompts[t];if(wt.includes(t)||!n.extensionPrompts[t].value||![a.extension_prompt_types.BEFORE_PROMPT,a.extension_prompt_types.IN_PROMPT].includes(e.position)||typeof e.filter=="function"&&!await e.filter())continue;const r={role:s.st_getPromptRole(e.role)??"system",content:e.value};if(e.position===a.extension_prompt_types.BEFORE_PROMPT)c.insert(e.depth,r);else if(e.position===a.extension_prompt_types.IN_PROMPT){const p=c.getMessages();c.insert(p.length-e.depth,r)}}for(const t of kt){const e=c.getMessages();c.insert(e.length-t.depth,{role:s.st_getPromptRole(t.role),content:t.entries.join(`
-`)})}if(!P){const t=s.st_getGroupDepthPrompts(ht.selected_group,Number(a.this_chid));if(ht.selected_group&&Array.isArray(t)&&t.length>0)t.filter(e=>e.text).forEach((e,l)=>{const r=c.getMessages();c.insert(r.length-e.depth,{role:e.role,content:e.text})});else{const e=s.st_baseChatReplace((pt=(at=(it=(rt=(st=n.characters[a.this_chid])==null?void 0:st.data)==null?void 0:rt.extensions)==null?void 0:it.depth_prompt)==null?void 0:at.prompt)==null?void 0:pt.trim(),a.name1,a.name2)||"";if(e){const l=a.depth_prompt_depth_default,r=((mt=(ut=(lt=(ct=n.characters[a.this_chid])==null?void 0:ct.data)==null?void 0:lt.extensions)==null?void 0:ut.depth_prompt)==null?void 0:mt.role)??a.depth_prompt_role_default,p=c.getMessages();c.insert(p.length-l,{role:s.st_getPromptRole(r),content:e})}}}let C=-1;if(!v){const t=s.st_getAuthorNote();if(t.prompt){t.prompt=s.st_baseChatReplace(t.prompt,a.name1,a.name2);const e={role:s.st_getPromptRole(t.role),content:t.prompt};switch(t.position){case a.extension_prompt_types.IN_PROMPT:c.insert(1,e),C=1;break;case a.extension_prompt_types.IN_CHAT:C=c.getMessages().length-t.depth,c.insert(C,e);break;case a.extension_prompt_types.BEFORE_PROMPT:c.addFront(e),C=0;break}}}return C>=0&&(V.length>0&&(c.insert(C,{role:"system",content:V.join(`
-`)}),C++),X.length>0&&c.insert(C+1,{role:"system",content:X.join(`
-`)})),{result:c.getMessages(),warnings:M}}exports.buildPrompt=At;
+${e.extra.title}`),{...e,mes:_,index:t}}));const Te=b.map(e=>_e.world_info_include_names?`${e.name}: ${e.mes}`:e.mes).reverse(),{worldInfoString:Ie,worldInfoBefore:N,worldInfoAfter:j,worldInfoExamples:ke,worldInfoDepth:we,anBefore:X,anAfter:Y}=J?{worldInfoString:"",worldInfoBefore:"",worldInfoAfter:"",worldInfoExamples:[],worldInfoDepth:[],anBefore:[],anAfter:[]}:await s.getWorldInfoPrompt(Te,G,!1);for(const e of ke){const t=e.content;if(t.length===0)continue;const l=n.st_baseChatReplace(t,a.name1,a.name2),i=n.st_parseMesExamples(l,W);e.position===_e.wi_anchor_position.before?M.unshift(...i):M.push(...i)}function Z(){const e=[];for(let t=b.length-1;t>=0;t--){const l=b[t],i=l.name==="System"&&!l.is_user?"system":l.is_user?"user":"assistant";e.unshift({role:i,content:d&&i!="system"?`${l.name}: ${l.mes}`:l.mes,source:l})}c.addMany(e)}if(u==="textgenerationwebui"){const e=[...M];M&&(M=n.st_formatInstructModeExamples(M,a.name1,a.name2));const t=(te=s.getPresetManager("sysprompt"))==null?void 0:te.getCompletionPresetByName(v);t&&(x=s.powerUserSettings.prefer_character_prompt&&x?x:n.st_baseChatReplace(t.content,a.name1,a.name2),x=W?n.st_formatInstructModeSystemPrompt(s.substituteParams(x,a.name1,a.name2,t.content),R):x);const l={description:F,personality:$,persona:s.powerUserSettings.persona_description_position==he.persona_description_positions.IN_PROMPT?K:"",scenario:H,system:x,char:a.name2,user:a.name1,wiBefore:N,wiAfter:j,loreBefore:N,loreAfter:j,mesExamples:M.join(""),mesExamplesRaw:e.join("")},i=(oe=s.getPresetManager("context"))==null?void 0:oe.getCompletionPresetByName(g);let p=n.st_renderStoryString(l,{customInstructSettings:R,customStoryString:i==null?void 0:i.story_string});p&&c.add({role:"system",content:p,ignoreInstruct:!0}),Z()}else{let e=function(P){const k=h.find(Q=>Q.identifier===P);if(k)return k;const ge=p.prompts.find(Q=>Q.identifier===P);if(ge)return ge},t=n.st_setOpenAIMessages(b),l=n.st_setOpenAIMessageExamples(M);async function i(){let[P,k]=await n.st_prepareOpenAIMessages({name2:a.name2,charDescription:F,charPersonality:$,Scenario:H,worldInfoBefore:N,worldInfoAfter:j,extensionPrompts:s.extensionPrompts,bias:"",type:"normal",quietPrompt:void 0,quietImage:void 0,cyclePrompt:"",systemPromptOverride:x,jailbreakPromptOverride:xe,personaDescription:K,messages:t,messageExamples:l},!1);c.addMany(P)}if(!o)return C.push("No preset name provided. Using default preset."),await i(),{result:c.getMessages(),warnings:C};const p=(se=s.getPresetManager("openai"))==null?void 0:se.getCompletionPresetByName(o);if(!p)return console.warn(`Preset not found: ${o}. Using current preset.`),C.push(`Preset not found: ${o}. Using current preset.`),i(),{result:c.getMessages(),warnings:C};let _=(ne=p.prompt_order)==null?void 0:ne.find(P=>P.character_id===a.this_chid);if(!_&&p.prompt_order&&p.prompt_order.length>0&&(_=p.prompt_order[p.prompt_order.length-1]),!_)return console.warn(`No prompt order found for preset: ${o}. Using current preset.`),C.push(`No prompt order found for preset: ${o}. Using current preset.`),i(),{result:c.getMessages(),warnings:C};const z=H&&p.scenario_format?s.substituteParams(p.scenario_format):"",D=$&&p.personality_format?s.substituteParams(p.personality_format):"",ve=s.substituteParams(p.group_nudge_prompt),Ee=p.impersonation_prompt?s.substituteParams(p.impersonation_prompt):"",h=[];J||h.push({role:"system",content:n.st_formatWorldInfo(N,{wiFormat:p.wi_format}),identifier:"worldInfoBefore"},{role:"system",content:n.st_formatWorldInfo(j,{wiFormat:p.wi_format}),identifier:"worldInfoAfter"}),y||h.push({role:"system",content:F,identifier:"charDescription"},{role:"system",content:D,identifier:"charPersonality"},{role:"system",content:z,identifier:"scenario"}),h.push({role:"system",content:Ee,identifier:"impersonate"},{role:"system",content:ve,identifier:"groupNudge"});const S=s.extensionPrompts["1_memory"];S&&S.value&&h.push({role:n.st_getPromptRole(S.role),content:S.value,identifier:"summary",position:n.st_getPromptPosition(S.position)});const O=s.extensionPrompts["2_floating_prompt"];!E&&O&&O.value&&h.push({role:n.st_getPromptRole(O.role),content:O.value,identifier:"authorsNote",position:n.st_getPromptPosition(O.position)});const q=s.extensionPrompts["3_vectors"];q&&q.value&&h.push({role:"system",content:q.value,identifier:"vectorsMemory",position:n.st_getPromptPosition(q.position)});const A=s.extensionPrompts["4_vectors_data_bank"];A&&A.value&&h.push({role:n.st_getPromptRole(A.role),content:A.value,identifier:"vectorsDataBank",position:n.st_getPromptPosition(A.position)});const B=s.extensionPrompts.chromadb;B&&B.value&&h.push({role:"system",content:B.value,identifier:"smartContext",position:n.st_getPromptPosition(B.position)}),!y&&s.powerUserSettings.persona_description&&s.powerUserSettings.persona_description_position===he.persona_description_positions.IN_PROMPT&&h.push({role:"system",content:s.powerUserSettings.persona_description,identifier:"personaDescription"}),_.order.forEach(P=>{if(!P.enabled)return;const k=e(P.identifier);if(k&&k.content){c.add({role:k.role??"system",content:s.substituteParams(k.content)});return}P.identifier==="chatHistory"&&Z()})}const be=["1_memory","2_floating_prompt","3_vectors","4_vectors_data_bank","chromadb","PERSONA_DESCRIPTION","QUIET_PROMPT","DEPTH_PROMPT"];for(const e in s.extensionPrompts)if(Object.hasOwn(s.extensionPrompts,e)){const t=s.extensionPrompts[e];if(be.includes(e)||!s.extensionPrompts[e].value||![a.extension_prompt_types.BEFORE_PROMPT,a.extension_prompt_types.IN_PROMPT].includes(t.position)||typeof t.filter=="function"&&!await t.filter())continue;const i={role:n.st_getPromptRole(t.role)??"system",content:t.value};if(t.position===a.extension_prompt_types.BEFORE_PROMPT)c.insert(t.depth,i);else if(t.position===a.extension_prompt_types.IN_PROMPT){const p=c.getMessages();c.insert(p.length-t.depth,i)}}for(const e of we){const t=c.getMessages();c.insert(t.length-e.depth,{role:n.st_getPromptRole(e.role),content:e.entries.join(`
+`)})}if(!y){const e=n.st_getGroupDepthPrompts(Pe.selected_group,Number(a.this_chid));if(Pe.selected_group&&Array.isArray(e)&&e.length>0)e.filter(t=>t.text).forEach((t,l)=>{const i=c.getMessages();c.insert(i.length-t.depth,{role:t.role,content:t.text})});else{const t=n.st_baseChatReplace((ce=(pe=(ae=(ie=(re=s.characters[a.this_chid])==null?void 0:re.data)==null?void 0:ie.extensions)==null?void 0:ae.depth_prompt)==null?void 0:pe.prompt)==null?void 0:ce.trim(),a.name1,a.name2)||"";if(t){const l=a.depth_prompt_depth_default,i=((fe=(ue=(me=(le=s.characters[a.this_chid])==null?void 0:le.data)==null?void 0:me.extensions)==null?void 0:ue.depth_prompt)==null?void 0:fe.role)??a.depth_prompt_role_default,p=c.getMessages();c.insert(p.length-l,{role:n.st_getPromptRole(i),content:t})}}}let T=-1;if(!E){const e=n.st_getAuthorNote();if(e.prompt){e.prompt=n.st_baseChatReplace(e.prompt,a.name1,a.name2);const t={role:n.st_getPromptRole(e.role),content:e.prompt};switch(e.position){case a.extension_prompt_types.IN_PROMPT:c.insert(1,t),T=1;break;case a.extension_prompt_types.IN_CHAT:T=c.getMessages().length-e.depth,c.insert(T,t);break;case a.extension_prompt_types.BEFORE_PROMPT:c.addFront(t),T=0;break}}}return T>=0&&(X.length>0&&(c.insert(T,{role:"system",content:X.join(`
+`)}),T++),Y.length>0&&c.insert(T+1,{role:"system",content:Y.join(`
+`)})),{result:c.getMessages(),warnings:C}}exports.buildPrompt=Ue;

package/dist/prompt-builder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prompt-builder.d.ts","sourceRoot":"","sources":["../src/prompt-builder.ts"],"names":[],"mappings":"AA+BA,OAAO,EAAE,qBAAqB,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAMtE,MAAM,WAAW,OAAQ,SAAQ,qBAAqB;IACpD,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB;AAED,MAAM,WAAW,kBAAkB;IACjC,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,UAAU,CAAC,EAAE,MAAM,GAAG,QAAQ,GAAG,QAAQ,CAAC;IAC1C,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,eAAe,CAAC,EAAE,OAAO,CAAC;IAE1B;;OAEG;IACH,qBAAqB,CAAC,EAAE;QACtB,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,GAAG,CAAC,EAAE,MAAM,CAAC;KACd,CAAC;CACH;AAmGD;;;;;;GAMG;AACH,wBAAsB,WAAW,CAC/B,GAAG,EAAE,MAAM,EACX,EACE,iBAAiB,EACjB,UAAU,EACV,YAAY,EACZ,WAAW,EACX,aAAa,EACb,UAAU,EACV,YAAY,EACZ,qBAAqB,EACrB,gBAAgB,EAChB,eAAe,EACf,qBAAqB,GACtB,GAAE,kBAAuB,GACzB,OAAO,CAAC;IAAE,MAAM,EAAE,OAAO,EAAE,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC,CAsgBrD"}
+{"version":3,"file":"prompt-builder.d.ts","sourceRoot":"","sources":["../src/prompt-builder.ts"],"names":[],"mappings":"AA+BA,OAAO,EAAE,qBAAqB,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAOtE,MAAM,WAAW,OAAQ,SAAQ,qBAAqB;IACpD,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB;AAED,MAAM,WAAW,kBAAkB;IACjC,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,UAAU,CAAC,EAAE,MAAM,GAAG,QAAQ,GAAG,QAAQ,CAAC;IAC1C,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,eAAe,CAAC,EAAE,OAAO,CAAC;IAE1B;;OAEG;IACH,qBAAqB,CAAC,EAAE;QACtB,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,GAAG,CAAC,EAAE,MAAM,CAAC;KACd,CAAC;CACH;AA0GD;;;;;;GAMG;AACH,wBAAsB,WAAW,CAC/B,GAAG,EAAE,MAAM,EACX,EACE,iBAAiB,EACjB,UAAU,EACV,YAAY,EACZ,WAAW,EACX,aAAa,EACb,UAAU,EACV,YAAY,EACZ,qBAAqB,EACrB,gBAAgB,EAChB,eAAe,EACf,qBAAqB,GACtB,GAAE,kBAAuB,GACzB,OAAO,CAAC;IAAE,MAAM,EAAE,OAAO,EAAE,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC,CAsgBrD"}

package/dist/prompt-builder.js

@@ -1,80 +1,88 @@
-var It = Object.defineProperty;
-var Dt = (l, s, o) => s in l ? It(l, s, { enumerable: !0, configurable: !0, writable: !0, value: o }) : l[s] = o;
-var U = (l, s, o) => Dt(l, typeof s != "symbol" ? s + "" : s, o);
-import { st_parseMesExamples as xt, st_getRegexedString as Bt, st_appendFileContent as Ft, st_baseChatReplace as q, st_formatInstructModeExamples as $t, st_formatInstructModeSystemPrompt as jt, st_renderStoryString as zt, st_setOpenAIMessages as Ht, st_setOpenAIMessageExamples as qt, st_formatWorldInfo as Mt, st_getPromptPosition as I, st_getPromptRole as w, st_getGroupDepthPrompts as Wt, st_getAuthorNote as Gt, st_getMaxContextSize as X, st_prepareOpenAIMessages as Qt } from "./config.js";
-import { Tokenizer as Jt } from "./tokenizer.js";
-import { regex_placement as Tt } from "../../../regex/engine.js";
-import { world_info_include_names as Kt, wi_anchor_position as Lt } from "../../../../world-info.js";
-import { name1 as b, name2 as T, this_chid as W, extension_prompt_types as v, depth_prompt_role_default as Vt, depth_prompt_depth_default as Xt } from "../../../../../script.js";
-import { persona_description_positions as Ct } from "../../../../power-user.js";
-import { selected_group as kt } from "../../../../group-chats.js";
-class Yt {
-  constructor(s) {
-    U(this, "messages", []);
-    U(this, "tokenizer");
-    U(this, "maxContext");
-    U(this, "currentTokenCount", 0);
-    this.tokenizer = new Jt(), this.maxContext = s;
+var Dt = Object.defineProperty;
+var zt = (l, n, o) => n in l ? Dt(l, n, { enumerable: !0, configurable: !0, writable: !0, value: o }) : l[n] = o;
+var I = (l, n, o) => zt(l, typeof n != "symbol" ? n + "" : n, o);
+import { st_parseMesExamples as Mt, st_getRegexedString as Bt, st_appendFileContent as Ft, st_baseChatReplace as q, st_formatInstructModeExamples as $t, st_formatInstructModeSystemPrompt as jt, st_renderStoryString as Ht, st_setOpenAIMessages as qt, st_setOpenAIMessageExamples as Wt, st_formatWorldInfo as Tt, st_getPromptPosition as D, st_getPromptRole as b, st_getGroupDepthPrompts as Gt, st_getAuthorNote as Qt, st_getMaxContextSize as X, st_prepareOpenAIMessages as Jt } from "./config.js";
+import { Tokenizer as Kt } from "./tokenizer.js";
+import { getMessageText as Lt, sanitizePromptMessage as Y, sanitizePromptMessages as Vt } from "./prompt-message-utils.js";
+import { regex_placement as Ct } from "../../../regex/engine.js";
+import { world_info_include_names as Xt, wi_anchor_position as Yt } from "../../../../world-info.js";
+import { name1 as v, name2 as C, this_chid as W, extension_prompt_types as E, depth_prompt_role_default as Zt, depth_prompt_depth_default as te } from "../../../../../script.js";
+import { persona_description_positions as kt } from "../../../../power-user.js";
+import { selected_group as wt } from "../../../../group-chats.js";
+class ee {
+  constructor(n) {
+    I(this, "messages", []);
+    I(this, "tokenizer");
+    I(this, "maxContext");
+    I(this, "currentTokenCount", 0);
+    this.tokenizer = new Kt(), this.maxContext = n;
   }
-  getTokenCount(s) {
-    var o, m;
-    return s.content ? ((m = (o = s.source) == null ? void 0 : o.extra) == null ? void 0 : m.token_count) ?? this.tokenizer.encode(s.content).length : 0;
+  getTokenCount(n) {
+    var c, m;
+    const o = Lt(n);
+    return o ? ((m = (c = n.source) == null ? void 0 : c.extra) == null ? void 0 : m.token_count) ?? this.tokenizer.encode(o).length : 0;
   }
-  canFit(s) {
-    return this.currentTokenCount + this.getTokenCount(s) <= this.maxContext;
+  canFit(n) {
+    return this.currentTokenCount + this.getTokenCount(n) <= this.maxContext;
   }
-  add(s) {
-    if (!s.content) return !0;
-    const o = this.getTokenCount(s);
-    return this.currentTokenCount + o > this.maxContext ? !1 : (this.messages.push(s), this.currentTokenCount += o, !0);
+  add(n) {
+    const o = Y(n);
+    if (!o) return !0;
+    n = o;
+    const c = this.getTokenCount(n);
+    return this.currentTokenCount + c > this.maxContext ? !1 : (this.messages.push(n), this.currentTokenCount += c, !0);
   }
-  addFront(s) {
-    if (!s.content) return !0;
-    const o = this.getTokenCount(s);
-    return this.currentTokenCount + o > this.maxContext ? !1 : (this.messages.unshift(s), this.currentTokenCount += o, !0);
+  addFront(n) {
+    const o = Y(n);
+    if (!o) return !0;
+    n = o;
+    const c = this.getTokenCount(n);
+    return this.currentTokenCount + c > this.maxContext ? !1 : (this.messages.unshift(n), this.currentTokenCount += c, !0);
   }
-  addMany(s) {
-    const o = s.filter((c) => c.content), m = o.map((c) => this.getTokenCount(c)), D = m.reduce((c, h) => c + h, 0);
-    if (this.currentTokenCount + D <= this.maxContext)
-      return this.messages.push(...o), this.currentTokenCount += D, !0;
-    let E = 0;
+  addMany(n) {
+    const o = Vt(n), c = o.map((f) => this.getTokenCount(f)), m = c.reduce((f, _) => f + _, 0);
+    if (this.currentTokenCount + m <= this.maxContext)
+      return this.messages.push(...o), this.currentTokenCount += m, !0;
+    let O = 0;
     const u = [];
-    for (let c = o.length - 1; c >= 0; c--) {
-      const h = o[c], O = m[c];
-      if (this.currentTokenCount + E + O <= this.maxContext)
-        u.unshift(h), E += O;
+    for (let f = o.length - 1; f >= 0; f--) {
+      const _ = o[f], S = c[f];
+      if (this.currentTokenCount + O + S <= this.maxContext)
+        u.unshift(_), O += S;
       else
         break;
     }
-    return u.length > 0 && (this.messages.push(...u), this.currentTokenCount += E), u.length === o.length;
+    return u.length > 0 && (this.messages.push(...u), this.currentTokenCount += O), u.length === o.length;
   }
-  insert(s, o) {
-    if (!o.content) return !0;
+  insert(n, o) {
+    const c = Y(o);
+    if (!c) return !0;
+    o = c;
     const m = this.getTokenCount(o);
-    return this.currentTokenCount + m > this.maxContext ? !1 : (this.messages.splice(s, 0, o), this.currentTokenCount += m, !0);
+    return this.currentTokenCount + m > this.maxContext ? !1 : (this.messages.splice(n, 0, o), this.currentTokenCount += m, !0);
   }
   getMessages() {
     return this.messages;
   }
 }
-async function ce(l, {
-  targetCharacterId: s,
+async function fe(l, {
+  targetCharacterId: n,
   presetName: o,
-  instructName: m,
-  contextName: D,
-  syspromptName: E,
+  instructName: c,
+  contextName: m,
+  syspromptName: O,
   maxContext: u,
-  includeNames: c,
-  ignoreCharacterFields: h,
-  ignoreAuthorNote: O,
-  ignoreWorldInfo: Y,
-  messageIndexesBetween: C
+  includeNames: f,
+  ignoreCharacterFields: _,
+  ignoreAuthorNote: S,
+  ignoreWorldInfo: Z,
+  messageIndexesBetween: k
 } = {}) {
-  var st, it, at, pt, ct, lt, ut, mt, ft, dt, gt, ht, _t, Pt;
+  var it, at, pt, ct, lt, ut, mt, ft, dt, gt, ht, _t, Pt, yt;
   if (!["textgenerationwebui", "openai"].includes(l))
     throw new Error("Unsupported API");
-  const n = SillyTavern.getContext();
-  let { description: G, personality: Q, persona: Z, scenario: J, mesExamples: wt, system: _, jailbreak: bt } = h ? {
+  const s = SillyTavern.getContext();
+  let { description: G, personality: Q, persona: tt, scenario: J, mesExamples: bt, system: P, jailbreak: vt } = _ ? {
     description: "",
     personality: "",
     persona: "",
@@ -82,12 +90,12 @@ async function ce(l, {
     mesExamples: "",
     system: "",
     jailbreak: ""
-  } : n.getCharacterCardFields({
-    chid: s
+  } : s.getCharacterCardFields({
+    chid: n
   });
-  const S = l === "textgenerationwebui" ? (st = n.getPresetManager("instruct")) == null ? void 0 : st.getCompletionPresetByName(m) : void 0, K = !!(S != null && S.enabled);
-  let P = xt(wt, K);
-  function vt() {
+  const A = l === "textgenerationwebui" ? (it = s.getPresetManager("instruct")) == null ? void 0 : it.getCompletionPresetByName(c) : void 0, K = !!(A != null && A.enabled);
+  let y = Mt(bt, K);
+  function Et() {
     var e, p;
     if (typeof u == "number")
       return u;
@@ -99,37 +107,37 @@ async function ce(l, {
       return u;
     let t;
     if (l === "textgenerationwebui") {
-      const r = (e = n.getPresetManager("textgenerationwebui")) == null ? void 0 : e.getCompletionPresetByName(o);
+      const r = (e = s.getPresetManager("textgenerationwebui")) == null ? void 0 : e.getCompletionPresetByName(o);
       t = r == null ? void 0 : r.max_length;
     } else {
-      const r = (p = n.getPresetManager("openai")) == null ? void 0 : p.getCompletionPresetByName(o);
+      const r = (p = s.getPresetManager("openai")) == null ? void 0 : p.getCompletionPresetByName(o);
       t = r == null ? void 0 : r.openai_max_context;
     }
     return typeof t == "number" ? t : X();
   }
-  let y = [];
-  const L = vt();
+  let x = [];
+  const L = Et();
   if (L <= 0)
-    return { result: [], warnings: y };
-  const a = new Yt(L), Et = n.ToolManager.isToolCallingSupported(), tt = (C == null ? void 0 : C.start) ?? 0, et = C != null && C.end ? C.end + 1 : void 0;
-  let k = tt === -1 && et === 0 ? [] : n.chat.slice(tt, et).filter((t) => {
+    return { result: [], warnings: x };
+  const a = new ee(L), Ot = s.ToolManager.isToolCallingSupported(), et = (k == null ? void 0 : k.start) ?? 0, ot = k != null && k.end ? k.end + 1 : void 0;
+  let w = et === -1 && ot === 0 ? [] : s.chat.slice(et, ot).filter((t) => {
     var e;
-    return !t.is_system || Et && Array.isArray((e = t.extra) == null ? void 0 : e.tool_invocations);
+    return !t.is_system || Ot && Array.isArray((e = t.extra) == null ? void 0 : e.tool_invocations);
   });
-  k = await Promise.all(
-    k.map(async (t, e) => {
-      var $, j;
-      let p = t.mes, r = t.is_user ? Tt.USER_INPUT : Tt.AI_OUTPUT, i = { isPrompt: !0, depth: k.length - e - 1 }, f = Bt(p, r, i);
-      return f = await Ft(t, f), ($ = t == null ? void 0 : t.extra) != null && $.append_title && ((j = t == null ? void 0 : t.extra) != null && j.title) && (f = `${f}
+  w = await Promise.all(
+    w.map(async (t, e) => {
+      var F, $;
+      let p = t.mes, r = t.is_user ? Ct.USER_INPUT : Ct.AI_OUTPUT, i = { isPrompt: !0, depth: w.length - e - 1 }, d = Bt(p, r, i);
+      return d = await Ft(t, d), (F = t == null ? void 0 : t.extra) != null && F.append_title && (($ = t == null ? void 0 : t.extra) != null && $.title) && (d = `${d}
 
 ${t.extra.title}`), {
         ...t,
-        mes: f,
+        mes: d,
         index: e
       };
     })
   );
-  const Ot = k.map((t) => Kt ? `${t.name}: ${t.mes}` : t.mes).reverse(), { worldInfoString: Zt, worldInfoBefore: B, worldInfoAfter: F, worldInfoExamples: St, worldInfoDepth: At, anBefore: ot, anAfter: nt } = Y ? {
+  const St = w.map((t) => Xt ? `${t.name}: ${t.mes}` : t.mes).reverse(), { worldInfoString: oe, worldInfoBefore: z, worldInfoAfter: B, worldInfoExamples: At, worldInfoDepth: Rt, anBefore: st, anAfter: nt } = Z ? {
     worldInfoString: "",
     worldInfoBefore: "",
     worldInfoAfter: "",
@@ -137,169 +145,169 @@ ${t.extra.title}`), {
     worldInfoDepth: [],
     anBefore: [],
     anAfter: []
-  } : await n.getWorldInfoPrompt(Ot, L, !1);
-  for (const t of St) {
+  } : await s.getWorldInfoPrompt(St, L, !1);
+  for (const t of At) {
     const e = t.content;
     if (e.length === 0)
       continue;
-    const p = q(e, b, T), r = xt(p, K);
-    t.position === Lt.before ? P.unshift(...r) : P.push(...r);
+    const p = q(e, v, C), r = Mt(p, K);
+    t.position === Yt.before ? y.unshift(...r) : y.push(...r);
   }
   function rt() {
     const t = [];
-    for (let e = k.length - 1; e >= 0; e--) {
-      const p = k[e], r = p.name === "System" && !p.is_user ? "system" : p.is_user ? "user" : "assistant";
+    for (let e = w.length - 1; e >= 0; e--) {
+      const p = w[e], r = p.name === "System" && !p.is_user ? "system" : p.is_user ? "user" : "assistant";
       t.unshift({
         role: r,
-        content: c && r != "system" ? `${p.name}: ${p.mes}` : p.mes,
+        content: f && r != "system" ? `${p.name}: ${p.mes}` : p.mes,
         source: p
       });
     }
     a.addMany(t);
   }
   if (l === "textgenerationwebui") {
-    const t = [...P];
-    P && (P = $t(P, b, T));
-    const e = (it = n.getPresetManager("sysprompt")) == null ? void 0 : it.getCompletionPresetByName(E);
-    e && (_ = n.powerUserSettings.prefer_character_prompt && _ ? _ : q(e.content, b, T), _ = K ? jt(
-      n.substituteParams(_, b, T, e.content),
-      S
-    ) : _);
+    const t = [...y];
+    y && (y = $t(y, v, C));
+    const e = (at = s.getPresetManager("sysprompt")) == null ? void 0 : at.getCompletionPresetByName(O);
+    e && (P = s.powerUserSettings.prefer_character_prompt && P ? P : q(e.content, v, C), P = K ? jt(
+      s.substituteParams(P, v, C, e.content),
+      A
+    ) : P);
     const p = {
       description: G,
       personality: Q,
-      persona: n.powerUserSettings.persona_description_position == Ct.IN_PROMPT ? Z : "",
+      persona: s.powerUserSettings.persona_description_position == kt.IN_PROMPT ? tt : "",
       scenario: J,
-      system: _,
-      char: T,
-      user: b,
-      wiBefore: B,
-      wiAfter: F,
-      loreBefore: B,
-      loreAfter: F,
-      mesExamples: P.join(""),
+      system: P,
+      char: C,
+      user: v,
+      wiBefore: z,
+      wiAfter: B,
+      loreBefore: z,
+      loreAfter: B,
+      mesExamples: y.join(""),
       mesExamplesRaw: t.join("")
-    }, r = (at = n.getPresetManager("context")) == null ? void 0 : at.getCompletionPresetByName(D);
-    let i = zt(p, {
-      customInstructSettings: S,
+    }, r = (pt = s.getPresetManager("context")) == null ? void 0 : pt.getCompletionPresetByName(m);
+    let i = Ht(p, {
+      customInstructSettings: A,
       customStoryString: r == null ? void 0 : r.story_string
     });
     i && a.add({ role: "system", content: i, ignoreInstruct: !0 }), rt();
   } else {
-    let t = function(g) {
-      const M = d.find((V) => V.identifier === g);
-      if (M)
-        return M;
-      const yt = i.prompts.find((V) => V.identifier === g);
-      if (yt)
-        return yt;
-    }, e = Ht(k), p = qt(P);
+    let t = function(h) {
+      const T = g.find((V) => V.identifier === h);
+      if (T)
+        return T;
+      const xt = i.prompts.find((V) => V.identifier === h);
+      if (xt)
+        return xt;
+    }, e = qt(w), p = Wt(y);
     async function r() {
-      let [g, M] = await Qt(
+      let [h, T] = await Jt(
         {
-          name2: T,
+          name2: C,
           charDescription: G,
           charPersonality: Q,
           Scenario: J,
-          worldInfoBefore: B,
-          worldInfoAfter: F,
-          extensionPrompts: n.extensionPrompts,
+          worldInfoBefore: z,
+          worldInfoAfter: B,
+          extensionPrompts: s.extensionPrompts,
           bias: "",
           type: "normal",
           quietPrompt: void 0,
           quietImage: void 0,
           cyclePrompt: "",
-          systemPromptOverride: _,
-          jailbreakPromptOverride: bt,
-          personaDescription: Z,
+          systemPromptOverride: P,
+          jailbreakPromptOverride: vt,
+          personaDescription: tt,
           messages: e,
           messageExamples: p
         },
         !1
       );
-      a.addMany(g);
+      a.addMany(h);
     }
     if (!o)
-      return y.push("No preset name provided. Using default preset."), await r(), { result: a.getMessages(), warnings: y };
-    const i = (pt = n.getPresetManager("openai")) == null ? void 0 : pt.getCompletionPresetByName(o);
+      return x.push("No preset name provided. Using default preset."), await r(), { result: a.getMessages(), warnings: x };
+    const i = (ct = s.getPresetManager("openai")) == null ? void 0 : ct.getCompletionPresetByName(o);
     if (!i)
-      return console.warn(`Preset not found: ${o}. Using current preset.`), y.push(`Preset not found: ${o}. Using current preset.`), r(), { result: a.getMessages(), warnings: y };
-    let f = (ct = i.prompt_order) == null ? void 0 : ct.find((g) => g.character_id === W);
-    if (!f && i.prompt_order && i.prompt_order.length > 0 && (f = i.prompt_order[i.prompt_order.length - 1]), !f)
-      return console.warn(`No prompt order found for preset: ${o}. Using current preset.`), y.push(`No prompt order found for preset: ${o}. Using current preset.`), r(), { result: a.getMessages(), warnings: y };
-    const $ = J && i.scenario_format ? n.substituteParams(i.scenario_format) : "", j = Q && i.personality_format ? n.substituteParams(i.personality_format) : "", Nt = n.substituteParams(i.group_nudge_prompt), Ut = i.impersonation_prompt ? n.substituteParams(i.impersonation_prompt) : "", d = [];
-    Y || d.push(
+      return console.warn(`Preset not found: ${o}. Using current preset.`), x.push(`Preset not found: ${o}. Using current preset.`), r(), { result: a.getMessages(), warnings: x };
+    let d = (lt = i.prompt_order) == null ? void 0 : lt.find((h) => h.character_id === W);
+    if (!d && i.prompt_order && i.prompt_order.length > 0 && (d = i.prompt_order[i.prompt_order.length - 1]), !d)
+      return console.warn(`No prompt order found for preset: ${o}. Using current preset.`), x.push(`No prompt order found for preset: ${o}. Using current preset.`), r(), { result: a.getMessages(), warnings: x };
+    const F = J && i.scenario_format ? s.substituteParams(i.scenario_format) : "", $ = Q && i.personality_format ? s.substituteParams(i.personality_format) : "", Ut = s.substituteParams(i.group_nudge_prompt), It = i.impersonation_prompt ? s.substituteParams(i.impersonation_prompt) : "", g = [];
+    Z || g.push(
       {
         role: "system",
-        content: Mt(B, { wiFormat: i.wi_format }),
+        content: Tt(z, { wiFormat: i.wi_format }),
         identifier: "worldInfoBefore"
       },
       {
         role: "system",
-        content: Mt(F, { wiFormat: i.wi_format }),
+        content: Tt(B, { wiFormat: i.wi_format }),
         identifier: "worldInfoAfter"
       }
-    ), h || d.push(
+    ), _ || g.push(
       { role: "system", content: G, identifier: "charDescription" },
-      { role: "system", content: j, identifier: "charPersonality" },
-      { role: "system", content: $, identifier: "scenario" }
-    ), d.push(
-      { role: "system", content: Ut, identifier: "impersonate" },
-      { role: "system", content: Nt, identifier: "groupNudge" }
+      { role: "system", content: $, identifier: "charPersonality" },
+      { role: "system", content: F, identifier: "scenario" }
+    ), g.push(
+      { role: "system", content: It, identifier: "impersonate" },
+      { role: "system", content: Ut, identifier: "groupNudge" }
     );
-    const A = n.extensionPrompts["1_memory"];
-    A && A.value && d.push({
-      role: w(A.role),
-      content: A.value,
+    const R = s.extensionPrompts["1_memory"];
+    R && R.value && g.push({
+      role: b(R.role),
+      content: R.value,
       identifier: "summary",
-      position: I(A.position)
+      position: D(R.position)
     });
-    const R = n.extensionPrompts["2_floating_prompt"];
-    !O && R && R.value && d.push({
-      role: w(R.role),
-      content: R.value,
+    const N = s.extensionPrompts["2_floating_prompt"];
+    !S && N && N.value && g.push({
+      role: b(N.role),
+      content: N.value,
       identifier: "authorsNote",
-      position: I(R.position)
+      position: D(N.position)
     });
-    const z = n.extensionPrompts["3_vectors"];
-    z && z.value && d.push({
+    const j = s.extensionPrompts["3_vectors"];
+    j && j.value && g.push({
       role: "system",
-      content: z.value,
+      content: j.value,
       identifier: "vectorsMemory",
-      position: I(z.position)
+      position: D(j.position)
     });
-    const N = n.extensionPrompts["4_vectors_data_bank"];
-    N && N.value && d.push({
-      role: w(N.role),
-      content: N.value,
+    const U = s.extensionPrompts["4_vectors_data_bank"];
+    U && U.value && g.push({
+      role: b(U.role),
+      content: U.value,
       identifier: "vectorsDataBank",
-      position: I(N.position)
+      position: D(U.position)
     });
-    const H = n.extensionPrompts.chromadb;
-    H && H.value && d.push({
+    const H = s.extensionPrompts.chromadb;
+    H && H.value && g.push({
       role: "system",
       content: H.value,
       identifier: "smartContext",
-      position: I(H.position)
-    }), !h && n.powerUserSettings.persona_description && n.powerUserSettings.persona_description_position === Ct.IN_PROMPT && d.push({
+      position: D(H.position)
+    }), !_ && s.powerUserSettings.persona_description && s.powerUserSettings.persona_description_position === kt.IN_PROMPT && g.push({
       role: "system",
-      content: n.powerUserSettings.persona_description,
+      content: s.powerUserSettings.persona_description,
       identifier: "personaDescription"
-    }), f.order.forEach((g) => {
-      if (!g.enabled)
+    }), d.order.forEach((h) => {
+      if (!h.enabled)
         return;
-      const M = t(g.identifier);
-      if (M && M.content) {
+      const T = t(h.identifier);
+      if (T && T.content) {
         a.add({
-          role: M.role ?? "system",
-          content: n.substituteParams(M.content)
+          role: T.role ?? "system",
+          content: s.substituteParams(T.content)
         });
         return;
       }
-      g.identifier === "chatHistory" && rt();
+      h.identifier === "chatHistory" && rt();
     });
   }
-  const Rt = [
+  const Nt = [
     "1_memory",
     "2_floating_prompt",
     "3_vectors",
@@ -309,74 +317,74 @@ ${t.extra.title}`), {
     "QUIET_PROMPT",
     "DEPTH_PROMPT"
   ];
-  for (const t in n.extensionPrompts)
-    if (Object.hasOwn(n.extensionPrompts, t)) {
-      const e = n.extensionPrompts[t];
-      if (Rt.includes(t) || !n.extensionPrompts[t].value || ![v.BEFORE_PROMPT, v.IN_PROMPT].includes(e.position) || typeof e.filter == "function" && !await e.filter()) continue;
+  for (const t in s.extensionPrompts)
+    if (Object.hasOwn(s.extensionPrompts, t)) {
+      const e = s.extensionPrompts[t];
+      if (Nt.includes(t) || !s.extensionPrompts[t].value || ![E.BEFORE_PROMPT, E.IN_PROMPT].includes(e.position) || typeof e.filter == "function" && !await e.filter()) continue;
       const r = {
-        role: w(e.role) ?? "system",
+        role: b(e.role) ?? "system",
         content: e.value
       };
-      if (e.position === v.BEFORE_PROMPT)
+      if (e.position === E.BEFORE_PROMPT)
         a.insert(e.depth, r);
-      else if (e.position === v.IN_PROMPT) {
+      else if (e.position === E.IN_PROMPT) {
         const i = a.getMessages();
         a.insert(i.length - e.depth, r);
       }
     }
-  for (const t of At) {
+  for (const t of Rt) {
     const e = a.getMessages();
     a.insert(e.length - t.depth, {
-      role: w(t.role),
+      role: b(t.role),
       content: t.entries.join(`
 `)
     });
   }
-  if (!h) {
-    const t = Wt(kt, Number(W));
-    if (kt && Array.isArray(t) && t.length > 0)
+  if (!_) {
+    const t = Gt(wt, Number(W));
+    if (wt && Array.isArray(t) && t.length > 0)
       t.filter((e) => e.text).forEach((e, p) => {
         const r = a.getMessages();
         a.insert(r.length - e.depth, { role: e.role, content: e.text });
       });
     else {
       const e = q(
-        (dt = (ft = (mt = (ut = (lt = n.characters[W]) == null ? void 0 : lt.data) == null ? void 0 : ut.extensions) == null ? void 0 : mt.depth_prompt) == null ? void 0 : ft.prompt) == null ? void 0 : dt.trim(),
-        b,
-        T
+        (gt = (dt = (ft = (mt = (ut = s.characters[W]) == null ? void 0 : ut.data) == null ? void 0 : mt.extensions) == null ? void 0 : ft.depth_prompt) == null ? void 0 : dt.prompt) == null ? void 0 : gt.trim(),
+        v,
+        C
       ) || "";
       if (e) {
-        const p = Xt, r = ((Pt = (_t = (ht = (gt = n.characters[W]) == null ? void 0 : gt.data) == null ? void 0 : ht.extensions) == null ? void 0 : _t.depth_prompt) == null ? void 0 : Pt.role) ?? Vt, i = a.getMessages();
+        const p = te, r = ((yt = (Pt = (_t = (ht = s.characters[W]) == null ? void 0 : ht.data) == null ? void 0 : _t.extensions) == null ? void 0 : Pt.depth_prompt) == null ? void 0 : yt.role) ?? Zt, i = a.getMessages();
         a.insert(i.length - p, {
-          role: w(r),
+          role: b(r),
           content: e
         });
       }
     }
   }
-  let x = -1;
-  if (!O) {
-    const t = Gt();
+  let M = -1;
+  if (!S) {
+    const t = Qt();
     if (t.prompt) {
-      t.prompt = q(t.prompt, b, T);
-      const e = { role: w(t.role), content: t.prompt };
+      t.prompt = q(t.prompt, v, C);
+      const e = { role: b(t.role), content: t.prompt };
       switch (t.position) {
-        case v.IN_PROMPT:
-          a.insert(1, e), x = 1;
+        case E.IN_PROMPT:
+          a.insert(1, e), M = 1;
           break;
-        case v.IN_CHAT:
-          x = a.getMessages().length - t.depth, a.insert(x, e);
+        case E.IN_CHAT:
+          M = a.getMessages().length - t.depth, a.insert(M, e);
           break;
-        case v.BEFORE_PROMPT:
-          a.addFront(e), x = 0;
+        case E.BEFORE_PROMPT:
+          a.addFront(e), M = 0;
           break;
       }
     }
   }
-  return x >= 0 && (ot.length > 0 && (a.insert(x, { role: "system", content: ot.join(`
-`) }), x++), nt.length > 0 && a.insert(x + 1, { role: "system", content: nt.join(`
-`) })), { result: a.getMessages(), warnings: y };
+  return M >= 0 && (st.length > 0 && (a.insert(M, { role: "system", content: st.join(`
+`) }), M++), nt.length > 0 && a.insert(M + 1, { role: "system", content: nt.join(`
+`) })), { result: a.getMessages(), warnings: x };
 }
 export {
-  ce as buildPrompt
+  fe as buildPrompt
 };

package/dist/prompt-message-utils.cjs

@@ -0,0 +1,2 @@
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});function r(e){return typeof e=="string"&&e.trim().length>0}function o(e){const t=e.content;return typeof t=="string"?t:Array.isArray(t)?t.map(n=>n.type==="text"?n.text:"").filter(r).join(`
+`):""}function s(e){const t=e.content;if(typeof t=="string")return r(t)?e:null;if(Array.isArray(t)){const n=t.filter(i=>i.type!=="text"||r(i.text));return n.length>0?{...e,content:n}:null}return null}function u(e){return e.map(t=>s(t)).filter(t=>t!==null)}exports.getMessageText=o;exports.sanitizePromptMessage=s;exports.sanitizePromptMessages=u;

package/dist/prompt-message-utils.d.ts

@@ -0,0 +1,6 @@
+import { ChatCompletionMessage } from './types/index.js';
+
+export declare function getMessageText(message: ChatCompletionMessage): string;
+export declare function sanitizePromptMessage<T extends ChatCompletionMessage>(message: T): T | null;
+export declare function sanitizePromptMessages<T extends ChatCompletionMessage>(messages: T[]): T[];
+//# sourceMappingURL=prompt-message-utils.d.ts.map

package/dist/prompt-message-utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"prompt-message-utils.d.ts","sourceRoot":"","sources":["../src/prompt-message-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAYzD,wBAAgB,cAAc,CAAC,OAAO,EAAE,qBAAqB,GAAG,MAAM,CAerE;AAED,wBAAgB,qBAAqB,CAAC,CAAC,SAAS,qBAAqB,EAAE,OAAO,EAAE,CAAC,GAAG,CAAC,GAAG,IAAI,CAa3F;AAED,wBAAgB,sBAAsB,CAAC,CAAC,SAAS,qBAAqB,EAAE,QAAQ,EAAE,CAAC,EAAE,GAAG,CAAC,EAAE,CAI1F"}

package/dist/prompt-message-utils.js

@@ -0,0 +1,26 @@
+function r(n) {
+  return typeof n == "string" && n.trim().length > 0;
+}
+function s(n) {
+  const t = n.content;
+  return typeof t == "string" ? t : Array.isArray(t) ? t.map((e) => e.type === "text" ? e.text : "").filter(r).join(`
+`) : "";
+}
+function o(n) {
+  const t = n.content;
+  if (typeof t == "string")
+    return r(t) ? n : null;
+  if (Array.isArray(t)) {
+    const e = t.filter((i) => i.type !== "text" || r(i.text));
+    return e.length > 0 ? { ...n, content: e } : null;
+  }
+  return null;
+}
+function u(n) {
+  return n.map((t) => o(t)).filter((t) => t !== null);
+}
+export {
+  s as getMessageText,
+  o as sanitizePromptMessage,
+  u as sanitizePromptMessages
+};

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "sillytavern-utils-lib",
-    "version": "1.0.65",
+    "version": "1.0.66",
     "description": "Utility library for SillyTavern",
     "type": "module",
     "exports": {