reworked codegen builder choices, added feature-gated tracing

Cargo.lock

···
  "smol_str",
  "thiserror 2.0.17",
  "tokio",
+ "tracing",
  "url",
 ]
 
···
  "smol_str",
  "thiserror 2.0.17",
  "tokio",
+ "tracing",
  "url",
 ]
 
···
  "serde_json",
  "thiserror 2.0.17",
  "tokio",
+ "tracing",
  "url",
  "urlencoding",
 ]
···
  "smol_str",
  "thiserror 2.0.17",
  "tokio",
+ "tracing",
  "trait-variant",
  "url",
  "webbrowser",

Cargo.toml

···
 async-trait = "0.1"
 tokio = "1"
 
+# Observability
+tracing = "0.1"
+
 # Encoding and crypto building blocks
 base64 = "0.22"
 percent-encoding = "2.3"

crates/jacquard-api/src/app_blebbit/authr/folder.rs

···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct FolderForm<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub name: Option<jacquard_common::CowStr<'a>>,
+    pub name: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub public: Option<bool>,
+    pub public: std::option::Option<bool>,
 }
 
 #[jacquard_derive::lexicon]
···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct FolderView<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub cuid: Option<jacquard_common::CowStr<'a>>,
+    pub cuid: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub name: Option<jacquard_common::CowStr<'a>>,
+    pub name: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub public: Option<bool>,
+    pub public: std::option::Option<bool>,
 }

crates/jacquard-api/src/app_blebbit/authr/folder/create_folder.rs

···
     Clone,
     PartialEq,
     Eq,
-    bon::Builder,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
-#[builder(start_fn = new)]
 pub struct CreateFolder<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub name: Option<jacquard_common::CowStr<'a>>,
+    pub name: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub public: Option<bool>,
-    #[serde(flatten)]
-    #[serde(borrow)]
-    #[builder(default)]
-    pub extra_data: ::std::collections::BTreeMap<
-        ::jacquard_common::smol_str::SmolStr,
-        ::jacquard_common::types::value::Data<'a>,
-    >,
+    pub public: std::option::Option<bool>,
 }
 
 #[jacquard_derive::lexicon]
···
     Clone,
     PartialEq,
     Eq,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct CreateFolderOutput<'a> {

crates/jacquard-api/src/app_blebbit/authr/folder/create_folder_relationship.rs

···
     Clone,
     PartialEq,
     Eq,
-    bon::Builder,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
-#[builder(start_fn = new)]
 pub struct CreateFolderRelationship<'a> {
     #[serde(borrow)]
-    #[builder(into)]
     pub relation: jacquard_common::CowStr<'a>,
     #[serde(borrow)]
-    #[builder(into)]
     pub resource: jacquard_common::CowStr<'a>,
     #[serde(borrow)]
-    #[builder(into)]
     pub subject: jacquard_common::CowStr<'a>,
-    #[serde(flatten)]
-    #[serde(borrow)]
-    #[builder(default)]
-    pub extra_data: ::std::collections::BTreeMap<
-        ::jacquard_common::smol_str::SmolStr,
-        ::jacquard_common::types::value::Data<'a>,
-    >,
 }
 
 ///Response type for

crates/jacquard-api/src/app_blebbit/authr/folder/delete_folder_relationship.rs

···
     Clone,
     PartialEq,
     Eq,
-    bon::Builder,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
-#[builder(start_fn = new)]
 pub struct DeleteFolderRelationship<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub relation: Option<jacquard_common::CowStr<'a>>,
+    pub relation: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(borrow)]
-    #[builder(into)]
     pub resource: jacquard_common::CowStr<'a>,
     #[serde(borrow)]
-    #[builder(into)]
     pub subject: jacquard_common::CowStr<'a>,
-    #[serde(flatten)]
-    #[serde(borrow)]
-    #[builder(default)]
-    pub extra_data: ::std::collections::BTreeMap<
-        ::jacquard_common::smol_str::SmolStr,
-        ::jacquard_common::types::value::Data<'a>,
-    >,
 }
 
 ///Response type for

crates/jacquard-api/src/app_blebbit/authr/folder/get_folder.rs

···
     Clone,
     PartialEq,
     Eq,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct GetFolderOutput<'a> {

crates/jacquard-api/src/app_blebbit/authr/folder/get_folders.rs

···
     Clone,
     PartialEq,
     Eq,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct GetFoldersOutput<'a> {

crates/jacquard-api/src/app_blebbit/authr/folder/update_folder.rs

···
     Clone,
     PartialEq,
     Eq,
-    bon::Builder,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
-#[builder(start_fn = new)]
 pub struct UpdateFolder<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub name: Option<jacquard_common::CowStr<'a>>,
+    pub name: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub public: Option<bool>,
-    #[serde(flatten)]
-    #[serde(borrow)]
-    #[builder(default)]
-    pub extra_data: ::std::collections::BTreeMap<
-        ::jacquard_common::smol_str::SmolStr,
-        ::jacquard_common::types::value::Data<'a>,
-    >,
+    pub public: std::option::Option<bool>,
 }
 
 #[jacquard_derive::lexicon]
···
     Clone,
     PartialEq,
     Eq,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct UpdateFolderOutput<'a> {

crates/jacquard-api/src/app_blebbit/authr/folder/update_folder_relationship.rs

···
     Clone,
     PartialEq,
     Eq,
-    bon::Builder,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
-#[builder(start_fn = new)]
 pub struct UpdateFolderRelationship<'a> {
     #[serde(borrow)]
-    #[builder(into)]
     pub relation: jacquard_common::CowStr<'a>,
     #[serde(borrow)]
-    #[builder(into)]
     pub resource: jacquard_common::CowStr<'a>,
     #[serde(borrow)]
-    #[builder(into)]
     pub subject: jacquard_common::CowStr<'a>,
-    #[serde(flatten)]
-    #[serde(borrow)]
-    #[builder(default)]
-    pub extra_data: ::std::collections::BTreeMap<
-        ::jacquard_common::smol_str::SmolStr,
-        ::jacquard_common::types::value::Data<'a>,
-    >,
 }
 
 ///Response type for

crates/jacquard-api/src/app_blebbit/authr/group.rs

···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct GroupForm<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub description: Option<jacquard_common::CowStr<'a>>,
+    pub description: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub display: Option<jacquard_common::CowStr<'a>>,
+    pub display: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(borrow)]
-    #[builder(into)]
     pub name: jacquard_common::CowStr<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub public: Option<bool>,
+    pub public: std::option::Option<bool>,
 }
 
 #[jacquard_derive::lexicon]
···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct GroupView<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub cuid: Option<jacquard_common::CowStr<'a>>,
+    pub cuid: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub description: Option<jacquard_common::CowStr<'a>>,
+    pub description: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub display: Option<jacquard_common::CowStr<'a>>,
+    pub display: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub name: Option<jacquard_common::CowStr<'a>>,
+    pub name: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub public: Option<bool>,
+    pub public: std::option::Option<bool>,
 }

crates/jacquard-api/src/app_blebbit/authr/group/create_group.rs

···
     Clone,
     PartialEq,
     Eq,
-    bon::Builder,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
-#[builder(start_fn = new)]
 pub struct CreateGroup<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub description: Option<jacquard_common::CowStr<'a>>,
+    pub description: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub display: Option<jacquard_common::CowStr<'a>>,
+    pub display: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(borrow)]
-    #[builder(into)]
     pub name: jacquard_common::CowStr<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub public: Option<bool>,
-    #[serde(flatten)]
-    #[serde(borrow)]
-    #[builder(default)]
-    pub extra_data: ::std::collections::BTreeMap<
-        ::jacquard_common::smol_str::SmolStr,
-        ::jacquard_common::types::value::Data<'a>,
-    >,
+    pub public: std::option::Option<bool>,
 }
 
 #[jacquard_derive::lexicon]
···
     Clone,
     PartialEq,
     Eq,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct CreateGroupOutput<'a> {

crates/jacquard-api/src/app_blebbit/authr/group/create_group_relationship.rs

···
     Clone,
     PartialEq,
     Eq,
-    bon::Builder,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
-#[builder(start_fn = new)]
 pub struct CreateGroupRelationship<'a> {
     #[serde(borrow)]
-    #[builder(into)]
     pub relation: jacquard_common::CowStr<'a>,
     #[serde(borrow)]
-    #[builder(into)]
     pub resource: jacquard_common::CowStr<'a>,
     #[serde(borrow)]
-    #[builder(into)]
     pub subject: jacquard_common::CowStr<'a>,
-    #[serde(flatten)]
-    #[serde(borrow)]
-    #[builder(default)]
-    pub extra_data: ::std::collections::BTreeMap<
-        ::jacquard_common::smol_str::SmolStr,
-        ::jacquard_common::types::value::Data<'a>,
-    >,
 }
 
 ///Response type for

crates/jacquard-api/src/app_blebbit/authr/group/delete_group_relationship.rs

···
     Clone,
     PartialEq,
     Eq,
-    bon::Builder,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
-#[builder(start_fn = new)]
 pub struct DeleteGroupRelationship<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub relation: Option<jacquard_common::CowStr<'a>>,
+    pub relation: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(borrow)]
-    #[builder(into)]
     pub resource: jacquard_common::CowStr<'a>,
     #[serde(borrow)]
-    #[builder(into)]
     pub subject: jacquard_common::CowStr<'a>,
-    #[serde(flatten)]
-    #[serde(borrow)]
-    #[builder(default)]
-    pub extra_data: ::std::collections::BTreeMap<
-        ::jacquard_common::smol_str::SmolStr,
-        ::jacquard_common::types::value::Data<'a>,
-    >,
 }
 
 ///Response type for

crates/jacquard-api/src/app_blebbit/authr/group/get_group.rs

···
     Clone,
     PartialEq,
     Eq,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct GetGroupOutput<'a> {

crates/jacquard-api/src/app_blebbit/authr/group/get_groups.rs

···
     Clone,
     PartialEq,
     Eq,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct GetGroupsOutput<'a> {

crates/jacquard-api/src/app_blebbit/authr/group/update_group.rs

···
     Clone,
     PartialEq,
     Eq,
-    bon::Builder,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
-#[builder(start_fn = new)]
 pub struct UpdateGroup<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub description: Option<jacquard_common::CowStr<'a>>,
+    pub description: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub display: Option<jacquard_common::CowStr<'a>>,
+    pub display: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(borrow)]
-    #[builder(into)]
     pub name: jacquard_common::CowStr<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub public: Option<bool>,
-    #[serde(flatten)]
-    #[serde(borrow)]
-    #[builder(default)]
-    pub extra_data: ::std::collections::BTreeMap<
-        ::jacquard_common::smol_str::SmolStr,
-        ::jacquard_common::types::value::Data<'a>,
-    >,
+    pub public: std::option::Option<bool>,
 }
 
 #[jacquard_derive::lexicon]
···
     Clone,
     PartialEq,
     Eq,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct UpdateGroupOutput<'a> {

crates/jacquard-api/src/app_blebbit/authr/group/update_group_relationship.rs

···
     Clone,
     PartialEq,
     Eq,
-    bon::Builder,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
-#[builder(start_fn = new)]
 pub struct UpdateGroupRelationship<'a> {
     #[serde(borrow)]
-    #[builder(into)]
     pub relation: jacquard_common::CowStr<'a>,
     #[serde(borrow)]
-    #[builder(into)]
     pub resource: jacquard_common::CowStr<'a>,
     #[serde(borrow)]
-    #[builder(into)]
     pub subject: jacquard_common::CowStr<'a>,
-    #[serde(flatten)]
-    #[serde(borrow)]
-    #[builder(default)]
-    pub extra_data: ::std::collections::BTreeMap<
-        ::jacquard_common::smol_str::SmolStr,
-        ::jacquard_common::types::value::Data<'a>,
-    >,
 }
 
 ///Response type for

crates/jacquard-api/src/app_blebbit/authr/page.rs

···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct PageForm<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub name: Option<jacquard_common::CowStr<'a>>,
+    pub name: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub public: Option<bool>,
+    pub public: std::option::Option<bool>,
 }
 
 #[jacquard_derive::lexicon]
···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct PageView<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub content: Option<jacquard_common::CowStr<'a>>,
+    pub content: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub cuid: Option<jacquard_common::CowStr<'a>>,
+    pub cuid: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub name: Option<jacquard_common::CowStr<'a>>,
+    pub name: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub public: Option<bool>,
+    pub public: std::option::Option<bool>,
 }

crates/jacquard-api/src/app_blebbit/authr/page/create_page.rs

···
     Clone,
     PartialEq,
     Eq,
-    bon::Builder,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
-#[builder(start_fn = new)]
 pub struct CreatePage<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub name: Option<jacquard_common::CowStr<'a>>,
+    pub name: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub public: Option<bool>,
-    #[serde(flatten)]
-    #[serde(borrow)]
-    #[builder(default)]
-    pub extra_data: ::std::collections::BTreeMap<
-        ::jacquard_common::smol_str::SmolStr,
-        ::jacquard_common::types::value::Data<'a>,
-    >,
+    pub public: std::option::Option<bool>,
 }
 
 #[jacquard_derive::lexicon]
···
     Clone,
     PartialEq,
     Eq,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct CreatePageOutput<'a> {

crates/jacquard-api/src/app_blebbit/authr/page/create_page_relationship.rs

···
     Clone,
     PartialEq,
     Eq,
-    bon::Builder,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
-#[builder(start_fn = new)]
 pub struct CreatePageRelationship<'a> {
     #[serde(borrow)]
-    #[builder(into)]
     pub relation: jacquard_common::CowStr<'a>,
     #[serde(borrow)]
-    #[builder(into)]
     pub resource: jacquard_common::CowStr<'a>,
     #[serde(borrow)]
-    #[builder(into)]
     pub subject: jacquard_common::CowStr<'a>,
-    #[serde(flatten)]
-    #[serde(borrow)]
-    #[builder(default)]
-    pub extra_data: ::std::collections::BTreeMap<
-        ::jacquard_common::smol_str::SmolStr,
-        ::jacquard_common::types::value::Data<'a>,
-    >,
 }
 
 ///Response type for

crates/jacquard-api/src/app_blebbit/authr/page/delete_page_relationship.rs

···
     Clone,
     PartialEq,
     Eq,
-    bon::Builder,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
-#[builder(start_fn = new)]
 pub struct DeletePageRelationship<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub relation: Option<jacquard_common::CowStr<'a>>,
+    pub relation: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(borrow)]
-    #[builder(into)]
     pub resource: jacquard_common::CowStr<'a>,
     #[serde(borrow)]
-    #[builder(into)]
     pub subject: jacquard_common::CowStr<'a>,
-    #[serde(flatten)]
-    #[serde(borrow)]
-    #[builder(default)]
-    pub extra_data: ::std::collections::BTreeMap<
-        ::jacquard_common::smol_str::SmolStr,
-        ::jacquard_common::types::value::Data<'a>,
-    >,
 }
 
 ///Response type for

crates/jacquard-api/src/app_blebbit/authr/page/get_page.rs

···
     Clone,
     PartialEq,
     Eq,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct GetPageOutput<'a> {

crates/jacquard-api/src/app_blebbit/authr/page/get_pages.rs

···
     Clone,
     PartialEq,
     Eq,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct GetPagesOutput<'a> {

crates/jacquard-api/src/app_blebbit/authr/page/update_page.rs

···
     Clone,
     PartialEq,
     Eq,
-    bon::Builder,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
-#[builder(start_fn = new)]
 pub struct UpdatePage<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub name: Option<jacquard_common::CowStr<'a>>,
+    pub name: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub public: Option<bool>,
-    #[serde(flatten)]
-    #[serde(borrow)]
-    #[builder(default)]
-    pub extra_data: ::std::collections::BTreeMap<
-        ::jacquard_common::smol_str::SmolStr,
-        ::jacquard_common::types::value::Data<'a>,
-    >,
+    pub public: std::option::Option<bool>,
 }
 
 #[jacquard_derive::lexicon]
···
     Clone,
     PartialEq,
     Eq,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct UpdatePageOutput<'a> {

crates/jacquard-api/src/app_blebbit/authr/page/update_page_relationship.rs

···
     Clone,
     PartialEq,
     Eq,
-    bon::Builder,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
-#[builder(start_fn = new)]
 pub struct UpdatePageRelationship<'a> {
     #[serde(borrow)]
-    #[builder(into)]
     pub relation: jacquard_common::CowStr<'a>,
     #[serde(borrow)]
-    #[builder(into)]
     pub resource: jacquard_common::CowStr<'a>,
     #[serde(borrow)]
-    #[builder(into)]
     pub subject: jacquard_common::CowStr<'a>,
-    #[serde(flatten)]
-    #[serde(borrow)]
-    #[builder(default)]
-    pub extra_data: ::std::collections::BTreeMap<
-        ::jacquard_common::smol_str::SmolStr,
-        ::jacquard_common::types::value::Data<'a>,
-    >,
 }
 
 ///Response type for

crates/jacquard-api/src/app_bsky/actor.rs

···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct BskyAppProgressGuide<'a> {
     #[serde(borrow)]
-    #[builder(into)]
     pub guide: jacquard_common::CowStr<'a>,
 }
 
···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct BskyAppStatePref<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub active_progress_guide: Option<crate::app_bsky::actor::BskyAppProgressGuide<'a>>,
+    pub active_progress_guide: std::option::Option<
+        crate::app_bsky::actor::BskyAppProgressGuide<'a>,
+    >,
     /// Storage for NUXs the user has encountered.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub nuxs: Option<Vec<crate::app_bsky::actor::Nux<'a>>>,
+    pub nuxs: std::option::Option<Vec<crate::app_bsky::actor::Nux<'a>>>,
     /// An array of tokens which identify nudges (modals, popups, tours, highlight dots) that should be shown to the user.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub queued_nudges: Option<Vec<jacquard_common::CowStr<'a>>>,
+    pub queued_nudges: std::option::Option<Vec<jacquard_common::CowStr<'a>>>,
 }
 
 #[jacquard_derive::lexicon]
···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct ContentLabelPref<'a> {
     #[serde(borrow)]
-    #[builder(into)]
     pub label: jacquard_common::CowStr<'a>,
     /// Which labeler does this preference apply to? If undefined, applies globally.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub labeler_did: Option<jacquard_common::types::string::Did<'a>>,
+    pub labeler_did: std::option::Option<jacquard_common::types::string::Did<'a>>,
     #[serde(borrow)]
-    #[builder(into)]
     pub visibility: jacquard_common::CowStr<'a>,
 }
 
···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct FeedViewPref<'a> {
     /// The URI of the feed, or an identifier which describes the feed.
     #[serde(borrow)]
-    #[builder(into)]
     pub feed: jacquard_common::CowStr<'a>,
     /// Hide quote posts in the feed.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub hide_quote_posts: Option<bool>,
+    pub hide_quote_posts: std::option::Option<bool>,
     /// Hide replies in the feed.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub hide_replies: Option<bool>,
+    pub hide_replies: std::option::Option<bool>,
     /// Hide replies in the feed if they do not have this number of likes.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub hide_replies_by_like_count: Option<i64>,
+    pub hide_replies_by_like_count: std::option::Option<i64>,
     /// Hide replies in the feed if they are not by followed users.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub hide_replies_by_unfollowed: Option<bool>,
+    pub hide_replies_by_unfollowed: std::option::Option<bool>,
     /// Hide reposts in the feed.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub hide_reposts: Option<bool>,
+    pub hide_reposts: std::option::Option<bool>,
 }
 
 #[jacquard_derive::lexicon]
···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct PersonalDetailsPref<'a> {
     /// The birth date of account owner.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub birth_date: Option<jacquard_common::types::string::Datetime>,
+    pub birth_date: std::option::Option<jacquard_common::types::string::Datetime>,
 }
 
 /// Default post interaction settings for the account. These values should be applied as default values when creating new posts. These refs should mirror the threadgate and postgate records exactly.
···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct PostInteractionSettingsPref<'a> {
     /// Matches postgate record. List of rules defining who can embed this users posts. If value is an empty array or is undefined, no particular rules apply and anyone can embed.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub postgate_embedding_rules: Option<
+    pub postgate_embedding_rules: std::option::Option<
         Vec<crate::app_bsky::feed::postgate::DisableRule<'a>>,
     >,
     /// Matches threadgate record. List of rules defining who can reply to this users posts. If value is an empty array, no one can reply. If value is undefined, anyone can reply.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub threadgate_allow_rules: Option<
+    pub threadgate_allow_rules: std::option::Option<
         Vec<PostInteractionSettingsPrefThreadgateAllowRulesItem<'a>>,
     >,
 }
···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct ProfileAssociated<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub activity_subscription: Option<
+    pub activity_subscription: std::option::Option<
         crate::app_bsky::actor::ProfileAssociatedActivitySubscription<'a>,
     >,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub chat: Option<crate::app_bsky::actor::ProfileAssociatedChat<'a>>,
+    pub chat: std::option::Option<crate::app_bsky::actor::ProfileAssociatedChat<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub feedgens: Option<i64>,
+    pub feedgens: std::option::Option<i64>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub labeler: Option<bool>,
+    pub labeler: std::option::Option<bool>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub lists: Option<i64>,
+    pub lists: std::option::Option<i64>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub starter_packs: Option<i64>,
+    pub starter_packs: std::option::Option<i64>,
 }
 
 #[jacquard_derive::lexicon]
···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct ProfileAssociatedActivitySubscription<'a> {
     #[serde(borrow)]
-    #[builder(into)]
     pub allow_subscriptions: jacquard_common::CowStr<'a>,
 }
 
···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct ProfileAssociatedChat<'a> {
     #[serde(borrow)]
-    #[builder(into)]
     pub allow_incoming: jacquard_common::CowStr<'a>,
 }
 
···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct ThreadViewPref<'a> {
     /// Show followed users at the top of all replies.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub prioritize_followed_users: Option<bool>,
+    pub prioritize_followed_users: std::option::Option<bool>,
     /// Sorting mode for threads.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub sort: Option<jacquard_common::CowStr<'a>>,
+    pub sort: std::option::Option<jacquard_common::CowStr<'a>>,
 }
 
 /// Preferences for how verified accounts appear in the app.
···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct VerificationPrefs<'a> {
     /// Hide the blue check badges for verified accounts and trusted verifiers.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub hide_badges: Option<bool>,
+    pub hide_badges: std::option::Option<bool>,
 }
 
 /// Represents the verification information about the user this object is attached to.
···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct ViewerState<'a> {
     /// This property is present only in selected cases, as an optimization.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub activity_subscription: Option<
+    pub activity_subscription: std::option::Option<
         crate::app_bsky::notification::ActivitySubscription<'a>,
     >,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub blocked_by: Option<bool>,
+    pub blocked_by: std::option::Option<bool>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub blocking: Option<jacquard_common::types::string::AtUri<'a>>,
+    pub blocking: std::option::Option<jacquard_common::types::string::AtUri<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub blocking_by_list: Option<crate::app_bsky::graph::ListViewBasic<'a>>,
+    pub blocking_by_list: std::option::Option<crate::app_bsky::graph::ListViewBasic<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub followed_by: Option<jacquard_common::types::string::AtUri<'a>>,
+    pub followed_by: std::option::Option<jacquard_common::types::string::AtUri<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub following: Option<jacquard_common::types::string::AtUri<'a>>,
+    pub following: std::option::Option<jacquard_common::types::string::AtUri<'a>>,
     /// This property is present only in selected cases, as an optimization.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub known_followers: Option<crate::app_bsky::actor::KnownFollowers<'a>>,
+    pub known_followers: std::option::Option<crate::app_bsky::actor::KnownFollowers<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub muted: Option<bool>,
+    pub muted: std::option::Option<bool>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub muted_by_list: Option<crate::app_bsky::graph::ListViewBasic<'a>>,
+    pub muted_by_list: std::option::Option<crate::app_bsky::graph::ListViewBasic<'a>>,
 }

crates/jacquard-api/src/app_bsky/feed.rs

···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct GeneratorViewerState<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub like: Option<jacquard_common::types::string::AtUri<'a>>,
+    pub like: std::option::Option<jacquard_common::types::string::AtUri<'a>>,
 }
 
 #[jacquard_derive::lexicon]
···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct Interaction<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub event: Option<jacquard_common::CowStr<'a>>,
+    pub event: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Context on a feed item that was originally supplied by the feed generator on getFeedSkeleton.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub feed_context: Option<jacquard_common::CowStr<'a>>,
+    pub feed_context: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub item: Option<jacquard_common::types::string::AtUri<'a>>,
+    pub item: std::option::Option<jacquard_common::types::string::AtUri<'a>>,
     /// Unique identifier per request that may be passed back alongside interactions.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub req_id: Option<jacquard_common::CowStr<'a>>,
+    pub req_id: std::option::Option<jacquard_common::CowStr<'a>>,
 }
 
 /// User liked the feed item
···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct ReasonPin<'a> {}
···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct SkeletonReasonPin<'a> {}
···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct ThreadContext<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub root_author_like: Option<jacquard_common::types::string::AtUri<'a>>,
+    pub root_author_like: std::option::Option<jacquard_common::types::string::AtUri<'a>>,
 }
 
 #[jacquard_derive::lexicon]
···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct ThreadgateView<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub cid: Option<jacquard_common::types::string::Cid<'a>>,
+    pub cid: std::option::Option<jacquard_common::types::string::Cid<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub lists: Option<Vec<crate::app_bsky::graph::ListViewBasic<'a>>>,
+    pub lists: std::option::Option<Vec<crate::app_bsky::graph::ListViewBasic<'a>>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub record: Option<jacquard_common::types::value::Data<'a>>,
+    pub record: std::option::Option<jacquard_common::types::value::Data<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub uri: Option<jacquard_common::types::string::AtUri<'a>>,
+    pub uri: std::option::Option<jacquard_common::types::string::AtUri<'a>>,
 }
 
 /// Metadata about the requesting account's relationship with the subject content. Only has meaningful content for authed requests.
···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct ViewerState<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub bookmarked: Option<bool>,
+    pub bookmarked: std::option::Option<bool>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub embedding_disabled: Option<bool>,
+    pub embedding_disabled: std::option::Option<bool>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub like: Option<jacquard_common::types::string::AtUri<'a>>,
+    pub like: std::option::Option<jacquard_common::types::string::AtUri<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub pinned: Option<bool>,
+    pub pinned: std::option::Option<bool>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub reply_disabled: Option<bool>,
+    pub reply_disabled: std::option::Option<bool>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub repost: Option<jacquard_common::types::string::AtUri<'a>>,
+    pub repost: std::option::Option<jacquard_common::types::string::AtUri<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub thread_muted: Option<bool>,
+    pub thread_muted: std::option::Option<bool>,
 }

crates/jacquard-api/src/app_bsky/feed/describe_feed_generator.rs

···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct Links<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub privacy_policy: Option<jacquard_common::CowStr<'a>>,
+    pub privacy_policy: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub terms_of_service: Option<jacquard_common::CowStr<'a>>,
+    pub terms_of_service: std::option::Option<jacquard_common::CowStr<'a>>,
 }
 
 #[jacquard_derive::lexicon]

crates/jacquard-api/src/app_bsky/feed/postgate.rs

···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct DisableRule<'a> {}

crates/jacquard-api/src/app_bsky/feed/send_interactions.rs

···
     Clone,
     PartialEq,
     Eq,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct SendInteractionsOutput<'a> {}

crates/jacquard-api/src/app_bsky/feed/threadgate.rs

···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct FollowerRule<'a> {}
···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct FollowingRule<'a> {}
···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct MentionRule<'a> {}

crates/jacquard-api/src/app_bsky/graph.rs

···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct ListViewerState<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub blocked: Option<jacquard_common::types::string::AtUri<'a>>,
+    pub blocked: std::option::Option<jacquard_common::types::string::AtUri<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub muted: Option<bool>,
+    pub muted: std::option::Option<bool>,
 }
 
 /// A list of actors to apply an aggregate moderation action (mute/block) on.

crates/jacquard-api/src/app_bsky/labeler.rs

···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct LabelerViewerState<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub like: Option<jacquard_common::types::string::AtUri<'a>>,
+    pub like: std::option::Option<jacquard_common::types::string::AtUri<'a>>,
 }

crates/jacquard-api/src/app_bsky/notification.rs

···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct RecordDeleted<'a> {}

crates/jacquard-api/src/app_bsky/notification/put_preferences_v2.rs

···
     Clone,
     PartialEq,
     Eq,
-    bon::Builder,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
-#[builder(start_fn = new)]
 pub struct PutPreferencesV2<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub chat: Option<crate::app_bsky::notification::ChatPreference<'a>>,
+    pub chat: std::option::Option<crate::app_bsky::notification::ChatPreference<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub follow: Option<crate::app_bsky::notification::FilterablePreference<'a>>,
+    pub follow: std::option::Option<
+        crate::app_bsky::notification::FilterablePreference<'a>,
+    >,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub like: Option<crate::app_bsky::notification::FilterablePreference<'a>>,
+    pub like: std::option::Option<
+        crate::app_bsky::notification::FilterablePreference<'a>,
+    >,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub like_via_repost: Option<crate::app_bsky::notification::FilterablePreference<'a>>,
+    pub like_via_repost: std::option::Option<
+        crate::app_bsky::notification::FilterablePreference<'a>,
+    >,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub mention: Option<crate::app_bsky::notification::FilterablePreference<'a>>,
+    pub mention: std::option::Option<
+        crate::app_bsky::notification::FilterablePreference<'a>,
+    >,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub quote: Option<crate::app_bsky::notification::FilterablePreference<'a>>,
+    pub quote: std::option::Option<
+        crate::app_bsky::notification::FilterablePreference<'a>,
+    >,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub reply: Option<crate::app_bsky::notification::FilterablePreference<'a>>,
+    pub reply: std::option::Option<
+        crate::app_bsky::notification::FilterablePreference<'a>,
+    >,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub repost: Option<crate::app_bsky::notification::FilterablePreference<'a>>,
+    pub repost: std::option::Option<
+        crate::app_bsky::notification::FilterablePreference<'a>,
+    >,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub repost_via_repost: Option<
+    pub repost_via_repost: std::option::Option<
         crate::app_bsky::notification::FilterablePreference<'a>,
     >,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub starterpack_joined: Option<crate::app_bsky::notification::Preference<'a>>,
+    pub starterpack_joined: std::option::Option<
+        crate::app_bsky::notification::Preference<'a>,
+    >,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub subscribed_post: Option<crate::app_bsky::notification::Preference<'a>>,
+    pub subscribed_post: std::option::Option<
+        crate::app_bsky::notification::Preference<'a>,
+    >,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub unverified: Option<crate::app_bsky::notification::Preference<'a>>,
+    pub unverified: std::option::Option<crate::app_bsky::notification::Preference<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub verified: Option<crate::app_bsky::notification::Preference<'a>>,
-    #[serde(flatten)]
-    #[serde(borrow)]
-    #[builder(default)]
-    pub extra_data: ::std::collections::BTreeMap<
-        ::jacquard_common::smol_str::SmolStr,
-        ::jacquard_common::types::value::Data<'a>,
-    >,
+    pub verified: std::option::Option<crate::app_bsky::notification::Preference<'a>>,
 }
 
 #[jacquard_derive::lexicon]

crates/jacquard-api/src/app_bsky/richtext/facet.rs

···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct Tag<'a> {
     #[serde(borrow)]
-    #[builder(into)]
     pub tag: jacquard_common::CowStr<'a>,
 }

crates/jacquard-api/src/app_bsky/unspecced.rs

···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct AgeAssuranceState<'a> {
     /// The timestamp when this state was last updated.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub last_initiated_at: Option<jacquard_common::types::string::Datetime>,
+    pub last_initiated_at: std::option::Option<jacquard_common::types::string::Datetime>,
     /// The status of the age assurance process.
     #[serde(borrow)]
-    #[builder(into)]
     pub status: jacquard_common::CowStr<'a>,
 }
 
···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct ThreadItemNoUnauthenticated<'a> {}
···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct ThreadItemNotFound<'a> {}
···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct TrendingTopic<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub description: Option<jacquard_common::CowStr<'a>>,
+    pub description: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub display_name: Option<jacquard_common::CowStr<'a>>,
+    pub display_name: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(borrow)]
-    #[builder(into)]
     pub link: jacquard_common::CowStr<'a>,
     #[serde(borrow)]
-    #[builder(into)]
     pub topic: jacquard_common::CowStr<'a>,
 }

crates/jacquard-api/src/app_bsky/unspecced/get_config.rs

···
     Clone,
     PartialEq,
     Eq,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct GetConfigOutput<'a> {

crates/jacquard-api/src/app_bsky/unspecced/init_age_assurance.rs

···
     Clone,
     PartialEq,
     Eq,
-    bon::Builder,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
-#[builder(start_fn = new)]
 pub struct InitAgeAssurance<'a> {
     /// An ISO 3166-1 alpha-2 code of the user's location.
     #[serde(borrow)]
-    #[builder(into)]
     pub country_code: jacquard_common::CowStr<'a>,
     /// The user's email address to receive assurance instructions.
     #[serde(borrow)]
-    #[builder(into)]
     pub email: jacquard_common::CowStr<'a>,
     /// The user's preferred language for communication during the assurance process.
     #[serde(borrow)]
-    #[builder(into)]
     pub language: jacquard_common::CowStr<'a>,
-    #[serde(flatten)]
-    #[serde(borrow)]
-    #[builder(default)]
-    pub extra_data: ::std::collections::BTreeMap<
-        ::jacquard_common::smol_str::SmolStr,
-        ::jacquard_common::types::value::Data<'a>,
-    >,
 }
 
 #[jacquard_derive::lexicon]

crates/jacquard-api/src/app_ocho/auth/authorize.rs

···
     Clone,
     PartialEq,
     Eq,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct AuthorizeOutput<'a> {

crates/jacquard-api/src/app_ocho/auth/update_email.rs

···
     Clone,
     PartialEq,
     Eq,
-    bon::Builder,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
-#[builder(start_fn = new)]
 pub struct UpdateEmail<'a> {
     #[serde(borrow)]
-    #[builder(into)]
     pub email: jacquard_common::CowStr<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub email_auth_factor: Option<bool>,
+    pub email_auth_factor: std::option::Option<bool>,
     /// Requires a token from com.atproto.sever.requestEmailUpdate if the account's email has been confirmed.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub token: Option<jacquard_common::CowStr<'a>>,
-    #[serde(flatten)]
-    #[serde(borrow)]
-    #[builder(default)]
-    pub extra_data: ::std::collections::BTreeMap<
-        ::jacquard_common::smol_str::SmolStr,
-        ::jacquard_common::types::value::Data<'a>,
-    >,
+    pub token: std::option::Option<jacquard_common::CowStr<'a>>,
 }
 
 #[jacquard_derive::open_union]

crates/jacquard-api/src/app_ocho/auth/whoami.rs

···
     Clone,
     PartialEq,
     Eq,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct WhoamiOutput<'a> {

crates/jacquard-api/src/app_ocho/edu/get_verification_url.rs

···
     Clone,
     PartialEq,
     Eq,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct GetVerificationUrlOutput<'a> {

crates/jacquard-api/src/app_ocho/message/send.rs

···
     Clone,
     PartialEq,
     Eq,
-    bon::Builder,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
-#[builder(start_fn = new)]
 pub struct Send<'a> {
     /// The user to send the message to.
     #[serde(borrow)]
-    #[builder(into)]
     pub did: jacquard_common::CowStr<'a>,
     /// The message to send to the user.
     #[serde(borrow)]
-    #[builder(into)]
     pub message: jacquard_common::CowStr<'a>,
-    #[serde(flatten)]
-    #[serde(borrow)]
-    #[builder(default)]
-    pub extra_data: ::std::collections::BTreeMap<
-        ::jacquard_common::smol_str::SmolStr,
-        ::jacquard_common::types::value::Data<'a>,
-    >,
 }
 
 #[jacquard_derive::lexicon]

crates/jacquard-api/src/app_ocho/payment/get_stripe_intent.rs

···
     Clone,
     PartialEq,
     Eq,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct GetStripeIntentOutput<'a> {

crates/jacquard-api/src/app_ocho/plugin.rs

···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct AdaptiveIcon<'a> {
     /// The background color of the adaptive icon.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub background_color: Option<jacquard_common::CowStr<'a>>,
+    pub background_color: std::option::Option<jacquard_common::CowStr<'a>>,
     /// The URL to the foreground image of the adaptive icon.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub foreground_image: Option<jacquard_common::CowStr<'a>>,
+    pub foreground_image: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub foreground_image_blob: Option<jacquard_common::types::blob::Blob<'a>>,
+    pub foreground_image_blob: std::option::Option<
+        jacquard_common::types::blob::Blob<'a>,
+    >,
 }
 
 #[jacquard_derive::lexicon]
···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct Android<'a> {
     /// Configuration for the adaptive icon on Android.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub adaptive_icon: Option<crate::app_ocho::plugin::AdaptiveIcon<'a>>,
+    pub adaptive_icon: std::option::Option<crate::app_ocho::plugin::AdaptiveIcon<'a>>,
     /// Whether edge-to-edge mode is enabled for the app.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub edge_to_edge_enabled: Option<bool>,
+    pub edge_to_edge_enabled: std::option::Option<bool>,
 }
 
 /// Android status bar configuration.
···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct AndroidStatusBar<'a> {
     /// The background color of the Android status bar.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub background_color: Option<jacquard_common::CowStr<'a>>,
+    pub background_color: std::option::Option<jacquard_common::CowStr<'a>>,
 }
 
 #[jacquard_derive::lexicon]
···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct Db<'a> {
     /// The ID of the database.
     #[serde(borrow)]
-    #[builder(into)]
     pub id: jacquard_common::CowStr<'a>,
 }
 
···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct Developer<'a> {
     /// The tool used for development, e.g., 'expo-cli'.
     #[serde(borrow)]
-    #[builder(into)]
     pub tool: jacquard_common::CowStr<'a>,
 }
 
···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct ExpoClient<'a> {
     /// Android-specific configuration for the app.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub android: Option<crate::app_ocho::plugin::Android<'a>>,
+    pub android: std::option::Option<crate::app_ocho::plugin::Android<'a>>,
     /// Configuration for the Android status bar.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub android_status_bar: Option<crate::app_ocho::plugin::AndroidStatusBar<'a>>,
+    pub android_status_bar: std::option::Option<
+        crate::app_ocho::plugin::AndroidStatusBar<'a>,
+    >,
     /// Experimental features enabled for the app.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub expirements: Option<jacquard_common::types::value::Data<'a>>,
+    pub expirements: std::option::Option<jacquard_common::types::value::Data<'a>>,
     /// Additional configuration for the app.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub extra: Option<jacquard_common::types::value::Data<'a>>,
+    pub extra: std::option::Option<jacquard_common::types::value::Data<'a>>,
     /// The URL to the app icon.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub icon: Option<jacquard_common::CowStr<'a>>,
+    pub icon: std::option::Option<jacquard_common::CowStr<'a>>,
     /// ios-specific configuration for the app.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub ios: Option<crate::app_ocho::plugin::Ios<'a>>,
+    pub ios: std::option::Option<crate::app_ocho::plugin::Ios<'a>>,
     /// Localization settings for the app.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub locales: Option<jacquard_common::types::value::Data<'a>>,
+    pub locales: std::option::Option<jacquard_common::types::value::Data<'a>>,
     /// The name of the Expo client application.
     #[serde(borrow)]
-    #[builder(into)]
     pub name: jacquard_common::CowStr<'a>,
     /// Whether the new architecture is enabled for the app.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub new_arch_enabled: Option<bool>,
+    pub new_arch_enabled: std::option::Option<bool>,
     /// The default orientation of the app.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub orientation: Option<jacquard_common::CowStr<'a>>,
+    pub orientation: std::option::Option<jacquard_common::CowStr<'a>>,
     /// The platforms supported by the app.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub platforms: Option<Vec<jacquard_common::CowStr<'a>>>,
+    pub platforms: std::option::Option<Vec<jacquard_common::CowStr<'a>>>,
     /// A list of plugins used by the app.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub plugins: Option<jacquard_common::types::value::Data<'a>>,
+    pub plugins: std::option::Option<jacquard_common::types::value::Data<'a>>,
     /// The custom URI scheme for deep linking.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub scheme: Option<jacquard_common::CowStr<'a>>,
+    pub scheme: std::option::Option<jacquard_common::CowStr<'a>>,
     /// The SDK version of the Expo client.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub sdk_version: Option<jacquard_common::CowStr<'a>>,
+    pub sdk_version: std::option::Option<jacquard_common::CowStr<'a>>,
     /// A URL-friendly identifier for the app.
     #[serde(borrow)]
-    #[builder(into)]
     pub slug: jacquard_common::CowStr<'a>,
     /// The default user interface style.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub user_interface_style: Option<jacquard_common::CowStr<'a>>,
+    pub user_interface_style: std::option::Option<jacquard_common::CowStr<'a>>,
     /// The version of the app.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub version: Option<jacquard_common::CowStr<'a>>,
+    pub version: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Web-specific configuration for the app.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub web: Option<crate::app_ocho::plugin::Web<'a>>,
+    pub web: std::option::Option<crate::app_ocho::plugin::Web<'a>>,
 }
 
 #[jacquard_derive::lexicon]
···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct Ios<'a> {
     /// Whether the app supports iPad.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub supports_tablet: Option<bool>,
+    pub supports_tablet: std::option::Option<bool>,
 }
 
 #[jacquard_derive::lexicon]
···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct Web<'a> {
     /// The bundler used for the web app.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub bundler: Option<jacquard_common::CowStr<'a>>,
+    pub bundler: std::option::Option<jacquard_common::CowStr<'a>>,
     /// The URL to the favicon for the web app.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub favicon: Option<jacquard_common::CowStr<'a>>,
+    pub favicon: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub favicon_blob: Option<jacquard_common::types::blob::Blob<'a>>,
+    pub favicon_blob: std::option::Option<jacquard_common::types::blob::Blob<'a>>,
     /// The output directory for the web app.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub output: Option<jacquard_common::CowStr<'a>>,
+    pub output: std::option::Option<jacquard_common::CowStr<'a>>,
 }

crates/jacquard-api/src/app_ocho/plugin/put_hosting_url.rs

···
     Clone,
     PartialEq,
     Eq,
-    bon::Builder,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
-#[builder(start_fn = new)]
 pub struct PutHostingUrl<'a> {
     /// The expo push token
     #[serde(borrow)]
-    #[builder(into)]
     pub url: jacquard_common::CowStr<'a>,
-    #[serde(flatten)]
-    #[serde(borrow)]
-    #[builder(default)]
-    pub extra_data: ::std::collections::BTreeMap<
-        ::jacquard_common::smol_str::SmolStr,
-        ::jacquard_common::types::value::Data<'a>,
-    >,
 }
 
 #[jacquard_derive::lexicon]

crates/jacquard-api/src/app_ocho/push/register.rs

···
     Clone,
     PartialEq,
     Eq,
-    bon::Builder,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
-#[builder(start_fn = new)]
 pub struct Register<'a> {
     /// The expo push token
     #[serde(borrow)]
-    #[builder(into)]
     pub push_token: jacquard_common::CowStr<'a>,
-    #[serde(flatten)]
-    #[serde(borrow)]
-    #[builder(default)]
-    pub extra_data: ::std::collections::BTreeMap<
-        ::jacquard_common::smol_str::SmolStr,
-        ::jacquard_common::types::value::Data<'a>,
-    >,
 }
 
 #[jacquard_derive::lexicon]

crates/jacquard-api/src/app_ocho/server/get_launch_token.rs

···
     Clone,
     PartialEq,
     Eq,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct GetLaunchTokenOutput<'a> {

crates/jacquard-api/src/app_ocho/server/get_token.rs

···
     Clone,
     PartialEq,
     Eq,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct GetTokenOutput<'a> {

crates/jacquard-api/src/app_ocho/server/swap_launch_token.rs

···
     Clone,
     PartialEq,
     Eq,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct SwapLaunchTokenOutput<'a> {

crates/jacquard-api/src/app_ocho/state/get_config.rs

···
     Clone,
     PartialEq,
     Eq,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct GetConfigOutput<'a> {

crates/jacquard-api/src/app_ocho/state/login.rs

···
     Clone,
     PartialEq,
     Eq,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct LoginOutput<'a> {

crates/jacquard-api/src/blog_pckt/blog.rs

···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct Palette<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub accent: Option<jacquard_common::CowStr<'a>>,
+    pub accent: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub background: Option<jacquard_common::CowStr<'a>>,
+    pub background: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub link: Option<jacquard_common::CowStr<'a>>,
+    pub link: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub surface_hover: Option<jacquard_common::CowStr<'a>>,
+    pub surface_hover: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub text: Option<jacquard_common::CowStr<'a>>,
+    pub text: std::option::Option<jacquard_common::CowStr<'a>>,
 }
 
 #[jacquard_derive::lexicon]
···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct Theme<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub dark: Option<crate::blog_pckt::blog::Palette<'a>>,
+    pub dark: std::option::Option<crate::blog_pckt::blog::Palette<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub font: Option<jacquard_common::CowStr<'a>>,
+    pub font: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub light: Option<crate::blog_pckt::blog::Palette<'a>>,
+    pub light: std::option::Option<crate::blog_pckt::blog::Palette<'a>>,
 }

crates/jacquard-api/src/blog_pckt/theme.rs

···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct Palette<'a> {
     /// Accent color (hex value)
     #[serde(borrow)]
-    #[builder(into)]
     pub accent: jacquard_common::CowStr<'a>,
     /// Background color (hex value)
     #[serde(borrow)]
-    #[builder(into)]
     pub background: jacquard_common::CowStr<'a>,
     /// Link color (hex value)
     #[serde(borrow)]
-    #[builder(into)]
     pub link: jacquard_common::CowStr<'a>,
     /// Surface hover color (hex value)
     #[serde(borrow)]
-    #[builder(into)]
     pub surface_hover: jacquard_common::CowStr<'a>,
     /// Primary text color (hex value)
     #[serde(borrow)]
-    #[builder(into)]
     pub text: jacquard_common::CowStr<'a>,
 }

crates/jacquard-api/src/blue_linkat/board.rs

···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct Card<'a> {
     /// Emoji of the card
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub emoji: Option<jacquard_common::CowStr<'a>>,
+    pub emoji: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Text of the card
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub text: Option<jacquard_common::CowStr<'a>>,
+    pub text: std::option::Option<jacquard_common::CowStr<'a>>,
     /// URL of the link
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub url: Option<jacquard_common::CowStr<'a>>,
+    pub url: std::option::Option<jacquard_common::CowStr<'a>>,
 }
 
 /// Record containing a cards of your profile.

crates/jacquard-api/src/blue_zio/atfile/finger.rs

···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct Browser<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub id: Option<jacquard_common::CowStr<'a>>,
+    pub id: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub user_agent: Option<jacquard_common::CowStr<'a>>,
+    pub user_agent: std::option::Option<jacquard_common::CowStr<'a>>,
 }
 
 /// A fingerprint of a machine upload.
···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct Machine<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub app: Option<jacquard_common::CowStr<'a>>,
+    pub app: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub host: Option<jacquard_common::CowStr<'a>>,
+    pub host: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub id: Option<jacquard_common::CowStr<'a>>,
+    pub id: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub os: Option<jacquard_common::CowStr<'a>>,
+    pub os: std::option::Option<jacquard_common::CowStr<'a>>,
 }

crates/jacquard-api/src/blue_zio/atfile/meta.rs

···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct Unknown<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub reason: Option<jacquard_common::CowStr<'a>>,
+    pub reason: std::option::Option<jacquard_common::CowStr<'a>>,
 }

crates/jacquard-api/src/chat_bsky/actor/delete_account.rs

···
     Clone,
     PartialEq,
     Eq,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct DeleteAccountOutput<'a> {}

crates/jacquard-api/src/chat_bsky/convo.rs

···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct LogAcceptConvo<'a> {
     #[serde(borrow)]
-    #[builder(into)]
     pub convo_id: jacquard_common::CowStr<'a>,
     #[serde(borrow)]
-    #[builder(into)]
     pub rev: jacquard_common::CowStr<'a>,
 }
 
···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct LogBeginConvo<'a> {
     #[serde(borrow)]
-    #[builder(into)]
     pub convo_id: jacquard_common::CowStr<'a>,
     #[serde(borrow)]
-    #[builder(into)]
     pub rev: jacquard_common::CowStr<'a>,
 }
 
···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct LogLeaveConvo<'a> {
     #[serde(borrow)]
-    #[builder(into)]
     pub convo_id: jacquard_common::CowStr<'a>,
     #[serde(borrow)]
-    #[builder(into)]
     pub rev: jacquard_common::CowStr<'a>,
 }
 
···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct LogMuteConvo<'a> {
     #[serde(borrow)]
-    #[builder(into)]
     pub convo_id: jacquard_common::CowStr<'a>,
     #[serde(borrow)]
-    #[builder(into)]
     pub rev: jacquard_common::CowStr<'a>,
 }
 
···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct LogUnmuteConvo<'a> {
     #[serde(borrow)]
-    #[builder(into)]
     pub convo_id: jacquard_common::CowStr<'a>,
     #[serde(borrow)]
-    #[builder(into)]
     pub rev: jacquard_common::CowStr<'a>,
 }
 
···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct MessageInput<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub embed: Option<crate::app_bsky::embed::record::Record<'a>>,
+    pub embed: std::option::Option<crate::app_bsky::embed::record::Record<'a>>,
     /// Annotations of text (mentions, URLs, hashtags, etc)
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub facets: Option<Vec<crate::app_bsky::richtext::facet::Facet<'a>>>,
+    pub facets: std::option::Option<Vec<crate::app_bsky::richtext::facet::Facet<'a>>>,
     #[serde(borrow)]
-    #[builder(into)]
     pub text: jacquard_common::CowStr<'a>,
 }
 

crates/jacquard-api/src/chat_bsky/convo/accept_convo.rs

···
     Clone,
     PartialEq,
     Eq,
-    bon::Builder,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
-#[builder(start_fn = new)]
 pub struct AcceptConvo<'a> {
     #[serde(borrow)]
-    #[builder(into)]
     pub convo_id: jacquard_common::CowStr<'a>,
-    #[serde(flatten)]
-    #[serde(borrow)]
-    #[builder(default)]
-    pub extra_data: ::std::collections::BTreeMap<
-        ::jacquard_common::smol_str::SmolStr,
-        ::jacquard_common::types::value::Data<'a>,
-    >,
 }
 
 #[jacquard_derive::lexicon]
···
     Clone,
     PartialEq,
     Eq,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct AcceptConvoOutput<'a> {

crates/jacquard-api/src/chat_bsky/convo/add_reaction.rs

···
     Clone,
     PartialEq,
     Eq,
-    bon::Builder,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
-#[builder(start_fn = new)]
 pub struct AddReaction<'a> {
     #[serde(borrow)]
-    #[builder(into)]
     pub convo_id: jacquard_common::CowStr<'a>,
     #[serde(borrow)]
-    #[builder(into)]
     pub message_id: jacquard_common::CowStr<'a>,
     #[serde(borrow)]
-    #[builder(into)]
     pub value: jacquard_common::CowStr<'a>,
-    #[serde(flatten)]
-    #[serde(borrow)]
-    #[builder(default)]
-    pub extra_data: ::std::collections::BTreeMap<
-        ::jacquard_common::smol_str::SmolStr,
-        ::jacquard_common::types::value::Data<'a>,
-    >,
 }
 
 #[jacquard_derive::lexicon]

crates/jacquard-api/src/chat_bsky/convo/delete_message_for_self.rs

···
     Clone,
     PartialEq,
     Eq,
-    bon::Builder,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
-#[builder(start_fn = new)]
 pub struct DeleteMessageForSelf<'a> {
     #[serde(borrow)]
-    #[builder(into)]
     pub convo_id: jacquard_common::CowStr<'a>,
     #[serde(borrow)]
-    #[builder(into)]
     pub message_id: jacquard_common::CowStr<'a>,
-    #[serde(flatten)]
-    #[serde(borrow)]
-    #[builder(default)]
-    pub extra_data: ::std::collections::BTreeMap<
-        ::jacquard_common::smol_str::SmolStr,
-        ::jacquard_common::types::value::Data<'a>,
-    >,
 }
 
 #[jacquard_derive::lexicon]

crates/jacquard-api/src/chat_bsky/convo/leave_convo.rs

···
     Clone,
     PartialEq,
     Eq,
-    bon::Builder,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
-#[builder(start_fn = new)]
 pub struct LeaveConvo<'a> {
     #[serde(borrow)]
-    #[builder(into)]
     pub convo_id: jacquard_common::CowStr<'a>,
-    #[serde(flatten)]
-    #[serde(borrow)]
-    #[builder(default)]
-    pub extra_data: ::std::collections::BTreeMap<
-        ::jacquard_common::smol_str::SmolStr,
-        ::jacquard_common::types::value::Data<'a>,
-    >,
 }
 
 #[jacquard_derive::lexicon]
···
     Clone,
     PartialEq,
     Eq,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct LeaveConvoOutput<'a> {

crates/jacquard-api/src/chat_bsky/convo/mute_convo.rs

···
     Clone,
     PartialEq,
     Eq,
-    bon::Builder,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
-#[builder(start_fn = new)]
 pub struct MuteConvo<'a> {
     #[serde(borrow)]
-    #[builder(into)]
     pub convo_id: jacquard_common::CowStr<'a>,
-    #[serde(flatten)]
-    #[serde(borrow)]
-    #[builder(default)]
-    pub extra_data: ::std::collections::BTreeMap<
-        ::jacquard_common::smol_str::SmolStr,
-        ::jacquard_common::types::value::Data<'a>,
-    >,
 }
 
 #[jacquard_derive::lexicon]

crates/jacquard-api/src/chat_bsky/convo/remove_reaction.rs

···
     Clone,
     PartialEq,
     Eq,
-    bon::Builder,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
-#[builder(start_fn = new)]
 pub struct RemoveReaction<'a> {
     #[serde(borrow)]
-    #[builder(into)]
     pub convo_id: jacquard_common::CowStr<'a>,
     #[serde(borrow)]
-    #[builder(into)]
     pub message_id: jacquard_common::CowStr<'a>,
     #[serde(borrow)]
-    #[builder(into)]
     pub value: jacquard_common::CowStr<'a>,
-    #[serde(flatten)]
-    #[serde(borrow)]
-    #[builder(default)]
-    pub extra_data: ::std::collections::BTreeMap<
-        ::jacquard_common::smol_str::SmolStr,
-        ::jacquard_common::types::value::Data<'a>,
-    >,
 }
 
 #[jacquard_derive::lexicon]

crates/jacquard-api/src/chat_bsky/convo/unmute_convo.rs

···
     Clone,
     PartialEq,
     Eq,
-    bon::Builder,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
-#[builder(start_fn = new)]
 pub struct UnmuteConvo<'a> {
     #[serde(borrow)]
-    #[builder(into)]
     pub convo_id: jacquard_common::CowStr<'a>,
-    #[serde(flatten)]
-    #[serde(borrow)]
-    #[builder(default)]
-    pub extra_data: ::std::collections::BTreeMap<
-        ::jacquard_common::smol_str::SmolStr,
-        ::jacquard_common::types::value::Data<'a>,
-    >,
 }
 
 #[jacquard_derive::lexicon]

crates/jacquard-api/src/chat_bsky/convo/update_all_read.rs

···
     Clone,
     PartialEq,
     Eq,
-    bon::Builder,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
-#[builder(start_fn = new)]
 pub struct UpdateAllRead<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub status: Option<jacquard_common::CowStr<'a>>,
-    #[serde(flatten)]
-    #[serde(borrow)]
-    #[builder(default)]
-    pub extra_data: ::std::collections::BTreeMap<
-        ::jacquard_common::smol_str::SmolStr,
-        ::jacquard_common::types::value::Data<'a>,
-    >,
+    pub status: std::option::Option<jacquard_common::CowStr<'a>>,
 }
 
 #[jacquard_derive::lexicon]

crates/jacquard-api/src/chat_bsky/convo/update_read.rs

···
     Clone,
     PartialEq,
     Eq,
-    bon::Builder,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
-#[builder(start_fn = new)]
 pub struct UpdateRead<'a> {
     #[serde(borrow)]
-    #[builder(into)]
     pub convo_id: jacquard_common::CowStr<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub message_id: Option<jacquard_common::CowStr<'a>>,
-    #[serde(flatten)]
-    #[serde(borrow)]
-    #[builder(default)]
-    pub extra_data: ::std::collections::BTreeMap<
-        ::jacquard_common::smol_str::SmolStr,
-        ::jacquard_common::types::value::Data<'a>,
-    >,
+    pub message_id: std::option::Option<jacquard_common::CowStr<'a>>,
 }
 
 #[jacquard_derive::lexicon]

crates/jacquard-api/src/com_atproto/admin.rs

···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct ThreatSignature<'a> {
     #[serde(borrow)]
-    #[builder(into)]
     pub property: jacquard_common::CowStr<'a>,
     #[serde(borrow)]
-    #[builder(into)]
     pub value: jacquard_common::CowStr<'a>,
 }

crates/jacquard-api/src/com_atproto/admin/disable_invite_codes.rs

···
     Clone,
     PartialEq,
     Eq,
-    bon::Builder,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
-#[builder(start_fn = new)]
 pub struct DisableInviteCodes<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub accounts: Option<Vec<jacquard_common::CowStr<'a>>>,
+    pub accounts: std::option::Option<Vec<jacquard_common::CowStr<'a>>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub codes: Option<Vec<jacquard_common::CowStr<'a>>>,
-    #[serde(flatten)]
-    #[serde(borrow)]
-    #[builder(default)]
-    pub extra_data: ::std::collections::BTreeMap<
-        ::jacquard_common::smol_str::SmolStr,
-        ::jacquard_common::types::value::Data<'a>,
-    >,
+    pub codes: std::option::Option<Vec<jacquard_common::CowStr<'a>>>,
 }
 
 ///Response type for

crates/jacquard-api/src/com_atproto/identity/get_recommended_did_credentials.rs

···
     Clone,
     PartialEq,
     Eq,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct GetRecommendedDidCredentialsOutput<'a> {

crates/jacquard-api/src/com_atproto/identity/sign_plc_operation.rs

···
     Clone,
     PartialEq,
     Eq,
-    bon::Builder,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
-#[builder(start_fn = new)]
 pub struct SignPlcOperation<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub also_known_as: Option<Vec<jacquard_common::CowStr<'a>>>,
+    pub also_known_as: std::option::Option<Vec<jacquard_common::CowStr<'a>>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub rotation_keys: Option<Vec<jacquard_common::CowStr<'a>>>,
+    pub rotation_keys: std::option::Option<Vec<jacquard_common::CowStr<'a>>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub services: Option<jacquard_common::types::value::Data<'a>>,
+    pub services: std::option::Option<jacquard_common::types::value::Data<'a>>,
     /// A token received through com.atproto.identity.requestPlcOperationSignature
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub token: Option<jacquard_common::CowStr<'a>>,
+    pub token: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub verification_methods: Option<jacquard_common::types::value::Data<'a>>,
-    #[serde(flatten)]
-    #[serde(borrow)]
-    #[builder(default)]
-    pub extra_data: ::std::collections::BTreeMap<
-        ::jacquard_common::smol_str::SmolStr,
-        ::jacquard_common::types::value::Data<'a>,
+    pub verification_methods: std::option::Option<
+        jacquard_common::types::value::Data<'a>,
     >,
 }
 

crates/jacquard-api/src/com_atproto/label.rs

···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct SelfLabel<'a> {
     /// The short string name of the value or type of this label.
     #[serde(borrow)]
-    #[builder(into)]
     pub val: jacquard_common::CowStr<'a>,
 }
 

crates/jacquard-api/src/com_atproto/label/subscribe_labels.rs

···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct Info<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub message: Option<jacquard_common::CowStr<'a>>,
+    pub message: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(borrow)]
-    #[builder(into)]
     pub name: jacquard_common::CowStr<'a>,
 }
 

crates/jacquard-api/src/com_atproto/moderation/create_report.rs

···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct ModTool<'a> {
     /// Additional arbitrary metadata about the source
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub meta: Option<jacquard_common::types::value::Data<'a>>,
+    pub meta: std::option::Option<jacquard_common::types::value::Data<'a>>,
     /// Name/identifier of the source (e.g., 'bsky-app/android', 'bsky-web/chrome')
     #[serde(borrow)]
-    #[builder(into)]
     pub name: jacquard_common::CowStr<'a>,
 }

crates/jacquard-api/src/com_atproto/repo/apply_writes.rs

···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct DeleteResult<'a> {}
···
     Clone,
     PartialEq,
     Eq,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct ApplyWritesOutput<'a> {

crates/jacquard-api/src/com_atproto/repo/delete_record.rs

···
     Clone,
     PartialEq,
     Eq,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct DeleteRecordOutput<'a> {

crates/jacquard-api/src/com_atproto/server/confirm_email.rs

···
     Clone,
     PartialEq,
     Eq,
-    bon::Builder,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
-#[builder(start_fn = new)]
 pub struct ConfirmEmail<'a> {
     #[serde(borrow)]
-    #[builder(into)]
     pub email: jacquard_common::CowStr<'a>,
     #[serde(borrow)]
-    #[builder(into)]
     pub token: jacquard_common::CowStr<'a>,
-    #[serde(flatten)]
-    #[serde(borrow)]
-    #[builder(default)]
-    pub extra_data: ::std::collections::BTreeMap<
-        ::jacquard_common::smol_str::SmolStr,
-        ::jacquard_common::types::value::Data<'a>,
-    >,
 }
 
 #[jacquard_derive::open_union]

crates/jacquard-api/src/com_atproto/server/create_app_password.rs

···
     Clone,
     PartialEq,
     Eq,
-    bon::Builder,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
-#[builder(start_fn = new)]
 pub struct CreateAppPassword<'a> {
     /// A short name for the App Password, to help distinguish them.
     #[serde(borrow)]
-    #[builder(into)]
     pub name: jacquard_common::CowStr<'a>,
     /// If an app password has 'privileged' access to possibly sensitive account state. Meant for use with trusted clients.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub privileged: Option<bool>,
-    #[serde(flatten)]
-    #[serde(borrow)]
-    #[builder(default)]
-    pub extra_data: ::std::collections::BTreeMap<
-        ::jacquard_common::smol_str::SmolStr,
-        ::jacquard_common::types::value::Data<'a>,
-    >,
+    pub privileged: std::option::Option<bool>,
 }
 
 #[jacquard_derive::lexicon]

crates/jacquard-api/src/com_atproto/server/create_invite_code.rs

···
     Clone,
     PartialEq,
     Eq,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct CreateInviteCodeOutput<'a> {

crates/jacquard-api/src/com_atproto/server/create_session.rs

···
     Clone,
     PartialEq,
     Eq,
-    bon::Builder,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
-#[builder(start_fn = new)]
 pub struct CreateSession<'a> {
     /// When true, instead of throwing error for takendown accounts, a valid response with a narrow scoped token will be returned
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub allow_takendown: Option<bool>,
+    pub allow_takendown: std::option::Option<bool>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub auth_factor_token: Option<jacquard_common::CowStr<'a>>,
+    pub auth_factor_token: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Handle or other identifier supported by the server for the authenticating user.
     #[serde(borrow)]
-    #[builder(into)]
     pub identifier: jacquard_common::CowStr<'a>,
     #[serde(borrow)]
-    #[builder(into)]
     pub password: jacquard_common::CowStr<'a>,
-    #[serde(flatten)]
-    #[serde(borrow)]
-    #[builder(default)]
-    pub extra_data: ::std::collections::BTreeMap<
-        ::jacquard_common::smol_str::SmolStr,
-        ::jacquard_common::types::value::Data<'a>,
-    >,
 }
 
 #[jacquard_derive::lexicon]

crates/jacquard-api/src/com_atproto/server/deactivate_account.rs

···
     Clone,
     PartialEq,
     Eq,
-    bon::Builder,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
-#[builder(start_fn = new)]
 pub struct DeactivateAccount<'a> {
     /// A recommendation to server as to how long they should hold onto the deactivated account before deleting.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub delete_after: Option<jacquard_common::types::string::Datetime>,
-    #[serde(flatten)]
-    #[serde(borrow)]
-    #[builder(default)]
-    pub extra_data: ::std::collections::BTreeMap<
-        ::jacquard_common::smol_str::SmolStr,
-        ::jacquard_common::types::value::Data<'a>,
-    >,
+    pub delete_after: std::option::Option<jacquard_common::types::string::Datetime>,
 }
 
 ///Response type for

crates/jacquard-api/src/com_atproto/server/describe_server.rs

···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct Contact<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub email: Option<jacquard_common::CowStr<'a>>,
+    pub email: std::option::Option<jacquard_common::CowStr<'a>>,
 }
 
 #[jacquard_derive::lexicon]
···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct Links<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub privacy_policy: Option<jacquard_common::types::string::Uri<'a>>,
+    pub privacy_policy: std::option::Option<jacquard_common::types::string::Uri<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub terms_of_service: Option<jacquard_common::types::string::Uri<'a>>,
+    pub terms_of_service: std::option::Option<jacquard_common::types::string::Uri<'a>>,
 }
 
 #[jacquard_derive::lexicon]

crates/jacquard-api/src/com_atproto/server/get_service_auth.rs

···
     Clone,
     PartialEq,
     Eq,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct GetServiceAuthOutput<'a> {

crates/jacquard-api/src/com_atproto/server/request_password_reset.rs

···
     Clone,
     PartialEq,
     Eq,
-    bon::Builder,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
-#[builder(start_fn = new)]
 pub struct RequestPasswordReset<'a> {
     #[serde(borrow)]
-    #[builder(into)]
     pub email: jacquard_common::CowStr<'a>,
-    #[serde(flatten)]
-    #[serde(borrow)]
-    #[builder(default)]
-    pub extra_data: ::std::collections::BTreeMap<
-        ::jacquard_common::smol_str::SmolStr,
-        ::jacquard_common::types::value::Data<'a>,
-    >,
 }
 
 ///Response type for

crates/jacquard-api/src/com_atproto/server/reserve_signing_key.rs

···
     Clone,
     PartialEq,
     Eq,
-    bon::Builder,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
-#[builder(start_fn = new)]
 pub struct ReserveSigningKey<'a> {
     /// The DID to reserve a key for.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    #[serde(borrow)]
-    pub did: Option<jacquard_common::types::string::Did<'a>>,
-    #[serde(flatten)]
     #[serde(borrow)]
-    #[builder(default)]
-    pub extra_data: ::std::collections::BTreeMap<
-        ::jacquard_common::smol_str::SmolStr,
-        ::jacquard_common::types::value::Data<'a>,
-    >,
+    pub did: std::option::Option<jacquard_common::types::string::Did<'a>>,
 }
 
 #[jacquard_derive::lexicon]
···
     Clone,
     PartialEq,
     Eq,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct ReserveSigningKeyOutput<'a> {

crates/jacquard-api/src/com_atproto/server/reset_password.rs

···
     Clone,
     PartialEq,
     Eq,
-    bon::Builder,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
-#[builder(start_fn = new)]
 pub struct ResetPassword<'a> {
     #[serde(borrow)]
-    #[builder(into)]
     pub password: jacquard_common::CowStr<'a>,
     #[serde(borrow)]
-    #[builder(into)]
     pub token: jacquard_common::CowStr<'a>,
-    #[serde(flatten)]
-    #[serde(borrow)]
-    #[builder(default)]
-    pub extra_data: ::std::collections::BTreeMap<
-        ::jacquard_common::smol_str::SmolStr,
-        ::jacquard_common::types::value::Data<'a>,
-    >,
 }
 
 #[jacquard_derive::open_union]

crates/jacquard-api/src/com_atproto/server/revoke_app_password.rs

···
     Clone,
     PartialEq,
     Eq,
-    bon::Builder,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
-#[builder(start_fn = new)]
 pub struct RevokeAppPassword<'a> {
     #[serde(borrow)]
-    #[builder(into)]
     pub name: jacquard_common::CowStr<'a>,
-    #[serde(flatten)]
-    #[serde(borrow)]
-    #[builder(default)]
-    pub extra_data: ::std::collections::BTreeMap<
-        ::jacquard_common::smol_str::SmolStr,
-        ::jacquard_common::types::value::Data<'a>,
-    >,
 }
 
 ///Response type for

crates/jacquard-api/src/com_atproto/server/update_email.rs

···
     Clone,
     PartialEq,
     Eq,
-    bon::Builder,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
-#[builder(start_fn = new)]
 pub struct UpdateEmail<'a> {
     #[serde(borrow)]
-    #[builder(into)]
     pub email: jacquard_common::CowStr<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub email_auth_factor: Option<bool>,
+    pub email_auth_factor: std::option::Option<bool>,
     /// Requires a token from com.atproto.sever.requestEmailUpdate if the account's email has been confirmed.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub token: Option<jacquard_common::CowStr<'a>>,
-    #[serde(flatten)]
-    #[serde(borrow)]
-    #[builder(default)]
-    pub extra_data: ::std::collections::BTreeMap<
-        ::jacquard_common::smol_str::SmolStr,
-        ::jacquard_common::types::value::Data<'a>,
-    >,
+    pub token: std::option::Option<jacquard_common::CowStr<'a>>,
 }
 
 #[jacquard_derive::open_union]

crates/jacquard-api/src/com_atproto/sync/get_host_status.rs

···
     Clone,
     PartialEq,
     Eq,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct GetHostStatusOutput<'a> {

crates/jacquard-api/src/com_atproto/sync/list_hosts.rs

···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct Host<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub account_count: Option<i64>,
+    pub account_count: std::option::Option<i64>,
     /// hostname of server; not a URL (no scheme)
     #[serde(borrow)]
-    #[builder(into)]
     pub hostname: jacquard_common::CowStr<'a>,
     /// Recent repo stream event sequence number. May be delayed from actual stream processing (eg, persisted cursor not in-memory cursor).
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub seq: Option<i64>,
+    pub seq: std::option::Option<i64>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub status: Option<crate::com_atproto::sync::HostStatus<'a>>,
+    pub status: std::option::Option<crate::com_atproto::sync::HostStatus<'a>>,
 }
 
 #[derive(

crates/jacquard-api/src/com_atproto/sync/notify_of_update.rs

···
     Clone,
     PartialEq,
     Eq,
-    bon::Builder,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
-#[builder(start_fn = new)]
 pub struct NotifyOfUpdate<'a> {
     /// Hostname of the current service (usually a PDS) that is notifying of update.
     #[serde(borrow)]
-    #[builder(into)]
     pub hostname: jacquard_common::CowStr<'a>,
-    #[serde(flatten)]
-    #[serde(borrow)]
-    #[builder(default)]
-    pub extra_data: ::std::collections::BTreeMap<
-        ::jacquard_common::smol_str::SmolStr,
-        ::jacquard_common::types::value::Data<'a>,
-    >,
 }
 
 ///Response type for

crates/jacquard-api/src/com_atproto/sync/request_crawl.rs

···
     Clone,
     PartialEq,
     Eq,
-    bon::Builder,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
-#[builder(start_fn = new)]
 pub struct RequestCrawl<'a> {
     /// Hostname of the current service (eg, PDS) that is requesting to be crawled.
     #[serde(borrow)]
-    #[builder(into)]
     pub hostname: jacquard_common::CowStr<'a>,
-    #[serde(flatten)]
-    #[serde(borrow)]
-    #[builder(default)]
-    pub extra_data: ::std::collections::BTreeMap<
-        ::jacquard_common::smol_str::SmolStr,
-        ::jacquard_common::types::value::Data<'a>,
-    >,
 }
 
 #[jacquard_derive::open_union]

crates/jacquard-api/src/com_atproto/sync/subscribe_repos.rs

···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct Info<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub message: Option<jacquard_common::CowStr<'a>>,
+    pub message: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(borrow)]
-    #[builder(into)]
     pub name: jacquard_common::CowStr<'a>,
 }
 

crates/jacquard-api/src/com_atproto/temp/add_reserved_handle.rs

···
     Clone,
     PartialEq,
     Eq,
-    bon::Builder,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
-#[builder(start_fn = new)]
 pub struct AddReservedHandle<'a> {
     #[serde(borrow)]
-    #[builder(into)]
     pub handle: jacquard_common::CowStr<'a>,
-    #[serde(flatten)]
-    #[serde(borrow)]
-    #[builder(default)]
-    pub extra_data: ::std::collections::BTreeMap<
-        ::jacquard_common::smol_str::SmolStr,
-        ::jacquard_common::types::value::Data<'a>,
-    >,
 }
 
 #[jacquard_derive::lexicon]
···
     Clone,
     PartialEq,
     Eq,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct AddReservedHandleOutput<'a> {}

crates/jacquard-api/src/com_atproto/temp/check_handle_availability.rs

···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct ResultAvailable<'a> {}

crates/jacquard-api/src/com_atproto/temp/dereference_scope.rs

···
     Clone,
     PartialEq,
     Eq,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct DereferenceScopeOutput<'a> {

crates/jacquard-api/src/com_atproto/temp/request_phone_verification.rs

···
     Clone,
     PartialEq,
     Eq,
-    bon::Builder,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
-#[builder(start_fn = new)]
 pub struct RequestPhoneVerification<'a> {
     #[serde(borrow)]
-    #[builder(into)]
     pub phone_number: jacquard_common::CowStr<'a>,
-    #[serde(flatten)]
-    #[serde(borrow)]
-    #[builder(default)]
-    pub extra_data: ::std::collections::BTreeMap<
-        ::jacquard_common::smol_str::SmolStr,
-        ::jacquard_common::types::value::Data<'a>,
-    >,
 }
 
 ///Response type for

crates/jacquard-api/src/com_shinolabs/pinksea/oekaki.rs

···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct ImageLink<'a> {
     /// Alt text description of the image, for accessibility.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub alt: Option<jacquard_common::CowStr<'a>>,
+    pub alt: std::option::Option<jacquard_common::CowStr<'a>>,
 }
 
 /// An oekaki post.

crates/jacquard-api/src/com_whtwnd/blog.rs

···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct BlogEntry<'a> {
     #[serde(borrow)]
-    #[builder(into)]
     pub content: jacquard_common::CowStr<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub created_at: Option<jacquard_common::types::string::Datetime>,
+    pub created_at: std::option::Option<jacquard_common::types::string::Datetime>,
 }
 
 #[jacquard_derive::lexicon]

crates/jacquard-api/src/com_whtwnd/blog/notify_of_new_entry.rs

···
     Clone,
     PartialEq,
     Eq,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct NotifyOfNewEntryOutput<'a> {}

crates/jacquard-api/src/community_lexicon/location/address.rs

···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct Address<'a> {
     /// The ISO 3166 country code. Preferably the 2-letter code.
     #[serde(borrow)]
-    #[builder(into)]
     pub country: jacquard_common::CowStr<'a>,
     /// The locality of the region. For example, a city in the USA.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub locality: Option<jacquard_common::CowStr<'a>>,
+    pub locality: std::option::Option<jacquard_common::CowStr<'a>>,
     /// The name of the location.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub name: Option<jacquard_common::CowStr<'a>>,
+    pub name: std::option::Option<jacquard_common::CowStr<'a>>,
     /// The postal code of the location.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub postal_code: Option<jacquard_common::CowStr<'a>>,
+    pub postal_code: std::option::Option<jacquard_common::CowStr<'a>>,
     /// The administrative region of the country. For example, a state in the USA.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub region: Option<jacquard_common::CowStr<'a>>,
+    pub region: std::option::Option<jacquard_common::CowStr<'a>>,
     /// The street address.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub street: Option<jacquard_common::CowStr<'a>>,
+    pub street: std::option::Option<jacquard_common::CowStr<'a>>,
 }

crates/jacquard-api/src/community_lexicon/location/fsq.rs

···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct Fsq<'a> {
     /// The unique identifier of a Foursquare POI.
     #[serde(borrow)]
-    #[builder(into)]
     pub fsq_place_id: jacquard_common::CowStr<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub latitude: Option<jacquard_common::CowStr<'a>>,
+    pub latitude: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub longitude: Option<jacquard_common::CowStr<'a>>,
+    pub longitude: std::option::Option<jacquard_common::CowStr<'a>>,
     /// The name of the location.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub name: Option<jacquard_common::CowStr<'a>>,
+    pub name: std::option::Option<jacquard_common::CowStr<'a>>,
 }

crates/jacquard-api/src/community_lexicon/location/geo.rs

···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct Geo<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub altitude: Option<jacquard_common::CowStr<'a>>,
+    pub altitude: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(borrow)]
-    #[builder(into)]
     pub latitude: jacquard_common::CowStr<'a>,
     #[serde(borrow)]
-    #[builder(into)]
     pub longitude: jacquard_common::CowStr<'a>,
     /// The name of the location.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub name: Option<jacquard_common::CowStr<'a>>,
+    pub name: std::option::Option<jacquard_common::CowStr<'a>>,
 }

crates/jacquard-api/src/community_lexicon/location/hthree.rs

···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct Hthree<'a> {
     /// The name of the location.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub name: Option<jacquard_common::CowStr<'a>>,
+    pub name: std::option::Option<jacquard_common::CowStr<'a>>,
     /// The h3 encoded location.
     #[serde(borrow)]
-    #[builder(into)]
     pub value: jacquard_common::CowStr<'a>,
 }

crates/jacquard-api/src/events_smokesignal/automation/invoke_webhook.rs

···
     Clone,
     PartialEq,
     Eq,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct InvokeWebhookOutput<'a> {}

crates/jacquard-api/src/garden_lexicon/ngerakines/helloworld/hello.rs

···
     Clone,
     PartialEq,
     Eq,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct HelloOutput<'a> {

crates/jacquard-api/src/my_skylights.rs

···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct Item<'a> {
     #[serde(borrow)]
-    #[builder(into)]
     pub r#ref: jacquard_common::CowStr<'a>,
     #[serde(borrow)]
-    #[builder(into)]
     pub value: jacquard_common::CowStr<'a>,
 }

crates/jacquard-api/src/my_skylights/list.rs

···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct List<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub created_at: Option<jacquard_common::types::string::Datetime>,
+    pub created_at: std::option::Option<jacquard_common::types::string::Datetime>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub description: Option<jacquard_common::CowStr<'a>>,
+    pub description: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub sort_by: Option<jacquard_common::CowStr<'a>>,
+    pub sort_by: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(borrow)]
-    #[builder(into)]
     pub title: jacquard_common::CowStr<'a>,
 }

crates/jacquard-api/src/my_skylights/list_item.rs

···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct Builtin<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub r#type: Option<BuiltinType<'a>>,
+    pub r#type: std::option::Option<BuiltinType<'a>>,
 }
 
 #[jacquard_derive::open_union]

crates/jacquard-api/src/net_anisota/beta/game/collection.rs

···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct SourceDetails<'a> {
     /// Number of attempts before successful capture
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub attempts: Option<i64>,
+    pub attempts: std::option::Option<i64>,
     /// Probability used when catching this specimen (decimal string, e.g. '0.75')
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub catch_probability: Option<jacquard_common::CowStr<'a>>,
+    pub catch_probability: std::option::Option<jacquard_common::CowStr<'a>>,
     /// URI of the game card that provided this specimen
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub game_card_uri: Option<jacquard_common::CowStr<'a>>,
+    pub game_card_uri: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Location where specimen was found or observed
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub location: Option<jacquard_common::CowStr<'a>>,
+    pub location: std::option::Option<jacquard_common::CowStr<'a>>,
 }
 
 /// Complete specimen information
···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct SpecimenData<'a> {
     /// Scientific authorship of the species
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub authorship: Option<jacquard_common::CowStr<'a>>,
+    pub authorship: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Detailed description of the specimen
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub description: Option<jacquard_common::CowStr<'a>>,
+    pub description: std::option::Option<jacquard_common::CowStr<'a>>,
 }

crates/jacquard-api/src/net_anisota/beta/game/inventory.rs

···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct SourceDetails<'a> {
     /// URI of the game card that provided this item
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub game_card_uri: Option<jacquard_common::CowStr<'a>>,
+    pub game_card_uri: std::option::Option<jacquard_common::CowStr<'a>>,
     /// ID of the quest that rewarded this item
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub quest_id: Option<jacquard_common::CowStr<'a>>,
+    pub quest_id: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Daily reward streak when item was acquired
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub reward_streak: Option<i64>,
+    pub reward_streak: std::option::Option<i64>,
 }

crates/jacquard-api/src/net_anisota/beta/game/log.rs

···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct CollectionData<'a> {
     /// Catch probability for specimens (decimal string between 0.0 and 1.0)
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub catch_probability: Option<jacquard_common::CowStr<'a>>,
+    pub catch_probability: std::option::Option<jacquard_common::CowStr<'a>>,
     /// URI of the created inventory record
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub inventory_record_uri: Option<jacquard_common::CowStr<'a>>,
+    pub inventory_record_uri: std::option::Option<jacquard_common::CowStr<'a>>,
     /// How the item was obtained
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub method: Option<jacquard_common::CowStr<'a>>,
+    pub method: std::option::Option<jacquard_common::CowStr<'a>>,
     /// URI of the created specimen record
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub specimen_record_uri: Option<jacquard_common::CowStr<'a>>,
+    pub specimen_record_uri: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Whether collection was successful
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub success: Option<bool>,
+    pub success: std::option::Option<bool>,
     /// Milliseconds between card generation and collection
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub time_since_generation: Option<i64>,
+    pub time_since_generation: std::option::Option<i64>,
     /// Milliseconds between card being viewed and collected
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub time_since_viewed: Option<i64>,
+    pub time_since_viewed: std::option::Option<i64>,
 }
 
 /// Details about daily rewards claim
···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct DailyRewardsData<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub reward_items: Option<Vec<crate::net_anisota::beta::game::log::RewardItem<'a>>>,
+    pub reward_items: std::option::Option<
+        Vec<crate::net_anisota::beta::game::log::RewardItem<'a>>,
+    >,
     /// Number of rewards claimed
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub rewards_count: Option<i64>,
+    pub rewards_count: std::option::Option<i64>,
     /// Current daily reward streak
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub streak: Option<i64>,
+    pub streak: std::option::Option<i64>,
     /// Milliseconds since last claim
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub time_since_last_claim: Option<i64>,
+    pub time_since_last_claim: std::option::Option<i64>,
 }
 
 /// Context about the feed when event occurred
···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct FeedContext<'a> {
     /// URI of the feed being viewed
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub feed_uri: Option<jacquard_common::CowStr<'a>>,
+    pub feed_uri: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Number of game cards injected
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub game_card_count: Option<i64>,
+    pub game_card_count: std::option::Option<i64>,
     /// Number of posts in the feed
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub post_count: Option<i64>,
+    pub post_count: std::option::Option<i64>,
     /// User's scroll position or card index
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub scroll_position: Option<i64>,
+    pub scroll_position: std::option::Option<i64>,
 }
 
 /// Details about game cards generated or interacted with
···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct GameCardData<'a> {
     /// Type of game card
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub card_type: Option<jacquard_common::CowStr<'a>>,
+    pub card_type: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Unique identifier for the game card
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub card_uri: Option<jacquard_common::CowStr<'a>>,
+    pub card_uri: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Random seed used for generation (for verification)
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub generation_seed: Option<jacquard_common::CowStr<'a>>,
+    pub generation_seed: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Position where card was injected in feed
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub injection_position: Option<i64>,
+    pub injection_position: std::option::Option<i64>,
     /// ID of the item/specimen
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub item_id: Option<jacquard_common::CowStr<'a>>,
+    pub item_id: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Quantity of items
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub quantity: Option<i64>,
+    pub quantity: std::option::Option<i64>,
     /// Rarity of the item/specimen
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub rarity: Option<jacquard_common::CowStr<'a>>,
+    pub rarity: std::option::Option<jacquard_common::CowStr<'a>>,
 }
 
 /// Details about item usage
···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct ItemUsageData<'a> {
     /// Effect that was applied
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub effect_applied: Option<jacquard_common::CowStr<'a>>,
+    pub effect_applied: std::option::Option<jacquard_common::CowStr<'a>>,
     /// URI of the modified inventory record
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub inventory_record_uri: Option<jacquard_common::CowStr<'a>>,
+    pub inventory_record_uri: std::option::Option<jacquard_common::CowStr<'a>>,
     /// ID of the item used
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub item_id: Option<jacquard_common::CowStr<'a>>,
+    pub item_id: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Quantity of the item used
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub quantity_used: Option<i64>,
+    pub quantity_used: std::option::Option<i64>,
     /// Remaining quantity after use
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub remaining_quantity: Option<i64>,
+    pub remaining_quantity: std::option::Option<i64>,
 }
 
 /// A log record for tracking game events and user actions for provenance and anti-bot analysis
···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct Metadata<'a> {
     /// Version of the client application
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub client_version: Option<jacquard_common::CowStr<'a>>,
+    pub client_version: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Network latency in milliseconds
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub network_latency: Option<i64>,
+    pub network_latency: std::option::Option<i64>,
     /// Performance timing data
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub performance_timings: Option<jacquard_common::types::value::Data<'a>>,
+    pub performance_timings: std::option::Option<
+        jacquard_common::types::value::Data<'a>,
+    >,
     /// Platform (web, mobile, etc.)
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub platform: Option<jacquard_common::CowStr<'a>>,
+    pub platform: std::option::Option<jacquard_common::CowStr<'a>>,
 }
 
 /// Item received as a reward
···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct RewardItem<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub item_id: Option<jacquard_common::CowStr<'a>>,
+    pub item_id: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub quantity: Option<i64>,
+    pub quantity: std::option::Option<i64>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub rarity: Option<jacquard_common::CowStr<'a>>,
+    pub rarity: std::option::Option<jacquard_common::CowStr<'a>>,
 }

crates/jacquard-api/src/net_anisota/beta/game/pack.rs

···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct PackHistoryEntry<'a> {
     /// Items received from this pack
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub items_received: Option<
+    pub items_received: std::option::Option<
         Vec<crate::net_anisota::beta::game::pack::ReceivedItem<'a>>,
     >,
     /// When this pack was opened
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub open_time: Option<jacquard_common::types::string::Datetime>,
+    pub open_time: std::option::Option<jacquard_common::types::string::Datetime>,
     /// Streak count at time of opening
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub streak_count: Option<i64>,
+    pub streak_count: std::option::Option<i64>,
 }
 
 /// An item received from a pack opening
···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct ReceivedItem<'a> {
     /// ID of the item received
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub item_id: Option<jacquard_common::CowStr<'a>>,
+    pub item_id: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Quantity received
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub quantity: Option<i64>,
+    pub quantity: std::option::Option<i64>,
     /// Rarity of the item
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub rarity: Option<jacquard_common::CowStr<'a>>,
+    pub rarity: std::option::Option<jacquard_common::CowStr<'a>>,
 }

crates/jacquard-api/src/net_anisota/beta/game/progress.rs

···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct Metadata<'a> {
     /// Version of the client when this progress was recorded
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub client_version: Option<jacquard_common::CowStr<'a>>,
+    pub client_version: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Platform where the level up occurred (web, mobile, etc.)
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub platform: Option<jacquard_common::CowStr<'a>>,
+    pub platform: std::option::Option<jacquard_common::CowStr<'a>>,
 }
 
 /// Game-specific statistics and metrics
···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct Stats<'a> {
     /// Total daily rewards claimed
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub daily_rewards_claimed: Option<i64>,
+    pub daily_rewards_claimed: std::option::Option<i64>,
     /// Total items collected
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub items_collected: Option<i64>,
+    pub items_collected: std::option::Option<i64>,
     /// Date when posts read today was last updated (for daily reset tracking)
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub last_post_read_date: Option<jacquard_common::types::string::Datetime>,
+    pub last_post_read_date: std::option::Option<
+        jacquard_common::types::string::Datetime,
+    >,
     /// Posts read today (resets daily)
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub posts_read_today: Option<i64>,
+    pub posts_read_today: std::option::Option<i64>,
     /// Total posts read (all time, cumulative)
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub posts_read_total: Option<i64>,
+    pub posts_read_total: std::option::Option<i64>,
     /// Total posts viewed
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub posts_viewed: Option<i64>,
+    pub posts_viewed: std::option::Option<i64>,
     /// Total shuffles performed
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub shuffles_performed: Option<i64>,
+    pub shuffles_performed: std::option::Option<i64>,
     /// Total specimens collected
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub specimens_collected: Option<i64>,
+    pub specimens_collected: std::option::Option<i64>,
 }

crates/jacquard-api/src/net_anisota/beta/game/session.rs

···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct ActivitySummary<'a> {
     /// Player's current level at the time of this session update
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub current_level: Option<i64>,
+    pub current_level: std::option::Option<i64>,
     /// Player's total XP at the time of this session update
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub current_xp: Option<i64>,
+    pub current_xp: std::option::Option<i64>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub game_actions: Option<crate::net_anisota::beta::game::session::GameActions<'a>>,
+    pub game_actions: std::option::Option<
+        crate::net_anisota::beta::game::session::GameActions<'a>,
+    >,
     /// List of unique pages/routes visited
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub pages_visited: Option<Vec<jacquard_common::CowStr<'a>>>,
+    pub pages_visited: std::option::Option<Vec<jacquard_common::CowStr<'a>>>,
     /// Total number of events logged in this session
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub total_events: Option<i64>,
+    pub total_events: std::option::Option<i64>,
     /// Total XP gained during this specific session
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub xp_gained_this_session: Option<i64>,
+    pub xp_gained_this_session: std::option::Option<i64>,
 }
 
 /// Game-specific actions performed
···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct GameActions<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub daily_rewards_claimed: Option<i64>,
+    pub daily_rewards_claimed: std::option::Option<i64>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub feeds_loaded: Option<i64>,
+    pub feeds_loaded: std::option::Option<i64>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub items_collected: Option<i64>,
+    pub items_collected: std::option::Option<i64>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub level_ups: Option<i64>,
+    pub level_ups: std::option::Option<i64>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub posts_viewed: Option<i64>,
+    pub posts_viewed: std::option::Option<i64>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub specimens_collected: Option<i64>,
+    pub specimens_collected: std::option::Option<i64>,
 }
 
 /// A game session record tracking a continuous period of user engagement with the application
···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct Metadata<'a> {
     /// List of features used during the session
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub features: Option<Vec<jacquard_common::CowStr<'a>>>,
+    pub features: std::option::Option<Vec<jacquard_common::CowStr<'a>>>,
     /// Network condition during session
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub network_condition: Option<jacquard_common::CowStr<'a>>,
+    pub network_condition: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub performance_metrics: Option<
+    pub performance_metrics: std::option::Option<
         crate::net_anisota::beta::game::session::PerformanceMetrics<'a>,
     >,
 }
···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct PerformanceMetrics<'a> {
     /// Average API response time in milliseconds (rounded to nearest integer)
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub average_response_time: Option<i64>,
+    pub average_response_time: std::option::Option<i64>,
     /// Number of errors encountered
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub error_count: Option<i64>,
+    pub error_count: std::option::Option<i64>,
 }
 
 /// Context about how the session started
···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct SessionContext<'a> {
     /// How the user was authenticated
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub authentication_method: Option<jacquard_common::CowStr<'a>>,
+    pub authentication_method: std::option::Option<jacquard_common::CowStr<'a>>,
     /// How the user entered the app
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub entry_point: Option<jacquard_common::CowStr<'a>>,
+    pub entry_point: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Whether this was a new user's first session
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub is_new_user: Option<bool>,
+    pub is_new_user: std::option::Option<bool>,
     /// Referrer URL if applicable
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub referrer: Option<jacquard_common::CowStr<'a>>,
+    pub referrer: std::option::Option<jacquard_common::CowStr<'a>>,
 }

crates/jacquard-api/src/net_anisota/graph/list_mute.rs

···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct ContentTypes<'a> {
     /// Mute regular posts from accounts on this list
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub posts: Option<bool>,
+    pub posts: std::option::Option<bool>,
     /// Mute quote posts from accounts on this list
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub quotes: Option<bool>,
+    pub quotes: std::option::Option<bool>,
     /// Mute replies from accounts on this list
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub replies: Option<bool>,
+    pub replies: std::option::Option<bool>,
     /// Mute reposts from accounts on this list
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub reposts: Option<bool>,
+    pub reposts: std::option::Option<bool>,
 }
 
 /// A record for muting content from all accounts on a list with fine-grained control over content types, duration, and feed targeting

crates/jacquard-api/src/net_anisota/graph/mute.rs

···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct ContentTypes<'a> {
     /// Mute regular posts from this account
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub posts: Option<bool>,
+    pub posts: std::option::Option<bool>,
     /// Mute quote posts from this account
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub quotes: Option<bool>,
+    pub quotes: std::option::Option<bool>,
     /// Mute replies from this account
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub replies: Option<bool>,
+    pub replies: std::option::Option<bool>,
     /// Mute reposts from this account
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub reposts: Option<bool>,
+    pub reposts: std::option::Option<bool>,
 }
 
 /// A record for muting content from a specific account with fine-grained control over content types and duration

crates/jacquard-api/src/network_slices/slice/clear_slice_records.rs

···
     Clone,
     PartialEq,
     Eq,
-    bon::Builder,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
-#[builder(start_fn = new)]
 pub struct ClearSliceRecords<'a> {
     /// AT-URI of the slice to clear
     #[serde(borrow)]
-    #[builder(into)]
     pub slice: jacquard_common::CowStr<'a>,
-    #[serde(flatten)]
-    #[serde(borrow)]
-    #[builder(default)]
-    pub extra_data: ::std::collections::BTreeMap<
-        ::jacquard_common::smol_str::SmolStr,
-        ::jacquard_common::types::value::Data<'a>,
-    >,
 }
 
 #[jacquard_derive::lexicon]
···
     Clone,
     PartialEq,
     Eq,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct ClearSliceRecordsOutput<'a> {

crates/jacquard-api/src/network_slices/slice/delete_o_auth_client.rs

···
     Clone,
     PartialEq,
     Eq,
-    bon::Builder,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
-#[builder(start_fn = new)]
 pub struct DeleteOAuthClient<'a> {
     /// OAuth client ID to delete
     #[serde(borrow)]
-    #[builder(into)]
     pub client_id: jacquard_common::CowStr<'a>,
-    #[serde(flatten)]
-    #[serde(borrow)]
-    #[builder(default)]
-    pub extra_data: ::std::collections::BTreeMap<
-        ::jacquard_common::smol_str::SmolStr,
-        ::jacquard_common::types::value::Data<'a>,
-    >,
 }
 
 #[jacquard_derive::lexicon]
···
     Clone,
     PartialEq,
     Eq,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct DeleteOAuthClientOutput<'a> {

crates/jacquard-api/src/network_slices/slice/get_actors.rs

···
     Clone,
     PartialEq,
     Eq,
-    bon::Builder,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
-#[builder(start_fn = new)]
 pub struct GetActors<'a> {
     /// Pagination cursor from previous response
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub cursor: Option<jacquard_common::CowStr<'a>>,
+    pub cursor: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Maximum number of actors to return
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub limit: Option<i64>,
+    pub limit: std::option::Option<i64>,
     /// AT-URI of the slice to query
     #[serde(borrow)]
-    #[builder(into)]
     pub slice: jacquard_common::CowStr<'a>,
     /// Flexible filtering conditions for querying actors
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub r#where: Option<jacquard_common::types::value::Data<'a>>,
-    #[serde(flatten)]
-    #[serde(borrow)]
-    #[builder(default)]
-    pub extra_data: ::std::collections::BTreeMap<
-        ::jacquard_common::smol_str::SmolStr,
-        ::jacquard_common::types::value::Data<'a>,
-    >,
+    pub r#where: std::option::Option<jacquard_common::types::value::Data<'a>>,
 }
 
 #[jacquard_derive::lexicon]

crates/jacquard-api/src/network_slices/slice/get_slice_records.rs

···
     Clone,
     PartialEq,
     Eq,
-    bon::Builder,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
-#[builder(start_fn = new)]
 pub struct GetSliceRecords<'a> {
     /// Pagination cursor from previous response
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub cursor: Option<jacquard_common::CowStr<'a>>,
+    pub cursor: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Maximum number of records to return
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub limit: Option<i64>,
+    pub limit: std::option::Option<i64>,
     /// AT-URI of the slice to query
     #[serde(borrow)]
-    #[builder(into)]
     pub slice: jacquard_common::CowStr<'a>,
     /// Sorting configuration for result ordering
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub sort_by: Option<jacquard_common::types::value::Data<'a>>,
+    pub sort_by: std::option::Option<jacquard_common::types::value::Data<'a>>,
     /// Flexible filtering conditions for querying records
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    #[serde(borrow)]
-    pub r#where: Option<jacquard_common::types::value::Data<'a>>,
-    #[serde(flatten)]
     #[serde(borrow)]
-    #[builder(default)]
-    pub extra_data: ::std::collections::BTreeMap<
-        ::jacquard_common::smol_str::SmolStr,
-        ::jacquard_common::types::value::Data<'a>,
-    >,
+    pub r#where: std::option::Option<jacquard_common::types::value::Data<'a>>,
 }
 
 #[jacquard_derive::lexicon]

crates/jacquard-api/src/network_slices/slice/start_sync.rs

···
     Clone,
     PartialEq,
     Eq,
-    bon::Builder,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
-#[builder(start_fn = new)]
 pub struct StartSync<'a> {
     /// List of collection NSIDs to sync (primary collections matching slice domain)
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub collections: Option<Vec<jacquard_common::types::string::Nsid<'a>>>,
+    pub collections: std::option::Option<Vec<jacquard_common::types::string::Nsid<'a>>>,
     /// List of external collection NSIDs to sync (collections outside slice domain)
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub external_collections: Option<Vec<jacquard_common::types::string::Nsid<'a>>>,
+    pub external_collections: std::option::Option<
+        Vec<jacquard_common::types::string::Nsid<'a>>,
+    >,
     /// Maximum number of records to sync per repository
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub limit_per_repo: Option<i64>,
+    pub limit_per_repo: std::option::Option<i64>,
     /// List of specific repository DIDs to sync from
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub repos: Option<Vec<jacquard_common::types::string::Did<'a>>>,
+    pub repos: std::option::Option<Vec<jacquard_common::types::string::Did<'a>>>,
     /// Skip lexicon validation during sync
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub skip_validation: Option<bool>,
+    pub skip_validation: std::option::Option<bool>,
     /// AT-URI of the slice to sync data into
     #[serde(borrow)]
-    #[builder(into)]
     pub slice: jacquard_common::CowStr<'a>,
-    #[serde(flatten)]
-    #[serde(borrow)]
-    #[builder(default)]
-    pub extra_data: ::std::collections::BTreeMap<
-        ::jacquard_common::smol_str::SmolStr,
-        ::jacquard_common::types::value::Data<'a>,
-    >,
 }
 
 #[jacquard_derive::lexicon]
···
     Clone,
     PartialEq,
     Eq,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct StartSyncOutput<'a> {

crates/jacquard-api/src/network_slices/slice/sync_user_collections.rs

···
     Clone,
     PartialEq,
     Eq,
-    bon::Builder,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
-#[builder(start_fn = new)]
 pub struct SyncUserCollections<'a> {
     /// AT-URI of the slice to sync user data into
     #[serde(borrow)]
-    #[builder(into)]
     pub slice: jacquard_common::CowStr<'a>,
     /// Timeout in seconds for the sync operation
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub timeout_seconds: Option<i64>,
-    #[serde(flatten)]
-    #[serde(borrow)]
-    #[builder(default)]
-    pub extra_data: ::std::collections::BTreeMap<
-        ::jacquard_common::smol_str::SmolStr,
-        ::jacquard_common::types::value::Data<'a>,
-    >,
+    pub timeout_seconds: std::option::Option<i64>,
 }
 
 #[jacquard_derive::lexicon]

crates/jacquard-api/src/network_slices/slice/update_o_auth_client.rs

···
     Clone,
     PartialEq,
     Eq,
-    bon::Builder,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
-#[builder(start_fn = new)]
 pub struct UpdateOAuthClient<'a> {
     /// OAuth client ID to update
     #[serde(borrow)]
-    #[builder(into)]
     pub client_id: jacquard_common::CowStr<'a>,
     /// New human-readable name of the OAuth client
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub client_name: Option<jacquard_common::CowStr<'a>>,
+    pub client_name: std::option::Option<jacquard_common::CowStr<'a>>,
     /// New URI of the client application
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub client_uri: Option<jacquard_common::types::string::Uri<'a>>,
+    pub client_uri: std::option::Option<jacquard_common::types::string::Uri<'a>>,
     /// New URI of the client logo
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub logo_uri: Option<jacquard_common::types::string::Uri<'a>>,
+    pub logo_uri: std::option::Option<jacquard_common::types::string::Uri<'a>>,
     /// New URI of the privacy policy
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub policy_uri: Option<jacquard_common::types::string::Uri<'a>>,
+    pub policy_uri: std::option::Option<jacquard_common::types::string::Uri<'a>>,
     /// New allowed redirect URIs for OAuth flow
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub redirect_uris: Option<Vec<jacquard_common::types::string::Uri<'a>>>,
+    pub redirect_uris: std::option::Option<Vec<jacquard_common::types::string::Uri<'a>>>,
     /// New OAuth scope
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub scope: Option<jacquard_common::CowStr<'a>>,
+    pub scope: std::option::Option<jacquard_common::CowStr<'a>>,
     /// New URI of the terms of service
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub tos_uri: Option<jacquard_common::types::string::Uri<'a>>,
-    #[serde(flatten)]
-    #[serde(borrow)]
-    #[builder(default)]
-    pub extra_data: ::std::collections::BTreeMap<
-        ::jacquard_common::smol_str::SmolStr,
-        ::jacquard_common::types::value::Data<'a>,
-    >,
+    pub tos_uri: std::option::Option<jacquard_common::types::string::Uri<'a>>,
 }
 
 #[jacquard_derive::lexicon]

crates/jacquard-api/src/place_stream.rs

···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct Rendition<'a> {
     #[serde(borrow)]
-    #[builder(into)]
     pub name: jacquard_common::CowStr<'a>,
 }
 

crates/jacquard-api/src/place_stream/graph/get_following_user.rs

···
     Clone,
     PartialEq,
     Eq,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct GetFollowingUserOutput<'a> {

crates/jacquard-api/src/place_stream/live/get_live_users.rs

···
     Clone,
     PartialEq,
     Eq,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct GetLiveUsersOutput<'a> {

crates/jacquard-api/src/place_stream/live/get_segments.rs

···
     Clone,
     PartialEq,
     Eq,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct GetSegmentsOutput<'a> {

crates/jacquard-api/src/place_stream/server.rs

···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct RewriteRule<'a> {
     /// Text to search for and replace.
     #[serde(borrow)]
-    #[builder(into)]
     pub from: jacquard_common::CowStr<'a>,
     /// Text to replace with.
     #[serde(borrow)]
-    #[builder(into)]
     pub to: jacquard_common::CowStr<'a>,
 }
 

crates/jacquard-api/src/place_stream/server/delete_webhook.rs

···
     Clone,
     PartialEq,
     Eq,
-    bon::Builder,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
-#[builder(start_fn = new)]
 pub struct DeleteWebhook<'a> {
     /// The ID of the webhook to delete.
     #[serde(borrow)]
-    #[builder(into)]
     pub id: jacquard_common::CowStr<'a>,
-    #[serde(flatten)]
-    #[serde(borrow)]
-    #[builder(default)]
-    pub extra_data: ::std::collections::BTreeMap<
-        ::jacquard_common::smol_str::SmolStr,
-        ::jacquard_common::types::value::Data<'a>,
-    >,
 }
 
 #[jacquard_derive::lexicon]

crates/jacquard-api/src/place_stream/server/update_webhook.rs

···
     Clone,
     PartialEq,
     Eq,
-    bon::Builder,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
-#[builder(start_fn = new)]
 pub struct UpdateWebhook<'a> {
     /// Whether this webhook should be active.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub active: Option<bool>,
+    pub active: std::option::Option<bool>,
     /// A description of what this webhook is used for.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub description: Option<jacquard_common::CowStr<'a>>,
+    pub description: std::option::Option<jacquard_common::CowStr<'a>>,
     /// The types of events this webhook should receive.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub events: Option<Vec<jacquard_common::CowStr<'a>>>,
+    pub events: std::option::Option<Vec<jacquard_common::CowStr<'a>>>,
     /// The ID of the webhook to update.
     #[serde(borrow)]
-    #[builder(into)]
     pub id: jacquard_common::CowStr<'a>,
     /// Words to filter out from chat messages. Messages containing any of these words will not be forwarded.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub mute_words: Option<Vec<jacquard_common::CowStr<'a>>>,
+    pub mute_words: std::option::Option<Vec<jacquard_common::CowStr<'a>>>,
     /// A user-friendly name for this webhook.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub name: Option<jacquard_common::CowStr<'a>>,
+    pub name: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Text to prepend to webhook messages.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub prefix: Option<jacquard_common::CowStr<'a>>,
+    pub prefix: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Text replacement rules for webhook messages.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub rewrite: Option<Vec<crate::place_stream::server::RewriteRule<'a>>>,
+    pub rewrite: std::option::Option<Vec<crate::place_stream::server::RewriteRule<'a>>>,
     /// Text to append to webhook messages.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub suffix: Option<jacquard_common::CowStr<'a>>,
+    pub suffix: std::option::Option<jacquard_common::CowStr<'a>>,
     /// The webhook URL where events will be sent.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub url: Option<jacquard_common::types::string::Uri<'a>>,
-    #[serde(flatten)]
-    #[serde(borrow)]
-    #[builder(default)]
-    pub extra_data: ::std::collections::BTreeMap<
-        ::jacquard_common::smol_str::SmolStr,
-        ::jacquard_common::types::value::Data<'a>,
-    >,
+    pub url: std::option::Option<jacquard_common::types::string::Uri<'a>>,
 }
 
 #[jacquard_derive::lexicon]

crates/jacquard-api/src/pub_leaflet/blocks/blockquote.rs

···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct Blockquote<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub facets: Option<Vec<crate::pub_leaflet::richtext::facet::Facet<'a>>>,
+    pub facets: std::option::Option<Vec<crate::pub_leaflet::richtext::facet::Facet<'a>>>,
     #[serde(borrow)]
-    #[builder(into)]
     pub plaintext: jacquard_common::CowStr<'a>,
 }

crates/jacquard-api/src/pub_leaflet/blocks/code.rs

···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct Code<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub language: Option<jacquard_common::CowStr<'a>>,
+    pub language: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(borrow)]
-    #[builder(into)]
     pub plaintext: jacquard_common::CowStr<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub syntax_highlighting_theme: Option<jacquard_common::CowStr<'a>>,
+    pub syntax_highlighting_theme: std::option::Option<jacquard_common::CowStr<'a>>,
 }

crates/jacquard-api/src/pub_leaflet/blocks/header.rs

···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct Header<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub facets: Option<Vec<crate::pub_leaflet::richtext::facet::Facet<'a>>>,
+    pub facets: std::option::Option<Vec<crate::pub_leaflet::richtext::facet::Facet<'a>>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub level: Option<i64>,
+    pub level: std::option::Option<i64>,
     #[serde(borrow)]
-    #[builder(into)]
     pub plaintext: jacquard_common::CowStr<'a>,
 }

crates/jacquard-api/src/pub_leaflet/blocks/horizontal_rule.rs

···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct HorizontalRule<'a> {}

crates/jacquard-api/src/pub_leaflet/blocks/math.rs

···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct Math<'a> {
     #[serde(borrow)]
-    #[builder(into)]
     pub tex: jacquard_common::CowStr<'a>,
 }

crates/jacquard-api/src/pub_leaflet/blocks/text.rs

···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct Text<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub facets: Option<Vec<crate::pub_leaflet::richtext::facet::Facet<'a>>>,
+    pub facets: std::option::Option<Vec<crate::pub_leaflet::richtext::facet::Facet<'a>>>,
     #[serde(borrow)]
-    #[builder(into)]
     pub plaintext: jacquard_common::CowStr<'a>,
 }

crates/jacquard-api/src/pub_leaflet/pages/linear_document.rs

···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct LinearDocument<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub blocks: Option<Vec<crate::pub_leaflet::pages::linear_document::Block<'a>>>,
+    pub blocks: std::option::Option<
+        Vec<crate::pub_leaflet::pages::linear_document::Block<'a>>,
+    >,
 }
 
 #[jacquard_derive::lexicon]

crates/jacquard-api/src/pub_leaflet/publication.rs

···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct Preferences<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub show_comments: Option<bool>,
+    pub show_comments: std::option::Option<bool>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub show_in_discover: Option<bool>,
+    pub show_in_discover: std::option::Option<bool>,
 }
 
 #[jacquard_derive::lexicon]
···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct Theme<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub accent_background: Option<ThemeAccentBackground<'a>>,
+    pub accent_background: std::option::Option<ThemeAccentBackground<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub accent_text: Option<ThemeAccentText<'a>>,
+    pub accent_text: std::option::Option<ThemeAccentText<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub background_color: Option<ThemeBackgroundColor<'a>>,
+    pub background_color: std::option::Option<ThemeBackgroundColor<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub background_image: Option<
+    pub background_image: std::option::Option<
         crate::pub_leaflet::theme::background_image::BackgroundImage<'a>,
     >,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub page_background: Option<ThemePageBackground<'a>>,
+    pub page_background: std::option::Option<ThemePageBackground<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub primary: Option<ThemePrimary<'a>>,
+    pub primary: std::option::Option<ThemePrimary<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub show_page_background: Option<bool>,
+    pub show_page_background: std::option::Option<bool>,
 }
 
 #[jacquard_derive::open_union]

crates/jacquard-api/src/pub_leaflet/richtext/facet.rs

···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct Bold<'a> {}
···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct Code<'a> {}
···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct Highlight<'a> {}
···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct Id<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub id: Option<jacquard_common::CowStr<'a>>,
+    pub id: std::option::Option<jacquard_common::CowStr<'a>>,
 }
 
 /// Facet feature for italic text
···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct Italic<'a> {}
···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct Strikethrough<'a> {}
···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct Underline<'a> {}

crates/jacquard-api/src/sh_tangled/git/ref_update.rs

···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct CommitCountBreakdown<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub by_email: Option<
+    pub by_email: std::option::Option<
         Vec<crate::sh_tangled::git::ref_update::IndividualEmailCommitCount<'a>>,
     >,
 }
···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct LangBreakdown<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub inputs: Option<
+    pub inputs: std::option::Option<
         Vec<crate::sh_tangled::git::ref_update::IndividualLanguageSize<'a>>,
     >,
 }

crates/jacquard-api/src/sh_tangled/knot/version.rs

···
     Clone,
     PartialEq,
     Eq,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct VersionOutput<'a> {

crates/jacquard-api/src/sh_tangled/label/definition.rs

···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct ValueType<'a> {
     /// Closed set of values that this label can take.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub r#enum: Option<Vec<jacquard_common::CowStr<'a>>>,
+    pub r#enum: std::option::Option<Vec<jacquard_common::CowStr<'a>>>,
     /// An optional constraint that can be applied on string concrete types.
     #[serde(borrow)]
-    #[builder(into)]
     pub format: jacquard_common::CowStr<'a>,
     /// The concrete type of this label's value.
     #[serde(borrow)]
-    #[builder(into)]
     pub r#type: jacquard_common::CowStr<'a>,
 }

crates/jacquard-api/src/sh_tangled/pipeline.rs

···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct ManualTriggerData<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub inputs: Option<Vec<crate::sh_tangled::pipeline::Pair<'a>>>,
+    pub inputs: std::option::Option<Vec<crate::sh_tangled::pipeline::Pair<'a>>>,
 }
 
 #[jacquard_derive::lexicon]
···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct Pair<'a> {
     #[serde(borrow)]
-    #[builder(into)]
     pub key: jacquard_common::CowStr<'a>,
     #[serde(borrow)]
-    #[builder(into)]
     pub value: jacquard_common::CowStr<'a>,
 }
 
···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct PullRequestTriggerData<'a> {
     #[serde(borrow)]
-    #[builder(into)]
     pub action: jacquard_common::CowStr<'a>,
     #[serde(borrow)]
-    #[builder(into)]
     pub source_branch: jacquard_common::CowStr<'a>,
     #[serde(borrow)]
-    #[builder(into)]
     pub source_sha: jacquard_common::CowStr<'a>,
     #[serde(borrow)]
-    #[builder(into)]
     pub target_branch: jacquard_common::CowStr<'a>,
 }
 
···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct PushTriggerData<'a> {
     #[serde(borrow)]
-    #[builder(into)]
     pub new_sha: jacquard_common::CowStr<'a>,
     #[serde(borrow)]
-    #[builder(into)]
     pub old_sha: jacquard_common::CowStr<'a>,
     #[serde(borrow)]
-    #[builder(into)]
     pub r#ref: jacquard_common::CowStr<'a>,
 }
 

crates/jacquard-api/src/sh_tangled/repo/blob.rs

···
     Clone,
     PartialEq,
     Eq,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct BlobOutput<'a> {

crates/jacquard-api/src/sh_tangled/repo/create.rs

···
     Clone,
     PartialEq,
     Eq,
-    bon::Builder,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
-#[builder(start_fn = new)]
 pub struct Create<'a> {
     /// Default branch to push to
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub default_branch: Option<jacquard_common::CowStr<'a>>,
+    pub default_branch: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Rkey of the repository record
     #[serde(borrow)]
-    #[builder(into)]
     pub rkey: jacquard_common::CowStr<'a>,
     /// A source URL to clone from, populate this when forking or importing a repository.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub source: Option<jacquard_common::CowStr<'a>>,
-    #[serde(flatten)]
-    #[serde(borrow)]
-    #[builder(default)]
-    pub extra_data: ::std::collections::BTreeMap<
-        ::jacquard_common::smol_str::SmolStr,
-        ::jacquard_common::types::value::Data<'a>,
-    >,
+    pub source: std::option::Option<jacquard_common::CowStr<'a>>,
 }
 
 ///Response type for

crates/jacquard-api/src/sh_tangled/repo/merge_check.rs

···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct ConflictInfo<'a> {
     /// Name of the conflicted file
     #[serde(borrow)]
-    #[builder(into)]
     pub filename: jacquard_common::CowStr<'a>,
     /// Reason for the conflict
     #[serde(borrow)]
-    #[builder(into)]
     pub reason: jacquard_common::CowStr<'a>,
 }
 

crates/jacquard-api/src/sh_tangled/repo/pull.rs

···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct Source<'a> {
     #[serde(borrow)]
-    #[builder(into)]
     pub branch: jacquard_common::CowStr<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub repo: Option<jacquard_common::types::string::AtUri<'a>>,
+    pub repo: std::option::Option<jacquard_common::types::string::AtUri<'a>>,
     #[serde(borrow)]
-    #[builder(into)]
     pub sha: jacquard_common::CowStr<'a>,
 }
 

crates/jacquard-api/src/sh_tangled/repo/tree.rs

···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct Readme<'a> {
     /// Contents of the readme file
     #[serde(borrow)]
-    #[builder(into)]
     pub contents: jacquard_common::CowStr<'a>,
     /// Name of the readme file
     #[serde(borrow)]
-    #[builder(into)]
     pub filename: jacquard_common::CowStr<'a>,
 }
 

crates/jacquard-api/src/sh_weaver/edit/cursor.rs

···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct RootContainerId<'a> {
     #[serde(borrow)]
-    #[builder(into)]
     pub container_type: jacquard_common::CowStr<'a>,
     #[serde(borrow)]
-    #[builder(into)]
     pub name: jacquard_common::CowStr<'a>,
 }

crates/jacquard-api/src/sh_weaver/notebook.rs

···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct ContentFormat<'a> {
     /// The format of the content. This is used to determine how to render the content.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub markdown: Option<jacquard_common::CowStr<'a>>,
+    pub markdown: std::option::Option<jacquard_common::CowStr<'a>>,
 }
 
 #[jacquard_derive::lexicon]

crates/jacquard-api/src/social_clippr/actor.rs

···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct PublishingScopesPref<'a> {
     /// What publishing scope to mark a clip as by default
     #[serde(borrow)]
-    #[builder(into)]
     pub default_scope: jacquard_common::CowStr<'a>,
 }

crates/jacquard-api/src/social_psky/richtext/facet.rs

···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct Room<'a> {
     #[serde(borrow)]
-    #[builder(into)]
     pub room: jacquard_common::CowStr<'a>,
 }

crates/jacquard-api/src/tools_ozone/communication/create_template.rs

···
     Clone,
     PartialEq,
     Eq,
-    bon::Builder,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
-#[builder(start_fn = new)]
 pub struct CreateTemplate<'a> {
     /// Content of the template, markdown supported, can contain variable placeholders.
     #[serde(borrow)]
-    #[builder(into)]
     pub content_markdown: jacquard_common::CowStr<'a>,
     /// DID of the user who is creating the template.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub created_by: Option<jacquard_common::types::string::Did<'a>>,
+    pub created_by: std::option::Option<jacquard_common::types::string::Did<'a>>,
     /// Message language.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub lang: Option<jacquard_common::types::string::Language>,
+    pub lang: std::option::Option<jacquard_common::types::string::Language>,
     /// Name of the template.
     #[serde(borrow)]
-    #[builder(into)]
     pub name: jacquard_common::CowStr<'a>,
     /// Subject of the message, used in emails.
     #[serde(borrow)]
-    #[builder(into)]
     pub subject: jacquard_common::CowStr<'a>,
-    #[serde(flatten)]
-    #[serde(borrow)]
-    #[builder(default)]
-    pub extra_data: ::std::collections::BTreeMap<
-        ::jacquard_common::smol_str::SmolStr,
-        ::jacquard_common::types::value::Data<'a>,
-    >,
 }
 
 #[jacquard_derive::lexicon]

crates/jacquard-api/src/tools_ozone/communication/delete_template.rs

···
     Clone,
     PartialEq,
     Eq,
-    bon::Builder,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
-#[builder(start_fn = new)]
 pub struct DeleteTemplate<'a> {
     #[serde(borrow)]
-    #[builder(into)]
     pub id: jacquard_common::CowStr<'a>,
-    #[serde(flatten)]
-    #[serde(borrow)]
-    #[builder(default)]
-    pub extra_data: ::std::collections::BTreeMap<
-        ::jacquard_common::smol_str::SmolStr,
-        ::jacquard_common::types::value::Data<'a>,
-    >,
 }
 
 ///Response type for

crates/jacquard-api/src/tools_ozone/communication/update_template.rs

···
     Clone,
     PartialEq,
     Eq,
-    bon::Builder,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
-#[builder(start_fn = new)]
 pub struct UpdateTemplate<'a> {
     /// Content of the template, markdown supported, can contain variable placeholders.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub content_markdown: Option<jacquard_common::CowStr<'a>>,
+    pub content_markdown: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub disabled: Option<bool>,
+    pub disabled: std::option::Option<bool>,
     /// ID of the template to be updated.
     #[serde(borrow)]
-    #[builder(into)]
     pub id: jacquard_common::CowStr<'a>,
     /// Message language.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub lang: Option<jacquard_common::types::string::Language>,
+    pub lang: std::option::Option<jacquard_common::types::string::Language>,
     /// Name of the template.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub name: Option<jacquard_common::CowStr<'a>>,
+    pub name: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Subject of the message, used in emails.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub subject: Option<jacquard_common::CowStr<'a>>,
+    pub subject: std::option::Option<jacquard_common::CowStr<'a>>,
     /// DID of the user who is updating the template.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub updated_by: Option<jacquard_common::types::string::Did<'a>>,
-    #[serde(flatten)]
-    #[serde(borrow)]
-    #[builder(default)]
-    pub extra_data: ::std::collections::BTreeMap<
-        ::jacquard_common::smol_str::SmolStr,
-        ::jacquard_common::types::value::Data<'a>,
-    >,
+    pub updated_by: std::option::Option<jacquard_common::types::string::Did<'a>>,
 }
 
 #[jacquard_derive::lexicon]

crates/jacquard-api/src/tools_ozone/hosting/get_account_history.rs

···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct AccountCreated<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub email: Option<jacquard_common::CowStr<'a>>,
+    pub email: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub handle: Option<jacquard_common::types::string::Handle<'a>>,
+    pub handle: std::option::Option<jacquard_common::types::string::Handle<'a>>,
 }
 
 #[jacquard_derive::lexicon]
···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct EmailConfirmed<'a> {
     #[serde(borrow)]
-    #[builder(into)]
     pub email: jacquard_common::CowStr<'a>,
 }
 
···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct EmailUpdated<'a> {
     #[serde(borrow)]
-    #[builder(into)]
     pub email: jacquard_common::CowStr<'a>,
 }
 
···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct PasswordUpdated<'a> {}

crates/jacquard-api/src/tools_ozone/moderation.rs

···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct AccountHosting<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub created_at: Option<jacquard_common::types::string::Datetime>,
+    pub created_at: std::option::Option<jacquard_common::types::string::Datetime>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub deactivated_at: Option<jacquard_common::types::string::Datetime>,
+    pub deactivated_at: std::option::Option<jacquard_common::types::string::Datetime>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub deleted_at: Option<jacquard_common::types::string::Datetime>,
+    pub deleted_at: std::option::Option<jacquard_common::types::string::Datetime>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub reactivated_at: Option<jacquard_common::types::string::Datetime>,
+    pub reactivated_at: std::option::Option<jacquard_common::types::string::Datetime>,
     #[serde(borrow)]
-    #[builder(into)]
     pub status: jacquard_common::CowStr<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub updated_at: Option<jacquard_common::types::string::Datetime>,
+    pub updated_at: std::option::Option<jacquard_common::types::string::Datetime>,
 }
 
 /// Statistics about a particular account subject
···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct AccountStats<'a> {
     /// Total number of appeals against a moderation action on the account
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub appeal_count: Option<i64>,
+    pub appeal_count: std::option::Option<i64>,
     /// Number of times the account was escalated
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub escalate_count: Option<i64>,
+    pub escalate_count: std::option::Option<i64>,
     /// Total number of reports on the account
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub report_count: Option<i64>,
+    pub report_count: std::option::Option<i64>,
     /// Number of times the account was suspended
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub suspend_count: Option<i64>,
+    pub suspend_count: std::option::Option<i64>,
     /// Number of times the account was taken down
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub takedown_count: Option<i64>,
+    pub takedown_count: std::option::Option<i64>,
 }
 
 /// Age assurance info coming directly from users. Only works on DID subjects.
···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct AgeAssuranceOverrideEvent<'a> {
     /// Comment describing the reason for the override.
     #[serde(borrow)]
-    #[builder(into)]
     pub comment: jacquard_common::CowStr<'a>,
     /// The status to be set for the user decided by a moderator, overriding whatever value the user had previously. Use reset to default to original state.
     #[serde(borrow)]
-    #[builder(into)]
     pub status: jacquard_common::CowStr<'a>,
 }
 
···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct CancelScheduledTakedownEvent<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub comment: Option<jacquard_common::CowStr<'a>>,
+    pub comment: std::option::Option<jacquard_common::CowStr<'a>>,
 }
 
 /// Logs identity related events on a repo subject. Normally captured by automod from the firehose and emitted to ozone for historical tracking.
···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct ModEventAcknowledge<'a> {
     /// If true, all other reports on content authored by this account will be resolved (acknowledged).
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub acknowledge_account_subjects: Option<bool>,
+    pub acknowledge_account_subjects: std::option::Option<bool>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub comment: Option<jacquard_common::CowStr<'a>>,
+    pub comment: std::option::Option<jacquard_common::CowStr<'a>>,
 }
 
 /// Add a comment to a subject. An empty comment will clear any previously set sticky comment.
···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct ModEventComment<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub comment: Option<jacquard_common::CowStr<'a>>,
+    pub comment: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Make the comment persistent on the subject
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub sticky: Option<bool>,
+    pub sticky: std::option::Option<bool>,
 }
 
 /// Divert a record's blobs to a 3rd party service for further scanning/tagging
···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct ModEventDivert<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub comment: Option<jacquard_common::CowStr<'a>>,
+    pub comment: std::option::Option<jacquard_common::CowStr<'a>>,
 }
 
 /// Keep a log of outgoing email to a user
···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct ModEventEmail<'a> {
     /// Additional comment about the outgoing comm.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub comment: Option<jacquard_common::CowStr<'a>>,
+    pub comment: std::option::Option<jacquard_common::CowStr<'a>>,
     /// The content of the email sent to the user.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub content: Option<jacquard_common::CowStr<'a>>,
+    pub content: std::option::Option<jacquard_common::CowStr<'a>>,
     /// The subject line of the email sent to the user.
     #[serde(borrow)]
-    #[builder(into)]
     pub subject_line: jacquard_common::CowStr<'a>,
 }
 
···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct ModEventEscalate<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub comment: Option<jacquard_common::CowStr<'a>>,
+    pub comment: std::option::Option<jacquard_common::CowStr<'a>>,
 }
 
 /// Apply/Negate labels on a subject
···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct ModEventMuteReporter<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub comment: Option<jacquard_common::CowStr<'a>>,
+    pub comment: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Indicates how long the account should remain muted. Falsy value here means a permanent mute.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub duration_in_hours: Option<i64>,
+    pub duration_in_hours: std::option::Option<i64>,
 }
 
 /// Set priority score of the subject. Higher score means higher priority.
···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct ModEventResolveAppeal<'a> {
     /// Describe resolution.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub comment: Option<jacquard_common::CowStr<'a>>,
+    pub comment: std::option::Option<jacquard_common::CowStr<'a>>,
 }
 
 /// Revert take down action on a subject
···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct ModEventReverseTakedown<'a> {
     /// Describe reasoning behind the reversal.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub comment: Option<jacquard_common::CowStr<'a>>,
+    pub comment: std::option::Option<jacquard_common::CowStr<'a>>,
 }
 
 /// Add/Remove a tag on a subject
···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct ModEventTakedown<'a> {
     /// If true, all other reports on content authored by this account will be resolved (acknowledged).
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub acknowledge_account_subjects: Option<bool>,
+    pub acknowledge_account_subjects: std::option::Option<bool>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub comment: Option<jacquard_common::CowStr<'a>>,
+    pub comment: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Indicates how long the takedown should be in effect before automatically expiring.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub duration_in_hours: Option<i64>,
+    pub duration_in_hours: std::option::Option<i64>,
     /// Names/Keywords of the policies that drove the decision.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub policies: Option<Vec<jacquard_common::CowStr<'a>>>,
+    pub policies: std::option::Option<Vec<jacquard_common::CowStr<'a>>>,
 }
 
 /// Unmute action on a subject
···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct ModEventUnmute<'a> {
     /// Describe reasoning behind the reversal.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub comment: Option<jacquard_common::CowStr<'a>>,
+    pub comment: std::option::Option<jacquard_common::CowStr<'a>>,
 }
 
 /// Unmute incoming reports from an account
···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct ModEventUnmuteReporter<'a> {
     /// Describe reasoning behind the reversal.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub comment: Option<jacquard_common::CowStr<'a>>,
+    pub comment: std::option::Option<jacquard_common::CowStr<'a>>,
 }
 
 #[jacquard_derive::lexicon]
···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct ModTool<'a> {
     /// Additional arbitrary metadata about the source
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub meta: Option<jacquard_common::types::value::Data<'a>>,
+    pub meta: std::option::Option<jacquard_common::types::value::Data<'a>>,
     /// Name/identifier of the source (e.g., 'automod', 'ozone/workspace')
     #[serde(borrow)]
-    #[builder(into)]
     pub name: jacquard_common::CowStr<'a>,
 }
 
···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct Moderation<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub subject_status: Option<crate::tools_ozone::moderation::SubjectStatusView<'a>>,
+    pub subject_status: std::option::Option<
+        crate::tools_ozone::moderation::SubjectStatusView<'a>,
+    >,
 }
 
 #[jacquard_derive::lexicon]
···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct ModerationDetail<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub subject_status: Option<crate::tools_ozone::moderation::SubjectStatusView<'a>>,
+    pub subject_status: std::option::Option<
+        crate::tools_ozone::moderation::SubjectStatusView<'a>,
+    >,
 }
 
 /// Logs lifecycle event on a record subject. Normally captured by automod from the firehose and emitted to ozone for historical tracking.
···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct RecordHosting<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub created_at: Option<jacquard_common::types::string::Datetime>,
+    pub created_at: std::option::Option<jacquard_common::types::string::Datetime>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub deleted_at: Option<jacquard_common::types::string::Datetime>,
+    pub deleted_at: std::option::Option<jacquard_common::types::string::Datetime>,
     #[serde(borrow)]
-    #[builder(into)]
     pub status: jacquard_common::CowStr<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub updated_at: Option<jacquard_common::types::string::Datetime>,
+    pub updated_at: std::option::Option<jacquard_common::types::string::Datetime>,
 }
 
 #[jacquard_derive::lexicon]
···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct RecordsStats<'a> {
     /// Number of items that were appealed at least once
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub appealed_count: Option<i64>,
+    pub appealed_count: std::option::Option<i64>,
     /// Number of items that were escalated at least once
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub escalated_count: Option<i64>,
+    pub escalated_count: std::option::Option<i64>,
     /// Number of item currently in "reviewOpen" or "reviewEscalated" state
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub pending_count: Option<i64>,
+    pub pending_count: std::option::Option<i64>,
     /// Number of item currently in "reviewNone" or "reviewClosed" state
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub processed_count: Option<i64>,
+    pub processed_count: std::option::Option<i64>,
     /// Number of items that were reported at least once
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub reported_count: Option<i64>,
+    pub reported_count: std::option::Option<i64>,
     /// Total number of item in the set
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub subject_count: Option<i64>,
+    pub subject_count: std::option::Option<i64>,
     /// Number of item currently taken down
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub takendown_count: Option<i64>,
+    pub takendown_count: std::option::Option<i64>,
     /// Cumulative sum of the number of reports on the items in the set
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub total_reports: Option<i64>,
+    pub total_reports: std::option::Option<i64>,
 }
 
 #[jacquard_derive::lexicon]
···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct RevokeAccountCredentialsEvent<'a> {
     /// Comment describing the reason for the revocation.
     #[serde(borrow)]
-    #[builder(into)]
     pub comment: jacquard_common::CowStr<'a>,
 }
 
···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct ScheduleTakedownEvent<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub comment: Option<jacquard_common::CowStr<'a>>,
+    pub comment: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub execute_after: Option<jacquard_common::types::string::Datetime>,
+    pub execute_after: std::option::Option<jacquard_common::types::string::Datetime>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub execute_at: Option<jacquard_common::types::string::Datetime>,
+    pub execute_at: std::option::Option<jacquard_common::types::string::Datetime>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub execute_until: Option<jacquard_common::types::string::Datetime>,
+    pub execute_until: std::option::Option<jacquard_common::types::string::Datetime>,
 }
 
 /// View of a scheduled moderation action

crates/jacquard-api/src/tools_ozone/moderation/schedule_action.rs

···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct SchedulingConfig<'a> {
     /// Earliest time to execute the action (for randomized scheduling)
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub execute_after: Option<jacquard_common::types::string::Datetime>,
+    pub execute_after: std::option::Option<jacquard_common::types::string::Datetime>,
     /// Exact time to execute the action
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub execute_at: Option<jacquard_common::types::string::Datetime>,
+    pub execute_at: std::option::Option<jacquard_common::types::string::Datetime>,
     /// Latest time to execute the action (for randomized scheduling)
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub execute_until: Option<jacquard_common::types::string::Datetime>,
+    pub execute_until: std::option::Option<jacquard_common::types::string::Datetime>,
 }
 
 /// Schedule a takedown action
···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct Takedown<'a> {
     /// If true, all other reports on content authored by this account will be resolved (acknowledged).
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub acknowledge_account_subjects: Option<bool>,
+    pub acknowledge_account_subjects: std::option::Option<bool>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub comment: Option<jacquard_common::CowStr<'a>>,
+    pub comment: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Indicates how long the takedown should be in effect before automatically expiring.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub duration_in_hours: Option<i64>,
+    pub duration_in_hours: std::option::Option<i64>,
     /// Names/Keywords of the policies that drove the decision.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub policies: Option<Vec<jacquard_common::CowStr<'a>>>,
+    pub policies: std::option::Option<Vec<jacquard_common::CowStr<'a>>>,
 }

crates/jacquard-api/src/tools_ozone/safelink/query_events.rs

···
     Clone,
     PartialEq,
     Eq,
-    bon::Builder,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
-#[builder(start_fn = new)]
 pub struct QueryEvents<'a> {
     /// Cursor for pagination
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub cursor: Option<jacquard_common::CowStr<'a>>,
+    pub cursor: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Maximum number of results to return
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub limit: Option<i64>,
+    pub limit: std::option::Option<i64>,
     /// Filter by pattern type
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub pattern_type: Option<jacquard_common::CowStr<'a>>,
+    pub pattern_type: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Sort direction
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub sort_direction: Option<jacquard_common::CowStr<'a>>,
+    pub sort_direction: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Filter by specific URLs or domains
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub urls: Option<Vec<jacquard_common::CowStr<'a>>>,
-    #[serde(flatten)]
-    #[serde(borrow)]
-    #[builder(default)]
-    pub extra_data: ::std::collections::BTreeMap<
-        ::jacquard_common::smol_str::SmolStr,
-        ::jacquard_common::types::value::Data<'a>,
-    >,
+    pub urls: std::option::Option<Vec<jacquard_common::CowStr<'a>>>,
 }
 
 #[jacquard_derive::lexicon]

crates/jacquard-api/src/tools_ozone/safelink/query_rules.rs

···
     Clone,
     PartialEq,
     Eq,
-    bon::Builder,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
-#[builder(start_fn = new)]
 pub struct QueryRules<'a> {
     /// Filter by action types
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub actions: Option<Vec<jacquard_common::CowStr<'a>>>,
+    pub actions: std::option::Option<Vec<jacquard_common::CowStr<'a>>>,
     /// Filter by rule creator
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub created_by: Option<jacquard_common::types::string::Did<'a>>,
+    pub created_by: std::option::Option<jacquard_common::types::string::Did<'a>>,
     /// Cursor for pagination
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub cursor: Option<jacquard_common::CowStr<'a>>,
+    pub cursor: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Maximum number of results to return
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
-    pub limit: Option<i64>,
+    pub limit: std::option::Option<i64>,
     /// Filter by pattern type
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub pattern_type: Option<jacquard_common::CowStr<'a>>,
+    pub pattern_type: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Filter by reason type
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub reason: Option<jacquard_common::CowStr<'a>>,
+    pub reason: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Sort direction
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub sort_direction: Option<jacquard_common::CowStr<'a>>,
+    pub sort_direction: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Filter by specific URLs or domains
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub urls: Option<Vec<jacquard_common::CowStr<'a>>>,
-    #[serde(flatten)]
-    #[serde(borrow)]
-    #[builder(default)]
-    pub extra_data: ::std::collections::BTreeMap<
-        ::jacquard_common::smol_str::SmolStr,
-        ::jacquard_common::types::value::Data<'a>,
-    >,
+    pub urls: std::option::Option<Vec<jacquard_common::CowStr<'a>>>,
 }
 
 #[jacquard_derive::lexicon]

crates/jacquard-api/src/tools_ozone/server/get_config.rs

···
     Clone,
     PartialEq,
     Eq,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct GetConfigOutput<'a> {
···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct ServiceConfig<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub url: Option<jacquard_common::types::string::Uri<'a>>,
+    pub url: std::option::Option<jacquard_common::types::string::Uri<'a>>,
 }
 
 #[jacquard_derive::lexicon]
···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct ViewerConfig<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub role: Option<jacquard_common::CowStr<'a>>,
+    pub role: std::option::Option<jacquard_common::CowStr<'a>>,
 }

crates/jacquard-api/src/tools_ozone/set.rs

···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct Set<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub description: Option<jacquard_common::CowStr<'a>>,
+    pub description: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(borrow)]
-    #[builder(into)]
     pub name: jacquard_common::CowStr<'a>,
 }
 

crates/jacquard-api/src/tools_ozone/set/delete_set.rs

···
     Clone,
     PartialEq,
     Eq,
-    bon::Builder,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
-#[builder(start_fn = new)]
 pub struct DeleteSet<'a> {
     /// Name of the set to delete
     #[serde(borrow)]
-    #[builder(into)]
     pub name: jacquard_common::CowStr<'a>,
-    #[serde(flatten)]
-    #[serde(borrow)]
-    #[builder(default)]
-    pub extra_data: ::std::collections::BTreeMap<
-        ::jacquard_common::smol_str::SmolStr,
-        ::jacquard_common::types::value::Data<'a>,
-    >,
 }
 
 #[jacquard_derive::lexicon]
···
     Clone,
     PartialEq,
     Eq,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct DeleteSetOutput<'a> {}

crates/jacquard-api/src/tools_ozone/set/upsert_set.rs

···
     Clone,
     PartialEq,
     Eq,
-    bon::Builder,
     jacquard_derive::IntoStatic
 )]
 #[serde(rename_all = "camelCase")]
-#[builder(start_fn = new)]
 pub struct UpsertSet<'a> {
     #[serde(flatten)]
     #[serde(borrow)]
     pub value: crate::tools_ozone::set::Set<'a>,
-    #[serde(flatten)]
-    #[serde(borrow)]
-    #[builder(default)]
-    pub extra_data: ::std::collections::BTreeMap<
-        ::jacquard_common::smol_str::SmolStr,
-        ::jacquard_common::types::value::Data<'a>,
-    >,
 }
 
 #[jacquard_derive::lexicon]

crates/jacquard-api/src/tools_ozone/setting.rs

···
 
 #[jacquard_derive::lexicon]
 #[derive(
-    serde::Serialize, serde::Deserialize, Debug, Clone, PartialEq, Eq, jacquard_derive::IntoStatic,
+    serde::Serialize,
+    serde::Deserialize,
+    Debug,
+    Clone,
+    PartialEq,
+    Eq,
+    jacquard_derive::IntoStatic
 )]
 #[serde(rename_all = "camelCase")]
 pub struct Option<'a> {
···
     pub updated_at: std::option::Option<jacquard_common::types::string::Datetime>,
     #[serde(borrow)]
     pub value: jacquard_common::types::value::Data<'a>,
-}
+}

crates/jacquard-api/src/tools_ozone/setting/remove_options.rs

···
     Clone,
     PartialEq,
     Eq,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct RemoveOptionsOutput<'a> {}

crates/jacquard-api/src/tools_ozone/signature.rs

···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct SigDetail<'a> {
     #[serde(borrow)]
-    #[builder(into)]
     pub property: jacquard_common::CowStr<'a>,
     #[serde(borrow)]
-    #[builder(into)]
     pub value: jacquard_common::CowStr<'a>,
 }

crates/jacquard-api/src/uk_skyblur/post/decrypt_by_cid.rs

···
     Clone,
     PartialEq,
     Eq,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct DecryptByCidOutput<'a> {

crates/jacquard-api/src/uk_skyblur/post/encrypt.rs

···
     Clone,
     PartialEq,
     Eq,
-    bon::Builder,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
-#[builder(start_fn = new)]
 pub struct Encrypt<'a> {
     #[serde(borrow)]
-    #[builder(into)]
     pub body: jacquard_common::CowStr<'a>,
     #[serde(borrow)]
-    #[builder(into)]
     pub password: jacquard_common::CowStr<'a>,
-    #[serde(flatten)]
-    #[serde(borrow)]
-    #[builder(default)]
-    pub extra_data: ::std::collections::BTreeMap<
-        ::jacquard_common::smol_str::SmolStr,
-        ::jacquard_common::types::value::Data<'a>,
-    >,
 }
 
 /// Returns the encrypted result.
···
     Clone,
     PartialEq,
     Eq,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct EncryptOutput<'a> {

crates/jacquard-api/src/uk_skyblur/post/get_post.rs

···
     Clone,
     PartialEq,
     Eq,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct GetPostOutput<'a> {

crates/jacquard-api/src/win_tomo_x/pushat.rs

···
     PartialEq,
     Eq,
     jacquard_derive::IntoStatic,
-    bon::Builder
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct NotifyBody<'a> {
     /// Body text of the notification.
     #[serde(borrow)]
-    #[builder(into)]
     pub body: jacquard_common::CowStr<'a>,
     /// The URI of the icon displayed in the notification.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub icon: Option<jacquard_common::types::string::Uri<'a>>,
+    pub icon: std::option::Option<jacquard_common::types::string::Uri<'a>>,
     /// Experimental — do not use. The URI to open when the notification is clicked.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    #[builder(into)]
     #[serde(borrow)]
-    pub link: Option<jacquard_common::types::string::Uri<'a>>,
+    pub link: std::option::Option<jacquard_common::types::string::Uri<'a>>,
     /// Title text of the notification.
     #[serde(borrow)]
-    #[builder(into)]
     pub title: jacquard_common::CowStr<'a>,
 }

crates/jacquard-api/src/win_tomo_x/pushat/push_notify.rs

···
     Clone,
     PartialEq,
     Eq,
-    jacquard_derive::IntoStatic
+    jacquard_derive::IntoStatic,
+    Default
 )]
 #[serde(rename_all = "camelCase")]
 pub struct PushNotifyOutput<'a> {}

crates/jacquard-common/Cargo.toml

···
 reqwest = { workspace = true, optional = true, features = ["charset", "http2", "json", "system-proxy", "gzip", "rustls-tls"] }
 serde_ipld_dagcbor.workspace = true
 signature = { version = "2", optional = true }
+tracing = { workspace = true, optional = true }
 
 [features]
 default = ["service-auth", "reqwest-client", "crypto"]
···
 crypto-p256 = ["crypto", "dep:p256", "p256/ecdsa"]
 service-auth = ["crypto-k256", "crypto-p256", "dep:signature"]
 reqwest-client = ["dep:reqwest"]
+tracing = ["dep:tracing"]
 
 [dependencies.ed25519-dalek]
 version = "2"

crates/jacquard-common/src/xrpc.rs

···
     ///   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.
+    #[cfg_attr(feature = "tracing", tracing::instrument(level = "debug", skip(self, request), fields(nsid = R::NSID)))]
     pub async fn send<R>(self, request: &R) -> XrpcResult<Response<<R as XrpcRequest>::Response>>
     where
         R: XrpcRequest + Send + Sync,

crates/jacquard-identity/Cargo.toml

···
 
 [features]
 dns = ["dep:hickory-resolver"]
+tracing = ["dep:tracing"]
 
 [dependencies]
 async-trait.workspace = true
···
 http.workspace = true
 serde_html_form.workspace = true
 urlencoding.workspace = true
+tracing = { workspace = true, optional = true }

crates/jacquard-identity/src/lib.rs

···
 impl JacquardResolver {
     /// Create a new instance of the default resolver with all options (except DNS) up front
     pub fn new(http: reqwest::Client, opts: ResolverOptions) -> Self {
+        #[cfg(feature = "tracing")]
+        tracing::info!(
+            public_fallback = opts.public_fallback_for_handle,
+            validate_doc_id = opts.validate_doc_id,
+            plc_source = ?opts.plc_source,
+            "jacquard resolver created"
+        );
+
         Self {
             http,
             opts,
···
     fn options(&self) -> &ResolverOptions {
         &self.opts
     }
+    #[cfg_attr(feature = "tracing", tracing::instrument(level = "debug", skip(self), fields(handle = %handle)))]
     async fn resolve_handle(&self, handle: &Handle<'_>) -> Result<Did<'static>, IdentityError> {
         let host = handle.as_str();
         for step in &self.opts.handle_order {
···
         Err(IdentityError::InvalidWellKnown)
     }
 
+    #[cfg_attr(feature = "tracing", tracing::instrument(level = "debug", skip(self), fields(did = %did)))]
     async fn resolve_did_doc(&self, did: &Did<'_>) -> Result<DidDocResponse, IdentityError> {
         let s = did.as_str();
         for step in &self.opts.did_order {

crates/jacquard-lexicon/src/codegen/structs.rs

···
 /// Check if a type name conflicts with types referenced by bon::Builder macro.
 /// bon::Builder generates code that uses unqualified `Option` and `Result`,
 /// so structs with these names cause compilation errors.
-fn conflicts_with_builder_macro(type_name: &str) -> bool {
+pub(crate) fn conflicts_with_builder_macro(type_name: &str) -> bool {
     matches!(type_name, "Option" | "Result")
+}
+
+/// Count the number of required fields in a lexicon object.
+/// Used to determine whether to generate builders or Default impls.
+pub(crate) fn count_required_fields(obj: &LexObject<'static>) -> usize {
+    let required = obj.required.as_ref().map(|r| r.as_slice()).unwrap_or(&[]);
+    required.len()
+}
+
+/// Check if a field property is a plain string that can default to empty.
+/// Returns true for bare CowStr fields (no format constraints).
+fn is_defaultable_string(prop: &LexObjectProperty<'static>) -> bool {
+    matches!(prop, LexObjectProperty::String(s) if s.format.is_none())
+}
+
+/// Check if all required fields in an object are defaultable strings.
+pub(crate) fn all_required_are_defaultable_strings(obj: &LexObject<'static>) -> bool {
+    let required = obj.required.as_ref().map(|r| r.as_slice()).unwrap_or(&[]);
+
+    if required.is_empty() {
+        return false; // Handled separately by count check
+    }
+
+    required.iter().all(|field_name| {
+        let field_name_str: &str = field_name.as_ref();
+        obj.properties.get(field_name_str)
+            .map(is_defaultable_string)
+            .unwrap_or(false)
+    })
 }
 
 impl<'c> CodeGenerator<'c> {
···
 
         // Objects always get a lifetime since they have the #[lexicon] attribute
         // which adds extra_data: BTreeMap<..., Data<'a>>
-        // Skip bon::Builder for types that conflict with the macro's unqualified type references
-        let has_builder = !conflicts_with_builder_macro(&type_name);
+
+        // Smart heuristics for builder generation:
+        // - 0 required fields: Default instead of builder
+        // - All required fields are bare strings: Default instead of builder
+        // - 1+ required fields (not all strings): bon::Builder (but not if name conflicts)
+        let required_count = count_required_fields(obj);
+        let has_default = required_count == 0 || all_required_are_defaultable_strings(obj);
+        let has_builder = required_count >= 1 && !has_default && !conflicts_with_builder_macro(&type_name);
 
         let fields = self.generate_object_fields(nsid, &type_name, obj, has_builder)?;
         let doc = self.generate_doc_comment(obj.description.as_ref());
···
                 #doc
                 #[jacquard_derive::lexicon]
                 #[derive(serde::Serialize, serde::Deserialize, Debug, Clone, PartialEq, Eq, jacquard_derive::IntoStatic, bon::Builder)]
+                #[serde(rename_all = "camelCase")]
+                pub struct #ident<'a> {
+                    #fields
+                }
+            }
+        } else if has_default {
+            quote! {
+                #doc
+                #[jacquard_derive::lexicon]
+                #[derive(serde::Serialize, serde::Deserialize, Debug, Clone, PartialEq, Eq, jacquard_derive::IntoStatic, Default)]
                 #[serde(rename_all = "camelCase")]
                 pub struct #ident<'a> {
                     #fields

crates/jacquard-lexicon/src/codegen/xrpc.rs

···
         // Check if this is a binary body (no schema, just raw bytes)
         let is_binary_body = body.schema.is_none();
 
+        // Determine if we should derive Default or bon::Builder
+        // Binary bodies always get builder, schema-based inputs use heuristics
+        let (has_default, has_builder) = if is_binary_body {
+            (false, true)
+        } else if let Some(crate::lexicon::LexXrpcBodySchema::Object(obj)) = &body.schema {
+            use crate::codegen::structs::{count_required_fields, all_required_are_defaultable_strings, conflicts_with_builder_macro};
+            let required_count = count_required_fields(obj);
+            let can_default = required_count == 0 || all_required_are_defaultable_strings(obj);
+            let can_builder = required_count >= 1 && !can_default && !conflicts_with_builder_macro(type_base);
+            (can_default, can_builder)
+        } else {
+            (false, false)
+        };
+
         let fields = if let Some(schema) = &body.schema {
-            self.generate_body_fields("", type_base, schema, true)?
+            self.generate_body_fields("", type_base, schema, has_builder)?
         } else {
             // Binary body: just a bytes field
             quote! {
···
                     #fields
                 }
             }
-        } else {
-            // Input structs with schemas: manually add extra_data field with #[builder(default)]
+        } else if has_builder {
+            // Input structs with schemas and builders: manually add extra_data field with #[builder(default)]
             // for bon compatibility. The #[lexicon] macro will see it exists and skip adding it.
             quote! {
                 #doc
···
                     >,
                 }
             }
+        } else if has_default {
+            quote! {
+                #doc
+                #[jacquard_derive::lexicon]
+                #[derive(serde::Serialize, serde::Deserialize, Debug, Clone, PartialEq, Eq, jacquard_derive::IntoStatic, Default)]
+                #[serde(rename_all = "camelCase")]
+                pub struct #ident<'a> {
+                    #fields
+                }
+            }
+        } else {
+            quote! {
+                #doc
+                #[jacquard_derive::lexicon]
+                #[derive(serde::Serialize, serde::Deserialize, Debug, Clone, PartialEq, Eq, jacquard_derive::IntoStatic)]
+                #[serde(rename_all = "camelCase")]
+                pub struct #ident<'a> {
+                    #fields
+                }
+            }
         };
 
         // Generate union types if schema is an Object
···
 
         let doc = self.generate_doc_comment(body.description.as_ref());
 
+        // Determine if we should derive Default
+        // Check if schema is an Object and apply heuristics
+        let has_default = if let Some(crate::lexicon::LexXrpcBodySchema::Object(obj)) = &body.schema {
+            use crate::codegen::structs::{count_required_fields, all_required_are_defaultable_strings};
+            let required_count = count_required_fields(obj);
+            required_count == 0 || all_required_are_defaultable_strings(obj)
+        } else {
+            false
+        };
+
         // Output structs always get a lifetime since they have the #[lexicon] attribute
         // which adds extra_data: BTreeMap<..., Data<'a>>
-        let struct_def = quote! {
-            #doc
-            #[jacquard_derive::lexicon]
-            #[derive(serde::Serialize, serde::Deserialize, Debug, Clone, PartialEq, Eq, jacquard_derive::IntoStatic)]
-            #[serde(rename_all = "camelCase")]
-            pub struct #ident<'a> {
-                #fields
+        let struct_def = if has_default {
+            quote! {
+                #doc
+                #[jacquard_derive::lexicon]
+                #[derive(serde::Serialize, serde::Deserialize, Debug, Clone, PartialEq, Eq, jacquard_derive::IntoStatic, Default)]
+                #[serde(rename_all = "camelCase")]
+                pub struct #ident<'a> {
+                    #fields
+                }
+            }
+        } else {
+            quote! {
+                #doc
+                #[jacquard_derive::lexicon]
+                #[derive(serde::Serialize, serde::Deserialize, Debug, Clone, PartialEq, Eq, jacquard_derive::IntoStatic)]
+                #[serde(rename_all = "camelCase")]
+                pub struct #ident<'a> {
+                    #fields
+                }
             }
         };
 

crates/jacquard-oauth/Cargo.toml

···
 trait-variant.workspace = true
 webbrowser = { version = "0.8", optional = true }
 rouille  = { version =  "3.6.2", optional = true }
+tracing = { workspace = true, optional = true }
 
 [features]
 default = []
 loopback = ["dep:rouille"]
 browser-open = ["dep:webbrowser"]
+tracing = ["dep:tracing"]

crates/jacquard-oauth/src/client.rs

···
     S: ClientAuthStore,
 {
     pub fn new_from_resolver(store: S, client: T, client_data: ClientData<'static>) -> Self {
+        #[cfg(feature = "tracing")]
+        tracing::info!(
+            redirect_uris = ?client_data.config.redirect_uris,
+            scopes = ?client_data.config.scopes,
+            has_keyset = client_data.keyset.is_some(),
+            "oauth client created"
+        );
+
         let client = Arc::new(client);
         let registry = Arc::new(SessionRegistry::new(store, client.clone(), client_data));
         Self { registry, client }
···
             .map(|keyset| keyset.public_jwks())
             .unwrap_or_default()
     }
+    #[cfg_attr(feature = "tracing", tracing::instrument(level = "debug", skip(self, input), fields(input = input.as_ref())))]
     pub async fn start_auth(
         &self,
         input: impl AsRef<str>,
···
             .unwrap())
     }
 
+    #[cfg_attr(feature = "tracing", tracing::instrument(level = "info", skip_all, fields(state = params.state.as_ref().map(|s| s.as_ref()))))]
     pub async fn callback(&self, params: CallbackParams<'_>) -> Result<OAuthSession<T, S>> {
         let Some(state_key) = params.state else {
             return Err(CallbackError::MissingState.into());
···
     S: ClientAuthStore + Send + Sync + 'static,
     T: OAuthResolver + DpopExt + Send + Sync + 'static,
 {
+    #[cfg_attr(feature = "tracing", tracing::instrument(level = "debug", skip_all))]
     pub async fn refresh(&self) -> Result<AuthorizationToken<'_>> {
         // Read identifiers without holding the lock across await
         let (did, sid) = {

crates/jacquard-oauth/src/request.rs

···
     }
 }
 
+#[cfg_attr(feature = "tracing", tracing::instrument(level = "debug", skip_all, fields(login_hint = login_hint.as_ref().map(|h| h.as_ref()))))]
 pub async fn par<'r, T: OAuthResolver + DpopExt + Send + Sync + 'static>(
     client: &T,
     login_hint: Option<CowStr<'r>>,
···
         login_hint: login_hint,
         prompt: prompt.map(CowStr::from),
     };
-    println!("Parameters: {:?}", parameters);
     if metadata
         .server_metadata
         .pushed_authorization_request_endpoint
···
     }
 }
 
+#[cfg_attr(feature = "tracing", tracing::instrument(level = "debug", skip_all, fields(did = %session_data.account_did)))]
 pub async fn refresh<'r, T>(
     client: &T,
     mut session_data: ClientSessionData<'r>,
···
     Ok(session_data)
 }
 
+#[cfg_attr(feature = "tracing", tracing::instrument(level = "debug", skip_all))]
 pub async fn exchange_code<'r, T, D>(
     client: &T,
     data_source: &'r mut D,
···
     })
 }
 
+#[cfg_attr(feature = "tracing", tracing::instrument(level = "debug", skip_all))]
 pub async fn revoke<'r, T, D>(
     client: &T,
     data_source: &'r mut D,

crates/jacquard/Cargo.toml

···
 dns = ["jacquard-identity/dns"]
 # Propagate loopback to oauth (server + browser helper)
 loopback = ["jacquard-oauth/loopback", "jacquard-oauth/browser-open"]
+# Enable tracing instrumentation
+tracing = ["dep:tracing", "jacquard-common/tracing", "jacquard-oauth/tracing", "jacquard-identity/tracing"]
 
 
 [[example]]
···
 [[example]]
 name = "update_preferences"
 path = "../../examples/update_preferences.rs"
+required-features = ["api_bluesky"]
 
 [dependencies]
 jacquard-api = { version = "0.5", path = "../jacquard-api" }
···
 jose-jwk = { workspace = true, features = ["p256"] }
 p256 = { workspace = true, features = ["ecdsa"] }
 rand_core.workspace = true
+tracing = { workspace = true, optional = true }
 
 [dev-dependencies]
 clap.workspace = true

crates/jacquard/src/client.rs

···
         R: Collection + serde::Serialize,
     {
         async move {
+            #[cfg(feature = "tracing")]
+            let _span = tracing::debug_span!("create_record", collection = %R::nsid()).entered();
+
             use jacquard_api::com_atproto::repo::create_record::CreateRecord;
             use jacquard_common::types::ident::AtIdentifier;
             use jacquard_common::types::value::to_data;
···
         R: Collection,
     {
         async move {
+            #[cfg(feature = "tracing")]
+            let _span = tracing::debug_span!("get_record", collection = %R::nsid(), uri = %uri).entered();
+
             // Validate that URI's collection matches the expected type
             if let Some(uri_collection) = uri.collection() {
                 if uri_collection.as_str() != R::nsid().as_str() {
···
         R: for<'a> From<<<R as Collection>::Record as XrpcResp>::Output<'a>>,
     {
         async move {
+            #[cfg(feature = "tracing")]
+            let _span = tracing::debug_span!("update_record", collection = %R::nsid(), uri = %uri).entered();
+
             // Fetch the record - Response<R::Record> where R::Record::Output<'de> = R<'de>
             let response = self.get_record::<R>(uri.clone()).await?;
 
···
         R: Collection,
     {
         async {
+            #[cfg(feature = "tracing")]
+            let _span = tracing::debug_span!("delete_record", collection = %R::nsid()).entered();
+
             use jacquard_api::com_atproto::repo::delete_record::DeleteRecord;
             use jacquard_common::types::ident::AtIdentifier;
 
···
         R: Collection + serde::Serialize,
     {
         async move {
+            #[cfg(feature = "tracing")]
+            let _span = tracing::debug_span!("put_record", collection = %R::nsid()).entered();
+
             use jacquard_api::com_atproto::repo::put_record::PutRecord;
             use jacquard_common::types::ident::AtIdentifier;
             use jacquard_common::types::value::to_data;
···
         mime_type: MimeType<'_>,
     ) -> impl std::future::Future<Output = Result<Blob<'static>, AgentError>> {
         async move {
+            #[cfg(feature = "tracing")]
+            let _span = tracing::debug_span!("upload_blob", mime_type = %mime_type).entered();
+
             use http::header::CONTENT_TYPE;
             use jacquard_api::com_atproto::repo::upload_blob::UploadBlob;
 

crates/jacquard/src/client/credential_session.rs

···
     where
         S: Any + 'static,
     {
+        #[cfg(feature = "tracing")]
+        let _span = tracing::info_span!("credential_session_login", identifier = %identifier).entered();
+
         // Resolve PDS base
         let pds = if identifier.as_ref().starts_with("http://")
             || identifier.as_ref().starts_with("https://")
···
     where
         S: Any + 'static,
     {
+        #[cfg(feature = "tracing")]
+        let _span = tracing::info_span!("credential_session_restore", did = %did, session_id = %session_id).entered();
+
         let key = (did.clone().into_static(), session_id.clone().into_static());
         let Some(sess) = self.store.get(&key).await else {
             return Err(ClientError::Auth(AuthError::NotAuthenticated));

crates/jacquard/src/client/vec_update.rs

···
 /// Bluesky actor preferences implementation
+#[cfg(feature = "api_bluesky")]
 pub mod preferences;
-
+#[cfg(feature = "api_bluesky")]
 pub use preferences::PreferencesUpdate;
 
 use jacquard_common::IntoStatic;

justfile

···
         cargo run -p jacquard --example {{NAME}} -- {{ARGS}}
     elif cargo metadata --format-version=1 --no-deps | \
          jq -e '.packages[] | select(.name == "jacquard-axum") | .targets[] | select(.kind[] == "example" and .name == "{{NAME}}")' > /dev/null; then
-        cargo run -p jacquard-axum --example {{NAME}} -- {{ARGS}}
+        cargo run -p jacquard-axum --example {{NAME}} --features api_bluesky -- {{ARGS}}
     else
         echo "Example '{{NAME}}' not found."
         echo ""