From ce2ed51fa9bc4667fdc76ecafa9464c513185e18 Mon Sep 17 00:00:00 2001 From: "kitokey-lina[bot]" <356214857+kitokey-lina[bot]@users.noreply.github.com> Date: Sun, 15 Nov 2026 11:06:26 +0100 Subject: [PATCH 1/6] =?UTF-8?q?shell:=20test=20=E2=80=94=20Settings'=20fol?= =?UTF-8?q?low-up=20of=20D95:=20=C2=AB=20Mod=C3=A8les=20=C3=A0=20t=C3=A9l?= =?UTF-8?q?=C3=A9charger=20=C2=BB=20folded,=20no=20agreement=20for=20this?= =?UTF-8?q?=20computer,=20=C2=AB=20cet=20ordinateur=20=C2=BB=20said=20(#78?= =?UTF-8?q?2,=20#859,=20#775),=20the=20oracle=20alone?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit BN: « Modèles à télécharger » a disclosure, closed at first, kept as left when drawn again; « Refaire le réglage » in « Général » (already so: held). BG: no agreement asked for the stand-in on this computer, nor for one's own address there, one for a host elsewhere (#859); the save said « cet ordinateur », not an address and a port (#775). Agent-Session: 04463b35-db3b-47ea-bef5-6892f2baedb7 Co-Authored-By: Claude Opus 5.5 --- modules/shell/scripts/e2e_window.py | 47 +++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/modules/shell/scripts/e2e_window.py b/modules/shell/scripts/e2e_window.py index 6b32ca09..c24d06f4 100644 --- a/modules/shell/scripts/e2e_window.py +++ b/modules/shell/scripts/e2e_window.py @@ -1482,12 +1482,18 @@ def log_message(self, *_): # address elsewhere can be named without being asked: tests/transcription.rs, # a_service_is_saved_only_once_its_host_elsewhere_is_agreed_to. choose(browser, "transcription-models", "openai/whisper-large-v3-turbo") + # No agreement asked where none is owed: the address is this computer's (#859). + agreement_shown = browser.execute_script("const a = document.getElementById('transcription-agreed'); return !!a && a.getClientRects().length > 0") + check("the service on this computer: no agreement to send the sound asked (#859)", not agreement_shown, agreement_shown) press(browser, "transcription-save") saved = wait_for(browser, lambda b: 'transcription_model = "openai/whisper-large-v3-turbo"' in window.file.read_text(), 5) text = window.file.read_text() check("saved: who hears is the service, its address, the model chosen; its host this computer's, no agreement recorded; never the key", saved and 'engine = "service"' in text and f'transcription_provider = "{stand}"' in text and "transcription_agreed" not in text and "sk-stand-in" not in text, text) + host = stand.split("/")[2] + told = browser.execute_script("return document.getElementById('transcription-said')?.textContent || ''") + check("saved on this computer: said so, not as an address and a port (#775)", "cet ordinateur" in told and host not in told, told) logged = [str(f) for f in (WORK / "state").rglob("*") if f.is_file() and "sk-stand-in" in f.read_text(errors="ignore")] check("the key never logged", logged == [], logged) # Drawn again: the service and its model said as chosen, no address shown. @@ -1501,6 +1507,17 @@ def log_message(self, *_): press(browser, "transcription-advanced") unfolded = wait_for(browser, lambda b: b.find_element(By.ID, "transcription-provider").is_displayed(), 3) check("« Avancé » unfolded: an address of one's own, and a model named by hand", unfolded and browser.find_element(By.ID, "transcription-model").is_displayed()) + # One's own address: an agreement asked for a host elsewhere, none for this computer (#859). + own_agreement = "const a = document.getElementById('transcription-own-agreed'); return !!a && a.getClientRects().length > 0" + own = browser.find_element(By.ID, "transcription-provider") + own.clear() + own.send_keys("http://localhost:8000/v1") + here_none = wait_for(browser, lambda b: not b.execute_script(own_agreement), 3) + own.clear() + own.send_keys("https://hears.example/v1") + away_asked = wait_for(browser, lambda b: b.execute_script(own_agreement), 3) + check("one's own address: no agreement for this computer, one for a host elsewhere (#859)", here_none and away_asked, [here_none, away_asked]) + own.clear() browser.execute_script("document.getElementById('transcription-where').scrollIntoView({block: 'start'})") shot_themed(browser, "d95-transcription-service-light", "light") shot_themed(browser, "d95-transcription-service-dark", "dark") @@ -4318,6 +4335,35 @@ def choose(browser, row: int) -> bool: captured.write_text(left) +def settings_folded(now: dt.datetime) -> None: + """BN. Settings after D95, what the 0.2.5 audit still saw (#782): « Modèles à télécharger » folded, a + disclosure (ARIA APG) that stays as the user left it when the page is drawn again; « Refaire le + réglage » in « Général », not among the models.""" + print("BN. Settings: « Modèles à télécharger » folded, kept as left when drawn again; « Refaire le réglage » in « Général » (#782)") + taping = WORK / "settings-folded" + taping.mkdir() + toggle = ("const t = document.getElementById('offered-toggle'), l = document.getElementById('offered');" + " return {toggle: !!t, expanded: t && t.getAttribute('aria-expanded'), controls: t && t.getAttribute('aria-controls')," + " name: t && t.textContent.trim(), list: !!l && l.getClientRects().length > 0, rows: l ? l.querySelectorAll('li').length : 0}") + card = ("const b = document.getElementById('welcome-again'); const c = b && b.closest('section.card');" + " return c ? c.querySelector('h2').textContent : null") + with Window(taping, "fr_FR.UTF-8", 'after = "nothing"\n') as browser: + browser.execute_script("location.hash = '#/settings'") + drawn = wait_for(browser, lambda b: b.find_elements(By.ID, "model") and b.find_element(By.ID, "model").is_displayed(), 10) + got = browser.execute_script(toggle) + check("« Modèles à télécharger » folded at first: a disclosure, closed, its list not shown (#782)", + drawn and got["toggle"] and got["expanded"] == "false" and got["controls"] == "offered" and got["name"] == "Modèles à télécharger" + and not got["list"] and got["rows"] > 0, got) + if got["toggle"]: + press(browser, "offered-toggle") + opened = wait_for(browser, lambda b: b.execute_script(toggle)["list"], 3) + check("pressed: unfolded, the list shown (#782)", opened and browser.execute_script(toggle)["expanded"] == "true", browser.execute_script(toggle)) + browser.execute_async_script("const done = arguments[0]; refresh().then(() => done(true), () => done(false))") + check("drawn again: still unfolded, as the user left it (#782)", + browser.execute_script(toggle)["list"] and browser.execute_script(toggle)["expanded"] == "true", browser.execute_script(toggle)) + check("« Refaire le réglage » in « Général », not among the models (#782)", browser.execute_script(card) == "Général", browser.execute_script(card)) + + def bar_opened(now: dt.datetime) -> None: """BA. The bar opened (D90, board 6): at rest, the microphone, « Vérifier le son » — D88's panel in the bar — and « Avancé » closed; recording, the context, the microphone recorded, « Confidentielle » @@ -9666,6 +9712,7 @@ def aside(folder): microphone_chosen(now) microphone_latest_answer(now) microphone_rollback(now) + settings_folded(now) sound_checked(now) bar_window(now) bar_opened(now) From cd3c2444e4c8031eddf035cd5e9d5c4586f0ae21 Mon Sep 17 00:00:00 2001 From: "kitokey-lina[bot]" <356214857+kitokey-lina[bot]@users.noreply.github.com> Date: Sun, 15 Nov 2026 11:15:32 +0100 Subject: [PATCH 2/6] =?UTF-8?q?shell:=20Settings'=20follow-up=20of=20D95?= =?UTF-8?q?=20=E2=80=94=20=C2=AB=20Mod=C3=A8les=20=C3=A0=20t=C3=A9l=C3=A9c?= =?UTF-8?q?harger=20=C2=BB=20folded,=20no=20agreement=20asked=20for=20this?= =?UTF-8?q?=20computer,=20the=20save=20said=20=C2=AB=20cet=20ordinateur=20?= =?UTF-8?q?=C2=BB=20(#782,=20#859,=20#775)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - « Modèles à télécharger » is a disclosure (ARIA APG), as « Avancé »: closed at first, the list, its refresh and its sentence under it, kept as the user left it over the page's drawings (#782). - A transcription service on this computer asks for no agreement, chosen above or typed under « Avancé »: none is owed there, as the shell already judges (#859). - Saved there, it says « cet ordinateur transcrira… », never its address and port (#775); a new sentence, service_saved_here, commented on its field. Agent-Session: 04463b35-db3b-47ea-bef5-6892f2baedb7 Co-Authored-By: Claude Opus 5.5 --- modules/shell/src/words.rs | 5 ++++ modules/shell/ui/window.js | 49 ++++++++++++++++++++++++++++++-------- 2 files changed, 44 insertions(+), 10 deletions(-) diff --git a/modules/shell/src/words.rs b/modules/shell/src/words.rs index a91f1fdd..8486e66c 100644 --- a/modules/shell/src/words.rs +++ b/modules/shell/src/words.rs @@ -451,6 +451,9 @@ pub struct Window { pub service_test: &'static str, pub service_tested: &'static str, pub service_saved: &'static str, + /// Shows: Settings, « Transcription », under the service's form, once saved. When: the address saved is + /// this computer's, where nothing leaves it (#775). At most: one line. Placeholders: none. + pub service_saved_here: &'static str, pub service_agree_first: &'static str, pub service_address_bad: &'static str, pub service_model_named: &'static str, @@ -923,6 +926,7 @@ pub fn window(language: Language) -> Window { service_test: "Test", service_tested: "It hears, with each segment’s times: a sound of Kitokey’s own was transcribed.", service_saved: "Saved: {} hears your next meetings.", + service_saved_here: "Saved: this computer hears your next meetings.", service_agree_first: "Nothing is saved: agree first that your meetings’ sound is sent to {}.", service_address_bad: "Nothing is saved: the address starts with https:// or http://, then the service’s host — for example https://api.groq.com/openai/v1.", service_model_named: "Nothing is saved: name the model the service hears with — for example whisper-large-v3.", @@ -1348,6 +1352,7 @@ pub fn window(language: Language) -> Window { service_test: "Tester", service_tested: "Il entend, avec les temps de chaque segment\u{a0}: un son propre à Kitokey a été transcrit.", service_saved: "Enregistré\u{a0}: {} transcrira vos prochaines réunions.", + service_saved_here: "Enregistré\u{a0}: cet ordinateur transcrira vos prochaines réunions.", service_agree_first: "Rien n’est enregistré\u{a0}: acceptez d’abord que le son de vos réunions soit envoyé à {}.", service_address_bad: "Rien n’est enregistré\u{a0}: l’adresse commence par https:// ou http://, puis l’hôte du service — par exemple https://api.groq.com/openai/v1.", service_model_named: "Rien n’est enregistré\u{a0}: nommez le modèle avec lequel le service entend — par exemple whisper-large-v3.", diff --git a/modules/shell/ui/window.js b/modules/shell/ui/window.js index b52fae47..93bc0785 100644 --- a/modules/shell/ui/window.js +++ b/modules/shell/ui/window.js @@ -2078,6 +2078,8 @@ function choice(name, value, [label, says], checked, disabled) { let testing = false; // Settings' « Avancé » unfolded: kept while Settings are drawn again, as a choice there redraws them. let generalAdvanced = false; +// « Modèles à télécharger » unfolded by the user, kept over the page's drawings (#782). +let offeredOpen = false; // Each guided path's own (D95), the summary's and the transcription's: « Avancé » unfolded, kept // while Settings are drawn again; each service's last answer to « Vérifier la clé », by its place // in the list — what it refused, or the models it listed —, and where and which service chosen, @@ -2535,6 +2537,10 @@ function showSettings(shown, minutes, words) { // A service (D43): nothing sent of a meeting before the user agreed to its host; a host on this // computer needs no agreement. const hostOf = (text) => { try { return new URL(text).host; } catch { return ""; } }; + // This computer's own host needs no agreement: nothing of the meeting leaves it. + // The whole host, its port aside: `localhost.example` or `127.example` is elsewhere. The shell + // judges again (`providers::local`); this only spares the agreement where none is needed. + const isHere = (host) => /^(localhost|127(\.\d{1,3}){3}|\[::1\])(:\d+)?$/i.test(host); const agreement = (id) => { const wrap = element("label", "row"); const box = element("input"); @@ -2545,12 +2551,19 @@ function showSettings(shown, minutes, words) { box.disabled = locked; const said = element("span", "says"); wrap.append(box, said); + // Shown where the form asks for it, and only for a host elsewhere: none is owed on this computer (#859). + let wanted = true; + let here = false; + const paint = () => { wrap.hidden = !wanted || here; }; // Ticked only for the host already agreed to. const hostIs = (host) => { said.textContent = fill(words.service_agree, host || "—"); box.checked = !!shown.transcription_agreed && shown.transcription_agreed === host; + here = isHere(host); + paint(); }; - return [wrap, box, hostIs]; + const shownIs = (now) => { wanted = now; paint(); }; + return [wrap, box, hostIs, shownIs]; }; const [serviceWrap, servicePick] = guidedList("transcription-service", words.service_name, locked); shown.hearing.forEach((hearing, index) => guidedOption(servicePick, String(index), hearing.name)); @@ -2563,14 +2576,15 @@ function showSettings(shown, minutes, words) { keySaid.id = "transcription-key-said"; keySaid.setAttribute("role", "status"); const [modelsWrap, serviceModels] = guidedList("transcription-models", words.service_model, locked); - const [agreeWrap, agreeBox, agreeHost] = agreement("transcription-agreed"); + const [agreeWrap, agreeBox, agreeHost, agreeShown] = agreement("transcription-agreed"); const saveService = guidedButton("transcription-save", words.service_save, true, locked); // The models listed with its key, the one saved chosen. const shownListed = (models) => { serviceModels.replaceChildren(); for (const id of models) guidedOption(serviceModels, id, modelSaid(id)); if (models.includes(shown.transcription_model)) serviceModels.value = shown.transcription_model; - modelsWrap.hidden = agreeWrap.hidden = saveService.hidden = models.length === 0; + modelsWrap.hidden = saveService.hidden = models.length === 0; + agreeShown(models.length > 0); }; // This service's last answer, said again; else the model saved with it — the others come with its key. const shownSaved = () => { @@ -2581,7 +2595,8 @@ function showSettings(shown, minutes, words) { if (answer?.models) return shownListed(answer.models); serviceModels.replaceChildren(); if (saved) guidedOption(serviceModels, shown.transcription_model, modelSaid(shown.transcription_model)); - modelsWrap.hidden = agreeWrap.hidden = saveService.hidden = !saved; + modelsWrap.hidden = saveService.hidden = !saved; + agreeShown(!!saved); }; shownSaved(); guidedKeyTested("transcription", words, locked, { servicePick, key: serviceKey, keyTest, keySaid, modelsPick: serviceModels }, @@ -2607,10 +2622,6 @@ function showSettings(shown, minutes, words) { const serviceSaid = element("p", "says"); serviceSaid.id = "transcription-said"; serviceSaid.setAttribute("role", "status"); - // This computer's own host needs no agreement: nothing of the meeting leaves it. - // The whole host, its port aside: `localhost.example` or `127.example` is elsewhere. The shell - // judges again (`providers::local`); this only spares the agreement where none is needed. - const isHere = (host) => /^(localhost|127(\.\d{1,3}){3}|\[::1\])(:\d+)?$/i.test(host); const saveHearing = async (provider, model, key, box, addressField, modelField) => { const { invoke } = window.__TAURI__.core; if (!/^https?:$/.test((() => { try { return new URL(provider.trim()).protocol; } catch { return ""; } })()) || !hostOf(provider.trim())) { @@ -2627,7 +2638,9 @@ function showSettings(shown, minutes, words) { } const saved = await invoke("transcription_saved", { provider, model, key: key || null, agreed: box.checked, - }).then((notKept) => (notKept === null ? fill(words.service_saved, hostOf(provider)) : fill(words.key_not_kept, notKept)), (why) => fill(words.not_saved, why)); + }).then((notKept) => (notKept !== null ? fill(words.key_not_kept, notKept) + // This computer's: said so, never as an address and a port (#775). + : isHere(hostOf(provider)) ? words.service_saved_here : fill(words.service_saved, hostOf(provider))), (why) => fill(words.not_saved, why)); // A Tester still asking stays: its answer comes after this, the button its own. serviceAnswer ??= { said: "", asking: false }; serviceAnswer.said = saved; @@ -2782,7 +2795,23 @@ function showSettings(shown, minutes, words) { refreshed.textContent = words.offered_refresh_failed; }); if (shown.registry_waits) refreshed.textContent = words.offered_refresh_waits; - step.append(element("h3", "", words.offered_title), offered, ...(shown.registry_waits ? [] : [refresh_]), refreshed); + // Folded at first (#782): a disclosure (ARIA APG), as « Avancé », left as the user leaves it when + // the page is drawn again — a download running in it goes on either way. + const offeredToggle = element("button", "disclose-advanced"); + offeredToggle.type = "button"; + offeredToggle.id = "offered-toggle"; + offeredToggle.setAttribute("aria-controls", "offered"); + offeredToggle.append(icon("chevron-right"), element("span", "", words.offered_title)); + const offeredPanel = [offered, ...(shown.registry_waits ? [] : [refresh_]), refreshed]; + const unfoldOffered = (now) => { + offeredOpen = now; + offeredToggle.setAttribute("aria-expanded", String(now)); + offeredToggle.firstChild.replaceWith(icon(now ? "chevron-down" : "chevron-right")); + for (const part of offeredPanel) part.hidden = !now; + }; + offeredToggle.addEventListener("click", () => unfoldOffered(!offeredOpen)); + unfoldOffered(offeredOpen); + step.append(offeredToggle, ...offeredPanel); paintOffered(offered); models.append(step, minutesRow(minutes, words, locked), element("p", "says", words.models_note)); parts.push(models); From cb855aacea296fc143a236497c572427c5539525 Mon Sep 17 00:00:00 2001 From: "kitokey-lina[bot]" <356214857+kitokey-lina[bot]@users.noreply.github.com> Date: Sun, 15 Nov 2026 11:37:28 +0100 Subject: [PATCH 3/6] =?UTF-8?q?shell:=20e2e=20=E2=80=94=20BG=20writes=20th?= =?UTF-8?q?is=20computer's=20Whisper=20models=20itself,=20so=20that=20it?= =?UTF-8?q?=20reads=20the=20same=20alone=20as=20in=20the=20whole=20run?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Played alone (KITOKEY_E2E_ONLY), BG found no model on this computer: main() writes them in K, which a partial run does not play. Seen in the coordinator's runs of the Settings follow-up, at ce2ed51 and cd3c244 alike: « on this computer: the models said by name… », got []. K's, when it ran, are kept. Agent-Session: 04463b35-db3b-47ea-bef5-6892f2baedb7 Co-Authored-By: Claude Opus 5.5 --- modules/shell/scripts/e2e_window.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/modules/shell/scripts/e2e_window.py b/modules/shell/scripts/e2e_window.py index c24d06f4..084db2f2 100644 --- a/modules/shell/scripts/e2e_window.py +++ b/modules/shell/scripts/e2e_window.py @@ -1393,6 +1393,13 @@ def transcription_guided(now: dt.datetime) -> None: address typed but under « Avancé ». The stand-in is on this computer: D43's agreement, owed to a host elsewhere, is held by tests/transcription.rs.""" print("BG. Settings: the transcription set up in a few guided steps, a service's key tested at once (D95)") + # This computer's Whisper models, as K writes them in main(): BG's own, so that it reads the same + # alone (KITOKEY_E2E_ONLY) as in the whole run; K's, when it ran, left as they are. + models = WORK / "data" / "kitokey" / "models" + models.mkdir(parents=True, exist_ok=True) + for name in ("ggml-large-v3-turbo-q8_0.bin", "ggml-small.bin"): + if not (models / name).exists(): + (models / name).write_bytes(b"x" * 1000) good, false = "sk-stand-in-good", "sk-stand-in-false" asked = [] From 50978cafbad179001015b9feb910f1ba52af9510 Mon Sep 17 00:00:00 2001 From: "kitokey-lina[bot]" <356214857+kitokey-lina[bot]@users.noreply.github.com> Date: Sun, 15 Nov 2026 13:49:08 +0100 Subject: [PATCH 4/6] =?UTF-8?q?shell:=20e2e=20=E2=80=94=20Z=20saves=20Open?= =?UTF-8?q?Router's=20stand-in=20on=20this=20computer=20with=20no=20agreem?= =?UTF-8?q?ent=20to=20tick,=20as=20#859=20has=20it=20(#866)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit #866's attest at 2e02fa7 stopped in Z: it ticked the agreement for the stand-in on 127.0.0.1, which #859 now hides, and the click raised (ElementNotInteractableException). Z now checks that no agreement is asked there and saves; a host elsewhere is still agreed to above, under « Avancé ». Agent-Session: 04463b35-db3b-47ea-bef5-6892f2baedb7 Co-Authored-By: Claude Opus 5.5 --- modules/shell/scripts/e2e_window.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/shell/scripts/e2e_window.py b/modules/shell/scripts/e2e_window.py index 084db2f2..5c082644 100644 --- a/modules/shell/scripts/e2e_window.py +++ b/modules/shell/scripts/e2e_window.py @@ -1169,8 +1169,10 @@ def log_message(self, *_): models and listed == ["/api/v1/key", "/api/v1/models?output_modalities=transcription"] and not browser.find_element(By.ID, "transcription-provider").is_displayed(), (offered(browser, "transcription-models"), listed)) Select(browser.find_element(By.ID, "transcription-models")).select_by_value("vendor/scribe") - if not browser.find_element(By.ID, "transcription-agreed").is_selected(): - browser.find_element(By.ID, "transcription-agreed").click() + # The stand-in is on this computer: no agreement asked, and it saves without one (#859); a host + # elsewhere is agreed to above, under « Avancé ». + asked = browser.execute_script("const a = document.getElementById('transcription-agreed'); return !!a && a.getClientRects().length > 0") + check("OpenRouter's stand-in on this computer: no agreement asked to send the sound (#859)", not asked, asked) press(browser, "transcription-save") saved = wait_for(browser, lambda b: f'transcription_provider = "{stand}"' in window.file.read_text(), 5) text = window.file.read_text() From d5875b40e269acf8aa7c57a831b01233c7f4fc26 Mon Sep 17 00:00:00 2001 From: "kitokey-lina[bot]" <356214857+kitokey-lina[bot]@users.noreply.github.com> Date: Sun, 15 Nov 2026 14:34:46 +0100 Subject: [PATCH 5/6] =?UTF-8?q?shell:=20the=20list's=20sentence=20for=20a?= =?UTF-8?q?=20key=20not=20yet=20built=20in=20removed=20=E2=80=94=20#825=20?= =?UTF-8?q?built=20it=20in=20=E2=80=94=20and=20#825's=20scenario=20unfolds?= =?UTF-8?q?=20=C2=AB=20Mod=C3=A8les=20=C3=A0=20t=C3=A9l=C3=A9charger=20?= =?UTF-8?q?=C2=BB=20first=20(#782)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit With the decider's key in `registry::PUBLIC_KEY` since #825, `registry_waits` was always false and « La liste ne peut pas encore être mise à jour : elle attend la clé qui la signe » never said: removed, with its flag, its field in both languages and its test. WITHOUT_COMMENT lowered to 596. list_refreshed now unfolds « Modèles à télécharger », folded since this pull request, before it reads and presses « Mettre à jour la liste ». Agent-Session: 04463b35-db3b-47ea-bef5-6892f2baedb7 Co-Authored-By: Claude Opus 5.5 --- modules/shell/scripts/e2e_window.py | 5 ++++- modules/shell/src/main.rs | 2 -- modules/shell/src/words.rs | 3 --- modules/shell/tests/words.rs | 9 +-------- modules/shell/ui/window.js | 7 +++---- 5 files changed, 8 insertions(+), 18 deletions(-) diff --git a/modules/shell/scripts/e2e_window.py b/modules/shell/scripts/e2e_window.py index 971d00a1..5ae3627f 100644 --- a/modules/shell/scripts/e2e_window.py +++ b/modules/shell/scripts/e2e_window.py @@ -935,7 +935,10 @@ def log_message(self, *_): window.env.update(KITOKEY_REGISTRY=f"http://{at}/models.json") with window as browser: browser.find_element(By.ID, "settings-link").click() - button = wait_for(browser, lambda b: b.find_elements(By.ID, "offered-refresh"), 10) + # « Modèles à télécharger » folded at first (#782): unfolded, as the user does, to reach its button. + wait_for(browser, lambda b: b.find_elements(By.ID, "offered-toggle"), 10) + press(browser, "offered-toggle") + button = wait_for(browser, lambda b: b.find_elements(By.ID, "offered-refresh") and b.find_element(By.ID, "offered-refresh").is_displayed(), 10) check("the key built in: a button offers to read the list again, its host shown, nothing said of a key awaited", button and at in browser.find_element(By.ID, "offered-refresh").text and "attend la clé" not in browser.execute_script(said) and asked == [], (browser.execute_script(said), asked)) diff --git a/modules/shell/src/main.rs b/modules/shell/src/main.rs index 634457ae..2da82e6f 100644 --- a/modules/shell/src/main.rs +++ b/modules/shell/src/main.rs @@ -2337,7 +2337,6 @@ struct SettingsShown { /// host it is read again from on the user's gesture (D40). offered: Vec, registry_host: String, - registry_waits: bool, /// The services that hear, offered by name (D63). hearing: Vec, /// The language meetings are spoken in, none: detected; and those offered first (D65). @@ -2423,7 +2422,6 @@ async fn settings_shown(app: AppHandle, shell: State<'_, Shell>) -> Result Window { offered_needs_ollama: "Needs Ollama — install it from ollama.com", offered_refresh: "Update the list ({})", offered_refresh_failed: "The list could not be updated: the models above are still offered.", - offered_refresh_waits: "The list cannot be updated yet: it waits on the key that signs it. The models above are still offered.", speech_option: "Apple's SpeechAnalyzer, on this Mac", speech_missing: "Apple's model is not on this Mac yet", speech_fetch: "Download Apple's model (macOS fetches it from Apple)", @@ -1337,7 +1335,6 @@ pub fn window(language: Language) -> Window { offered_needs_ollama: "Nécessite Ollama, à installer depuis ollama.com", offered_refresh: "Mettre à jour la liste ({})", offered_refresh_failed: "La liste n’a pas pu être mise à jour\u{a0}: les modèles ci-dessus restent proposés.", - offered_refresh_waits: "La liste ne peut pas encore être mise à jour\u{a0}: elle attend la clé qui la signe. Les modèles ci-dessus restent proposés.", speech_option: "SpeechAnalyzer d’Apple, sur ce Mac", speech_missing: "le modèle d’Apple n’est pas encore sur ce Mac", speech_fetch: "Télécharger le modèle d’Apple (macOS le télécharge depuis Apple)", diff --git a/modules/shell/tests/words.rs b/modules/shell/tests/words.rs index c4cde238..112f8f77 100644 --- a/modules/shell/tests/words.rs +++ b/modules/shell/tests/words.rs @@ -1231,7 +1231,7 @@ const STILL_WRONG: &str = include_str!("words_still_wrong.txt"); /// The sentences still without their comment, counted: 602 keys would be three review budgets. /// The number only goes down, as the list does. -const WITHOUT_COMMENT: usize = 597; +const WITHOUT_COMMENT: usize = 596; /// A sentence of `src/words.rs`, as the file arranges it. #[derive(Debug)] @@ -1699,13 +1699,6 @@ fn no_sentence_says_a_word_the_lexicon_refuses() { still_wrong("lexicon", wrong); } -#[test] -fn a_list_waiting_on_its_key_says_so_and_what_stays_offered() { - let (english, french) = (words::window(Language::English), words::window(Language::French)); - assert!(english.offered_refresh_waits.contains("waits on the key") && english.offered_refresh_waits.contains("still offered")); - assert!(french.offered_refresh_waits.contains("attend la clé") && french.offered_refresh_waits.contains("restent proposés")); -} - #[test] fn the_bar_says_a_silence_as_the_notifications_do() { // D49: the same gesture as the notification's, in each language; the side's own. D90: a diff --git a/modules/shell/ui/window.js b/modules/shell/ui/window.js index 93bc0785..2186b183 100644 --- a/modules/shell/ui/window.js +++ b/modules/shell/ui/window.js @@ -2778,8 +2778,8 @@ function showSettings(shown, minutes, words) { pulled.append(pulledSaid, element("span", "state")); offered.append(pulled); // The list read again from where it is kept, only on this click, its host shown (D40): read, - // the page is drawn with it; refused, the list above stays, and it is said. Until the key that - // signs it is built in, no click is offered, and that is said (D56). + // the page is drawn with it; refused, the list above stays, and it is said — signed by the + // decider's key alone, built in since D56. const refreshed = element("p", "says"); refreshed.id = "offered-refreshed"; refreshed.setAttribute("role", "status"); @@ -2794,7 +2794,6 @@ function showSettings(shown, minutes, words) { refresh_.disabled = false; refreshed.textContent = words.offered_refresh_failed; }); - if (shown.registry_waits) refreshed.textContent = words.offered_refresh_waits; // Folded at first (#782): a disclosure (ARIA APG), as « Avancé », left as the user leaves it when // the page is drawn again — a download running in it goes on either way. const offeredToggle = element("button", "disclose-advanced"); @@ -2802,7 +2801,7 @@ function showSettings(shown, minutes, words) { offeredToggle.id = "offered-toggle"; offeredToggle.setAttribute("aria-controls", "offered"); offeredToggle.append(icon("chevron-right"), element("span", "", words.offered_title)); - const offeredPanel = [offered, ...(shown.registry_waits ? [] : [refresh_]), refreshed]; + const offeredPanel = [offered, refresh_, refreshed]; const unfoldOffered = (now) => { offeredOpen = now; offeredToggle.setAttribute("aria-expanded", String(now)); From 64cbda93ec1d04d9c672f4dfb8be248777bc3ed0 Mon Sep 17 00:00:00 2001 From: "kitokey-lina[bot]" <356214857+kitokey-lina[bot]@users.noreply.github.com> Date: Sun, 15 Nov 2026 14:39:22 +0100 Subject: [PATCH 6/6] =?UTF-8?q?shell:=20e2e=20=E2=80=94=20W's=20stand-in?= =?UTF-8?q?=20says=20it=20closes=20each=20connection,=20so=20that=20the=20?= =?UTF-8?q?signature=20is=20never=20asked=20on=20a=20closed=20one=20(#866)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit At d5875b4, W alone failed its last read once: the shell logged « the list's signature could not be read (io: Peer disconnected) », the signature's request never reaching the stand-in. It answers in HTTP/1.0, closing each connection without saying so, and the client may send the next request on the one just closed. It now says « Connection: close ». Main's run of W alone was green: a race. Agent-Session: 04463b35-db3b-47ea-bef5-6892f2baedb7 Co-Authored-By: Claude Opus 5.5 --- modules/shell/scripts/e2e_window.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/shell/scripts/e2e_window.py b/modules/shell/scripts/e2e_window.py index 5ae3627f..2f26edc2 100644 --- a/modules/shell/scripts/e2e_window.py +++ b/modules/shell/scripts/e2e_window.py @@ -919,6 +919,9 @@ def do_GET(self): body = serving["signature"] if self.path.endswith(".minisig") else serving["list"] self.send_response(404 if body is None else 200) self.send_header("Content-Length", str(len(body or b""))) + # HTTP/1.0 closes each connection: said, so that the shell's client never sends the + # signature's request on the list's, closed under it (« Peer disconnected », #866). + self.send_header("Connection", "close") self.end_headers() self.wfile.write(body or b"")