fix(mcp): read the OS keychain key on native macOS/Windows package builds

Desktop enables os-keyring and provisions the data-encryption key in the
OS keychain during the data security upgrade, but dbx-mcp/dbx-cli package
builds compiled without any keyring backend (the feature became opt-in
for the Linux cross builds), so every desktop-migrated profile made the
MCP fail with DATA_MIGRATION_REQUIRED forever - the error even pointed
users back at a migration they had already completed.

- dbx-mcp gains an os-keyring forwarding feature; the native macOS and
  Windows MCP and CLI legs of the packages release build with it, Linux
  zigbuild legs keep the managed .dbx/secret.key fallback
- LocalBackend::open now separates 'key unreadable in this process'
  (SECRET_KEY_UNAVAILABLE with the DBX_SECRET_KEY_FILE/DBX_SECRET_KEY
  escape hatch) from genuinely pending legacy data, keeping the
  DATA_MIGRATION_REQUIRED contract for the latter (test covered)
This commit is contained in:
t8y2 committed 2026-09-24 11:27:41 +08:00
1 parent a1dab2b3ec
commit d94a0fe312
3 files changed
+32 -2

No files matched your search

+9 -2
View File
@@ -426,7 +426,9 @@ jobs:
if [[ "${{ runner.os }}" == "Linux" ]]; then
cargo zigbuild --release -p dbx-cli --no-default-features --target "${{ matrix.target }}.2.31"
else
cargo build --release -p dbx-cli --no-default-features --target "${{ matrix.target }}"
# Same keychain rationale as the MCP native legs; the feature is
# forwarded through the dbx-mcp dependency.
cargo build --release -p dbx-cli --no-default-features --features dbx-mcp/os-keyring --target "${{ matrix.target }}"
fi
- name: Stage platform package
@@ -660,9 +662,14 @@ jobs:
shell: bash
run: |
if [[ "${{ runner.os }}" == "Linux" ]]; then
# Linux zigbuild cannot link the dbus Secret Service backend; the
# managed .dbx/secret.key file remains the key material source.
cargo zigbuild --release -p dbx-mcp --target "${{ matrix.target }}.2.31"
else
cargo build --release -p dbx-mcp --target "${{ matrix.target }}"
# Native macOS/Windows builds read the OS keychain key that DBX
# Desktop provisions during the data security upgrade, so the MCP
# works against desktop-migrated profiles without env overrides.
cargo build --release -p dbx-mcp --features os-keyring --target "${{ matrix.target }}"
fi
- name: Stage platform package