betterbird: ship the operator's approved configuration, and show and fix drift from it (hq issue 345) #256

Merged
mesh-admin merged 2 commits from fix/345-betterbird-configuration into main 2026-10-12 19:22:15 +00:00
Contributor

What

The Betterbird configuration the operator approved on 2026-10-12 (about 21:10), in three layers, plus the tools to manage it.

Locked (install/distribution/policies.json): L1 (mail.shell.checkDefaultClient, from #253) stays. This adds L2 DisableAppUpdate (already there), L3 DisableTelemetry, L5 ExtensionUpdate: false, and two preferences locked to false: L4 mail.inappnotifications.enabled and L6 mailnews.start_page.enabled. The operator chose to lock L6, not make it a default.

Default (new install/defaults-pref/mesh-defaults.js, placed at /opt/betterbird/defaults/pref/ by the existing defaults artifact and spelling resource):

  • the 19 written entries from g14 (D2–D4, D7–D11, D14–D23; D18 is two lines; D23 is Do Not Track true);
  • calendar.alarms.showmissed true (approved);
  • mail.chat.enabled false (approved).

That makes 21 pref() lines, each with a comment above it saying why. Five lines of the form // keeps Betterbird's default: <name> name the preferences the module manages at Betterbird's own default: the theme, system colours, always-underlined links, manual spam marking and the attachment pane (D1, D5, D6, D12, D13).

Tools

  • T1 betterbird_config (new): each managed preference with its lock, the module's default (or Betterbird's), the node layer (setting prefs), the profile's prefs.js value and the value in effect. It flags drift: a saved value that beats the module's value without a lock or node layer saying so.
  • T2 betterbird_prefs: reads Betterbird's real defaults from omni.ja (greprefs.js, defaults/pref/*.js) and from the installation's defaults/pref. The answer gives default and default_from, and "locked by the module's policy" for a lock. Of several files, the one first by name holds, which is Gecko's reverse-sorted read. Against the pinned 153.4.0 omni.ja this gives mail.threadpane.listview 1, so D9 is written, and offline.autoDetect and the gloda indexer true (from all-thunderbird.js).
  • T3 betterbird_config_apply (new): a dry run by default. With apply, and only while no Betterbird main process runs, it removes the drifting lines from prefs.js and leaves every other line byte for byte. It says each one it cleared, with the value it had and the value that now holds. It refuses when mesh-defaults.js is not placed.
  • T4: of mailnews.*, it withholds only a name holding server, account, ident, smtp, ldap, imap, pop3, nntp, tags., email or addr. So mailnews.start_page.enabled and mailnews.default_view_flags are now answered.
  • T5 betterbird_check: a finding for drift, which names the preferences and gives both remedies, and a finding when the defaults are not placed on a node running the mesh's release. policyProblem now lists every gap, not only the first.
  • T6 betterbird_config with keep: proposes a node layer of prefs for MESH_NODE through seat:mesh-controller.settings (propose: true), holding the profile's values of the named preferences. It never writes user.js. It refuses a locked name, an unmanaged name, or a name the profile did not save.
  • Review follow-up from #253: defaultClientAsk decides from the policy's own Preferences entry (locks()), not from policyProblem's first message. Before, a policy missing both DisableAppUpdate and the lock was read as not asking.

README: a new section, "The configuration this module ships", lists the layers, and the Owns, Tools and push tables are updated.

Design limits I chose

  • A keep layer carries the whole prefs value as it stands on the machine, with the kept values added, because the setting is one string and a layer replaces it whole. If the node layer also holds accounts, the controller refuses a proposal that would drop it, and the tool reports that refusal.
  • For a kept-at-default preference that is in no defaults file (the theme, system colours, underlined links are compiled in), any saved value counts as drift.
  • The resource id spelling is kept, though it now places two files, so that no node sees a resource removed and added again.

How it was tested

  • config_test.go: the approved locks and defaults, exactly; every line commented; the lock prefixes are ones Betterbird accepts. Defaults are read from a fake omni.ja with two files that contradict each other. Withholding of mailnews.*. Layers and drift. Apply refused while running, then clearing only the drifting lines. A keep proposal through a stubbed controller. The default-client decision. Each test fails on main: the new symbols are missing. The withholding and default-client tests were also checked by putting the old logic back, and both fail.
  • defaults() was also run once against the real pinned omni.ja, which gives 2,714 defaults.
  • go vet, go test -race ./... in modules/betterbird.
  • MESH_GATE=<mesh-controller main 84deb53 built> MESH_CHECK_MODULES=betterbird sh merge-check.sh passes.
  • No conflict with #252 (issue 168, accounts takes-settings): git merge-tree is clean, and this PR does not touch the accounts resource.

What changes on shanks when it lands (push waits for the operator: upgrade policy record)

At Betterbird's next start:

  • no default-client window;
  • no start page;
  • telemetry and add-on updates off;
  • compact density and 14-point text;
  • vertical layout, multi-line rows, cards, threads grouped (where shanks saved no value of its own);
  • no Shift+Delete or calendar-delete confirmation;
  • new mail with no pop-up, sound or tray icon;
  • the calendar day 09:00 to 20:00;
  • missed reminders shown at the start;
  • no chat button.

betterbird_check then reports drift for the theme (compact-dark), system colours, underlined links, manual spam marking and the attachment pane. These change only after a betterbird_config_apply with Betterbird quit, or stay through a keep layer.

Fixes part of issue 345 (the configuration). Not merged.

## What The Betterbird configuration the operator approved on 2026-10-12 (about 21:10), in three layers, plus the tools to manage it. **Locked** (`install/distribution/policies.json`): L1 (`mail.shell.checkDefaultClient`, from #253) stays. This adds L2 `DisableAppUpdate` (already there), L3 `DisableTelemetry`, L5 `ExtensionUpdate: false`, and two preferences locked to false: L4 `mail.inappnotifications.enabled` and L6 `mailnews.start_page.enabled`. The operator chose to lock L6, not make it a default. **Default** (new `install/defaults-pref/mesh-defaults.js`, placed at `/opt/betterbird/defaults/pref/` by the existing `defaults` artifact and `spelling` resource): - the 19 written entries from g14 (D2–D4, D7–D11, D14–D23; D18 is two lines; D23 is Do Not Track true); - `calendar.alarms.showmissed` true (approved); - `mail.chat.enabled` false (approved). That makes 21 `pref()` lines, each with a comment above it saying why. Five lines of the form `// keeps Betterbird's default: <name>` name the preferences the module manages at Betterbird's own default: the theme, system colours, always-underlined links, manual spam marking and the attachment pane (D1, D5, D6, D12, D13). **Tools** - T1 `betterbird_config` (new): each managed preference with its lock, the module's default (or Betterbird's), the node layer (setting `prefs`), the profile's `prefs.js` value and the value in effect. It flags drift: a saved value that beats the module's value without a lock or node layer saying so. - T2 `betterbird_prefs`: reads Betterbird's real defaults from `omni.ja` (`greprefs.js`, `defaults/pref/*.js`) and from the installation's `defaults/pref`. The answer gives `default` and `default_from`, and "locked by the module's policy" for a lock. Of several files, the one first by name holds, which is Gecko's reverse-sorted read. Against the pinned 153.4.0 `omni.ja` this gives `mail.threadpane.listview` 1, so D9 is written, and `offline.autoDetect` and the gloda indexer true (from all-thunderbird.js). - T3 `betterbird_config_apply` (new): a dry run by default. With `apply`, and only while no Betterbird main process runs, it removes the drifting lines from `prefs.js` and leaves every other line byte for byte. It says each one it cleared, with the value it had and the value that now holds. It refuses when `mesh-defaults.js` is not placed. - T4: of `mailnews.*`, it withholds only a name holding server, account, ident, smtp, ldap, imap, pop3, nntp, tags., email or addr. So `mailnews.start_page.enabled` and `mailnews.default_view_flags` are now answered. - T5 `betterbird_check`: a finding for drift, which names the preferences and gives both remedies, and a finding when the defaults are not placed on a node running the mesh's release. `policyProblem` now lists every gap, not only the first. - T6 `betterbird_config` with `keep`: proposes a node layer of `prefs` for `MESH_NODE` through `seat:mesh-controller.settings` (`propose: true`), holding the profile's values of the named preferences. It never writes user.js. It refuses a locked name, an unmanaged name, or a name the profile did not save. - Review follow-up from #253: `defaultClientAsk` decides from the policy's own `Preferences` entry (`locks()`), not from `policyProblem`'s first message. Before, a policy missing both `DisableAppUpdate` and the lock was read as not asking. README: a new section, "The configuration this module ships", lists the layers, and the Owns, Tools and push tables are updated. ## Design limits I chose - A `keep` layer carries the whole `prefs` value as it stands on the machine, with the kept values added, because the setting is one string and a layer replaces it whole. If the node layer also holds `accounts`, the controller refuses a proposal that would drop it, and the tool reports that refusal. - For a kept-at-default preference that is in no defaults file (the theme, system colours, underlined links are compiled in), any saved value counts as drift. - The resource id `spelling` is kept, though it now places two files, so that no node sees a resource removed and added again. ## How it was tested - `config_test.go`: the approved locks and defaults, exactly; every line commented; the lock prefixes are ones Betterbird accepts. Defaults are read from a fake `omni.ja` with two files that contradict each other. Withholding of `mailnews.*`. Layers and drift. Apply refused while running, then clearing only the drifting lines. A `keep` proposal through a stubbed controller. The default-client decision. Each test fails on main: the new symbols are missing. The withholding and default-client tests were also checked by putting the old logic back, and both fail. - `defaults()` was also run once against the real pinned `omni.ja`, which gives 2,714 defaults. - `go vet`, `go test -race ./...` in modules/betterbird. - `MESH_GATE=<mesh-controller main 84deb53 built> MESH_CHECK_MODULES=betterbird sh merge-check.sh` passes. - No conflict with #252 (issue 168, accounts `takes-settings`): `git merge-tree` is clean, and this PR does not touch the accounts resource. ## What changes on shanks when it lands (push waits for the operator: upgrade policy record) At Betterbird's next start: - no default-client window; - no start page; - telemetry and add-on updates off; - compact density and 14-point text; - vertical layout, multi-line rows, cards, threads grouped (where shanks saved no value of its own); - no Shift+Delete or calendar-delete confirmation; - new mail with no pop-up, sound or tray icon; - the calendar day 09:00 to 20:00; - missed reminders shown at the start; - no chat button. `betterbird_check` then reports drift for the theme (compact-dark), system colours, underlined links, manual spam marking and the attachment pane. These change only after a `betterbird_config_apply` with Betterbird quit, or stay through a `keep` layer. Fixes part of issue 345 (the configuration). Not merged.
mesh-admin added 1 commit 2026-10-12 18:59:06 +00:00
betterbird: ship the operator's approved configuration, and show and fix drift from it (hq issue 345)
mesh/merge-gate out of date: judged against trunk 2fe5601397ae, the trunk is now 0863ec2a059d; judged again on a recheck or when it is merged
mesh/repo-check out of date: judged against trunk 2fe5601397ae, the trunk is now 0863ec2a059d; judged again on a recheck or when it is merged
mesh/delivery superseded: a newer head of the same pull request
854c85393c
A module that installs Betterbird but leaves every node to its own settings does not set Betterbird up.
The operator approved the configuration on 2026-10-12, and it now ships in three layers. The policy
locks what must never differ: telemetry, add-on updates, the vendor's notices and the start page. A
defaults file carries the laptop's setup, so a fresh node gets it untouched. The setting prefs stays a
node's exceptions.

A default loses to a value the profile saved. betterbird_config shows that drift, betterbird_check
reports it, and betterbird_config_apply clears it while Betterbird is quit. keep proposes a node layer
instead of writing user.js. betterbird_prefs now reads Betterbird's real defaults from omni.ja, and
withholds of mailnews.* only what names an account. The default-client ask is decided from its own
policy entry, not from the first thing the policy lacks.
Author
Contributor

Delivery novox/mesh-catalog@c4b4bac757c5 — delivered since 2026-10-12T19:32:21Z

Delivery plan — builds betterbird, sent nowhere; no bus step; 1 wait(s) for a person

  • tier 0: betterbird
  • shanks: waits for a person: betterbird
  • betterbird waits for a person: its policy records (person)

Machines

  • build-agent on ace: passed — carried by plan-1791832950910939849

Transitions

  • 2026-10-12 19:09 (new) → proposed (announced): novox/mesh-catalog#256's head announced
  • 2026-10-12 19:13 proposed → checked (checked): a verdict names this commit and the trunk's head as its trunk commit
  • 2026-10-12 19:13 checked → ready (accepted): the gate passed or warned, and the repository's own check did not fail
  • 2026-10-12 19:22 ready → published (merged): on the trunk its modules follow: merged there, and its walk opened — or nothing for a walk to move
  • 2026-10-12 19:22 published → delivering (go): its walk started: let go by this owner in its group's order, by a person, or on the controller's own path — not a failed walk that carried a later commit for it, after which it waits for a walk of its own commit
  • 2026-10-12 19:32 delivering → delivered (done): its walk is done, carrying its own commit: every machine of its deploy plan passed, or was left as its policy says

The commit's note under refs/notes/mesh-plan keeps every transition: git log --notes=mesh-plan.

<!-- mesh-delivery:view --> **Delivery** `novox/mesh-catalog@c4b4bac757c5` — **delivered** since 2026-10-12T19:32:21Z **Delivery plan** — builds betterbird, sent nowhere; no bus step; 1 wait(s) for a person - tier 0: betterbird - shanks: waits for a person: betterbird - betterbird waits for a person: its policy records (person) **Machines** - build-agent on ace: passed — carried by plan-1791832950910939849 **Transitions** - 2026-10-12 19:09 (new) → proposed (announced): novox/mesh-catalog#256's head announced - 2026-10-12 19:13 proposed → checked (checked): a verdict names this commit and the trunk's head as its trunk commit - 2026-10-12 19:13 checked → ready (accepted): the gate passed or warned, and the repository's own check did not fail - 2026-10-12 19:22 ready → published (merged): on the trunk its modules follow: merged there, and its walk opened — or nothing for a walk to move - 2026-10-12 19:22 published → delivering (go): its walk started: let go by this owner in its group's order, by a person, or on the controller's own path — not a failed walk that carried a later commit for it, after which it waits for a walk of its own commit - 2026-10-12 19:32 delivering → delivered (done): its walk is done, carrying its own commit: every machine of its deploy plan passed, or was left as its policy says The commit's note under `refs/notes/mesh-plan` keeps every transition: `git log --notes=mesh-plan`.
Author
Contributor

Merge check at 854c8539
Judged: head 854c85393cd8 merged into trunk 2fe5601397ae; read beside it: mesh-controller 84deb530ee5a, mesh-controller-main 84deb530ee5a, mesh-host 303d4037e84e, mesh-tools 954e1a53eef9

  • mesh/merge-gate: PASS — every machine composes with the change as it did without (4 of 4 compose) (modules: betterbird)
  • mesh/repo-check: PASS — its merge-check.sh passed, each part in its toolchain: merge-check.sh (go), merge-check-typescript.sh (typescript)

Delivery plan — builds betterbird, sent nowhere; no bus step; 1 wait(s) for a person

  • tier 0: betterbird
  • shanks: waits for a person: betterbird
  • betterbird waits for a person: its policy records (person)
  • read by no module's build: modules/betterbird/README.md, modules/betterbird/cmd/betterbird-tools/config_test.go

Run by the build seat on g14 as build-1791831561878481388 (builds --log build-1791831561878481388).

--- the gate: betterbird
betterbird: ok, 10 tool(s), invokes seat:mesh-controller.settings
long-running resources without health: 0
files asking for a setting without saying whether it is trusted: 0
1 manifest(s) checked. Judged against the seats this binary carries; a claim on one of the mesh's own seats is judged fully at registration, and a seat declared by a module not given here reads as unknown. Identities judged on a 6-character machine name, against the bounds of the providers given here
judging 1 module(s) changed against 4 machine(s), as the snapshot of 2026-10-12T18:54:57Z says they run
composing every machine as the mesh is
the bus's user list leaves out 5 user(s) the mesh has minted no credential for: controller, node.f35, node.idt, node.ygcyr, node.yvbpsm. Each is a user that cannot connect until one is issued
the bus's user list leaves out 5 user(s) the mesh has minted no credential for: controller, node.f35, node.idt, node.ygcyr, node.yvbpsm. Each is a user that cannot connect until one is issued
composing every machine with the change
the bus's user list leaves out 5 user(s) the mesh has minted no credential for: controller, node.f35, node.idt, node.ygcyr, node.yvbpsm. Each is a user that cannot connect until one is issued
the bus's user list leaves out 5 user(s) the mesh has minted no credential for: controller, node.f35, node.idt, node.ygcyr, node.yvbpsm. Each is a user that cannot connect until one is issued
merge gate: PASS — every machine composes with the change as it did without (4 of 4 compose)
judged by controller development build against the facts of 2026-10-12T18:54:57Z

modules the change moves:
  - betterbird (changed)

machines:
  - a machine (f35): composes
  - holds mesh-dns-resolver (idt): composes
  - holds git, holds mesh-artifact-store, holds mesh-broker, holds mesh-catalog, holds mesh-delivery, holds mesh-dns-resolver, holds mesh-store, holds mesh-vault, holds npm-package-registry, the control node, the hub (ygcyr): composes
  - a machine (yvbpsm): composes

a merge would rebuild 1 module(s) in 1 tier(s): betterbird

notes:
  - modules/betterbird/README.md and modules/betterbird/cmd/betterbird-tools/config_test.go read by no module's build, and rebuild nothing (issue 280)
--- its merge-check.sh (go toolchain)
ok  	git.novox.be/novox/mesh-catalog/checks/words	0.003s
words: 12 retired words and 70 daemons' lines, none in the 44634 strings of 703 files
ok  	git.novox.be/novox/mesh-catalog/checks/agenthome	0.011s
agent-home: no archive and no file written into under the agent's home
ok  	git.novox.be/novox/mesh-catalog/checks/paths	0.005s
paths: no module names another's state on its machine (3 known, listed to go)
long-running resources without health: 69, as kept
ok  	git.novox.be/novox/mesh-catalog/checks/deps	0.216s
testing modules/betterbird
ok  	betterbird/cmd/betterbird-tools	1.843s
--- its merge-check-typescript.sh (typescript toolchain)
**Merge check** at `854c8539` Judged: head `854c85393cd8` merged into trunk `2fe5601397ae`; read beside it: mesh-controller `84deb530ee5a`, mesh-controller-main `84deb530ee5a`, mesh-host `303d4037e84e`, mesh-tools `954e1a53eef9` - `mesh/merge-gate`: **PASS** — every machine composes with the change as it did without (4 of 4 compose) (modules: betterbird) - `mesh/repo-check`: **PASS** — its merge-check.sh passed, each part in its toolchain: merge-check.sh (go), merge-check-typescript.sh (typescript) **Delivery plan** — builds betterbird, sent nowhere; no bus step; 1 wait(s) for a person - tier 0: betterbird - shanks: waits for a person: betterbird - betterbird waits for a person: its policy records (person) - read by no module's build: modules/betterbird/README.md, modules/betterbird/cmd/betterbird-tools/config_test.go Run by the build seat on g14 as `build-1791831561878481388` (`builds --log build-1791831561878481388`). ``` --- the gate: betterbird betterbird: ok, 10 tool(s), invokes seat:mesh-controller.settings long-running resources without health: 0 files asking for a setting without saying whether it is trusted: 0 1 manifest(s) checked. Judged against the seats this binary carries; a claim on one of the mesh's own seats is judged fully at registration, and a seat declared by a module not given here reads as unknown. Identities judged on a 6-character machine name, against the bounds of the providers given here judging 1 module(s) changed against 4 machine(s), as the snapshot of 2026-10-12T18:54:57Z says they run composing every machine as the mesh is the bus's user list leaves out 5 user(s) the mesh has minted no credential for: controller, node.f35, node.idt, node.ygcyr, node.yvbpsm. Each is a user that cannot connect until one is issued the bus's user list leaves out 5 user(s) the mesh has minted no credential for: controller, node.f35, node.idt, node.ygcyr, node.yvbpsm. Each is a user that cannot connect until one is issued composing every machine with the change the bus's user list leaves out 5 user(s) the mesh has minted no credential for: controller, node.f35, node.idt, node.ygcyr, node.yvbpsm. Each is a user that cannot connect until one is issued the bus's user list leaves out 5 user(s) the mesh has minted no credential for: controller, node.f35, node.idt, node.ygcyr, node.yvbpsm. Each is a user that cannot connect until one is issued merge gate: PASS — every machine composes with the change as it did without (4 of 4 compose) judged by controller development build against the facts of 2026-10-12T18:54:57Z modules the change moves: - betterbird (changed) machines: - a machine (f35): composes - holds mesh-dns-resolver (idt): composes - holds git, holds mesh-artifact-store, holds mesh-broker, holds mesh-catalog, holds mesh-delivery, holds mesh-dns-resolver, holds mesh-store, holds mesh-vault, holds npm-package-registry, the control node, the hub (ygcyr): composes - a machine (yvbpsm): composes a merge would rebuild 1 module(s) in 1 tier(s): betterbird notes: - modules/betterbird/README.md and modules/betterbird/cmd/betterbird-tools/config_test.go read by no module's build, and rebuild nothing (issue 280) --- its merge-check.sh (go toolchain) ok git.novox.be/novox/mesh-catalog/checks/words 0.003s words: 12 retired words and 70 daemons' lines, none in the 44634 strings of 703 files ok git.novox.be/novox/mesh-catalog/checks/agenthome 0.011s agent-home: no archive and no file written into under the agent's home ok git.novox.be/novox/mesh-catalog/checks/paths 0.005s paths: no module names another's state on its machine (3 known, listed to go) long-running resources without health: 69, as kept ok git.novox.be/novox/mesh-catalog/checks/deps 0.216s testing modules/betterbird ok betterbird/cmd/betterbird-tools 1.843s --- its merge-check-typescript.sh (typescript toolchain) ```
mesh-admin left a comment
Author
Contributor

Verdict: request changes at 854c85393c

Independent review for hq issue 345 (the Betterbird configuration the module ships). One blocking defect: the theme row (D1) cannot be brought back by clearing prefs.js, so betterbird_config_apply reports a fix it does not make. One cheap hardening is also asked. The rest holds.

What holds (checked)

  • Locks match the approved spec (L1-L6; start page locked as the operator chose); policies.json valid, keeps DisableAppUpdate and Owl force-installed with updates off.
  • Defaults match: exactly 21 values (the spec's 19 + calendar.alarms.showmissed true + mail.chat.enabled false); names, values and placement as approved; every name exists in the pinned 153.4.0esr-bb10.
  • T4 withholding: no answer path returns an address, host, account or token value.
  • T6 keep: proposes through mesh-controller.settings (propose, no replace), never writes user.js; a proposal that would drop accounts is refused.
  • The apply write keeps every other prefs.js line byte-for-byte in order (temp file + rename).
  • New tests fail without the change; go vet clean; go test -race passes; merge-check.sh (MESH_CHECK_MODULES=betterbird, MESH_GATE from mesh-controller 84deb530) exits 0.
  • Statuses: merge-gate, repo-check, delivery all success.

Blocking: clearing extensions.activeThemeID does not change the theme (D1)

  • Symptom: on shanks D1 drifts (thunderbird-compact-dark@mozilla.org); apply removes the line and says Betterbird's default now holds; config/check then show no drift (the test asserts this).
  • Cause: in 153.4.0 the active theme lives in the add-on database (extensions.json); the pref only mirrors it (XPIDatabase.sys.mjs addonChanged() is its only writer; nothing at start reads it to choose the theme). So compact-dark stays active while the tool reports it gone.
  • Second effect: a profile holding "default-theme@mozilla.org" reads as drifting forever (module value "").
  • Asked: (1) D1's module value "default-theme@mozilla.org", unset treated as equal; (2) leave the theme out of what apply clears, report it as drift fixed by enabling the default theme in the add-on manager, never as cleared; (3) a test that fails today; correct the spec line "after a T3 apply the theme goes back".

Asked: refuse an account-owned name in the managed list (hardening)

  • config()/ConfigApply() act on whatever names mesh-defaults.js lists; only the file's content keeps mail.server/identity/smtpserver/account, account lists and credential names out. Skip every name withheld() or accountOwned covers, with a betterbird_check finding and a test that puts such a name in the defaults file and shows prefs.js keeps it.

Notes (not blocking)

  • Running detection: also check the profile's own lock (Gecko's per-profile signal).
  • f.Sync() the temp file before the rename.
  • D5/D6: an explicitly saved default (false) reads as drift (noise only).

(Posted by the main session for the reviewer, which had no posting tool; full text in the session scratchpad review256.md.)

Verdict: request changes at 854c85393cd8722ba4abc7ac8d6de244a17ed205 Independent review for hq issue 345 (the Betterbird configuration the module ships). One blocking defect: the theme row (D1) cannot be brought back by clearing prefs.js, so `betterbird_config_apply` reports a fix it does not make. One cheap hardening is also asked. The rest holds. **What holds (checked)** - Locks match the approved spec (L1-L6; start page locked as the operator chose); policies.json valid, keeps DisableAppUpdate and Owl force-installed with updates off. - Defaults match: exactly 21 values (the spec's 19 + calendar.alarms.showmissed true + mail.chat.enabled false); names, values and placement as approved; every name exists in the pinned 153.4.0esr-bb10. - T4 withholding: no answer path returns an address, host, account or token value. - T6 keep: proposes through mesh-controller.settings (propose, no replace), never writes user.js; a proposal that would drop accounts is refused. - The apply write keeps every other prefs.js line byte-for-byte in order (temp file + rename). - New tests fail without the change; go vet clean; go test -race passes; merge-check.sh (MESH_CHECK_MODULES=betterbird, MESH_GATE from mesh-controller 84deb530) exits 0. - Statuses: merge-gate, repo-check, delivery all success. **Blocking: clearing `extensions.activeThemeID` does not change the theme (D1)** - Symptom: on shanks D1 drifts (thunderbird-compact-dark@mozilla.org); apply removes the line and says Betterbird's default now holds; config/check then show no drift (the test asserts this). - Cause: in 153.4.0 the active theme lives in the add-on database (extensions.json); the pref only mirrors it (XPIDatabase.sys.mjs addonChanged() is its only writer; nothing at start reads it to choose the theme). So compact-dark stays active while the tool reports it gone. - Second effect: a profile holding "default-theme@mozilla.org" reads as drifting forever (module value ""). - Asked: (1) D1's module value "default-theme@mozilla.org", unset treated as equal; (2) leave the theme out of what apply clears, report it as drift fixed by enabling the default theme in the add-on manager, never as cleared; (3) a test that fails today; correct the spec line "after a T3 apply the theme goes back". **Asked: refuse an account-owned name in the managed list (hardening)** - config()/ConfigApply() act on whatever names mesh-defaults.js lists; only the file's content keeps mail.server/identity/smtpserver/account, account lists and credential names out. Skip every name withheld() or accountOwned covers, with a betterbird_check finding and a test that puts such a name in the defaults file and shows prefs.js keeps it. **Notes (not blocking)** - Running detection: also check the profile's own `lock` (Gecko's per-profile signal). - f.Sync() the temp file before the rename. - D5/D6: an explicitly saved default (false) reads as drift (noise only). (Posted by the main session for the reviewer, which had no posting tool; full text in the session scratchpad review256.md.)
jschoubben added 1 commit 2026-10-12 19:09:27 +00:00
betterbird: never report the theme as fixed by clearing prefs.js, and never manage an account's name (hq issue 345, review 96)
mesh/merge-gate head c4b4bac757c5 merged into trunk 0863ec2a059d — pass: builds betterbird, sent nowhere; no bus step; 1 wait(s) for a person; every machin…
mesh/repo-check head c4b4bac757c5 merged into trunk 0863ec2a059d — pass: its merge-check.sh passed, each part in its toolchain: merge-check.sh (go), merge-…
mesh/delivery delivered
c4b4bac757
Betterbird keeps the active theme in its add-on database, and extensions.activeThemeID only mirrors it.
So clearing the preference changed nothing, and the drift report then hid that. The theme is now read
from extensions.json against default-theme@mozilla.org. Another theme is drift, and its remedy is the
add-on manager: config_apply never clears it and keep refuses it.

A credential's, an account's or a server's name in the defaults file is refused by code: it is never
answered or cleared, and the check names it. Apply also refuses while the profile's lock is there, and
syncs prefs.js before the rename. A saved default of a built-in preference is no longer drift.
mesh-admin left a comment
Author
Contributor

Verdict: approve at c4b4bac757

Re-review against review 96. Every point is built and checked in the code: the theme is read from extensions.json with module value default-theme@mozilla.org; apply never clears it (not_cleared, remedy: the add-on manager); betterbird_check gives it its own finding; keep refuses it. config() skips names withheld() or accountOwned covers (listed under refused, with a check finding; test: prefs.js unchanged, no account value answered). Apply is refused while the profile's lock exists. The temp file is synced before the rename. D5/D6 saved false is not drift.

Run: the new tests put on 854c8539 fail on behaviour (4 tests) once their new fields are stubbed; on the head go vet is clean, go test -race passes, merge-check.sh (MESH_CHECK_MODULES=betterbird, MESH_GATE from mesh-controller 84deb530) exits 0.

This approval covers the code; the merge waits until mesh/merge-gate and mesh/repo-check are green and read.

Note (not blocking): a node layer of prefs naming extensions.activeThemeID would hide theme drift without changing the theme; keep refuses it, so only a hand-set layer could.

(Posted by the main session for the reviewer; full text in the session scratchpad review256b.md.)

Verdict: approve at c4b4bac757c55e99053c4d63361564f9d77d22b2 Re-review against review 96. Every point is built and checked in the code: the theme is read from extensions.json with module value default-theme@mozilla.org; apply never clears it (not_cleared, remedy: the add-on manager); betterbird_check gives it its own finding; keep refuses it. config() skips names withheld() or accountOwned covers (listed under refused, with a check finding; test: prefs.js unchanged, no account value answered). Apply is refused while the profile's lock exists. The temp file is synced before the rename. D5/D6 saved false is not drift. Run: the new tests put on 854c8539 fail on behaviour (4 tests) once their new fields are stubbed; on the head go vet is clean, go test -race passes, merge-check.sh (MESH_CHECK_MODULES=betterbird, MESH_GATE from mesh-controller 84deb530) exits 0. This approval covers the code; the merge waits until mesh/merge-gate and mesh/repo-check are green and read. Note (not blocking): a node layer of prefs naming extensions.activeThemeID would hide theme drift without changing the theme; keep refuses it, so only a hand-set layer could. (Posted by the main session for the reviewer; full text in the session scratchpad review256b.md.)
Author
Contributor

Merge check at c4b4bac7
Judged: head c4b4bac757c5 merged into trunk 0863ec2a059d; read beside it: mesh-controller 84deb530ee5a, mesh-controller-main 84deb530ee5a, mesh-host 303d4037e84e, mesh-tools 954e1a53eef9

  • mesh/merge-gate: PASS — every machine composes with the change as it did without (4 of 4 compose) (modules: betterbird)
  • mesh/repo-check: PASS — its merge-check.sh passed, each part in its toolchain: merge-check.sh (go), merge-check-typescript.sh (typescript)

Delivery plan — builds betterbird, sent nowhere; no bus step; 1 wait(s) for a person

  • tier 0: betterbird
  • shanks: waits for a person: betterbird
  • betterbird waits for a person: its policy records (person)
  • read by no module's build: modules/betterbird/README.md, modules/betterbird/cmd/betterbird-tools/config_test.go

Run by the build seat on novox as build-1791832197613212426 (builds --log build-1791832197613212426).

--- the gate: betterbird
betterbird: ok, 10 tool(s), invokes seat:mesh-controller.settings
long-running resources without health: 0
files asking for a setting without saying whether it is trusted: 0
1 manifest(s) checked. Judged against the seats this binary carries; a claim on one of the mesh's own seats is judged fully at registration, and a seat declared by a module not given here reads as unknown. Identities judged on a 6-character machine name, against the bounds of the providers given here
judging 1 module(s) changed against 4 machine(s), as the snapshot of 2026-10-12T19:03:57Z says they run
composing every machine as the mesh is
the bus's user list leaves out 5 user(s) the mesh has minted no credential for: controller, node.f35, node.idt, node.ygcyr, node.yvbpsm. Each is a user that cannot connect until one is issued
the bus's user list leaves out 5 user(s) the mesh has minted no credential for: controller, node.f35, node.idt, node.ygcyr, node.yvbpsm. Each is a user that cannot connect until one is issued
composing every machine with the change
the bus's user list leaves out 5 user(s) the mesh has minted no credential for: controller, node.f35, node.idt, node.ygcyr, node.yvbpsm. Each is a user that cannot connect until one is issued
the bus's user list leaves out 5 user(s) the mesh has minted no credential for: controller, node.f35, node.idt, node.ygcyr, node.yvbpsm. Each is a user that cannot connect until one is issued
merge gate: PASS — every machine composes with the change as it did without (4 of 4 compose)
judged by controller development build against the facts of 2026-10-12T19:03:57Z

modules the change moves:
  - betterbird (changed)

machines:
  - a machine (f35): composes
  - holds mesh-dns-resolver (idt): composes
  - holds git, holds mesh-artifact-store, holds mesh-broker, holds mesh-catalog, holds mesh-delivery, holds mesh-dns-resolver, holds mesh-store, holds mesh-vault, holds npm-package-registry, the control node, the hub (ygcyr): composes
  - a machine (yvbpsm): composes

a merge would rebuild 1 module(s) in 1 tier(s): betterbird

notes:
  - modules/betterbird/README.md and modules/betterbird/cmd/betterbird-tools/config_test.go read by no module's build, and rebuild nothing (issue 280)
--- its merge-check.sh (go toolchain)
ok  	git.novox.be/novox/mesh-catalog/checks/words	0.008s
words: 12 retired words and 70 daemons' lines, none in the 44678 strings of 703 files
ok  	git.novox.be/novox/mesh-catalog/checks/agenthome	0.013s
agent-home: no archive and no file written into under the agent's home
ok  	git.novox.be/novox/mesh-catalog/checks/paths	0.007s
paths: no module names another's state on its machine (3 known, listed to go)
long-running resources without health: 69, as kept
ok  	git.novox.be/novox/mesh-catalog/checks/deps	0.216s
testing modules/betterbird
ok  	betterbird/cmd/betterbird-tools	2.015s
--- its merge-check-typescript.sh (typescript toolchain)
**Merge check** at `c4b4bac7` Judged: head `c4b4bac757c5` merged into trunk `0863ec2a059d`; read beside it: mesh-controller `84deb530ee5a`, mesh-controller-main `84deb530ee5a`, mesh-host `303d4037e84e`, mesh-tools `954e1a53eef9` - `mesh/merge-gate`: **PASS** — every machine composes with the change as it did without (4 of 4 compose) (modules: betterbird) - `mesh/repo-check`: **PASS** — its merge-check.sh passed, each part in its toolchain: merge-check.sh (go), merge-check-typescript.sh (typescript) **Delivery plan** — builds betterbird, sent nowhere; no bus step; 1 wait(s) for a person - tier 0: betterbird - shanks: waits for a person: betterbird - betterbird waits for a person: its policy records (person) - read by no module's build: modules/betterbird/README.md, modules/betterbird/cmd/betterbird-tools/config_test.go Run by the build seat on novox as `build-1791832197613212426` (`builds --log build-1791832197613212426`). ``` --- the gate: betterbird betterbird: ok, 10 tool(s), invokes seat:mesh-controller.settings long-running resources without health: 0 files asking for a setting without saying whether it is trusted: 0 1 manifest(s) checked. Judged against the seats this binary carries; a claim on one of the mesh's own seats is judged fully at registration, and a seat declared by a module not given here reads as unknown. Identities judged on a 6-character machine name, against the bounds of the providers given here judging 1 module(s) changed against 4 machine(s), as the snapshot of 2026-10-12T19:03:57Z says they run composing every machine as the mesh is the bus's user list leaves out 5 user(s) the mesh has minted no credential for: controller, node.f35, node.idt, node.ygcyr, node.yvbpsm. Each is a user that cannot connect until one is issued the bus's user list leaves out 5 user(s) the mesh has minted no credential for: controller, node.f35, node.idt, node.ygcyr, node.yvbpsm. Each is a user that cannot connect until one is issued composing every machine with the change the bus's user list leaves out 5 user(s) the mesh has minted no credential for: controller, node.f35, node.idt, node.ygcyr, node.yvbpsm. Each is a user that cannot connect until one is issued the bus's user list leaves out 5 user(s) the mesh has minted no credential for: controller, node.f35, node.idt, node.ygcyr, node.yvbpsm. Each is a user that cannot connect until one is issued merge gate: PASS — every machine composes with the change as it did without (4 of 4 compose) judged by controller development build against the facts of 2026-10-12T19:03:57Z modules the change moves: - betterbird (changed) machines: - a machine (f35): composes - holds mesh-dns-resolver (idt): composes - holds git, holds mesh-artifact-store, holds mesh-broker, holds mesh-catalog, holds mesh-delivery, holds mesh-dns-resolver, holds mesh-store, holds mesh-vault, holds npm-package-registry, the control node, the hub (ygcyr): composes - a machine (yvbpsm): composes a merge would rebuild 1 module(s) in 1 tier(s): betterbird notes: - modules/betterbird/README.md and modules/betterbird/cmd/betterbird-tools/config_test.go read by no module's build, and rebuild nothing (issue 280) --- its merge-check.sh (go toolchain) ok git.novox.be/novox/mesh-catalog/checks/words 0.008s words: 12 retired words and 70 daemons' lines, none in the 44678 strings of 703 files ok git.novox.be/novox/mesh-catalog/checks/agenthome 0.013s agent-home: no archive and no file written into under the agent's home ok git.novox.be/novox/mesh-catalog/checks/paths 0.007s paths: no module names another's state on its machine (3 known, listed to go) long-running resources without health: 69, as kept ok git.novox.be/novox/mesh-catalog/checks/deps 0.216s testing modules/betterbird ok betterbird/cmd/betterbird-tools 2.015s --- its merge-check-typescript.sh (typescript toolchain) ```
mesh-admin merged commit eb5f33f2b4 into main 2026-10-12 19:22:15 +00:00
mesh-admin deleted branch fix/345-betterbird-configuration 2026-10-12 19:22:15 +00:00
Sign in to join this conversation.
No Reviewers
2 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: novox/mesh-catalog#256