Repository navigation
Agent: regroup Settings into Workspace, Connections, and Account & System - #1507
Conversation
|
Local check note (macOS, rustc 1.96.0, no Nix on this machine)
With only those two lints allowed ( One linker note: on this toolchain the |
Sidebar gets three labelled groups with a filter field and About pinned to the footer. The filter matches labels, subtitles, and hidden per-section keywords (former page names, moved controls); the visible list is rebuilt on filter and locale changes, not in render. General splits into General and Appearance (segmented theme pills that are pointer, keyboard, and Application Vim targets); Privacy & Security folds into Account & Security, Usage into Plan & Billing, API and ACP become Developer & API tabs, and Integrations gains Connected/App Catalog tabs through a shared keyboard-capable pane_tab. Sign out and the local-encryption controls render even while the profile fetch is pending or failed. Settings pages use card stacks under page headers, Settings primary actions use a high-contrast neutral default_button with a contrast test, and the Settings root routes Tab to window.focus_next like the store gate does, except while a dropdown is open. Persisted values, element IDs, and protocol strings are unchanged; OpenSettingsSection callers for the removed sections map to their new homes. en/es catalogs updated and the es revision stamped.
3eb89d6 to
ee46ffe
Compare
|
Rework 1 (advisor review: Codex + Claude lanes; interrogation lane unavailable on this machine) Agreed findings applied in the amended head:
Not taken: sharing |
Replace the Connected / App Catalog pill switch with one directory: built-in agents, then connected servers with "Add custom server" as the list's last row, then the catalog with its search and category chips. Connected state stays at the top and the catalog is no longer behind a tab. The add row is a Tab stop pressed by Enter or Space; Application Vim targets follow the display order.
b3cd373 to
0addd3c
Compare
Usage is the page people glance at daily; Plan & Billing is occasional admin. Folding the meter into Billing made it the longest page in Settings and buried the thing the sidebar meter deep-links to. - `Section::Usage` (Account & System, between Account and Billing, gauge icon): plan meter with reset date, extra-credits balance, a short "what counts" note, and `Manage plan` into Plan & Billing. - Plan & Billing keeps the subscription status, plans on sale, payment provider, and buy-credits form; the meter lives on Usage only. - The sidebar usage menu opens Usage again; the out-of-usage transcript banner still opens Billing (that is the upgrade path). - Filter keywords: "usage"/"quota"/"limit" resolve to Usage. Also fixes the once-seen flake in `sidebar_filter_narrows_sections_and_handles_empty_matches`, which was a real bug: every async data load called `reconcile_application_vim_target`, which unconditionally snapped the Application Vim section back to the selected page, moving a sidebar cursor the user had parked elsewhere. The reconcile now only binds the section while the cursor is in the pane region. Covered by `data_loads_keep_the_sidebar_vim_cursor_where_the_user_left_it`.
0addd3c to
76d7981
Compare
A page holding one editor does not earn a sidebar item, and the custom instructions are a workspace preference like everything else on General. The editor, its Save/Clear row, and the explanatory copy now form the last General subsection; the Application Vim target order on General continues through the editor and its buttons. `Section::Prompt` and its section/keyword strings are gone; "instructions" and "system prompt" resolve to General in the sidebar filter.
The inline Pro/Team/Max list repeated the pricing page inside Settings: three filled CTAs with three different verbs, the current plan rendered as a dimmed button, server marketing copy at caption size, and a muted footnote restating things the page already said. Plan & Billing now opens with a single "Your plan" card: plan name, the price and cadence (resolved from the matching product), the renews/ expires line, and one button: "Change plan" into the Stripe portal, or "View plans" to the web pricing page for subscriptions this app cannot change. Subscribers no longer see the plan list; the portal and pricing page handle switching. Accounts without a paid plan keep a "Choose a plan" list because that is the only in-app checkout, with one verb per row, outlined buttons, and the current tier filtered out. The footnote is gone, and the status badge only appears when the subscription is not simply active. The portal/checkout notice is now a dismissible `widgets::notice`.
…ions help
- The sidebar Usage card carries the same gauge glyph as the Usage
section it opens, so the deep link reads as one thing.
- The Additional-instructions help copy wrapped onto a one-word second
line at common widths; shortened to a single sentence ("every new
task" covers the applies-after-save nuance).
With three built-in cards, the app directory started below the fold and nothing above it said it existed. Integrations now opens with a "Popular apps" strip under the header: Stripe, Cloudflare, Vercel, Notion, Dropbox and Linear as compact one-click tiles (logo, name, Connect), and a "See all N apps" button that clears the catalog search and category and scrolls the full directory into view. Connected apps drop out of the strip; it is not backfilled. Tiles wrap on narrow panes. Application Vim: the strip's tiles are `McpFeatured(id)`, distinct from the same app's `McpCatalog(id)` card below, so cursor motion resolves to one element; "See all" is `McpCatalogSeeAll`. Target order is strip, built-ins, connected, add row, directory.
…hared-app case A failed connect from a Popular apps tile reported only on the catalog card below the fold, so it read as a dead click. The tile now repeats the card's detail: sign-in errors and "Get <app>" (which opens the download page on click) in place of "Connect". The cursor-motion regression test started from the first catalog card, which is never a strip app once Notion is connected, so it could not catch a shared target. It now starts from the first card that is also a tile.
… onto a second row
…te only The directory moves off Integrations into its own Settings section, `Apps` (Connections group). The page follows the Codex Plugins layout: header with the search on the right, then Popular and the catalog's own categories (Productivity, Teams, Business, Developer) as two-column grids of compact rows: logo, name, one-line summary, `+`. Typing in the search flattens the page into one list of matches. The category chips are gone; the sections do that job. Integrations now opens with the Popular apps strip (whose "See all" opens the Apps page), then Built into Maple, then Connected only when a server exists, then a "Custom server" subsection with one line of explanation and the add row. The empty-state sentence and the "Execution computer: This computer" line are gone; the execution line only renders for a remote host. Application Vim: Apps targets are Popular (`McpFeatured`) then the directory in display order (`McpCatalog`), so motion is linear even though Popular apps repeat below. Integrations targets end at the add row.
…ndoff Plan & Billing had two "Refresh" buttons (page and API credits), Usage a third, and the Local API card its own "Refresh status". Each section had grown a fetch and a button for it. Pages that fetch remote state (Plan & Billing, Usage, Developer & API) now carry one `rotate-cw` icon at the right of the page header, behind a single `SettingsTarget::PageRefresh` that refetches whatever the page shows. The section-level buttons and their targets are gone. The reason those buttons existed was the browser handoff: after Change plan, checkout, or buying credits the app could not know when to refetch. It now remembers the handoff and refreshes billing when the window regains focus, so the notices no longer tell the person to refresh. The icon is the fallback, not a step.
…-only icon - The activation refetch cleared the handoff on the first return, which is often before payment or the webhook has landed. The handoff now stays armed for ten minutes; each return refetches without clearing the notice that says what was opened. `on_window_activated` is a method with a test for all three cases. - Selecting Plan & Billing or Usage refetches billing; it loaded only when Settings opened. - Developer & API shows the refresh icon (and its Vim target) only on the API tab; ACP has nothing remote to reload. - The local-API failure notice no longer points at a button that is gone.
"Add a custom server" sits at the bottom of Integrations but opened the
form inline at the top of the page, so a click teleported the page.
The form is now a dialog over the page, in the same chrome as the
catalog's address prompt: scrim, centred card, title ("Add a custom
server" / "Edit server") with the custom-server line as subtitle, a
close button, a scrolling body, and a right-aligned footer (Cancel ·
Sign in with browser · Save). Save errors show inside the dialog.
Escape and the backdrop close it; the name field is focused on open.
Field tab indexes move to their own range so Tab walks the form in
order instead of colliding with the page's stops. The page underneath
does not move; the add-row test asserts that and the Escape path.
…ithout the help line
…s the browser Instead of a footnote under the pay buttons saying checkout opens in the browser, each control that leaves the app says so itself: a small external-link glyph after the label, in the control's own text color. Applied to Change plan, View plans, the plan list's Choose / See on the web, Pay with card, Pay with Bitcoin, Get <app> in the directory, Sign in with browser in the server dialog, and the Cua team link. The "Checkout opens in your browser." line is gone; guests keep the one sentence about card checkout being off for anonymous accounts. In-app navigation buttons (See all N apps, Manage plan) get a chevron instead, so the two kinds of "go somewhere" read differently. Back unwinds in-app links before it closes Settings: following See all apps or Manage plan pushes the page it left, Back pops it, and choosing a sidebar item resets the history so Back closes as before.
…pp link - In-app navigation buttons use an arrow-right, pairing with Back's arrow-left and staying distinct from the chevrons on disclosure rows. - The API page's "See plans" / "Buy more" links go through the same history as See all apps and Manage plan, and Escape at the Settings root unwinds that history before it closes, so keyboard and mouse agree. - External-link marks on the remaining browser openers: the local API "Learn more" link, the address prompt's "Get <app>" link, and the Popular-apps tile in its "Get <app>" state.
The danger zone was a red-bordered card with a filled red button, and the two confirmation steps swapped into that card in place. The weight was in the wrong place: loud at rest, cramped when it mattered. At rest it is now a plain row (title, one-line consequence) with an outlined error-colored button carrying an alert glyph. Clicking it opens a dialog in the same chrome as the other Settings dialogs: "Delete account?", the consequences, the acknowledgement field, Cancel and a filled destructive button that stays inert until the field is valid; then the emailed-code step in the same dialog. Escape, the backdrop and Cancel all cancel the flow. The handlers behind it are unchanged.
…dialog Escape and the backdrop cancel account deletion only before a code is emailed; after that a stray click would throw away a real code and trigger a second email, so only the explicit Cancel ends the flow. While the dialog is open Application Vim's targets are its controls alone, in display order. Test covers focus on open, the Escape/backdrop guard at both steps, the busy guard, and the target scoping.
"Erase local data…" expanded the encryption card in place into a wall of copy, a field and two buttons. It now matches account deletion: the row keeps an outlined error-colored button with an alert glyph, and the confirmation is a dialog with the consequences, the typed word, Cancel, and a destructive button inert until the word is right. Escape, the backdrop and Cancel close it; the field is focused on open; errors show inside it; success closes it as before. The erase handler is unchanged.
Set, change and remove unlock password replaced the encryption card in place with the multi-field form. The form now opens over the page like the other Settings dialogs: scrim, the form's own card centred, and the encryption-context lines kept under it. Escape and the backdrop dismiss it unless an operation is running; the form's own Cancel and completion paths are unchanged.
…st is deterministic Escape and the backdrop on the unlock-password dialog now call the form's own `close`, which is a no-op while an operation runs and otherwise emits the cancelled finish, so there is one exit path and no way to orphan an in-flight re-encryption. `window_activation_refetches_billing_only_after_a_recent_handoff` asserted on the dead test backend's error landing within one park, which depends on socket timing under load. `load_billing` now counts issued loads and the test asserts the count.
From the clean-context review and the three advisor lanes (Codex, Grok 4.7, Claude interrogation), validated against the code: - The pricing page now arms the browser-handoff refetch like the portal and checkout do (Team and non-portal plans change there), and a failed browser open no longer disarms an earlier handoff. - Application Vim: Enter acts only on a target that is still visible, so a dialog opening over the page cannot have Enter re-fire the control underneath; targets are empty under the erase, password and address dialogs; General's Clear/Save order matches the screen. - Escape under Application Vim behaves the same in every dialog field: the erase field and the address prompt get the shared escape wiring and join the input lists; the address prompt's backdrop dismisses. - Closing any dialog hands focus back and reconciles the Vim target. - Back history is a real stack (a second hop keeps the first) and a refused navigation records nothing. - Dialogs: the password dialog has an accessible name and a height cap, its encryption notes sit on a card instead of the scrim, the server dialog no longer closes on a backdrop click (it can hold secrets), the erase field submits on Enter, Usage hides the credits row for plans without API access. - Marks: in-app arrows on the API page's plan links; Popular tiles have a button role and label; "See all N apps" counts apps not yet connected. - Refresh on the API page also refetches the credits balance it shows. - i18n: es billing keywords include "equipo"; the Bitcoin notice no longer asks for a manual refresh; one duplicate string removed. - pane_tab is acp-only, matching its only caller. - Tests: erase dialog (focus, gate, Escape, busy), password dialog (opens, dismisses through the form), two-hop Back history.
The sidebar Settings menu still offers "Account" with the person icon, while #1507 renames the section it opens to Account & Security. The row now takes that section's label, so the two read the same in English and Spanish, and draws Lucide's shield-user: a person inside a shield, for both halves of the name. shield-check, #1507's icon for the section, already marks the composer's Auto mode and trusted projects, so the Settings nav should move to shield-user as well. The row's own chat-account message and the user icon had no other use, so both are gone, along with the Spanish revision line for the message.
The sidebar Settings menu still offers "Account" with the person icon, while #1507 renames the section it opens to Account & Security. The row now takes that section's label, so the two read the same in English and Spanish, and draws Lucide's shield-user: a person inside a shield, for both halves of the name. shield-check, #1507's icon for the section, already marks the composer's Auto mode and trusted projects, so the Settings nav should move to shield-user as well. The row's own chat-account message and the user icon had no other use, so both are gone, along with the Spanish revision line for the message.
shield-check already marks the composer's Auto permission mode and trusted projects in the sidebar. shield-user, a person inside a shield, names both halves of the section and matches the sidebar Settings menu row that opens it (#1513), which adds the same file.
Master added Settings > Tools (#1505), moved the Web switch there (#1506) and landed the shared sidebar layout (#1508). - Tools sits in the Connections group after Integrations and Apps, with a wrench icon, the shared page header and its own filter keywords. Its placement test follows. - General drops the Web row; "web" moves from General's filter keywords to Tools'. - The sidebar keeps #1508's layout and Back arrow with this branch's nav rows. Back still steps through in-app links before leaving Settings, so its tooltip reads "Back". - Account keeps this branch's sign-out row.
…ser (#1513) The sidebar Settings menu still offers "Account" with the person icon, while #1507 renames the section it opens to Account & Security. The row now takes that section's label, so the two read the same in English and Spanish, and draws Lucide's shield-user: a person inside a shield, for both halves of the name. shield-check, #1507's icon for the section, already marks the composer's Auto mode and trusted projects, so the Settings nav should move to shield-user as well. The row's own chat-account message and the user icon had no other use, so both are gone, along with the Spanish revision line for the message.
* fix(agent): Settings dialog and Usage page follow-ups Follow-ups to the Settings regroup (#1507) and the Usage page (#1512). - Application Vim keys no longer reach the sidebar or the filter under an open Settings dialog. Before, leaving the field and pressing h, j, Enter changed the page beneath the delete-account or server dialog, and closed the erase dialog. - The erase dialog opens with an empty field every time, so the erase button starts inert after a finished erase as well as after Cancel. - A running erase keeps its dialog and its page, like a running password change, and a refused Back no longer forgets the page to return to. - Refresh on Developer & API clears the note left by a checkout hand-off. - A visit to Usage fetches the history once instead of twice, and a failed billing status load no longer refetches it. - The plan-reset label on the daily chart moves to the left of its line when the line is in the right half, where it was cut off. - The remote guard test lists the four usage operations. Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com> * fix(agent): give the erase dialog Vim targets and keep the page still - The erase dialog's field, Cancel and erase button are Application Vim targets, as the deletion dialog's controls already are, so j, k and Enter work the same way in both. - Moving between a dialog's controls no longer scrolls the page behind it: the reveal anchor belongs to the page's scroll area, which the dialog is not in. Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com> --------- Co-authored-by: Claude Fable 5.2 <noreply@anthropic.com>
Current review stack
Native stack #1534:
master → #1507 → #1512 → #1513.Bottom layer: the Settings regroup. Base:
master.Refreshed onto master
af5c3165, including merged #1508, #1505 (Tools) and #1506 (Web switch), by merging master in; no commits were rewritten.tools_sit_beside_integrations_and_list_every_switch_with_its_copynow expects Apps between Integrations and Tools.settings-keywords-toolsis new and needs review by a Spanish speaker.Local app tests on this head (
ui::chat::,ui::settings::,ui::i18n::,desktop::,ui::widgets,ui::theme::): 590 passed, 0 failed.Current head:
6840c842.The original scope and validation are retained below.
Summary
Reorganizes Maple Work's Settings around three sidebar groups and consolidates fragmented pages, without changing persisted values, element IDs, or protocol strings.
Sidebar (Direction A, "Grouped Workbench")
Workspace: General · Appearance · Keyboard Shortcuts. The custom prompt is the last subsection of General, titled Agent instructions (no help line; the editor placeholder carries it), rather than its own page: it is one editor, and it is a workspace preference like the rest of General. The filter still resolves "instructions" and "system prompt" to General.Connections: Integrations · Apps · Remote computers · Developer & APIAccount & System: Account & Security · Usage · Plan & Billing;Aboutpinned to the footer with the version and update dotsettings-keywords-*), so former names and moved controls still resolve: "privacy" → Account & Security, "usage" → Usage, "mcp" → Integrations. The visible list is computed when the filter or locale changes, not in render. Application Vim follows the filtered list; an empty match renders a hint instead of panicking.Pages
Generalkeeps task defaults, language, notifications, editing modes and voice; the visual settings move to a newAppearancepage with a segmented System/Dark/Light selector (pointer; Tab + Space/Enter; under Application Vim, Enter on the selected target since Space is the leader key), chat font/size with the live preview, and the transcript toggles.window.focus_next/focus_prev) the way the store gate and chat already do, so Tab works from pills, tabs, and buttons, not only from inside text fields.Account & Securityabsorbs the formerPrivacy & Securitypage: profile, password & session (Sign out moved here from the Settings page header, and still rendered while the profile is loading or failed to load), the local-encryption controls and store notices (likewise independent of the profile fetch), then the danger zone. Set / change / remove unlock password opens its form as a dialog, and "Erase local data…" confirms in a dialog of the same kind as deletion (outlined error button in the row; consequences, typed word, inert destructive button in the dialog). The danger zone is now a quiet row (outlined error button with an alert glyph) that opens a confirmation dialog for the type-DELETE and emailed-code steps, with the destructive button inert until the field is valid. The local-store action is relabeled "Change unlock password…" so it is not confused with the sign-in password.Usageis its own page (Account & System group, between Account and Billing): the plan meter with reset date, the extra-credits balance, a short "what counts" note, andManage planinto Plan & Billing. The sidebar usage meter deep-links here. Thin on purpose — richer per-model/per-day usage isn't generally enabled server-side yet.Plan & Billingopens with one Your plan card (name, price / cadence, renews-or-expires line, payment-provider note) and a single action:Change planinto the Stripe portal, orView plansto the web pricing page for subscriptions this app cannot change. Subscribers no longer get an inline Pro/Team/Max list; accounts without a paid plan keep aChoose a planlist (the only in-app checkout) with one verb per row and the current tier filtered out. The portal/checkout notice is dismissible. Prepaid credits stay below.Developer & APIholdsAPIandACPas horizontal tabs (ACP tab only with theacpfeature).See all N apps,Manage plan, the API page's plan links) carry an arrow instead. The "Checkout opens in your browser." footnote is gone.See all N apps(Integrations → Apps) orManage plan(Usage → Billing), Back returns to the page you came from; choosing a sidebar item resets that, so Back closes Settings as before.↻icon in the page header (SettingsTarget::PageRefresh); the section-level Refresh buttons (API credits, Local API status) are gone. AfterChange plan, checkout, or buying credits, billing refetches automatically when the window regains focus, so the handoff notices no longer ask you to refresh.Integrationsis machine state only: a Popular apps strip under the header (Stripe, Cloudflare, Vercel, Notion, Dropbox as one-click tiles, plusSee all N apps), built-in agents, Connected servers (only when there is one), and a Custom server subsection with the add row. No empty-state sentence, no "Execution computer: This computer" line (it still shows a remote host).Appsis the directory as its own page, Codex-Plugins style: search in the header, then Popular and the catalog's categories as two-column grids of compact rows (logo, name, summary,+). Search flattens the page into one list; the category chips are gone. Connected apps leave both the strip and the directory.widgets::card_stackrows underpage_header/subsection_titleinstead of free-floatingcard_rowboxes.Buttons (Settings-local, per the accessibility request)
widgets::default_button: neutral inverted pill (bg_default_button/text_on_default_buttontokens) used for every primary action inside Settings. The coralprimary_buttonis unchanged outside Settings; a global button pass is a separate follow-up.theme::contrast_testsnow asserts the default button's rest/hover/active pairs at ≥ 7:1 in both palettes.Localization
enandes;translation-revisions/es.txtstamped.Screenshots
Sample data, dark theme. Before is master at
e1fcca57; after is this branch atee416ac4.Not in this PR
primary_buttonand thebrand.mdbutton section (follow-up).crates/pi-*, CI, or release files.Testing
just cicould not run on the pinned toolchain; see the first comment. What ran on rustc 1.96:cargo fmt --check, the fullci-lintclippy matrix with-D warningsplus two pre-existing master lints allowed,cargo test --workspace --no-fail-fast(1354 desktop tests at the last full local run, 889maple-agentlib tests, updater/billing/pi-*/store-bench suites and doc-tests green),cargo build --workspace --all-targets, and the headless--no-default-features --features acp,proxytests (384 green).sidebar_filter_narrows_sections_and_handles_empty_matches) was a real bug, not test timing: every async data load (billing, profile, keys, catalog…) calledreconcile_application_vim_target, which unconditionally snapped the Application Vim section back to the selected page — so a load landing while the cursor was parked elsewhere in the sidebar moved it. The reconcile now only binds the section while the cursor is in the pane region;data_loads_keep_the_sidebar_vim_cursor_where_the_user_left_itcovers it.pane_tabis acp-only.erase_dialog_focuses_gates_and_closes,password_form_opens_as_a_dialog_and_dismisses_through_the_form,delete_account_dialog_focuses_scopes_and_guards_the_code_step,back_returns_to_the_page_an_in_app_link_left,window_activation_refetches_billing_only_after_a_recent_handoff,featured_strip_drops_connected_apps_and_keeps_catalog_motion_linear,sidebar_filter_narrows_sections_and_handles_empty_matches,sidebar_filter_matches_former_names_and_moved_controls,data_loads_keep_the_sidebar_vim_cursor_where_the_user_left_it,appearance_segmented_theme_switches_on_pointer_and_vim_activation,appearance_theme_pills_are_keyboard_tab_stops,integrations_add_row_is_a_keyboard_tab_stop_and_catalog_is_on_the_page,sign_out_renders_while_the_profile_is_loading.Touches the same
ui/settings*.rsfiles as #1436; whichever lands second will need an update.