David/HERMES-GIELIE
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(#5021): keep boot 401 budget out of later dropdown refreshes

Browse source
This commit is contained in:
Rod Boev 2026-06-26 20:00:13 -04:00 committed by nesquena-hermes
parent 0b9235c646
commit df1cb13cd5
2 changed files with 36 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
static/boot.js
View file

@ -2374,9 +2374,9 @@ window._applyTitlebarProfileVisibility=_applyTitlebarProfileVisibility;
}
return true;
};
const _hydrateBootModelDropdown=()=>populateModelDropdown({
const _hydrateModelDropdown=({redirectIfUnauth=null}={})=>populateModelDropdown({
preferProfileDefaultOnFreshBoot:true,
redirectIfUnauth:_redirectBootModelDropdownIfUnauth,
...(redirectIfUnauth?{redirectIfUnauth}:{}),
}).then(()=>{
const sessionModelState=S.session&&S.session.model
? {model:S.session.model,model_provider:S.session.model_provider||null}
@ -2415,15 +2415,22 @@ window._applyTitlebarProfileVisibility=_applyTitlebarProfileVisibility;
window._modelDropdownReady=null;
throw e;
});
const _startModelDropdown=()=>{
const ready=window._modelDropdownReady;
if(ready&&typeof ready.then==='function') return ready;
const next=_hydrateModelDropdown();
window._modelDropdownReady=next;
return next;
};
const _startBootModelDropdown=()=>{
const ready=window._modelDropdownReady;
if(ready&&typeof ready.then==='function') return ready;
const next=_hydrateBootModelDropdown();
const next=_hydrateModelDropdown({redirectIfUnauth:_redirectBootModelDropdownIfUnauth});
window._modelDropdownReady=next;
return next;
};
window._modelDropdownReady=null;
window._ensureModelDropdownReady=_startBootModelDropdown;
window._ensureModelDropdownReady=_startModelDropdown;
setTimeout(()=>{
try{Promise.resolve(_startBootModelDropdown()).catch(()=>{});}catch(_){}
},0);

25
tests/test_5021_boot_model_redirect_budget.py
View file

@ -175,6 +175,7 @@ function installGlobals(select, redirects, fetchQueue, jsonCalls) {
};
globalThis.location = windowObj.location;
globalThis.sessionStorage = new FakeStorage();
globalThis.localStorage = new FakeStorage();
globalThis.document = {
baseURI: 'http://localhost/session/abc?workspace=test',
createElement(tag) {
@ -340,6 +341,18 @@ async function runBootAttempt(attempt, redirects, storage, fetchQueue, jsonCalls
],
jsonCalls,
));
} else if (scenario.kind === 'post-boot-refresh') {
const select = buildSelect();
installGlobals(select, redirects, [], jsonCalls);
globalThis.sessionStorage = storage;
globalThis.S = {session: null, activeProfile: 'default', activeProfileIsDefault: true};
globalThis._bootActiveProfileUnauthRedirectBudget.spendOnFallback(storage);
globalThis.fetch = async () => ({
status: 401,
ok: false,
json: async () => ({active_provider: 'openai', default_model: 'gpt-4o', configured_model_badges: {}, groups: []}),
});
await populateModelDropdown({preferProfileDefaultOnFreshBoot: true});
} else {
throw new Error(`unknown scenario: ${scenario.kind}`);
}
@ -419,3 +432,15 @@ def test_boot_model_success_still_stores_active_provider(driver_path):
assert payload["activeProvider"] == "anthropic"
assert payload["defaultModel"] == "claude-sonnet-4"
assert payload["jsonCalls"] == 1
def test_post_boot_model_refresh_keeps_normal_401_redirect(driver_path):
payload = _run(
driver_path,
{
"kind": "post-boot-refresh",
},
)
assert payload["jsonCalls"] == 0
assert "window._ensureModelDropdownReady=_startModelDropdown;" in BOOT_JS.read_text(encoding="utf-8")