ce141480b9
Additive conflict in extension/src/wasm.d.ts resolved by keeping BOTH the org_* declarations (org_unwrap_key/org_manifest_decrypt/org_manifest_encrypt) and the keyfile_* declarations (unlock_with_secret/keyfile_encode/keyfile_decode). Rust lib.rs (core + wasm) auto-merged cleanly with both feature sets. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_014s527M917W47LDrfQ4t47g