From 8674a053da275dceca5d1961f86dfbc07df59a3a Mon Sep 17 00:00:00 2001
From: Orual <orual@nonbinary.computer>
Date: Wed, 8 Oct 2025 19:45:11 -0400
Subject: [PATCH] attempt at improving lifetime and ownership semantics

---
 Cargo.lock                                    | 360 ++++++++++++++++++
 .../src/app_bsky/actor/get_preferences.rs     |   6 +-
 .../src/app_bsky/actor/get_profile.rs         |   6 +-
 .../src/app_bsky/actor/get_profiles.rs        |   6 +-
 .../src/app_bsky/actor/get_suggestions.rs     |   6 +-
 .../src/app_bsky/actor/put_preferences.rs     |   6 +-
 .../src/app_bsky/actor/search_actors.rs       |   6 +-
 .../app_bsky/actor/search_actors_typeahead.rs |   6 +-
 .../src/app_bsky/bookmark/create_bookmark.rs  |   6 +-
 .../src/app_bsky/bookmark/delete_bookmark.rs  |   6 +-
 .../src/app_bsky/bookmark/get_bookmarks.rs    |   6 +-
 .../app_bsky/feed/describe_feed_generator.rs  |   8 +-
 .../src/app_bsky/feed/get_actor_feeds.rs      |   6 +-
 .../src/app_bsky/feed/get_actor_likes.rs      |   6 +-
 .../src/app_bsky/feed/get_author_feed.rs      |   6 +-
 .../src/app_bsky/feed/get_feed.rs             |   6 +-
 .../src/app_bsky/feed/get_feed_generator.rs   |   6 +-
 .../src/app_bsky/feed/get_feed_generators.rs  |   6 +-
 .../src/app_bsky/feed/get_feed_skeleton.rs    |   6 +-
 .../src/app_bsky/feed/get_likes.rs            |   6 +-
 .../src/app_bsky/feed/get_list_feed.rs        |   6 +-
 .../src/app_bsky/feed/get_post_thread.rs      |   6 +-
 .../src/app_bsky/feed/get_posts.rs            |   6 +-
 .../src/app_bsky/feed/get_quotes.rs           |   6 +-
 .../src/app_bsky/feed/get_reposted_by.rs      |   6 +-
 .../src/app_bsky/feed/get_suggested_feeds.rs  |   6 +-
 .../src/app_bsky/feed/get_timeline.rs         |   6 +-
 .../src/app_bsky/feed/search_posts.rs         |   6 +-
 .../src/app_bsky/feed/send_interactions.rs    |   6 +-
 .../app_bsky/graph/get_actor_starter_packs.rs |   6 +-
 .../src/app_bsky/graph/get_blocks.rs          |   6 +-
 .../src/app_bsky/graph/get_followers.rs       |   6 +-
 .../src/app_bsky/graph/get_follows.rs         |   6 +-
 .../src/app_bsky/graph/get_known_followers.rs |   6 +-
 .../src/app_bsky/graph/get_list.rs            |   6 +-
 .../src/app_bsky/graph/get_list_blocks.rs     |   6 +-
 .../src/app_bsky/graph/get_list_mutes.rs      |   6 +-
 .../src/app_bsky/graph/get_lists.rs           |   6 +-
 .../graph/get_lists_with_membership.rs        |   7 +-
 .../src/app_bsky/graph/get_mutes.rs           |   6 +-
 .../src/app_bsky/graph/get_relationships.rs   |   6 +-
 .../src/app_bsky/graph/get_starter_pack.rs    |   6 +-
 .../src/app_bsky/graph/get_starter_packs.rs   |   6 +-
 .../get_starter_packs_with_membership.rs      |   7 +-
 .../graph/get_suggested_follows_by_actor.rs   |   7 +-
 .../src/app_bsky/graph/mute_actor.rs          |   6 +-
 .../src/app_bsky/graph/mute_actor_list.rs     |   6 +-
 .../src/app_bsky/graph/mute_thread.rs         |   6 +-
 .../app_bsky/graph/search_starter_packs.rs    |   6 +-
 .../src/app_bsky/graph/unmute_actor.rs        |   6 +-
 .../src/app_bsky/graph/unmute_actor_list.rs   |   6 +-
 .../src/app_bsky/graph/unmute_thread.rs       |   6 +-
 .../src/app_bsky/labeler/get_services.rs      |   6 +-
 .../app_bsky/notification/get_preferences.rs  |   6 +-
 .../app_bsky/notification/get_unread_count.rs |   6 +-
 .../list_activity_subscriptions.rs            |   7 +-
 .../notification/list_notifications.rs        |   6 +-
 .../notification/put_activity_subscription.rs |   7 +-
 .../app_bsky/notification/put_preferences.rs  |   6 +-
 .../notification/put_preferences_v2.rs        |   6 +-
 .../app_bsky/notification/register_push.rs    |   6 +-
 .../app_bsky/notification/unregister_push.rs  |   6 +-
 .../src/app_bsky/notification/update_seen.rs  |   6 +-
 .../unspecced/get_age_assurance_state.rs      |   8 +-
 .../src/app_bsky/unspecced/get_config.rs      |   8 +-
 .../get_onboarding_suggested_starter_packs.rs |   7 +-
 ...arding_suggested_starter_packs_skeleton.rs |   8 +-
 .../unspecced/get_popular_feed_generators.rs  |   7 +-
 .../unspecced/get_post_thread_other_v2.rs     |   6 +-
 .../app_bsky/unspecced/get_post_thread_v2.rs  |   6 +-
 .../app_bsky/unspecced/get_suggested_feeds.rs |   6 +-
 .../unspecced/get_suggested_feeds_skeleton.rs |   7 +-
 .../unspecced/get_suggested_starter_packs.rs  |   6 +-
 .../get_suggested_starter_packs_skeleton.rs   |   7 +-
 .../app_bsky/unspecced/get_suggested_users.rs |   6 +-
 .../unspecced/get_suggested_users_skeleton.rs |   7 +-
 .../unspecced/get_suggestions_skeleton.rs     |   7 +-
 .../unspecced/get_tagged_suggestions.rs       |   6 +-
 .../app_bsky/unspecced/get_trending_topics.rs |   6 +-
 .../src/app_bsky/unspecced/get_trends.rs      |   6 +-
 .../app_bsky/unspecced/get_trends_skeleton.rs |   6 +-
 .../app_bsky/unspecced/init_age_assurance.rs  |   6 +-
 .../unspecced/search_actors_skeleton.rs       |   6 +-
 .../unspecced/search_posts_skeleton.rs        |   6 +-
 .../search_starter_packs_skeleton.rs          |   7 +-
 .../src/app_bsky/video/get_job_status.rs      |   6 +-
 .../src/app_bsky/video/get_upload_limits.rs   |   8 +-
 .../src/app_bsky/video/upload_video.rs        |  16 +-
 .../src/chat_bsky/actor/delete_account.rs     |   8 +-
 .../chat_bsky/actor/export_account_data.rs    |   8 +-
 .../src/chat_bsky/convo/accept_convo.rs       |   6 +-
 .../src/chat_bsky/convo/add_reaction.rs       |   6 +-
 .../convo/delete_message_for_self.rs          |   6 +-
 .../src/chat_bsky/convo/get_convo.rs          |   6 +-
 .../chat_bsky/convo/get_convo_availability.rs |   6 +-
 .../chat_bsky/convo/get_convo_for_members.rs  |   6 +-
 .../src/chat_bsky/convo/get_log.rs            |   6 +-
 .../src/chat_bsky/convo/get_messages.rs       |   6 +-
 .../src/chat_bsky/convo/leave_convo.rs        |   6 +-
 .../src/chat_bsky/convo/list_convos.rs        |   6 +-
 .../src/chat_bsky/convo/mute_convo.rs         |   6 +-
 .../src/chat_bsky/convo/remove_reaction.rs    |   6 +-
 .../src/chat_bsky/convo/send_message.rs       |   6 +-
 .../src/chat_bsky/convo/send_message_batch.rs |   6 +-
 .../src/chat_bsky/convo/unmute_convo.rs       |   6 +-
 .../src/chat_bsky/convo/update_all_read.rs    |   6 +-
 .../src/chat_bsky/convo/update_read.rs        |   6 +-
 .../moderation/get_actor_metadata.rs          |   6 +-
 .../moderation/get_message_context.rs         |   6 +-
 .../moderation/update_actor_access.rs         |   6 +-
 .../src/com_atproto/admin/delete_account.rs   |   6 +-
 .../admin/disable_account_invites.rs          |   6 +-
 .../com_atproto/admin/disable_invite_codes.rs |   6 +-
 .../admin/enable_account_invites.rs           |   6 +-
 .../src/com_atproto/admin/get_account_info.rs |   6 +-
 .../com_atproto/admin/get_account_infos.rs    |   6 +-
 .../src/com_atproto/admin/get_invite_codes.rs |   6 +-
 .../com_atproto/admin/get_subject_status.rs   |   6 +-
 .../src/com_atproto/admin/search_accounts.rs  |   6 +-
 .../src/com_atproto/admin/send_email.rs       |   6 +-
 .../com_atproto/admin/update_account_email.rs |   6 +-
 .../admin/update_account_handle.rs            |   6 +-
 .../admin/update_account_password.rs          |   6 +-
 .../admin/update_account_signing_key.rs       |   7 +-
 .../admin/update_subject_status.rs            |   6 +-
 .../get_recommended_did_credentials.rs        |   9 +-
 .../com_atproto/identity/refresh_identity.rs  |   6 +-
 .../request_plc_operation_signature.rs        |   9 +-
 .../src/com_atproto/identity/resolve_did.rs   |   6 +-
 .../com_atproto/identity/resolve_handle.rs    |   6 +-
 .../com_atproto/identity/resolve_identity.rs  |   6 +-
 .../identity/sign_plc_operation.rs            |   6 +-
 .../identity/submit_plc_operation.rs          |   6 +-
 .../src/com_atproto/identity/update_handle.rs |   6 +-
 .../src/com_atproto/label/query_labels.rs     |   6 +-
 .../com_atproto/moderation/create_report.rs   |   6 +-
 .../src/com_atproto/repo/apply_writes.rs      |   6 +-
 .../src/com_atproto/repo/create_record.rs     |   6 +-
 .../src/com_atproto/repo/delete_record.rs     |   6 +-
 .../src/com_atproto/repo/describe_repo.rs     |   6 +-
 .../src/com_atproto/repo/get_record.rs        |   6 +-
 .../src/com_atproto/repo/import_repo.rs       |  16 +-
 .../com_atproto/repo/list_missing_blobs.rs    |   6 +-
 .../src/com_atproto/repo/list_records.rs      |   6 +-
 .../src/com_atproto/repo/put_record.rs        |  33 +-
 .../src/com_atproto/repo/upload_blob.rs       |  31 +-
 .../com_atproto/server/activate_account.rs    |   8 +-
 .../server/check_account_status.rs            |   8 +-
 .../src/com_atproto/server/confirm_email.rs   |   6 +-
 .../src/com_atproto/server/create_account.rs  |   6 +-
 .../com_atproto/server/create_app_password.rs |   6 +-
 .../com_atproto/server/create_invite_code.rs  |   6 +-
 .../com_atproto/server/create_invite_codes.rs |   6 +-
 .../src/com_atproto/server/create_session.rs  |   6 +-
 .../com_atproto/server/deactivate_account.rs  |   6 +-
 .../src/com_atproto/server/delete_account.rs  |   6 +-
 .../src/com_atproto/server/delete_session.rs  |   8 +-
 .../src/com_atproto/server/describe_server.rs |   8 +-
 .../server/get_account_invite_codes.rs        |   6 +-
 .../com_atproto/server/get_service_auth.rs    |   6 +-
 .../src/com_atproto/server/get_session.rs     |   8 +-
 .../com_atproto/server/list_app_passwords.rs  |   8 +-
 .../src/com_atproto/server/refresh_session.rs |   8 +-
 .../server/request_account_delete.rs          |   8 +-
 .../server/request_email_confirmation.rs      |   8 +-
 .../server/request_email_update.rs            |   8 +-
 .../server/request_password_reset.rs          |   6 +-
 .../com_atproto/server/reserve_signing_key.rs |   6 +-
 .../src/com_atproto/server/reset_password.rs  |   6 +-
 .../com_atproto/server/revoke_app_password.rs |   6 +-
 .../src/com_atproto/server/update_email.rs    |   6 +-
 .../src/com_atproto/sync/get_blob.rs          |   6 +-
 .../src/com_atproto/sync/get_blocks.rs        |   6 +-
 .../src/com_atproto/sync/get_checkout.rs      |   6 +-
 .../src/com_atproto/sync/get_head.rs          |   6 +-
 .../src/com_atproto/sync/get_host_status.rs   |   6 +-
 .../src/com_atproto/sync/get_latest_commit.rs |   6 +-
 .../src/com_atproto/sync/get_record.rs        |   6 +-
 .../src/com_atproto/sync/get_repo.rs          |   6 +-
 .../src/com_atproto/sync/get_repo_status.rs   |   6 +-
 .../src/com_atproto/sync/list_blobs.rs        |   6 +-
 .../src/com_atproto/sync/list_hosts.rs        |   6 +-
 .../src/com_atproto/sync/list_repos.rs        |   6 +-
 .../sync/list_repos_by_collection.rs          |   6 +-
 .../src/com_atproto/sync/notify_of_update.rs  |   6 +-
 .../src/com_atproto/sync/request_crawl.rs     |   6 +-
 .../com_atproto/temp/add_reserved_handle.rs   |   6 +-
 .../temp/check_handle_availability.rs         |   7 +-
 .../com_atproto/temp/check_signup_queue.rs    |   8 +-
 .../src/com_atproto/temp/dereference_scope.rs |   6 +-
 .../src/com_atproto/temp/fetch_labels.rs      |   6 +-
 .../temp/request_phone_verification.rs        |   7 +-
 .../temp/revoke_account_credentials.rs        |   7 +-
 .../communication/create_template.rs          |   6 +-
 .../communication/delete_template.rs          |   6 +-
 .../communication/list_templates.rs           |   8 +-
 .../communication/update_template.rs          |   6 +-
 .../hosting/get_account_history.rs            |   6 +-
 .../src/tools_ozone/moderation/emit_event.rs  |   6 +-
 .../moderation/get_account_timeline.rs        |   6 +-
 .../src/tools_ozone/moderation/get_event.rs   |   6 +-
 .../src/tools_ozone/moderation/get_record.rs  |   6 +-
 .../src/tools_ozone/moderation/get_records.rs |   6 +-
 .../src/tools_ozone/moderation/get_repo.rs    |   6 +-
 .../moderation/get_reporter_stats.rs          |   6 +-
 .../src/tools_ozone/moderation/get_repos.rs   |   6 +-
 .../tools_ozone/moderation/get_subjects.rs    |   6 +-
 .../tools_ozone/moderation/query_events.rs    |   6 +-
 .../tools_ozone/moderation/query_statuses.rs  |   6 +-
 .../tools_ozone/moderation/search_repos.rs    |   6 +-
 .../src/tools_ozone/safelink/add_rule.rs      |   6 +-
 .../src/tools_ozone/safelink/query_events.rs  |   6 +-
 .../src/tools_ozone/safelink/query_rules.rs   |   6 +-
 .../src/tools_ozone/safelink/remove_rule.rs   |   6 +-
 .../src/tools_ozone/safelink/update_rule.rs   |   6 +-
 .../src/tools_ozone/server/get_config.rs      |   8 +-
 .../src/tools_ozone/set/add_values.rs         |   6 +-
 .../src/tools_ozone/set/delete_set.rs         |   6 +-
 .../src/tools_ozone/set/delete_values.rs      |   6 +-
 .../src/tools_ozone/set/get_values.rs         |   6 +-
 .../src/tools_ozone/set/query_sets.rs         |   6 +-
 .../src/tools_ozone/set/upsert_set.rs         |   6 +-
 .../src/tools_ozone/setting/list_options.rs   |   6 +-
 .../src/tools_ozone/setting/remove_options.rs |   6 +-
 .../src/tools_ozone/setting/upsert_option.rs  |   6 +-
 .../tools_ozone/signature/find_correlation.rs |   6 +-
 .../signature/find_related_accounts.rs        |   6 +-
 .../tools_ozone/signature/search_accounts.rs  |   6 +-
 .../src/tools_ozone/team/add_member.rs        |   6 +-
 .../src/tools_ozone/team/delete_member.rs     |   6 +-
 .../src/tools_ozone/team/list_members.rs      |   6 +-
 .../src/tools_ozone/team/update_member.rs     |   6 +-
 .../verification/grant_verifications.rs       |   6 +-
 .../verification/list_verifications.rs        |   6 +-
 .../verification/revoke_verifications.rs      |   6 +-
 crates/jacquard-axum/Cargo.toml               |  29 ++
 crates/jacquard-axum/src/lib.rs               |  80 ++++
 crates/jacquard-common/src/error.rs           |  15 +
 crates/jacquard-common/src/types/xrpc.rs      | 240 ++++++++----
 crates/jacquard-identity/src/lib.rs           |  26 +-
 crates/jacquard-lexicon/src/codegen.rs        |  33 +-
 crates/jacquard-oauth/src/client.rs           |  42 +-
 crates/jacquard/src/client.rs                 |   8 +-
 .../jacquard/src/client/credential_session.rs |  30 +-
 crates/jacquard/src/main.rs                   |   3 +-
 245 files changed, 1515 insertions(+), 889 deletions(-)
 create mode 100644 crates/jacquard-axum/Cargo.toml
 create mode 100644 crates/jacquard-axum/src/lib.rs

diff --git a/Cargo.lock b/Cargo.lock
index 628d085b..be660961 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -131,6 +131,12 @@ dependencies = [
  "windows-sys 0.60.2",
 ]
 
+[[package]]
+name = "anyhow"
+version = "1.0.100"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a23eb6b1614318a8071c9b2521f36b424b2c83db5eb3a0fead4a6c0809af6e61"
+
 [[package]]
 name = "ascii"
 version = "1.1.0"
@@ -150,6 +156,28 @@ dependencies = [
  "tokio",
 ]
 
+[[package]]
+name = "async-stream"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b5a71a6f37880a80d1d7f19efd781e4b5de42c88f0722cc13bcb6cc2cfe8476"
+dependencies = [
+ "async-stream-impl",
+ "futures-core",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "async-stream-impl"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.106",
+]
+
 [[package]]
 name = "async-trait"
 version = "0.1.89"
@@ -173,6 +201,87 @@ version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
 
+[[package]]
+name = "axum"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a18ed336352031311f4e0b4dd2ff392d4fbb370777c9d18d7fc9d7359f73871"
+dependencies = [
+ "axum-core",
+ "bytes",
+ "form_urlencoded",
+ "futures-util",
+ "http",
+ "http-body",
+ "http-body-util",
+ "hyper",
+ "hyper-util",
+ "itoa",
+ "matchit",
+ "memchr",
+ "mime",
+ "percent-encoding",
+ "pin-project-lite",
+ "serde_core",
+ "serde_json",
+ "serde_path_to_error",
+ "serde_urlencoded",
+ "sync_wrapper",
+ "tokio",
+ "tower",
+ "tower-layer",
+ "tower-service",
+ "tracing",
+]
+
+[[package]]
+name = "axum-core"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59446ce19cd142f8833f856eb31f3eb097812d1479ab224f54d72428ca21ea22"
+dependencies = [
+ "bytes",
+ "futures-core",
+ "http",
+ "http-body",
+ "http-body-util",
+ "mime",
+ "pin-project-lite",
+ "sync_wrapper",
+ "tower-layer",
+ "tower-service",
+ "tracing",
+]
+
+[[package]]
+name = "axum-test"
+version = "18.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "680e88effaafbb28675074f29cda0e984c984bed5eb513085c17caf7de564225"
+dependencies = [
+ "anyhow",
+ "axum",
+ "bytes",
+ "bytesize",
+ "cookie",
+ "expect-json",
+ "http",
+ "http-body-util",
+ "hyper",
+ "hyper-util",
+ "mime",
+ "pretty_assertions",
+ "reserve-port",
+ "rust-multipart-rfc7578_2",
+ "serde",
+ "serde_json",
+ "serde_urlencoded",
+ "smallvec",
+ "tokio",
+ "tower",
+ "url",
+]
+
 [[package]]
 name = "backtrace"
 version = "0.3.76"
@@ -352,6 +461,12 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "bytesize"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f5c434ae3cf0089ca203e9019ebe529c47ff45cefe8af7c85ecb734ef541822f"
+
 [[package]]
 name = "cbor4ii"
 version = "0.2.14"
@@ -538,6 +653,16 @@ version = "0.9.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8"
 
+[[package]]
+name = "cookie"
+version = "0.18.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ddef33a339a91ea89fb53151bd0a4689cfce27055c291dfa69945475d22c747"
+dependencies = [
+ "time",
+ "version_check",
+]
+
 [[package]]
 name = "core-foundation"
 version = "0.9.4"
@@ -747,6 +872,12 @@ dependencies = [
  "serde_core",
 ]
 
+[[package]]
+name = "diff"
+version = "0.1.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8"
+
 [[package]]
 name = "digest"
 version = "0.10.7"
@@ -838,6 +969,15 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "email_address"
+version = "0.2.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e079f19b08ca6239f47f8ba8509c11cf3ea30095831f7fed61441475edd8c449"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "encoding_rs"
 version = "0.8.35"
@@ -865,6 +1005,17 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
 
+[[package]]
+name = "erased-serde"
+version = "0.4.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "259d404d09818dec19332e31d94558aeb442fea04c817006456c24b5460bbd4b"
+dependencies = [
+ "serde",
+ "serde_core",
+ "typeid",
+]
+
 [[package]]
 name = "errno"
 version = "0.3.14"
@@ -875,6 +1026,34 @@ dependencies = [
  "windows-sys 0.60.2",
 ]
 
+[[package]]
+name = "expect-json"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7519e78573c950576b89eb4f4fe82aedf3a80639245afa07e3ee3d199dcdb29e"
+dependencies = [
+ "chrono",
+ "email_address",
+ "expect-json-macros",
+ "num",
+ "serde",
+ "serde_json",
+ "thiserror 2.0.17",
+ "typetag",
+ "uuid",
+]
+
+[[package]]
+name = "expect-json-macros"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7bf7f5979e98460a0eb412665514594f68f366a32b85fa8d7ffb65bb1edee6a0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.106",
+]
+
 [[package]]
 name = "fastrand"
 version = "2.3.0"
@@ -980,7 +1159,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
 dependencies = [
  "futures-core",
+ "futures-io",
  "futures-task",
+ "memchr",
  "pin-project-lite",
  "pin-utils",
  "slab",
@@ -1250,6 +1431,7 @@ dependencies = [
  "http",
  "http-body",
  "httparse",
+ "httpdate",
  "itoa",
  "pin-project-lite",
  "pin-utils",
@@ -1467,6 +1649,15 @@ version = "2.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f4c7245a08504955605670dbf141fceab975f15ca21570696aebe9d2e71576bd"
 
+[[package]]
+name = "inventory"
+version = "0.3.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bc61209c082fbeb19919bee74b176221b27223e27b65d781eb91af24eb1fb46e"
+dependencies = [
+ "rustversion",
+]
+
 [[package]]
 name = "io-uring"
 version = "0.7.10"
@@ -1588,6 +1779,24 @@ dependencies = [
  "thiserror 2.0.17",
 ]
 
+[[package]]
+name = "jacquard-axum"
+version = "0.3.0"
+dependencies = [
+ "axum",
+ "axum-test",
+ "bytes",
+ "jacquard",
+ "jacquard-common",
+ "miette",
+ "serde",
+ "serde_ipld_dagcbor",
+ "serde_json",
+ "thiserror 2.0.17",
+ "tokio",
+ "tokio-test",
+]
+
 [[package]]
 name = "jacquard-common"
 version = "0.3.0"
@@ -1898,6 +2107,12 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "matchit"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "47e1ffaa40ddd1f3ed91f717a33c8c0ee23fff369e3aa8772b9605cc1d22f4c3"
+
 [[package]]
 name = "memchr"
 version = "2.7.6"
@@ -2032,6 +2247,30 @@ dependencies = [
  "minimal-lexical",
 ]
 
+[[package]]
+name = "num"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23"
+dependencies = [
+ "num-bigint",
+ "num-complex",
+ "num-integer",
+ "num-iter",
+ "num-rational",
+ "num-traits",
+]
+
+[[package]]
+name = "num-bigint"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9"
+dependencies = [
+ "num-integer",
+ "num-traits",
+]
+
 [[package]]
 name = "num-bigint-dig"
 version = "0.8.4"
@@ -2049,6 +2288,15 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "num-complex"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495"
+dependencies = [
+ "num-traits",
+]
+
 [[package]]
 name = "num-conv"
 version = "0.1.0"
@@ -2075,6 +2323,17 @@ dependencies = [
  "num-traits",
 ]
 
+[[package]]
+name = "num-rational"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824"
+dependencies = [
+ "num-bigint",
+ "num-integer",
+ "num-traits",
+]
+
 [[package]]
 name = "num-traits"
 version = "0.2.19"
@@ -2281,6 +2540,16 @@ dependencies = [
  "zerocopy",
 ]
 
+[[package]]
+name = "pretty_assertions"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ae130e2f271fbc2ac3a40fb1d07180839cdbbe443c7a27e1e3c13c5cac0116d"
+dependencies = [
+ "diff",
+ "yansi",
+]
+
 [[package]]
 name = "prettyplease"
 version = "0.2.37"
@@ -2595,6 +2864,15 @@ dependencies = [
  "webpki-roots",
 ]
 
+[[package]]
+name = "reserve-port"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "21918d6644020c6f6ef1993242989bf6d4952d2e025617744f184c02df51c356"
+dependencies = [
+ "thiserror 2.0.17",
+]
+
 [[package]]
 name = "resolv-conf"
 version = "0.7.5"
@@ -2669,6 +2947,21 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "rust-multipart-rfc7578_2"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c839d037155ebc06a571e305af66ff9fd9063a6e662447051737e1ac75beea41"
+dependencies = [
+ "bytes",
+ "futures-core",
+ "futures-util",
+ "http",
+ "mime",
+ "rand 0.9.2",
+ "thiserror 2.0.17",
+]
+
 [[package]]
 name = "rustc-demangle"
 version = "0.1.26"
@@ -2892,6 +3185,17 @@ dependencies = [
  "serde_core",
 ]
 
+[[package]]
+name = "serde_path_to_error"
+version = "0.1.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "10a9ff822e371bb5403e391ecd83e182e0e77ba7f6fe0160b795797109d1b457"
+dependencies = [
+ "itoa",
+ "serde",
+ "serde_core",
+]
+
 [[package]]
 name = "serde_repr"
 version = "0.1.20"
@@ -3356,6 +3660,30 @@ dependencies = [
  "tokio",
 ]
 
+[[package]]
+name = "tokio-stream"
+version = "0.1.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047"
+dependencies = [
+ "futures-core",
+ "pin-project-lite",
+ "tokio",
+]
+
+[[package]]
+name = "tokio-test"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2468baabc3311435b55dd935f702f42cd1b8abb7e754fb7dfb16bd36aa88f9f7"
+dependencies = [
+ "async-stream",
+ "bytes",
+ "futures-core",
+ "tokio",
+ "tokio-stream",
+]
+
 [[package]]
 name = "tokio-util"
 version = "0.7.16"
@@ -3382,6 +3710,7 @@ dependencies = [
  "tokio",
  "tower-layer",
  "tower-service",
+ "tracing",
 ]
 
 [[package]]
@@ -3420,6 +3749,7 @@ version = "0.1.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
 dependencies = [
+ "log",
  "pin-project-lite",
  "tracing-attributes",
  "tracing-core",
@@ -3471,12 +3801,42 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "typeid"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bc7d623258602320d5c55d1bc22793b57daff0ec7efc270ea7d55ce1d5f5471c"
+
 [[package]]
 name = "typenum"
 version = "1.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f"
 
+[[package]]
+name = "typetag"
+version = "0.2.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "be2212c8a9b9bcfca32024de14998494cf9a5dfa59ea1b829de98bac374b86bf"
+dependencies = [
+ "erased-serde",
+ "inventory",
+ "once_cell",
+ "serde",
+ "typetag-impl",
+]
+
+[[package]]
+name = "typetag-impl"
+version = "0.2.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "27a7a9b72ba121f6f1f6c3632b85604cac41aedb5ddc70accbebb6cac83de846"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.106",
+]
+
 [[package]]
 name = "unicase"
 version = "2.8.1"
diff --git a/crates/jacquard-api/src/app_bsky/actor/get_preferences.rs b/crates/jacquard-api/src/app_bsky/actor/get_preferences.rs
index 5b345a3d..1162bd46 100644
--- a/crates/jacquard-api/src/app_bsky/actor/get_preferences.rs
+++ b/crates/jacquard-api/src/app_bsky/actor/get_preferences.rs
@@ -42,10 +42,10 @@ impl jacquard_common::IntoStatic for GetPreferencesOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for GetPreferences {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for GetPreferences {
     const NSID: &'static str = "app.bsky.actor.getPreferences";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = GetPreferencesOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = GetPreferencesOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/actor/get_profile.rs b/crates/jacquard-api/src/app_bsky/actor/get_profile.rs
index 329127a3..84a8f90e 100644
--- a/crates/jacquard-api/src/app_bsky/actor/get_profile.rs
+++ b/crates/jacquard-api/src/app_bsky/actor/get_profile.rs
@@ -49,10 +49,10 @@ impl jacquard_common::IntoStatic for GetProfileOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for GetProfile<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for GetProfile<'de> {
     const NSID: &'static str = "app.bsky.actor.getProfile";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = GetProfileOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = GetProfileOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/actor/get_profiles.rs b/crates/jacquard-api/src/app_bsky/actor/get_profiles.rs
index 6dfccddd..b74ee8b9 100644
--- a/crates/jacquard-api/src/app_bsky/actor/get_profiles.rs
+++ b/crates/jacquard-api/src/app_bsky/actor/get_profiles.rs
@@ -48,10 +48,10 @@ impl jacquard_common::IntoStatic for GetProfilesOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for GetProfiles<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for GetProfiles<'de> {
     const NSID: &'static str = "app.bsky.actor.getProfiles";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = GetProfilesOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = GetProfilesOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/actor/get_suggestions.rs b/crates/jacquard-api/src/app_bsky/actor/get_suggestions.rs
index aec0aadc..d9afdfdd 100644
--- a/crates/jacquard-api/src/app_bsky/actor/get_suggestions.rs
+++ b/crates/jacquard-api/src/app_bsky/actor/get_suggestions.rs
@@ -62,10 +62,10 @@ impl jacquard_common::IntoStatic for GetSuggestionsOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for GetSuggestions<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for GetSuggestions<'de> {
     const NSID: &'static str = "app.bsky.actor.getSuggestions";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = GetSuggestionsOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = GetSuggestionsOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/actor/put_preferences.rs b/crates/jacquard-api/src/app_bsky/actor/put_preferences.rs
index a13f30f0..ff4adb01 100644
--- a/crates/jacquard-api/src/app_bsky/actor/put_preferences.rs
+++ b/crates/jacquard-api/src/app_bsky/actor/put_preferences.rs
@@ -39,12 +39,12 @@ impl jacquard_common::IntoStatic for PutPreferences<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for PutPreferences<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for PutPreferences<'de> {
     const NSID: &'static str = "app.bsky.actor.putPreferences";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Procedure(
         "application/json",
     );
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = ();
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = ();
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/actor/search_actors.rs b/crates/jacquard-api/src/app_bsky/actor/search_actors.rs
index 78f202ea..eb95d2a2 100644
--- a/crates/jacquard-api/src/app_bsky/actor/search_actors.rs
+++ b/crates/jacquard-api/src/app_bsky/actor/search_actors.rs
@@ -68,10 +68,10 @@ impl jacquard_common::IntoStatic for SearchActorsOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for SearchActors<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for SearchActors<'de> {
     const NSID: &'static str = "app.bsky.actor.searchActors";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = SearchActorsOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = SearchActorsOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/actor/search_actors_typeahead.rs b/crates/jacquard-api/src/app_bsky/actor/search_actors_typeahead.rs
index 72e510d7..23eae1ef 100644
--- a/crates/jacquard-api/src/app_bsky/actor/search_actors_typeahead.rs
+++ b/crates/jacquard-api/src/app_bsky/actor/search_actors_typeahead.rs
@@ -59,10 +59,10 @@ impl jacquard_common::IntoStatic for SearchActorsTypeaheadOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for SearchActorsTypeahead<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for SearchActorsTypeahead<'de> {
     const NSID: &'static str = "app.bsky.actor.searchActorsTypeahead";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = SearchActorsTypeaheadOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = SearchActorsTypeaheadOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/bookmark/create_bookmark.rs b/crates/jacquard-api/src/app_bsky/bookmark/create_bookmark.rs
index 4f167d15..036b780e 100644
--- a/crates/jacquard-api/src/app_bsky/bookmark/create_bookmark.rs
+++ b/crates/jacquard-api/src/app_bsky/bookmark/create_bookmark.rs
@@ -90,12 +90,12 @@ impl jacquard_common::IntoStatic for CreateBookmarkError<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for CreateBookmark<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for CreateBookmark<'de> {
     const NSID: &'static str = "app.bsky.bookmark.createBookmark";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Procedure(
         "application/json",
     );
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = ();
-    type Err<'de> = CreateBookmarkError<'de>;
+    type Output = ();
+    type Err = CreateBookmarkError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/bookmark/delete_bookmark.rs b/crates/jacquard-api/src/app_bsky/bookmark/delete_bookmark.rs
index 41c9a768..41acea7f 100644
--- a/crates/jacquard-api/src/app_bsky/bookmark/delete_bookmark.rs
+++ b/crates/jacquard-api/src/app_bsky/bookmark/delete_bookmark.rs
@@ -87,12 +87,12 @@ impl jacquard_common::IntoStatic for DeleteBookmarkError<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for DeleteBookmark<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for DeleteBookmark<'de> {
     const NSID: &'static str = "app.bsky.bookmark.deleteBookmark";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Procedure(
         "application/json",
     );
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = ();
-    type Err<'de> = DeleteBookmarkError<'de>;
+    type Output = ();
+    type Err = DeleteBookmarkError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/bookmark/get_bookmarks.rs b/crates/jacquard-api/src/app_bsky/bookmark/get_bookmarks.rs
index 31d313a7..e5269c10 100644
--- a/crates/jacquard-api/src/app_bsky/bookmark/get_bookmarks.rs
+++ b/crates/jacquard-api/src/app_bsky/bookmark/get_bookmarks.rs
@@ -58,10 +58,10 @@ impl jacquard_common::IntoStatic for GetBookmarksOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for GetBookmarks<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for GetBookmarks<'de> {
     const NSID: &'static str = "app.bsky.bookmark.getBookmarks";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = GetBookmarksOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = GetBookmarksOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/feed/describe_feed_generator.rs b/crates/jacquard-api/src/app_bsky/feed/describe_feed_generator.rs
index b61bb7f1..80dad749 100644
--- a/crates/jacquard-api/src/app_bsky/feed/describe_feed_generator.rs
+++ b/crates/jacquard-api/src/app_bsky/feed/describe_feed_generator.rs
@@ -72,12 +72,12 @@ impl jacquard_common::IntoStatic for DescribeFeedGeneratorOutput<'_> {
 }
 
 /// XRPC request marker type
-#[derive(Debug, Clone, Copy, PartialEq, Eq, serde::Serialize)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
 pub struct DescribeFeedGenerator;
-impl jacquard_common::types::xrpc::XrpcRequest for DescribeFeedGenerator {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for DescribeFeedGenerator {
     const NSID: &'static str = "app.bsky.feed.describeFeedGenerator";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = DescribeFeedGeneratorOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = DescribeFeedGeneratorOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/feed/get_actor_feeds.rs b/crates/jacquard-api/src/app_bsky/feed/get_actor_feeds.rs
index 5b024ca5..b95083c7 100644
--- a/crates/jacquard-api/src/app_bsky/feed/get_actor_feeds.rs
+++ b/crates/jacquard-api/src/app_bsky/feed/get_actor_feeds.rs
@@ -61,10 +61,10 @@ impl jacquard_common::IntoStatic for GetActorFeedsOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for GetActorFeeds<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for GetActorFeeds<'de> {
     const NSID: &'static str = "app.bsky.feed.getActorFeeds";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = GetActorFeedsOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = GetActorFeedsOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/feed/get_actor_likes.rs b/crates/jacquard-api/src/app_bsky/feed/get_actor_likes.rs
index 1552a299..98c426a1 100644
--- a/crates/jacquard-api/src/app_bsky/feed/get_actor_likes.rs
+++ b/crates/jacquard-api/src/app_bsky/feed/get_actor_likes.rs
@@ -120,10 +120,10 @@ impl jacquard_common::IntoStatic for GetActorLikesError<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for GetActorLikes<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for GetActorLikes<'de> {
     const NSID: &'static str = "app.bsky.feed.getActorLikes";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = GetActorLikesOutput<'de>;
-    type Err<'de> = GetActorLikesError<'de>;
+    type Output = GetActorLikesOutput<'de>;
+    type Err = GetActorLikesError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/feed/get_author_feed.rs b/crates/jacquard-api/src/app_bsky/feed/get_author_feed.rs
index 75acdd93..74d522b9 100644
--- a/crates/jacquard-api/src/app_bsky/feed/get_author_feed.rs
+++ b/crates/jacquard-api/src/app_bsky/feed/get_author_feed.rs
@@ -130,10 +130,10 @@ impl jacquard_common::IntoStatic for GetAuthorFeedError<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for GetAuthorFeed<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for GetAuthorFeed<'de> {
     const NSID: &'static str = "app.bsky.feed.getAuthorFeed";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = GetAuthorFeedOutput<'de>;
-    type Err<'de> = GetAuthorFeedError<'de>;
+    type Output = GetAuthorFeedOutput<'de>;
+    type Err = GetAuthorFeedError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/feed/get_feed.rs b/crates/jacquard-api/src/app_bsky/feed/get_feed.rs
index fd83d7d0..2b779808 100644
--- a/crates/jacquard-api/src/app_bsky/feed/get_feed.rs
+++ b/crates/jacquard-api/src/app_bsky/feed/get_feed.rs
@@ -104,10 +104,10 @@ impl jacquard_common::IntoStatic for GetFeedError<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for GetFeed<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for GetFeed<'de> {
     const NSID: &'static str = "app.bsky.feed.getFeed";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = GetFeedOutput<'de>;
-    type Err<'de> = GetFeedError<'de>;
+    type Output = GetFeedOutput<'de>;
+    type Err = GetFeedError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/feed/get_feed_generator.rs b/crates/jacquard-api/src/app_bsky/feed/get_feed_generator.rs
index 8d308704..ac89bf38 100644
--- a/crates/jacquard-api/src/app_bsky/feed/get_feed_generator.rs
+++ b/crates/jacquard-api/src/app_bsky/feed/get_feed_generator.rs
@@ -54,10 +54,10 @@ impl jacquard_common::IntoStatic for GetFeedGeneratorOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for GetFeedGenerator<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for GetFeedGenerator<'de> {
     const NSID: &'static str = "app.bsky.feed.getFeedGenerator";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = GetFeedGeneratorOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = GetFeedGeneratorOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/feed/get_feed_generators.rs b/crates/jacquard-api/src/app_bsky/feed/get_feed_generators.rs
index 2b141a9f..8782029e 100644
--- a/crates/jacquard-api/src/app_bsky/feed/get_feed_generators.rs
+++ b/crates/jacquard-api/src/app_bsky/feed/get_feed_generators.rs
@@ -48,10 +48,10 @@ impl jacquard_common::IntoStatic for GetFeedGeneratorsOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for GetFeedGenerators<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for GetFeedGenerators<'de> {
     const NSID: &'static str = "app.bsky.feed.getFeedGenerators";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = GetFeedGeneratorsOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = GetFeedGeneratorsOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/feed/get_feed_skeleton.rs b/crates/jacquard-api/src/app_bsky/feed/get_feed_skeleton.rs
index 8279fe71..e1846f47 100644
--- a/crates/jacquard-api/src/app_bsky/feed/get_feed_skeleton.rs
+++ b/crates/jacquard-api/src/app_bsky/feed/get_feed_skeleton.rs
@@ -113,10 +113,10 @@ impl jacquard_common::IntoStatic for GetFeedSkeletonError<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for GetFeedSkeleton<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for GetFeedSkeleton<'de> {
     const NSID: &'static str = "app.bsky.feed.getFeedSkeleton";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = GetFeedSkeletonOutput<'de>;
-    type Err<'de> = GetFeedSkeletonError<'de>;
+    type Output = GetFeedSkeletonOutput<'de>;
+    type Err = GetFeedSkeletonError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/feed/get_likes.rs b/crates/jacquard-api/src/app_bsky/feed/get_likes.rs
index 4ef866c3..a46b7600 100644
--- a/crates/jacquard-api/src/app_bsky/feed/get_likes.rs
+++ b/crates/jacquard-api/src/app_bsky/feed/get_likes.rs
@@ -94,10 +94,10 @@ impl jacquard_common::IntoStatic for GetLikesOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for GetLikes<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for GetLikes<'de> {
     const NSID: &'static str = "app.bsky.feed.getLikes";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = GetLikesOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = GetLikesOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/feed/get_list_feed.rs b/crates/jacquard-api/src/app_bsky/feed/get_list_feed.rs
index 67dade67..81fa8463 100644
--- a/crates/jacquard-api/src/app_bsky/feed/get_list_feed.rs
+++ b/crates/jacquard-api/src/app_bsky/feed/get_list_feed.rs
@@ -106,10 +106,10 @@ impl jacquard_common::IntoStatic for GetListFeedError<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for GetListFeed<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for GetListFeed<'de> {
     const NSID: &'static str = "app.bsky.feed.getListFeed";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = GetListFeedOutput<'de>;
-    type Err<'de> = GetListFeedError<'de>;
+    type Output = GetListFeedOutput<'de>;
+    type Err = GetListFeedError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/feed/get_post_thread.rs b/crates/jacquard-api/src/app_bsky/feed/get_post_thread.rs
index 78095e96..ebc44bfd 100644
--- a/crates/jacquard-api/src/app_bsky/feed/get_post_thread.rs
+++ b/crates/jacquard-api/src/app_bsky/feed/get_post_thread.rs
@@ -140,10 +140,10 @@ impl jacquard_common::IntoStatic for GetPostThreadError<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for GetPostThread<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for GetPostThread<'de> {
     const NSID: &'static str = "app.bsky.feed.getPostThread";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = GetPostThreadOutput<'de>;
-    type Err<'de> = GetPostThreadError<'de>;
+    type Output = GetPostThreadOutput<'de>;
+    type Err = GetPostThreadError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/feed/get_posts.rs b/crates/jacquard-api/src/app_bsky/feed/get_posts.rs
index 8e1e8267..19ace19b 100644
--- a/crates/jacquard-api/src/app_bsky/feed/get_posts.rs
+++ b/crates/jacquard-api/src/app_bsky/feed/get_posts.rs
@@ -48,10 +48,10 @@ impl jacquard_common::IntoStatic for GetPostsOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for GetPosts<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for GetPosts<'de> {
     const NSID: &'static str = "app.bsky.feed.getPosts";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = GetPostsOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = GetPostsOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/feed/get_quotes.rs b/crates/jacquard-api/src/app_bsky/feed/get_quotes.rs
index 517356d3..f750be10 100644
--- a/crates/jacquard-api/src/app_bsky/feed/get_quotes.rs
+++ b/crates/jacquard-api/src/app_bsky/feed/get_quotes.rs
@@ -72,10 +72,10 @@ impl jacquard_common::IntoStatic for GetQuotesOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for GetQuotes<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for GetQuotes<'de> {
     const NSID: &'static str = "app.bsky.feed.getQuotes";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = GetQuotesOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = GetQuotesOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/feed/get_reposted_by.rs b/crates/jacquard-api/src/app_bsky/feed/get_reposted_by.rs
index 9291eb93..1c80f798 100644
--- a/crates/jacquard-api/src/app_bsky/feed/get_reposted_by.rs
+++ b/crates/jacquard-api/src/app_bsky/feed/get_reposted_by.rs
@@ -72,10 +72,10 @@ impl jacquard_common::IntoStatic for GetRepostedByOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for GetRepostedBy<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for GetRepostedBy<'de> {
     const NSID: &'static str = "app.bsky.feed.getRepostedBy";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = GetRepostedByOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = GetRepostedByOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/feed/get_suggested_feeds.rs b/crates/jacquard-api/src/app_bsky/feed/get_suggested_feeds.rs
index b466558c..5d727f04 100644
--- a/crates/jacquard-api/src/app_bsky/feed/get_suggested_feeds.rs
+++ b/crates/jacquard-api/src/app_bsky/feed/get_suggested_feeds.rs
@@ -58,10 +58,10 @@ impl jacquard_common::IntoStatic for GetSuggestedFeedsOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for GetSuggestedFeeds<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for GetSuggestedFeeds<'de> {
     const NSID: &'static str = "app.bsky.feed.getSuggestedFeeds";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = GetSuggestedFeedsOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = GetSuggestedFeedsOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/feed/get_timeline.rs b/crates/jacquard-api/src/app_bsky/feed/get_timeline.rs
index 6f9934bb..281a5fab 100644
--- a/crates/jacquard-api/src/app_bsky/feed/get_timeline.rs
+++ b/crates/jacquard-api/src/app_bsky/feed/get_timeline.rs
@@ -63,10 +63,10 @@ impl jacquard_common::IntoStatic for GetTimelineOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for GetTimeline<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for GetTimeline<'de> {
     const NSID: &'static str = "app.bsky.feed.getTimeline";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = GetTimelineOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = GetTimelineOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/feed/search_posts.rs b/crates/jacquard-api/src/app_bsky/feed/search_posts.rs
index ec589425..5836aed5 100644
--- a/crates/jacquard-api/src/app_bsky/feed/search_posts.rs
+++ b/crates/jacquard-api/src/app_bsky/feed/search_posts.rs
@@ -151,10 +151,10 @@ impl jacquard_common::IntoStatic for SearchPostsError<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for SearchPosts<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for SearchPosts<'de> {
     const NSID: &'static str = "app.bsky.feed.searchPosts";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = SearchPostsOutput<'de>;
-    type Err<'de> = SearchPostsError<'de>;
+    type Output = SearchPostsOutput<'de>;
+    type Err = SearchPostsError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/feed/send_interactions.rs b/crates/jacquard-api/src/app_bsky/feed/send_interactions.rs
index 6c2db16f..2f88deb2 100644
--- a/crates/jacquard-api/src/app_bsky/feed/send_interactions.rs
+++ b/crates/jacquard-api/src/app_bsky/feed/send_interactions.rs
@@ -52,12 +52,12 @@ impl jacquard_common::IntoStatic for SendInteractionsOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for SendInteractions<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for SendInteractions<'de> {
     const NSID: &'static str = "app.bsky.feed.sendInteractions";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Procedure(
         "application/json",
     );
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = SendInteractionsOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = SendInteractionsOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/graph/get_actor_starter_packs.rs b/crates/jacquard-api/src/app_bsky/graph/get_actor_starter_packs.rs
index 0ae0719a..3a967007 100644
--- a/crates/jacquard-api/src/app_bsky/graph/get_actor_starter_packs.rs
+++ b/crates/jacquard-api/src/app_bsky/graph/get_actor_starter_packs.rs
@@ -61,10 +61,10 @@ impl jacquard_common::IntoStatic for GetActorStarterPacksOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for GetActorStarterPacks<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for GetActorStarterPacks<'de> {
     const NSID: &'static str = "app.bsky.graph.getActorStarterPacks";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = GetActorStarterPacksOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = GetActorStarterPacksOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/graph/get_blocks.rs b/crates/jacquard-api/src/app_bsky/graph/get_blocks.rs
index 2e066ce0..827f6f87 100644
--- a/crates/jacquard-api/src/app_bsky/graph/get_blocks.rs
+++ b/crates/jacquard-api/src/app_bsky/graph/get_blocks.rs
@@ -58,10 +58,10 @@ impl jacquard_common::IntoStatic for GetBlocksOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for GetBlocks<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for GetBlocks<'de> {
     const NSID: &'static str = "app.bsky.graph.getBlocks";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = GetBlocksOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = GetBlocksOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/graph/get_followers.rs b/crates/jacquard-api/src/app_bsky/graph/get_followers.rs
index acab4ff2..ad7e87ec 100644
--- a/crates/jacquard-api/src/app_bsky/graph/get_followers.rs
+++ b/crates/jacquard-api/src/app_bsky/graph/get_followers.rs
@@ -64,10 +64,10 @@ impl jacquard_common::IntoStatic for GetFollowersOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for GetFollowers<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for GetFollowers<'de> {
     const NSID: &'static str = "app.bsky.graph.getFollowers";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = GetFollowersOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = GetFollowersOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/graph/get_follows.rs b/crates/jacquard-api/src/app_bsky/graph/get_follows.rs
index 7e7b5192..c361b49e 100644
--- a/crates/jacquard-api/src/app_bsky/graph/get_follows.rs
+++ b/crates/jacquard-api/src/app_bsky/graph/get_follows.rs
@@ -64,10 +64,10 @@ impl jacquard_common::IntoStatic for GetFollowsOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for GetFollows<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for GetFollows<'de> {
     const NSID: &'static str = "app.bsky.graph.getFollows";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = GetFollowsOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = GetFollowsOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/graph/get_known_followers.rs b/crates/jacquard-api/src/app_bsky/graph/get_known_followers.rs
index 6a7b18f9..a13d21a0 100644
--- a/crates/jacquard-api/src/app_bsky/graph/get_known_followers.rs
+++ b/crates/jacquard-api/src/app_bsky/graph/get_known_followers.rs
@@ -64,10 +64,10 @@ impl jacquard_common::IntoStatic for GetKnownFollowersOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for GetKnownFollowers<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for GetKnownFollowers<'de> {
     const NSID: &'static str = "app.bsky.graph.getKnownFollowers";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = GetKnownFollowersOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = GetKnownFollowersOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/graph/get_list.rs b/crates/jacquard-api/src/app_bsky/graph/get_list.rs
index 7bf16fb1..877a0798 100644
--- a/crates/jacquard-api/src/app_bsky/graph/get_list.rs
+++ b/crates/jacquard-api/src/app_bsky/graph/get_list.rs
@@ -64,10 +64,10 @@ impl jacquard_common::IntoStatic for GetListOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for GetList<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for GetList<'de> {
     const NSID: &'static str = "app.bsky.graph.getList";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = GetListOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = GetListOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/graph/get_list_blocks.rs b/crates/jacquard-api/src/app_bsky/graph/get_list_blocks.rs
index 0d27989f..861a264e 100644
--- a/crates/jacquard-api/src/app_bsky/graph/get_list_blocks.rs
+++ b/crates/jacquard-api/src/app_bsky/graph/get_list_blocks.rs
@@ -58,10 +58,10 @@ impl jacquard_common::IntoStatic for GetListBlocksOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for GetListBlocks<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for GetListBlocks<'de> {
     const NSID: &'static str = "app.bsky.graph.getListBlocks";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = GetListBlocksOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = GetListBlocksOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/graph/get_list_mutes.rs b/crates/jacquard-api/src/app_bsky/graph/get_list_mutes.rs
index 57c3c7f7..5800ee95 100644
--- a/crates/jacquard-api/src/app_bsky/graph/get_list_mutes.rs
+++ b/crates/jacquard-api/src/app_bsky/graph/get_list_mutes.rs
@@ -58,10 +58,10 @@ impl jacquard_common::IntoStatic for GetListMutesOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for GetListMutes<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for GetListMutes<'de> {
     const NSID: &'static str = "app.bsky.graph.getListMutes";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = GetListMutesOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = GetListMutesOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/graph/get_lists.rs b/crates/jacquard-api/src/app_bsky/graph/get_lists.rs
index 3b3f9b31..adeb00a8 100644
--- a/crates/jacquard-api/src/app_bsky/graph/get_lists.rs
+++ b/crates/jacquard-api/src/app_bsky/graph/get_lists.rs
@@ -65,10 +65,10 @@ impl jacquard_common::IntoStatic for GetListsOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for GetLists<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for GetLists<'de> {
     const NSID: &'static str = "app.bsky.graph.getLists";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = GetListsOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = GetListsOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/graph/get_lists_with_membership.rs b/crates/jacquard-api/src/app_bsky/graph/get_lists_with_membership.rs
index 16f7cdc8..a82d8e6f 100644
--- a/crates/jacquard-api/src/app_bsky/graph/get_lists_with_membership.rs
+++ b/crates/jacquard-api/src/app_bsky/graph/get_lists_with_membership.rs
@@ -88,10 +88,11 @@ impl jacquard_common::IntoStatic for GetListsWithMembershipOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for GetListsWithMembership<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de>
+for GetListsWithMembership<'de> {
     const NSID: &'static str = "app.bsky.graph.getListsWithMembership";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = GetListsWithMembershipOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = GetListsWithMembershipOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/graph/get_mutes.rs b/crates/jacquard-api/src/app_bsky/graph/get_mutes.rs
index 886efd82..b78ad21f 100644
--- a/crates/jacquard-api/src/app_bsky/graph/get_mutes.rs
+++ b/crates/jacquard-api/src/app_bsky/graph/get_mutes.rs
@@ -58,10 +58,10 @@ impl jacquard_common::IntoStatic for GetMutesOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for GetMutes<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for GetMutes<'de> {
     const NSID: &'static str = "app.bsky.graph.getMutes";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = GetMutesOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = GetMutesOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/graph/get_relationships.rs b/crates/jacquard-api/src/app_bsky/graph/get_relationships.rs
index 95072c55..5a71e0da 100644
--- a/crates/jacquard-api/src/app_bsky/graph/get_relationships.rs
+++ b/crates/jacquard-api/src/app_bsky/graph/get_relationships.rs
@@ -106,10 +106,10 @@ impl jacquard_common::IntoStatic for GetRelationshipsError<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for GetRelationships<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for GetRelationships<'de> {
     const NSID: &'static str = "app.bsky.graph.getRelationships";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = GetRelationshipsOutput<'de>;
-    type Err<'de> = GetRelationshipsError<'de>;
+    type Output = GetRelationshipsOutput<'de>;
+    type Err = GetRelationshipsError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/graph/get_starter_pack.rs b/crates/jacquard-api/src/app_bsky/graph/get_starter_pack.rs
index f0a0cbf2..bc099e01 100644
--- a/crates/jacquard-api/src/app_bsky/graph/get_starter_pack.rs
+++ b/crates/jacquard-api/src/app_bsky/graph/get_starter_pack.rs
@@ -48,10 +48,10 @@ impl jacquard_common::IntoStatic for GetStarterPackOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for GetStarterPack<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for GetStarterPack<'de> {
     const NSID: &'static str = "app.bsky.graph.getStarterPack";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = GetStarterPackOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = GetStarterPackOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/graph/get_starter_packs.rs b/crates/jacquard-api/src/app_bsky/graph/get_starter_packs.rs
index 9a309271..00b30561 100644
--- a/crates/jacquard-api/src/app_bsky/graph/get_starter_packs.rs
+++ b/crates/jacquard-api/src/app_bsky/graph/get_starter_packs.rs
@@ -48,10 +48,10 @@ impl jacquard_common::IntoStatic for GetStarterPacksOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for GetStarterPacks<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for GetStarterPacks<'de> {
     const NSID: &'static str = "app.bsky.graph.getStarterPacks";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = GetStarterPacksOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = GetStarterPacksOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/graph/get_starter_packs_with_membership.rs b/crates/jacquard-api/src/app_bsky/graph/get_starter_packs_with_membership.rs
index 6aa31910..0fa4019d 100644
--- a/crates/jacquard-api/src/app_bsky/graph/get_starter_packs_with_membership.rs
+++ b/crates/jacquard-api/src/app_bsky/graph/get_starter_packs_with_membership.rs
@@ -63,12 +63,13 @@ impl jacquard_common::IntoStatic for GetStarterPacksWithMembershipOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for GetStarterPacksWithMembership<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de>
+for GetStarterPacksWithMembership<'de> {
     const NSID: &'static str = "app.bsky.graph.getStarterPacksWithMembership";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = GetStarterPacksWithMembershipOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = GetStarterPacksWithMembershipOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
 
 ///A starter pack and an optional list item indicating membership of a target user to that starter pack.
diff --git a/crates/jacquard-api/src/app_bsky/graph/get_suggested_follows_by_actor.rs b/crates/jacquard-api/src/app_bsky/graph/get_suggested_follows_by_actor.rs
index e3411101..fdbee242 100644
--- a/crates/jacquard-api/src/app_bsky/graph/get_suggested_follows_by_actor.rs
+++ b/crates/jacquard-api/src/app_bsky/graph/get_suggested_follows_by_actor.rs
@@ -56,10 +56,11 @@ impl jacquard_common::IntoStatic for GetSuggestedFollowsByActorOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for GetSuggestedFollowsByActor<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de>
+for GetSuggestedFollowsByActor<'de> {
     const NSID: &'static str = "app.bsky.graph.getSuggestedFollowsByActor";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = GetSuggestedFollowsByActorOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = GetSuggestedFollowsByActorOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/graph/mute_actor.rs b/crates/jacquard-api/src/app_bsky/graph/mute_actor.rs
index 68200dee..4b6ddddc 100644
--- a/crates/jacquard-api/src/app_bsky/graph/mute_actor.rs
+++ b/crates/jacquard-api/src/app_bsky/graph/mute_actor.rs
@@ -39,12 +39,12 @@ impl jacquard_common::IntoStatic for MuteActor<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for MuteActor<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for MuteActor<'de> {
     const NSID: &'static str = "app.bsky.graph.muteActor";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Procedure(
         "application/json",
     );
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = ();
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = ();
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/graph/mute_actor_list.rs b/crates/jacquard-api/src/app_bsky/graph/mute_actor_list.rs
index d1b0b6f1..9e95ed80 100644
--- a/crates/jacquard-api/src/app_bsky/graph/mute_actor_list.rs
+++ b/crates/jacquard-api/src/app_bsky/graph/mute_actor_list.rs
@@ -39,12 +39,12 @@ impl jacquard_common::IntoStatic for MuteActorList<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for MuteActorList<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for MuteActorList<'de> {
     const NSID: &'static str = "app.bsky.graph.muteActorList";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Procedure(
         "application/json",
     );
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = ();
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = ();
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/graph/mute_thread.rs b/crates/jacquard-api/src/app_bsky/graph/mute_thread.rs
index ec8693bf..a45070cd 100644
--- a/crates/jacquard-api/src/app_bsky/graph/mute_thread.rs
+++ b/crates/jacquard-api/src/app_bsky/graph/mute_thread.rs
@@ -39,12 +39,12 @@ impl jacquard_common::IntoStatic for MuteThread<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for MuteThread<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for MuteThread<'de> {
     const NSID: &'static str = "app.bsky.graph.muteThread";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Procedure(
         "application/json",
     );
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = ();
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = ();
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/graph/search_starter_packs.rs b/crates/jacquard-api/src/app_bsky/graph/search_starter_packs.rs
index e848866c..72fa5488 100644
--- a/crates/jacquard-api/src/app_bsky/graph/search_starter_packs.rs
+++ b/crates/jacquard-api/src/app_bsky/graph/search_starter_packs.rs
@@ -62,10 +62,10 @@ impl jacquard_common::IntoStatic for SearchStarterPacksOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for SearchStarterPacks<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for SearchStarterPacks<'de> {
     const NSID: &'static str = "app.bsky.graph.searchStarterPacks";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = SearchStarterPacksOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = SearchStarterPacksOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/graph/unmute_actor.rs b/crates/jacquard-api/src/app_bsky/graph/unmute_actor.rs
index a2e86bc2..083ce7f4 100644
--- a/crates/jacquard-api/src/app_bsky/graph/unmute_actor.rs
+++ b/crates/jacquard-api/src/app_bsky/graph/unmute_actor.rs
@@ -39,12 +39,12 @@ impl jacquard_common::IntoStatic for UnmuteActor<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for UnmuteActor<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for UnmuteActor<'de> {
     const NSID: &'static str = "app.bsky.graph.unmuteActor";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Procedure(
         "application/json",
     );
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = ();
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = ();
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/graph/unmute_actor_list.rs b/crates/jacquard-api/src/app_bsky/graph/unmute_actor_list.rs
index 90977bc7..e5d82335 100644
--- a/crates/jacquard-api/src/app_bsky/graph/unmute_actor_list.rs
+++ b/crates/jacquard-api/src/app_bsky/graph/unmute_actor_list.rs
@@ -39,12 +39,12 @@ impl jacquard_common::IntoStatic for UnmuteActorList<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for UnmuteActorList<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for UnmuteActorList<'de> {
     const NSID: &'static str = "app.bsky.graph.unmuteActorList";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Procedure(
         "application/json",
     );
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = ();
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = ();
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/graph/unmute_thread.rs b/crates/jacquard-api/src/app_bsky/graph/unmute_thread.rs
index ce3266ba..14afee97 100644
--- a/crates/jacquard-api/src/app_bsky/graph/unmute_thread.rs
+++ b/crates/jacquard-api/src/app_bsky/graph/unmute_thread.rs
@@ -39,12 +39,12 @@ impl jacquard_common::IntoStatic for UnmuteThread<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for UnmuteThread<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for UnmuteThread<'de> {
     const NSID: &'static str = "app.bsky.graph.unmuteThread";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Procedure(
         "application/json",
     );
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = ();
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = ();
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/labeler/get_services.rs b/crates/jacquard-api/src/app_bsky/labeler/get_services.rs
index 1da32456..333a967e 100644
--- a/crates/jacquard-api/src/app_bsky/labeler/get_services.rs
+++ b/crates/jacquard-api/src/app_bsky/labeler/get_services.rs
@@ -52,10 +52,10 @@ impl jacquard_common::IntoStatic for GetServicesOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for GetServices<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for GetServices<'de> {
     const NSID: &'static str = "app.bsky.labeler.getServices";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = GetServicesOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = GetServicesOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/notification/get_preferences.rs b/crates/jacquard-api/src/app_bsky/notification/get_preferences.rs
index 50846f3c..f15a2377 100644
--- a/crates/jacquard-api/src/app_bsky/notification/get_preferences.rs
+++ b/crates/jacquard-api/src/app_bsky/notification/get_preferences.rs
@@ -42,10 +42,10 @@ impl jacquard_common::IntoStatic for GetPreferencesOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for GetPreferences {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for GetPreferences {
     const NSID: &'static str = "app.bsky.notification.getPreferences";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = GetPreferencesOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = GetPreferencesOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/notification/get_unread_count.rs b/crates/jacquard-api/src/app_bsky/notification/get_unread_count.rs
index b9f905d0..4055962c 100644
--- a/crates/jacquard-api/src/app_bsky/notification/get_unread_count.rs
+++ b/crates/jacquard-api/src/app_bsky/notification/get_unread_count.rs
@@ -47,10 +47,10 @@ impl jacquard_common::IntoStatic for GetUnreadCountOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for GetUnreadCount {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for GetUnreadCount {
     const NSID: &'static str = "app.bsky.notification.getUnreadCount";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = GetUnreadCountOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = GetUnreadCountOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/notification/list_activity_subscriptions.rs b/crates/jacquard-api/src/app_bsky/notification/list_activity_subscriptions.rs
index 0e0a4c9c..e2cd8675 100644
--- a/crates/jacquard-api/src/app_bsky/notification/list_activity_subscriptions.rs
+++ b/crates/jacquard-api/src/app_bsky/notification/list_activity_subscriptions.rs
@@ -58,10 +58,11 @@ impl jacquard_common::IntoStatic for ListActivitySubscriptionsOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for ListActivitySubscriptions<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de>
+for ListActivitySubscriptions<'de> {
     const NSID: &'static str = "app.bsky.notification.listActivitySubscriptions";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = ListActivitySubscriptionsOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = ListActivitySubscriptionsOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/notification/list_notifications.rs b/crates/jacquard-api/src/app_bsky/notification/list_notifications.rs
index 4571f595..263e5681 100644
--- a/crates/jacquard-api/src/app_bsky/notification/list_notifications.rs
+++ b/crates/jacquard-api/src/app_bsky/notification/list_notifications.rs
@@ -74,12 +74,12 @@ impl jacquard_common::IntoStatic for ListNotificationsOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for ListNotifications<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for ListNotifications<'de> {
     const NSID: &'static str = "app.bsky.notification.listNotifications";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = ListNotificationsOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = ListNotificationsOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
 
 #[jacquard_derive::lexicon]
diff --git a/crates/jacquard-api/src/app_bsky/notification/put_activity_subscription.rs b/crates/jacquard-api/src/app_bsky/notification/put_activity_subscription.rs
index ba57eff1..a4ec1738 100644
--- a/crates/jacquard-api/src/app_bsky/notification/put_activity_subscription.rs
+++ b/crates/jacquard-api/src/app_bsky/notification/put_activity_subscription.rs
@@ -66,12 +66,13 @@ impl jacquard_common::IntoStatic for PutActivitySubscriptionOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for PutActivitySubscription<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de>
+for PutActivitySubscription<'de> {
     const NSID: &'static str = "app.bsky.notification.putActivitySubscription";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Procedure(
         "application/json",
     );
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = PutActivitySubscriptionOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = PutActivitySubscriptionOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/notification/put_preferences.rs b/crates/jacquard-api/src/app_bsky/notification/put_preferences.rs
index 809c7dc2..a1017e87 100644
--- a/crates/jacquard-api/src/app_bsky/notification/put_preferences.rs
+++ b/crates/jacquard-api/src/app_bsky/notification/put_preferences.rs
@@ -38,12 +38,12 @@ impl jacquard_common::IntoStatic for PutPreferences<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for PutPreferences<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for PutPreferences<'de> {
     const NSID: &'static str = "app.bsky.notification.putPreferences";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Procedure(
         "application/json",
     );
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = ();
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = ();
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/notification/put_preferences_v2.rs b/crates/jacquard-api/src/app_bsky/notification/put_preferences_v2.rs
index 69da75c8..7a4c5864 100644
--- a/crates/jacquard-api/src/app_bsky/notification/put_preferences_v2.rs
+++ b/crates/jacquard-api/src/app_bsky/notification/put_preferences_v2.rs
@@ -126,12 +126,12 @@ impl jacquard_common::IntoStatic for PutPreferencesV2Output<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for PutPreferencesV2<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for PutPreferencesV2<'de> {
     const NSID: &'static str = "app.bsky.notification.putPreferencesV2";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Procedure(
         "application/json",
     );
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = PutPreferencesV2Output<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = PutPreferencesV2Output<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/notification/register_push.rs b/crates/jacquard-api/src/app_bsky/notification/register_push.rs
index 6414a21f..8a588b20 100644
--- a/crates/jacquard-api/src/app_bsky/notification/register_push.rs
+++ b/crates/jacquard-api/src/app_bsky/notification/register_push.rs
@@ -55,12 +55,12 @@ impl jacquard_common::IntoStatic for RegisterPush<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for RegisterPush<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for RegisterPush<'de> {
     const NSID: &'static str = "app.bsky.notification.registerPush";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Procedure(
         "application/json",
     );
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = ();
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = ();
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/notification/unregister_push.rs b/crates/jacquard-api/src/app_bsky/notification/unregister_push.rs
index 8c2b0c0f..605c3469 100644
--- a/crates/jacquard-api/src/app_bsky/notification/unregister_push.rs
+++ b/crates/jacquard-api/src/app_bsky/notification/unregister_push.rs
@@ -51,12 +51,12 @@ impl jacquard_common::IntoStatic for UnregisterPush<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for UnregisterPush<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for UnregisterPush<'de> {
     const NSID: &'static str = "app.bsky.notification.unregisterPush";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Procedure(
         "application/json",
     );
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = ();
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = ();
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/notification/update_seen.rs b/crates/jacquard-api/src/app_bsky/notification/update_seen.rs
index 062f81b4..5147556d 100644
--- a/crates/jacquard-api/src/app_bsky/notification/update_seen.rs
+++ b/crates/jacquard-api/src/app_bsky/notification/update_seen.rs
@@ -38,12 +38,12 @@ impl jacquard_common::IntoStatic for UpdateSeen<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for UpdateSeen<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for UpdateSeen<'de> {
     const NSID: &'static str = "app.bsky.notification.updateSeen";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Procedure(
         "application/json",
     );
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = ();
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = ();
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/unspecced/get_age_assurance_state.rs b/crates/jacquard-api/src/app_bsky/unspecced/get_age_assurance_state.rs
index b49bc377..40ee8a26 100644
--- a/crates/jacquard-api/src/app_bsky/unspecced/get_age_assurance_state.rs
+++ b/crates/jacquard-api/src/app_bsky/unspecced/get_age_assurance_state.rs
@@ -25,12 +25,12 @@ impl jacquard_common::IntoStatic for GetAgeAssuranceStateOutput<'_> {
 }
 
 /// XRPC request marker type
-#[derive(Debug, Clone, Copy, PartialEq, Eq, serde::Serialize)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
 pub struct GetAgeAssuranceState;
-impl jacquard_common::types::xrpc::XrpcRequest for GetAgeAssuranceState {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for GetAgeAssuranceState {
     const NSID: &'static str = "app.bsky.unspecced.getAgeAssuranceState";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = GetAgeAssuranceStateOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = GetAgeAssuranceStateOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/unspecced/get_config.rs b/crates/jacquard-api/src/app_bsky/unspecced/get_config.rs
index 7cb97019..8fbd2c8d 100644
--- a/crates/jacquard-api/src/app_bsky/unspecced/get_config.rs
+++ b/crates/jacquard-api/src/app_bsky/unspecced/get_config.rs
@@ -49,12 +49,12 @@ impl jacquard_common::IntoStatic for GetConfigOutput<'_> {
 }
 
 /// XRPC request marker type
-#[derive(Debug, Clone, Copy, PartialEq, Eq, serde::Serialize)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
 pub struct GetConfig;
-impl jacquard_common::types::xrpc::XrpcRequest for GetConfig {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for GetConfig {
     const NSID: &'static str = "app.bsky.unspecced.getConfig";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = GetConfigOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = GetConfigOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/unspecced/get_onboarding_suggested_starter_packs.rs b/crates/jacquard-api/src/app_bsky/unspecced/get_onboarding_suggested_starter_packs.rs
index 17d339d1..3d0fb959 100644
--- a/crates/jacquard-api/src/app_bsky/unspecced/get_onboarding_suggested_starter_packs.rs
+++ b/crates/jacquard-api/src/app_bsky/unspecced/get_onboarding_suggested_starter_packs.rs
@@ -47,10 +47,11 @@ impl jacquard_common::IntoStatic for GetOnboardingSuggestedStarterPacksOutput<'_
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for GetOnboardingSuggestedStarterPacks {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de>
+for GetOnboardingSuggestedStarterPacks {
     const NSID: &'static str = "app.bsky.unspecced.getOnboardingSuggestedStarterPacks";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = GetOnboardingSuggestedStarterPacksOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = GetOnboardingSuggestedStarterPacksOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/unspecced/get_onboarding_suggested_starter_packs_skeleton.rs b/crates/jacquard-api/src/app_bsky/unspecced/get_onboarding_suggested_starter_packs_skeleton.rs
index 749718ea..9bfaca43 100644
--- a/crates/jacquard-api/src/app_bsky/unspecced/get_onboarding_suggested_starter_packs_skeleton.rs
+++ b/crates/jacquard-api/src/app_bsky/unspecced/get_onboarding_suggested_starter_packs_skeleton.rs
@@ -54,11 +54,11 @@ for GetOnboardingSuggestedStarterPacksSkeletonOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest
-for GetOnboardingSuggestedStarterPacksSkeleton<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de>
+for GetOnboardingSuggestedStarterPacksSkeleton<'de> {
     const NSID: &'static str = "app.bsky.unspecced.getOnboardingSuggestedStarterPacksSkeleton";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = GetOnboardingSuggestedStarterPacksSkeletonOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = GetOnboardingSuggestedStarterPacksSkeletonOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/unspecced/get_popular_feed_generators.rs b/crates/jacquard-api/src/app_bsky/unspecced/get_popular_feed_generators.rs
index 70fd7776..646d8f8c 100644
--- a/crates/jacquard-api/src/app_bsky/unspecced/get_popular_feed_generators.rs
+++ b/crates/jacquard-api/src/app_bsky/unspecced/get_popular_feed_generators.rs
@@ -63,10 +63,11 @@ impl jacquard_common::IntoStatic for GetPopularFeedGeneratorsOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for GetPopularFeedGenerators<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de>
+for GetPopularFeedGenerators<'de> {
     const NSID: &'static str = "app.bsky.unspecced.getPopularFeedGenerators";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = GetPopularFeedGeneratorsOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = GetPopularFeedGeneratorsOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/unspecced/get_post_thread_other_v2.rs b/crates/jacquard-api/src/app_bsky/unspecced/get_post_thread_other_v2.rs
index f48f8c26..c7e170fe 100644
--- a/crates/jacquard-api/src/app_bsky/unspecced/get_post_thread_other_v2.rs
+++ b/crates/jacquard-api/src/app_bsky/unspecced/get_post_thread_other_v2.rs
@@ -53,12 +53,12 @@ impl jacquard_common::IntoStatic for GetPostThreadOtherV2Output<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for GetPostThreadOtherV2<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for GetPostThreadOtherV2<'de> {
     const NSID: &'static str = "app.bsky.unspecced.getPostThreadOtherV2";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = GetPostThreadOtherV2Output<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = GetPostThreadOtherV2Output<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
 
 #[jacquard_derive::lexicon]
diff --git a/crates/jacquard-api/src/app_bsky/unspecced/get_post_thread_v2.rs b/crates/jacquard-api/src/app_bsky/unspecced/get_post_thread_v2.rs
index bbbcc65b..d8309ed3 100644
--- a/crates/jacquard-api/src/app_bsky/unspecced/get_post_thread_v2.rs
+++ b/crates/jacquard-api/src/app_bsky/unspecced/get_post_thread_v2.rs
@@ -78,12 +78,12 @@ impl jacquard_common::IntoStatic for GetPostThreadV2Output<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for GetPostThreadV2<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for GetPostThreadV2<'de> {
     const NSID: &'static str = "app.bsky.unspecced.getPostThreadV2";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = GetPostThreadV2Output<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = GetPostThreadV2Output<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
 
 #[jacquard_derive::lexicon]
diff --git a/crates/jacquard-api/src/app_bsky/unspecced/get_suggested_feeds.rs b/crates/jacquard-api/src/app_bsky/unspecced/get_suggested_feeds.rs
index eaa6d5b1..ee8ca2e2 100644
--- a/crates/jacquard-api/src/app_bsky/unspecced/get_suggested_feeds.rs
+++ b/crates/jacquard-api/src/app_bsky/unspecced/get_suggested_feeds.rs
@@ -47,10 +47,10 @@ impl jacquard_common::IntoStatic for GetSuggestedFeedsOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for GetSuggestedFeeds {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for GetSuggestedFeeds {
     const NSID: &'static str = "app.bsky.unspecced.getSuggestedFeeds";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = GetSuggestedFeedsOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = GetSuggestedFeedsOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/unspecced/get_suggested_feeds_skeleton.rs b/crates/jacquard-api/src/app_bsky/unspecced/get_suggested_feeds_skeleton.rs
index af1b4e4f..f44fb12d 100644
--- a/crates/jacquard-api/src/app_bsky/unspecced/get_suggested_feeds_skeleton.rs
+++ b/crates/jacquard-api/src/app_bsky/unspecced/get_suggested_feeds_skeleton.rs
@@ -53,10 +53,11 @@ impl jacquard_common::IntoStatic for GetSuggestedFeedsSkeletonOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for GetSuggestedFeedsSkeleton<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de>
+for GetSuggestedFeedsSkeleton<'de> {
     const NSID: &'static str = "app.bsky.unspecced.getSuggestedFeedsSkeleton";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = GetSuggestedFeedsSkeletonOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = GetSuggestedFeedsSkeletonOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/unspecced/get_suggested_starter_packs.rs b/crates/jacquard-api/src/app_bsky/unspecced/get_suggested_starter_packs.rs
index 36d44632..c789b5a8 100644
--- a/crates/jacquard-api/src/app_bsky/unspecced/get_suggested_starter_packs.rs
+++ b/crates/jacquard-api/src/app_bsky/unspecced/get_suggested_starter_packs.rs
@@ -47,10 +47,10 @@ impl jacquard_common::IntoStatic for GetSuggestedStarterPacksOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for GetSuggestedStarterPacks {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for GetSuggestedStarterPacks {
     const NSID: &'static str = "app.bsky.unspecced.getSuggestedStarterPacks";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = GetSuggestedStarterPacksOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = GetSuggestedStarterPacksOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/unspecced/get_suggested_starter_packs_skeleton.rs b/crates/jacquard-api/src/app_bsky/unspecced/get_suggested_starter_packs_skeleton.rs
index 8b792889..26331efa 100644
--- a/crates/jacquard-api/src/app_bsky/unspecced/get_suggested_starter_packs_skeleton.rs
+++ b/crates/jacquard-api/src/app_bsky/unspecced/get_suggested_starter_packs_skeleton.rs
@@ -53,10 +53,11 @@ impl jacquard_common::IntoStatic for GetSuggestedStarterPacksSkeletonOutput<'_>
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for GetSuggestedStarterPacksSkeleton<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de>
+for GetSuggestedStarterPacksSkeleton<'de> {
     const NSID: &'static str = "app.bsky.unspecced.getSuggestedStarterPacksSkeleton";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = GetSuggestedStarterPacksSkeletonOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = GetSuggestedStarterPacksSkeletonOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/unspecced/get_suggested_users.rs b/crates/jacquard-api/src/app_bsky/unspecced/get_suggested_users.rs
index 71b4261b..06a045c4 100644
--- a/crates/jacquard-api/src/app_bsky/unspecced/get_suggested_users.rs
+++ b/crates/jacquard-api/src/app_bsky/unspecced/get_suggested_users.rs
@@ -54,10 +54,10 @@ impl jacquard_common::IntoStatic for GetSuggestedUsersOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for GetSuggestedUsers<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for GetSuggestedUsers<'de> {
     const NSID: &'static str = "app.bsky.unspecced.getSuggestedUsers";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = GetSuggestedUsersOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = GetSuggestedUsersOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/unspecced/get_suggested_users_skeleton.rs b/crates/jacquard-api/src/app_bsky/unspecced/get_suggested_users_skeleton.rs
index b7937ae1..0c471245 100644
--- a/crates/jacquard-api/src/app_bsky/unspecced/get_suggested_users_skeleton.rs
+++ b/crates/jacquard-api/src/app_bsky/unspecced/get_suggested_users_skeleton.rs
@@ -58,10 +58,11 @@ impl jacquard_common::IntoStatic for GetSuggestedUsersSkeletonOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for GetSuggestedUsersSkeleton<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de>
+for GetSuggestedUsersSkeleton<'de> {
     const NSID: &'static str = "app.bsky.unspecced.getSuggestedUsersSkeleton";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = GetSuggestedUsersSkeletonOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = GetSuggestedUsersSkeletonOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/unspecced/get_suggestions_skeleton.rs b/crates/jacquard-api/src/app_bsky/unspecced/get_suggestions_skeleton.rs
index 02e0f8ab..90913aef 100644
--- a/crates/jacquard-api/src/app_bsky/unspecced/get_suggestions_skeleton.rs
+++ b/crates/jacquard-api/src/app_bsky/unspecced/get_suggestions_skeleton.rs
@@ -75,10 +75,11 @@ impl jacquard_common::IntoStatic for GetSuggestionsSkeletonOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for GetSuggestionsSkeleton<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de>
+for GetSuggestionsSkeleton<'de> {
     const NSID: &'static str = "app.bsky.unspecced.getSuggestionsSkeleton";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = GetSuggestionsSkeletonOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = GetSuggestionsSkeletonOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/unspecced/get_tagged_suggestions.rs b/crates/jacquard-api/src/app_bsky/unspecced/get_tagged_suggestions.rs
index 990d4d4a..360ace5a 100644
--- a/crates/jacquard-api/src/app_bsky/unspecced/get_tagged_suggestions.rs
+++ b/crates/jacquard-api/src/app_bsky/unspecced/get_tagged_suggestions.rs
@@ -42,12 +42,12 @@ impl jacquard_common::IntoStatic for GetTaggedSuggestionsOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for GetTaggedSuggestions {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for GetTaggedSuggestions {
     const NSID: &'static str = "app.bsky.unspecced.getTaggedSuggestions";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = GetTaggedSuggestionsOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = GetTaggedSuggestionsOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
 
 #[jacquard_derive::lexicon]
diff --git a/crates/jacquard-api/src/app_bsky/unspecced/get_trending_topics.rs b/crates/jacquard-api/src/app_bsky/unspecced/get_trending_topics.rs
index 29d5e2c4..1d1430ca 100644
--- a/crates/jacquard-api/src/app_bsky/unspecced/get_trending_topics.rs
+++ b/crates/jacquard-api/src/app_bsky/unspecced/get_trending_topics.rs
@@ -56,10 +56,10 @@ impl jacquard_common::IntoStatic for GetTrendingTopicsOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for GetTrendingTopics<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for GetTrendingTopics<'de> {
     const NSID: &'static str = "app.bsky.unspecced.getTrendingTopics";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = GetTrendingTopicsOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = GetTrendingTopicsOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/unspecced/get_trends.rs b/crates/jacquard-api/src/app_bsky/unspecced/get_trends.rs
index 58440a84..bc1e2200 100644
--- a/crates/jacquard-api/src/app_bsky/unspecced/get_trends.rs
+++ b/crates/jacquard-api/src/app_bsky/unspecced/get_trends.rs
@@ -47,10 +47,10 @@ impl jacquard_common::IntoStatic for GetTrendsOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for GetTrends {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for GetTrends {
     const NSID: &'static str = "app.bsky.unspecced.getTrends";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = GetTrendsOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = GetTrendsOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/unspecced/get_trends_skeleton.rs b/crates/jacquard-api/src/app_bsky/unspecced/get_trends_skeleton.rs
index 0dfb42c0..0e8fd7d3 100644
--- a/crates/jacquard-api/src/app_bsky/unspecced/get_trends_skeleton.rs
+++ b/crates/jacquard-api/src/app_bsky/unspecced/get_trends_skeleton.rs
@@ -53,10 +53,10 @@ impl jacquard_common::IntoStatic for GetTrendsSkeletonOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for GetTrendsSkeleton<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for GetTrendsSkeleton<'de> {
     const NSID: &'static str = "app.bsky.unspecced.getTrendsSkeleton";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = GetTrendsSkeletonOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = GetTrendsSkeletonOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/unspecced/init_age_assurance.rs b/crates/jacquard-api/src/app_bsky/unspecced/init_age_assurance.rs
index d4ee439f..e6a0c615 100644
--- a/crates/jacquard-api/src/app_bsky/unspecced/init_age_assurance.rs
+++ b/crates/jacquard-api/src/app_bsky/unspecced/init_age_assurance.rs
@@ -141,12 +141,12 @@ impl jacquard_common::IntoStatic for InitAgeAssuranceError<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for InitAgeAssurance<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for InitAgeAssurance<'de> {
     const NSID: &'static str = "app.bsky.unspecced.initAgeAssurance";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Procedure(
         "application/json",
     );
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = InitAgeAssuranceOutput<'de>;
-    type Err<'de> = InitAgeAssuranceError<'de>;
+    type Output = InitAgeAssuranceOutput<'de>;
+    type Err = InitAgeAssuranceError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/unspecced/search_actors_skeleton.rs b/crates/jacquard-api/src/app_bsky/unspecced/search_actors_skeleton.rs
index 33a8c4da..1864f8a7 100644
--- a/crates/jacquard-api/src/app_bsky/unspecced/search_actors_skeleton.rs
+++ b/crates/jacquard-api/src/app_bsky/unspecced/search_actors_skeleton.rs
@@ -120,10 +120,10 @@ impl jacquard_common::IntoStatic for SearchActorsSkeletonError<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for SearchActorsSkeleton<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for SearchActorsSkeleton<'de> {
     const NSID: &'static str = "app.bsky.unspecced.searchActorsSkeleton";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = SearchActorsSkeletonOutput<'de>;
-    type Err<'de> = SearchActorsSkeletonError<'de>;
+    type Output = SearchActorsSkeletonOutput<'de>;
+    type Err = SearchActorsSkeletonError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/unspecced/search_posts_skeleton.rs b/crates/jacquard-api/src/app_bsky/unspecced/search_posts_skeleton.rs
index 152c034d..b2773e6f 100644
--- a/crates/jacquard-api/src/app_bsky/unspecced/search_posts_skeleton.rs
+++ b/crates/jacquard-api/src/app_bsky/unspecced/search_posts_skeleton.rs
@@ -157,10 +157,10 @@ impl jacquard_common::IntoStatic for SearchPostsSkeletonError<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for SearchPostsSkeleton<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for SearchPostsSkeleton<'de> {
     const NSID: &'static str = "app.bsky.unspecced.searchPostsSkeleton";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = SearchPostsSkeletonOutput<'de>;
-    type Err<'de> = SearchPostsSkeletonError<'de>;
+    type Output = SearchPostsSkeletonOutput<'de>;
+    type Err = SearchPostsSkeletonError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/unspecced/search_starter_packs_skeleton.rs b/crates/jacquard-api/src/app_bsky/unspecced/search_starter_packs_skeleton.rs
index 4977bb7c..8d1c968f 100644
--- a/crates/jacquard-api/src/app_bsky/unspecced/search_starter_packs_skeleton.rs
+++ b/crates/jacquard-api/src/app_bsky/unspecced/search_starter_packs_skeleton.rs
@@ -117,10 +117,11 @@ impl jacquard_common::IntoStatic for SearchStarterPacksSkeletonError<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for SearchStarterPacksSkeleton<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de>
+for SearchStarterPacksSkeleton<'de> {
     const NSID: &'static str = "app.bsky.unspecced.searchStarterPacksSkeleton";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = SearchStarterPacksSkeletonOutput<'de>;
-    type Err<'de> = SearchStarterPacksSkeletonError<'de>;
+    type Output = SearchStarterPacksSkeletonOutput<'de>;
+    type Err = SearchStarterPacksSkeletonError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/video/get_job_status.rs b/crates/jacquard-api/src/app_bsky/video/get_job_status.rs
index 58dbd87b..a50140b9 100644
--- a/crates/jacquard-api/src/app_bsky/video/get_job_status.rs
+++ b/crates/jacquard-api/src/app_bsky/video/get_job_status.rs
@@ -49,10 +49,10 @@ impl jacquard_common::IntoStatic for GetJobStatusOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for GetJobStatus<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for GetJobStatus<'de> {
     const NSID: &'static str = "app.bsky.video.getJobStatus";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = GetJobStatusOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = GetJobStatusOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/video/get_upload_limits.rs b/crates/jacquard-api/src/app_bsky/video/get_upload_limits.rs
index d763b9b9..2dfda8c5 100644
--- a/crates/jacquard-api/src/app_bsky/video/get_upload_limits.rs
+++ b/crates/jacquard-api/src/app_bsky/video/get_upload_limits.rs
@@ -37,12 +37,12 @@ impl jacquard_common::IntoStatic for GetUploadLimitsOutput<'_> {
 }
 
 /// XRPC request marker type
-#[derive(Debug, Clone, Copy, PartialEq, Eq, serde::Serialize)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
 pub struct GetUploadLimits;
-impl jacquard_common::types::xrpc::XrpcRequest for GetUploadLimits {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for GetUploadLimits {
     const NSID: &'static str = "app.bsky.video.getUploadLimits";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = GetUploadLimitsOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = GetUploadLimitsOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/app_bsky/video/upload_video.rs b/crates/jacquard-api/src/app_bsky/video/upload_video.rs
index c8861c21..b564908f 100644
--- a/crates/jacquard-api/src/app_bsky/video/upload_video.rs
+++ b/crates/jacquard-api/src/app_bsky/video/upload_video.rs
@@ -45,15 +45,25 @@ impl jacquard_common::IntoStatic for UploadVideoOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for UploadVideo {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for UploadVideo {
     const NSID: &'static str = "app.bsky.video.uploadVideo";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Procedure(
         "video/mp4",
     );
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = UploadVideoOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = UploadVideoOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
     fn encode_body(&self) -> Result<Vec<u8>, jacquard_common::types::xrpc::EncodeError> {
         Ok(self.body.to_vec())
     }
+    fn decode_body(
+        &self,
+        body: &'de [u8],
+    ) -> Result<Box<Self>, jacquard_common::error::DecodeError> {
+        Ok(
+            Box::new(Self {
+                body: bytes::Bytes::copy_from_slice(body),
+            }),
+        )
+    }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/chat_bsky/actor/delete_account.rs b/crates/jacquard-api/src/chat_bsky/actor/delete_account.rs
index 41dd6928..526cbfd7 100644
--- a/crates/jacquard-api/src/chat_bsky/actor/delete_account.rs
+++ b/crates/jacquard-api/src/chat_bsky/actor/delete_account.rs
@@ -19,14 +19,14 @@ impl jacquard_common::IntoStatic for DeleteAccountOutput<'_> {
 }
 
 /// XRPC request marker type
-#[derive(Debug, Clone, Copy, PartialEq, Eq, serde::Serialize)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
 pub struct DeleteAccount;
-impl jacquard_common::types::xrpc::XrpcRequest for DeleteAccount {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for DeleteAccount {
     const NSID: &'static str = "chat.bsky.actor.deleteAccount";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Procedure(
         "application/json",
     );
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = DeleteAccountOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = DeleteAccountOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/chat_bsky/actor/export_account_data.rs b/crates/jacquard-api/src/chat_bsky/actor/export_account_data.rs
index d05754c5..30ab301b 100644
--- a/crates/jacquard-api/src/chat_bsky/actor/export_account_data.rs
+++ b/crates/jacquard-api/src/chat_bsky/actor/export_account_data.rs
@@ -19,12 +19,12 @@ impl jacquard_common::IntoStatic for ExportAccountDataOutput<'_> {
 }
 
 /// XRPC request marker type
-#[derive(Debug, Clone, Copy, PartialEq, Eq, serde::Serialize)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
 pub struct ExportAccountData;
-impl jacquard_common::types::xrpc::XrpcRequest for ExportAccountData {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for ExportAccountData {
     const NSID: &'static str = "chat.bsky.actor.exportAccountData";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/jsonl";
-    type Output<'de> = ExportAccountDataOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = ExportAccountDataOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/chat_bsky/convo/accept_convo.rs b/crates/jacquard-api/src/chat_bsky/convo/accept_convo.rs
index fdad51e5..eff96fb5 100644
--- a/crates/jacquard-api/src/chat_bsky/convo/accept_convo.rs
+++ b/crates/jacquard-api/src/chat_bsky/convo/accept_convo.rs
@@ -60,12 +60,12 @@ impl jacquard_common::IntoStatic for AcceptConvoOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for AcceptConvo<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for AcceptConvo<'de> {
     const NSID: &'static str = "chat.bsky.convo.acceptConvo";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Procedure(
         "application/json",
     );
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = AcceptConvoOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = AcceptConvoOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/chat_bsky/convo/add_reaction.rs b/crates/jacquard-api/src/chat_bsky/convo/add_reaction.rs
index 71d9743c..154f0d84 100644
--- a/crates/jacquard-api/src/chat_bsky/convo/add_reaction.rs
+++ b/crates/jacquard-api/src/chat_bsky/convo/add_reaction.rs
@@ -138,12 +138,12 @@ impl jacquard_common::IntoStatic for AddReactionError<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for AddReaction<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for AddReaction<'de> {
     const NSID: &'static str = "chat.bsky.convo.addReaction";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Procedure(
         "application/json",
     );
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = AddReactionOutput<'de>;
-    type Err<'de> = AddReactionError<'de>;
+    type Output = AddReactionOutput<'de>;
+    type Err = AddReactionError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/chat_bsky/convo/delete_message_for_self.rs b/crates/jacquard-api/src/chat_bsky/convo/delete_message_for_self.rs
index 6d20f9e4..06f58e86 100644
--- a/crates/jacquard-api/src/chat_bsky/convo/delete_message_for_self.rs
+++ b/crates/jacquard-api/src/chat_bsky/convo/delete_message_for_self.rs
@@ -63,12 +63,12 @@ impl jacquard_common::IntoStatic for DeleteMessageForSelfOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for DeleteMessageForSelf<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for DeleteMessageForSelf<'de> {
     const NSID: &'static str = "chat.bsky.convo.deleteMessageForSelf";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Procedure(
         "application/json",
     );
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = DeleteMessageForSelfOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = DeleteMessageForSelfOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/chat_bsky/convo/get_convo.rs b/crates/jacquard-api/src/chat_bsky/convo/get_convo.rs
index 3b775652..7cca14be 100644
--- a/crates/jacquard-api/src/chat_bsky/convo/get_convo.rs
+++ b/crates/jacquard-api/src/chat_bsky/convo/get_convo.rs
@@ -49,10 +49,10 @@ impl jacquard_common::IntoStatic for GetConvoOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for GetConvo<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for GetConvo<'de> {
     const NSID: &'static str = "chat.bsky.convo.getConvo";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = GetConvoOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = GetConvoOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/chat_bsky/convo/get_convo_availability.rs b/crates/jacquard-api/src/chat_bsky/convo/get_convo_availability.rs
index 414a5dff..c9dc1107 100644
--- a/crates/jacquard-api/src/chat_bsky/convo/get_convo_availability.rs
+++ b/crates/jacquard-api/src/chat_bsky/convo/get_convo_availability.rs
@@ -51,10 +51,10 @@ impl jacquard_common::IntoStatic for GetConvoAvailabilityOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for GetConvoAvailability<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for GetConvoAvailability<'de> {
     const NSID: &'static str = "chat.bsky.convo.getConvoAvailability";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = GetConvoAvailabilityOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = GetConvoAvailabilityOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/chat_bsky/convo/get_convo_for_members.rs b/crates/jacquard-api/src/chat_bsky/convo/get_convo_for_members.rs
index eb89664a..788e3fbf 100644
--- a/crates/jacquard-api/src/chat_bsky/convo/get_convo_for_members.rs
+++ b/crates/jacquard-api/src/chat_bsky/convo/get_convo_for_members.rs
@@ -48,10 +48,10 @@ impl jacquard_common::IntoStatic for GetConvoForMembersOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for GetConvoForMembers<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for GetConvoForMembers<'de> {
     const NSID: &'static str = "chat.bsky.convo.getConvoForMembers";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = GetConvoForMembersOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = GetConvoForMembersOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/chat_bsky/convo/get_log.rs b/crates/jacquard-api/src/chat_bsky/convo/get_log.rs
index a1680c6f..e25b5f41 100644
--- a/crates/jacquard-api/src/chat_bsky/convo/get_log.rs
+++ b/crates/jacquard-api/src/chat_bsky/convo/get_log.rs
@@ -54,10 +54,10 @@ impl jacquard_common::IntoStatic for GetLogOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for GetLog<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for GetLog<'de> {
     const NSID: &'static str = "chat.bsky.convo.getLog";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = GetLogOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = GetLogOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/chat_bsky/convo/get_messages.rs b/crates/jacquard-api/src/chat_bsky/convo/get_messages.rs
index 95fd5361..7b8aa844 100644
--- a/crates/jacquard-api/src/chat_bsky/convo/get_messages.rs
+++ b/crates/jacquard-api/src/chat_bsky/convo/get_messages.rs
@@ -62,10 +62,10 @@ impl jacquard_common::IntoStatic for GetMessagesOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for GetMessages<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for GetMessages<'de> {
     const NSID: &'static str = "chat.bsky.convo.getMessages";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = GetMessagesOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = GetMessagesOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/chat_bsky/convo/leave_convo.rs b/crates/jacquard-api/src/chat_bsky/convo/leave_convo.rs
index d4b6d848..af7f5568 100644
--- a/crates/jacquard-api/src/chat_bsky/convo/leave_convo.rs
+++ b/crates/jacquard-api/src/chat_bsky/convo/leave_convo.rs
@@ -61,12 +61,12 @@ impl jacquard_common::IntoStatic for LeaveConvoOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for LeaveConvo<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for LeaveConvo<'de> {
     const NSID: &'static str = "chat.bsky.convo.leaveConvo";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Procedure(
         "application/json",
     );
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = LeaveConvoOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = LeaveConvoOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/chat_bsky/convo/list_convos.rs b/crates/jacquard-api/src/chat_bsky/convo/list_convos.rs
index bbe92fee..20e86aea 100644
--- a/crates/jacquard-api/src/chat_bsky/convo/list_convos.rs
+++ b/crates/jacquard-api/src/chat_bsky/convo/list_convos.rs
@@ -68,10 +68,10 @@ impl jacquard_common::IntoStatic for ListConvosOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for ListConvos<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for ListConvos<'de> {
     const NSID: &'static str = "chat.bsky.convo.listConvos";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = ListConvosOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = ListConvosOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/chat_bsky/convo/mute_convo.rs b/crates/jacquard-api/src/chat_bsky/convo/mute_convo.rs
index 0133242d..7a8388ed 100644
--- a/crates/jacquard-api/src/chat_bsky/convo/mute_convo.rs
+++ b/crates/jacquard-api/src/chat_bsky/convo/mute_convo.rs
@@ -58,12 +58,12 @@ impl jacquard_common::IntoStatic for MuteConvoOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for MuteConvo<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for MuteConvo<'de> {
     const NSID: &'static str = "chat.bsky.convo.muteConvo";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Procedure(
         "application/json",
     );
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = MuteConvoOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = MuteConvoOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/chat_bsky/convo/remove_reaction.rs b/crates/jacquard-api/src/chat_bsky/convo/remove_reaction.rs
index cf94ee90..eba3c00f 100644
--- a/crates/jacquard-api/src/chat_bsky/convo/remove_reaction.rs
+++ b/crates/jacquard-api/src/chat_bsky/convo/remove_reaction.rs
@@ -127,12 +127,12 @@ impl jacquard_common::IntoStatic for RemoveReactionError<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for RemoveReaction<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for RemoveReaction<'de> {
     const NSID: &'static str = "chat.bsky.convo.removeReaction";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Procedure(
         "application/json",
     );
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = RemoveReactionOutput<'de>;
-    type Err<'de> = RemoveReactionError<'de>;
+    type Output = RemoveReactionOutput<'de>;
+    type Err = RemoveReactionError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/chat_bsky/convo/send_message.rs b/crates/jacquard-api/src/chat_bsky/convo/send_message.rs
index 2e5786c1..0273e425 100644
--- a/crates/jacquard-api/src/chat_bsky/convo/send_message.rs
+++ b/crates/jacquard-api/src/chat_bsky/convo/send_message.rs
@@ -62,12 +62,12 @@ impl jacquard_common::IntoStatic for SendMessageOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for SendMessage<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for SendMessage<'de> {
     const NSID: &'static str = "chat.bsky.convo.sendMessage";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Procedure(
         "application/json",
     );
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = SendMessageOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = SendMessageOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/chat_bsky/convo/send_message_batch.rs b/crates/jacquard-api/src/chat_bsky/convo/send_message_batch.rs
index 0c05f913..3968ee2e 100644
--- a/crates/jacquard-api/src/chat_bsky/convo/send_message_batch.rs
+++ b/crates/jacquard-api/src/chat_bsky/convo/send_message_batch.rs
@@ -78,12 +78,12 @@ impl jacquard_common::IntoStatic for SendMessageBatchOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for SendMessageBatch<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for SendMessageBatch<'de> {
     const NSID: &'static str = "chat.bsky.convo.sendMessageBatch";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Procedure(
         "application/json",
     );
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = SendMessageBatchOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = SendMessageBatchOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/chat_bsky/convo/unmute_convo.rs b/crates/jacquard-api/src/chat_bsky/convo/unmute_convo.rs
index 1b6e8212..641c86f5 100644
--- a/crates/jacquard-api/src/chat_bsky/convo/unmute_convo.rs
+++ b/crates/jacquard-api/src/chat_bsky/convo/unmute_convo.rs
@@ -58,12 +58,12 @@ impl jacquard_common::IntoStatic for UnmuteConvoOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for UnmuteConvo<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for UnmuteConvo<'de> {
     const NSID: &'static str = "chat.bsky.convo.unmuteConvo";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Procedure(
         "application/json",
     );
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = UnmuteConvoOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = UnmuteConvoOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/chat_bsky/convo/update_all_read.rs b/crates/jacquard-api/src/chat_bsky/convo/update_all_read.rs
index 40d655af..2890492d 100644
--- a/crates/jacquard-api/src/chat_bsky/convo/update_all_read.rs
+++ b/crates/jacquard-api/src/chat_bsky/convo/update_all_read.rs
@@ -59,12 +59,12 @@ impl jacquard_common::IntoStatic for UpdateAllReadOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for UpdateAllRead<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for UpdateAllRead<'de> {
     const NSID: &'static str = "chat.bsky.convo.updateAllRead";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Procedure(
         "application/json",
     );
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = UpdateAllReadOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = UpdateAllReadOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/chat_bsky/convo/update_read.rs b/crates/jacquard-api/src/chat_bsky/convo/update_read.rs
index b5218855..4f8705da 100644
--- a/crates/jacquard-api/src/chat_bsky/convo/update_read.rs
+++ b/crates/jacquard-api/src/chat_bsky/convo/update_read.rs
@@ -63,12 +63,12 @@ impl jacquard_common::IntoStatic for UpdateReadOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for UpdateRead<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for UpdateRead<'de> {
     const NSID: &'static str = "chat.bsky.convo.updateRead";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Procedure(
         "application/json",
     );
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = UpdateReadOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = UpdateReadOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/chat_bsky/moderation/get_actor_metadata.rs b/crates/jacquard-api/src/chat_bsky/moderation/get_actor_metadata.rs
index a587ca8b..e2c4ab42 100644
--- a/crates/jacquard-api/src/chat_bsky/moderation/get_actor_metadata.rs
+++ b/crates/jacquard-api/src/chat_bsky/moderation/get_actor_metadata.rs
@@ -54,12 +54,12 @@ impl jacquard_common::IntoStatic for GetActorMetadataOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for GetActorMetadata<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for GetActorMetadata<'de> {
     const NSID: &'static str = "chat.bsky.moderation.getActorMetadata";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = GetActorMetadataOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = GetActorMetadataOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
 
 #[jacquard_derive::lexicon]
diff --git a/crates/jacquard-api/src/chat_bsky/moderation/get_message_context.rs b/crates/jacquard-api/src/chat_bsky/moderation/get_message_context.rs
index 67e3e00c..5186b84c 100644
--- a/crates/jacquard-api/src/chat_bsky/moderation/get_message_context.rs
+++ b/crates/jacquard-api/src/chat_bsky/moderation/get_message_context.rs
@@ -62,10 +62,10 @@ impl jacquard_common::IntoStatic for GetMessageContextOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for GetMessageContext<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for GetMessageContext<'de> {
     const NSID: &'static str = "chat.bsky.moderation.getMessageContext";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = GetMessageContextOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = GetMessageContextOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/chat_bsky/moderation/update_actor_access.rs b/crates/jacquard-api/src/chat_bsky/moderation/update_actor_access.rs
index 738c928b..3ee60906 100644
--- a/crates/jacquard-api/src/chat_bsky/moderation/update_actor_access.rs
+++ b/crates/jacquard-api/src/chat_bsky/moderation/update_actor_access.rs
@@ -46,12 +46,12 @@ impl jacquard_common::IntoStatic for UpdateActorAccess<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for UpdateActorAccess<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for UpdateActorAccess<'de> {
     const NSID: &'static str = "chat.bsky.moderation.updateActorAccess";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Procedure(
         "application/json",
     );
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = ();
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = ();
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atproto/admin/delete_account.rs b/crates/jacquard-api/src/com_atproto/admin/delete_account.rs
index 358ae2f0..133f43c8 100644
--- a/crates/jacquard-api/src/com_atproto/admin/delete_account.rs
+++ b/crates/jacquard-api/src/com_atproto/admin/delete_account.rs
@@ -39,12 +39,12 @@ impl jacquard_common::IntoStatic for DeleteAccount<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for DeleteAccount<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for DeleteAccount<'de> {
     const NSID: &'static str = "com.atproto.admin.deleteAccount";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Procedure(
         "application/json",
     );
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = ();
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = ();
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atproto/admin/disable_account_invites.rs b/crates/jacquard-api/src/com_atproto/admin/disable_account_invites.rs
index a850d481..26144abd 100644
--- a/crates/jacquard-api/src/com_atproto/admin/disable_account_invites.rs
+++ b/crates/jacquard-api/src/com_atproto/admin/disable_account_invites.rs
@@ -45,12 +45,12 @@ impl jacquard_common::IntoStatic for DisableAccountInvites<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for DisableAccountInvites<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for DisableAccountInvites<'de> {
     const NSID: &'static str = "com.atproto.admin.disableAccountInvites";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Procedure(
         "application/json",
     );
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = ();
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = ();
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atproto/admin/disable_invite_codes.rs b/crates/jacquard-api/src/com_atproto/admin/disable_invite_codes.rs
index 1b277c56..a7547966 100644
--- a/crates/jacquard-api/src/com_atproto/admin/disable_invite_codes.rs
+++ b/crates/jacquard-api/src/com_atproto/admin/disable_invite_codes.rs
@@ -44,12 +44,12 @@ impl jacquard_common::IntoStatic for DisableInviteCodes<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for DisableInviteCodes<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for DisableInviteCodes<'de> {
     const NSID: &'static str = "com.atproto.admin.disableInviteCodes";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Procedure(
         "application/json",
     );
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = ();
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = ();
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atproto/admin/enable_account_invites.rs b/crates/jacquard-api/src/com_atproto/admin/enable_account_invites.rs
index 0418fdf8..b1fb936e 100644
--- a/crates/jacquard-api/src/com_atproto/admin/enable_account_invites.rs
+++ b/crates/jacquard-api/src/com_atproto/admin/enable_account_invites.rs
@@ -45,12 +45,12 @@ impl jacquard_common::IntoStatic for EnableAccountInvites<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for EnableAccountInvites<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for EnableAccountInvites<'de> {
     const NSID: &'static str = "com.atproto.admin.enableAccountInvites";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Procedure(
         "application/json",
     );
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = ();
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = ();
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atproto/admin/get_account_info.rs b/crates/jacquard-api/src/com_atproto/admin/get_account_info.rs
index 0e67eea2..029b403b 100644
--- a/crates/jacquard-api/src/com_atproto/admin/get_account_info.rs
+++ b/crates/jacquard-api/src/com_atproto/admin/get_account_info.rs
@@ -49,10 +49,10 @@ impl jacquard_common::IntoStatic for GetAccountInfoOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for GetAccountInfo<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for GetAccountInfo<'de> {
     const NSID: &'static str = "com.atproto.admin.getAccountInfo";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = GetAccountInfoOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = GetAccountInfoOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atproto/admin/get_account_infos.rs b/crates/jacquard-api/src/com_atproto/admin/get_account_infos.rs
index 5960bfaa..007343dd 100644
--- a/crates/jacquard-api/src/com_atproto/admin/get_account_infos.rs
+++ b/crates/jacquard-api/src/com_atproto/admin/get_account_infos.rs
@@ -48,10 +48,10 @@ impl jacquard_common::IntoStatic for GetAccountInfosOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for GetAccountInfos<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for GetAccountInfos<'de> {
     const NSID: &'static str = "com.atproto.admin.getAccountInfos";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = GetAccountInfosOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = GetAccountInfosOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atproto/admin/get_invite_codes.rs b/crates/jacquard-api/src/com_atproto/admin/get_invite_codes.rs
index 80e15372..79bac687 100644
--- a/crates/jacquard-api/src/com_atproto/admin/get_invite_codes.rs
+++ b/crates/jacquard-api/src/com_atproto/admin/get_invite_codes.rs
@@ -64,10 +64,10 @@ impl jacquard_common::IntoStatic for GetInviteCodesOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for GetInviteCodes<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for GetInviteCodes<'de> {
     const NSID: &'static str = "com.atproto.admin.getInviteCodes";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = GetInviteCodesOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = GetInviteCodesOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atproto/admin/get_subject_status.rs b/crates/jacquard-api/src/com_atproto/admin/get_subject_status.rs
index 90f511df..d5b4ba9d 100644
--- a/crates/jacquard-api/src/com_atproto/admin/get_subject_status.rs
+++ b/crates/jacquard-api/src/com_atproto/admin/get_subject_status.rs
@@ -98,10 +98,10 @@ impl jacquard_common::IntoStatic for GetSubjectStatusOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for GetSubjectStatus<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for GetSubjectStatus<'de> {
     const NSID: &'static str = "com.atproto.admin.getSubjectStatus";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = GetSubjectStatusOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = GetSubjectStatusOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atproto/admin/search_accounts.rs b/crates/jacquard-api/src/com_atproto/admin/search_accounts.rs
index a270f7c0..7588542a 100644
--- a/crates/jacquard-api/src/com_atproto/admin/search_accounts.rs
+++ b/crates/jacquard-api/src/com_atproto/admin/search_accounts.rs
@@ -63,10 +63,10 @@ impl jacquard_common::IntoStatic for SearchAccountsOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for SearchAccounts<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for SearchAccounts<'de> {
     const NSID: &'static str = "com.atproto.admin.searchAccounts";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = SearchAccountsOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = SearchAccountsOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atproto/admin/send_email.rs b/crates/jacquard-api/src/com_atproto/admin/send_email.rs
index 968caa76..840be31b 100644
--- a/crates/jacquard-api/src/com_atproto/admin/send_email.rs
+++ b/crates/jacquard-api/src/com_atproto/admin/send_email.rs
@@ -74,12 +74,12 @@ impl jacquard_common::IntoStatic for SendEmailOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for SendEmail<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for SendEmail<'de> {
     const NSID: &'static str = "com.atproto.admin.sendEmail";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Procedure(
         "application/json",
     );
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = SendEmailOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = SendEmailOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atproto/admin/update_account_email.rs b/crates/jacquard-api/src/com_atproto/admin/update_account_email.rs
index b1ed64b8..e454a529 100644
--- a/crates/jacquard-api/src/com_atproto/admin/update_account_email.rs
+++ b/crates/jacquard-api/src/com_atproto/admin/update_account_email.rs
@@ -44,12 +44,12 @@ impl jacquard_common::IntoStatic for UpdateAccountEmail<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for UpdateAccountEmail<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for UpdateAccountEmail<'de> {
     const NSID: &'static str = "com.atproto.admin.updateAccountEmail";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Procedure(
         "application/json",
     );
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = ();
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = ();
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atproto/admin/update_account_handle.rs b/crates/jacquard-api/src/com_atproto/admin/update_account_handle.rs
index 84be4930..2fe74cfd 100644
--- a/crates/jacquard-api/src/com_atproto/admin/update_account_handle.rs
+++ b/crates/jacquard-api/src/com_atproto/admin/update_account_handle.rs
@@ -42,12 +42,12 @@ impl jacquard_common::IntoStatic for UpdateAccountHandle<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for UpdateAccountHandle<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for UpdateAccountHandle<'de> {
     const NSID: &'static str = "com.atproto.admin.updateAccountHandle";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Procedure(
         "application/json",
     );
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = ();
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = ();
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atproto/admin/update_account_password.rs b/crates/jacquard-api/src/com_atproto/admin/update_account_password.rs
index 0cd3c4f0..6496295f 100644
--- a/crates/jacquard-api/src/com_atproto/admin/update_account_password.rs
+++ b/crates/jacquard-api/src/com_atproto/admin/update_account_password.rs
@@ -43,12 +43,12 @@ impl jacquard_common::IntoStatic for UpdateAccountPassword<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for UpdateAccountPassword<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for UpdateAccountPassword<'de> {
     const NSID: &'static str = "com.atproto.admin.updateAccountPassword";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Procedure(
         "application/json",
     );
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = ();
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = ();
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atproto/admin/update_account_signing_key.rs b/crates/jacquard-api/src/com_atproto/admin/update_account_signing_key.rs
index f3419a64..f990ffe3 100644
--- a/crates/jacquard-api/src/com_atproto/admin/update_account_signing_key.rs
+++ b/crates/jacquard-api/src/com_atproto/admin/update_account_signing_key.rs
@@ -43,12 +43,13 @@ impl jacquard_common::IntoStatic for UpdateAccountSigningKey<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for UpdateAccountSigningKey<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de>
+for UpdateAccountSigningKey<'de> {
     const NSID: &'static str = "com.atproto.admin.updateAccountSigningKey";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Procedure(
         "application/json",
     );
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = ();
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = ();
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atproto/admin/update_subject_status.rs b/crates/jacquard-api/src/com_atproto/admin/update_subject_status.rs
index 078e919f..29d148d7 100644
--- a/crates/jacquard-api/src/com_atproto/admin/update_subject_status.rs
+++ b/crates/jacquard-api/src/com_atproto/admin/update_subject_status.rs
@@ -135,12 +135,12 @@ impl jacquard_common::IntoStatic for UpdateSubjectStatusOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for UpdateSubjectStatus<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for UpdateSubjectStatus<'de> {
     const NSID: &'static str = "com.atproto.admin.updateSubjectStatus";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Procedure(
         "application/json",
     );
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = UpdateSubjectStatusOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = UpdateSubjectStatusOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atproto/identity/get_recommended_did_credentials.rs b/crates/jacquard-api/src/com_atproto/identity/get_recommended_did_credentials.rs
index e5cb1f2f..a978faff 100644
--- a/crates/jacquard-api/src/com_atproto/identity/get_recommended_did_credentials.rs
+++ b/crates/jacquard-api/src/com_atproto/identity/get_recommended_did_credentials.rs
@@ -40,12 +40,13 @@ impl jacquard_common::IntoStatic for GetRecommendedDidCredentialsOutput<'_> {
 }
 
 /// XRPC request marker type
-#[derive(Debug, Clone, Copy, PartialEq, Eq, serde::Serialize)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
 pub struct GetRecommendedDidCredentials;
-impl jacquard_common::types::xrpc::XrpcRequest for GetRecommendedDidCredentials {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de>
+for GetRecommendedDidCredentials {
     const NSID: &'static str = "com.atproto.identity.getRecommendedDidCredentials";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = GetRecommendedDidCredentialsOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = GetRecommendedDidCredentialsOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atproto/identity/refresh_identity.rs b/crates/jacquard-api/src/com_atproto/identity/refresh_identity.rs
index d4383bf3..642821d3 100644
--- a/crates/jacquard-api/src/com_atproto/identity/refresh_identity.rs
+++ b/crates/jacquard-api/src/com_atproto/identity/refresh_identity.rs
@@ -132,12 +132,12 @@ impl jacquard_common::IntoStatic for RefreshIdentityError<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for RefreshIdentity<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for RefreshIdentity<'de> {
     const NSID: &'static str = "com.atproto.identity.refreshIdentity";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Procedure(
         "application/json",
     );
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = RefreshIdentityOutput<'de>;
-    type Err<'de> = RefreshIdentityError<'de>;
+    type Output = RefreshIdentityOutput<'de>;
+    type Err = RefreshIdentityError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atproto/identity/request_plc_operation_signature.rs b/crates/jacquard-api/src/com_atproto/identity/request_plc_operation_signature.rs
index 9e2c8689..80c05081 100644
--- a/crates/jacquard-api/src/com_atproto/identity/request_plc_operation_signature.rs
+++ b/crates/jacquard-api/src/com_atproto/identity/request_plc_operation_signature.rs
@@ -6,14 +6,15 @@
 // Any manual changes will be overwritten on the next regeneration.
 
 /// XRPC request marker type
-#[derive(Debug, Clone, Copy, PartialEq, Eq, serde::Serialize)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
 pub struct RequestPlcOperationSignature;
-impl jacquard_common::types::xrpc::XrpcRequest for RequestPlcOperationSignature {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de>
+for RequestPlcOperationSignature {
     const NSID: &'static str = "com.atproto.identity.requestPlcOperationSignature";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Procedure(
         "application/json",
     );
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = ();
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = ();
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atproto/identity/resolve_did.rs b/crates/jacquard-api/src/com_atproto/identity/resolve_did.rs
index fd146bb8..6f868cd1 100644
--- a/crates/jacquard-api/src/com_atproto/identity/resolve_did.rs
+++ b/crates/jacquard-api/src/com_atproto/identity/resolve_did.rs
@@ -108,10 +108,10 @@ impl jacquard_common::IntoStatic for ResolveDidError<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for ResolveDid<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for ResolveDid<'de> {
     const NSID: &'static str = "com.atproto.identity.resolveDid";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = ResolveDidOutput<'de>;
-    type Err<'de> = ResolveDidError<'de>;
+    type Output = ResolveDidOutput<'de>;
+    type Err = ResolveDidError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atproto/identity/resolve_handle.rs b/crates/jacquard-api/src/com_atproto/identity/resolve_handle.rs
index df81947b..ca61db35 100644
--- a/crates/jacquard-api/src/com_atproto/identity/resolve_handle.rs
+++ b/crates/jacquard-api/src/com_atproto/identity/resolve_handle.rs
@@ -96,10 +96,10 @@ impl jacquard_common::IntoStatic for ResolveHandleError<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for ResolveHandle<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for ResolveHandle<'de> {
     const NSID: &'static str = "com.atproto.identity.resolveHandle";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = ResolveHandleOutput<'de>;
-    type Err<'de> = ResolveHandleError<'de>;
+    type Output = ResolveHandleOutput<'de>;
+    type Err = ResolveHandleError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atproto/identity/resolve_identity.rs b/crates/jacquard-api/src/com_atproto/identity/resolve_identity.rs
index cf4fd830..11bfba80 100644
--- a/crates/jacquard-api/src/com_atproto/identity/resolve_identity.rs
+++ b/crates/jacquard-api/src/com_atproto/identity/resolve_identity.rs
@@ -123,10 +123,10 @@ impl jacquard_common::IntoStatic for ResolveIdentityError<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for ResolveIdentity<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for ResolveIdentity<'de> {
     const NSID: &'static str = "com.atproto.identity.resolveIdentity";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = ResolveIdentityOutput<'de>;
-    type Err<'de> = ResolveIdentityError<'de>;
+    type Output = ResolveIdentityOutput<'de>;
+    type Err = ResolveIdentityError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atproto/identity/sign_plc_operation.rs b/crates/jacquard-api/src/com_atproto/identity/sign_plc_operation.rs
index efa785a3..4d41a5f8 100644
--- a/crates/jacquard-api/src/com_atproto/identity/sign_plc_operation.rs
+++ b/crates/jacquard-api/src/com_atproto/identity/sign_plc_operation.rs
@@ -79,12 +79,12 @@ impl jacquard_common::IntoStatic for SignPlcOperationOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for SignPlcOperation<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for SignPlcOperation<'de> {
     const NSID: &'static str = "com.atproto.identity.signPlcOperation";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Procedure(
         "application/json",
     );
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = SignPlcOperationOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = SignPlcOperationOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atproto/identity/submit_plc_operation.rs b/crates/jacquard-api/src/com_atproto/identity/submit_plc_operation.rs
index f4bd5525..83900bd1 100644
--- a/crates/jacquard-api/src/com_atproto/identity/submit_plc_operation.rs
+++ b/crates/jacquard-api/src/com_atproto/identity/submit_plc_operation.rs
@@ -39,12 +39,12 @@ impl jacquard_common::IntoStatic for SubmitPlcOperation<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for SubmitPlcOperation<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for SubmitPlcOperation<'de> {
     const NSID: &'static str = "com.atproto.identity.submitPlcOperation";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Procedure(
         "application/json",
     );
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = ();
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = ();
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atproto/identity/update_handle.rs b/crates/jacquard-api/src/com_atproto/identity/update_handle.rs
index b5437e43..6495bd55 100644
--- a/crates/jacquard-api/src/com_atproto/identity/update_handle.rs
+++ b/crates/jacquard-api/src/com_atproto/identity/update_handle.rs
@@ -40,12 +40,12 @@ impl jacquard_common::IntoStatic for UpdateHandle<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for UpdateHandle<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for UpdateHandle<'de> {
     const NSID: &'static str = "com.atproto.identity.updateHandle";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Procedure(
         "application/json",
     );
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = ();
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = ();
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atproto/label/query_labels.rs b/crates/jacquard-api/src/com_atproto/label/query_labels.rs
index 47ebe8b1..1e644848 100644
--- a/crates/jacquard-api/src/com_atproto/label/query_labels.rs
+++ b/crates/jacquard-api/src/com_atproto/label/query_labels.rs
@@ -65,10 +65,10 @@ impl jacquard_common::IntoStatic for QueryLabelsOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for QueryLabels<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for QueryLabels<'de> {
     const NSID: &'static str = "com.atproto.label.queryLabels";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = QueryLabelsOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = QueryLabelsOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atproto/moderation/create_report.rs b/crates/jacquard-api/src/com_atproto/moderation/create_report.rs
index ddf503d6..4d65e5ab 100644
--- a/crates/jacquard-api/src/com_atproto/moderation/create_report.rs
+++ b/crates/jacquard-api/src/com_atproto/moderation/create_report.rs
@@ -141,14 +141,14 @@ impl jacquard_common::IntoStatic for CreateReportOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for CreateReport<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for CreateReport<'de> {
     const NSID: &'static str = "com.atproto.moderation.createReport";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Procedure(
         "application/json",
     );
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = CreateReportOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = CreateReportOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
 
 ///Moderation tool information for tracing the source of the action
diff --git a/crates/jacquard-api/src/com_atproto/repo/apply_writes.rs b/crates/jacquard-api/src/com_atproto/repo/apply_writes.rs
index 52fbfe18..16c99a15 100644
--- a/crates/jacquard-api/src/com_atproto/repo/apply_writes.rs
+++ b/crates/jacquard-api/src/com_atproto/repo/apply_writes.rs
@@ -214,14 +214,14 @@ impl jacquard_common::IntoStatic for ApplyWritesError<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for ApplyWrites<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for ApplyWrites<'de> {
     const NSID: &'static str = "com.atproto.repo.applyWrites";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Procedure(
         "application/json",
     );
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = ApplyWritesOutput<'de>;
-    type Err<'de> = ApplyWritesError<'de>;
+    type Output = ApplyWritesOutput<'de>;
+    type Err = ApplyWritesError<'de>;
 }
 
 ///Operation which updates an existing record.
diff --git a/crates/jacquard-api/src/com_atproto/repo/create_record.rs b/crates/jacquard-api/src/com_atproto/repo/create_record.rs
index ebacd339..7f931833 100644
--- a/crates/jacquard-api/src/com_atproto/repo/create_record.rs
+++ b/crates/jacquard-api/src/com_atproto/repo/create_record.rs
@@ -141,12 +141,12 @@ impl jacquard_common::IntoStatic for CreateRecordError<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for CreateRecord<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for CreateRecord<'de> {
     const NSID: &'static str = "com.atproto.repo.createRecord";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Procedure(
         "application/json",
     );
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = CreateRecordOutput<'de>;
-    type Err<'de> = CreateRecordError<'de>;
+    type Output = CreateRecordOutput<'de>;
+    type Err = CreateRecordError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atproto/repo/delete_record.rs b/crates/jacquard-api/src/com_atproto/repo/delete_record.rs
index 62e97f79..d4e82141 100644
--- a/crates/jacquard-api/src/com_atproto/repo/delete_record.rs
+++ b/crates/jacquard-api/src/com_atproto/repo/delete_record.rs
@@ -124,12 +124,12 @@ impl jacquard_common::IntoStatic for DeleteRecordError<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for DeleteRecord<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for DeleteRecord<'de> {
     const NSID: &'static str = "com.atproto.repo.deleteRecord";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Procedure(
         "application/json",
     );
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = DeleteRecordOutput<'de>;
-    type Err<'de> = DeleteRecordError<'de>;
+    type Output = DeleteRecordOutput<'de>;
+    type Err = DeleteRecordError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atproto/repo/describe_repo.rs b/crates/jacquard-api/src/com_atproto/repo/describe_repo.rs
index 42277b04..9e0d9a27 100644
--- a/crates/jacquard-api/src/com_atproto/repo/describe_repo.rs
+++ b/crates/jacquard-api/src/com_atproto/repo/describe_repo.rs
@@ -62,10 +62,10 @@ impl jacquard_common::IntoStatic for DescribeRepoOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for DescribeRepo<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for DescribeRepo<'de> {
     const NSID: &'static str = "com.atproto.repo.describeRepo";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = DescribeRepoOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = DescribeRepoOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atproto/repo/get_record.rs b/crates/jacquard-api/src/com_atproto/repo/get_record.rs
index b06f0c29..ebc2d79b 100644
--- a/crates/jacquard-api/src/com_atproto/repo/get_record.rs
+++ b/crates/jacquard-api/src/com_atproto/repo/get_record.rs
@@ -112,10 +112,10 @@ impl jacquard_common::IntoStatic for GetRecordError<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for GetRecord<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for GetRecord<'de> {
     const NSID: &'static str = "com.atproto.repo.getRecord";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = GetRecordOutput<'de>;
-    type Err<'de> = GetRecordError<'de>;
+    type Output = GetRecordOutput<'de>;
+    type Err = GetRecordError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atproto/repo/import_repo.rs b/crates/jacquard-api/src/com_atproto/repo/import_repo.rs
index 2017ace4..9b0a6116 100644
--- a/crates/jacquard-api/src/com_atproto/repo/import_repo.rs
+++ b/crates/jacquard-api/src/com_atproto/repo/import_repo.rs
@@ -27,15 +27,25 @@ impl jacquard_common::IntoStatic for ImportRepo {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for ImportRepo {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for ImportRepo {
     const NSID: &'static str = "com.atproto.repo.importRepo";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Procedure(
         "application/vnd.ipld.car",
     );
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = ();
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = ();
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
     fn encode_body(&self) -> Result<Vec<u8>, jacquard_common::types::xrpc::EncodeError> {
         Ok(self.body.to_vec())
     }
+    fn decode_body(
+        &self,
+        body: &'de [u8],
+    ) -> Result<Box<Self>, jacquard_common::error::DecodeError> {
+        Ok(
+            Box::new(Self {
+                body: bytes::Bytes::copy_from_slice(body),
+            }),
+        )
+    }
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atproto/repo/list_missing_blobs.rs b/crates/jacquard-api/src/com_atproto/repo/list_missing_blobs.rs
index f7af3ab1..9b209f6a 100644
--- a/crates/jacquard-api/src/com_atproto/repo/list_missing_blobs.rs
+++ b/crates/jacquard-api/src/com_atproto/repo/list_missing_blobs.rs
@@ -58,12 +58,12 @@ impl jacquard_common::IntoStatic for ListMissingBlobsOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for ListMissingBlobs<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for ListMissingBlobs<'de> {
     const NSID: &'static str = "com.atproto.repo.listMissingBlobs";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = ListMissingBlobsOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = ListMissingBlobsOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
 
 #[jacquard_derive::lexicon]
diff --git a/crates/jacquard-api/src/com_atproto/repo/list_records.rs b/crates/jacquard-api/src/com_atproto/repo/list_records.rs
index 64ea0cd2..4873ce86 100644
--- a/crates/jacquard-api/src/com_atproto/repo/list_records.rs
+++ b/crates/jacquard-api/src/com_atproto/repo/list_records.rs
@@ -67,12 +67,12 @@ impl jacquard_common::IntoStatic for ListRecordsOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for ListRecords<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for ListRecords<'de> {
     const NSID: &'static str = "com.atproto.repo.listRecords";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = ListRecordsOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = ListRecordsOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
 
 #[jacquard_derive::lexicon]
diff --git a/crates/jacquard-api/src/com_atproto/repo/put_record.rs b/crates/jacquard-api/src/com_atproto/repo/put_record.rs
index b603da5b..1927399e 100644
--- a/crates/jacquard-api/src/com_atproto/repo/put_record.rs
+++ b/crates/jacquard-api/src/com_atproto/repo/put_record.rs
@@ -6,15 +6,7 @@
 // Any manual changes will be overwritten on the next regeneration.
 
 #[jacquard_derive::lexicon]
-#[derive(
-    serde::Serialize,
-    serde::Deserialize,
-    Debug,
-    Clone,
-    PartialEq,
-    Eq,
-    bon::Builder
-)]
+#[derive(serde::Serialize, serde::Deserialize, Debug, Clone, PartialEq, Eq, bon::Builder)]
 #[serde(rename_all = "camelCase")]
 #[builder(start_fn = new)]
 pub struct PutRecord<'a> {
@@ -29,9 +21,7 @@ pub struct PutRecord<'a> {
     pub repo: jacquard_common::types::ident::AtIdentifier<'a>,
     ///The Record Key.
     #[serde(borrow)]
-    pub rkey: jacquard_common::types::string::RecordKey<
-        jacquard_common::types::string::Rkey<'a>,
-    >,
+    pub rkey: jacquard_common::types::string::RecordKey<jacquard_common::types::string::Rkey<'a>>,
     ///Compare and swap with the previous commit by CID.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
@@ -106,7 +96,7 @@ impl jacquard_common::IntoStatic for PutRecordOutput<'_> {
     PartialEq,
     Eq,
     thiserror::Error,
-    miette::Diagnostic
+    miette::Diagnostic,
 )]
 #[serde(tag = "error", content = "message")]
 #[serde(bound(deserialize = "'de: 'a"))]
@@ -134,20 +124,17 @@ impl jacquard_common::IntoStatic for PutRecordError<'_> {
     type Output = PutRecordError<'static>;
     fn into_static(self) -> Self::Output {
         match self {
-            PutRecordError::InvalidSwap(v) => {
-                PutRecordError::InvalidSwap(v.into_static())
-            }
+            PutRecordError::InvalidSwap(v) => PutRecordError::InvalidSwap(v.into_static()),
             PutRecordError::Unknown(v) => PutRecordError::Unknown(v.into_static()),
         }
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for PutRecord<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for PutRecord<'de> {
     const NSID: &'static str = "com.atproto.repo.putRecord";
-    const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Procedure(
-        "application/json",
-    );
+    const METHOD: jacquard_common::types::xrpc::XrpcMethod =
+        jacquard_common::types::xrpc::XrpcMethod::Procedure("application/json");
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = PutRecordOutput<'de>;
-    type Err<'de> = PutRecordError<'de>;
-}
\ No newline at end of file
+    type Output = PutRecordOutput<'de>;
+    type Err = PutRecordError<'de>;
+}
diff --git a/crates/jacquard-api/src/com_atproto/repo/upload_blob.rs b/crates/jacquard-api/src/com_atproto/repo/upload_blob.rs
index 3a4153f2..c2117f04 100644
--- a/crates/jacquard-api/src/com_atproto/repo/upload_blob.rs
+++ b/crates/jacquard-api/src/com_atproto/repo/upload_blob.rs
@@ -5,15 +5,7 @@
 // This file was automatically generated from Lexicon schemas.
 // Any manual changes will be overwritten on the next regeneration.
 
-#[derive(
-    serde::Serialize,
-    serde::Deserialize,
-    Debug,
-    Clone,
-    PartialEq,
-    Eq,
-    bon::Builder
-)]
+#[derive(serde::Serialize, serde::Deserialize, Debug, Clone, PartialEq, Eq, bon::Builder)]
 #[builder(start_fn = new)]
 #[serde(rename_all = "camelCase")]
 pub struct UploadBlob {
@@ -45,15 +37,22 @@ impl jacquard_common::IntoStatic for UploadBlobOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for UploadBlob {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for UploadBlob {
     const NSID: &'static str = "com.atproto.repo.uploadBlob";
-    const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Procedure(
-        "*/*",
-    );
+    const METHOD: jacquard_common::types::xrpc::XrpcMethod =
+        jacquard_common::types::xrpc::XrpcMethod::Procedure("*/*");
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = UploadBlobOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = UploadBlobOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
     fn encode_body(&self) -> Result<Vec<u8>, jacquard_common::types::xrpc::EncodeError> {
         Ok(self.body.to_vec())
     }
-}
\ No newline at end of file
+    fn decode_body(
+        &self,
+        body: &'de [u8],
+    ) -> Result<Box<Self>, jacquard_common::error::DecodeError> {
+        Ok(Box::new(Self {
+            body: bytes::Bytes::copy_from_slice(body),
+        }))
+    }
+}
diff --git a/crates/jacquard-api/src/com_atproto/server/activate_account.rs b/crates/jacquard-api/src/com_atproto/server/activate_account.rs
index 8fafef37..12acb548 100644
--- a/crates/jacquard-api/src/com_atproto/server/activate_account.rs
+++ b/crates/jacquard-api/src/com_atproto/server/activate_account.rs
@@ -6,14 +6,14 @@
 // Any manual changes will be overwritten on the next regeneration.
 
 /// XRPC request marker type
-#[derive(Debug, Clone, Copy, PartialEq, Eq, serde::Serialize)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
 pub struct ActivateAccount;
-impl jacquard_common::types::xrpc::XrpcRequest for ActivateAccount {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for ActivateAccount {
     const NSID: &'static str = "com.atproto.server.activateAccount";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Procedure(
         "application/json",
     );
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = ();
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = ();
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atproto/server/check_account_status.rs b/crates/jacquard-api/src/com_atproto/server/check_account_status.rs
index 7d73c2ea..96f65dba 100644
--- a/crates/jacquard-api/src/com_atproto/server/check_account_status.rs
+++ b/crates/jacquard-api/src/com_atproto/server/check_account_status.rs
@@ -41,12 +41,12 @@ impl jacquard_common::IntoStatic for CheckAccountStatusOutput<'_> {
 }
 
 /// XRPC request marker type
-#[derive(Debug, Clone, Copy, PartialEq, Eq, serde::Serialize)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
 pub struct CheckAccountStatus;
-impl jacquard_common::types::xrpc::XrpcRequest for CheckAccountStatus {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for CheckAccountStatus {
     const NSID: &'static str = "com.atproto.server.checkAccountStatus";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = CheckAccountStatusOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = CheckAccountStatusOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atproto/server/confirm_email.rs b/crates/jacquard-api/src/com_atproto/server/confirm_email.rs
index c8988052..5dd6ec78 100644
--- a/crates/jacquard-api/src/com_atproto/server/confirm_email.rs
+++ b/crates/jacquard-api/src/com_atproto/server/confirm_email.rs
@@ -125,12 +125,12 @@ impl jacquard_common::IntoStatic for ConfirmEmailError<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for ConfirmEmail<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for ConfirmEmail<'de> {
     const NSID: &'static str = "com.atproto.server.confirmEmail";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Procedure(
         "application/json",
     );
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = ();
-    type Err<'de> = ConfirmEmailError<'de>;
+    type Output = ();
+    type Err = ConfirmEmailError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atproto/server/create_account.rs b/crates/jacquard-api/src/com_atproto/server/create_account.rs
index f4110a66..d756ce21 100644
--- a/crates/jacquard-api/src/com_atproto/server/create_account.rs
+++ b/crates/jacquard-api/src/com_atproto/server/create_account.rs
@@ -234,12 +234,12 @@ impl jacquard_common::IntoStatic for CreateAccountError<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for CreateAccount<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for CreateAccount<'de> {
     const NSID: &'static str = "com.atproto.server.createAccount";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Procedure(
         "application/json",
     );
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = CreateAccountOutput<'de>;
-    type Err<'de> = CreateAccountError<'de>;
+    type Output = CreateAccountOutput<'de>;
+    type Err = CreateAccountError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atproto/server/create_app_password.rs b/crates/jacquard-api/src/com_atproto/server/create_app_password.rs
index 429d699b..3ffd5f87 100644
--- a/crates/jacquard-api/src/com_atproto/server/create_app_password.rs
+++ b/crates/jacquard-api/src/com_atproto/server/create_app_password.rs
@@ -137,12 +137,12 @@ impl jacquard_common::IntoStatic for CreateAppPasswordError<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for CreateAppPassword<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for CreateAppPassword<'de> {
     const NSID: &'static str = "com.atproto.server.createAppPassword";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Procedure(
         "application/json",
     );
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = CreateAppPasswordOutput<'de>;
-    type Err<'de> = CreateAppPasswordError<'de>;
+    type Output = CreateAppPasswordOutput<'de>;
+    type Err = CreateAppPasswordError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atproto/server/create_invite_code.rs b/crates/jacquard-api/src/com_atproto/server/create_invite_code.rs
index e955ddbe..efaf20e8 100644
--- a/crates/jacquard-api/src/com_atproto/server/create_invite_code.rs
+++ b/crates/jacquard-api/src/com_atproto/server/create_invite_code.rs
@@ -60,12 +60,12 @@ impl jacquard_common::IntoStatic for CreateInviteCodeOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for CreateInviteCode<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for CreateInviteCode<'de> {
     const NSID: &'static str = "com.atproto.server.createInviteCode";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Procedure(
         "application/json",
     );
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = CreateInviteCodeOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = CreateInviteCodeOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atproto/server/create_invite_codes.rs b/crates/jacquard-api/src/com_atproto/server/create_invite_codes.rs
index 957d9c4f..2e585c52 100644
--- a/crates/jacquard-api/src/com_atproto/server/create_invite_codes.rs
+++ b/crates/jacquard-api/src/com_atproto/server/create_invite_codes.rs
@@ -83,12 +83,12 @@ impl jacquard_common::IntoStatic for CreateInviteCodesOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for CreateInviteCodes<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for CreateInviteCodes<'de> {
     const NSID: &'static str = "com.atproto.server.createInviteCodes";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Procedure(
         "application/json",
     );
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = CreateInviteCodesOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = CreateInviteCodesOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atproto/server/create_session.rs b/crates/jacquard-api/src/com_atproto/server/create_session.rs
index 20473c4e..076e8d4a 100644
--- a/crates/jacquard-api/src/com_atproto/server/create_session.rs
+++ b/crates/jacquard-api/src/com_atproto/server/create_session.rs
@@ -162,12 +162,12 @@ impl jacquard_common::IntoStatic for CreateSessionError<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for CreateSession<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for CreateSession<'de> {
     const NSID: &'static str = "com.atproto.server.createSession";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Procedure(
         "application/json",
     );
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = CreateSessionOutput<'de>;
-    type Err<'de> = CreateSessionError<'de>;
+    type Output = CreateSessionOutput<'de>;
+    type Err = CreateSessionError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atproto/server/deactivate_account.rs b/crates/jacquard-api/src/com_atproto/server/deactivate_account.rs
index aa7f6b7f..6c3d38cd 100644
--- a/crates/jacquard-api/src/com_atproto/server/deactivate_account.rs
+++ b/crates/jacquard-api/src/com_atproto/server/deactivate_account.rs
@@ -40,12 +40,12 @@ impl jacquard_common::IntoStatic for DeactivateAccount<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for DeactivateAccount<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for DeactivateAccount<'de> {
     const NSID: &'static str = "com.atproto.server.deactivateAccount";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Procedure(
         "application/json",
     );
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = ();
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = ();
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atproto/server/delete_account.rs b/crates/jacquard-api/src/com_atproto/server/delete_account.rs
index 1ec15b5d..49bd89a2 100644
--- a/crates/jacquard-api/src/com_atproto/server/delete_account.rs
+++ b/crates/jacquard-api/src/com_atproto/server/delete_account.rs
@@ -106,12 +106,12 @@ impl jacquard_common::IntoStatic for DeleteAccountError<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for DeleteAccount<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for DeleteAccount<'de> {
     const NSID: &'static str = "com.atproto.server.deleteAccount";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Procedure(
         "application/json",
     );
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = ();
-    type Err<'de> = DeleteAccountError<'de>;
+    type Output = ();
+    type Err = DeleteAccountError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atproto/server/delete_session.rs b/crates/jacquard-api/src/com_atproto/server/delete_session.rs
index cd814283..4d7c0a5e 100644
--- a/crates/jacquard-api/src/com_atproto/server/delete_session.rs
+++ b/crates/jacquard-api/src/com_atproto/server/delete_session.rs
@@ -6,14 +6,14 @@
 // Any manual changes will be overwritten on the next regeneration.
 
 /// XRPC request marker type
-#[derive(Debug, Clone, Copy, PartialEq, Eq, serde::Serialize)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
 pub struct DeleteSession;
-impl jacquard_common::types::xrpc::XrpcRequest for DeleteSession {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for DeleteSession {
     const NSID: &'static str = "com.atproto.server.deleteSession";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Procedure(
         "application/json",
     );
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = ();
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = ();
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atproto/server/describe_server.rs b/crates/jacquard-api/src/com_atproto/server/describe_server.rs
index 82d152ab..8254c171 100644
--- a/crates/jacquard-api/src/com_atproto/server/describe_server.rs
+++ b/crates/jacquard-api/src/com_atproto/server/describe_server.rs
@@ -88,12 +88,12 @@ impl jacquard_common::IntoStatic for DescribeServerOutput<'_> {
 }
 
 /// XRPC request marker type
-#[derive(Debug, Clone, Copy, PartialEq, Eq, serde::Serialize)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
 pub struct DescribeServer;
-impl jacquard_common::types::xrpc::XrpcRequest for DescribeServer {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for DescribeServer {
     const NSID: &'static str = "com.atproto.server.describeServer";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = DescribeServerOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = DescribeServerOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atproto/server/get_account_invite_codes.rs b/crates/jacquard-api/src/com_atproto/server/get_account_invite_codes.rs
index 1127e907..7a897ee7 100644
--- a/crates/jacquard-api/src/com_atproto/server/get_account_invite_codes.rs
+++ b/crates/jacquard-api/src/com_atproto/server/get_account_invite_codes.rs
@@ -97,10 +97,10 @@ impl jacquard_common::IntoStatic for GetAccountInviteCodesError<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for GetAccountInviteCodes {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for GetAccountInviteCodes {
     const NSID: &'static str = "com.atproto.server.getAccountInviteCodes";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = GetAccountInviteCodesOutput<'de>;
-    type Err<'de> = GetAccountInviteCodesError<'de>;
+    type Output = GetAccountInviteCodesOutput<'de>;
+    type Err = GetAccountInviteCodesError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atproto/server/get_service_auth.rs b/crates/jacquard-api/src/com_atproto/server/get_service_auth.rs
index cd62ea02..5f9114da 100644
--- a/crates/jacquard-api/src/com_atproto/server/get_service_auth.rs
+++ b/crates/jacquard-api/src/com_atproto/server/get_service_auth.rs
@@ -103,10 +103,10 @@ impl jacquard_common::IntoStatic for GetServiceAuthError<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for GetServiceAuth<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for GetServiceAuth<'de> {
     const NSID: &'static str = "com.atproto.server.getServiceAuth";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = GetServiceAuthOutput<'de>;
-    type Err<'de> = GetServiceAuthError<'de>;
+    type Output = GetServiceAuthOutput<'de>;
+    type Err = GetServiceAuthError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atproto/server/get_session.rs b/crates/jacquard-api/src/com_atproto/server/get_session.rs
index e9b1a8d4..ac546bb9 100644
--- a/crates/jacquard-api/src/com_atproto/server/get_session.rs
+++ b/crates/jacquard-api/src/com_atproto/server/get_session.rs
@@ -49,12 +49,12 @@ impl jacquard_common::IntoStatic for GetSessionOutput<'_> {
 }
 
 /// XRPC request marker type
-#[derive(Debug, Clone, Copy, PartialEq, Eq, serde::Serialize)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
 pub struct GetSession;
-impl jacquard_common::types::xrpc::XrpcRequest for GetSession {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for GetSession {
     const NSID: &'static str = "com.atproto.server.getSession";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = GetSessionOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = GetSessionOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atproto/server/list_app_passwords.rs b/crates/jacquard-api/src/com_atproto/server/list_app_passwords.rs
index 3151192c..904f1fac 100644
--- a/crates/jacquard-api/src/com_atproto/server/list_app_passwords.rs
+++ b/crates/jacquard-api/src/com_atproto/server/list_app_passwords.rs
@@ -94,12 +94,12 @@ impl jacquard_common::IntoStatic for ListAppPasswordsError<'_> {
 }
 
 /// XRPC request marker type
-#[derive(Debug, Clone, Copy, PartialEq, Eq, serde::Serialize)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
 pub struct ListAppPasswords;
-impl jacquard_common::types::xrpc::XrpcRequest for ListAppPasswords {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for ListAppPasswords {
     const NSID: &'static str = "com.atproto.server.listAppPasswords";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = ListAppPasswordsOutput<'de>;
-    type Err<'de> = ListAppPasswordsError<'de>;
+    type Output = ListAppPasswordsOutput<'de>;
+    type Err = ListAppPasswordsError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atproto/server/refresh_session.rs b/crates/jacquard-api/src/com_atproto/server/refresh_session.rs
index 96a134a4..51e90632 100644
--- a/crates/jacquard-api/src/com_atproto/server/refresh_session.rs
+++ b/crates/jacquard-api/src/com_atproto/server/refresh_session.rs
@@ -92,14 +92,14 @@ impl jacquard_common::IntoStatic for RefreshSessionError<'_> {
 }
 
 /// XRPC request marker type
-#[derive(Debug, Clone, Copy, PartialEq, Eq, serde::Serialize)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
 pub struct RefreshSession;
-impl jacquard_common::types::xrpc::XrpcRequest for RefreshSession {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for RefreshSession {
     const NSID: &'static str = "com.atproto.server.refreshSession";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Procedure(
         "application/json",
     );
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = RefreshSessionOutput<'de>;
-    type Err<'de> = RefreshSessionError<'de>;
+    type Output = RefreshSessionOutput<'de>;
+    type Err = RefreshSessionError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atproto/server/request_account_delete.rs b/crates/jacquard-api/src/com_atproto/server/request_account_delete.rs
index 3c22579e..ab9a9817 100644
--- a/crates/jacquard-api/src/com_atproto/server/request_account_delete.rs
+++ b/crates/jacquard-api/src/com_atproto/server/request_account_delete.rs
@@ -6,14 +6,14 @@
 // Any manual changes will be overwritten on the next regeneration.
 
 /// XRPC request marker type
-#[derive(Debug, Clone, Copy, PartialEq, Eq, serde::Serialize)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
 pub struct RequestAccountDelete;
-impl jacquard_common::types::xrpc::XrpcRequest for RequestAccountDelete {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for RequestAccountDelete {
     const NSID: &'static str = "com.atproto.server.requestAccountDelete";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Procedure(
         "application/json",
     );
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = ();
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = ();
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atproto/server/request_email_confirmation.rs b/crates/jacquard-api/src/com_atproto/server/request_email_confirmation.rs
index 77b09584..455f508f 100644
--- a/crates/jacquard-api/src/com_atproto/server/request_email_confirmation.rs
+++ b/crates/jacquard-api/src/com_atproto/server/request_email_confirmation.rs
@@ -6,14 +6,14 @@
 // Any manual changes will be overwritten on the next regeneration.
 
 /// XRPC request marker type
-#[derive(Debug, Clone, Copy, PartialEq, Eq, serde::Serialize)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
 pub struct RequestEmailConfirmation;
-impl jacquard_common::types::xrpc::XrpcRequest for RequestEmailConfirmation {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for RequestEmailConfirmation {
     const NSID: &'static str = "com.atproto.server.requestEmailConfirmation";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Procedure(
         "application/json",
     );
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = ();
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = ();
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atproto/server/request_email_update.rs b/crates/jacquard-api/src/com_atproto/server/request_email_update.rs
index 995a3599..be1ef728 100644
--- a/crates/jacquard-api/src/com_atproto/server/request_email_update.rs
+++ b/crates/jacquard-api/src/com_atproto/server/request_email_update.rs
@@ -23,14 +23,14 @@ impl jacquard_common::IntoStatic for RequestEmailUpdateOutput<'_> {
 }
 
 /// XRPC request marker type
-#[derive(Debug, Clone, Copy, PartialEq, Eq, serde::Serialize)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
 pub struct RequestEmailUpdate;
-impl jacquard_common::types::xrpc::XrpcRequest for RequestEmailUpdate {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for RequestEmailUpdate {
     const NSID: &'static str = "com.atproto.server.requestEmailUpdate";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Procedure(
         "application/json",
     );
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = RequestEmailUpdateOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = RequestEmailUpdateOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atproto/server/request_password_reset.rs b/crates/jacquard-api/src/com_atproto/server/request_password_reset.rs
index 07f12c90..5cccbb2f 100644
--- a/crates/jacquard-api/src/com_atproto/server/request_password_reset.rs
+++ b/crates/jacquard-api/src/com_atproto/server/request_password_reset.rs
@@ -40,12 +40,12 @@ impl jacquard_common::IntoStatic for RequestPasswordReset<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for RequestPasswordReset<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for RequestPasswordReset<'de> {
     const NSID: &'static str = "com.atproto.server.requestPasswordReset";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Procedure(
         "application/json",
     );
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = ();
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = ();
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atproto/server/reserve_signing_key.rs b/crates/jacquard-api/src/com_atproto/server/reserve_signing_key.rs
index ac05cde0..73676b0f 100644
--- a/crates/jacquard-api/src/com_atproto/server/reserve_signing_key.rs
+++ b/crates/jacquard-api/src/com_atproto/server/reserve_signing_key.rs
@@ -60,12 +60,12 @@ impl jacquard_common::IntoStatic for ReserveSigningKeyOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for ReserveSigningKey<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for ReserveSigningKey<'de> {
     const NSID: &'static str = "com.atproto.server.reserveSigningKey";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Procedure(
         "application/json",
     );
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = ReserveSigningKeyOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = ReserveSigningKeyOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atproto/server/reset_password.rs b/crates/jacquard-api/src/com_atproto/server/reset_password.rs
index 92718a8f..99038807 100644
--- a/crates/jacquard-api/src/com_atproto/server/reset_password.rs
+++ b/crates/jacquard-api/src/com_atproto/server/reset_password.rs
@@ -103,12 +103,12 @@ impl jacquard_common::IntoStatic for ResetPasswordError<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for ResetPassword<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for ResetPassword<'de> {
     const NSID: &'static str = "com.atproto.server.resetPassword";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Procedure(
         "application/json",
     );
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = ();
-    type Err<'de> = ResetPasswordError<'de>;
+    type Output = ();
+    type Err = ResetPasswordError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atproto/server/revoke_app_password.rs b/crates/jacquard-api/src/com_atproto/server/revoke_app_password.rs
index de9bf213..28a0e7dc 100644
--- a/crates/jacquard-api/src/com_atproto/server/revoke_app_password.rs
+++ b/crates/jacquard-api/src/com_atproto/server/revoke_app_password.rs
@@ -40,12 +40,12 @@ impl jacquard_common::IntoStatic for RevokeAppPassword<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for RevokeAppPassword<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for RevokeAppPassword<'de> {
     const NSID: &'static str = "com.atproto.server.revokeAppPassword";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Procedure(
         "application/json",
     );
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = ();
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = ();
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atproto/server/update_email.rs b/crates/jacquard-api/src/com_atproto/server/update_email.rs
index 946c2af2..6a2193a0 100644
--- a/crates/jacquard-api/src/com_atproto/server/update_email.rs
+++ b/crates/jacquard-api/src/com_atproto/server/update_email.rs
@@ -118,12 +118,12 @@ impl jacquard_common::IntoStatic for UpdateEmailError<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for UpdateEmail<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for UpdateEmail<'de> {
     const NSID: &'static str = "com.atproto.server.updateEmail";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Procedure(
         "application/json",
     );
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = ();
-    type Err<'de> = UpdateEmailError<'de>;
+    type Output = ();
+    type Err = UpdateEmailError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atproto/sync/get_blob.rs b/crates/jacquard-api/src/com_atproto/sync/get_blob.rs
index 975755cc..e0650a8a 100644
--- a/crates/jacquard-api/src/com_atproto/sync/get_blob.rs
+++ b/crates/jacquard-api/src/com_atproto/sync/get_blob.rs
@@ -135,10 +135,10 @@ impl jacquard_common::IntoStatic for GetBlobError<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for GetBlob<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for GetBlob<'de> {
     const NSID: &'static str = "com.atproto.sync.getBlob";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "*/*";
-    type Output<'de> = GetBlobOutput<'de>;
-    type Err<'de> = GetBlobError<'de>;
+    type Output = GetBlobOutput<'de>;
+    type Err = GetBlobError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atproto/sync/get_blocks.rs b/crates/jacquard-api/src/com_atproto/sync/get_blocks.rs
index 123d74b6..95536922 100644
--- a/crates/jacquard-api/src/com_atproto/sync/get_blocks.rs
+++ b/crates/jacquard-api/src/com_atproto/sync/get_blocks.rs
@@ -139,10 +139,10 @@ impl jacquard_common::IntoStatic for GetBlocksError<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for GetBlocks<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for GetBlocks<'de> {
     const NSID: &'static str = "com.atproto.sync.getBlocks";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/vnd.ipld.car";
-    type Output<'de> = GetBlocksOutput<'de>;
-    type Err<'de> = GetBlocksError<'de>;
+    type Output = GetBlocksOutput<'de>;
+    type Err = GetBlocksError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atproto/sync/get_checkout.rs b/crates/jacquard-api/src/com_atproto/sync/get_checkout.rs
index 5f5892b5..24c0a353 100644
--- a/crates/jacquard-api/src/com_atproto/sync/get_checkout.rs
+++ b/crates/jacquard-api/src/com_atproto/sync/get_checkout.rs
@@ -43,10 +43,10 @@ impl jacquard_common::IntoStatic for GetCheckoutOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for GetCheckout<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for GetCheckout<'de> {
     const NSID: &'static str = "com.atproto.sync.getCheckout";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/vnd.ipld.car";
-    type Output<'de> = GetCheckoutOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = GetCheckoutOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atproto/sync/get_head.rs b/crates/jacquard-api/src/com_atproto/sync/get_head.rs
index ccd88eaf..ec82428a 100644
--- a/crates/jacquard-api/src/com_atproto/sync/get_head.rs
+++ b/crates/jacquard-api/src/com_atproto/sync/get_head.rs
@@ -91,10 +91,10 @@ impl jacquard_common::IntoStatic for GetHeadError<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for GetHead<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for GetHead<'de> {
     const NSID: &'static str = "com.atproto.sync.getHead";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = GetHeadOutput<'de>;
-    type Err<'de> = GetHeadError<'de>;
+    type Output = GetHeadOutput<'de>;
+    type Err = GetHeadError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atproto/sync/get_host_status.rs b/crates/jacquard-api/src/com_atproto/sync/get_host_status.rs
index 21670173..db07d126 100644
--- a/crates/jacquard-api/src/com_atproto/sync/get_host_status.rs
+++ b/crates/jacquard-api/src/com_atproto/sync/get_host_status.rs
@@ -108,10 +108,10 @@ impl jacquard_common::IntoStatic for GetHostStatusError<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for GetHostStatus<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for GetHostStatus<'de> {
     const NSID: &'static str = "com.atproto.sync.getHostStatus";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = GetHostStatusOutput<'de>;
-    type Err<'de> = GetHostStatusError<'de>;
+    type Output = GetHostStatusOutput<'de>;
+    type Err = GetHostStatusError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atproto/sync/get_latest_commit.rs b/crates/jacquard-api/src/com_atproto/sync/get_latest_commit.rs
index 29e9f3b9..1b9ef3fe 100644
--- a/crates/jacquard-api/src/com_atproto/sync/get_latest_commit.rs
+++ b/crates/jacquard-api/src/com_atproto/sync/get_latest_commit.rs
@@ -133,10 +133,10 @@ impl jacquard_common::IntoStatic for GetLatestCommitError<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for GetLatestCommit<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for GetLatestCommit<'de> {
     const NSID: &'static str = "com.atproto.sync.getLatestCommit";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = GetLatestCommitOutput<'de>;
-    type Err<'de> = GetLatestCommitError<'de>;
+    type Output = GetLatestCommitOutput<'de>;
+    type Err = GetLatestCommitError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atproto/sync/get_record.rs b/crates/jacquard-api/src/com_atproto/sync/get_record.rs
index 5a0c1c43..9051a701 100644
--- a/crates/jacquard-api/src/com_atproto/sync/get_record.rs
+++ b/crates/jacquard-api/src/com_atproto/sync/get_record.rs
@@ -144,10 +144,10 @@ impl jacquard_common::IntoStatic for GetRecordError<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for GetRecord<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for GetRecord<'de> {
     const NSID: &'static str = "com.atproto.sync.getRecord";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/vnd.ipld.car";
-    type Output<'de> = GetRecordOutput<'de>;
-    type Err<'de> = GetRecordError<'de>;
+    type Output = GetRecordOutput<'de>;
+    type Err = GetRecordError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atproto/sync/get_repo.rs b/crates/jacquard-api/src/com_atproto/sync/get_repo.rs
index 2da98ab1..46eeec3f 100644
--- a/crates/jacquard-api/src/com_atproto/sync/get_repo.rs
+++ b/crates/jacquard-api/src/com_atproto/sync/get_repo.rs
@@ -125,10 +125,10 @@ impl jacquard_common::IntoStatic for GetRepoError<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for GetRepo<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for GetRepo<'de> {
     const NSID: &'static str = "com.atproto.sync.getRepo";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/vnd.ipld.car";
-    type Output<'de> = GetRepoOutput<'de>;
-    type Err<'de> = GetRepoError<'de>;
+    type Output = GetRepoOutput<'de>;
+    type Err = GetRepoError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atproto/sync/get_repo_status.rs b/crates/jacquard-api/src/com_atproto/sync/get_repo_status.rs
index 06811706..72a5da72 100644
--- a/crates/jacquard-api/src/com_atproto/sync/get_repo_status.rs
+++ b/crates/jacquard-api/src/com_atproto/sync/get_repo_status.rs
@@ -106,10 +106,10 @@ impl jacquard_common::IntoStatic for GetRepoStatusError<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for GetRepoStatus<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for GetRepoStatus<'de> {
     const NSID: &'static str = "com.atproto.sync.getRepoStatus";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = GetRepoStatusOutput<'de>;
-    type Err<'de> = GetRepoStatusError<'de>;
+    type Output = GetRepoStatusOutput<'de>;
+    type Err = GetRepoStatusError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atproto/sync/list_blobs.rs b/crates/jacquard-api/src/com_atproto/sync/list_blobs.rs
index 48b40124..22802d95 100644
--- a/crates/jacquard-api/src/com_atproto/sync/list_blobs.rs
+++ b/crates/jacquard-api/src/com_atproto/sync/list_blobs.rs
@@ -145,10 +145,10 @@ impl jacquard_common::IntoStatic for ListBlobsError<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for ListBlobs<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for ListBlobs<'de> {
     const NSID: &'static str = "com.atproto.sync.listBlobs";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = ListBlobsOutput<'de>;
-    type Err<'de> = ListBlobsError<'de>;
+    type Output = ListBlobsOutput<'de>;
+    type Err = ListBlobsError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atproto/sync/list_hosts.rs b/crates/jacquard-api/src/com_atproto/sync/list_hosts.rs
index 2be478da..d4b84ef2 100644
--- a/crates/jacquard-api/src/com_atproto/sync/list_hosts.rs
+++ b/crates/jacquard-api/src/com_atproto/sync/list_hosts.rs
@@ -89,10 +89,10 @@ impl jacquard_common::IntoStatic for ListHostsOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for ListHosts<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for ListHosts<'de> {
     const NSID: &'static str = "com.atproto.sync.listHosts";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = ListHostsOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = ListHostsOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atproto/sync/list_repos.rs b/crates/jacquard-api/src/com_atproto/sync/list_repos.rs
index 95b5d556..54227450 100644
--- a/crates/jacquard-api/src/com_atproto/sync/list_repos.rs
+++ b/crates/jacquard-api/src/com_atproto/sync/list_repos.rs
@@ -58,12 +58,12 @@ impl jacquard_common::IntoStatic for ListReposOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for ListRepos<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for ListRepos<'de> {
     const NSID: &'static str = "com.atproto.sync.listRepos";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = ListReposOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = ListReposOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
 
 #[jacquard_derive::lexicon]
diff --git a/crates/jacquard-api/src/com_atproto/sync/list_repos_by_collection.rs b/crates/jacquard-api/src/com_atproto/sync/list_repos_by_collection.rs
index 89905261..6f1348f9 100644
--- a/crates/jacquard-api/src/com_atproto/sync/list_repos_by_collection.rs
+++ b/crates/jacquard-api/src/com_atproto/sync/list_repos_by_collection.rs
@@ -61,12 +61,12 @@ impl jacquard_common::IntoStatic for ListReposByCollectionOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for ListReposByCollection<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for ListReposByCollection<'de> {
     const NSID: &'static str = "com.atproto.sync.listReposByCollection";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = ListReposByCollectionOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = ListReposByCollectionOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
 
 #[jacquard_derive::lexicon]
diff --git a/crates/jacquard-api/src/com_atproto/sync/notify_of_update.rs b/crates/jacquard-api/src/com_atproto/sync/notify_of_update.rs
index b4f2fe6e..741e5b34 100644
--- a/crates/jacquard-api/src/com_atproto/sync/notify_of_update.rs
+++ b/crates/jacquard-api/src/com_atproto/sync/notify_of_update.rs
@@ -41,12 +41,12 @@ impl jacquard_common::IntoStatic for NotifyOfUpdate<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for NotifyOfUpdate<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for NotifyOfUpdate<'de> {
     const NSID: &'static str = "com.atproto.sync.notifyOfUpdate";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Procedure(
         "application/json",
     );
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = ();
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = ();
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atproto/sync/request_crawl.rs b/crates/jacquard-api/src/com_atproto/sync/request_crawl.rs
index d07ccd61..c857e097 100644
--- a/crates/jacquard-api/src/com_atproto/sync/request_crawl.rs
+++ b/crates/jacquard-api/src/com_atproto/sync/request_crawl.rs
@@ -86,12 +86,12 @@ impl jacquard_common::IntoStatic for RequestCrawlError<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for RequestCrawl<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for RequestCrawl<'de> {
     const NSID: &'static str = "com.atproto.sync.requestCrawl";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Procedure(
         "application/json",
     );
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = ();
-    type Err<'de> = RequestCrawlError<'de>;
+    type Output = ();
+    type Err = RequestCrawlError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atproto/temp/add_reserved_handle.rs b/crates/jacquard-api/src/com_atproto/temp/add_reserved_handle.rs
index 59edc9bb..569dab96 100644
--- a/crates/jacquard-api/src/com_atproto/temp/add_reserved_handle.rs
+++ b/crates/jacquard-api/src/com_atproto/temp/add_reserved_handle.rs
@@ -53,12 +53,12 @@ impl jacquard_common::IntoStatic for AddReservedHandleOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for AddReservedHandle<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for AddReservedHandle<'de> {
     const NSID: &'static str = "com.atproto.temp.addReservedHandle";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Procedure(
         "application/json",
     );
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = AddReservedHandleOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = AddReservedHandleOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atproto/temp/check_handle_availability.rs b/crates/jacquard-api/src/com_atproto/temp/check_handle_availability.rs
index 0f2aa419..03b7ae08 100644
--- a/crates/jacquard-api/src/com_atproto/temp/check_handle_availability.rs
+++ b/crates/jacquard-api/src/com_atproto/temp/check_handle_availability.rs
@@ -124,12 +124,13 @@ impl jacquard_common::IntoStatic for CheckHandleAvailabilityError<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for CheckHandleAvailability<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de>
+for CheckHandleAvailability<'de> {
     const NSID: &'static str = "com.atproto.temp.checkHandleAvailability";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = CheckHandleAvailabilityOutput<'de>;
-    type Err<'de> = CheckHandleAvailabilityError<'de>;
+    type Output = CheckHandleAvailabilityOutput<'de>;
+    type Err = CheckHandleAvailabilityError<'de>;
 }
 
 ///Indicates the provided handle is available.
diff --git a/crates/jacquard-api/src/com_atproto/temp/check_signup_queue.rs b/crates/jacquard-api/src/com_atproto/temp/check_signup_queue.rs
index 47798e45..a956b8c1 100644
--- a/crates/jacquard-api/src/com_atproto/temp/check_signup_queue.rs
+++ b/crates/jacquard-api/src/com_atproto/temp/check_signup_queue.rs
@@ -29,12 +29,12 @@ impl jacquard_common::IntoStatic for CheckSignupQueueOutput<'_> {
 }
 
 /// XRPC request marker type
-#[derive(Debug, Clone, Copy, PartialEq, Eq, serde::Serialize)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
 pub struct CheckSignupQueue;
-impl jacquard_common::types::xrpc::XrpcRequest for CheckSignupQueue {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for CheckSignupQueue {
     const NSID: &'static str = "com.atproto.temp.checkSignupQueue";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = CheckSignupQueueOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = CheckSignupQueueOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atproto/temp/dereference_scope.rs b/crates/jacquard-api/src/com_atproto/temp/dereference_scope.rs
index 5cc74583..9632f826 100644
--- a/crates/jacquard-api/src/com_atproto/temp/dereference_scope.rs
+++ b/crates/jacquard-api/src/com_atproto/temp/dereference_scope.rs
@@ -98,10 +98,10 @@ impl jacquard_common::IntoStatic for DereferenceScopeError<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for DereferenceScope<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for DereferenceScope<'de> {
     const NSID: &'static str = "com.atproto.temp.dereferenceScope";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = DereferenceScopeOutput<'de>;
-    type Err<'de> = DereferenceScopeError<'de>;
+    type Output = DereferenceScopeOutput<'de>;
+    type Err = DereferenceScopeError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atproto/temp/fetch_labels.rs b/crates/jacquard-api/src/com_atproto/temp/fetch_labels.rs
index caa712a8..0eab4765 100644
--- a/crates/jacquard-api/src/com_atproto/temp/fetch_labels.rs
+++ b/crates/jacquard-api/src/com_atproto/temp/fetch_labels.rs
@@ -49,10 +49,10 @@ impl jacquard_common::IntoStatic for FetchLabelsOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for FetchLabels {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for FetchLabels {
     const NSID: &'static str = "com.atproto.temp.fetchLabels";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = FetchLabelsOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = FetchLabelsOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atproto/temp/request_phone_verification.rs b/crates/jacquard-api/src/com_atproto/temp/request_phone_verification.rs
index b810a691..1d46cb2d 100644
--- a/crates/jacquard-api/src/com_atproto/temp/request_phone_verification.rs
+++ b/crates/jacquard-api/src/com_atproto/temp/request_phone_verification.rs
@@ -40,12 +40,13 @@ impl jacquard_common::IntoStatic for RequestPhoneVerification<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for RequestPhoneVerification<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de>
+for RequestPhoneVerification<'de> {
     const NSID: &'static str = "com.atproto.temp.requestPhoneVerification";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Procedure(
         "application/json",
     );
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = ();
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = ();
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/com_atproto/temp/revoke_account_credentials.rs b/crates/jacquard-api/src/com_atproto/temp/revoke_account_credentials.rs
index b66ca2c5..d1a60e5d 100644
--- a/crates/jacquard-api/src/com_atproto/temp/revoke_account_credentials.rs
+++ b/crates/jacquard-api/src/com_atproto/temp/revoke_account_credentials.rs
@@ -39,12 +39,13 @@ impl jacquard_common::IntoStatic for RevokeAccountCredentials<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for RevokeAccountCredentials<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de>
+for RevokeAccountCredentials<'de> {
     const NSID: &'static str = "com.atproto.temp.revokeAccountCredentials";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Procedure(
         "application/json",
     );
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = ();
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = ();
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/tools_ozone/communication/create_template.rs b/crates/jacquard-api/src/tools_ozone/communication/create_template.rs
index 5fbc455a..2d0ea66b 100644
--- a/crates/jacquard-api/src/tools_ozone/communication/create_template.rs
+++ b/crates/jacquard-api/src/tools_ozone/communication/create_template.rs
@@ -126,12 +126,12 @@ impl jacquard_common::IntoStatic for CreateTemplateError<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for CreateTemplate<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for CreateTemplate<'de> {
     const NSID: &'static str = "tools.ozone.communication.createTemplate";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Procedure(
         "application/json",
     );
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = CreateTemplateOutput<'de>;
-    type Err<'de> = CreateTemplateError<'de>;
+    type Output = CreateTemplateOutput<'de>;
+    type Err = CreateTemplateError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/tools_ozone/communication/delete_template.rs b/crates/jacquard-api/src/tools_ozone/communication/delete_template.rs
index 04f9a8b8..634fd11d 100644
--- a/crates/jacquard-api/src/tools_ozone/communication/delete_template.rs
+++ b/crates/jacquard-api/src/tools_ozone/communication/delete_template.rs
@@ -40,12 +40,12 @@ impl jacquard_common::IntoStatic for DeleteTemplate<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for DeleteTemplate<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for DeleteTemplate<'de> {
     const NSID: &'static str = "tools.ozone.communication.deleteTemplate";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Procedure(
         "application/json",
     );
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = ();
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = ();
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/tools_ozone/communication/list_templates.rs b/crates/jacquard-api/src/tools_ozone/communication/list_templates.rs
index 7db8b247..bad09864 100644
--- a/crates/jacquard-api/src/tools_ozone/communication/list_templates.rs
+++ b/crates/jacquard-api/src/tools_ozone/communication/list_templates.rs
@@ -26,12 +26,12 @@ impl jacquard_common::IntoStatic for ListTemplatesOutput<'_> {
 }
 
 /// XRPC request marker type
-#[derive(Debug, Clone, Copy, PartialEq, Eq, serde::Serialize)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
 pub struct ListTemplates;
-impl jacquard_common::types::xrpc::XrpcRequest for ListTemplates {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for ListTemplates {
     const NSID: &'static str = "tools.ozone.communication.listTemplates";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = ListTemplatesOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = ListTemplatesOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/tools_ozone/communication/update_template.rs b/crates/jacquard-api/src/tools_ozone/communication/update_template.rs
index 3bd4f996..03493c1d 100644
--- a/crates/jacquard-api/src/tools_ozone/communication/update_template.rs
+++ b/crates/jacquard-api/src/tools_ozone/communication/update_template.rs
@@ -137,12 +137,12 @@ impl jacquard_common::IntoStatic for UpdateTemplateError<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for UpdateTemplate<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for UpdateTemplate<'de> {
     const NSID: &'static str = "tools.ozone.communication.updateTemplate";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Procedure(
         "application/json",
     );
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = UpdateTemplateOutput<'de>;
-    type Err<'de> = UpdateTemplateError<'de>;
+    type Output = UpdateTemplateOutput<'de>;
+    type Err = UpdateTemplateError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/tools_ozone/hosting/get_account_history.rs b/crates/jacquard-api/src/tools_ozone/hosting/get_account_history.rs
index 7250dd21..9491b633 100644
--- a/crates/jacquard-api/src/tools_ozone/hosting/get_account_history.rs
+++ b/crates/jacquard-api/src/tools_ozone/hosting/get_account_history.rs
@@ -181,12 +181,12 @@ impl jacquard_common::IntoStatic for GetAccountHistoryOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for GetAccountHistory<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for GetAccountHistory<'de> {
     const NSID: &'static str = "tools.ozone.hosting.getAccountHistory";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = GetAccountHistoryOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = GetAccountHistoryOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
 
 #[jacquard_derive::lexicon]
diff --git a/crates/jacquard-api/src/tools_ozone/moderation/emit_event.rs b/crates/jacquard-api/src/tools_ozone/moderation/emit_event.rs
index 8f091f3c..c490b821 100644
--- a/crates/jacquard-api/src/tools_ozone/moderation/emit_event.rs
+++ b/crates/jacquard-api/src/tools_ozone/moderation/emit_event.rs
@@ -310,12 +310,12 @@ impl jacquard_common::IntoStatic for EmitEventError<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for EmitEvent<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for EmitEvent<'de> {
     const NSID: &'static str = "tools.ozone.moderation.emitEvent";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Procedure(
         "application/json",
     );
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = EmitEventOutput<'de>;
-    type Err<'de> = EmitEventError<'de>;
+    type Output = EmitEventOutput<'de>;
+    type Err = EmitEventError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/tools_ozone/moderation/get_account_timeline.rs b/crates/jacquard-api/src/tools_ozone/moderation/get_account_timeline.rs
index 893a2df1..fe9db3ec 100644
--- a/crates/jacquard-api/src/tools_ozone/moderation/get_account_timeline.rs
+++ b/crates/jacquard-api/src/tools_ozone/moderation/get_account_timeline.rs
@@ -95,12 +95,12 @@ impl jacquard_common::IntoStatic for GetAccountTimelineError<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for GetAccountTimeline<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for GetAccountTimeline<'de> {
     const NSID: &'static str = "tools.ozone.moderation.getAccountTimeline";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = GetAccountTimelineOutput<'de>;
-    type Err<'de> = GetAccountTimelineError<'de>;
+    type Output = GetAccountTimelineOutput<'de>;
+    type Err = GetAccountTimelineError<'de>;
 }
 
 #[jacquard_derive::lexicon]
diff --git a/crates/jacquard-api/src/tools_ozone/moderation/get_event.rs b/crates/jacquard-api/src/tools_ozone/moderation/get_event.rs
index 00aa7d8d..e5016535 100644
--- a/crates/jacquard-api/src/tools_ozone/moderation/get_event.rs
+++ b/crates/jacquard-api/src/tools_ozone/moderation/get_event.rs
@@ -46,10 +46,10 @@ impl jacquard_common::IntoStatic for GetEventOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for GetEvent {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for GetEvent {
     const NSID: &'static str = "tools.ozone.moderation.getEvent";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = GetEventOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = GetEventOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/tools_ozone/moderation/get_record.rs b/crates/jacquard-api/src/tools_ozone/moderation/get_record.rs
index 11125c89..545b36c7 100644
--- a/crates/jacquard-api/src/tools_ozone/moderation/get_record.rs
+++ b/crates/jacquard-api/src/tools_ozone/moderation/get_record.rs
@@ -98,10 +98,10 @@ impl jacquard_common::IntoStatic for GetRecordError<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for GetRecord<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for GetRecord<'de> {
     const NSID: &'static str = "tools.ozone.moderation.getRecord";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = GetRecordOutput<'de>;
-    type Err<'de> = GetRecordError<'de>;
+    type Output = GetRecordOutput<'de>;
+    type Err = GetRecordError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/tools_ozone/moderation/get_records.rs b/crates/jacquard-api/src/tools_ozone/moderation/get_records.rs
index 2ef5af01..6ee66b7f 100644
--- a/crates/jacquard-api/src/tools_ozone/moderation/get_records.rs
+++ b/crates/jacquard-api/src/tools_ozone/moderation/get_records.rs
@@ -48,10 +48,10 @@ impl jacquard_common::IntoStatic for GetRecordsOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for GetRecords<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for GetRecords<'de> {
     const NSID: &'static str = "tools.ozone.moderation.getRecords";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = GetRecordsOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = GetRecordsOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/tools_ozone/moderation/get_repo.rs b/crates/jacquard-api/src/tools_ozone/moderation/get_repo.rs
index 9a56ccad..1bfad7b6 100644
--- a/crates/jacquard-api/src/tools_ozone/moderation/get_repo.rs
+++ b/crates/jacquard-api/src/tools_ozone/moderation/get_repo.rs
@@ -92,10 +92,10 @@ impl jacquard_common::IntoStatic for GetRepoError<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for GetRepo<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for GetRepo<'de> {
     const NSID: &'static str = "tools.ozone.moderation.getRepo";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = GetRepoOutput<'de>;
-    type Err<'de> = GetRepoError<'de>;
+    type Output = GetRepoOutput<'de>;
+    type Err = GetRepoError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/tools_ozone/moderation/get_reporter_stats.rs b/crates/jacquard-api/src/tools_ozone/moderation/get_reporter_stats.rs
index 19903c07..32669a12 100644
--- a/crates/jacquard-api/src/tools_ozone/moderation/get_reporter_stats.rs
+++ b/crates/jacquard-api/src/tools_ozone/moderation/get_reporter_stats.rs
@@ -48,10 +48,10 @@ impl jacquard_common::IntoStatic for GetReporterStatsOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for GetReporterStats<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for GetReporterStats<'de> {
     const NSID: &'static str = "tools.ozone.moderation.getReporterStats";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = GetReporterStatsOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = GetReporterStatsOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/tools_ozone/moderation/get_repos.rs b/crates/jacquard-api/src/tools_ozone/moderation/get_repos.rs
index 0016203c..635bf9a0 100644
--- a/crates/jacquard-api/src/tools_ozone/moderation/get_repos.rs
+++ b/crates/jacquard-api/src/tools_ozone/moderation/get_repos.rs
@@ -48,10 +48,10 @@ impl jacquard_common::IntoStatic for GetReposOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for GetRepos<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for GetRepos<'de> {
     const NSID: &'static str = "tools.ozone.moderation.getRepos";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = GetReposOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = GetReposOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/tools_ozone/moderation/get_subjects.rs b/crates/jacquard-api/src/tools_ozone/moderation/get_subjects.rs
index c3759b94..d85b253d 100644
--- a/crates/jacquard-api/src/tools_ozone/moderation/get_subjects.rs
+++ b/crates/jacquard-api/src/tools_ozone/moderation/get_subjects.rs
@@ -48,10 +48,10 @@ impl jacquard_common::IntoStatic for GetSubjectsOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for GetSubjects<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for GetSubjects<'de> {
     const NSID: &'static str = "tools.ozone.moderation.getSubjects";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = GetSubjectsOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = GetSubjectsOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/tools_ozone/moderation/query_events.rs b/crates/jacquard-api/src/tools_ozone/moderation/query_events.rs
index 74626a77..007a2eb3 100644
--- a/crates/jacquard-api/src/tools_ozone/moderation/query_events.rs
+++ b/crates/jacquard-api/src/tools_ozone/moderation/query_events.rs
@@ -141,10 +141,10 @@ impl jacquard_common::IntoStatic for QueryEventsOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for QueryEvents<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for QueryEvents<'de> {
     const NSID: &'static str = "tools.ozone.moderation.queryEvents";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = QueryEventsOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = QueryEventsOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/tools_ozone/moderation/query_statuses.rs b/crates/jacquard-api/src/tools_ozone/moderation/query_statuses.rs
index 3052d578..71fae391 100644
--- a/crates/jacquard-api/src/tools_ozone/moderation/query_statuses.rs
+++ b/crates/jacquard-api/src/tools_ozone/moderation/query_statuses.rs
@@ -191,10 +191,10 @@ impl jacquard_common::IntoStatic for QueryStatusesOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for QueryStatuses<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for QueryStatuses<'de> {
     const NSID: &'static str = "tools.ozone.moderation.queryStatuses";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = QueryStatusesOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = QueryStatusesOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/tools_ozone/moderation/search_repos.rs b/crates/jacquard-api/src/tools_ozone/moderation/search_repos.rs
index faa044ff..b25d780f 100644
--- a/crates/jacquard-api/src/tools_ozone/moderation/search_repos.rs
+++ b/crates/jacquard-api/src/tools_ozone/moderation/search_repos.rs
@@ -68,10 +68,10 @@ impl jacquard_common::IntoStatic for SearchReposOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for SearchRepos<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for SearchRepos<'de> {
     const NSID: &'static str = "tools.ozone.moderation.searchRepos";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = SearchReposOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = SearchReposOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/tools_ozone/safelink/add_rule.rs b/crates/jacquard-api/src/tools_ozone/safelink/add_rule.rs
index a7bd606d..f8fa0dd7 100644
--- a/crates/jacquard-api/src/tools_ozone/safelink/add_rule.rs
+++ b/crates/jacquard-api/src/tools_ozone/safelink/add_rule.rs
@@ -137,12 +137,12 @@ impl jacquard_common::IntoStatic for AddRuleError<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for AddRule<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for AddRule<'de> {
     const NSID: &'static str = "tools.ozone.safelink.addRule";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Procedure(
         "application/json",
     );
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = AddRuleOutput<'de>;
-    type Err<'de> = AddRuleError<'de>;
+    type Output = AddRuleOutput<'de>;
+    type Err = AddRuleError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/tools_ozone/safelink/query_events.rs b/crates/jacquard-api/src/tools_ozone/safelink/query_events.rs
index 0ad2b5f0..4a81c642 100644
--- a/crates/jacquard-api/src/tools_ozone/safelink/query_events.rs
+++ b/crates/jacquard-api/src/tools_ozone/safelink/query_events.rs
@@ -86,12 +86,12 @@ impl jacquard_common::IntoStatic for QueryEventsOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for QueryEvents<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for QueryEvents<'de> {
     const NSID: &'static str = "tools.ozone.safelink.queryEvents";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Procedure(
         "application/json",
     );
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = QueryEventsOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = QueryEventsOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/tools_ozone/safelink/query_rules.rs b/crates/jacquard-api/src/tools_ozone/safelink/query_rules.rs
index cfb81cde..6661191b 100644
--- a/crates/jacquard-api/src/tools_ozone/safelink/query_rules.rs
+++ b/crates/jacquard-api/src/tools_ozone/safelink/query_rules.rs
@@ -102,12 +102,12 @@ impl jacquard_common::IntoStatic for QueryRulesOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for QueryRules<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for QueryRules<'de> {
     const NSID: &'static str = "tools.ozone.safelink.queryRules";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Procedure(
         "application/json",
     );
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = QueryRulesOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = QueryRulesOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/tools_ozone/safelink/remove_rule.rs b/crates/jacquard-api/src/tools_ozone/safelink/remove_rule.rs
index 798039a5..3c171272 100644
--- a/crates/jacquard-api/src/tools_ozone/safelink/remove_rule.rs
+++ b/crates/jacquard-api/src/tools_ozone/safelink/remove_rule.rs
@@ -120,12 +120,12 @@ impl jacquard_common::IntoStatic for RemoveRuleError<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for RemoveRule<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for RemoveRule<'de> {
     const NSID: &'static str = "tools.ozone.safelink.removeRule";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Procedure(
         "application/json",
     );
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = RemoveRuleOutput<'de>;
-    type Err<'de> = RemoveRuleError<'de>;
+    type Output = RemoveRuleOutput<'de>;
+    type Err = RemoveRuleError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/tools_ozone/safelink/update_rule.rs b/crates/jacquard-api/src/tools_ozone/safelink/update_rule.rs
index 8959c6e3..844c8d73 100644
--- a/crates/jacquard-api/src/tools_ozone/safelink/update_rule.rs
+++ b/crates/jacquard-api/src/tools_ozone/safelink/update_rule.rs
@@ -126,12 +126,12 @@ impl jacquard_common::IntoStatic for UpdateRuleError<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for UpdateRule<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for UpdateRule<'de> {
     const NSID: &'static str = "tools.ozone.safelink.updateRule";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Procedure(
         "application/json",
     );
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = UpdateRuleOutput<'de>;
-    type Err<'de> = UpdateRuleError<'de>;
+    type Output = UpdateRuleOutput<'de>;
+    type Err = UpdateRuleError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/tools_ozone/server/get_config.rs b/crates/jacquard-api/src/tools_ozone/server/get_config.rs
index 99369701..e2f1fb67 100644
--- a/crates/jacquard-api/src/tools_ozone/server/get_config.rs
+++ b/crates/jacquard-api/src/tools_ozone/server/get_config.rs
@@ -46,14 +46,14 @@ impl jacquard_common::IntoStatic for GetConfigOutput<'_> {
 }
 
 /// XRPC request marker type
-#[derive(Debug, Clone, Copy, PartialEq, Eq, serde::Serialize)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
 pub struct GetConfig;
-impl jacquard_common::types::xrpc::XrpcRequest for GetConfig {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for GetConfig {
     const NSID: &'static str = "tools.ozone.server.getConfig";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = GetConfigOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = GetConfigOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
 
 #[jacquard_derive::lexicon]
diff --git a/crates/jacquard-api/src/tools_ozone/set/add_values.rs b/crates/jacquard-api/src/tools_ozone/set/add_values.rs
index e4929dae..99cc4655 100644
--- a/crates/jacquard-api/src/tools_ozone/set/add_values.rs
+++ b/crates/jacquard-api/src/tools_ozone/set/add_values.rs
@@ -45,12 +45,12 @@ impl jacquard_common::IntoStatic for AddValues<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for AddValues<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for AddValues<'de> {
     const NSID: &'static str = "tools.ozone.set.addValues";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Procedure(
         "application/json",
     );
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = ();
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = ();
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/tools_ozone/set/delete_set.rs b/crates/jacquard-api/src/tools_ozone/set/delete_set.rs
index 41e0f9c7..091efcba 100644
--- a/crates/jacquard-api/src/tools_ozone/set/delete_set.rs
+++ b/crates/jacquard-api/src/tools_ozone/set/delete_set.rs
@@ -100,12 +100,12 @@ impl jacquard_common::IntoStatic for DeleteSetError<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for DeleteSet<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for DeleteSet<'de> {
     const NSID: &'static str = "tools.ozone.set.deleteSet";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Procedure(
         "application/json",
     );
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = DeleteSetOutput<'de>;
-    type Err<'de> = DeleteSetError<'de>;
+    type Output = DeleteSetOutput<'de>;
+    type Err = DeleteSetError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/tools_ozone/set/delete_values.rs b/crates/jacquard-api/src/tools_ozone/set/delete_values.rs
index 4dea8a26..7fcf7c58 100644
--- a/crates/jacquard-api/src/tools_ozone/set/delete_values.rs
+++ b/crates/jacquard-api/src/tools_ozone/set/delete_values.rs
@@ -91,12 +91,12 @@ impl jacquard_common::IntoStatic for DeleteValuesError<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for DeleteValues<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for DeleteValues<'de> {
     const NSID: &'static str = "tools.ozone.set.deleteValues";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Procedure(
         "application/json",
     );
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = ();
-    type Err<'de> = DeleteValuesError<'de>;
+    type Output = ();
+    type Err = DeleteValuesError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/tools_ozone/set/get_values.rs b/crates/jacquard-api/src/tools_ozone/set/get_values.rs
index 953df0ab..7c1922a6 100644
--- a/crates/jacquard-api/src/tools_ozone/set/get_values.rs
+++ b/crates/jacquard-api/src/tools_ozone/set/get_values.rs
@@ -111,10 +111,10 @@ impl jacquard_common::IntoStatic for GetValuesError<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for GetValues<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for GetValues<'de> {
     const NSID: &'static str = "tools.ozone.set.getValues";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = GetValuesOutput<'de>;
-    type Err<'de> = GetValuesError<'de>;
+    type Output = GetValuesOutput<'de>;
+    type Err = GetValuesError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/tools_ozone/set/query_sets.rs b/crates/jacquard-api/src/tools_ozone/set/query_sets.rs
index 36052c70..4785cd47 100644
--- a/crates/jacquard-api/src/tools_ozone/set/query_sets.rs
+++ b/crates/jacquard-api/src/tools_ozone/set/query_sets.rs
@@ -75,10 +75,10 @@ impl jacquard_common::IntoStatic for QuerySetsOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for QuerySets<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for QuerySets<'de> {
     const NSID: &'static str = "tools.ozone.set.querySets";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = QuerySetsOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = QuerySetsOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/tools_ozone/set/upsert_set.rs b/crates/jacquard-api/src/tools_ozone/set/upsert_set.rs
index 539f759e..540bc92b 100644
--- a/crates/jacquard-api/src/tools_ozone/set/upsert_set.rs
+++ b/crates/jacquard-api/src/tools_ozone/set/upsert_set.rs
@@ -59,12 +59,12 @@ impl jacquard_common::IntoStatic for UpsertSetOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for UpsertSet<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for UpsertSet<'de> {
     const NSID: &'static str = "tools.ozone.set.upsertSet";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Procedure(
         "application/json",
     );
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = UpsertSetOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = UpsertSetOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/tools_ozone/setting/list_options.rs b/crates/jacquard-api/src/tools_ozone/setting/list_options.rs
index c42f1fad..c7057070 100644
--- a/crates/jacquard-api/src/tools_ozone/setting/list_options.rs
+++ b/crates/jacquard-api/src/tools_ozone/setting/list_options.rs
@@ -73,10 +73,10 @@ impl jacquard_common::IntoStatic for ListOptionsOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for ListOptions<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for ListOptions<'de> {
     const NSID: &'static str = "tools.ozone.setting.listOptions";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = ListOptionsOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = ListOptionsOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/tools_ozone/setting/remove_options.rs b/crates/jacquard-api/src/tools_ozone/setting/remove_options.rs
index b2910183..332e91dd 100644
--- a/crates/jacquard-api/src/tools_ozone/setting/remove_options.rs
+++ b/crates/jacquard-api/src/tools_ozone/setting/remove_options.rs
@@ -56,12 +56,12 @@ impl jacquard_common::IntoStatic for RemoveOptionsOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for RemoveOptions<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for RemoveOptions<'de> {
     const NSID: &'static str = "tools.ozone.setting.removeOptions";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Procedure(
         "application/json",
     );
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = RemoveOptionsOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = RemoveOptionsOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/tools_ozone/setting/upsert_option.rs b/crates/jacquard-api/src/tools_ozone/setting/upsert_option.rs
index d2771272..ea580d70 100644
--- a/crates/jacquard-api/src/tools_ozone/setting/upsert_option.rs
+++ b/crates/jacquard-api/src/tools_ozone/setting/upsert_option.rs
@@ -74,12 +74,12 @@ impl jacquard_common::IntoStatic for UpsertOptionOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for UpsertOption<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for UpsertOption<'de> {
     const NSID: &'static str = "tools.ozone.setting.upsertOption";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Procedure(
         "application/json",
     );
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = UpsertOptionOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = UpsertOptionOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/tools_ozone/signature/find_correlation.rs b/crates/jacquard-api/src/tools_ozone/signature/find_correlation.rs
index edc28007..aff8e93c 100644
--- a/crates/jacquard-api/src/tools_ozone/signature/find_correlation.rs
+++ b/crates/jacquard-api/src/tools_ozone/signature/find_correlation.rs
@@ -48,10 +48,10 @@ impl jacquard_common::IntoStatic for FindCorrelationOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for FindCorrelation<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for FindCorrelation<'de> {
     const NSID: &'static str = "tools.ozone.signature.findCorrelation";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = FindCorrelationOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = FindCorrelationOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/tools_ozone/signature/find_related_accounts.rs b/crates/jacquard-api/src/tools_ozone/signature/find_related_accounts.rs
index c4017a17..03e914f3 100644
--- a/crates/jacquard-api/src/tools_ozone/signature/find_related_accounts.rs
+++ b/crates/jacquard-api/src/tools_ozone/signature/find_related_accounts.rs
@@ -61,12 +61,12 @@ impl jacquard_common::IntoStatic for FindRelatedAccountsOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for FindRelatedAccounts<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for FindRelatedAccounts<'de> {
     const NSID: &'static str = "tools.ozone.signature.findRelatedAccounts";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = FindRelatedAccountsOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = FindRelatedAccountsOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
 
 #[jacquard_derive::lexicon]
diff --git a/crates/jacquard-api/src/tools_ozone/signature/search_accounts.rs b/crates/jacquard-api/src/tools_ozone/signature/search_accounts.rs
index 4164cfa9..7d723af6 100644
--- a/crates/jacquard-api/src/tools_ozone/signature/search_accounts.rs
+++ b/crates/jacquard-api/src/tools_ozone/signature/search_accounts.rs
@@ -61,10 +61,10 @@ impl jacquard_common::IntoStatic for SearchAccountsOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for SearchAccounts<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for SearchAccounts<'de> {
     const NSID: &'static str = "tools.ozone.signature.searchAccounts";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = SearchAccountsOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = SearchAccountsOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/tools_ozone/team/add_member.rs b/crates/jacquard-api/src/tools_ozone/team/add_member.rs
index 8462427d..8b0a9196 100644
--- a/crates/jacquard-api/src/tools_ozone/team/add_member.rs
+++ b/crates/jacquard-api/src/tools_ozone/team/add_member.rs
@@ -108,12 +108,12 @@ impl jacquard_common::IntoStatic for AddMemberError<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for AddMember<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for AddMember<'de> {
     const NSID: &'static str = "tools.ozone.team.addMember";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Procedure(
         "application/json",
     );
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = AddMemberOutput<'de>;
-    type Err<'de> = AddMemberError<'de>;
+    type Output = AddMemberOutput<'de>;
+    type Err = AddMemberError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/tools_ozone/team/delete_member.rs b/crates/jacquard-api/src/tools_ozone/team/delete_member.rs
index f451f9a6..ef67ae7b 100644
--- a/crates/jacquard-api/src/tools_ozone/team/delete_member.rs
+++ b/crates/jacquard-api/src/tools_ozone/team/delete_member.rs
@@ -98,12 +98,12 @@ impl jacquard_common::IntoStatic for DeleteMemberError<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for DeleteMember<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for DeleteMember<'de> {
     const NSID: &'static str = "tools.ozone.team.deleteMember";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Procedure(
         "application/json",
     );
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = ();
-    type Err<'de> = DeleteMemberError<'de>;
+    type Output = ();
+    type Err = DeleteMemberError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/tools_ozone/team/list_members.rs b/crates/jacquard-api/src/tools_ozone/team/list_members.rs
index 9df2f75d..5d9bfd11 100644
--- a/crates/jacquard-api/src/tools_ozone/team/list_members.rs
+++ b/crates/jacquard-api/src/tools_ozone/team/list_members.rs
@@ -70,10 +70,10 @@ impl jacquard_common::IntoStatic for ListMembersOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for ListMembers<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for ListMembers<'de> {
     const NSID: &'static str = "tools.ozone.team.listMembers";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = ListMembersOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = ListMembersOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/tools_ozone/team/update_member.rs b/crates/jacquard-api/src/tools_ozone/team/update_member.rs
index 23396b83..2d150495 100644
--- a/crates/jacquard-api/src/tools_ozone/team/update_member.rs
+++ b/crates/jacquard-api/src/tools_ozone/team/update_member.rs
@@ -112,12 +112,12 @@ impl jacquard_common::IntoStatic for UpdateMemberError<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for UpdateMember<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for UpdateMember<'de> {
     const NSID: &'static str = "tools.ozone.team.updateMember";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Procedure(
         "application/json",
     );
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = UpdateMemberOutput<'de>;
-    type Err<'de> = UpdateMemberError<'de>;
+    type Output = UpdateMemberOutput<'de>;
+    type Err = UpdateMemberError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/tools_ozone/verification/grant_verifications.rs b/crates/jacquard-api/src/tools_ozone/verification/grant_verifications.rs
index 79082409..163ff5fc 100644
--- a/crates/jacquard-api/src/tools_ozone/verification/grant_verifications.rs
+++ b/crates/jacquard-api/src/tools_ozone/verification/grant_verifications.rs
@@ -85,14 +85,14 @@ impl jacquard_common::IntoStatic for GrantVerificationsOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for GrantVerifications<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for GrantVerifications<'de> {
     const NSID: &'static str = "tools.ozone.verification.grantVerifications";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Procedure(
         "application/json",
     );
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = GrantVerificationsOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = GrantVerificationsOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
 
 #[jacquard_derive::lexicon]
diff --git a/crates/jacquard-api/src/tools_ozone/verification/list_verifications.rs b/crates/jacquard-api/src/tools_ozone/verification/list_verifications.rs
index 2d7341a7..a98bf59c 100644
--- a/crates/jacquard-api/src/tools_ozone/verification/list_verifications.rs
+++ b/crates/jacquard-api/src/tools_ozone/verification/list_verifications.rs
@@ -81,10 +81,10 @@ impl jacquard_common::IntoStatic for ListVerificationsOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for ListVerifications<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for ListVerifications<'de> {
     const NSID: &'static str = "tools.ozone.verification.listVerifications";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Query;
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = ListVerificationsOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = ListVerificationsOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
\ No newline at end of file
diff --git a/crates/jacquard-api/src/tools_ozone/verification/revoke_verifications.rs b/crates/jacquard-api/src/tools_ozone/verification/revoke_verifications.rs
index 38b64d5f..b41b9a70 100644
--- a/crates/jacquard-api/src/tools_ozone/verification/revoke_verifications.rs
+++ b/crates/jacquard-api/src/tools_ozone/verification/revoke_verifications.rs
@@ -69,14 +69,14 @@ impl jacquard_common::IntoStatic for RevokeVerificationsOutput<'_> {
     }
 }
 
-impl jacquard_common::types::xrpc::XrpcRequest for RevokeVerifications<'_> {
+impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for RevokeVerifications<'de> {
     const NSID: &'static str = "tools.ozone.verification.revokeVerifications";
     const METHOD: jacquard_common::types::xrpc::XrpcMethod = jacquard_common::types::xrpc::XrpcMethod::Procedure(
         "application/json",
     );
     const OUTPUT_ENCODING: &'static str = "application/json";
-    type Output<'de> = RevokeVerificationsOutput<'de>;
-    type Err<'de> = jacquard_common::types::xrpc::GenericError<'de>;
+    type Output = RevokeVerificationsOutput<'de>;
+    type Err = jacquard_common::types::xrpc::GenericError<'de>;
 }
 
 ///Error object for failed revocations
diff --git a/crates/jacquard-axum/Cargo.toml b/crates/jacquard-axum/Cargo.toml
new file mode 100644
index 00000000..a86fe9ba
--- /dev/null
+++ b/crates/jacquard-axum/Cargo.toml
@@ -0,0 +1,29 @@
+[package]
+name = "jacquard-axum"
+edition.workspace = true
+version.workspace = true
+authors.workspace = true
+repository.workspace = true
+keywords.workspace = true
+categories.workspace = true
+readme.workspace = true
+exclude.workspace = true
+homepage.workspace = true
+license.workspace = true
+description = "Axum server helpers for Jacquard"
+
+[dependencies]
+axum = "0.8.6"
+bytes.workspace = true
+jacquard = { version = "0.3.0", path = "../jacquard" }
+jacquard-common = { version = "0.3.0", path = "../jacquard-common", features = ["reqwest-client"] }
+miette.workspace = true
+serde.workspace = true
+serde_ipld_dagcbor.workspace = true
+serde_json.workspace = true
+thiserror.workspace = true
+tokio.workspace = true
+
+[dev-dependencies]
+axum-test = "18.1.0"
+tokio-test = "0.4.4"
diff --git a/crates/jacquard-axum/src/lib.rs b/crates/jacquard-axum/src/lib.rs
new file mode 100644
index 00000000..7cacf6cc
--- /dev/null
+++ b/crates/jacquard-axum/src/lib.rs
@@ -0,0 +1,80 @@
+use axum::{
+    Router,
+    body::{Body, Bytes},
+    extract::{FromRequest, Request},
+    http::{
+        StatusCode,
+        header::{HeaderValue, USER_AGENT},
+        uri::PathAndQuery,
+    },
+    response::{ErrorResponse, IntoResponse, Response},
+    routing::get,
+};
+use jacquard::types::xrpc::{XrpcError, XrpcMethod, XrpcRequest};
+use serde::Serialize;
+use serde_json::json;
+
+pub struct ExtractXrpc<R: XrpcRequest<'static>>(R);
+
+impl<S, R> FromRequest<S> for ExtractXrpc<R>
+where
+    Bytes: FromRequest<S>,
+    S: Send + Sync,
+    R: for<'de> XrpcRequest<'de> + for<'de> serde::Deserialize<'de>,
+{
+    type Rejection = Response;
+
+    async fn from_request(req: Request, state: &S) -> Result<Self, Self::Rejection> {
+        match R::METHOD {
+            XrpcMethod::Procedure(encoding) => {
+                let body = Bytes::from_request(req, state)
+                    .await
+                    .map_err(IntoResponse::into_response)?;
+                match encoding {
+                    "application/json" => {
+                        let value: R = serde_json::from_slice::<R>(&body).map_err(|e| {
+                            (
+                                StatusCode::BAD_REQUEST,
+                                serde_json::to_string(&json!({
+                                    "error": "InvalidRequest",
+                                    "message": XrpcRequestError::JsonDecodeError(e).to_string()
+                                }))
+                                .expect("Failed to serialize error response"),
+                            )
+                                .into_response()
+                        })?;
+                        Ok(ExtractXrpc(value))
+                    }
+                    "*/*" => {
+                        //
+                        todo!()
+                    }
+                    _ => todo!(),
+                }
+            }
+            XrpcMethod::Query => {
+                if let Some(path_query) = req.uri().path_and_query() {
+                    let path = path_query.path();
+                    let query = path_query.query();
+                    if path.ends_with(R::NSID) {
+                        // success
+                    } else {
+                        // wrong endpoint
+                    }
+                }
+
+                todo!()
+            }
+        }
+    }
+}
+
+#[derive(Debug, thiserror::Error, miette::Diagnostic)]
+pub enum XrpcRequestError {
+    #[error("Unsupported encoding: {0}")]
+    UnsupportedEncoding(String),
+    #[error("JSON decode error: {0}")]
+    JsonDecodeError(serde_json::Error),
+    #[error("UTF-8 decode error: {0}")]
+    Utf8DecodeError(std::string::FromUtf8Error),
+}
diff --git a/crates/jacquard-common/src/error.rs b/crates/jacquard-common/src/error.rs
index f59053c0..e2f3dc62 100644
--- a/crates/jacquard-common/src/error.rs
+++ b/crates/jacquard-common/src/error.rs
@@ -1,6 +1,7 @@
 //! Error types for XRPC client operations
 
 use bytes::Bytes;
+use serde::{Deserialize, Serialize};
 
 use crate::types::xrpc::EncodeError;
 
@@ -156,3 +157,17 @@ pub enum AuthError {
     #[error("Authentication error: {0:?}")]
     Other(http::HeaderValue),
 }
+
+impl crate::IntoStatic for AuthError {
+    type Output = AuthError;
+
+    fn into_static(self) -> Self::Output {
+        match self {
+            AuthError::TokenExpired => AuthError::TokenExpired,
+            AuthError::InvalidToken => AuthError::InvalidToken,
+            AuthError::RefreshFailed => AuthError::RefreshFailed,
+            AuthError::NotAuthenticated => AuthError::NotAuthenticated,
+            AuthError::Other(header) => AuthError::Other(header),
+        }
+    }
+}
diff --git a/crates/jacquard-common/src/types/xrpc.rs b/crates/jacquard-common/src/types/xrpc.rs
index 73a96baa..53e9248a 100644
--- a/crates/jacquard-common/src/types/xrpc.rs
+++ b/crates/jacquard-common/src/types/xrpc.rs
@@ -17,16 +17,16 @@ use http::{
 };
 use serde::{Deserialize, Serialize};
 use smol_str::SmolStr;
-use std::fmt::{self, Debug};
+use std::fmt::{self, Debug, Display};
 use std::{error::Error, marker::PhantomData};
 use url::Url;
 
-use crate::IntoStatic;
 use crate::error::TransportError;
 use crate::http_client::HttpClient;
 use crate::types::value::Data;
 use crate::{AuthorizationToken, error::AuthError};
 use crate::{CowStr, error::XrpcResult};
+use crate::{IntoStatic, error::DecodeError};
 
 /// Error type for encoding XRPC requests
 #[derive(Debug, thiserror::Error, miette::Diagnostic)]
@@ -83,7 +83,7 @@ impl XrpcMethod {
 /// HTTP method, encoding types, and associated output types.
 ///
 /// The trait is implemented on the request parameters/input type itself.
-pub trait XrpcRequest: Serialize {
+pub trait XrpcRequest<'de>: Serialize + Deserialize<'de> {
     /// The NSID for this XRPC method
     const NSID: &'static str;
 
@@ -94,10 +94,10 @@ pub trait XrpcRequest: Serialize {
     const OUTPUT_ENCODING: &'static str;
 
     /// Response output type
-    type Output<'de>: Deserialize<'de> + IntoStatic;
+    type Output: Deserialize<'de> + IntoStatic;
 
     /// Error type for this request
-    type Err<'de>: Error + Deserialize<'de> + IntoStatic;
+    type Err: Error + Deserialize<'de> + IntoStatic;
 
     /// Encode the request body for procedures.
     ///
@@ -105,14 +105,22 @@ pub trait XrpcRequest: Serialize {
     fn encode_body(&self) -> Result<Vec<u8>, EncodeError> {
         Ok(serde_json::to_vec(self)?)
     }
+
+    /// Decode the request body for procedures.
+    ///
+    /// Default implementation deserializes from JSON. Override for non-JSON encodings.
+    fn decode_body(&self, body: &'de [u8]) -> Result<Box<Self>, DecodeError> {
+        let body: Self = serde_json::from_slice(body).map_err(|e| DecodeError::Json(e))?;
+
+        Ok(Box::new(body))
+    }
 }
 
 /// Error type for XRPC endpoints that don't define any errors
 #[derive(Debug, Clone, PartialEq, Eq, Deserialize, Serialize)]
-#[serde(bound(deserialize = "'de: 'a"))]
-pub struct GenericError<'a>(Data<'a>);
+pub struct GenericError<'a>(#[serde(borrow)] Data<'a>);
 
-impl fmt::Display for GenericError<'_> {
+impl<'de> fmt::Display for GenericError<'de> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         self.0.fmt(f)
     }
@@ -270,7 +278,10 @@ impl<'a, C: HttpClient> XrpcCall<'a, C> {
     ///   inspect the header for `error="invalid_token"` or `error="use_dpop_nonce"` and react
     ///   (refresh/retry). If the header is absent, the 401 body flows through to `Response` and
     ///   can be parsed/mapped to `AuthError` as appropriate.
-    pub async fn send<R: XrpcRequest + Send>(self, request: &R) -> XrpcResult<Response<R>> {
+    pub async fn send<'de, R>(self, request: &'de R) -> XrpcResult<Response<'de, R>>
+    where
+        R: XrpcRequest<'de> + Send,
+    {
         let http_request = build_http_request(&self.base, request, &self.opts)
             .map_err(crate::error::TransportError::from)?;
 
@@ -282,15 +293,44 @@ impl<'a, C: HttpClient> XrpcCall<'a, C> {
 
         process_response(http_response)
     }
+
+    /// Send the given typed XRPC request and return an owned response wrapper.
+    ///
+    /// Note on 401 handling:
+    /// - When the server returns 401 with a `WWW-Authenticate` header, this surfaces as
+    ///   `ClientError::Auth(AuthError::Other(header))` so higher layers (e.g., OAuth/DPoP) can
+    ///   inspect the header for `error="invalid_token"` or `error="use_dpop_nonce"` and react
+    ///   (refresh/retry). If the header is absent, the 401 body flows through to `Response` and
+    ///   can be parsed/mapped to `AuthError` as appropriate.
+    pub async fn send_owned<'de, R, S>(self, request: R) -> XrpcResult<OwnedResponse<S>>
+    where
+        R: XrpcRequest<'de> + Send + 'de,
+        S: XrpcRequest<'static>,
+    {
+        let http_request = build_http_request(&self.base, &request, &self.opts)
+            .map_err(crate::error::TransportError::from)?;
+
+        let http_response = self
+            .client
+            .send_http(http_request)
+            .await
+            .map_err(|e| crate::error::TransportError::Other(Box::new(e)))?;
+
+        let resp: XrpcResult<Response<'de, R>> = process_response(http_response);
+        match resp {
+            Ok(response) => Ok(response.owned()),
+            Err(err) => Err(err),
+        }
+    }
 }
 
 /// Process the HTTP response from the server into a proper xrpc response statelessly.
 ///
 /// Exposed to make things more easily pluggable
 #[inline]
-pub fn process_response<R: XrpcRequest + Send>(
+pub fn process_response<'de, R: XrpcRequest<'de> + Send>(
     http_response: http::Response<Vec<u8>>,
-) -> XrpcResult<Response<R>> {
+) -> XrpcResult<Response<'de, R>> {
     let status = http_response.status();
     // If the server returned 401 with a WWW-Authenticate header, expose it so higher layers
     // (e.g., DPoP handling) can detect `error="invalid_token"` and trigger refresh.
@@ -340,7 +380,7 @@ impl From<Header> for HeaderName {
 }
 
 /// Build an HTTP request for an XRPC call given base URL and options
-pub fn build_http_request<R: XrpcRequest>(
+pub fn build_http_request<'de, R: XrpcRequest<'de>>(
     base: &Url,
     req: &R,
     opts: &CallOptions<'_>,
@@ -418,14 +458,20 @@ pub fn build_http_request<R: XrpcRequest>(
 /// XRPC response wrapper that owns the response buffer
 ///
 /// Allows borrowing from the buffer when parsing to avoid unnecessary allocations.
-/// Supports both borrowed parsing (with `parse()`) and owned parsing (with `into_output()`).
-pub struct Response<R: XrpcRequest> {
+pub struct Response<'de, R: XrpcRequest<'de>> {
+    buffer: Bytes,
+    status: StatusCode,
+    _marker: PhantomData<&'de R>,
+}
+
+/// Owned response wrapper which allows taking ownership of the resulting response type
+pub struct OwnedResponse<R: XrpcRequest<'static>> {
     buffer: Bytes,
     status: StatusCode,
     _marker: PhantomData<R>,
 }
 
-impl<R: XrpcRequest> Response<R> {
+impl<'de, R: XrpcRequest<'de>> Response<'de, R> {
     /// Create a new response from a buffer and status code
     pub fn new(buffer: Bytes, status: StatusCode) -> Self {
         Self {
@@ -441,29 +487,29 @@ impl<R: XrpcRequest> Response<R> {
     }
 
     /// Parse the response, borrowing from the internal buffer
-    pub fn parse(&self) -> Result<R::Output<'_>, XrpcError<R::Err<'_>>> {
+    pub fn parse(&'de self) -> Result<R::Output, XrpcError<R::Err>> {
         // Use a helper to make lifetime inference work
-        fn parse_output<'b, R: XrpcRequest>(
+        fn parse_output<'b, R: XrpcRequest<'b>>(
             buffer: &'b [u8],
-        ) -> Result<R::Output<'b>, serde_json::Error> {
+        ) -> Result<R::Output, serde_json::Error> {
             serde_json::from_slice(buffer)
         }
 
-        fn parse_error<'b, R: XrpcRequest>(
+        fn parse_error<'b, R: XrpcRequest<'b>>(
             buffer: &'b [u8],
-        ) -> Result<R::Err<'b>, serde_json::Error> {
+        ) -> Result<R::Err, serde_json::Error> {
             serde_json::from_slice(buffer)
         }
 
         // 200: parse as output
         if self.status.is_success() {
-            match parse_output::<R>(&self.buffer) {
+            match parse_output::<'de, R>(&self.buffer) {
                 Ok(output) => Ok(output),
                 Err(e) => Err(XrpcError::Decode(e)),
             }
         // 400: try typed XRPC error, fallback to generic error
         } else if self.status.as_u16() == 400 {
-            match parse_error::<R>(&self.buffer) {
+            match parse_error::<'de, R>(&self.buffer) {
                 Ok(error) => Err(XrpcError::Xrpc(error)),
                 Err(_) => {
                     // Fallback to generic error (InvalidRequest, ExpiredToken, etc.)
@@ -474,8 +520,12 @@ impl<R: XrpcRequest> Response<R> {
                             generic.http_status = self.status;
                             // Map auth-related errors to AuthError
                             match generic.error.as_str() {
-                                "ExpiredToken" => Err(XrpcError::Auth(AuthError::TokenExpired)),
-                                "InvalidToken" => Err(XrpcError::Auth(AuthError::InvalidToken)),
+                                "ExpiredToken" => {
+                                    Err(XrpcError::<R::Err>::Auth(AuthError::TokenExpired))
+                                }
+                                "InvalidToken" => {
+                                    Err(XrpcError::<R::Err>::Auth(AuthError::InvalidToken))
+                                }
                                 _ => Err(XrpcError::Generic(generic)),
                             }
                         }
@@ -491,9 +541,9 @@ impl<R: XrpcRequest> Response<R> {
                     generic.method = R::METHOD.as_str();
                     generic.http_status = self.status;
                     match generic.error.as_str() {
-                        "ExpiredToken" => Err(XrpcError::Auth(AuthError::TokenExpired)),
-                        "InvalidToken" => Err(XrpcError::Auth(AuthError::InvalidToken)),
-                        _ => Err(XrpcError::Auth(AuthError::NotAuthenticated)),
+                        "ExpiredToken" => Err(XrpcError::<R::Err>::Auth(AuthError::TokenExpired)),
+                        "InvalidToken" => Err(XrpcError::<R::Err>::Auth(AuthError::InvalidToken)),
+                        _ => Err(XrpcError::<R::Err>::Auth(AuthError::NotAuthenticated)),
                     }
                 }
                 Err(e) => Err(XrpcError::Decode(e)),
@@ -501,35 +551,56 @@ impl<R: XrpcRequest> Response<R> {
         }
     }
 
+    /// Get the raw buffer
+    pub fn buffer(&self) -> &Bytes {
+        &self.buffer
+    }
+
+    /// Take ownership of the response so the original can be dropped
+    pub fn owned<S>(&self) -> OwnedResponse<S>
+    where
+        S: XrpcRequest<'static>,
+    {
+        OwnedResponse {
+            buffer: self.buffer.clone(),
+            status: self.status,
+            _marker: std::marker::PhantomData,
+        }
+    }
+}
+
+impl<R: XrpcRequest<'static>> OwnedResponse<R> {
     /// Parse the response into an owned output
-    pub fn into_output(self) -> Result<R::Output<'static>, XrpcError<R::Err<'static>>>
+    pub fn output(self) -> Result<R::Output, XrpcError<R::Err>>
     where
-        for<'a> R::Output<'a>: IntoStatic<Output = R::Output<'static>>,
-        for<'a> R::Err<'a>: IntoStatic<Output = R::Err<'static>>,
+        for<'a> R::Output: IntoStatic<Output = R::Output>,
+        for<'a> R::Err: IntoStatic<Output = R::Err>,
     {
         // Use a helper to make lifetime inference work
-        fn parse_output<'b, R: XrpcRequest>(
-            buffer: &'b [u8],
-        ) -> Result<R::Output<'b>, serde_json::Error> {
-            serde_json::from_slice(buffer)
+        fn parse_output<'b, R: XrpcRequest<'b>>(
+            buffer: Box<[u8]>,
+        ) -> Result<R::Output, serde_json::Error> {
+            let buf: &'static [u8] = Box::leak(buffer);
+            serde_json::from_slice(buf)
         }
 
-        fn parse_error<'b, R: XrpcRequest>(
-            buffer: &'b [u8],
-        ) -> Result<R::Err<'b>, serde_json::Error> {
-            serde_json::from_slice(buffer)
+        fn parse_error<'b, R: XrpcRequest<'b>>(
+            buffer: Box<[u8]>,
+        ) -> Result<R::Err, serde_json::Error> {
+            let buf: &'static [u8] = Box::leak(buffer);
+            serde_json::from_slice(buf)
         }
 
         // 200: parse as output
         if self.status.is_success() {
-            match parse_output::<R>(&self.buffer) {
+            match parse_output::<'static, R>(Box::from(self.buffer.as_ref())) {
                 Ok(output) => Ok(output.into_static()),
-                Err(e) => Err(XrpcError::Decode(e)),
+                Err(e) => Err(XrpcError::<R::Err>::Decode(e).into_static()),
             }
         // 400: try typed XRPC error, fallback to generic error
         } else if self.status.as_u16() == 400 {
-            match parse_error::<R>(&self.buffer) {
-                Ok(error) => Err(XrpcError::Xrpc(error.into_static())),
+            let result = match parse_error::<'static, R>(Box::from(self.buffer.as_ref())) {
+                Ok(error) => XrpcError::Xrpc(error),
                 Err(_) => {
                     // Fallback to generic error (InvalidRequest, ExpiredToken, etc.)
                     match serde_json::from_slice::<GenericXrpcError>(&self.buffer) {
@@ -539,44 +610,45 @@ impl<R: XrpcRequest> Response<R> {
                             generic.http_status = self.status;
                             // Map auth-related errors to AuthError
                             match generic.error.as_ref() {
-                                "ExpiredToken" => Err(XrpcError::Auth(AuthError::TokenExpired)),
-                                "InvalidToken" => Err(XrpcError::Auth(AuthError::InvalidToken)),
-                                _ => Err(XrpcError::Generic(generic)),
+                                "ExpiredToken" => {
+                                    XrpcError::<R::Err>::Auth(AuthError::TokenExpired)
+                                }
+                                "InvalidToken" => {
+                                    XrpcError::<R::Err>::Auth(AuthError::InvalidToken)
+                                }
+                                _ => XrpcError::Generic(generic),
                             }
                         }
-                        Err(e) => Err(XrpcError::Decode(e)),
+                        Err(e) => XrpcError::Decode(e),
                     }
                 }
-            }
+            };
+            Err(result.into_static())
         // 401: always auth error
         } else {
-            match serde_json::from_slice::<GenericXrpcError>(&self.buffer) {
+            let result = match serde_json::from_slice::<GenericXrpcError>(&self.buffer) {
                 Ok(mut generic) => {
                     let status = self.status;
                     generic.nsid = R::NSID;
                     generic.method = R::METHOD.as_str();
                     generic.http_status = status;
                     match generic.error.as_ref() {
-                        "ExpiredToken" => Err(XrpcError::Auth(AuthError::TokenExpired)),
-                        "InvalidToken" => Err(XrpcError::Auth(AuthError::InvalidToken)),
-                        _ => Err(XrpcError::Auth(AuthError::NotAuthenticated)),
+                        "ExpiredToken" => XrpcError::<R::Err>::Auth(AuthError::TokenExpired),
+                        "InvalidToken" => XrpcError::<R::Err>::Auth(AuthError::InvalidToken),
+                        _ => XrpcError::<R::Err>::Auth(AuthError::NotAuthenticated),
                     }
                 }
-                Err(e) => Err(XrpcError::Decode(e)),
-            }
+                Err(e) => XrpcError::Decode(e),
+            };
+            Err(result.into_static())
         }
     }
-
-    /// Get the raw buffer
-    pub fn buffer(&self) -> &Bytes {
-        &self.buffer
-    }
 }
 
 /// Generic XRPC error format for untyped errors like InvalidRequest
 ///
 /// Used when the error doesn't match the endpoint's specific error enum
-#[derive(Debug, Clone, Deserialize)]
+#[derive(Debug, Clone, Deserialize, Serialize)]
 pub struct GenericXrpcError {
     /// Error code (e.g., "InvalidRequest")
     pub error: SmolStr,
@@ -611,6 +683,14 @@ impl std::fmt::Display for GenericXrpcError {
     }
 }
 
+impl IntoStatic for GenericXrpcError {
+    type Output = Self;
+
+    fn into_static(self) -> Self::Output {
+        self
+    }
+}
+
 impl std::error::Error for GenericXrpcError {}
 
 /// XRPC-specific errors returned from endpoints
@@ -618,7 +698,7 @@ impl std::error::Error for GenericXrpcError {}
 /// Represents errors returned in the response body
 /// Type parameter `E` is the endpoint's specific error enum type.
 #[derive(Debug, thiserror::Error, miette::Diagnostic)]
-pub enum XrpcError<E: std::error::Error + IntoStatic> {
+pub enum XrpcError<E: Debug + Display + IntoStatic> {
     /// Typed XRPC error from the endpoint's specific error enum
     #[error("XRPC error: {0}")]
     #[diagnostic(code(jacquard_common::xrpc::typed))]
@@ -640,12 +720,28 @@ pub enum XrpcError<E: std::error::Error + IntoStatic> {
     Decode(#[from] serde_json::Error),
 }
 
+impl<E: std::error::Error + IntoStatic> IntoStatic for XrpcError<E>
+where
+    <E as crate::into_static::IntoStatic>::Output: IntoStatic,
+    <E as crate::into_static::IntoStatic>::Output: Debug + Display,
+{
+    type Output = XrpcError<E::Output>;
+    fn into_static(self) -> Self::Output {
+        match self {
+            XrpcError::Xrpc(e) => XrpcError::Xrpc(e.into_static()),
+            XrpcError::Auth(e) => XrpcError::Auth(e.into_static()),
+            XrpcError::Generic(e) => XrpcError::Generic(e),
+            XrpcError::Decode(e) => XrpcError::Decode(e),
+        }
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
     use serde::{Deserialize, Serialize};
 
-    #[derive(Serialize)]
+    #[derive(Serialize, Deserialize)]
     struct DummyReq;
 
     #[derive(Deserialize, Debug, thiserror::Error)]
@@ -659,12 +755,12 @@ mod tests {
         }
     }
 
-    impl XrpcRequest for DummyReq {
+    impl<'de> XrpcRequest<'de> for DummyReq {
         const NSID: &'static str = "test.dummy";
         const METHOD: XrpcMethod = XrpcMethod::Procedure("application/json");
         const OUTPUT_ENCODING: &'static str = "application/json";
-        type Output<'de> = ();
-        type Err<'de> = DummyErr<'de>;
+        type Output = ();
+        type Err = DummyErr<'de>;
     }
 
     #[test]
@@ -706,7 +802,7 @@ mod tests {
 
     #[test]
     fn no_double_slash_in_path() {
-        #[derive(Serialize)]
+        #[derive(Serialize, Deserialize)]
         struct Req;
         #[derive(Deserialize, Debug, thiserror::Error)]
         #[error("{0}")]
@@ -717,12 +813,12 @@ mod tests {
                 Err(self.0.into_static())
             }
         }
-        impl XrpcRequest for Req {
+        impl<'de> XrpcRequest<'de> for Req {
             const NSID: &'static str = "com.example.test";
             const METHOD: XrpcMethod = XrpcMethod::Query;
             const OUTPUT_ENCODING: &'static str = "application/json";
-            type Output<'de> = ();
-            type Err<'de> = Err<'de>;
+            type Output = ();
+            type Err = Err<'de>;
         }
 
         let opts = CallOptions::default();
@@ -749,8 +845,8 @@ pub trait XrpcClient: HttpClient {
         async { CallOptions::default() }
     }
     /// Send an XRPC request and parse the response
-    fn send<R: XrpcRequest + Send>(
-        self,
-        request: &R,
-    ) -> impl Future<Output = XrpcResult<Response<R>>>;
+    fn send<'de, R: XrpcRequest<'de> + Send>(
+        &self,
+        request: &'de R,
+    ) -> impl Future<Output = XrpcResult<Response<'de, R>>>;
 }
diff --git a/crates/jacquard-identity/src/lib.rs b/crates/jacquard-identity/src/lib.rs
index 4f2d5041..6a6c65ff 100644
--- a/crates/jacquard-identity/src/lib.rs
+++ b/crates/jacquard-identity/src/lib.rs
@@ -19,14 +19,14 @@ use crate::resolver::{
     ResolverOptions,
 };
 use bytes::Bytes;
-use jacquard_api::com_atproto::identity::resolve_did;
+use jacquard_api::com_atproto::identity::resolve_did::{self, ResolveDid};
 use jacquard_api::com_atproto::identity::resolve_handle::ResolveHandle;
 use jacquard_common::error::TransportError;
 use jacquard_common::http_client::HttpClient;
 use jacquard_common::types::did::Did;
 use jacquard_common::types::did_doc::DidDocument;
 use jacquard_common::types::ident::AtIdentifier;
-use jacquard_common::types::xrpc::XrpcExt;
+use jacquard_common::types::xrpc::{OwnedResponse, XrpcExt};
 use jacquard_common::{IntoStatic, types::string::Handle};
 use percent_encoding::percent_decode_str;
 use reqwest::StatusCode;
@@ -199,15 +199,18 @@ impl JacquardResolver {
             Some(u) => u.clone(),
             None => return Err(IdentityError::InvalidWellKnown),
         };
-        let req = ResolveHandle::new().handle((*handle).clone()).build();
+        let req = ResolveHandle::new()
+            .handle(handle.clone().into_static())
+            .build();
         let resp = self
             .http
             .xrpc(pds)
             .send(&req)
             .await
             .map_err(|e| IdentityError::Xrpc(e.to_string()))?;
-        let out = resp
-            .into_output()
+        let owned: OwnedResponse<ResolveHandle<'static>> = resp.owned();
+        let out = owned
+            .output()
             .map_err(|e| IdentityError::Xrpc(e.to_string()))?;
         Did::new_owned(out.did.as_str())
             .map(|d| d.into_static())
@@ -230,8 +233,9 @@ impl JacquardResolver {
             .send(&req)
             .await
             .map_err(|e| IdentityError::Xrpc(e.to_string()))?;
-        let out = resp
-            .into_output()
+        let owned: OwnedResponse<ResolveDid<'static>> = resp.owned();
+        let out = owned
+            .output()
             .map_err(|e| IdentityError::Xrpc(e.to_string()))?;
         let doc_json = serde_json::to_value(&out.did_doc)?;
         let s = serde_json::to_string(&doc_json)?;
@@ -255,9 +259,11 @@ impl JacquardResolver {
         };
         let mut url = base;
         url.set_path("/xrpc/com.bad-example.identity.resolveMiniDoc");
-        if let Ok(qs) =
-            serde_html_form::to_string(&resolve_did::ResolveDid::new().did(did.clone()).build())
-        {
+        if let Ok(qs) = serde_html_form::to_string(
+            &resolve_did::ResolveDid::new()
+                .did(did.clone().into_static())
+                .build(),
+        ) {
             url.set_query(Some(&qs));
         }
         let (buf, status) = self.get_json_bytes(url).await?;
diff --git a/crates/jacquard-lexicon/src/codegen.rs b/crates/jacquard-lexicon/src/codegen.rs
index 40f24790..96b80aeb 100644
--- a/crates/jacquard-lexicon/src/codegen.rs
+++ b/crates/jacquard-lexicon/src/codegen.rs
@@ -2044,25 +2044,42 @@ impl<'c> CodeGenerator<'c> {
             quote! {}
         };
 
+        // Generate decode_body() method for binary inputs
+        let decode_body_method = if is_binary_input {
+            quote! {
+                fn decode_body(
+                    &self,
+                    body: &'de [u8],
+                ) -> Result<Box<Self>, jacquard_common::error::DecodeError> {
+                    Ok(Box::new(Self {
+                        body: bytes::Bytes::copy_from_slice(body),
+                    }))
+                }
+            }
+        } else {
+            quote! {}
+        };
+
         if has_params {
             // Implement on the params/input struct itself
             let request_ident = syn::Ident::new(type_base, proc_macro2::Span::call_site());
             let impl_target = if params_has_lifetime {
-                quote! { #request_ident<'_> }
+                quote! { #request_ident<'de> }
             } else {
                 quote! { #request_ident }
             };
 
             Ok(quote! {
-                impl jacquard_common::types::xrpc::XrpcRequest for #impl_target {
+                impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for #impl_target {
                     const NSID: &'static str = #nsid;
                     const METHOD: jacquard_common::types::xrpc::XrpcMethod = #method;
                     const OUTPUT_ENCODING: &'static str = #output_encoding;
 
-                    type Output<'de> = #output_type;
-                    type Err<'de> = #error_type;
+                    type Output = #output_type;
+                    type Err = #error_type;
 
                     #encode_body_method
+                    #decode_body_method
                 }
             })
         } else {
@@ -2071,16 +2088,16 @@ impl<'c> CodeGenerator<'c> {
 
             Ok(quote! {
                 /// XRPC request marker type
-                #[derive(Debug, Clone, Copy, PartialEq, Eq, serde::Serialize)]
+                #[derive(Debug, Clone, Copy, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
                 pub struct #request_ident;
 
-                impl jacquard_common::types::xrpc::XrpcRequest for #request_ident {
+                impl<'de> jacquard_common::types::xrpc::XrpcRequest<'de> for #request_ident {
                     const NSID: &'static str = #nsid;
                     const METHOD: jacquard_common::types::xrpc::XrpcMethod = #method;
                     const OUTPUT_ENCODING: &'static str = #output_encoding;
 
-                    type Output<'de> = #output_type;
-                    type Err<'de> = #error_type;
+                    type Output = #output_type;
+                    type Err = #error_type;
                 }
             })
         }
diff --git a/crates/jacquard-oauth/src/client.rs b/crates/jacquard-oauth/src/client.rs
index c865e088..cfdd4b72 100644
--- a/crates/jacquard-oauth/src/client.rs
+++ b/crates/jacquard-oauth/src/client.rs
@@ -11,14 +11,11 @@ use crate::{
 };
 use jacquard_common::{
     AuthorizationToken, CowStr, IntoStatic,
-    error::{AuthError, ClientError, TransportError, XrpcResult},
+    error::{ClientError, TransportError, XrpcResult},
     http_client::HttpClient,
     types::{
         did::Did,
-        xrpc::{
-            CallOptions, Response, XrpcClient, XrpcExt, XrpcRequest, build_http_request,
-            process_response,
-        },
+        xrpc::{CallOptions, Response, XrpcClient, XrpcExt, build_http_request, process_response},
     },
 };
 use jacquard_identity::JacquardResolver;
@@ -378,10 +375,10 @@ where
         self.options.read().await.clone()
     }
 
-    async fn send<R: jacquard_common::types::xrpc::XrpcRequest + Send>(
-        self,
-        request: &R,
-    ) -> XrpcResult<Response<R>> {
+    async fn send<'de, R: jacquard_common::types::xrpc::XrpcRequest<'de> + Send>(
+        &self,
+        request: &'de R,
+    ) -> XrpcResult<Response<'de, R>> {
         let base_uri = self.base_uri();
         let mut opts = self.options.read().await.clone();
         opts.auth = Some(self.access_token().await);
@@ -394,8 +391,7 @@ where
             .await
             .map_err(|e| TransportError::Other(Box::new(e)))?;
         drop(guard);
-        let res = process_response(http_response);
-        if is_invalid_token_response(&res) {
+        if is_invalid_token_response(&http_response) {
             opts.auth = Some(
                 self.refresh()
                     .await
@@ -411,21 +407,21 @@ where
                 .map_err(|e| TransportError::Other(Box::new(e)))?;
             process_response(http_response)
         } else {
-            res
+            process_response(http_response)
         }
     }
 }
 
-fn is_invalid_token_response<R: XrpcRequest>(response: &XrpcResult<Response<R>>) -> bool {
-    match response {
-        Err(ClientError::Auth(AuthError::InvalidToken)) => true,
-        Err(ClientError::Auth(AuthError::Other(value))) => value
-            .to_str()
-            .is_ok_and(|s| s.starts_with("DPoP ") && s.contains("error=\"invalid_token\"")),
-        Ok(resp) => match resp.parse() {
-            Err(jacquard_common::types::xrpc::XrpcError::Auth(AuthError::InvalidToken)) => true,
-            _ => false,
-        },
-        _ => false,
+fn is_invalid_token_response(response: &http::Response<Vec<u8>>) -> bool {
+    let status = response.status();
+    if status.as_u16() == 401 {
+        if let Some(www_auth) = response
+            .headers()
+            .get("WWW-Authenticate")
+            .and_then(|v| v.to_str().ok())
+        {
+            return www_auth.starts_with("DPoP") && www_auth.contains(r#"error="invalid_token""#);
+        }
     }
+    false
 }
diff --git a/crates/jacquard/src/client.rs b/crates/jacquard/src/client.rs
index 8cb06bc4..fcee69b7 100644
--- a/crates/jacquard/src/client.rs
+++ b/crates/jacquard/src/client.rs
@@ -248,10 +248,10 @@ impl<A: AgentSession> XrpcClient for Agent<A> {
     fn opts(&self) -> impl Future<Output = CallOptions<'_>> {
         self.inner.opts()
     }
-    fn send<R: XrpcRequest + Send>(
-        self,
-        request: &R,
-    ) -> impl Future<Output = XrpcResult<Response<R>>> {
+    fn send<'de, R: XrpcRequest<'de> + Send>(
+        &self,
+        request: &'de R,
+    ) -> impl Future<Output = XrpcResult<Response<'de, R>>> {
         async move { self.inner.send(request).await }
     }
 }
diff --git a/crates/jacquard/src/client/credential_session.rs b/crates/jacquard/src/client/credential_session.rs
index b818199d..2c4d2b7b 100644
--- a/crates/jacquard/src/client/credential_session.rs
+++ b/crates/jacquard/src/client/credential_session.rs
@@ -1,6 +1,9 @@
 use std::sync::Arc;
 
-use jacquard_api::com_atproto::server::refresh_session::RefreshSession;
+use jacquard_api::com_atproto::server::{
+    create_session::{CreateSession, CreateSessionOutput},
+    refresh_session::RefreshSession,
+};
 use jacquard_common::{
     AuthorizationToken, CowStr, IntoStatic,
     error::{AuthError, ClientError, XrpcResult},
@@ -8,7 +11,7 @@ use jacquard_common::{
     session::SessionStore,
     types::{
         did::Did,
-        xrpc::{CallOptions, Response, XrpcClient, XrpcError, XrpcExt, XrpcRequest},
+        xrpc::{CallOptions, Response, XrpcClient, XrpcExt, XrpcRequest},
     },
 };
 use tokio::sync::RwLock;
@@ -129,7 +132,8 @@ where
             .send(&RefreshSession)
             .await?;
         let refresh = response
-            .into_output()
+            .owned::<RefreshSession>()
+            .output()
             .map_err(|_| ClientError::Auth(jacquard_common::error::AuthError::RefreshFailed))?;
 
         let new_session: AtpSession = refresh.into();
@@ -238,8 +242,9 @@ where
             .with_options(self.options.read().await.clone())
             .send(&req)
             .await?;
-        let out = resp
-            .into_output()
+        let out: CreateSessionOutput<'_> = resp
+            .owned::<CreateSession<'_>>()
+            .output()
             .map_err(|_| ClientError::Auth(AuthError::NotAuthenticated))?;
         let session = AtpSession::from(out);
 
@@ -414,10 +419,10 @@ where
             )
         }
     }
-    async fn send<R: jacquard_common::types::xrpc::XrpcRequest + Send>(
-        self,
-        request: &R,
-    ) -> XrpcResult<Response<R>> {
+    async fn send<'de, R: jacquard_common::types::xrpc::XrpcRequest<'de> + Send>(
+        &self,
+        request: &'de R,
+    ) -> XrpcResult<Response<'de, R>> {
         let base_uri = self.base_uri();
         let auth = self.access_token().await;
         let mut opts = self.options.read().await.clone();
@@ -443,13 +448,10 @@ where
     }
 }
 
-fn is_expired<R: XrpcRequest>(response: &XrpcResult<Response<R>>) -> bool {
+fn is_expired<'de, R: XrpcRequest<'de>>(response: &XrpcResult<Response<'de, R>>) -> bool {
     match response {
         Err(ClientError::Auth(AuthError::TokenExpired)) => true,
-        Ok(resp) => match resp.parse() {
-            Err(XrpcError::Auth(AuthError::TokenExpired)) => true,
-            _ => false,
-        },
+
         _ => false,
     }
 }
diff --git a/crates/jacquard/src/main.rs b/crates/jacquard/src/main.rs
index a1e8fb03..1b6d2d98 100644
--- a/crates/jacquard/src/main.rs
+++ b/crates/jacquard/src/main.rs
@@ -76,7 +76,8 @@ async fn main() -> miette::Result<()> {
     let timeline = agent
         .send(&GetTimeline::new().limit(5).build())
         .await?
-        .into_output()?;
+        .owned::<GetTimeline>()
+        .output()?;
     for (i, post) in timeline.feed.iter().enumerate() {
         println!("\n{}. by {}", i + 1, post.post.author.handle);
         println!(
-- 
2.51.2