Skip to content

fix(linux): explain default-keyring recovery on every locked-keyring error - #4234

Merged
datlechin merged 3 commits into
TableProApp:mainfrom
mvanhorn:fix/4106-linux-mcp-default-keyring
Nov 12, 2026
Merged

datlechin merged 3 commits into
TableProApp:mainfrom
mvanhorn:fix/4106-linux-mcp-default-keyring

Conversation

@mvanhorn

@mvanhorn mvanhorn commented Nov 12, 2026 •

Copy link
Copy Markdown
Contributor

Summary

  • map_error returns SecretError::Locked for a missing default keyring on every secret read, so the create-a-default-keyring advice belongs on every locked-keyring error, not only the MCP token.
  • One shared keyring_locked_recovery() gettext helper in secret_save_report; remedy() and each surface compose it, so the advice sentence is translated once.
  • Appended on the API-key read, saved-password read and duplicate-connection surfaces, which previously said only "Unlock it and try again."
  • Changelog fragment renamed to the PR number.

Test plan

  • test tablepro: new a_locked_key_explains_default_keyring_recovery (assistant) and the MCP locked_token_* tests cover the recovery text; saved_connection and the duplicate-connection toast assertions updated for the appended advice.
  • Linux build is Docker/CI-only on the author's machine; verified through CI.

Fixes #4106

…ux MCP token

The message now covers accepting the unlock prompt and creating a
default keyring in Passwords and Keys. Added tests cover both errors,
the recovery text, retry visibility, disabled client controls, and the
transition back to Off. Additional assertions preserve the distinct
service and portal error messages, and a changelog entry records the
fix.

Fixes TableProApp#4106
…ng errors

map_error returns SecretError::Locked for a missing default keyring on every secret read, so the advice now appends from one shared gettext helper on the API-key, saved-password, duplicate-connection and save surfaces, not only the MCP token.
@datlechin datlechin changed the title fix(preferences_dialog): explain default keyring recovery for the Linux MCP token fix(linux): explain default-keyring recovery on every locked-keyring error Nov 12, 2026
# Conflicts:
#	linux/crates/app/src/ui/preferences_dialog/mcp_page.rs
@datlechin
datlechin enabled auto-merge (squash) November 12, 2026 18:54
@datlechin
datlechin merged commit 2ad31ae into TableProApp:main Nov 12, 2026
29 checks passed
@mvanhorn

Copy link
Copy Markdown
Contributor Author

Appreciate the merge, @datlechin. Every locked-keyring error now carries the steps to create a default keyring in Passwords and Keys, not just the MCP token one.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Linux: the MCP token's locked-keyring message has no default-keyring step

2 participants