Merge remote-tracking branch 'origin/master' into maint/pr-2868
# Conflicts: # CHANGELOG.md
This commit is contained in:
commit
cf92aa5cc1
15 files changed
+956
-44
No files matched your search
+3
-7
@@ -1542,12 +1542,8 @@ function applyBotName(){
|
||||
if(sel&&typeof _applyModelToDropdown==='function'){
|
||||
// Fresh page boot must prefer the profile/server default over stale
|
||||
// browser-persisted model state. A restored session can still apply its
|
||||
// own persisted model later through loadSession().
|
||||
if(typeof _clearPersistedModelState==='function') _clearPersistedModelState();
|
||||
else {
|
||||
localStorage.removeItem('hermes-webui-model');
|
||||
localStorage.removeItem('hermes-webui-model-state');
|
||||
}
|
||||
// own persisted model later through loadSession(). Preserve the browser
|
||||
// keys for legacy/no-default fallback paths instead of deleting them.
|
||||
const existingDefaultOpt=Array.from(sel.options).find(o=>o.value===s.default_model);
|
||||
if(existingDefaultOpt&&window._activeProvider&&!existingDefaultOpt.dataset.provider){
|
||||
existingDefaultOpt.dataset.provider=window._activeProvider;
|
||||
@@ -1655,7 +1651,7 @@ function applyBotName(){
|
||||
// Fetch available models without blocking session restore. The static HTML
|
||||
// options are enough for first paint; the dynamic provider list can settle
|
||||
// after the saved session is visible.
|
||||
const _hydrateBootModelDropdown=()=>populateModelDropdown().then(()=>{
|
||||
const _hydrateBootModelDropdown=()=>populateModelDropdown({preferProfileDefaultOnFreshBoot:true}).then(()=>{
|
||||
const sessionModelState=S.session&&S.session.model
|
||||
? {model:S.session.model,model_provider:S.session.model_provider||null}
|
||||
: null;
|
||||
|
||||
Reference in new issue
Block a user