From 22b31c52bb6e2724e2edcdde5a80c9414e100e5c Mon Sep 17 00:00:00 2001
From: DS Boyce <260543580+ds-boyce@users.noreply.github.com>
Date: Thu, 13 Aug 2026 10:50:16 -0700
Subject: [PATCH 01/32] Update image in deploy-ota.md (#11462)

---
 docs/deploy-ota.md      |   2 +-
 docs/img/ota_action.png | Bin 86622 -> 51054 bytes
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/deploy-ota.md b/docs/deploy-ota.md
index d582402672..52a319bf38 100644
--- a/docs/deploy-ota.md
+++ b/docs/deploy-ota.md
@@ -44,7 +44,7 @@ Double check yourself by ensuring that the `version` in `package.json` matches
 what's in the latest release.
 
 This new OTA branch should follow the format `1.X.0-ota-1`. If one or more OTAs
-have already been deployed for this release, incremement the branch name e.g.
+have already been deployed for this release, increment the branch name e.g.
 `1.x.0-ota-2`.
 
 ### 4. Add commits to the OTA branch
diff --git a/docs/img/ota_action.png b/docs/img/ota_action.png
index 56911400aa543fb3fb8de5897d6b0596608b1110..0d14bb0bc862a845535e9d1526d4f5ed992cfc83 100644
GIT binary patch
literal 51054
zcmeFZWmFwq*DZ*<1Si<R-QC^YU4sO7cL^a7B)GdL!QCOj-66QUyVJ$<=6UbeeSi13
zqsM5f4xF=3?UJ>t)|zv!wFy^NltM<pLjVH<Lza;iR|NxufB{}EaKLXc*YU+kFfedA
zD={%;88I<pWoHKqD_e6gFzQ&pZ$eCBCYWK_sx*_IM7oU|Ln;%dDPAJ&!lilH3*qY*
z7indD9(Qgc=8=vRv~5+tDs_H1LzX6oL1WRAz)3q?!e;p8<#OS3;WNg=!!wS}o-p_r
z6udn@5L!}S-CP8nwMQ<DgGcsRM>STQl##;s;I?FC<MPU4I{o_bb#-slOs;4zy}+J!
z5!^_dyXu%a#v}C6R!8=3d{aL}NkEb7F3+$gBNE;S@iq-#Qu0oPJHh_kg+agHAr-{u
zxd>aMX)RN0<ou0iCwyp1I+tyPyJq8DYRs&SN)oLHg)@C?zBBgZ3wH#+&bkD>d@mgQ
z;U|jXR=w9&lPNk);~nUQAq6HssNF|q$GNM|(YYT{N6QmT@QsqMHJ%Hv;oG{ps9pIR
zPcE6EP;xZgm**l5XBEv}1oU-J(e?Fx!}56G0PAX+Ys*+DD1gxd@8Q6}!>qudfOp`)
z3lDgKfkDQ727?9uq607S9Eg9vg@DO{{O^00w+%(q#AIZEziOt==H~V;mJY7R5+u~X
zu4b*&wOzFp<atdU>=;eV96p#cdfGX@bphk|<OSZ^nY)@0d)nFByYPAnkp8m;FYx}Y
znTeG6pG{nC1W2_Nl!?V0oXv?j8JQWGNd*yziHZ50%`A9T#U=lC2R;dqTDrPA@-i`b
zcz7^+urWF~e`I0-2A7GMm5G&=0oa1U#mnB+#FN3^h3r2&`FB6!<}RkrR*tS#4)(-v
z`!)IC;N~hoO8R!7|Ni{vJk33={@0Q0UH)DcaDhy3-!QQ-GBf>m-#}OXw^m+dD^GJ<
z9dRo=z&yY)1UXr``2X4dfBWWt9r1tk)c#*RIas*=XV3rf&HuBfhKsqgn1dZ~NLRuC
zH8OuY|IaV~cI0PzyYl~GiT{}SpH{%mf(ZOf{~a?ygv>5R128aQFd1<Xbx-i4Ojv!)
zKAb*KFm*&8wXs;0i9}CYk)%ST)lHlQx<XC5eMA~=zRa{G`gL|nH=d8e5yuT2=Mgmh
zJPoNk^kTpY-%V=>U8j?y$J1xj20p(Xz8W@%)!~!o`$Pn9VP;}5i2tljpM{k}Wih=h
zI|d$hSoRU5-hqMtvj*wQfCY<`+q$dcK?#Gst@0Rw#>Q!g`Xc{)5+>F{4>bNpmrj@n
z^Pe8zQ&9Y^)~%(!OVh8A*M~*^UQDD%Ye6r8hv1vwy<)?#<-DNDG6w5%E<65mkWP-T
zwv(e#IHXsCwj;>>OgNzPI`AB9lVk@HCkqvF5W2)^rPhfKTYK?oGlI7#Xg}o$AwZKp
zg=-B`a1YcdIE>bL7kEwr+ZTqg{WL68UNZI0@v*X~^NboB<3yMHu15J=68_!Z1KI=Z
z18g~JB<g}^%EOm)lD<AzqLLBZ%wFMmeW$J1qg+ZT{!Yke@Hxm{@JL8TZWQe~TuYC3
z?gMtPH87N)B4R?qz|!fq_I)$(y&X6o{wd2ixhVt05wFa9epje*&^TzCxRh%T^=)|=
zA{oizgY6LfX@jIbQ{cxj0Ox+Tb`t%P(_-3t4HyDA3Zxc3YLikri`N~RM3Sp^;{>4z
zEb0}kJ}NFMGtmWi;C-k0E+m^MIN$ENK@BRq4D~h~A7UTsTuK)t|2W7|z!Hx=5*8O#
z{{w#|F)r>Yi!>qgH6Hv^6ntPz2~Jcl?tCY#@ASxLosgFxU@^J5Fjfe)M;?=ZhyOg)
z)CV?}%IY5rRd+MaP9u4OM`e%`w$9;k3>R>WA{WcNh9JmGv<KP)6_q3E14dTe0{0mc
zLRyII@<G!6FhkBn;3j}h&<Q>V-3tvEOW+@4#lc56^XWN)!G;J>KJe*XA-*lC^vHAb
zPJYbjh5JtR=UtKYftgXaxR&U7*x>G&-Ec&_5O4OfKAXb7f_+<_w{zzBZ5UDf{Q&!y
zL`XkcqoW?Jb!Fl|i;yrk>>vVT?i-#HP=JJm%amc)y7igO^o$6SznIRZlz!<TYp%y-
zh!+L8**cS<$^l!lvNx~XSxQnHe{Ag&mU;4I<k=pjlGuPoJ!95qlL!z77SG18PV;hD
z#NeQFqL68DwTjrz)fBM1FAw9m5kbhlol@}W7RV1$^*1r1EBB?+Bus;c`zG}=YwIac
zC*-SzLv!{Mb%zZg?D5{izDXiT)Fdb!gQS}hb}AZ=Z)dQetC;CI__zCxS0Ok*CMJu>
zYoJ0~gkw}FM~|ywYKG2(NRg4-1p&hAa;NYY^rc#Ea295^V@TZTN{yF)y}DCtU*M@F
z`v9WUG9eOoAY?gW@_QWLub#2Rd=q7Q4fG?>XD$#BhK7a-eZS*J`wXj^0(2*F`-vc*
zPc|@-!H=5xz=09@U8nJ8+>eK-L`3#miDQtWK^XE6`!uA89`>?Br^m-MTuhwTQi$*I
zfV=txvktBj(HA+)uqKBm5cTdXv(Dn}_9pl#1eHWhI|S=-Vtg;$BA@x(KZIZi-MTL?
zpQkXF?iLk9O7W~Sh1-cj<a?bXL=EMsC{Re3BgDOa-HDG(g6W9rPWbzn24C9lI0pOM
zngEQaqR#C1JBwrvQcrvQv9iMl@P`mOeN^mTe@`AhaJ@bo#OppEBw%=3`$Xbf)uI_M
zGguGE@UoYdvi{ws!U6FbCklL(VKDQ<po)W1tn`)p9U_$g>KV%paMKS%KL1XEeF$TT
zvE2h9c$KquX#|&ktjOA0H+e8X#-h_ye`(tb#WBi(fJTs>N5G=xrXtgOj0x2}%#u|G
zCn_&Y(^H#Ss>>H=MMHfV)`NE`oi*cNTtIt4qOt3M%uXl|c?o$jxxDW3qscEac)Y1~
zxn+EQjW*!3`g389iHn;uQBW=5`xRShLeHT?0U8loKAx)u@C;!qo|kS2WqQdGk66i-
zF+%5_X_boW#)sD?xp6Q)NVRnu$0Z*MrOAt8&bUUPpIr6Fg~o-DZhu<Ng}RHs_D8?u
zQh%J^QmKJR*J1lO`K_Y8NP|u*E<hOUndN*8sd!r&O;k*5U}Pk!o$!GHneZZt42!|V
zyvohL{u|wjX=lqQ$3Hg|!hdckTpaqyXU(>k#Rm|BPW2}kf1Yo7d3hzC=Nss|mrNZw
zBYF*cn;r*CslV#OVmms7W=eF#Mgs`g(&|IQ241<u!VZ30Q~mT?<0eQR$*F)joHBkq
z;;FIf9e(did+-vK&V^>fs9A0(aeX+4<H1nz`h4@FJM-)j%4yEuv(&ifdt$Bih_wzc
z?(-DxIUcv=yC^~~MZ_YZ2kgs2=&#t5H<^5U9hG+7ZpN2~4jmI0iF8{T$<+1sk1_s4
zk6-6?7CWyk$8&<_Yp(ldofbq*-0&c=*4FJ^DJFiS5Iq!gyg5r_U&q;V6&M%%fQzjG
zviO(d1TLxvOh)<p%iX!+gX80}*{jPqDMQqY;X|6;7@-$jhL>GXv+q5t!0nTZRT9Z)
z1`k<!RywC0=|2C<yeWFj@9NT=8;A^Ex3nz#KdRHu$&3bhscaT;4Z0|}eEu2UT`>)U
zOxT#5_VdyKug@{v+aShEdJ26^2Hk{})46Q-(-j7jd57nYL#vaeCSPl_qOlZ`ZT(tH
zwBzNP<TOq@StH+j3PJ&I@q;lrw2?HfV&D4<6@xm=uA-*umKGmnaq&+ox_>@Qu*1;S
z$X_cVhO*yj2FvnGK&;D8(;Tglc#Q6$HWD!taqoIsnjAG8aJbGlBxGdBx3{-fr#g%t
z{n6aC1h<gS7BLNYFZWt9;Jt9wQR0?9%kIDAIieR$rIb}L*wwYQzc161z`1cS^J7|E
zp_kA7=v%m7PXyN0AYH}y^W$x)T=A%C5+p3jxW{UMR8%^9ZVDm}dFK16;;AvAXZqdN
zs&69|vR{?ItJ56Z8=~_1-c>d_c>|Y|Z!VWSnZ%%1V%t=`F)BoFS=qY@q8Rq&vTbav
zP+$05q{LZhDBwM5W6&b|CrjO(@uLX^!9DDqTG>J!4I^jL$x7P~rJ-pVpE`$-Tl*B&
zuh@(Qp$9_0dwcH(RQ-WRNS#>$B9;t@90tFZ(wN_3|3g^55hw{Jz{X#zTtD~j&JztG
zy0q|9ESaS4*Sy<Zne35Vv9PUv3<v8P4TVv9S9XU9eJfO=aeg-(qb6r_>)D^F^M8bx
zD<kE*>2oUo5D_u<>DGyE^$YdIfabDos1ntATeFE-Syf%CJ%6edN8f?w8;n3FM}KOz
zHaE%kU0$N_xr!EOmlil|XlQ7{4L#Q-XbqZc;aDG}EfhUBK7te14b&=k!vEnlDrSrf
zB0Od3d~<#wm;>oEW={#?_Wmb?*B)gzT)2m9zPz&V5Du<>nVxaG;Ym~?oVTY!-(<8F
z?@tf)*neBOeCm0nPjX$+R6;wOgjg-RlnT~12zYt&n!xPt?RhU?^6n=)l5I30AElIw
zkQ_D>S_OQ^t3BhF*vD8hscu8Yl8lw*v9TEYrACsQ&Aw<1L^5E^^Ua5nR1?s-v$TeY
zejaN#eJB)+E{vc46{H{v{?Y8v(>%8_k3~5+>|~UAyQHC5n%tZ3DKtI{_73+__?7v;
z-dKwB3N>`eBL8@8w-A~$Hdbnz`@<HT^|dXX^<sJEJln(XUtp(taI{8Qzv}JsFLy_W
z`mzQS>7@AT9g??Z%M7HR>;j#vjlfU2?%eN~Cn(RdAmnz6SxhbOtGBI7^QvtPYcZ3a
z84X*hMTL`-4ONGT>`GoApG#d+S!)AU1;d-IrX*=qs>zpIJhW~=w)2%igV507XXx12
z77Si(9h3y~^q7tj^*12D(#b3!NVPudrq+&4ea(mWVBmk^2*-LF4{&_8+zfVijXV#k
z7>UH2g{w5V7EJfEcIGcX8Mm4FF7d>g)8w)<D88^4E48<1^7{)HOvD8ATxRjZ%%uFb
ze5`eNFtQEeJOR(o78j#tv(ovG-;sk_bt+BrC94|(=WfFM+0-wR!La>deiWl_B=qJ!
z>N%iw+)1;cdakjWtf-_R8nWX4%=)(X(5$F-aV`atlU9I4^JCRL(!JMi94Ika4}7)b
z{ElZ;(Smd(ga|$EXP_cO^b0}Cam@zi84OrDDau0-%%7=6jxj33*86bo**epjmx;VA
ztuEAHGC)dKH=Gg?n7Qd(4iVpsPg_~j{aNaUoi=K%weZW;4vn;?$x#X1&~btIk+qpD
zB6T9|D8PMu{q0XUmB2aswU76&1-#GM^8F~efkOi^+SciWb_@*$n~UBCy3_=30q7*r
ztFZ<5KWINkAZl}IGYHB4&Pf4+#s`U2z)&yeLuH?E=p^~OWx$!`wy22)tjR&nL6*Z7
zw-7Zh{%WKK*Q=01)cyzhG1-*1mI*Izf9Ly!Li9Ne1Hd^)sJ=SCfsGVQiKR69A{Q8p
z0pNPJ#GAD^M}C?>2AshlT3yR~{!bxnw_$t(9$QXAh%R8Q8IfQ@?E}Zwm)BOgE6v5|
z!_aGs(j43=9B()dwI&%>?yS*&coQ7-cpD=MV72vNul<KQ8*DrX!%^|h7G;uV?@bhg
z7N^Cc^PUGa_(`F<T~J*<cSQH__@p2cd;rnalry-HL4e4s@N4IF?9}G(nL{oOu3<6<
z%&kN8-X{37bdn~43d1>gXwGXUL~7vj+BauTjvS|DasU$2$f$3j-=990`Q+O+!|ahA
zXTMs+=aGPi*INpAb|E5oEg^@Eu)$=YW#>7z^I|1qn)BGa0r}#+<af;>LC^*M3^oVe
z3$BF+tBt~qlP(?FhNv7X3SC<H(XcoTQ$;&Y06Mv1Su-s-UAA*5?QjZRYf}JbAu|sf
z(tSCT%ySPeM<_=K_k>2|AJ{x@5f<igmi9FSaH{Muo-yF3?V6Gg4G&(87Wpop2z|$e
z9Q}-aJ3ag3Kb79+lqi931h~AQ@cBD-4dVh>ywn`%g6Po<xaj{fLn2uEG1zv&l?2zz
z>L(lq)lO?qn|<>i9q)4kGtY@23t1d@b`x}hCGOS8?=i!P_&dc;j>bV-C^&N=e&u0#
zp@?6E9oL_9HeL(xlM{D@1vql7unF2;b>1OG-r^RZq<BX`z4StLN=<+4RYtM}_@lKW
zyUiQ2%BT%En*_H(&?aVPr;tm`^@Wa5-bhU6t;>g;W6FHPV`j%C-_uFY9eY6KWt~QS
zkig~18{jkwI{Fn1-{J}>4C9Xm_@!VVG_HQ#5r#*yx+So@o{dIf4sZ+_0WLR?g7<h7
zT59<V49Z&IA;cy`ZxH)t;QB>SDvw5ngp0DW6$&H1B?>`gF@T~e|7?`RJ9dE++*x5=
zLB1{eur!;(-k}glNJzH?+(+CWM5<X<Omk$|b)n|n(BFoJ+cAK8t84}S^jPMe|8oE2
zs+RLN+8bG~4ip}~cd@#`)Rs%)fTfU4tj8X%?m(B1i;JJWMT^@{^B#y@ndc_bo5bB)
z@uhZ9Ro%3TFe~t>K?h=|bF4Q;9^@@5Dk|5-;I5+A^2zvq{KvfqH(z>5A;&c+C}CnL
z_{tsPYnYy4%>KoeclY<nIq3c?t}N%+%S}FGJNFB!Jitv%H&$wK=u#*PA?}})jjuRT
z>^Tvf;CqOd$&Ut|+c}wtA_Pbc#T1=f{QSKXl-+9Qd4|;t(E+M4VehN;a)NGg*95>u
zFPH2hB;|Y*xhul>C|27goT_l>U7b9Gz~BM{ZQiX_MfdSLIMkV?S@RE9E<>PC;GU_5
zO5@Q;wFyX&PAsl7WnA%h_N7R1-lD#KfTj^-l-x#ud=o#KLcn6Y1nF_-d0(|V&Ckl9
zj_+mvgT4ts02^wwlsX&Of9b+Ut||_!P{e%)7PKT9*vJ3J%<k~X7Cfbk2-40@i|@NO
z4SM)K*^`0`xDa9T(LM<KfwT2ZFX`lf-<zJbE}7X$pO(_Fv$<@5X5|G2*=wz2Dl#y{
z#j$d{Y90FRL>Lu1XT1g?2mna}nmLZ&7#3AbW?JPjBs3bC=}n4pw1P;J6xLu>19rjv
z263nrASN;apT|2Alz#(@NQiIvrsb?nLfK|!(|5AWo92jGp?@I&WCdVH;QzNB)sN0$
zuf0*Qn4qclzE07O&p2>_U~r9`L6}iNH-<P0o7wg)(7Z$|8hq3a6y7E3%hRiniiGZG
zj=?X&4fQ4N!Qg<{6SO4N*<$UJzGEY|S=^Us(6J+!S5hVS4z7e~1N~Z<;_dp0^Pw0|
zAB-gPaYGx}{lABSOx{}mvkFUr1%rD-ydC*%4a@?Af)qf=`1=tIPMBF3^jC%ge>V=u
zPB~IR82<`W;BYW|kpB^{fZyH_?~tyj9U&k_rE*FtnEakcl&x3tLI-};yh>&J%H~VP
z<OV|{sy?C+?*AZJO+iZ6h+bax*1Py&(4weG5$+0{QFSaBREX`TsGkHe!nvZM)Qlvt
z^|pv?v`fv`_&sfA196fk(H1oL+DYEmCt?n5&(Q;Ub_=bEFupfDbykbf7rVE4sDck)
zyl?kySZy`A6*Krl+d(XGydGZR-!*?EVabpp117VjT#FsKC*gbNC=Ky6t0Wdr6=Tys
z`~nV+iH{*h!cqM(u3WDo%e&_W@;k125<m`2zhLeH7pN%O$ss936%_S>mnn!v=vDM1
zQ+EV5$$>b#z@<E$pSj@ch8!=NU)l#I!@M?FlsFo!hhH5ya=x0oH9TGiNXJ5++N1ZQ
zX;UxeOP*C@sa)Bk88NX}?nf(P+e2FKZXLn`sMamUGNpD+H^XB}M~v7kWK)!2d?}^4
zxVS#72Tt8y4JY$*`xOoP^FJhPxp7~l&~rHEL?&p-vD-c>0!S9gDT_)eyHGK+<y#Z0
z-jB_#(f}Dk(+!NhXH>xgtRHjI?^6+(!a9M$osR*=`LRl3kWq9koC<I1M}=EqW21K3
zUEgW7=4)TUfGS^Bf#BVqX){2l84RjZARuJN<F@JgmzS4IZlq!eG%;$Z1eU8QoV=mi
z+Gujb;jsh*vwTjx&KK)ksH$k&buO`8_f;W6!|d{%w+AN{t`8~7NF^d<xo?D=Hn{Bo
zcQzPui^4y3ptFEcl`i>mCh**1pLw_1>?SvQy4+%enMHMis_|!eS-^7h^ECk9#X1!4
z43fYm^$dSQ0qj9!U|?XQ+Y7|!9x0#5Bj9GH*y4UdJiFw};`mMjzFf4$<1`Q8YZIts
zQtvIkx&Wh2PYKpV{56P_XO2v{N|mBiee#%Gx8C;s%umBaBD-nfrDnHN#y-^5QzZ=l
z$HbS#W{tA#-QvEPEeA`Bu{4U=9fqtt&f|ssnIl48x5+SrMq@z^t$4v7YxvV;a%D!I
zS?=Els+4noN$SFl?uJW&awmiYGl&mo9Eg2j6$ykG&$(;njC>?6whEyHJ3LOa=IgTO
zRz1ZO7aQypGWp!!nFOES7#%+F7B;l%>iRx;pApNpx`v;ub}-#bl!WWEeKuEABJ6m!
zfNQ&Za&g@o7m>*`4RgP;9V(_FAqhgjVf;z)l?-@-34v#}5>lOf-xo^tl*V!B(s8Wo
zNQZ5ID;%R6;@7W^*IdZ3XywzDW@O*Aw1A6gt6JB4S?|0mMPkeOl327)Z9cdC%dTzS
z*Ak}hysk<n5%lu_mZ-u}m(Yo^QfD(K9{<hpJP#qA{QOo@y#IWnk7%m6!R^xGxygOw
zN0y+m%h?)uY6^#koK)FSi^o3Y89=(E&+s^`RlSF7X#B*4ezVrpck2?yfP^R~99CLs
z`qZqOLPm}k8@9fH0MGJ>258$t_0oUf;m*v4JsJy#642`EG`F11hXyE{=jXL$Wo7du
zkq;&?Vgy8A@r4wZR{d`cE*LZ;KTI!kr!R2)P)i)dx_%Xkd0$3RC`9x%qM+K^Do0=W
zU722sr22N9^-SJ}p087*go_kQz)?#pRrhU*M0+Bfn;lLKN5W5p8Y_h66g_`~`uwWg
z@M~fitxf7SLlJSd*eh*ycxFp<)S?#(GO{kLt#tVCl7M@!Hi_s7P~wjOR~qy@Pijs@
z;wWDBTJs>}+sF8@vuIMw;2XBoRHK^}3bUf$kB=CJ{AyVC7>2gmb0O|4N9bh)o_>$`
zT6A;FH=gEpxNkY_grI`qZ(ZX)f~P}vdv=z?Q}c0RBjAO^;kuFh$LZ_+qXT?<z^fpw
zat;`SPJKrE;|r{JwT_F9E}YsUGJR^Djpmfzva1|qe387`5NaqrG)@OV_WPagBQ)3@
z$BprLT~p>?4I7oC_h~AihS!uV4pX{p-w^<jA|8qu*9@H?uL&h+)|%mQx>U`XYBm2O
zlMXAl#|gc_?Gc;m!1-qHpsMH;RdzvXfI_lN^4zVL+NzQ)TcvXk!guv1R=?Zda0p09
z1*K|~@kLo&1?)CE@>LgvF6!zD=t!==z!2ZllUMG~mzQnL0OV}H%wq*>JzuUkdS91F
zyT+S?LAOyD>Z^{+j;wc*f8){6OcuOQK)}K63v7axUG$c>-Jd+Y@6t+M422G(V@bSe
zau_FoZ`P6O9O>g)6Pcw5OAsc0goDyT&Ha+u%Xeuvka=1yb~qbv@T^r~s1T2N`h_Xi
z(9@Ncmp2M@s<OuMxVIN?#d%){pMe6)#Kd%Q!zg}!?z9hQr}vJLkEt+&$8Vwj6Duws
zA7G?B5^gwd_Mq{HDC&!G|MbEB&Eh8ZvtY9Hanfo!w6$lLbWVF_J&F|@V_E7oxYn(l
zvXOKJVo0K&QERV9%=$M+*a(e=e{}ke*1qrycWS^H({yR*qF?`;=b<MCTofWPDg566
z>xcz}RQ*B<71X~C{SZJyH5h5!zad$R1gxv`|G+NpG)1w6#nH<}I*X-MXf=4hUHm}B
z?FtMOfLqdB?fCMwO&A_$^Ej4&5-NxuI7MPPW>U0|l$}Nj^f>CV7md3rpqnNUt#Wc+
z7dK^hSjx3hLA&E!kZ@1LeJQFlA=L{r4iX$U9ymP(x9-;*{y&O2jYePs$^pO#=5B3m
z*^YtU?+`&Obu?x>1(=#(!axxKzyVUq7At{f5e}2?L@E>krwE^`{G(o0KO9tJN7d(u
zN6<fegoBBmC8buXM?XWQmT7QU9h~KleGkVBe&Vt8YAoD20XR>`T5J)o>O?RH_U;Rj
zdQvG18mPuqlYF}75HcXmw)UkgnDq_u0;@0z;H$ogt;I6@#ZTO%03?c@r=`Y#(<V`F
z_w_oME{#uAzB#|SxhX=Y7^#R#rqzf*_<@``E1$*hRiaubI~&{u0v^0{cwy##i?#ky
z4!EN~Eip*1T=om{*9UWB^@AJ^6TyP_uEIqZHcO50p$@Ag+e}*J83XLz*9Qt{J~y)5
z48r@9g;vXek~uW{YPmhAQER%(XnlQDlg0%N1@+EFyZr+NfRjS8>Gj3=@6%aBV33P4
zTimCfpb;rDar7EEvFMlW%NA>MS%jW5PR@!TF8E;lpY4JjQ#pL<ONkvJgY-o@uQbx>
zzDLUj2iifkKiYHG`99D*?EOZij!DOl!eyDPhpHjrRJt?mi<(lJFQPo5Q7fKkIc<}=
zJz1gP(qI~id^nf7I6u#2>bMJT_V7{Tv_m0!O59QCczuDzqE(lEqEg6^2GRiq741ZM
zw{wa_K1VDE<5gsY{GNf{H+v#;<pzZn>b!s?G7)TcH~&+|#rtA_ij6?&>o=hQ{|Ap}
z80+a0Gy%`Ez@=$msJAqMC&k%jD1U_$qY)RR<mBX3Yro99(BwjeMXxM8`BOPJZwdL8
zbKRrq(EqfJsQdft%#XP*e#OmGL>D8<`IV-<PvR|PH{-Lf^>3MjGNwh0DEuGrHf`OH
z4tlufnN=2^lUV{j(RZPtp;J=~dJ)MnX~t5~coHu!FS^RlRf?8`X+jP}3aR`$r%4Y5
z3A&VP140Md39(w@;!sfpJi$Ovl?6~rkr*s0x>AYloi-!2bd@&UOUKg%n?a*vP?q-r
zO+NelWZmH*>wUFyrQKoxDW>Pvh#XVv*@v{s&nUye9N0exjLSlM_kUD$VCM#UF)xm0
z@?oq#zw$W6)k21SWRP@1JViPKJlgHaa{g#0?*<K)*dF&-BH-n>1}&rtYl6X)%qm(R
zXrpj>BJjAZM877}Cz%NdT*ifkh5gJ%C44|;P&rveB9!%-F}vO`&MuL$=BZP`;75F?
zJO6#=`^0WGat>Ru(vOzCtT>cak=FvK&qK)-;~yaf3r(%_h*-DqpC9}TIZ{_z-Qr>V
z?<ovAoI=_aoA?5*CZzWFi}enmp?^2u9Q=uIf7YZ*z-`9Q61rWgVQs>1KEMA0^3Q?3
z+y$^{8)dM<GYqojW^WWaJvq5}G(E8uB`s?lLIIpy8a_xanI^v$Y7QX9%W{SF_RFLz
zGnkMrpQ*01r&WWJy<4v;I*LjgU=0h~{T|VnzS0{sC%h#SR9-Xgis4|}yl;yhtgSv?
zAIzv)tlTo|TX_zremz)(9?7!(jtgSL5ns}oVsV+Zjek9Yg@h;<?);5K8^jwZtoY7y
zww34HfF2Rtw_zYYGk1TkqGCy-Mo)_)wR)ZJus>g_)a{USy3#~!p@vFyNr!sA<|8U0
zkMpM&oz_o)XCTvs@kqQGVseZ1IH=I6kyL+zM!-(s{(0g5Sk|!j^8C1^)-453*en1`
zr}Z;uJ_UD!?`e9cT$iZQf<Ba{gp<hs>71&%+ffdl;`QmWfm}<30lzX_MHga3U%rug
zT|2~S`@(!gCke@ZrM0xd<^I0IjAr?BZ^Nor*xe&mTB@KQZ=LOZt>ejZ3r=WQ=!8SZ
z3++PU4I%G1?CEXsW?zh&v2jkLORJM<-{dI<<-0iw;v6V|XK9}QB$g3;eL}=k7nB~o
z|G4=X*>$ZGoF-&tVi+D#(w5hi85;tdK7|S5ORA+K40tgq5Tr`e5JTO_AzB*(lhNi|
zFGpLZTa-Y$`6tR8E)UZ*#|ehs`{oa4`7z=>BN)8t{9a2}FAJFmr3u_C)@AJ$Bk!(N
ziuE2)kI%LSF!C$_PL`iNteC}J$}=>Pplpmu9FLu~CU!WDZP(v;{+d6L-#1Pcg@<kf
zJAVcvF>?1K2HMF0ITYfiB_l;z;w$z{@W7`rAHvZr0XlmC@3Jf`R?1jW01kx4|4rm3
zL&P2~^1UanDt;-|t)q3iN4jOOT==>oo31>VlMy=23V{f-&ruo*2?xDT5#~553ML0X
zI;l!sEQXOH6p)orQQthpWiI$~XUcJZRE#~6uF}?=%W9H_@No|t3yT5|<~MS1Zf-8+
z%;o3vBd1aGl!6<ITDwKXxQ`+hCmB4|;Z;?WX_go^Vs&0hY#QIya}P^vsgFE%j^2Oh
zl1i`Dx%{=$zy90VOeA0BH_XE;kOlfG87M%fRZefx$p6!?$?+xkvnao+e>)*(WNV^D
zVFmguciE>;P?NQoWqKVYO6kv%k#}9p*3F|j-0y<G(t=&jMTvLcMyY85vCxeeLd06k
zWP8ondnfhd-mTC}LY$p4J~ZIUPEM+)9UtA%kqIBlCJ3ua&yMQ-pF7a)TbnN#G=Jir
zlljLN%g-p4>};I#!R!pD()r*Hhsqp}`Vha|OEpN5)`1pv^w2Od#f?x1sI6W75poU>
zE9A!Q7V8H-3ux|gSxu@x!6My7K0Q56n?})5M4CLrQ!2!HD=4S4@ni-;!lKy-VKdEc
zk7bi`KJ7wzs*%}%{9nv}9%bIC30!yn>H@N4<j(++m5Hz89FDj(s$8$Yy}-aeDtd2d
z$Sj|InDn0Pm&o9xsKo{u3LH1>TeMzarB42hu{PpxxieA>nl_CvA52Ihe5|Ufq8t)%
zSkbp$xRR-3d;xJNr{DZkkVKs}>#;%x-7uU}3avzq9qy|YE9PGAjuj7VzJ!Fu>ut*>
zmPV)+&LK^du1-N|qAWOn){I`LvmPoEUSY~jO~67Ok@ZVJc&S%iMaARSZev@cqAj?=
z_q`l>_nhfDMszyxS@b60K2d9nF(8Fj2><t$M=5f|lbLwsB()>&&kfMUwbsMPmj@(d
zMbB{ag65iCc>jWhBb{PJY6i7*6dVR!^4ubYOxj=YO#5dqQAYkRI(}{AnY~f?OiCh_
z_=L!D-82A8d=FtS*bd$dt;7bth6E8UOWf!UCvk+-Q0kd`jb9q&ZAGP<j?RIR3d%LT
z<`LRRQTZK1WI;}(be6=4Ry3M@+J4WNep*oWeg)JSbDPQIvS6m{zpycwIF#2u2azJ1
z?RDl1$%JLrefBkB7~Z(G)$#Gh&d>R$0L#+5(p$%G@qy@twkN+)RIxD0@ZrxIvAn2F
z=M)Y$&hM-kqrw_sOHI2_Ac(&eLfzSTzfWC4W*f6?jf8{FK(#@cB*S!^7q9dB_BxV^
zK^0wm&YCEA*<S*r?b0z2=Esz&ja$eNq4foE-#LmyXv;cwYl@`)6}yPT0C?9=a@LOx
z^`Dmi!bbSN4bEQx0g3=3#+EPy?6i7U!I7Ex+cE(EoL)n~!KKK6CuBkwYI{Hv0+2qZ
zzdE;8b10d?K*$F^65a{{2V@682SJ&Ha+WQ{w;aJNm)8|PTJ3Q@y-Nv;rgX4duKx{X
zW_FhDZEh94AmH3|Rg2b7jTyYZxB$OpJ8@V#1>h(eJRlIh;Yqc6^tIhvvKXSg4+m52
zFW?lVB@XAdBcRl6B8b-Fz+}`MntlPhlSqzG<F&}L&#a4~V5qaWmB+!@;lW^V+-Pq|
zTE#TC<gZv~>;RnTkpk|1$Y0qH0|2sX;!&Y_z}ElhfNcOCt>iK(K>b^srYH`OTMQ2D
z2!y{4H-Mbdx$-Gi@L%YQ20ToP)7sRue;el00Z8tHA^Gt4m}}wy>iGY{Nt{s=YLA9T
zeEruJfLi8qa>MPhg9#TBsD=(#PPCD*Et&gPd)KK6Q9rtz)T=~KF~7k3<zHhlz8MRV
zgYrAXUt`q+#KD+Oq#O2cc^(ew+PbKlh=w!C8<%u8DN`|jV|bMyz=k)bUlVGAgu6%2
zZ2O^g{uzwTca^uuXi4Y<#bqk!|58DxH-Os;uMGAtStNM7`HC5o|Nkxiv9ja;F?$g4
z7(!rzLFs?%Y&pHoL8p+D9r<AT!Sa_wN3$^lgI1|^o%M9nkQ`>a9e$Z^-K6uH?U_Wn
z8KjxnIy&%(G>Wt3p{G)uSu~umf0&Lze+J-Lg5x=<-<?Q+ZjHB_MSOy1w%-f17Y;4?
zE?2pc2SS(e&61ZoPa{H|-7`ccpjQ+<xNK>bWfcngJ*s5#=Aw|`&M#0xs;5`yTyFNG
zvAguTrr#3-*$nkJ|2Ul_(o`KPoW<WPw+7IM?p<&S+3`pn7wSe?tn`b3rwPgF@7rpe
zg|W-AHb3C`nVG*K6vDCp$?Rymtf^D5p7~DUOA8CT*is@5f^trHbDupi!-S!o6J$~)
zzJFL<@6JeQCL4Z#9;*7#BU{V%fvLx^Rh;D<zSd;Qf>!fq<6W74TasdSi}2SM9a4Wl
zQlF%&Xs7hYVbsr2n<(B|njX7kYL)Iw4A2)P&Ex@zWe1!WLZ$Ns1Qq<Lczyiv5j^yA
zKH!YGZ7#p~Qxq>+8QsthgK9a=l&ePtP?M*cbXj%2;eU3fVtv(57B`CT;2!VV_>@7E
zoOl}e2Z?}Pdnp2oj`C*4<`v85wB4`A{<wHZj%g}<Z%P%%g59G_G@lxaPD4JP3Rb($
zg3w7P6&#dYq08{={p0aMjnc+X?Ka7SY6f4}M0uUGs;!UVL3Nz#z6z-i$avB^y8PF*
zp0`IcdPgohBRD?ozW0{vt6vLImXzF&B66y?2UBGS`=gR|8yOlE<{kN}p9_<X(0q;;
z+$<049j$CEx+Cjc8D`W-H({Y{0cofc#`DX8E|mRpv&2-9e5`CD!w>xV<T8B;pe&>?
zB?Zy-{=)pbVLs*g)(B;eI2eGEvWWsV;G4@fyuH0A$4!2Bk4?s8XA3E0@JlSG;v}(q
zeYjuCkJ%5!(VMz3A0i*&nns7k*X(g2l1f-pot{hPwslsGlh4ukp-IMg=`tpybaHaS
zZZ)V*gZP*&=oazx^lY^fERn$FU`VT5TT<|QyTfVob3&a5Xt{d~W9Qyw_l?BFef0Is
zm^U^3&||+J2Ayow8<lJxe>hh@5sJ8LzTe5LI1pF3w=<G1=~W$&_+4YaJAAX&{ur-R
z?fC)uEpd@h(xYzBv_e8s_oa>p7z)y;a0($gB&4B)*vms}nlJZD?S6WB%Z<4;Qc_Z1
z{eFQk_QQLl3KiloADu-+YR&#Q|IqRD!urPR9AKP(T?`~4zC0_<NNMv`0ktR(9?QBi
zs|_U;cYpG;;+Xw~g@HgAXb;TOfZEvH?9ps=Gy!S^V|-_zdVEknqr4aW{TT(VBaMUv
zhDCZdoenB7F+7CI$Ih4w!OYmJLJIZ$R*Zy%iet|OyXk|`#*k=dZK;|Wsac|+67E=u
zn>VMaKLLf*%l*TTF4pjD9+%IY4hz&L?d?4!GE-FBzFYmEy|B{`vX#Zoc$-a1h3?D%
zfTD=a1k=gr{9z&{4y1g!hZUHt6r`Y}lx@^9@|QWf+#Q+eWAm7NeMapEiVdSde3HY&
zwVH4O%Xz6Pj-xf!+Yypp&Vhi~J(cxEKz4pWNvqs2mKzzLgEeCDII5ieCONxjq>|{!
zc#uf|DUww>Y#X2!zf2FYmouM%lkX8+i;tmj|61%SC&|P=7ePx4LvLKgj9CIDs~1`P
z(J(yAmnxM~DMMOBHoxwp(x*nij`ayxP6l6r=s#zzG~Fu+k=FbGln<%bSRl)c{Qe#C
za=Qri;1p>eyb(U`c(GdTRU;4cbOoNi!=T$gv7~g5fYmLBzr|&*&E(#0x+P;i)r<V$
z)xR6AX{y8hnD+U0Rnut`G>h)o$Tu+1?NMT@{mo<qEWM)rMRHJYd{OU6Bf&z1ZQ%lD
zwX0^`vp$8`&12X?Eh6yOZn5e~!F@(lDZkERmDwMJy3~rVOLnkO3EwJ1RTHWB=_5yJ
z!M`Z@QwZaxP5b}kkU@p~&0f8cQOAu+#GeDCXuc@pfN-b=W|bG->kU)a4a6=siG+N<
znj6+}-IFe`By;|rRX+{wl=(F<%moXl5E@8jtPOkz3Wwxier^bQvFeV-&p<tiy!t;x
zdKtGDP4A?YYP4{kFW1#ef`D2!!?}vXUt4M(JD({jB?3$IbsECUl62)PTzJl_2|7T6
z8J+@<J+pS*?Plj6cyu4u;Xl24L2j=F8L5hj21D&uSLbxK?Eg7~vKTod^!1L?#PPon
zX3N+G_$~X70e&wfXhiLw*PgW|ka)KpuPTe~$Jb7^7;@VR$9-P9A3CklY%myv<fIrn
ze6#K&gU?lA5y@LWb&8_hl5sAD(WmmsVs!SZ!DHJ#JwtAlJU<n(W5^}b=h|EA>>qoq
z6mIzYU*+mLAFMXS%y?T{t-(R0l7K~tSd@@N5239^8B3AI#JY0{d9DdBlv8?QBY2()
zp9=b!kr~}KtR{_kf5rfzF0}GQgOs-T&Rsr^A%NP`cV$92Q1t3U2X<ITrSy1942n_C
zcbbU=d}QuI5na>&+?*_n;ix6C&zk~?qwdv(v59;saySS5Esj$ZLOxoCKBWf=2%GbY
z5&=xxBKdSm^O@<Hqz#2vn>5d`*)lo&X$$F<Zw)@Df^sU|OuP>T1o!Y?{7*Y7Ze&`G
zITXDiv`vl66(-|3PkW3n2W=`QYWLa9*{By$k5<QEb!+SeLhV**o<ozJNMnewJY0mr
zP>2%XSNi(GlFGDcl=yK!Z;zzp`x7wuh>n&Dpx8dmw4-s(9?%4xK|-XG1Cn_B+Pe`B
zxHCdZ{H#{5>KK)fSGi2S$@9&=1m$nyr>!#vls+r9w-5LZsz5G|W<Bo2UZ1RU2n8_G
zNWwro`$wLOWj>{gt}YF;c;k^Yl5Px$)Awt9%8D_Uz+{ble}+slM%{wNKVu%#X*nhd
zmDP^E$BZ{GA&=A7Gg@YspjDmrr@<fAGMhA|Q*A!YyhYJtH;=a<>vx|~A2kmK4>wzL
ztE{Gqit=!q%3g1c-ZI0g(FZd&$~8L-d$S{Yk|wHp++#ukuVRCPa;(`Xck&G3ONxZ@
zN4k$G7wp@~L@-4Q-Rcje%aSp8G-<g0q&YJ+V+YwpYi%e_RaMok>bZILOcD)TMoNSN
zQJF&>?jzPt4&#-vNAM<JXNy{0f9dAu9>BlHCiOz??*sW!uTQBd!2=1xekgD*&}v{9
znHVLyFy^~{8i=kLG3pP+igpgCtY@YlD5m*P@}@s`b;~7_w|wz?EOp&yoo-jKiBRLa
z_i|pN!kM(uekRDvii(MdWY<kw3;+1sJJKCLJWgVS50A7jldkcn%bM#^r?82cO1*$8
zGxF2=Hl!hXQ^BXAX&)r|LN%a}HWjX}#YxVDZ6g^2Nj8~=>@;v~B;q{_!RdE&M&#t;
z+Pn4xv`JanJ+tGG()L7*>*>MIrlV+ZWvgFEQTN$3QW>CQvUetd)Pc_TFUgxw)oRSl
z8aiTK#&UzvZffhS8@(}yek_jP#G4AB-mQ$F{!=6K8S01u*Z4A*#4aO57zS=QQy~3r
zqDQS*$(%T8JEyh6WIF=OT5ZMZ!RpF#C}<t=jd{4gfd&-iShEx2v*j}r9YYm=`iZlN
zZu&7W_&1^#hy^k4YYF|X_1}3!TyOb|bX|Nm=)XjT4gjRu;7|_#k`9G8<+x~8(%^58
zP6U9lXo7X&|I42-fX_{(bt+nadsK=7R0vD>?C->+pe1pzQ<i>(vZ!WV@->YrNUWa^
zyxR<e*);AoxY${5RM9xI6S6tpGsT`DRk9(Psgh_(L{!*xjTkxT!xjO!$7%J};s<mu
zt&^XEdKp~12*DY^spv-o_?3vY{tWlGX%ri-B~nIiqOxQQ`kB=gN0X0dT)LFMEH8WX
zNv|DQbF$eSe=IkUykR6>%ZlND0u}nstdQNpdVJ|ilRIqY^X<uHalE4x1wWPnc=ggH
zHhDv9=w5Fx*ZxT;@;ihhcmk^sVSCaXduC7h^{UW5Tp}CKVJBBeKpN14+peJlUr}32
znoEyEQ3@0`)|!+ifO2L5ryvGS?H70qPqaNig1r%QecdU585zrdw1-KkM`;-705j|#
zf$|KWTrO4}+_C7R3<8M%vLJQlGJFBQU!VZAJ5>}CFwqO+8%r-wmV0n7vDU4+I?-RV
zM*?h}c?TRHZi_pJsLfjqK)gD-D2g@C+iUa+7~w#=s*w^HnDRg6C5adqxM%k`n5uN$
zMR>k9+rrj!A`Oo~p+%<P`?L3LFFWa+h2j0cK=eX=51S@=@!$v%fGMBND?x>$hB#jI
z$N{Q$C-R^X_g30`F!f2KqXU84^BV`0ICY7RUiN(Mv(MG;s6RwhP)!5zVD>STHU-G-
z0yFB#iJef$?K7#8_>_`q-~Le5$5)Xwwt(D5Cf!!?rTggTwFzoorw4jF<W-Y`S<ub$
zt?SjD%sD>ai<Td+uQT-pZk_jyP8)vT@oQJuhu!VZ0bF)To&*8iB@-L%?$44Jm$$`9
zW3_o-o?*M~q`HZ`YaaESPb!{f9ac!sqs0k}PbDKUJzi2<jM1D@Z;80cU*xoYlA^pl
zTW8;dt#fml(ckIIxPW!7ndogIK}||@vSm|wd3ui5jCBY@3ch^V8BUY2Td1E>Y6V34
zg7IcItE-Y&b|9WvUoW{#|4=g0ZTi5|w%UN|wKF1jiSx|hRcAkyWaw2!$Dr5zNzk_g
zBrs7>rSkq_cTDNNt@X+ts3@QWfk0KSZDut0_xDp&Ab(*X^5rQSH1}VKytcRPA0*P%
zQhnfRn<`8H#Gsu+{Fb;H#bGp*1xmq-V+8k<YAi-`k`4Vso7)O8@VK9ObKR^C5(ciG
z&rH+{tu;2D;ol|~@<Nn`LPQ}V!ur2Zu>Vj4RVA!VkA(f&B@YTR@|6r=(w7D>WMN;H
zrzkwEoz-ALxN5=s0EPV37cRq5p{G03i0~$1P}{1}5l|>@)pJm%&Pe@**Zn}giiPFM
z<kf!zz(h(@A4ig0<b(`mwW$q?kgiYei5QHU6R?M~rNU4M3xEj;duu_E2?+_}Z)rG}
zU6g#Yi|rw)Lb>Fktkd=~s6?#l>9c;*7?nqqOv?*#gFi|c+>D~gQoca_h4sSE_Y-qQ
z?+YOj-;#Q*W^1xTKxje3gH%&rgMrv5epj#Hr$*9~!R;@q&}hz1mnq;P89=1o&Y#Ki
zJnp}BW^!&by@!TCuLY1y!7@~Qq8ny~w*2sT-8wg$^u?D)rBgneUL@AqLjfekgHN9$
z82I`1PraY!S!fGCL63Cz^ja6Yu0MGV?xrd^^uYs8^AIDjxAS@tm!lRV$a?0-5Fsy>
z(RX#3h?p3*)G2`Ul*p$Fw`Fs}gSab=Hj-(t9aYOU%bEoVviX7Jq-+9psmIWdB<6Vn
zUQgv{fYn$6_|}<7zYxKo&0E8Wk_#g{diGP?ck6Ir3{vfocR07oxZk<~&_HY)2gZcM
zZg(Cj(;)_X)BK4O91k*n1X1c;rQ+HnNb(>V^7~wg3_h1F^ZRg(8}p&W{1aft6NPM2
zLAY9xs<U&o{E3ZL#q49%8S}~9YUE_2(<Y3Y*S&f8T#JLyVDSw>Wt00c9tEXg9P+nT
z@-81N&2k+nrq+4gQ==NqGWJuk#=ILM{U+a3$>^7G2*{zql`ji!qE^2<US;{80G&#k
z@*N0Aj2^6jvz!#uv5gqFz}{e9gg6swG+RgtpVL7j{s?!W<s)j;-3wnl%WE2MXcCj2
ztP#pXM7`ar%=RF(O2eE{d?m)~QwUIf6$*p$lE&$P7(cMWjJDF*zs_Sgw&F*vb4=J6
z@Y)WwpSPmcnU2wfBou?sl#WbQdNnVf$}eLlf2F1*Y>U&fJ_evEbO+X@t5r_C%OUNJ
z?XRGAe0yB+fKfa|pn??K6ry^pQ<&S4A~(?HU}qCQkZ!ec#KZ;tKX79AciqJ>X3Lh1
z3i|QEudp#PJ-K4Zk+klZ^O^64iNFM={1sHk>~f<H3x>2$463!%2C~x97)e|h7v$L~
zDJi`%m&OW^Ofo5~5`KRBz1N3%q0+}=>BwGWc{IPz@Ajen$H0+*5Y!8A8ADy<!S-SO
zhF9Tt=zbzwR;ozk-|`a3<jCv`Ko3VgV(I5r>IMTB0M{HTo;%BIr^yZ6e5;guQ7G&=
zABKk}5ImoxP@Cu;$xt?C$od1d4h}(_L-oxtNEp;5qga`+Mvff%ffogQrSo=JZNxlt
z)k!uq?w<mN*>^y|=OBocWhCwVehXwQT~wk}G~UWe0SQyY-r8<@1`2%TL;lP1`OkKE
zZbt|pOwmHH_7+5P=_D3qP6DO3d_fY`qatgH8zyx$%uHT)Lb4uAwvN%F`3ZpYQIrbo
zOYzaln^u$XAZ$Mx$L03L$PK(9ciik}_jcUH+x~GwR10$h6;&%j%!Q%606}C*wA7@?
zzr)>p{wBjt41Ku>3S5R;;%yIX4bGwh!gPu86itGwC&Y5pqNMBC6`8*~9UM9UFB}CR
zWQmOxf)uG6C2vnCF=BXhOpbUwd@}f4Xz2#OunQ9}!k@V`>X?*&3Q!P?YNzyQSWKw!
zcA!1mQ=-*r_$iHN1(;;Z8Ul6tqKjohwpzK<R6+B--mbmeCRGx8_4mYY(NpM+9?$Fs
zx^tQ3QX_5=*Fwe6QNba?jO325FNE*)JR{eudfy{)f_TN~awGqU25R`~6z&WqL6H4Z
zGFu4=Zi#dRh9&c_$X@eSPx6x?%=up#{@>a?_`kaGs4Re<YU&9Fk^eUQi|EMzRo&@;
zus*urOwIML>K+8}Za!g&xHl;ER*L-dO?9^!%3b=~U<~^v{r|sn5)D%r)JE+PJrv}V
z>;0yRMmTa<Z&*Wh45;SPMM&EAAL}?H^?TY6WZ&OW_nO2c4<k$&`)K4V6VgE>>hJ%;
zqmOs_CxCU04X9ml*?}}0F9xJi)!mO-R*79HO;p@aAxl%UC8h8X0^T=qGGD1IUxaWl
zq|}NOxX@T#6#3jwb2$!Y(<3veVookxJUqDePidpQmX-==Pl*29Cf@!EMV#s$P}|$q
zGE@j*p&E=YddG9r`D<dUbZYN+j9}55Tv~T9<5DYLvpbq^;B%v5{HOZ;IDy{3{|mrs
z5SV9tIGOY|i*)njNZ0iB-1nIp)!p0ay6pGAj~aghr4+grd3+KCKq_QHp1Pn7uCY*l
zl*?hI0HZG^J}j*@%jd-l0lqYmLMMq%YxF1wpU^KZ%j<#0d!1*l-R1r|V6!mm`SEHL
zy=Y&?Y<R5W9ipL76j36jr(yz?0*Ukdde3ZGA=D}=2q=IIoveSY-?0q0o`Wy!>=dR|
zFHuf&j>LaN+#X3!mW+I0iOS}Hm7B}1YutGPrbJPgmk|)yGJctA5o30IpcIF$4(^Qo
z9kw6)`I?5`Hl2JfKl#Kyc;;!Mcq~Hiwqd1cYL{{Rlh6z1BTz;h?l+U>hKZ3aEESWP
zQ><5y*<ntn6%Nwl7ZBLa*aT8m>2~XUdj+z$*%WeC5wcQjY!)L$n-j(2E?s@ku&6^`
z6@q@`(mfH0mLIzfBicM=E|w~-*nn~${jc^njc$642_hJtFerHRH!Ask(iyXM3#!xM
zmTj|JG2!u7RvP8{I=?;xL1LZHU1kN4h*edLj0TgLKn!|Sac@P`jlM?@4~OW<&yAyx
z>V%D1M!r1K*_7FpwCRWaX?W4MO{z9FpHKU_Pa<Y)$c1(^s?B6Z77xz<>}C~jZJ9mT
zEU^1&%Wa=CXv$xFoo~oSArhpu-5oW`iLp8P6dL0Piz1_c0ve`$80Oh$ThdID2O<&q
z%1PTJIWAM3V`i~JwiQhp9DnM_<;+~OED^xT$zxE3UOsU;EK8DDSDTuaDhywT9B|mk
zrY*fT8I`X#>O}LoOMFXCPOimgGZ(VAIpO=={%CkH^<cu%lRa`!_bRK~_IQKE_xg0-
zcj|h3VgSs{Yg-vv2(LSg+0^=}u5z()QHd?g<|~jL6O~+j;dK9f=2xqK2n>3AkD8L)
zcvhSDSHIELdtLQp9#Lk;)FN>STaq=Pikgtmtq9Nhn<+*TDRHH2vv34LjdUz&0#HJA
zaf|wm`33yt11c~n8kl#e2-Hawf@kl;r0m60?LRfSphpMXWxU46*?(OuRhw`<|Ipga
zbh2BFit|ocbeRLIXed0~+3cFehQ<4K7CC``Em7lO_J63-g&!e+$*U<_*MmQJXS~zv
zkGtDnRs%}aOI5pr!PvO5u_OSQjriu(Ime!KtoUH~x?H)6G!YRY&t-RXP&m~{;Ylcx
zKmr+$Gmq{&JzWx0F~IOkWM`~Zvmb9yi>G;HHeeIzb1SGStZKd+9em%oD0mK1wdpv^
zJ5j7pLFeUG!Zv#=8-Y2Oy^?G=dALhb)FvDm22|e2U>#Z|L#(VzI-r8y>w9%$>2?fN
zItP_aJYO--RXPc}$C;MV)M<cX9xz3HJdNYW{+-j1kCZ>5P;|Lrlc@P1)MN#QKUJ1v
z;}WFceSgVPDMS5M>bGyicE7ADn-V^Jj7qKJWSK*4)c~2hFMVF}xWjA41u^-BLf3Be
zJd1x>YV*OdTdEW}xEpObg<nL(VZ==gTa2uTpHI>Dt84nHuQ-cWAO*McWwu-hMXlP5
zX2ZK?ZKY*QOr$_|=DX`gx07yzJ2C|oh00&Wyx?%ILhg_K>a4+U-w_v`{QP_#o@7>_
zlJq-|O6oBBTKH~2hr+jT>-%c+|BJS_4vJ$7`v!x%2ZBS8;O=e-?(PzTI|O$NL<sH#
z32wn10t5^0?(S~E_sqSy?_2flKU-V7sjgHtFg-op)8{<T&km<|-ewbbhtJmFH;KUv
zTY5!cp|$n8K6pupD7-D8H6?lS1pL{v9}V{wKJwS__#;f@yDK5pd7O$sD5;77Ox-%t
zn<Avx<MhAacr+`Qg!qQ#uEko0f4KWOo)Xrv6>V_>FYh;?KrXnPdSu5s3lX{PQK>e5
z6hxZ;X-bn#<vHS@-O4;!YVes}3-LQpcsEc^K!YoizBi4Q+YaOE{wSE`@{J~Uqcn7V
z-CM{j+_61K`X7wFQPJkt{^Ezcc_IU=0~V3bY5+7xZ5c=xdHjR3=6+P7IGznxtxn2>
zI$a@~i(C!#-A-fbM=7m^lyy%DgQ;%<He}dTkX(h9e0$VKIPDMTYodFrC6M>UjQqp|
zb#ytB2VFKlZH~QiDmt8Lz8lg5_fp4ep2}5Z<+0a%ygTCk)&RlU$NSWmMxXVP+0AxF
zvVtd+m?%%F`htcJ_3Ap0D|*N%j}jN8k_b}&gX?jdu3Qwm%*N|wOb2_{fHR^edKiHG
zAU%L8eMhGp32_AJ{+mE;z7UpoTxM*>5B(O38&2DaaL&@TDW=peySa%%)hVb9A4WH=
z+d$(L+0u`V?^4=oY_xV`8t2V$o~tV!sg9@4Jo?`4sP`F2Xxf!GxgDmw%gBK*^}aq*
zA>~S*F42)#@NhJHxz)qg2=1M|PO3?-?OeSW?DL=N+fBS*J2uVLvfjc0gpobJ*lva)
zg?^A>@965HP!0PE2uawX?s=`L7S*>Ot(71AI;HuY_BcVaEBQ<Nmd;2laXVcI3;Rnb
zGB*_U``{|=2_+A0{BIhuXsP$snTnBM2<PtYbsxi7pdCPS)%uM?WaBbZE}B3(UKeS<
z`?2Hk>>S^!>Z0?rpjVumEk<HyTHUL*TpD}xbIwFJaP93xJji7#xevZ#2PH3;#`R{@
z*c}SIkMp~HyU%?wvmP0%C3}~1eUyRI>a8`M0Ee7YCNwZPI`R;w+x@mf7lylpWMi{}
zx?fXyo7rFo5JmCjnd8p5s(uZ<KpFzUrBbLdaS7f;3XLfreb*5hc1N`Ra}<u|@M-J{
zAw0M}60f_hcPEZ!wS<*MNm7ozBydH5;xOa5n^WwUs&JG0VO-ONSa55Mv5Wa|OtxE?
zm#o6AZi>%A?jsr+3T+{pk}Yn3Vm8L@HI7*DWTg@MSZ)S?NtV#7SCS?13<&)dnuq+(
z&1oL9tV!vu(b>5D{&YmU@`sLf*zu$VtpiEB9Pb(Vj%YIc%yVQ+>VQ=5cXq7n#47=b
zaUi8vH}Za+hV13NpXgA{>hq#MQvb{^WTIO)y|6>CD!)!a{t`yc>O2<1RvQObc|j|o
zeIRtZ>AhN>`tI0TGxetZqB_2d{nif=wP~hfm(`P!8`|uIpLkE_?kVqTJb<S$_tXU!
z0iZ}@F$G}&t0HmPjp>RRiZu0$$>!E(*7+GUSJ*C;{oy#>!!C}8_0%+~xi=ysd&|Wx
zk!v}=@?pDTo$*zxkf8q2t*gy<-*B3ENPpTK$RHG4Q;QXOjOyt)K5<=Tv74aaaSUyP
z0^u%iFRF&A?LNb)rZ4+G1=})iP=5^%U&Pj**BNsEq|ahEj(_~Z*n8RU;nH*Zhnf^O
z{+VgEEgo~ZFXfA3p9Vh=L%_ppC%0+xG(h+RgXLv;w@kwG36fJlZ-0p)x|p24DD)zI
zn*3pKd6aJbHknWF#nCofcJ9E#(o;ZCvHED3iCECOZ|)M8vE^87zR919G@FN)#q+P{
z_f-m2&DI8gG}mU#osi;kt4)}z98oHy2-CS8hF#O0)Z|!|aJt(_sZD3(^4{lQ5*>9s
zEcqJ=WnGA;tfY`X06qcB;kj>_)G((>+9DJv@&Q`rfD?#dUCzdtf%ZooeurM8NY&2u
zg@Dx>89TW~nW01(>Esc9wMXG$iU1kS!%e>BOAi<v5qO<u52qR`Op5Kf6h0L6gXuz-
z7aax8Lolfce$LL=E$5o<D!!GP>z6!BIY2P3_A57p^HiSiB&UD3VpWPGcA}e}yX42y
zW<FaCMzPY(jji8+oF3`un)Hgg$hEqcPftG%Sz_3<O)DX%viK>y<d4L>?_1xtZMQEl
zNCc%#C;Z@l5KRXrN_j-+&MRe_nbJ8heJP}Lc)v~^3MSEUZ$0`*VdWwmo0~*Un;j$i
z_Ai5X54W;+j>KEPfl$@bu3+|t*Xiut?D#MD{EnX_vT_rC*gy3Q%1>4e_8t(rA7a;Y
zd6dv?2JsX6byKxXO_CDv62{4d5A@c|u<>~7BTvTEtUFA!bBD!YuA}o5Qul&S`Xf9{
zO=oKDyy`B}lNuifx?237pdN1S$gCrKJatk`1Lfx#ZSgItb%oaz((XIo6kBBE0vN4p
zWS)9x(Z>gdJzv1(<6buQko>=@xQWu?xhhhhYvtEMPL5j_R^H~ZS=FBB#vie%X=Uw}
z)@h(Bf1PBzPufh7Uke_+-}r6PvSQ3+M@p^}CEJ`<@ZwcT*XX?t?V8l)cM8h!8shI=
zRc;&kNC5SCnTnWU{g_j;a>7GyT*hspfarj@`9Md&2H=t`Agw5lD0QtoB;25J)h-yV
zh9RJHa0@~EhekN8qhlZy8O&WZQR@pwg>DFVR<@jPfhHoLQZCDtZLMLmx!%+abH^b(
zb0W!Mhm%z!sCsuE3k?P+*+bi^Z)CXlzP}vUvu4t?ndRCH?S9><u$y`;_x^D*tx}*}
zVYgPoFw1NHfr$_l$WTqO2O7z!4{dEM!b<D#2-}n+wXSone%r;NF7f!@sA<J5%DVr-
z{g8gtt?P5=fBZlL#8C0$O5EzdAN&CQ=nO6k1n~aH#IpUL?DRj%p$Rm_##+q)H~&|o
zmj+>yx2;*?{uAvTK$>EMQwpcQ@9D@4I$Fp{%-OzbBfBOj5jI}`A?$5CR04!0YuMO@
z`$P^&C^3{r83pbw{ujOZd@*$<c`(9H;(rEGIHpHtw_N<}>_CH(<J;JLQ8~E#5^`!J
zP|Y`(LQt^J17}^fRW?`XI~{a5?qB_~uvT4n=sQR7A85f#US=Bp(8{(Vy=6-M{N!%Q
zpO}xrpo_hS+#s3>wlDT<*2?`dE2o5WRlvQ!$CX#%@m=*5!EVU_j8&khJyleVmbE=q
zIDZpt;N0GM?fs?5VQf1=;Y6y#dkrIni)>SsXo8PhjwW^{#)a&yj}C&R`VBE}C$#n}
z`vk9M)+wIrYi8{Gt~O}yNvM9*iGQE+ej!ed#@|Rc!7<r>LGG@mgA;27Kro6xovgSN
zK>O1U7QRSnD_z)KECgE7>T=G%YpKb>C_7}kSZTEzh;rtCxfdvPBs_2Z`i)<1rgZ+-
zF6ib8K|evzbz`zY`-vZm$@&7wX)g9dmLu*JbbzJym6iQWwNCTR{Dr>o;rI`l?@DSL
zr?J(3>*jRBqoy?Bt-3vV=HXxlJX?4Eq1URiPz^$O+B>AWA`^v%48wCxmVH^4rtnV^
zk=-Q^;_HDdsMCxAh=LNTXDR*Z6Z?N2ub8Z!cO?dY`E|CPcum4fwd<VRQG3jJ#$z#C
z;f*n<S1;Y{>*Hg2*h*yCS8ernTkyqWOHvX~euJqN>}et`7YC5=(2al5soEX5!M931
zZGFu1BqBj+-2Whjk$ak?T`CygyG{3)(xhUnE!q|e`MPFxzt&(^3=k>ydR*We`w2jL
zGMXz;jAwUxi~%;CS))Y#<I>KQ!9BBqY*hJu!`l7Ld9g$Ni^-nV-fGY~clvgnZSI}_
zj(%Q}Kwm<@QU;CPGdye*1RsYeEz=Y}gW~1gU$<7QQO3MUS0s$^@PI+tbsUBT{sWu}
z1yy}+!O3ha7a@QStw85j?bHE(rfmJ-zT_KOpEiZhsMqkRFM&ypjqOGF@klX%d|kF#
zq6C>9Sk=r^<Kn1X5ovXP(f)CyPJ%5^l6q>gX98|pN)dk%N`IFGNGs?3T~VUV?w4np
zAOTZ5%{^Omy5&Mry#nv@U%8C0DzLDqCgkf0Q)WCxM1IaD$L)?wR&9Z{E7FPxLfLq6
z9CLFv78E60{iXp}z8HWhe5J4SbE6J5>*=t_4g^nNGyCp&xtZ80?4N!r*}!AuAK`a%
zLnBk>6#L5g-hGiD$@}7WH0O<_`{@Ce=LMpx?ey1l`%y-P`T_p;M>Bybf{#hBF$y*0
zzTOXdaqDLsIS@L82)^GTzuX_!d!>ShY+tNIUF9jCYw}Uda?xv}7#2A_AnadtPP7Lj
zEqG9G44M0>x_E0&F9xIx;gB&=SRnCG!y-hY@eFZFBm+4uYGH1iE8|L?k=MbFq`qF4
zm`!;#tDB*p#LV8TFz8f1hof)r9s%Jr=|!49q`8VTvJ#u#b6<>Q_&;||8Cq1#E5GIc
zA!iMzhSl|Bza8h6l@|(13-J1FxO%v*ea_IUCMNH%1_)$${Dl`ua&qN08I2@qzLF)n
zo;;HINF$(=WtnueRz0Vd@YCaV_zuh#y`4RK@0XtK8WcpyujEfkHggqg5#>(*l#sez
zcEH&I%8xkKlY03+;<mXM(ZLihDiXX`ypN#z!V^&1dGl$f8h<USJ!4~oYAmD-IKW3*
ziMU6Lxc1qTWan0z<JyRr-H&F(7?a8+0~FA5H(5Cu;_;+7fT3<uG2&}}yfQ2G7KMS*
ztd^rzuE34BAW3r;PSF?W4ru8A5wpG(2=p<3<(qEHZv98G_7Y_ni-o#;_iAb$kIZ|6
z)%}R-JWy~Fwx@epMD%N+zsL7=nQt0fJPr#{GEo}af`RAoeSmV&g=Ja_BlBg<N7)+A
z4p{qH$(VVQD@@2fqJ9A!-4lQwco4B68xYEk<`;5tQ!Eo}QBD!GqHwyc*`LUwNuABp
zFfj=T#WNH)?&znnRRlbd)ZsQzkIfa%u4h;qwcn@2?+l-xVw-=*M(&1B%)WFjPKkiQ
zz;uLz_MmUa)x~lxPj17laT`*iK6zCezKF$XwU$wBwGRJz*YB|_5%6YQ^hSpH(Ee54
z?pzgI`5;HD*I>VVb$R^z8x#$%rk!NX(v72Z8s{Y#;~@xzQwFD9`<5CG9zF%NFO?*A
zlIr)Cbf0Q>MFDM*N>!e1)CK*D+4IP2#goTy*?9W#f>F~6_&!z1M_aZoa@%?C<Z2-y
zp~5;Zi#DLWq>gN359IWo8sN0T=PytA?wVSwu3%U24hLIR?(`eP;htI1dM}TFPLc&A
ze`CEkG&{GK`;F9}1>DhMf1lh0KHSk&+Z#Z{DS(e4XTC;@ciR}vCQ$qg7i2QJy<0Ly
z+)Rcq>Yw&GpX@t}vSn5ffg%c)Xj?KOAlT(gLo4SZ+D=TCv6tVRh1@Kh537ymDMXx&
zanlg;|D3vXMe3*b;RY@_%sVxux}5pCSXyZ$RG<9Et~N3DS*34+GDin!<I=uEHzfwy
zdhnJ&%pq@0+#S~)H2uhTUl1)K&7M7Rhs>MiFB+h$%8Dmk?<XjBW^l9b&`hWMVZt-@
zZ5#cQ`_dk>t;hJwo>HwcVd{d2#3^|I6@^FvRTvd5is3*)hNQ8YHdEjU{Gh{663OO|
z&d2FO)n=cMtWc4nzGh75Hx^1st-m!jOU?$C?jjO<HHgGSO4cek#GpZu#({d&ck?oX
zf15hggSx)t=X+{9<NAOA6fDQ{Q?%dpUnfGJWzrAH{dGgQ&mfn(WvXuWZNx8s26Cg=
zEawDfwGROGiIFrIj$Ao?r~Ru8AG8l)9%?U(hq*dz4(=~HfaZ~tCY#dXlc4)m$-!@)
zGwHBUvO9*Xbc%4*l#j1#OjsFE9gsJq=qTNexr@R|tvEysRr#F%l$Xl96h`DF{$G1>
z7sOr+%B2vzXqT9PY!vt_V^doE8A{(AKoG3_`9~2F8MuB86^99X0h_?A!>B~MLjn>w
z0M@S~4+tDQm^aSk#!Ao*uHNJ6y_9y4iizA-_%+Qxr59xH|6!yDIN(29`!nDFjSf))
zbr>m};$L&cGf>!NVnA4>f3_Wnb;0X7Z|@=OC){hbWdd5UoAVds&i#j+%KqS;Q;`ZV
z(1CPQ&9{~E12*&C&oL{Pl-Vdq{zt$UM&i_G{zjR$%5ayt6yHNaJR0M_DxLAWMJV%w
zmrA`{(Z~$Ab+&Xm)5wq!A@L3RbH4Mx!U~!;aVVpbL>v|@|3AMwD9aYlU&DiwZwMB3
zR%P$%Hq4}W<GTq@wO6q2KZD|p>MXVVnrRSoWfNxVxqd^MG|;$iY<=K@<tPBg81g72
zXu-UbnO~-;kzDLs?<l?<e1UE!7qFsa38QTDM*d;gLXiR;#z2e=3+@OztTs`vDcb+3
z@&J(OJQoHPFtj`aR*@dU*@c4@UckzDz+`#2y~@-?FZVIF=#~az4pGG4+Uu~z@tCM1
zCVva&XW-6~<L{_|sGrJ6QBl!nr=~G^U-I*5;Nn>v`WPbga%JPk>f50p)v_(b4UXp(
zo@#>>$EfjXs&rXYD*LO-;arV^^Uh*E28l4COutsi#9f{34J3{vira2h_70smr)K{#
z_m{A+*ArH@<j1?BNgK=S^cM9}U9OglRT&6S($+3fEuZVVGGgLYrN<-TkOpC_MDrk~
zWlsLr1EsKp+_tnhjTVOI#{x-wHr$to(;2{ZXi^<!GO;sS?b4%Iq*6*R^kmEM7HYi%
zLj*fcN$7#I#%eqP#ABjy6&OWgvlx8;7@MEd4iXqu2=6DStC<+TSWlLS*-V$@L1p+V
z0=0k)4jww>YZ#>hDt>lZ)KwRuz_U$;k)WINLf<AgbDfh{+1xBYrK6)&ZdsdOvznbz
z-L5=5Lhy5bw*!2GR=;nbUa&Bm7<z7Me2Vy(wd?=zMypIeOG)G=1fl}}6)cS9I<_}!
zF)5cMSm2PcboMqcQsg!qgm5U?&DU_DegHutfB}6DdIMIq8B97JoFonl?or|~rJX$O
z=6lsd&LJ?1ao+ZjeY}RN))4O+SE{3OaBv_Lu`dZ>!oimw&HsLRN<rb)?`dgCYryMo
zcx;$0iPq@34!`)*Rc=B1cRdKa)F@QdAcLp*=acF{KB*k~DI}V~qc`B1%)@Id`{abR
z(SuD)^^8tG37v$$Kq<cF*}YM%Ezrkgz{b(a@TmF@2XbKmFkf=j_@9)Z0n9d4aUjM-
zN1PE|sWbA=#dMt>_C^IQrb0*SouaCoynN2Hr)R!>&H8N)a_iIx5-wK*R`lBCnOQg$
z%1)095~V@WG$5Y<Tzn|VDLq3G6KlhRZVox=$-voc*-b-N`U9+!`TW*}0fWgL76sy=
z$j(C|3K>4CL+;0O)L@p*^eV~<xP43HApWjnTlmeVk=2f{YI0r(8TvopBv`=9-@j`s
zU+st>L9^YS6b|fGNEu-<?de?#BIL4Bg}Dp~&cph%evPz;V*6%t9Q7f5*@bl@HS7J+
z0$*cJy5dUyi^oTciUTF>pSA>x4YBf1cXmO7d%SM<9y-oRA`a<d_PmfzGjISRb>p)S
zhl934thSwvNw=L6jA+_&R69iZV?9DX3VZNrMgj%scw+s^NRMTr4rRT|Emy^Bo-)gt
zw*wMUmb|Y?PK&YiLyJHiFNe|i9$rma8u4(Z;WMe{hRUrWlhlbSEa3Qodq@@%O(E(F
zSZdg`NKwa2%uh1}_G;}C`#j%waJp^&Br8N+!<4V01y9KX5P3redWkb>ZsYpw`<a-S
zwN=}nrbF<K8KSJ5kmwSS^qIq;)ZxJkQH&8li{a9n^#c2xWvc@2%IUa1A!#m5|7;vD
z1$aPr5Obu+N3_2Qd20$NxNP)bs-eIU)7B`r+236quERhC2+Wkm!wvK63(0B?s5C|U
z^sw4%q5sB8Nw-Zk%#Z!~C<Nb7A(b@*x$|H%{s5YB4&#+HIYi?y1!gNtbsSjYkN})7
ze878@Q<jO(C$VyMm<sr$$FyGJ25@gT=%EFtPLkGl;DZ9Q>oEH)w19VxZNs3T+~8bv
z4RXvjSdWrbww_Tmkl^6(GH&<>EH-nu+^w+in}ZaLe}r+1u+?mmL@vb1@ZeAEN#dCF
z5YxU2i+N7cM1Q`!G1Ymg7Y-Qq-$Jk+Hvv6(q^2GvPVm8H4F9n3Zq!jgccdbPp;ocx
zw}%o+9p|VV@O$uw4g^04To4tt<J=H}YxY?|O@S_zA;-6*avZpX{qxH;?=#Od5B@XA
z4GevjfPD~z3$fBcCbs|=2ydTu_(AnQ-rfMTjpZnsRR5XdhCpC@pi3>0?Emogkdc{L
zJDT?I?8r+4;q7PbX}SLX0K5k*Oq21O?|(1!N*aW>w`j_m`0vWU0FT}O=O^J~Fv>TN
zmOJzo8bnZKo_uSf1zAExa9XmlUJaS#jb4}Z)P{|5-DSq@LFzxn;XVlx%JlZiSlz1$
z#4+l`EP0k8kO;pI2kcSooPfdA4##$ZXdtwDV~EINgG<;MP{L*S^C^?L_go!TzrA5^
z5xVRJ<{rs-daXR8p2++^f9fZe-0CdgV7zhJtL=qAz$*c;HN7s@{E>N5UM_E;QKQSX
zx3Ec#yj&ZhS*n}7`@WLndyUOYhW;4b2jfj3MyoRv0x1;NyJdxHxgN(w`^6!RLo=P-
zog*R3e(^49B7D9~N%U%pO=7ISckx6Y(Z$G>NWYy8Kw_)}A>ymv%1w1qg-2U}%<UF#
zDUE?ZZxD#<%<1qbjtl}&7Zw(F+Jg}wmZ{rJe-R{`qkPTMxruxS5q{6L*LiTk6Pxc=
zL&hftu1;7#2etQP_{l=}zz>)Ebbh8+DDXP%qQy3vqznuuR+A|;w^Y8qzT?#Rf}{0F
z4}xyQc60UZ1rK^PUYc_tv`aY*8x;};mWYG1yNfq?;X0`}V1Sb1uSr_<ovd7Wpj&9T
z!{!?35i#4pE;{J9+N*%iWE0rGV+nb*Y7qNkDPg~7D~)j|iM-*l*XQZ;-#Xx<c)rl=
z8Qa|4T;S};`oOzIvp2aeM9Ag!#S$4b9CF?iSIQs_q`>QvQ1bN9Y!zy;zc|1Wg*UQ4
zkwq=oD{G?kPH&>voy^;8|7_Q7|FL$0P0*I;a(D4FGaZ_$m;7v{869whiSJJ-D4h^v
zs3{`V_|)0=B{kv6hq}Vn@htDic747ZttgQ8bt3hz#)=1JiFWF<SSRQi(<mqN@YT1l
zwV}tEvH4HKOP*~~8t?7y$q}=rsV?xW5j9efrKQ^8>4QE!zr@KYEQ5QazVSv3)AvwT
zMfo+|CyFrvL}?@vakRjY5KJ$mhtzG`qei5r-PD6u!yAb$*NPcW3oR~N0}TRFo7a5)
zeb=%6<#p(UP){+`n{zcbjm;zbyQG94bjbA|ZfnJie;1d@I-ENqBbU5X5*jt=h&fj&
za5S0qUWt1BjhC)pt29B-^9)ga*krZm-A$iHO4qfT-^9NCV#dfmOY5U#8PH`GUAj&X
z6QiTWC*jbf;h{zR+N;^GE)lvzmwvp5OY3&oYOw0(W^!5j^(KY1xkPMpde+}kyXoq%
zYkFE~c-mnmXV!MHLQVXNY=U$Dah6sp@=b612&>gX&c_yf3sg*eOyxJ+@D7vJ(W7jA
z*&e6ZDd<&Rtm5gkDECqBDjZEpeJvdKLVVa*bUmhubRcH$Xp#yNmm+v4XoG`F$YoDa
zJXI1e7HlL>FE{JXs^0CxsklB_LQrsXFjGTg*cd<$wHN92)84!)!TTgDj7w+_htyNQ
zTPf`w9JSZ|&_cd(x$!7A6q%zWS(^~ZvvP)ivGMs)lFt#~Pb2SnhrbEbrBjkIlC?G5
zGLtKH-W^`^5n_<lyGsmS!*jSH4kCUI|1|YD(;)CVh11SDGIio(@tyJY(t|Gi*tO@D
zPH6|vI*p}Ur0|qR*>s6P*>Whi-Td5VKA;&OMi;VebrY27cW-CQDDhEjCug{3o=;$e
z4#NoR`-n3NNPJ3aAKyc(l35Y+2yOm0FOIaD63pgV?q`b0x3SDT#%;2_UcRSmU6+BM
z%n;)ytF#;@p)*PG->u%u-P*LUI<}J_p~QxtIO0-Z4y)c-8&i-C3*M!v7i$_M3Z57<
z>Q-A)RIDT5^1v|n{i;MhAb>7Xk4|s7v!nvJ8XALkc@zP;^KOF!amV*JpON;^H0(D6
zp7EJh6KdD_XFZ8}Lk;1RW5VE@uSQ4rs1sppGf3wRr{(URB{gOW|Hi2$8<`0Rj>Ia#
zcEOjv#lSB(0P!T*uBrFy>bSHc%#IOU52)^^zu;QBpT)+Z2>56pDq&)XQ=PR7ZSDX}
zfoX)_gjJGcMK+ay2{!PTr07DcLk9C3p$kU~g4-$9o*cztrlS#M(f-g!AK!3=6-!4c
ziNkGxF7@Xr5W)4o%<y{*-NNzOiJBVjd+yrxwAo*=x4G8@sdhHa(XO=l#g^0gyd{r6
z$}B4-G^KLIG9<E~c>KA&>HVV9S~y}HA3rlX>8o6z{POM^Z8K~6;r^bhIF`n=`e^RD
zyHz@RV{zQ-hM8*WL&<YVaOW;x&BxF~FE$Fligev|meck3pNH82iSmSQ>)mL+9(ut}
zt=k!iE#49rFBfulznM$^G`!6fjflL5rq_%DmAdx10~wEZOD+XEDOt0KY6`c#<riW*
zS7$`oi)y<jH^Rr&9TnAFRX97T??`E|;tXfA`A_3fz+A@r(W&?aC%((peHIkV?e%ze
zS()8dB#H&9@qJi3YVbk$YKPfI_-YDsft#I>E?N1m<wAKNXMvs+003!KR8%yh#<OcW
z&lWq82+0WXE~w!@p-5srn+7r&>p7h&^Sw(d93Hyqyh$M-YPPQSmHZar!@p=T{#x5A
zl2nL-s|a4&*0u!QzP=6~mAK>@9X8d8EFvB(9$<OF94Ty0Eq8{vJ~_p7JnEtGr463v
zs$=x*v_A3+xw9B^kKxqM4_Wl)R}XiWleaHPk6upTK4D>DonUJ%!<`^;h+F;8Z`k<J
zbc81t%;lf1pl$D@B&Q%^K43{8v<HI=&lXN|E$rk*X8GZx52Hcl>wVHnnxAg3qNxbu
zNS8x%`cAGKk>Qt?f=gQG5np!?;+-eykP=T^B`vPMgnxnKBA&81t3Fp}#RQ@X$IGXU
z$iAEO-UPgYc3>;fZ&1yiE>NN5>s7_g*LBrf>Q7|is_N+HM^UnpEFTi_+6aGj-n$-K
zvVp%)s`ID8Wt&rhG^~0E9~N%*fRh!`WOpMw((V`Hj9v=PyAT}_^L$7A`Vv1C3>vb8
zS1>Th3$=E7m-xn<7)Ndix<tA#yaOQ&2<lVk>}Gw|0!<>PIfgGH#?g1*V3XA!ldrUG
zayGB{rL(CmdEJo&X3ky=30(dR5eX@+t`{+X%IhUNURp%`GkAFqhU|&sP_t(c#f_ET
z*^6=}4UIAt4xKmrO&Brpthmu*>rGLg-nP(xJXAa@qOYo?ieiIxJ6OnqGx3DNI0N#u
z9j=K1$7|PvoP;O6T38e?>Wp`>OR!bF4nQzaMc*%StO*Lb@aP<%FEgyMf_CmH>|&}Z
zl$7p9fS2aA5n7VP_PZ!RM->yRF$3v2sv`v#YJ02_N;|A49b&kscj0mT7O3bX$dk6L
z*{(hvFhR-G`sBaB;tgDe&LWvt9|om`vi*9BgA+ubX?W>=qmC0za@tC(s7jziCtBT-
z;OMVSGbLgY(dr4g5r-KoH=&GJs_IdzoUs%&o_>}^pXIWZ$oh5tGURl*Pt??9w9%F5
zl!FihznPT(y>fQu1MS^m-G@Df)|1!%t4t9aycX9`V>*W&57x6{R5T);eE!0Um|Q6+
zQi-I?a6R{xYYpd3ybQH*b`(%Fu&haFo~8x9nVq)+sE=SAV+w{WO_0f!bg)pRH60e+
z)$HkSrI?XAi@lH+L3BAOB4`O_j#S31XS?M~sHSDk=1e5$9J2-j?t23-_J>@y2estf
z(Z1Xz{aL);3QX<)=_X(@c71!|<MP|42p#;JO49c4u}M%a6PeGi^JH==oB%=q$uB-e
zw=E+^8o$2Y<X!p9PnBAeot`n2<<W!Z{ZXgYaB`vc@()zy=t<~_`cSjs&3Sc(ss=jt
zgRpmP^X=Tewerl^y&}{B-pW`^zPYimaW95euB=9~@V?gMyXLbqxxMW@m`&jub&Q(a
zfLe0KgL0jGhabU*_x0Wb8oFAK_?g2*gQ&KABi)ZM@VvOlm>5;}t$2)a>nc5)n~CtL
zHQueSTTw9IDZZ8}b__iuL3oIY5`ylK!?$_M2QNoGsJD>aulZwdZ|C?xSkxou1`T>9
zW#Gmpz0y_wygO9_j_{-Gma9p<q3>-HcU?lEh$7a^Yf%pKhi(K^hwI~cmTY1C-P+?I
z)5Ye8G&v;5qwSx9Xbca^3z|D!TGE7izmom+6qY6SfZG=isKzTI<^HYBSAG5<NVfJ+
zGLtq3gYsS*lQgC5u?H_9O;+qYfK2k21Qy2mF^z(1*0U->UhVD<M~tBqKB1Ep30;x?
zq1B&XNiG{f=}d?LA3g4W^JaS6<l0y#TPcmz5N&S+9sfXw-VPPB*L7%3F@;rZdN7Nv
zeDA%Q{Ul>1DnrX8-XA{GfX(>r^xbUN&XtGv!-mdbYz3d$y3HLmg}tJKBH6lst{rpP
zycd1#SAa0paZS+C8ZuPz6{#c5po~MrxZ1TJuSE*vxtbXTyW_p^<FQ|uSe6R#Me4Jj
zYHnBwb2}l-s^MIrFU@YP^74C}&F3dyo79-G(bgsDdB4N+N1`d<uI2Sd?3f96s9h!^
z)U?Q_D<a~FOOG=oJ~u}32=|v8)%N3>T>R5zG{=w5Ze--^GB`ap{vEt8;M*KEQ#1BX
ztEWiBF^ShQnE+HYZQ~;v9C%EP>VWluJFmyR-B1)ys8^*vsrB5!3D1r-HQp6b9i@b+
zooL!ZIv79*_I{Tq6HE>yD_o_7=6UadUq-!jetYPfR8eX(h$+M?BQfhshzAyGA!_SQ
z4}$vo0=>HQgSi?t1oRgws+(xS-V)-f@l&`k?>=Zr$`MAO!8=&A@+YT2S1>*|Houy$
zwU;?{er??+M~?<u)TUc=f#7v@Fk8y8m@`I&`&H0}Aj>*m2VJg|JYJn(=+|kVCBPas
z3UnHS`h=;6CVd0ULMXOMQJSM;(}xU}LoZ6Qi<|d&Y$?3m?c8zG82trB3^v8u$#oD3
zdU256<ruGgJhb>G9ROQN1LckauP^&M{Tf$K0h&q_vMC}dvpRkXP5*a~DoP0K|4x4x
z(u{qE6a}^bHR$K4X>YS={@Htm^iB!vS6Z}IP5ynwO58Izn0)OWnZE~|jeQ0ed@y@#
z%k}paywsxYZFG2EG5;P=^omNfo!t9M;QxLK#*`y<%P418O&zZJyjt>GEc%R~dX|Yy
z7czL$`}|335O3tk^Rh;sPM`^IZub#k1Gh>gmWJ1TDG`FZ9(S!THs%);u5fhP`h^_F
zm6aKN8e@0v#>zB~aw^e@LBRRrd5bz*ZI<erFHu}1vE-o!CV#4%v(2hzdp=$7(d}lY
zZ6=fC-P2E4$mOZV&fgf|dlio9mp%;Yy&H`&`w_&kuxxPIPKrA7fSroy8RW9<OQ7CV
z>&K!>0o!8#Q*K!yor2|Q8&^S(gLMRlwE|rc(Q)34MtLXx0db;K%cxv}oZD8WaDTEY
zZ1&sGwC#Q)Pp*s*y`L^V)fDCdemFs1KCk=a_WF}=k$}7(yM2ii=j8ZNKLV+ba>Exd
z|D1soE;Wi@9YR4k3{DJC)~NPo;u*HDS4vGB<h1{=;UbS5gnmxkbA1YgSyxHA*|+`3
z@1#2QW7(K&gVeXAxZ9x0t>s>LTghs?)~=Z|yXQ;1FM@<?@=FSO-Jc*C*JE{v*?OX+
z(39DyK{mKG<1E|Ieg84UkPH<q76fSbR^k>{3%|U>Kz8E}>0m@RDcFuNW0)AeZEI_G
zaS#7sGP}N0K}&GcPK&1aNla7}cNV`{V_Z_Q2XRlc*#n8eCb6gC{DtKr7L=Y`FvlZ<
zMp20s9-}VBO3>}fpXs2`tJ2is6uS~E_eBvRvxg4~y4-tT7Vk2@O5)FbY+Ui_+T%*0
zacjB<eM}13uhFen3aQrGs+aAxJ@ak{V?NP%X8E0q(-pD$4bE@;lGv#YD|f5>CixY=
zT~!f(44=62JDr>+M3{f8cP;I);Y1+f6eDC;w&Yu#(MD`1F0eh6TDICc^e9m_U*k|l
z?->$^qpx~xX1yPr%YFg1civarJN;S+OfaPkwZb2~K_HkJKoC@$6iHfuy$w;QM89nt
zt!l!!q4Nla0X=e8DIiGfmc#6;;p>%|3R8ZUirT!0ufjj3Riaf+bpyp-+)X2>7g7if
z!Vn#8^x{W+X0ivei5%(Z?^m4o^4`~;k`LPtmx;679%V;J4v{NsR1Ql%Dc!pMmn^$v
ziSAem(XFCTYKmBagm{;9*0tFr07Cc>@#y&F13=XcLPLo8oM+?$C1Ha102%uZ=pSMj
zw3t1Qp3+}TaL~cyD+4@%1vEeJZFWVgz8zmAR~>jZ@goVnr(G(+<am8=^pm()2H4kL
zA`H4sg5_{xK#w8U@gZWPE75SOT<`-;k|sK06f!P@tj8Y}Ttc6-jc7Jgk+Jg6FPM`K
zKLuYb0DZ-{!mVHB!eUAC)(f{k<$wDVq=`M5$!%Xs+M86S^hCgrJ(U<)jNLX`&oMo2
zqLQ(8J;aXOB=cu79nQH&q2vvX_C(5obd|AOxngo<kp7WvH%9~f8*yQzM~o87gn2s6
z0{23=1<VG`1$N@3z*5OIFua^#(H;~kKksby`15D&?JGAU3McD*j<=oCrAnaWpKurv
z-H%R-Ov0bP?!5i_?Mu^7%el}y;(iv(p55_$>d4*Y!~xZg2aK6&l#h!Dy>zKgs#4%?
z?$xtt;JsvZ`sHCYSDyvexsuhpcz12@CFIh5;lXrpd7*Z;`y{N=3R;^Tr`;H8LY{ZS
z=^jo_CWC8EKY89o3eGiDRojdsC+@B_f>8YG`a9;q{uIy25-Yu`H{Q1wpBxYyY^D_n
zI5S((2k_h8vKWk2yC(}`n<}@qlc)|LKF1W7L?vUUltP_;j~N%^44MxO;qb6z&b`p5
z@Nh(hxyw=JN@|bK1gJh61G5}^)Aceqpl`xw1QtYcw7se5qIiZrpdQZ+A$S&TB$|s1
zlIx6gRW4`N(i6OhIn1lSkX{Drv!1eLejmmzRytbnq$;bR3}kgZ+mP`z{k@;pEPHyU
zc(8WVlxpSpXEd8Ro5|>>ytO)7lrC4X+;vY=itAOoE@?>me|^*(=%Zc%?Me)bzhB^q
zTA?_fcT)cV2{d*S3(0pG*}Y&W{e4sT^S(UcD*wAlw&K^r+rxKqcMl$M3Nw$b+v%hG
zLQU@d=e~DEZ3yiJx}wy{x9b=wFAltj4SwB`(=)U5@Cqu4Kv%O#izE!tq2Oq@+J8&7
znl;ZAHYb<s8@#jmK`iJfYSA1#$mlWhnWdMCGQ_w|2BXevQnnox^(o2et)zb2jFj=S
z9(leq?RU*@8wJk_wD)WT-!Ual#E2>@Gesbqto4_*R>bTEzz@Qidlov47!D*0D4mOW
z*>LNO;Ggg{a###mdas1da!*`3_C!iqrPTO8F?qPaGFuF#^+9bPH{X$>yJ@vZDr6&R
zzin0Y0O|W?fvkVDr-5@?ug+GcmeqnF->|`%%Vg?m|3=c~T|<?{aEf<!rC|b{8aL_u
z_YXE88iZ>A`}^agcZA?u*bf))=?awqoMd~+Mo4xsN$>Im&>y*!Vzt7`i1q}g_LOO4
zN<ouds1$ao#1mmh)OF8W95DYq$|q;Pz-c>}Om-ob{}w86K2C7<&0V(j1^n-p>qVND
z3{TA^!rMI2$>ToYe0>w_OcYO_M*U?cv_pz1Tf8ST&<qvQJ+)Y?UnFYaqQJ-&?2?c$
zwy&}>9A4i)^-hrpM3la^>Y=@Ik%A9H4=oZg-(f*}bjJ%5`?JvCa>Xh0jhESmoOvpG
z)qUePRzsB&<;{IR%QtjRBposGAea{uS)MMbSMYw}pT$t*m;7uBL_^WSJQ%bXr(O0b
zO?+1{B7TKsOZB2WAndF_U}me?qIgE5gbN~E{QA}MoRvN?*Q1^C5E%CvL}xO>!w;Kn
zuFFd;UPy<C`pU{aXlSsay!ZpZn5ns#sW17;{WI`P$|4({#yZ|e&cV(UX%t(zx$aGk
zukWgz!VQI7i+RNj3hIOFwvvJ-QHd4EVZQY_?BKfFk<r7YTt0<&HKCpAB|55o(nrmr
zcWQjsd*eN*RHYI8??3%`5$WR}cW<u#qutz~wWH;F4xzM@)ES6HCOk%<+eSc-?u_(#
z(gt6^knPvAh4lJd)B;l*IJm;VcS}B=Tm!dlb36x>Me2q0rais~>a>pC#*1?`MYUn4
z#!pZ%??C3Ru4F^y=Ek;_h|VmHSEn&r1pF72NGX!UL?c4RtgJ9jw2&k*mY=jF0*e`z
zq?+XL3MHc*ZYu$7oz>=hnjYagwe2x|ne8ln5CskOa&woEY8Rt`_K=Qm`B97MG-<NH
zwG!X^lT2ov9qc}h`DeDduC5`v#J{p@hK}jevqk=xxS`&mHLv00xy{UAb0$iJq03H7
zH5OzdlnyNKKdKDIn$Fqj)yWzgGjVOWT=aOpz1{>X5#dPI8PRBvA%+zUpJ^1wnz5J;
z^G4$^lC(|1iO)2Le$KH^Gd?Nyv<YNBM_fqod{gxf`-B+!IP$*C7(P_zeUIX|4X~ia
zM=d_oS4fL$Lg`cW%Bvl#ViDEKFg@Ld37;g5+vFb<OyxgZ#I~m9aNLF5@ETGsz2(Sk
z=dxaSJ^kD1NZvFs5aqNd<??-fg{km_ho8Cc?Oe?tU8HJ^{X>suB4C+8YXVN-!Q+5e
zt`NDFCo_YQ5Xos-|M~&j6qO}*|CK^grW`RVGi(Mnwe0T@haRHr9z+sLLk^M7cLY?r
zp8V@}p_lu2&2v!3o~Fl3n3q4X@<Vq|H*iu|%xm#&_3EsOQ$qHqpAJPVF2!Djeqn_V
z9=(1PP>tZPh%5K1IXuKHKIr_)dJvKc%_QMWoRBa4uwi;wWj>gSvh=B~I4(>=g6k$y
z?bUw8Cr^ov%D{@VH$=v;h$eW1*!8Jf7|a!Ss+9GAq>F^7ZbgpH)w<CozI9Z_eYSNt
zb!$$1iRf>8z_1c_hwR%376!OE7=N;A>^utAW6zUn#QF_sg%0gy>ll-<klvvNS_jrp
zd#vAnp<~3&T?vc`^D@k6u5{f`c)qEeXRE_!Gc}D<w0}xSLi(NB_w)V%vSg^XWI1t3
z<Eie<)!{s2nTHhqn_r^n`<HaCn}eAeW7>zu94Sb5ZBb+L*qvc!!gHpDlQ^&fEk0Yb
z+g~pIs}H#C$gX>z2KK|<`+j^A$T9o8b@iv*q(HMYg_z4uVSs!jo%{$^4$7m3!{dC*
zLm#Kx#VvwIaO$y2j5XC^zA?9oR`J0x19qy2`cGhqkhfcLUfZW|w>Z{dk&uDHalcWs
zFiAAqJ-1FV|0A>tBq`05YEqnH3|rL`2}KZzAaBEVIwp|~OR3A4Mb*5${$?W-yI{He
z<H2H$kOJq){rh+XxM0pKv$X-LmEE8~ff-(8_@m#;L}#7*u@Qt^U$r!vLr=HUMAmN1
zy1V?BpF|VcNq6s+8}TBS8602X=h(a)7_dRC*JI6$2%KI(E}=yVNB2uu)p6Tod;c5L
zvssVlVK9)^w3*v=FS63qd(K>Gx9hBwXIZ+eWNov`f7wr`+A$CoVZP*g9qud$b}acB
z7yK@2+^iXK;6VX!qc<{sgq3bnL#o#^6<wE5I`o|S3=6tFuz_fNxM2B!Aqts)b|HVH
z%z84BZqoAa@1@Cc5J9&GyTcgs_Z5QipqW!TB=~=E2=+Uyw&Ru7ha<<T-me++L?ZsH
zZ}~`FWW6p9lI_h}tgkrguYZ2sO(5f-fWkh}2VJCKor882<Lj09X~S437zCNYwl>bX
zJ>ZRqQ_!p3%@Y`6?>HXnSgpGr@4sXvl2o`q^6t$L@%J+8^#SKE2<ba94)HZV!|G!d
zm~yAKyA5azz7iYKFH0B7k!Y%Ax7k9qXfHgwyRTAm-QU3I@rx_EkbezLwIT#di|?Ui
zRFP*-J_54qkx)cl6+ap>K$;tFI^7Dd2;)TY`XY1p*CAzh7TG1s<uV{}_cQi^R~Rp(
zNuc=tebT=p&$t~u#4$;y%&<xE;rc+p_y<aXi16PI%4&Y>`i@Ry&$aGI$&&cMFf1Y{
ziX{OSokW<Tz@kGkg3}NP={OBrU)=6rvT)dXPmA1YYqc2uZ--XeT_wCk@R$y1UIZZ#
zDJ1+0#bR9pN4}P(C$)!_pyhfk+4CFJ?j`TM(pVq$7Wr>hhYZ$k&Vyj3$@d{W@8xYA
zlPnYz>WZ+iFo>-}YhqQdGS9r&Ta<F?HT{KY$VU!r$|ba`t5R_DW4HKOE2*bAxjN@t
zUcMl@5G{k_nnfY3G_c~q=_@gxx-=~a6>QN2t1^!ZGI_&1#XNc$<Va&ha2zJ?HhLQa
zY;n`kvS1-ypbmEO2h;X&Mj{|^K1M`Ldc0ts`5~b|Tn|VHPW^q0J^h^Dt!CnuJ0ixJ
zwWnWZhX~9R9-WGidF!_OayJv{)HIz_-Li(5^lI>IDQz2wc<g`oCgD#K8t)tMW0MD#
z$bn*f>QJwi5e}C11WuiiCF4s~Vc&esF(%99U@A{85NMBO+LILOHhh2m=FP0d#<hF1
z);L8ZSlvOc;cPS4PGG*|v12ql2Y3*JE_z+j)@z^pojiUW+xdE%a_!JM6a(r`IS>P4
zHfWuiXVSOP>-BJ3TxK~10@g<NqlCQe>Gnb&VJ427KH^kAV)BxUiUw2=?`gNln$6a_
z7JC5*E?6^)v?D?pdb;_Ii_lpxxF0sy;C^u3#h1#y3<P}S1`vu?nhz2x=wwSqc<>n~
zkboZP7OXQMMh<IC2Nk^AjYhNq(zCIB@9RHI7vWM(eu0O!zp2cHw)+K|luQ0X3`;Cl
z)1Ilm{pr&29cc_PDyE_7X{}fZkAV5wLGC{Y_zK~h%=i(obFOQztG%c>Ih)-Mi*C33
zrC?rvCWxep!iAtbpIZ93bCX1)c{Ti%56KmX+^850Nihkr`4M68J1aV$AvD3%2P0re
zgL2=C^trlTB(T~~PznQ?-S=(f`3{hivyVl_#zu1?n5c5BRir+96ln(6uQL}W*kHHI
z^wjy)Vkmud#S4vaXA~Q;oYSNsHKtxO8!S9Z=<1r*{Y$oo5-Cb_iUOcPHkUMdv9iz}
zT@D>vOlMmoCMm&ORf>#FB=dDPC*P_2CwSTFD&X2myd9*&t&uUo3aNM2CZZqz{Fen#
z9Ui#!Pmz`Ex%w;A?5O$X_Cp}<2LgeKd&mASPHS;w{;Jt++mFYdmmNJ7rac$;AM?}4
zPPXr^#`k%ai0N71m8ciS7=l7h3W5Nzv<|120{?a^?KvKEjA-^`z@6uul9&9D)JN=}
zx(;$KF=?D%B)~x83mHg^GAg?5$sJGE-jHOn)n|yfE57o-{+19FI2XTfXNV$buYS+E
z5$r_q1={=COZOiPmN|tQfsscvJK%mbitO<Pi*CVm1R;-#3G|DES1TXw4K`oDuiofS
z9KJ6Y@l|bnPw+83eB{p`d>*$iql}%>OU<5K3tp+Kbmw|7z(O7a?KJnXtxeZ!vDUzw
zz|@xHk-MJ?GvKH`J1c?9YXYItVOiMwCz2BJ{8us_aXqkRY$_{Z8JH3(@dJrNKi|;&
z5E*!jX6{mn{@={c$%R;U@NhED38@6DE!`3yxdU>Mr0u%_?1{^W+s4b9Rs0w6w8O;y
z@N!Ydw8?P@kzz={P&F6U$?a(7B@p;K<573{dEl~V%4(Pz*T1o&k4bF@#UGr54X3TL
z($|nKBXb#h(l1ibR8hjP|KgXkoC$@4Si?$Mp7+Je@^(k^QqVdf&%WHN(m&7KO%Mv?
zK-C+3cF;$ifNoX(&X|d)zK=5Z(PB6~eq}IKHAP-AgP+OB=aC>Z=y|LuH1>%wm}HvE
zhPBt<Q<eKa{hdb<@=br}uoQ;@zH*=I6BC$>9A(M1lAUqW;74L%D`7ye{Z)VLVv|`|
zUS$NpICa7U1bUA2SEX!^%`ILU+RAdj4B%o1V-Xbg@2{|9{BAT?_Zxahv!`F*rv5k2
z!a*U!Gq;VT{+(4TDZ&11#q_K><W*pE6bk^E)T|e;{@EiBJdg&Xn%jYEZSvn&=wpKB
z0~)pE?*YjLuvajM&3X(iQomu-+H)hFowLvh3*WqU=8X_nf*es=7^-Sj)b`*_RlaOa
zXQ!P-`h92ei`XEstqO}?Qt@Z0F!5#Dvj=ZO>>{%_RTn-;k*W%5f}yGHGtvfEY8D88
z5dVbB^3o&=0ZydlX!mPSVE#4c{<a%5Ci01ykndj3g4?`Z48!!HJxeScz=hvoKx;7@
zMHdv9s^(a-eG521X>hILQlb<if>GMXnxc_FGQI(88Gz+TWWd}&ErtH$<vUA+a#rl$
zYp^Hs?NxBY_<}YU$?L0jdB!WNB%ON=iO+12LBMKu3iNeC=K|#G$pK|ad0NuW(KAj0
zijw1(Q^TdO#+Dv8&Lw*N##<2h`5CmwRDn}f*gCjc{~RPaK!<PTEHIUT!y8-`>daw6
z7VXj;<2Is%zZX`zO%Ysr5;!Gkax>U+b9{V!+M9uW=^_2m?{9Je<uDX9Q3hyy=8nEN
zI)=@@co%}9XaC%>7vL5iQS|#%aR%mlU&R=Bi*HQNw#uDM*|GbrQF(j6WF1It6`gvh
z5}PV9ppi>pjs=bHd`FY;WBtKQgWT3oDvN;IVS-_c_k2f@R@uwcI@|c%{>1*bu}8<Q
z`*h?pyC)%Frl5orWQcu?lyX?V;~5g0`Q8`EKb%Sxs+1O?dLD9FjeZa1Y&lo7+b$T*
z&V8FJdv+3xA)SABgzN9`f3q>J#D%IG0@f7Kn);zf;~He$yY>cU^YWzwA}6dPSPg<L
zq2D4`r9)ujNFcS(Zc8H{$o9)j?jc{wz%S%rAf}|P`oj1o6D;mn>G$Au<9I=9H|@~+
zKo3FPfKF%MwO_N;>=8s{dSBbmw)(dYr17a8HSXJ^HC_L_8^EC5j0uFf-H)ViIm>wZ
z9YMsiu{wmYAM<+jZP&X6Dbvk^WDe)GPNZaRyA;?YYJ{9D%Kzh?S9V6T#{fIZU!HBE
zjT}$|gcc~(-@v>R2ee=_^Ua>;uX<B?${sbvL0I?3S||#(_ioGwqb4^6kSE5ZEgl{b
zp#hZ*)*8I320_V_=X+e%GY=l(5NhIxs?91~V3+-vQR!KCm^O0K^|U@8Sb+WU7lAD*
z1tsO7T_j@U$obk<-PnU%LJSJh)mvWw$L5<+9Fa-lgQXTZAO^8qa=l`E^32uPpGv7s
z8l@VE2AqbdBxYv!zgJG?nFI0t#W{;JFQ>X8v7q+6$HT2_AYR*PL=b>W3to})-_{cg
zVZQ=ETx3tSW0v?^B#gyIHw`-pfUV^AQ%3#<X`)<5S9bGjxvOvx{-pjhsB+z-&3@{n
zJX>N<dgvi;urz<d5V==wu1yD14Iz*H+v_H<f(s|9pxe=cRTVX>WVoZpWQAiiMK`HQ
zq9G5D<QJGbjHpcAz_Cn213sVyMJCj?&-_2Gyp-|nm*lnmeFlf-$HtXw#Go&$S!HDz
zwdau{kC>>CWdjo$UHAKZNd)%h5fJZfj`SP6E<gF)T=J*_W!BBXXO{O!CR<+!Qr!M{
zQ@(3t(+v3rjf!`7wNJyK$vDmG2ceQ67b-$bQrVn9=hL$TWa||FdIuW$@;bZTn65MN
z<)7?lt&|%_O~(mjd5<|JU|q{-o)4&_E|&O91Xs1q*UL|RA0krKiCFi7F*YXXs?JlK
zSkOqRaDZf*+a7(&2A}^YuVqyFIT+PI>k|Z8pD&pM?3K?04Vv6!E{im<?bM{s@8CR2
z*}~Xf3*wn@2v=j@-|jQE`+wtieb@7qq=>Ej*W=ALS)tvMzNmJHOqdqlE~HT+r-W2X
z(sPUqdRUG=9PK(Cb<}T_leCknns>nLB?`U!CV(4$_f5<V<WoXEC?4clLU~V-`VYnS
z?_UIoc}2eyUXoeKbJt9*0VDs3DzxFrK$h`J?loTVH(}VfrYw79sCi2E1EG*lppVnW
zlCqY({y$@}CUj3WMXqSOxII&F@;~ex;)+hN#n*fRWcc(YiINOGq|UVPse6<c%xhE5
zNqpcuu3i}nnU+|5r5OhUWN%AHqZwjg`AD#H)6K_q?5#wUti9}iz6Tc+0T#&VOdj1U
zI_qd(TTNHcS~~d~<J&g-6U~f%+tV5Tnm%yW9z#R`GfsVtw7DXfvq=!~B_w8^8{f1M
zal&aPDzlbLpClb3t$f~BFj}%*Hh~47eFYC%U)B*t(_Hp1Ik+SPMql?UBAfr{NBft6
z9Awf?ru$14deDGzc4^k3<UjVXJ`_9vb;f3S;3`74m2Z%m%c8Yn>c1c0fmwbbC_ecw
zzZl>SitUwe58b-|F_?N_O#T1sBuJ%KCa1%G`y2W)8CYwA90Ewo>vp_&%-#w*j^6oW
z^u(SfS9gLQ9B4!Tbp^ZrYNI@Fan~4)u%@F%y;*LnIZmC^al%5sV1bRzr{)-Dvn9Y{
zZK;)dT~=!{bd1q#`wf@(m6Na5_BSI*w_$2G`31uQ?g)4V<JqYnRJ%5CDIuy-HDSVY
zlcF(!SB;0<sRQX87K&2G9@}CyHvIvC!5b&59cTT+<7=UwV_kN9&X%suTW9G#gRw$h
zzfBFu65n=x>b-T{U-(o7JP4J>qi?+ldYP)gs<CIS!@`O23<>>m!3eYC82FshVChgs
zmFVb79;(ixj9D6BjgKDBSCnbuF10U|bw0Y*!yfIhgKgeU-Q$KG;BCTblPCn1txv00
z^A3q0A_#jyXTy#wXSwrocjQN@e!Zix+I}=?sQ=~W3wHlUpO1og(WJ9x4T4_Ro|^O3
zev7&UBTsOA1URuJ+zBj3hJEo2G?zr2(wg@JU)8h3;Q|x-llx__o2srnQ^^vsn@fAN
zm*3NjG%64UIyxRL=nOXLUDF(x+0Ioe{Q4Ey3xGzdy-t})Mr{n9ff>+M=RC?Kl$PgL
zDCP~{YK;FS3)Nk3Ul{q8wtqYF7ex;t)fD-^$~()bs=l_}vuPv+rArzC>26Sv?(Xgu
z=|(U}X(XkkySq!eTcklsTHws>U!V7RpE1rm&iQmc90!ge%f07bYwfw_ocDeIu4@K2
zA8#r$B*i<??dL-as8_xxn6Ld(es0gHM38>?*td=Eu`xBX{)YN>x%q)-u?*NVfMZ^#
zb9s8Nd|haI4~fiE^PB{2>N;4GG~pPBcCNBB3>OWo6qKd`W_s{~<bCqoE3g5fDF|E6
z&oh|>(|oljDA0Cl4i<~;JY2R}ywZ52!bFW1*Ui3thm~PK67Q^HS`GFsTjcLtshoN2
zGn3ibtRCgf?i=X*Vu28UswE2*IiG?ksMdNRdg~;vFdN{h5lXsgjZdNWQUiG-m0ax^
zO6xQg*2CHa9G5Q=JhUL&g{)-Z6NAZ|aGdERjpv%}o?Xp>4I%r&bO-abwV};7%gFpe
ziZ1DbE4Ar@jO8(1*I;T-jpJ>h)P!BA1fI)jfzWLrrZKkwRyOUjh^Hy!A5`;o?lwZ;
z;bHB{mZgAq#)zT?@)5`&OqIROw>(HlZ4{@<iuc`rJn)$oAO)7a6<YnYFmbGl!49oc
zCSaj)_BQgH`O)d|@k6wHP4hNqap3gD;r%nz1RnDOxGJFr2NOFzbzvw^PfyRan`sG3
zx-y8`UhmBT-5Jbev|wV;e}KzKm8XzC-F`-0+2VZ<hiN_D87jWf_0CdGr(<SjKt7UE
zB5X3$#@5#Mz4?3KT{ZJ7&HY4bcq=oMfA6d!M<(ah&iGU0N6&OM&kq;!2A?34UB}yz
zkC@D3BF4eNW(NXoEvSKJdk?h<dk$%~`@im~GFdk8>o16*&G8IR)&>qe+*A|-y3Y(+
zigs>g;;L$?=@H*K)mnV}4!^exr9B_fX)1nA=cnxri~p?Od`);d*4rQrlKpWPK)F+O
zNORAlhCqz$mD(uq`Je%JW+Y<H#IX}iknJS#T+6VSJW0qU-sDl<*1NcOHz?k}>xOv4
zf`NM`y%D^_gJbMNjAW^THaMoGdX2d|jw?J3;1NeX0T69|lhAiLbkCCl(i5?JNFenW
zKzUL*w0N_D;QF;h#12jx?KCa=56k?E`{b!Yvx(gB2KXRfe^kL&FZV1qLb>LDe9$~|
zc5P+Wu2Z}jAlxs16?nLiRB7?Ek!R<o-`TCw+_`(vV0F!=#R0HTxne<TxRC{vU|w`x
zOni#^&_9y^u+%v4aL*<yQD)A)fX!99&$VzkNSdGu8s{R;R5^+7Ocds&@!x2+cqdKf
z6Ovb3t0(-3bmL^NYT<)1!YaX4l*+xcoOsZt4^yHu)BC;rnVx<BgCMJxUsoI7x<4q_
zi}5DiF0`_*=}^!fCGr?GT|=p%1@+~8SJsT7TbGD(75pMhSG3D@AwmXV-#c2TN9x0<
z|Ew(iKVVZnn@WmemIK?_jFzU`c)6Q^08Cq&?l`;dPF8wEbzO_aVit?ucIK9BJ6=Qh
z%z?*)GPiuy2R8HgSZgipw_(?080b^J?jYNpeM%W=IlC$MDcks};;CYO=#{?_`SfkO
zP1n&Hn{$^VdLT<;tW1$C@`u$*%Q3NG^XZ}_F8y3zsd}#BAFQq(8d+eEWQ_^ehC_n`
zBv^CV`xn~PRZE3xVIrtArG9>bpG$=ZxaD6TF6Yb`M(J)9DfIaAXbX{EMAvgO_ifA$
zKGof17eo4suHJ)9>b803Ngf*MXoD{@NI_FG@jF`${bhu9a?{o6rj?q`;)HUfNl#e(
zSe8%}>efghjJ1z2XB1fhG-;zYn@CrP<<B?Xnr%me8b>p^l6ciwu`t#SbFdvvxw{e5
zD@o>_7-wA8W{Xfsq+#EZB&CB<DKMC3G#GDq)+0{%wKcnyRL`gCa8xviWue2?d+JME
z$>-&7m~fl|v8?No3!^;;3pG|v1CY2g&0JZntCKy4>>C`eVlgFlewSB?W?99K?v_~?
zWZ@)PmCC|?egtM5bV!(?1dmU|Bl=U)XcI)me#o=C90f}t+HVXz_UuA}hv8Y_IT#$L
zmig(qP*d!Q#*!ShY0mYama|0Re1Exk<`VhAmz*v9jJ7R+!opJE8zX*7lqnkO8qbl$
zzn-yfG`rOL94rSnm21auCu5jVY_}1{MOFV*EB%*%Np92GIsf=F<1jQrYi^Aqga7hh
ztgBvft!2rUf!|fmgIX-U)n$(hK|7f{ScISR<C;4N!pblFdqN93dY)^&5lN6Foys+g
z3QC2T*J~pAbPdJdr<{g1CnYlR^K}KiCk}irN=dF-s?^EKv&?IL8S!jf^Fyavv9?^~
zpCV@7+4k;w`q>^wpSC_S+wOjB-LORW!q2abrimW@omviTnqO?1mX0!$JhXnKD0TDm
zF(y&HD)Yq5R~5Bz@k#Sgx1K4W6c24SsUoOB^6a>rc6BD8`fi`&=2~@99gm5HIZrl8
z^3)PJ;4G|sIS}C#0Tx0G&x9<1&&bey6~}OKDB`iLnBNm*xM6u4>5aoS{uYDmUEB^9
zlUiP##Tt1TkIUEDRQ5o6L>tB%p5+xJj5=Q?E~90X)9#C0qfQCJVvEQ;)ABL@HhIdm
zaY727Q<=op{|3kg9KFk_1*J#pM|=FJ=xVYl?KIc$Vk~;|$ciRWT)wgg8}OuTi1LmG
z-sc5hqR5(Bv-H7shR-A4`54l}U?hha4299xf7Ry8*C|aS<UBvP2&B24%KvCHSwz30
zaHS+fd=q`W!7YPS*JERKBkO^m!Xl&BVqMMpd_QiHf^!*DC3pK_rK`YVvF9&=1KP7*
zLcS^l%~~J3J|bg+Zff;Dq%4U-qbG=;R#%4!9|vL+2S1y<UHe*N_Hfo})pIqY{k$TT
zb+oJC*X1#i4v|p-ro?u_u#R1F^oqsEw64)2l8N#xN?Ycw;(F(j$>anJRk1PJGp37?
z>$3q8SQ9WeOtzuh8n*4oYF3P|C2A%`94otE$oSR)m#QxTIc6`DHT6$7=c+VV>Y71V
zK1p}%GZE^BPZTi8hc;Ta<!=Lu=d8%TItyU@-4i$Ns|_=kk-FdGDg5-6^u^Lv02HhU
zQf7zKC??8W5S?|=T#<(h<&dy-6>oYU{i!q+^e(f!BofX&cZNON;~vG;goB$-EEfQ&
z7euqcwaoa@aL!f@e+VvnlFf{LsvK>YgWlnMy^0W*&DF~fNNncbU<Xx2qL7S?`Eh{2
zW^vhNjvbSCSDTSrp>HZeI!6`sVC_QG<U1(gF$+nMFo_kzk-mv={@S4>v++6d_xaYJ
z2VWYmWo^kI*YV5IXUP$WathGAw)8yak)M{0xm(QY5I#l>%Wtf<Ra``auamfY$Lh#P
zTV6r3uC>LIn__96WQZzJJS2NM-Yr8YVE&Wt%4?XAB&ChSsf-If05usCf8FRPV0zt@
zSf{Jrd80xARD-Jz{8<8CQ}_(^;}>cs^mYx%CL){Vbb(#$rx|^0$M|Y(=LT939X8e&
zTisSjX;`p=bN2#}$dohD15>J(9dhLMw~G{nxC1$>ESqlxvbYE?F{od~(8!J+;#Q&7
zVFD*|qj)Rq)|Kc`v!H;};}zeapaxO}q0Acc%M!7SH@9f;)q67zw<X$E?y{u6)3$m0
z_OkjdVJ~3qX%(5uYTzAo56_*k8DKDH!3;lmeo&)jW$c6#Vl>)I4!jnZsno_Jtd5g)
zGsWKQKUM23t4a~4Ce|#B|K7xuw?9|8@QjBlj&`2|nwrX!Pp?45k;*CWP#J8KKHNo)
zV~e+xPi|kpb}Xth#4|LX0|aZmSx=+}y8?c7mELv*b~lMpmDV_;q)4LUV_H${X4xWH
zi{qt(&>P$fQd|9uD`&3Ryef=3KWl<^tF5mjJ0A_42YYQQr@pAgWJyL!*IkWZl=ybi
zRJhHYb8tR}CV)W~!_lVsDhr!Nj&Evyqs0XcXQ@{0+x=xw=1yCT3;*U?=|R9KUk*~Y
z&`=#@4WR+#T;<A~H8gDpejKGi$f?5klj?7-6@;Lo=lgCo$$#FF0*x0Rp$h)ZwR(Zy
zqXchKi~nS2A$cI;<mvt=&k7psO9Q`~j`&*q=P9r^V$rF6iERQU&>MaD0;`K(Z$50e
z57Ac^C@FZI+<Uc@ZhmM=KU^63akvlfHB6}=1NH_*pk2URpr=d+=Jk!Tr(lN}YrVW%
zwk5NaA>^0Lh)GIr4ovJo0|ONg(d#w5%H_^f&KdAD__5r$!sOb1M|^32d3{aIe}9es
zBP!wkRJy^NJ4P=*^!ck6gS=4Hh$(W28&1ATUI`jL&r1vv0Xp{F`;T9~9eLe5&YFNF
z^$?6MxqU)AnA-<|Gmsg=lCyV(B<5q;GVv!|9MS_uj)&Lo+*f_J-+oR^k{yg8p%GGn
zns+>1WidM!g7c<5`zQGJjaTJrrIj26YYF;j<JvRnc_UF@%nv_+47))@@S7aYMvgqU
zsTr%Uv!*N?y#*3<bd>8uA^J%NWh1b}=XH*uUK`aj*|u}e6<~+Dclu5O{S;*uJ%KMi
z92|eVS*oHvI>C8>sJ|Rg<hzNp4P|HP0Xr*EIisJ{cxX$JGbD>PAN=#R>(C}Q$k(#N
zX;we7xSdKc=mSPj)F+zH-%ofd2UfAXEFy8;o5I_NwX!2g)m#iicG2J`<5~ze$<S>u
zEeC%WeAp=G*T10IK3U4t)2Vk{YbvB8*j;HHsnlKu9*Jfm_jup4=QJ7kd7n|6<}I7+
z=wZ{T)|KrGI==iYpAx%KXuB{@!KV5t(@2t2FWn+7uI$L<WcU)r^LE=r@62;}{_Nx?
zML0)pp=LJ{bDz?W=V#e1-x|uv+pvh}tlrPr0ZLjly_~j_F9&TVYEmT*FU0(s@639J
z-22P31DeFo$zoq0EZE?`o)BNE1(BhvkIQzMyH$quQjJMM4H-0^WYw=L{9s^lpLz9}
zINwUC=NkPJ$F<izNx=+M6!`kHyn**wwP0Zvei%SSbK9}ecj0;<5H%`##Mzx=5Tm_(
zu3DA5P|r`LCBxx>?xnN$AQQ%Z?OTrLlHaOG^J_ISbPh5)B)jxqovLP$HQ(;q(A<H1
zQafRka%}+dm~ZLcpT-Ah70p)K71gpr{|R;r{FD!X&3`JlLB#Xt*4o5g0=HFasZ^1r
zm>w$YzudaKj=y1meg769A?nRsw#%QL+Wbt8)a_8`YrQv~Qa+CxWnq*d7rM3v{IxR+
zhit0?axfpM-JRpUB%#~sw4JA&oekJ=1d-RY#pDvhNB9aU+{DLlGoq@F%*o)1pSML>
zma(x<c#}q{UfwaZNMEDKY-pCWT@C_aZT)l$yFk&b9ywD0^RihUeMrWTA;pDTGy(An
z4G3e)w{~`g$|R3ILi^viQc<oK3fKlVh$d928VPawBd~S037CDxo$k@swwAdDWRJi#
z-7}oYhq9v+!CLVWk6u~zHs;!2PkifHq-BGRIp&T3Q?-xMpVzjAKf(`u0L5{ep%O<D
zLPA1j!J2>;_qD)BOxmhN5SWEsiXR~LR$X$JBi$o&dWV$NwPH&fM(|yDZ{}TTx<iwr
z2A=PoZ?XX(UB90%xa`!ImNMA^2gIL*gG3s#^{YPtVVIL>l==v6R>v^D#&!q$-CJah
zgT5^TA8IMq#GkjO^^IEWOw9X7MiUsqK<76oSTYY0#qcgV2+hih+;demjiqr?BV%ao
zaJuLLN#B9ve7bj>m5!FK<iv|klH$#!-#6t7RO_9IO9LBfFhw)U9!i&=9n0a|jdrHG
zE(sUBjv!@MXR!nuU}|pyl-VAl2PnuwJ}J`7VKEQ>n%<R$T6f*_fG5F`M@L!O!luZO
zQjoRBCh(Az|Ktoej5|1C@pZgHk*sPRDi2O&j~_c)3JBsFKK4>6(sXLBiATpE!-&J7
z{XA9re6cwTWmuB*v{`I^00L3YG=5PW>ANDkguS<Ck>(>`E8crSAO_ol+V7+>e4*58
z;-vk^JJK=y2JXj5>n1&%rIuo(mv&9;Nb9fhwCci}Hqv$(d5~k2k}OaDLG2HDl3|Q+
z^)n{2I^&$=hg?Nlj!gVZzz0wRz?W*BPh$I5AEjr##{^A*W=oOBHkCqgtHp&qlf&??
zTC(q7e1ONiv<ACayGF6~sgoEIseArjHVW9%up7Z#z~gjdqJ8gsf6Pfw)J%@`hIDP0
zOmVLfyNE`KrhbjXLar9D(|GaGcyzshc4LIsrAodx%hskNv6#9$qg#-vI*ipsVsKlD
z40)fQrHsSDXnpMqIu1JC5wGiREZD};i@Q0Ex6?d(=Zg@^sn<c={max0k%JkO_14Gv
z`)e(izu3(jL2Tsp5fC^wH!PRNseaQ#1ccKYW4#}3X@fNfi#1zh3Ayr_9a=djPo#go
zz58l$O%#;I5PC!2_EQT4x;aL-4Y1+@MU^J2WUStGVZ^MuF=8q(c$(~rk>NyKQThrO
zqo?0}U+rBd3QXt7d>(t!MSh6rx|irx`T04)8bf)D{leE=wHr`uDo`#6d?5M`7Yon5
zou%EU48*`^Nt`yh2VU$>frMvbqg`$&wxkEfdpZ^)?*XUjJaC@PQ!h}!R)mUTiVGQ%
zFV(GQ1W|1)Kp?3&ttTCI)RMVt(Uo;-;cW=;_d#JV)qcYWMu<4?#mk83C-dPDtV)kP
zzrA>-@e;YhR|OLQKjTcd14FcJMUqu(WTf2fZWzQI;Pb`NzYuJ94bUVUh0Nm<6UF&t
z*pI$89;<y%loOAV373)b@lEEN((eMp#!yj1y#9T&d9^jAv9bK@O@p(D89IYXZV|Lv
za{lT?`1uq1i?LbO@pj}=-@7}u0meqdIrBDDAG33ZR_ZuaPX4#A);G};oSZO?V1oI*
z&WnIPb3S?yznE|OF}t&6$f(A4-cgn$^|gD|ptlN<Bk;WrKt#p}a#QxvD{eTrY4n~`
zp86=-8Le9!P{@afI3Jw8-kbFsIsx=^_%2<xmKDx2QhaMIu}d7iM!U}Lfagd51?09K
zm=blxDAGt`!OxOIs;h=!Ap|zki=bG=!8e&1VGo3RJ*1hbs%*PTb%12%N2K+zpQ4ZK
zoX<6(U|1YuE;zlry?$V>!TghqTtR3`e0RE#7H~Yu3_rTYwS&0gjjbnNl?;?<7JN2;
zh&8heFwt$s<;OwKA_c6;EUl5IV{_e>>4As_yOdC!h=gF(2z?k+wJA}sw~HWbr>(`<
zqv@xV-uM1fhji*ZA$4D@3gV?7dX1`Bb$MnCk7YB|Yg2O4LL@fCvzE$;;U5h0+R%0!
zO-uPFp+I#kZRa^PtS?FU_ESw!5b-rL>tEU~-JX~&ILE0)iie7wJ=)PH6zDsdh7fAw
zGAaRrdJqZaFo;3JP8)kLV`5IkdStX4<$8LIdTJ(;uo#tt_>Ww4$5@t-u(z$Eux#E6
zMKR(`#+{5OBxk1n4>O>w>8Tcf1xjBJ^KmUzOmZbXKo7yi7mZ`L$#<OIXB%(24t1U4
zHMc95j{9=_-gA98Gcd^#$eAWvHPVI5S?rip{8A`B;69rSr6wgz?C!v_zHhl@+YO3_
zJ^L=xL%v6vb*^7w`$m-&QJvmt+W(|WML|ldG9o<ZO_zS?^JV-+!)<kT`=b)Q#t3iW
z4avDGry%e1oqN;X5<xb%AL-ZgG}E<ecHUE5DhfsRSk8tqP-SLAnEFJ1l17ofNfirM
zJLDkLbLDYR>%D%KhmpVEc-6yJl<3iVV=U~7-YQnb@a_zZb8hzCO{O18uFf3-DS9Tu
zq+(w$RB~S)Z5k$-s`m94L{>Jfa=Y}PSuN!j*R1WNHSZIm2j7C&`EiG%pR3<DDHK$G
z+kML9!Ax-^P+xAv>Tan?Eh`nq=hS`^fUt=k10rcpd-SGcmUo!5iXtijD=cr{zVxKu
z16dBW#I}p<dw)oU)4Igt&x1+aM57TtUKbDI9~)97I<EFABf-lfyR+=SiEnqt*9~oA
zofLBHB!#)yNMg@3J8FZdbL91QT@xn5BFj)pv@o-bzsaR6#vm;HfXBSc28Ehgxp=vB
zvY0~r%<HNmmfi^pI}C;)mdj!valmRiyfMNj_1+o|JGhaGsd^tn6EUMjhbX*P{mcgU
zLNzik$0Sewe1$=TShv>B!V3q6z;M%(f=?Sg6Dx!O&D_iDB4is58<V+ct3&H*_XP#n
zdKe)=rICRDVe_F-Dkq<WTRdjiyrR%Na%el|j5`qogD_^<Crv4iL$yRxT9d?LFyo=F
zw=B?bhChiWLv#ix@W_~v#JhGvI9Sz5MHJc|m|aVJ5{f$=ht@1a%ZRJB#m7O=xRQ&A
z#kkY(gD64e;NFa0;V{XmuitmSv$e<^lB4>qG%r=bG*utsQ%8aODP&QW?JilOi;;R4
z3r_r*%i#yJRT-_xoDL;EN}vXF!-hrCV7=v<MesKc4`_n~O}d3NZ)m>yyd{i(^N8n{
zd|;N#>qBy4_Eo5;)YkCTTQ(zA0uwaHwX!OR9eSNXxX$$$%xSstmGi9~I&vQ<-cL{?
z1!ppPleNuNKtzdkO{7pUJQ|$eopIVq9HoZf!byC<A6>&99MR&95QsXT6KYmn4Q0U$
z(wRjPoM=p_%+^0h$Z}-8zg#gcwZ~vcPem5_hQ3@Uw3LjNRRq{N5Fv9>@-mnVb-hn)
zXKVI5LM$~-Wr6!uz|-FLl({luG=9}C0ANK2dxQPOsJ?crYmrZlm<ZLcgzs2h2;uXN
zH!VdoFK2`{;h6Z(nIu)1IrMY$x_0c@{*GxS`usDZNuP0^i6&<{G&8OE2}>E&c6~&K
z&&M79p$sQJi8@pEqR&G|ey-A@7DJ%FfEm7X*PQ8gaz~}sQBM9^JT!6}Q!kEL<tgvj
zfztrdT28h{kXgD%OvmwZ_XQGRL9uxOa_M7ZMW!8{#WakIKHxT~rda8f+bL!2qgQJ$
zI9F|B@&0ft`^%d<u?41KHRa<8{-(bXw%LcRyg~sw{A?5^91EI&pSWmjl}uXYwvz3u
z8+b?--83|FG>m4p+=Cnu7+eV9gp)2m2Vz~2?M7}_PC=o5YojgTc1Ih@B2cseH)@#O
zrPeU&{7r)GvZ$>P5RAIOqT&tBxGf|w>hBAPaUBUdeG7g@J5`{gkswj_{PchuIO7i<
z)4V_9GxyZk9^v)NZZs!v-s}4X6c;^hoJ1k+JV4wi&=jO82;%ozEXUd&kQ=q%;rf45
zMfM_q>`NU1O)7AP89CrgZ*?puj^w2VyB^8bR_Ocqyq!zPG-=rA4Fkysfdo*j9yuVI
zW<-7H4x(Dqwl+~^c6)`3Dh_m_6;Os8Zh<IwG?hI>C-(IcZq~)DG@9%>Y~j{9+f*oJ
zOu__rFBF=M$Rz2sj`nAObsdTb+ZcL1_`m0x2Uq`(xaQpwM+WuMu>)--;@9`$Jm*OU
ztwu2+WP-TVvt#Hw4R?GunD5@cSHDO96o|k-(r#ql?0LX<wgL)!_0KZyF55_d_PGF~
zo!!veEvKd88yrtP;4qQ|3Vxd(s3H4-p`KhIa9yvqT998iO83aVG3$|S?#bn;`*))G
zT8Hcq%})WufxB#-%W$FD;-Oxg`H6FE1UrGXcE8JkY<v>Hi^Yt3VjZ|4?7ptYbo+rl
zl8y%|{aTTL=O~)VvsHS4YzT94d^~nw!#dgt9CPTJJuk*i1!&OLKtb-6!3BsX8sthM
z-`xyfz8eRr%Vx0Cdqv1d(oI6H7bw9D)wE8zt`o;9P1-Kl)&ro(DlNV_z)#Ar`I&O|
zTZyFe!B<w3`Q_h-l2mFZng!kLQNHNufKBt5AFi!o6A=|2KhrJK3k?a`J?oEQC5*81
zR@$O?amR!sCJyqlYKgoqn_(yn6fu4&Utqr;)H_@K0`3^n_7f#Qllc<VG+jR#4$pcU
zGGE7-f3Rd!dBm*Wak3c=7!y=z)(L?>PEMK^g60i*JUB?ZZu{lr^#Om^AiUQgxBaXL
z;bbu-*qJ0YKcDU<?AKkyg|+r~r7x;h^cpQqRdyDiru=w3V^s@OMK5wA6O1VE(8CpB
zE>>?za>hu`I1g8RQ>ndPAI1Zthk@iNF1b#C8l7DO72w$AAGG<n_UgqdkXTu!9MZ^-
zUXyWkz{4XWv&4%N6>1bPf}EdPDbOO1J{UKtdnmmMt!GF=xgJwFs3P3FwL*=a3d^LX
zx7qi$p-8JzLS-6wk?3P2nuU@G75U;l(;X$?;6THd1(!k&#TP)Sma|E{n7lxJDc<*A
zaP#`c)-J3z{Lm~YSkgf8X3PHpZw~$hjQ~-TF(lm%=GB^q5|~?BO^DL~_~9-L<w#aS
zZAJO8=&<v4F~5*x*S{e_`H;X691@Jt0fTr9h%9TYeT-EMu+!0+WaO@gqN1H3E~BPm
z<YgUTo6^MXFt@h0N+rF!x>80@btRe&0N&9k3<y{xBlu?u_Bx(}!sY9r;>l5`AB5;x
z1rN(8r}-my_N2N5hg2qkK1;uFodXx8(*v+BQJhe&kMOonJv$m^`YX5XGKB*MNiMGz
z`(9VYQn^nfBC~ddY&eb!kq*pI!$n9iG6#YqSdEl|S#F!D)@DmSH3{57O@I-WI^b&>
zC6<d1W7ZDg)5>2R({euW2HIW?VQ*so*Rmt&?z{Bpek~5d&AwnU2`k<MqMjXB;Hdwz
zLGR}L<Ys?vmmB0d*c{d<P&l;F>(cXXvwOdL$I`78p4D*B_Dgm0fah%)h+YFO&IoMw
z5n=I|^(P^OK{r<}Tc#&&D^~RQ`Fi!so7HXW65W{MLin^DbY*U(d7Rf>DC--awVd0W
z;W!@jkzrh|`5k|L<GGaYg!7oj(Z~umZF^b`m~6;^CvqtA!4fTS5se1o)$qtjCzD?M
zVX?69!=E%di)#te*jhP9L2ZB@D=!rptte*(xHu%R_DruiRLa6awj=lnt+lcweaL}z
zV&&GSqptFUODD=IGa!{i$vOskUGfjVMNNL+t~(j04Y_Fdu<~&=bpp9d6jXwa29_~}
z<zmE<Fr`13yX`o@X(s!BH`fKqrgmjW7#vOm;N1F4^!TR`pBUkfr*hVyZiSJ58;X0X
zCXHpW6+z;>Gfr)xq`V)h@dWORDkoxy&SWk{JprRZwf4%i<!nY8G0KP5p^u9K_>tg5
ze2^y{W}lz`sIX#G`9ztPUUG7&(V8^Bm=pnDfegXF%2A~gnPBpQwZN}QhRnvvFp`WL
z_P1$sImSs!-;SgSGPDCt14mMdkgGN{R)2s%PtyzkZ{YdPOT+uS+X~AySQHEl`Ci>h
zeRWJ>cfV<yM><fY%O7usBt2weumNh?{xVY|N5TO#6&^r^GJ44(^*rn!tV#rSE)<Ng
z`x7&^e^D$dXrlb%Tl|2(nRQHPW<9TTPWew}{pCmS4yuQ&uz%PsQ!?m4pkPp$^9Rj}
zq5|)bqA-U4^M*bl_)GrZO^j0^KjQube|44ch%DWkg7@RwAw%ekUcUFAb0p_F|2(Hc
zt!(_QhF#(5JKA6smZM;OLlU+)7%rrz2IUoV-N*~1l7l&Q=#gyI%8V)CKFeVB*>H)2
z-3o#qG3bkRh+#hP^<4TFH+%q3{%Cd3^LkRM{-9=oN~2_9NuLH4n#(7JFVStGP*Up6
zemQ2$2bsfj-ZQsJlL+KOOq-@GQV79rJArT@SjeY;OyPBrjv&?*?;FK1G@^>?Mp;b?
zv_MT`b)Vj5@9kWWZEx%3e>>&E44HkDBIqT-iSUEzT|F3yOf6tXCBFR!sMj`nbh4pY
z3wHg1RvlpAkBXGm%`tmL|1`o5sdR4Jfa7L22WA<t(jw`c`eoWu?f%@1e{OY@e=1mM
z@IOe466wLB1G$A*u!EtQ5zt!)YS8@yEwV#L9JF1=i9M9qr+V7)j5^Pr+?>lSHMlxh
zjX1R4ml$=f5E)?>>NkhjE?20<KQnmtA>mm}>r8PZEvOi+h}Ik~(lcn3M%(ef9{5Hr
zlcTuSasE@_$$t>L8BXgxe3n}+OIL>^uRxqV31(zq<NMB{mBnM=kx87lIw5D1_>Y##
zf<<$E6W}v({F=+8H#`PphNO#=IkP8xE*=C&CK%jB3Z~FP`%TnCXn6(REIv91S@nym
zmicfBy&j)iOOD>vP-#l@*|ZKDFo3LIJwknd#H?ME7<OY>lmfOH2KMt$fJJ%?$gvJ#
zKHc~T@aw^g6}gWI`oxSgC3-QpHy49Y0X%@bYhy(*p}ox!S}XdIJ=j!96=2|drL|0Y
z9uHW$_4xB}f}3bSxT-CC+#I+Ym6w;(+{w`!v@|WXg5sK|ezOF6y>S)ly3qAYgaCka
z4^F1%N(I0oeE%>aT-m#Y0{xau;URZa&QRKQE>Pq#`;EgyO>xutE`#&!^_ja}i_?0@
zzo251zfdt@9)OB9OMr74%~zN#(LPFmIk6|d!Do0Y2|eFFEZ9kWQ)F}8k0i)pH{boR
zadBz<@H@o^mtHTlGBdgD&8yYeFHtmmp2dTt3WW-d!n7r@39I}(I0F*D)izVgL_vJ6
zy8}05-iDa#f6wv(B7ta<nJFqP1e!b*L+~MjI50e-SAI^qcU|}Eu9w)(?-ZBG6bO*9
zRT&fsCkt(Ck-ruQwgV*+!hFav4$ZE^7fLo;G_GH#k&}f6!a8Lpl%Q7&gu*0X3*<3t
z;xN-5eaBf^zrAalS@C87imq5pi8~FQ5Dh#dnWNR))a=&>eB-qS!dm6V^&u~wKSzcS
zRS>?>)%QD4D^M)|%)#a$yuW;K#b55>QCofu`UncN01XqIKozA8s}mTsPTg!Bh839v
zxnFG$+PxoN6=geaJTzT5*J%R9#eok&h*q;NP7yo#J45=*+?J!|+I1$G!N$`1+c(}#
z0v@8j>2Mmrp)Lg{`NdQFYhV;=6o0Gm2_HUu%+ugEG!C<mv^!ZqIf_NzoYlF2amlPx
zQ)K7?DP<V{hyR8u?8mya^lNC#hTCUH3D7LDx1rTY@=9bd##Z)K>i!u3k3_%-DNv@O
zN&V+QA0s%x_Ca9q3=NiBFpIDVK;I%<PgW5|h{0I<UEh>F73XbubAIddZGqU9-;akc
z{83?^`=)zCmf`A-VApkhT-$N}OM1n!sDD>Qto}D}n3eW3=Y7YU4|UbVzuDbp6wML*
zy`=Si4v^<|J}k2*5F=;&nXzbJBlv7>uh;Ai+LNzhFUfDP!07isV!;}}e#sE7k*D{y
zdXd#v+x~9+4a&cR!3zJMg2B-53j6>9x_%(Ga5X;cUx;&*zZY_y%l_BLzTeBdtcP`_
z+J@o3AWXk@K^aPePPGCtBHFz_y3*2hrH_V$EQ+B$3EG)dpac4&ea6^7^RWOhT7nzd
z$D4lt=Kvc(rGsSKzl!}Wjk81LzC*r7|2IvDl*rP@z4<7@_Yi2HrT8|wZ2$Ru5&uBQ
zAzUd9R+Ce+#!Pw~Ep#4;#df?1ek+4QfAFvedH{NiQ5Gy4aDV7>h5tD%Wl(?@m43$x
zas$8dcvB<jGQn}H!s^dGic$s#l%>Ot|5o5pp%2s>{scKFoc_<}fCI|LVG4gRa;-#g
zrHqU9wuFD$%mxdcpjd1Z@4wGg2Xqoy`)W4v_wMC@1KF|o>wlnd5nS-VlcTyl`y}zF
zO?qHcMV`}zpZ@2xD_FqfpjGEG$ML7lmr&Axp1SAq?`gk5`99ELXEO1U{000kqWF*F
zZt>BuIjFgGB$Tv~ZC7tyu*<o0KXZ}F=)?8^nOWZ>=(CQ%k9tN0E7W}=9T)mVYFYZ~
z`(!sew$Hb0S~cdu$!^-#$jc=SX>XgG{=1b6>HU5gtz0`>WE4|sK+^X~H}}_MzlRA9
zBsOyyC}&r~_TuDH^I%aLhi^Nd?4B4P9D>gM|LPb|gOGs=OALa@*bw#vW_t9izaR-n
zF>C>K@T!MT2ca1`Sgh!NjwgqExA4B>Bl_$F7|+~E!DXh+&=x5nV*6)4Nx)>oa@SQd
zl&2gC+xm(vMa~OuBvmN(`afSLbhHBZ?b9ocPk#--`k@DSWAQ`(-bfVC;9Pdr+|a%h
zxxo+blk}R~oG%7uc`)xc85nQ1e?})PG-a&${P0xPR<qgUcm^dgDv%&|ZA$0c7By_>
z@XpJxKkfTDxHJ)e?MaKtY`xdGTWlduYt7TU#5;+DFr~*-mT#G@90%2^IxM#(ebdMY
z-hYo4?IhC@JF|cpUo7d?SJ7PP@J<HI`T_f*{)9pMV<Wa^d|1dr6>|EwXLbawo)zEw
z<8*`$_@qykf5c$$TIl0qJ%|q}ioI#wj`xT&><3>u=?f4ONxC92toOrXJP#ch8ushE
zITemSyt|Wf{@(Yb_zSnj)J@A8QI1p&f7NyO3EpE}aVE@KpIO4B^C5UaQv7l)-@Th4
zkvHk1cD^q4VSc+fXZ8k_ahqc|@;apVK92eO-d@EaqEoF#eb~G_6q={|ej}CVMT*l!
z_n$sHIi-!>&fXBso&NB&(#%ZTjO3~+Sr$8$!N;3X@${kg3U$Dm^cq`T$#z^8Q_ghf
zmAiQr)63bv{q=CywO`EFQ_yb}?W*#A#Pch3^>YYV+_szRFwS!rSkW9CYbN0R9NScX
zDqWIN-$k1s=M}YAlj5n@*IPrNB80PCr7W(6TOl17X`A3_W-~Y;*SIqNetqlnu)m(c
zEg7)3I^9-nY}V&4bq3aTJhZ+DGWct2et`nCMOQ$Q&&N<&MP!J0u}O$|hdwY9o%*nm
zbFn<CJTfe*5iYqe6jeAbJhZlNi-E@S=x$s5WbWiRLg|c{@L_D@W}9bHxm68(Y(8D<
zMe5T~lZZaK)0rA`nedr$<foQ?Tb>ttu4=6?ysy5M{TBbU-GG7es71&moc&!JoGV}7
z{0#1{ZIf19ZUwh>E3x3?=%V@kh((5=T+C?6)&u&P5`&o6PC;KxzL`BK%z3%o@o|As
zWl^c61>>4iX8!yUonBpb5r35uA7XVvip0@nYXLLCa5s<D{SKw`>89My^wC2v^(RU<
z*?Yl4C#^XK3%8^;M^OUG_mHbaWSE${v@dt+Ji%}2_v};GR#Xn`d7Yo?dMXf*i<`I7
zp1Luq+d+b1ka6;fc6W6$>ZYsh!sC@|ZKD?B*SV6K&zQaDpiAzfXJG7TDs0tUkfriZ
zmyZx2$~i~SC^d+~NEb}rpMRcm=T^AplEBPUEtg2}D|9o|3?8ip|1uNORzwnXywBv4
zW1pl=Xt9)u?%CwN@%c(>O9p#YN2&C9O;)pfS=!$*T33Tb0mAD}F-hw4fmJ%VP=!XZ
znymX2FXqO&TIrx2bI&iDkh)Mhv~Bunz6ie<&^`T^5+_N-@c75$@vA-3K+&V~l-fad
zH^H3hI<Ukg9mHiSmb?$FsXmWYKlV?0W6<(iOW$@$!+x>p$wc@yX-6M_s{X{D+Re<s
z@;Va7!tR~g+1t7LNLGI|H!OjaIIn%#Y!Q&4e;y!kmHMK-8`DhZH5_u0Z9Mks`STwM
zJD)5H!@Jw!@AG6(^BIB@z2Fx5#wH$W8-x!*`*<m|kMA{vJ^pG7OU8Kl9BD3Lp(Vrm
zbXc;+I_`SqG;GnJG3Zz69#TOGMLaRAH$#7BBFnJJOgUDwkTaVu(!y0^{C1dkAi*j>
zVs%V<xDsV>Q2hcPjrOLSO<w;8_GMK$1hgkH>xRM*2z+bMX!985iRCSlE1t9^y`cq6
zJH%D5{@y{)xz2s#qv}&7(K{|KlviLRSq3f!0T<^aHfinfhK@*X8}pBojH?hYk2CPX
zSR8*XqHvBfnC-&|d3jfTnSMBeOJq^YH;cgIGAiAs_2m+wF@E=K7jEw-a#qX59U&z(
zFf7Ac>ggldJb-0n{Z+BUjjpi2UP|&o)!%=O%6AeO<E(5xj>WFD|5gpA?U20bew2mR
zAzp-(l?yw5!N;~VO-u&{Ne7`Wsomvg-|w-3Dhkw2{I(S64s9`QQp1t|vB#X?;<vjK
zEqqm(5&E9g`W9!)ge@CS8uvuw6OtQV$cpt*y<p@RZi>{*=L|i~v!04q!!b$GBCp96
zTa9q$8g0Cilix!N50`_XR$_x)R7cE^q5R`?C5(_Lg0(VJe?O?f0~nqG;Fpy?C;fNY
z#Rbzxe@EBLztgTDbR9%`JEYz~?kMyvWgejpSv`i@76u0HwbXM_)!f=o$ZfcA`@d&G
zkTr%I*~6KpgF|^<gznbhAd0B|L<bikNTMtcEG~`&z+)v)s-T&LMuk;<oT$t9Y780a
z1zXwVzTP9v6#-AZwzLQ!l0JowC{02};cSU*U|QZ4c>_UxYR`9p1+$?1<~EKq@%O|@
z18FJQPP*;THX{$1jY%-=b<^o?HKM2Yu^^yVn-_+Y84-HXo=a})M8}CRmp3@4%nWtL
zl;Mw<lJ|pEv{PwLz0*wso(TSK4_B1~-OliAWd5v8?4d6#c25GDzTZnIcc>b9dCH)O
z>Cb^WsBcT{H?!ZWXy~$256sf;8h+(9f9~3<I=Irs_X$aVMR9J>MS$LI_xxYkoDNtl
zIx^@(m+-%ruFKHb?*Hf{iYWs=Mc@hiUJ=@gwGEF5L1P!8f%n5<;mvdi4;~G@moxbU
zU5K^OLj+Eb_FeKo>>}SVv``EWB>VI&zKbYh#Zl0!^Ot<s#(uas$8KMY^UnqSpmIF_
zNnZ~V@yDmk8()nRxuKWr4i6F7^FG;(Q(>iD)F!iU+*fZJT3mvUkd%09&_DiB*w6Q!
z5GghAA#rhw9{RncV~d4}$IPH_d%mrC`LH%YuD$Kxt(HGOif*&>i;hmQ9L4C*$|Yhi
zj*t6kKX#^4vpGQfU!MqU&nOlbf+k=0b2>`me<Y=g@-TxBE}{Jgyy7JhWF9{|oJ{5K
z!ZIGJjgWDrB?1N!zi*@!RP<u^EAcOHde<t*&jrEq4}h7id-FE+&FbCh+qzI30o<LB
zg;^ad+?X}kENI$O^k@)Rcx0@66nsQZVFw&?5r3Efb=VNmLcTXoz`r4|oB?J_=ks_?
za?oGkk*gkRE^pc6NMJ$VMJ}>xu*y?<8D)SH-4pQp|A%l`&^BG4vHouLEodm)3ECzE
z_7om1$Rkxo_IER%{f)4!h@lPmw+TQx4fVIM|M_S-L;UB2NWa@=QD|dHoT=~n{W;_h
Zyz4%Ba9>z&$-#g>QZMA6mxvh#{x2}sW3B)I

literal 86622
zcma(2bzD?y_Xdp9Euf@yN_R^QpmcW%NOyP5kRm7zN+aD!cT0DJlyr9w1MlED&pAHd
z=l6R*?|-xB-h0iyS6pk|*IE;<tSI#ijR*|}2IiTJ^cz(e7z6|u7`P!6B<MFT7)BV-
z3q~t-ZC7mt`PU{6cC5yx4)4uaJ?$K!>o71vqMnY%CN^fS6z|O}tn7uUj+@%3D6C9{
zskC?$*cBWl%q*>>y`9a}ycN|=ylqSbOsPag(1bi+Lj~BGxf)Y=+S%H>y!I5P`Yrc0
z^z+l#Y*ZA#Z*jE|rqWhWrjT%OHlyHWWoKol5<#O7ayB)8t@=jt?}wpR!c>;7u8yzS
z*gQNuSUtE{9h@!LI0OU)*w{JQI5}CMcd)p4*}EEhve>&&KZ*ED#v3yi6K5+&S1Sj5
ziYJ-I?;YG+g{i2Z>lA+rceOJASGv8+-`j^Og6(OAjf0h)?a$lIJgxr!-2Sxk@9j?y
zzt&bYb8)bBd-{1{Dh_ULHjdw-ey{2LzpVYcq+xFbeP7Psk3IdsYh^1>Gh3ZER(59g
zF2BX{aq#}1Rqa1kIoLV*|6SH_F>{u1u!BAe6{=?9Yz7r#>EKGm_M~&Rzm*QP9@{_W
zgI@gO0A}`3t2;x@yPb^h0Rw|pVkIG=EF&R7q3rBnZe?o*10x-tkc6xrH~#{7{Fonx
z0EdbqjoKpP0Gop#j{4RcFCiKMg*Fsm>2B(TI2-s8B@xd6PsNc1Sc0h1-AR>6&)6u2
z|J==h`NPKnFi2u<$z$1PTVW&>Z1&K=<?`r4X8{NEwdZ;GgfSY-%T8OTFXeQ?uXsOy
zCWgfZ!op(14*fC@|3XO#f{B^GJU;tHw)Uxy^t@2}@!`JhBUMz!4@4L=G5(mOAH#qf
zjBnZcG5o|ZQ<U9hNhvJJYx^jZ-O?bGYbB>Mj3`B?HSX;3Ns;Hq?@)^2fOJm$Yo;*L
zcOTNyyA&kXqP0=<P`%(NJNrCV6Jx%ohOx&I5K@a!1?R7Ey?A^<ck94`W5ywnYWi|C
z)lBz<SuBx0E$%U(_46ak%iY*{lF$#as@?v^eIKU~FLPP2qQA2{shlvQdrm$~rc#|o
zq?*|$YArIK^OwNPFJHU`Ri)CL7!R(QR#BUO&DbOr8C=^muGE)#&$h+v((U3!YZb%k
zgO<S(VHo}5x$vMsV8Pp})C7Do_U(1rst8)+%DY=}!_kIjk;*CyQ^;mBT&=BxyKHdA
z!9i*RbZJX}sDx0*PDo_XXM|35i*4X4e)C0cSl|8aZY!screeLV1FtjX_El)#vN2<?
zsA(cBx@QnzLjpOb9f_aH8eJUZ!7J*p_ZhBy^PBH?3IW=bkvENzN*3r1_~<*ln!Hyq
z@|Oog37)fjOA*m%{v(>|DD9mx2==4%f!M+|qzxiWTee8j2DmwN3;x@(-2z;-h3;^K
z8y*1IF(A<xoOe6n7wQ@T7=l%h`T<s;7{UicIaq=mAO;0egAuJZ@<%a-IW+e`*$Q$J
z1gQ>GM>Ouh^Ht7zBzq9+7&;j&10ft+2mKAqD+-iOG1Cudg<=cQu%<}!0F1t8XQ6Oe
z?DY7uz*tI38jz;=ewJzhMo};(fM;xUOkju86@D+23;;ida)Ez`k!|!sK8VLyV(x``
zyF5S4XJAr$zvC-?7=n(JUugA2BA9&bNx$?Q*_cBNJ5A_;u@Z%uuF6~VNCW72ksl>!
zv$_kW3tp%T6cK5JSxeSrA7$ngXcZ_~GADn`%N`zQwG?%wNsbtKQ!eQsuJtYI8}XRd
zxW^d$j>-ie#>;FFM;E`z+!sQ5&Q}C#kqo^gJ*hvcjlDS}zF=uHYa-eNyLI0gn|v>v
z!<$o>Ynk)5MXx0m{6O0E%h8&jE0u|ru(!i({i9QpQ?FB!qi{XtqEs`<J7R~R>yF-E
zAvfZ_0uO`_RISLOkr@=qC`bqv;_M))J~~@U5-M&Sdz?@doHuX3Js(dX6qBbdqt?XU
z|6tecza|I;UjqTU24w-zqHY6PL!9&MCensTOuTd+4V$WvjQE25YjJBzVTu;&xc*R6
zEN2pdl;*Gc60PF?;t%vn33bsHgXbHweOmo|eb;?$niTYe^z3+vjJWjiOsSgnr6(W7
zGYM6j=}88xW$`viHbu<jV~Q+G2}{0Y)ytfIS$p<lTb7?zg4TgHT{UJxESE_(NF7%r
zYVYl)>Z}@;%FhA`Zsy?+J$bnkvQ~7KY1Jxbv}S^v^qWGPjGO2Ks(A4qv(WTt4a_12
z7!rIKGq$ZpOh(p6fAW{xzZ-3Kn!YU}EApLwG3`D5ZhF+(mB*omyT;D?lXcYe_+H*#
z)?ULNc<Ser;c))2$Jfy`L(a#k`!J%4&_c;CJ!qeTh)9V{l68|?lc|Q6lC`)EtqLu@
zEOV_7#~KTGz9~$*PvTo1kG1AN0?XtrCMI|BE{ZQyNS~34l7^4KrYWYO8c;7uFNrUC
zFZFuA5e|J9yNubQ*`nfS2cdu@+|}G+Jwrjl2*M3AKsrQP50wlZ4<*JRewIO8Nc8;^
zTBP--yHEW+M?GJArh7aTDqdm4amTg1GRUhaY_a-im9T5aH8<2DZ&W*5;sa|AnuPlm
zxQBQ>EVCtlPI9h$4vUT#0f-Qfkc^m3yi0US{K@>2rA=pEFISJW(%ZDu^w7b;a>*7l
z(=!!nqh{tZn`pal($rJifAuNtE9r`ThCzn#v`C+SkY6!G3t0;JyF^;ohwN69z;&`-
zFa{BI@b_@1CDiqe-Rhp*=1DpW<Zat+wUL0vFHJcOBraa9W0sTwzp_Gt${Nc^X5q_J
z`5N^Ce@5A>dXRd2_Nf7@VF_cU_ZmkT=b>^Xc%|MhOb)0Wc+I#h4$j*oXrZJ3I5SJA
zc-@lFOx?oNl5w+hM+2U^i@aL^mz~(1cHJP}*qt|x&X~H)^BkxINIhyiXu(Uv{(?<_
zRf1Q5{{b2nbBqocyUKicixd$YK@=p$F6ilVvW}e{Jrr#y{ymE_OCxKvv!qKiv?ffg
zD=CB={So`u%kQ*nDmhL$G?hHEl#C)pudIcV@eJ@;K7EhW!E<5K6xPK4i5nIX@llY3
zuXfJobmWJ`>DB3v)9XY+mVP~Flft`+i(G<42Ih5U!8D-E2SxtGlMtMt!mUW!N}Ow&
z&(1CNP4#SEWX+__&s&+=B1Ka-lGPJ0gywm?e9ojl`p9|>FoBXXRZm_`v$+NAdFnbY
z#8mfR>|ESo_)3cR2xP^wD|os!%$zlEE>Ur*e3wq%O@-!DbrK4ZR75kDe(Qle$}W|#
zZtb%)Q;J@ee8z1Pd-bDTp&vrV@1$C-9(wM7!DR$yXl80TYE_p_=``4Hwli)O!53#u
zhZpP3?vyg<a#hcG9FDtnyIJk~vs5!OGx@fOc>B4;n2#@f>p1ppD`rV#!zWl-S*<jF
zyxuuRT=B54UaI$5uY2*Xe^|A6;%tH~r9Q>}!3ZMp11l~ij@QH9X|B?N$-UTdzs2t8
z=jTL*M7;QC_E-zc6+x}proG^_LHA|)I;NGjh<dq7Io;>l<JEcr*E36ojB1QN#X`k<
z*OmwK^%lNt4i2LtQGRY<p6jHe$NTKn-d6ZlWTK*H#e-Pyv9?Hj-Rbv~!Ag-C)|kcQ
ztitz~A5K18Sk8?X^L*yv>E-@xR~TYLTSMKu9_5i{lxA7PRW7Jpu4?H0A~inM_td3x
z^jZ-y)mnI%-@v11btt`Rs*3iRvV?z^rHO2IHA8J7IQ6k%#yn}Os!jXed82vcwg`QI
zpjMye9djeUSK;b}c0|GE^ybE3Q0bs9xj}e?^R@NP^hhnRc7N8l%)rW`*0Ax&8*=|_
zn|Rxv)1G(Pxqf=gc*W^T3v4**{@Rsy(Y<+TYIACOv84k1KFViwQ?NvE_NelBdCy?#
zrytwdyA{X{ctYge$~p2b*0Ru$7yqfHooHU$2FIq;EzT#p>9();nrv>-?+A^axe7fC
zxU-BFyg9orS!u(-6Q&krBA+2E^Rhp`zyB~QJsa_ZE%e>TcZ$u74-%(Q!sVX~Gj1o>
zM?a5$8PDQd<BN0PYf<y@*l1Y-&wP*mPDjouA|ILLs}A<Oz*$!VZ|{tD;WQXJ8Zx#f
z``SI=pOgl0nmDU=KX=KKg2nyjsQLoNAqocY84<XE2;+1*BrnV|HuMOzf_n_N*gCRu
zf?0io4ns)>Q=w}<2gAYSIW$Kl1Y>K%G&z6k;jNkRV!#PT=v+rL3pCN%QL{?U$<_Oq
zdlXOxz`u0ZZ-dEpLRP0?YDtEH0l>(-5mWbsJxD_alGMz%xh)}1+7>bJPWKoEaj>|m
zqTa?HXTYFhQ=n$$;CT05EUU?6hiu59?4st3OB}a+d56)1YXbJ&W(t7hj2{doHZ8TZ
z{A~FtwMu;X)l1S_%X>Q^&v?MR>4Jy^fdU2=1potw4TSm6M>jE}gj16xKVClWodVGb
zbjM)$L!dv91b|6_91Y(Gy8+`2Bk<RyWGzWFS^F|2J{%cB0OkKkx&%=4if7i<&2sa*
zz?P#@VPGvtNOCC#WQvZF?_m8>czy=s1r!31QDA*x+ZpC)L%t`&*j@?Byl5Avh+akc
zzb}Se01qdC4<|O+A5+6g?Nf>|nzWtbRTa{l{afB2Z#I=ra-xgHjIaj)cd>~7*Y2J+
z3J3CML8zSVHnka%Rx1ArQqrxG250)w%&L!z?vTq23!cH=0)6T4B@-XS9y0^RL@Rq0
zC?kCVBI=qVp3^YUS9sg`{7;qr)}Asl!d(qEN;3WDT|S=^pwyWH-67}-;6s1^D(r7L
z|EN#7*ty+CxB|MPL#(?0-6#rzGc)uBbFdZ5RY1r>u{Q3OSk=f25?h~;A)p5URDr>K
zz&`j5*xw2~!H2D3#R_^4gAM`&Qvb({|5!8=6J<ji1wjF`SJz;@!|gi~OSV&9#st&?
z7s!9u68dhSvrXWvw-Kc>@&dX2|85W)<-&$Cx@C(}?;POm{fW?bf=G7(`H;FHG#a`;
z>DCT_2nBgGR>+FwlNv9u?xe2j8G>W5`oabVkjsgnMlF!$|6gnD0Re4LmE!#1fS6;E
zok+Lt<_M3GSwiJ(jQu4C`5%X~*1+^EMaGA7%Y^*G|6hj#0X~NSu99&(cX=407H}TM
z{B420=F`7i?jr023HxuCi$-3i%ADCWR>m-*#Flmp{>T6Sqqr$p5D7Xcv;UWNv5inY
z>rAE@_sE6X9X!+m|0fufTmQefn~<pu8PwgL2Px@F$o+OV><Q@p`uPa^kT>AZvQCIu
z?vNotP*wJk@rAHMeNb8Fc2xr&YCAksss9tC*gya&_Rg$0h2=N?yp@9vc(Q)JG^mTf
zA7-7Tko+y@pNIvN4#1XQwu@(CR*NoD{f~!GVE28;?t2#}&fg-52(>`jeAaIZeB~p%
zK>od9>}41#tZ3xlF4wMyFx4o8@e!68dVK!;A8kEh2%#84ax&3y!OW}4g$dK-(zfp^
zaT-vFVb@0R_V!lL@`&2iU$9Gbbx*P1FV{#ip~U7EAhB`#ggpC$s5-LetH11TX!tuy
zGNVZ>t*zNjr0TTI04}8?Z|hl6BBkL}8*6yIX%{(7A~n!lzrH<`D}4`W)2X>?+9Zd?
zhoi1!a8~={oi3$~E(*-64(4iaW|CM9tQ#8-QU=oPv+I)hQ2<6KDAJT;rg(6}!wPx1
zxwInVfp1Ck{A9F9$`F;HJ~?kgR>?z@lRx{RgRb=So8Op7tPRR8`9;)5iagX}Py^iz
z^Fl4g5&gi?!w8@Fa&m8rNEN}=)%_bnLC9BvS!F(i9M}EbT~4{CM*T+{8#}j;unfCI
z#6&~y^Kqr4(7X7(b~f7rm=$m|(}bGr)3N!`{s2ADb7?>#>^jvTkd~A*FFSkk;ypGy
zTn2X?w?0b2WB=>?*@xN1#e=J}oul3F1Az;3S`_qHDW%^!8#|NtGQY2WF^q#Js2>Z6
zCjSE()zvU9M}ZacfC1phNN$(eNVl7~Q8x|>#7SK*Wj|jPWvV9~j!YP;$yQY7pg%N8
z{k5IHNj|foVZ7c9ZiW*E85U&<AJ)&V{g7>JY9kTTvZ}+n$%ryD7o(?K<4mgaBvW`t
zfdC?Q_#cdq4!b8i@lpQS7PioAtDf?h47|c<7lVPTk)gOyy41SVYp@>FGJwa2`vwg9
zBN*G+Y1kJOS#|Z2Q{CDpa;F3K`7xe5_hS>jfLl<b&_=zOYJUgUAr2Hqus-sMF6pRh
z<owC-3kG=s7V@7o6%7yRhh>1@sP=k^35Q)^2e+4hN0N1SxJJ9MpPk(1l8%QDSF>bZ
z|N74$!==fDz?-@+j?Z^!A)={L!NS#uXU<kHC_OJ4WwkCp+RA|FqF_KguqTO(Mn*k6
zr&Z8eUS>gk#1aa98xnUOTqgh#D)N}9OImWXK<518jCBea(84S1yTZHDlsy_|gwTiU
zpH-dWnYBMLw4mDjCkulD5jyo+D~xqIB59ys@`z=YmQEY=cK+b8r^H_7b{u*{LSl6+
zJW3|N>1sP6X5Ya1jT!*VsW_5?Z~;sLSXh*JX^NlXMmw9eZAQ!pvc8U{VSlI;P>K!3
z0?l-USy<2-%2de{W+Fl{^TQKnD!lp|GeNn((<&4*&C$KsFU~US8BiLaThOIZ9$p!3
zhyR~!6Z#Sg38C}w>(2Y>0BCNzEyqAmVC(hP4NCOt>Tua^s6zVsFLZ)_Q6TU6`y;}j
zV93E8P_i?V6B9i9Qws}}z!1QpP=sz<Y)_A5)tz;5!{EWeLCNJH>GxRzW(4a8Cir=q
z_DY`azavyE|96CbgXSJ+gqr^qp>t<ID5BE01YjICTP0{{*2WD?pQpQ?uKn1W-%jTe
z78drJ3}?=0N8C=c(bTmHEMEOU9mVS~oTBAwrZ=>(NOF?Emcn7u(`|<Nu)rtp<I^;6
z8uw{9CX9S*EhFFokqbOExhCX^lmw^^X&)O52nZN%A<8GZrrR!vIAeW`xwzMdQ@Uvn
zd!UB9{Rs=97ENkL7da90rw|Pk>Vx`6G?vxvs)WSlwH)}+B2VFG!Rqdm2m!0U=~2_8
z|9J#c8S|H@;0Y9NUfGx(0~0m1lPjM^$Dn6Jd~K(0>v#$c^C>0M07nJdDdGV~<_tiq
z*Ui|Vhe>i356**Be#KU@D+Hw@%pD+@N&ZLmri|{Kd5_v}6hGDNvRH36G$MFtscGPb
z=Q1<DjoD*WP$dl~cu?V2f}vgSn032!*~X_NbQ@oVNneRp`RoN~Z?p^Y>C%dFHKdtS
zcCO#)e+$G+_YI)Kr|BDTPMY?z%W=!mlqy0=^@ObX%vMTo-l1B)JO|j{iQMIqr>&%C
z(@9azXd<V^1XC619xTfD!&qpVHhT2QePuhv0b8j3JaWOm#C-aiZ?pb#N#sZBC8NL7
zQD)+X7*9U;=<wG#u8#ZZ^2gCqnb`%`hTRlf&VnR<vw_gOn%rrj^8+sP{@BlA!deUo
zb=B4NJ^`BvTC%#w<u2TOd?}v}D<j`V{2Z<t710~8ayhH5srlhli9z^*n9n{nCU*Oj
zE}cCBpM^+TBmNVL`uR1DP;h(*5J_P9mfF~JjO-2YVU?bO+}9&hm>=_A<OIAbh;a7&
z)-r(h)~{giSi<!z`StyVg(z3jJKvb5yacUx3~qK>4{H`jw5D2GNw))9ShBecjy=2i
z$vm^#T|YAXw{*6?THFWU+^m1*(8XfAhLAt>9aNqxnh%5$_iUYf47lA)8ur>Yv|Ki<
z0Cb2feU~CP%Tr8SJJSaj8>SH3-%F(i9M;To=BIJ~3=w?&dI*FZz@iwpJ*B3|8#nXr
z=MMwt-RmI;mJoJ6`OP%^(8X@bm(4^2-p_iCu7zIECx?^*{6m_0_&dB~uP@gJ1FS_L
zqD}L;_{CTK^g8bzAlE-<eLa)X465(e!|5{Ke-=4IsdJ_NdYxJ|^5Oj8aT7jP1`#sI
zTorjc!`Ej2N-5b?@)Hr>_9RlQ%a)J>YwHDPHaL!0(7ojL*EO5V1Fc-*mmtjB#`7@I
zehYBQ$~%jPv)Q%~8jsQKbiX|GHt<o?mf(u8kRow^y7i#ace|+tM5|Z)ogjCB=s#u7
z)4_zjc>}<rm{?tC<Y=vQw`lO4^($XPe_BfQn}ma^*>^_@HG7JUH8Z+{slI37{RM#!
z$Yj3kiYXj^-Umq*VTW~5UEW=-l?G@ruD>Szl81yZPP&{Xo`?C(+O{p#GME8hn6a?;
zD;6k;oO*H@2R^C-=;NEq*^a7`bcX%$*}<*i%f7u!qSy2BoU8ZfY|gS_8?S<I2k>z6
z_eJ)HCQ0{mI00stKj3sgsa|(hr<ViP07KSjHGc+_Sk_xNG!_<_#?rb4PD~_PWfBf?
zVe8iE_&Qjd0db0E)Xgvc=kQpbH<<9q{2yQrf&T<`4Gr@BWI=A5;KHYaz&Kh!uBb%)
z{n?;E+~wo4SH54<yk+gOcd_T0fbqR2m&=y<76_RW=fRPsf8DNb$^L5IhmC+X0+@q7
zNGiVgS@6in-)HGq-!TMFlfAUGbVM}Z!FO_L>G0lgIY89nWhM|8QAy}D2RzZKYg1-b
zJ8y2oCpLosj+|8F2qSZUBjn^Bk}aAH@bI|)Lh#PBqxobl!fB~rNam5w0}@<Ae-j@u
zA;8wW^WuCbJF4MiQ}p($j&aE5Fj-RotND3d+ltY$_dd(y`1se7yi7xfi=f<~^z2rW
z({3E4uP?cHIZ{UErnq@{i2Op&x^X^p<)?3zVx{}oe^$dSm|!s<=Hy#(jwm*qAsrxJ
z)U_#n*?jcH)PMi5E`LJOx?O~GzX;+JJ15a@7+G!GSg^<wODRG!z0-U(u#I*4OZv61
zCHdC}+`G5@Plfr@0VW!GUg~!q0s8hOqEn_Cidd?u5Gy)#cz`#`>`gix-zo`Tx}Inr
z6tuv7=HL6`NeWKTGBg<x+_vQtn3l=2t5#`41O2#CxPoh{Hqx<KV5{;}m@&I6d#D>2
zV9GCZn^dsqMgx`BE>bC?$2q*UZG*Tw-Df<WX}K&Nmqm32+)QQ+hiqrq&~+=AU+j#V
z6BoDNj4JT;?sjC$T+37`ag?{->3(4JT(s&X9VQTI%a_w?s^3|Y8|sP@da)gFk`<Qv
z7<c6r%y;Rr?3U!Uo13&Q<mdIOthG_cEkQ#ce>&i*Vf)7*A9p`gZ!8Df7!cKumoo;l
zj6w^GWSEaF=VjWI74zm???V8wQH;|fs5ZK0;aA$x=!0)^uw|Ux!f7Ao`~82t-%fL9
z{2o8*KRI0YCB>n&p`<bwKQ;uowd8kw+#!FhwU{3QBy07!jmp{HUL!Appo=a<QAf9>
zjftGOWIcMaR%0z7x3y74w~>yCp1Ghluc|rtHdhz)tSB8`$z%s~c$sOUyu1ztTeQ_v
z;iyn%3_+^+Y9?R%w{Rq(<IF!OUgv0N2BWr?pdGb>$+)`89<i=ZyW^CSKjkU%7>5J*
zQaGrqnpgAm?A`LCe+0g&cWx|$Mxv80PQbe8!%M@JYOBdJMuelbN6@!;*ec$P-R1jY
z`^)PHwuT{AgFbqATv6q^dGnMWjlKoSpOJ=!NuHYtN)0kCoFiX2x=x$G={`eZ$YiU8
zWn5m)`n}bk@?Jkiu(g=Z)XE8Vd*+kY)fr~i&oD4|#s)VyjC>l5-*1>#+}o7ZKwC7$
zgUzyS*k;X5&0x&ioE{rI7GXxXkCK(77SqN;C##14uR^vDq#FyLD=)^F!Y7}4K3&8&
zzHO+yh!k);aE*6;G1;Jre7-dt5y8#F_v4{esBXnyss#HBk4s+4n0?b>ZP|ws?1zi|
zHvSOc@_|D|$DO?@2`|pn&wGMWowmiTT3g5SWq(0WH7SLnpw9QsYihuL`6!VqPfqQz
zwr#SeUaLw;lo=Q&Q$!)+w>X{}x#cn&F5W%fgKYWbGSXR8tmi9Uy_UP7C2ZAn!3+H#
znaXy~mfU8S>>ptd2P^t}9^`QK>^TN=cSnP;yaz-1zsW0onIkC1JxPSEi}$KM`)H<z
zg3+RXIlBb)mNt5`__4Tkl>aW|p(h!@VIS-YQSqtAa&w(Y-0@7UCb+QK>eNi%>vH<-
z;T1UneMj8!dEn-O8U>C|OU!hzTg&B)n-;rS*Rw^Zk#m<wW(3pDvYKPTIa*k@)*Dq@
z{|xSy3~nn`-^=&0qgG15Rc@7$?M{2h?F8BnzqNI8u7I{*JtPs~;<pi>3<bX1u4#Zn
zf_;xJ`IbLq$7$kn-mc6iA4crEHl1cB${=ixm%1N^o@(lxj7Ry-v7T!G_+cX>>F6zI
z$e>lCYDAxeN^{JT@l-1&bZa5GI(aK!J>Gzxhaw+>9<UMk|DnW8U$%ROuLLdJ2|IqO
zlnpp)1lwQF3;1~-EuOQoyR7(fwZ@i{`Z^wrZlj*j2$mKGv%N4)Vxhb5AzprC;80P6
z>EE!K=rX<NwY_w7bGPr$S>lJvTQ`Un*mT_r4&<xFRqmE$%59^<=2TFme^%`wmYd4U
zFVt_pr)8Btj2xtAvevz-KpH0t%yC{#)Pty^nWgjCxHMUG&Xg@8lQVOp6R>g{Pn7d!
z(h?b4fpCRGa2X46lCYyyDN@-CzgsiFch;!urSH8a%KeIBgXc;ECI5l~&ff++(S0#t
zeG(g4NOHdqgoAC!*4Z^{{%4aJy-DA~zw?d`x(f@xE9=8B6r8eX5_cG_I@e$%5fLp2
zpI^Rm33c8(UjQl{i8PfNDxwAHxX<3NUgQb#9~xpW%Iaj`VVug~+!K`Kb^sP>ll(_n
zd+X`T#4{N0&yud9x)M$-!zCOSxY;x0{L_BLNRfZ45_-Hxx8DU)@m3fTXa_(p^%vB}
zRk7@n=jM0YTq_{%KO1rp2PldoI~+se;iff_cHR|3z~5{fGg{@XUv&~wK-oT+6Cg5#
z=3FxPH#Ij#{+qx6*!96a+p+l}3_hrmOzA<aTWK}KSiY&Z9PgZK>$>{c>+e;KZ@5xN
zE=w>p;HIdcxLJ*A#J<udu)wc;=(lCQEDmsJxMZupUiJ}9hp~|g@Y`eCy(sLA3OLAi
znp%${sM7-IQw*Lj?3WWOv^&(Fk~@8rzo@HlSZCUdwYkk58Y4rK$uGwUhQQ-Ko^)Z+
z#SIU#fy<G1BA)$XLSCq%<Y#G%PO-{pm>aMP0ChOe%Yt;3k<`H++!f|nuu`2ijHRDn
zt#ytE0pUsB{4O>~$FTm|+2H`}%4?g=<EVgp9G97|`Avi4Z%!s3&l%41MIUKfn`aFJ
zsQsx+*l^`jYGYDR%Bn_8n>tn!om#Wbn$7sA;|m)T(Jjki8aB54RWX_0HP10Hir-Bt
ziN?8j)#*fl(ma;?f9$uqied?0ROl@Ew<;yRsQeIZQ<ovwTqTaPViRy_)3o~ww<>X|
z#_(w0P_WzYv(v-<EvrzpsOoD=)DNw5nW$h6DN?HoykLtApAq?*?L}9~EhdCfVZL4t
z`Sjyf@UaI*r>UVsC%G*BvkM+LhL><^x%+V;LA#s-8AxCrPzv(7`rBzchxtb9$JQ%j
z%FMw@c;=i23R013tUKg0$~F>!$kz6Y1$5ulu4CjjaxpSf@))e#L1d0%+Whd1I3*E0
z!-+@#t;timTin}}{W2Hxi8DETOUTW#k6(vv%d{rz;`n%04yD^@+llX<FSKltV@!qg
zxBNW5abPq68R~l_cx^m);4KGFq{D*`T9SV1v-zqjX(IQgImW7?ZKx}ockf!H<0<vz
zy7J$4<B;@n7R%uYF2CCckNYFvm8@y%*;%#Lk1mhIQp<0w_@1-4EWEVH8(@fDlmh%}
zaM|t|HTY#4dfamT&Nd<IqQhAgZ7PrxaIIx`OF-D`gCZ?4K1+l&@k;_s-y9nIH-8;S
zGKOVaDI9#`NCQ<wRAe&>go<RBJog%lgIG5Iida7@4HDpbtF+di@hUcB#U)C)d&ll9
zH_2~B@qJRa)0wM>M~dO&ibLe`9CCjBs(0-6;UVhysfr;yO4*oO$i>0BfyWY#)NYlR
z%T^8^g2$qlMQRxs3yj$v6SEC1r#b6%s&3fBF?UrFc5p)SQ{6-R{e4ze{6b!HPJP;y
zag1^6f*$IL&)@mqZVq)IlM;UXN)tgd8clhyo9XC)ua)1<|A3Ic+VB4kdYE$_#Q!XM
znsc+5rAXR^6i9g_X2TNWS{Xm48nGIy`I6E;hdgKzU25rA`9TDs^_iN*(fglCGj;`E
z|9_l!jq3YA30frkJ(uVQm`7d1Rx%x-#P+MN`gL8>)p;@MeEM6L6BF^d+y-#ZdlvZ^
zTV4FG8bTR`>=*g7pCM&@_jxN#31o_DuUt=bLR|5d!YID>X*&Dp-}X6_Aw`DrzX&lH
zgivCTMh})@NV}uS@TGX>3xq)N)#2M|jUt5k@sb+!33+Mi{7Y6bYDGe_YAAnu*4{=b
zK}Pi#>QbInX!Z^!e945iD=3sn;igFpg9YuAEA}?#Dck>>^CuKRc%n2}YpL(bz$XpP
zWw>ycGMS~r*Yi-;wHS?}@ADj#e{L11G%riG(XkAu7F{shQeghOL-9m6Kn6iYBMkfk
z&|i85GAc9_7C2^ua_XGq6hHp#J1N`2{bC`<hnx0)kxCBt<2edG96G^l{Sz%UZ##^*
zyUSB^B4cx6MP41XkxUOIx2bPK(V-n0fCz4_?^Az9_L%&Kf_NX|6D0|<MF(XiJ*Gpu
z1U1vF^+f;jYOpA{3eX<OH<g&@P*TlkP8-FvZJavQzY7`5lV-(p0@`z^nIyZ=>pd?>
z+g7<zU>^;4mleznP#4F%aJ~N0(}M&a{gO_0$@D~Ndm_-(4S4JoJMR_G<HIFHBj-ZO
zZouv0?JlcqP=Xy~tOyiaWe))Ai#%ObqEy%LetlK^Y^U}kC_O#BaxW7bsuV`h87};=
z!Z4J4o@YMX<2WQW$W5>Qb{piTlFg0dUm7d=0$LYzcsM#e^)HHkk_TSRkrNZ$p-sNq
zEx(xEyV8O(fUnn)6__`YQ&JdT>tu4G05aL&yq~Kbw8;x+WrX_c9o~kPVW5MC&O4qs
z#!N|+VDc|S4J54azZ+QAiGVsDVKT0wAG)aA^L3x)6xfhVc)%s~6?d=3ELprHqlh*s
zn6;;@z}9YpHWk>GGsJksleLeoVkE!*B9)5hkS`K@Q8%;VdRv5!_k<lbSk4k3q#lXu
zNp^ORcn;GH%++nGtn93K4&`1SIG{ioSo%<420B5U%c|Fcu3kysK95|Y`|K1M+%q-a
zpKoJP{^CM4sFf)>^xb*HP*r$fQVD;*EfOH}d*Qgewtsc8v5ZvM?m@}X^)Rv{6K+U5
z_6vH4RrSv=vZfi~C2MLMe0;zV_quJVE!r{cW#={Z;z;s+aYPm<=_>fao8qN{!1k=}
zFN`SLXRm!%CBTHJ5bCzKfR2Yl`9Y%8aGmAt<E=}-9H~U3{yRIR%1VOU!DFR7QktJq
zv2vDlIp^Rwt%r>mw(1P|Hll-v>|q4aidTK>J+;XycK#C}RSJ&t4s=j6!eTpvgREi9
z9qGZK852hA01yk`qj6Yt(pkMGf!Dt{()ZE>6ap|*isOFr(jf87WAfNkwY<vh$5UCe
z{z3{SssKEluM-`dA9I)}5Pp-RL5fBPJNP&=h-?OpQ?9PoXDSnH-I<2ebij6HZ2IEq
zBn^77J!b;+i2S8?Mssq)HVI9;uA*g<+4^|U+rm;x56W62D7=yqRu?Au?3fA7=}3&o
zXL<-5o5}h=9okrpA|dV72@<!<J4_;_RwDsvn%9v+66xnYl2D!{(nz2JT9m3QC&IC?
zupDLJ!W$SY<u&z|>(xGkK?Xfn$}A~#Q<u)p^)~>?L+cn~UtT`G#)o|Gc(<$?49jC}
z-6_xE3?KR}(($j*Q+Uu{q0&LEysAYF4)&_LHOyC6O*d>1Qkk#834LO$L9d|=nrmF`
z9$oZEYn!q-!7W}&_G$#x^-9M*p%}T67e-k%Xgj-C8OUxr5oFbPX&m}uGQCiYIp6^W
zPdY5F!bWWnYd^Kc>aSK=;HsxejQnj-vFq~tUQl4_rB%`%P7+^cXDU;*O$sF895MI`
z;}vFHshoIq@l7rd+P77+EhHs{RqD$R$aTIX6P_V5>i9-x@l9xf5mEQx=YTnQt8yHY
z7|(4%!G*9F2Dn;#6gd()R$r3b<H|H}KWlTfimE}`;cT(*|Lk8!MD3L;n=A0)&W5`+
zqAOf@gY!(mj1wZLA>#1x2I7}ftSNAXeL`}B{uHQz2xkQ!s%(_Z`tM6{Kh%oC|EO2r
zeUBE6{BPqqlLihFHK0me`G&%v(nuUsER)0<UAVLJ)V8!*EkLH8`zuJ}8IeCOQn#mI
zyn*{!$JGKRINnGREk-|*AS?8AZ(OsiYtXM0c%GLwrnE!%cdJNQMqu^Y8x10hp9XR$
zuY&p1IZmb`A{_bi+o=hs;Wys`Iv0#hByUJj?>i136i@8?5U913MPN}ksPt16MA4Qv
z!<|K8DTQ4kUCh4?oN5##J1Z)@{0EE22teQ6CFC34UU4OBIDMsDfKkfOQ?W+DN1SLl
zle}^w-JS3=9ZH!h4*{4D2eQi3$&t$_we<&K9a7IL?T}wii3Uav_w_fA8WR2LCWD>9
zZSSA<#fRNJD{AY0Fq<u=-B(Dc+g6y(XgG?Fx)8aUUy-<J&o_F6_V7eY5D5>duRTIm
z2p$DTj-^&0CPRea`JwT5l$n~<eMdv08|(W*=gakwg;VWQh+yQ(i$wSs-!V)TV-m|3
z`0y{`C*F9kd7sr~$U|-?xgZ>T2D6rIi0H6bfo)IiGFiGz@*98s)VFZ+k2(BNSg$#b
zI}1gfvea#t0irrfQHslfl$?#x*c<=0{X@UBbDAs+acWXlcsezuFh!9GFZdUY9*wot
zn?#rA9D~$*s@vMl;<+OShDkDn&rF>+-r&~5ytR<MjA5WFG=!QP^;ba{W#3=srr88U
z7yDJC=kHx6>lLfHJJVPu#@P&V>VxNl0GDQi*&9dSU&UkH#tUW(jHJ@#xD5UJI-JDb
z7I6QtJwSSg2nqBTYb(ekA>3z%Z|2NwX<4egwExPHo#x!mgm_2j@T@=>pG#3Ts@#><
z?=$(`5;}#NNF=gPmnUm2A<As78Xng>^jo=KIs5E+R-Hw07J}pfzq5U&G~A0JKYrRK
z<_9|J5xXFfS53D16oMVIaS0`L4-cZW`=V_Sqr9toi~iD7!hd{4Sr~3G(yAsAwseG(
zq7Xy7v3igJz9-V&g<!U!y2+d1Wz;g~`fE{cxv1VXCvC#IUF|Uj4v*%ok8`4h-_UZX
z&NPZJ8ZI{nU#@i<l+80xbAO4P;l8PQ9xCPi2}5Z0`LeCt+?0n;h3dq>VzbaUz8m|G
z_HBGjUdh!MCzDq+qUBB_g=`JTfcL`z4izwt+oP6&U|%xL$%Aq!(H9TB-;^Ih3m(LG
zAqjLX4y`93tTQf#$G^rkS{|1_*MJcthqE!pXfzZDkvE!i0YN(TmNE~gTB7SI2P=j$
z8UA2HmG%4$&#`pcWF@eb*Hr5gjc}|75gw8paLV(wi|{9+>$mu@E$%`Ej*eLmMjY5-
zYS)GvH)94#<u9Q<xGzr=A0QFbn~bPHoi$Tbd#0g7Ljtp)mn!MZqy*BEk|CTb$wPy;
zCIt*6T(@^;v}HZh8**XiJ_&C}!ofw+zf;feJ})~A+yYl7n;D?swG{)!`JJMTfbz>E
z;fMZb1VkNpA_0WPR#W&rIw3CCDesFX<+9}!ibU~Z@;}NS356FHkf6f`6z$O1-xLj?
zbcOt;<-eSmFNbdk3EeY2NcUOam6GG7j9PnkEmX)0s@4iY7<IW`f$Qg9v`@#4U*rum
zFmhg+X7oOmgt(@0jk;|&eKu`fzDRDEx{bTND-OFjyXksnf5G(=DUf7cJCP)e+&Kqn
zQ~LV=4EQ7!JrU02Fdfbroq+9ofE?j0y$!={w*R_e!Oi)Fz=-pD`-Ufrm&k3)y>rs@
zGHPRn)k%p~d13oEg}y~AiRZJ~7nZ&=+skl8N+X5=4<_+J<rsfMT66|5*pYmM*5^6-
z_JtT-;3VxjiO6d@LaJ|Q6Cv5rqmx>gW*9tXMbbSNDzCq?s1cGwt?^eElaL+cWD-$@
z(dY4vLz6PI9BaoVn4FpMd>`Hq12mDH@7m)^f4#@qmEY=or~j@Yx_~-g`ZZOV;F+na
z-J4g@1?;;lsaY%K7^dYiCqVVAvhF>)l02#gB&zN(>fMtpKhrz89fDudkA##E>a6E8
z#9sLgpST-#ugI6H<p5G=lVs~WMlpG_j{usD;z^X^4@pgB4+YK4sNz1dq;{GPS<&O{
z;0t;Fr3Y69REuJ_y4*c<{)t0skP>J{44eh6s-v+Gf55k~CAUqV9!mxIAmQ2zh|tce
zQk3G-%RX$SzQLjya=7&6{DplSbys|9V=j~+?|`u`sJF;Q5G{4NaBr*xbA7MTMoutb
zfpaLj!alLil~HuT{;)rOn|=SV!zevvxOcOV<NzHEg6oHcrZoU2Eb1BD2(6bf>2_rY
zMJreC+Ela3gOr4f4((ETGFxoI8r8b)Qj|g~NvrLhgL`XzBEO!!d}{ousaBlK@A~$y
zSubal$SNPC4RA6*v4@H(Ft=S?2aQ>g9`Pe#_Xc^VX)nG?Op{^?+r)|KZ01HizLzt%
zm<W&XcaH>fh|KJP>{~nwRa>YDG~RXGhePY78$D&?v>0j<OXLgq4FEIp3&x!sGr-tt
z&uu4Bc@D|+J6KJ%1G5HMI__b6XSNuojw7DVf#<VH+LPo-a#lrlGkpzrCT3#a9`m?Y
z21usMC2-GL?*sg5-}q$-Nugt~I{AEq&fDx@)jp%y;1gO^={+<qfw&sw#>3W9=C+DZ
zltgr<!`b`dJ+qAe&bEytI}kmsw3M!>b6UGR)h(>yKwsWxNwUh?5w*T(_-S9i@^i;~
zipWR(z*14P{2r^*w+r$QLQa0;%W4meonF}{^`CDFT!Q!I$?zQ1DzHx|e%Bim3KR^%
zI1EnJ84pdkOnS8MCRs;zvT-`*;+b{Y8D9Fnsbn=AdT>iOm7O5R#Rx}>>*sxqfTLx=
z??Q$6bl~~R=joGxxUeRrZonbP&z}$rguzm#CjAQBv2-}}xJ0=5m*}B5K~?lo0nc%s
zHN|dLR^B;j5E?L;a0XpA(TEygO?L}y^qX)*52TeWXheT@bbE_;7q3o{%IPGZq$OT~
z?U=!PVMFU`aK&l+u9J*V$nt4~P0Zh`p!NA>l%!9!I1i@asd0d!cq36v!Z;<#BY@su
zbI~wmWya*u<CZ3;CBi?^`*5H-^i@XQ-A0adV$W*?jpd$Q!=O(Nm8S~h<7S^maPicQ
zr{AY(JVzJ|-sz2WyvRnwniYQn^jYkukvX}ic^3M&WEgpzfZ6Bq7<ax|t@_H|V09K_
zq4<|940-*S6-1?r=<9{-tpkxYwyZ6;T3eE&e!>eT?GP@7J@(fiH<2Z?np@Mwmpu+d
z$OGk^-Yqyi5&pgfH_=D?sK%n<N_qQtalagevwR;an1VupCcWfO*$@>@3`qBF<5PC_
z^}&l(9i26Kr*|2Y=a`}@RF!Db-EZ<MLJV#tC#R+?C2M$6Y7-?V7i|;ZV&JH@tKUE$
z|7(^9L`04K>M+Plr$g0<eN;t$iKy}N>LR(U%zpBFbuaVo4(HO+0$}XHC8&jc_`0Sc
zEByiC5E$Y9T@~j>{+9zur100p+7D5eW>pcPjN)b3nD}tR5BEi#2G6AU=Xe1=nW7X}
zXxBlJNLq*8=m+ggcget%9g91aatLJ~iaRkmch3a&&&M@d1otSIj8R6ogN=ZLFXmj0
zrL=u^{|=KG&0!OwnE{P<gq-hajCs-|{k@$g7Zz+EUvk;o7F*TH!m?QH9L;Ed*AuwM
zo+MlPpc?1I$2yg%>~)c6xZY2nau#-5DCZ%gV$J=a-n^s+5J+>meX%L-m0|fPx#??v
zh5dow@oD50`+0Qq(7Jv#K}`oS`nx1y71m7+iZr!A{_dL+71$<jfc@|Bv3eD!^v|C$
zC+8cctW%rhm7*SF9ADnT|K;>ga+J9chz^qjx6Bz3bmjH*Qkqylo#FddbXT+Op3Tl<
z_c(u*X(mSv9XGB|J6U5u%a7%P)tY&b`C$r|RhcRaof{n^!YEbgv&42SlK<j*GbX|b
zp=`<+6P46{bac4q(eWs5S{yH3`p8ofV+O#*99_{vx^bRZY;=FYM||8*?{lcjMNDWi
z+wrODaU%yMdWM)5*wyjdYkr$uc@lx!eE;CU^^rSt(iw>XDY1&pn~3<ZzRa(%<-yXn
zz{%vIhQ8?>xI2C?m_wWR+_JmC%X7}8eN<3CC&Gh)w=I$B=F}=a(ToARC;zKg#ON%y
z@pOMxHWkTJ=uZj2=9>(gVZUt(N*H*@9%id!w$^-><01<aMwl`D;HC-NI>7-Qr`WIQ
zhZ1k@12Cu#e@q^?pHO9Tq%sS+x#GjSGk|cB<eCm5Xs*9WXLp{c_D2z|o8^S-T{?w-
z5Pzp<U_Pg9d0*fuN;I7p<$OSi-7-E25EerEY)x|lJ<MY2i$=HCKH4y{JuBh$canPB
zBQCVZ7TY;7_Ual#S{upp+qfZK48FFT-ZOhSwYZmcL-cQn7~m6`b=L0hK~OvXCwI3Z
zbbhfvnB%Z7sjIe$(Xqb9J<<F&Bd+d)PQ#3t3fJDkezq<v%H|>=nKFw>qUP`bPaxWQ
z(GZvm(%|Kn3$jcl8a-B*ylv_Fdy*NdAwCHut`FJGXzl&0uAk-U2U5n@%n?ep=x$0x
zQXs^K1lSNF{y`vqQ;d=JtLVZ%3JGAl<Eu=+%!^I>LpF*ke?L&W03Z9*7Y-AK%$w?5
zV8(%z#Be6L;}1y2(3i>0aIVIWFK#E6jVM<|jd!?_RVn893~NQ&cvIQ`!b{L2YssdO
z$ETV{x{d7ne#gqTK8Hu0hW#_?2T8IYGA~yHubOHGrfr$X@ca}g4&sY#p`()jz(<T2
zMdT^>mQC#dtc53|iOMIsPt1r1@*+fRp)Ez+imoanfq;I>1Ic)mxzBV7{jU>TbPTk;
z&Nr_w>*21j@ZmrR&{5XR&!{vSh0l=)HbZRu*~2+w_)3R07!+<=&UFq}`ZzN?l6@N7
z-d*vVyB0%<Blj6tQqnXPRLs8+?03*nhXAi$plHG^04gSRpCOO}iE$cLOnOuSCVdxk
zs`$l3Dhu&D(NUj>T^2-*G4{^3Ob>W|4+*|c1~E#l_^!ervxV-(2IV;CSh*da9Of+T
zX{Bjj2?bWv-Y$~CiwQABLAG-ni#v-E4h-E2Ek|JpDmICT{DezcCeVoMP9x7x{y2ym
zbw3|_6?C@;?C~F$^W|%Zs>QCjPO(se<tvM403pR)?OYX2a71b?QA~zza=))xSJki|
z%<U;J^K};5m*WOI*%Sn4_rm?2>&O&Y0KM9D4&NqiX5~fb<cL{$dwY}l!tqkNLh@{;
z_ow3oXZtSf0Xg2`;rE62<=A6)oPWkr9}RYoHxYQ33uND1pjXq?X^H6o?>|9~6i38r
z-Avetb|;pDnT44&n0up6e1&MoP7mw*aWuyjJeppe83L3iy4OXR#%1g$kqLtywkOGb
zqXvU_$-C+U=J>9YyNmt8vVCO)zCe5-T8LB%r2~4;N@g4z&KQ$#l7V&fJEvzFol8Z*
zkk=ewJtNV#L4OQ#5`IPK)E+IpOhN)EB7;YVZx0<O^b*XO5s7%dP1R2fuVizoaA>i6
zpJ$L{ycUH0F-XNj)Z6H4_W>`;rgXMZgatvpujyWD;@ssl`q1!Z+@Az=e;9lflQB4U
zmErizTRCRsQV-QYVH@X^HNO8iJ>!||%T)vEsyIL5UxQ5;yrw3p%2%iFb}YDCeqB=(
zeSrTb*n#aRuQI<InipC2Mi2=#!oKHzz~~yd*@qXQVl|P<{OI(9BtJU+rD5Y2dDsjl
zOz?f<hd_KdqOChM$Kar3BIqQJveF@dW!YMt`jgFAN!}f3y51Yl9{b1D&hm|qLJ1RF
z)=wjzW))$@GpSGne{}7Xva*mrG*iF?E$&|W3AYb(9n9u8(-!_%4P6?~RFP05k9qmA
z#|O1Ol2^jj^){H}xkGQZ(`~9R1WH{?78!RBjMu61w~HZIB6l^Bnzqf?jZO-yLSjB#
zjq<Gz4mgC^=<*S7dYl#wY<Yl@q)~pRmg(--No{LEme)DX2>u|F>{05CjV?H4sHH?h
z>ejo+9#xC9*fR8O34<7udZNDew;9$Fb&6X|;*4x-y}>PyWAs7M%g}4wn+^QQUCa?Z
z0j$VIz*>NZWU+37G_7?6EN8Xx;=^Kd=OGeiG_McHwU%Y|2x<om=zMBk4TUFC7{<>&
zxY#rtJpW_v6*??^@4KS(z*FYB{?^AfIv0o(e#H{o^Vxo52RVk<cJfe~%cAwj<<>Pp
zW-BQRgubtTmn1`QkcV2Vn9hO)<&}W|zvs~v!_GP?iZD&g;lX_=wV2AU%I7b67UX{w
z!zl`{PO9O<YVL*U_I@JW{8&?02VVP4T>S_2V-R{GUmhOW{940&{3e2dg2z+}e06=5
z8SXP73n+p~`T-ff?~kPCa%x?B<3GI}%SERLg{TN)ELc7of^-xSsX;ih>adt)a#Qbw
z=@B&_IB9F|XSRy1>H_^LdP<#(gQ$)Kc9(U}ba{>TtuCarrXF?`j(8}nqW<&-HaK^b
z9lBfp*rTxE@mARJ4!?o{TB&u-rfncI!Wu&{vHo7Jx^&cMR_4^N6-)%3;incEhA&Sn
zRNp>O33Q5;f}n$8gfWNhR;GU7t42_!!?5?VN^4{YP{~2MM{pmeZFz80EwSF80r}w3
zo(ncWWHjzKarJlZbCUq9i+#d6Of^`Sen!BhNSTu9nY7B;;5)G1n`B&hY;vK+u>5v2
z+fj&2As3tqrPN)W{13${D;-r^eo>K%e7#yFHhd)y&J4g9eaK2Y`02EDN8Lb#YNmsE
zF~@iR%w9{Ii9F~7#%2kxn92fiI|J&P{V!ooNGxZj7^9($07VPTlPUks#hI-rma|36
zl7eJY+RFH_!tTC1SBW2yl8!cGhRv>VEyr%gHzRrqPwUkYsVyeca)HG9p|AxLetyXr
zJdLNtegYaLAwV>*q(^CQe^#=_|C&20lzntc`X-t@^fNml%PT`El`ZXv?vl}p>x~bx
zv^Dr3`Cje=lj*u^#id-~>Kj*PI(?I0SpT91^bZ&(5&&=-j3DpS#gYIE({$hXr?+?}
zIG1gMwh8dw44cjtJzvXGhvQ#5NN(x}BBk3S>_r(bzWmHv3q@K%7gx@J@FMx7f#;aj
z@OK@KiSUYKTQL@jN;ZfUIQc4#1OpIZhjPh^O&Wc>+Z!Bq#j1U9#9jisN3x+=)dCQS
zY3l8ZKf}iX;hyH5B-~MmYV~$}JgoB(wnEdQ^9;7ldZ23i_Sw3#p?tW=L2r3k^x$z)
z@m;LQ%%d3=Y%e87zrdY2EHw83(yD{BC5Wta(U&~pmEs_gCkdlTE~l|Gj1E{GRPBWX
zB(j3H9#UW_9b14{#;CXBKURW)bCaMDV7*wE^VuKwRKxBZq_I;jm1%uk1F9|pRmt|{
zz&tP9RF-{t5I6<a@BCyo9paHX%M&ht|4pF2Y-0s?QgrW)NIkOMG0%&Sn*2rN7i?Ii
z=2~Cl4IlgWgO=gibAv^B4K!ixo3stvXxxL;(8GjC{`dpXULa6!w45UglHUS<(7kd@
zx!M~(QmMW!$LBu<GZ`hgq|6m5sxbp``EIYTOJ71_zqofc$lTGig*Us*aU<~buOvca
z1Ww(_o1V&Vs$!_pW|7n_y}Qb3e8Jg5nqZ>ki~Y$UUfhJ5+nlc&?gVTBIpJ<nHfEXG
z3N980{>x-ef9T>;+^Auix2mp4rq%r3ea*p;=&~{Ule^S2`83{k^GOs9V@SDE9(10?
z5<IJeT~9+yO>o8#rthk*iMT}WbH6GQ(n$u#`|dK7lNa<<vz0~Fi(Z7i-o?^HlEt{&
zCe1NJ0bgZuHy~Mjr0uYR=bg|)D}ZBp7Hv%-t5%tI&6MJyXlJAb!2)Wb1#|y<rh<XH
z1OQCL+V<PXrLOjv;1!=oH~5GyR~r`-oUE&rqoBy4aIPzCPfC?FyR55y(!!fsozAD*
z_7KU|KxsbhJ`T$G%{0EI!A6w{kd|LO&#Z`@Q`)vmE`b-v*VFvbRV|9Y?9@C;nARC?
zis~j~#eg-VYh#xI`Y&`5GkQSh0~5%)GZ%z6N+ueY5W>`dH|JiJKcbBOsAX;;mKjq}
zO1V-ZTBLj##*9N(_Uk=Y1oAie-{%Yf1vxC8_&Ke1L$XX9#Z{KHcX4nAq!%rierHd1
zV?d8D<_|MaM*)P8s>%3xtLt{wUpzmm4f;mGwTzKHe6P-VdzPPXqJom+g&hb5n&>bf
zK?!OKP@XIaH{A8MbT%Zml3zA4uRX#QuTDhfF*>pE`M<m#uw9zYs26C@O!y3GiI5|b
zJZ`;<U0+>aTI=gv25iF1;w_mWQ@LAZl$_rIviJY6_mxpqc3Ze~3ra|rNQ0DgDhdM9
zB@I%No9<01BHbMurKF|1k?xf4ZZ^#Z?z{Cn=X~dUW8D9Dj63+Vi}kK|t~KYH^O<u#
zZ<K_aF(kH8kfLnO(sp4k(S%YVhTQx(T_Cal3-#YD-7^f6PXDMOs%!5X4z?tfT3YfL
zUNiOdC0&^`x+wGjiHvq2J^x)2Df+X;S0N<~(krs7CpMA-A$Z!#)ZCv}B^2Mf|IJTd
zmZafT>koZ!o5&?-bwSE1ZgT2Uz=ZNyF=kno7HHz2eQ0(uJ+;~-lJN%8ig^$@h06U+
zgeXl9&**Q1Jd&pg#cEF+UMvige~JPk(Wx8K-pq_HergczZ_k8+^^Nv7Y!`&$&pG%8
zr1=8ldhHd%?t`!RL$6%^HjL5RmN3M5NdFtIP;AM!UY@j1Oui7H9lW6BwEH{`4<9N0
z-muh5YIEmGQoUsvMD==Gk(_a`W#9hq)yz1+{IzV@@JX%Y3+!mvNXE_hZLK{Y0}~c^
zx`0n96(Q2k=qJDmael*G!<s(bH*>L(@9Lsujda}olI`?_>k%<==ih_%MU-z`?=2;g
zsQBx$oYZj3?m7$ec5EyNkpwY<fRkq@T%yXPA8j~dX<#s2X=>)Fj=P%JBvOK|!2#))
zzekC*C@0}WG05Zi=n=Q3ifUmm4L?=T+5(w%5+Ni^Qp?TjY5b{Nv#y+y;=^$#{g?l~
z9Rwu06p7_hBL;dwq=}oHm(1BwFKLy?I2<GaB~_qd54p*XBAg6zMs7;o>Fqx8-hJ|4
z-YRVdm*HRyH$fDY<YW7xq;IcH22EbjMjH9y0ozF;2_-mbS|<-eINsPJk(8TF@}DEC
z<%l7Yf}n2M$Oja1Vu{~t=KC_k+KCX}`xr^1Waw=`Bc%NBKWH8xicu7-a9V7JtUh9L
zV1{hWCqTp2!>tgBs5ZeQ_U*$0%h7*@%)pPOsQlL6ac&<%6+#AonX}tJ!SW+PrGjsS
zZ2WGzC{+!8*`XNeT;_**J4BIx+xmti1WW=9{bbTPor%ld*pG2ZuSNMTQa<AR7FeVl
zO^MRrKzw-VZ2PPA3g!Nm*KTz#FWVs!a&jT0q8=6XQQ2|{$>-<iWww?{rtw@cjPl&r
z#O&N0ji=Gu+uK|Z9y~CctFbQ@3jq3R-f7HND!sYj?pav;uAJGwTheU1;B$YgUBgxk
z-^+j`l(_vk8JvteK69fbvT*yppvUryrY1!Nk}Od#TCjmCEcDfIG^RB4)#%{wssu&y
z{Aosv5evS1+qn?Fki9H!$e4+BW*A>^43+n#5l}f#8F(D4uv8!D-DO=hom0HzkBZ&j
z8tB!SC5tO|NmD*wMa?}hkOa9<RTOR)xmt@c>!Nh!M5lH#)Lqo~^x-<kBOdByEwNTe
z0+(so)|#gIOHPSi4Db)QHhW&$)uI*?{59<-eyx<MW>Prx`j4mKCnJsz60%b6xhph(
zW|zWCVV@=?^Ndm#adDA;L(ae`fT&+tn(7gwp8e0bjZPmJ4=$r<%3z{V6EqF<Q<*W<
ztt^ShT!ErfRS1#U#9!`OQrDoX#QTiZj8S--V~q^$<T^tsTatuhHwZc;+_m-PFAp{p
z2g$wDzo!Iui=n(LmZ<R<4XA4PCXt5&m@W`fQjcywZ64tlx|nED#Uuf0DhxtJ!_HGu
zdowM|Iq;C^B=-_Cv<;i1<G6jg{J3*WrPr5#A<@dVcKtCF2BllQ`wT5#p80+3XHXzb
zueKJx$n+O%?=VSn7);VZ3y^q5@E*P&voO?5Dt*Ew6w?6nj`r3tfG9p<7pSDX={HRP
zi{nP1425owt<G*$T7kpGHr{1|AOGdc_&s`^f#m2NrWZo#@$Dgra#3IkT;G*EfyUP4
zeks-5<Oh8378|%+i``F0y86+ny@n41in;8+C2>0kYXKFv{VAYEQz{>rJ#<j`@LcDa
z$uOEn9~;jkDlrGZDCDNFJCc$N)5iogi;DBsj^AMz`4`FLj+W1R>=s!~>X}nkD?^%_
z828Q^W6}&ms*eA~1uzg0GgW4{{KWM>EG*1yvT$GkD6al+P`7IfUGO|yXHN;$1xnub
zb3SJ3s=2yGxc50=UVOdw_Z%xOFtDjqmj@}9=onM4gb3!Rlk(({A5ZC{luXOtREWQl
zmNw6KJ4r|T2ojhEAf>r<MAo9`w6CVEwmAtHLS2_pvBkbz)GFz|Q^_#@YNc^yQ?)Qt
zytK{BzvvY*YsgjH?SXbpQCVRO9WWQtj{xfF+|Q@YV<uA0rVJLV?wQS+8q<N^okcdS
zvZrwhf1yZ9@<>c5`7#hkz}(R#OW0#Aut9%3di9E+G)6(BwXpGAThMjFmhm-ls?S$<
zSP-Mb=<`<5t1N>3SMC9+&y$)VA~)mXYod&*g!Y$4fyoc}=Y|8ad<C|aN`7kbVm7a>
zV6Pq>-XBRrQx;)-xYTY-h#Qi#)~jvFE#NCwgRrrxx%b$P-BY-HnMI>CvyJC7yXV&m
zL5$yNZ{aN^R>ieB*iF|nR#GXv2W8N~<4(8CnVEj-yUW~2(L?(bn<~D=yGj1l=lg~C
zVIXf|XKLDG9>`V2h<GhBo>0~n2i9Ksg}&L8p12Vaz5G`e*Ku-pc{8BpWktaI$7Ltu
z7m+~k%~`V;c|L{Laz>8JsGIdQx#=D=sSZ0pz0F7faR)ief?a!<*-S;)`-9%27G%86
z-~?HbuKI(9KCc5uNEjq@@c4WdltQ4GY(pf=nwS|O)W*USuj;f%1=NhfoA^47ME=;a
z5|nFd<j4H+6eP|4yPy0fBrV|PxIJECkwM+UXg+d=+0M5*wb;WqZbHMJ8QJ^j_HbPt
zZA+FnNvu^NTKtq&d>dD@WN1ANe4gYUhuF*GeqsWY{F;B-15+JV68u_H1D!m$#+?Nb
zN6*=tRh0XD(FHZ0`SVwz`NV|r^952}?>F=!5G4xOpLz2)=~%SMZnW3$MJK=NWMo}R
z;x?6p7J<C!6ebd=am81@3+Q4F!JAmF#&cczl+nK1Hli-R57FA_ro#<U<R$T1?PXn>
zw$G(h?e#T@i*pMn=#1d6KfJ3=-4rltLve&1cWGx&VhZ*m=(Ri5pDvRd3^C<KPX+ur
zYIZ^;P`mtVjmO*K7`vL7P<9Fj?CarD`t0A*C4R0vHaSTK*@@Qy@os8`_%`3}ALbMk
zu!b)hN6Z^HGo)>%c`ArZPwH4`J%nu!`6z%JC1MVYBes3Gz53Xzb9N?QvDG9^b_j1X
zXhScv$U*EF{`EHpo~fD)r_$756A{GmvqqpRYeV5C{<8660dG32|9VL9rcfYtA5*vD
z7_z`Hl)^v69@ITZ+*VN1R42H6xw-=FegC2tff*HOpYPXmU9>r<-CT&Ar>tB~Uvb*!
zE;$?m_luPnDrYp*@s;{)eLYq21FUv(iPySZah)vGId0?1adyAD-qZbJzTe?d>D2A^
zVo~)%d~U3!5c3N;u@1>T`L&X9$JjXk;??W~eTRM3I{=*KvpV|<4a#Jbj#iL+{V&U?
zP16$Xr|pKN3%DYjY?vS9%N&I|@+bSV4BsuN1w8X8D5?s!O6CWpUyVdOb6rNKa%&N}
z{<XRR_4Ifx;ZT+jMvFHPGu8(WaFjS>eNu{A$hWPYuX-k6GgI+U@2JLZ`K37v$1Xyx
zmImh0uq2+~y|z_O0@sHk7|_PG&TyIBPcOd#YTS3x+=!{)PY!Ng=`H9N$A_4R04<06
z<lDTu`bCQg?=yy*5Qapcg-PJvJlmJsScI45du4seJVOHPVkHcT(v)E925NtXuL-&i
zNvz;~j*{>=wCZ`6lo9SP@8@kHbG(E3LeAk+`wNH;W#^Y8c+J!$1B>4E`~5>eJESpd
zXWR<8fkgZ!U!TD}uHYI?`6}*Rd2m`<+QzpKj-K8m@`k$$A5LKJIOlx=pHH)H<bCoJ
z>7s@mNpGCb9@?E9ny};Jify%A>drJT=`7wUG#GS7NmJRH*;XaVC2+scCFanl*zEet
zSKUgHc;7<m&ignlFau2dEHOAh;>B}#OE}==)uKcbEXQeR_jv6`ew^QM%~y;$F^&*!
zy-fiJ8{8CKCh^>w$lL)=Q7q8rBn}&iaJEw*aFL(8aa5eHyl%Dm(TX-$Ad1zdb6s6n
z_N3-Vs9`}7PcKf<*i>b=g=5W<+Os?yC0Jf=8ddbXeTY`M%JReES=W7@NUuza(P(LQ
zdx68b^7$0ApM7O30)6sW@v`;DlQ7X5ojvl43>>9YhN9+cAk$qoV&Veytv%C~X*$Ma
zS&LGasN$AT*W3}z*F!P&-I@3t&|`iLbOLtvB4jVR6lk*baPWJ3bz=SOI{FKr<UB=D
z!oU%A90cm6#+m)zebhmhLb<;hlF!R+XvdwcA2=+oJ0YG-y?YA{QuGozi`Pg3&I83?
z>r<apK@BnY#kJS6^gk7>W^Nok$|>gZ3yN17j8;lofF@i@#T7Gaq4sQ0>JKrule}Er
z)Vsp>M3}9OCnv0}<kV+Xx}c+vDPrIlpb@5W){6^B2$f1bMryrX%N6IDiTp7-=#!nn
zTznoRLM|$1(###{^uk?Lrm5$eb$O~Y>`FH~-MEQE{{yD9-Ss!A(Sh<l$$u$R1Io8j
zBN2`M6brj2${0AfnwCKQoYWIP%QxFBj@D&4rvbXEj%N5tX`AVuhrG=V=bE<c9^CSf
zPcasEcQ^Z1#g{*aR!R_<BKVBug!Y*uZ#j~RE6;8P_d}@{W_IST9sDL+`<V6RNEX0T
zJ_n#mbxr5v);$BiSzGAF(n;XZbPuG0O-Z1}P(I^`rN9mK)f;T-r22%_^Vy3KLD^V`
zot|fzLoXQS3raRvC{L?Iw<k+egnQMaL1lNcmuK`LUd1XyT>9Lxhfh1;0Rdn{^Iv3y
zmRc@H>GRt9I{qekkx<8c%2-hs`JgDNkq@bVGe;pQI#|EKO_>Fj&<vY^-5&BMMu1Q0
z&aIHBxe2BcNkAmuL$#}Y{O7~Ki?>Z{y#py1E)A^p47*bX_nyQMSSJ4l_G30X<!Mk+
z%$2_Z$lCOMN%fM0j!kX0R=a+nuG`0(U&axnTAUw9+tlhK{1*EAw#lfxj$Uj|QSZBE
zgsrUkpR}Oj`&2v=shMJd@fl1x_m4;?@eHyx7#Rt;GIueiyK%>XM`x^Zn+h{JvZ7xt
z=R(}2(5v%|vM=kf0+$pkA*&DPp5(%#1i;G#s>uT+M!t8$3;8k-{J1MhQ7!X5DhQF1
zF?I(UQpH>~yKSOP@x@&aQUtXs_3sYPJ&&##tE<wiy>E0DIhXgFVv&G;6@O+Z>}*nJ
zYF+0&<KooqfyXBG79?=rby55}Dx${HWzIhEQvSXjPkd#?wvzlvhL#3sCAz7}yxa2b
zcp?xmr9TUjVqy)n<~M3{%U#1bju1Kda1;-Q?f9XmgmBc+EYyHj!*WT%t;?MqW}i(p
zsffI~o*50_p?ExYAO~>|%sD{^2C46?skGET9kmD1qX0H;hicE5H+|J`k>CvQ(ExLk
z_UQZ4uNZn{=Si0uJ>YiHFw~U3;C0S7T<;XvS9;Kid!EbK3%G>~z&Ojx=Giy}z+xPN
z?oDgaA#;PLGii4rH+z(2wTczDCo}zM&a&@j)~DwCyu@opTvqE$1b<p>-a&Nl=<3^V
z6$d!>nk~lou%>TB7M#Y|?du5fTj!l(7B`oUyC7c@_}(TzXMUQpmZcdrBz9w+nv;zV
zxtTLx{UO2#aeB|<wRn4x+m?+ccDaOnVbQ9(*BK&Hb#vHkP^iRQIr#F*H0{wGpAN_d
zXmMpVBg`$K-)p+rd|4L7+~hKhSFGYC3H}JC*x3~Lbs>5C+k@gn!ceof{u0oF@j-kJ
z2?zyrP`D3ct#<2z8<SZ}>Sic>=1NQBd>59iB%80Go3lZV5xmU?%;xMj96nbCYG-nV
z*)Nnx_NrzX2eNu%`rFS_&Q&<QV5`(2&}XGFeVY)U)&Pk2H7VWCm%rpB)+-ha2x^G-
zP;^snQTtG}s6@`x?&Mcjdg+F+IU1JuZsdw7r#5^_8lsiGwu+8Bf(mkj?-*4`K6Q)V
zUvWr5;;})auGLt6dM*po{XXVRT2=$RtLrGe;^u>?<G9eT;SS+5Z<HX0a~B~C9xred
z#I{kOl_fr7NqY&Z<}OK#dOnR;8~jZN-_-9datEsn$lThsa6bgSKH&-F|7A)eqsiRV
zBZNL?P_!wKc=2lfkA%uFKUfRC6GCP~k#d<`J^%vcWE#!}H53nH?{mS;PS8Mr62Z%&
z_9>m~wKXMBF-Pqhx8u~jYwjBZ=Lz1t>X|XVneIKH4{1XcGQ-X{tvS6`h7b@TvXeOe
zN_#U#@ScGjM8S$2d$<z9A+Kk!v*wP(VGbr*0{j()bq|_SO<(*nBDCN!DSyT^FWH@j
zGQxL0jb}jUSnJ~IzFv?uCWb46`h}1+klN+LPX+rf%6nc-188537&B@X%?N(b8gx>{
ze-U<GCtz@-<`4RA^&?`!EBqrEG>-RIs<~x2j8YjRG?uR&3>?0duQRG!aW?h3EAMVU
z5h%K7ASU~o3;zUsI?s)Yv7vrtG^WGV^D*Z|!Bfu6`R($)o3g`M8K^aMs`-vxy^;+r
zT;Svb^rUYa)3ZD4TCG^k5$3tCi5CrYE+5FD&GWCtJmP3NRpBPNIpc#BmJgO1Fu3uD
zV^hs1h&j8Ck92J`)GBgs$$KR~i+#|QzR+*J8*Lg35Js4%tmQ<Mr6*QiZG8Q(lL&+9
zz3C<<9(9TxePQr<n5Wxi#&`*G4@;<poj}YOYwfZxH;P1p_x5{i0>SHtr5aBI<_yK9
z)A&<dU24W}n4LH}eye^<H~ms)w98w;#A2g)=9KtzY~e&r$=^%=In?(RB&}lhBban1
zu>6|<#`_e-F|W-%+LP%F{5>fzp&2Zm<KC>^{gL#JJPh4$nvXB*$oiA5iuUtU#hYsm
z$LjkfVdiPh3@J$|HfCgG<O6grJWW6Pyh;<k^54cV$a905uFM)<Wi*#%N=NWrH_SWq
zahSvT0qUW*A$ir%+c@eyr=p@M(J)e;nSLM7CU-IIWX@lkl)=}P+s2n<?LaH~I^pwa
ztl+OT;a>&1-gt*gwnjMq@t`bFIwK55h}_oK6ZVu>rNSQFx|Oz45xO9&QSM)khVir;
zq|jzQwfiWmIeL$2s(0qHmBhSjJnF-!pgZ<D<KY`eTA(9i`~f1zQ)P_t0pv}of2SiP
zCNRg7U;5G`tAp@$|C|-SFZtI?!!68=ha?^wsQ{k)*HQAXua%tPk?|cy4Z?rm)8Cu$
zp>NADfdnn*X}=&Gh5zfbzXr_M0bC@t+edZ)&Gi3V&hIOuFF>S{<S6xz0fAX&Jp6u5
zw}kY+;~^kPDk1<K$~>E){~RzMn1<4sbPMXg=KP<@d`?He^80E&NcwL{{ChU)z%(*;
zB7Cv`cY**;C5lLhBsrAI^G|BHd<EcyouEb}{?9f3HCGZ3KvJL61<n6S+@_WWOe0?$
z>Dga!!{7e-@6P1^%>TO(Fb#Ddl>b*3EW>?EvFDHE4Qn0&%xT;Jdk4I+tb6g-7cuu5
zQOROrq%+x!+}tjB8)mj#{abVMT<8=l_5nHkgy#cpfBF^1pX2_mM9lq2rgTbG)uaF}
zJm=}R{7M4r?X8uC1;B+A$_Lcr<TN%?{%o=H_@c`S1cV>pPCA)33%qHEvjH=dY{INF
zoRWMIz?TBS^;P3e&d#Kb_U&+Ikpved3+IEaZIy-syGHHw24Sj-!!zxQZZ@q^E(%*e
zEBJ!`_jq2I-7FHIQJ}ExT|*5eeajIzRaX#YC)t-UQJW>hC)zaHMg`~1^7QcVRw3#R
z*+YK7aF6o>_v3tfS^GOFQj20j`Y;v|C_bwK4acvUJwXF*8DJKpS#N0z2r0}~tyaef
zwJ$5Ku11&hGrDA}H357aZj@g{`P>wFsPNx@p~(<MZsSIbMWkDaav%T%Munu}B-_~|
zvmtZ74BwUGbiftQF2`%l;i`s;@gdJQH6GKDR0#op<o5tHq>NgO#3qYhYPf8X;3CHa
zgcgesQV3TvDQ?6@T5JP?VIduOIgekI0!_D2k60m!)b-fL9q@q{@Z+`2m%qOhdOAF_
zBhLPv-^}ZE1}-^5HIARqQyMMeLKJ_TLP?xCZop6J0)9V!+`c&pSH`E96&06Yvonhq
zzyIHZ_MwS>q~Dpt;v6H~nmm%Al@R`;nbI_geJ;+<FHqnUoPUVH&C%UbS8H!e2)y^D
z_kHPW_D7w<C5$ugWejT(9ssxUoe}B91}f=0#f!m4xE2G$k^fWC$7$h9ayeXU`VU)#
zfQ2~oZ(H$io0EYHw@~eYgY3U|<$wJ^31b-TU$)>smvVjs7z|1=CtFfry8rci8er;t
zf3pOCy#(@U1I}(kaESq*j3f8~@MuaHU$W(bhhw_?MdQT^>nMLKK=kEaZrJKCV4LNk
zAbdtx4j`|I{0naF6y6=mlHMt*Io2P5%8}i{o6FURr10>;=#sB_c|C6-O+gkPK0KEb
z79Plq5S=uqq+T#3PVj+U9&gOMF7if9!}#x3A>eq-pzL(k*gi4bHL|i@vh8K(DZMG{
z%87V5+f(AzVS_Oc#n3t~f-h2jh7d=b>TCiV0+=l-T%N~?wK8ydR!T1=X5OSDxH>y0
z!HIWLU9OYNwnwuoU6F}uzA0x)PX{@Dw6L-&kg)lw$>p;5&av&d3rM3f{0tZrzJCb?
zV8)K+_aZTjihNy^o)ubVNv68z3k&+?7h*RX>~)<TK^s6@dnokt+j27-Te15q(SdFA
zR12aP9G|vQjhQ!lnJHf5oRVQp=;U3hYiiMZGYpB`6uNgQv=pp6v74tme<l^RRP(~z
z)mfa>u`xYOEvY$Sfkr$b60}Ek`@NDG8yG)KGB&6%iQ%n|8Fv^T{2$!~)Prno`G7P{
z(^cyQ2T$L#dh0J60uo5czV}Dyiy@5Z>lzmU99|2l_SboW1Te3&qMDW9jeZ_Q#q|j&
zt}TE)Y{X78lFPq@)~XD~l{BoNc{~W%DKdd=Hvh=I8gy-1zXM<Uh^hDF%jH|aT@e7d
zXUxWVBgVm8+62qK9Z2^)P*!O)`O}R!LkH)i6D26dfUAezqst4RUBvquV6M1mn6WHK
z2IARFGk|Etncz($_zplZd8YJl3Iy=dM=_uC@g;+Nc2fpn^{1mr_yA^@D!83R(7#hq
z6d$zLb+Hff8LI$@$#l!k1vclP{i_k;%Y<TG)UKiBk&#GS!;;N5;ezLvHB}CSM8tz9
zv7QgKCdOYMMSjHN_Mmb&Y`$-*Boyds03b%Q^*9agF71#=bxpmAY_P+W-T=rOs<XNI
zr+5WN5$PQU&d_G3I$WzrN>LWvjEiee@(TuB@r2uev!VVbwRYO<cA<nJm78^HcEd}7
zV1;)|mo7bVqfeE|7D%Ppa;q_k8Z;D=nS9gFA9IdZEpCPau>B0PY0Cir;`;^foBg}s
z^(>za9!Pi`qK8<5!JVr4d{hiq@H_jTME#%1tsgQPIG^z<kY;=_FVccVaNNtJ=2*R5
z@XXr`X6-$}0rViBg;l^NGc5Hav#<?JsFDH^1J?mXe=n9trO&^`Xc&N<6Eue|h7YL@
zViAMgtQJHZJEEk!Zp#3!#6p1I>-Ch}AD8F5C~&*u3p~rgzc*P6{%=mZrH=t-0EHTl
zaaXtu*HtHflUdd6aG-8_$g`&L#w!i6+7#QmY2CXRNaxkXFJss8-D1d_BykR{vJR1x
z?o2q^7X(Ee0s;w(=giF;2~)`coHV`nqy5}oD@oqU=E8kb&+sw3Heqmww0tkF_+Gsk
zJO;P%Wz6M1Y;JCW9V_~9^Uv8Cr}EG8IPa)I2S8r)g+JO(Yz+|O#>h_kp4~LLUniND
zmDigRl23EH&VyYQv<)832psuiKXXdC*YoIk4L059k&kItRS+D|TlGVyQsO)WLM8m%
zZ5wFw-Pxf4+YrE{VR~NHho?~nf~>=#t_C2j0mS-*p2d;kH}8V1x{J%3kBT9eHCLZ(
zTv_E4m(p`jto&~$b)fKkhqU8vQT0#t@1mgU{VMx+=>Xq{@c{%TJtN~5-4ianXV`R_
zecS)N<Jx;&wZ3U3xS*fCdLiFXOQFx{<!qYpg}kPD*^~Kpk%Bi^eZl~@A(IBlQ>f{U
zYiWv%_hoy%i8L|M-9_`g@trYy&>v(>$sO?OScYQB{^a<O;PrUMong?FiR}VpncU|^
z#*@dtjKf(jT~1HO6rAfX8T)!mg2v-@Y?mixtjgk?jJUHflip^<C~S_;9zgf6cS^vw
zDLqeJMK@Ey@gvcJS*oPWtmlg$gYxwG(p%5P`xo5PS6#p4?@WZK2aDdsjVZtY6sSS)
z?o&*^97iKzLJFr*L+xpFh+ewr!moJ>@5?BAZQ2Mz5`g!sf@f-~qg0pwu&8=Y6S25v
zrT1GtoIz&A3s2<Ia8J<#&P7$t_R4;@xLhGsZKrm{Un|{DS5ia$HLCbsX+-kv9(2&f
zqsfw*yXUYXI4Pq)3Mrpsii9~Kb~6LH+0q4IZ)=#ID8_>W%`2Bg1BX8Mfer50A+Zyk
zKxVjf$hwdI{8TB0r858%oF@yoCO?Pie>-a@z`4l;p``yUMZ<>}A4V&F7HUa>B-W?M
zdsvGbgbtHpi+!{symxJ?lK{3B(S;;EvzguEUB-mN257O~XS+D}lb+muzFBLV3ZoQ;
zS#HHelhrV&H;W?B!!CB&(%qp4(NfieC$ek}KCUMiEC49`;Ca!y{IN47$aNpD*H=^D
zeL@RG1lnJIP_)&xhoW3x398=@>~Fri1@Uu5U~5N=nmjtX0ibCufz$Kz#M_I-q5c^!
zM^_(oiX+o{TOSu)6W02%dO|dZg4esXs~t$`)qAh*VpSDcBelIw7jJ$zbZhn{TNRT^
zH{V^8mx^x#{7<2;Tga?T;<aKuicQjF?j?$8wG_F$ZDzik6VI`hG`zpNSrnd6hV2(s
z2F=8!r=34{yNGp7JL{s}bJU!LZApt!q%8HZtiiGRiLLTj2W{N)F$H0v<~tGC5uHNb
zk2Wk;0lE02$vdCDbn<l;l$Bm=w+e{#yZFponp677_j-SpA(|duF68%L%aDPDaw>lb
z05gKc%x|5DXjPA?VN23x>7tJvxL@2)5BWsJH2CY)-(3<YCLR>qI&PaThRDOt@+xv6
z-kqs7;&}|!1A$e81rLW!Hjn7S9b^&LV@8*=V$4&pIRp$|@PK3F-v{{eiNzwlROk)N
zj1c70*Sy~~xQEoPh6{%lqC0^+4;wWt9S*Uk#l>%?IYRl~;T!<QgnO}m4?nl2d!gmf
z;Ql({%Ah{p0D=eXg8G+H$s(51ukARRVX{X#;T+QscKu_%<&4@gl^9(Nf%!Bh8!lHu
zHh!%td;x9NE$V@u)t|oSq1Bc;njX3nho>P)m?KXWH!h6i??N~l63ZLjuXId=?ZkTa
zRxKCo>65qKu5<YCYU&?5y4uSBsto)Ilt#RCcpbj0jh)bVas5&^A$}ruCs-XT1BWS&
z?Fzn|W2FHH&wY*wp!xuO9-^m_YDiBDCa!nE=Xd^sH>uG6m7gIoGNt!32Dd`zjG`X(
zWD7qSR@W1*!1cT-Qz=(J{Ip%t1s&5P;t*-&$*Fqh^mC>Q3Zs*@Y{eYSy5C>W*9d5!
zeR?B*t{}SaRL$7h;9g69)guJ-9b>GYPQEkH86N!tAW8`6R8C)JcY$DvF-gtwZX}au
zvDC->4%RT0FgN$3sE8eu?)M7t<|;Tk0)e8BrESkb-Y$S`kt#Qk@{-7YX4|~;xYhB%
zeKW;zNN^UleN8;;%+>3lR&b+cRk1%s9;;B(06bxvy3NkbAg?{UAM>>zFvZ15H6EQO
zPwM@NZG7H5lj%{=d?y<>%?L?Uad}g#5x%R)?8}`&kstfJWPu8B4%h8734c4bYF~UA
zo=oYvf^}2Gc=_E=o|gBV%BQ+l@(GS5-yTwUB#vY;ZWG#qK#Ef9mz8XWA?#*JdF1lE
zeY175dnVqoX-=}F!wH@MSKtW)dVp^{3kpB@^P+$vfv5b;iC|IXvx<ef;gq?n5tO>f
zwyeoG#FdON+V-bD>h<1YwSxLf&$(tM^q0L-ct3lsQ=vONDEJlhV{-js9mr==(b0!3
z^apyX&-UkbL_56Me>LO;FqiEY%=lYeleG`JY`4TRlMAsvN>dFE*^@_;L^TjyLMT6<
zu?jF8RG#F>g+vuJV31b6+L&`33>JUQggS`Hm`)MhC-hhazHzV_1K<aLEF7$#-eUUG
zbstA_G?yy40q{T#>BKR-pHbGc$`XG+rFjn|C9+P=PET{%dVKjTh0hZ+=fm%NF5ll$
zQc}8?TXHAtw|%NAFXs`?`);SHskz|QZqx?3Xd{RMkg6QssEa;?({t?`E|dDTloPMV
zgwt1Y5AY^<0TgfTa`Z8KFKFZ&jwNGqha58vAE-HP(cwuk+j7svYyVdcKO41i9b2z9
zJA-le3+&gFyE-6L6y2ERaY#(aXfI>R;PFf^9e|>U*v7((77_etY3wG{rvNTLh05ui
zlno}7>$*>LxZ-R8N7??qqhmUcq85P{7)c4zEPOf)>e?6rPpH0~v2x*&Y^=1gv0-QM
z)LV~2{W96vhx${7&lm3Eg?s!=Zq%H4utv7gC^`fiEWYJf%c9!ZJB?=@62E_$%6_Ao
zWbc3W$>qtq3UjaT{l)zq|CxIm0DTUL90R3G>9?`VH!jV-Lx;7}BKC^uhy2ZrgM~cq
zD%>pVQ|V+^scckPI2dvor_4(GK;J-#nhAuF36&6XYQ9N_^IN4qN&?8!l3ljO?-=nr
z0wOy)#>PaEO}2bhF2HYFEaB|6?u)FdsoISq9+&s2B{M>7V=}2g-==}DOIy@L*ybch
zW(A1p9nKlL2Zf{ChQv~|Jh=M2MPJ5~Psih3U%#}w`V~;&5P@8a#vD^YYRIKvBOg!S
z`pJM`d(RYE#rxAa<GLCxqr$Z9Zc$Ze=G}R9b4o$Ul_^EMG`aj|dhDK0@YME}0keYK
z!$I*w-D<(Fy)vYBiMI{eY$z=IN+@c{OlNSMgDG9&phW)Iv<LGKT1TRW<grT1pa=-d
zKxPw*AhXtSv7fnmEL^zrY~yMCBm4W?q@H*&#)N&7$9EqO4K|vTGE8ye?2><2_yn{%
z3I7^eqx2f~GouIS4jty{BE-l*Wxvegggn8^(7gQTK@UI~*|47KEE@HU2;aoL(yoII
zY{=r6LMRVb*4Kv5aLO-Dw-wB;pLa`wJKc2tQw^z?b^cFcf}@=$k0Je`JUS7RC+G<<
z?vE<~lQ5a$f@Hcw#0<6MjZ5K&=5g9wFeRECsnP+j%AfLl7D<3hsn;&+@$ZFVit%+3
zUj&G$S4M3zXHqR{7sz&PJngFI9ITEWJI4xEo>L`?xJOT$CZx?P93^ueTn9y@3{5Mx
ztB-CM<t<q6dYq+QshUBoiyO~1U6R@;%Gcv{5^vAvr#{JJ_}u#3^Dn7dt^PdpIaJZi
zZ9+EquzBT|`k{JW>^H|*aj?zavm1l!6V2Xy1yJ`PP#0A`z^7AxlJA-~&-21Q1td1M
zS9-I#;z8}crkuH{Q4H7YxsG@1x$-Gy3L@JkniER;9}6*YZw|gHEI+pxeR}cQuO6tU
zl0Of-uR0HTbiJ058cPjNL~i2wMEA1pOWVP7hm8BtzT~zIBR1OK&!0P%59pqA_*nQ%
zO{P~v7*hou$HsGoCBf?y*}lTN{XBD;s4v}_pEbF3x6&pG$xb`8Kj6<<`7J)*mLpmK
zr@a(m1xU8wVA0czv{CaRvAm^5X8^2|<G4xZ(R!B1tk?$6^OWaSaz+Xt6`&`UP#wkn
zVv&g9njmM`b`MUVa31Z+O_bxP?GB|DU$6!kKHU$ugBa68#Zfg+F!52VfLeyj8QyIQ
z9Dd{L(;DqYn*{uqo*c2O-j|uwvq9H{7oT+q2JbJLA@=vt&OJ|Wqvbf{q~i7zZ50IU
z!%of5Kkty4EZYIp*-0GJnDwdg7+VITdAE8V0GagIP}bDJqJ5VSB{A1%Gk~Mi`{0S4
z{wQa-ghK9D&PSD!o0uYtevO`d&N6*<lKS)dEVaBua}qruHNFjSS6>CX!9`K22;k<G
z_n|c};qRQKC1TE87r|3NDT(n$qH#FS#hfE3_yvgCfEa@maEHZ{3yPaMKT*PXgQCYe
zpn#zb64!k9y*TU2<-4l1aDwBr8*KDmA0Ta_E$6psOyCX~tEsN{x!qmdbKM@oP(Ju&
z)z=*$q(^g{JIo8)6z8uMic<$o^f`|JIKuQMzPP;Zy1v)(&$2i~mJ-Dy3!b`{5EHdq
z*(oxZUk!X1`(q%-K!4uHqc)Y{IDZ-815BuHrhylv->-CRIR$Fqnu2Y0C8X3JH0dZa
zU)0T~o}55n&&?P87W5YtPN#c;vQN>#m;?Du&)c)9mFv3tI%6N^^rQX|c2&!}_q)G6
zNdP2&;P=@%*E*R34`)D25F2j(^9dritn3I%Kcv4~3ihy}5|65wR&U!Z4-5s;ShvMB
z+`ll@81$3WCaLyi)Fy{YQaSPqS_^9@XNm`}po`3Q4<rdhy<x$;_LLv(tF_z3?N?qw
zXRJ!%DhfPnr@jGguhX0PdNUBugW6O~{n|6LgfYhDtR)h*T>8hWnz|$Xl@Q#*SRJ6c
za3F`rEHO?)f4aY%U_-j-<*NFPF3b99r?#!%ymNCT`JPp`SV??`(}feU+82{eyk+~<
zPQlkwO?tPLhi&k}$Awad%xG9!?e4xn^twT#sN4ZDQYC<YrfBMW_vq($hLO=-AAjr2
z!n#4s6rDNFmV!7Olng9MB^!B>cGa^fYaN2##GY|&Hv{bg+fRVP``U-V3Ayvxm-t6=
zM&`pKJW-g0x(=5zzkDP)P-kKJ8R4YFj0%+)31F-OuA;3B;7*1e{DQU*|A87t$^mY}
zUsa{Re*7D#NC!`LJi7l<`{IuV{|#-Fcn0`hwQv7kD*hK38R`baw^A^=4Yc2(*?$dK
z3kP_)Y2nE9-^K!7a<0JhMaL0|<Zx(Qi2@*yqe>_(je>k$`4WW<KscBv{{7h8c2DOB
zE&xwQBI6xW=yfptYccr5=u!bH?&|vXjg5^*-nnyB@STI>M+5c8>Cak%7wvMwqZE>>
zp+w=|qZ9f8nE~CV$;tR{Co!0CTl9wJH&{%!oL++tAMqzXkO2Ct5}afiMMzk9o)X~8
zPcnQd+y+XT1;*S-^)*Q|N!N|^a}NJB3p{yZClrvCkmu6eGx+6SqL@6J9a)Y;0x}8D
zV#9u`J>6%CNatuU8z~7_L>xKbz{&!EZ3fCa6F9FF=O|`Hb#=YYIC;5prc~JJ>^d9}
z7h<3xB`!qv-zzYtm=gj7lM6?@w?A%H!DYKfm%(oW;QbCV0L1fxIT8;aXwhl;!AN83
zYm%C3LN$rlei!9{44`;PD8FRu-r5oV7KREYkcKcKBO?oYYr$)1Yir9LLR?KQ*2Aj;
z5x7A0yQT%Q08eNAfk9GCsD8H`Hp0bGqL_XIM+k?}5tD|1qN{fSE${g4CYNe6Guv(J
zD&gsmuM}G!DP@4`**uEGmw-GTpF;6}BB9CDhY*Wcc~%G~D*Ug+V9O7h48Jn5c3zK)
zg`CRHU_T@KW8J54`5~cH_+`YVvk@>MeE9$@cQFQlk{5Ih48WmxrZ8W$et?^|;^QX6
zjZ4u)MaA=!oE!!*xp!nz@b&`rry1)C(WWYPJ7fM#NcoqX0=$6e9O0syqg(d>jVn_j
zKFBzeV!y_Cv9Cv?`G<Gz_oh_hMr`6%;^xNsZ&iSQ_gNg+^X>Pf4(R{8eG&Yk;cx^g
zyoCObC-k5F-3|dZ#_~N*E%HB=s0Wx+Y-s2|)B(sv!LyS`KA-0h0df5IkQpX`g2_rr
z{r9JEJ!?6FXF@N<B@g~f>;83Lgh=#snZOGE&v=HH@T@BgLhJfJU%*A31WZ0UO8KAT
zal+s_bvG3GS5oEgHy8UBuqZv<O#d8@<PNxFoO|<b%72PimH|))6BEM!i0)rv2Fm<_
zMCd)w8t(tj9RZ0Ro~!-;%k^h7{9l*rIo`d_(jN&f-Iu#kA*hV&Qus&<dH@8uEG#sS
zTNGRMAJt?0`fxqMj`8?azDk@~i6OD|7w>QWzQMk-=-cuhhhA6a9JPCU2lM;$3&7uf
z>w*cl48zsH-rm~!Iz1~vcM?x7A(IjflmBX0MBj3I;72NBlMVVvQBN0UweOL(OQptL
zYu!<FN!6vy)>`Qz?kEsLhsz^cL2uZrACjSTi1;*!_}x!YzCY}KN*p}^yrJ=X^N>k3
zry`bFl`rG_Knj1~V45)UN+#_$z50~3I;)Zg+HpV=uuMYn{GV$LSJ{x)-V_TvBUjtb
zGBkQ#3^atv8}*?*@KRw>&nKyfy~2LnoyfK7Pi6cRGZFzaQeuNfB0yrJCfpho{{Gdc
z7UYXXj!LU3EbYnZa`W}!uaYMN{N-zz5#pH1pQDl>5{LSt*_IRebzfr`6yvky?)zb3
zX4tA>5)=9AS*|7ebuf0F>h4HdN!5K_wnUUSz9?^KA`ys?{N9pCB0ZHrdiwB_#M`%_
zd;_4V12c=s!Xy#lOF==mBg4p83-U_4Wl%JuYeNr@5D74z+^nq0*K+kd6|LaM?B8^B
zzqtjmji2;SkCXD4%N8Z`+N>t?i7qNs|A@*XVbad}-UxYb?3lBX^zQked*eh>!$8Sw
z6M)N=22s@2ZME}3w6Lo!vwlO(qR1*1QLo&+H`t^l=HqDE_)Mi0Dm9&^o-;iW5*k|d
z(?|?IAf&<+lj@CQO~}DQbkw(%0dB?@Wi$}Do$dBCb9(p!eP{e(F~&eDuw|j67}|hG
za`cHTY^Z3J6U!i5mgov7|FS0IS88zM$}?zgihZW1?Q%H7-rNr<$)%{Vcq`y@2eXX*
z@qOWE!#y%O?v`B`8E=-^09l!RyVMo5r1|ZM+Vn<Wg5u72UeUm^a^OV4)F*45<+gxq
zAX!;QB^^!?ua^(j?}=m8kd0$0%2Z4fqSvXmoiJijegD3!=kE6AELS=6vr5%l(xlt@
z3x|_6nY0}J`MSDi*gm)Ne7192>@x>}?IhvEA%w?adxtZXeL^!<8O6$Jb<S+7h6*Gj
zkH<-)*>zw@uSrG%+PaAZj^!S3P3203?ck^IXlRsZ(E$~kv17T4j8{&;BVJ;$llf!j
zJ<q!hd~Vrm27_d>W#h8)>xQ7~L%GF28JrCY<AFjSw1Ig1PI}qcAF}*j7o4xrad}b-
zuD>k^94`8B$f<ZLZ+e{V$a*^~f|M`jIhy+uc+3Y;iX1&&wQbYQparR4#6NmR>wd_n
zYXEKJ+@52f(bfcmpanPNL*Iy4H9mU{)?BqcsGl-VIgwi~Qe9|puUsKqPd;?{;n<=m
zmnP(#r8`}=Q(Gz*&u&0V&S#Ag|C|PQ5mAKvh)wK!4v1Z=;T0cf8b31p(eK@gi^zh~
z_Vs54{7qy4W}(hS#Ocn2w0<(Df-|o1^Ps`Bg9ktGTly>)#lTs1Mvw&8kA=ovxMh|T
zEba;ekItLkieE0>IxN&~?qqFk-PRpx)}BqC`-gvg<b;#+*8TMc>@qVbxcf2XO%vEd
z?rg_z3}^V*b2Y3QX>hu7SJFTHISMQ3+-#|%gx*2JDlSmm)#oHK<Ea=JUT4hjl?V!d
zF2v!k#`w)CPeo_|$OqBlId21*+1pr$y)D(Jb6!ySlhHncbpT{OXB8I=^>jL9ctCc!
z14~m8qtFNrwJNFY)R#*|NE^Obggk=`B^nI{ZX*JH7v(p$OF(M$v6rqNfsjCENNmRH
z<x%_m{;g4O<I5S@3tPSQK91(->P7ddSLpLA+Ghvzst)VD>#i^$-w;DA9Wk<hE}Y>~
zT=T7{0^}2-?whn~c-k6B-NOj+vi!EkR~xF_0+mF=7V?S&if}b-oA>$rPTIYu9^#qy
zbt`jx_=#}dI9jL9+IrFNR5ft?3{RA)+}ww;r1>}}NOo#J<AtJZ*v<s<j_-N%`Houi
zrBe6{j^;gX=fin=L5Iuc-j!=MohDtWFb}S*mCi#HnK}ECp{yR&HQ>2km+K93U>`tF
zvR8*&eNIamVc`jCSP<{qYuQ={KLwp*oEKn8W>KKXZZ<cej@t4vF39m^9_QNC*D{+~
zmuBNRTDan8;eXMDGV-F2MFD0M0n<ba$xYCp^nHMhPhQPnVUVw6+a{Vgc?M34y^}Ry
zFX=f#$t<GL=i`;e2yB~g`NT~T@LvkTJ0ZGJiJ#*oa|lL}OpuG)zEv_s=xukf7BHXX
zOSmBtcic#Dp-y`ns^YOeCxD8+l2Cvftl1mSZXSmy@cH}!_)f3@hjSa$ysrT~=i?1$
zv0i<Zep2hc^*6h{Mem!UbY^0)^#}uc{9i#mkM*xnf=2_T!YHURa5&wS7J)VtSs~`1
zYD_)3#rF4iVB}cDH$Hb)n>}f+b5xN;1sYCD!MMf`RvB6ZXBS5ms5~nm<dhF_BT9YF
zJ%ycy<GB`gKaN1}@>RE4dfyHTs|i!NEj1ySB81b4YUpoG7KO;97tfN&OpA`@tu|gK
zd&VJtAWSqOq#PoBSM}<n#0%)0;}DuUT86jVXOX+h%<HSIB97v#no?t=SVRWO9LE<u
z7_9hMaOpmU+uWY7og#m!A=|ZasZC?Ox1fH<&FQ&2wzPky<#Wg0am|XUBWfR5&xT*p
z4S;vrTr?sku4Wdh7ijF(4lG2KcnZ(04n*&P-=WoH=E=pg#qlqA$wdg&=WGEWM1nyb
z&}eGehv4`=l%d`~N@3Lv?-=4EHYQrwzExPL_L$(nA^c}B(HI^0M>MDZ$P2ot_o2$N
zp;^z=Sy5mx=$vnqS_0SPx4@p-tC~qlovO?JkpV92do5xwtRM?Xfmv1}%|uJ`=_YV}
z!`Zp;Ni((g@I^vU^Pc#9Y344&pfxrTOO|lQch-Y;;N(u0^qB3;+<WmfzU;X_Ga&>l
zCMgEnG8QGXTG^c_F!z5^z07(3*w+-HmDKUZUa{`t$-&faG1S0};4%Fa)6XxDD$afq
zcWo(~Pc?VGCe|k*qU-{S2q2A+$-<zEdq2<7#)OCIyt_JMY>n(CUKF}6(>~S|={(eV
zR>-W6T(9xjVvicb&@Aj*QT;8HrR>DdcJIHxO&6Is6a$cOa(Vpv{fXUXjZ#E02>84f
zhf3sCj(m#kAvTkgA?nND3bOX_sJdKM0ki+lxgVL0VQs%r_<rpXC83i(pb-|rrf&B8
zW4R@J)2q8)t%Q%$rb9TI-jvs!1hblK^mDv)AQxYz7ne2{^>89+P?I!ViBLFc#VEA%
z6(WBDUU0t<EoWW)9^So0EWPcKnYLvIKG`-uzoZT!mUFC}L0U`g46_zNN)V=eoQQni
zXq~iZzh{Wq1$5#`Rhyn<C7jvY?ar1odyn|+4op=FRtS?($aG2uKDf}~wmT|U)amoZ
zrw^XJrV{sl*%?j_x-e2k{E3P}Y3=IaCr|iQf}A(s1|?@ibRw3B4&rr^6iRyQ-y~L3
zZRg`9>{%taSN$3WsF&?3XEZL<1LMHJ5zm;qHx=kaCYBs<(7y5}5wiYN7jdx^S!Zs}
z5_7J(CpuDNZ>&{#@KGsRt#bi(Bsh|7<;rzOu~fZ0p_wxiPMZ^2<8Y>~xh+JCd&hr$
z8dj};xqq=ZfdTy>+ze#&K~eUr3^mhZA~*rKVh`UEwK?HpG_f8u=Fo}y6gS@q&1#6a
zQhEIdN%KGbNo>&T%SbhKM-ce{D>6^j;4C)sy#Bz^Y_aLqQhV^ZUXXkWpA|I%=WXEL
zOrsoVUi^&m=UA4E>fR~6h$>$`EKwH0erS2a{I`FHPZyb)$j$rhk2}d|H(3&tznI-&
zUX{OaL#d3u5<Nq~Ae$Z1`r?*aTKyBtR^hXy!VVf)Od)6UsK+`)En?A6IQ-wZJjQKu
zB0FRJh^hZUul0+VkkY}IZ9d*;E5H=&cTxMiCqhES>WGL>S~Uy74ck4VI3{3J&=_1w
zo()H!AY&MR#A8ZdaVB^HJ?`T50P4DKqm9=9i+(m^{{&a9NPFT?KqyO!)>rw1*V0>@
z(Qg5Y?tYwv=&dGDGYAhS6CWp1Xt=nLui0~w<4(+s9%|-J;fXVUXJ1zF{;Lrd6wbIO
zWLaP8szcq1*zAT{wOcN|f0a50%Is95Dr%DYegsTynmUGIv)9#$ixcTohAZR}mp7c;
z&jDqVcVl`&txIGaoQU5k&f15NiPKWM{LpT_H*WNY5wc#~``2JBQq>Z`%S_5}srcZ!
zf^_u4el?7LOH|-Tf455MdsLm<TBtX`gG(Uj-m6x`)F$@!_$%A!kYNlBWz}wMbL6D`
z9jamNa5V^&Bz7yg|MubF6LjFIWy9L7hX^}(t>C>gNZE&xC-dG+6_Le-4r(7#6VTWr
zqX1K?{5r$1_2mwD<l;R^CSmhs)hcVr0@GRFlcp)I9f1X&sD2T=qwt`FHx1@HI6{HJ
zPSES<rIKg-Vi`QUdeFefNS{%v;TBl}N#==CFOQ~rL{5I{QL+t68g8gvAbvy3=ji!*
zWYKfur$-$@1lOq4SF&-T{B(Hg3h$5A3p!knA}9p$E5>{kJmXl@os?e(cepA%LOi@D
zS?AAbNz4=lU!%`piwh-6iQS$$5}eMWL9Y*7bdQ7&<KA#Bl+yixHW+&vre44-8mY<2
ztrWKvGC89Rz-N`1pXcf*tzs~8)}=5%*6d9qn=7?xBEtxl#ClTrBPu63IZSd2m1bi(
zUE~+#uR3KBZ>B}O$$|-)Eu$?QJ;tt{M-|6m5^9oa>C$U)Dk!ZjdzuszZ2U?wSM#X!
z3|FaYJ@m^{jd2`&<Yk9<SHNb#$%{0ETcTF1J1w<LhUS@5=S|p~z#$#rOWz5Pu~abE
zeic!@BK#fSd7uo>wsl8clYeJ(w!4(Na{eS6sO-&dNkFVpFMt3pp2<gAU5&yBC}6Ls
zx7^)b+m2k2UU)gk^u6S0>&{AKDKmcSJ2@9ez1bpInb%%sI^C|<X$*Z=qQ0yBL4Dt5
z>nq{J8o907ZFz0BYz)xm!*|$A*#H{$8I=%CMo*<bHfeY=)@t-=!f{@V-+tJ01J$lr
z>-lq!%{#`*xwVSjs6fxH^}A?~aKmktHj-YBlA7Kphg=t=Xl9u6#Aa7-K%}Imi;ax_
z%$@)lqhltD{aCIh`Ee@6(V9fFsg5%7_@jc*Ik)yRkK~b~N13N5(N*b}S9VXo?gpFW
z3@AKC17fIei7kG}KUg|E=@uS=4@2D2Z`e?d`0`u~$uc5--l}7srsTLcKbKxjCvIwB
z!9P~eHwe97bXfO#tXc8!XtPc9cR1(w3Pbn%#yVMRcU_cf?y7K--5pw&*4L+M=oH(=
zlJD?pC>>xTIcf?JL7Nae>2Ee!ST#A&Tt)Qa)w{eCW<x?G;HV#U9MP$?v<SI8t6sDg
z!1sH@75++Z^c#+A7O~m2nXHs$I(fmn=b!`V13#$5qtbUp7ft%?^nn%>b~PB{k4K&s
zj~ci72b8(>L`P1{HnI*QF`BF}i7ZuBW~|zc73JR)zS+`R-N0l_71cTSUHh6&%dlMM
zeE-1*Jt032d0^s{@vRnj-`gh-*utK%%WMCO3&6wakOfbCbj$>}uN8>05(`k&wR`^V
zM+;D;O2n3I|Jwzk0m2gej`oj#wC|Z85Zzz0r&W5Kk$Jk+*W*@=8hTD`S78!hwscIf
zCca-PractmJI#^bx!V{>u~A{$Ul)q!L7%(o)v3DPfTbA!YEwi?o&P#W5@bDnf}git
zNCb$9=b=mx;p&?S=EOX3R<D$x9e1D=a-L3Z)%{jpaQ$ocdriHo7+<fOeQQ7D#@OE1
z#6MXZe)OA7*^0t~KW)2K^ei;q6lO{@ZAahC%N@GVn?Ao^YL(QWRh0x!HC<nmH(MHG
zDyiZU${wg;H-9oZs0qekx^Gw!V{Pc_7ZW<O(+I{xku464YgfB`<!AW%!Q5ddw*?Tx
z3sLzPQbsD56xg630|HQ%p|Km)Rnv%xdjgO1@!u#Sk=R=m#G8BC9`RI>xlMmY=AdJZ
z9pj<n{1|Z362~B)+#TCPaJKn+y-_^Y5EaoimU5fwU}T=-ip*R~tQpy8&-&L7<sn|F
z$4)d$?h8atd@O2TTn(!%CoC_1JgDc`e#h5;DJ@}+AHM#CIqH3Cv=F7R%bb~O(Q9iH
z6y&WfvR0M2&+IFlZ5}ZWvFOsCmut#U7#(e`;}zjUraoaXD%Ek=(3dx<tSY9~GYvhD
z1DIK#F;diQrq}Pg9yUjaSdU3b8V>0%V&Q(rj`hA=pnqz2YLR6z2Cd{#ERQIvhv|Q3
zMzy`p`iw^*@FC`XC1C=WMv5JTh|frOsZ{!=Co70!8>kJOv&Cy)Y|XVKeW9saey`V?
zj69@;k*>UN+teeUKPzSg6Y#VNE0=42^(UZtg)#h+=8=TRTev;fij%0cR6h%0kjm+2
zD(XYZ>EZm!cXF}VcN%TpnR-2Ko<7<)YBN_M6Lv5e#UMXe>Zt3w_sgOTbsnf5yB*y)
z=|kCGdc9Cd*78N9p^@A#h+hazN;lAZt3mYS4GiN@DjS7U4!!Lw5G>xaKiHX?(kgwW
zl^slkYF3>c`x5z#*S~UbnS?FT>v&z$q1;2c3tL!2mvcprxwRwLgj}Yxr>LvSX0|Zy
zO|66JnP{2IzL01#-p`Q^nV4IVHO32(ZgdFF#`Utcf|t8L?C$0XZ<+SXdEyD1k*((g
zkmi<y+@}bvAM2cVx1KDmgV(++!{c?)WUCcb6>rP6G`@Xgi;1%ACiIa!sZFRAuLCZ2
z2=I7YS<16po)zs*8r-yghxNXs_LXp_sbcln6KQ{gje&%K<~z$VsV6_Y!7wI)Uh?O5
zzAmBF&bxg38ID&c>)sj&?;dnqZcA*E_8ATWPxYO5lwN~D2V=gy4*6wiMB4VI2aQ)d
z;)W8bD-_glmtUw;tq?Z184CbA3~pra@OiC&DdqaTFL2r(^@zi>YX({`ZS(=g+c***
z*m0o8W8M*qqtra*%sTB_lb|MrBb{i*2*pQeyU0u=OmHjl@EIJ*pzl0|zlnT}k@1n-
z@;RZ^7sYf65T#+{TQ>{fsVB`P2Z>9jjg`q9yF?8&;ndU~lun`lhrPFqs<LalhG_u-
z=@1F&1_6;yMY<blkOt{aNhKwfmX_{rkW#uE>F%y~ZPe?&p69#2pWlyfjCTwMW6O4*
z`&{c>aUAoQbFTa)e?nXYZ6MKmzL*(z^P&Fy>&N9pyT?}@pNVMLehhgB<tdkCf$+y`
zd*a~m*F$nko@YI4L>nT;;PB}KM=rr-J9y@UbwigU4}OEJ1P1*@F%}tdBcSuL<T{(7
zx_q4eWQKg*{xR*PP^7m^C>QQ7E>T0?_#2}*TtC?dA$_j!4y_(INEbjKx*RrbT^4pR
zfW%HD6#Xd5eZ1-=Mc?Nk)&)(y?>|1<&Q^?XejN~J??tIKN^dj4)~9L=Exq<pmSJhZ
zblE+7?Na)oS{N$p{Nuoevi8|iXRGS@Hib-yOIkP<_yxc;iFMqu8rwJ^3S{l4*Q~Ta
z#rHVNLNdNP8J|Dayu|K*ZLk?`n_B%2huLb9#Qi+-jkDfEbLDq)E^EmA+Ab@j<Mr~a
z;(W%h=|9p99|Y>R(BMhw^QKctC+j=b+=GS1i0^s?)vDv~<7U<u&`!zu(+VM3>BA)o
zq0wjrtn4|gP#bYfT6D4~_%ze+8O#HhSnBqMtGv3F#9;GaIs034>gm^m_>Q*iO7&k|
zkH9?<aN`)5OiAcR?NpziqREFD$aB(BFEz}4{<GqNG89pc=M8a;z^&T0=mS6F+>5P3
z-EUy;eK12q#If2maiAGaR;cgUDN;^f6QU(!HK8=*P-^na*K)8D;6*ANw7rjJ@U*$y
zz8nAA4wc=#je>o!!8P8(ef>I|c=YV66Y+)mXg9kp)k}{zW4j*V7*oj&uDy*OSJD`+
z9|s-nCuT4#UyxwdyqPVgrFr^2ZPVbecFlJ9%hF!M3+XH=kB)w`&L?dSmoB?+Zf1|P
z%XE!CyU*=>MnB7Vp;djwT+gBb)Pb?LeQsMzmDABzgPkc|y;#&6Mgr1_lV3g9j6Kt)
zrutvLGW@tUG@wVmeeJ18lOL0s+RWA-RD~+1-;CFRuo6GiOX9L`L6jFACUD0)j;&Ya
z9A>|DTb!??SX#eAh7qgugu~r0BjDAig8RMX^A|y>im6cYtKOtsn-a)g`#BJb*u!iC
zw?ZD44+$|AIYcs*Lv8!j$EkMz5hgU<G`tFB`0t(M7>C~qxP!H6L`jYr36|*TMd_6C
zGd|8V@OUy6gmo==EeO@g>`YBXaXdM^IqJVmWo|QhyEn%Ne^mB#-Q;xZE*{O`Ws_hF
zjM=f}t9H>OhZdn*-S#5)3)@Xa?b94{ABVm74x+w>qv<6(G4FZE_v){bccbHPMy3MV
zI4d^2ZJ)U!S?{)R??m!iU)Zi>)Utl&&v??ic$rEb^94rIn@*W7&&}3O4qnzQnTOKI
zfQc*XTDRPz;d0J$4s#uyjdCU1QTs=Ke=MWutZX*s4cadrs3ur0Tf?~L=3{iPWa{UG
zN4`;?kL9b2&~ru^Wa*Tf$n!D6CwWL!9mrrIDqBl+1B5&I3$DCUu|~VbbE6im4N4{c
z?@^$pfajy%@nI9$awtsXU@pk%<@^=doOnr*j$DaDEZR%tdfCkv(np@bG(_P7R7K2*
zBSsH$(f1F2=>U+8;WZSW-HF`E$tacy9}WysbMQo(9I{VP5@`%_>qBlSuf=2ZBxXeJ
z4x-(ij9tcp8}UrGGPU~v5rWZ$h>=cV!yG@2z}O=j`~15YF^i;23CAgL+_RR_pUT?&
z(EkduAm0DTi+l6KeLXBKR`~tzK^fACo`+30r*-Z*t5}MVTE_1mQgZZEe?ie|iG1>V
z?9Ub^CAXqlwct&rW{sY~^_R`T8H;mnZyi4@YFU#`Z9u@5{P{qe@Tc<I+5cRmIULFZ
z@qBRs4P*#oPX$R})Yml1GXJ?53Ung4uRjB!vQb`kdbDUjvg`l#Blra~RhU%T=E(3r
zANt!A$ftAAgTl6&|L-UNf7C-=ky*w|-M_~OD}~SYWSOLeMgH=S&m!o3v7wjCC@xRc
zP5%t<E<d=wL@x4d*_2oy>go>0qPFM6;$Tz$^3q@Mo32qBWKcwKA*LRsP|Fg75)p?T
zdr-lBB@A+bE_*l@IUiYY1xo8VUfb()Brexu8XQ>h>LDdW3TVuzdpJjhB7(<>sXLB2
z#gf}oEj+isJBoUFWJ8h6c;_j?e}*!t2V#5Ba#yklEv!Ce)#G*+SOWYXobKnvPk0=8
zJvL*6`Xu}X5o+Y}sUU+mgA)2WUbqbnd|}WN-gkmBNeU8B_b~785&jYj`njNw6Sn&?
zk7U>rg;ZUkO#H6A2OOZJWoqtY^39fg)F0W$r1o+CL&)V`LPM(|;2VK`?P_J9<$bNn
zxlm|u@L&o}4prVi(?Jj>wi(nj;Ynx^PIo8CsUIdr12X!C)0Z;i{sD#NPlu1>o-Xvi
zcf0SjOr&OG@6S}a(a>^m1Hrnnjf@k{e>y$L73SbQ?j)QH!cT96Xc*@zpEe;*;*4{w
z)C3bR;u%N{*M~tGN)euvrKassuFX(XW?J#VKl78|gSU%UOC8FbDd{Q^wa9Y{R60q2
z!N-EDw2;mO%Zj&yx4JYGKkU8%^47om#E>24dn?8sJ9_=nf>z)!S#N9CTi)u|_n~^M
zphdp5sn9$tpK%UKSE&;Wq0FBJ?elx6Xc#a+N@U=F*2%1zXc=k<`3o9ymi~q!_Tg+-
zk85IDhJ23+A{Lpc3IFM?RK$fOggp-Qqr!Bj^Ve9Z!rm`n?$;l0D%~IJGD+OxWdF2@
zBEl3g-ih$2Fv|2Xu1|p6Q*`Jc24Bch$qEZ?fCDwm{jX<hhzqki`@Me4FxK(aS0W|E
zm%e1ZkTK~a^%AQ0RPJ9xstkRhPI{eQ++WaygID-ZgZ}fSU}KI2HG$8kL#2BE{_CID
z=wHB_X_Nbi|BqD@lxj3UUD$9+vNzy&>E`#S`}14S1ib0@wvGJ1Tr|QIN$zQcDKjIX
z=>7dfj3PzTtIAZb+Nv}?obZGUkswc)QS%XOcN$Y!($`ZdpNzp&x^G{I<N{E@VC5TJ
zF9wqI9B+`kv=nhY-KJ&KctZ-A!k|xkBgtQXtt`yPzrSa}G0Fu+gpp#Xv3zZ#Hk1s0
zXbr>+euHG6-`f}#hBqtJ7Qq@I1ZZh0*E`#o4lO?cTd?PVE4#&nU}u|fDxl#B4YPdu
zvuO=Qd8-o0HHe~WAZHxFr-4xiySDMCzezFScI%JOYSuwu57wNa#+w4@SDuI6)V9->
zRo$Sbv>d17iNx85_-7V?3|rgCJNIEU47vs~K3Q&ErZB0)MXCMYxA9;=*+gVN?Qfr!
zV<2Xtu$*KlG)IWtFlK|s{L_wLI8fWCGwO*J*WWxh<g#0h{-&HK0mu=*$obL^S9-T<
z?vmHxoFt=Zo`M3i6pM7mBU}bGIl1w2>~glJj!2`K`W?tHxAy}YbhH?<PkS_U7K#iB
z3x$G{<U^m4mENJ>b$eg*>IL728OHs0o8($`j!_`ik5wtqP!B(6d9PDr8-qf`t%OFx
zzpdKZ_ULRN>o5?F=o5G%8@9-JO!>p^XR}VMHoqtmZUNLj8g>HGvdmu5nmVVwSRhZ5
z%zod-SJeDk@b2~oq(*&%jWF+?TzKAjM1~OYj3vC;13|q85n*~;&e7LbUT_(1C!?wq
zp!m<~wEKpD?R(P``<$zjEqc_)?E41AUU!~88+V|`je6_$8vBN_qzN@&oU_IAdwk(<
zw4CMu9)Kj{5YHQ?rfXI%$L;tTJJ|;b^KcsFCQrw;-9nYVDRn!pKO*L(F(1p11UfBc
z$L$HdPn!k3Hz0+IfQC&T=m7`u`X1FE_Rt@;J+eFIzx(r~yyFBFVxXx=7~xTZN2V2?
zMz~t2v;H2Ah%hy_E2TtJfK(s}!0T&;uTkoCj*OY;&f2cW&J%lTpwjN3Z81oT`kZ?<
zvsc7+BQx%D<yFnQ?+;dBxmy7gf5sD*B=jCZVz$=d=2s*TqV*{w2VqpsS@}*(By#Yp
z7B2K57#J8>Hq6%3xQ*mQLdRkR1%6Ej{5}PdpV{mZa3RY}@$_%!iB|d(#^cb|P9%<2
zf94B+=Tk`)gf2iNc&1-%zcr?n3J8_9B>e7b-mjn&863C9q`};xghc;_OR;|@0|T@g
z%&z>0i+6A?A8_e$9UI^EMaB$+_Qn+PPv5Ve@`6x3-hiyo18NUs0-!p18uaKRbbN`y
za)b3eKdXLwm-m-eH-3KnofJ0XFpJ4j<?vhbMd=r_hB46VBc8yj(9F;?ncZwe&Z>G5
zfmXFJQ7Kp9l_m@dA;(Ot$6At;hLLyo3+p-Np>k72<<-z!RuA2UW*-%TVo=7h#3;61
zkuZXPS5s~|t>RR_$op<A-`WVE2ventK!N)ykl0m@mbP!$p$VLIesT)H^-9Jx7!ayQ
zYd5%Vv=v7H;TH4qw6*cWe443BOLD+NY2;sf$Q+`uw*EDa(Y_bPj)qt_^qJi%o`&f_
zqlcT8PR7<qE*1_96HCDF>B8XS|8RAh1$I!#8`)>Q8ZG~xAOy<X>(QrscR9^7M2BEO
zGcUWORixSqqvp=RhYp-<R2>jcW;OcoLc`&*Xxs+BV0X4Ie0#P|b+0Y)2K3}75I=~g
z3H#dzK30T8FX`brE-N@3Izaqu)St}fdIyByvA`}#9AI=b#a2Plx-T0&Z(M6R6Z2$K
z_$!kj>P7xFz@c)u0wMq=mtVou%gfzSzPWHLgMr=;PowCZW^C#zSey?!21|8YV3HiJ
zPIpQTyD=RYFU`#n)u`Fc$D{xPiYIpr3{J@vvm5o7Y*14td`h7$?+aM>A+{k3j6Gfa
zvqCI$amYFkHky2x5Y}e)!}Eis!^<t}buAj$Z>mLBXcv~C@MGEJv8{{j^DOBOyp_+|
zO!0Ef>sNd5Th;#QPBf`GX=5*tHK`EjVz$P$9B&N&w0c<yT;B>AAKaqXOFU9TL3w-}
zEfvoq1YiWB1P)4{4><Ij+ceWOurr4Nk4UVxKwXghECN+F<<<u^p}7cvOul2kT0~j?
z*{soHAfbLwZ>t1kKLfc$F&K`ip&cd_k>5iJ6H;gOGoC1-*8j>vRXzp89LuujrnX^d
zbxAsB)zUdIpbGBbr1*qm&5um?WOG!gw~ZZIjl<7OazN@SS=t*P1CcIp72hmjt*|Ft
zU&C9Rd{lKEY!;fKt;@G(E{Z}Qu2wY@8~!IXGJ{|oBX5vZ{2+6!l*$K;N(4(z6<EPF
z?4$`$=6aCv?CtFw>~r()PWq|^8Y_JHXL?rQxybR4bV|PVr|DIgjap2}T>xgzTyP~p
z8%lE=GzG2QT^j?piEZK|-lqv1mdIZaBEf@=0_8UGXDjX9^b5FBeThiKBn*s8zqhnf
zVrWhTi>Z8<(#L4?u#4Q}Qe(lTx>Op7hAkias6bX4A;^xgU&x}n8NhX$byREA`xYx{
z-Ep=S@U=M6P^jWn0FR+PddKlpWQC3BT-WFer=oG0b>+VDLJXs3<$6x}WBK`7hrA>-
zxhyGlYlm&m7GHRWiF57Z2l$Zv9um?RVhRR&N+X(A`+ayxOb3fe7F}xKV@*v<A71l&
ziiwdjz|2wJO1;fT)HOW#b-n>h#WZpnE^u2MxH)>H!$0ukU4M;9B=Zf47XwFNrZ!(n
zx&R>t-n*@3Vji1c8MCMy-@@Lv#J+x0JMsb^TEb7x6LWxzSusoMW#UQ8H<(6r(lqR6
zoNu#m{7UBpAODTQ{3LaMZYt~1!l$AL5=(4ifE@B<qSWyBJyW2Y%+^+5(<-zxQ;H7n
z0r?(b71&@2Wf;6SpuWT20U124%h4)o*WtqZM-$Zoch`!6gYp47Fo-II-rWG48ZdBa
z(1m$)6F&!KI#Dbn_-U)Kj)N2p18kBBp?i}@O&k_5z~o|_o($}aq6jGXx?fMm5+C*W
zfxZ5UNYca@6l9f!0dH&@`GM7?)oiUsFUolM`-A|!zrh8QPX--)4vHAl;{KuhQ*>hH
zEUNns4`T6o!e!ePgwdAy>LV`9D?za37)=zXxvC2$BFmfzUpz!qj+rcL8V)QrYtE4;
zKRI-vsRLWX;f&q;%$LEKmz+Hu5>PL%kB9p?=D`vJ0o)yu7M#&noMYg)ZDvT8Oo{+K
z9kLx0eFTvpf^K)SuI>JUkb2qMP=2LSLvaG$bM;)Uy4d7CDB^wrfp!^7XAm{qe3&RP
z$e!IBT6x-HAD}yoY4NqX8Cb@ec(4K1%aUyej_SHHfkYe=<Jr7dQ@PowM7EzV#RMJP
z++nrspSX7sQ%s6h&`7ZQWmHPC418377}xJ1L?#H;2dnp%#KO-VgdT_B-u*mcfpdun
zxE>|gWs-HH8)Q@FppA5uNF*<74i9^oB>}JxpT5>LUS+LwR;=ARVE$7VQ<oNKC7Wc!
z3k}@nJ(70Bctnp5kXCgTf~gU@B$=fLP#_d0V91wGJ7jftdu3hG>T_2ftm6q3Qd6_}
z!z20XilX73^2{;kU|dYPx4^`EJ_Ei7vloG*A|OUR?v#E=DGpY7_+9~pzd`47#Q0pO
zQ9k-9If97C<sxz74}AtKobQ(nF;Y}S6yobd2JQNZFEa^>R@0TzmuFr|MF_gTil1j4
zTD>XWFV<^Yx!Sv<mZPiojkLD^Ft~`Sg3G<$vf5{$F8Ct+#a_O8nc-CVMkSUd_nq2f
zoAdoeM@k<yV|T@eQc1cu19_^}9x~RS*CYDlpNS;9Zkk5TSiP{Cp#VzHSUwW8csnwS
zz9mMi&bL1=RkYo9o==t-1d_ngzzm#%2r3#xkWX`CbXO+c(=BM&_-O<;OZT(<Nj97r
zA>;GPjVw!J=liWSm8s5y<VeVBIOGGc#An~w{A84bvpc)2-oRAIbGZkPQZZ%pM&due
z%)3o%K6j=N)~-;d7Sc}aS4AE&pcbWTXLPG_J0pG~^@3I<KZpMe?YV986ik`@59L7n
zohj+tn=>8D$KjE?ye_uAo1^A%tH+U;A%1O<3!uR9>5UZ#rlTtapU)10doIxF<SB8*
zVboCK*_kdkEwj?p-}q@GW#jE24B|J#(Ql)+%Uu|DG%bu%57yqtS1!o-h_NWn2+?4G
z0g#JL{Qyn^|L;PQ@!V(gx!I=T<2;`cPA}T$&(Sa$_cRkYtmG<M{?>M>I~w==<t<0A
zDCcmVUKUBD&a?l#$_yPB|8;oT`s{CMmu?+VhTuP?U3)Tbd7~d2vZzATljgQ56D};J
zcc4&28OyMKz~^>qa&(jW04vDvRr5FHMK?v!E0z;7F5k#I!2YD7ra$_dbi72&$RZ;p
z!}-zf4|XJ~#%hbl|0NmpBLn<r8rBf%-;4IYfBQ&Dc`G8Y9&{KDLxwD=1`?<w?H&I5
znC@`$$$XQzz|x@M&sc`MosJGx()2g9V^NSt&58ldiIVujTARuYBjI1^D?vCw^bG6G
zzdwd-LjUVW@B<{l)c0ffXFL7Z3sz!Kz+s(xZV(EY`lQN;K!7M3mjF6Mi8jUm(?6FI
zbVX;`<5<<A=G#OsSj!M5)hI&QdIecXOr;h;0CE|^WxFc1#CBx=pA<L374An}sLQx`
z1DjF(r(E<d=kbu|kY&|J>FK+}Wm+w(!Z$SvneMm}e-<S0(G8*I`ssM5q~jcs^5iH0
z$TYC#<3XB~@yrKsbJp2byQ5x*m})&%^~wItZNJ|YgD{(UQ0FX3!3}<;?ppAde;U!k
zOqzGU(nXR%vDGehdPw-VUmU&urWX5~I(8rFY=}134=)e}Dk8uz!~Ta)t{&SAjLaOS
z)5L+jwsq`EbHG3SYUmE*4ET7^0BKpOqAO(tkEfJZ{eBP_n!pSsLUM$vG{F{MC1k_(
zyzZVq9|Vav*!$;<NS&+F90d2>p1$5U`To0m4V7U!!-(SI<1HizB3|D`w6g6jiUgjE
zd{MSWtW5ZmTd<--pQALhLmLphTkeu?sY9jY1P{*FPLBc7IfkY%EO|U`ry<LL*L|1z
z>otx|XE;fmBDJgnS48F>8b|V<%Y6L^6%B>o+-wFTisAjZmDRh)+ph=*VBklK@{p~t
zs}yb@_QQ(He%lv%)qG_XLv>OM&c7o{Fn|>5fiHg70=rK;Gae31Fq=N|-w%nnib>;f
zy0X``fB!B4V({Znev_qx@Y1mjv=i_CY_dVDFu+lCFv$zWP}fw54(5}mPY${mH+>ca
z&hTN7gc8UfD9^k5n|0qmSSev|5#G<s!leZN8CU;_QUA@O{^zg1Uqpx_f>AHdM3Er$
zpV9TtH5MV$>WPMw<bQeZvmXQk`oCZKm!STCJNAF|fFR8OSHowyi(*HY?a%U0+5z|F
zg*g>4;3!Ds_t4OGyKzvj+D*ZZ>xTLI9%7kA!N_F7#N%{JZ_pVU2T%pk*BuHaxF9|Q
z=Z9)(r089Iz$tzEbLwUP_dUU{LGj*jWTL6U{)a==^5j}`$qjBsyE85r^a=2hfJ+AE
zijsoVJ@iWvk&CqaGeMQuv%0Rmy?x!0pKAeWV`8IGYIZe$s2Z1%DZ&w)21Tn`nSZ=D
zuL^>k&r-A30jPvxK*eK8*cn0)mm};w5B>2YK+dpWT#lAwcy_C2lOe_L!(my0=^GPd
zY(|Zj%G9C|4CMjZlc20`B}}vwV9!K`X63nG(5PU5FLK<M=jI5OLw!U%hDWiCLg7XM
zT>+?%)r_E~qUco%e+)2G3Sn^GT_0U@V$*B<uofuW0crbd*OL%c1i-ZsT4h#?Fk!nO
z62q2{m44SviT5zy0vU&aqNIfDh7&kK-^(O)o;ZCH)m{0fd<ftS@%IQP4gn8Hs&#;2
zx;23It%s1s(v{?JW$*=LQc!X2on~jBhW7m!&VUE2?~pHR|NY`Z;0L9Bx!bta7f}H=
z&iw7UhS$k%RzVi3$i606Awd8SR8}<~TJA2j-$)TJ{I&NHxBFm;I+~1BW$of>&q%zl
z*Kbf-_q1wWyevz)pmi-lz3gjUD{a13Aez(k75@BWWV*JPLhv;j1(IT{q<zB|Q3n8_
z23R=l&L|~=tG`lTJ{}6Gw3sCm2|z*Z?sd~WjxS+#8S4E6RAM(i3JVu$Z4KRIjVYhz
zdxKP|kl?fYY%o9c4~YX&*ic+bC?rhr*+*<nY;-=*KWu$S4p;};aUiRCSmdoFqm?OP
zbnyB4hiDpYvi!0nUKfR0hrOrZWQ#(J`9>`kTaoT3aJSl(Qn%A(RqSRHa=6UuWRPfn
z)kG~qB~{S|98NMt4xZO15GhXI_`!f?yrkYDt~>ZnXt`t)p0C{?3RpK;JVhXah%oAn
zn_g0XE>|ule>J^Skt!C_4dBw{@p(_I^F42NxiK?<S4Fi2KBA6&{;D%iN&I%t=z~n+
zj~}#pi9ZzIezpK0{AbCZ0g$a#&>4=UloOy~+=@)kVU&PgiSO<)h8&9h?udLWqb3s&
zYoHb_(8z@1v3zM1J%E=G8g<;Ap`GtbPV&WM6&*7#Y?N>sk+Ph3y|ToT8j79wq0sAL
z4Q9!nRg+E|6iFtbqgToQ!MY=x7tnarSEusSdwyKgy5W_!$H_@KH(!5L2V`1xSVM87
zK(=3D3{IP0ejzFQpXL_>%=}IOscN!Xb9$bPIgB{{>>)M{>8lUT8xc7d;cm-7A;)cT
zyU<YzzzEkfkm~hJU&+{s&D7U9?qG(*3qBqxVs_XZiwq^?=t=Rq!Le_LW6pc_tWnwC
z28|p)vpb2WYI0OFaXd!Y9~p_irM)2V3=j$_9VWAgR(fNijuMiY=e_O(CY!vPWVCCQ
zXlvA@ThuZcP{Enjn~bfy1{66!&}H^b1cxgp9*CDHl--}FhE0yFKZ8qm!{0bU-h4v1
z#si(cp2mBi`b|lEb2N|sLV31|#(&_Cw#xbAFwwB>X1(@ggIiTYES`>gq*9)W^uZ5G
z9>?wI&umSI8da=D68F-nL|fz_^D>JI<d&IpIsHQU;w2Dtp=r$PnhuWDI+#g%I(Xe3
z^$XOpEjLt2H%8BNW`#ssX?Y>#80*s;QJnEafHS9P)1&<&L;}&KxcaO6!GR)F`|)8l
zgOQcr-|fkt)dvtVP|Ub7C7N6I>{|^A<;kV_hN7KXG@n(gJxj4h=G6M=_qF`pVyi;2
zE)W5L!e`Fjj-%!SEbpivPq^HRj&{#_p2+s$_76^|&5z_>UmQ)6rBY}&d5SdKodEdG
z*Fd|4Pocrp0g|UD@;hjZ6>8DvsT84I-iT^fF=jE$w4L+$EO1R0%fq&a9e|~Gxo&d4
zSLP&<b^b(*H(U=|HC+_dQm@jZ({UxpE)+B~=?CuF<0-`8&;+vpmR-C(>qo1z58PJC
z_~2A{YZ)osV=ap@#Zbk&_l$}!o2#1r88yTzEuQt9wUkoaIA-E4>7E!ThJ!e!9_#mR
z@<~b;*m_<*AYs0VC|&89s^_b9DhrFeJvS&pA$c}LERqU{B&@p4OWbJ8qG$H&CgF81
zP2eONF8Af)H*P<lUv~6Rv_4$B+LMjzH~zsQKlO5$le;w1#s@e(Xzts<Cy!~ZnT7LB
z=>X2?I#r3D8nRR(=j3jkPb7K32A)v4L1F1vlhH#=kLnx7opN8eUa<<R*`Bu-fTr`A
zWzncE9Ev;K<LY>bIc3)e99bmd<opa1==2w|q|NY|&%u1J;1#%BH@J}Vc+>KcG0S(s
z2p0mHcD*QTbchn$QYpv)`nXfdi6`5K1MgigySA+BO}`#jM*i~Va5Y+N)iIhneq^}6
zU`!GI+Vm)odzHJ0Ay+#Blt=QoT@KE^&^{uHluy?l=^?{1u1pt2t0JNVFXB@^x^X?N
zxi0M;xv^6fB&dF*M;3bIibK`i5RUcjb#-S?T=-sfp=K4+;CA;7TDjSz0=Gl0YFs!i
zM^WxortF?J^x5~lCgxA_%=P%?ZSf{6z7)>e2e0AJ;NX(-9}sWr;{*k@H8?N&Gop{I
zZO<(&Mi6l)(I9y(WY~1s^=tG#JeS?b%}T9iwOB{bL-$tLPh*;$Y3oK7S)2kw)&!^Z
z;ziG%jw}fz0D*;1EHO9mJ|iREl&6Z#KSoYQEo$H%B`heqVOUf5S^If&<`5gZS!0q+
zO@&oRfSnz0yNbiB+OTo9GtFEb&=$Z?vXA18_6wYZAWo6oDW_q-a~KgFR97`q%cyW`
zB$_vmW*z7`kV>5ypy2Eb-}96?`;SPtLHy=a&qlR0b8n6*GrBJlS1MbwdoNRy<k}OJ
z<g{MUbfrfn)57y~at&_hM1q~=bS(IaALc-Wmf~*)3#hj1y4PJ^7BlN&n5C3l;+C15
z)w@&Xu-YgGU!AXZsx}9g&s*J-#?Np3M4p*plYjEXn~&{5ZpNuctYbdl48Xu<`{d^l
zLL5rSLnTPyZ4dzr-SXlJ(p;B&@uEtb@Ebb2k|Q6Eu)1s8=*$gn+}wHzoKv<8sXgL-
zm!iWX1rrioVL2@dfDQexn6vyhBh64o-Y>A?`Len7TY!A+V+<*=Dp9*eg_%oPmPwOh
zr<;TEcu0M%{~~|8*vi9n(aX;Yb*AWOd;F)XGIRX9^yBqzgI@(csmjIIut-c4S*N6)
zeXm*LkVo5?3RKr$Uv3KsE$)Gzak}$Z)=R+uAi?m=6e5NeFJXl;YSBlcnibW}gz}G!
z1VYLwI@tZ$13D4u+ILloS&jOPrV&+cRfUy^yl%t_J&(xoJ;En!9rXCA8oFQ8tdJ-B
z%=PhYelT|gKBXI19V2`tmh=1#BK)v3_1zxCszut;2>e{6fDyRz!gS~*5S;e$#h`WO
zP@a>~Li`^(e6%_~w8V^Z$WQp}ZxU{vVJ4=KuyTSv-PAQ(TnayVl%rnGf|i3%&JHTa
z`=XE>4McgY(DjHwsL-7?UrKp+3p;SpCi(nFXvx?!ZfyKCHe2gJx8-i1_s6?HzFuBa
z%M~EcID8;F3#7s(Xd62MTek<(cWMs!y5FpqzkXyYXFjE3N@LWv(%Y;tSVNl?f2qMR
z8x*;;La)-r6-u}jr(ZwQ@?<Q&`fT$=XWB+YQ{c`$z{)!G@n|Lxu%Ae>ai`<&xC0+l
ztZ%}f!oglV?h1!O&=bv6(C;(IO|GWbiYOX8JIE5hWnfi{QJhpLdY)!dy%?~S{|TXQ
z8=L_`&O-#w23$4Hif;Y|%j}OHuk#)YZs!I0&bnH%{FSK2n|D6afz|!k*)=^=UtKFU
zZL1zPycmOjF>jxqJZ*8Pca{8@iy=p}B;-xOCQ1H#>#zhy?wB~OQ<5_J*Q4xF%uVMC
z*33#tKk1a+&m@8FdU>~Q?-LMARhZ5Sa-NkWFjFo9mDrV$PEpnr1r_ZLTB^IjSffyq
z_0Os2Fb@d~_`{bhr^{o`<`M#QKfq_5L&Pa>97bbm85qV@BpG9nsZ)W}uRKXE<X0Oe
zmBQiZ_&iNs%Gl=IiL_ho)h^FUAeY@S->7!zGU3HyAXl)=FpDYH^slSuoBo5}$}at6
zKJ1||1kI`RAkh^3xCy647K!;vp}=~!=3;x;F0S<?3vGeG0&e(yeW@^4A-ip;LfC@3
zG2FO$Ut-G05mmw)n^&4{MTvGY1~)(a+GNSeMZ<>rt!ah}l}w+qyt1BPnR6#r5pw3x
z!`9~Gl~QSt-aV?e%MLqjY+*ZqRP&_GG~~<PN}n|Nx3&-~BB|ujJ`&a4(9LRZE^X$W
z-<L`d@bVGQssa_8!|6wrATZdv`KpJsbc1>%iM}c$;l=!OW8W=c??sj!gNoveu2JBI
zw<xsV8c%Y1VWw(13y0;xSPIw~|1w>GcL0><`ZGLiA|)p)3aLd!5#7gIOaz?gli8Np
z!#l^ipPNgTzE9JIki7Wr_;O!iO@_HRII+1^#|y_jM7LYGirnBA))XLH=IjnMUiM(;
zRXcBF1|LrEHJL|Au$@(dSfeuj@?>+exGvy@cGwH6DT|-m=0K@9oXNg_)NcphtG<{?
zFph-_?VR>pA=B0fE1Fq3us0^JsJ5qZTS$C3+giX4f9J^y$MQ-uL5f7ZP{J2NB%O)c
zQjfeBR;KD%L|VM#-r7&Fd@zS|u#3UAy3*rDInwQ->Of>pSbrkqxHFdt(njFN*)uzu
zbe%y1_glDU&r7UCwIRxN=&yi+;{3~IM*!Mi1R7J~srQn2LwF<yCQL7;s^f#jU&OCD
zG3TM9VFN=8vDov~=Vd%d8(n&zU4GdL!oGFc+HoqU^nRv#Tf}N}x8D|?QLbPw^v;@(
z<a?>LctPKQUYp@{b;;$e_b&{^mjfJjI*WBa@;72Vw$J&DfX?Oe>b-3mqIznhVx0EW
zR5HSh$VEkQa4Vv&M$Bgo|FC@^sc^7*=a5p>^1)&{D>PJ;x?1P1bDJOARZUygX;pc<
zpvTs5p*efoM(X){K@5Ft7|}_;wI35DOFK>&{Vc=K74SKNw#l9QvoMNIUFD|3J8Ta>
zP{&Us#F#Uweh^lDx(@`i=<cLyNeIZah|##gHbY2!ULkh`SX%jN@>n5V9GOjVR+P=4
zQtWxkgPOwX%<<S~G&T=C2={xI=gcKm*J@MmZ}AW`=01iu*J<5ey^%maFP|6}#!<sN
za(Hf|w>Z9HtnUpdfu^t2EB+{*4_-7f{S}L=g=m#iCs(8JY;iIVMLaybsK<|w4BSm~
z%BU<lqxOQ4eMFYS{!~Ygv{&QkU%QKHX#YBL^Y#d7{w#wkO4u+yT7fLI)=poT%PJ)r
zMTSK!eX58+8lH#Je9OJk-j67{42qcrqUm%SH1+Y1KqcblGcVUW?XqsX-AYh=<9K*2
z5^t_YMlBmGfY(UAs_|v%Z36LGNnXAP9~u$2#kZ($nlqY34W|L~T)HQ}Br?`s8oYe6
z=D#qvK2wv<M-(l!Kw=6q<f6)uXDh8f<WCBO<>K_(mbMIsUh4B$UBg+X`If$G(yI-v
z*<(>|wwEBcDU6QwG1r5OMJY^8-@BxI)<`<T-qJet$p3J1(G#zQaHZx`;@Y#rNAf-C
zK;yF+F0cE=HjY6{-*+rHD>UdGlqKsK`v;CNB69aHLD+%Dg_^3I*!C&&D?M>XJhJ61
zr+L^;3}9DM!$$cHfjc9`$H`dN+mtSchPU6M8EtOG5KY4_)te5v-E9--tiheIFiX7M
z8Y?Je!wknbsG4)11)}UMyRf9g%?>(D;$C@NZqt*kt9-1PT+Cf}6VA#*35=D|X~Z8J
zAayiyJi*;z!8991uzNE7{=p-&vNtc7)SSZ<;9A(HW&)-AxL)tKd|YcX%Y=?+HrN!V
z=*W-uVJ-RQty;{DP?(pCCAtziS)9PZw`;IhyW&5J{CJv=-n`l&L<!#x9BjnRZOue|
zmK@gZ@*)R^N_X)v<?hY5k8I=QLyGYA4mZbT{S^+OC88{y<Xp<l(WaHv^8k3E4?jIq
zUyZL6b^Yeer6W<f>!1y!EQ0cRszoI>z<8u&(GO;B)CyC=JdE<h#bO8#lx(czhbtD&
z(fV1+VM*GiG9-U8W-ZsO@z^e#m?bm4GOCNk%t}q-xvO}OVDeG*t4~Rl%*+`EV!Z~%
zUl{!Zl=iA>9%bCVjWhv<fOsfcb^7y2ILFQ9T<>4?<U-I$tO_qfyo`Q+%&v1#tWL6g
z!Ox|~FpFrXg4k!gx;myT$@BOiY@19QRYIfXVV<U{-)x*(8C=FsbPDek_$adKP6S@A
zfv~VIyt*)*Rxjq>HE<YzpP3U2p2oF)FrC=eKr(y0%2~N#L*j;mwJ76dvqd5^v4SDf
z7@gJ8gP{GY{l)wb3Dc6`)w9AZACx_M#iJ2y2CWZ9@LKA*tGlmlzj<pqQna$jpMAJW
z^7Zm=hcj}H`zXyITiuz4-eJ$iDeU+40lzs5CB=vn&&*-empLhEmW}t){;ZutZiL%B
zUYAn!vX8BAzWSF`X@j0g^@rMny9c~|QsHD0IrY|@TJ?q|o-uFQJB!yA*-^VJb_@y~
zJ;g-JsQ<-{a7^4Qag{ydIwLx;h+26a%N53$NH40uB8#`xF0!!Wmc5ynV2ba2;F#q8
z`KXrJE1tF3S-hU0K-{3RE+(p@y?wewoaP1y0M}iv<LL7I01d@F+v+VE>!DtlUHGon
z%HnJHBPT36dfLvJ%32wu+4|jeJW<p1R|^Y6F^`{rd(e<<^(Ewq=X%Qn7;fM-Jf+>J
zC>fU(+lpDgyEVfFMW~|geMnc4v2n5X;QU2Py`|da0uN@WuW{pN1*1*X9Nl{67`8Cw
z7_Qw}Vm{Y)LYzSlhLpfeCFwPi{^q9JTTNYBcu6W6q~dR48bMAK(PE4|3Ahfj>rV#T
zIn!L<t{4EkW+kt`@}4|_iKM%XLFN0F0(b6u5X0_u_Doo$xuc~FwBnEQXkCfma$c_-
zJIk5s7UI@*ZmG~=1^(M*tUUDQkGnXk+Iq50>){K%BRjKo{f?r##K}Y4Zm%6I;f3J_
zYT9ND*zT$`G}5mYiD#d@j-o6t>lF*3Am(-Maux2pLEAelY!39<;7uiRdoqt<ReOy1
z9;+~1exF?>c}DM7G66gq9dqrv@HBh;XqzpZClRqrbzsPo6JI`D25<B8kyM|}&njB7
zLM_M9xkYd~&su+m<G_EwW6nzd!BwIN(7y_}4N7Q!p_zI_gSl%`2kj7q^fDB4SWZD{
zF&2&43Uj;!xPA>@9#UYf6Z3#%(=0sGso7{K)zd>DyC5gwis#)z^X<z#!rd~mK^Q(H
z7WnQPekY(exkdYIsK(0i=GlsW!XpV1^6KyL$<ZpGzBI*w-Ysx`TYdzGwrE(6Tip1&
z@L?*fyGdU(d9>i44FWDl5@@GB_E=J1WgiS@SnJ_c+p+|+X@gGp)qTzu{~lO(c4SeT
zpOQ?Rk7c*B3gerQ`^WaTLmzQBMMeW9|5hY(bTCG}BvWG-?p=3h%2YAoM7c}UYzOz=
zThrHAF8zE?)0eedtqDurv;3zf0-xCrD1qcWY})dfv;3)}J^AwreZZwS<&{oIE?UEy
zM#O2BAQXLbWQ-Lzr|Gm&+GB%;KU^mh$uH3O0zdKvfKC+}uu~>GSzYk?WW|bwU;X^@
z+};>H$^4wmJNw)ZZoY$XgbrJDK@6jBB&4}SPd`@9<MOytdn*!G1#NCGiniav?Ic7e
z3tK|XdFVwyy7OYw*&G^`X{|L#fQ`4jGYMw<o=v%ZX6=7b3gmTIQdO3X*B94)I~uVI
z>K5*W=ak5$WyX8Ngby>L<&&p@qn6pX6}C`|kD4dV+u7ea3Ot$9gKf;-{Xj7q5+-GP
z^Q!WmQ#<4hH74?%RpBiG9|L({q*#cUu&!B{L)KGgq;_mr&hx1vZS)dDy$o)POSq@E
z3zW!PO(Mmw0$q2e99-vkf7CBd&h50PvF*Bw6e?tv_H0BUoDg=Ahaa=l9ro5=K&NY+
z>c;yBjEK2|gU{@l82SU`djv*Y`}W_>*Q>Kl=Qj76nuTEgRO~yS`c7*i^#EbDWS3Rm
zDk@9*N>HQ1BDaWM+i_6*P9rq2jYJ4wP?<7G&LnUNqnERVZ#+(vr!*_4xe9W|3K{`e
zYf)NbCf=^Ay|_3!>ul3`xf(xT2LSEMFIu+U9UKA-urpg9VELlqeaxr!To-^77u5=W
zN#@VHIk#bkHK%zu9cI%&H~ce(Ra^t4%C^Apu8XxKV;;M%5F^BN>0&eg4U{Dfy^%pJ
zjbY9C<4ZK>EsQ=uLU6#1e=5TA>GIcliEFaUbfsmvHB$T8?x^B!-CYZm>@g=ou3~m2
z^TM@18FcTo|EEskEo+`?HOHO0y{0&w)&6nGjYVyt&PD*n9BwbH3FD;gE-H9-zDpTZ
zkt}a%dd<>umS?jhdOBdT@&-L?xp>I5AZt)?DkoQ<tSO1;@G1{0b1(%!UeRGT$jF>C
z?PV~-A-3OFmHI1JT|bK|!6T!(kH2XtE0UUIRmjzUMHo7df2Lj{aUqS!QPBMsk<EKW
zZLe`lCh6fg%=}rV*DdX2nGqfhT-0S<g{MdT3Lf&kq!Zy`=7VGrHU1%U%ViZDMS&Td
z$DW^?n)wpx7T<X>M`;F|=q1iv8vDD0<<dXz2gg0U?T4t_c$MlSyE(Lf=!e&Y#N3d7
z=5@8>G+F0VR6Pv8aE?lX$Zh*QI4MlbUjQ7iT?sV%4)1j}V6}5Xv2Rj?bUHCq9%dQn
z4aGA`xgPkMt>jz(bgWD9g-T=%^R$WHIZq!p=WfhWt7nn@!rQSeYJatnoucmVO^Yw#
zD+iPPiS2D)^j2Ym3bhYri--7&i`4q_moYoYqNhJkSPs;_6a%F1M<GX2fNu*uNlwKI
zbA7Qtkx+*cjys?T=N*jEud01~$i&j(ZHbzh+S-YzLeKI6PYU`R9PFE!bjXR;vVQPN
zC||lbBV$~mB|0uylL30NWT^pIxmjtU##d8kpo<ml3EC3q^&qS|5W0Yd=MUG&lj}qP
zlwtD<^~@xW2{6Er8rP!4tt+=i>EM;WDLt!mtz+`3Ie({Xnrw7#6^75Ru;wFt+;EnS
z#DGTnZXh^pxz)dE(_@c>m%KqmAV-o#$atip+GnU)jY8KI*4-yH>D-g=TfS-SnKOmj
zGt<W}B&BzJaO4ZB2d#K@N?3zc-}c|iq#8P|6xQt)D@IB2Mr-Vr!R&-*2m>B2tVWA|
z?1+Dd|CL8)88a<?cJmox)|(byVqfzID>d?|adgV8LjK-0UJ-Z_g}QxOHVmIIclV5J
z`-vDsqBQUFBf=FCN?VoR65ew)g5mmH#~e=IYL@6{&Wr5=!>2Pz)^`Jnr5?aco%08+
zKPx!xlKQfvj>owF`-p6v;a@L+BI=z0=`ViucnRzi`q3BQp^nC)a2Bb~Wahj>VLla)
zVUr;$U}I>y_A#nK1Lp!Sz$4iymoR|1wb>YUj6H?NNn0TgPlY@F<kyozLGg$PU2G5F
zlC*6P`+{-m^k}ALDBIersUl~V9myXEK)LPv>KwP85-J6DuNV(47<p`0ANXSAL<gN+
zt99P41V>%F8^#~Xhl8SkoaK)3*X^+er`clhh>@#_4B6dN$xd77Sk^2%-28goGo51l
zprbpq>iNlLw|Py`jH$W0ajybjr2fZCsxWKs{d=Dn^Ye2%W?}6W^b?xx-ZE9#XJRls
zyV%*Dd^>KP05}aZzi5h!XP)M#gfuI(SG=>yj)`Y~`_LR={EGjum76+##>>lihY+@N
zK>SI;;o}xQNGem7$1^leNB>1klJhK(>r7FWFP$++&bX-A8m6(VB{BDsPo{xj>2%g@
zfI@uZ2!DPhCQs$_uj4V^Vci4W<$MbFl&1YwlNLI>*D)QR;u6jX40_sedxC&D;4}?y
zzc1gOg)bs}>qUe8^isg=x9Yt|R`{kv2_>4c0kBBzN_n%Ki*-CKj|?D4J}DM@b2_u=
zjY(TQU)pMps&|<U(unBFKBY=Rbp+FE{gK+`O%mjg@YiI^%9;+C%O?%{>vC_@pDCp2
zQ);d5&K}sIdr)^*dp)Cri<-H)I(<-YlIf7g;v0ac=wxN0G5$2|s3j5mNU21WjrX`n
ztEx|?O^imzmADPj7$V)LnYi>C%l@3pimwNUi;N=$4|JMhs8ni$P)9y?%Uw)B8-U{!
zW^b0rjA^9bex8Z66pdu7r!~WW!nZwCp-J(f&)&!zqp-lqKVZblWU|!gq`@%jP3Gyv
zP~J7bY{h{FV3h5=JYTJ(Rl_br)dQ28S@a}NHIM2+OiDn3W))R5yLcyyKb$0evXbNm
zRR%gfmwt89CW1dw;>)b@J!P{y?JT?{3aw&xDJ77<dsIqKb+gP79)zvC=_rL;H|)9T
zDe-LHU|Of3->6a!Sbtf)8T!6OVdLVlh)-R_{Qb_l#umpO4xmGCAUdcBBgAv!Vn|8x
zVPC)}!B{e=Ow_E*_>ITK`{(Z8Ll`=|Ln(bssJ%CE_-e1B9q?VeY!?(ICTlpR@_t@s
zLL4e-;kvdV!52CKPyoFQAeRI#RzWH-@mDAhA0TF_X86B)RbHywAV&Hasd<u?A%zrB
zfs}jWcSFCMmC9gHp<5zDbK`{U!@s?E==e=UKu3j3g=-E3=s9{4T(PhOMHcl-<1Mwk
z5Mgf_c($GxeZD_T;D7PF#7KQ1d~Q-H+<Vg2KSY?{F9`g>trDzAlqCPJH|}p;2y*M_
zR3CpEVf==C|NQm=--+xKVw<TZ`-kN7@3(^>h9YE$QLp}+BuextsP~K3DCATB<rn=!
zHUsiINZ(=jb$|WCh4>#W`JbG)|Mfq}#J~+9wi?R+mzG4xLpVY5h1gs76#W17KQJH!
z1US7?n*Y+0E*j8#T{Nm6PX0)*?s4zGoq!0D%=)sZWB-?y7-B<oVbSy*uKyv^{nJoE
zI8Y%*7m8>2@Q0uE@5ZnqgWhBPe}9~|*!0@Gz8xj^_Y209@eQ4$%HH?&YW#Vs-D+<1
zxRF&Bc{(i=w9PxtZ)8eB#tzWNlnC+?eVd#P*wbZn4`guT@PsIM+*U)FWr(u>O&c_1
zgn@sEtFRZ*h}RZxF}eSZ#yL~TI{MP+ndnY?&XRNgOV(`>_oA?%;m9C)u90Uim@zLu
zB}mVBzM%-~6i35a_$!I|>MwYEeX-KVvlpT9+`MN<;4T_)F3B~%eRnmKg8^!ZsPgL6
z8VKb-gb0A6#C%_bG+WL7a^{v1mnRy`RhK0U#39crLJv_l5tPa|ty4=!O#Q8+bzbM#
zPYFZu(2+>&BcZjM8Y}x89Eka~j^a*fRdigqXOi+c>SxF;wg&y!hgh@%pQa+K&X)HN
zRsc_=+iDoN(ozG~M{=J|mK4CU+``@Y4Ma<Od+7+uaxns0ZO*XHm$>C#YLr(CPSN^9
zWdH@lP?MLA%Vw@|P{5xjHWUich>q6$ON0(tWHjRu)(vdDlwoeNOy`(?${VWw>fL(S
zR@=OM(s6#rs9NY7mg?^<fVca5YEVQ8f-+5})hsvnS=D@Btg4P1-)G9;ksSG1W@~@s
zm7CKVti)z7rUoTQfsusQ^V$#CcPj4tsWXhx#7UKX#9@5vD_{3BnXj(gdR_*E_OvdC
z%aKpGe(6m1<<Pz+;+c&j%hVj<NW}TgniNxnIcQ=sb=61?xo-&R6cR8rd*ynznVDB(
zw1rE+YH0FB`Jyw$6L9StR8k)C<AY>7ik;_$Y&46{T!X6wu+nw-Djr4MJCx}~mG~4n
ztnc=e$8@YbH_7YbXTG|;T%KRvJ~;ewotCXdK}cN?V&4bhnTSECcbM4f2=_c6VVGAR
zv15Q+$$D(Z_f@H3+{UvxcJ*?T5}<)pS^atSDvXFHHfwFITNo<`BtQ+!64=Zb+`#Vf
z!flfE!n%KMC`V63z1}eR8Zgb}mFk+mMbpT)$`ZU=A9$)>Vw<@=U!_w@FX^*wX4VA~
z1sFEgzYnezGTq~w;}d_k-x4ujiHOvlh5{W4hR10)+S<53?4^9Jw&>1O#Wt5r3O^&n
z19jpp?uHsuQ*>{P7A^@dE!!R6C-pBKj*z({7y!9oK)pr&y-{!m8gx9_+K-JggrJ`|
z=CZz-RtxL{IQDX%esQAH!;ciGs&ZIN(DaUoS>_Dh0(DMp$MinXF&R!*?l=mh3Hrdm
zX9&H&^evT1=6nihCeg}ys?@p3NHK)lYQTztBH@>VsLe#Zk)$A|n(A`Dj$mgxo7og<
zBhWk!9&|=$UnSY3k5Z22yo<6+KoouNbz$WBl}Iqd8YtkBb@;t*-8E$dUkSeisy^{=
zD!F7Ahig%wuF!4PK^whx^JY^!D7ZUI(sxOiy!gq%99~uuRcIY>(W+Bn6bi&US{Tn)
zr}w%&iA$i+U;IQVi7@gLyV2$7t%qkBiP=YU<t9(Q+&49)bo6oh<)X37I!^;1k)Xv;
zP9AW^eMXj>QO9&WOXj=eF>Q?FYyl8596y;a(vWhIwiX+|$7XrHRvpK(6Vw`g_O3w@
z;8IOj9su3hCqNb7INh5lQGDBXP1Z4=EefxnX>Z}k<$9U_<2X6-kKux;1X%vrJAOvp
ztCsAs@Y&bJbJMu7v>|fydWfm(`k%7(&99lHX)8<S@i%rAJIf3B*U<G>b62&Bi&?MM
zTqg#eT1BIh_Y*nIS)RRz9}xFfY!eNAJmvC>is%p`nsUFKT%)4v(6rAG4Z(lgTXPdu
zXE6bn>~8BF&7>@`=XrX8;&OLm$~^-#3>#w=AJIqzJl`a{I2NNQncA)N7?nzlGd)7O
zrh%{|zJG@L(ft7R32DcN4xaCIH>a90tw!&!_q+t+4WCwlQ!`Y!^6Fk4I%D%L{58AX
zjKlj7inP>u(eXLyHv_}yN4yQIR}0Jw37se)-|fjP(0uSFCEbj>Yb3X5J@={SXN77u
zv*mXJuidR|`X3P$x|1+Cq{FmU%?!z0lvGoh5P)+JKH+IUiOLzGN*#bB`yNWf=#Pwp
zEC$^XepVOw5|BdH$DegNE!<vlOZLXb!LbA!?gFU<-oiQ-a%Q84yQlCB7W13)JSoNb
z&n@p$kg8=pl{<ZDn`f@AIGrl-gOyWYv->92v5b#x>1}7KN)BGxy^U(1?x$g%{7w1w
zDJMfOT9wUXJG^&f1s+_I%~jjdJ$b5ij+QmIms{7-&@?!)2u^c0bsDcyMSEm_Mem;*
zgi9=a4~5|tUQMi`TY>8%wDgskiGoeuS44>CuBu<g+?XrK(}}4d(?4esF!C1n#<(N2
zs-D|Mm~E9ecrfa7Mh6>#Kc3aF2`2zxD%rW}iV)tCG)DuawSM~kM=mnOFfe_KI3t;_
z&#ZhS*G(e9Ni7OiwFd#IJy0Vh;3Qnu<r?Gk%-ULF@_<J%fQ*M=6mkWes+glZJ+3Hf
z`eX&3v#fi3T88<BIj6#%QvW79{*5++>`bdVnaWf2Z2Yc5tB<F2vyyaLd0%g1#TJvp
zH-1NNt>l6aefFK7J-=Tk&0z3fv7?Q%U}`nEKA+VNA?{Dv6WFXX9nOkiD3&5Ug!mGp
z5p(A7Y!#ZiWQP$gmvlauxUP#1J~Zw_1m2EC%46{281Z7`ii(&a*B5I#hl8(4B<I{+
zVlWrbcH+@HHL9#AA^tDoxHy_4L@7Hwj$MEcVgH&$ks+kq#Kx!oVr<$L2=s_X)7oYw
zT+jt#V22;B_9bO!F&RdEWU7|~f@X_SgxN}Sr>M}t$*b+X#_{wY1tU47&lHPPi;|_^
zH!rp|(xOlu0*P+LutcTB<hLwB3--X{(-eoh^PMV7yBei$*aAdw>HYJ$SNT9^slgQ~
z;N_XrXwd0)Z#CVU@G0pm`jx2AbN}|PQB@tB()ZRw@jIvzpN-&FkE#)XY&tS8<}1)+
zf7ud=kA;xA+$^Oom#s>avY*Wt$(8svn<4m`azVUTbV}6TPdU&bN+y;X^-i&adQJ?N
zou>kFjRnj{^bsuEKCaMAK!Jmy{)jHM=wfq>Pt<t&#eDm$0TAlUYCrDPF1T4_eS*+r
z`*LnFkVUVHXp&!3@8w@3yisAO3YmQ;7}iPf@QEro!Q{fWhaBgjgkB8pP@0A3h0WeG
z`7)$?_becu5QHpO-ai!YcM#FP)kp}r@)&qu2kK4nJI**0$!w;iwduwZHBrpQ4>BXJ
zI*3TE4M+RCtnJArSUFZ02`S*fJSQ@Twbu?nCDD_v8C=}R6Mbd3+LgN&V&M1K^sD%Q
z5JwX0NS;gC+rut$K6@Pb`PjHO3~VFymVi^yKd5=_^9ibNRmu(cXAym7-&l!AuZ=%V
zi{bnBW4K4;1~?%ZhJQ&x`^;sR#VYCbDxArHy#_b|lmfn}2a4V3ths>a48D2VJ~)54
zdyVbwx_#Phs)!j})~S^y9^<75RUY?JVllRNY0LD*bC<SR&x;jRPj#lcZ2@r=#P~iI
zWN%EQaYPujbEfz{C%{uA%R)b2UpmixKG^aCm+`?P;=`pP`d=5rmC}TSu&=b5Zo?-%
zq*S2|-gtEtR8_?Jz@`l8x$j9$v&3}JK=nq`7VOc}jLo<%a{DjMyleVGwZA$hV(a$V
z{gdLXQ;h9egnY$^O}iyoO{3@UloMN_uHsepYb9ijpiJ()B1kPEX#z*03oayL=~94O
zfExgY(g*A7E!c#>0L^+tZZBiM-}SlE93uAsU``c9KO8>382C)Y>m0=OBxd>mOZzYn
zZ*|^j!YTam&e>1uPLqO2VSjh>hKWGC7r?8PU-Z*mw&)zHL3<6%NAEe0`eA5y+GeC4
znDpXYm5L9_h}A|E)Nfug>X<GM_g}|60G|AVXsCHgx%p8_s(o8zndk%XpfIdPkSVw(
zLo~|z@s$yfaz9@ZkIJSf8yV?+yNi>!xZ^Z;!h@0c!ZUp{j20dJoI>n_R3f{2>b?!-
z6C<d@G=sa9!t}$NWCL5R?s{8~;CkN;Xi=&2_)=_Vr-V|qNjoKVQgGhc@3iHA5}wsV
znky|eVKqV`yX2Baz1#I(rXE#les&<Fb^{rF3<wW5`woGoe+6K$-R4D2dJS2D^7h}T
zUs3Z<NTA;BUXIhj0b^ACtw@mqA#1~*Qw~%nRd@M1)@^Ap`}>cMF1{&$lK|4O;~Xwg
z&-Xv~9x01*9;gL3BPKqrl|X5)v!ugW^Bc^NE!z1-DS3>Il1M_n^?%rVtAME5s9_Wa
zM35Fl8l*w#27wU~L`f-WB&4KEx=XsH2SHN0hYl&}Zcw_0?)vwD`o7=yo^x|9&doV@
z414dV)_PWl!;GW<71*=bd`1L1gh?MdK*iFc^V&|=4w<^zhQ1(J5NHSC!O^$~#Bq{c
ztxaM75ME*{ib@cekCETN?nw3bDomJ{{^5Enq;}kgC^U8K=^Nkbh@TqKMg|UF74cal
zEW(c653HJ8>{a@kz9*fbvwnCKMORN_Hmq@E6eUMpKtCKA7${l9)%0uH8tx`iOPiMz
zB16u*+gOMs5S8;4DAYSslJ>FjbUI93#6j{ouW)_~9$oDdpp*dbeA(ycVFsu`#MO8K
zK5jTeGPM`81nSrLh!4+_gcJ1M2QA&9W<1<miGDbu=&93%khBt*>#MI*-uy;hnh|oV
zz-2Ha3Of$P^7j3%CUOtC|L59JW$Mw@RqAVXNkD2pyl<Y#`6+a@jtmw7#CX3RJlp@N
zj7z5a`F%~~5K)iA!VKH`11VjgW&#&!#~nOQ`e~t9)<TPvDiXtHOTV#NN6ym6&c`sN
zAy6z}z0?sSbP3+)Ph<cgzD54Lf$%!SCz`-?tRSS3h+3i5Cr&FiUfU%nd9Nw=i`ecj
z`w@(?6(GhdIyHKbvUmxdS|Kqb&TEaY4JePS#L$~VdDKVKL`Olu8xbzbKWq(&L4S2v
zyQ@r96CDF);U-lA^FN)ozbK=W*5Y=66j-zH)xO6)wY#<=s@p}lL>2o5D#CyR@FfUP
zog)zfC2ve-d3bDOP@@%uEV~nMKRdMil6es5Xi^u()2K#yKV`G-{r1w2IP9GYiVxC`
znz$?2%7l%%h_mvV4k^b#m68vkK;GG;63Y5$4p~1@zG_~k^adsb$y9%?-gU4%vCk?k
za3iDk!vFD(ZtCYMyV(-QphL^lxAjJRp~i?&!x})HZs6c6V*#N|?T!RVd9*ec1G0{>
zZuD!QLM2e%@hpjw*iX)gkl#|L0Vpx-w7ngUhR1Iy#*fR8`1nd`-<8{Je&0Q;!z0%>
z21J?og#V)`jzguI>b!{656sx^ucQxA#yn}QdB|@QmS19dwz_vlDKPy`S=9dsay~kH
z+MoUisI(DD9LjrbWHQ~uJCmJ-tfPj|{WC--8Zdv)9VeEOe^8vsz&1oTMHrjDu27#k
zHvsBD$hg@oTw*!d-&8V1A#+fPhgYK1IP|{j`U9J)<$;RE&&qB}QjpfB?b+o$CBbT&
z?}gj2<a*Bsw83~n7Q)+CKz|yuVPBJ+mR5bB8vsw|R^{CL7P_78A#eSz#lW+Lf|oj>
zS%(D2{4iP<xXgLyS1gMd{VCwSdB~s;T=m*Gq3U29Y6lNo%WnqRdFld9qghHvCZTqT
zm|6Do8M;S)YTP;#Kcfa+zmuQZuHbHQu{lha`D&P;UxO5QD54Qfk4%CPeSrKDc(RwV
z1f`Z)qW#KZ{H?8p0|Bv;`qO&zBhpb`34ajX-j6uexWf7?Ix6O-gbm)xn$Fl5W;!kH
zkO<XM42t_na^$<(DSVxon&l?tWu^|Lv;Lie%MRCjKR})Foc<bLVmEE_NeEapjP}2B
z0Yz63mt1F8cCa^U8cy3xOH2+;81qRNi0=AJ@=L%ycI`Gj3FU7@9X$$_^K*MpzIqGB
zUHbEjysAlbP0~^IphW<3hckv$fY8dq{EG0ZMvI1P7Q2nn0p}tx-17NNt^8Ht6P;gm
zj$T_9KsNJy6|NVvz`kjW_wy(1{^y|CwHf}6w-p6Ho@1{c7)@nIv@8LwDqdcJPQL<@
zV?vy8_SHv~Ot#(5iKEp4>9O`jJHhR(;W{Ad{<Y1^S!auc&FQs7-Uh%dk&n!F+|z;E
zq93|f5k^a##%GoMRJ^3Vf};}^Fq&lA)>eA=2GR<pb-yjrNn2FJB1_~oHP3$q8U6?_
zo8F6XH|q13H`Q-wNwkaKyr^b3R|1LkDk)Ig=PEHoQrjGn<GE-AhNv6QUvJjk^&tHo
zv!hK?mREHzFDcvy^iszQ;ayQk6ORraX<xk!^qj@TkYsMc@Y?mrz`sv8Yo9-PtHuV4
zkDjd)#iv-BfHE9R35Fz<mJPODI~PKop!A!)o1yj&@7-v7Y<*P<bKQj0H4mXsHB3;G
zkX_l(<qRGXwSK_LZI@sASOgSLydMv@;Jvb#Vm)T>xbLL-Pfr*o8<_RecAnj<-65_8
zPA|5HvdD5kG`>nd#iGwIHaV6H^(pjy$W*<a#M5FRM>l0iwxR}zpx1v>$tnn)`?>A1
zQp5P%m*rZ!!Zv4ZV{<cl>}1RSO!#;<N#^8Gb4MT${=r&iVlwOl#dM#(wQKcL5H4(a
zgFjxxUF)U&MygX6vsx7!7QN8fy=vYrva=%UI+^8`R;{Hn(iyHo)~qe9`isr+6NnxE
zLh#D>3A)RVx?PlzC6nZpzEleipy7?Jh08)}>t0j3wTUHDT+RGxA8Yn2B3k}63u;2-
zgQRT4`R@<wI`;A+)^Z;gb_{&&o6x?_(_U)De&JJpf7c5=WjprCQCRS5u3udJ0WH7M
zfDjiD!~6M@dsI@8&IKwOr(w5c;dT0$FJw#7(k4FGJ-3XpSd@|l8QxzWXh(_W+0Fd<
z5o3zzZHsw6ypwK2;SKZZrLh8Oy8Ma02Zk13;-)VO==<6XCiXh*k7Hw_72NHGxL`ut
zr`OY(4s*%J58Tew8a4_VW?iq)wG{_Ss-0nVW0$KEBE30%fa7n5UgXqxDw`EwIoowI
zHth1eeXBh1nR1u_<K=AmT%|0B*3$K|#hjVLVif5xLfT>Vu3uv0FUE%1^6Q%8T9w$^
ztkg$ig6G=jXS^ELFJ7jd<%-rRT%=*Uwwg_rF&>VKF+7>8zHWCvdsu0`MCRBRc2#kJ
z<vQ4bXNx(?UQ-9PXyi3O63bVwP=G-vMdv<5JiR+%jf6(OF*Fo4`>iB=7Tay7MTUOs
zOufVY>?HW=s^Kcc;ywL?2Qs5s*%+><uFe~{$0N-C(}yLg2)8|R{bIp0omokpqs-5p
zu^7mJ){XZ;lZPXn9$LKU8~GrPo~=OSMN0nKB2uc<H7mQ4DCmWPZ~VsxgSFPtqFjZs
zE9Kd>DC^Tn)%3<0Quq9?tySyL3ksPxR#&?xl;()pG3qx*EPuqRN~c6>ZrJ4<2iiJ0
z*j-%!MNV}5wkA_GSW*i$W~k>A9BOAGZTF61E3e{D4|`8FR6WyPj|Qox<mVyTmR12)
zl{gneO`@Ju5m~y!#F-}VcvrM<RF@}%E5qf?CN66~nBTH#E7Nsbw;Ql}Wu>^~e#_%I
zW2zBZYjf<p&nr)k?P%XpY991Wmrvf$<7${yJEb#9eWn&jA55~X258;{Q?!e9E4)Xt
zN8>!6ky*07uleLj5~<yEww{=XR`erZ-%Ag95J&xR@fU$}0z?vHzg+`T3o3c7?ZVfK
zK%>uX)zam+$YB__jXr^vh+3%loIf{c&mlBxgU6eiqq6!<0{kw^@t8+MFZtcv{eH!D
zZ!me4n^J73M0900IPO3Ae3?+=!ttnp^qW^f6Cd$P`&qjq+j?AK@J!7y-{t)8UV5&$
z^AVo)s1aEI=_i;i3L-?#-N_iF`FC@_o5p=$ZRC&o5LVF)pxq*z@^rn_0ayb}ZGug1
z=4XpUS2mH-pXPmF2p2HSs|8=K+s=bJVC19iIo86wns;D<j@ypdH$y!0kU;5rhD-MM
z!`q>Ot>2^ecm`>fAsm5s%KV>A1*5$I`e!XCcK3fj07HPVT%7D8JaN1K_90!O1O_C<
zA3*%?p4ouKGHv?EYyNl7{J?+=cVF24w{;;?FtCbyg6|X`-kiq2*C>Yt4EX=CZS}u>
zclZ^014lMwWT4ZihJr#A3Hz6UoQ8UG=RKSxluz(RtZ+zDVtc}1=3^rxO9BD{n$FHO
zr~3i8G5)}DK9vi&=>d-@3#PvYTB2I_^hi?zT~mJ_ZcC)cY<7QN050|P>OlJR?!s0<
zem-Uk7}pRTh^!9Bfxjsige)HV!5-+r8kkt{a8z$^ZPmyjSu?r!uvPNoUm!L1<7C?u
z6sO4tBTAcROt+%)avZ#G1M)bh0b$TTQ|rMSCIGnn@``xy%dB(1KPX3Se5Aab%+4Q+
z+%`E`7rF7~p2L^s`BMyRF1JefLWJkN@dw)lHMLeYwn_63!y_Y8CZ0bPmwqZf!~nId
zeUN(y$FCL-j{*$THV+^mx2nY-OEv$%OHD<^F!i0BbnZWRt_u<p5|R-yAsnxCDBK_%
z`>CeZHuX6(D=RSu#GX@j*BhL0_Yr(JZfWo_25J}@vYrPqXk4r))182e{1zkGHqrFW
z)rJLU^x3BS<<dPu&1_qq&3wd(qif_DFedkbpT;m3qN^e}nWcIN-FQ4BD>JSCrf)4A
zj!d7xgbk~2#oM{on+dbN5Obi$e5YhX4QB)a!-HvY`bQ9dnt`B(9$Hd%cE33Rd`LxN
z&!T2|;49nUbUiYS1O)0jE^JZwh$gXMg(&xOh`Y2bZ<|NLC2hau?TrK5;mD<fRa6{m
zb94wd6eTvghVEg2mVO4@bYXuWtJ8|wkRM#H7A}OubY(k;@aLZTc!V0;en@8twtLbT
zhucWmh>du&^<eN@@v(^sMBG0wQp#~7H;>Z=+vR4yGcZC$@#FxD-GRf-gc3*j&g!55
z=^q@!$tD23`+(ObFfv$RU54Zh=4beV1mExj-2SnnKLix`U5=ykLE%J77l)zS5C88x
ze;^1Rx!*`BSDqE?_ZLt8(w%#Fz@yKYjQ=HixwHU{GLdD*gg5Q|Gt}*$_;kP{Hj+30
z>)!wdD7{AT29Knu5u^N_;m=D9QjlWH`@bjhY<k3IKFwFD->Lg}bGLo0npz?>TEmi2
zpjX7*R}e^2p8@)9&dk<1Pv<IOLxF_&^lXm9kr#%^c9}yCL>9BP-_7Rg>#|)W(>$Y7
zhrKCoP8vQFhR+TApWwu~vk0fwa`DJz8+kTD*5Rj`tOXMKREYd9u~;AbcNjWpXoh73
zdN6di=7lfEq~m{aEPq<~Vu@RBWw~2Ol6odZ$a#xTQ9D0B>f0*W<>z^<j9vkLx3QYp
zC1R4gkTX;5b7;-!a^mYZs^3C^@+UR2ZhLs<lV!&IXFyAcdEp&TcT2#;+AE2U%lW?B
zlHzK|f7%BP@5wq~Nsif(5VcNi_l%u0{O6d$;~LA>hM3)|f-8B<Tx8bM7sScnJ-I_A
zxi{|yTSxDH4Sg^&QHeVKk~5ff;Uiw)o|C&KRbiN<dtU-~JJm;h${t^w8%SZ?N33hP
znmw)`6K*1uGa2~0+AnyXdfM&Y+U5}&id6|zHv}3*us^oHIN5~_rCvpo07b@UO@O2*
zC74a>`G*e}9gl}!FM@w;zu*SCDgOpPL>rk6^#GkD{sy2rl*sS<Qnu>PMy_KF&L2yK
z$n?Ip`?~&d%T#+qO<g^okQ=#niP?f%&xia_rUA;X*H+bVme;`Le)0yXsa^O;{&=*q
z{sn>4aCJce3;Xocn=r~Z!^I6t55JP$kdm8e`>_Gub%q%7<mML}8|W;+LwLUs29$5L
zzdkFxRxW9NV+W7CRQ8iu7P;CDn`#xtKkJlrW5Ut~(nKFkh6+RgRnj9)9kwQyW>0$?
z0u2<rT#?Vz-6%{X;k~49(fSgO&U33Bw;B!7BZ$M~^+rSeqVU;3Saol2uUih2vc&V}
z-Xz>6(J@xnm)LyC<MheGJeEL<D7EOW^>yzL4nT#0YKPi|1g&Gjj$XXxB?ghzU$^7I
z*WUHQqY@)Jh{ow=Mu-vUvC1qAR(C8s@zP3mz_H}c>j5jE)NA|1^^U(t>s7|e(Ugk7
z3_W;;G3!YLFX{)LYase*8mR9u4djk9Pp1}oM$e`0bs+u4o==Y&?|JGnJi7gl0WExK
zm>q<W7{(XvfXngMnZ<a~qa%7Dpr}NkcPH9K3w9xSI6F87E90W-%|EON9FGQw7@Ts$
zw}Rsib&*aJ@B$D=8gwZc24lt{*Zd4b25=ZRUZt_PH)4YSc86Ay1TMZ(iZbz?n>9&-
z05eb-1jgT=DCl-kMO#@`c0i|WJt-HbZSC9nhnj$;aRBOrmlZD#Z>ybc1_H9(*$|-B
zsc!f9UB5%1Gd1T8mCuA{o@=_*3*g@UyIVHY9g-Wg^vtE-IT(^{H%kJN+BapL0Pi9$
z2|8TMk|Hj0&;CJSi6r-TG9@?_jLC`-zu6o(vJp@ADbd{(pc3VIRLWvK;>K8^EFI>!
z$nX+&6(Yl5v}Xd2B)e<qRr(F=C?zQ!+ph;-YsX4`x-4`Wd8~I0Sn<ivfBYm`-}^Cu
z@>e*Ma|N!8;vE0i7jOi~4F#K;<|T5QDmP4hwZIv#v`AfoW2QP#HTcyS5MMC^IJKY1
z@DfayW?eg@uBP9eIJ;YVq1f^dF$V;29h}uWShqKl?EsmjdQtZ{rqE@=^{DiEZT29O
z_ozm6?h@v(P)l*rc%Dp*I1D(cdtG<Dub0=?*Ppmt9yXNdx!1RaQEb=mCtK8nxgA_r
z%ewqpV0_>$@0JVxOGLpCY*2`6M$~WNnD7k<s7PR?adqdR#(e#8o#}!lV~XJRMRLtz
z<m+j`Bh-z$^Of~7&eX!fL0Ve6m|f>bEHg|(<V>E?M4{xN=E0Ybdd)zAlB_|L^b1AL
zKi3Z6TNKD|ANAj*jJ%PM=UeesVX#l=YcN>o<vQGh35Wt?eaw~9k*{8(I1S-03Lm6l
z14e?HIoq{Q9?Q$i<Ag=_TWZJk$Cq_q@0`|$s%2%=9F9&U30p(VfjXL<H2ZNi7fGOi
zKd=P4b>n0Uo<?&HrN`grpuPtn6vP_MXiSAZO62tD@pp8t7xZ5uJV<H$<D#A~ataj`
zNDPXB=?jYK{-}qkA_=U6N^lO*X$@3q=I!OjPZ=GRRNf5Tn)3g0qV;2VWp86+W1-W&
zu=xeedI~bYv0@Y1^`KMbrj^dCfMo=T(D>A$niL@H2LxTDc{S5RFTCzV{YKJkdC*X%
zY-KEV-0o;*NS~yu?X9{t%%0;1sB58sx;BvYf2Xcpn0|Kr7ZZ36A|oR+$d556{<x7}
z8LMRYM%AJXAx3auiGIWDABKrf)kuxx+ku1q_jdiJia6Q20QJp1Ssdj02MK?_1bzfO
zx)<^2w{Z98ioyBqcR1Sbc78R!q1pd>g5W6%Ji@1X{`4ON_`_O0!SC3wsMkY(=Kcp_
zzHp^S%<o1L<Q9k2)J&;O_xH=`F=ti(nL&}$ldS?xFWJQ0G{>xkQjUpz5spxbjGh2*
zF;!g%z*U+QO}HgY0MaqvN7YMY8_juv;yW4q41z=S3;y;np=W5QjH#84jZH{-(lVSN
z!51Od^IKM{&i`70=?%_l4flut`z!L~)KtC!TrYTMtQo@-^Zt))B}a{HE0wNCV)yQw
z0<|=2Zag9Kr)D2GXZBpDhx}L#r8pM%WY=p~cK0@Z^yes)WGRD<ZG&5=k*c#uyumDZ
zy6}@2e&ShC!DCvZHVAZk(JUo3;`{S{j4ZgF<DDIta6!>6uWJef2&hYeJa9NYkOnia
z03NVno?uhsCI-0y!>F#`O0r3u2QiZElXRJOo^Mzk*Xl;y6w*&_MjU4H1WG*DK%q|T
zD8VJ@Ik0Z$#hrI78Rci*keS<K_Pj?0aR#EaK<^BIYHw!17*!VlJQr6);X`;P&_RBz
zJ2^pTKC|m>dgVS;3W3x8jm_0YKDnU=EaKnjMW}^5j0)jpJ1_$^;Xt^DV-N|EoJ3Rz
zk)2kaGu@0s3wbE#Dio&mHZd_#w*}k-O8fa2&d7)}U^xr@ozLL8EI`Ye3l6^lQ7Q6)
zsMA~WheoERmH_=RZw(N4rhVrsq~1Tg8Rq5pd-r}sa7{1qVj~2@wVcw=<CiQBisvuY
zM`&;=@E&c|SBZIRkK!LDLn%j#T=iXnmOk=5aIAmU@cU07@Anx5U#;U0n*4+3xjumI
z$iyGP1sBwR<M$t2x`&7X`r0o_@ZTr2@LSUvm_hWvzd`VP1HS;i1SS7{!USK$D;b)e
z|1}S=m}pUe9W$1N|JPulhz2Y|$(qU-<qt0X9T<WS-0D|pzPC8>?@dEq0gK3v#FOOw
z?*;t|=i&F5_5W+-P=YTaCh29uf6W{WzQ8HHF?xjlU#fE-PIVT=1~L9ib$}jGz|PQB
z|NA5czKH)HRB%-Oe+Vi_@vF&ax8T*0Lp`WUNqNQ?AWA7m0J5{oZL9D4f=zpiD4r%%
z0NN$=(wV_c9F`!|106&@L`8Z2x5yWLyn5er_X)h3m{P2NV@gW`0O@zGPT6p+)-#Pd
z+!S>uifI$+xq}QtwJj+Av_YE|$8C%d<&~i%)(v2@h2a>mois=V|A|C}Lnoyb=q?5^
z)<`E2shJ2#nOqbPrT9slXn;<v{0=*SGhUVru~^%VeA~Vq%eE?AaB9Z0r(N?rP39r_
zBh&^P3?%xKr;uA#<;M+Rf6Li{96x+)@7I)4k!6a9d5?6~OW4gXrsciWabI~ig3$t+
za;^01NCZnJLXt-}GgE|n$;QW*?F)qN6QOWCMq#^$fzNY#gYl3zaNae{DNzUi866L9
zBb-;cBc;LC)uSOStcBJ;F|!uxPzDqw{?-0WrwY#~+rl;k(=B^wny(8(ePJcoT3v<A
z@;t@(bv{8O1KV^T-QkVG?TPmc!MiaK@<|51(g)&{Q-o}%(F5j_`)c1FG~syQ0tQK@
z5xcWQ%!a82vUZLAfCw2(B+fpfZQ_LWX_%eFcLs>F-tfdH!eG#a(G4&lqwrf?&MD&z
zU#dQC2M>zWXAuq_6w>VvQA&vICDu4TV1xUp4F=rzvYTEX6OK3hBoz1TdYU{;d_%Ij
zz+ijd=HHCYwhv)NJUGXpv^QRdj}2ufFIyaBg5N(^A#j<$VUfaXsJIZHDSd-8au~p=
zf0q+Q0Y(AG+(*qrx+rd!7Bc&`MdZN_c_qu&!vX(P;@yEX(NUrU)I$7Yex``my<0jd
zhYno(;bzs$5cptDwDa^}>Nc(_H2M&p&Z08t*asR>h!>g<CdVOfVT0>78;ar%<Ja|@
ziT{TJnd=E&4$ZE}Y%lLNu6XaeG(6HTJ_(mfY)hZ1(^7)2D!1nf()NB@q|0gDhy=j7
zkHAS-d6MKLoP_BhAVX`Mr$6V+QnDd%>-&OV;G*UsA5<2)Bk|o}t_L_DF#O1w8YUgV
z8N*B5e#vk*=uF2h^^>oquT%2do<aOjPv+bz%lIyYhUFHF;VkdQ?u7y3c0Dr&BqO;R
z<Uxn$b|U3%5m)@{JF`cV2G4((`hrh@GZi_OMp|o#P<tmTc#C=!aCqkLOPj)f5_+<o
z4(Oc>cZP28p$=0aUT*m}crVV0GnYVmZlRzKKgZG2%yRh8J)C~Qv}w#9B){wgs>Zoz
z(#ht;x71i1!5cvY`DQ~nz)d_M8WupjLNU2~2tJ3;0}PD;D*rfY%=y0=$naC(3HLP~
z!vAD@{}<mt9)j@NWo%37`s_n6L+V~eAphnA;IDY|ue8?;!_VMcn=li(SF^U6d-z<1
z=)KBrPX5LW%)6!}9Su9YanE-J8g{itFZ}~Aaje?m@^~s}l<$j`&-rkw`zUi#H6IW1
zx7nR==j*XKJ%Reu6w{f5K+f)Kcj0~UO0&6&FLu;_)bqw28joi>A5$Khz(qvJ7qr#I
zJ!*^7kA-HdtDBZn25(MxDcoCy>b7#U3?!d~f}cNcLm2wJ^Dych-QwJW*JAR*>&qe9
zf{be*6rG6{@i%k#d<59fbYAW%z-2biNm_`wH^0I%w69_7F^r<&R5;5a-Ril-d`8ax
zuVxG9lQGztv-{5q*bH&|&p$?H$Qc~I^)|19;8=q37^FF)3H!n8@~B{_BU9eIb5mg&
zJ+{7MWMpJQ?+&#4vJ1QZNo*5m6|zi9aeuFGtW(ui`1!ExwX5Z0@LzEp1J3`SdnMm^
z6^F6lGSP9~xm*0ue0<dV>cYBnK_1+Zo{iqm?xSexv}|tO$PUY1rPG{KsrHHXX5BeI
z<ixv^ogx(ou)j6*+1cC0D#pYPEX?dLr~XWtI^Fb`<Tf9!s+uM{uWY}%ayrncaHyzh
z=gr?Lytns9LS{n+5D^2U{|P`t;A}KN>c{30XbXDgYtsg?A9smZ12IAF$GOMVKVlo2
zf4P5LDTk3XoX$mioen*$V%6T~4w@=)E<F$GtNVT-@a$?p<f8fF9BbR|dbd=z%H64@
zp<2Etec?i2?J6~~ezBnDc*RQNQQzBmhU-O&!qUZx1&Nuw>$wMv1BJEwrhC(upr9cE
z6HV_S&9jE1g6+3JbMYCNbn01p_@YdzgP-&H1NVhx8Ggpu#=@+ucH`u24IBUSt`O~D
z1MiiUYnSKKp_Q(?eKT2Czie2f7E@<-gPo@yUQ-1u3(1(r>!N&K#_fqM2s4_#+Oe3P
zt2^6P*rV@zyJ&vZ@hYgsaRd`q+HhjaR3|sD)aRZ*)K`W!v@n7K70^GQHG|!Ca2vZ^
zPE-H&E%ju-?=#{{>I037%>s&cW3?;yx&`+qF5fOcJC8_ck!R(s1X)~DOq^Ioe0M#W
zbhmO4x;j@B_<gMqkU!D)j|(_j?+(7aF}1t}3FRdGn0~F1{Jk^x&?n00C08%*7qJ2v
zysd`JS3V5u?019;WYSyLS_>o$4jITX^Rkzf3O^loXxaoRG!ffNgp!4-i@fV@9WM;K
zk31%qdhR#fb`~sDQy@&8*v$)d3_kBq6p7u>MA8h|34MG$y7jcEWu_EXASX4O&XOv^
z<mWM<D<_xkMU2YDQpL}ah7I#l(EiMUT6=QvS~OC9e>%NbJA{bhTI4!Hfi?d;!z!OA
zhnzM{>0*Ud_`wRhtXF5&cS49A<7iIWqWjfRA`2l>%524~>paP}9pDV*vDDwlEBs-Q
z%AEc)Po;LUZtKBzx8z`@RQ9_?p+dI?!BMN}OPOG@_2`-cD!D9+^q0iQEb1xj2*DqS
z*WPy|Vn$kU^}Es!ug#6P%FgP!)&G`eV#Fa|4QhiQUN#oVv<V0#47{!jW-u$tUhoo-
z9J9*&<jWpPAz+g9;uTBJBgaU`2Yx<y{tToq&S=hAV6Rd;JbwG<<XAvi-KxZSlT{nl
z<JwqZGH!OFXY)hYRTi^nN|omO3$uK9j19|O4iA*1tS8RV<23PC__s1vzS13{XQq;7
z<rtne@Bi8<q^Rw@$Y+k4S-Cp<VO8%ffnB9Nd&zmcMAASh?k%C~s7bb)88k=iUn*pR
zVPtAyla~UWyWC4jttNpr2&>az<*_g1ZJ)&wadW*1LEOIB(<TY38M|z9{RzF65*jSt
z-VqKOI!OiEWfiB0rl8BXdgj}su0hqFIl4P6Rc<ohCoc5<?Cx^e05!0Y<t%P|js&Hm
zTss&Elyo@dCrbC-Ll?*7UX4Brc=3kS?Uq9#ASanlmpb#3-Y`B&#NymfYg{}91T^#8
zd+H^GN@l(uC^R)DJ2H4w8{ckh^J=<F*`u2LCXQM`U8a!UkW{v3)TV9R+&tBf`<%bl
zSbu-KK)dZ!sX|||WG_;?@4Q#lq$0hA?RGBYFxvTJrr|nX8&v495M)(ZSg%BP>=p^t
z?cAS{#=ht((R4am%Go>{MXoz<cz4c8AR^-Ao63?n7FZ)t7geyOlJ(=~^(Lo9*#lH!
z<(9^Ct#fP`t)W)#GgZbNf#bTEIUe_;v0fy>8EscsKCEimZo9`=_4>SW&KfETPKKr7
z1S1lUc3xv1Ya5<FUgei}nD1~4Dh1<eTR=}_7itJhK2$BgzUJ*coSAA^tG}G3sLH|1
zjPE9Sag<trDD1E}j$5hS6;J6bSQc!~P6u7_AjYy4@y$?J{z<B3JNeyeF!wOUnAG#`
zZ!zf^G8Xw$%JLDb^ibT(kMb<u1V>2XXsd$=uY>AeG>Rv@b0K=eUBfp*tG#S%_pD<>
zZ*Z>keNQo}GU{I+KL=ia;GQ%^z0j4$u|;Lo_4%Gd2A!M8+01dWu%Wh0mbjnA?D{bg
zsuP8ilah;ystWe%0+MUB;Mljanl+{@3kg)16gx|{v&qI8-{qbWTK#Mj_Bp{S`Q4_q
zS;QvSt+8t|5+u<i7>okuv~h)S=tv$XH*p;+gmT7#GTdo>U3k$mmOQJZlH~v^JRQ{j
zZdcyH;nHK0OlEp|UU;p!iJjtp2@^psRHsCVnkS#wvD|^Kq&lUY9`1S;(d_*+BrmC&
zh`OW(5%XDeo)TnfH?iSK%>QMl`f&ADTpZ;F6B%MWWcHfr<15okTVRBS7Q~;U*9xzT
zHf43rdG#6j=w5GmE2M+9Wj3l_!#eVYT(N8;3;cW-OC(dFg5-5GW?}ZrBJ@sD^DhD=
z&}~)SEN#+P=D0Ohv5se-J9||LntJjIwBkn4=Wq%#`yAr>EzTTO0u2<Fmv9%)ZHC)%
z5BS~focy)7FAQr89X<s7kcQ#yCi<I)zOcK#W5+7A&mp+JfFp8}KNl{q$||^K8-yM9
zaFt)R;ZQPY0sW7NaRoT<`rYjpZ=BhlRH&;N7qIqg9QVk?J+rAArPv`6IiJ|U7tP5>
zn@Iz&pqr~&E!bkOuST-1dcW*Xqw6<Q!1S-rnn-3Y2bS$Q)eTjFFqUqis>S3@cItLN
zqbv*6jum@)<yT1@E5j~SGTKXTbI*fbUqgqVxOTCol+(mYn&S{jh^G`KJd2km6B*In
zcHf&Fm$NiE$P64>5$YRE3BM$__4N=oPlFAXYMVRX^{HffT6f79wDNZko`A&6#^$zo
z<BstZMqO>acs_Pzb8)(gErP%DS@4i1QKuc(@o5MqwY6@G%?UpmJ;N^o$4f2Chb*oU
zH7Aa&#Srs*A9q%tIp~$;q{@7>n{fVE2Hv){n5$&gj}csruVkXxo^1#HiYH~>9jmfS
zB$uU&*_0)Ip>^!V+v@x%`dc>GkG}FLZWc`lnU($`8VO>q)yrcMRP!NN$nwYts*dWr
zKeYe|&ffb5>d~uy{JJ>>F<<Ci+01qpd8*CBiUB(|-Nw)gy%DtG!kP!5^&&P>KfaNX
zqh-LU3u6Y0O?AiI+t{-w;{zkO=W*f=VGF3cPm;>{h@SquqUR|LO5GBXjxA&jvH#(&
z-(vDueF_ie)v)>P$JPKyx?gZcveGIp6~T0R?}b}>vp)1JDv?b1pgVVSF|t|3ZO6cT
zA0};;f?dCsZeIIgQH3R|P=B}wcO)m`eRl^tf9^`>@~3y)-><08->m&C4@<ZjE39f8
z95yQ2i<s)Z_HVyv)y70&#d$7e31ve1V+Lz%1hiX1zUN$kE(GXqfylP|wetrBmg7Jz
zPoWAcvmNN^kWA=h(>@e^4yV@J-o+_VJF~#ysAcd_ouZzW<vM3I-rf~c`!j-npc#(S
zfvN?#zli1MnBh(oY+L&{Y**ahe-i6(W55F<>u{lR47;wT<56Bk2}^aKit~P{8mfMz
z&m(=Yn0jp(+Kb)5Z&Q#OINONhWB#g^MIMuJ-JW9F;2bymI@8F&Zx4e6d;Jr}<zK%z
zAs-;>A{hq!zVJX}b7hLT==g){B?F5f`hnb6sjS#C^u;2lSsOEgg-(^{Q4brwyKcLR
z*eiTl>G$r|A#IsiXPX!koH!P?a?m)ipwKkFDw0nF6#CfuyJ;J+OUI`ZBRwa8cClSk
z+3?F^dP8fc9VT+Mw-1Zt)FKd@VTD~uZc+qD9Dg`jv1kx+({i8mS%Xn%U9%#|$9J6r
zEaa2jMkbIWyD~PDxOC{{eikVbccf`rNIHzswV)Ou4K>^2^A%Q3W3hB*E6(z%cNFFI
zm&z=ZBvg9h$@+(*o=F2rYQsPT?hRc)5uL{qxiWehG2CfoJtXML<KANv*1F!__1*>g
z2}~b<Ml7V6D?AQcR$4PyhvI9~S2xkBpc^ICGlLywWd)Mw>o*$a$Sq>WIH2F__D&0}
z+#M%?jx}p}7tC))kCoj7<L$t1n(;fAMq_SDwgYQ%RdLC76CSpH-GIpH49Fh!I9@Uo
zxF7dv-QTw*uHhNJt+hTI4-?)THP^uVaVJbTG{Ux1nvmOV%O;F2Y9=51THpa4aAj^W
z>>9wgRS`k!8^bCX7uiYU{a_OQSkDppTX${J!`zhyo};`KS8eCYe5#i+P;RZ%vFlZA
z;cP7%p&6n};|VF3@DV*(+4ufeWiD@+#wd7jFc<;osq9S3hv0XrpcH(Xl?uNf*@&Xb
zbM0wSJ0?_mX`EHqhc2^GA`y(*P<5UK6LH_o!Aa()3&xJ`C}TZ6@`OD(wU|2!8O{wp
zu06Xn-^{kkgp~f+UM}?XlDdBe#oJ4eP!V=nYGa*5`P6xF7VE)W!&}pLae)VOFonqt
zkRGc$n(0|W(SAX{xjr=4zDx}NVE1@ACddlq=^uJ=@CpK3ROsy%(Ou^z355TbDcQr`
z)sCYnd>cADNi{T)@)C>{*@FJ#(Ox{c${4jV73Dq7U8W4jB?ez3Es-n^?TozMo_OcT
zwP~Qr;Fu8V+`GX{iDXKLPO;5k-rn*^?250vZX`bI2db?(Hn9`?M;n#G@^*b;8;JyJ
z?b7y64@FLuJ%rOR^gInp*1ixUmCzrz6n8PF)2Wp!Yu5~Lb8&U0nz&w^y!!Z5pKml#
z;MR$1aNo%6&|-L^Y?t5IBb3B0c(px9fNrFSf~`xwEl%J}(QuARhq{NYK6pWzrfcKU
zF0fXZ?o!Bflr+dlN&@dTzzP*Z1k`zn;-|fZqD<{tuJy5Qwvh`nb^4SXlTf%ko$k*e
zA%mWB;Jmc_6T0==stz|V;J^(Jwk5yqDL0t(+Xg`i7>55}{zh&A+37&35-`G0BD$S(
ze;hRCxZwhXz#=bjZWM_|R9o_m620fH)M9}D8@bs+=;Fxq%K+E?Th1O1ga=Y0BC+0D
z4&+usw=4>0mWTEdX!^(JL$t3dwN;`pjBeu@hk1Zu%U!RGh2WDsg5aeII2g6Frw=^U
z#aE=1Q$W73n7bw$R%|i;?dtiLkp_rQTmO=n=7f=Y*+<5WAF|g0e)~!@=!22X7LJkm
zK^yBI8`4%d<m(L-<nrJ)r1khLz$*j}!3%f-!o8D>TuuSA1w{G^LS?k!lfHD6gt@1>
z8Rc)>_s^!V{XC?GhTN&+Kf2t4(Q_T{wQ%aCWroXTfPqe6Z9uk8Dqwy3Na9Fv#!6EK
z%?C|EBs%gAs3pPUs>06B<7)KAvUf>>8rFxg(WP)>y9MSa0%!#TwUi<p6|)sVhlh3?
zjJXc&*mls6<IR%yt3GJy;IAq2>zV;zHWVZ1-(miQ%bA1#Oj=EFp$x8-fyEl<9vlL$
z_hk8G{58Wq1^<~?|DyzaaYQ$k5mE5*cfy&cy~-#?i3hv|4Tn25$L>h=<$$eFZBj<?
z2BrugU(}tFHBtS58wVjL@<FeWtgXM|R;!TtdHT8LO0f*@@kI`g=bM(s-CiE*!HJPI
zC{)nY4+}G21N6>DY6kB)g|~cG7}|$g!>p;gt0Ge)qi|VkJA^!BrsEF^Ha8S<6&nEe
zWtuoS{Ff_k_J)<6kR3-k`K-*g&rt_PCq;RI0RNudDB4ikR{L}?CmnS3PP|}Vj|RWr
zvE*0#J7}AZ%i&WMPN_n4kT#FAGn9xCirRwk-8K))C)qx?RzHtMO5E_gsEr8ruP(_&
z_lZW6*~%E;@)-_lQkBfpXt~hzUjOy)#Qih*5{1Q=mT}HU$ASj;%g3bojK7)23wMPi
zj4u*P@N^;Pl70mO*695_3V@tI7PIronWil>^J^Rbg-ehZd*e14B&;jxvjF75E#CKw
zfV>^vHB<ICaEh_OH+Tol=%Mhm3JT3*3T3pDnvAnm58itnn2J_VFNloRkI^mrZxa?_
z_YXz{k^_EHvb{w<OX=R2aX+P<YV*XjA8tp!F!`*5v4g~_d>3O>HJ$Y42pN1E1G%sP
z)LD|Egj+lzq{z0-E>zA(Zo}-U@{KAbS{R_20SU}IYL4$OF2Pc<kErG7#aXUjg2%!A
z4f2g7_nIlF+dLi#KEuBaka*6=(@NRchYf53a2;U0qZjVarQgpA0dZ`_+4}}6I8@Hc
zZ&gU3UED)3D|55NAuK>1UMEn#Yed$v>{*?M$cBP3X7jS{28$?JJvl;!*ijd0rD$%h
zKTSCMy$;2$QQhNlYNRGMh$07y=cK+^-s3><+dB|DEI*InITu$E8;I^78}z^9T<Cqk
zMES+^8Eyt|h+(noQ+J!mMm0uSHsk%L@7+g2qz;eY&T=pP>3~Idb2J{{5uDZbU($ew
z(B{Y(6`7K48m-mU)=7)wLmnBO)GQlhL~8aOS;a`EF3xHU_(b!VNsQ`-xPf)p(8Tmw
zK7Qj1Fwnyx6dT9CF{a)}%b=G#Lw!bD;UzG}gxDYo5&dRa?i6Xnd-D|r5rECl{ZhOh
zA$Y!`r<A4tQQ^cPDAU8uCD+5byvR8b<A#zWaytS1lH-E{5e*kdidVty$xt({+lc?)
zx9>N3A%@3lx5@DJ0IpAKv;#L0k#`|6--Ond5URUg1xn_z(9-|gl^P=h3D#?xW;c1a
z)LG1m;`!<tSKb{k^^f0wX<y;{ShcE@CCUF^A(ft8bp6MKMODR%jSPTfOekXg+r9j+
zRWL;Ybmh}iGey8_LMR1-+Rb}t5-DO-Vf_s%0`@{Ui`>Qb{)xfnC&2c6O`1&x*#6~_
z_YUSARlI4JBCkG~Jc;?2_jZ-nbCHm3Ee!vN-*3~QDJPf^`OOW$%U@8+uBfvhOyq8q
zP?te!g<PvmJZ`AN?*n-!P1*OB&AI!t1*&QV&mkWM$iO=gaIHZ~P*1R`SY$;sQtXr1
zzAxpFtNnWq9*u!y3c5Ji9;paQ0LS%v<mq<UW5+^B*~*JS@*?J6ucAbO3GvR@bw%3z
zFFPVXP@s6yU|zr{e?=8;h^dmRFnaKmLrvUsHS&`L;q66-i+hj~G<;IL_aW2@dfokt
zUh&@GR0#}_E7c##@6%>jl&+*ZF5sE@YsI9Ldx0FO*ObvPMn}Lro)^o9>kSSD!SiK2
z5pfv$`5y+5gP-aD>)5jGL3i52@8F$DAbW$at0LfPC)ms5sM~SOidLUSXu{KQn=&!H
z^<REyAbulKPn6^_0ehwtCez(EH1Ed7lL!(3`?x`!lCHRB*d*US4t(n--puP`{emI(
zuajU3_6S8R_4DftI3O$us90KMq6!ND2u&#78~AzXf;z8wDoc-Y>iYJFa)g8=L#){U
ziM<1Y#KOU_aaJK7DIWf)NOD%XcF0<^KCJ!{h=F|XgACxu7V_Ep3r-=c2%1PDF-Lri
zLQ;&MkZ(XpOzq*JZKo%i#O);pD7Bm!a`Ri(;LBe}OJtAf?q+uu8zkiwWwGx1n24wP
zvPS|(I*j8f*6_J<#ID*DI%qw(yS)DLpv_8`ie<2WV8Fb-t*xz0M)VekZq8rnIc4x+
z^Em5Fkx?*V7!fzOka<~#t)iOm(o4n;$v&Cyl;Pe1sPGlI;s!YB3TD)d*mi74ephX5
zAOD27OD<?XjhvVuexSs*_ODSNyaGo3ut~4i`0+4%R(Y@Gxv6S1NhKGrjIQnicr$P*
z=ny!-SbS^vH)m8hPV3)<`H@|%MPJquo0tlkBmiL|nr~l?s>uII1%bmu5et!QVePGK
za_Hp;F(d8xh%a|&g<3xsx%mcA;?QGEdq2~e#~6T1j>Mj#$yTz^$_lyga`4MOLQn3@
z($XO^A?sEKpuSS>sL`O-KZkmV+)OCj?jmr6p5Dx+cz{5|6M<8^+rdt5`u^vu$DOY>
zg#w;I9E39f6jqW3*GwQDKpe;Q1z;Tyg&yL(+I=?hkOx)mfz!07_uV8IUta725aho+
zAcg;zzyYD`_xp>JLw9YzW$6j;w&GoH7N=2gnmAb(5eCH-p9;Nq2K<ZS8QFl~%oOFZ
z9dOQu=_AZ<qWgK?P%VihN^(d>1HYAO7VqwhqSDfqt*M%^l3*fE;&kwR^1lXHO1U)T
zVM2(Wpq;?z5WBWze6h}A)bl+%uV*Z--HU@KwlAql+P-zx(&ZV@=(C~Hp#6jkG~sa`
z+uZy0#*L9*3f^A+Dwq3`9^z~gxL@&>S<GdUB(c_Q1PJ2Bs<}KrR>wSOX1CuYJi=!q
zcKPG<LGbLl2_Sk4Sn6$qv-E_>_76`GAr$Dj+DRd}EhhsKrzqz?zl0ERM!DjmmS}a=
zbLx#e4MeNXh;z`OHJ-l_s=__&zje;?Q)kCchkr?~#`YzQ2#TdN3N~RE1mhPyC;d77
zOjUezW@L#@CPDx84_n8H-Gz1_tHWQ&B6fdvQi^-$?{WYe%_Br^&}!bDLo?7jq-U;D
zU=<Wn0zHq^%=1LiT?Hf#!eAKg#K*z52p)S3Om+oNUP3YXx<V?3SwhG<;KJ%9g?mGz
zMJc;s=!?6ZvwT1SV&!iIG6V*y+o@bE9~;y@ZD`aH;bBqmFNRi9I4rb>IRI_v0x^;9
ze4@Jbr{9nc9m4y3P6q)%)nbp0Riilel+aUK=p5NOr&25zC&p^=)DvW;t);qWl+=k!
zrJnDVHPD`6fM^><@c~liVZTtX-h1-ReJrq^e=beJwcZX!WHLE)&d|UBW<k}Z*&)!~
zI&y`w&<>%u1AX9U0@{$whmB?wAgUMA1@+H@Q5f^A#07=_qBszt@d)x55n2P)lrXFT
z!f~ri1)UTxpxPdxxCTjv&xOcdbP>MscOe)phJ-TKy&P>ESQ+5LLrn?i7t5o15aRnp
zWAh=3r>^89z=EVGg19B&nwrp%??#Zy+f#T4Rr1lI;QNhj>bf;5(RbG0qVT2h^}uZ0
ztMaTg$-1h-AK6}o#W<Gw2ze7IO@6qa%cOzB71S`PpYYW{UsMeuj{j3s6Yq=Tm-{&%
zAIVuEvsBG{RrNZ|*r{x?W@R-PJQ1?XNo2F~dMY{$Q_gp4%(Y!6GK3D4%yj@o%w~Y-
z>0c%VZ>{Q0aTeaOn_t&o!iw7|f?j0F#IG;+q#C}~T6lT*Ql;49TKKpXYF98NK$0p@
z|Mfew;1(D9w-^D^a42%t4}&;XZE`PH@>IuVqDr82Xq39!k@eUUzy8g$JG4O9YpIgr
z*?IvGqsl6l1*F1DS!S_lnpj~ApFlAB!{W7T3V^=YHJu7{S&OAe&IW<o0>&1WLs_y8
z=mbxS=If4UH=v8V1&;JRHk^h%wr6}}LdVm1V*CI>@s_0AmZP)KPf?@2%Na?3?`)cb
zt~9=;?>#l^gTPX;DCgI)9c;0jg~4qH49Qt>_aBAy_YPy7ePtoN4Cof!iwQowk_ryR
zM~6x+?FF6qeH~;&&9H<MRg)+W+mS&}lhndXeb$)|#9@aA)k3BL73ucf?=o2=YHBQe
zUplZn3?)}3ASk@w??tWZj@YTexh|$ETh%XCjuH1+2Oo9JgFJ$}p(8J4o-5ioDNMGU
zo0_<UCe-nMegPV8El##2=%+<TLfUH{S&t11BJ~RM*t!>V9VTgXj=|ZTNBBgXquXkA
zb{hn1f<T(b1M!d$YJ<qhg;9}H{aNKzn*xDAGgH&oOEc9rHA8(>R?Oymi=DbYpBchf
zLQ3lO1~UR-2Y|Ub-|ZyrZPwv)c?n%t`7h*K?O~_&FEg;o1U4(oBb=74(pavPG~@-#
zYTne1ZW~Mzlu!tcF4IX7Zeu<S<aiDxmk1?(5XTx4JXLKuK*ej2%Zp-bZyz}DF0~Hj
zTYCDC{k2wwZG2uHc1TxrolQFyC#q3hrcCm$3bPp#C$3rvWn0?5XC>q(fGmqAO?l?b
zT=ChbisHGkc*p^ofc>8E8gDl>`+846z_%_R`B*w5iUp+;_QXEo7cZbnfdOkxB_|_@
z!W^x>Vm)8ZzLEwGvVUERd)}og%9N=C9{yZfg4YFv&x(nI0PaqLeDAR6jvDJP6J{9=
zrsneI<DJnV(^<>-oteUzFWSFE=eE4}%&43&G|Nes8ni_TG%acPrx<h`uG637KGqoS
zUe$Sp_mB<E|3|EnXdy~HA^KU>d`PsPPE&g9CvWf}PIjI}0Lg;NSZh;><C%J!n<`_5
z!!ijm@yr1c=jDF(8|~!b?E#h8Gu)Js{hbKv5^J5{Zdt*Z0wE6htsk^|C<EU9*!-7O
zhP+ks9L2(0WkXwb*$etFz%2o|@59+tJ4q@fFC@(;qij3KE;2LUk1;w7z0P@^O!!2x
zkVtBOWV`<nuio;L4fjNeQ0w;AlkhFIw#vnP^^Isog1G@8b)uU0xWG-*J2r1CQUZG4
zz#;JGGZnBDK6U588s{|74nzNeH{t76GlB*18=e{#9{?mj!ITcuy6k5U!kR>dO55Z{
zAD-++Q2boWes%toEcL|#-M)lX?jQ}#n<zWw!d@)-q(dFyt^*_JdVhK~+a$&wG2^{2
zZj6IQk!p!z;z1i5kE6YxL0I3wr4DXUuz=>8PPuHD;L?3{aw&ua=GFe*NxD`0;(jb4
zg-}esB~V&l(rL*H?|4t<DE;V<^7t$anM3XqhZ!>4pVnSHiX3?CX%A~+qttpmnl7Nu
zKVQeB-`j<5wHrgDLG{b0jJ_)|lm^+ei(amf#9dtG`bfry<Rwv!11wf@M~c^V(l#+X
zuV9AbXJ5g_qxiC1si6QmUbA(sN}KjxMFrcto8N=tjN*RU+Ih147`v3TC8~px30A0U
zbl7gLve%Hf?RBCv=c>}3Xp(6zk7?1D8BdQBI9R$bM<71nb6U(MnRwb&E@NVsE)jb4
z`2LfuYZF|gmQ8+}Cq-_TPFYd5c9?@aBY7yEn@7fHh>Y~n&RvXIUAeyg+yeGz4ByLg
zh8Bv}QJoURxzt^z1}gYiP%C82?Jy(Wb#(Qek*zY_H47?$0BI!!BWarJ({x)0LYDol
zfGwNQ7WBelD$q0dDnz~CP}zcz<i$QLn}~xh$~^&Q6I2^AL_^~ht8SYkaOhv0D7(YH
z9;RY7IWDVoUYr&4Rqwl8HfbGJC!WFaATh&?YO>xT!KWA<oB(;aL(n7+{3VO|f!9G!
z+WxVsoue^VPXE>Dnc3W~8e<wooL<s5BE595EpvaTTi7b24t~)OA1yAaa+i3mx@`S2
zHEYt?ASDL%A5p=NjHu+3$j;905$RPY1@PU$MrH~GuUDVr9h8#4BucFO5Zk%`p}|K4
zRO7gxxw<X#+-a;p(;R4HRgvVD^Yr=L@Gwmn;%3oUT&M-nb}Wm!iNiT}yB}uXTQ^N(
z$dCDvw`|W-Vze(iTFg@k?+vd}BkeEul)9oF#9yYD$Sbdc52`QvGl5<u9qEX77j0hF
zaM=LO-%BL0ZFSvyt5-TWPs3_}CaY@N+-8%CoKjpJWR4@}<9fOn0abaPqKBg!gO^WN
zzG%+2ej%|BA>$ogOUIbZTuE^qE$>W622$T<;K@TysxK5JGFGa-(GfBymai{rQ;?0<
zIfq3nusU331<C729K>i9X@$v?&k;{ZJR@iAzf#zE>U{JesKOPyWYOy>pq9*w-475*
zkP}m86MHBynF<Xqb>X>|NV=#fjznFf(Ms-ArQ0>8&%(V=@L)Z#-J4O*W9g9Bk}Igs
zoQO*yW2km?P9GZiQXJbVBa|J_t}{CjKiWDVW^c0TO%XhXSW(b(RmN4jCt8?mf84`9
zTR!Z=u7DD@{A}#z`5xs;nDC1`c3)WHupUIRHoR%1*m4{uP4@^``z~=E|7%q=mT_47
z@ggXi3rlPao0+Zt>@5MNY0N8oEA!6ygSc-27&wGH$jxH?Du8dY;O-l7^(px&LfN>T
zydg{!?2VGECu59>5yCr-NHV++hXY|iW#+9Y+U1lHw6awU*n}bPIFl#TPrzYR)li+{
z%Voeis(Fha=C7WjfzERCf-FDe{4xHOB-6`@u9!;ISfsnhHSGpN%?3YYY^WFIy@zDo
zwd5X9lwYd@W&K_iTHj06ceJA0eR|UG4QobcEi19(C``=|bU7&^5w!n6)ivfklqn61
zR*)(Fm>(8v;cXi@aMWgYM13sgwmtLcG0Xc-aj&L$dAcT=RvSRCM~U*lYJT;Ybtvk^
zY2+!heEXY(Oz8J?H;SL>T#V4i8Il5^gZ69|{x*cbusze`FO~0WYZ*B(*U=NiS}*AI
z>t7armoO$^Rjaj3itJlB=VxZ$diyAR`57u)Iz8%7b7u_|53N<RJe*KiOD&%pkr9A~
zXOBU3Pxl@oNsoG3P>3T|d#uin?@d;o(0((K&U!%8H8OGMB`c@Asurb>Vzc31{i?ce
z?Y^H64wG$n$HPcUau5)OqXj!dS-JKS&2|COD2wf;?BmPMzn)JS7`vxAk;n9aRD{al
z^*_c#;(CsW??*Xl{<_Nez*A*5#bf+-*}`!lvj-ONBwa*$mKc(EFA@f{C51&uklURv
zNh5VW1*!o(85=`80{*-3q|?bP4$aoJML<>8JyNQ_{jD|uGIo~<h?|h~DI|<ofBnn(
zU53Zbp(3~xdu#H?v>$awm>k-O46E2n3`H#kX5C=bh6c3FDc$N=->whNDm(VCpcLNq
zo|K(0wDFEQsPm+?(+OGc#nf31iStS*KhGBYxC+^d3jgMueHXYnIv;UYM=0}<o``hZ
z4?B2}W0gqL>Mbyrxq}+nAi2P4+F)20ye6-0ZQ$X9*M`9S{JXB>?q}^0e|Am9Z-pw?
zDtF)7{c0}rD9eNAJxSA%Ny8xn<iPCIeLWoO4CTM;+c9xnwNcS4h($YSJ6QP8<J(4n
zzDk<ZBVh}D{Qf=L9i~&4D>+1k<wEp5voUm%MH8X{UooohiI$NPhcvo_Yw}(^0*uk&
z+cQ&zQgwMW4?xew<_BN12ED#IEVKx`Tspug3#R4R6_%tMU58caeSL~DpIW`07YY^A
zqOX=PXnCfYG8Z@GxnE_q@Qq?naO*qaJv-1G1BE6#Bvn-AF!!;t#Ur84kK8&&B;{tg
zm2V&Jt?A)>FG=Duj?DMz=NSFwsCe{lT<wEZ2cX;;(1$xH4mmR>d`Ed}T)Y_2R+f49
z-N2#{l%Kkpjv{22YjJ<WL6LrUa_7}ywnP#u&tMv^a@=?{ggu@;9aUmNtP=GMRBK;z
zs`o3f>}8`w`<!yg`%3-C{e$oO_QHgK`YhtU@PHd|0yy)BRJ;01fst-Kr2Ev(fv0t1
zVtL4|521z@`2BJj6Md_$?dI0L%J;-nzqnLPgfQ%nc|B?I2rvmulVX0oR3^6VLTSbL
z=?f>nmwryW6w%jZF>+9gH+au{H!xd1Pl^VhG^J8bE2&(vD0X&x)90`+^hJ{d&aeg_
z@f^f?$OoCXpEd}n!OpCH9uOc{o1t>3)1?^iOn>6CGb@Z})p2umwUIE~Cy)Z<Ek-G%
zE9qa7S7iB<YD(e7x%5ocK~C1FA<BEScgd0dRwKF-I!YAfgG6QZP$d<`HNtlD>X%l^
zUk)PZSUHGCA4vS4rp`L9$^L!&G6#}6N>aK(5Rj1W?vzGJ>FyfcAvr=ugTw@p4nexp
zfs_(b(jYL2=feBGf8Xc7vDfyx*cG2R&f|O^!)odJ8A|5WRepZIYCpA;-!Dvov&01!
z%I+qUsagd@=s%eA8DmScRq4)|Oo<*jehnD_NkIV3%oF6Mn7q8mQHL)4QgvYeHKFV3
zY>6dPftg=zG#4cS?QOfqMWUsy&h55I&?vK60jFye0xR44?M@1jE`7?R<bBs%^nlp&
zp+?iH85sGAEdEcxI`T=`eC6i4j@G0St!XuuU7ZEfWQ^*T`?uy)?hALT`>h5}-QieA
zW2mITkdJd$f#uB2m>|MF_2dL>l2)wap)NV!v!a%={FnVNSVEuBL0AN!BNrv!qo|*0
zy>*(lE^$^LH3NyZ2G7*xG)+?zLr;qedX?3<EkY9d8RYb>wqO2=@l?MM5t7r+PuvTL
zH)`>K1!TlJDZ7*n+Z%e)&wjE;Mo*RF68>HjO*ryx=h`~zLsR@{8*^qLt9MnK%tg;8
z<f?$hu-eP+cQwbQm8FJf^vb4};I6KzkqUMbp1v|E>pseJw`Swgq{~fv^yYCHNn$b;
z@!BKQ9`gy?=1H6bLlORtK2~d~%#mmVNRmgPt#qMR%8J8$O6y%lMZQ9<K4(i|9L!qZ
zMh-)<9`v^R`p7>$KpIYfRh20$?^#!QZ65G@f5GT^;Wlq6tU$`U0V#eln^cowbIqHB
z_P83eD~Qk*HbLjikYz_fzjGkHa`8cu-|CJh6Q&Bks0E;t$6q1y41AXc9Fgrli-fvM
z_A}1S(_9G4^d;r1N_9^zLKq-rdRCma^LR~hXCySqlqK|E!Btk=3j6N)tG+)Uz<6J_
z`+d|n8ISM0`8k7MTeP352<iR8DuO2gDJ?1!Ww6kf$`jW8;kI;Q`WeI^ED@hOy#);V
z=F80domOl`Q`la-1gXZq6J&wlIC(38zGV`y_xp<ynyTJr@48W)0gRxGe0_9*;Bh;@
z!MU&Q=bhq`%gVU$R>vtsiw<o2Oc|q47bG@jroo|$9i5oLdcAQb@5)+xm6`70gh$Mt
znUhM2iOUBCLg9zsPBAa7e;qtlY8hlM7V@{OxCMHLe|RYy^tL37i`nGtKY8Icx0j;7
zzFm3d5~gg9sM_*T%AlZ59VI>oz@*1(L}5loN<d$S$LTZ;p`ZI;K@54|wJodn0Nol@
z=aD_BjqH6|;jJc))%U3NA^{r@k)JC)h1-+z%F+9M7b2c93xZ+@Hk=)u%J=mg1opF^
z5L=qiV)Hciw^LQ^!jo&e8ZU9fBwq0s1L`ZE^5>R~RYOExz2~=-CY6S>OT>h?y|?q=
zv6UQDfqz?oIE8AM+3bb@!pZVhfE1%jpCm6ut2Or}li8z$heA^Ivm9^03XC#m4aP9P
zsJRht=Ta3OF-#pSD06=DrtHQ_jMsL7`9aCvV)OJibCcF_qzL5$x$gr%=&c8^3<V!R
z!Sa~6W*~L3X0f1N+l!pQfTgub+!y4@R=UA?qz;*!qPnjcqw))eb2J!|1fTdvaA!pB
z9cjcEwf^Qd!Z*i2BRkvHa0F;RUNb4WBK$bAN`7uS>6C>q@wYgh4Rw3$FlBalN^gsX
zPez+g!>g(FZR(L&raLn~JQ6E>S(ghOO1sl5?Le+V#QxwwS>cT_kxJ=&FWpoHj1E6|
zCd4#g-45;>h^)@MPo21HK|+zBjlL|HT+QrRX2$N=ay@y<(5+|fF{!P2*Rk|Z>7m>M
z1h5?HT&HH<Xget03UOmp8I}D(3}6oTNgk(@KH9c4KG~YOeWP6p*i6ubel*hRgQD>^
z7_|Cd0}=Gk`2dCI<17e>`$*Bx5-TkF^ejHUFV(Onafb&`Lmfy<BQCnk(zMs5(t7{o
zmh$Nl`12_B+N^do$pjcSl$7)$qmU1oNPpbbHO#?<%P(6k&XjIp`%<Y{bOtYq4-o!1
zu39Dv$Qx7QGEPv65<)fI3Y#y^gEF4siuQdLB5#lpC*GqkN&_yZ@HlV+?LTuDunmHR
zs7|Iz7lsNb7GiZ!dtvbm5^a2}&67OkdG*U$lWooBs^Z9!Gy~lt<frB)Usiv&m>B0w
zS%24@Mct2Koxx0mezBl#OX{fIW|m+QF4*p`CfWn8cR$N3BeU<#$;$87S|%JEqCF#*
z+O44{l;BuBCqE>?YQBn=Kg-@PN9bv`5@q$1ICxIjrpMF>7KELXU@0dTE5r;%s;v|j
zUg-F7yqcOXVBv9Bct6%t8rX5XEhzPW^#gb=c!-Bdkqtk1nLA#l?}&{$Vb_7_;N;KI
zOOc4i+U$hg=lQW)bIRdUyC4SEsf9A`&rQAQ5YhMJbh^HW#ff^nW)5^>omJT85C!w@
zyCM*cw1lwQo)(Tb{6!sIHV?LfGxY&8q+&YJn2TAlC}gKLPW~_}Ji`gQn*8P{L?vMa
z0@tVggE%8<_d?fT6kE2LarvhBzB#@PV{Jr?`;V~YP$KjH7*jy04A##Oq?PZ?K-4Fv
z1t0w$D7Y9>dz9N?RHQ5O$gO^7UP7HPwe+6qj4S-fb4`&T72D-!k9pBG14B0?Wcfsu
zlzpDtb8)^m<{|)kW}(sqcem(Xq9;$ywV%kF@i<w3+dYrKD92P^JcZKbc#t*U*BcY;
z4`ODVMAlFFMc+%D>}s;p6u8Vz2@Q&~^XYKBolg7ClNzL0f2yIJf{Bj)!!%Lzt0{v5
zP+<7?<_DG})<BwL;3~Hf<kN_07`0c78HSW*yto}r?1{xk1?6X8g}z_4sfiC}FQuP%
zoM_Tf_^b3u1>M^^2|s1Aj1n;u%TIe1Aun_?z*q#76aJC%lj-2?Zwh&dowNMQdR9XQ
z?76sZd8a*f3-W?I3ZixTwrkazU1a2-O}MR)@Zq$biO{wnQ4~&cMn!=Ot=1@(jjxno
zIsx5A7J*WaO<RPUHN*d;eW(&0L{8ub>FkpAbdW<@b1lJ?1H<DLc&%n;8|YiE^&mG`
zp*S8*8p|3NLWU!say0OiJn^!g1<oez6gSlKM~ZhvF%LG^eJqI)CPCA6XRDJi1$|3F
z4SJ8s79<B)5-Bi}SP)IbDd<G2-h|<ISzpaZLKRv~!;51(TF<H4X)aunvG^2wBL{e>
ziz<y^p9=q1skTgT!N4p|a!p~9ryHzI&xb3=%f^O~L0)T`F~@03hftHiXeG3jo@4k}
zWsmdpcP)!_2n~{-GmTP#+NWvnj1oZo((8ke8FH}YY&fQ#5-}9*lGSJACs`E2R(+m{
z%PQlU^GZVGhNln%YZi`AmXPt2P$h6qhK9__S0xE)Y1ig)`lR<_T}SB_)XaFQ{;2uC
zQ7+^&79He~{?vUqWQgNJJwAW6hs7QBo!u_%LpZI31z&!T(Qo({&*5^;>d$5U#JqtS
z>`$zY=FKF%{cy9Mri+hYL$8dZ??$O)8n|e!*QY7ZxJKt92?nmH)p(HUaw$qH-g8GQ
z*)TPg1jNf#UT!KOm5mXGLy`mGS1o;N?6yiYor1}TUKMR=h;?I*#YKx#2q|X)O_!;9
z+vNI2=7>4UE&DmI)Q&E>4L|jrj{fTegF^A6nJ2F`*5qa8$-a~``?sZ~C0edSil+^w
zLIuF(@q;jIvcWer1!FlFDs+0bgG^bIxs><&LSgH3n<ud{#Zx4YAG~gsqQV9Ji$S1~
zr8)fxd#ES;U4?~_vLrejvnL4+{Kka!yUi(VY(eHaqNmw!cepw%$?v?_m1c~Bgf$||
z#riBn{rJ<z;+Omj7U*Sk{+a4A)}SNVs%I(j&w%Ok8QNt|F1Nd07l!S(JCXAD-U7~0
z@;~#-H9aIrbCvJndfK8{#elRi+(ORGNkt)*Ncr?rtt*V-O&UVa5<G!P9K&v6s~a*9
z&Ruv}h^r?jq$;gQQkh84$23OT|NCbb%>>1hsk^JW4w=~aGc`#vyCSC_dI8UjpHLju
zq-ISH>y?@G<ge9x@$@qVMm_e|AIi;&UnD3IhDBGUqv3qICZ#geV>cP`te3w|yMF{(
zvsWb(Vd~sN%iB6gOHxCfH191m_6BcUPR0Dwqsjw`c9uyKx_<iUmrn>Wad8o~xRSPN
zwjBXKODry$sZ1(82`(BPOv47)0!eB)lfmLPUaLa}MU@_lKa4;AsdP%N?S0H@^P9^C
zVW;?a{aX#LA3n`<e}+vosjK|1yfR&Sj7YT3t?aaCbqD{8M1%G##aKH6k%F}KGdZw!
zc6+HpaKpDnm&wp(gBYkpI-%h1ua8Rrebli!;IQDqlJq07mm5z@eeY%rwgicH+!`HB
z>%_zH&`_?&AERwiH7SxbCBmd22A;7j2w+Nmp7ZAJUsST-F_#_E|5=*ccbdnwl_lz*
z=xaa=iT>+7)OZe+iDF;A;0#7wehT|)YIL(Z6k-|mL=Rmiu<1#tc=3EXQ|ydeVO;dr
zo-{e<wwSK~c3OGXjqpXFF&iCm^l`Yf^Bc)X`n$@D*zk_oZAEazapPOE^jRi|A>Q3O
zrV#T&Q>TM%vseaSbn=3o??YX^<-;f5+ZT!m9J0OIa9;u}Ce{>JonM2NW5=-Amjz6v
zAcLv)2i%yaV^KPH#XJLWed<>=eIb9cs|7YRtevxhgMHzl%DRlndKnbs6v~bJu}thQ
z$RFvJ*p2PewHSr8E`9E)ya9Yhc`R2y{B(62S}>HH>4UKzM!B&6<#AT`{3b_cJGyn#
z18QR{SEEM9xamXSIDq5n8GW)1ixr<rZ-3Yam5nu59VLyaFno!&qpT5|IL1*z_76Qb
zB6Q|<bR`|-8d8RhT<r(WfX{<h>My$OG1{I>;AZ6$*Wd)u`+D0iAy~Va<W%(<2j|+?
zDuDqGr`40JnS?2dc*wUdBgN||Kh0Ej6<jb|(q}i=*6w-`K<IW_&=apk9*&Ul=9Ln=
z@mfhsUY9SlINGb-RMxZ&tp<BuBd{v~)#$H-Kp9SHK}xX(mi_UvTq+{rUN-%h<Ga)E
ztVjs_#S{;D>Yj>jv7n>(maua}4a6zyxi9L0bO`<5xsXU%LfCXK#dFYwF6kn*OGc@?
zk|0HACwas`fk}&yahENE1}0`#PR&`}qt7c`Lv1$*f-2F%Q*YwT0&4BakgFLSrgRw4
zYNw;Oy#(GdD!*-Z%mOrTrGoaDPt~_}Dr*`7$Pum!J?0_*K3oI?RETw)^CH2O-Ayur
z?R(GCQYI)yk@RsAH4-)4H2O>hoWFkxU|iJNa_EGX0exwTAEn@6+vqz7jRN7sLlFxi
zg&HD_7pi+pvX}H-i?g6?BZ4CKxF^Ss5?KhE3Y899v;1z>m?#`Sgir;fTnpr9(^(^S
zBH(t$ZU&p4dO+2*vP$Li9V)1rfW9*Zh?G9*A(7*v=OUuTi~Ll~3P*ou4)YI~7Yi&A
zN^uy*F9r$nn>p5t?PPL!Mb2UJY`|%i3S?2+{;k9-P*^|Haq`DFqSJTy->nLS<*h^$
z?uFWmZ&aUATT?CD3hElnB_!{@#%W0Tb{iSz5n2&tqOoGmJVeV|Gz;_$l9rgl)QFD$
zInIv@p5LwcQ?kHT`4D53>64n<sOsqc+>wRT%5osOF5n{Q8-)oYfrO`pCnWO#2B~E<
zN1(N4tR~bqlC8ihAa2GzkwQGEZK2&hbD_>EPT23%R&&;%Zk<TLqR&IXZHA@MdByY`
zU`xd%F3E1l{*^QFSzKw-$>j`aIz#6$;SoJ_wPorTr9x~Rj+hFpzqHlGpobZNpY3uB
za<{^UTY`Q}eHXq&qd=Fsl&lWNp?DDbf%3%ILW`s*oCR=|z@I_&0rS^Sj!x<jrKRB8
zYtAZMmR$BcAWdU)2pj6YHc-tocwGXxe|E_!$d{B&QCf{a&WE<^`he#7o^vp-yh)%*
zJK1xOl`sb+ecrUH!1C6+g$rY^spRl7)tsL-Z~IvRAXbX@O+i@H;&{-_bZ8{>t75g9
zzDqpi3m)c!kK;}*0!tp+Y9jb|&qgd`viD*-X(sVhD!KPY{IDAxcEwTULp6XChJ%NJ
z_8Y?DgRKC34xoKNJsvoZ|F%!_TG!MvEKGJvS5k<CQxY!MtI+DYwppwF96Lb11h!A`
z;j3}avRuFS?TRwD8Hhg{TuX%NRqSL5fFD%6-Qc5jPEE$+C2<LU%3uB1P*&~ICM1wn
zu{2Ymz3S)b;n6Z%Nv$?pSz9~VzMph6uq|V>yUbdN=5?_A^jbd8-p;A6sW*<~&T`V)
z?tfl-{LssMvQTzEmc7Qq(5BiR@O=ooT}0bcPHx>XKu-p&y}!LFYdzb|Zy<g+hyres
zukAmQZs+&}1dNse{AFw4pYvwTIwgq{Ac=fZ^_@ts=-CX)lK-!nt&oD_vR~@RwlcHi
z_7d_QA8?(BRzP)gv$_1)I2&F>%Ohw}iXv$=H)*Rn%UYmcwEr<th-7IzCcdTnD~EWk
zzWOBLieSP;M>nD6=!Y<3r+(dRd;Cj=|D;bp^H;cvU<q?tx?<l0Xg00Oelz=O!?O2n
zpwmay?{T+9S$x9>%pa_V^}JWEAI&{GYP01+o2_;&5j1)8VYO|<6bx`h)qp;Z{A5%s
zaS0B|Q!k)=quNf+?bN>4&{XcroVRXz6wB@a3S5reY-L7@6PMvdY({XkDC}q*)Qcib
zyz?CDvwU^eE;sWJGV<Gv<I(9Cx5tG?uW!zS6?Bj2<}Wm-XO`R#+K=TPjMrDZ3HSd(
zaU;VYLAm*J-0XYlFjI<RJ1ZkFQbNDcYV-(}>yQrCW^J7Do@>n(uUBVln(*#OZNzmx
zEJ^!~Uw%NJXZhE3!U7BNnnN8u@mVZT*07LjG_CuVEJ@5Hwp=+KddeJqzDvqB#O*$1
zu1Ux-rp$4K+?+e;ROg3q950T)ZNFdR+t0VJiwO86d`=1bEPtsYzxrr$h(*h0crIg(
z6z)9{jGE4G$rJX1H3)s;vEDXlGA}3r$f@p)%WQoiGN_N^V$9=6fBMfp2GtYA!>5GX
zmsf@zVxh@gj>U_4)K9(FPfE^+1w4mz1nTCw&N}x58ZVK;OgnDlOXmYcAjhv6=qGAw
z>D)?G_!?`GLMECYlmxuvj~l2DTsk{89xG2HaJZVDsp0Sp7B##Y*_v!0V%Rvsnd$NE
zev}k@iDw%%p`Iz)@jeyroufl0Y20OW&|{kU?)-FL1_zXCUTL^%iEP?+9Dojd!ixQm
z`UUJkQ6*oHK_*FJwkB<W%-hKFJWms?aEt>9GhYVHgx^gbJYeg=4z!j4le~QjjjHJY
zM9^8K#nFiQn0!UeNnz{NW*&1TcxFN)ep=j7v*FD&lXsEGpOwkUSNCNrExc$85wiRn
zyF0+I9OON{T>M(Sut;Yh3kO8i7^ls#yr22JHi;s`!ReQs*L%**nQiMOzq4gcf)Gxd
ziFx~x6u}!FD<G3vm$4Uq=gW`ig@uKeP|V2I1*h>UxeqGs0Ts(<by5Ybt;3?kWUO_)
z3zphl+!k`Jk>$C`Vn7J_1!Z-cg;jK765u}ipo`YhY+-M2Pf0D(V%BAqX~LQ0HWGi%
z34r1n@W`E8F6Df4S0x}Dfc&HL0-D=;HNQ7X#<U@0xyiyx`DmI>z0~Lt>&8<qvkd@M
zRV4M7K~sm1`K0+^?u!il!ZUa;`XH1zuY{33t6Dgfl2c@!Ae>f180?{i5I%m;=(%g1
z6A<OnVd3^RU!~KGif^J-p$izQ+nsu2N9t}Z4U-4GMS`kEmpBRc`l*9Q-g<t>y0IM6
zfZ8Lj)vB0yKg1U;7Aq32@$W6s`{T%XQqrdGM`CokoZ8K=BRt*w=tLb+ItH<~80Wt}
zj<;A1XIK%%I){s#bb8EJ)R-Qx`0XOJ-$Z~G8l62+nwf}qqji4f$7y=X0FY7HSUnwi
zO(gX$fg(TQI{Wb=P&A$kH>0MtP4n{v>=1eTqKAC~9h1MQFzftg8ti?YgHCdm#)EG@
z2JM|B&qM(PIMRJ^Hzo_^14KuKsW5i9*eHT{q6OEq9e^_|H<tm>ZFnh`ZGTOBN06mI
zqCEdmB--Bj7xdSMoM?lDJkLv*>_ezQ(&`eo53g3bGoI!EXhFYAVl>2HrX``$k~qy4
zwiF68)ahCI7=oaQi-B0AVK_DfI7`M;sli1Z?>eXz`$%*wu;@KgJFLoJHTNGp9AIb`
zE<(=um{g}SE5qy^iNk6@6SE*ceN*P?VTNG;KiuBKPdhVO4~-m&yVy;GB1rF(F9H?n
z9-70PW%fyVI}3|2?iL{NqBuY88r|}&%fx#ry`t=*RN*=;swP9hJ;i+e_b^5nt>fD&
zf;mP6kB;|Gm`x1#XYu!ktt;1KqQ?VY8n6oX1zfgEIz~u34rTYF#IFhlPyTw@jltc5
z<EOIFXH=(F;F#4vXKph95bi%DuO?XPLH_pPmk9F<QjAzTOesjY66hmg63!Mo$lu+s
zQM~Fxap?M&jku@K(fFp0jnAm|7T)pT8FATlBv<S6rwG4|%GHhY#zi-GJ#M@5Q<Mks
zXUE1Rs<PX4W^u2B<aYe-wfjg@|7u~5@qM5l8EgM)DQ_Q$`m4Q4wK{J1AAcw4TuU{J
z*gzs}8XCXVTC}#F33R$fJ$#~60TX=lc91Gv9vizEm?wMpU_zdD4v-0be!CZT5G-fg
z2?6dZv(9CzZNny)g0{);KD3{D?riNWFbUE#gT7amn3#Bjr!BO=p5<=Emun7s1wrVe
z2U{K9zhWVkjnd(A4Xq6K18x`w5YSRS$Zj@3nyl{wq37zn+He}0d84;llq5!Q@FW?5
zo&9d_A?2L2CJ<8<pMWOG^hSgX$s;C{>7ipGJw*zKou$A0xM@lC0~1?5;jQYu-Y4Qg
z95Ne}sePfY7X7{3@=1QuksTnnAKkL9ZGNZ35qGJmM$J4HxQbYRWkC%F=nN?*essTo
zDKmpDO*~#42R#0D)&DgLvAmPmx=1Anb3t+yF;-Es+%kp3c<!_#d^EC(h)$K}ghlp@
zKl`boXqN7uix(V{$QUf9ZVc+gC96I?y57#6r!^aQkrx-{6At(hK?1BluGY_+6DXFR
zcrT_ref>kD@k5&!>&((#BaNf|iSRA+bYf$p&9`(Fmaf|`)IlrzivoOn3sh(T7qVgR
z=5{rXvmpUZzow1;tJlThEC1H6tx1d3CI@xp;ie|FKfjL9xN7~*=$*c*bh@syo8Gt~
zCoi=OCTn%|gd9G|^IlnC&VR%Fd#Msb5_d*qsdjgyH?viudm^VGkoN!+RwDH7nn7u4
z;rcO$li1+<Q1P9J9!@6BdUDJuf>#M$$vQy5goZBo*M88cynz4jD$|9Gv`^w%gWfBF
z?FU%q!NVyx&?<)Lvr|Lq{BpwGjp6Z6iIzzm8=d<tW<N)Xcb}`*L?_rVR!h_!l=~@<
z>%wB^o82=PXq|Z`8d*gyzK87tsO0z4C_89beo$ofV@xtY`mjGLI`f30FEaR6(d1?p
zL#6f67X5as_kCJL9@DhQ$J@FAJ{NbcprhV>M`!=mR@9DuUy>Y=hU#6@8??=WyETRo
zZ>rco1~vRkGpBo+iZ39NiisT@c|)mj|88M{kJc^-E+c_>-T<Rq9|=W1X>b%V*j0u~
zUCaNSWg(5m37FscYXZ2P{Zv6hL4O_?7~OyCftJh<m;Dd$6w#9cw>h$E^RblGMQ7U&
zBe?1pQ6pE6f={J=)x=JpUh4=&&+lLCJ=y<+2+T_tl-JX*3LNQt=z^?Ss)H7ML{izU
zWFb@unPVks-2VLD#t0)j&uXic6bDeyY5LDN-Iz!7cDp+Oz1-)Tx_vqD_QA@y<!4~m
zFhc|_^cw_8*<l`X8qug>g1-EWmNcKs#b&!}g1Cdv{+Ni1?fd}#BB7;q-5Y<jrmU^y
z*-!}j5oE~<kFmwXbq2w@a@{xcJG+<M)ei^*`EVKVup$i05WKi8aiiJ_nac)RCK0In
zqXIyz>3N+p7auV&Mr0uIgT}pn9Vpv$d9Y3(#e<z8-+mtW5zi1X8+*-fSgTB?6QCA@
z#E>;fbTYksd`Z!=z$%=$KR*a{vaX6&xmN$(04ReFQi?CXLz=_gP#NIs@|<U{LjBJw
z&FI<j`<g4JOTXD;%^Ocl9HK*G86Zi%N)>@vFsYTaO0f!t;9yvejjaVR^E?e!`fK$D
zLtP{%<5Z5NQU|{+NQly>@3QwL!<&yYvn!KGF?EEXK#*sDHDKrETLU5zy}ehKS|#Cg
zzjy30zO3YslZAH9T`9g8&ADQjo)LHdsp7qnuAegk`0baxJO7yY>cTq;5g%|+I&|BQ
zUPu`WMqW5v25c+Ne;4;SOm6FQi3h;EwbRJk?T&l%PTNz{uhn+Hijw{5+O;dXcMtqW
zQASdy(P`=DX+q4m0~4PgIE%pe#`Y>OqR<=21@!`~-U7Z$)DpYJYGwsKgN&J3W@a1Z
zNz7niQyFwVA^oU@q<xDnZt5B<@yVLwedr^3OdWRUOph3DBg(<Stf;V%_{?C+9200T
z!W~MxLyy5Zz^Inbr=HNEYMEd>tmf=!D8Q+oD7j_V6A^bB0oLqXN%t2CqyDUE-k0`S
zG9Sn%504z6OB(E4a1aGH0*<i2m!d9z_8OZNQw>k-z6w03|HNpvl(}tDcZN#)z(bqg
z((QYqDBgy8<vrG1*9dJAzn&IP-9!biz4JxAK?1#s9y~RR>cV>-%1GoxJ5lL8Az|S~
zi==AL;fy>c|9kN+2%lc!{Za~NmnG39HELp?ZDljSITE<vcGBqD!8zG(-UUR|1P{K|
zUIZR%cY~!L2_Qly6_3qa_jeo9>1ZwLk}TtFT_nKvG6JkbE#Qj@yQv|E0|2bZj|vob
z(+(;0#u$G3dTs@WZjM$X4-D|L_kGeo#}cEMpznex(5*+apSH9;EGg-WcxuGsUHV7<
z+0{~{h1@U@yG4sQnC|#|Yhng4&S5<qE7^QWLVTn?nKS99Q7W{Yl+tZfsjiB_T1<Q5
zey1PW_P%?0Ps(y-2%qEa1L33sXzkPazSrhS?S_YC;@65ga&rC72QRnPgti$3ynem(
z1`L#o!Zpo(+Y}(6A%&hcc<dpi!T~jWQ%@g_r3l&fldqvpVt8iu{_@#?1)X<{{sI(O
zroYdZ2<}sxm1R5)nw@1c{D<8wOYmLlB?C*3U35qd!Gz7t7nAFg@pE>J*m=QcF^YI-
zw1~dlC0m4rd9Zg2*i`@Ch49=P6FfY;jEpLI+RhH8XN!slDXqJ&bfKB*yL^i58f(*U
z*r<=+zYExAOWmXLUB_>9-+ai8(I)k7$(j3!VX$XjUY^tL*J@zp9>ka=T(7LsGBQ@f
zxj^#cJs?TRGdwpNs3g2<-ESGLHawG1>xiNbn%i4yMQ&4JpfW-&#R46E09W0^$k7by
z;cLkJcZqGspmC?`z6MqI@ha#1Rf&M*1StgS-M+h2ah2mK#pRFdkdbhRa+?R3#J7u^
zVhj2W*=o*?dFy=%_O7Vx&p;pm(WsOFct!vNP%EY~P?fY@6!?Dn1?>1t>Q0|@ft<Eq
z>FpS#1m|k;faD3!#sn7$U_kAJD(lhzN`1gQQHP)P6hR2Ezv`kSwKXVl?~_05Lrc$N
zti+yS)JK0A9&mliES_j3P5E!*)MpKROe8<hk?4uR@?Vk)G?wP@8?uAHpGCu=_n>)m
ze~TOX+MVX#8mizC&<~yK)0YO^pMT|0iFC+>DEeKB0Ra0}(|n5U%rt={UH$hIe7Wm5
z{^2E8{!hdc@Qp9;LdY>@DqJN@o<YI|9ylzw$?`v1bf6~u{x2cr8SWi{Ba%6S?f+|C
z`Fp5)V72E^;Q0`rL@)Rs&-v<hZ;l)9-o1O>&u(ipCF_c?X*R;{p@G1d5Sj@>7tB-s
z$>@LolnD9zViBDZ<oz1$?gRh61H6DUe}`;27UKW&#sA)K!oiJl>kq;0!6E^Ua8FTI
LO{PZ5JoNtorc5#T


From 97b3978fb86591227d7677882a294d0ec3b1583f Mon Sep 17 00:00:00 2001
From: Samuel Newman <mozzius@protonmail.com>
Date: Thu, 13 Aug 2026 22:26:12 +0300
Subject: [PATCH 02/32] [SDK] Rebuild the session core on PasswordSession
 behind an AtpAgent compat shim (#11343)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
---
 oxlint-suppressions.json                      |    5 -
 package.json                                  |    2 +
 pnpm-lock.yaml                                | 2841 +++++++++--------
 .../EmailDialog/data/useAccountEmailState.ts  |   19 +-
 src/lib/strings/__tests__/errors.test.ts      |  126 +
 src/lib/strings/errors.ts                     |   39 +-
 src/screens/Login/LoginForm.tsx               |   15 +-
 src/screens/Signup/state.ts                   |   45 +-
 src/state/persisted/index.ts                  |   12 +
 src/state/persisted/index.web.ts              |   23 +
 src/state/persisted/types.ts                  |    9 +
 src/state/queries/preferences/index.ts        |    4 +-
 .../session/__tests__/bridge-agent-test.ts    |  573 ++++
 .../session/__tests__/expiry-rescue-test.ts   |  104 +
 src/state/session/__tests__/mock-fetch.ts     |  126 +
 .../session/__tests__/provider-abort-test.tsx |  145 +
 .../provider-session-events-test.tsx          |  559 ++++
 .../session/__tests__/session-core-test.ts    | 1027 ++++++
 src/state/session/__tests__/session-test.ts   | 1103 ++++---
 src/state/session/agent-config.ts             |   12 -
 src/state/session/agent.ts                    |  404 +--
 src/state/session/bridge-agent.ts             |  442 +++
 src/state/session/create-account.ts           |  243 ++
 src/state/session/expiry-rescue.ts            |   30 +
 src/state/session/index.tsx                   |  419 ++-
 src/state/session/logging.ts                  |  164 +-
 src/state/session/moderation.ts               |   36 +-
 src/state/session/network.ts                  |   23 +
 src/state/session/reducer.ts                  |  123 +-
 src/state/session/session-core.ts             |  438 +++
 src/state/session/session-data.ts             |  107 +
 src/state/session/types.ts                    |   11 +-
 src/state/session/util.ts                     |   26 +-
 src/storage/schema.ts                         |   11 +
 src/view/com/composer/drafts/state/api.ts     |    2 +-
 35 files changed, 6871 insertions(+), 2397 deletions(-)
 create mode 100644 src/lib/strings/__tests__/errors.test.ts
 create mode 100644 src/state/session/__tests__/bridge-agent-test.ts
 create mode 100644 src/state/session/__tests__/expiry-rescue-test.ts
 create mode 100644 src/state/session/__tests__/mock-fetch.ts
 create mode 100644 src/state/session/__tests__/provider-abort-test.tsx
 create mode 100644 src/state/session/__tests__/provider-session-events-test.tsx
 create mode 100644 src/state/session/__tests__/session-core-test.ts
 delete mode 100644 src/state/session/agent-config.ts
 create mode 100644 src/state/session/bridge-agent.ts
 create mode 100644 src/state/session/create-account.ts
 create mode 100644 src/state/session/expiry-rescue.ts
 create mode 100644 src/state/session/network.ts
 create mode 100644 src/state/session/session-core.ts
 create mode 100644 src/state/session/session-data.ts

diff --git a/oxlint-suppressions.json b/oxlint-suppressions.json
index ae3513a254..197bd43b1a 100644
--- a/oxlint-suppressions.json
+++ b/oxlint-suppressions.json
@@ -1456,11 +1456,6 @@
       "count": 1
     }
   },
-  "src/state/session/agent.ts": {
-    "typescript/no-explicit-any": {
-      "count": 1
-    }
-  },
   "src/state/shell/color-mode.tsx": {
     "typescript/no-floating-promises": {
       "count": 2
diff --git a/package.json b/package.json
index 51febee03a..93d671ff31 100644
--- a/package.json
+++ b/package.json
@@ -98,6 +98,8 @@
   "dependencies": {
     "@atproto/api": "0.20.39",
     "@atproto/common-web": "0.5.7",
+    "@atproto/lex-client": "0.3.0",
+    "@atproto/lex-password-session": "0.1.8",
     "@atproto/syntax": "0.7.2",
     "@bitdrift/react-native": "^0.6.8",
     "@braintree/sanitize-url": "^6.0.2",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 6ffd6a36f6..b4baf4a374 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -248,51 +248,57 @@ importers:
       '@atproto/common-web':
         specifier: 0.5.7
         version: 0.5.7
+      '@atproto/lex-client':
+        specifier: 0.3.0
+        version: 0.3.0
+      '@atproto/lex-password-session':
+        specifier: 0.1.8
+        version: 0.1.8
       '@atproto/syntax':
         specifier: 0.7.2
         version: 0.7.2
       '@bitdrift/react-native':
         specifier: ^0.6.8
-        version: 0.6.14(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+        version: 0.6.14(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1)
       '@braintree/sanitize-url':
         specifier: ^6.0.2
         version: 6.0.4
       '@bsky.app/alf':
         specifier: ^0.1.15
-        version: 0.1.15(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+        version: 0.1.15(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)
       '@bsky.app/expo-dynamic-app-icon':
         specifier: ^1.8.5
-        version: 1.8.5(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+        version: 1.8.5(83e0f64f4281e4798012214ad5b2d72d)
       '@bsky.app/expo-guess-language':
         specifier: ^0.2.8
-        version: 0.2.8(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+        version: 0.2.8(83e0f64f4281e4798012214ad5b2d72d)
       '@bsky.app/expo-image-crop-tool':
         specifier: ^0.5.1
-        version: 0.5.1(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+        version: 0.5.1(83e0f64f4281e4798012214ad5b2d72d)
       '@bsky.app/expo-scroll-edge-effect':
         specifier: ^0.1.9
-        version: 0.1.9(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+        version: 0.1.9(83e0f64f4281e4798012214ad5b2d72d)
       '@bsky.app/expo-translate-text':
         specifier: ^0.2.9
-        version: 0.2.9(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+        version: 0.2.9(83e0f64f4281e4798012214ad5b2d72d)
       '@bsky.app/peek-menu':
         specifier: ^0.3.2
-        version: 0.3.2(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+        version: 0.3.2(83e0f64f4281e4798012214ad5b2d72d)
       '@bsky.app/react-native-uitextview':
         specifier: ^2.7.0
-        version: 2.7.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+        version: 2.7.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)
       '@bsky.app/sift':
         specifier: ^0.3.9
-        version: 0.3.9(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native-safe-area-context@5.6.2(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+        version: 0.3.9(2d5c14016450c7e55c8cd0dffcca6f69)
       '@bsky.app/tapper':
         specifier: ^0.6.1
-        version: 0.6.1(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)(tlds@1.261.0)
+        version: 0.6.1(8d6e1ad3cb49b1a6214533c496326d11)
       '@bsky.app/video':
         specifier: 0.3.6
-        version: 0.3.6(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+        version: 0.3.6(83e0f64f4281e4798012214ad5b2d72d)
       '@bsky.app/video-compressor':
         specifier: 0.2.0
-        version: 0.2.0(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+        version: 0.2.0(83e0f64f4281e4798012214ad5b2d72d)
       '@emoji-mart/data':
         specifier: ^1.2.1
         version: 1.2.1
@@ -304,7 +310,7 @@ importers:
         version: 0.12.5
       '@expo/webpack-config':
         specifier: ^19.0.1
-        version: 19.0.1(clean-css@5.3.3)(csso@5.0.5)(esbuild@0.25.12)(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(html-minifier-terser@6.1.0)(postcss@8.5.14)
+        version: 19.0.1(clean-css@5.3.3)(cssnano@5.1.15(postcss@8.5.14))(csso@5.0.5)(debug@4.4.3(supports-color@8.1.1))(esbuild@0.25.12)(expo@54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1))(html-minifier-terser@6.1.0)(lightningcss@1.32.0)(postcss@8.5.14)(supports-color@8.1.1)
       '@floating-ui/dom':
         specifier: ^1.6.3
         version: 1.7.6
@@ -334,25 +340,25 @@ importers:
         version: 9.2.7
       '@lingui/core':
         specifier: ^5.9.2
-        version: 5.9.5(@lingui/babel-plugin-lingui-macro@5.9.5(@typescript/typescript6@6.0.2))
+        version: 5.9.5(@lingui/babel-plugin-lingui-macro@5.9.5(@typescript/typescript6@6.0.2)(supports-color@8.1.1))
       '@lingui/react':
         specifier: ^5.9.2
-        version: 5.9.5(@lingui/babel-plugin-lingui-macro@5.9.5(@typescript/typescript6@6.0.2))(react@19.1.0)
+        version: 5.9.5(@lingui/babel-plugin-lingui-macro@5.9.5(@typescript/typescript6@6.0.2)(supports-color@8.1.1))(react@19.1.0)
       '@react-native-async-storage/async-storage':
         specifier: 2.2.0
-        version: 2.2.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))
+        version: 2.2.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))
       '@react-navigation/bottom-tabs':
         specifier: ^7.15.5
-        version: 7.16.0(91eab7bd987834c4c877d5cbf9d3796c)
+        version: 7.16.0(15d086c577324dcb87d77ea7fa3207d2)
       '@react-navigation/native':
         specifier: ^7.1.33
-        version: 7.2.4(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+        version: 7.2.4(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)
       '@react-navigation/native-stack':
         specifier: ^7.14.4
-        version: 7.15.0(91eab7bd987834c4c877d5cbf9d3796c)
+        version: 7.15.0(15d086c577324dcb87d77ea7fa3207d2)
       '@sentry/react-native':
         specifier: ~8.18.0
-        version: 8.18.0(@expo/env@2.0.11)(dotenv@16.6.1)(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+        version: 8.18.0(61f03fc01fabd5cbd0e83cc2a57309d9)
       '@tanstack/query-async-storage-persister':
         specifier: ^5.96.2
         version: 5.100.10
@@ -433,115 +439,115 @@ importers:
         version: 5.0.4
       expo:
         specifier: 54.0.35
-        version: 54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+        version: 54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1)
       expo-age-range:
         specifier: 0.2.18
-        version: 0.2.18(patch_hash=c325225749993424461eeece1d97a99b19c00da2ebc958a73c12e4eca0c39306)(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))
+        version: 0.2.18(patch_hash=c325225749993424461eeece1d97a99b19c00da2ebc958a73c12e4eca0c39306)(83f21d12a6c1aa99b4a65d070875cc68)
       expo-application:
         specifier: ~7.0.8
-        version: 7.0.8(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))
+        version: 7.0.8(expo@54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1))
       expo-asset:
         specifier: ~12.0.13
-        version: 12.0.13(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+        version: 12.0.13(93a6abd34ab5ae64aff6a80525489f34)
       expo-blur:
         specifier: ~15.0.8
-        version: 15.0.8(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+        version: 15.0.8(83e0f64f4281e4798012214ad5b2d72d)
       expo-build-properties:
         specifier: ~1.0.10
-        version: 1.0.10(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))
+        version: 1.0.10(expo@54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1))
       expo-camera:
         specifier: ~17.0.10
-        version: 17.0.10(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native-web@0.21.2(react-dom@19.1.0(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+        version: 17.0.10(8d9f18414d5ddcf91a3e8d2e3aa26778)
       expo-clipboard:
         specifier: ~8.0.8
-        version: 8.0.8(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+        version: 8.0.8(83e0f64f4281e4798012214ad5b2d72d)
       expo-contacts:
         specifier: ^15.0.10
-        version: 15.0.11(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+        version: 15.0.11(83e0f64f4281e4798012214ad5b2d72d)
       expo-dev-client:
         specifier: ~6.0.20
-        version: 6.0.21(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))
+        version: 6.0.21(expo@54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1))(supports-color@8.1.1)
       expo-device:
         specifier: ~8.0.10
-        version: 8.0.10(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))
+        version: 8.0.10(expo@54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1))
       expo-file-system:
         specifier: ~19.0.21
-        version: 19.0.22(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))
+        version: 19.0.22(83f21d12a6c1aa99b4a65d070875cc68)
       expo-font:
         specifier: ~14.0.11
-        version: 14.0.11(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+        version: 14.0.11(83e0f64f4281e4798012214ad5b2d72d)
       expo-glass-effect:
         specifier: 0.1.10
-        version: 0.1.10(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+        version: 0.1.10(83e0f64f4281e4798012214ad5b2d72d)
       expo-haptics:
         specifier: ~15.0.8
-        version: 15.0.8(patch_hash=b33910ba2753c4eccdc885b449e6e33aa90b9cefa75ca8639762a26013141410)(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))
+        version: 15.0.8(patch_hash=b33910ba2753c4eccdc885b449e6e33aa90b9cefa75ca8639762a26013141410)(expo@54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1))
       expo-image:
         specifier: ~3.0.11
-        version: 3.0.11(patch_hash=6d46ffac33426c5285777da5bf5f88c68c8ce27290595dfa65f38c478930c2c4)(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native-web@0.21.2(react-dom@19.1.0(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+        version: 3.0.11(patch_hash=6d46ffac33426c5285777da5bf5f88c68c8ce27290595dfa65f38c478930c2c4)(8d9f18414d5ddcf91a3e8d2e3aa26778)
       expo-image-manipulator:
         specifier: ~14.0.8
-        version: 14.0.8(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))
+        version: 14.0.8(expo@54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1))
       expo-image-picker:
         specifier: ~17.0.10
-        version: 17.0.11(patch_hash=47b28f6ddb8bcaa6483f8714c82daaa0001122f2b0dac6c05d19e98a61a6ceab)(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))
+        version: 17.0.11(patch_hash=47b28f6ddb8bcaa6483f8714c82daaa0001122f2b0dac6c05d19e98a61a6ceab)(expo@54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1))
       expo-intent-launcher:
         specifier: ~13.0.8
-        version: 13.0.8(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))
+        version: 13.0.8(expo@54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1))
       expo-keep-awake:
         specifier: ~15.0.8
-        version: 15.0.8(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react@19.1.0)
+        version: 15.0.8(expo@54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)
       expo-linear-gradient:
         specifier: ~15.0.8
-        version: 15.0.8(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+        version: 15.0.8(83e0f64f4281e4798012214ad5b2d72d)
       expo-linking:
         specifier: ~8.0.11
-        version: 8.0.12(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+        version: 8.0.12(93a6abd34ab5ae64aff6a80525489f34)
       expo-localization:
         specifier: ~17.0.8
-        version: 17.0.8(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react@19.1.0)
+        version: 17.0.8(expo@54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)
       expo-location:
         specifier: ~19.0.8
-        version: 19.0.8(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))
+        version: 19.0.8(expo@54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1))
       expo-media-library:
         specifier: ~18.2.1
-        version: 18.2.1(patch_hash=2b84c17999bb0c977eaef7fa8ac297f7074d91c94fb63726b42d2a277b26b39a)(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))
+        version: 18.2.1(patch_hash=2b84c17999bb0c977eaef7fa8ac297f7074d91c94fb63726b42d2a277b26b39a)(83f21d12a6c1aa99b4a65d070875cc68)
       expo-notifications:
         specifier: ~0.32.17
-        version: 0.32.17(patch_hash=a45a8dcf3d8c4b5df4ee0e62bc79b755fcf9d28ca51a6f685b85830bf4afc2e5)(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+        version: 0.32.17(patch_hash=a45a8dcf3d8c4b5df4ee0e62bc79b755fcf9d28ca51a6f685b85830bf4afc2e5)(93a6abd34ab5ae64aff6a80525489f34)
       expo-paste-input:
         specifier: ^0.2.1
-        version: 0.2.1(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+        version: 0.2.1(83e0f64f4281e4798012214ad5b2d72d)
       expo-privacy-sensitive:
         specifier: ^0.2.0
-        version: 0.2.0(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+        version: 0.2.0(83e0f64f4281e4798012214ad5b2d72d)
       expo-screen-orientation:
         specifier: ~9.0.8
-        version: 9.0.9(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))
+        version: 9.0.9(83f21d12a6c1aa99b4a65d070875cc68)
       expo-sharing:
         specifier: ~14.0.8
-        version: 14.0.8(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))
+        version: 14.0.8(expo@54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1))
       expo-sms:
         specifier: ^14.0.7
-        version: 14.0.8(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))
+        version: 14.0.8(expo@54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1))
       expo-splash-screen:
         specifier: ~31.0.13
-        version: 31.0.13(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))
+        version: 31.0.13(expo@54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1))(supports-color@8.1.1)
       expo-system-ui:
         specifier: ~6.0.9
-        version: 6.0.9(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native-web@0.21.2(react-dom@19.1.0(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))
+        version: 6.0.9(41b38c851305f17c9d2f63b3bbab71a9)
       expo-updates:
         specifier: ~29.0.17
-        version: 29.0.17(patch_hash=04f28cb005b770e9ae8f0065eab96e43cbb1e58107f5f6ad1bdd18f6deb66487)(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+        version: 29.0.17(patch_hash=04f28cb005b770e9ae8f0065eab96e43cbb1e58107f5f6ad1bdd18f6deb66487)(93a6abd34ab5ae64aff6a80525489f34)
       expo-video:
         specifier: ~3.0.16
-        version: 3.0.16(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+        version: 3.0.16(83e0f64f4281e4798012214ad5b2d72d)
       expo-video-thumbnails:
         specifier: ^10.0.8
-        version: 10.0.8(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))
+        version: 10.0.8(expo@54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1))
       expo-web-browser:
         specifier: ~15.0.10
-        version: 15.0.11(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))
+        version: 15.0.11(83f21d12a6c1aa99b4a65d070875cc68)
       fast-deep-equal:
         specifier: ^3.1.3
         version: 3.1.3
@@ -622,73 +628,73 @@ importers:
         version: 5.1.2(react-is@19.2.6)(react@19.1.0)
       react-native:
         specifier: 0.81.5
-        version: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0)
+        version: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1)
       react-native-compressor:
         specifier: 1.13.0
-        version: 1.13.0(patch_hash=58379dfaace6ced8590cb341c77f2ca8099dfa8f7df6297032ec51de767a9925)(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+        version: 1.13.0(patch_hash=58379dfaace6ced8590cb341c77f2ca8099dfa8f7df6297032ec51de767a9925)(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)
       react-native-date-picker:
         specifier: ^5.0.13
-        version: 5.0.13(patch_hash=92943fb79d17d7342a29bbb12b0d8ee3cf6f7bca12ed322dc8d124a3e9fb75bd)(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+        version: 5.0.13(patch_hash=92943fb79d17d7342a29bbb12b0d8ee3cf6f7bca12ed322dc8d124a3e9fb75bd)(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)
       react-native-device-attest:
         specifier: ^0.1.6
-        version: 0.1.6(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+        version: 0.1.6(83e0f64f4281e4798012214ad5b2d72d)
       react-native-drawer-layout:
         specifier: ^4.2.3
-        version: 4.2.3(patch_hash=74f2c043cc22ab87054f219e7c7373a509b779b18bfa79d27e7d051d73355130)(f8669ab0fde0772e831a7516fba74dd4)
+        version: 4.2.3(patch_hash=74f2c043cc22ab87054f219e7c7373a509b779b18bfa79d27e7d051d73355130)(80d195d8b17891585aee78a1fb66460a)
       react-native-edge-to-edge:
         specifier: ^1.8.1
-        version: 1.8.1(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+        version: 1.8.1(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)
       react-native-gesture-handler:
         specifier: ~2.30.0
-        version: 2.30.1(patch_hash=39b9e51b3977fae8ff61764b8c32934fe3fbddaf21587b4661fd73b7c6dd325b)(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+        version: 2.30.1(patch_hash=39b9e51b3977fae8ff61764b8c32934fe3fbddaf21587b4661fd73b7c6dd325b)(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)
       react-native-keyboard-controller:
         specifier: ^1.21.8
-        version: 1.21.8(patch_hash=ac52bf7502ff3ad34a8594b5e1a916b96bf87a2523b6abc87c31f03607d52271)(react-native-reanimated@4.3.2(patch_hash=ab1c095bc473ec5bfd9ead76e870c566660e355e11c5078cfdeb35922d7b2f05)(react-native-worklets@0.8.3(patch_hash=f7263a59ae1c0170af8dfe9a5704cb374d29214a430b4b2841f9b7886c9ba8ad)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+        version: 1.21.8(patch_hash=ac52bf7502ff3ad34a8594b5e1a916b96bf87a2523b6abc87c31f03607d52271)(a7f993fe7a53ab427398397086882821)
       react-native-mmkv:
         specifier: ^3.3.3
-        version: 3.3.3(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+        version: 3.3.3(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)
       react-native-pager-view:
         specifier: 6.8.0
-        version: 6.8.0(patch_hash=c8316acd33c9aef6531e8c272c2bfab7bd02af1255969eeaab2bad5ab48531cc)(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+        version: 6.8.0(patch_hash=c8316acd33c9aef6531e8c272c2bfab7bd02af1255969eeaab2bad5ab48531cc)(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)
       react-native-progress:
         specifier: ^5.0.1
-        version: 5.0.1(react-native-svg@15.12.1(patch_hash=ae309e9542214f5ae54935e253dedd236765feedac7be343f81d532d7fe09310)(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))
+        version: 5.0.1(react-native-svg@15.12.1(patch_hash=ae309e9542214f5ae54935e253dedd236765feedac7be343f81d532d7fe09310)(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))
       react-native-qrcode-styled:
         specifier: ^0.3.3
-        version: 0.3.3(react-native-svg@15.12.1(patch_hash=ae309e9542214f5ae54935e253dedd236765feedac7be343f81d532d7fe09310)(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+        version: 0.3.3(react-native-svg@15.12.1(patch_hash=ae309e9542214f5ae54935e253dedd236765feedac7be343f81d532d7fe09310)(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)
       react-native-reanimated:
         specifier: 4.3.2
-        version: 4.3.2(patch_hash=ab1c095bc473ec5bfd9ead76e870c566660e355e11c5078cfdeb35922d7b2f05)(react-native-worklets@0.8.3(patch_hash=f7263a59ae1c0170af8dfe9a5704cb374d29214a430b4b2841f9b7886c9ba8ad)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+        version: 4.3.2(patch_hash=ab1c095bc473ec5bfd9ead76e870c566660e355e11c5078cfdeb35922d7b2f05)(react-native-worklets@0.8.3(patch_hash=f7263a59ae1c0170af8dfe9a5704cb374d29214a430b4b2841f9b7886c9ba8ad)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)
       react-native-safe-area-context:
         specifier: ~5.6.0
-        version: 5.6.2(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+        version: 5.6.2(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)
       react-native-screens:
         specifier: 4.24.0
-        version: 4.24.0(patch_hash=74a74b489f8074a1974c2792c9c97aec30d8e251669aa37fc5c99993bb4a19e6)(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+        version: 4.24.0(patch_hash=74a74b489f8074a1974c2792c9c97aec30d8e251669aa37fc5c99993bb4a19e6)(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)
       react-native-scroll-forwarder:
         specifier: link:./modules/react-native-scroll-forwarder
         version: link:modules/react-native-scroll-forwarder
       react-native-svg:
         specifier: 15.12.1
-        version: 15.12.1(patch_hash=ae309e9542214f5ae54935e253dedd236765feedac7be343f81d532d7fe09310)(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+        version: 15.12.1(patch_hash=ae309e9542214f5ae54935e253dedd236765feedac7be343f81d532d7fe09310)(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)
       react-native-uuid:
         specifier: ^2.0.3
         version: 2.0.4
       react-native-view-shot:
         specifier: ^4.0.3
-        version: 4.0.3(patch_hash=a2457dc30a82cc8c21f371a6f860d9396d450a2a1b4265b1a4ee13bdb24d3268)(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+        version: 4.0.3(patch_hash=a2457dc30a82cc8c21f371a6f860d9396d450a2a1b4265b1a4ee13bdb24d3268)(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)
       react-native-web:
         specifier: ^0.21.0
         version: 0.21.2(react-dom@19.1.0(react@19.1.0))(react@19.1.0)
       react-native-web-webview:
         specifier: ^1.0.2
-        version: 1.0.2(file-loader@6.2.0(webpack@5.106.2(postcss@8.5.14)))(react-native-web@0.21.2(react-dom@19.1.0(react@19.1.0))(react@19.1.0))
+        version: 1.0.2(file-loader@6.2.0(webpack@5.106.2(clean-css@5.3.3)(cssnano@5.1.15(postcss@8.5.14))(csso@5.0.5)(esbuild@0.25.12)(html-minifier-terser@6.1.0)(lightningcss@1.32.0)(postcss@8.5.14)))(react-native-web@0.21.2(react-dom@19.1.0(react@19.1.0))(react@19.1.0))
       react-native-webview:
         specifier: ^13.15.0
-        version: 13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+        version: 13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)
       react-native-worklets:
         specifier: 0.8.3
-        version: 0.8.3(patch_hash=f7263a59ae1c0170af8dfe9a5704cb374d29214a430b4b2841f9b7886c9ba8ad)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+        version: 0.8.3(patch_hash=f7263a59ae1c0170af8dfe9a5704cb374d29214a430b4b2841f9b7886c9ba8ad)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1)
       react-remove-scroll-bar:
         specifier: ^2.3.8
         version: 2.3.8(@types/react@19.1.17)(react@19.1.0)
@@ -709,7 +715,7 @@ importers:
         version: 2.0.7(react-dom@19.1.0(react@19.1.0))(react@19.1.0)
       sonner-native:
         specifier: 0.26.4
-        version: 0.26.4(c538f2bb3fa64bd80a9a262f75d56c17)
+        version: 0.26.4(dd52c15d65a2604bcf203dfed917879b)
       tippy.js:
         specifier: ^6.3.7
         version: 6.3.7
@@ -728,10 +734,10 @@ importers:
     devDependencies:
       '@babel/core':
         specifier: ^7.26.0
-        version: 7.29.0
+        version: 7.29.0(supports-color@8.1.1)
       '@babel/preset-env':
         specifier: ^7.26.0
-        version: 7.29.5(@babel/core@7.29.0)
+        version: 7.29.5(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
       '@babel/runtime':
         specifier: ^7.26.0
         version: 7.29.2
@@ -740,25 +746,25 @@ importers:
         version: 4.14.2
       '@lingui/babel-plugin-lingui-macro':
         specifier: ^5.9.2
-        version: 5.9.5(@typescript/typescript6@6.0.2)
+        version: 5.9.5(@typescript/typescript6@6.0.2)(supports-color@8.1.1)
       '@lingui/cli':
         specifier: ^5.9.2
-        version: 5.9.5(@typescript/typescript6@6.0.2)
+        version: 5.9.5(@typescript/typescript6@6.0.2)(supports-color@8.1.1)
       '@pmmmwh/react-refresh-webpack-plugin':
         specifier: ^0.5.15
-        version: 0.5.17(react-refresh@0.14.2)(type-fest@1.4.0)(webpack-dev-server@4.15.2(webpack@5.106.2(postcss@8.5.14)))(webpack@5.106.2(postcss@8.5.14))
+        version: 0.5.17(react-refresh@0.14.2)(type-fest@1.4.0)(webpack-dev-server@4.15.2(debug@4.4.3(supports-color@8.1.1))(supports-color@8.1.1)(webpack@5.106.2(clean-css@5.3.3)(cssnano@5.1.15(postcss@8.5.14))(csso@5.0.5)(esbuild@0.25.12)(html-minifier-terser@6.1.0)(lightningcss@1.32.0)(postcss@8.5.14)))(webpack@5.106.2(clean-css@5.3.3)(cssnano@5.1.15(postcss@8.5.14))(csso@5.0.5)(esbuild@0.25.12)(html-minifier-terser@6.1.0)(lightningcss@1.32.0)(postcss@8.5.14))
       '@react-native/babel-preset':
         specifier: 0.81.5
-        version: 0.81.5(@babel/core@7.29.0)
+        version: 0.81.5(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
       '@react-native/typescript-config':
         specifier: ^0.81.5
         version: 0.81.6
       '@sentry/webpack-plugin':
         specifier: ^3.2.2
-        version: 3.6.1(webpack@5.106.2(postcss@8.5.14))
+        version: 3.6.1(supports-color@8.1.1)(webpack@5.106.2(clean-css@5.3.3)(cssnano@5.1.15(postcss@8.5.14))(csso@5.0.5)(esbuild@0.25.12)(html-minifier-terser@6.1.0)(lightningcss@1.32.0)(postcss@8.5.14))
       '@testing-library/react-native':
         specifier: ^13.2.0
-        version: 13.3.3(jest@29.7.0(@types/node@24.12.4))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react-test-renderer@19.1.0(react@19.1.0))(react@19.1.0)
+        version: 13.3.3(jest@29.7.0(@types/node@24.12.4)(supports-color@8.1.1))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react-test-renderer@19.1.0(react@19.1.0))(react@19.1.0)
       '@types/jest':
         specifier: 29.5.14
         version: 29.5.14
@@ -785,7 +791,7 @@ importers:
         version: typescript@7.0.2
       babel-jest:
         specifier: ^29.7.0
-        version: 29.7.0(@babel/core@7.29.0)
+        version: 29.7.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
       babel-plugin-module-resolver:
         specifier: ^5.0.2
         version: 5.0.3
@@ -794,25 +800,25 @@ importers:
         version: 19.1.0-rc.3
       babel-preset-expo:
         specifier: ~54.0.10
-        version: 54.0.10(@babel/core@7.29.0)(@babel/runtime@7.29.2)(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-refresh@0.14.2)
+        version: 54.0.10(@babel/core@7.29.0(supports-color@8.1.1))(@babel/runtime@7.29.2)(expo@54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1))(react-refresh@0.14.2)(supports-color@8.1.1)
       eslint-plugin-bsky-internal:
         specifier: link:eslint
         version: link:eslint
       eslint-plugin-react-compiler:
         specifier: 19.1.0-rc.2
-        version: 19.1.0-rc.2(eslint@eslint)
+        version: 19.1.0-rc.2(eslint@8.57.1(supports-color@8.1.1))(supports-color@8.1.1)
       eslint-plugin-react-native:
         specifier: ^5.0.0
-        version: 5.0.0(eslint@eslint)
+        version: 5.0.0(eslint@8.57.1(supports-color@8.1.1))
       eslint-plugin-react-native-a11y:
         specifier: ^3.5.1
-        version: 3.5.1(eslint@eslint)
+        version: 3.5.1(eslint@8.57.1(supports-color@8.1.1))
       eslint-plugin-simple-import-sort:
         specifier: ^13.0.0
-        version: 13.0.0(eslint@eslint)
+        version: 13.0.0(eslint@8.57.1(supports-color@8.1.1))
       file-loader:
         specifier: 6.2.0
-        version: 6.2.0(webpack@5.106.2(postcss@8.5.14))
+        version: 6.2.0(webpack@5.106.2(clean-css@5.3.3)(cssnano@5.1.15(postcss@8.5.14))(csso@5.0.5)(esbuild@0.25.12)(html-minifier-terser@6.1.0)(lightningcss@1.32.0)(postcss@8.5.14))
       globals:
         specifier: ^17.0.0
         version: 17.6.0
@@ -824,10 +830,10 @@ importers:
         version: 3.0.1
       jest:
         specifier: ^29.7.0
-        version: 29.7.0(@types/node@24.12.4)
+        version: 29.7.0(@types/node@24.12.4)(supports-color@8.1.1)
       jest-expo:
         specifier: ~54.0.17
-        version: 54.0.17(@babel/core@7.29.0)(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(jest@29.7.0(@types/node@24.12.4))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+        version: 54.0.17(ff9d3150c2730c411fa3a2f331cc40ee)
       jest-junit:
         specifier: ^16.0.0
         version: 16.0.0
@@ -887,6 +893,10 @@ packages:
     resolution: {integrity: sha512-2c5C6YV8352JJz9Z5fNfcsstllaKGAb3cQW9aO7unMAGh/FzTGFq+xOwNMW2lTeagO6z530uxYm8AiSRM6O+DQ==}
     engines: {node: '>=22'}
 
+  '@atproto/lex-client@0.3.0':
+    resolution: {integrity: sha512-P+S3hWdIIOgNTun7J42dvxSyCkQog3Q2ShTjvcwP761TqiRex7zDWaRAaT9gvCy6I4pRuNdBCStysjSMlJeSdg==}
+    engines: {node: '>=22'}
+
   '@atproto/lex-data@0.1.6':
     resolution: {integrity: sha512-rvovRrYWDEuerX+ZeQbdI5dKs0bYvuMjhwDOtT+pkOvdY4MkfN41DJCz/RAYVAQ7noPdaalB6pAX9euukheE/w==}
     engines: {node: '>=22'}
@@ -903,6 +913,14 @@ packages:
     resolution: {integrity: sha512-mvrAd0lbyuecIHjyld8QN6MN6CBf4j0GCxLzegsvLh0SvDf+GbYWklkcQqmITL44yFQOwmA/QNIQj0Uvh7+R/g==}
     engines: {node: '>=22'}
 
+  '@atproto/lex-password-session@0.1.8':
+    resolution: {integrity: sha512-Zr3HLu6rgadiq2w82VSThOQcNfwTJNlrzlT8n9oBXDBw3CUEq3cTMatzTpdk4HYqv0unaqhaEowcKhJ4eWvSxQ==}
+    engines: {node: '>=22'}
+
+  '@atproto/lex-schema@0.2.5':
+    resolution: {integrity: sha512-/tP3dRqaZu0EIoq0BSVzhvFGL6u0uu2KFDV21i73DpFsg6TXOTddKJ9bvgK83XdAJYL7PWi703XsaR31v9u5Qg==}
+    engines: {node: '>=22'}
+
   '@atproto/lexicon@0.7.11':
     resolution: {integrity: sha512-ukCZMCWmiu7fAlssBbLs+IMaf2K2R9mADaTKz2jEeC/xeZ3jT77Ka0S2G+ELBB+Dc9ijBACU0iPMQLhquOkuzQ==}
     engines: {node: '>=22'}
@@ -1893,6 +1911,24 @@ packages:
     cpu: [x64]
     os: [win32]
 
+  '@eslint-community/eslint-utils@4.10.1':
+    resolution: {integrity: sha512-cuadcxVFE8sDK6iWJbs8Sn0av2Nrh2QSGQhVlBW9AaAHqHwjWsZHT8LJ4hFGPh7ASBV2deFdM7H/DPjulmh8rg==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      eslint: ^6.0.0 || ^7.0.0 || >=8.0.0
+
+  '@eslint-community/regexpp@4.12.2':
+    resolution: {integrity: sha512-EriSTlt5OC9/7SXkRSCAhfSxxoSUgBm33OH+IkwbdpgoqsSsUg7y3uh+IICI/Qg4BBWr3U2i39RpmycbxMq4ew==}
+    engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0}
+
+  '@eslint/eslintrc@2.1.4':
+    resolution: {integrity: sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+
+  '@eslint/js@8.57.1':
+    resolution: {integrity: sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+
   '@expo/cli@54.0.25':
     resolution: {integrity: sha512-WnUqIb8oMBhtwSfIqdCHCzcaDIpLNXItRVd5miuvWi4GO0SGo89PSsAkbVJ+LJgcaY+v5rbgMELJS9I/CqOulA==}
     hasBin: true
@@ -2083,6 +2119,19 @@ packages:
     resolution: {integrity: sha512-mUaMsgeUTpRIUOTn33EUXHRK6j7pxBjwqH4WpQyq+pukjd1AIzWlEa6w7i6bInJUcweGgP2beXZmaP6b6UPn7A==}
     engines: {node: '>=10'}
 
+  '@humanwhocodes/config-array@0.13.0':
+    resolution: {integrity: sha512-DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw==}
+    engines: {node: '>=10.10.0'}
+    deprecated: Use @eslint/config-array instead
+
+  '@humanwhocodes/module-importer@1.0.1':
+    resolution: {integrity: sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==}
+    engines: {node: '>=12.22'}
+
+  '@humanwhocodes/object-schema@2.0.3':
+    resolution: {integrity: sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==}
+    deprecated: Use @eslint/object-schema instead
+
   '@ide/backoff@1.0.0':
     resolution: {integrity: sha512-F0YfUDjvT+Mtt/R4xdl2X0EYCHMMiJqNLdxHD++jDT5ydEFIyqbCHh51Qx2E211dgZprPKhV7sHmnXKpLuvc5g==}
 
@@ -3500,6 +3549,9 @@ packages:
   '@sinonjs/fake-timers@10.3.0':
     resolution: {integrity: sha512-V4BG07kuYSUkTCSBHG8G8TNhM+F19jXFWnQtzj+we8DrkpSBCee9Z3Ms8yiGer/dlmhe35/Xdgyo3/0rQKg7YA==}
 
+  '@standard-schema/spec@1.1.0':
+    resolution: {integrity: sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w==}
+
   '@tanstack/query-async-storage-persister@5.100.10':
     resolution: {integrity: sha512-NbxsCI9qyMbEooFnFsAR2dbVQ6cmxZpOWSjLFy62qfMkxXnNjkskqex7YgtzWSaD/ozOOLgrbDiyYWEPYKmMyQ==}
 
@@ -3972,10 +4024,12 @@ packages:
   '@xmldom/xmldom@0.8.13':
     resolution: {integrity: sha512-KRYzxepc14G/CEpEGc3Yn+JKaAeT63smlDr+vjB8jRfgTBBI9wRj/nkQEO+ucV8p8I9bfKLWp37uHgFrbntPvw==}
     engines: {node: '>=10.0.0'}
+    deprecated: this version has critical issues, please update to the latest version
 
   '@xmldom/xmldom@0.9.10':
     resolution: {integrity: sha512-A9gOqLdi6cV4ibazAjcQufGj0B1y/vDqYrcuP6d/6x8P27gRS8643Dj9o1dEKtB6O7fwxb2FgBmJS2mX7gpvdw==}
     engines: {node: '>=14.6'}
+    deprecated: this version has critical issues, please update to the latest version
 
   '@xtuc/ieee754@1.2.0':
     resolution: {integrity: sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==}
@@ -4008,6 +4062,11 @@ packages:
     peerDependencies:
       acorn: ^8.14.0
 
+  acorn-jsx@5.3.2:
+    resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
+    peerDependencies:
+      acorn: ^6.0.0 || ^7.0.0 || ^8.0.0
+
   acorn-walk@8.3.5:
     resolution: {integrity: sha512-HEHNfbars9v4pgpW6SO1KSPkfoS0xVOM/9UzkJltjlsHZmJasxg8aXkuZa7SMf8vKGIBhpUsPluQSqhJFCqebw==}
     engines: {node: '>=0.4.0'}
@@ -4875,6 +4934,9 @@ packages:
     resolution: {integrity: sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==}
     engines: {node: '>=4.0.0'}
 
+  deep-is@0.1.4:
+    resolution: {integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==}
+
   deepmerge@4.3.1:
     resolution: {integrity: sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==}
     engines: {node: '>=0.10.0'}
@@ -4951,6 +5013,10 @@ packages:
     resolution: {integrity: sha512-l4gcSouhcgIKRvyy99RNVOgxXiicE+2jZoNmaNmZ6JXiGajBOJAesk1OBlJuM5k2c+eudGdLxDqXuPCKIj6kpw==}
     engines: {node: '>=6'}
 
+  doctrine@3.0.0:
+    resolution: {integrity: sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==}
+    engines: {node: '>=6.0.0'}
+
   dom-converter@0.2.0:
     resolution: {integrity: sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==}
 
@@ -5167,15 +5233,37 @@ packages:
     resolution: {integrity: sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==}
     engines: {node: '>=8.0.0'}
 
+  eslint-scope@7.2.2:
+    resolution: {integrity: sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+
+  eslint-visitor-keys@3.4.3:
+    resolution: {integrity: sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+
+  eslint@8.57.1:
+    resolution: {integrity: sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    deprecated: This version is no longer supported. Please see https://eslint.org/version-support for other options.
+    hasBin: true
+
   esm@3.2.25:
     resolution: {integrity: sha512-U1suiZ2oDVWv4zPO56S0NcR5QriEahGtdN2OR6FiOG4WJvcjBVFB0qI4+eKoWFH483PKGuLuu6V8Z4T5g63UVA==}
     engines: {node: '>=6'}
 
+  espree@9.6.1:
+    resolution: {integrity: sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+
   esprima@4.0.1:
     resolution: {integrity: sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==}
     engines: {node: '>=4'}
     hasBin: true
 
+  esquery@1.7.0:
+    resolution: {integrity: sha512-Ap6G0WQwcU/LHsvLwON1fAQX9Zp0A2Y6Y/cJBl9r/JbW90Zyg4/zbG6zzKa2OTALELarYHmKu0GhpM5EO+7T0g==}
+    engines: {node: '>=0.10'}
+
   esrecurse@4.3.0:
     resolution: {integrity: sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==}
     engines: {node: '>=4.0'}
@@ -5571,6 +5659,9 @@ packages:
   fast-json-stringify@6.4.0:
     resolution: {integrity: sha512-ibRCQ0GZKJIQ+P3Et1h0LhPgp3PMTYk0MH8O+kW3lNYsvmaQww5Nn3f1jf73Q0jR1Yz3a1CDP4/NZD3vOajWJQ==}
 
+  fast-levenshtein@2.0.6:
+    resolution: {integrity: sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==}
+
   fast-text-encoding@1.0.6:
     resolution: {integrity: sha512-VhXlQgj9ioXCqGstD37E/HBeqEGV/qOD/kmbVG8h5xKBYvM1L3lR1Zn4555cQ8GkYbJa8aJSipLPndE1k6zK2w==}
 
@@ -5602,6 +5693,10 @@ packages:
       picomatch:
         optional: true
 
+  file-entry-cache@6.0.1:
+    resolution: {integrity: sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==}
+    engines: {node: ^10.12.0 || >=12.0.0}
+
   file-loader@6.2.0:
     resolution: {integrity: sha512-qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw==}
     engines: {node: '>= 10.13.0'}
@@ -5646,6 +5741,13 @@ packages:
   find-yarn-workspace-root@2.0.0:
     resolution: {integrity: sha512-1IMnbjt4KzsQfnhnzNd8wUEgXZ44IzZaZmnLYx7D5FZlaHt2gW20Cri8Q+E/t5tIj4+epTBub+2Zxu/vNILzqQ==}
 
+  flat-cache@3.2.0:
+    resolution: {integrity: sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==}
+    engines: {node: ^10.12.0 || >=12.0.0}
+
+  flatted@3.4.4:
+    resolution: {integrity: sha512-5+ybhBZANEJxaH3X5evAFatUxLfEHSr7n6kYJ+1Qd0mUqr4eu9gIf6GDbWHf8RJijHrjjO8G+la14SlL2SeS1Q==}
+
   flow-enums-runtime@0.0.6:
     resolution: {integrity: sha512-3PYnM29RFXwvAN6Pc/scUfkI7RwhQ/xqyLUyPNlXUp9S40zI8nup9tUSrTLSVnWGBN38FNiGWbwZOB6uR4OGdw==}
 
@@ -5797,6 +5899,10 @@ packages:
     engines: {node: '>=16 || 14 >=14.17'}
     deprecated: Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me
 
+  globals@13.24.0:
+    resolution: {integrity: sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==}
+    engines: {node: '>=8'}
+
   globals@17.6.0:
     resolution: {integrity: sha512-sepffkT8stwnIYbsMBpoCHJuJM5l98FUF2AnE07hfvE0m/qp3R586hw4jF4uadbhvg1ooIdzuu7CsfD2jzCaNA==}
     engines: {node: '>=18'}
@@ -5820,6 +5926,9 @@ packages:
   graceful-fs@4.2.11:
     resolution: {integrity: sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==}
 
+  graphemer@1.4.0:
+    resolution: {integrity: sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==}
+
   gzip-size@6.0.0:
     resolution: {integrity: sha512-ax7ZYomf6jqPTQ4+XCpUGyXKHk5WweS+e05MBO4/y3WJ5RkmPXNKvX+bx1behVILVwr6JSQvZAku021CHPXG3Q==}
     engines: {node: '>=10'}
@@ -6196,6 +6305,10 @@ packages:
     resolution: {integrity: sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==}
     engines: {node: '>=6'}
 
+  is-path-inside@3.0.3:
+    resolution: {integrity: sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==}
+    engines: {node: '>=8'}
+
   is-plain-obj@2.1.0:
     resolution: {integrity: sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==}
     engines: {node: '>=8'}
@@ -6529,6 +6642,9 @@ packages:
     engines: {node: '>=6'}
     hasBin: true
 
+  json-buffer@3.0.1:
+    resolution: {integrity: sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==}
+
   json-parse-even-better-errors@2.3.1:
     resolution: {integrity: sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==}
 
@@ -6541,6 +6657,9 @@ packages:
   json-schema-traverse@1.0.0:
     resolution: {integrity: sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==}
 
+  json-stable-stringify-without-jsonify@1.0.1:
+    resolution: {integrity: sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==}
+
   json5@2.2.3:
     resolution: {integrity: sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==}
     engines: {node: '>=6'}
@@ -6557,6 +6676,9 @@ packages:
     resolution: {integrity: sha512-+KJGIyHgkGuIq3IEBNftfhW/LfWhXUIY6OmyVWjliu5KH1y0fw7VQ8YndE2O4qZdMSd9SqbnC8GOcZEy0Om7sA==}
     engines: {node: '>=18'}
 
+  keyv@4.5.4:
+    resolution: {integrity: sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==}
+
   kleur@3.0.3:
     resolution: {integrity: sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==}
     engines: {node: '>=6'}
@@ -6575,6 +6697,10 @@ packages:
     resolution: {integrity: sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==}
     engines: {node: '>=6'}
 
+  levn@0.4.1:
+    resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==}
+    engines: {node: '>= 0.8.0'}
+
   libphonenumber-js@1.13.1:
     resolution: {integrity: sha512-GEw0GLL7YUUA6nv21IsCvVjtI5Ejn84sjbdfQ9KxdbqEVOk1PZh7xejn01EEiniKw+dBeCfim+8MGeuvVuE2BA==}
 
@@ -6703,6 +6829,9 @@ packages:
   lodash.memoize@4.1.2:
     resolution: {integrity: sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==}
 
+  lodash.merge@4.6.2:
+    resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
+
   lodash.shuffle@4.2.0:
     resolution: {integrity: sha512-V/rTAABKLFjoecTZjKSv+A1ZomG8hZg8hlgeG6wwQVD9AGv+10zqqSf6mFq2tVA703Zd5R0YhSuSlXA+E/Ei+Q==}
 
@@ -7331,6 +7460,10 @@ packages:
     resolution: {integrity: sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==}
     hasBin: true
 
+  optionator@0.9.4:
+    resolution: {integrity: sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==}
+    engines: {node: '>= 0.8.0'}
+
   ora@3.4.0:
     resolution: {integrity: sha512-eNwHudNbO1folBP3JsZ19v9azXWtQZjICdr3Q0TDPIaeBQ3mXLrh54wM+er0+hSp+dWKf+Z8KM58CYzEyIYxYg==}
     engines: {node: '>=6'}
@@ -7725,6 +7858,10 @@ packages:
     resolution: {integrity: sha512-SoSL4+OSEtR99LHFZQiJLkT59C5B1amGO1NzTwj7TT1qCUgUO6hxOvzkOYxD+vMrXBM3XJIKzokoERdqQq/Zmg==}
     engines: {node: ^10 || ^12 || >=14}
 
+  prelude-ls@1.2.1:
+    resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
+    engines: {node: '>= 0.8.0'}
+
   prettier@3.8.3:
     resolution: {integrity: sha512-7igPTM53cGHMW8xWuVTydi2KO233VFiTNyF5hLJqpilHfmn8C8gPf+PS7dUT64YcXFbiMGZxS9pCSxL/Dxm/Jw==}
     engines: {node: '>=14'}
@@ -8823,6 +8960,9 @@ packages:
   text-segmentation@1.0.3:
     resolution: {integrity: sha512-iOiPUo/BGnZ6+54OsWxZidGCsdU8YbE4PSpdPinp7DeMtUJNJBoJ/ouUSTJjHkh1KntHaltHl/gDs2FC4i5+Nw==}
 
+  text-table@0.2.0:
+    resolution: {integrity: sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==}
+
   thenify-all@1.6.0:
     resolution: {integrity: sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==}
     engines: {node: '>=0.8'}
@@ -8902,10 +9042,18 @@ packages:
   tslib@2.8.1:
     resolution: {integrity: sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==}
 
+  type-check@0.4.0:
+    resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==}
+    engines: {node: '>= 0.8.0'}
+
   type-detect@4.0.8:
     resolution: {integrity: sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==}
     engines: {node: '>=4'}
 
+  type-fest@0.20.2:
+    resolution: {integrity: sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==}
+    engines: {node: '>=10'}
+
   type-fest@0.21.3:
     resolution: {integrity: sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==}
     engines: {node: '>=10'}
@@ -9265,6 +9413,10 @@ packages:
   wonka@6.3.6:
     resolution: {integrity: sha512-MXH+6mDHAZ2GuMpgKS055FR6v0xVP3XwquxIMYXgiW+FejHQlMGlvVRZT4qMCxR+bEo/FCtIdKxwej9WV3YQag==}
 
+  word-wrap@1.2.5:
+    resolution: {integrity: sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==}
+    engines: {node: '>=0.10.0'}
+
   wrap-ansi@10.0.0:
     resolution: {integrity: sha512-SGcvg80f0wUy2/fXES19feHMz8E0JoXv2uNgHOu4Dgi2OrCy1lqwFYEJz1BLbDI0exjPMe/ZdzZ/YpGECBG/aQ==}
     engines: {node: '>=20'}
@@ -9441,6 +9593,13 @@ snapshots:
       '@atproto/syntax': 0.7.4
       zod: 3.25.76
 
+  '@atproto/lex-client@0.3.0':
+    dependencies:
+      '@atproto/lex-data': 0.1.7
+      '@atproto/lex-json': 0.1.6
+      '@atproto/lex-schema': 0.2.5
+      tslib: 2.8.1
+
   '@atproto/lex-data@0.1.6':
     dependencies:
       multiformats: 13.4.2
@@ -9463,6 +9622,19 @@ snapshots:
       '@atproto/lex-data': 0.1.7
       tslib: 2.8.1
 
+  '@atproto/lex-password-session@0.1.8':
+    dependencies:
+      '@atproto/lex-client': 0.3.0
+      '@atproto/lex-schema': 0.2.5
+      tslib: 2.8.1
+
+  '@atproto/lex-schema@0.2.5':
+    dependencies:
+      '@atproto/lex-data': 0.1.7
+      '@atproto/syntax': 0.7.4
+      '@standard-schema/spec': 1.1.0
+      tslib: 2.8.1
+
   '@atproto/lexicon@0.7.11':
     dependencies:
       '@atproto/common-web': 0.5.9
@@ -9497,20 +9669,20 @@ snapshots:
 
   '@babel/compat-data@7.29.3': {}
 
-  '@babel/core@7.29.0':
+  '@babel/core@7.29.0(supports-color@8.1.1)':
     dependencies:
       '@babel/code-frame': 7.29.0
       '@babel/generator': 7.29.1
       '@babel/helper-compilation-targets': 7.28.6
-      '@babel/helper-module-transforms': 7.28.6(@babel/core@7.29.0)
+      '@babel/helper-module-transforms': 7.28.6(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
       '@babel/helpers': 7.29.2
       '@babel/parser': 7.29.3
       '@babel/template': 7.28.6
-      '@babel/traverse': 7.29.0
+      '@babel/traverse': 7.29.0(supports-color@8.1.1)
       '@babel/types': 7.29.0
       '@jridgewell/remapping': 2.3.5
       convert-source-map: 2.0.0
-      debug: 4.4.3
+      debug: 4.4.3(supports-color@8.1.1)
       gensync: 1.0.0-beta.2
       json5: 2.2.3
       semver: 6.3.1
@@ -9537,32 +9709,32 @@ snapshots:
       lru-cache: 5.1.1
       semver: 6.3.1
 
-  '@babel/helper-create-class-features-plugin@7.29.3(@babel/core@7.29.0)':
+  '@babel/helper-create-class-features-plugin@7.29.3(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
       '@babel/helper-annotate-as-pure': 7.27.3
-      '@babel/helper-member-expression-to-functions': 7.28.5
+      '@babel/helper-member-expression-to-functions': 7.28.5(supports-color@8.1.1)
       '@babel/helper-optimise-call-expression': 7.27.1
-      '@babel/helper-replace-supers': 7.28.6(@babel/core@7.29.0)
-      '@babel/helper-skip-transparent-expression-wrappers': 7.27.1
-      '@babel/traverse': 7.29.0
+      '@babel/helper-replace-supers': 7.28.6(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
+      '@babel/helper-skip-transparent-expression-wrappers': 7.27.1(supports-color@8.1.1)
+      '@babel/traverse': 7.29.0(supports-color@8.1.1)
       semver: 6.3.1
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/helper-create-regexp-features-plugin@7.28.5(@babel/core@7.29.0)':
+  '@babel/helper-create-regexp-features-plugin@7.28.5(@babel/core@7.29.0(supports-color@8.1.1))':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
       '@babel/helper-annotate-as-pure': 7.27.3
       regexpu-core: 6.4.0
       semver: 6.3.1
 
-  '@babel/helper-define-polyfill-provider@0.6.8(@babel/core@7.29.0)':
+  '@babel/helper-define-polyfill-provider@0.6.8(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
       '@babel/helper-compilation-targets': 7.28.6
       '@babel/helper-plugin-utils': 7.28.6
-      debug: 4.4.3
+      debug: 4.4.3(supports-color@8.1.1)
       lodash.debounce: 4.0.8
       resolve: 1.22.12
     transitivePeerDependencies:
@@ -9570,26 +9742,26 @@ snapshots:
 
   '@babel/helper-globals@7.28.0': {}
 
-  '@babel/helper-member-expression-to-functions@7.28.5':
+  '@babel/helper-member-expression-to-functions@7.28.5(supports-color@8.1.1)':
     dependencies:
-      '@babel/traverse': 7.29.0
+      '@babel/traverse': 7.29.0(supports-color@8.1.1)
       '@babel/types': 7.29.0
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/helper-module-imports@7.28.6':
+  '@babel/helper-module-imports@7.28.6(supports-color@8.1.1)':
     dependencies:
-      '@babel/traverse': 7.29.0
+      '@babel/traverse': 7.29.0(supports-color@8.1.1)
       '@babel/types': 7.29.0
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/helper-module-transforms@7.28.6(@babel/core@7.29.0)':
+  '@babel/helper-module-transforms@7.28.6(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)':
     dependencies:
-      '@babel/core': 7.29.0
-      '@babel/helper-module-imports': 7.28.6
+      '@babel/core': 7.29.0(supports-color@8.1.1)
+      '@babel/helper-module-imports': 7.28.6(supports-color@8.1.1)
       '@babel/helper-validator-identifier': 7.28.5
-      '@babel/traverse': 7.29.0
+      '@babel/traverse': 7.29.0(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
@@ -9599,27 +9771,27 @@ snapshots:
 
   '@babel/helper-plugin-utils@7.28.6': {}
 
-  '@babel/helper-remap-async-to-generator@7.27.1(@babel/core@7.29.0)':
+  '@babel/helper-remap-async-to-generator@7.27.1(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
       '@babel/helper-annotate-as-pure': 7.27.3
-      '@babel/helper-wrap-function': 7.28.6
-      '@babel/traverse': 7.29.0
+      '@babel/helper-wrap-function': 7.28.6(supports-color@8.1.1)
+      '@babel/traverse': 7.29.0(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/helper-replace-supers@7.28.6(@babel/core@7.29.0)':
+  '@babel/helper-replace-supers@7.28.6(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)':
     dependencies:
-      '@babel/core': 7.29.0
-      '@babel/helper-member-expression-to-functions': 7.28.5
+      '@babel/core': 7.29.0(supports-color@8.1.1)
+      '@babel/helper-member-expression-to-functions': 7.28.5(supports-color@8.1.1)
       '@babel/helper-optimise-call-expression': 7.27.1
-      '@babel/traverse': 7.29.0
+      '@babel/traverse': 7.29.0(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/helper-skip-transparent-expression-wrappers@7.27.1':
+  '@babel/helper-skip-transparent-expression-wrappers@7.27.1(supports-color@8.1.1)':
     dependencies:
-      '@babel/traverse': 7.29.0
+      '@babel/traverse': 7.29.0(supports-color@8.1.1)
       '@babel/types': 7.29.0
     transitivePeerDependencies:
       - supports-color
@@ -9630,10 +9802,10 @@ snapshots:
 
   '@babel/helper-validator-option@7.27.1': {}
 
-  '@babel/helper-wrap-function@7.28.6':
+  '@babel/helper-wrap-function@7.28.6(supports-color@8.1.1)':
     dependencies:
       '@babel/template': 7.28.6
-      '@babel/traverse': 7.29.0
+      '@babel/traverse': 7.29.0(supports-color@8.1.1)
       '@babel/types': 7.29.0
     transitivePeerDependencies:
       - supports-color
@@ -9654,696 +9826,696 @@ snapshots:
     dependencies:
       '@babel/types': 7.29.0
 
-  '@babel/plugin-bugfix-firefox-class-in-computed-class-key@7.28.5(@babel/core@7.29.0)':
+  '@babel/plugin-bugfix-firefox-class-in-computed-class-key@7.28.5(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.28.6
-      '@babel/traverse': 7.29.0
+      '@babel/traverse': 7.29.0(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/plugin-bugfix-safari-class-field-initializer-scope@7.27.1(@babel/core@7.29.0)':
+  '@babel/plugin-bugfix-safari-class-field-initializer-scope@7.27.1(@babel/core@7.29.0(supports-color@8.1.1))':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@7.27.1(@babel/core@7.29.0)':
+  '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@7.27.1(@babel/core@7.29.0(supports-color@8.1.1))':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-bugfix-safari-rest-destructuring-rhs-array@7.29.3(@babel/core@7.29.0)':
+  '@babel/plugin-bugfix-safari-rest-destructuring-rhs-array@7.29.3(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.28.6
-      '@babel/helper-skip-transparent-expression-wrappers': 7.27.1
+      '@babel/helper-skip-transparent-expression-wrappers': 7.27.1(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@7.27.1(@babel/core@7.29.0)':
+  '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@7.27.1(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.28.6
-      '@babel/helper-skip-transparent-expression-wrappers': 7.27.1
-      '@babel/plugin-transform-optional-chaining': 7.28.6(@babel/core@7.29.0)
+      '@babel/helper-skip-transparent-expression-wrappers': 7.27.1(supports-color@8.1.1)
+      '@babel/plugin-transform-optional-chaining': 7.28.6(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@7.28.6(@babel/core@7.29.0)':
+  '@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@7.28.6(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.28.6
-      '@babel/traverse': 7.29.0
+      '@babel/traverse': 7.29.0(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/plugin-proposal-decorators@7.29.0(@babel/core@7.29.0)':
+  '@babel/plugin-proposal-decorators@7.29.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)':
     dependencies:
-      '@babel/core': 7.29.0
-      '@babel/helper-create-class-features-plugin': 7.29.3(@babel/core@7.29.0)
+      '@babel/core': 7.29.0(supports-color@8.1.1)
+      '@babel/helper-create-class-features-plugin': 7.29.3(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.28.6
-      '@babel/plugin-syntax-decorators': 7.28.6(@babel/core@7.29.0)
+      '@babel/plugin-syntax-decorators': 7.28.6(@babel/core@7.29.0(supports-color@8.1.1))
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/plugin-proposal-export-default-from@7.27.1(@babel/core@7.29.0)':
+  '@babel/plugin-proposal-export-default-from@7.27.1(@babel/core@7.29.0(supports-color@8.1.1))':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-proposal-private-methods@7.18.6(@babel/core@7.29.0)':
+  '@babel/plugin-proposal-private-methods@7.18.6(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)':
     dependencies:
-      '@babel/core': 7.29.0
-      '@babel/helper-create-class-features-plugin': 7.29.3(@babel/core@7.29.0)
+      '@babel/core': 7.29.0(supports-color@8.1.1)
+      '@babel/helper-create-class-features-plugin': 7.29.3(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.28.6
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/plugin-proposal-private-property-in-object@7.21.0-placeholder-for-preset-env.2(@babel/core@7.29.0)':
+  '@babel/plugin-proposal-private-property-in-object@7.21.0-placeholder-for-preset-env.2(@babel/core@7.29.0(supports-color@8.1.1))':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
 
-  '@babel/plugin-syntax-async-generators@7.8.4(@babel/core@7.29.0)':
+  '@babel/plugin-syntax-async-generators@7.8.4(@babel/core@7.29.0(supports-color@8.1.1))':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-syntax-bigint@7.8.3(@babel/core@7.29.0)':
+  '@babel/plugin-syntax-bigint@7.8.3(@babel/core@7.29.0(supports-color@8.1.1))':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-syntax-class-properties@7.12.13(@babel/core@7.29.0)':
+  '@babel/plugin-syntax-class-properties@7.12.13(@babel/core@7.29.0(supports-color@8.1.1))':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-syntax-class-static-block@7.14.5(@babel/core@7.29.0)':
+  '@babel/plugin-syntax-class-static-block@7.14.5(@babel/core@7.29.0(supports-color@8.1.1))':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-syntax-decorators@7.28.6(@babel/core@7.29.0)':
+  '@babel/plugin-syntax-decorators@7.28.6(@babel/core@7.29.0(supports-color@8.1.1))':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-syntax-dynamic-import@7.8.3(@babel/core@7.29.0)':
+  '@babel/plugin-syntax-dynamic-import@7.8.3(@babel/core@7.29.0(supports-color@8.1.1))':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-syntax-export-default-from@7.28.6(@babel/core@7.29.0)':
+  '@babel/plugin-syntax-export-default-from@7.28.6(@babel/core@7.29.0(supports-color@8.1.1))':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-syntax-flow@7.28.6(@babel/core@7.29.0)':
+  '@babel/plugin-syntax-flow@7.28.6(@babel/core@7.29.0(supports-color@8.1.1))':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-syntax-import-assertions@7.28.6(@babel/core@7.29.0)':
+  '@babel/plugin-syntax-import-assertions@7.28.6(@babel/core@7.29.0(supports-color@8.1.1))':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-syntax-import-attributes@7.28.6(@babel/core@7.29.0)':
+  '@babel/plugin-syntax-import-attributes@7.28.6(@babel/core@7.29.0(supports-color@8.1.1))':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-syntax-import-meta@7.10.4(@babel/core@7.29.0)':
+  '@babel/plugin-syntax-import-meta@7.10.4(@babel/core@7.29.0(supports-color@8.1.1))':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-syntax-json-strings@7.8.3(@babel/core@7.29.0)':
+  '@babel/plugin-syntax-json-strings@7.8.3(@babel/core@7.29.0(supports-color@8.1.1))':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-syntax-jsx@7.28.6(@babel/core@7.29.0)':
+  '@babel/plugin-syntax-jsx@7.28.6(@babel/core@7.29.0(supports-color@8.1.1))':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-syntax-logical-assignment-operators@7.10.4(@babel/core@7.29.0)':
+  '@babel/plugin-syntax-logical-assignment-operators@7.10.4(@babel/core@7.29.0(supports-color@8.1.1))':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-syntax-nullish-coalescing-operator@7.8.3(@babel/core@7.29.0)':
+  '@babel/plugin-syntax-nullish-coalescing-operator@7.8.3(@babel/core@7.29.0(supports-color@8.1.1))':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-syntax-numeric-separator@7.10.4(@babel/core@7.29.0)':
+  '@babel/plugin-syntax-numeric-separator@7.10.4(@babel/core@7.29.0(supports-color@8.1.1))':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-syntax-object-rest-spread@7.8.3(@babel/core@7.29.0)':
+  '@babel/plugin-syntax-object-rest-spread@7.8.3(@babel/core@7.29.0(supports-color@8.1.1))':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-syntax-optional-catch-binding@7.8.3(@babel/core@7.29.0)':
+  '@babel/plugin-syntax-optional-catch-binding@7.8.3(@babel/core@7.29.0(supports-color@8.1.1))':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-syntax-optional-chaining@7.8.3(@babel/core@7.29.0)':
+  '@babel/plugin-syntax-optional-chaining@7.8.3(@babel/core@7.29.0(supports-color@8.1.1))':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-syntax-private-property-in-object@7.14.5(@babel/core@7.29.0)':
+  '@babel/plugin-syntax-private-property-in-object@7.14.5(@babel/core@7.29.0(supports-color@8.1.1))':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-syntax-top-level-await@7.14.5(@babel/core@7.29.0)':
+  '@babel/plugin-syntax-top-level-await@7.14.5(@babel/core@7.29.0(supports-color@8.1.1))':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-syntax-typescript@7.28.6(@babel/core@7.29.0)':
+  '@babel/plugin-syntax-typescript@7.28.6(@babel/core@7.29.0(supports-color@8.1.1))':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-syntax-unicode-sets-regex@7.18.6(@babel/core@7.29.0)':
+  '@babel/plugin-syntax-unicode-sets-regex@7.18.6(@babel/core@7.29.0(supports-color@8.1.1))':
     dependencies:
-      '@babel/core': 7.29.0
-      '@babel/helper-create-regexp-features-plugin': 7.28.5(@babel/core@7.29.0)
+      '@babel/core': 7.29.0(supports-color@8.1.1)
+      '@babel/helper-create-regexp-features-plugin': 7.28.5(@babel/core@7.29.0(supports-color@8.1.1))
       '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-transform-arrow-functions@7.27.1(@babel/core@7.29.0)':
+  '@babel/plugin-transform-arrow-functions@7.27.1(@babel/core@7.29.0(supports-color@8.1.1))':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-transform-async-generator-functions@7.29.0(@babel/core@7.29.0)':
+  '@babel/plugin-transform-async-generator-functions@7.29.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.28.6
-      '@babel/helper-remap-async-to-generator': 7.27.1(@babel/core@7.29.0)
-      '@babel/traverse': 7.29.0
+      '@babel/helper-remap-async-to-generator': 7.27.1(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
+      '@babel/traverse': 7.29.0(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/plugin-transform-async-to-generator@7.28.6(@babel/core@7.29.0)':
+  '@babel/plugin-transform-async-to-generator@7.28.6(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)':
     dependencies:
-      '@babel/core': 7.29.0
-      '@babel/helper-module-imports': 7.28.6
+      '@babel/core': 7.29.0(supports-color@8.1.1)
+      '@babel/helper-module-imports': 7.28.6(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.28.6
-      '@babel/helper-remap-async-to-generator': 7.27.1(@babel/core@7.29.0)
+      '@babel/helper-remap-async-to-generator': 7.27.1(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/plugin-transform-block-scoped-functions@7.27.1(@babel/core@7.29.0)':
+  '@babel/plugin-transform-block-scoped-functions@7.27.1(@babel/core@7.29.0(supports-color@8.1.1))':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-transform-block-scoping@7.28.6(@babel/core@7.29.0)':
+  '@babel/plugin-transform-block-scoping@7.28.6(@babel/core@7.29.0(supports-color@8.1.1))':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-transform-class-properties@7.28.6(@babel/core@7.29.0)':
+  '@babel/plugin-transform-class-properties@7.28.6(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)':
     dependencies:
-      '@babel/core': 7.29.0
-      '@babel/helper-create-class-features-plugin': 7.29.3(@babel/core@7.29.0)
+      '@babel/core': 7.29.0(supports-color@8.1.1)
+      '@babel/helper-create-class-features-plugin': 7.29.3(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.28.6
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/plugin-transform-class-static-block@7.28.6(@babel/core@7.29.0)':
+  '@babel/plugin-transform-class-static-block@7.28.6(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)':
     dependencies:
-      '@babel/core': 7.29.0
-      '@babel/helper-create-class-features-plugin': 7.29.3(@babel/core@7.29.0)
+      '@babel/core': 7.29.0(supports-color@8.1.1)
+      '@babel/helper-create-class-features-plugin': 7.29.3(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.28.6
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/plugin-transform-classes@7.28.6(@babel/core@7.29.0)':
+  '@babel/plugin-transform-classes@7.28.6(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
       '@babel/helper-annotate-as-pure': 7.27.3
       '@babel/helper-compilation-targets': 7.28.6
       '@babel/helper-globals': 7.28.0
       '@babel/helper-plugin-utils': 7.28.6
-      '@babel/helper-replace-supers': 7.28.6(@babel/core@7.29.0)
-      '@babel/traverse': 7.29.0
+      '@babel/helper-replace-supers': 7.28.6(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
+      '@babel/traverse': 7.29.0(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/plugin-transform-computed-properties@7.28.6(@babel/core@7.29.0)':
+  '@babel/plugin-transform-computed-properties@7.28.6(@babel/core@7.29.0(supports-color@8.1.1))':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.28.6
       '@babel/template': 7.28.6
 
-  '@babel/plugin-transform-destructuring@7.28.5(@babel/core@7.29.0)':
+  '@babel/plugin-transform-destructuring@7.28.5(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.28.6
-      '@babel/traverse': 7.29.0
+      '@babel/traverse': 7.29.0(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/plugin-transform-dotall-regex@7.28.6(@babel/core@7.29.0)':
+  '@babel/plugin-transform-dotall-regex@7.28.6(@babel/core@7.29.0(supports-color@8.1.1))':
     dependencies:
-      '@babel/core': 7.29.0
-      '@babel/helper-create-regexp-features-plugin': 7.28.5(@babel/core@7.29.0)
+      '@babel/core': 7.29.0(supports-color@8.1.1)
+      '@babel/helper-create-regexp-features-plugin': 7.28.5(@babel/core@7.29.0(supports-color@8.1.1))
       '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-transform-duplicate-keys@7.27.1(@babel/core@7.29.0)':
+  '@babel/plugin-transform-duplicate-keys@7.27.1(@babel/core@7.29.0(supports-color@8.1.1))':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-transform-duplicate-named-capturing-groups-regex@7.29.0(@babel/core@7.29.0)':
+  '@babel/plugin-transform-duplicate-named-capturing-groups-regex@7.29.0(@babel/core@7.29.0(supports-color@8.1.1))':
     dependencies:
-      '@babel/core': 7.29.0
-      '@babel/helper-create-regexp-features-plugin': 7.28.5(@babel/core@7.29.0)
+      '@babel/core': 7.29.0(supports-color@8.1.1)
+      '@babel/helper-create-regexp-features-plugin': 7.28.5(@babel/core@7.29.0(supports-color@8.1.1))
       '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-transform-dynamic-import@7.27.1(@babel/core@7.29.0)':
+  '@babel/plugin-transform-dynamic-import@7.27.1(@babel/core@7.29.0(supports-color@8.1.1))':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-transform-explicit-resource-management@7.28.6(@babel/core@7.29.0)':
+  '@babel/plugin-transform-explicit-resource-management@7.28.6(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.28.6
-      '@babel/plugin-transform-destructuring': 7.28.5(@babel/core@7.29.0)
+      '@babel/plugin-transform-destructuring': 7.28.5(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/plugin-transform-exponentiation-operator@7.28.6(@babel/core@7.29.0)':
+  '@babel/plugin-transform-exponentiation-operator@7.28.6(@babel/core@7.29.0(supports-color@8.1.1))':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-transform-export-namespace-from@7.27.1(@babel/core@7.29.0)':
+  '@babel/plugin-transform-export-namespace-from@7.27.1(@babel/core@7.29.0(supports-color@8.1.1))':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-transform-flow-strip-types@7.27.1(@babel/core@7.29.0)':
+  '@babel/plugin-transform-flow-strip-types@7.27.1(@babel/core@7.29.0(supports-color@8.1.1))':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.28.6
-      '@babel/plugin-syntax-flow': 7.28.6(@babel/core@7.29.0)
+      '@babel/plugin-syntax-flow': 7.28.6(@babel/core@7.29.0(supports-color@8.1.1))
 
-  '@babel/plugin-transform-for-of@7.27.1(@babel/core@7.29.0)':
+  '@babel/plugin-transform-for-of@7.27.1(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.28.6
-      '@babel/helper-skip-transparent-expression-wrappers': 7.27.1
+      '@babel/helper-skip-transparent-expression-wrappers': 7.27.1(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/plugin-transform-function-name@7.27.1(@babel/core@7.29.0)':
+  '@babel/plugin-transform-function-name@7.27.1(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
       '@babel/helper-compilation-targets': 7.28.6
       '@babel/helper-plugin-utils': 7.28.6
-      '@babel/traverse': 7.29.0
+      '@babel/traverse': 7.29.0(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/plugin-transform-json-strings@7.28.6(@babel/core@7.29.0)':
+  '@babel/plugin-transform-json-strings@7.28.6(@babel/core@7.29.0(supports-color@8.1.1))':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-transform-literals@7.27.1(@babel/core@7.29.0)':
+  '@babel/plugin-transform-literals@7.27.1(@babel/core@7.29.0(supports-color@8.1.1))':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-transform-logical-assignment-operators@7.28.6(@babel/core@7.29.0)':
+  '@babel/plugin-transform-logical-assignment-operators@7.28.6(@babel/core@7.29.0(supports-color@8.1.1))':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-transform-member-expression-literals@7.27.1(@babel/core@7.29.0)':
+  '@babel/plugin-transform-member-expression-literals@7.27.1(@babel/core@7.29.0(supports-color@8.1.1))':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-transform-modules-amd@7.27.1(@babel/core@7.29.0)':
+  '@babel/plugin-transform-modules-amd@7.27.1(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)':
     dependencies:
-      '@babel/core': 7.29.0
-      '@babel/helper-module-transforms': 7.28.6(@babel/core@7.29.0)
+      '@babel/core': 7.29.0(supports-color@8.1.1)
+      '@babel/helper-module-transforms': 7.28.6(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.28.6
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/plugin-transform-modules-commonjs@7.28.6(@babel/core@7.29.0)':
+  '@babel/plugin-transform-modules-commonjs@7.28.6(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)':
     dependencies:
-      '@babel/core': 7.29.0
-      '@babel/helper-module-transforms': 7.28.6(@babel/core@7.29.0)
+      '@babel/core': 7.29.0(supports-color@8.1.1)
+      '@babel/helper-module-transforms': 7.28.6(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.28.6
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/plugin-transform-modules-systemjs@7.29.4(@babel/core@7.29.0)':
+  '@babel/plugin-transform-modules-systemjs@7.29.4(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)':
     dependencies:
-      '@babel/core': 7.29.0
-      '@babel/helper-module-transforms': 7.28.6(@babel/core@7.29.0)
+      '@babel/core': 7.29.0(supports-color@8.1.1)
+      '@babel/helper-module-transforms': 7.28.6(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.28.6
       '@babel/helper-validator-identifier': 7.28.5
-      '@babel/traverse': 7.29.0
+      '@babel/traverse': 7.29.0(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/plugin-transform-modules-umd@7.27.1(@babel/core@7.29.0)':
+  '@babel/plugin-transform-modules-umd@7.27.1(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)':
     dependencies:
-      '@babel/core': 7.29.0
-      '@babel/helper-module-transforms': 7.28.6(@babel/core@7.29.0)
+      '@babel/core': 7.29.0(supports-color@8.1.1)
+      '@babel/helper-module-transforms': 7.28.6(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.28.6
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/plugin-transform-named-capturing-groups-regex@7.29.0(@babel/core@7.29.0)':
+  '@babel/plugin-transform-named-capturing-groups-regex@7.29.0(@babel/core@7.29.0(supports-color@8.1.1))':
     dependencies:
-      '@babel/core': 7.29.0
-      '@babel/helper-create-regexp-features-plugin': 7.28.5(@babel/core@7.29.0)
+      '@babel/core': 7.29.0(supports-color@8.1.1)
+      '@babel/helper-create-regexp-features-plugin': 7.28.5(@babel/core@7.29.0(supports-color@8.1.1))
       '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-transform-new-target@7.27.1(@babel/core@7.29.0)':
+  '@babel/plugin-transform-new-target@7.27.1(@babel/core@7.29.0(supports-color@8.1.1))':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-transform-nullish-coalescing-operator@7.28.6(@babel/core@7.29.0)':
+  '@babel/plugin-transform-nullish-coalescing-operator@7.28.6(@babel/core@7.29.0(supports-color@8.1.1))':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-transform-numeric-separator@7.28.6(@babel/core@7.29.0)':
+  '@babel/plugin-transform-numeric-separator@7.28.6(@babel/core@7.29.0(supports-color@8.1.1))':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-transform-object-rest-spread@7.28.6(@babel/core@7.29.0)':
+  '@babel/plugin-transform-object-rest-spread@7.28.6(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
       '@babel/helper-compilation-targets': 7.28.6
       '@babel/helper-plugin-utils': 7.28.6
-      '@babel/plugin-transform-destructuring': 7.28.5(@babel/core@7.29.0)
-      '@babel/plugin-transform-parameters': 7.27.7(@babel/core@7.29.0)
-      '@babel/traverse': 7.29.0
+      '@babel/plugin-transform-destructuring': 7.28.5(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
+      '@babel/plugin-transform-parameters': 7.27.7(@babel/core@7.29.0(supports-color@8.1.1))
+      '@babel/traverse': 7.29.0(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/plugin-transform-object-super@7.27.1(@babel/core@7.29.0)':
+  '@babel/plugin-transform-object-super@7.27.1(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.28.6
-      '@babel/helper-replace-supers': 7.28.6(@babel/core@7.29.0)
+      '@babel/helper-replace-supers': 7.28.6(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/plugin-transform-optional-catch-binding@7.28.6(@babel/core@7.29.0)':
+  '@babel/plugin-transform-optional-catch-binding@7.28.6(@babel/core@7.29.0(supports-color@8.1.1))':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-transform-optional-chaining@7.28.6(@babel/core@7.29.0)':
+  '@babel/plugin-transform-optional-chaining@7.28.6(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.28.6
-      '@babel/helper-skip-transparent-expression-wrappers': 7.27.1
+      '@babel/helper-skip-transparent-expression-wrappers': 7.27.1(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/plugin-transform-parameters@7.27.7(@babel/core@7.29.0)':
+  '@babel/plugin-transform-parameters@7.27.7(@babel/core@7.29.0(supports-color@8.1.1))':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-transform-private-methods@7.28.6(@babel/core@7.29.0)':
+  '@babel/plugin-transform-private-methods@7.28.6(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)':
     dependencies:
-      '@babel/core': 7.29.0
-      '@babel/helper-create-class-features-plugin': 7.29.3(@babel/core@7.29.0)
+      '@babel/core': 7.29.0(supports-color@8.1.1)
+      '@babel/helper-create-class-features-plugin': 7.29.3(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.28.6
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/plugin-transform-private-property-in-object@7.28.6(@babel/core@7.29.0)':
+  '@babel/plugin-transform-private-property-in-object@7.28.6(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
       '@babel/helper-annotate-as-pure': 7.27.3
-      '@babel/helper-create-class-features-plugin': 7.29.3(@babel/core@7.29.0)
+      '@babel/helper-create-class-features-plugin': 7.29.3(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.28.6
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/plugin-transform-property-literals@7.27.1(@babel/core@7.29.0)':
+  '@babel/plugin-transform-property-literals@7.27.1(@babel/core@7.29.0(supports-color@8.1.1))':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-transform-react-display-name@7.28.0(@babel/core@7.29.0)':
+  '@babel/plugin-transform-react-display-name@7.28.0(@babel/core@7.29.0(supports-color@8.1.1))':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-transform-react-jsx-development@7.27.1(@babel/core@7.29.0)':
+  '@babel/plugin-transform-react-jsx-development@7.27.1(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)':
     dependencies:
-      '@babel/core': 7.29.0
-      '@babel/plugin-transform-react-jsx': 7.28.6(@babel/core@7.29.0)
+      '@babel/core': 7.29.0(supports-color@8.1.1)
+      '@babel/plugin-transform-react-jsx': 7.28.6(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/plugin-transform-react-jsx-self@7.27.1(@babel/core@7.29.0)':
+  '@babel/plugin-transform-react-jsx-self@7.27.1(@babel/core@7.29.0(supports-color@8.1.1))':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-transform-react-jsx-source@7.27.1(@babel/core@7.29.0)':
+  '@babel/plugin-transform-react-jsx-source@7.27.1(@babel/core@7.29.0(supports-color@8.1.1))':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-transform-react-jsx@7.28.6(@babel/core@7.29.0)':
+  '@babel/plugin-transform-react-jsx@7.28.6(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
       '@babel/helper-annotate-as-pure': 7.27.3
-      '@babel/helper-module-imports': 7.28.6
+      '@babel/helper-module-imports': 7.28.6(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.28.6
-      '@babel/plugin-syntax-jsx': 7.28.6(@babel/core@7.29.0)
+      '@babel/plugin-syntax-jsx': 7.28.6(@babel/core@7.29.0(supports-color@8.1.1))
       '@babel/types': 7.29.0
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/plugin-transform-react-pure-annotations@7.27.1(@babel/core@7.29.0)':
+  '@babel/plugin-transform-react-pure-annotations@7.27.1(@babel/core@7.29.0(supports-color@8.1.1))':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
       '@babel/helper-annotate-as-pure': 7.27.3
       '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-transform-regenerator@7.29.0(@babel/core@7.29.0)':
+  '@babel/plugin-transform-regenerator@7.29.0(@babel/core@7.29.0(supports-color@8.1.1))':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-transform-regexp-modifiers@7.28.6(@babel/core@7.29.0)':
+  '@babel/plugin-transform-regexp-modifiers@7.28.6(@babel/core@7.29.0(supports-color@8.1.1))':
     dependencies:
-      '@babel/core': 7.29.0
-      '@babel/helper-create-regexp-features-plugin': 7.28.5(@babel/core@7.29.0)
+      '@babel/core': 7.29.0(supports-color@8.1.1)
+      '@babel/helper-create-regexp-features-plugin': 7.28.5(@babel/core@7.29.0(supports-color@8.1.1))
       '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-transform-reserved-words@7.27.1(@babel/core@7.29.0)':
+  '@babel/plugin-transform-reserved-words@7.27.1(@babel/core@7.29.0(supports-color@8.1.1))':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-transform-runtime@7.29.0(@babel/core@7.29.0)':
+  '@babel/plugin-transform-runtime@7.29.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)':
     dependencies:
-      '@babel/core': 7.29.0
-      '@babel/helper-module-imports': 7.28.6
+      '@babel/core': 7.29.0(supports-color@8.1.1)
+      '@babel/helper-module-imports': 7.28.6(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.28.6
-      babel-plugin-polyfill-corejs2: 0.4.17(@babel/core@7.29.0)
-      babel-plugin-polyfill-corejs3: 0.13.0(@babel/core@7.29.0)
-      babel-plugin-polyfill-regenerator: 0.6.8(@babel/core@7.29.0)
+      babel-plugin-polyfill-corejs2: 0.4.17(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
+      babel-plugin-polyfill-corejs3: 0.13.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
+      babel-plugin-polyfill-regenerator: 0.6.8(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
       semver: 6.3.1
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/plugin-transform-shorthand-properties@7.27.1(@babel/core@7.29.0)':
+  '@babel/plugin-transform-shorthand-properties@7.27.1(@babel/core@7.29.0(supports-color@8.1.1))':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-transform-spread@7.28.6(@babel/core@7.29.0)':
+  '@babel/plugin-transform-spread@7.28.6(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.28.6
-      '@babel/helper-skip-transparent-expression-wrappers': 7.27.1
+      '@babel/helper-skip-transparent-expression-wrappers': 7.27.1(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/plugin-transform-sticky-regex@7.27.1(@babel/core@7.29.0)':
+  '@babel/plugin-transform-sticky-regex@7.27.1(@babel/core@7.29.0(supports-color@8.1.1))':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-transform-template-literals@7.27.1(@babel/core@7.29.0)':
+  '@babel/plugin-transform-template-literals@7.27.1(@babel/core@7.29.0(supports-color@8.1.1))':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-transform-typeof-symbol@7.27.1(@babel/core@7.29.0)':
+  '@babel/plugin-transform-typeof-symbol@7.27.1(@babel/core@7.29.0(supports-color@8.1.1))':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-transform-typescript@7.28.6(@babel/core@7.29.0)':
+  '@babel/plugin-transform-typescript@7.28.6(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
       '@babel/helper-annotate-as-pure': 7.27.3
-      '@babel/helper-create-class-features-plugin': 7.29.3(@babel/core@7.29.0)
+      '@babel/helper-create-class-features-plugin': 7.29.3(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.28.6
-      '@babel/helper-skip-transparent-expression-wrappers': 7.27.1
-      '@babel/plugin-syntax-typescript': 7.28.6(@babel/core@7.29.0)
+      '@babel/helper-skip-transparent-expression-wrappers': 7.27.1(supports-color@8.1.1)
+      '@babel/plugin-syntax-typescript': 7.28.6(@babel/core@7.29.0(supports-color@8.1.1))
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/plugin-transform-unicode-escapes@7.27.1(@babel/core@7.29.0)':
+  '@babel/plugin-transform-unicode-escapes@7.27.1(@babel/core@7.29.0(supports-color@8.1.1))':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-transform-unicode-property-regex@7.28.6(@babel/core@7.29.0)':
+  '@babel/plugin-transform-unicode-property-regex@7.28.6(@babel/core@7.29.0(supports-color@8.1.1))':
     dependencies:
-      '@babel/core': 7.29.0
-      '@babel/helper-create-regexp-features-plugin': 7.28.5(@babel/core@7.29.0)
+      '@babel/core': 7.29.0(supports-color@8.1.1)
+      '@babel/helper-create-regexp-features-plugin': 7.28.5(@babel/core@7.29.0(supports-color@8.1.1))
       '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-transform-unicode-regex@7.27.1(@babel/core@7.29.0)':
+  '@babel/plugin-transform-unicode-regex@7.27.1(@babel/core@7.29.0(supports-color@8.1.1))':
     dependencies:
-      '@babel/core': 7.29.0
-      '@babel/helper-create-regexp-features-plugin': 7.28.5(@babel/core@7.29.0)
+      '@babel/core': 7.29.0(supports-color@8.1.1)
+      '@babel/helper-create-regexp-features-plugin': 7.28.5(@babel/core@7.29.0(supports-color@8.1.1))
       '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-transform-unicode-sets-regex@7.28.6(@babel/core@7.29.0)':
+  '@babel/plugin-transform-unicode-sets-regex@7.28.6(@babel/core@7.29.0(supports-color@8.1.1))':
     dependencies:
-      '@babel/core': 7.29.0
-      '@babel/helper-create-regexp-features-plugin': 7.28.5(@babel/core@7.29.0)
+      '@babel/core': 7.29.0(supports-color@8.1.1)
+      '@babel/helper-create-regexp-features-plugin': 7.28.5(@babel/core@7.29.0(supports-color@8.1.1))
       '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/preset-env@7.29.5(@babel/core@7.29.0)':
+  '@babel/preset-env@7.29.5(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)':
     dependencies:
       '@babel/compat-data': 7.29.3
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
       '@babel/helper-compilation-targets': 7.28.6
       '@babel/helper-plugin-utils': 7.28.6
       '@babel/helper-validator-option': 7.27.1
-      '@babel/plugin-bugfix-firefox-class-in-computed-class-key': 7.28.5(@babel/core@7.29.0)
-      '@babel/plugin-bugfix-safari-class-field-initializer-scope': 7.27.1(@babel/core@7.29.0)
-      '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression': 7.27.1(@babel/core@7.29.0)
-      '@babel/plugin-bugfix-safari-rest-destructuring-rhs-array': 7.29.3(@babel/core@7.29.0)
-      '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining': 7.27.1(@babel/core@7.29.0)
-      '@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-proposal-private-property-in-object': 7.21.0-placeholder-for-preset-env.2(@babel/core@7.29.0)
-      '@babel/plugin-syntax-import-assertions': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-syntax-import-attributes': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-syntax-unicode-sets-regex': 7.18.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-arrow-functions': 7.27.1(@babel/core@7.29.0)
-      '@babel/plugin-transform-async-generator-functions': 7.29.0(@babel/core@7.29.0)
-      '@babel/plugin-transform-async-to-generator': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-block-scoped-functions': 7.27.1(@babel/core@7.29.0)
-      '@babel/plugin-transform-block-scoping': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-class-properties': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-class-static-block': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-classes': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-computed-properties': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-destructuring': 7.28.5(@babel/core@7.29.0)
-      '@babel/plugin-transform-dotall-regex': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-duplicate-keys': 7.27.1(@babel/core@7.29.0)
-      '@babel/plugin-transform-duplicate-named-capturing-groups-regex': 7.29.0(@babel/core@7.29.0)
-      '@babel/plugin-transform-dynamic-import': 7.27.1(@babel/core@7.29.0)
-      '@babel/plugin-transform-explicit-resource-management': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-exponentiation-operator': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-export-namespace-from': 7.27.1(@babel/core@7.29.0)
-      '@babel/plugin-transform-for-of': 7.27.1(@babel/core@7.29.0)
-      '@babel/plugin-transform-function-name': 7.27.1(@babel/core@7.29.0)
-      '@babel/plugin-transform-json-strings': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-literals': 7.27.1(@babel/core@7.29.0)
-      '@babel/plugin-transform-logical-assignment-operators': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-member-expression-literals': 7.27.1(@babel/core@7.29.0)
-      '@babel/plugin-transform-modules-amd': 7.27.1(@babel/core@7.29.0)
-      '@babel/plugin-transform-modules-commonjs': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-modules-systemjs': 7.29.4(@babel/core@7.29.0)
-      '@babel/plugin-transform-modules-umd': 7.27.1(@babel/core@7.29.0)
-      '@babel/plugin-transform-named-capturing-groups-regex': 7.29.0(@babel/core@7.29.0)
-      '@babel/plugin-transform-new-target': 7.27.1(@babel/core@7.29.0)
-      '@babel/plugin-transform-nullish-coalescing-operator': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-numeric-separator': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-object-rest-spread': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-object-super': 7.27.1(@babel/core@7.29.0)
-      '@babel/plugin-transform-optional-catch-binding': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-optional-chaining': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-parameters': 7.27.7(@babel/core@7.29.0)
-      '@babel/plugin-transform-private-methods': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-private-property-in-object': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-property-literals': 7.27.1(@babel/core@7.29.0)
-      '@babel/plugin-transform-regenerator': 7.29.0(@babel/core@7.29.0)
-      '@babel/plugin-transform-regexp-modifiers': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-reserved-words': 7.27.1(@babel/core@7.29.0)
-      '@babel/plugin-transform-shorthand-properties': 7.27.1(@babel/core@7.29.0)
-      '@babel/plugin-transform-spread': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-sticky-regex': 7.27.1(@babel/core@7.29.0)
-      '@babel/plugin-transform-template-literals': 7.27.1(@babel/core@7.29.0)
-      '@babel/plugin-transform-typeof-symbol': 7.27.1(@babel/core@7.29.0)
-      '@babel/plugin-transform-unicode-escapes': 7.27.1(@babel/core@7.29.0)
-      '@babel/plugin-transform-unicode-property-regex': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-unicode-regex': 7.27.1(@babel/core@7.29.0)
-      '@babel/plugin-transform-unicode-sets-regex': 7.28.6(@babel/core@7.29.0)
-      '@babel/preset-modules': 0.1.6-no-external-plugins(@babel/core@7.29.0)
-      babel-plugin-polyfill-corejs2: 0.4.17(@babel/core@7.29.0)
-      babel-plugin-polyfill-corejs3: 0.14.2(@babel/core@7.29.0)
-      babel-plugin-polyfill-regenerator: 0.6.8(@babel/core@7.29.0)
+      '@babel/plugin-bugfix-firefox-class-in-computed-class-key': 7.28.5(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
+      '@babel/plugin-bugfix-safari-class-field-initializer-scope': 7.27.1(@babel/core@7.29.0(supports-color@8.1.1))
+      '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression': 7.27.1(@babel/core@7.29.0(supports-color@8.1.1))
+      '@babel/plugin-bugfix-safari-rest-destructuring-rhs-array': 7.29.3(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
+      '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining': 7.27.1(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
+      '@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly': 7.28.6(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
+      '@babel/plugin-proposal-private-property-in-object': 7.21.0-placeholder-for-preset-env.2(@babel/core@7.29.0(supports-color@8.1.1))
+      '@babel/plugin-syntax-import-assertions': 7.28.6(@babel/core@7.29.0(supports-color@8.1.1))
+      '@babel/plugin-syntax-import-attributes': 7.28.6(@babel/core@7.29.0(supports-color@8.1.1))
+      '@babel/plugin-syntax-unicode-sets-regex': 7.18.6(@babel/core@7.29.0(supports-color@8.1.1))
+      '@babel/plugin-transform-arrow-functions': 7.27.1(@babel/core@7.29.0(supports-color@8.1.1))
+      '@babel/plugin-transform-async-generator-functions': 7.29.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
+      '@babel/plugin-transform-async-to-generator': 7.28.6(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
+      '@babel/plugin-transform-block-scoped-functions': 7.27.1(@babel/core@7.29.0(supports-color@8.1.1))
+      '@babel/plugin-transform-block-scoping': 7.28.6(@babel/core@7.29.0(supports-color@8.1.1))
+      '@babel/plugin-transform-class-properties': 7.28.6(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
+      '@babel/plugin-transform-class-static-block': 7.28.6(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
+      '@babel/plugin-transform-classes': 7.28.6(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
+      '@babel/plugin-transform-computed-properties': 7.28.6(@babel/core@7.29.0(supports-color@8.1.1))
+      '@babel/plugin-transform-destructuring': 7.28.5(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
+      '@babel/plugin-transform-dotall-regex': 7.28.6(@babel/core@7.29.0(supports-color@8.1.1))
+      '@babel/plugin-transform-duplicate-keys': 7.27.1(@babel/core@7.29.0(supports-color@8.1.1))
+      '@babel/plugin-transform-duplicate-named-capturing-groups-regex': 7.29.0(@babel/core@7.29.0(supports-color@8.1.1))
+      '@babel/plugin-transform-dynamic-import': 7.27.1(@babel/core@7.29.0(supports-color@8.1.1))
+      '@babel/plugin-transform-explicit-resource-management': 7.28.6(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
+      '@babel/plugin-transform-exponentiation-operator': 7.28.6(@babel/core@7.29.0(supports-color@8.1.1))
+      '@babel/plugin-transform-export-namespace-from': 7.27.1(@babel/core@7.29.0(supports-color@8.1.1))
+      '@babel/plugin-transform-for-of': 7.27.1(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
+      '@babel/plugin-transform-function-name': 7.27.1(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
+      '@babel/plugin-transform-json-strings': 7.28.6(@babel/core@7.29.0(supports-color@8.1.1))
+      '@babel/plugin-transform-literals': 7.27.1(@babel/core@7.29.0(supports-color@8.1.1))
+      '@babel/plugin-transform-logical-assignment-operators': 7.28.6(@babel/core@7.29.0(supports-color@8.1.1))
+      '@babel/plugin-transform-member-expression-literals': 7.27.1(@babel/core@7.29.0(supports-color@8.1.1))
+      '@babel/plugin-transform-modules-amd': 7.27.1(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
+      '@babel/plugin-transform-modules-commonjs': 7.28.6(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
+      '@babel/plugin-transform-modules-systemjs': 7.29.4(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
+      '@babel/plugin-transform-modules-umd': 7.27.1(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
+      '@babel/plugin-transform-named-capturing-groups-regex': 7.29.0(@babel/core@7.29.0(supports-color@8.1.1))
+      '@babel/plugin-transform-new-target': 7.27.1(@babel/core@7.29.0(supports-color@8.1.1))
+      '@babel/plugin-transform-nullish-coalescing-operator': 7.28.6(@babel/core@7.29.0(supports-color@8.1.1))
+      '@babel/plugin-transform-numeric-separator': 7.28.6(@babel/core@7.29.0(supports-color@8.1.1))
+      '@babel/plugin-transform-object-rest-spread': 7.28.6(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
+      '@babel/plugin-transform-object-super': 7.27.1(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
+      '@babel/plugin-transform-optional-catch-binding': 7.28.6(@babel/core@7.29.0(supports-color@8.1.1))
+      '@babel/plugin-transform-optional-chaining': 7.28.6(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
+      '@babel/plugin-transform-parameters': 7.27.7(@babel/core@7.29.0(supports-color@8.1.1))
+      '@babel/plugin-transform-private-methods': 7.28.6(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
+      '@babel/plugin-transform-private-property-in-object': 7.28.6(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
+      '@babel/plugin-transform-property-literals': 7.27.1(@babel/core@7.29.0(supports-color@8.1.1))
+      '@babel/plugin-transform-regenerator': 7.29.0(@babel/core@7.29.0(supports-color@8.1.1))
+      '@babel/plugin-transform-regexp-modifiers': 7.28.6(@babel/core@7.29.0(supports-color@8.1.1))
+      '@babel/plugin-transform-reserved-words': 7.27.1(@babel/core@7.29.0(supports-color@8.1.1))
+      '@babel/plugin-transform-shorthand-properties': 7.27.1(@babel/core@7.29.0(supports-color@8.1.1))
+      '@babel/plugin-transform-spread': 7.28.6(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
+      '@babel/plugin-transform-sticky-regex': 7.27.1(@babel/core@7.29.0(supports-color@8.1.1))
+      '@babel/plugin-transform-template-literals': 7.27.1(@babel/core@7.29.0(supports-color@8.1.1))
+      '@babel/plugin-transform-typeof-symbol': 7.27.1(@babel/core@7.29.0(supports-color@8.1.1))
+      '@babel/plugin-transform-unicode-escapes': 7.27.1(@babel/core@7.29.0(supports-color@8.1.1))
+      '@babel/plugin-transform-unicode-property-regex': 7.28.6(@babel/core@7.29.0(supports-color@8.1.1))
+      '@babel/plugin-transform-unicode-regex': 7.27.1(@babel/core@7.29.0(supports-color@8.1.1))
+      '@babel/plugin-transform-unicode-sets-regex': 7.28.6(@babel/core@7.29.0(supports-color@8.1.1))
+      '@babel/preset-modules': 0.1.6-no-external-plugins(@babel/core@7.29.0(supports-color@8.1.1))
+      babel-plugin-polyfill-corejs2: 0.4.17(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
+      babel-plugin-polyfill-corejs3: 0.14.2(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
+      babel-plugin-polyfill-regenerator: 0.6.8(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
       core-js-compat: 3.49.0
       semver: 6.3.1
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/preset-modules@0.1.6-no-external-plugins(@babel/core@7.29.0)':
+  '@babel/preset-modules@0.1.6-no-external-plugins(@babel/core@7.29.0(supports-color@8.1.1))':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.28.6
       '@babel/types': 7.29.0
       esutils: 2.0.3
 
-  '@babel/preset-react@7.28.5(@babel/core@7.29.0)':
+  '@babel/preset-react@7.28.5(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.28.6
       '@babel/helper-validator-option': 7.27.1
-      '@babel/plugin-transform-react-display-name': 7.28.0(@babel/core@7.29.0)
-      '@babel/plugin-transform-react-jsx': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-react-jsx-development': 7.27.1(@babel/core@7.29.0)
-      '@babel/plugin-transform-react-pure-annotations': 7.27.1(@babel/core@7.29.0)
+      '@babel/plugin-transform-react-display-name': 7.28.0(@babel/core@7.29.0(supports-color@8.1.1))
+      '@babel/plugin-transform-react-jsx': 7.28.6(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
+      '@babel/plugin-transform-react-jsx-development': 7.27.1(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
+      '@babel/plugin-transform-react-pure-annotations': 7.27.1(@babel/core@7.29.0(supports-color@8.1.1))
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/preset-typescript@7.28.5(@babel/core@7.29.0)':
+  '@babel/preset-typescript@7.28.5(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.28.6
       '@babel/helper-validator-option': 7.27.1
-      '@babel/plugin-syntax-jsx': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-modules-commonjs': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-typescript': 7.28.6(@babel/core@7.29.0)
+      '@babel/plugin-syntax-jsx': 7.28.6(@babel/core@7.29.0(supports-color@8.1.1))
+      '@babel/plugin-transform-modules-commonjs': 7.28.6(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
+      '@babel/plugin-transform-typescript': 7.28.6(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
@@ -10355,7 +10527,7 @@ snapshots:
       '@babel/parser': 7.29.3
       '@babel/types': 7.29.0
 
-  '@babel/traverse@7.29.0':
+  '@babel/traverse@7.29.0(supports-color@8.1.1)':
     dependencies:
       '@babel/code-frame': 7.29.0
       '@babel/generator': 7.29.1
@@ -10363,7 +10535,7 @@ snapshots:
       '@babel/parser': 7.29.3
       '@babel/template': 7.28.6
       '@babel/types': 7.29.0
-      debug: 4.4.3
+      debug: 4.4.3(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
@@ -10374,94 +10546,94 @@ snapshots:
 
   '@bcoe/v8-coverage@0.2.3': {}
 
-  '@bitdrift/react-native@0.6.14(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)':
+  '@bitdrift/react-native@0.6.14(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1)':
     dependencies:
-      '@expo/config-plugins': 9.1.7
+      '@expo/config-plugins': 9.1.7(supports-color@8.1.1)
       fast-json-stringify: 6.4.0
       react: 19.1.0
-      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0)
+      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
   '@braintree/sanitize-url@6.0.4': {}
 
-  '@bsky.app/alf@0.1.15(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)':
+  '@bsky.app/alf@0.1.15(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)':
     dependencies:
       react: 19.1.0
-      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0)
+      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1)
       react-responsive: 10.0.1(react@19.1.0)
 
-  '@bsky.app/expo-dynamic-app-icon@1.8.5(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)':
+  '@bsky.app/expo-dynamic-app-icon@1.8.5(83e0f64f4281e4798012214ad5b2d72d)':
     dependencies:
       '@expo/image-utils': 0.8.12
-      expo: 54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+      expo: 54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1)
       react: 19.1.0
-      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0)
+      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1)
       xcode: 3.0.1
 
-  '@bsky.app/expo-guess-language@0.2.8(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)':
+  '@bsky.app/expo-guess-language@0.2.8(83e0f64f4281e4798012214ad5b2d72d)':
     dependencies:
-      expo: 54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+      expo: 54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1)
       lande: 1.0.10
       react: 19.1.0
-      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0)
+      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1)
 
-  '@bsky.app/expo-image-crop-tool@0.5.1(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)':
+  '@bsky.app/expo-image-crop-tool@0.5.1(83e0f64f4281e4798012214ad5b2d72d)':
     dependencies:
-      expo: 54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+      expo: 54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1)
       react: 19.1.0
-      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0)
+      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1)
 
-  '@bsky.app/expo-scroll-edge-effect@0.1.9(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)':
+  '@bsky.app/expo-scroll-edge-effect@0.1.9(83e0f64f4281e4798012214ad5b2d72d)':
     dependencies:
       '@types/jest': 30.0.0
-      expo: 54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+      expo: 54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1)
       react: 19.1.0
-      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0)
+      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1)
 
-  '@bsky.app/expo-translate-text@0.2.9(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)':
+  '@bsky.app/expo-translate-text@0.2.9(83e0f64f4281e4798012214ad5b2d72d)':
     dependencies:
-      expo: 54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+      expo: 54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1)
       react: 19.1.0
-      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0)
+      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1)
 
-  '@bsky.app/peek-menu@0.3.2(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)':
+  '@bsky.app/peek-menu@0.3.2(83e0f64f4281e4798012214ad5b2d72d)':
     dependencies:
-      expo: 54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+      expo: 54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1)
       react: 19.1.0
-      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0)
+      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1)
 
-  '@bsky.app/react-native-uitextview@2.7.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)':
+  '@bsky.app/react-native-uitextview@2.7.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)':
     dependencies:
       react: 19.1.0
-      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0)
+      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1)
 
-  '@bsky.app/sift@0.3.9(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native-safe-area-context@5.6.2(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)':
+  '@bsky.app/sift@0.3.9(2d5c14016450c7e55c8cd0dffcca6f69)':
     dependencies:
-      expo: 54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+      expo: 54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1)
       react: 19.1.0
-      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0)
-      react-native-safe-area-context: 5.6.2(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1)
+      react-native-safe-area-context: 5.6.2(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)
 
-  '@bsky.app/tapper@0.6.1(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)(tlds@1.261.0)':
+  '@bsky.app/tapper@0.6.1(8d6e1ad3cb49b1a6214533c496326d11)':
     dependencies:
-      expo: 54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+      expo: 54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1)
       react: 19.1.0
-      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0)
+      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1)
       tlds: 1.261.0
 
-  '@bsky.app/video-compressor@0.2.0(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)':
+  '@bsky.app/video-compressor@0.2.0(83e0f64f4281e4798012214ad5b2d72d)':
     dependencies:
-      expo: 54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+      expo: 54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1)
       mediabunny: 1.49.0
       react: 19.1.0
-      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0)
+      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1)
 
-  '@bsky.app/video@0.3.6(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)':
+  '@bsky.app/video@0.3.6(83e0f64f4281e4798012214ad5b2d72d)':
     dependencies:
-      expo: 54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+      expo: 54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1)
       react: 19.1.0
-      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0)
+      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1)
 
   '@crowdin/cli@4.14.2':
     dependencies:
@@ -10564,27 +10736,50 @@ snapshots:
   '@esbuild/win32-x64@0.25.12':
     optional: true
 
-  '@expo/cli@54.0.25(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))':
+  '@eslint-community/eslint-utils@4.10.1(eslint@8.57.1(supports-color@8.1.1))':
+    dependencies:
+      eslint: 8.57.1(supports-color@8.1.1)
+      eslint-visitor-keys: 3.4.3
+
+  '@eslint-community/regexpp@4.12.2': {}
+
+  '@eslint/eslintrc@2.1.4(supports-color@8.1.1)':
+    dependencies:
+      ajv: 6.15.0
+      debug: 4.4.3(supports-color@8.1.1)
+      espree: 9.6.1
+      globals: 13.24.0
+      ignore: 5.3.2
+      import-fresh: 3.3.1
+      js-yaml: 4.1.1
+      minimatch: 3.1.5
+      strip-json-comments: 3.1.1
+    transitivePeerDependencies:
+      - supports-color
+
+  '@eslint/js@8.57.1': {}
+
+  '@expo/cli@54.0.25(c1408f750868568d2dc75671b50084a7)':
     dependencies:
       '@0no-co/graphql.web': 1.2.0
       '@expo/code-signing-certificates': 0.0.6
-      '@expo/config': 12.0.13
-      '@expo/config-plugins': 54.0.4
-      '@expo/devcert': 1.2.1
-      '@expo/env': 2.0.11
+      '@expo/config': 12.0.13(supports-color@8.1.1)
+      '@expo/config-plugins': 54.0.4(supports-color@8.1.1)
+      '@expo/devcert': 1.2.1(supports-color@8.1.1)
+      '@expo/env': 2.0.11(supports-color@8.1.1)
       '@expo/image-utils': 0.8.12
       '@expo/json-file': 10.2.0
-      '@expo/metro': 54.2.0
-      '@expo/metro-config': 54.0.16(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))
+      '@expo/metro': 54.2.0(supports-color@8.1.1)
+      '@expo/metro-config': 54.0.16(expo@54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1))(supports-color@8.1.1)
       '@expo/osascript': 2.4.3
       '@expo/package-manager': 1.10.5
       '@expo/plist': 0.4.9
-      '@expo/prebuild-config': 54.0.8(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))
+      '@expo/prebuild-config': 54.0.8(expo@54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1))(supports-color@8.1.1)
       '@expo/schema-utils': 0.1.8
       '@expo/spawn-async': 1.7.2
       '@expo/ws-tunnel': 1.0.6
       '@expo/xcpretty': 4.4.4
-      '@react-native/dev-middleware': 0.81.5
+      '@react-native/dev-middleware': 0.81.5(supports-color@8.1.1)
       '@urql/core': 5.2.0
       '@urql/exchange-retry': 1.3.2(@urql/core@5.2.0)
       accepts: 1.3.8
@@ -10594,11 +10789,11 @@ snapshots:
       bplist-parser: 0.3.2
       chalk: 4.1.2
       ci-info: 3.9.0
-      compression: 1.8.1
-      connect: 3.7.0
-      debug: 4.4.3
+      compression: 1.8.1(supports-color@8.1.1)
+      connect: 3.7.0(supports-color@8.1.1)
+      debug: 4.4.3(supports-color@8.1.1)
       env-editor: 0.4.2
-      expo: 54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+      expo: 54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1)
       expo-server: 1.0.7
       freeport-async: 2.0.0
       getenv: 2.0.0
@@ -10620,7 +10815,7 @@ snapshots:
       resolve-from: 5.0.0
       resolve.exports: 2.0.3
       semver: 7.8.0
-      send: 0.19.2
+      send: 0.19.2(supports-color@8.1.1)
       slugify: 1.6.9
       source-map-support: 0.5.21
       stacktrace-parser: 0.1.11
@@ -10631,7 +10826,7 @@ snapshots:
       wrap-ansi: 7.0.0
       ws: 8.20.1
     optionalDependencies:
-      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0)
+      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1)
     transitivePeerDependencies:
       - bufferutil
       - graphql
@@ -10642,14 +10837,14 @@ snapshots:
     dependencies:
       node-forge: 1.4.0
 
-  '@expo/config-plugins@54.0.4':
+  '@expo/config-plugins@54.0.4(supports-color@8.1.1)':
     dependencies:
       '@expo/config-types': 54.0.10
       '@expo/json-file': 10.0.14
       '@expo/plist': 0.4.8
       '@expo/sdk-runtime-versions': 1.0.0
       chalk: 4.1.2
-      debug: 4.4.3
+      debug: 4.4.3(supports-color@8.1.1)
       getenv: 2.0.0
       glob: 13.0.6
       resolve-from: 5.0.0
@@ -10661,14 +10856,14 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@expo/config-plugins@9.1.7':
+  '@expo/config-plugins@9.1.7(supports-color@8.1.1)':
     dependencies:
       '@expo/config-types': 53.0.5
       '@expo/json-file': 9.1.5
       '@expo/plist': 0.3.5
       '@expo/sdk-runtime-versions': 1.0.0
       chalk: 4.1.2
-      debug: 4.4.3
+      debug: 4.4.3(supports-color@8.1.1)
       getenv: 1.0.0
       glob: 10.5.0
       resolve-from: 5.0.0
@@ -10684,10 +10879,10 @@ snapshots:
 
   '@expo/config-types@54.0.10': {}
 
-  '@expo/config@12.0.13':
+  '@expo/config@12.0.13(supports-color@8.1.1)':
     dependencies:
       '@babel/code-frame': 7.10.4
-      '@expo/config-plugins': 54.0.4
+      '@expo/config-plugins': 54.0.4(supports-color@8.1.1)
       '@expo/config-types': 54.0.10
       '@expo/json-file': 10.0.14
       deepmerge: 4.3.1
@@ -10702,36 +10897,36 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@expo/devcert@1.2.1':
+  '@expo/devcert@1.2.1(supports-color@8.1.1)':
     dependencies:
       '@expo/sudo-prompt': 9.3.2
-      debug: 3.2.7
+      debug: 3.2.7(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
-  '@expo/devtools@0.1.8(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)':
+  '@expo/devtools@0.1.8(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)':
     dependencies:
       chalk: 4.1.2
     optionalDependencies:
       react: 19.1.0
-      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0)
+      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1)
 
-  '@expo/env@2.0.11':
+  '@expo/env@2.0.11(supports-color@8.1.1)':
     dependencies:
       chalk: 4.1.2
-      debug: 4.4.3
+      debug: 4.4.3(supports-color@8.1.1)
       dotenv: 16.4.7
       dotenv-expand: 11.0.7
       getenv: 2.0.0
     transitivePeerDependencies:
       - supports-color
 
-  '@expo/fingerprint@0.15.5':
+  '@expo/fingerprint@0.15.5(supports-color@8.1.1)':
     dependencies:
       '@expo/spawn-async': 1.7.2
       arg: 5.0.2
       chalk: 4.1.2
-      debug: 4.4.3
+      debug: 4.4.3(supports-color@8.1.1)
       getenv: 2.0.0
       glob: 13.0.6
       ignore: 5.3.2
@@ -10774,19 +10969,19 @@ snapshots:
       '@babel/code-frame': 7.10.4
       json5: 2.2.3
 
-  '@expo/metro-config@54.0.16(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))':
+  '@expo/metro-config@54.0.16(expo@54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1))(supports-color@8.1.1)':
     dependencies:
       '@babel/code-frame': 7.29.0
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
       '@babel/generator': 7.29.1
-      '@expo/config': 12.0.13
-      '@expo/env': 2.0.11
+      '@expo/config': 12.0.13(supports-color@8.1.1)
+      '@expo/env': 2.0.11(supports-color@8.1.1)
       '@expo/json-file': 10.0.16
-      '@expo/metro': 54.2.0
+      '@expo/metro': 54.2.0(supports-color@8.1.1)
       '@expo/spawn-async': 1.7.2
       browserslist: 4.28.2
       chalk: 4.1.2
-      debug: 4.4.3
+      debug: 4.4.3(supports-color@8.1.1)
       dotenv: 16.4.7
       dotenv-expand: 11.0.7
       getenv: 2.0.0
@@ -10798,28 +10993,28 @@ snapshots:
       postcss: 8.4.49
       resolve-from: 5.0.0
     optionalDependencies:
-      expo: 54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+      expo: 54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1)
     transitivePeerDependencies:
       - bufferutil
       - supports-color
       - utf-8-validate
 
-  '@expo/metro@54.2.0':
+  '@expo/metro@54.2.0(supports-color@8.1.1)':
     dependencies:
-      metro: 0.83.3
-      metro-babel-transformer: 0.83.3
-      metro-cache: 0.83.3
+      metro: 0.83.3(supports-color@8.1.1)
+      metro-babel-transformer: 0.83.3(supports-color@8.1.1)
+      metro-cache: 0.83.3(supports-color@8.1.1)
       metro-cache-key: 0.83.3
-      metro-config: 0.83.3
+      metro-config: 0.83.3(supports-color@8.1.1)
       metro-core: 0.83.3
-      metro-file-map: 0.83.3
+      metro-file-map: 0.83.3(supports-color@8.1.1)
       metro-minify-terser: 0.83.3
       metro-resolver: 0.83.3
       metro-runtime: 0.83.3
-      metro-source-map: 0.83.3
-      metro-symbolicate: 0.83.3
-      metro-transform-plugins: 0.83.3
-      metro-transform-worker: 0.83.3
+      metro-source-map: 0.83.3(supports-color@8.1.1)
+      metro-symbolicate: 0.83.3(supports-color@8.1.1)
+      metro-transform-plugins: 0.83.3(supports-color@8.1.1)
+      metro-transform-worker: 0.83.3(supports-color@8.1.1)
     transitivePeerDependencies:
       - bufferutil
       - supports-color
@@ -10856,16 +11051,16 @@ snapshots:
       base64-js: 1.5.1
       xmlbuilder: 15.1.1
 
-  '@expo/prebuild-config@54.0.8(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))':
+  '@expo/prebuild-config@54.0.8(expo@54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1))(supports-color@8.1.1)':
     dependencies:
-      '@expo/config': 12.0.13
-      '@expo/config-plugins': 54.0.4
+      '@expo/config': 12.0.13(supports-color@8.1.1)
+      '@expo/config-plugins': 54.0.4(supports-color@8.1.1)
       '@expo/config-types': 54.0.10
       '@expo/image-utils': 0.8.12
       '@expo/json-file': 10.0.14
       '@react-native/normalize-colors': 0.81.5
-      debug: 4.4.3
-      expo: 54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+      debug: 4.4.3(supports-color@8.1.1)
+      expo: 54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1)
       resolve-from: 5.0.0
       semver: 7.8.0
       xml2js: 0.6.0
@@ -10882,38 +11077,38 @@ snapshots:
 
   '@expo/sudo-prompt@9.3.2': {}
 
-  '@expo/vector-icons@15.1.1(expo-font@14.0.12(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)':
+  '@expo/vector-icons@15.1.1(expo-font@14.0.12(83e0f64f4281e4798012214ad5b2d72d))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)':
     dependencies:
-      expo-font: 14.0.12(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+      expo-font: 14.0.12(83e0f64f4281e4798012214ad5b2d72d)
       react: 19.1.0
-      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0)
+      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1)
 
-  '@expo/webpack-config@19.0.1(clean-css@5.3.3)(csso@5.0.5)(esbuild@0.25.12)(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(html-minifier-terser@6.1.0)(postcss@8.5.14)':
+  '@expo/webpack-config@19.0.1(clean-css@5.3.3)(cssnano@5.1.15(postcss@8.5.14))(csso@5.0.5)(debug@4.4.3(supports-color@8.1.1))(esbuild@0.25.12)(expo@54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1))(html-minifier-terser@6.1.0)(lightningcss@1.32.0)(postcss@8.5.14)(supports-color@8.1.1)':
     dependencies:
-      '@babel/core': 7.29.0
-      babel-loader: 8.4.1(@babel/core@7.29.0)(webpack@5.106.2(postcss@8.5.14))
+      '@babel/core': 7.29.0(supports-color@8.1.1)
+      babel-loader: 8.4.1(@babel/core@7.29.0(supports-color@8.1.1))(webpack@5.106.2(clean-css@5.3.3)(cssnano@5.1.15(postcss@8.5.14))(csso@5.0.5)(esbuild@0.25.12)(html-minifier-terser@6.1.0)(lightningcss@1.32.0)(postcss@8.5.14))
       chalk: 4.1.2
-      clean-webpack-plugin: 4.0.0(webpack@5.106.2(postcss@8.5.14))
-      copy-webpack-plugin: 10.2.4(webpack@5.106.2(postcss@8.5.14))
-      css-loader: 6.11.0(webpack@5.106.2(postcss@8.5.14))
-      css-minimizer-webpack-plugin: 3.4.1(clean-css@5.3.3)(csso@5.0.5)(esbuild@0.25.12)(webpack@5.106.2(postcss@8.5.14))
-      expo: 54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
-      expo-pwa: 0.0.127(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))
+      clean-webpack-plugin: 4.0.0(webpack@5.106.2(clean-css@5.3.3)(cssnano@5.1.15(postcss@8.5.14))(csso@5.0.5)(esbuild@0.25.12)(html-minifier-terser@6.1.0)(lightningcss@1.32.0)(postcss@8.5.14))
+      copy-webpack-plugin: 10.2.4(webpack@5.106.2(clean-css@5.3.3)(cssnano@5.1.15(postcss@8.5.14))(csso@5.0.5)(esbuild@0.25.12)(html-minifier-terser@6.1.0)(lightningcss@1.32.0)(postcss@8.5.14))
+      css-loader: 6.11.0(webpack@5.106.2(clean-css@5.3.3)(cssnano@5.1.15(postcss@8.5.14))(csso@5.0.5)(esbuild@0.25.12)(html-minifier-terser@6.1.0)(lightningcss@1.32.0)(postcss@8.5.14))
+      css-minimizer-webpack-plugin: 3.4.1(clean-css@5.3.3)(csso@5.0.5)(esbuild@0.25.12)(webpack@5.106.2(clean-css@5.3.3)(cssnano@5.1.15(postcss@8.5.14))(csso@5.0.5)(esbuild@0.25.12)(html-minifier-terser@6.1.0)(lightningcss@1.32.0)(postcss@8.5.14))
+      expo: 54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1)
+      expo-pwa: 0.0.127(expo@54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1))
       find-up: 5.0.0
       find-yarn-workspace-root: 2.0.0
       fs-extra: 11.3.5
       getenv: 1.0.0
-      html-webpack-plugin: 5.6.7(webpack@5.106.2(postcss@8.5.14))
+      html-webpack-plugin: 5.6.7(webpack@5.106.2(clean-css@5.3.3)(cssnano@5.1.15(postcss@8.5.14))(csso@5.0.5)(esbuild@0.25.12)(html-minifier-terser@6.1.0)(lightningcss@1.32.0)(postcss@8.5.14))
       is-wsl: 2.2.0
-      mini-css-extract-plugin: 2.10.2(webpack@5.106.2(postcss@8.5.14))
+      mini-css-extract-plugin: 2.10.2(webpack@5.106.2(clean-css@5.3.3)(cssnano@5.1.15(postcss@8.5.14))(csso@5.0.5)(esbuild@0.25.12)(html-minifier-terser@6.1.0)(lightningcss@1.32.0)(postcss@8.5.14))
       node-html-parser: 5.4.2
       semver: 7.5.4
-      source-map-loader: 3.0.2(webpack@5.106.2(postcss@8.5.14))
-      style-loader: 3.3.4(webpack@5.106.2(postcss@8.5.14))
-      terser-webpack-plugin: 5.6.0(clean-css@5.3.3)(csso@5.0.5)(esbuild@0.25.12)(html-minifier-terser@6.1.0)(postcss@8.5.14)(webpack@5.106.2(postcss@8.5.14))
-      webpack: 5.106.2(postcss@8.5.14)
-      webpack-dev-server: 4.15.2(webpack@5.106.2(postcss@8.5.14))
-      webpack-manifest-plugin: 4.1.1(webpack@5.106.2(postcss@8.5.14))
+      source-map-loader: 3.0.2(webpack@5.106.2(clean-css@5.3.3)(cssnano@5.1.15(postcss@8.5.14))(csso@5.0.5)(esbuild@0.25.12)(html-minifier-terser@6.1.0)(lightningcss@1.32.0)(postcss@8.5.14))
+      style-loader: 3.3.4(webpack@5.106.2(clean-css@5.3.3)(cssnano@5.1.15(postcss@8.5.14))(csso@5.0.5)(esbuild@0.25.12)(html-minifier-terser@6.1.0)(lightningcss@1.32.0)(postcss@8.5.14))
+      terser-webpack-plugin: 5.6.0(clean-css@5.3.3)(cssnano@5.1.15(postcss@8.5.14))(csso@5.0.5)(esbuild@0.25.12)(html-minifier-terser@6.1.0)(lightningcss@1.32.0)(postcss@8.5.14)(webpack@5.106.2(clean-css@5.3.3)(cssnano@5.1.15(postcss@8.5.14))(csso@5.0.5)(esbuild@0.25.12)(html-minifier-terser@6.1.0)(lightningcss@1.32.0)(postcss@8.5.14))
+      webpack: 5.106.2(clean-css@5.3.3)(cssnano@5.1.15(postcss@8.5.14))(csso@5.0.5)(esbuild@0.25.12)(html-minifier-terser@6.1.0)(lightningcss@1.32.0)(postcss@8.5.14)
+      webpack-dev-server: 4.15.2(debug@4.4.3(supports-color@8.1.1))(supports-color@8.1.1)(webpack@5.106.2(clean-css@5.3.3)(cssnano@5.1.15(postcss@8.5.14))(csso@5.0.5)(esbuild@0.25.12)(html-minifier-terser@6.1.0)(lightningcss@1.32.0)(postcss@8.5.14))
+      webpack-manifest-plugin: 4.1.1(webpack@5.106.2(clean-css@5.3.3)(cssnano@5.1.15(postcss@8.5.14))(csso@5.0.5)(esbuild@0.25.12)(html-minifier-terser@6.1.0)(lightningcss@1.32.0)(postcss@8.5.14))
     transitivePeerDependencies:
       - '@minify-html/node'
       - '@parcel/css'
@@ -11006,6 +11201,18 @@ snapshots:
     dependencies:
       dom-mutator: 0.6.0
 
+  '@humanwhocodes/config-array@0.13.0(supports-color@8.1.1)':
+    dependencies:
+      '@humanwhocodes/object-schema': 2.0.3
+      debug: 4.4.3(supports-color@8.1.1)
+      minimatch: 3.1.5
+    transitivePeerDependencies:
+      - supports-color
+
+  '@humanwhocodes/module-importer@1.0.1': {}
+
+  '@humanwhocodes/object-schema@2.0.3': {}
+
   '@ide/backoff@1.0.0': {}
 
   '@ipld/dag-cbor@9.2.7':
@@ -11049,12 +11256,12 @@ snapshots:
       jest-util: 29.7.0
       slash: 3.0.0
 
-  '@jest/core@29.7.0':
+  '@jest/core@29.7.0(supports-color@8.1.1)':
     dependencies:
       '@jest/console': 29.7.0
-      '@jest/reporters': 29.7.0
+      '@jest/reporters': 29.7.0(supports-color@8.1.1)
       '@jest/test-result': 29.7.0
-      '@jest/transform': 29.7.0
+      '@jest/transform': 29.7.0(supports-color@8.1.1)
       '@jest/types': 29.6.3
       '@types/node': 24.12.4
       ansi-escapes: 4.3.2
@@ -11063,15 +11270,15 @@ snapshots:
       exit: 0.1.2
       graceful-fs: 4.2.11
       jest-changed-files: 29.7.0
-      jest-config: 29.7.0(@types/node@24.12.4)
+      jest-config: 29.7.0(@types/node@24.12.4)(supports-color@8.1.1)
       jest-haste-map: 29.7.0
       jest-message-util: 29.7.0
       jest-regex-util: 29.6.3
       jest-resolve: 29.7.0
-      jest-resolve-dependencies: 29.7.0
-      jest-runner: 29.7.0
-      jest-runtime: 29.7.0
-      jest-snapshot: 29.7.0
+      jest-resolve-dependencies: 29.7.0(supports-color@8.1.1)
+      jest-runner: 29.7.0(supports-color@8.1.1)
+      jest-runtime: 29.7.0(supports-color@8.1.1)
+      jest-snapshot: 29.7.0(supports-color@8.1.1)
       jest-util: 29.7.0
       jest-validate: 29.7.0
       jest-watcher: 29.7.0
@@ -11105,10 +11312,10 @@ snapshots:
     dependencies:
       '@jest/get-type': 30.1.0
 
-  '@jest/expect@29.7.0':
+  '@jest/expect@29.7.0(supports-color@8.1.1)':
     dependencies:
       expect: 29.7.0
-      jest-snapshot: 29.7.0
+      jest-snapshot: 29.7.0(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
@@ -11123,10 +11330,10 @@ snapshots:
 
   '@jest/get-type@30.1.0': {}
 
-  '@jest/globals@29.7.0':
+  '@jest/globals@29.7.0(supports-color@8.1.1)':
     dependencies:
       '@jest/environment': 29.7.0
-      '@jest/expect': 29.7.0
+      '@jest/expect': 29.7.0(supports-color@8.1.1)
       '@jest/types': 29.6.3
       jest-mock: 29.7.0
     transitivePeerDependencies:
@@ -11137,12 +11344,12 @@ snapshots:
       '@types/node': 24.12.4
       jest-regex-util: 30.4.0
 
-  '@jest/reporters@29.7.0':
+  '@jest/reporters@29.7.0(supports-color@8.1.1)':
     dependencies:
       '@bcoe/v8-coverage': 0.2.3
       '@jest/console': 29.7.0
       '@jest/test-result': 29.7.0
-      '@jest/transform': 29.7.0
+      '@jest/transform': 29.7.0(supports-color@8.1.1)
       '@jest/types': 29.6.3
       '@jridgewell/trace-mapping': 0.3.31
       '@types/node': 24.12.4
@@ -11152,9 +11359,9 @@ snapshots:
       glob: 7.2.3
       graceful-fs: 4.2.11
       istanbul-lib-coverage: 3.2.2
-      istanbul-lib-instrument: 6.0.3
+      istanbul-lib-instrument: 6.0.3(supports-color@8.1.1)
       istanbul-lib-report: 3.0.1
-      istanbul-lib-source-maps: 4.0.1
+      istanbul-lib-source-maps: 4.0.1(supports-color@8.1.1)
       istanbul-reports: 3.2.0
       jest-message-util: 29.7.0
       jest-util: 29.7.0
@@ -11194,12 +11401,12 @@ snapshots:
       jest-haste-map: 29.7.0
       slash: 3.0.0
 
-  '@jest/transform@29.7.0':
+  '@jest/transform@29.7.0(supports-color@8.1.1)':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
       '@jest/types': 29.6.3
       '@jridgewell/trace-mapping': 0.3.31
-      babel-plugin-istanbul: 6.1.1
+      babel-plugin-istanbul: 6.1.1(supports-color@8.1.1)
       chalk: 4.1.2
       convert-source-map: 2.0.0
       fast-json-stable-stringify: 2.1.0
@@ -11261,29 +11468,29 @@ snapshots:
 
   '@lingui/babel-plugin-extract-messages@5.9.5': {}
 
-  '@lingui/babel-plugin-lingui-macro@5.9.5(@typescript/typescript6@6.0.2)':
+  '@lingui/babel-plugin-lingui-macro@5.9.5(@typescript/typescript6@6.0.2)(supports-color@8.1.1)':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
       '@babel/runtime': 7.29.2
       '@babel/types': 7.29.0
       '@lingui/conf': 5.9.5(@typescript/typescript6@6.0.2)
-      '@lingui/core': 5.9.5(@lingui/babel-plugin-lingui-macro@5.9.5(@typescript/typescript6@6.0.2))
+      '@lingui/core': 5.9.5(@lingui/babel-plugin-lingui-macro@5.9.5(@typescript/typescript6@6.0.2)(supports-color@8.1.1))
       '@lingui/message-utils': 5.9.5
     transitivePeerDependencies:
       - supports-color
       - typescript
 
-  '@lingui/cli@5.9.5(@typescript/typescript6@6.0.2)':
+  '@lingui/cli@5.9.5(@typescript/typescript6@6.0.2)(supports-color@8.1.1)':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
       '@babel/generator': 7.29.1
       '@babel/parser': 7.29.3
       '@babel/runtime': 7.29.2
       '@babel/types': 7.29.0
       '@lingui/babel-plugin-extract-messages': 5.9.5
-      '@lingui/babel-plugin-lingui-macro': 5.9.5(@typescript/typescript6@6.0.2)
+      '@lingui/babel-plugin-lingui-macro': 5.9.5(@typescript/typescript6@6.0.2)(supports-color@8.1.1)
       '@lingui/conf': 5.9.5(@typescript/typescript6@6.0.2)
-      '@lingui/core': 5.9.5(@lingui/babel-plugin-lingui-macro@5.9.5(@typescript/typescript6@6.0.2))
+      '@lingui/core': 5.9.5(@lingui/babel-plugin-lingui-macro@5.9.5(@typescript/typescript6@6.0.2)(supports-color@8.1.1))
       '@lingui/format-po': 5.9.5(@typescript/typescript6@6.0.2)
       '@lingui/message-utils': 5.9.5
       chokidar: 3.5.1
@@ -11301,7 +11508,7 @@ snapshots:
       pofile: 1.1.4
       pseudolocale: 2.2.0
       source-map: 0.7.6
-      threads: 1.7.0
+      threads: 1.7.0(supports-color@8.1.1)
     transitivePeerDependencies:
       - babel-plugin-macros
       - supports-color
@@ -11317,12 +11524,12 @@ snapshots:
     transitivePeerDependencies:
       - typescript
 
-  '@lingui/core@5.9.5(@lingui/babel-plugin-lingui-macro@5.9.5(@typescript/typescript6@6.0.2))':
+  '@lingui/core@5.9.5(@lingui/babel-plugin-lingui-macro@5.9.5(@typescript/typescript6@6.0.2)(supports-color@8.1.1))':
     dependencies:
       '@babel/runtime': 7.29.2
       '@lingui/message-utils': 5.9.5
     optionalDependencies:
-      '@lingui/babel-plugin-lingui-macro': 5.9.5(@typescript/typescript6@6.0.2)
+      '@lingui/babel-plugin-lingui-macro': 5.9.5(@typescript/typescript6@6.0.2)(supports-color@8.1.1)
 
   '@lingui/format-po@5.9.5(@typescript/typescript6@6.0.2)':
     dependencies:
@@ -11338,13 +11545,13 @@ snapshots:
       '@messageformat/parser': 5.1.1
       js-sha256: 0.10.1
 
-  '@lingui/react@5.9.5(@lingui/babel-plugin-lingui-macro@5.9.5(@typescript/typescript6@6.0.2))(react@19.1.0)':
+  '@lingui/react@5.9.5(@lingui/babel-plugin-lingui-macro@5.9.5(@typescript/typescript6@6.0.2)(supports-color@8.1.1))(react@19.1.0)':
     dependencies:
       '@babel/runtime': 7.29.2
-      '@lingui/core': 5.9.5(@lingui/babel-plugin-lingui-macro@5.9.5(@typescript/typescript6@6.0.2))
+      '@lingui/core': 5.9.5(@lingui/babel-plugin-lingui-macro@5.9.5(@typescript/typescript6@6.0.2)(supports-color@8.1.1))
       react: 19.1.0
     optionalDependencies:
-      '@lingui/babel-plugin-lingui-macro': 5.9.5(@typescript/typescript6@6.0.2)
+      '@lingui/babel-plugin-lingui-macro': 5.9.5(@typescript/typescript6@6.0.2)(supports-color@8.1.1)
 
   '@messageformat/parser@5.1.1':
     dependencies:
@@ -11440,7 +11647,7 @@ snapshots:
   '@pkgjs/parseargs@0.11.0':
     optional: true
 
-  '@pmmmwh/react-refresh-webpack-plugin@0.5.17(react-refresh@0.14.2)(type-fest@1.4.0)(webpack-dev-server@4.15.2(webpack@5.106.2(postcss@8.5.14)))(webpack@5.106.2(postcss@8.5.14))':
+  '@pmmmwh/react-refresh-webpack-plugin@0.5.17(react-refresh@0.14.2)(type-fest@1.4.0)(webpack-dev-server@4.15.2(debug@4.4.3(supports-color@8.1.1))(supports-color@8.1.1)(webpack@5.106.2(clean-css@5.3.3)(cssnano@5.1.15(postcss@8.5.14))(csso@5.0.5)(esbuild@0.25.12)(html-minifier-terser@6.1.0)(lightningcss@1.32.0)(postcss@8.5.14)))(webpack@5.106.2(clean-css@5.3.3)(cssnano@5.1.15(postcss@8.5.14))(csso@5.0.5)(esbuild@0.25.12)(html-minifier-terser@6.1.0)(lightningcss@1.32.0)(postcss@8.5.14))':
     dependencies:
       ansi-html: 0.0.9
       core-js-pure: 3.49.0
@@ -11450,10 +11657,10 @@ snapshots:
       react-refresh: 0.14.2
       schema-utils: 4.3.3
       source-map: 0.7.6
-      webpack: 5.106.2(postcss@8.5.14)
+      webpack: 5.106.2(clean-css@5.3.3)(cssnano@5.1.15(postcss@8.5.14))(csso@5.0.5)(esbuild@0.25.12)(html-minifier-terser@6.1.0)(lightningcss@1.32.0)(postcss@8.5.14)
     optionalDependencies:
       type-fest: 1.4.0
-      webpack-dev-server: 4.15.2(webpack@5.106.2(postcss@8.5.14))
+      webpack-dev-server: 4.15.2(debug@4.4.3(supports-color@8.1.1))(supports-color@8.1.1)(webpack@5.106.2(clean-css@5.3.3)(cssnano@5.1.15(postcss@8.5.14))(csso@5.0.5)(esbuild@0.25.12)(html-minifier-terser@6.1.0)(lightningcss@1.32.0)(postcss@8.5.14))
 
   '@polka/url@1.0.0-next.29': {}
 
@@ -12206,74 +12413,74 @@ snapshots:
 
   '@radix-ui/rect@1.1.1': {}
 
-  '@react-native-async-storage/async-storage@2.2.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))':
+  '@react-native-async-storage/async-storage@2.2.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))':
     dependencies:
       merge-options: 3.0.4
-      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0)
+      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1)
 
   '@react-native/assets-registry@0.81.5': {}
 
-  '@react-native/babel-plugin-codegen@0.81.5(@babel/core@7.29.0)':
+  '@react-native/babel-plugin-codegen@0.81.5(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)':
     dependencies:
-      '@babel/traverse': 7.29.0
-      '@react-native/codegen': 0.81.5(@babel/core@7.29.0)
+      '@babel/traverse': 7.29.0(supports-color@8.1.1)
+      '@react-native/codegen': 0.81.5(@babel/core@7.29.0(supports-color@8.1.1))
     transitivePeerDependencies:
       - '@babel/core'
       - supports-color
 
-  '@react-native/babel-preset@0.81.5(@babel/core@7.29.0)':
+  '@react-native/babel-preset@0.81.5(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)':
     dependencies:
-      '@babel/core': 7.29.0
-      '@babel/plugin-proposal-export-default-from': 7.27.1(@babel/core@7.29.0)
-      '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/core@7.29.0)
-      '@babel/plugin-syntax-export-default-from': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.29.0)
-      '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.29.0)
-      '@babel/plugin-transform-arrow-functions': 7.27.1(@babel/core@7.29.0)
-      '@babel/plugin-transform-async-generator-functions': 7.29.0(@babel/core@7.29.0)
-      '@babel/plugin-transform-async-to-generator': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-block-scoping': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-class-properties': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-classes': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-computed-properties': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-destructuring': 7.28.5(@babel/core@7.29.0)
-      '@babel/plugin-transform-flow-strip-types': 7.27.1(@babel/core@7.29.0)
-      '@babel/plugin-transform-for-of': 7.27.1(@babel/core@7.29.0)
-      '@babel/plugin-transform-function-name': 7.27.1(@babel/core@7.29.0)
-      '@babel/plugin-transform-literals': 7.27.1(@babel/core@7.29.0)
-      '@babel/plugin-transform-logical-assignment-operators': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-modules-commonjs': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-named-capturing-groups-regex': 7.29.0(@babel/core@7.29.0)
-      '@babel/plugin-transform-nullish-coalescing-operator': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-numeric-separator': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-object-rest-spread': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-optional-catch-binding': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-optional-chaining': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-parameters': 7.27.7(@babel/core@7.29.0)
-      '@babel/plugin-transform-private-methods': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-private-property-in-object': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-react-display-name': 7.28.0(@babel/core@7.29.0)
-      '@babel/plugin-transform-react-jsx': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-react-jsx-self': 7.27.1(@babel/core@7.29.0)
-      '@babel/plugin-transform-react-jsx-source': 7.27.1(@babel/core@7.29.0)
-      '@babel/plugin-transform-regenerator': 7.29.0(@babel/core@7.29.0)
-      '@babel/plugin-transform-runtime': 7.29.0(@babel/core@7.29.0)
-      '@babel/plugin-transform-shorthand-properties': 7.27.1(@babel/core@7.29.0)
-      '@babel/plugin-transform-spread': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-sticky-regex': 7.27.1(@babel/core@7.29.0)
-      '@babel/plugin-transform-typescript': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-unicode-regex': 7.27.1(@babel/core@7.29.0)
+      '@babel/core': 7.29.0(supports-color@8.1.1)
+      '@babel/plugin-proposal-export-default-from': 7.27.1(@babel/core@7.29.0(supports-color@8.1.1))
+      '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/core@7.29.0(supports-color@8.1.1))
+      '@babel/plugin-syntax-export-default-from': 7.28.6(@babel/core@7.29.0(supports-color@8.1.1))
+      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.29.0(supports-color@8.1.1))
+      '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.29.0(supports-color@8.1.1))
+      '@babel/plugin-transform-arrow-functions': 7.27.1(@babel/core@7.29.0(supports-color@8.1.1))
+      '@babel/plugin-transform-async-generator-functions': 7.29.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
+      '@babel/plugin-transform-async-to-generator': 7.28.6(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
+      '@babel/plugin-transform-block-scoping': 7.28.6(@babel/core@7.29.0(supports-color@8.1.1))
+      '@babel/plugin-transform-class-properties': 7.28.6(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
+      '@babel/plugin-transform-classes': 7.28.6(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
+      '@babel/plugin-transform-computed-properties': 7.28.6(@babel/core@7.29.0(supports-color@8.1.1))
+      '@babel/plugin-transform-destructuring': 7.28.5(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
+      '@babel/plugin-transform-flow-strip-types': 7.27.1(@babel/core@7.29.0(supports-color@8.1.1))
+      '@babel/plugin-transform-for-of': 7.27.1(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
+      '@babel/plugin-transform-function-name': 7.27.1(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
+      '@babel/plugin-transform-literals': 7.27.1(@babel/core@7.29.0(supports-color@8.1.1))
+      '@babel/plugin-transform-logical-assignment-operators': 7.28.6(@babel/core@7.29.0(supports-color@8.1.1))
+      '@babel/plugin-transform-modules-commonjs': 7.28.6(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
+      '@babel/plugin-transform-named-capturing-groups-regex': 7.29.0(@babel/core@7.29.0(supports-color@8.1.1))
+      '@babel/plugin-transform-nullish-coalescing-operator': 7.28.6(@babel/core@7.29.0(supports-color@8.1.1))
+      '@babel/plugin-transform-numeric-separator': 7.28.6(@babel/core@7.29.0(supports-color@8.1.1))
+      '@babel/plugin-transform-object-rest-spread': 7.28.6(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
+      '@babel/plugin-transform-optional-catch-binding': 7.28.6(@babel/core@7.29.0(supports-color@8.1.1))
+      '@babel/plugin-transform-optional-chaining': 7.28.6(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
+      '@babel/plugin-transform-parameters': 7.27.7(@babel/core@7.29.0(supports-color@8.1.1))
+      '@babel/plugin-transform-private-methods': 7.28.6(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
+      '@babel/plugin-transform-private-property-in-object': 7.28.6(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
+      '@babel/plugin-transform-react-display-name': 7.28.0(@babel/core@7.29.0(supports-color@8.1.1))
+      '@babel/plugin-transform-react-jsx': 7.28.6(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
+      '@babel/plugin-transform-react-jsx-self': 7.27.1(@babel/core@7.29.0(supports-color@8.1.1))
+      '@babel/plugin-transform-react-jsx-source': 7.27.1(@babel/core@7.29.0(supports-color@8.1.1))
+      '@babel/plugin-transform-regenerator': 7.29.0(@babel/core@7.29.0(supports-color@8.1.1))
+      '@babel/plugin-transform-runtime': 7.29.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
+      '@babel/plugin-transform-shorthand-properties': 7.27.1(@babel/core@7.29.0(supports-color@8.1.1))
+      '@babel/plugin-transform-spread': 7.28.6(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
+      '@babel/plugin-transform-sticky-regex': 7.27.1(@babel/core@7.29.0(supports-color@8.1.1))
+      '@babel/plugin-transform-typescript': 7.28.6(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
+      '@babel/plugin-transform-unicode-regex': 7.27.1(@babel/core@7.29.0(supports-color@8.1.1))
       '@babel/template': 7.28.6
-      '@react-native/babel-plugin-codegen': 0.81.5(@babel/core@7.29.0)
+      '@react-native/babel-plugin-codegen': 0.81.5(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
       babel-plugin-syntax-hermes-parser: 0.29.1
-      babel-plugin-transform-flow-enums: 0.0.2(@babel/core@7.29.0)
+      babel-plugin-transform-flow-enums: 0.0.2(@babel/core@7.29.0(supports-color@8.1.1))
       react-refresh: 0.14.2
     transitivePeerDependencies:
       - supports-color
 
-  '@react-native/codegen@0.81.5(@babel/core@7.29.0)':
+  '@react-native/codegen@0.81.5(@babel/core@7.29.0(supports-color@8.1.1))':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
       '@babel/parser': 7.29.3
       glob: 7.2.3
       hermes-parser: 0.29.1
@@ -12281,17 +12488,17 @@ snapshots:
       nullthrows: 1.1.1
       yargs: 17.7.2
 
-  '@react-native/community-cli-plugin@0.81.5(@react-native/metro-config@0.86.0(@babel/core@7.29.0))':
+  '@react-native/community-cli-plugin@0.81.5(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(supports-color@8.1.1)':
     dependencies:
-      '@react-native/dev-middleware': 0.81.5
-      debug: 4.4.3
+      '@react-native/dev-middleware': 0.81.5(supports-color@8.1.1)
+      debug: 4.4.3(supports-color@8.1.1)
       invariant: 2.2.4
-      metro: 0.83.3
-      metro-config: 0.83.3
+      metro: 0.83.3(supports-color@8.1.1)
+      metro-config: 0.83.3(supports-color@8.1.1)
       metro-core: 0.83.3
       semver: 7.8.0
     optionalDependencies:
-      '@react-native/metro-config': 0.86.0(@babel/core@7.29.0)
+      '@react-native/metro-config': 0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
     transitivePeerDependencies:
       - bufferutil
       - supports-color
@@ -12299,18 +12506,18 @@ snapshots:
 
   '@react-native/debugger-frontend@0.81.5': {}
 
-  '@react-native/dev-middleware@0.81.5':
+  '@react-native/dev-middleware@0.81.5(supports-color@8.1.1)':
     dependencies:
       '@isaacs/ttlcache': 1.4.1
       '@react-native/debugger-frontend': 0.81.5
-      chrome-launcher: 0.15.2
-      chromium-edge-launcher: 0.2.0
-      connect: 3.7.0
-      debug: 4.4.3
+      chrome-launcher: 0.15.2(supports-color@8.1.1)
+      chromium-edge-launcher: 0.2.0(supports-color@8.1.1)
+      connect: 3.7.0(supports-color@8.1.1)
+      debug: 4.4.3(supports-color@8.1.1)
       invariant: 2.2.4
       nullthrows: 1.1.1
       open: 7.4.2
-      serve-static: 1.16.3
+      serve-static: 1.16.3(supports-color@8.1.1)
       ws: 6.2.3
     transitivePeerDependencies:
       - bufferutil
@@ -12323,20 +12530,20 @@ snapshots:
 
   '@react-native/js-polyfills@0.86.0': {}
 
-  '@react-native/metro-babel-transformer@0.86.0(@babel/core@7.29.0)':
+  '@react-native/metro-babel-transformer@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)':
     dependencies:
-      '@babel/core': 7.29.0
-      '@react-native/babel-preset': 0.81.5(@babel/core@7.29.0)
+      '@babel/core': 7.29.0(supports-color@8.1.1)
+      '@react-native/babel-preset': 0.81.5(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
       hermes-parser: 0.36.0
       nullthrows: 1.1.1
     transitivePeerDependencies:
       - supports-color
 
-  '@react-native/metro-config@0.86.0(@babel/core@7.29.0)':
+  '@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)':
     dependencies:
       '@react-native/js-polyfills': 0.86.0
-      '@react-native/metro-babel-transformer': 0.86.0(@babel/core@7.29.0)
-      metro-config: 0.84.4
+      '@react-native/metro-babel-transformer': 0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
+      metro-config: 0.84.4(supports-color@8.1.1)
       metro-runtime: 0.84.4
     transitivePeerDependencies:
       - '@babel/core'
@@ -12348,24 +12555,24 @@ snapshots:
 
   '@react-native/typescript-config@0.81.6': {}
 
-  '@react-native/virtualized-lists@0.81.5(@types/react@19.1.17)(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)':
+  '@react-native/virtualized-lists@0.81.5(@types/react@19.1.17)(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)':
     dependencies:
       invariant: 2.2.4
       nullthrows: 1.1.1
       react: 19.1.0
-      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0)
+      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1)
     optionalDependencies:
       '@types/react': 19.1.17
 
-  '@react-navigation/bottom-tabs@7.16.0(91eab7bd987834c4c877d5cbf9d3796c)':
+  '@react-navigation/bottom-tabs@7.16.0(15d086c577324dcb87d77ea7fa3207d2)':
     dependencies:
-      '@react-navigation/elements': 2.9.17(@react-navigation/native@7.2.4(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native-safe-area-context@5.6.2(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
-      '@react-navigation/native': 7.2.4(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+      '@react-navigation/elements': 2.9.17(0db73217b8c0536280a44f0cfa3926ed)
+      '@react-navigation/native': 7.2.4(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)
       color: 4.2.3
       react: 19.1.0
-      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0)
-      react-native-safe-area-context: 5.6.2(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
-      react-native-screens: 4.24.0(patch_hash=74a74b489f8074a1974c2792c9c97aec30d8e251669aa37fc5c99993bb4a19e6)(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1)
+      react-native-safe-area-context: 5.6.2(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)
+      react-native-screens: 4.24.0(patch_hash=74a74b489f8074a1974c2792c9c97aec30d8e251669aa37fc5c99993bb4a19e6)(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)
       sf-symbols-typescript: 2.2.0
     transitivePeerDependencies:
       - '@react-native-masked-view/masked-view'
@@ -12382,38 +12589,38 @@ snapshots:
       use-latest-callback: 0.2.6(react@19.1.0)
       use-sync-external-store: 1.6.0(react@19.1.0)
 
-  '@react-navigation/elements@2.9.17(@react-navigation/native@7.2.4(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native-safe-area-context@5.6.2(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)':
+  '@react-navigation/elements@2.9.17(0db73217b8c0536280a44f0cfa3926ed)':
     dependencies:
-      '@react-navigation/native': 7.2.4(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+      '@react-navigation/native': 7.2.4(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)
       color: 4.2.3
       react: 19.1.0
-      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0)
-      react-native-safe-area-context: 5.6.2(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1)
+      react-native-safe-area-context: 5.6.2(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)
       use-latest-callback: 0.2.6(react@19.1.0)
       use-sync-external-store: 1.6.0(react@19.1.0)
 
-  '@react-navigation/native-stack@7.15.0(91eab7bd987834c4c877d5cbf9d3796c)':
+  '@react-navigation/native-stack@7.15.0(15d086c577324dcb87d77ea7fa3207d2)':
     dependencies:
-      '@react-navigation/elements': 2.9.17(@react-navigation/native@7.2.4(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native-safe-area-context@5.6.2(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
-      '@react-navigation/native': 7.2.4(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+      '@react-navigation/elements': 2.9.17(0db73217b8c0536280a44f0cfa3926ed)
+      '@react-navigation/native': 7.2.4(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)
       color: 4.2.3
       react: 19.1.0
-      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0)
-      react-native-safe-area-context: 5.6.2(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
-      react-native-screens: 4.24.0(patch_hash=74a74b489f8074a1974c2792c9c97aec30d8e251669aa37fc5c99993bb4a19e6)(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1)
+      react-native-safe-area-context: 5.6.2(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)
+      react-native-screens: 4.24.0(patch_hash=74a74b489f8074a1974c2792c9c97aec30d8e251669aa37fc5c99993bb4a19e6)(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)
       sf-symbols-typescript: 2.2.0
       warn-once: 0.1.1
     transitivePeerDependencies:
       - '@react-native-masked-view/masked-view'
 
-  '@react-navigation/native@7.2.4(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)':
+  '@react-navigation/native@7.2.4(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)':
     dependencies:
       '@react-navigation/core': 7.17.4(react@19.1.0)
       escape-string-regexp: 4.0.0
       fast-deep-equal: 3.1.3
       nanoid: 3.3.12
       react: 19.1.0
-      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0)
+      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1)
       use-latest-callback: 0.2.6(react@19.1.0)
 
   '@react-navigation/routers@7.5.5':
@@ -12438,11 +12645,11 @@ snapshots:
       '@sentry/replay': 10.64.0
       '@sentry/replay-canvas': 10.64.0
 
-  '@sentry/bundler-plugin-core@3.6.1':
+  '@sentry/bundler-plugin-core@3.6.1(supports-color@8.1.1)':
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
       '@sentry/babel-plugin-component-annotate': 3.6.1
-      '@sentry/cli': 2.58.5
+      '@sentry/cli': 2.58.5(supports-color@8.1.1)
       dotenv: 16.6.1
       find-up: 5.0.0
       glob: 9.3.5
@@ -12500,9 +12707,9 @@ snapshots:
   '@sentry/cli-win32-x64@3.6.0':
     optional: true
 
-  '@sentry/cli@2.58.5':
+  '@sentry/cli@2.58.5(supports-color@8.1.1)':
     dependencies:
-      https-proxy-agent: 5.0.1
+      https-proxy-agent: 5.0.1(supports-color@8.1.1)
       node-fetch: 2.7.0
       progress: 2.0.3
       proxy-from-env: 1.1.0
@@ -12542,29 +12749,29 @@ snapshots:
     dependencies:
       '@sentry/conventions': 0.15.1
 
-  '@sentry/expo-upload-sourcemaps@8.18.0(patch_hash=2368e1e1986165e7ead3c60017b78b2f9ade1b6a6b2f5ad27cd428608c6f12ae)(@expo/env@2.0.11)(dotenv@16.6.1)':
+  '@sentry/expo-upload-sourcemaps@8.18.0(patch_hash=2368e1e1986165e7ead3c60017b78b2f9ade1b6a6b2f5ad27cd428608c6f12ae)(@expo/env@2.0.11(supports-color@8.1.1))(dotenv@16.6.1)':
     dependencies:
       '@sentry/cli': 3.6.0
     optionalDependencies:
-      '@expo/env': 2.0.11
+      '@expo/env': 2.0.11(supports-color@8.1.1)
       dotenv: 16.6.1
 
   '@sentry/feedback@10.64.0':
     dependencies:
       '@sentry/core': 10.64.0
 
-  '@sentry/react-native@8.18.0(@expo/env@2.0.11)(dotenv@16.6.1)(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)':
+  '@sentry/react-native@8.18.0(61f03fc01fabd5cbd0e83cc2a57309d9)':
     dependencies:
       '@sentry/babel-plugin-component-annotate': 5.3.0
       '@sentry/browser': 10.64.0
       '@sentry/cli': 3.6.0
       '@sentry/core': 10.64.0
-      '@sentry/expo-upload-sourcemaps': 8.18.0(patch_hash=2368e1e1986165e7ead3c60017b78b2f9ade1b6a6b2f5ad27cd428608c6f12ae)(@expo/env@2.0.11)(dotenv@16.6.1)
+      '@sentry/expo-upload-sourcemaps': 8.18.0(patch_hash=2368e1e1986165e7ead3c60017b78b2f9ade1b6a6b2f5ad27cd428608c6f12ae)(@expo/env@2.0.11(supports-color@8.1.1))(dotenv@16.6.1)
       '@sentry/react': 10.64.0(react@19.1.0)
       react: 19.1.0
-      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0)
+      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1)
     optionalDependencies:
-      expo: 54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+      expo: 54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1)
     transitivePeerDependencies:
       - '@expo/env'
       - dotenv
@@ -12585,12 +12792,12 @@ snapshots:
       '@sentry/browser-utils': 10.64.0
       '@sentry/core': 10.64.0
 
-  '@sentry/webpack-plugin@3.6.1(webpack@5.106.2(postcss@8.5.14))':
+  '@sentry/webpack-plugin@3.6.1(supports-color@8.1.1)(webpack@5.106.2(clean-css@5.3.3)(cssnano@5.1.15(postcss@8.5.14))(csso@5.0.5)(esbuild@0.25.12)(html-minifier-terser@6.1.0)(lightningcss@1.32.0)(postcss@8.5.14))':
     dependencies:
-      '@sentry/bundler-plugin-core': 3.6.1
+      '@sentry/bundler-plugin-core': 3.6.1(supports-color@8.1.1)
       unplugin: 1.0.1
       uuid: 9.0.1
-      webpack: 5.106.2(postcss@8.5.14)
+      webpack: 5.106.2(clean-css@5.3.3)(cssnano@5.1.15(postcss@8.5.14))(csso@5.0.5)(esbuild@0.25.12)(html-minifier-terser@6.1.0)(lightningcss@1.32.0)(postcss@8.5.14)
     transitivePeerDependencies:
       - encoding
       - supports-color
@@ -12607,6 +12814,8 @@ snapshots:
     dependencies:
       '@sinonjs/commons': 3.0.1
 
+  '@standard-schema/spec@1.1.0': {}
+
   '@tanstack/query-async-storage-persister@5.100.10':
     dependencies:
       '@tanstack/query-core': 5.100.10
@@ -12629,17 +12838,17 @@ snapshots:
       '@tanstack/query-core': 5.100.10
       react: 19.1.0
 
-  '@testing-library/react-native@13.3.3(jest@29.7.0(@types/node@24.12.4))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react-test-renderer@19.1.0(react@19.1.0))(react@19.1.0)':
+  '@testing-library/react-native@13.3.3(jest@29.7.0(@types/node@24.12.4)(supports-color@8.1.1))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react-test-renderer@19.1.0(react@19.1.0))(react@19.1.0)':
     dependencies:
       jest-matcher-utils: 30.4.1
       picocolors: 1.1.1
       pretty-format: 30.4.1
       react: 19.1.0
-      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0)
+      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1)
       react-test-renderer: 19.1.0(react@19.1.0)
       redent: 3.0.0
     optionalDependencies:
-      jest: 29.7.0(@types/node@24.12.4)
+      jest: 29.7.0(@types/node@24.12.4)(supports-color@8.1.1)
 
   '@tiptap/core@2.27.2(@tiptap/pm@2.27.2)':
     dependencies:
@@ -13139,15 +13348,19 @@ snapshots:
     dependencies:
       acorn: 8.16.0
 
+  acorn-jsx@5.3.2(acorn@8.16.0):
+    dependencies:
+      acorn: 8.16.0
+
   acorn-walk@8.3.5:
     dependencies:
       acorn: 8.16.0
 
   acorn@8.16.0: {}
 
-  agent-base@6.0.2:
+  agent-base@6.0.2(supports-color@8.1.1):
     dependencies:
-      debug: 4.4.3
+      debug: 4.4.3(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
@@ -13315,34 +13528,34 @@ snapshots:
 
   await-lock@3.0.0: {}
 
-  babel-jest@29.7.0(@babel/core@7.29.0):
+  babel-jest@29.7.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1):
     dependencies:
-      '@babel/core': 7.29.0
-      '@jest/transform': 29.7.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
+      '@jest/transform': 29.7.0(supports-color@8.1.1)
       '@types/babel__core': 7.20.5
-      babel-plugin-istanbul: 6.1.1
-      babel-preset-jest: 29.6.3(@babel/core@7.29.0)
+      babel-plugin-istanbul: 6.1.1(supports-color@8.1.1)
+      babel-preset-jest: 29.6.3(@babel/core@7.29.0(supports-color@8.1.1))
       chalk: 4.1.2
       graceful-fs: 4.2.11
       slash: 3.0.0
     transitivePeerDependencies:
       - supports-color
 
-  babel-loader@8.4.1(@babel/core@7.29.0)(webpack@5.106.2(postcss@8.5.14)):
+  babel-loader@8.4.1(@babel/core@7.29.0(supports-color@8.1.1))(webpack@5.106.2(clean-css@5.3.3)(cssnano@5.1.15(postcss@8.5.14))(csso@5.0.5)(esbuild@0.25.12)(html-minifier-terser@6.1.0)(lightningcss@1.32.0)(postcss@8.5.14)):
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
       find-cache-dir: 3.3.2
       loader-utils: 2.0.4
       make-dir: 3.1.0
       schema-utils: 2.7.1
-      webpack: 5.106.2(postcss@8.5.14)
+      webpack: 5.106.2(clean-css@5.3.3)(cssnano@5.1.15(postcss@8.5.14))(csso@5.0.5)(esbuild@0.25.12)(html-minifier-terser@6.1.0)(lightningcss@1.32.0)(postcss@8.5.14)
 
-  babel-plugin-istanbul@6.1.1:
+  babel-plugin-istanbul@6.1.1(supports-color@8.1.1):
     dependencies:
       '@babel/helper-plugin-utils': 7.28.6
       '@istanbuljs/load-nyc-config': 1.1.0
       '@istanbuljs/schema': 0.1.6
-      istanbul-lib-instrument: 5.2.1
+      istanbul-lib-instrument: 5.2.1(supports-color@8.1.1)
       test-exclude: 6.0.0
     transitivePeerDependencies:
       - supports-color
@@ -13362,35 +13575,35 @@ snapshots:
       reselect: 4.1.8
       resolve: 1.22.12
 
-  babel-plugin-polyfill-corejs2@0.4.17(@babel/core@7.29.0):
+  babel-plugin-polyfill-corejs2@0.4.17(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1):
     dependencies:
       '@babel/compat-data': 7.29.3
-      '@babel/core': 7.29.0
-      '@babel/helper-define-polyfill-provider': 0.6.8(@babel/core@7.29.0)
+      '@babel/core': 7.29.0(supports-color@8.1.1)
+      '@babel/helper-define-polyfill-provider': 0.6.8(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
       semver: 6.3.1
     transitivePeerDependencies:
       - supports-color
 
-  babel-plugin-polyfill-corejs3@0.13.0(@babel/core@7.29.0):
+  babel-plugin-polyfill-corejs3@0.13.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1):
     dependencies:
-      '@babel/core': 7.29.0
-      '@babel/helper-define-polyfill-provider': 0.6.8(@babel/core@7.29.0)
+      '@babel/core': 7.29.0(supports-color@8.1.1)
+      '@babel/helper-define-polyfill-provider': 0.6.8(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
       core-js-compat: 3.49.0
     transitivePeerDependencies:
       - supports-color
 
-  babel-plugin-polyfill-corejs3@0.14.2(@babel/core@7.29.0):
+  babel-plugin-polyfill-corejs3@0.14.2(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1):
     dependencies:
-      '@babel/core': 7.29.0
-      '@babel/helper-define-polyfill-provider': 0.6.8(@babel/core@7.29.0)
+      '@babel/core': 7.29.0(supports-color@8.1.1)
+      '@babel/helper-define-polyfill-provider': 0.6.8(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
       core-js-compat: 3.49.0
     transitivePeerDependencies:
       - supports-color
 
-  babel-plugin-polyfill-regenerator@0.6.8(@babel/core@7.29.0):
+  babel-plugin-polyfill-regenerator@0.6.8(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1):
     dependencies:
-      '@babel/core': 7.29.0
-      '@babel/helper-define-polyfill-provider': 0.6.8(@babel/core@7.29.0)
+      '@babel/core': 7.29.0(supports-color@8.1.1)
+      '@babel/helper-define-polyfill-provider': 0.6.8(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
@@ -13408,102 +13621,102 @@ snapshots:
     dependencies:
       hermes-parser: 0.29.1
 
-  babel-plugin-transform-flow-enums@0.0.2(@babel/core@7.29.0):
+  babel-plugin-transform-flow-enums@0.0.2(@babel/core@7.29.0(supports-color@8.1.1)):
     dependencies:
-      '@babel/plugin-syntax-flow': 7.28.6(@babel/core@7.29.0)
+      '@babel/plugin-syntax-flow': 7.28.6(@babel/core@7.29.0(supports-color@8.1.1))
     transitivePeerDependencies:
       - '@babel/core'
 
   babel-plugin-transform-remove-console@6.9.4: {}
 
-  babel-preset-current-node-syntax@1.2.0(@babel/core@7.29.0):
+  babel-preset-current-node-syntax@1.2.0(@babel/core@7.29.0(supports-color@8.1.1)):
     dependencies:
-      '@babel/core': 7.29.0
-      '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.29.0)
-      '@babel/plugin-syntax-bigint': 7.8.3(@babel/core@7.29.0)
-      '@babel/plugin-syntax-class-properties': 7.12.13(@babel/core@7.29.0)
-      '@babel/plugin-syntax-class-static-block': 7.14.5(@babel/core@7.29.0)
-      '@babel/plugin-syntax-import-attributes': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-syntax-import-meta': 7.10.4(@babel/core@7.29.0)
-      '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.29.0)
-      '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.29.0)
-      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.29.0)
-      '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.29.0)
-      '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.29.0)
-      '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.29.0)
-      '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.29.0)
-      '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@7.29.0)
-      '@babel/plugin-syntax-top-level-await': 7.14.5(@babel/core@7.29.0)
+      '@babel/core': 7.29.0(supports-color@8.1.1)
+      '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.29.0(supports-color@8.1.1))
+      '@babel/plugin-syntax-bigint': 7.8.3(@babel/core@7.29.0(supports-color@8.1.1))
+      '@babel/plugin-syntax-class-properties': 7.12.13(@babel/core@7.29.0(supports-color@8.1.1))
+      '@babel/plugin-syntax-class-static-block': 7.14.5(@babel/core@7.29.0(supports-color@8.1.1))
+      '@babel/plugin-syntax-import-attributes': 7.28.6(@babel/core@7.29.0(supports-color@8.1.1))
+      '@babel/plugin-syntax-import-meta': 7.10.4(@babel/core@7.29.0(supports-color@8.1.1))
+      '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.29.0(supports-color@8.1.1))
+      '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.29.0(supports-color@8.1.1))
+      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.29.0(supports-color@8.1.1))
+      '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.29.0(supports-color@8.1.1))
+      '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.29.0(supports-color@8.1.1))
+      '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.29.0(supports-color@8.1.1))
+      '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.29.0(supports-color@8.1.1))
+      '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@7.29.0(supports-color@8.1.1))
+      '@babel/plugin-syntax-top-level-await': 7.14.5(@babel/core@7.29.0(supports-color@8.1.1))
 
-  babel-preset-expo@54.0.10(@babel/core@7.29.0)(@babel/runtime@7.29.2)(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-refresh@0.14.2):
+  babel-preset-expo@54.0.10(@babel/core@7.29.0(supports-color@8.1.1))(@babel/runtime@7.29.2)(expo@54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1))(react-refresh@0.14.2)(supports-color@8.1.1):
     dependencies:
-      '@babel/helper-module-imports': 7.28.6
-      '@babel/plugin-proposal-decorators': 7.29.0(@babel/core@7.29.0)
-      '@babel/plugin-proposal-export-default-from': 7.27.1(@babel/core@7.29.0)
-      '@babel/plugin-syntax-export-default-from': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-class-static-block': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-export-namespace-from': 7.27.1(@babel/core@7.29.0)
-      '@babel/plugin-transform-flow-strip-types': 7.27.1(@babel/core@7.29.0)
-      '@babel/plugin-transform-modules-commonjs': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-object-rest-spread': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-parameters': 7.27.7(@babel/core@7.29.0)
-      '@babel/plugin-transform-private-methods': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-private-property-in-object': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-runtime': 7.29.0(@babel/core@7.29.0)
-      '@babel/preset-react': 7.28.5(@babel/core@7.29.0)
-      '@babel/preset-typescript': 7.28.5(@babel/core@7.29.0)
-      '@react-native/babel-preset': 0.81.5(@babel/core@7.29.0)
+      '@babel/helper-module-imports': 7.28.6(supports-color@8.1.1)
+      '@babel/plugin-proposal-decorators': 7.29.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
+      '@babel/plugin-proposal-export-default-from': 7.27.1(@babel/core@7.29.0(supports-color@8.1.1))
+      '@babel/plugin-syntax-export-default-from': 7.28.6(@babel/core@7.29.0(supports-color@8.1.1))
+      '@babel/plugin-transform-class-static-block': 7.28.6(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
+      '@babel/plugin-transform-export-namespace-from': 7.27.1(@babel/core@7.29.0(supports-color@8.1.1))
+      '@babel/plugin-transform-flow-strip-types': 7.27.1(@babel/core@7.29.0(supports-color@8.1.1))
+      '@babel/plugin-transform-modules-commonjs': 7.28.6(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
+      '@babel/plugin-transform-object-rest-spread': 7.28.6(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
+      '@babel/plugin-transform-parameters': 7.27.7(@babel/core@7.29.0(supports-color@8.1.1))
+      '@babel/plugin-transform-private-methods': 7.28.6(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
+      '@babel/plugin-transform-private-property-in-object': 7.28.6(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
+      '@babel/plugin-transform-runtime': 7.29.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
+      '@babel/preset-react': 7.28.5(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
+      '@babel/preset-typescript': 7.28.5(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
+      '@react-native/babel-preset': 0.81.5(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
       babel-plugin-react-compiler: 1.0.0
       babel-plugin-react-native-web: 0.21.2
       babel-plugin-syntax-hermes-parser: 0.29.1
-      babel-plugin-transform-flow-enums: 0.0.2(@babel/core@7.29.0)
-      debug: 4.4.3
+      babel-plugin-transform-flow-enums: 0.0.2(@babel/core@7.29.0(supports-color@8.1.1))
+      debug: 4.4.3(supports-color@8.1.1)
       react-refresh: 0.14.2
       resolve-from: 5.0.0
     optionalDependencies:
       '@babel/runtime': 7.29.2
-      expo: 54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+      expo: 54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1)
     transitivePeerDependencies:
       - '@babel/core'
       - supports-color
 
-  babel-preset-expo@54.0.12(@babel/core@7.29.0)(@babel/runtime@7.29.2)(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-refresh@0.14.2):
+  babel-preset-expo@54.0.12(@babel/core@7.29.0(supports-color@8.1.1))(@babel/runtime@7.29.2)(expo@54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1))(react-refresh@0.14.2)(supports-color@8.1.1):
     dependencies:
-      '@babel/helper-module-imports': 7.28.6
-      '@babel/plugin-proposal-decorators': 7.29.0(@babel/core@7.29.0)
-      '@babel/plugin-proposal-export-default-from': 7.27.1(@babel/core@7.29.0)
-      '@babel/plugin-syntax-export-default-from': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-class-static-block': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-export-namespace-from': 7.27.1(@babel/core@7.29.0)
-      '@babel/plugin-transform-flow-strip-types': 7.27.1(@babel/core@7.29.0)
-      '@babel/plugin-transform-modules-commonjs': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-object-rest-spread': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-parameters': 7.27.7(@babel/core@7.29.0)
-      '@babel/plugin-transform-private-methods': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-private-property-in-object': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-runtime': 7.29.0(@babel/core@7.29.0)
-      '@babel/preset-react': 7.28.5(@babel/core@7.29.0)
-      '@babel/preset-typescript': 7.28.5(@babel/core@7.29.0)
-      '@react-native/babel-preset': 0.81.5(@babel/core@7.29.0)
+      '@babel/helper-module-imports': 7.28.6(supports-color@8.1.1)
+      '@babel/plugin-proposal-decorators': 7.29.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
+      '@babel/plugin-proposal-export-default-from': 7.27.1(@babel/core@7.29.0(supports-color@8.1.1))
+      '@babel/plugin-syntax-export-default-from': 7.28.6(@babel/core@7.29.0(supports-color@8.1.1))
+      '@babel/plugin-transform-class-static-block': 7.28.6(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
+      '@babel/plugin-transform-export-namespace-from': 7.27.1(@babel/core@7.29.0(supports-color@8.1.1))
+      '@babel/plugin-transform-flow-strip-types': 7.27.1(@babel/core@7.29.0(supports-color@8.1.1))
+      '@babel/plugin-transform-modules-commonjs': 7.28.6(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
+      '@babel/plugin-transform-object-rest-spread': 7.28.6(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
+      '@babel/plugin-transform-parameters': 7.27.7(@babel/core@7.29.0(supports-color@8.1.1))
+      '@babel/plugin-transform-private-methods': 7.28.6(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
+      '@babel/plugin-transform-private-property-in-object': 7.28.6(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
+      '@babel/plugin-transform-runtime': 7.29.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
+      '@babel/preset-react': 7.28.5(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
+      '@babel/preset-typescript': 7.28.5(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
+      '@react-native/babel-preset': 0.81.5(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
       babel-plugin-react-compiler: 1.0.0
       babel-plugin-react-native-web: 0.21.2
       babel-plugin-syntax-hermes-parser: 0.29.1
-      babel-plugin-transform-flow-enums: 0.0.2(@babel/core@7.29.0)
-      debug: 4.4.3
+      babel-plugin-transform-flow-enums: 0.0.2(@babel/core@7.29.0(supports-color@8.1.1))
+      debug: 4.4.3(supports-color@8.1.1)
       react-refresh: 0.14.2
       resolve-from: 5.0.0
     optionalDependencies:
       '@babel/runtime': 7.29.2
-      expo: 54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+      expo: 54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1)
     transitivePeerDependencies:
       - '@babel/core'
       - supports-color
 
-  babel-preset-jest@29.6.3(@babel/core@7.29.0):
+  babel-preset-jest@29.6.3(@babel/core@7.29.0(supports-color@8.1.1)):
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
       babel-plugin-jest-hoist: 29.6.3
-      babel-preset-current-node-syntax: 1.2.0(@babel/core@7.29.0)
+      babel-preset-current-node-syntax: 1.2.0(@babel/core@7.29.0(supports-color@8.1.1))
 
   badgin@1.2.3: {}
 
@@ -13543,11 +13756,11 @@ snapshots:
       inherits: 2.0.4
       readable-stream: 3.6.2
 
-  body-parser@1.20.5:
+  body-parser@1.20.5(supports-color@8.1.1):
     dependencies:
       bytes: 3.1.2
       content-type: 1.0.5
-      debug: 2.6.9
+      debug: 2.6.9(supports-color@8.1.1)
       depd: 2.0.0
       destroy: 1.2.0
       http-errors: 2.0.1
@@ -13704,23 +13917,23 @@ snapshots:
 
   chownr@3.0.0: {}
 
-  chrome-launcher@0.15.2:
+  chrome-launcher@0.15.2(supports-color@8.1.1):
     dependencies:
       '@types/node': 24.12.4
       escape-string-regexp: 4.0.0
       is-wsl: 2.2.0
-      lighthouse-logger: 1.4.2
+      lighthouse-logger: 1.4.2(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
   chrome-trace-event@1.0.4: {}
 
-  chromium-edge-launcher@0.2.0:
+  chromium-edge-launcher@0.2.0(supports-color@8.1.1):
     dependencies:
       '@types/node': 24.12.4
       escape-string-regexp: 4.0.0
       is-wsl: 2.2.0
-      lighthouse-logger: 1.4.2
+      lighthouse-logger: 1.4.2(supports-color@8.1.1)
       mkdirp: 1.0.4
       rimraf: 3.0.2
     transitivePeerDependencies:
@@ -13738,10 +13951,10 @@ snapshots:
     dependencies:
       source-map: 0.6.1
 
-  clean-webpack-plugin@4.0.0(webpack@5.106.2(postcss@8.5.14)):
+  clean-webpack-plugin@4.0.0(webpack@5.106.2(clean-css@5.3.3)(cssnano@5.1.15(postcss@8.5.14))(csso@5.0.5)(esbuild@0.25.12)(html-minifier-terser@6.1.0)(lightningcss@1.32.0)(postcss@8.5.14)):
     dependencies:
       del: 4.1.1
-      webpack: 5.106.2(postcss@8.5.14)
+      webpack: 5.106.2(clean-css@5.3.3)(cssnano@5.1.15(postcss@8.5.14))(csso@5.0.5)(esbuild@0.25.12)(html-minifier-terser@6.1.0)(lightningcss@1.32.0)(postcss@8.5.14)
 
   cli-cursor@2.1.0:
     dependencies:
@@ -13840,11 +14053,11 @@ snapshots:
     dependencies:
       mime-db: 1.54.0
 
-  compression@1.8.1:
+  compression@1.8.1(supports-color@8.1.1):
     dependencies:
       bytes: 3.1.2
       compressible: 2.0.18
-      debug: 2.6.9
+      debug: 2.6.9(supports-color@8.1.1)
       negotiator: 0.6.4
       on-headers: 1.1.0
       safe-buffer: 5.2.1
@@ -13856,10 +14069,10 @@ snapshots:
 
   connect-history-api-fallback@2.0.0: {}
 
-  connect@3.7.0:
+  connect@3.7.0(supports-color@8.1.1):
     dependencies:
-      debug: 2.6.9
-      finalhandler: 1.1.2
+      debug: 2.6.9(supports-color@8.1.1)
+      finalhandler: 1.1.2(supports-color@8.1.1)
       parseurl: 1.3.3
       utils-merge: 1.0.1
     transitivePeerDependencies:
@@ -13877,7 +14090,7 @@ snapshots:
 
   cookie@0.7.2: {}
 
-  copy-webpack-plugin@10.2.4(webpack@5.106.2(postcss@8.5.14)):
+  copy-webpack-plugin@10.2.4(webpack@5.106.2(clean-css@5.3.3)(cssnano@5.1.15(postcss@8.5.14))(csso@5.0.5)(esbuild@0.25.12)(html-minifier-terser@6.1.0)(lightningcss@1.32.0)(postcss@8.5.14)):
     dependencies:
       fast-glob: 3.3.3
       glob-parent: 6.0.2
@@ -13885,7 +14098,7 @@ snapshots:
       normalize-path: 3.0.0
       schema-utils: 4.3.3
       serialize-javascript: 6.0.2
-      webpack: 5.106.2(postcss@8.5.14)
+      webpack: 5.106.2(clean-css@5.3.3)(cssnano@5.1.15(postcss@8.5.14))(csso@5.0.5)(esbuild@0.25.12)(html-minifier-terser@6.1.0)(lightningcss@1.32.0)(postcss@8.5.14)
 
   core-js-compat@3.49.0:
     dependencies:
@@ -13904,13 +14117,13 @@ snapshots:
     optionalDependencies:
       typescript: '@typescript/typescript6@6.0.2'
 
-  create-jest@29.7.0(@types/node@24.12.4):
+  create-jest@29.7.0(@types/node@24.12.4)(supports-color@8.1.1):
     dependencies:
       '@jest/types': 29.6.3
       chalk: 4.1.2
       exit: 0.1.2
       graceful-fs: 4.2.11
-      jest-config: 29.7.0(@types/node@24.12.4)
+      jest-config: 29.7.0(@types/node@24.12.4)(supports-color@8.1.1)
       jest-util: 29.7.0
       prompts: 2.4.2
     transitivePeerDependencies:
@@ -13945,7 +14158,7 @@ snapshots:
     dependencies:
       utrie: 1.0.2
 
-  css-loader@6.11.0(webpack@5.106.2(postcss@8.5.14)):
+  css-loader@6.11.0(webpack@5.106.2(clean-css@5.3.3)(cssnano@5.1.15(postcss@8.5.14))(csso@5.0.5)(esbuild@0.25.12)(html-minifier-terser@6.1.0)(lightningcss@1.32.0)(postcss@8.5.14)):
     dependencies:
       icss-utils: 5.1.0(postcss@8.5.14)
       postcss: 8.5.14
@@ -13956,11 +14169,11 @@ snapshots:
       postcss-value-parser: 4.2.0
       semver: 7.8.0
     optionalDependencies:
-      webpack: 5.106.2(postcss@8.5.14)
+      webpack: 5.106.2(clean-css@5.3.3)(cssnano@5.1.15(postcss@8.5.14))(csso@5.0.5)(esbuild@0.25.12)(html-minifier-terser@6.1.0)(lightningcss@1.32.0)(postcss@8.5.14)
 
   css-mediaquery@0.1.2: {}
 
-  css-minimizer-webpack-plugin@3.4.1(clean-css@5.3.3)(csso@5.0.5)(esbuild@0.25.12)(webpack@5.106.2(postcss@8.5.14)):
+  css-minimizer-webpack-plugin@3.4.1(clean-css@5.3.3)(csso@5.0.5)(esbuild@0.25.12)(webpack@5.106.2(clean-css@5.3.3)(cssnano@5.1.15(postcss@8.5.14))(csso@5.0.5)(esbuild@0.25.12)(html-minifier-terser@6.1.0)(lightningcss@1.32.0)(postcss@8.5.14)):
     dependencies:
       cssnano: 5.1.15(postcss@8.5.14)
       jest-worker: 27.5.1
@@ -13968,7 +14181,7 @@ snapshots:
       schema-utils: 4.3.3
       serialize-javascript: 6.0.2
       source-map: 0.6.1
-      webpack: 5.106.2(postcss@8.5.14)
+      webpack: 5.106.2(clean-css@5.3.3)(cssnano@5.1.15(postcss@8.5.14))(csso@5.0.5)(esbuild@0.25.12)(html-minifier-terser@6.1.0)(lightningcss@1.32.0)(postcss@8.5.14)
     optionalDependencies:
       clean-css: 5.3.3
       csso: 5.0.5
@@ -14101,17 +14314,23 @@ snapshots:
 
   debounce@1.2.1: {}
 
-  debug@2.6.9:
+  debug@2.6.9(supports-color@8.1.1):
     dependencies:
       ms: 2.0.0
+    optionalDependencies:
+      supports-color: 8.1.1
 
-  debug@3.2.7:
+  debug@3.2.7(supports-color@8.1.1):
     dependencies:
       ms: 2.1.3
+    optionalDependencies:
+      supports-color: 8.1.1
 
-  debug@4.4.3:
+  debug@4.4.3(supports-color@8.1.1):
     dependencies:
       ms: 2.1.3
+    optionalDependencies:
+      supports-color: 8.1.1
 
   decamelize@1.2.0: {}
 
@@ -14123,6 +14342,8 @@ snapshots:
 
   deep-extend@0.6.0: {}
 
+  deep-is@0.1.4: {}
+
   deepmerge@4.3.1: {}
 
   default-gateway@6.0.3:
@@ -14187,6 +14408,10 @@ snapshots:
     dependencies:
       '@leichtgewicht/ip-codec': 2.0.5
 
+  doctrine@3.0.0:
+    dependencies:
+      esutils: 2.0.3
+
   dom-converter@0.2.0:
     dependencies:
       utila: 0.4.0
@@ -14430,46 +14655,106 @@ snapshots:
     optionalDependencies:
       source-map: 0.6.1
 
-  eslint-plugin-react-compiler@19.1.0-rc.2(eslint@eslint):
+  eslint-plugin-react-compiler@19.1.0-rc.2(eslint@8.57.1(supports-color@8.1.1))(supports-color@8.1.1):
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
       '@babel/parser': 7.29.3
-      '@babel/plugin-proposal-private-methods': 7.18.6(@babel/core@7.29.0)
-      eslint: link:eslint
+      '@babel/plugin-proposal-private-methods': 7.18.6(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
+      eslint: 8.57.1(supports-color@8.1.1)
       hermes-parser: 0.25.1
       zod: 3.25.76
       zod-validation-error: 3.5.4(zod@3.25.76)
     transitivePeerDependencies:
       - supports-color
 
-  eslint-plugin-react-native-a11y@3.5.1(eslint@eslint):
+  eslint-plugin-react-native-a11y@3.5.1(eslint@8.57.1(supports-color@8.1.1)):
     dependencies:
       '@babel/runtime': 7.29.2
       ast-types-flow: 0.0.7
-      eslint: link:eslint
+      eslint: 8.57.1(supports-color@8.1.1)
       jsx-ast-utils: 3.3.5
 
   eslint-plugin-react-native-globals@0.1.2: {}
 
-  eslint-plugin-react-native@5.0.0(eslint@eslint):
+  eslint-plugin-react-native@5.0.0(eslint@8.57.1(supports-color@8.1.1)):
     dependencies:
-      eslint: link:eslint
+      eslint: 8.57.1(supports-color@8.1.1)
       eslint-plugin-react-native-globals: 0.1.2
 
-  eslint-plugin-simple-import-sort@13.0.0(eslint@eslint):
+  eslint-plugin-simple-import-sort@13.0.0(eslint@8.57.1(supports-color@8.1.1)):
     dependencies:
-      eslint: link:eslint
+      eslint: 8.57.1(supports-color@8.1.1)
 
   eslint-scope@5.1.1:
     dependencies:
       esrecurse: 4.3.0
       estraverse: 4.3.0
 
+  eslint-scope@7.2.2:
+    dependencies:
+      esrecurse: 4.3.0
+      estraverse: 5.3.0
+
+  eslint-visitor-keys@3.4.3: {}
+
+  eslint@8.57.1(supports-color@8.1.1):
+    dependencies:
+      '@eslint-community/eslint-utils': 4.10.1(eslint@8.57.1(supports-color@8.1.1))
+      '@eslint-community/regexpp': 4.12.2
+      '@eslint/eslintrc': 2.1.4(supports-color@8.1.1)
+      '@eslint/js': 8.57.1
+      '@humanwhocodes/config-array': 0.13.0(supports-color@8.1.1)
+      '@humanwhocodes/module-importer': 1.0.1
+      '@nodelib/fs.walk': 1.2.8
+      '@ungap/structured-clone': 1.3.1
+      ajv: 6.15.0
+      chalk: 4.1.2
+      cross-spawn: 7.0.6
+      debug: 4.4.3(supports-color@8.1.1)
+      doctrine: 3.0.0
+      escape-string-regexp: 4.0.0
+      eslint-scope: 7.2.2
+      eslint-visitor-keys: 3.4.3
+      espree: 9.6.1
+      esquery: 1.7.0
+      esutils: 2.0.3
+      fast-deep-equal: 3.1.3
+      file-entry-cache: 6.0.1
+      find-up: 5.0.0
+      glob-parent: 6.0.2
+      globals: 13.24.0
+      graphemer: 1.4.0
+      ignore: 5.3.2
+      imurmurhash: 0.1.4
+      is-glob: 4.0.3
+      is-path-inside: 3.0.3
+      js-yaml: 4.1.1
+      json-stable-stringify-without-jsonify: 1.0.1
+      levn: 0.4.1
+      lodash.merge: 4.6.2
+      minimatch: 3.1.5
+      natural-compare: 1.4.0
+      optionator: 0.9.4
+      strip-ansi: 6.0.1
+      text-table: 0.2.0
+    transitivePeerDependencies:
+      - supports-color
+
   esm@3.2.25:
     optional: true
 
+  espree@9.6.1:
+    dependencies:
+      acorn: 8.16.0
+      acorn-jsx: 5.3.2(acorn@8.16.0)
+      eslint-visitor-keys: 3.4.3
+
   esprima@4.0.1: {}
 
+  esquery@1.7.0:
+    dependencies:
+      estraverse: 5.3.0
+
   esrecurse@4.3.0:
     dependencies:
       estraverse: 5.3.0
@@ -14521,208 +14806,208 @@ snapshots:
       jest-mock: 30.4.1
       jest-util: 30.4.1
 
-  expo-age-range@0.2.18(patch_hash=c325225749993424461eeece1d97a99b19c00da2ebc958a73c12e4eca0c39306)(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0)):
+  expo-age-range@0.2.18(patch_hash=c325225749993424461eeece1d97a99b19c00da2ebc958a73c12e4eca0c39306)(83f21d12a6c1aa99b4a65d070875cc68):
     dependencies:
-      expo: 54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
-      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0)
+      expo: 54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1)
+      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1)
 
-  expo-application@7.0.8(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)):
+  expo-application@7.0.8(expo@54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1)):
     dependencies:
-      expo: 54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+      expo: 54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1)
 
-  expo-asset@12.0.13(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0):
+  expo-asset@12.0.13(93a6abd34ab5ae64aff6a80525489f34):
     dependencies:
       '@expo/image-utils': 0.8.12
-      expo: 54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
-      expo-constants: 18.0.13(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))
+      expo: 54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1)
+      expo-constants: 18.0.13(c1408f750868568d2dc75671b50084a7)
       react: 19.1.0
-      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0)
+      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
-  expo-blur@15.0.8(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0):
+  expo-blur@15.0.8(83e0f64f4281e4798012214ad5b2d72d):
     dependencies:
-      expo: 54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+      expo: 54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1)
       react: 19.1.0
-      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0)
+      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1)
 
-  expo-build-properties@1.0.10(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)):
+  expo-build-properties@1.0.10(expo@54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1)):
     dependencies:
       ajv: 8.20.0
-      expo: 54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+      expo: 54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1)
       semver: 7.8.0
 
-  expo-camera@17.0.10(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native-web@0.21.2(react-dom@19.1.0(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0):
+  expo-camera@17.0.10(8d9f18414d5ddcf91a3e8d2e3aa26778):
     dependencies:
-      expo: 54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+      expo: 54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1)
       invariant: 2.2.4
       react: 19.1.0
-      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0)
+      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1)
     optionalDependencies:
       react-native-web: 0.21.2(react-dom@19.1.0(react@19.1.0))(react@19.1.0)
 
-  expo-clipboard@8.0.8(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0):
+  expo-clipboard@8.0.8(83e0f64f4281e4798012214ad5b2d72d):
     dependencies:
-      expo: 54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+      expo: 54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1)
       react: 19.1.0
-      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0)
+      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1)
 
-  expo-constants@18.0.13(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0)):
+  expo-constants@18.0.13(c1408f750868568d2dc75671b50084a7):
     dependencies:
-      '@expo/config': 12.0.13
-      '@expo/env': 2.0.11
-      expo: 54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
-      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0)
+      '@expo/config': 12.0.13(supports-color@8.1.1)
+      '@expo/env': 2.0.11(supports-color@8.1.1)
+      expo: 54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1)
+      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
-  expo-contacts@15.0.11(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0):
+  expo-contacts@15.0.11(83e0f64f4281e4798012214ad5b2d72d):
     dependencies:
-      expo: 54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+      expo: 54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1)
       react: 19.1.0
-      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0)
+      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1)
 
-  expo-dev-client@6.0.21(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)):
+  expo-dev-client@6.0.21(expo@54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1))(supports-color@8.1.1):
     dependencies:
-      expo: 54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
-      expo-dev-launcher: 6.0.21(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))
-      expo-dev-menu: 7.0.19(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))
-      expo-dev-menu-interface: 2.0.0(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))
-      expo-manifests: 1.0.11(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))
-      expo-updates-interface: 2.0.0(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))
+      expo: 54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1)
+      expo-dev-launcher: 6.0.21(expo@54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1))(supports-color@8.1.1)
+      expo-dev-menu: 7.0.19(expo@54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1))
+      expo-dev-menu-interface: 2.0.0(expo@54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1))
+      expo-manifests: 1.0.11(expo@54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1))(supports-color@8.1.1)
+      expo-updates-interface: 2.0.0(expo@54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1))
     transitivePeerDependencies:
       - supports-color
 
-  expo-dev-launcher@6.0.21(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)):
+  expo-dev-launcher@6.0.21(expo@54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1))(supports-color@8.1.1):
     dependencies:
       ajv: 8.20.0
-      expo: 54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
-      expo-dev-menu: 7.0.19(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))
-      expo-manifests: 1.0.11(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))
+      expo: 54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1)
+      expo-dev-menu: 7.0.19(expo@54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1))
+      expo-manifests: 1.0.11(expo@54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1))(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
-  expo-dev-menu-interface@2.0.0(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)):
+  expo-dev-menu-interface@2.0.0(expo@54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1)):
     dependencies:
-      expo: 54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+      expo: 54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1)
 
-  expo-dev-menu@7.0.19(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)):
+  expo-dev-menu@7.0.19(expo@54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1)):
     dependencies:
-      expo: 54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
-      expo-dev-menu-interface: 2.0.0(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))
+      expo: 54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1)
+      expo-dev-menu-interface: 2.0.0(expo@54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1))
 
-  expo-device@8.0.10(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)):
+  expo-device@8.0.10(expo@54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1)):
     dependencies:
-      expo: 54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+      expo: 54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1)
       ua-parser-js: 0.7.41
 
   expo-eas-client@1.0.8: {}
 
-  expo-file-system@19.0.22(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0)):
+  expo-file-system@19.0.22(83f21d12a6c1aa99b4a65d070875cc68):
     dependencies:
-      expo: 54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
-      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0)
+      expo: 54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1)
+      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1)
 
-  expo-file-system@19.0.23(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0)):
+  expo-file-system@19.0.23(83f21d12a6c1aa99b4a65d070875cc68):
     dependencies:
-      expo: 54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
-      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0)
+      expo: 54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1)
+      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1)
 
-  expo-font@14.0.11(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0):
+  expo-font@14.0.11(83e0f64f4281e4798012214ad5b2d72d):
     dependencies:
-      expo: 54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+      expo: 54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1)
       fontfaceobserver: 2.3.0
       react: 19.1.0
-      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0)
+      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1)
 
-  expo-font@14.0.12(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0):
+  expo-font@14.0.12(83e0f64f4281e4798012214ad5b2d72d):
     dependencies:
-      expo: 54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+      expo: 54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1)
       fontfaceobserver: 2.3.0
       react: 19.1.0
-      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0)
+      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1)
 
-  expo-glass-effect@0.1.10(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0):
+  expo-glass-effect@0.1.10(83e0f64f4281e4798012214ad5b2d72d):
     dependencies:
-      expo: 54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+      expo: 54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1)
       react: 19.1.0
-      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0)
+      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1)
 
-  expo-haptics@15.0.8(patch_hash=b33910ba2753c4eccdc885b449e6e33aa90b9cefa75ca8639762a26013141410)(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)):
+  expo-haptics@15.0.8(patch_hash=b33910ba2753c4eccdc885b449e6e33aa90b9cefa75ca8639762a26013141410)(expo@54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1)):
     dependencies:
-      expo: 54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+      expo: 54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1)
 
-  expo-image-loader@6.0.0(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)):
+  expo-image-loader@6.0.0(expo@54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1)):
     dependencies:
-      expo: 54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+      expo: 54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1)
 
-  expo-image-manipulator@14.0.8(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)):
+  expo-image-manipulator@14.0.8(expo@54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1)):
     dependencies:
-      expo: 54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
-      expo-image-loader: 6.0.0(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))
+      expo: 54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1)
+      expo-image-loader: 6.0.0(expo@54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1))
 
-  expo-image-picker@17.0.11(patch_hash=47b28f6ddb8bcaa6483f8714c82daaa0001122f2b0dac6c05d19e98a61a6ceab)(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)):
+  expo-image-picker@17.0.11(patch_hash=47b28f6ddb8bcaa6483f8714c82daaa0001122f2b0dac6c05d19e98a61a6ceab)(expo@54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1)):
     dependencies:
-      expo: 54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
-      expo-image-loader: 6.0.0(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))
+      expo: 54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1)
+      expo-image-loader: 6.0.0(expo@54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1))
 
-  expo-image@3.0.11(patch_hash=6d46ffac33426c5285777da5bf5f88c68c8ce27290595dfa65f38c478930c2c4)(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native-web@0.21.2(react-dom@19.1.0(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0):
+  expo-image@3.0.11(patch_hash=6d46ffac33426c5285777da5bf5f88c68c8ce27290595dfa65f38c478930c2c4)(8d9f18414d5ddcf91a3e8d2e3aa26778):
     dependencies:
-      expo: 54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+      expo: 54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1)
       react: 19.1.0
-      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0)
+      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1)
     optionalDependencies:
       react-native-web: 0.21.2(react-dom@19.1.0(react@19.1.0))(react@19.1.0)
 
-  expo-intent-launcher@13.0.8(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)):
+  expo-intent-launcher@13.0.8(expo@54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1)):
     dependencies:
-      expo: 54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+      expo: 54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1)
 
   expo-json-utils@0.15.0: {}
 
-  expo-keep-awake@15.0.8(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react@19.1.0):
+  expo-keep-awake@15.0.8(expo@54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1))(react@19.1.0):
     dependencies:
-      expo: 54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+      expo: 54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1)
       react: 19.1.0
 
-  expo-linear-gradient@15.0.8(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0):
+  expo-linear-gradient@15.0.8(83e0f64f4281e4798012214ad5b2d72d):
     dependencies:
-      expo: 54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+      expo: 54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1)
       react: 19.1.0
-      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0)
+      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1)
 
-  expo-linking@8.0.12(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0):
+  expo-linking@8.0.12(93a6abd34ab5ae64aff6a80525489f34):
     dependencies:
-      expo-constants: 18.0.13(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))
+      expo-constants: 18.0.13(c1408f750868568d2dc75671b50084a7)
       invariant: 2.2.4
       react: 19.1.0
-      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0)
+      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1)
     transitivePeerDependencies:
       - expo
       - supports-color
 
-  expo-localization@17.0.8(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react@19.1.0):
+  expo-localization@17.0.8(expo@54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1))(react@19.1.0):
     dependencies:
-      expo: 54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+      expo: 54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1)
       react: 19.1.0
       rtl-detect: 1.1.2
 
-  expo-location@19.0.8(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)):
+  expo-location@19.0.8(expo@54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1)):
     dependencies:
-      expo: 54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+      expo: 54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1)
 
-  expo-manifests@1.0.11(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)):
+  expo-manifests@1.0.11(expo@54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1))(supports-color@8.1.1):
     dependencies:
-      '@expo/config': 12.0.13
-      expo: 54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+      '@expo/config': 12.0.13(supports-color@8.1.1)
+      expo: 54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1)
       expo-json-utils: 0.15.0
     transitivePeerDependencies:
       - supports-color
 
-  expo-media-library@18.2.1(patch_hash=2b84c17999bb0c977eaef7fa8ac297f7074d91c94fb63726b42d2a277b26b39a)(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0)):
+  expo-media-library@18.2.1(patch_hash=2b84c17999bb0c977eaef7fa8ac297f7074d91c94fb63726b42d2a277b26b39a)(83f21d12a6c1aa99b4a65d070875cc68):
     dependencies:
-      expo: 54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
-      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0)
+      expo: 54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1)
+      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1)
 
   expo-modules-autolinking@3.0.26:
     dependencies:
@@ -14732,150 +15017,150 @@ snapshots:
       require-from-string: 2.0.2
       resolve-from: 5.0.0
 
-  expo-modules-core@3.0.30(patch_hash=952fb1c8cb6dc8a0d8ef4e1114942a341d89b025e011f1acfff788929997346e)(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0):
+  expo-modules-core@3.0.30(patch_hash=952fb1c8cb6dc8a0d8ef4e1114942a341d89b025e011f1acfff788929997346e)(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0):
     dependencies:
       invariant: 2.2.4
       react: 19.1.0
-      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0)
+      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1)
 
-  expo-notifications@0.32.17(patch_hash=a45a8dcf3d8c4b5df4ee0e62bc79b755fcf9d28ca51a6f685b85830bf4afc2e5)(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0):
+  expo-notifications@0.32.17(patch_hash=a45a8dcf3d8c4b5df4ee0e62bc79b755fcf9d28ca51a6f685b85830bf4afc2e5)(93a6abd34ab5ae64aff6a80525489f34):
     dependencies:
       '@expo/image-utils': 0.8.12
       '@ide/backoff': 1.0.0
       abort-controller: 3.0.0
       assert: 2.1.0
       badgin: 1.2.3
-      expo: 54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
-      expo-application: 7.0.8(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))
-      expo-constants: 18.0.13(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))
+      expo: 54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1)
+      expo-application: 7.0.8(expo@54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1))
+      expo-constants: 18.0.13(c1408f750868568d2dc75671b50084a7)
       react: 19.1.0
-      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0)
+      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
-  expo-paste-input@0.2.1(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0):
+  expo-paste-input@0.2.1(83e0f64f4281e4798012214ad5b2d72d):
     dependencies:
-      expo: 54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+      expo: 54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1)
       react: 19.1.0
-      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0)
+      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1)
 
-  expo-privacy-sensitive@0.2.0(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0):
+  expo-privacy-sensitive@0.2.0(83e0f64f4281e4798012214ad5b2d72d):
     dependencies:
-      expo: 54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+      expo: 54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1)
       react: 19.1.0
-      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0)
+      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1)
 
-  expo-pwa@0.0.127(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)):
+  expo-pwa@0.0.127(expo@54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1)):
     dependencies:
       '@expo/image-utils': 0.8.12
       chalk: 4.1.2
       commander: 2.20.0
-      expo: 54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+      expo: 54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1)
       update-check: 1.5.3
 
-  expo-screen-orientation@9.0.9(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0)):
+  expo-screen-orientation@9.0.9(83f21d12a6c1aa99b4a65d070875cc68):
     dependencies:
-      expo: 54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
-      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0)
+      expo: 54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1)
+      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1)
 
   expo-server@1.0.7: {}
 
-  expo-sharing@14.0.8(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)):
+  expo-sharing@14.0.8(expo@54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1)):
     dependencies:
-      expo: 54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+      expo: 54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1)
 
-  expo-sms@14.0.8(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)):
+  expo-sms@14.0.8(expo@54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1)):
     dependencies:
-      expo: 54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+      expo: 54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1)
 
-  expo-splash-screen@31.0.13(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)):
+  expo-splash-screen@31.0.13(expo@54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1))(supports-color@8.1.1):
     dependencies:
-      '@expo/prebuild-config': 54.0.8(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))
-      expo: 54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+      '@expo/prebuild-config': 54.0.8(expo@54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1))(supports-color@8.1.1)
+      expo: 54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
   expo-structured-headers@5.0.0: {}
 
-  expo-system-ui@6.0.9(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native-web@0.21.2(react-dom@19.1.0(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0)):
+  expo-system-ui@6.0.9(41b38c851305f17c9d2f63b3bbab71a9):
     dependencies:
       '@react-native/normalize-colors': 0.81.5
-      debug: 4.4.3
-      expo: 54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
-      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0)
+      debug: 4.4.3(supports-color@8.1.1)
+      expo: 54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1)
+      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1)
     optionalDependencies:
       react-native-web: 0.21.2(react-dom@19.1.0(react@19.1.0))(react@19.1.0)
     transitivePeerDependencies:
       - supports-color
 
-  expo-updates-interface@2.0.0(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)):
+  expo-updates-interface@2.0.0(expo@54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1)):
     dependencies:
-      expo: 54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+      expo: 54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1)
 
-  expo-updates@29.0.17(patch_hash=04f28cb005b770e9ae8f0065eab96e43cbb1e58107f5f6ad1bdd18f6deb66487)(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0):
+  expo-updates@29.0.17(patch_hash=04f28cb005b770e9ae8f0065eab96e43cbb1e58107f5f6ad1bdd18f6deb66487)(93a6abd34ab5ae64aff6a80525489f34):
     dependencies:
       '@expo/code-signing-certificates': 0.0.6
       '@expo/plist': 0.4.8
       '@expo/spawn-async': 1.7.2
       arg: 4.1.0
       chalk: 4.1.2
-      debug: 4.4.3
-      expo: 54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+      debug: 4.4.3(supports-color@8.1.1)
+      expo: 54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1)
       expo-eas-client: 1.0.8
-      expo-manifests: 1.0.11(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))
+      expo-manifests: 1.0.11(expo@54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1))(supports-color@8.1.1)
       expo-structured-headers: 5.0.0
-      expo-updates-interface: 2.0.0(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))
+      expo-updates-interface: 2.0.0(expo@54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1))
       getenv: 2.0.0
       glob: 13.0.6
       ignore: 5.3.2
       react: 19.1.0
-      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0)
+      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1)
       resolve-from: 5.0.0
     transitivePeerDependencies:
       - supports-color
 
-  expo-video-thumbnails@10.0.8(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)):
+  expo-video-thumbnails@10.0.8(expo@54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1)):
     dependencies:
-      expo: 54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+      expo: 54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1)
 
-  expo-video@3.0.16(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0):
+  expo-video@3.0.16(83e0f64f4281e4798012214ad5b2d72d):
     dependencies:
-      expo: 54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+      expo: 54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1)
       react: 19.1.0
-      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0)
+      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1)
 
-  expo-web-browser@15.0.11(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0)):
+  expo-web-browser@15.0.11(83f21d12a6c1aa99b4a65d070875cc68):
     dependencies:
-      expo: 54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
-      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0)
+      expo: 54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1)
+      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1)
 
-  expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0):
+  expo@54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1):
     dependencies:
       '@babel/runtime': 7.29.2
-      '@expo/cli': 54.0.25(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))
-      '@expo/config': 12.0.13
-      '@expo/config-plugins': 54.0.4
-      '@expo/devtools': 0.1.8(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
-      '@expo/fingerprint': 0.15.5
-      '@expo/metro': 54.2.0
-      '@expo/metro-config': 54.0.16(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))
-      '@expo/vector-icons': 15.1.1(expo-font@14.0.12(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+      '@expo/cli': 54.0.25(c1408f750868568d2dc75671b50084a7)
+      '@expo/config': 12.0.13(supports-color@8.1.1)
+      '@expo/config-plugins': 54.0.4(supports-color@8.1.1)
+      '@expo/devtools': 0.1.8(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)
+      '@expo/fingerprint': 0.15.5(supports-color@8.1.1)
+      '@expo/metro': 54.2.0(supports-color@8.1.1)
+      '@expo/metro-config': 54.0.16(expo@54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1))(supports-color@8.1.1)
+      '@expo/vector-icons': 15.1.1(expo-font@14.0.12(83e0f64f4281e4798012214ad5b2d72d))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)
       '@ungap/structured-clone': 1.3.1
-      babel-preset-expo: 54.0.12(@babel/core@7.29.0)(@babel/runtime@7.29.2)(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-refresh@0.14.2)
-      expo-asset: 12.0.13(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
-      expo-constants: 18.0.13(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))
-      expo-file-system: 19.0.23(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))
-      expo-font: 14.0.12(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
-      expo-keep-awake: 15.0.8(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react@19.1.0)
+      babel-preset-expo: 54.0.12(@babel/core@7.29.0(supports-color@8.1.1))(@babel/runtime@7.29.2)(expo@54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1))(react-refresh@0.14.2)(supports-color@8.1.1)
+      expo-asset: 12.0.13(93a6abd34ab5ae64aff6a80525489f34)
+      expo-constants: 18.0.13(c1408f750868568d2dc75671b50084a7)
+      expo-file-system: 19.0.23(83f21d12a6c1aa99b4a65d070875cc68)
+      expo-font: 14.0.12(83e0f64f4281e4798012214ad5b2d72d)
+      expo-keep-awake: 15.0.8(expo@54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)
       expo-modules-autolinking: 3.0.26
-      expo-modules-core: 3.0.30(patch_hash=952fb1c8cb6dc8a0d8ef4e1114942a341d89b025e011f1acfff788929997346e)(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+      expo-modules-core: 3.0.30(patch_hash=952fb1c8cb6dc8a0d8ef4e1114942a341d89b025e011f1acfff788929997346e)(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)
       pretty-format: 29.7.0
       react: 19.1.0
-      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0)
+      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1)
       react-refresh: 0.14.2
       whatwg-url-without-unicode: 8.0.0-3
     optionalDependencies:
-      react-native-webview: 13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+      react-native-webview: 13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)
     transitivePeerDependencies:
       - '@babel/core'
       - bufferutil
@@ -14886,21 +15171,21 @@ snapshots:
 
   exponential-backoff@3.1.3: {}
 
-  express@4.22.2:
+  express@4.22.2(supports-color@8.1.1):
     dependencies:
       accepts: 1.3.8
       array-flatten: 1.1.1
-      body-parser: 1.20.5
+      body-parser: 1.20.5(supports-color@8.1.1)
       content-disposition: 0.5.4
       content-type: 1.0.5
       cookie: 0.7.2
       cookie-signature: 1.0.7
-      debug: 2.6.9
+      debug: 2.6.9(supports-color@8.1.1)
       depd: 2.0.0
       encodeurl: 2.0.0
       escape-html: 1.0.3
       etag: 1.8.1
-      finalhandler: 1.3.2
+      finalhandler: 1.3.2(supports-color@8.1.1)
       fresh: 0.5.2
       http-errors: 2.0.1
       merge-descriptors: 1.0.3
@@ -14912,8 +15197,8 @@ snapshots:
       qs: 6.15.1
       range-parser: 1.2.1
       safe-buffer: 5.2.1
-      send: 0.19.2
-      serve-static: 1.16.3
+      send: 0.19.2(supports-color@8.1.1)
+      serve-static: 1.16.3(supports-color@8.1.1)
       setprototypeof: 1.2.0
       statuses: 2.0.2
       type-is: 1.6.18
@@ -14943,6 +15228,8 @@ snapshots:
       json-schema-ref-resolver: 3.0.0
       rfdc: 1.4.1
 
+  fast-levenshtein@2.0.6: {}
+
   fast-text-encoding@1.0.6: {}
 
   fast-uri@3.1.2: {}
@@ -14977,11 +15264,15 @@ snapshots:
     optionalDependencies:
       picomatch: 4.0.4
 
-  file-loader@6.2.0(webpack@5.106.2(postcss@8.5.14)):
+  file-entry-cache@6.0.1:
+    dependencies:
+      flat-cache: 3.2.0
+
+  file-loader@6.2.0(webpack@5.106.2(clean-css@5.3.3)(cssnano@5.1.15(postcss@8.5.14))(csso@5.0.5)(esbuild@0.25.12)(html-minifier-terser@6.1.0)(lightningcss@1.32.0)(postcss@8.5.14)):
     dependencies:
       loader-utils: 2.0.4
       schema-utils: 3.3.0
-      webpack: 5.106.2(postcss@8.5.14)
+      webpack: 5.106.2(clean-css@5.3.3)(cssnano@5.1.15(postcss@8.5.14))(csso@5.0.5)(esbuild@0.25.12)(html-minifier-terser@6.1.0)(lightningcss@1.32.0)(postcss@8.5.14)
 
   fill-range@7.1.1:
     dependencies:
@@ -14989,9 +15280,9 @@ snapshots:
 
   filter-obj@1.1.0: {}
 
-  finalhandler@1.1.2:
+  finalhandler@1.1.2(supports-color@8.1.1):
     dependencies:
-      debug: 2.6.9
+      debug: 2.6.9(supports-color@8.1.1)
       encodeurl: 1.0.2
       escape-html: 1.0.3
       on-finished: 2.3.0
@@ -15001,9 +15292,9 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  finalhandler@1.3.2:
+  finalhandler@1.3.2(supports-color@8.1.1):
     dependencies:
-      debug: 2.6.9
+      debug: 2.6.9(supports-color@8.1.1)
       encodeurl: 2.0.0
       escape-html: 1.0.3
       on-finished: 2.4.1
@@ -15041,9 +15332,19 @@ snapshots:
     dependencies:
       micromatch: 4.0.8
 
+  flat-cache@3.2.0:
+    dependencies:
+      flatted: 3.4.4
+      keyv: 4.5.4
+      rimraf: 3.0.2
+
+  flatted@3.4.4: {}
+
   flow-enums-runtime@0.0.6: {}
 
-  follow-redirects@1.16.0: {}
+  follow-redirects@1.16.0(debug@4.4.3(supports-color@8.1.1)):
+    optionalDependencies:
+      debug: 4.4.3(supports-color@8.1.1)
 
   fontfaceobserver@2.3.0: {}
 
@@ -15190,6 +15491,10 @@ snapshots:
       minipass: 4.2.8
       path-scurry: 1.11.1
 
+  globals@13.24.0:
+    dependencies:
+      type-fest: 0.20.2
+
   globals@17.6.0: {}
 
   globalthis@1.0.4:
@@ -15218,6 +15523,8 @@ snapshots:
 
   graceful-fs@4.2.11: {}
 
+  graphemer@1.4.0: {}
+
   gzip-size@6.0.0:
     dependencies:
       duplexer: 0.1.2
@@ -15315,7 +15622,7 @@ snapshots:
       relateurl: 0.2.7
       terser: 5.47.1
 
-  html-webpack-plugin@5.6.7(webpack@5.106.2(postcss@8.5.14)):
+  html-webpack-plugin@5.6.7(webpack@5.106.2(clean-css@5.3.3)(cssnano@5.1.15(postcss@8.5.14))(csso@5.0.5)(esbuild@0.25.12)(html-minifier-terser@6.1.0)(lightningcss@1.32.0)(postcss@8.5.14)):
     dependencies:
       '@types/html-minifier-terser': 6.1.0
       html-minifier-terser: 6.1.0
@@ -15323,7 +15630,7 @@ snapshots:
       pretty-error: 4.0.0
       tapable: 2.3.3
     optionalDependencies:
-      webpack: 5.106.2(postcss@8.5.14)
+      webpack: 5.106.2(clean-css@5.3.3)(cssnano@5.1.15(postcss@8.5.14))(csso@5.0.5)(esbuild@0.25.12)(html-minifier-terser@6.1.0)(lightningcss@1.32.0)(postcss@8.5.14)
 
   html2canvas@1.4.1:
     dependencies:
@@ -15357,18 +15664,18 @@ snapshots:
 
   http-parser-js@0.5.10: {}
 
-  http-proxy-agent@5.0.0:
+  http-proxy-agent@5.0.0(supports-color@8.1.1):
     dependencies:
       '@tootallnate/once': 2.0.1
-      agent-base: 6.0.2
-      debug: 4.4.3
+      agent-base: 6.0.2(supports-color@8.1.1)
+      debug: 4.4.3(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
-  http-proxy-middleware@2.0.9(@types/express@4.17.25):
+  http-proxy-middleware@2.0.9(@types/express@4.17.25)(debug@4.4.3(supports-color@8.1.1)):
     dependencies:
       '@types/http-proxy': 1.17.17
-      http-proxy: 1.18.1
+      http-proxy: 1.18.1(debug@4.4.3(supports-color@8.1.1))
       is-glob: 4.0.3
       is-plain-obj: 3.0.0
       micromatch: 4.0.8
@@ -15377,25 +15684,25 @@ snapshots:
     transitivePeerDependencies:
       - debug
 
-  http-proxy@1.18.1:
+  http-proxy@1.18.1(debug@4.4.3(supports-color@8.1.1)):
     dependencies:
       eventemitter3: 4.0.7
-      follow-redirects: 1.16.0
+      follow-redirects: 1.16.0(debug@4.4.3(supports-color@8.1.1))
       requires-port: 1.0.0
     transitivePeerDependencies:
       - debug
 
-  https-proxy-agent@5.0.1:
+  https-proxy-agent@5.0.1(supports-color@8.1.1):
     dependencies:
-      agent-base: 6.0.2
-      debug: 4.4.3
+      agent-base: 6.0.2(supports-color@8.1.1)
+      debug: 4.4.3(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
-  https-proxy-agent@7.0.6:
+  https-proxy-agent@7.0.6(supports-color@8.1.1):
     dependencies:
       agent-base: 7.1.4
-      debug: 4.4.3
+      debug: 4.4.3(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
@@ -15592,6 +15899,8 @@ snapshots:
     dependencies:
       path-is-inside: 1.0.2
 
+  is-path-inside@3.0.3: {}
+
   is-plain-obj@2.1.0: {}
 
   is-plain-obj@3.0.0: {}
@@ -15655,9 +15964,9 @@ snapshots:
 
   istanbul-lib-coverage@3.2.2: {}
 
-  istanbul-lib-instrument@5.2.1:
+  istanbul-lib-instrument@5.2.1(supports-color@8.1.1):
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
       '@babel/parser': 7.29.3
       '@istanbuljs/schema': 0.1.6
       istanbul-lib-coverage: 3.2.2
@@ -15665,9 +15974,9 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  istanbul-lib-instrument@6.0.3:
+  istanbul-lib-instrument@6.0.3(supports-color@8.1.1):
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
       '@babel/parser': 7.29.3
       '@istanbuljs/schema': 0.1.6
       istanbul-lib-coverage: 3.2.2
@@ -15681,9 +15990,9 @@ snapshots:
       make-dir: 4.0.0
       supports-color: 7.2.0
 
-  istanbul-lib-source-maps@4.0.1:
+  istanbul-lib-source-maps@4.0.1(supports-color@8.1.1):
     dependencies:
-      debug: 4.4.3
+      debug: 4.4.3(supports-color@8.1.1)
       istanbul-lib-coverage: 3.2.2
       source-map: 0.6.1
     transitivePeerDependencies:
@@ -15710,10 +16019,10 @@ snapshots:
       jest-util: 29.7.0
       p-limit: 3.1.0
 
-  jest-circus@29.7.0:
+  jest-circus@29.7.0(supports-color@8.1.1):
     dependencies:
       '@jest/environment': 29.7.0
-      '@jest/expect': 29.7.0
+      '@jest/expect': 29.7.0(supports-color@8.1.1)
       '@jest/test-result': 29.7.0
       '@jest/types': 29.6.3
       '@types/node': 24.12.4
@@ -15724,8 +16033,8 @@ snapshots:
       jest-each: 29.7.0
       jest-matcher-utils: 29.7.0
       jest-message-util: 29.7.0
-      jest-runtime: 29.7.0
-      jest-snapshot: 29.7.0
+      jest-runtime: 29.7.0(supports-color@8.1.1)
+      jest-snapshot: 29.7.0(supports-color@8.1.1)
       jest-util: 29.7.0
       p-limit: 3.1.0
       pretty-format: 29.7.0
@@ -15736,16 +16045,16 @@ snapshots:
       - babel-plugin-macros
       - supports-color
 
-  jest-cli@29.7.0(@types/node@24.12.4):
+  jest-cli@29.7.0(@types/node@24.12.4)(supports-color@8.1.1):
     dependencies:
-      '@jest/core': 29.7.0
+      '@jest/core': 29.7.0(supports-color@8.1.1)
       '@jest/test-result': 29.7.0
       '@jest/types': 29.6.3
       chalk: 4.1.2
-      create-jest: 29.7.0(@types/node@24.12.4)
+      create-jest: 29.7.0(@types/node@24.12.4)(supports-color@8.1.1)
       exit: 0.1.2
       import-local: 3.2.0
-      jest-config: 29.7.0(@types/node@24.12.4)
+      jest-config: 29.7.0(@types/node@24.12.4)(supports-color@8.1.1)
       jest-util: 29.7.0
       jest-validate: 29.7.0
       yargs: 17.7.2
@@ -15755,23 +16064,23 @@ snapshots:
       - supports-color
       - ts-node
 
-  jest-config@29.7.0(@types/node@24.12.4):
+  jest-config@29.7.0(@types/node@24.12.4)(supports-color@8.1.1):
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
       '@jest/test-sequencer': 29.7.0
       '@jest/types': 29.6.3
-      babel-jest: 29.7.0(@babel/core@7.29.0)
+      babel-jest: 29.7.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
       chalk: 4.1.2
       ci-info: 3.9.0
       deepmerge: 4.3.1
       glob: 7.2.3
       graceful-fs: 4.2.11
-      jest-circus: 29.7.0
+      jest-circus: 29.7.0(supports-color@8.1.1)
       jest-environment-node: 29.7.0
       jest-get-type: 29.6.3
       jest-regex-util: 29.6.3
       jest-resolve: 29.7.0
-      jest-runner: 29.7.0
+      jest-runner: 29.7.0(supports-color@8.1.1)
       jest-util: 29.7.0
       jest-validate: 29.7.0
       micromatch: 4.0.8
@@ -15811,7 +16120,7 @@ snapshots:
       jest-util: 29.7.0
       pretty-format: 29.7.0
 
-  jest-environment-jsdom@29.7.0:
+  jest-environment-jsdom@29.7.0(supports-color@8.1.1):
     dependencies:
       '@jest/environment': 29.7.0
       '@jest/fake-timers': 29.7.0
@@ -15820,7 +16129,7 @@ snapshots:
       '@types/node': 24.12.4
       jest-mock: 29.7.0
       jest-util: 29.7.0
-      jsdom: 20.0.3
+      jsdom: 20.0.3(supports-color@8.1.1)
     transitivePeerDependencies:
       - bufferutil
       - supports-color
@@ -15835,21 +16144,21 @@ snapshots:
       jest-mock: 29.7.0
       jest-util: 29.7.0
 
-  jest-expo@54.0.17(@babel/core@7.29.0)(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(jest@29.7.0(@types/node@24.12.4))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0):
+  jest-expo@54.0.17(ff9d3150c2730c411fa3a2f331cc40ee):
     dependencies:
-      '@expo/config': 12.0.13
+      '@expo/config': 12.0.13(supports-color@8.1.1)
       '@expo/json-file': 10.0.14
       '@jest/create-cache-key-function': 29.7.0
-      '@jest/globals': 29.7.0
-      babel-jest: 29.7.0(@babel/core@7.29.0)
-      expo: 54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
-      jest-environment-jsdom: 29.7.0
-      jest-snapshot: 29.7.0
+      '@jest/globals': 29.7.0(supports-color@8.1.1)
+      babel-jest: 29.7.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
+      expo: 54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1)
+      jest-environment-jsdom: 29.7.0(supports-color@8.1.1)
+      jest-snapshot: 29.7.0(supports-color@8.1.1)
       jest-watch-select-projects: 2.0.0
-      jest-watch-typeahead: 2.2.1(jest@29.7.0(@types/node@24.12.4))
+      jest-watch-typeahead: 2.2.1(jest@29.7.0(@types/node@24.12.4)(supports-color@8.1.1))
       json5: 2.2.3
       lodash: 4.18.1
-      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0)
+      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1)
       react-test-renderer: 19.1.0(react@19.1.0)
       server-only: 0.0.1
       stacktrace-js: 2.0.2
@@ -15951,10 +16260,10 @@ snapshots:
 
   jest-regex-util@30.4.0: {}
 
-  jest-resolve-dependencies@29.7.0:
+  jest-resolve-dependencies@29.7.0(supports-color@8.1.1):
     dependencies:
       jest-regex-util: 29.6.3
-      jest-snapshot: 29.7.0
+      jest-snapshot: 29.7.0(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
@@ -15970,12 +16279,12 @@ snapshots:
       resolve.exports: 2.0.3
       slash: 3.0.0
 
-  jest-runner@29.7.0:
+  jest-runner@29.7.0(supports-color@8.1.1):
     dependencies:
       '@jest/console': 29.7.0
       '@jest/environment': 29.7.0
       '@jest/test-result': 29.7.0
-      '@jest/transform': 29.7.0
+      '@jest/transform': 29.7.0(supports-color@8.1.1)
       '@jest/types': 29.6.3
       '@types/node': 24.12.4
       chalk: 4.1.2
@@ -15987,7 +16296,7 @@ snapshots:
       jest-leak-detector: 29.7.0
       jest-message-util: 29.7.0
       jest-resolve: 29.7.0
-      jest-runtime: 29.7.0
+      jest-runtime: 29.7.0(supports-color@8.1.1)
       jest-util: 29.7.0
       jest-watcher: 29.7.0
       jest-worker: 29.7.0
@@ -15996,14 +16305,14 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  jest-runtime@29.7.0:
+  jest-runtime@29.7.0(supports-color@8.1.1):
     dependencies:
       '@jest/environment': 29.7.0
       '@jest/fake-timers': 29.7.0
-      '@jest/globals': 29.7.0
+      '@jest/globals': 29.7.0(supports-color@8.1.1)
       '@jest/source-map': 29.6.3
       '@jest/test-result': 29.7.0
-      '@jest/transform': 29.7.0
+      '@jest/transform': 29.7.0(supports-color@8.1.1)
       '@jest/types': 29.6.3
       '@types/node': 24.12.4
       chalk: 4.1.2
@@ -16016,24 +16325,24 @@ snapshots:
       jest-mock: 29.7.0
       jest-regex-util: 29.6.3
       jest-resolve: 29.7.0
-      jest-snapshot: 29.7.0
+      jest-snapshot: 29.7.0(supports-color@8.1.1)
       jest-util: 29.7.0
       slash: 3.0.0
       strip-bom: 4.0.0
     transitivePeerDependencies:
       - supports-color
 
-  jest-snapshot@29.7.0:
+  jest-snapshot@29.7.0(supports-color@8.1.1):
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
       '@babel/generator': 7.29.1
-      '@babel/plugin-syntax-jsx': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-syntax-typescript': 7.28.6(@babel/core@7.29.0)
+      '@babel/plugin-syntax-jsx': 7.28.6(@babel/core@7.29.0(supports-color@8.1.1))
+      '@babel/plugin-syntax-typescript': 7.28.6(@babel/core@7.29.0(supports-color@8.1.1))
       '@babel/types': 7.29.0
       '@jest/expect-utils': 29.7.0
-      '@jest/transform': 29.7.0
+      '@jest/transform': 29.7.0(supports-color@8.1.1)
       '@jest/types': 29.6.3
-      babel-preset-current-node-syntax: 1.2.0(@babel/core@7.29.0)
+      babel-preset-current-node-syntax: 1.2.0(@babel/core@7.29.0(supports-color@8.1.1))
       chalk: 4.1.2
       expect: 29.7.0
       graceful-fs: 4.2.11
@@ -16081,11 +16390,11 @@ snapshots:
       chalk: 3.0.0
       prompts: 2.4.2
 
-  jest-watch-typeahead@2.2.1(jest@29.7.0(@types/node@24.12.4)):
+  jest-watch-typeahead@2.2.1(jest@29.7.0(@types/node@24.12.4)(supports-color@8.1.1)):
     dependencies:
       ansi-escapes: 6.2.1
       chalk: 4.1.2
-      jest: 29.7.0(@types/node@24.12.4)
+      jest: 29.7.0(@types/node@24.12.4)(supports-color@8.1.1)
       jest-regex-util: 29.6.3
       jest-watcher: 29.7.0
       slash: 5.1.0
@@ -16116,12 +16425,12 @@ snapshots:
       merge-stream: 2.0.0
       supports-color: 8.1.1
 
-  jest@29.7.0(@types/node@24.12.4):
+  jest@29.7.0(@types/node@24.12.4)(supports-color@8.1.1):
     dependencies:
-      '@jest/core': 29.7.0
+      '@jest/core': 29.7.0(supports-color@8.1.1)
       '@jest/types': 29.6.3
       import-local: 3.2.0
-      jest-cli: 29.7.0(@types/node@24.12.4)
+      jest-cli: 29.7.0(@types/node@24.12.4)(supports-color@8.1.1)
     transitivePeerDependencies:
       - '@types/node'
       - babel-plugin-macros
@@ -16149,7 +16458,7 @@ snapshots:
 
   jsc-safe-url@0.2.4: {}
 
-  jsdom@20.0.3:
+  jsdom@20.0.3(supports-color@8.1.1):
     dependencies:
       abab: 2.0.6
       acorn: 8.16.0
@@ -16162,8 +16471,8 @@ snapshots:
       escodegen: 2.1.0
       form-data: 4.0.5
       html-encoding-sniffer: 3.0.0
-      http-proxy-agent: 5.0.0
-      https-proxy-agent: 5.0.1
+      http-proxy-agent: 5.0.0(supports-color@8.1.1)
+      https-proxy-agent: 5.0.1(supports-color@8.1.1)
       is-potential-custom-element-name: 1.0.1
       nwsapi: 2.2.23
       parse5: 7.3.0
@@ -16184,6 +16493,8 @@ snapshots:
 
   jsesc@3.1.0: {}
 
+  json-buffer@3.0.1: {}
+
   json-parse-even-better-errors@2.3.1: {}
 
   json-schema-ref-resolver@3.0.0:
@@ -16194,6 +16505,8 @@ snapshots:
 
   json-schema-traverse@1.0.0: {}
 
+  json-stable-stringify-without-jsonify@1.0.1: {}
+
   json5@2.2.3: {}
 
   jsonfile@6.2.1:
@@ -16211,6 +16524,10 @@ snapshots:
 
   jwt-decode@4.0.0: {}
 
+  keyv@4.5.4:
+    dependencies:
+      json-buffer: 3.0.1
+
   kleur@3.0.3: {}
 
   lan-network@0.2.1: {}
@@ -16226,11 +16543,16 @@ snapshots:
 
   leven@3.1.0: {}
 
+  levn@0.4.1:
+    dependencies:
+      prelude-ls: 1.2.1
+      type-check: 0.4.0
+
   libphonenumber-js@1.13.1: {}
 
-  lighthouse-logger@1.4.2:
+  lighthouse-logger@1.4.2(supports-color@8.1.1):
     dependencies:
-      debug: 2.6.9
+      debug: 2.6.9(supports-color@8.1.1)
       marky: 1.3.0
     transitivePeerDependencies:
       - supports-color
@@ -16336,6 +16658,8 @@ snapshots:
 
   lodash.memoize@4.1.2: {}
 
+  lodash.merge@4.6.2: {}
+
   lodash.shuffle@4.2.0: {}
 
   lodash.throttle@4.1.1: {}
@@ -16449,18 +16773,18 @@ snapshots:
 
   methods@1.1.2: {}
 
-  metro-babel-transformer@0.83.3:
+  metro-babel-transformer@0.83.3(supports-color@8.1.1):
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
       flow-enums-runtime: 0.0.6
       hermes-parser: 0.32.0
       nullthrows: 1.1.1
     transitivePeerDependencies:
       - supports-color
 
-  metro-babel-transformer@0.84.4:
+  metro-babel-transformer@0.84.4(supports-color@8.1.1):
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
       flow-enums-runtime: 0.0.6
       hermes-parser: 0.35.0
       metro-cache-key: 0.84.4
@@ -16476,31 +16800,31 @@ snapshots:
     dependencies:
       flow-enums-runtime: 0.0.6
 
-  metro-cache@0.83.3:
+  metro-cache@0.83.3(supports-color@8.1.1):
     dependencies:
       exponential-backoff: 3.1.3
       flow-enums-runtime: 0.0.6
-      https-proxy-agent: 7.0.6
+      https-proxy-agent: 7.0.6(supports-color@8.1.1)
       metro-core: 0.83.3
     transitivePeerDependencies:
       - supports-color
 
-  metro-cache@0.84.4:
+  metro-cache@0.84.4(supports-color@8.1.1):
     dependencies:
       exponential-backoff: 3.1.3
       flow-enums-runtime: 0.0.6
-      https-proxy-agent: 7.0.6
+      https-proxy-agent: 7.0.6(supports-color@8.1.1)
       metro-core: 0.84.4
     transitivePeerDependencies:
       - supports-color
 
-  metro-config@0.83.3:
+  metro-config@0.83.3(supports-color@8.1.1):
     dependencies:
-      connect: 3.7.0
+      connect: 3.7.0(supports-color@8.1.1)
       flow-enums-runtime: 0.0.6
       jest-validate: 29.7.0
-      metro: 0.83.3
-      metro-cache: 0.83.3
+      metro: 0.83.3(supports-color@8.1.1)
+      metro-cache: 0.83.3(supports-color@8.1.1)
       metro-core: 0.83.3
       metro-runtime: 0.83.3
       yaml: 2.9.0
@@ -16509,13 +16833,13 @@ snapshots:
       - supports-color
       - utf-8-validate
 
-  metro-config@0.84.4:
+  metro-config@0.84.4(supports-color@8.1.1):
     dependencies:
-      connect: 3.7.0
+      connect: 3.7.0(supports-color@8.1.1)
       flow-enums-runtime: 0.0.6
       jest-validate: 29.7.0
-      metro: 0.84.4
-      metro-cache: 0.84.4
+      metro: 0.84.4(supports-color@8.1.1)
+      metro-cache: 0.84.4(supports-color@8.1.1)
       metro-core: 0.84.4
       metro-runtime: 0.84.4
       yaml: 2.9.0
@@ -16536,9 +16860,9 @@ snapshots:
       lodash.throttle: 4.1.1
       metro-resolver: 0.84.4
 
-  metro-file-map@0.83.3:
+  metro-file-map@0.83.3(supports-color@8.1.1):
     dependencies:
-      debug: 4.4.3
+      debug: 4.4.3(supports-color@8.1.1)
       fb-watchman: 2.0.2
       flow-enums-runtime: 0.0.6
       graceful-fs: 4.2.11
@@ -16550,9 +16874,9 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  metro-file-map@0.84.4:
+  metro-file-map@0.84.4(supports-color@8.1.1):
     dependencies:
-      debug: 4.4.3
+      debug: 4.4.3(supports-color@8.1.1)
       fb-watchman: 2.0.2
       flow-enums-runtime: 0.0.6
       graceful-fs: 4.2.11
@@ -16592,14 +16916,14 @@ snapshots:
       '@babel/runtime': 7.29.2
       flow-enums-runtime: 0.0.6
 
-  metro-source-map@0.83.3:
+  metro-source-map@0.83.3(supports-color@8.1.1):
     dependencies:
-      '@babel/traverse': 7.29.0
-      '@babel/traverse--for-generate-function-map': '@babel/traverse@7.29.0'
+      '@babel/traverse': 7.29.0(supports-color@8.1.1)
+      '@babel/traverse--for-generate-function-map': '@babel/traverse@7.29.0(supports-color@8.1.1)'
       '@babel/types': 7.29.0
       flow-enums-runtime: 0.0.6
       invariant: 2.2.4
-      metro-symbolicate: 0.83.3
+      metro-symbolicate: 0.83.3(supports-color@8.1.1)
       nullthrows: 1.1.1
       ob1: 0.83.3
       source-map: 0.5.7
@@ -16607,13 +16931,13 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  metro-source-map@0.84.4:
+  metro-source-map@0.84.4(supports-color@8.1.1):
     dependencies:
-      '@babel/traverse': 7.29.0
+      '@babel/traverse': 7.29.0(supports-color@8.1.1)
       '@babel/types': 7.29.0
       flow-enums-runtime: 0.0.6
       invariant: 2.2.4
-      metro-symbolicate: 0.84.4
+      metro-symbolicate: 0.84.4(supports-color@8.1.1)
       nullthrows: 1.1.1
       ob1: 0.84.4
       source-map: 0.5.7
@@ -16621,104 +16945,104 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  metro-symbolicate@0.83.3:
+  metro-symbolicate@0.83.3(supports-color@8.1.1):
     dependencies:
       flow-enums-runtime: 0.0.6
       invariant: 2.2.4
-      metro-source-map: 0.83.3
+      metro-source-map: 0.83.3(supports-color@8.1.1)
       nullthrows: 1.1.1
       source-map: 0.5.7
       vlq: 1.0.1
     transitivePeerDependencies:
       - supports-color
 
-  metro-symbolicate@0.84.4:
+  metro-symbolicate@0.84.4(supports-color@8.1.1):
     dependencies:
       flow-enums-runtime: 0.0.6
       invariant: 2.2.4
-      metro-source-map: 0.84.4
+      metro-source-map: 0.84.4(supports-color@8.1.1)
       nullthrows: 1.1.1
       source-map: 0.5.7
       vlq: 1.0.1
     transitivePeerDependencies:
       - supports-color
 
-  metro-transform-plugins@0.83.3:
+  metro-transform-plugins@0.83.3(supports-color@8.1.1):
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
       '@babel/generator': 7.29.1
       '@babel/template': 7.28.6
-      '@babel/traverse': 7.29.0
+      '@babel/traverse': 7.29.0(supports-color@8.1.1)
       flow-enums-runtime: 0.0.6
       nullthrows: 1.1.1
     transitivePeerDependencies:
       - supports-color
 
-  metro-transform-plugins@0.84.4:
+  metro-transform-plugins@0.84.4(supports-color@8.1.1):
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
       '@babel/generator': 7.29.1
       '@babel/template': 7.28.6
-      '@babel/traverse': 7.29.0
+      '@babel/traverse': 7.29.0(supports-color@8.1.1)
       flow-enums-runtime: 0.0.6
       nullthrows: 1.1.1
     transitivePeerDependencies:
       - supports-color
 
-  metro-transform-worker@0.83.3:
+  metro-transform-worker@0.83.3(supports-color@8.1.1):
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
       '@babel/generator': 7.29.1
       '@babel/parser': 7.29.3
       '@babel/types': 7.29.0
       flow-enums-runtime: 0.0.6
-      metro: 0.83.3
-      metro-babel-transformer: 0.83.3
-      metro-cache: 0.83.3
+      metro: 0.83.3(supports-color@8.1.1)
+      metro-babel-transformer: 0.83.3(supports-color@8.1.1)
+      metro-cache: 0.83.3(supports-color@8.1.1)
       metro-cache-key: 0.83.3
       metro-minify-terser: 0.83.3
-      metro-source-map: 0.83.3
-      metro-transform-plugins: 0.83.3
+      metro-source-map: 0.83.3(supports-color@8.1.1)
+      metro-transform-plugins: 0.83.3(supports-color@8.1.1)
       nullthrows: 1.1.1
     transitivePeerDependencies:
       - bufferutil
       - supports-color
       - utf-8-validate
 
-  metro-transform-worker@0.84.4:
+  metro-transform-worker@0.84.4(supports-color@8.1.1):
     dependencies:
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
       '@babel/generator': 7.29.1
       '@babel/parser': 7.29.3
       '@babel/types': 7.29.0
       flow-enums-runtime: 0.0.6
-      metro: 0.84.4
-      metro-babel-transformer: 0.84.4
-      metro-cache: 0.84.4
+      metro: 0.84.4(supports-color@8.1.1)
+      metro-babel-transformer: 0.84.4(supports-color@8.1.1)
+      metro-cache: 0.84.4(supports-color@8.1.1)
       metro-cache-key: 0.84.4
       metro-minify-terser: 0.84.4
-      metro-source-map: 0.84.4
-      metro-transform-plugins: 0.84.4
+      metro-source-map: 0.84.4(supports-color@8.1.1)
+      metro-transform-plugins: 0.84.4(supports-color@8.1.1)
       nullthrows: 1.1.1
     transitivePeerDependencies:
       - bufferutil
       - supports-color
       - utf-8-validate
 
-  metro@0.83.3:
+  metro@0.83.3(supports-color@8.1.1):
     dependencies:
       '@babel/code-frame': 7.29.0
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
       '@babel/generator': 7.29.1
       '@babel/parser': 7.29.3
       '@babel/template': 7.28.6
-      '@babel/traverse': 7.29.0
+      '@babel/traverse': 7.29.0(supports-color@8.1.1)
       '@babel/types': 7.29.0
       accepts: 1.3.8
       chalk: 4.1.2
       ci-info: 2.0.0
-      connect: 3.7.0
-      debug: 4.4.3
+      connect: 3.7.0(supports-color@8.1.1)
+      debug: 4.4.3(supports-color@8.1.1)
       error-stack-parser: 2.1.4
       flow-enums-runtime: 0.0.6
       graceful-fs: 4.2.11
@@ -16728,18 +17052,18 @@ snapshots:
       jest-worker: 29.7.0
       jsc-safe-url: 0.2.4
       lodash.throttle: 4.1.1
-      metro-babel-transformer: 0.83.3
-      metro-cache: 0.83.3
+      metro-babel-transformer: 0.83.3(supports-color@8.1.1)
+      metro-cache: 0.83.3(supports-color@8.1.1)
       metro-cache-key: 0.83.3
-      metro-config: 0.83.3
+      metro-config: 0.83.3(supports-color@8.1.1)
       metro-core: 0.83.3
-      metro-file-map: 0.83.3
+      metro-file-map: 0.83.3(supports-color@8.1.1)
       metro-resolver: 0.83.3
       metro-runtime: 0.83.3
-      metro-source-map: 0.83.3
-      metro-symbolicate: 0.83.3
-      metro-transform-plugins: 0.83.3
-      metro-transform-worker: 0.83.3
+      metro-source-map: 0.83.3(supports-color@8.1.1)
+      metro-symbolicate: 0.83.3(supports-color@8.1.1)
+      metro-transform-plugins: 0.83.3(supports-color@8.1.1)
+      metro-transform-worker: 0.83.3(supports-color@8.1.1)
       mime-types: 2.1.35
       nullthrows: 1.1.1
       serialize-error: 2.1.0
@@ -16752,19 +17076,19 @@ snapshots:
       - supports-color
       - utf-8-validate
 
-  metro@0.84.4:
+  metro@0.84.4(supports-color@8.1.1):
     dependencies:
       '@babel/code-frame': 7.29.0
-      '@babel/core': 7.29.0
+      '@babel/core': 7.29.0(supports-color@8.1.1)
       '@babel/generator': 7.29.1
       '@babel/parser': 7.29.3
       '@babel/template': 7.28.6
-      '@babel/traverse': 7.29.0
+      '@babel/traverse': 7.29.0(supports-color@8.1.1)
       '@babel/types': 7.29.0
       accepts: 2.0.0
       ci-info: 2.0.0
-      connect: 3.7.0
-      debug: 4.4.3
+      connect: 3.7.0(supports-color@8.1.1)
+      debug: 4.4.3(supports-color@8.1.1)
       error-stack-parser: 2.1.4
       flow-enums-runtime: 0.0.6
       graceful-fs: 4.2.11
@@ -16774,18 +17098,18 @@ snapshots:
       jest-worker: 29.7.0
       jsc-safe-url: 0.2.4
       lodash.throttle: 4.1.1
-      metro-babel-transformer: 0.84.4
-      metro-cache: 0.84.4
+      metro-babel-transformer: 0.84.4(supports-color@8.1.1)
+      metro-cache: 0.84.4(supports-color@8.1.1)
       metro-cache-key: 0.84.4
-      metro-config: 0.84.4
+      metro-config: 0.84.4(supports-color@8.1.1)
       metro-core: 0.84.4
-      metro-file-map: 0.84.4
+      metro-file-map: 0.84.4(supports-color@8.1.1)
       metro-resolver: 0.84.4
       metro-runtime: 0.84.4
-      metro-source-map: 0.84.4
-      metro-symbolicate: 0.84.4
-      metro-transform-plugins: 0.84.4
-      metro-transform-worker: 0.84.4
+      metro-source-map: 0.84.4(supports-color@8.1.1)
+      metro-symbolicate: 0.84.4(supports-color@8.1.1)
+      metro-transform-plugins: 0.84.4(supports-color@8.1.1)
+      metro-transform-worker: 0.84.4(supports-color@8.1.1)
       mime-types: 3.0.2
       nullthrows: 1.1.1
       serialize-error: 2.1.0
@@ -16825,11 +17149,11 @@ snapshots:
 
   min-indent@1.0.1: {}
 
-  mini-css-extract-plugin@2.10.2(webpack@5.106.2(postcss@8.5.14)):
+  mini-css-extract-plugin@2.10.2(webpack@5.106.2(clean-css@5.3.3)(cssnano@5.1.15(postcss@8.5.14))(csso@5.0.5)(esbuild@0.25.12)(html-minifier-terser@6.1.0)(lightningcss@1.32.0)(postcss@8.5.14)):
     dependencies:
       schema-utils: 4.3.3
       tapable: 2.3.3
-      webpack: 5.106.2(postcss@8.5.14)
+      webpack: 5.106.2(clean-css@5.3.3)(cssnano@5.1.15(postcss@8.5.14))(csso@5.0.5)(esbuild@0.25.12)(html-minifier-terser@6.1.0)(lightningcss@1.32.0)(postcss@8.5.14)
 
   minimalistic-assert@1.0.1: {}
 
@@ -17023,6 +17347,15 @@ snapshots:
 
   opener@1.5.2: {}
 
+  optionator@0.9.4:
+    dependencies:
+      deep-is: 0.1.4
+      fast-levenshtein: 2.0.6
+      levn: 0.4.1
+      prelude-ls: 1.2.1
+      type-check: 0.4.0
+      word-wrap: 1.2.5
+
   ora@3.4.0:
     dependencies:
       chalk: 2.4.2
@@ -17407,6 +17740,8 @@ snapshots:
       picocolors: 1.1.1
       source-map-js: 1.2.1
 
+  prelude-ls@1.2.1: {}
+
   prettier@3.8.3: {}
 
   pretty-bytes@5.6.0: {}
@@ -17729,123 +18064,123 @@ snapshots:
       react: 19.1.0
       react-is: 19.2.6
 
-  react-native-compressor@1.13.0(patch_hash=58379dfaace6ced8590cb341c77f2ca8099dfa8f7df6297032ec51de767a9925)(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0):
+  react-native-compressor@1.13.0(patch_hash=58379dfaace6ced8590cb341c77f2ca8099dfa8f7df6297032ec51de767a9925)(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0):
     dependencies:
       react: 19.1.0
-      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0)
+      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1)
 
-  react-native-date-picker@5.0.13(patch_hash=92943fb79d17d7342a29bbb12b0d8ee3cf6f7bca12ed322dc8d124a3e9fb75bd)(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0):
+  react-native-date-picker@5.0.13(patch_hash=92943fb79d17d7342a29bbb12b0d8ee3cf6f7bca12ed322dc8d124a3e9fb75bd)(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0):
     dependencies:
       react: 19.1.0
-      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0)
+      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1)
 
-  react-native-device-attest@0.1.6(expo@54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0):
+  react-native-device-attest@0.1.6(83e0f64f4281e4798012214ad5b2d72d):
     dependencies:
-      expo: 54.0.35(@babel/core@7.29.0)(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+      expo: 54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1)
       react: 19.1.0
-      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0)
+      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1)
 
   react-native-dotenv@3.4.11(@babel/runtime@7.29.2):
     dependencies:
       '@babel/runtime': 7.29.2
       dotenv: 16.6.1
 
-  react-native-drawer-layout@4.2.3(patch_hash=74f2c043cc22ab87054f219e7c7373a509b779b18bfa79d27e7d051d73355130)(f8669ab0fde0772e831a7516fba74dd4):
+  react-native-drawer-layout@4.2.3(patch_hash=74f2c043cc22ab87054f219e7c7373a509b779b18bfa79d27e7d051d73355130)(80d195d8b17891585aee78a1fb66460a):
     dependencies:
       color: 4.2.3
       react: 19.1.0
-      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0)
-      react-native-gesture-handler: 2.30.1(patch_hash=39b9e51b3977fae8ff61764b8c32934fe3fbddaf21587b4661fd73b7c6dd325b)(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
-      react-native-reanimated: 4.3.2(patch_hash=ab1c095bc473ec5bfd9ead76e870c566660e355e11c5078cfdeb35922d7b2f05)(react-native-worklets@0.8.3(patch_hash=f7263a59ae1c0170af8dfe9a5704cb374d29214a430b4b2841f9b7886c9ba8ad)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1)
+      react-native-gesture-handler: 2.30.1(patch_hash=39b9e51b3977fae8ff61764b8c32934fe3fbddaf21587b4661fd73b7c6dd325b)(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)
+      react-native-reanimated: 4.3.2(patch_hash=ab1c095bc473ec5bfd9ead76e870c566660e355e11c5078cfdeb35922d7b2f05)(react-native-worklets@0.8.3(patch_hash=f7263a59ae1c0170af8dfe9a5704cb374d29214a430b4b2841f9b7886c9ba8ad)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)
       use-latest-callback: 0.2.6(react@19.1.0)
 
-  react-native-edge-to-edge@1.8.1(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0):
+  react-native-edge-to-edge@1.8.1(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0):
     dependencies:
       react: 19.1.0
-      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0)
+      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1)
 
-  react-native-gesture-handler@2.30.1(patch_hash=39b9e51b3977fae8ff61764b8c32934fe3fbddaf21587b4661fd73b7c6dd325b)(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0):
+  react-native-gesture-handler@2.30.1(patch_hash=39b9e51b3977fae8ff61764b8c32934fe3fbddaf21587b4661fd73b7c6dd325b)(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0):
     dependencies:
       '@egjs/hammerjs': 2.0.17
       hoist-non-react-statics: 3.3.2
       invariant: 2.2.4
       react: 19.1.0
-      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0)
+      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1)
 
-  react-native-is-edge-to-edge@1.3.1(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0):
+  react-native-is-edge-to-edge@1.3.1(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0):
     dependencies:
       react: 19.1.0
-      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0)
+      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1)
 
-  ? react-native-keyboard-controller@1.21.8(patch_hash=ac52bf7502ff3ad34a8594b5e1a916b96bf87a2523b6abc87c31f03607d52271)(react-native-reanimated@4.3.2(patch_hash=ab1c095bc473ec5bfd9ead76e870c566660e355e11c5078cfdeb35922d7b2f05)(react-native-worklets@0.8.3(patch_hash=f7263a59ae1c0170af8dfe9a5704cb374d29214a430b4b2841f9b7886c9ba8ad)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
-  : dependencies:
-      react: 19.1.0
-      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0)
-      react-native-is-edge-to-edge: 1.3.1(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
-      react-native-reanimated: 4.3.2(patch_hash=ab1c095bc473ec5bfd9ead76e870c566660e355e11c5078cfdeb35922d7b2f05)(react-native-worklets@0.8.3(patch_hash=f7263a59ae1c0170af8dfe9a5704cb374d29214a430b4b2841f9b7886c9ba8ad)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
-
-  react-native-mmkv@3.3.3(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0):
+  react-native-keyboard-controller@1.21.8(patch_hash=ac52bf7502ff3ad34a8594b5e1a916b96bf87a2523b6abc87c31f03607d52271)(a7f993fe7a53ab427398397086882821):
     dependencies:
       react: 19.1.0
-      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0)
+      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1)
+      react-native-is-edge-to-edge: 1.3.1(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)
+      react-native-reanimated: 4.3.2(patch_hash=ab1c095bc473ec5bfd9ead76e870c566660e355e11c5078cfdeb35922d7b2f05)(react-native-worklets@0.8.3(patch_hash=f7263a59ae1c0170af8dfe9a5704cb374d29214a430b4b2841f9b7886c9ba8ad)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)
 
-  react-native-pager-view@6.8.0(patch_hash=c8316acd33c9aef6531e8c272c2bfab7bd02af1255969eeaab2bad5ab48531cc)(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0):
+  react-native-mmkv@3.3.3(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0):
     dependencies:
       react: 19.1.0
-      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0)
+      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1)
 
-  react-native-progress@5.0.1(react-native-svg@15.12.1(patch_hash=ae309e9542214f5ae54935e253dedd236765feedac7be343f81d532d7fe09310)(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)):
+  react-native-pager-view@6.8.0(patch_hash=c8316acd33c9aef6531e8c272c2bfab7bd02af1255969eeaab2bad5ab48531cc)(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0):
+    dependencies:
+      react: 19.1.0
+      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1)
+
+  react-native-progress@5.0.1(react-native-svg@15.12.1(patch_hash=ae309e9542214f5ae54935e253dedd236765feedac7be343f81d532d7fe09310)(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)):
     dependencies:
       prop-types: 15.8.1
-      react-native-svg: 15.12.1(patch_hash=ae309e9542214f5ae54935e253dedd236765feedac7be343f81d532d7fe09310)(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+      react-native-svg: 15.12.1(patch_hash=ae309e9542214f5ae54935e253dedd236765feedac7be343f81d532d7fe09310)(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)
 
-  react-native-qrcode-styled@0.3.3(react-native-svg@15.12.1(patch_hash=ae309e9542214f5ae54935e253dedd236765feedac7be343f81d532d7fe09310)(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0):
+  react-native-qrcode-styled@0.3.3(react-native-svg@15.12.1(patch_hash=ae309e9542214f5ae54935e253dedd236765feedac7be343f81d532d7fe09310)(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0):
     dependencies:
       qrcode: 1.5.4
       react: 19.1.0
       react-fast-compare: 3.2.2
-      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0)
-      react-native-svg: 15.12.1(patch_hash=ae309e9542214f5ae54935e253dedd236765feedac7be343f81d532d7fe09310)(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1)
+      react-native-svg: 15.12.1(patch_hash=ae309e9542214f5ae54935e253dedd236765feedac7be343f81d532d7fe09310)(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)
 
-  react-native-reanimated@4.3.2(patch_hash=ab1c095bc473ec5bfd9ead76e870c566660e355e11c5078cfdeb35922d7b2f05)(react-native-worklets@0.8.3(patch_hash=f7263a59ae1c0170af8dfe9a5704cb374d29214a430b4b2841f9b7886c9ba8ad)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0):
+  react-native-reanimated@4.3.2(patch_hash=ab1c095bc473ec5bfd9ead76e870c566660e355e11c5078cfdeb35922d7b2f05)(react-native-worklets@0.8.3(patch_hash=f7263a59ae1c0170af8dfe9a5704cb374d29214a430b4b2841f9b7886c9ba8ad)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0):
     dependencies:
       react: 19.1.0
-      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0)
-      react-native-is-edge-to-edge: 1.3.1(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
-      react-native-worklets: 0.8.3(patch_hash=f7263a59ae1c0170af8dfe9a5704cb374d29214a430b4b2841f9b7886c9ba8ad)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1)
+      react-native-is-edge-to-edge: 1.3.1(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)
+      react-native-worklets: 0.8.3(patch_hash=f7263a59ae1c0170af8dfe9a5704cb374d29214a430b4b2841f9b7886c9ba8ad)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1)
       semver: 7.8.0
 
-  react-native-safe-area-context@5.6.2(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0):
+  react-native-safe-area-context@5.6.2(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0):
     dependencies:
       react: 19.1.0
-      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0)
+      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1)
 
-  react-native-screens@4.24.0(patch_hash=74a74b489f8074a1974c2792c9c97aec30d8e251669aa37fc5c99993bb4a19e6)(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0):
+  react-native-screens@4.24.0(patch_hash=74a74b489f8074a1974c2792c9c97aec30d8e251669aa37fc5c99993bb4a19e6)(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0):
     dependencies:
       react: 19.1.0
       react-freeze: 1.0.4(react@19.1.0)
-      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0)
+      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1)
       warn-once: 0.1.1
 
-  react-native-svg@15.12.1(patch_hash=ae309e9542214f5ae54935e253dedd236765feedac7be343f81d532d7fe09310)(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0):
+  react-native-svg@15.12.1(patch_hash=ae309e9542214f5ae54935e253dedd236765feedac7be343f81d532d7fe09310)(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0):
     dependencies:
       css-select: 5.2.2
       css-tree: 1.1.3
       react: 19.1.0
-      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0)
+      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1)
       warn-once: 0.1.1
 
   react-native-uuid@2.0.4: {}
 
-  react-native-view-shot@4.0.3(patch_hash=a2457dc30a82cc8c21f371a6f860d9396d450a2a1b4265b1a4ee13bdb24d3268)(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0):
+  react-native-view-shot@4.0.3(patch_hash=a2457dc30a82cc8c21f371a6f860d9396d450a2a1b4265b1a4ee13bdb24d3268)(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0):
     dependencies:
       html2canvas: 1.4.1
       react: 19.1.0
-      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0)
+      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1)
 
-  react-native-web-webview@1.0.2(file-loader@6.2.0(webpack@5.106.2(postcss@8.5.14)))(react-native-web@0.21.2(react-dom@19.1.0(react@19.1.0))(react@19.1.0)):
+  react-native-web-webview@1.0.2(file-loader@6.2.0(webpack@5.106.2(clean-css@5.3.3)(cssnano@5.1.15(postcss@8.5.14))(csso@5.0.5)(esbuild@0.25.12)(html-minifier-terser@6.1.0)(lightningcss@1.32.0)(postcss@8.5.14)))(react-native-web@0.21.2(react-dom@19.1.0(react@19.1.0))(react@19.1.0)):
     dependencies:
-      file-loader: 6.2.0(webpack@5.106.2(postcss@8.5.14))
+      file-loader: 6.2.0(webpack@5.106.2(clean-css@5.3.3)(cssnano@5.1.15(postcss@8.5.14))(csso@5.0.5)(esbuild@0.25.12)(html-minifier-terser@6.1.0)(lightningcss@1.32.0)(postcss@8.5.14))
       qs: 6.15.1
       react-native-web: 0.21.2(react-dom@19.1.0(react@19.1.0))(react@19.1.0)
 
@@ -17864,47 +18199,47 @@ snapshots:
     transitivePeerDependencies:
       - encoding
 
-  react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0):
+  react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0):
     dependencies:
       escape-string-regexp: 4.0.0
       invariant: 2.2.4
       react: 19.1.0
-      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0)
+      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1)
 
-  react-native-worklets@0.8.3(patch_hash=f7263a59ae1c0170af8dfe9a5704cb374d29214a430b4b2841f9b7886c9ba8ad)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0):
+  react-native-worklets@0.8.3(patch_hash=f7263a59ae1c0170af8dfe9a5704cb374d29214a430b4b2841f9b7886c9ba8ad)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1):
     dependencies:
-      '@babel/core': 7.29.0
-      '@babel/plugin-transform-arrow-functions': 7.27.1(@babel/core@7.29.0)
-      '@babel/plugin-transform-class-properties': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-classes': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-nullish-coalescing-operator': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-optional-chaining': 7.28.6(@babel/core@7.29.0)
-      '@babel/plugin-transform-shorthand-properties': 7.27.1(@babel/core@7.29.0)
-      '@babel/plugin-transform-template-literals': 7.27.1(@babel/core@7.29.0)
-      '@babel/plugin-transform-unicode-regex': 7.27.1(@babel/core@7.29.0)
-      '@babel/preset-typescript': 7.28.5(@babel/core@7.29.0)
-      '@react-native/metro-config': 0.86.0(@babel/core@7.29.0)
+      '@babel/core': 7.29.0(supports-color@8.1.1)
+      '@babel/plugin-transform-arrow-functions': 7.27.1(@babel/core@7.29.0(supports-color@8.1.1))
+      '@babel/plugin-transform-class-properties': 7.28.6(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
+      '@babel/plugin-transform-classes': 7.28.6(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
+      '@babel/plugin-transform-nullish-coalescing-operator': 7.28.6(@babel/core@7.29.0(supports-color@8.1.1))
+      '@babel/plugin-transform-optional-chaining': 7.28.6(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
+      '@babel/plugin-transform-shorthand-properties': 7.27.1(@babel/core@7.29.0(supports-color@8.1.1))
+      '@babel/plugin-transform-template-literals': 7.27.1(@babel/core@7.29.0(supports-color@8.1.1))
+      '@babel/plugin-transform-unicode-regex': 7.27.1(@babel/core@7.29.0(supports-color@8.1.1))
+      '@babel/preset-typescript': 7.28.5(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
+      '@react-native/metro-config': 0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
       convert-source-map: 2.0.0
       react: 19.1.0
-      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0)
+      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1)
       semver: 7.8.0
     transitivePeerDependencies:
       - supports-color
 
-  react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0):
+  react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1):
     dependencies:
       '@jest/create-cache-key-function': 29.7.0
       '@react-native/assets-registry': 0.81.5
-      '@react-native/codegen': 0.81.5(@babel/core@7.29.0)
-      '@react-native/community-cli-plugin': 0.81.5(@react-native/metro-config@0.86.0(@babel/core@7.29.0))
+      '@react-native/codegen': 0.81.5(@babel/core@7.29.0(supports-color@8.1.1))
+      '@react-native/community-cli-plugin': 0.81.5(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(supports-color@8.1.1)
       '@react-native/gradle-plugin': 0.81.5
       '@react-native/js-polyfills': 0.81.5
       '@react-native/normalize-colors': 0.81.5
-      '@react-native/virtualized-lists': 0.81.5(@types/react@19.1.17)(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+      '@react-native/virtualized-lists': 0.81.5(@types/react@19.1.17)(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)
       abort-controller: 3.0.0
       anser: 1.4.10
       ansi-regex: 5.0.1
-      babel-jest: 29.7.0(@babel/core@7.29.0)
+      babel-jest: 29.7.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
       babel-plugin-syntax-hermes-parser: 0.29.1
       base64-js: 1.5.1
       commander: 12.1.0
@@ -17914,7 +18249,7 @@ snapshots:
       jest-environment-node: 29.7.0
       memoize-one: 5.2.1
       metro-runtime: 0.83.3
-      metro-source-map: 0.83.3
+      metro-source-map: 0.83.3(supports-color@8.1.1)
       nullthrows: 1.1.1
       pretty-format: 29.7.0
       promise: 8.3.0
@@ -18226,9 +18561,9 @@ snapshots:
 
   semver@7.8.0: {}
 
-  send@0.19.2:
+  send@0.19.2(supports-color@8.1.1):
     dependencies:
-      debug: 2.6.9
+      debug: 2.6.9(supports-color@8.1.1)
       depd: 2.0.0
       destroy: 1.2.0
       encodeurl: 2.0.0
@@ -18250,11 +18585,11 @@ snapshots:
     dependencies:
       randombytes: 2.1.0
 
-  serve-index@1.9.2:
+  serve-index@1.9.2(supports-color@8.1.1):
     dependencies:
       accepts: 1.3.8
       batch: 0.6.1
-      debug: 2.6.9
+      debug: 2.6.9(supports-color@8.1.1)
       escape-html: 1.0.3
       http-errors: 1.8.1
       mime-types: 2.1.35
@@ -18262,12 +18597,12 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  serve-static@1.16.3:
+  serve-static@1.16.3(supports-color@8.1.1):
     dependencies:
       encodeurl: 2.0.0
       escape-html: 1.0.3
       parseurl: 1.3.3
-      send: 0.19.2
+      send: 0.19.2(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
@@ -18392,16 +18727,16 @@ snapshots:
       uuid: 8.3.2
       websocket-driver: 0.7.4
 
-  sonner-native@0.26.4(c538f2bb3fa64bd80a9a262f75d56c17):
+  sonner-native@0.26.4(dd52c15d65a2604bcf203dfed917879b):
     dependencies:
       react: 19.1.0
-      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0)
-      react-native-gesture-handler: 2.30.1(patch_hash=39b9e51b3977fae8ff61764b8c32934fe3fbddaf21587b4661fd73b7c6dd325b)(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
-      react-native-reanimated: 4.3.2(patch_hash=ab1c095bc473ec5bfd9ead76e870c566660e355e11c5078cfdeb35922d7b2f05)(react-native-worklets@0.8.3(patch_hash=f7263a59ae1c0170af8dfe9a5704cb374d29214a430b4b2841f9b7886c9ba8ad)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
-      react-native-safe-area-context: 5.6.2(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
-      react-native-screens: 4.24.0(patch_hash=74a74b489f8074a1974c2792c9c97aec30d8e251669aa37fc5c99993bb4a19e6)(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
-      react-native-svg: 15.12.1(patch_hash=ae309e9542214f5ae54935e253dedd236765feedac7be343f81d532d7fe09310)(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
-      react-native-worklets: 0.8.3(patch_hash=f7263a59ae1c0170af8dfe9a5704cb374d29214a430b4b2841f9b7886c9ba8ad)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0)(@react-native/metro-config@0.86.0(@babel/core@7.29.0))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1)
+      react-native-gesture-handler: 2.30.1(patch_hash=39b9e51b3977fae8ff61764b8c32934fe3fbddaf21587b4661fd73b7c6dd325b)(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)
+      react-native-reanimated: 4.3.2(patch_hash=ab1c095bc473ec5bfd9ead76e870c566660e355e11c5078cfdeb35922d7b2f05)(react-native-worklets@0.8.3(patch_hash=f7263a59ae1c0170af8dfe9a5704cb374d29214a430b4b2841f9b7886c9ba8ad)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)
+      react-native-safe-area-context: 5.6.2(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)
+      react-native-screens: 4.24.0(patch_hash=74a74b489f8074a1974c2792c9c97aec30d8e251669aa37fc5c99993bb4a19e6)(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)
+      react-native-svg: 15.12.1(patch_hash=ae309e9542214f5ae54935e253dedd236765feedac7be343f81d532d7fe09310)(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)
+      react-native-worklets: 0.8.3(patch_hash=f7263a59ae1c0170af8dfe9a5704cb374d29214a430b4b2841f9b7886c9ba8ad)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1)
 
   sonner@2.0.7(react-dom@19.1.0(react@19.1.0))(react@19.1.0):
     dependencies:
@@ -18412,12 +18747,12 @@ snapshots:
 
   source-map-js@1.2.1: {}
 
-  source-map-loader@3.0.2(webpack@5.106.2(postcss@8.5.14)):
+  source-map-loader@3.0.2(webpack@5.106.2(clean-css@5.3.3)(cssnano@5.1.15(postcss@8.5.14))(csso@5.0.5)(esbuild@0.25.12)(html-minifier-terser@6.1.0)(lightningcss@1.32.0)(postcss@8.5.14)):
     dependencies:
       abab: 2.0.6
       iconv-lite: 0.6.3
       source-map-js: 1.2.1
-      webpack: 5.106.2(postcss@8.5.14)
+      webpack: 5.106.2(clean-css@5.3.3)(cssnano@5.1.15(postcss@8.5.14))(csso@5.0.5)(esbuild@0.25.12)(html-minifier-terser@6.1.0)(lightningcss@1.32.0)(postcss@8.5.14)
 
   source-map-support@0.5.13:
     dependencies:
@@ -18437,9 +18772,9 @@ snapshots:
 
   source-map@0.7.6: {}
 
-  spdy-transport@3.0.0:
+  spdy-transport@3.0.0(supports-color@8.1.1):
     dependencies:
-      debug: 4.4.3
+      debug: 4.4.3(supports-color@8.1.1)
       detect-node: 2.1.0
       hpack.js: 2.1.6
       obuf: 1.1.2
@@ -18448,13 +18783,13 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  spdy@4.0.2:
+  spdy@4.0.2(supports-color@8.1.1):
     dependencies:
-      debug: 4.4.3
+      debug: 4.4.3(supports-color@8.1.1)
       handle-thing: 2.0.1
       http-deceiver: 1.2.7
       select-hose: 2.0.0
-      spdy-transport: 3.0.0
+      spdy-transport: 3.0.0(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
@@ -18594,9 +18929,9 @@ snapshots:
 
   structured-headers@0.4.1: {}
 
-  style-loader@3.3.4(webpack@5.106.2(postcss@8.5.14)):
+  style-loader@3.3.4(webpack@5.106.2(clean-css@5.3.3)(cssnano@5.1.15(postcss@8.5.14))(csso@5.0.5)(esbuild@0.25.12)(html-minifier-terser@6.1.0)(lightningcss@1.32.0)(postcss@8.5.14)):
     dependencies:
-      webpack: 5.106.2(postcss@8.5.14)
+      webpack: 5.106.2(clean-css@5.3.3)(cssnano@5.1.15(postcss@8.5.14))(csso@5.0.5)(esbuild@0.25.12)(html-minifier-terser@6.1.0)(lightningcss@1.32.0)(postcss@8.5.14)
 
   stylehacks@5.1.1(postcss@8.5.14):
     dependencies:
@@ -18672,18 +19007,20 @@ snapshots:
       ansi-escapes: 4.3.2
       supports-hyperlinks: 2.3.0
 
-  terser-webpack-plugin@5.6.0(clean-css@5.3.3)(csso@5.0.5)(esbuild@0.25.12)(html-minifier-terser@6.1.0)(postcss@8.5.14)(webpack@5.106.2(postcss@8.5.14)):
+  terser-webpack-plugin@5.6.0(clean-css@5.3.3)(cssnano@5.1.15(postcss@8.5.14))(csso@5.0.5)(esbuild@0.25.12)(html-minifier-terser@6.1.0)(lightningcss@1.32.0)(postcss@8.5.14)(webpack@5.106.2(clean-css@5.3.3)(cssnano@5.1.15(postcss@8.5.14))(csso@5.0.5)(esbuild@0.25.12)(html-minifier-terser@6.1.0)(lightningcss@1.32.0)(postcss@8.5.14)):
     dependencies:
       '@jridgewell/trace-mapping': 0.3.31
       jest-worker: 27.5.1
       schema-utils: 4.3.3
       terser: 5.47.1
-      webpack: 5.106.2(postcss@8.5.14)
+      webpack: 5.106.2(clean-css@5.3.3)(cssnano@5.1.15(postcss@8.5.14))(csso@5.0.5)(esbuild@0.25.12)(html-minifier-terser@6.1.0)(lightningcss@1.32.0)(postcss@8.5.14)
     optionalDependencies:
       clean-css: 5.3.3
+      cssnano: 5.1.15(postcss@8.5.14)
       csso: 5.0.5
       esbuild: 0.25.12
       html-minifier-terser: 6.1.0
+      lightningcss: 1.32.0
       postcss: 8.5.14
 
   terser@5.47.1:
@@ -18703,6 +19040,8 @@ snapshots:
     dependencies:
       utrie: 1.0.2
 
+  text-table@0.2.0: {}
+
   thenify-all@1.6.0:
     dependencies:
       thenify: 3.3.1
@@ -18711,10 +19050,10 @@ snapshots:
     dependencies:
       any-promise: 1.3.0
 
-  threads@1.7.0:
+  threads@1.7.0(supports-color@8.1.1):
     dependencies:
       callsites: 3.1.0
-      debug: 4.4.3
+      debug: 4.4.3(supports-color@8.1.1)
       is-observable: 2.1.0
       observable-fns: 0.6.1
     optionalDependencies:
@@ -18781,8 +19120,14 @@ snapshots:
 
   tslib@2.8.1: {}
 
+  type-check@0.4.0:
+    dependencies:
+      prelude-ls: 1.2.1
+
   type-detect@4.0.8: {}
 
+  type-fest@0.20.2: {}
+
   type-fest@0.21.3: {}
 
   type-fest@0.7.1: {}
@@ -19043,16 +19388,16 @@ snapshots:
       - bufferutil
       - utf-8-validate
 
-  webpack-dev-middleware@5.3.4(webpack@5.106.2(postcss@8.5.14)):
+  webpack-dev-middleware@5.3.4(webpack@5.106.2(clean-css@5.3.3)(cssnano@5.1.15(postcss@8.5.14))(csso@5.0.5)(esbuild@0.25.12)(html-minifier-terser@6.1.0)(lightningcss@1.32.0)(postcss@8.5.14)):
     dependencies:
       colorette: 2.0.20
       memfs: 3.5.3
       mime-types: 2.1.35
       range-parser: 1.2.1
       schema-utils: 4.3.3
-      webpack: 5.106.2(postcss@8.5.14)
+      webpack: 5.106.2(clean-css@5.3.3)(cssnano@5.1.15(postcss@8.5.14))(csso@5.0.5)(esbuild@0.25.12)(html-minifier-terser@6.1.0)(lightningcss@1.32.0)(postcss@8.5.14)
 
-  webpack-dev-server@4.15.2(webpack@5.106.2(postcss@8.5.14)):
+  webpack-dev-server@4.15.2(debug@4.4.3(supports-color@8.1.1))(supports-color@8.1.1)(webpack@5.106.2(clean-css@5.3.3)(cssnano@5.1.15(postcss@8.5.14))(csso@5.0.5)(esbuild@0.25.12)(html-minifier-terser@6.1.0)(lightningcss@1.32.0)(postcss@8.5.14)):
     dependencies:
       '@types/bonjour': 3.5.13
       '@types/connect-history-api-fallback': 1.5.4
@@ -19065,13 +19410,13 @@ snapshots:
       bonjour-service: 1.3.0
       chokidar: 3.6.0
       colorette: 2.0.20
-      compression: 1.8.1
+      compression: 1.8.1(supports-color@8.1.1)
       connect-history-api-fallback: 2.0.0
       default-gateway: 6.0.3
-      express: 4.22.2
+      express: 4.22.2(supports-color@8.1.1)
       graceful-fs: 4.2.11
       html-entities: 2.6.0
-      http-proxy-middleware: 2.0.9(@types/express@4.17.25)
+      http-proxy-middleware: 2.0.9(@types/express@4.17.25)(debug@4.4.3(supports-color@8.1.1))
       ipaddr.js: 2.4.0
       launch-editor: 2.13.2
       open: 8.4.2
@@ -19079,23 +19424,23 @@ snapshots:
       rimraf: 3.0.2
       schema-utils: 4.3.3
       selfsigned: 2.4.1
-      serve-index: 1.9.2
+      serve-index: 1.9.2(supports-color@8.1.1)
       sockjs: 0.3.24
-      spdy: 4.0.2
-      webpack-dev-middleware: 5.3.4(webpack@5.106.2(postcss@8.5.14))
+      spdy: 4.0.2(supports-color@8.1.1)
+      webpack-dev-middleware: 5.3.4(webpack@5.106.2(clean-css@5.3.3)(cssnano@5.1.15(postcss@8.5.14))(csso@5.0.5)(esbuild@0.25.12)(html-minifier-terser@6.1.0)(lightningcss@1.32.0)(postcss@8.5.14))
       ws: 8.20.1
     optionalDependencies:
-      webpack: 5.106.2(postcss@8.5.14)
+      webpack: 5.106.2(clean-css@5.3.3)(cssnano@5.1.15(postcss@8.5.14))(csso@5.0.5)(esbuild@0.25.12)(html-minifier-terser@6.1.0)(lightningcss@1.32.0)(postcss@8.5.14)
     transitivePeerDependencies:
       - bufferutil
       - debug
       - supports-color
       - utf-8-validate
 
-  webpack-manifest-plugin@4.1.1(webpack@5.106.2(postcss@8.5.14)):
+  webpack-manifest-plugin@4.1.1(webpack@5.106.2(clean-css@5.3.3)(cssnano@5.1.15(postcss@8.5.14))(csso@5.0.5)(esbuild@0.25.12)(html-minifier-terser@6.1.0)(lightningcss@1.32.0)(postcss@8.5.14)):
     dependencies:
       tapable: 2.3.3
-      webpack: 5.106.2(postcss@8.5.14)
+      webpack: 5.106.2(clean-css@5.3.3)(cssnano@5.1.15(postcss@8.5.14))(csso@5.0.5)(esbuild@0.25.12)(html-minifier-terser@6.1.0)(lightningcss@1.32.0)(postcss@8.5.14)
       webpack-sources: 2.3.1
 
   webpack-sources@2.3.1:
@@ -19107,7 +19452,7 @@ snapshots:
 
   webpack-virtual-modules@0.5.0: {}
 
-  webpack@5.106.2(postcss@8.5.14):
+  webpack@5.106.2(clean-css@5.3.3)(cssnano@5.1.15(postcss@8.5.14))(csso@5.0.5)(esbuild@0.25.12)(html-minifier-terser@6.1.0)(lightningcss@1.32.0)(postcss@8.5.14):
     dependencies:
       '@types/eslint-scope': 3.7.7
       '@types/estree': 1.0.6
@@ -19130,7 +19475,7 @@ snapshots:
       neo-async: 2.6.2
       schema-utils: 4.3.3
       tapable: 2.3.3
-      terser-webpack-plugin: 5.6.0(clean-css@5.3.3)(csso@5.0.5)(esbuild@0.25.12)(html-minifier-terser@6.1.0)(postcss@8.5.14)(webpack@5.106.2(postcss@8.5.14))
+      terser-webpack-plugin: 5.6.0(clean-css@5.3.3)(cssnano@5.1.15(postcss@8.5.14))(csso@5.0.5)(esbuild@0.25.12)(html-minifier-terser@6.1.0)(lightningcss@1.32.0)(postcss@8.5.14)(webpack@5.106.2(clean-css@5.3.3)(cssnano@5.1.15(postcss@8.5.14))(csso@5.0.5)(esbuild@0.25.12)(html-minifier-terser@6.1.0)(lightningcss@1.32.0)(postcss@8.5.14))
       watchpack: 2.5.1
       webpack-sources: 3.4.1
     transitivePeerDependencies:
@@ -19228,6 +19573,8 @@ snapshots:
 
   wonka@6.3.6: {}
 
+  word-wrap@1.2.5: {}
+
   wrap-ansi@10.0.0:
     dependencies:
       ansi-styles: 6.2.3
diff --git a/src/components/dialogs/EmailDialog/data/useAccountEmailState.ts b/src/components/dialogs/EmailDialog/data/useAccountEmailState.ts
index f25369f8db..b9edd1629d 100644
--- a/src/components/dialogs/EmailDialog/data/useAccountEmailState.ts
+++ b/src/components/dialogs/EmailDialog/data/useAccountEmailState.ts
@@ -1,7 +1,7 @@
 import {useEffect, useMemo, useState} from 'react'
 import {useQuery} from '@tanstack/react-query'
 
-import {useAgent, useSessionApi} from '#/state/session'
+import {useSession, useSessionApi} from '#/state/session'
 import {emitEmailVerified} from '#/components/dialogs/EmailDialog/events'
 
 export type AccountEmailState = {
@@ -12,24 +12,29 @@ export type AccountEmailState = {
 export const accountEmailStateQueryKey = ['accountEmailState'] as const
 
 export function useAccountEmailState() {
-  const agent = useAgent()
+  /*
+   * Read from the account rather than the agent's session: `partialRefreshSession`
+   * patches the email fields on the account in the reducer (`PasswordSession`
+   * has no setter for them), so the account is the fresh source of truth.
+   */
+  const {currentAccount} = useSession()
   const {partialRefreshSession} = useSessionApi()
   const [prevIsEmailVerified, setPrevEmailIsVerified] = useState(
-    !!agent.session?.emailConfirmed,
+    !!currentAccount?.emailConfirmed,
   )
   const state: AccountEmailState = useMemo(
     () => ({
-      isEmailVerified: !!agent.session?.emailConfirmed,
-      email2FAEnabled: !!agent.session?.emailAuthFactor,
+      isEmailVerified: !!currentAccount?.emailConfirmed,
+      email2FAEnabled: !!currentAccount?.emailAuthFactor,
     }),
-    [agent.session],
+    [currentAccount],
   )
 
   /**
    * Only here to refetch on focus, when necessary
    */
   useQuery({
-    enabled: !!agent.session,
+    enabled: !!currentAccount,
     /**
      * Only refetch if the email verification s incomplete.
      */
diff --git a/src/lib/strings/__tests__/errors.test.ts b/src/lib/strings/__tests__/errors.test.ts
new file mode 100644
index 0000000000..03cdd422c8
--- /dev/null
+++ b/src/lib/strings/__tests__/errors.test.ts
@@ -0,0 +1,126 @@
+import {XRPCError} from '@atproto/api'
+import {LexError, XrpcResponseError} from '@atproto/lex-client'
+import {beforeAll, describe, expect, it} from '@jest/globals'
+import {i18n} from '@lingui/core'
+
+import {cleanError} from '../errors'
+
+/*
+ * `cleanError` returns translated copy, so a locale has to be active. With no
+ * catalog loaded, Lingui falls back to the source message.
+ */
+beforeAll(() => {
+  i18n.loadAndActivate({locale: 'en', messages: {}})
+})
+
+/**
+ * A stand-in for the method schema an `XrpcResponseError` is built against.
+ * The generated lexicons are not available yet, and `XrpcResponseError` only
+ * reads `method` back out for `matchesSchemaErrors()`, which these tests never
+ * call - so a minimal object is enough.
+ */
+const method = {
+  nsid: 'com.atproto.server.createAccount',
+  type: 'procedure',
+  errors: ['HandleNotAvailable'],
+} as unknown as ConstructorParameters<typeof XrpcResponseError>[0]
+
+/** An error as the lex client builds one from a JSON error response body. */
+function xrpcResponseError(
+  error: string,
+  message: string,
+  status: number = 400,
+) {
+  return new XrpcResponseError(method, new Response(null, {status}), {
+    encoding: 'application/json',
+    body: {error, message},
+  })
+}
+
+/**
+ * An error as the lex client builds one from a response with no XRPC error
+ * payload: the code is derived from the HTTP status, and the message is a
+ * generic overview of the response.
+ */
+function xrpcStatusError(status: number) {
+  return new XrpcResponseError(method, new Response(null, {status}), undefined)
+}
+
+describe('cleanError', () => {
+  it('surfaces the clean message of a lex error', () => {
+    const e = xrpcResponseError('HandleNotAvailable', 'Handle already taken')
+    // The raw stringification is class- and code-prefixed, so it must not leak.
+    expect(e.toString()).toBe(
+      'XrpcResponseError: [HandleNotAvailable] Handle already taken',
+    )
+    expect(cleanError(e)).toBe('Handle already taken')
+  })
+
+  it('falls back to the lexicon code when a lex error has no message', () => {
+    // `Error` defaults an absent message to the empty string.
+    const e = new LexError('InvalidRequest')
+    expect(e.toString()).toBe('LexError: [InvalidRequest] ')
+    expect(cleanError(e)).toBe('InvalidRequest')
+  })
+
+  it('matches the upstream-failure branch on a lex error code', () => {
+    // 502 maps to the space-free `UpstreamFailure` lexicon code.
+    const e = xrpcStatusError(502)
+    expect(e.error).toBe('UpstreamFailure')
+    expect(cleanError(e)).toBe(
+      'The server appears to be experiencing issues. Please try again in a few moments.',
+    )
+  })
+
+  it('matches the upstream-failure branch on a legacy XRPC error', () => {
+    const e = new XRPCError(502)
+    expect(cleanError(e)).toBe(
+      'The server appears to be experiencing issues. Please try again in a few moments.',
+    )
+  })
+
+  it('matches NotEnoughResources on both error shapes', () => {
+    expect(cleanError(xrpcStatusError(503))).toBe(
+      'The server appears to be experiencing issues. Please try again in a few moments.',
+    )
+    expect(cleanError(new XRPCError(503))).toBe(
+      'The server appears to be experiencing issues. Please try again in a few moments.',
+    )
+  })
+
+  it('matches the app-password branch on a lex error message', () => {
+    const e = xrpcResponseError('InvalidToken', 'Bad token scope')
+    expect(cleanError(e)).toBe(
+      'This feature is not available while using an App Password. Please sign in with your main password.',
+    )
+  })
+
+  it('matches the network-error branch on a lex error message', () => {
+    const e = xrpcResponseError('InternalServerError', 'Failed to fetch', 500)
+    expect(cleanError(e)).toBe(
+      'Unable to connect. Please check your internet connection and try again.',
+    )
+  })
+
+  it('surfaces the authentication-required code of a lex error', () => {
+    /*
+     * The lex client derives `AuthenticationRequired` from a 401 with no XRPC
+     * payload, where `@atproto/api` used the spaced "Authentication Required".
+     * Neither is special-cased in `cleanError`, so what matters is that the
+     * class- and code-prefixed stringification does not reach the user.
+     */
+    const e = xrpcStatusError(401)
+    expect(e.error).toBe('AuthenticationRequired')
+    expect(cleanError(e)).toBe('Upstream server responded with a 401 error')
+  })
+
+  it('strips a leading "Error: " from a plain error', () => {
+    expect(cleanError(new Error('Something broke'))).toBe('Something broke')
+  })
+
+  it('passes strings through', () => {
+    expect(cleanError('Something broke')).toBe('Something broke')
+    expect(cleanError('')).toBe('')
+    expect(cleanError(undefined)).toBe('')
+  })
+})
diff --git a/src/lib/strings/errors.ts b/src/lib/strings/errors.ts
index 11e7c11362..4f793ec195 100644
--- a/src/lib/strings/errors.ts
+++ b/src/lib/strings/errors.ts
@@ -1,17 +1,51 @@
 import {XRPCError} from '@atproto/api'
+import {LexError} from '@atproto/lex-client'
 import {t} from '@lingui/core/macro'
 
+/**
+ * The text to show the user when no special case applies.
+ *
+ * A `LexError` stringifies as `Class: [ErrorCode] message` (for example
+ * `XrpcResponseError: [HandleNotAvailable] Handle already taken`), so its
+ * `toString()` is never fit for display. Its `message` is the server's
+ * human-readable text, so prefer that and fall back to the lexicon code for the
+ * errors that carry no message.
+ *
+ * Everything else keeps the historical behaviour of stringifying and dropping a
+ * leading `Error: `.
+ */
+function toDisplayString(e: unknown, str: string): string {
+  if (e instanceof LexError) {
+    return e.message || e.error
+  }
+  if (str.startsWith('Error: ')) {
+    return str.slice('Error: '.length)
+  }
+  return str
+}
+
 export function cleanError(e: unknown): string {
   if (!e) {
     return ''
   }
+  /*
+   * Match against the full stringification rather than the display text: it
+   * contains the error name and the lexicon code as well as the message, so a
+   * single check covers both error shapes.
+   */
   // oxlint-disable-next-line typescript/no-base-to-string
   const str = typeof e === 'string' ? e : e.toString()
   if (isNetworkError(str)) {
     return t`Unable to connect. Please check your internet connection and try again.`
   }
+  /*
+   * `@atproto/api` names these with spaces ("Upstream Failure"); lexicon error
+   * codes are space-free ("UpstreamFailure"). Match both while the app throws
+   * both shapes.
+   */
   if (
     str.includes('Upstream Failure') ||
+    str.includes('UpstreamFailure') ||
     str.includes('NotEnoughResources') ||
     str.includes('pipethrough network error')
   ) {
@@ -41,10 +75,7 @@ export function cleanError(e: unknown): string {
   if (str.includes('Unable to resolve handle')) {
     return t`Unable to resolve handle`
   }
-  if (str.startsWith('Error: ')) {
-    return str.slice('Error: '.length)
-  }
-  return str
+  return toDisplayString(e, str)
 }
 
 const NETWORK_ERRORS = [
diff --git a/src/screens/Login/LoginForm.tsx b/src/screens/Login/LoginForm.tsx
index 27361219ec..ad50179bee 100644
--- a/src/screens/Login/LoginForm.tsx
+++ b/src/screens/Login/LoginForm.tsx
@@ -1,9 +1,7 @@
 import {useRef, useState} from 'react'
 import {Keyboard, type TextInput, View} from 'react-native'
-import {
-  ComAtprotoServerCreateSession,
-  type ComAtprotoServerDescribeServer,
-} from '@atproto/api'
+import {type ComAtprotoServerDescribeServer} from '@atproto/api'
+import {LexAuthFactorError} from '@atproto/lex-password-session'
 import {Trans, useLingui} from '@lingui/react/macro'
 
 import {DEFAULT_SERVICE, HITSLOP_10, HITSLOP_20} from '#/lib/constants'
@@ -142,10 +140,11 @@ export const LoginForm = ({
     } catch (err) {
       const errMsg = String(err)
       setIsProcessing(false)
-      if (
-        err instanceof
-        ComAtprotoServerCreateSession.AuthFactorTokenRequiredError
-      ) {
+      /*
+       * `LexAuthFactorError` is what `PasswordSession.login` throws when the
+       * server demands an email 2FA token.
+       */
+      if (err instanceof LexAuthFactorError) {
         setIsAuthFactorTokenNeeded(true)
       } else {
         onAttemptFailed()
diff --git a/src/screens/Signup/state.ts b/src/screens/Signup/state.ts
index 95b3185758..33a5d26a64 100644
--- a/src/screens/Signup/state.ts
+++ b/src/screens/Signup/state.ts
@@ -1,9 +1,7 @@
 import {createContext, useCallback, useContext} from 'react'
 import {LayoutAnimation} from 'react-native'
-import {
-  ComAtprotoServerCreateAccount,
-  type ComAtprotoServerDescribeServer,
-} from '@atproto/api'
+import {type ComAtprotoServerDescribeServer} from '@atproto/api'
+import {XrpcResponseError} from '@atproto/lex-client'
 import {useLingui} from '@lingui/react/macro'
 import * as EmailValidator from 'email-validator'
 
@@ -260,14 +258,35 @@ export const useSignupContext = () => useContext(SignupContext)
  * failure is unexpected and should be reported to Sentry.
  */
 function classifyExpectedSignupError(e: unknown): string | undefined {
-  if (e instanceof ComAtprotoServerCreateAccount.InvalidHandleError)
-    return 'InvalidHandle'
-  if (e instanceof ComAtprotoServerCreateAccount.HandleNotAvailableError)
-    return 'HandleNotAvailable'
-  if (e instanceof ComAtprotoServerCreateAccount.InvalidPasswordError)
-    return 'InvalidPassword'
-  if (e instanceof ComAtprotoServerCreateAccount.UnsupportedDomainError)
-    return 'UnsupportedDomain'
+  /*
+   * TODO: `XrpcResponseError.error` is the open `LexErrorCode` union, so these
+   * codes are compared as plain strings and a typo silently never matches.
+   * Once the generated lexicons land, replace this (and every multi-code error
+   * site) with a shared helper that narrows against the method schema:
+   *
+   *   function matchXrpcError<M extends Procedure | Query>(
+   *     e: unknown,
+   *     method: Main<M>,
+   *   ): InferMethodError<M> | undefined
+   *
+   *   switch (matchXrpcError(e, com.atproto.server.createAccount)) {
+   *     case 'InvalidHandle': ...
+   *   }
+   *
+   * The return type is the method's declared-errors union, so a typo'd case is
+   * a compile error, and undeclared codes fall through to `undefined`. The
+   * helper should also match `e.method.nsid` so a declared code from a
+   * different call cannot match, mirroring the old per-method error classes.
+   */
+  if (e instanceof XrpcResponseError) {
+    switch (e.error) {
+      case 'InvalidHandle':
+      case 'HandleNotAvailable':
+      case 'InvalidPassword':
+      case 'UnsupportedDomain':
+        return e.error
+    }
+  }
   /* the server sends no typed error for this case */
   if (String(e).includes('Email already taken')) return 'EmailTaken'
   if (isNetworkError(e)) return 'NetworkError'
@@ -357,7 +376,7 @@ export function useSubmitSignup() {
       } catch (err) {
         const e = err as Error
         let errMsg = e.toString()
-        if (e instanceof ComAtprotoServerCreateAccount.InvalidInviteCodeError) {
+        if (e instanceof XrpcResponseError && e.error === 'InvalidInviteCode') {
           dispatch({
             type: 'setError',
             value: l`Invite code not accepted. Check that you input it correctly and try again.`,
diff --git a/src/state/persisted/index.ts b/src/state/persisted/index.ts
index 8c043a3420..0659e7817b 100644
--- a/src/state/persisted/index.ts
+++ b/src/state/persisted/index.ts
@@ -31,6 +31,18 @@ export function get<K extends keyof Schema>(key: K): Schema[K] {
 }
 get satisfies PersistedApi['get']
 
+/**
+ * Native is single-instance: there is no other tab that could have written
+ * newer data behind our back, so the in-memory `_state` is already the truth
+ * and a synchronous fresh read is impossible anyway (AsyncStorage is async).
+ * This mirrors {@link get}; the web implementation is the one that actually
+ * re-reads the store.
+ */
+export function readLatest<K extends keyof Schema>(key: K): Schema[K] {
+  return _state[key]
+}
+readLatest satisfies PersistedApi['readLatest']
+
 export async function write<K extends keyof Schema>(
   key: K,
   value: Schema[K],
diff --git a/src/state/persisted/index.web.ts b/src/state/persisted/index.web.ts
index 35e796810d..a4c5d1b247 100644
--- a/src/state/persisted/index.web.ts
+++ b/src/state/persisted/index.web.ts
@@ -39,6 +39,29 @@ export function get<K extends keyof Schema>(key: K): Schema[K] {
 }
 get satisfies PersistedApi['get']
 
+/**
+ * Force a fresh synchronous re-read of localStorage and return the requested
+ * key from it, WITHOUT adopting it as `_state`.
+ *
+ * This exists for the cross-tab expiry-rescue path. A frozen tab may not have
+ * processed a queued broadcast yet, so {@link get} (and persisted's in-memory
+ * `_state`) can be stale even though another tab already wrote healthy tokens
+ * to storage. Reading through storage directly here is the only way to see the
+ * true cross-tab-latest tokens on web.
+ *
+ * Crucially we do NOT adopt into `_state`. {@link readFromStorage} memoizes by
+ * raw string and returns the same object reference for unchanged data, so
+ * adopting here would make the later queued broadcast/storage event for that
+ * same write see `next === _state` and suppress its listener notification -
+ * leaving non-current-account changes (removals, other tokens, metadata) stale
+ * indefinitely. Leaving `_state` alone lets that queued event still fire.
+ */
+export function readLatest<K extends keyof Schema>(key: K): Schema[K] {
+  const next = readFromStorage()
+  return next?.[key] ?? _state[key]
+}
+readLatest satisfies PersistedApi['readLatest']
+
 // eslint-disable-next-line @typescript-eslint/require-await
 export async function write<K extends keyof Schema>(
   key: K,
diff --git a/src/state/persisted/types.ts b/src/state/persisted/types.ts
index d1fdfc26cb..4b5a29d938 100644
--- a/src/state/persisted/types.ts
+++ b/src/state/persisted/types.ts
@@ -3,6 +3,15 @@ import {type Schema} from './schema'
 export type PersistedApi = {
   init(): Promise<void>
   get<K extends keyof Schema>(key: K): Schema[K]
+  /**
+   * Like {@link get}, but on web forces a fresh synchronous re-read of the
+   * backing store before returning (without adopting it as the in-memory
+   * state). This exists for the cross-tab expiry-rescue path: a frozen tab may
+   * not have processed a queued broadcast yet, so {@link get} can be stale
+   * while another tab has already written healthy tokens to storage. On native
+   * it is identical to {@link get} (single-instance, no other writer).
+   */
+  readLatest<K extends keyof Schema>(key: K): Schema[K]
   write<K extends keyof Schema>(key: K, value: Schema[K]): Promise<void>
   onUpdate<K extends keyof Schema>(
     key: K,
diff --git a/src/state/queries/preferences/index.ts b/src/state/queries/preferences/index.ts
index 41adfc9a04..a5803a9c7b 100644
--- a/src/state/queries/preferences/index.ts
+++ b/src/state/queries/preferences/index.ts
@@ -21,7 +21,7 @@ import {
 } from '#/state/queries/preferences/types'
 import {createQueryKey} from '#/state/queries/util'
 import {useAgent} from '#/state/session'
-import {saveLabelers} from '#/state/session/agent-config'
+import {saveLabelers} from '#/state/session/moderation'
 import {useAgeAssurance} from '#/ageAssurance'
 import {makeAgeRestrictedModerationPrefs} from '#/ageAssurance/util'
 import {useAnalytics} from '#/analytics'
@@ -53,7 +53,7 @@ export function usePreferencesQuery() {
         const res = await agent.getPreferences()
 
         // save to local storage to ensure there are labels on initial requests
-        void saveLabelers(
+        saveLabelers(
           agent.did,
           res.moderationPrefs.labelers.map(l => l.did),
         )
diff --git a/src/state/session/__tests__/bridge-agent-test.ts b/src/state/session/__tests__/bridge-agent-test.ts
new file mode 100644
index 0000000000..cbd606d12a
--- /dev/null
+++ b/src/state/session/__tests__/bridge-agent-test.ts
@@ -0,0 +1,573 @@
+import {
+  PasswordSession,
+  type PasswordSessionOptions,
+  type SessionData,
+} from '@atproto/lex-password-session'
+import {beforeEach, describe, expect, it, jest} from '@jest/globals'
+
+jest.mock('#/state/events', () => ({
+  emitNetworkConfirmed: jest.fn(),
+  emitNetworkLost: jest.fn(),
+}))
+
+jest.mock('jwt-decode', () => ({
+  jwtDecode() {
+    return {scope: 'com.atproto.access'}
+  },
+}))
+
+import {BskyAppAgent, PasswordSessionManager} from '../bridge-agent'
+import {sessionAccountToSessionData} from '../session-data'
+import {type SessionAccount} from '../types'
+import {
+  asFetch,
+  DID,
+  DIDDOC_PDS_HOST,
+  HANDLE,
+  json,
+  makeAccount,
+  makeDidDoc,
+  makeMockFetch,
+  type MockFetch,
+  PDS_HOST,
+  SERVICE,
+  urlsOf,
+} from './mock-fetch'
+
+/**
+ * Build the manager + agent pair under test.
+ *
+ * The mock fetch is installed in both places it can be reached from: as the
+ * inner `PasswordSession`'s fetch (the authenticated path) and, via
+ * `setFetch`, as the manager's own fetch (the unauthenticated bypass path,
+ * which would otherwise use the real network-aware fetch).
+ */
+function setup({
+  account = makeAccount(),
+  didDoc,
+  pdsUrl,
+  fetchMock = makeMockFetch(),
+  sessionOptions,
+}: {
+  account?: SessionAccount
+  didDoc?: SessionData['didDoc']
+  pdsUrl?: string
+  fetchMock?: MockFetch
+  sessionOptions?: PasswordSessionOptions
+} = {}) {
+  const data: SessionData = {
+    ...sessionAccountToSessionData(account),
+    ...(didDoc ? {didDoc} : {}),
+  }
+  const inner = new PasswordSession(data, {
+    fetch: asFetch(fetchMock),
+    ...sessionOptions,
+  })
+  const manager = new PasswordSessionManager(inner, {
+    service: account.service,
+    pdsUrl,
+  })
+  manager.setFetch(asFetch(fetchMock))
+  const agent = new BskyAppAgent(manager)
+  return {inner, manager, agent, fetchMock}
+}
+
+function setupPublic(fetchMock: MockFetch = makeMockFetch()) {
+  const manager = new PasswordSessionManager(null, {service: SERVICE})
+  manager.setFetch(asFetch(fetchMock))
+  return {manager, agent: new BskyAppAgent(manager), fetchMock}
+}
+
+describe('PasswordSessionManager getters', () => {
+  it('reads live SessionData through .session', () => {
+    const {agent} = setup()
+    expect(agent.session?.did).toBe(DID)
+    expect(agent.session?.handle).toBe(HANDLE)
+    expect(agent.session?.email).toBe('alice@example.com')
+    expect(agent.session?.emailConfirmed).toBe(true)
+    expect(agent.did).toBe(DID)
+    expect(agent.hasSession).toBe(true)
+  })
+
+  it('defaults active to true when the payload omits it', () => {
+    const {agent} = setup({account: makeAccount({active: undefined})})
+    expect(agent.session?.active).toBe(true)
+  })
+
+  it('exposes serviceUrl from the constructor service', () => {
+    const {agent} = setup()
+    expect(agent.serviceUrl.toString()).toBe('https://bsky.social/')
+  })
+
+  it('derives pdsUrl/dispatchUrl from the didDoc', () => {
+    const {agent} = setup({didDoc: makeDidDoc(PDS_HOST)})
+    expect(agent.pdsUrl?.toString()).toBe(`${PDS_HOST}/`)
+    expect(agent.dispatchUrl.toString()).toBe(`${PDS_HOST}/`)
+  })
+
+  it('falls back to the stored pdsUrl when there is no didDoc', () => {
+    const {agent} = setup({pdsUrl: PDS_HOST})
+    expect(agent.pdsUrl?.toString()).toBe(`${PDS_HOST}/`)
+    expect(agent.dispatchUrl.toString()).toBe(`${PDS_HOST}/`)
+  })
+
+  it('prefers the didDoc PDS over the stored pdsUrl', () => {
+    const {agent} = setup({
+      didDoc: makeDidDoc(DIDDOC_PDS_HOST),
+      pdsUrl: PDS_HOST,
+    })
+    expect(agent.pdsUrl?.toString()).toBe(`${DIDDOC_PDS_HOST}/`)
+  })
+
+  it('dispatchUrl falls back to serviceUrl with no PDS at all', () => {
+    const {agent} = setup()
+    expect(agent.pdsUrl).toBe(undefined)
+    expect(agent.dispatchUrl.toString()).toBe('https://bsky.social/')
+  })
+
+  it('ignores an unparseable stored pdsUrl', () => {
+    const {agent} = setup({pdsUrl: 'not a url'})
+    expect(agent.pdsUrl).toBe(undefined)
+    expect(agent.dispatchUrl.toString()).toBe('https://bsky.social/')
+  })
+
+  it('matches the inner session on didDocs a strict validator would reject', () => {
+    /*
+     * No `id` on the document and a non-canonical service `type`: enough for
+     * isValidDidDoc/getPdsEndpoint to bail, but PasswordSession still routes
+     * here, so the bridge must agree or dispatchUrl lies about where requests
+     * go (and service-auth aud gets minted for the wrong host).
+     */
+    const {agent} = setup({
+      didDoc: {
+        service: [
+          {
+            id: '#atproto_pds',
+            type: 'SomethingElse',
+            serviceEndpoint: DIDDOC_PDS_HOST,
+          },
+        ],
+      },
+      pdsUrl: PDS_HOST,
+    })
+    expect(agent.pdsUrl?.toString()).toBe(`${DIDDOC_PDS_HOST}/`)
+    expect(agent.dispatchUrl.toString()).toBe(`${DIDDOC_PDS_HOST}/`)
+  })
+
+  it('falls back to the stored pdsUrl when the didDoc has no PDS service', () => {
+    const {agent} = setup({
+      didDoc: {
+        id: DID,
+        service: [
+          {
+            id: '#bsky_notif',
+            type: 'BskyNotificationService',
+            serviceEndpoint: DIDDOC_PDS_HOST,
+          },
+        ],
+      },
+      pdsUrl: PDS_HOST,
+    })
+    expect(agent.pdsUrl?.toString()).toBe(`${PDS_HOST}/`)
+  })
+
+  it('falls back to the stored pdsUrl when the PDS endpoint does not parse', () => {
+    const {agent} = setup({
+      didDoc: {
+        id: DID,
+        service: [
+          {
+            id: '#atproto_pds',
+            type: 'AtprotoPersonalDataServer',
+            serviceEndpoint: 'not a url',
+          },
+        ],
+      },
+      pdsUrl: PDS_HOST,
+    })
+    expect(agent.pdsUrl?.toString()).toBe(`${PDS_HOST}/`)
+  })
+})
+
+describe('PasswordSessionManager.session identity', () => {
+  it('is stable across consecutive reads', () => {
+    const {agent} = setup()
+    expect(agent.session).toBe(agent.session)
+  })
+
+  it('is a new object after a refresh rotates tokens', async () => {
+    const {agent} = setup()
+    const before = agent.session
+    expect(before?.accessJwt).toBe('access-jwt')
+    await agent.sessionManager.refreshSession()
+    const after = agent.session
+    expect(after).not.toBe(before)
+    expect(after?.accessJwt).toBe('access-jwt-2')
+    expect(after).toBe(agent.session)
+  })
+
+  it('rejects writes to .session', () => {
+    const {agent} = setup()
+    expect(() => {
+      /* the whole point of the accessor: writes must not silently drift */
+      agent.sessionManager.session = agent.session
+    }).toThrow('read-only')
+  })
+
+  it('rejects writes to .pdsUrl', () => {
+    const {agent} = setup()
+    expect(() => {
+      agent.sessionManager.pdsUrl = new URL(PDS_HOST)
+    }).toThrow('read-only')
+  })
+})
+
+describe('PasswordSessionManager.fetchHandler routing', () => {
+  it('dispatches to the stored PDS before a refresh, then to the didDoc PDS', async () => {
+    const {manager, fetchMock} = setup({pdsUrl: PDS_HOST})
+
+    await manager.fetchHandler('/xrpc/app.bsky.actor.getProfile')
+    expect(urlsOf(fetchMock).at(-1)).toBe(
+      `${PDS_HOST}/xrpc/app.bsky.actor.getProfile`,
+    )
+
+    /* the refresh response carries a didDoc pointing at a different host */
+    await manager.refreshSession()
+    expect(manager.pdsUrl?.toString()).toBe(`${DIDDOC_PDS_HOST}/`)
+
+    await manager.fetchHandler('/xrpc/app.bsky.actor.getProfile')
+    expect(urlsOf(fetchMock).at(-1)).toBe(
+      `${DIDDOC_PDS_HOST}/xrpc/app.bsky.actor.getProfile`,
+    )
+  })
+
+  it('attaches the session bearer token', async () => {
+    const seen: Headers[] = []
+    const fetchMock = makeMockFetch({
+      'app.bsky.actor.getProfile': (_url, init) => {
+        seen.push(new Headers(init.headers))
+        return json({})
+      },
+    })
+    const {manager} = setup({fetchMock})
+    await manager.fetchHandler('/xrpc/app.bsky.actor.getProfile')
+    expect(seen[0].get('authorization')).toBe('Bearer access-jwt')
+  })
+
+  it('bypasses the inner session when authorization is pre-set', async () => {
+    const seen: Headers[] = []
+    const fetchMock = makeMockFetch({
+      'com.atproto.server.describeServer': (_url, init) => {
+        seen.push(new Headers(init.headers))
+        return json({})
+      },
+    })
+    const {manager} = setup({fetchMock, pdsUrl: PDS_HOST})
+
+    /*
+     * PasswordSession throws TypeError on a pre-set authorization header, so
+     * this path must never reach it.
+     */
+    await expect(
+      manager.fetchHandler('/xrpc/com.atproto.server.describeServer', {
+        headers: {authorization: 'Bearer caller-supplied'},
+      }),
+    ).resolves.toBeDefined()
+
+    expect(seen.length).toBe(1)
+    /* the caller's header survives, and there is exactly one of them */
+    expect(seen[0].get('authorization')).toBe('Bearer caller-supplied')
+    expect(urlsOf(fetchMock).at(-1)).toBe(
+      `${PDS_HOST}/xrpc/com.atproto.server.describeServer`,
+    )
+  })
+})
+
+describe('BskyAppAgent namespace requests', () => {
+  it('carries proxy, labeler and bearer headers to the dispatch host', async () => {
+    const seen: {url: string; headers: Headers}[] = []
+    const fetchMock = makeMockFetch({
+      'app.bsky.actor.getProfile': (url, init) => {
+        seen.push({url, headers: new Headers(init.headers)})
+        return json({did: DID, handle: HANDLE})
+      },
+    })
+    const {agent} = setup({fetchMock, pdsUrl: PDS_HOST})
+    agent.configureProxy('did:web:api.bsky.app#bsky_appview')
+    agent.configureLabelers(['did:plc:custom-labeler'])
+
+    /*
+     * The request headers (what we assert) are captured by the fetch mock
+     * before the agent parses the response body. Response-body lexicon
+     * validation can throw in the jest environment (a multiformats CID mock
+     * quirk unrelated to the header composition under test), so we ignore any
+     * parse error here.
+     */
+    await agent.app.bsky.actor.getProfile({actor: HANDLE}).catch(() => {})
+
+    expect(seen.length).toBe(1)
+    expect(seen[0].url.startsWith(`${PDS_HOST}/xrpc/`)).toBe(true)
+    expect(seen[0].headers.get('atproto-proxy')).toBe(
+      'did:web:api.bsky.app#bsky_appview',
+    )
+    expect(seen[0].headers.get('atproto-accept-labelers')).toContain(
+      'did:plc:custom-labeler',
+    )
+    expect(seen[0].headers.get('authorization')).toBe('Bearer access-jwt')
+  })
+})
+
+describe('PasswordSessionManager.refreshSession', () => {
+  it('returns an old-shaped XRPC envelope with fresh tokens', async () => {
+    const {manager, fetchMock} = setup()
+    const res = await manager.refreshSession()
+    expect(res.success).toBe(true)
+    expect(res.data.accessJwt).toBe('access-jwt-2')
+    expect(res.data.refreshJwt).toBe('refresh-jwt-2')
+    expect(res.data.did).toBe(DID)
+    expect(res.data.handle).toBe(HANDLE)
+    expect(
+      urlsOf(fetchMock).some(u =>
+        u.includes('com.atproto.server.refreshSession'),
+      ),
+    ).toBe(true)
+  })
+
+  it('throws when there is no live session', async () => {
+    const {manager} = setupPublic()
+    await expect(manager.refreshSession()).rejects.toThrow(
+      'No session to refresh',
+    )
+  })
+})
+
+describe('PasswordSessionManager.resumeSession', () => {
+  const staleData = {
+    accessJwt: 'stale-access',
+    refreshJwt: 'stale-refresh',
+    handle: 'stale.test',
+    did: DID,
+    active: true,
+  }
+
+  it('ignores its argument and returns fresh tokens from a refresh', async () => {
+    const {manager} = setup()
+    const res = await manager.resumeSession(staleData)
+    expect(res.data.accessJwt).toBe('access-jwt-2')
+    expect(res.data.refreshJwt).toBe('refresh-jwt-2')
+    expect(manager.session?.accessJwt).toBe('access-jwt-2')
+  })
+
+  it('is reachable through the agent and does not install the stale data', async () => {
+    const {agent} = setup()
+    await agent.resumeSession(staleData)
+    expect(agent.session?.accessJwt).toBe('access-jwt-2')
+    expect(agent.session?.handle).toBe(HANDLE)
+  })
+})
+
+describe('PasswordSessionManager unsupported methods', () => {
+  it('refuses login()', async () => {
+    const {agent} = setup()
+    await expect(
+      agent.login({identifier: HANDLE, password: 'hunter2'}),
+    ).rejects.toThrow('Not supported on PasswordSessionManager')
+  })
+
+  it('refuses createAccount()', async () => {
+    const {agent} = setup()
+    await expect(
+      agent.createAccount({handle: HANDLE, email: 'a@b.c', password: 'x'}),
+    ).rejects.toThrow('Not supported on PasswordSessionManager')
+  })
+})
+
+describe('PasswordSessionManager destroyed inner session', () => {
+  it('getters return undefined rather than throwing after logout', async () => {
+    const {agent, inner} = setup()
+    await agent.logout()
+    expect(inner.destroyed).toBe(true)
+    /* PasswordSession.did/.session throw once destroyed; the bridge must not */
+    expect(() => agent.did).not.toThrow()
+    expect(agent.did).toBe(undefined)
+    expect(agent.session).toBe(undefined)
+    expect(agent.hasSession).toBe(false)
+    expect(agent.pdsUrl).toBe(undefined)
+  })
+
+  it('logout() is idempotent', async () => {
+    const {agent} = setup()
+    await agent.logout()
+    await expect(agent.logout()).resolves.toBeUndefined()
+  })
+
+  it('fetchHandler stops attaching auth once destroyed', async () => {
+    const seen: Headers[] = []
+    const fetchMock = makeMockFetch({
+      'app.bsky.actor.getProfile': (_url, init) => {
+        seen.push(new Headers(init.headers))
+        return json({})
+      },
+    })
+    const {agent, manager} = setup({fetchMock})
+    await agent.logout()
+    await manager.fetchHandler('/xrpc/app.bsky.actor.getProfile')
+    expect(seen.length).toBe(1)
+    expect(seen[0].get('authorization')).toBe(null)
+  })
+})
+
+describe('BskyAppAgent.dispose', () => {
+  let ctx: ReturnType<typeof setup>
+
+  beforeEach(() => {
+    ctx = setup({pdsUrl: PDS_HOST})
+  })
+
+  it('makes the session read as logged out', () => {
+    expect(ctx.agent.session).toBeDefined()
+    ctx.agent.dispose()
+    expect(ctx.agent.session).toBe(undefined)
+    expect(ctx.agent.did).toBe(undefined)
+    expect(ctx.agent.pdsUrl).toBe(undefined)
+    expect(ctx.agent.hasSession).toBe(false)
+  })
+
+  it('routes requests through the plain unauthenticated fetch', async () => {
+    const seen: Headers[] = []
+    const fetchMock = makeMockFetch({
+      'app.bsky.actor.getProfile': (_url, init) => {
+        seen.push(new Headers(init.headers))
+        return json({})
+      },
+    })
+    const {agent, manager} = setup({fetchMock, pdsUrl: PDS_HOST})
+    agent.dispose()
+    await manager.fetchHandler('/xrpc/app.bsky.actor.getProfile')
+    expect(seen.length).toBe(1)
+    expect(seen[0].get('authorization')).toBe(null)
+    /* dispatch falls back to the service, since pdsUrl now reads undefined */
+    expect(urlsOf(fetchMock).at(-1)).toBe(
+      `${SERVICE}/xrpc/app.bsky.actor.getProfile`,
+    )
+  })
+
+  it('leaves refreshSession unusable', async () => {
+    ctx.agent.dispose()
+    await expect(ctx.agent.sessionManager.refreshSession()).rejects.toThrow(
+      'No session to refresh',
+    )
+  })
+})
+
+describe('public PasswordSessionManager (no inner session)', () => {
+  it('reads as logged out', () => {
+    const {agent} = setupPublic()
+    expect(agent.session).toBe(undefined)
+    expect(agent.did).toBe(undefined)
+    expect(agent.hasSession).toBe(false)
+    expect(agent.pdsUrl).toBe(undefined)
+    expect(agent.dispatchUrl.toString()).toBe('https://bsky.social/')
+  })
+
+  it('dispatches to the service unauthenticated', async () => {
+    const seen: Headers[] = []
+    const fetchMock = makeMockFetch({
+      'app.bsky.feed.getFeed': (_url, init) => {
+        seen.push(new Headers(init.headers))
+        return json({})
+      },
+    })
+    const {manager} = setupPublic(fetchMock)
+    await manager.fetchHandler('/xrpc/app.bsky.feed.getFeed')
+    expect(seen.length).toBe(1)
+    expect(seen[0].get('authorization')).toBe(null)
+    expect(urlsOf(fetchMock).at(-1)).toBe(
+      `${SERVICE}/xrpc/app.bsky.feed.getFeed`,
+    )
+  })
+})
+
+describe('PasswordSession lifecycle over mocked fetch', () => {
+  it('resume fast path: constructing does not hit the network', () => {
+    const fetchMock = makeMockFetch()
+    setup({fetchMock})
+    expect(fetchMock.mock.calls.length).toBe(0)
+  })
+
+  it('a refresh fires onUpdated with fresh tokens', async () => {
+    const onUpdated =
+      jest.fn<NonNullable<PasswordSessionOptions['onUpdated']>>()
+    const {manager} = setup({sessionOptions: {onUpdated}})
+    await manager.refreshSession()
+    expect(onUpdated).toHaveBeenCalledTimes(1)
+    expect(manager.session?.accessJwt).toBe('access-jwt-2')
+  })
+
+  it('onDeleted fires when refresh returns a declared invalid-token error', async () => {
+    const onDeleted =
+      jest.fn<NonNullable<PasswordSessionOptions['onDeleted']>>()
+    const onUpdated =
+      jest.fn<NonNullable<PasswordSessionOptions['onUpdated']>>()
+    const fetchMock = makeMockFetch({
+      'com.atproto.server.refreshSession': () =>
+        json({error: 'ExpiredToken', message: 'Token expired'}, 400),
+    })
+    const {manager} = setup({fetchMock, sessionOptions: {onDeleted, onUpdated}})
+    await expect(manager.refreshSession()).rejects.toBeDefined()
+    expect(onDeleted).toHaveBeenCalledTimes(1)
+    expect(onUpdated).not.toHaveBeenCalled()
+    /* and the bridge reads as logged out afterwards */
+    expect(manager.session).toBe(undefined)
+  })
+
+  it('onUpdateFailure fires on a transient (500) refresh error, session preserved', async () => {
+    const onDeleted =
+      jest.fn<NonNullable<PasswordSessionOptions['onDeleted']>>()
+    const onUpdateFailure =
+      jest.fn<NonNullable<PasswordSessionOptions['onUpdateFailure']>>()
+    const fetchMock = makeMockFetch({
+      'com.atproto.server.refreshSession': () =>
+        json({error: 'InternalServerError'}, 500),
+    })
+    const {manager} = setup({
+      fetchMock,
+      sessionOptions: {onDeleted, onUpdateFailure},
+    })
+    /*
+     * PasswordSession.refresh() resolves with the unchanged data here; the
+     * bridge restores the old CredentialSession contract by rejecting.
+     */
+    await expect(manager.refreshSession()).rejects.toThrow(
+      'Failed to refresh session',
+    )
+    expect(onUpdateFailure).toHaveBeenCalledTimes(1)
+    expect(onDeleted).not.toHaveBeenCalled()
+    expect(manager.session?.accessJwt).toBe('access-jwt')
+  })
+
+  it('rejects on a network error rather than reporting a no-op success', async () => {
+    const fetchMock = makeMockFetch({
+      'com.atproto.server.refreshSession': () => {
+        throw new TypeError('Network request failed')
+      },
+    })
+    const {manager} = setup({fetchMock})
+    await expect(manager.refreshSession()).rejects.toThrow(
+      'Failed to refresh session',
+    )
+    /* the session survives, exactly as the old transient-failure path did */
+    expect(manager.session?.accessJwt).toBe('access-jwt')
+  })
+
+  it('resumeSession rejects on a transient failure too', async () => {
+    const fetchMock = makeMockFetch({
+      'com.atproto.server.refreshSession': () =>
+        json({error: 'InternalServerError'}, 500),
+    })
+    const {agent} = setup({fetchMock})
+    await expect(agent.resumeSession(agent.session!)).rejects.toThrow(
+      'Failed to refresh session',
+    )
+  })
+})
diff --git a/src/state/session/__tests__/expiry-rescue-test.ts b/src/state/session/__tests__/expiry-rescue-test.ts
new file mode 100644
index 0000000000..c33eb527de
--- /dev/null
+++ b/src/state/session/__tests__/expiry-rescue-test.ts
@@ -0,0 +1,104 @@
+import {describe, expect, it} from '@jest/globals'
+
+import {
+  MAX_EXPIRY_RESCUE_GENERATIONS,
+  pickExpiryRescueCandidate,
+} from '../expiry-rescue'
+import {type SessionAccount} from '../types'
+
+function makeAccount(overrides: Partial<SessionAccount> = {}): SessionAccount {
+  return {
+    service: 'https://bsky.social',
+    did: 'did:plc:example123',
+    handle: 'alice.test',
+    email: 'alice@example.com',
+    emailConfirmed: true,
+    emailAuthFactor: false,
+    refreshJwt: 'refresh-jwt',
+    accessJwt: 'access-jwt',
+    signupQueued: false,
+    active: true,
+    status: undefined,
+    pdsUrl: undefined,
+    isSelfHosted: false,
+    ...overrides,
+  }
+}
+
+describe('pickExpiryRescueCandidate', () => {
+  it('picks a candidate whose refreshJwt differs from the dying one', () => {
+    const fresh = makeAccount({refreshJwt: 'refresh-jwt-2'})
+    const picked = pickExpiryRescueCandidate({
+      dyingRefreshJwt: 'refresh-jwt-1',
+      candidates: [fresh],
+      failedRefreshJwts: new Set(),
+    })
+    expect(picked).toBe(fresh)
+  })
+
+  it('rejects a candidate carrying the dying refreshJwt (equally dead)', () => {
+    const picked = pickExpiryRescueCandidate({
+      dyingRefreshJwt: 'refresh-jwt-1',
+      candidates: [makeAccount({refreshJwt: 'refresh-jwt-1'})],
+      failedRefreshJwts: new Set(),
+    })
+    expect(picked).toBe(undefined)
+  })
+
+  it('rejects a candidate with no refreshJwt', () => {
+    const picked = pickExpiryRescueCandidate({
+      dyingRefreshJwt: 'refresh-jwt-1',
+      candidates: [makeAccount({refreshJwt: undefined}), undefined],
+      failedRefreshJwts: new Set(),
+    })
+    expect(picked).toBe(undefined)
+  })
+
+  it('rejects a candidate already recorded as failed (loop guard)', () => {
+    const picked = pickExpiryRescueCandidate({
+      dyingRefreshJwt: 'refresh-jwt-1',
+      candidates: [makeAccount({refreshJwt: 'refresh-jwt-2'})],
+      failedRefreshJwts: new Set(['refresh-jwt-2']),
+    })
+    expect(picked).toBe(undefined)
+  })
+
+  it('tries candidates in order, preferring the first qualifying one', () => {
+    const persistedCandidate = makeAccount({
+      refreshJwt: 'refresh-jwt-persisted',
+    })
+    const reducerCandidate = makeAccount({refreshJwt: 'refresh-jwt-reducer'})
+    const picked = pickExpiryRescueCandidate({
+      dyingRefreshJwt: 'refresh-jwt-1',
+      candidates: [persistedCandidate, reducerCandidate],
+      failedRefreshJwts: new Set(),
+    })
+    expect(picked).toBe(persistedCandidate)
+  })
+
+  it('skips an unusable first candidate and falls back to a later one', () => {
+    const reducerCandidate = makeAccount({refreshJwt: 'refresh-jwt-reducer'})
+    const picked = pickExpiryRescueCandidate({
+      dyingRefreshJwt: 'refresh-jwt-1',
+      candidates: [
+        makeAccount({refreshJwt: 'refresh-jwt-1'}),
+        reducerCandidate,
+      ],
+      failedRefreshJwts: new Set(),
+    })
+    expect(picked).toBe(reducerCandidate)
+  })
+
+  it('gives up once the failed-generation set hits the hard cap', () => {
+    const failed = new Set<string>()
+    for (let i = 0; i < MAX_EXPIRY_RESCUE_GENERATIONS; i++) {
+      failed.add(`refresh-jwt-failed-${i}`)
+    }
+    const picked = pickExpiryRescueCandidate({
+      dyingRefreshJwt: 'refresh-jwt-dying',
+      candidates: [makeAccount({refreshJwt: 'refresh-jwt-brand-new'})],
+      failedRefreshJwts: failed,
+    })
+    expect(picked).toBe(undefined)
+  })
+})
diff --git a/src/state/session/__tests__/mock-fetch.ts b/src/state/session/__tests__/mock-fetch.ts
new file mode 100644
index 0000000000..a107d8dc3c
--- /dev/null
+++ b/src/state/session/__tests__/mock-fetch.ts
@@ -0,0 +1,126 @@
+import {jest} from '@jest/globals'
+
+import {type SessionAccount} from '../types'
+
+/*
+ * Shared fixtures for the suites that drive a real `PasswordSession` over a
+ * stubbed network. Not a suite itself - the filename deliberately avoids the
+ * `-test` suffix so jest does not collect it.
+ */
+
+export const DID = 'did:plc:example123'
+export const HANDLE = 'alice.test'
+export const SERVICE = 'https://bsky.social'
+/** A PDS host an account may be pinned to by its stored `pdsUrl`. */
+export const PDS_HOST = 'https://shimeji.us-east.host.bsky.network'
+/** A different PDS host, delivered by the didDoc a refresh returns. */
+export const DIDDOC_PDS_HOST = 'https://morel.us-west.host.bsky.network'
+
+export function json(body: unknown, status = 200) {
+  return new Response(JSON.stringify(body), {
+    status,
+    headers: {'content-type': 'application/json'},
+  })
+}
+
+/** A minimal valid DID document whose only service entry is a PDS. */
+export function makeDidDoc(pdsUrl: string, did: string = DID) {
+  return {
+    id: did,
+    service: [
+      {
+        id: '#atproto_pds',
+        type: 'AtprotoPersonalDataServer',
+        serviceEndpoint: pdsUrl,
+      },
+    ],
+  }
+}
+
+export function makeAccount(
+  overrides: Partial<SessionAccount> = {},
+): SessionAccount {
+  return {
+    service: SERVICE,
+    did: DID,
+    handle: HANDLE,
+    email: 'alice@example.com',
+    emailConfirmed: true,
+    emailAuthFactor: false,
+    refreshJwt: 'refresh-jwt',
+    accessJwt: 'access-jwt',
+    signupQueued: false,
+    active: true,
+    status: undefined,
+    pdsUrl: undefined,
+    isSelfHosted: false,
+    ...overrides,
+  }
+}
+
+/**
+ * Build a mock `fetch` that returns canned XRPC responses keyed by the last
+ * path segment (nsid). `refreshSession` returns fresh tokens; `getSession`
+ * echoes the account; anything else returns an empty 200.
+ *
+ * The refresh response carries both `emailConfirmed` and a `didDoc` so the
+ * library has no reason to make a `getSession` follow-up call, which keeps the
+ * recorded request list assertable. Its didDoc points at
+ * {@link DIDDOC_PDS_HOST}, a different host from {@link PDS_HOST}, so PDS
+ * re-routing after a refresh is observable.
+ */
+export function makeMockFetch(
+  overrides: Record<
+    string,
+    (url: string, init: RequestInit) => Response | Promise<Response>
+  > = {},
+) {
+  return jest.fn(
+    /*
+     * PasswordSession calls fetch with a URL object (new URL(path, service));
+     * asFetch() below widens the mock to the full fetch signature it expects.
+     */
+    async (input: URL | string, init: RequestInit = {}): Promise<Response> => {
+      const url = input instanceof URL ? input.href : input
+      const nsid = url.split('/xrpc/')[1]?.split('?')[0]
+      const handler = nsid ? overrides[nsid] : undefined
+      if (handler) {
+        return handler(url, init)
+      }
+      if (nsid === 'com.atproto.server.refreshSession') {
+        return json({
+          accessJwt: 'access-jwt-2',
+          refreshJwt: 'refresh-jwt-2',
+          handle: HANDLE,
+          did: DID,
+          email: 'alice@example.com',
+          emailConfirmed: true,
+          didDoc: makeDidDoc(DIDDOC_PDS_HOST),
+          active: true,
+        })
+      }
+      if (nsid === 'com.atproto.server.getSession') {
+        return json({
+          did: DID,
+          handle: HANDLE,
+          email: 'alice@example.com',
+          emailConfirmed: true,
+          active: true,
+        })
+      }
+      return json({})
+    },
+  )
+}
+
+export type MockFetch = ReturnType<typeof makeMockFetch>
+
+/** Cast a jest fetch mock to the `fetch` type PasswordSession options expect. */
+export function asFetch(mock: MockFetch): typeof fetch {
+  return mock as unknown as typeof fetch
+}
+
+/** The URLs a mock fetch was called with, in order. */
+export function urlsOf(mock: MockFetch): string[] {
+  return mock.mock.calls.map(c => (c[0] instanceof URL ? c[0].href : c[0]))
+}
diff --git a/src/state/session/__tests__/provider-abort-test.tsx b/src/state/session/__tests__/provider-abort-test.tsx
new file mode 100644
index 0000000000..fdc1585981
--- /dev/null
+++ b/src/state/session/__tests__/provider-abort-test.tsx
@@ -0,0 +1,145 @@
+import {beforeEach, describe, expect, it, jest} from '@jest/globals'
+import {act, render} from '@testing-library/react-native'
+
+/*
+ * The provider pulls the whole app shell in through `#/state/util` and the
+ * account factories. These mocks cut the tree back to the session lifecycle
+ * itself, which is all these tests drive.
+ */
+jest.mock('#/state/persisted', () => {
+  const {
+    defaults,
+  }: typeof import('#/state/persisted/schema') = require('#/state/persisted/schema')
+  return {
+    defaults,
+    get: (key: keyof typeof defaults) => defaults[key],
+    write: () => Promise.resolve(),
+    readLatest: (key: keyof typeof defaults) => defaults[key],
+    onUpdate: () => () => {},
+  }
+})
+jest.mock('#/state/util', () => ({useCloseAllActiveElements: () => () => {}}))
+jest.mock('#/components/dialogs/Context', () => ({
+  useGlobalDialogsControlContext: () => ({signinDialogControl: {open() {}}}),
+}))
+jest.mock('#/analytics', () => ({
+  AnalyticsContext: ({children}: {children: React.ReactNode}) => children,
+  useAnalyticsBase: () => ({metric() {}, logger: {debug() {}, error() {}}}),
+  utils: {accountToSessionMetadata: () => ({}), useMeta: () => undefined},
+}))
+jest.mock('#/state/shell/onboarding', () => ({
+  useOnboardingDispatch: () => () => {},
+}))
+jest.mock('#/ageAssurance/data', () => ({
+  clearAgeAssuranceServerDataForAll: () => {},
+  clearAgeAssuranceServerDataForDid: () => {},
+}))
+jest.mock('#/lib/persisted-query-storage', () => ({
+  clearPersistedQueryStorage: () => Promise.resolve(),
+}))
+jest.mock('#/lib/notifications/notifications', () => ({
+  unregisterPushToken: () => Promise.resolve(),
+}))
+jest.mock('jwt-decode', () => ({jwtDecode: () => ({})}))
+
+/*
+ * The factories are stubbed so a test controls exactly when each one resolves,
+ * which is what lets a second call abort the first while it is in flight.
+ * `disposeBundle` is spied on rather than replaced wholesale: the rest of
+ * session-core stays real so the provider's own module graph is unchanged.
+ */
+const mockLogin = jest.fn<(...args: unknown[]) => Promise<unknown>>()
+const mockCreateAccount = jest.fn<(...args: unknown[]) => Promise<unknown>>()
+const mockDisposeBundle = jest.fn()
+jest.mock('../session-core', () => ({
+  ...jest.requireActual<object>('../session-core'),
+  createSessionBundleAndLogin: (...args: unknown[]) => mockLogin(...args),
+  disposeBundle: (bundle: unknown) => mockDisposeBundle(bundle),
+}))
+jest.mock('../create-account', () => ({
+  createSessionBundleAndCreateAccount: (...args: unknown[]) =>
+    mockCreateAccount(...args),
+}))
+
+import {Provider, useSessionApi} from '#/state/session'
+import {type SessionApiContext} from '#/state/session/types'
+
+/** Render the provider and hand back its api context. */
+function renderProvider(): SessionApiContext {
+  let api!: SessionApiContext
+  function Probe() {
+    api = useSessionApi()
+    return null
+  }
+  render(
+    <Provider>
+      <Probe />
+    </Provider>,
+  )
+  return api
+}
+
+/*
+ * Every factory returns an ARMED bundle, so a call whose result is thrown away
+ * because a newer call superseded it must dispose that bundle. Leaving it armed
+ * leaves a live session auto-refreshing and rotating refresh tokens server-side
+ * for an account the app is no longer tracking.
+ */
+describe('superseded session tasks dispose their bundle', () => {
+  /*
+   * Without this, a recorded call from an earlier test satisfies a later
+   * assertion. The tagged bundles below are the other half of that guard: two
+   * `{}` literals are structurally equal, so `toHaveBeenCalledWith` could not
+   * tell one test's bundle from the other's even within a cleared mock.
+   */
+  beforeEach(() => {
+    mockLogin.mockReset()
+    mockCreateAccount.mockReset()
+    mockDisposeBundle.mockReset()
+  })
+
+  it('disposes the bundle of an aborted login', async () => {
+    const bundle = {tag: 'login-bundle'} as never
+    let resolveLogin!: (value: unknown) => void
+    mockLogin.mockReturnValueOnce(
+      new Promise(resolve => {
+        resolveLogin = resolve
+      }),
+    )
+    const api = renderProvider()
+
+    const superseded = api.login({} as never, 'LoginForm')
+    /* the second call aborts the first task's signal, and never settles */
+    mockLogin.mockReturnValueOnce(new Promise(() => {}))
+    void api.login({} as never, 'LoginForm')
+
+    await act(async () => {
+      resolveLogin({bundle, account: {did: 'did:plc:example'}})
+      await superseded
+    })
+
+    expect(mockDisposeBundle).toHaveBeenCalledWith(bundle)
+  })
+
+  it('disposes the bundle of an aborted createAccount', async () => {
+    const bundle = {tag: 'create-account-bundle'} as never
+    let resolveCreate!: (value: unknown) => void
+    mockCreateAccount.mockReturnValueOnce(
+      new Promise(resolve => {
+        resolveCreate = resolve
+      }),
+    )
+    const api = renderProvider()
+
+    const superseded = api.createAccount({} as never, {} as never)
+    mockCreateAccount.mockReturnValueOnce(new Promise(() => {}))
+    void api.createAccount({} as never, {} as never)
+
+    await act(async () => {
+      resolveCreate({bundle, account: {did: 'did:plc:example'}})
+      await superseded
+    })
+
+    expect(mockDisposeBundle).toHaveBeenCalledWith(bundle)
+  })
+})
diff --git a/src/state/session/__tests__/provider-session-events-test.tsx b/src/state/session/__tests__/provider-session-events-test.tsx
new file mode 100644
index 0000000000..e6a51a5414
--- /dev/null
+++ b/src/state/session/__tests__/provider-session-events-test.tsx
@@ -0,0 +1,559 @@
+import {type SessionData} from '@atproto/lex-password-session'
+import {beforeEach, describe, expect, it, jest} from '@jest/globals'
+import {act, render} from '@testing-library/react-native'
+
+import {type Schema} from '#/state/persisted/schema'
+import {type SessionAccount} from '../types'
+
+/*
+ * The provider pulls the whole app shell in through `#/state/util` and the
+ * account factories. These mocks cut the tree back to the session lifecycle
+ * itself, which is all these tests drive. They mirror provider-abort-test.tsx,
+ * plus a stateful `#/state/persisted` (this suite drives cross-tab updates and
+ * the expiry rescue's fresh persisted read) and an observable
+ * `emitSessionDropped`.
+ */
+const mockPersisted: {session: Schema['session']; latest: Schema['session']} = {
+  session: {accounts: [], currentAccount: undefined},
+  latest: {accounts: [], currentAccount: undefined},
+}
+/*
+ * Every registered listener is kept, not just the newest. The provider's
+ * subscription effect re-runs on every state change, so a callback captured
+ * before a dispatch is exactly the stale-closure case the shouldActivate guard
+ * exists to catch.
+ */
+const mockPersistedListeners: ((value: Schema['session']) => void)[] = []
+jest.mock('#/state/persisted', () => {
+  const {
+    defaults,
+  }: typeof import('#/state/persisted/schema') = require('#/state/persisted/schema')
+  return {
+    defaults,
+    get: (key: string) =>
+      key === 'session'
+        ? mockPersisted.session
+        : defaults[key as keyof typeof defaults],
+    readLatest: (key: string) =>
+      key === 'session'
+        ? mockPersisted.latest
+        : defaults[key as keyof typeof defaults],
+    write: () => Promise.resolve(),
+    onUpdate: (_key: string, cb: (value: Schema['session']) => void) => {
+      mockPersistedListeners.push(cb)
+      return () => {}
+    },
+  }
+})
+jest.mock('#/state/util', () => ({useCloseAllActiveElements: () => () => {}}))
+jest.mock('#/components/dialogs/Context', () => ({
+  useGlobalDialogsControlContext: () => ({signinDialogControl: {open() {}}}),
+}))
+jest.mock('#/analytics', () => ({
+  AnalyticsContext: ({children}: {children: React.ReactNode}) => children,
+  useAnalyticsBase: () => ({metric() {}, logger: {debug() {}, error() {}}}),
+  utils: {accountToSessionMetadata: () => ({}), useMeta: () => undefined},
+}))
+jest.mock('#/state/shell/onboarding', () => ({
+  useOnboardingDispatch: () => () => {},
+}))
+jest.mock('#/ageAssurance/data', () => ({
+  clearAgeAssuranceServerDataForAll: () => {},
+  clearAgeAssuranceServerDataForDid: () => {},
+}))
+jest.mock('#/lib/persisted-query-storage', () => ({
+  clearPersistedQueryStorage: () => Promise.resolve(),
+}))
+jest.mock('#/lib/notifications/notifications', () => ({
+  unregisterPushToken: () => Promise.resolve(),
+}))
+jest.mock('jwt-decode', () => ({jwtDecode: () => ({})}))
+
+const mockEmitSessionDropped = jest.fn()
+jest.mock('#/state/events', () => ({
+  emitSessionDropped: () => mockEmitSessionDropped(),
+  emitNetworkConfirmed: () => {},
+  emitNetworkLost: () => {},
+}))
+
+/*
+ * The factories are stubbed so a test controls exactly what each one returns
+ * and when. `createSessionBundleFromStoredAccount` is stubbed faithfully rather
+ * than replaced by a constant: it must still consult `shouldActivate` and
+ * decline to hand back a bundle when the guard rejects, because that decision
+ * is what these tests observe. Its disposal of a rejected bundle is pinned by
+ * session-core-test; here we only assert what the provider does with the
+ * result.
+ */
+const mockLogin = jest.fn<(...args: unknown[]) => Promise<unknown>>()
+const mockResume = jest.fn<(...args: unknown[]) => Promise<unknown>>()
+const mockDisposeBundle = jest.fn()
+type Rebuild = {
+  account: SessionAccount
+  shouldActivate: boolean
+  bundle: FakeBundle
+}
+const mockRebuilds: Rebuild[] = []
+const mockRebuild = jest.fn(
+  (
+    account: SessionAccount,
+    _onSessionChange: unknown,
+    shouldActivate: (
+      bundle: unknown,
+      account: SessionAccount,
+    ) => boolean = () => true,
+  ) => {
+    const bundle = makeBundle(account)
+    const activated = shouldActivate(bundle, account)
+    mockRebuilds.push({account, shouldActivate: activated, bundle})
+    return activated ? {bundle, account} : undefined
+  },
+)
+jest.mock('../session-core', () => ({
+  ...jest.requireActual<object>('../session-core'),
+  createSessionBundleAndLogin: (...args: unknown[]) => mockLogin(...args),
+  createSessionBundleAndResume: (...args: unknown[]) => mockResume(...args),
+  createSessionBundleFromStoredAccount: (...args: unknown[]) =>
+    // @ts-expect-error the stub's arity is checked by its own signature
+    mockRebuild(...args),
+  disposeBundle: (bundle: unknown) => mockDisposeBundle(bundle),
+}))
+jest.mock('../create-account', () => ({
+  createSessionBundleAndCreateAccount: () => new Promise(() => {}),
+}))
+
+import {Provider, useSession, useSessionApi} from '#/state/session'
+import {
+  type OnSessionChange,
+  type SessionBundle,
+} from '#/state/session/session-core'
+import {type SessionApiContext} from '#/state/session/types'
+
+const DID = 'did:plc:example123'
+const SERVICE = 'https://bsky.social/'
+
+function makeAccount(overrides: Partial<SessionAccount> = {}): SessionAccount {
+  return {
+    service: SERVICE,
+    did: DID,
+    handle: 'alice.test',
+    email: 'alice@example.com',
+    emailConfirmed: true,
+    emailAuthFactor: false,
+    refreshJwt: 'refresh-jwt-1',
+    accessJwt: 'access-jwt-1',
+    signupQueued: false,
+    active: true,
+    status: undefined,
+    pdsUrl: undefined,
+    isSelfHosted: false,
+    ...overrides,
+  }
+}
+
+/*
+ * The provider only ever reads `bundle.agent` (for context) and
+ * `bundle.session.destroyed` / `bundle.session.session` (for the cross-tab
+ * token comparison), and otherwise treats a bundle as an opaque identity. A
+ * literal with those fields is enough, and keeps a real PasswordSession - with
+ * its network and refresh machinery - out of a suite about provider dispatch.
+ */
+type FakeBundle = {
+  session: {destroyed: boolean; session: SessionData}
+  agent: object
+  service: URL
+}
+
+function makeBundle(account: SessionAccount): FakeBundle {
+  return {
+    session: {
+      destroyed: false,
+      session: {
+        accessJwt: account.accessJwt ?? '',
+        refreshJwt: account.refreshJwt ?? '',
+        /* SessionData types these as branded strings; the values are fixtures */
+        handle: account.handle as `${string}.${string}`,
+        did: account.did as `did:${string}:${string}`,
+        active: true,
+        service: account.service,
+      },
+    },
+    agent: {},
+    service: new URL(account.service),
+  }
+}
+
+type Harness = {
+  api: SessionApiContext
+  /** The provider's own onSessionChange, as handed to a session factory. */
+  onSessionChange: OnSessionChange
+  currentAccount: () => SessionAccount | undefined
+  hasSession: () => boolean
+}
+
+/**
+ * Render the provider, log an account in through the stubbed login factory, and
+ * hand back the api plus the `onSessionChange` the factory received. Firing
+ * that callback is how a test synthesizes a session event from a live bundle.
+ */
+async function renderLoggedIn(
+  account: SessionAccount,
+  bundle: FakeBundle,
+): Promise<Harness> {
+  let api!: SessionApiContext
+  let session!: ReturnType<typeof useSession>
+  function Probe() {
+    api = useSessionApi()
+    session = useSession()
+    return null
+  }
+  render(
+    <Provider>
+      <Probe />
+    </Provider>,
+  )
+
+  let captured!: OnSessionChange
+  mockLogin.mockImplementationOnce((...args: unknown[]) => {
+    captured = args[1] as OnSessionChange
+    return Promise.resolve({bundle, account})
+  })
+  await act(async () => {
+    await api.login({} as never, 'LoginForm')
+  })
+
+  return {
+    api,
+    onSessionChange: captured,
+    currentAccount: () => session.currentAccount,
+    hasSession: () => session.hasSession,
+  }
+}
+
+/** The dying payload PasswordSession threads through its `onDeleted` hook. */
+function dyingData(refreshJwt: string): SessionData {
+  return {
+    accessJwt: 'dead-access-jwt',
+    refreshJwt,
+    handle: 'alice.test',
+    did: DID,
+    active: true,
+    service: SERVICE,
+  }
+}
+
+/** The rotated payload PasswordSession threads through its `onUpdated` hook. */
+function refreshedData(
+  refreshJwt: string,
+  didDoc?: SessionData['didDoc'],
+): SessionData {
+  return {
+    accessJwt: 'fresh-access-jwt',
+    refreshJwt,
+    handle: 'alice.test',
+    did: DID,
+    active: true,
+    service: SERVICE,
+    ...(didDoc ? {didDoc} : {}),
+  }
+}
+
+/** A minimal valid DID document whose only service entry is a PDS. */
+function makeDidDoc(pdsUrl: string): SessionData['didDoc'] {
+  return {
+    id: DID,
+    service: [
+      {
+        id: '#atproto_pds',
+        type: 'AtprotoPersonalDataServer',
+        serviceEndpoint: pdsUrl,
+      },
+    ],
+  }
+}
+
+beforeEach(() => {
+  mockPersisted.session = {accounts: [], currentAccount: undefined}
+  mockPersisted.latest = {accounts: [], currentAccount: undefined}
+  mockPersistedListeners.length = 0
+  mockRebuilds.length = 0
+  mockLogin.mockReset()
+  mockResume.mockReset()
+  mockRebuild.mockClear()
+  mockDisposeBundle.mockReset()
+  mockEmitSessionDropped.mockReset()
+})
+
+/*
+ * A stale tab can expire a refresh token that another tab has already rotated
+ * past. Logging every tab out on that event is the known-worst failure in this
+ * subsystem, so the provider first looks for a newer token generation and
+ * rebuilds onto it, only falling through to logout when there is nothing left
+ * to try.
+ */
+describe('expiry rescue', () => {
+  it('rebuilds onto a fresher persisted generation instead of logging out', async () => {
+    const account = makeAccount()
+    const bundle = makeBundle(account)
+    const {onSessionChange, hasSession, currentAccount} = await renderLoggedIn(
+      account,
+      bundle,
+    )
+
+    /* another tab already rotated to generation 2 and wrote it to storage */
+    const fresher = makeAccount({
+      accessJwt: 'access-jwt-2',
+      refreshJwt: 'refresh-jwt-2',
+    })
+    mockPersisted.latest = {accounts: [fresher], currentAccount: fresher}
+
+    act(() => {
+      onSessionChange(
+        bundle as unknown as SessionBundle,
+        DID,
+        'expired',
+        dyingData('refresh-jwt-1'),
+      )
+    })
+
+    /* the rescue rebuilt onto the fresher generation ... */
+    expect(mockRebuilds.length).toBe(1)
+    expect(mockRebuilds[0].account.refreshJwt).toBe('refresh-jwt-2')
+    /* ... and adopted it, without ever reporting the session as dropped */
+    expect(hasSession()).toBe(true)
+    expect(currentAccount()?.refreshJwt).toBe('refresh-jwt-2')
+    expect(mockEmitSessionDropped).not.toHaveBeenCalled()
+  })
+
+  it('drops the session and logs out when there is no fresher generation', async () => {
+    const account = makeAccount()
+    const bundle = makeBundle(account)
+    const {onSessionChange, hasSession, currentAccount} = await renderLoggedIn(
+      account,
+      bundle,
+    )
+
+    /* storage agrees the dying token is the newest one anybody has */
+    mockPersisted.latest = {accounts: [account], currentAccount: account}
+
+    act(() => {
+      onSessionChange(
+        bundle as unknown as SessionBundle,
+        DID,
+        'expired',
+        dyingData('refresh-jwt-1'),
+      )
+    })
+
+    expect(mockRebuilds.length).toBe(0)
+    expect(mockEmitSessionDropped).toHaveBeenCalledTimes(1)
+    expect(hasSession()).toBe(false)
+    /* the reducer cleared the dead credentials rather than keeping them */
+    expect(currentAccount()).toBe(undefined)
+  })
+
+  it('does not retry a generation that already failed', async () => {
+    const account = makeAccount()
+    const bundle = makeBundle(account)
+    const {onSessionChange, hasSession} = await renderLoggedIn(account, bundle)
+
+    const gen2 = makeAccount({
+      accessJwt: 'access-jwt-2',
+      refreshJwt: 'refresh-jwt-2',
+    })
+    mockPersisted.latest = {accounts: [gen2], currentAccount: gen2}
+
+    /* generation 1 dies and is rescued onto generation 2 */
+    act(() => {
+      onSessionChange(
+        bundle as unknown as SessionBundle,
+        DID,
+        'expired',
+        dyingData('refresh-jwt-1'),
+      )
+    })
+    expect(mockRebuilds.length).toBe(1)
+    const rescued = mockRebuilds[0].bundle
+
+    /*
+     * Generation 2 dies too, and a stale tab has meanwhile written generation 1
+     * back to storage. It differs from the dying token, so only the record of
+     * its earlier failure can reject it.
+     */
+    mockPersisted.latest = {accounts: [account], currentAccount: account}
+    act(() => {
+      onSessionChange(
+        rescued as unknown as SessionBundle,
+        DID,
+        'expired',
+        dyingData('refresh-jwt-2'),
+      )
+    })
+
+    expect(mockRebuilds.length).toBe(1)
+    expect(mockEmitSessionDropped).toHaveBeenCalledTimes(1)
+    expect(hasSession()).toBe(false)
+  })
+})
+
+/*
+ * A refresh payload only carries a didDoc when the server sends one, but
+ * `pdsUrl` is never derived from the login service. If the provider does not
+ * thread the stored value through, an ordinary refresh persists
+ * `pdsUrl: undefined` and the next cold start routes pre-refresh requests to
+ * the entryway instead of the account's PDS.
+ */
+describe('refresh persistence', () => {
+  const PDS_HOST = 'https://shimeji.us-east.host.bsky.network'
+  const DIDDOC_PDS_HOST = 'https://morel.us-west.host.bsky.network'
+
+  it('keeps the stored pdsUrl when the refresh carries no didDoc', async () => {
+    const account = makeAccount({pdsUrl: `${PDS_HOST}/`})
+    const bundle = makeBundle(account)
+    const {onSessionChange, currentAccount} = await renderLoggedIn(
+      account,
+      bundle,
+    )
+
+    act(() => {
+      onSessionChange(
+        bundle as unknown as SessionBundle,
+        DID,
+        'update',
+        refreshedData('refresh-jwt-2'),
+      )
+    })
+
+    expect(currentAccount()?.refreshJwt).toBe('refresh-jwt-2')
+    expect(currentAccount()?.pdsUrl).toBe(`${PDS_HOST}/`)
+  })
+
+  it('prefers the didDoc endpoint over the stored pdsUrl', async () => {
+    const account = makeAccount({pdsUrl: `${PDS_HOST}/`})
+    const bundle = makeBundle(account)
+    const {onSessionChange, currentAccount} = await renderLoggedIn(
+      account,
+      bundle,
+    )
+
+    act(() => {
+      onSessionChange(
+        bundle as unknown as SessionBundle,
+        DID,
+        'update',
+        refreshedData('refresh-jwt-2', makeDidDoc(DIDDOC_PDS_HOST)),
+      )
+    })
+
+    expect(currentAccount()?.pdsUrl).toBe(`${DIDDOC_PDS_HOST}/`)
+  })
+})
+
+/** Deliver a cross-tab `persisted` update to the provider's newest listener. */
+function emitSynced(session: Schema['session']) {
+  mockPersistedListeners[mockPersistedListeners.length - 1](session)
+}
+
+/*
+ * A `PasswordSession` cannot be patched in place, so adopting tokens another
+ * tab refreshed means rebuilding the bundle. Doing that for every broadcast
+ * would churn the agent (and the React tree under it) constantly, so the
+ * provider rebuilds only when the tokens actually moved, and guards the swap
+ * against the store having advanced underneath it.
+ */
+describe('cross-tab sync', () => {
+  it('short-circuits an update carrying the tokens the live session already has', async () => {
+    const account = makeAccount()
+    const bundle = makeBundle(account)
+    const {hasSession} = await renderLoggedIn(account, bundle)
+
+    act(() => {
+      emitSynced({accounts: [account], currentAccount: account})
+    })
+
+    /* identical tokens: nothing to adopt, so no rebuild */
+    expect(mockRebuilds.length).toBe(0)
+    expect(hasSession()).toBe(true)
+  })
+
+  it('rebuilds onto tokens another tab rotated', async () => {
+    const account = makeAccount()
+    const bundle = makeBundle(account)
+    const {currentAccount} = await renderLoggedIn(account, bundle)
+
+    const rotated = makeAccount({
+      accessJwt: 'access-jwt-2',
+      refreshJwt: 'refresh-jwt-2',
+    })
+    act(() => {
+      emitSynced({accounts: [rotated], currentAccount: rotated})
+    })
+
+    expect(mockRebuilds.length).toBe(1)
+    expect(mockRebuilds[0].account.refreshJwt).toBe('refresh-jwt-2')
+    expect(currentAccount()?.refreshJwt).toBe('refresh-jwt-2')
+  })
+
+  it('declines to activate a rebuild once the store has moved past the bundle it was built for', async () => {
+    const account = makeAccount()
+    const bundle = makeBundle(account)
+    await renderLoggedIn(account, bundle)
+
+    const gen2 = makeAccount({
+      accessJwt: 'access-jwt-2',
+      refreshJwt: 'refresh-jwt-2',
+    })
+    const gen3 = makeAccount({
+      accessJwt: 'access-jwt-3',
+      refreshJwt: 'refresh-jwt-3',
+    })
+
+    /*
+     * Two broadcasts land back to back inside one act(), so React does not
+     * commit (and the effect does not re-subscribe) between them: the second
+     * runs the listener registered while the ORIGINAL bundle was current, even
+     * though the store has since advanced to the generation-2 rebuild.
+     */
+    const listener = mockPersistedListeners[mockPersistedListeners.length - 1]
+    act(() => {
+      listener({accounts: [gen2], currentAccount: gen2})
+      listener({accounts: [gen3], currentAccount: gen3})
+    })
+
+    expect(mockRebuilds.length).toBe(2)
+    expect(mockRebuilds[0].shouldActivate).toBe(true)
+    /* the stale closure's bundle is no longer current, so the swap is refused */
+    expect(mockRebuilds[1].account.refreshJwt).toBe('refresh-jwt-3')
+    expect(mockRebuilds[1].shouldActivate).toBe(false)
+  })
+
+  it('cancels pending work when another tab logs the account out', async () => {
+    const account = makeAccount()
+    const bundle = makeBundle(account)
+    const {api} = await renderLoggedIn(account, bundle)
+
+    /* a resume is in flight and will resolve only after the cross-tab logout */
+    const resumedBundle = makeBundle(account)
+    let finishResume!: (value: unknown) => void
+    mockResume.mockReturnValueOnce(
+      new Promise(resolve => {
+        finishResume = resolve
+      }),
+    )
+    const pending = api.resumeSession(account)
+
+    const loggedOut = makeAccount({accessJwt: undefined, refreshJwt: undefined})
+    act(() => {
+      emitSynced({accounts: [loggedOut], currentAccount: loggedOut})
+    })
+
+    await act(async () => {
+      finishResume({bundle: resumedBundle, account})
+      await pending
+    })
+
+    /* the superseded resume disposed its bundle rather than signing back in */
+    expect(mockDisposeBundle).toHaveBeenCalledWith(resumedBundle)
+    expect(mockRebuilds.length).toBe(0)
+  })
+})
diff --git a/src/state/session/__tests__/session-core-test.ts b/src/state/session/__tests__/session-core-test.ts
new file mode 100644
index 0000000000..9dbc646c9f
--- /dev/null
+++ b/src/state/session/__tests__/session-core-test.ts
@@ -0,0 +1,1027 @@
+import {
+  PasswordSession,
+  type PasswordSessionOptions,
+  type SessionData,
+} from '@atproto/lex-password-session'
+import {beforeEach, describe, expect, it, jest} from '@jest/globals'
+
+import {type SessionAccount} from '../types'
+
+jest.mock('#/state/events', () => ({
+  emitNetworkConfirmed: jest.fn(),
+  emitNetworkLost: jest.fn(),
+}))
+
+/*
+ * `makeSessionHooks` reports a throwing `onSessionChange` through the logger
+ * rather than letting it escape into PasswordSession's session promise. Stub
+ * the module so that report is assertable (and so nothing reaches the real
+ * transports).
+ */
+const mockLoggerError = jest.fn()
+jest.mock('#/logger', () => {
+  const noopLogger = {
+    error: (...args: unknown[]) => mockLoggerError(...args),
+    warn: () => {},
+    info: () => {},
+    log: () => {},
+    debug: () => {},
+  }
+  return {
+    logger: noopLogger,
+    Logger: {
+      create: () => noopLogger,
+      Context: new Proxy({}, {get: (_t, key) => String(key)}),
+      Level: {},
+    },
+  }
+})
+
+/*
+ * `prefetchAgeAssuranceServerData` is a genuine prep await in each factory
+ * (moderation config is synchronous, so the AA prefetch is where the factory
+ * tests inject a mid-prep token rotation). The default is a no-op;
+ * individual tests install behavior via `mockImplementationOnce`.
+ */
+const mockPrefetchAgeAssuranceServerData = jest.fn<() => void | Promise<void>>()
+jest.mock('#/ageAssurance/data', () => ({
+  prefetchAgeAssuranceServerData: () => mockPrefetchAgeAssuranceServerData(),
+}))
+/*
+ * The factory tail awaits `features.refresh(...)`; stub the analytics module so
+ * the factory does not pull GrowthBook (and its native deps) into this
+ * lightweight suite.
+ */
+jest.mock('#/analytics', () => ({
+  features: {refresh: () => Promise.resolve()},
+}))
+
+/*
+ * `configureModerationForAccount` is synchronous (the labeler cache is a local
+ * MMKV read), so it is not a prep await - but it still runs inside each factory
+ * with the freshly built bridge agent, before the awaited prep steps. The
+ * factory tests capture the agent with this mock, then inject a real refresh
+ * into the awaited AA prefetch so a token rotation happens during prep, before
+ * arm(). The default is a no-op so other tests are unaffected.
+ * (jest requires out-of-scope factory references to be `mock`-prefixed.)
+ */
+const mockConfigureModerationForAccount =
+  jest.fn<(agent: unknown, account: unknown) => void>()
+jest.mock('../moderation', () => ({
+  configureModerationForAccount: (agent: unknown, account: unknown) =>
+    mockConfigureModerationForAccount(agent, account),
+  configureModerationForGuest: () => {},
+}))
+
+jest.mock('jwt-decode', () => ({
+  jwtDecode(token: string) {
+    if (token === 'queued-access-jwt') {
+      return {scope: 'com.atproto.signupQueued'}
+    }
+    /*
+     * A far-future exp so isSessionExpired() reads this stored token as still
+     * valid, which routes resume() through the sync (no-network) fast path.
+     * That isolates the prep-time refresh as the ONLY token rotation.
+     */
+    if (token === 'valid-access-jwt') {
+      return {scope: 'com.atproto.access', exp: 4102444800}
+    }
+    return {scope: 'com.atproto.access'}
+  },
+}))
+
+import {type BskyAppAgent} from '../bridge-agent'
+import {
+  type AtpSessionEvent,
+  buildBundle,
+  createSessionBundleFromStoredAccount,
+  disposeBundle,
+  finishPreparation,
+  makeSessionHooks,
+  registerBundleKillSwitch,
+  sessionAccountToSessionData,
+  type SessionBundle,
+  sessionDataToSessionAccount,
+} from '../session-core'
+import {
+  asFetch,
+  DID,
+  HANDLE,
+  makeAccount,
+  makeDidDoc,
+  makeMockFetch,
+  PDS_HOST as PDS_URL,
+  SERVICE,
+} from './mock-fetch'
+
+function synthDidDoc(
+  did: string,
+  pdsUrl: string,
+): NonNullable<SessionData['didDoc']> {
+  return makeDidDoc(pdsUrl, did)
+}
+
+function makeSessionData(overrides: Partial<SessionData> = {}): SessionData {
+  return {
+    accessJwt: 'access-jwt',
+    refreshJwt: 'refresh-jwt',
+    handle: HANDLE,
+    did: DID,
+    email: 'alice@example.com',
+    emailConfirmed: true,
+    emailAuthFactor: false,
+    active: true,
+    service: 'https://bsky.social',
+    ...overrides,
+  }
+}
+
+describe('sessionDataToSessionAccount', () => {
+  it('returns undefined for a missing session', () => {
+    expect(sessionDataToSessionAccount(undefined, 'https://bsky.social')).toBe(
+      undefined,
+    )
+    expect(sessionDataToSessionAccount(null, 'https://bsky.social')).toBe(
+      undefined,
+    )
+  })
+
+  it('maps fields for a hosted account (no didDoc)', () => {
+    const account = sessionDataToSessionAccount(
+      makeSessionData(),
+      'https://bsky.social',
+    )!
+    expect(account).toEqual({
+      service: 'https://bsky.social/',
+      did: DID,
+      handle: HANDLE,
+      email: 'alice@example.com',
+      emailConfirmed: true,
+      emailAuthFactor: false,
+      refreshJwt: 'refresh-jwt',
+      accessJwt: 'access-jwt',
+      signupQueued: false,
+      active: true,
+      status: undefined,
+      pdsUrl: undefined,
+      isSelfHosted: false,
+    })
+  })
+
+  it('serializes service as a normalized URL', () => {
+    const account = sessionDataToSessionAccount(
+      makeSessionData(),
+      'https://bsky.social',
+    )!
+    expect(account.service).toBe('https://bsky.social/')
+  })
+
+  it('serializes the didDoc PDS endpoint as a normalized URL', () => {
+    const account = sessionDataToSessionAccount(
+      makeSessionData({didDoc: synthDidDoc(DID, PDS_URL)}),
+      'https://bsky.social',
+    )!
+    expect(account.pdsUrl).toBe(`${PDS_URL}/`)
+  })
+
+  it('leaves pdsUrl undefined for hosted accounts (no service fallback)', () => {
+    const account = sessionDataToSessionAccount(
+      makeSessionData({didDoc: undefined}),
+      'https://bsky.social',
+    )!
+    expect(account.pdsUrl).toBe(undefined)
+  })
+
+  it('retains the stored PDS when a valid didDoc has no PDS service', () => {
+    const account = sessionDataToSessionAccount(
+      makeSessionData({didDoc: {id: DID}}),
+      'https://bsky.social',
+      PDS_URL,
+    )!
+    expect(account.pdsUrl).toBe(`${PDS_URL}/`)
+  })
+
+  it('derives isSelfHosted from the service URL', () => {
+    const hosted = sessionDataToSessionAccount(
+      makeSessionData(),
+      'https://bsky.social',
+    )!
+    expect(hosted.isSelfHosted).toBe(false)
+
+    const selfHosted = sessionDataToSessionAccount(
+      makeSessionData({service: 'https://pds.example.com'}),
+      'https://pds.example.com',
+    )!
+    expect(selfHosted.isSelfHosted).toBe(true)
+  })
+
+  it('derives signupQueued from the access token scope', () => {
+    const queued = sessionDataToSessionAccount(
+      makeSessionData({accessJwt: 'queued-access-jwt'}),
+      'https://bsky.social',
+    )!
+    expect(queued.signupQueued).toBe(true)
+
+    const notQueued = sessionDataToSessionAccount(
+      makeSessionData(),
+      'https://bsky.social',
+    )!
+    expect(notQueued.signupQueued).toBe(false)
+  })
+
+  it('coerces missing email flags to false', () => {
+    const account = sessionDataToSessionAccount(
+      makeSessionData({
+        email: undefined,
+        emailConfirmed: undefined,
+        emailAuthFactor: undefined,
+      }),
+      'https://bsky.social',
+    )!
+    expect(account.email).toBe(undefined)
+    expect(account.emailConfirmed).toBe(false)
+    expect(account.emailAuthFactor).toBe(false)
+  })
+
+  it('preserves the exact SessionAccount field order', () => {
+    /*
+     * Byte-stability guard: the reducer's JSON.stringify fast path and the
+     * session test snapshots depend on this exact persisted key order.
+     */
+    const account = sessionDataToSessionAccount(
+      makeSessionData({didDoc: synthDidDoc(DID, PDS_URL)}),
+      'https://bsky.social',
+    )!
+    const golden: SessionAccount = {
+      service: 'https://bsky.social/',
+      did: DID,
+      handle: HANDLE,
+      email: 'alice@example.com',
+      emailConfirmed: true,
+      emailAuthFactor: false,
+      refreshJwt: 'refresh-jwt',
+      accessJwt: 'access-jwt',
+      signupQueued: false,
+      active: true,
+      status: undefined,
+      pdsUrl: `${PDS_URL}/`,
+      isSelfHosted: false,
+    }
+    expect(Object.keys(account)).toEqual(Object.keys(golden))
+    expect(JSON.stringify(account)).toBe(JSON.stringify(golden))
+  })
+})
+
+describe('sessionAccountToSessionData', () => {
+  const baseAccount: SessionAccount = {
+    service: 'https://bsky.social/',
+    did: DID,
+    handle: HANDLE,
+    email: 'alice@example.com',
+    emailConfirmed: true,
+    emailAuthFactor: false,
+    refreshJwt: 'refresh-jwt',
+    accessJwt: 'access-jwt',
+    signupQueued: false,
+    active: true,
+    status: undefined,
+    pdsUrl: undefined,
+    isSelfHosted: false,
+  }
+
+  it('maps fields with empty-string token fallbacks and active default', () => {
+    const data = sessionAccountToSessionData({
+      ...baseAccount,
+      accessJwt: undefined,
+      refreshJwt: undefined,
+      active: undefined,
+    })
+    expect(data.accessJwt).toBe('')
+    expect(data.refreshJwt).toBe('')
+    expect(data.active).toBe(true)
+    expect(data.did).toBe(DID)
+    expect(data.handle).toBe(HANDLE)
+    expect(data.service).toBe('https://bsky.social/')
+  })
+
+  it('omits didDoc when the account has no stored pdsUrl', () => {
+    const data = sessionAccountToSessionData(baseAccount)
+    expect('didDoc' in data).toBe(false)
+  })
+
+  it('does not synthesize protocol data from a stored pdsUrl', () => {
+    const data = sessionAccountToSessionData({
+      ...baseAccount,
+      pdsUrl: `${PDS_URL}/`,
+    })
+    expect('didDoc' in data).toBe(false)
+  })
+
+  it('round-trips account -> SessionData -> account preserving all fields', () => {
+    const withPds: SessionAccount = {
+      ...baseAccount,
+      pdsUrl: `${PDS_URL}/`,
+    }
+    for (const account of [baseAccount, withPds]) {
+      const data = sessionAccountToSessionData(account)
+      const roundTripped = sessionDataToSessionAccount(
+        data,
+        account.service,
+        account.pdsUrl,
+      )!
+      expect(roundTripped).toEqual(account)
+      expect(JSON.stringify(roundTripped)).toBe(JSON.stringify(account))
+    }
+  })
+
+  it('round-trips signupQueued via the access token scope', () => {
+    const queued: SessionAccount = {
+      ...baseAccount,
+      accessJwt: 'queued-access-jwt',
+      signupQueued: true,
+    }
+    const roundTripped = sessionDataToSessionAccount(
+      sessionAccountToSessionData(queued),
+      queued.service,
+    )!
+    expect(roundTripped.signupQueued).toBe(true)
+    expect(roundTripped).toEqual(queued)
+  })
+
+  it('round-trips a self-hosted account', () => {
+    const selfHosted: SessionAccount = {
+      ...baseAccount,
+      service: 'https://pds.example.com/',
+      pdsUrl: 'https://pds.example.com/',
+      isSelfHosted: true,
+    }
+    const roundTripped = sessionDataToSessionAccount(
+      sessionAccountToSessionData(selfHosted),
+      selfHosted.service,
+      selfHosted.pdsUrl,
+    )!
+    expect(roundTripped).toEqual(selfHosted)
+  })
+})
+
+describe('createSessionBundleFromStoredAccount', () => {
+  it('builds a bridge agent over one session', () => {
+    const result = createSessionBundleFromStoredAccount(
+      makeAccount(),
+      jest.fn(),
+    )!
+
+    /* the agent reads its identity straight through the shared session */
+    expect(result.bundle.agent.session?.accessJwt).toBe('access-jwt')
+    expect(result.bundle.agent.did).toBe(DID)
+    expect(result.bundle.agent.sessionManager.session).toBe(
+      result.bundle.agent.session,
+    )
+    expect(result.bundle.service.toString()).toBe(`${SERVICE}/`)
+    disposeBundle(result.bundle)
+    /* disposal detaches the agent from the session */
+    expect(result.bundle.agent.session).toBe(undefined)
+  })
+
+  it('disposes a bundle rejected by the activation guard', async () => {
+    const onSessionChange = jest.fn()
+    let rejectedBundle: SessionBundle | undefined
+    const result = createSessionBundleFromStoredAccount(
+      makeAccount(),
+      onSessionChange,
+      bundle => {
+        rejectedBundle = bundle
+        return false
+      },
+    )
+
+    expect(result).toBeUndefined()
+    await expect(
+      rejectedBundle!.session.fetchHandler('/xrpc/test', {}),
+    ).rejects.toThrow('session disposed')
+    expect(onSessionChange).not.toHaveBeenCalled()
+  })
+})
+
+describe('makeSessionHooks arm-latch + event mapping', () => {
+  /*
+   * The hooks read neither `this` (the PasswordSession) nor their data
+   * argument, so we invoke them with empty stand-ins cast to the declared
+   * parameter types. This keeps the test focused on the arm-latch + event
+   * mapping.
+   */
+  const fakeSession = {} as PasswordSession
+  const fakeData = {} as SessionData
+
+  function setup() {
+    const onSessionChange =
+      jest.fn<
+        (
+          bundle: SessionBundle,
+          did: string,
+          event: AtpSessionEvent,
+          sessionData?: SessionData,
+        ) => void
+      >()
+    /* the hook only passes this through by identity; a stub bundle suffices */
+    const bundle = {} as SessionBundle
+    const hooks = makeSessionHooks({
+      onSessionChange,
+      getBundle: () => bundle,
+      getDid: () => DID,
+    })
+    return {onSessionChange, bundle, hooks}
+  }
+
+  it('swallows events before arm()', () => {
+    const {onSessionChange, hooks} = setup()
+    void hooks.onUpdated?.call(fakeSession, fakeData)
+    expect(onSessionChange).not.toHaveBeenCalled()
+  })
+
+  it("maps onUpdated -> 'update' after arm(), passing the bundle + payload through", () => {
+    const {onSessionChange, bundle, hooks} = setup()
+    hooks.arm()
+    void hooks.onUpdated?.call(fakeSession, fakeData)
+    expect(onSessionChange).toHaveBeenCalledTimes(1)
+    expect(onSessionChange.mock.calls[0][0]).toBe(bundle)
+    expect(onSessionChange.mock.calls[0][1]).toBe(DID)
+    expect(onSessionChange.mock.calls[0][2]).toBe('update')
+    /* the fresh SessionData the library delivers is threaded through verbatim */
+    expect(onSessionChange.mock.calls[0][3]).toBe(fakeData)
+  })
+
+  it("maps onDeleted -> 'expired' after arm()", () => {
+    const {onSessionChange, hooks} = setup()
+    hooks.arm()
+    void hooks.onDeleted?.call(fakeSession, fakeData)
+    expect(onSessionChange.mock.calls[0][2]).toBe('expired')
+  })
+
+  it("maps onUpdateFailure -> 'network-error' after arm()", () => {
+    const {onSessionChange, hooks} = setup()
+    hooks.arm()
+    void hooks.onUpdateFailure?.call(
+      fakeSession,
+      fakeData,
+      {} as Parameters<NonNullable<typeof hooks.onUpdateFailure>>[1],
+    )
+    expect(onSessionChange.mock.calls[0][2]).toBe('network-error')
+  })
+
+  it("threads the dying session payload on the 'expired' path", () => {
+    /*
+     * onDeleted maps to 'expired' AND threads the dying SessionData through
+     * (the library hands onDeleted the session being destroyed, before it nulls
+     * its internal state). The provider reads the dying refreshJwt from this
+     * payload to drive the cross-tab expiry rescue. The provider still guards
+     * `refreshedAccount` on `event === 'update' && sessionData`, so the payload
+     * on 'expired' does NOT produce a refreshedAccount (reducer still clears
+     * tokens + logs out when no rescue applies) - see the provider test below.
+     */
+    const {onSessionChange, hooks} = setup()
+    hooks.arm()
+    void hooks.onDeleted?.call(fakeSession, fakeData)
+    expect(onSessionChange.mock.calls[0][2]).toBe('expired')
+    expect(onSessionChange.mock.calls[0][3]).toBe(fakeData)
+  })
+})
+
+/*
+ * The exact derivation from the provider's onSessionChange (index.tsx). Pinned
+ * here because payload threading and this mapping together read tokens from
+ * the delivered payload on 'update' and force
+ * undefined on the drop paths so the reducer logs the user out.
+ */
+function deriveRefreshedAccount(
+  event: AtpSessionEvent,
+  sessionData?: SessionData,
+): SessionAccount | undefined {
+  return event === 'update' && sessionData
+    ? sessionDataToSessionAccount(sessionData, sessionData.service)
+    : undefined
+}
+
+/*
+ * `PasswordSession` fires onUpdated with the fresh session BEFORE committing it
+ * internally, so the live getter is still stale at hook time.
+ */
+describe('session-hook payload threading (pre-commit ordering)', () => {
+  it('delivers the NEW tokens via the payload even though the live getter is still pre-commit stale', async () => {
+    const fetchMock = makeMockFetch()
+    let session!: PasswordSession
+    let liveGetterAtHookTime: SessionAccount | undefined
+    let refreshedAccountAtHookTime: SessionAccount | undefined
+    const onSessionChange = jest.fn(
+      (
+        _bundle: SessionBundle,
+        _did: string,
+        event: AtpSessionEvent,
+        sessionData?: SessionData,
+      ) => {
+        /* Capture the live getter to demonstrate its pre-commit state. */
+        liveGetterAtHookTime = sessionDataToSessionAccount(
+          session.session,
+          session.session.service,
+        )
+        /* Derive fresh data from the delivered payload. */
+        refreshedAccountAtHookTime = deriveRefreshedAccount(event, sessionData)
+      },
+    )
+    const hooks = makeSessionHooks({
+      onSessionChange,
+      getBundle: () => ({}) as SessionBundle,
+      getDid: () => DID,
+    })
+    session = new PasswordSession(sessionAccountToSessionData(makeAccount()), {
+      ...hooks,
+      fetch: asFetch(fetchMock),
+    })
+    hooks.arm()
+
+    await session.refresh()
+
+    /* at hook time the live getter still held the previous tokens */
+    expect(liveGetterAtHookTime?.accessJwt).toBe('access-jwt')
+    /* the payload already contains the fresh tokens */
+    expect(refreshedAccountAtHookTime?.accessJwt).toBe('access-jwt-2')
+    expect(refreshedAccountAtHookTime?.refreshJwt).toBe('refresh-jwt-2')
+    /* and the session does eventually commit those same tokens */
+    expect(session.session.accessJwt).toBe('access-jwt-2')
+  })
+
+  it("yields refreshedAccount === undefined on the 'expired' path (forces logout)", async () => {
+    const fetchMock = makeMockFetch({
+      'com.atproto.server.refreshSession': () =>
+        new Response(
+          JSON.stringify({error: 'ExpiredToken', message: 'Token expired'}),
+          {status: 400, headers: {'content-type': 'application/json'}},
+        ),
+    })
+    let refreshedAccountAtHookTime: SessionAccount | undefined = makeAccount()
+    let observedEvent: AtpSessionEvent | undefined
+    let observedSessionData: SessionData | undefined
+    const onSessionChange = jest.fn(
+      (
+        _bundle: SessionBundle,
+        _did: string,
+        event: AtpSessionEvent,
+        sessionData?: SessionData,
+      ) => {
+        observedEvent = event
+        observedSessionData = sessionData
+        refreshedAccountAtHookTime = deriveRefreshedAccount(event, sessionData)
+      },
+    )
+    const hooks = makeSessionHooks({
+      onSessionChange,
+      getBundle: () => ({}) as SessionBundle,
+      getDid: () => DID,
+    })
+    const session = new PasswordSession(
+      sessionAccountToSessionData(makeAccount()),
+      {...hooks, fetch: asFetch(fetchMock)},
+    )
+    hooks.arm()
+
+    await expect(session.refresh()).rejects.toBeDefined()
+
+    expect(observedEvent).toBe('expired')
+    /*
+     * The dying SessionData IS threaded on 'expired' (its refreshJwt drives the
+     * provider's cross-tab rescue), but it does NOT become a refreshedAccount:
+     * deriveRefreshedAccount only maps the 'update' path, so the reducer still
+     * sees `undefined` and logs out when no rescue applies.
+     */
+    expect(observedSessionData?.refreshJwt).toBe('refresh-jwt')
+    expect(refreshedAccountAtHookTime).toBe(undefined)
+  })
+})
+
+/*
+ * `PasswordSession` exposes no local
+ * destroy, so disposeBundle neutralizes the session by tripping the flag inside
+ * the injected fetch - after disposal every request (direct or auto-refresh,
+ * which shares this same captured fetch) throws before touching the network.
+ */
+describe('disposeBundle kill-switch', () => {
+  it('the injected fetch throws after disposeBundle', () => {
+    const hooks = makeSessionHooks({
+      onSessionChange: jest.fn(),
+      getBundle: () => ({}) as SessionBundle,
+      getDid: () => DID,
+    })
+    /* the injected fetch is the kill-switch wrapper makeSessionHooks bakes in */
+    const injectedFetch = hooks.fetch!
+
+    /*
+     * A live session is required for disposeBundle to act (it early-returns on
+     * a null/destroyed session).
+     */
+    const session = new PasswordSession(
+      sessionAccountToSessionData(makeAccount()),
+      {...hooks},
+    )
+    const bundle = buildBundle(session)
+    registerBundleKillSwitch(bundle, hooks.kill)
+
+    /*
+     * Before disposal the wrapper does NOT throw synchronously - it delegates
+     * to the async networkAwareFetch and returns a promise. Swallow that
+     * promise's rejection (the real network is unavailable under jest); we only
+     * care that no synchronous throw happened here.
+     */
+    const pending = injectedFetch('https://bsky.social/xrpc/x')
+    expect(pending).toBeInstanceOf(Promise)
+    void pending.catch(() => {})
+
+    disposeBundle(bundle)
+
+    /* after disposal every call through the injected fetch throws */
+    expect(() => injectedFetch('https://bsky.social/xrpc/x')).toThrow(
+      'session disposed',
+    )
+  })
+})
+
+/*
+ * PasswordSession lifecycle over a mocked fetch, covering the resume fast path
+ * and the hooks that makeSessionHooks maps into reducer events.
+ */
+describe('PasswordSession lifecycle over mocked fetch', () => {
+  it('resume fast path: constructing does not hit the network', () => {
+    const fetchMock = makeMockFetch()
+    /* not expired -> new PasswordSession(...) with no refresh */
+    void new PasswordSession(sessionAccountToSessionData(makeAccount()), {
+      fetch: asFetch(fetchMock),
+    })
+    expect(fetchMock.mock.calls.length).toBe(0)
+  })
+
+  it('resume network path fires onUpdated with fresh tokens', async () => {
+    const fetchMock = makeMockFetch()
+    const onUpdated =
+      jest.fn<NonNullable<PasswordSessionOptions['onUpdated']>>()
+    const session = await PasswordSession.resume(
+      sessionAccountToSessionData(makeAccount()),
+      {fetch: asFetch(fetchMock), onUpdated},
+    )
+    expect(onUpdated).toHaveBeenCalledTimes(1)
+    expect(session.session.accessJwt).toBe('access-jwt-2')
+  })
+
+  it('onDeleted fires when refresh returns a declared invalid-token error', async () => {
+    const onDeleted =
+      jest.fn<NonNullable<PasswordSessionOptions['onDeleted']>>()
+    const onUpdated =
+      jest.fn<NonNullable<PasswordSessionOptions['onUpdated']>>()
+    const fetchMock = makeMockFetch({
+      'com.atproto.server.refreshSession': () =>
+        new Response(
+          JSON.stringify({error: 'ExpiredToken', message: 'Token expired'}),
+          {status: 400, headers: {'content-type': 'application/json'}},
+        ),
+    })
+    const session = new PasswordSession(
+      sessionAccountToSessionData(makeAccount()),
+      {fetch: asFetch(fetchMock), onDeleted, onUpdated},
+    )
+    await expect(session.refresh()).rejects.toBeDefined()
+    expect(onDeleted).toHaveBeenCalledTimes(1)
+    expect(onUpdated).not.toHaveBeenCalled()
+  })
+
+  it('onUpdateFailure fires on a transient (500) refresh error, session preserved', async () => {
+    const onDeleted =
+      jest.fn<NonNullable<PasswordSessionOptions['onDeleted']>>()
+    const onUpdateFailure =
+      jest.fn<NonNullable<PasswordSessionOptions['onUpdateFailure']>>()
+    const fetchMock = makeMockFetch({
+      'com.atproto.server.refreshSession': () =>
+        new Response(JSON.stringify({error: 'InternalServerError'}), {
+          status: 500,
+          headers: {'content-type': 'application/json'},
+        }),
+    })
+    const session = new PasswordSession(
+      sessionAccountToSessionData(makeAccount()),
+      {
+        fetch: asFetch(fetchMock),
+        onDeleted,
+        onUpdateFailure,
+      },
+    )
+    await session.refresh()
+    expect(onUpdateFailure).toHaveBeenCalledTimes(1)
+    expect(onDeleted).not.toHaveBeenCalled()
+    /* session data is preserved (still the original tokens) */
+    expect(session.session.accessJwt).toBe('access-jwt')
+  })
+})
+
+/*
+ * A refresh through a bundle's armed hooks: the app has no `refreshSession` api
+ * of its own, so every rotation the reducer sees originates here, in
+ * `PasswordSession.refresh()`. On success the armed hooks dispatch exactly one
+ * 'update' event and the post-refresh snapshot carries the rotated tokens;
+ * rejections propagate to the caller.
+ */
+describe('PasswordSession.refresh through armed hooks', () => {
+  it('refresh() resolves updated data and the armed hooks dispatch exactly one update', async () => {
+    const fetchMock = makeMockFetch()
+    const onSessionChange =
+      jest.fn<
+        (bundle: SessionBundle, did: string, event: AtpSessionEvent) => void
+      >()
+    const bundle = {} as SessionBundle
+    const hooks = makeSessionHooks({
+      onSessionChange,
+      getBundle: () => bundle,
+      getDid: () => DID,
+    })
+    /*
+     * makeSessionHooks bakes in networkAwareFetch (the real global fetch);
+     * override it with the mock while keeping the arm-latched callbacks (they
+     * close over the same `armed` flag, so hooks.arm() below still applies).
+     */
+    const session = new PasswordSession(
+      sessionAccountToSessionData(makeAccount()),
+      {...hooks, fetch: asFetch(fetchMock)},
+    )
+    hooks.arm()
+
+    await session.refresh()
+
+    /* the refreshed tokens are live on the session */
+    expect(session.session.accessJwt).toBe('access-jwt-2')
+    /* exactly one 'update' event reached the reducer via the armed hooks */
+    expect(onSessionChange).toHaveBeenCalledTimes(1)
+    expect(onSessionChange.mock.calls[0][2]).toBe('update')
+
+    /* the post-refresh SessionAccount snapshot carries the rotated tokens */
+    const snapshot = sessionDataToSessionAccount(
+      session.session,
+      session.session.service,
+    )!
+    expect(snapshot.accessJwt).toBe('access-jwt-2')
+    expect(snapshot.refreshJwt).toBe('refresh-jwt-2')
+  })
+
+  it('propagates a rejection from refresh() (invalid session)', async () => {
+    const fetchMock = makeMockFetch({
+      'com.atproto.server.refreshSession': () =>
+        new Response(
+          JSON.stringify({error: 'ExpiredToken', message: 'Token expired'}),
+          {status: 400, headers: {'content-type': 'application/json'}},
+        ),
+    })
+    const session = new PasswordSession(
+      sessionAccountToSessionData(makeAccount()),
+      {fetch: asFetch(fetchMock)},
+    )
+    await expect(session.refresh()).rejects.toBeDefined()
+  })
+})
+
+/**
+ * Load a fresh factory graph whose network leaf captures `fetch`.
+ *
+ * `session-core`'s network leaf reads `globalThis.fetch` at module load, and
+ * that captured fetch is what `PasswordSession`'s auto-refresh routes through,
+ * so the module has to be re-required after the override is in place.
+ */
+async function withFreshFactory(
+  fetch: typeof globalThis.fetch,
+  run: (core: typeof import('../session-core')) => Promise<void>,
+) {
+  const realFetch = globalThis.fetch
+  globalThis.fetch = fetch
+  try {
+    await jest.isolateModulesAsync(async () => {
+      const core =
+        require('../session-core') as typeof import('../session-core')
+      await run(core)
+    })
+  } finally {
+    globalThis.fetch = realFetch
+  }
+}
+
+/*
+ * The resume/login factories must snapshot the returned account after
+ * the prep awaits, not before. A 401 during prep triggers PasswordSession's
+ * internal auto-refresh (rotating BOTH tokens and firing an onUpdated the
+ * disarmed latch drops); an early snapshot would persist the stale refreshJwt,
+ * which is dead on the next cold start.
+ *
+ * We simulate the mid-prep rotation by capturing the bundle from the mocked
+ * `configureModerationForAccount` and making the mocked
+ * `prefetchAgeAssuranceServerData` (a genuine prep await in each factory) run a
+ * real `session.refresh()`. The factory itself is re-required inside
+ * `jest.isolateModulesAsync` AFTER overriding `globalThis.fetch`, because
+ * the network leaf captures `globalThis.fetch` at module load - and that
+ * captured fetch is what PasswordSession's auto-refresh routes through.
+ */
+describe('factory account snapshot after preparation', () => {
+  beforeEach(() => {
+    mockConfigureModerationForAccount.mockReset()
+    mockPrefetchAgeAssuranceServerData.mockReset()
+  })
+
+  it('resume: returned account carries the tokens rotated DURING prep', async () => {
+    /*
+     * A refresh mid-prep rotates the session to access-jwt-2/refresh-jwt-2.
+     * `valid-access-jwt` decodes as non-expired, so resume() takes the sync
+     * fast path and the only refresh is the one prep triggers. The bundle is
+     * captured from the (synchronous) moderation call, and the rotation is
+     * injected into the awaited AA prefetch.
+     */
+    let capturedAgent: BskyAppAgent | undefined
+    mockConfigureModerationForAccount.mockImplementationOnce(
+      (agent: unknown) => {
+        capturedAgent = agent as BskyAppAgent
+      },
+    )
+    mockPrefetchAgeAssuranceServerData.mockImplementationOnce(async () => {
+      /* routes through the bridge into the shared PasswordSession's refresh */
+      await capturedAgent!.sessionManager.refreshSession()
+    })
+    const fetchMock = makeMockFetch()
+
+    await withFreshFactory(asFetch(fetchMock), async core => {
+      const {account, bundle} = await core.createSessionBundleAndResume(
+        makeAccount({accessJwt: 'valid-access-jwt'}),
+        jest.fn(),
+      )
+      /* the moderation prep step ran the refresh */
+      expect(mockConfigureModerationForAccount).toHaveBeenCalledTimes(1)
+      /* the RETURNED account carries the POST-prep (rotated) tokens */
+      expect(account.accessJwt).toBe('access-jwt-2')
+      expect(account.refreshJwt).toBe('refresh-jwt-2')
+      /* and it matches the session's committed state */
+      expect(bundle.session.session.accessJwt).toBe('access-jwt-2')
+    })
+  })
+
+  it('resume: returned account falls back to the stored account when the fast path yields no live token change', async () => {
+    /*
+     * With no mid-prep refresh, the snapshot still reflects the valid stored
+     * tokens.
+     */
+    mockConfigureModerationForAccount.mockReturnValueOnce(undefined)
+    const fetchMock = makeMockFetch()
+
+    await withFreshFactory(asFetch(fetchMock), async core => {
+      const {account} = await core.createSessionBundleAndResume(
+        makeAccount({accessJwt: 'valid-access-jwt'}),
+        jest.fn(),
+      )
+      expect(account.accessJwt).toBe('valid-access-jwt')
+      expect(account.refreshJwt).toBe('refresh-jwt')
+    })
+  })
+})
+
+/*
+ * Preparation is the window between building the bundle and arming its hooks.
+ * The session is live but its events are swallowed, so a session that dies in
+ * here would otherwise leave the app holding a bundle that looks signed in and
+ * can only make unauthenticated requests, with nothing left to log it out.
+ * Both failure modes must therefore dispose the bundle and reject.
+ */
+describe('a session destroyed or rejected during preparation', () => {
+  beforeEach(() => {
+    mockConfigureModerationForAccount.mockReset()
+    mockPrefetchAgeAssuranceServerData.mockReset()
+  })
+
+  it('resume: rejects with the revoked-during-prep error and disposes the bundle', async () => {
+    /*
+     * A revoked refresh token: the session's own refresh during prep gets a
+     * declared invalid-token error, which destroys it. `logout()` is the only
+     * way to drive a session to `destroyed` from outside, and it takes the same
+     * `deleteSession` -> onDeleted -> destroyed path the real 401 rescue does.
+     */
+    let capturedAgent: BskyAppAgent | undefined
+    mockConfigureModerationForAccount.mockImplementationOnce(
+      (agent: unknown) => {
+        capturedAgent = agent as BskyAppAgent
+      },
+    )
+    mockPrefetchAgeAssuranceServerData.mockImplementationOnce(async () => {
+      await capturedAgent!.logout()
+    })
+    const fetchMock = makeMockFetch()
+
+    await withFreshFactory(asFetch(fetchMock), async core => {
+      /*
+       * The clean error, not PasswordSession's opaque `Logged out` getter
+       * throw, which is what a naive `snapshot()` on a destroyed session would
+       * surface.
+       */
+      await expect(
+        core.createSessionBundleAndResume(
+          makeAccount({accessJwt: 'valid-access-jwt'}),
+          jest.fn(),
+        ),
+      ).rejects.toThrow('Session was revoked while it was being prepared')
+
+      /* the bundle the caller never received reads as logged out */
+      expect(capturedAgent!.session).toBe(undefined)
+    })
+  })
+
+  it('resume: a prep rejection propagates and disposes the bundle', async () => {
+    let capturedAgent: BskyAppAgent | undefined
+    mockConfigureModerationForAccount.mockImplementationOnce(
+      (agent: unknown) => {
+        capturedAgent = agent as BskyAppAgent
+      },
+    )
+    mockPrefetchAgeAssuranceServerData.mockImplementationOnce(() =>
+      Promise.reject(new Error('prefetch blew up')),
+    )
+    const fetchMock = makeMockFetch()
+
+    await withFreshFactory(asFetch(fetchMock), async core => {
+      await expect(
+        core.createSessionBundleAndResume(
+          makeAccount({accessJwt: 'valid-access-jwt'}),
+          jest.fn(),
+        ),
+      ).rejects.toThrow('prefetch blew up')
+
+      /* the still-live session was disposed rather than left refreshing */
+      expect(capturedAgent!.session).toBe(undefined)
+    })
+  })
+
+  it('finishPreparation disposes and rethrows without running the snapshot', async () => {
+    const hooks = makeSessionHooks({
+      onSessionChange: jest.fn(),
+      getBundle: () => bundle,
+      getDid: () => DID,
+    })
+    const session = new PasswordSession(
+      sessionAccountToSessionData(makeAccount()),
+      {...hooks, fetch: asFetch(makeMockFetch())},
+    )
+    const bundle = buildBundle(session)
+    registerBundleKillSwitch(bundle, hooks.kill)
+    const snapshot = jest.fn(() => 'never')
+
+    await expect(
+      finishPreparation(bundle, Promise.reject(new Error('nope')), snapshot),
+    ).rejects.toThrow('nope')
+
+    expect(snapshot).not.toHaveBeenCalled()
+    expect(bundle.agent.session).toBe(undefined)
+  })
+})
+
+/*
+ * A hook must never throw: PasswordSession awaits its hooks inside the
+ * assignment to its internal session promise, so an escaping throw would leave
+ * that promise permanently rejected - every later request fails, while the
+ * session is never marked destroyed, so disposeBundle cannot even see that the
+ * bundle is dead.
+ */
+describe('a throwing onSessionChange does not brick the session', () => {
+  beforeEach(() => {
+    mockLoggerError.mockClear()
+  })
+
+  it('reports through logger.error and leaves the session usable', async () => {
+    const fetchMock = makeMockFetch()
+    const onSessionChange = jest.fn(() => {
+      throw new Error('reducer side effect exploded')
+    })
+    let bundle!: SessionBundle
+    const hooks = makeSessionHooks({
+      onSessionChange,
+      getBundle: () => bundle,
+      getDid: () => DID,
+    })
+    const session = new PasswordSession(
+      sessionAccountToSessionData(makeAccount()),
+      {...hooks, fetch: asFetch(fetchMock)},
+    )
+    bundle = buildBundle(session)
+    hooks.arm()
+
+    await session.refresh()
+
+    expect(onSessionChange).toHaveBeenCalledTimes(1)
+    expect(mockLoggerError).toHaveBeenCalledTimes(1)
+    expect(mockLoggerError.mock.calls[0][1]).toEqual({
+      message: "session: onSessionChange threw for a 'update' event",
+    })
+
+    /* the session still committed the rotation, and can still refresh again */
+    expect(session.session.accessJwt).toBe('access-jwt-2')
+    await expect(session.refresh()).resolves.toBeDefined()
+    await expect(
+      session.fetchHandler('/xrpc/app.bsky.actor.getProfile', {}),
+    ).resolves.toBeDefined()
+  })
+})
diff --git a/src/state/session/__tests__/session-test.ts b/src/state/session/__tests__/session-test.ts
index eebcfcf8d2..9cb2db6a59 100644
--- a/src/state/session/__tests__/session-test.ts
+++ b/src/state/session/__tests__/session-test.ts
@@ -1,8 +1,10 @@
-import {AtpAgent} from '@atproto/api'
+import {type AtpAgent} from '@atproto/api'
+import {type SessionData} from '@atproto/lex-password-session'
 import {describe, expect, it, jest} from '@jest/globals'
 
-import {agentToSessionAccountOrThrow} from '../agent'
 import {type Action, getInitialState, reducer, type State} from '../reducer'
+import {sessionDataToSessionAccount} from '../session-core'
+import {type SessionAccount} from '../types'
 
 jest.mock('jwt-decode', () => ({
   jwtDecode(_token: string) {
@@ -20,6 +22,46 @@ jest.mock('#/lib/notifications/notifications', () => ({
     return Promise.resolve()
   },
 }))
+/*
+ * The logout and account-removal reducer cases fire a push-token side effect
+ * whose first step, `createTemporaryAgentsAndResume`, builds real `AtpAgent`s
+ * and resumes them over the real network. Under jest that request outlives the
+ * suite: it rejects after teardown, and the resulting `logger.error` reaches
+ * for `nanoid` in an environment that no longer has it, failing whichever suite
+ * happens to be running at that moment. Stubbing the module keeps the side
+ * effect synchronous and offline.
+ */
+jest.mock('../util', () => ({
+  createTemporaryAgentsAndResume: () => Promise.resolve([]),
+}))
+
+// Reuse a bundle within each test: session events are scoped by bundle identity.
+function makeBundle(service: string) {
+  return {service: new URL(service)}
+}
+
+function makeAccount(
+  service: string,
+  session: {
+    active: boolean
+    did: string
+    handle: string
+    accessJwt: string
+    refreshJwt: string
+    email?: string
+    emailAuthFactor?: boolean
+    emailConfirmed?: boolean
+  },
+): SessionAccount {
+  const account = sessionDataToSessionAccount(
+    session as unknown as SessionData,
+    service,
+  )
+  if (!account) {
+    throw new Error('Expected an account')
+  }
+  return account
+}
 
 describe('session', () => {
   it('can log in and out', () => {
@@ -27,8 +69,8 @@ describe('session', () => {
     expect(printState(state)).toMatchInlineSnapshot(`
       {
         "accounts": [],
-        "currentAgentState": {
-          "agent": {
+        "currentBundleState": {
+          "bundle": {
             "service": "https://public.api.bsky.app/",
           },
           "did": undefined,
@@ -37,22 +79,22 @@ describe('session', () => {
       }
     `)
 
-    const agent = new AtpAgent({service: 'https://alice.com'})
-    agent.sessionManager.session = {
+    const aliceBundle = makeBundle('https://alice.com')
+    const aliceAccount = makeAccount('https://alice.com', {
       active: true,
       did: 'alice-did',
       handle: 'alice.test',
       accessJwt: 'alice-access-jwt-1',
       refreshJwt: 'alice-refresh-jwt-1',
-    }
+    })
     state = run(state, [
       {
         type: 'switched-to-account',
-        newAgent: agent,
-        newAccount: agentToSessionAccountOrThrow(agent),
+        newBundle: aliceBundle,
+        newAccount: aliceAccount,
       },
     ])
-    expect(state.currentAgentState.did).toBe('alice-did')
+    expect(state.currentBundleState.did).toBe('alice-did')
     expect(state.accounts.length).toBe(1)
     expect(state.accounts[0].did).toBe('alice-did')
     expect(state.accounts[0].accessJwt).toBe('alice-access-jwt-1')
@@ -76,8 +118,8 @@ describe('session', () => {
             "status": undefined,
           },
         ],
-        "currentAgentState": {
-          "agent": {
+        "currentBundleState": {
+          "bundle": {
             "service": "https://alice.com/",
           },
           "did": "alice-did",
@@ -92,7 +134,7 @@ describe('session', () => {
       },
     ])
     // Should keep the account but clear out the tokens.
-    expect(state.currentAgentState.did).toBe(undefined)
+    expect(state.currentBundleState.did).toBe(undefined)
     expect(state.accounts.length).toBe(1)
     expect(state.accounts[0].did).toBe('alice-did')
     expect(state.accounts[0].accessJwt).toBe(undefined)
@@ -116,8 +158,8 @@ describe('session', () => {
             "status": undefined,
           },
         ],
-        "currentAgentState": {
-          "agent": {
+        "currentBundleState": {
+          "bundle": {
             "service": "https://public.api.bsky.app/",
           },
           "did": undefined,
@@ -130,26 +172,26 @@ describe('session', () => {
   it('switches to the latest account, stores all of them', () => {
     let state = getInitialState([])
 
-    const agent1 = new AtpAgent({service: 'https://alice.com'})
-    agent1.sessionManager.session = {
+    const aliceBundle = makeBundle('https://alice.com')
+    const aliceAccount = makeAccount('https://alice.com', {
       active: true,
       did: 'alice-did',
       handle: 'alice.test',
       accessJwt: 'alice-access-jwt-1',
       refreshJwt: 'alice-refresh-jwt-1',
-    }
+    })
     state = run(state, [
       {
         // Switch to Alice.
         type: 'switched-to-account',
-        newAgent: agent1,
-        newAccount: agentToSessionAccountOrThrow(agent1),
+        newBundle: aliceBundle,
+        newAccount: aliceAccount,
       },
     ])
     expect(state.accounts.length).toBe(1)
     expect(state.accounts[0].did).toBe('alice-did')
-    expect(state.currentAgentState.did).toBe('alice-did')
-    expect(state.currentAgentState.agent).toBe(agent1)
+    expect(state.currentBundleState.did).toBe('alice-did')
+    expect(state.currentBundleState.bundle).toBe(aliceBundle)
     expect(printState(state)).toMatchInlineSnapshot(`
       {
         "accounts": [
@@ -169,8 +211,8 @@ describe('session', () => {
             "status": undefined,
           },
         ],
-        "currentAgentState": {
-          "agent": {
+        "currentBundleState": {
+          "bundle": {
             "service": "https://alice.com/",
           },
           "did": "alice-did",
@@ -179,28 +221,28 @@ describe('session', () => {
       }
     `)
 
-    const agent2 = new AtpAgent({service: 'https://bob.com'})
-    agent2.sessionManager.session = {
+    const bobBundle = makeBundle('https://bob.com')
+    const bobAccount = makeAccount('https://bob.com', {
       active: true,
       did: 'bob-did',
       handle: 'bob.test',
       accessJwt: 'bob-access-jwt-1',
       refreshJwt: 'bob-refresh-jwt-1',
-    }
+    })
     state = run(state, [
       {
         // Switch to Bob.
         type: 'switched-to-account',
-        newAgent: agent2,
-        newAccount: agentToSessionAccountOrThrow(agent2),
+        newBundle: bobBundle,
+        newAccount: bobAccount,
       },
     ])
     expect(state.accounts.length).toBe(2)
     // Bob should float upwards.
     expect(state.accounts[0].did).toBe('bob-did')
     expect(state.accounts[1].did).toBe('alice-did')
-    expect(state.currentAgentState.did).toBe('bob-did')
-    expect(state.currentAgentState.agent).toBe(agent2)
+    expect(state.currentBundleState.did).toBe('bob-did')
+    expect(state.currentBundleState.bundle).toBe(bobBundle)
     expect(printState(state)).toMatchInlineSnapshot(`
       {
         "accounts": [
@@ -235,8 +277,8 @@ describe('session', () => {
             "status": undefined,
           },
         ],
-        "currentAgentState": {
-          "agent": {
+        "currentBundleState": {
+          "bundle": {
             "service": "https://bob.com/",
           },
           "did": "bob-did",
@@ -245,28 +287,28 @@ describe('session', () => {
       }
     `)
 
-    const agent3 = new AtpAgent({service: 'https://alice.com'})
-    agent3.sessionManager.session = {
+    const aliceBundle2 = makeBundle('https://alice.com')
+    const aliceAccount2 = makeAccount('https://alice.com', {
       active: true,
       did: 'alice-did',
       handle: 'alice-updated.test',
       accessJwt: 'alice-access-jwt-2',
       refreshJwt: 'alice-refresh-jwt-2',
-    }
+    })
     state = run(state, [
       {
         // Switch back to Alice.
         type: 'switched-to-account',
-        newAgent: agent3,
-        newAccount: agentToSessionAccountOrThrow(agent3),
+        newBundle: aliceBundle2,
+        newAccount: aliceAccount2,
       },
     ])
     expect(state.accounts.length).toBe(2)
     // Alice should float upwards.
     expect(state.accounts[0].did).toBe('alice-did')
     expect(state.accounts[0].handle).toBe('alice-updated.test')
-    expect(state.currentAgentState.did).toBe('alice-did')
-    expect(state.currentAgentState.agent).toBe(agent3)
+    expect(state.currentBundleState.did).toBe('alice-did')
+    expect(state.currentBundleState.bundle).toBe(aliceBundle2)
     expect(printState(state)).toMatchInlineSnapshot(`
       {
         "accounts": [
@@ -301,8 +343,8 @@ describe('session', () => {
             "status": undefined,
           },
         ],
-        "currentAgentState": {
-          "agent": {
+        "currentBundleState": {
+          "bundle": {
             "service": "https://alice.com/",
           },
           "did": "alice-did",
@@ -311,26 +353,26 @@ describe('session', () => {
       }
     `)
 
-    const agent4 = new AtpAgent({service: 'https://jay.com'})
-    agent4.sessionManager.session = {
+    const jayBundle = makeBundle('https://jay.com')
+    const jayAccount = makeAccount('https://jay.com', {
       active: true,
       did: 'jay-did',
       handle: 'jay.test',
       accessJwt: 'jay-access-jwt-1',
       refreshJwt: 'jay-refresh-jwt-1',
-    }
+    })
     state = run(state, [
       {
         // Switch to Jay.
         type: 'switched-to-account',
-        newAgent: agent4,
-        newAccount: agentToSessionAccountOrThrow(agent4),
+        newBundle: jayBundle,
+        newAccount: jayAccount,
       },
     ])
     expect(state.accounts.length).toBe(3)
     expect(state.accounts[0].did).toBe('jay-did')
-    expect(state.currentAgentState.did).toBe('jay-did')
-    expect(state.currentAgentState.agent).toBe(agent4)
+    expect(state.currentBundleState.did).toBe('jay-did')
+    expect(state.currentBundleState.bundle).toBe(jayBundle)
     expect(printState(state)).toMatchInlineSnapshot(`
       {
         "accounts": [
@@ -380,8 +422,8 @@ describe('session', () => {
             "status": undefined,
           },
         ],
-        "currentAgentState": {
-          "agent": {
+        "currentBundleState": {
+          "bundle": {
             "service": "https://jay.com/",
           },
           "did": "jay-did",
@@ -397,7 +439,7 @@ describe('session', () => {
       },
     ])
     expect(state.accounts.length).toBe(3)
-    expect(state.currentAgentState.did).toBe(undefined)
+    expect(state.currentBundleState.did).toBe(undefined)
     // All tokens should be gone.
     expect(state.accounts[0].accessJwt).toBe(undefined)
     expect(state.accounts[0].refreshJwt).toBe(undefined)
@@ -454,8 +496,8 @@ describe('session', () => {
             "status": undefined,
           },
         ],
-        "currentAgentState": {
-          "agent": {
+        "currentBundleState": {
+          "bundle": {
             "service": "https://public.api.bsky.app/",
           },
           "did": undefined,
@@ -468,25 +510,25 @@ describe('session', () => {
   it('can log back in after logging out', () => {
     let state = getInitialState([])
 
-    const agent1 = new AtpAgent({service: 'https://alice.com'})
-    agent1.sessionManager.session = {
+    const aliceBundle = makeBundle('https://alice.com')
+    const aliceAccount = makeAccount('https://alice.com', {
       active: true,
       did: 'alice-did',
       handle: 'alice.test',
       accessJwt: 'alice-access-jwt-1',
       refreshJwt: 'alice-refresh-jwt-1',
-    }
+    })
     state = run(state, [
       {
         type: 'switched-to-account',
-        newAgent: agent1,
-        newAccount: agentToSessionAccountOrThrow(agent1),
+        newBundle: aliceBundle,
+        newAccount: aliceAccount,
       },
     ])
     expect(state.accounts.length).toBe(1)
     expect(state.accounts[0].accessJwt).toBe('alice-access-jwt-1')
     expect(state.accounts[0].refreshJwt).toBe('alice-refresh-jwt-1')
-    expect(state.currentAgentState.did).toBe('alice-did')
+    expect(state.currentBundleState.did).toBe('alice-did')
 
     state = run(state, [
       {
@@ -496,7 +538,7 @@ describe('session', () => {
     expect(state.accounts.length).toBe(1)
     expect(state.accounts[0].accessJwt).toBe(undefined)
     expect(state.accounts[0].refreshJwt).toBe(undefined)
-    expect(state.currentAgentState.did).toBe(undefined)
+    expect(state.currentBundleState.did).toBe(undefined)
     expect(printState(state)).toMatchInlineSnapshot(`
       {
         "accounts": [
@@ -516,8 +558,8 @@ describe('session', () => {
             "status": undefined,
           },
         ],
-        "currentAgentState": {
-          "agent": {
+        "currentBundleState": {
+          "bundle": {
             "service": "https://public.api.bsky.app/",
           },
           "did": undefined,
@@ -526,25 +568,25 @@ describe('session', () => {
       }
     `)
 
-    const agent2 = new AtpAgent({service: 'https://alice.com'})
-    agent2.sessionManager.session = {
+    const aliceBundle2 = makeBundle('https://alice.com')
+    const aliceAccount2 = makeAccount('https://alice.com', {
       active: true,
       did: 'alice-did',
       handle: 'alice.test',
       accessJwt: 'alice-access-jwt-2',
       refreshJwt: 'alice-refresh-jwt-2',
-    }
+    })
     state = run(state, [
       {
         type: 'switched-to-account',
-        newAgent: agent2,
-        newAccount: agentToSessionAccountOrThrow(agent2),
+        newBundle: aliceBundle2,
+        newAccount: aliceAccount2,
       },
     ])
     expect(state.accounts.length).toBe(1)
     expect(state.accounts[0].accessJwt).toBe('alice-access-jwt-2')
     expect(state.accounts[0].refreshJwt).toBe('alice-refresh-jwt-2')
-    expect(state.currentAgentState.did).toBe('alice-did')
+    expect(state.currentBundleState.did).toBe('alice-did')
     expect(printState(state)).toMatchInlineSnapshot(`
       {
         "accounts": [
@@ -564,8 +606,8 @@ describe('session', () => {
             "status": undefined,
           },
         ],
-        "currentAgentState": {
-          "agent": {
+        "currentBundleState": {
+          "bundle": {
             "service": "https://alice.com/",
           },
           "did": "alice-did",
@@ -578,25 +620,25 @@ describe('session', () => {
   it('can remove active account', () => {
     let state = getInitialState([])
 
-    const agent1 = new AtpAgent({service: 'https://alice.com'})
-    agent1.sessionManager.session = {
+    const aliceBundle = makeBundle('https://alice.com')
+    const aliceAccount = makeAccount('https://alice.com', {
       active: true,
       did: 'alice-did',
       handle: 'alice.test',
       accessJwt: 'alice-access-jwt-1',
       refreshJwt: 'alice-refresh-jwt-1',
-    }
+    })
     state = run(state, [
       {
         type: 'switched-to-account',
-        newAgent: agent1,
-        newAccount: agentToSessionAccountOrThrow(agent1),
+        newBundle: aliceBundle,
+        newAccount: aliceAccount,
       },
     ])
     expect(state.accounts.length).toBe(1)
     expect(state.accounts[0].accessJwt).toBe('alice-access-jwt-1')
     expect(state.accounts[0].refreshJwt).toBe('alice-refresh-jwt-1')
-    expect(state.currentAgentState.did).toBe('alice-did')
+    expect(state.currentBundleState.did).toBe('alice-did')
 
     state = run(state, [
       {
@@ -605,12 +647,12 @@ describe('session', () => {
       },
     ])
     expect(state.accounts.length).toBe(0)
-    expect(state.currentAgentState.did).toBe(undefined)
+    expect(state.currentBundleState.did).toBe(undefined)
     expect(printState(state)).toMatchInlineSnapshot(`
       {
         "accounts": [],
-        "currentAgentState": {
-          "agent": {
+        "currentBundleState": {
+          "bundle": {
             "service": "https://public.api.bsky.app/",
           },
           "did": undefined,
@@ -623,36 +665,36 @@ describe('session', () => {
   it('can remove inactive account', () => {
     let state = getInitialState([])
 
-    const agent1 = new AtpAgent({service: 'https://alice.com'})
-    agent1.sessionManager.session = {
+    const aliceBundle = makeBundle('https://alice.com')
+    const aliceAccount = makeAccount('https://alice.com', {
       active: true,
       did: 'alice-did',
       handle: 'alice.test',
       accessJwt: 'alice-access-jwt-1',
       refreshJwt: 'alice-refresh-jwt-1',
-    }
-    const agent2 = new AtpAgent({service: 'https://bob.com'})
-    agent2.sessionManager.session = {
+    })
+    const bobBundle = makeBundle('https://bob.com')
+    const bobAccount = makeAccount('https://bob.com', {
       active: true,
       did: 'bob-did',
       handle: 'bob.test',
       accessJwt: 'bob-access-jwt-1',
       refreshJwt: 'bob-refresh-jwt-1',
-    }
+    })
     state = run(state, [
       {
         type: 'switched-to-account',
-        newAgent: agent1,
-        newAccount: agentToSessionAccountOrThrow(agent1),
+        newBundle: aliceBundle,
+        newAccount: aliceAccount,
       },
       {
         type: 'switched-to-account',
-        newAgent: agent2,
-        newAccount: agentToSessionAccountOrThrow(agent2),
+        newBundle: bobBundle,
+        newAccount: bobAccount,
       },
     ])
     expect(state.accounts.length).toBe(2)
-    expect(state.currentAgentState.did).toBe('bob-did')
+    expect(state.currentBundleState.did).toBe('bob-did')
 
     state = run(state, [
       {
@@ -661,7 +703,7 @@ describe('session', () => {
       },
     ])
     expect(state.accounts.length).toBe(1)
-    expect(state.currentAgentState.did).toBe('bob-did')
+    expect(state.currentBundleState.did).toBe('bob-did')
     expect(printState(state)).toMatchInlineSnapshot(`
       {
         "accounts": [
@@ -681,8 +723,8 @@ describe('session', () => {
             "status": undefined,
           },
         ],
-        "currentAgentState": {
-          "agent": {
+        "currentBundleState": {
+          "bundle": {
             "service": "https://bob.com/",
           },
           "did": "bob-did",
@@ -698,51 +740,51 @@ describe('session', () => {
       },
     ])
     expect(state.accounts.length).toBe(0)
-    expect(state.currentAgentState.did).toBe(undefined)
+    expect(state.currentBundleState.did).toBe(undefined)
   })
 
   it('can log out of the current account', () => {
     let state = getInitialState([])
 
-    const agent1 = new AtpAgent({service: 'https://alice.com'})
-    agent1.sessionManager.session = {
+    const aliceBundle = makeBundle('https://alice.com')
+    const aliceAccount = makeAccount('https://alice.com', {
       active: true,
       did: 'alice-did',
       handle: 'alice.test',
       accessJwt: 'alice-access-jwt-1',
       refreshJwt: 'alice-refresh-jwt-1',
-    }
+    })
     state = run(state, [
       {
         type: 'switched-to-account',
-        newAgent: agent1,
-        newAccount: agentToSessionAccountOrThrow(agent1),
+        newBundle: aliceBundle,
+        newAccount: aliceAccount,
       },
     ])
     expect(state.accounts.length).toBe(1)
     expect(state.accounts[0].accessJwt).toBe('alice-access-jwt-1')
     expect(state.accounts[0].refreshJwt).toBe('alice-refresh-jwt-1')
-    expect(state.currentAgentState.did).toBe('alice-did')
+    expect(state.currentBundleState.did).toBe('alice-did')
 
-    const agent2 = new AtpAgent({service: 'https://bob.com'})
-    agent2.sessionManager.session = {
+    const bobBundle = makeBundle('https://bob.com')
+    const bobAccount = makeAccount('https://bob.com', {
       active: true,
       did: 'bob-did',
       handle: 'bob.test',
       accessJwt: 'bob-access-jwt-1',
       refreshJwt: 'bob-refresh-jwt-1',
-    }
+    })
     state = run(state, [
       {
         type: 'switched-to-account',
-        newAgent: agent2,
-        newAccount: agentToSessionAccountOrThrow(agent2),
+        newBundle: bobBundle,
+        newAccount: bobAccount,
       },
     ])
     expect(state.accounts.length).toBe(2)
     expect(state.accounts[0].accessJwt).toBe('bob-access-jwt-1')
     expect(state.accounts[0].refreshJwt).toBe('bob-refresh-jwt-1')
-    expect(state.currentAgentState.did).toBe('bob-did')
+    expect(state.currentBundleState.did).toBe('bob-did')
 
     state = run(state, [
       {
@@ -754,7 +796,7 @@ describe('session', () => {
     expect(state.accounts[0].refreshJwt).toBe(undefined)
     expect(state.accounts[1].accessJwt).toBe('alice-access-jwt-1')
     expect(state.accounts[1].refreshJwt).toBe('alice-refresh-jwt-1')
-    expect(state.currentAgentState.did).toBe(undefined)
+    expect(state.currentBundleState.did).toBe(undefined)
     expect(printState(state)).toMatchInlineSnapshot(`
       {
         "accounts": [
@@ -789,8 +831,8 @@ describe('session', () => {
             "status": undefined,
           },
         ],
-        "currentAgentState": {
-          "agent": {
+        "currentBundleState": {
+          "bundle": {
             "service": "https://public.api.bsky.app/",
           },
           "did": undefined,
@@ -803,40 +845,38 @@ describe('session', () => {
   it('updates stored account with refreshed tokens', () => {
     let state = getInitialState([])
 
-    const agent1 = new AtpAgent({service: 'https://alice.com'})
-    agent1.sessionManager.session = {
-      active: true,
-      did: 'alice-did',
-      handle: 'alice.test',
-      accessJwt: 'alice-access-jwt-1',
-      refreshJwt: 'alice-refresh-jwt-1',
-    }
+    const aliceBundle = makeBundle('https://alice.com')
     state = run(state, [
       {
         type: 'switched-to-account',
-        newAgent: agent1,
-        newAccount: agentToSessionAccountOrThrow(agent1),
+        newBundle: aliceBundle,
+        newAccount: makeAccount('https://alice.com', {
+          active: true,
+          did: 'alice-did',
+          handle: 'alice.test',
+          accessJwt: 'alice-access-jwt-1',
+          refreshJwt: 'alice-refresh-jwt-1',
+        }),
       },
     ])
     expect(state.accounts.length).toBe(1)
-    expect(state.currentAgentState.did).toBe('alice-did')
+    expect(state.currentBundleState.did).toBe('alice-did')
 
-    agent1.sessionManager.session = {
-      active: true,
-      did: 'alice-did',
-      handle: 'alice-updated.test',
-      accessJwt: 'alice-access-jwt-2',
-      refreshJwt: 'alice-refresh-jwt-2',
-      email: 'alice@foo.bar',
-      emailAuthFactor: false,
-      emailConfirmed: false,
-    }
     state = run(state, [
       {
-        type: 'received-agent-event',
+        type: 'received-session-event',
         accountDid: 'alice-did',
-        agent: agent1,
-        refreshedAccount: agentToSessionAccountOrThrow(agent1),
+        bundle: aliceBundle,
+        refreshedAccount: makeAccount('https://alice.com', {
+          active: true,
+          did: 'alice-did',
+          handle: 'alice-updated.test',
+          accessJwt: 'alice-access-jwt-2',
+          refreshJwt: 'alice-refresh-jwt-2',
+          email: 'alice@foo.bar',
+          emailAuthFactor: false,
+          emailConfirmed: false,
+        }),
         sessionEvent: 'update',
       },
     ])
@@ -845,7 +885,7 @@ describe('session', () => {
     expect(state.accounts[0].handle).toBe('alice-updated.test')
     expect(state.accounts[0].accessJwt).toBe('alice-access-jwt-2')
     expect(state.accounts[0].refreshJwt).toBe('alice-refresh-jwt-2')
-    expect(state.currentAgentState.did).toBe('alice-did')
+    expect(state.currentBundleState.did).toBe('alice-did')
     expect(printState(state)).toMatchInlineSnapshot(`
       {
         "accounts": [
@@ -865,8 +905,8 @@ describe('session', () => {
             "status": undefined,
           },
         ],
-        "currentAgentState": {
-          "agent": {
+        "currentBundleState": {
+          "bundle": {
             "service": "https://alice.com/",
           },
           "did": "alice-did",
@@ -875,22 +915,21 @@ describe('session', () => {
       }
     `)
 
-    agent1.sessionManager.session = {
-      active: true,
-      did: 'alice-did',
-      handle: 'alice-updated.test',
-      accessJwt: 'alice-access-jwt-3',
-      refreshJwt: 'alice-refresh-jwt-3',
-      email: 'alice@foo.baz',
-      emailAuthFactor: true,
-      emailConfirmed: true,
-    }
     state = run(state, [
       {
-        type: 'received-agent-event',
+        type: 'received-session-event',
         accountDid: 'alice-did',
-        agent: agent1,
-        refreshedAccount: agentToSessionAccountOrThrow(agent1),
+        bundle: aliceBundle,
+        refreshedAccount: makeAccount('https://alice.com', {
+          active: true,
+          did: 'alice-did',
+          handle: 'alice-updated.test',
+          accessJwt: 'alice-access-jwt-3',
+          refreshJwt: 'alice-refresh-jwt-3',
+          email: 'alice@foo.baz',
+          emailAuthFactor: true,
+          emailConfirmed: true,
+        }),
         sessionEvent: 'update',
       },
     ])
@@ -899,7 +938,7 @@ describe('session', () => {
     expect(state.accounts[0].handle).toBe('alice-updated.test')
     expect(state.accounts[0].accessJwt).toBe('alice-access-jwt-3')
     expect(state.accounts[0].refreshJwt).toBe('alice-refresh-jwt-3')
-    expect(state.currentAgentState.did).toBe('alice-did')
+    expect(state.currentBundleState.did).toBe('alice-did')
     expect(printState(state)).toMatchInlineSnapshot(`
       {
         "accounts": [
@@ -919,8 +958,8 @@ describe('session', () => {
             "status": undefined,
           },
         ],
-        "currentAgentState": {
-          "agent": {
+        "currentBundleState": {
+          "bundle": {
             "service": "https://alice.com/",
           },
           "did": "alice-did",
@@ -929,22 +968,21 @@ describe('session', () => {
       }
     `)
 
-    agent1.sessionManager.session = {
-      active: true,
-      did: 'alice-did',
-      handle: 'alice-updated.test',
-      accessJwt: 'alice-access-jwt-4',
-      refreshJwt: 'alice-refresh-jwt-4',
-      email: 'alice@foo.baz',
-      emailAuthFactor: false,
-      emailConfirmed: false,
-    }
     state = run(state, [
       {
-        type: 'received-agent-event',
+        type: 'received-session-event',
         accountDid: 'alice-did',
-        agent: agent1,
-        refreshedAccount: agentToSessionAccountOrThrow(agent1),
+        bundle: aliceBundle,
+        refreshedAccount: makeAccount('https://alice.com', {
+          active: true,
+          did: 'alice-did',
+          handle: 'alice-updated.test',
+          accessJwt: 'alice-access-jwt-4',
+          refreshJwt: 'alice-refresh-jwt-4',
+          email: 'alice@foo.baz',
+          emailAuthFactor: false,
+          emailConfirmed: false,
+        }),
         sessionEvent: 'update',
       },
     ])
@@ -953,7 +991,7 @@ describe('session', () => {
     expect(state.accounts[0].handle).toBe('alice-updated.test')
     expect(state.accounts[0].accessJwt).toBe('alice-access-jwt-4')
     expect(state.accounts[0].refreshJwt).toBe('alice-refresh-jwt-4')
-    expect(state.currentAgentState.did).toBe('alice-did')
+    expect(state.currentBundleState.did).toBe('alice-did')
     expect(printState(state)).toMatchInlineSnapshot(`
       {
         "accounts": [
@@ -973,8 +1011,8 @@ describe('session', () => {
             "status": undefined,
           },
         ],
-        "currentAgentState": {
-          "agent": {
+        "currentBundleState": {
+          "bundle": {
             "service": "https://alice.com/",
           },
           "did": "alice-did",
@@ -987,37 +1025,35 @@ describe('session', () => {
   it('bails out of update on identical objects', () => {
     let state = getInitialState([])
 
-    const agent1 = new AtpAgent({service: 'https://alice.com'})
-    agent1.sessionManager.session = {
-      active: true,
-      did: 'alice-did',
-      handle: 'alice.test',
-      accessJwt: 'alice-access-jwt-1',
-      refreshJwt: 'alice-refresh-jwt-1',
-    }
+    const aliceBundle = makeBundle('https://alice.com')
     state = run(state, [
       {
         type: 'switched-to-account',
-        newAgent: agent1,
-        newAccount: agentToSessionAccountOrThrow(agent1),
+        newBundle: aliceBundle,
+        newAccount: makeAccount('https://alice.com', {
+          active: true,
+          did: 'alice-did',
+          handle: 'alice.test',
+          accessJwt: 'alice-access-jwt-1',
+          refreshJwt: 'alice-refresh-jwt-1',
+        }),
       },
     ])
     expect(state.accounts.length).toBe(1)
-    expect(state.currentAgentState.did).toBe('alice-did')
+    expect(state.currentBundleState.did).toBe('alice-did')
 
-    agent1.sessionManager.session = {
-      active: true,
-      did: 'alice-did',
-      handle: 'alice-updated.test',
-      accessJwt: 'alice-access-jwt-2',
-      refreshJwt: 'alice-refresh-jwt-2',
-    }
     state = run(state, [
       {
-        type: 'received-agent-event',
+        type: 'received-session-event',
         accountDid: 'alice-did',
-        agent: agent1,
-        refreshedAccount: agentToSessionAccountOrThrow(agent1),
+        bundle: aliceBundle,
+        refreshedAccount: makeAccount('https://alice.com', {
+          active: true,
+          did: 'alice-did',
+          handle: 'alice-updated.test',
+          accessJwt: 'alice-access-jwt-2',
+          refreshJwt: 'alice-refresh-jwt-2',
+        }),
         sessionEvent: 'update',
       },
     ])
@@ -1027,28 +1063,33 @@ describe('session', () => {
     const lastState = state
     state = run(state, [
       {
-        type: 'received-agent-event',
+        type: 'received-session-event',
         accountDid: 'alice-did',
-        agent: agent1,
-        refreshedAccount: agentToSessionAccountOrThrow(agent1),
+        bundle: aliceBundle,
+        refreshedAccount: makeAccount('https://alice.com', {
+          active: true,
+          did: 'alice-did',
+          handle: 'alice-updated.test',
+          accessJwt: 'alice-access-jwt-2',
+          refreshJwt: 'alice-refresh-jwt-2',
+        }),
         sessionEvent: 'update',
       },
     ])
     expect(lastState === state).toBe(true)
 
-    agent1.sessionManager.session = {
-      active: true,
-      did: 'alice-did',
-      handle: 'alice-updated.test',
-      accessJwt: 'alice-access-jwt-3',
-      refreshJwt: 'alice-refresh-jwt-3',
-    }
     state = run(state, [
       {
-        type: 'received-agent-event',
+        type: 'received-session-event',
         accountDid: 'alice-did',
-        agent: agent1,
-        refreshedAccount: agentToSessionAccountOrThrow(agent1),
+        bundle: aliceBundle,
+        refreshedAccount: makeAccount('https://alice.com', {
+          active: true,
+          did: 'alice-did',
+          handle: 'alice-updated.test',
+          accessJwt: 'alice-access-jwt-3',
+          refreshJwt: 'alice-refresh-jwt-3',
+        }),
         sessionEvent: 'update',
       },
     ])
@@ -1056,127 +1097,86 @@ describe('session', () => {
     expect(state.accounts[0].accessJwt).toBe('alice-access-jwt-3')
   })
 
-  it('accepts updates from a stale agent', () => {
+  it('ignores updates from a stale bundle', () => {
     let state = getInitialState([])
 
-    const agent1 = new AtpAgent({service: 'https://alice.com'})
-    agent1.sessionManager.session = {
-      active: true,
-      did: 'alice-did',
-      handle: 'alice.test',
-      accessJwt: 'alice-access-jwt-1',
-      refreshJwt: 'alice-refresh-jwt-1',
-    }
-
-    const agent2 = new AtpAgent({service: 'https://bob.com'})
-    agent2.sessionManager.session = {
-      active: true,
-      did: 'bob-did',
-      handle: 'bob.test',
-      accessJwt: 'bob-access-jwt-1',
-      refreshJwt: 'bob-refresh-jwt-1',
-    }
+    const aliceBundle = makeBundle('https://alice.com')
+    const bobBundle = makeBundle('https://bob.com')
 
     state = run(state, [
       {
         // Switch to Alice.
         type: 'switched-to-account',
-        newAgent: agent1,
-        newAccount: agentToSessionAccountOrThrow(agent1),
+        newBundle: aliceBundle,
+        newAccount: makeAccount('https://alice.com', {
+          active: true,
+          did: 'alice-did',
+          handle: 'alice.test',
+          accessJwt: 'alice-access-jwt-1',
+          refreshJwt: 'alice-refresh-jwt-1',
+        }),
       },
       {
         // Switch to Bob.
         type: 'switched-to-account',
-        newAgent: agent2,
-        newAccount: agentToSessionAccountOrThrow(agent2),
+        newBundle: bobBundle,
+        newAccount: makeAccount('https://bob.com', {
+          active: true,
+          did: 'bob-did',
+          handle: 'bob.test',
+          accessJwt: 'bob-access-jwt-1',
+          refreshJwt: 'bob-refresh-jwt-1',
+        }),
       },
     ])
     expect(state.accounts.length).toBe(2)
-    expect(state.currentAgentState.did).toBe('bob-did')
+    expect(state.currentBundleState.did).toBe('bob-did')
 
-    agent1.sessionManager.session = {
-      active: true,
-      did: 'alice-did',
-      handle: 'alice-updated.test',
-      accessJwt: 'alice-access-jwt-2',
-      refreshJwt: 'alice-refresh-jwt-2',
-      email: 'alice@foo.bar',
-      emailAuthFactor: false,
-      emailConfirmed: false,
-    }
+    /*
+     * An 'update' from the stale (background) Alice bundle is dropped
+     * ENTIRELY - identical state object, no token write. A refresh completing
+     * after switching away must not resurrect fresh tokens into the
+     * switched-away account entry.
+     */
+    const beforeStaleUpdate = state
     state = run(state, [
       {
-        type: 'received-agent-event',
+        type: 'received-session-event',
         accountDid: 'alice-did',
-        agent: agent1,
-        refreshedAccount: agentToSessionAccountOrThrow(agent1),
+        bundle: aliceBundle,
+        refreshedAccount: makeAccount('https://alice.com', {
+          active: true,
+          did: 'alice-did',
+          handle: 'alice-updated.test',
+          accessJwt: 'alice-access-jwt-2',
+          refreshJwt: 'alice-refresh-jwt-2',
+          email: 'alice@foo.bar',
+          emailAuthFactor: false,
+          emailConfirmed: false,
+        }),
         sessionEvent: 'update',
       },
     ])
-    expect(state.accounts.length).toBe(2)
+    expect(beforeStaleUpdate === state).toBe(true)
     expect(state.accounts[1].did).toBe('alice-did')
-    // Should update Alice's tokens because otherwise they'll be stale.
-    expect(state.accounts[1].handle).toBe('alice-updated.test')
-    expect(state.accounts[1].accessJwt).toBe('alice-access-jwt-2')
-    expect(state.accounts[1].refreshJwt).toBe('alice-refresh-jwt-2')
-    expect(printState(state)).toMatchInlineSnapshot(`
-      {
-        "accounts": [
-          {
-            "accessJwt": "bob-access-jwt-1",
-            "active": true,
-            "did": "bob-did",
-            "email": undefined,
-            "emailAuthFactor": false,
-            "emailConfirmed": false,
-            "handle": "bob.test",
-            "isSelfHosted": true,
-            "pdsUrl": undefined,
-            "refreshJwt": "bob-refresh-jwt-1",
-            "service": "https://bob.com/",
-            "signupQueued": false,
-            "status": undefined,
-          },
-          {
-            "accessJwt": "alice-access-jwt-2",
-            "active": true,
-            "did": "alice-did",
-            "email": "alice@foo.bar",
-            "emailAuthFactor": false,
-            "emailConfirmed": false,
-            "handle": "alice-updated.test",
-            "isSelfHosted": true,
-            "pdsUrl": undefined,
-            "refreshJwt": "alice-refresh-jwt-2",
-            "service": "https://alice.com/",
-            "signupQueued": false,
-            "status": undefined,
-          },
-        ],
-        "currentAgentState": {
-          "agent": {
-            "service": "https://bob.com/",
-          },
-          "did": "bob-did",
-        },
-        "needsPersist": true,
-      }
-    `)
+    // Alice's stored tokens are untouched (the stale update did not land).
+    expect(state.accounts[1].handle).toBe('alice.test')
+    expect(state.accounts[1].accessJwt).toBe('alice-access-jwt-1')
+    expect(state.accounts[1].refreshJwt).toBe('alice-refresh-jwt-1')
 
-    agent2.sessionManager.session = {
-      active: true,
-      did: 'bob-did',
-      handle: 'bob-updated.test',
-      accessJwt: 'bob-access-jwt-2',
-      refreshJwt: 'bob-refresh-jwt-2',
-    }
     state = run(state, [
       {
-        // Update Bob.
-        type: 'received-agent-event',
+        // Update Bob (the current bundle) - this still applies.
+        type: 'received-session-event',
         accountDid: 'bob-did',
-        agent: agent2,
-        refreshedAccount: agentToSessionAccountOrThrow(agent2),
+        bundle: bobBundle,
+        refreshedAccount: makeAccount('https://bob.com', {
+          active: true,
+          did: 'bob-did',
+          handle: 'bob-updated.test',
+          accessJwt: 'bob-access-jwt-2',
+          refreshJwt: 'bob-refresh-jwt-2',
+        }),
         sessionEvent: 'update',
       },
     ])
@@ -1205,23 +1205,23 @@ describe('session', () => {
             "status": undefined,
           },
           {
-            "accessJwt": "alice-access-jwt-2",
+            "accessJwt": "alice-access-jwt-1",
             "active": true,
             "did": "alice-did",
-            "email": "alice@foo.bar",
+            "email": undefined,
             "emailAuthFactor": false,
             "emailConfirmed": false,
-            "handle": "alice-updated.test",
+            "handle": "alice.test",
             "isSelfHosted": true,
             "pdsUrl": undefined,
-            "refreshJwt": "alice-refresh-jwt-2",
+            "refreshJwt": "alice-refresh-jwt-1",
             "service": "https://alice.com/",
             "signupQueued": false,
             "status": undefined,
           },
         ],
-        "currentAgentState": {
-          "agent": {
+        "currentBundleState": {
+          "bundle": {
             "service": "https://bob.com/",
           },
           "did": "bob-did",
@@ -1230,14 +1230,13 @@ describe('session', () => {
       }
     `)
 
-    // Ignore other events for inactive agent.
+    // Ignore other events for the inactive bundle too (network-error, expired).
     const lastState = state
-    agent1.sessionManager.session = undefined
     state = run(state, [
       {
-        type: 'received-agent-event',
+        type: 'received-session-event',
         accountDid: 'alice-did',
-        agent: agent1,
+        bundle: aliceBundle,
         refreshedAccount: undefined,
         sessionEvent: 'network-error',
       },
@@ -1245,9 +1244,9 @@ describe('session', () => {
     expect(lastState === state).toBe(true)
     state = run(state, [
       {
-        type: 'received-agent-event',
+        type: 'received-session-event',
         accountDid: 'alice-did',
-        agent: agent1,
+        bundle: aliceBundle,
         refreshedAccount: undefined,
         sessionEvent: 'expired',
       },
@@ -1255,37 +1254,128 @@ describe('session', () => {
     expect(lastState === state).toBe(true)
   })
 
-  it('ignores updates from a removed agent', () => {
+  it('drops an update from a stale bundle even when its account entry still exists (no resurrection)', () => {
     let state = getInitialState([])
 
-    const agent1 = new AtpAgent({service: 'https://alice.com'})
-    agent1.sessionManager.session = {
-      active: true,
-      did: 'alice-did',
-      handle: 'alice.test',
-      accessJwt: 'alice-access-jwt-1',
-      refreshJwt: 'alice-refresh-jwt-1',
-    }
+    const aliceBundle = makeBundle('https://alice.com')
+    state = run(state, [
+      {
+        type: 'switched-to-account',
+        newBundle: aliceBundle,
+        newAccount: makeAccount('https://alice.com', {
+          active: true,
+          did: 'alice-did',
+          handle: 'alice.test',
+          accessJwt: 'alice-access-jwt-1',
+          refreshJwt: 'alice-refresh-jwt-1',
+        }),
+      },
+    ])
+    expect(state.currentBundleState.did).toBe('alice-did')
 
-    const agent2 = new AtpAgent({service: 'https://bob.com'})
-    agent2.sessionManager.session = {
-      active: true,
-      did: 'bob-did',
-      handle: 'bob.test',
-      accessJwt: 'bob-access-jwt-1',
-      refreshJwt: 'bob-refresh-jwt-1',
-    }
+    // Alice logs out: her account entry stays, but tokens are cleared and the
+    // current bundle becomes the public (logged-out) bundle.
+    state = run(state, [{type: 'logged-out-current-account'}])
+    expect(state.currentBundleState.did).toBe(undefined)
+    expect(state.accounts[0].did).toBe('alice-did')
+    expect(state.accounts[0].accessJwt).toBe(undefined)
+    expect(state.accounts[0].refreshJwt).toBe(undefined)
+
+    /*
+     * A refresh that was already in flight on the (now stale) Alice bundle
+     * completes and delivers fresh tokens. It must NOT resurrect them into the
+     * soft-logged-out account entry - the bundle no longer matches the current
+     * (public) bundle, so the event is dropped entirely.
+     */
+    const afterLogout = state
+    state = run(state, [
+      {
+        type: 'received-session-event',
+        accountDid: 'alice-did',
+        bundle: aliceBundle,
+        refreshedAccount: makeAccount('https://alice.com', {
+          active: true,
+          did: 'alice-did',
+          handle: 'alice.test',
+          accessJwt: 'alice-access-jwt-2',
+          refreshJwt: 'alice-refresh-jwt-2',
+        }),
+        sessionEvent: 'update',
+      },
+    ])
+    expect(afterLogout === state).toBe(true)
+    expect(state.accounts[0].accessJwt).toBe(undefined)
+    expect(state.accounts[0].refreshJwt).toBe(undefined)
+    expect(state.currentBundleState.did).toBe(undefined)
+  })
+
+  it('applies an update from the current bundle', () => {
+    let state = getInitialState([])
+
+    const aliceBundle = makeBundle('https://alice.com')
+    state = run(state, [
+      {
+        type: 'switched-to-account',
+        newBundle: aliceBundle,
+        newAccount: makeAccount('https://alice.com', {
+          active: true,
+          did: 'alice-did',
+          handle: 'alice.test',
+          accessJwt: 'alice-access-jwt-1',
+          refreshJwt: 'alice-refresh-jwt-1',
+        }),
+      },
+    ])
+
+    state = run(state, [
+      {
+        type: 'received-session-event',
+        accountDid: 'alice-did',
+        bundle: aliceBundle,
+        refreshedAccount: makeAccount('https://alice.com', {
+          active: true,
+          did: 'alice-did',
+          handle: 'alice.test',
+          accessJwt: 'alice-access-jwt-2',
+          refreshJwt: 'alice-refresh-jwt-2',
+        }),
+        sessionEvent: 'update',
+      },
+    ])
+    // The current bundle's update lands and rotates the stored tokens.
+    expect(state.accounts[0].accessJwt).toBe('alice-access-jwt-2')
+    expect(state.accounts[0].refreshJwt).toBe('alice-refresh-jwt-2')
+    expect(state.currentBundleState.did).toBe('alice-did')
+  })
+
+  it('ignores updates from a removed bundle', () => {
+    let state = getInitialState([])
+
+    const aliceBundle = makeBundle('https://alice.com')
+    const bobBundle = makeBundle('https://bob.com')
 
     state = run(state, [
       {
         type: 'switched-to-account',
-        newAgent: agent1,
-        newAccount: agentToSessionAccountOrThrow(agent1),
+        newBundle: aliceBundle,
+        newAccount: makeAccount('https://alice.com', {
+          active: true,
+          did: 'alice-did',
+          handle: 'alice.test',
+          accessJwt: 'alice-access-jwt-1',
+          refreshJwt: 'alice-refresh-jwt-1',
+        }),
       },
       {
         type: 'switched-to-account',
-        newAgent: agent2,
-        newAccount: agentToSessionAccountOrThrow(agent2),
+        newBundle: bobBundle,
+        newAccount: makeAccount('https://bob.com', {
+          active: true,
+          did: 'bob-did',
+          handle: 'bob.test',
+          accessJwt: 'bob-access-jwt-1',
+          refreshJwt: 'bob-refresh-jwt-1',
+        }),
       },
       {
         type: 'removed-account',
@@ -1293,58 +1383,55 @@ describe('session', () => {
       },
     ])
     expect(state.accounts.length).toBe(1)
-    expect(state.currentAgentState.did).toBe('bob-did')
+    expect(state.currentBundleState.did).toBe('bob-did')
 
-    agent1.sessionManager.session = {
-      active: true,
-      did: 'alice-did',
-      handle: 'alice.test',
-      accessJwt: 'alice-access-jwt-2',
-      refreshJwt: 'alice-refresh-jwt-2',
-    }
     state = run(state, [
       {
-        type: 'received-agent-event',
+        type: 'received-session-event',
         accountDid: 'alice-did',
-        agent: agent1,
-        refreshedAccount: agentToSessionAccountOrThrow(agent1),
+        bundle: aliceBundle,
+        refreshedAccount: makeAccount('https://alice.com', {
+          active: true,
+          did: 'alice-did',
+          handle: 'alice.test',
+          accessJwt: 'alice-access-jwt-2',
+          refreshJwt: 'alice-refresh-jwt-2',
+        }),
         sessionEvent: 'update',
       },
     ])
     expect(state.accounts.length).toBe(1)
     expect(state.accounts[0].did).toBe('bob-did')
     expect(state.accounts[0].accessJwt).toBe('bob-access-jwt-1')
-    expect(state.currentAgentState.did).toBe('bob-did')
+    expect(state.currentBundleState.did).toBe('bob-did')
   })
 
   it('ignores network errors', () => {
     let state = getInitialState([])
 
-    const agent1 = new AtpAgent({service: 'https://alice.com'})
-    agent1.sessionManager.session = {
-      active: true,
-      did: 'alice-did',
-      handle: 'alice.test',
-      accessJwt: 'alice-access-jwt-1',
-      refreshJwt: 'alice-refresh-jwt-1',
-    }
+    const aliceBundle = makeBundle('https://alice.com')
     state = run(state, [
       {
         // Switch to Alice.
         type: 'switched-to-account',
-        newAgent: agent1,
-        newAccount: agentToSessionAccountOrThrow(agent1),
+        newBundle: aliceBundle,
+        newAccount: makeAccount('https://alice.com', {
+          active: true,
+          did: 'alice-did',
+          handle: 'alice.test',
+          accessJwt: 'alice-access-jwt-1',
+          refreshJwt: 'alice-refresh-jwt-1',
+        }),
       },
     ])
     expect(state.accounts.length).toBe(1)
-    expect(state.currentAgentState.did).toBe('alice-did')
+    expect(state.currentBundleState.did).toBe('alice-did')
 
-    agent1.sessionManager.session = undefined
     state = run(state, [
       {
-        type: 'received-agent-event',
+        type: 'received-session-event',
         accountDid: 'alice-did',
-        agent: agent1,
+        bundle: aliceBundle,
         refreshedAccount: undefined,
         sessionEvent: 'network-error',
       },
@@ -1352,7 +1439,7 @@ describe('session', () => {
     expect(state.accounts.length).toBe(1)
     expect(state.accounts[0].accessJwt).toBe('alice-access-jwt-1')
     expect(state.accounts[0].refreshJwt).toBe('alice-refresh-jwt-1')
-    expect(state.currentAgentState.did).toBe('alice-did')
+    expect(state.currentBundleState.did).toBe('alice-did')
     expect(printState(state)).toMatchInlineSnapshot(`
       {
         "accounts": [
@@ -1372,8 +1459,8 @@ describe('session', () => {
             "status": undefined,
           },
         ],
-        "currentAgentState": {
-          "agent": {
+        "currentBundleState": {
+          "bundle": {
             "service": "https://alice.com/",
           },
           "did": "alice-did",
@@ -1386,31 +1473,29 @@ describe('session', () => {
   it('resets tokens on expired event', () => {
     let state = getInitialState([])
 
-    const agent1 = new AtpAgent({service: 'https://alice.com'})
-    agent1.sessionManager.session = {
-      active: true,
-      did: 'alice-did',
-      handle: 'alice.test',
-      accessJwt: 'alice-access-jwt-1',
-      refreshJwt: 'alice-refresh-jwt-1',
-    }
+    const aliceBundle = makeBundle('https://alice.com')
     state = run(state, [
       {
         type: 'switched-to-account',
-        newAgent: agent1,
-        newAccount: agentToSessionAccountOrThrow(agent1),
+        newBundle: aliceBundle,
+        newAccount: makeAccount('https://alice.com', {
+          active: true,
+          did: 'alice-did',
+          handle: 'alice.test',
+          accessJwt: 'alice-access-jwt-1',
+          refreshJwt: 'alice-refresh-jwt-1',
+        }),
       },
     ])
     expect(state.accounts.length).toBe(1)
     expect(state.accounts[0].accessJwt).toBe('alice-access-jwt-1')
-    expect(state.currentAgentState.did).toBe('alice-did')
+    expect(state.currentBundleState.did).toBe('alice-did')
 
-    agent1.sessionManager.session = undefined
     state = run(state, [
       {
-        type: 'received-agent-event',
+        type: 'received-session-event',
         accountDid: 'alice-did',
-        agent: agent1,
+        bundle: aliceBundle,
         refreshedAccount: undefined,
         sessionEvent: 'expired',
       },
@@ -1418,7 +1503,7 @@ describe('session', () => {
     expect(state.accounts.length).toBe(1)
     expect(state.accounts[0].accessJwt).toBe(undefined)
     expect(state.accounts[0].refreshJwt).toBe(undefined)
-    expect(state.currentAgentState.did).toBe(undefined)
+    expect(state.currentBundleState.did).toBe(undefined)
     expect(printState(state)).toMatchInlineSnapshot(`
       {
         "accounts": [
@@ -1438,74 +1523,8 @@ describe('session', () => {
             "status": undefined,
           },
         ],
-        "currentAgentState": {
-          "agent": {
-            "service": "https://public.api.bsky.app/",
-          },
-          "did": undefined,
-        },
-        "needsPersist": true,
-      }
-    `)
-  })
-
-  it('resets tokens on created-failed event', () => {
-    let state = getInitialState([])
-
-    const agent1 = new AtpAgent({service: 'https://alice.com'})
-    agent1.sessionManager.session = {
-      active: true,
-      did: 'alice-did',
-      handle: 'alice.test',
-      accessJwt: 'alice-access-jwt-1',
-      refreshJwt: 'alice-refresh-jwt-1',
-    }
-    state = run(state, [
-      {
-        type: 'switched-to-account',
-        newAgent: agent1,
-        newAccount: agentToSessionAccountOrThrow(agent1),
-      },
-    ])
-    expect(state.accounts.length).toBe(1)
-    expect(state.accounts[0].accessJwt).toBe('alice-access-jwt-1')
-    expect(state.currentAgentState.did).toBe('alice-did')
-
-    agent1.sessionManager.session = undefined
-    state = run(state, [
-      {
-        type: 'received-agent-event',
-        accountDid: 'alice-did',
-        agent: agent1,
-        refreshedAccount: undefined,
-        sessionEvent: 'create-failed',
-      },
-    ])
-    expect(state.accounts.length).toBe(1)
-    expect(state.accounts[0].accessJwt).toBe(undefined)
-    expect(state.accounts[0].refreshJwt).toBe(undefined)
-    expect(state.currentAgentState.did).toBe(undefined)
-    expect(printState(state)).toMatchInlineSnapshot(`
-      {
-        "accounts": [
-          {
-            "accessJwt": undefined,
-            "active": true,
-            "did": "alice-did",
-            "email": undefined,
-            "emailAuthFactor": false,
-            "emailConfirmed": false,
-            "handle": "alice.test",
-            "isSelfHosted": true,
-            "pdsUrl": undefined,
-            "refreshJwt": undefined,
-            "service": "https://alice.com/",
-            "signupQueued": false,
-            "status": undefined,
-          },
-        ],
-        "currentAgentState": {
-          "agent": {
+        "currentBundleState": {
+          "bundle": {
             "service": "https://public.api.bsky.app/",
           },
           "did": undefined,
@@ -1518,59 +1537,53 @@ describe('session', () => {
   it('replaces local accounts with synced accounts', () => {
     let state = getInitialState([])
 
-    const agent1 = new AtpAgent({service: 'https://alice.com'})
-    agent1.sessionManager.session = {
-      active: true,
-      did: 'alice-did',
-      handle: 'alice.test',
-      accessJwt: 'alice-access-jwt-1',
-      refreshJwt: 'alice-refresh-jwt-1',
-    }
-    const agent2 = new AtpAgent({service: 'https://bob.com'})
-    agent2.sessionManager.session = {
-      active: true,
-      did: 'bob-did',
-      handle: 'bob.test',
-      accessJwt: 'bob-access-jwt-1',
-      refreshJwt: 'bob-refresh-jwt-1',
-    }
+    const aliceBundle = makeBundle('https://alice.com')
+    const bobBundle = makeBundle('https://bob.com')
     state = run(state, [
       {
         type: 'switched-to-account',
-        newAgent: agent1,
-        newAccount: agentToSessionAccountOrThrow(agent1),
+        newBundle: aliceBundle,
+        newAccount: makeAccount('https://alice.com', {
+          active: true,
+          did: 'alice-did',
+          handle: 'alice.test',
+          accessJwt: 'alice-access-jwt-1',
+          refreshJwt: 'alice-refresh-jwt-1',
+        }),
       },
       {
         type: 'switched-to-account',
-        newAgent: agent2,
-        newAccount: agentToSessionAccountOrThrow(agent2),
+        newBundle: bobBundle,
+        newAccount: makeAccount('https://bob.com', {
+          active: true,
+          did: 'bob-did',
+          handle: 'bob.test',
+          accessJwt: 'bob-access-jwt-1',
+          refreshJwt: 'bob-refresh-jwt-1',
+        }),
       },
     ])
     expect(state.accounts.length).toBe(2)
-    expect(state.currentAgentState.did).toBe('bob-did')
+    expect(state.currentBundleState.did).toBe('bob-did')
 
-    const anotherTabAgent1 = new AtpAgent({service: 'https://jay.com'})
-    anotherTabAgent1.sessionManager.session = {
-      active: true,
-      did: 'jay-did',
-      handle: 'jay.test',
-      accessJwt: 'jay-access-jwt-1',
-      refreshJwt: 'jay-refresh-jwt-1',
-    }
-    const anotherTabAgent2 = new AtpAgent({service: 'https://alice.com'})
-    anotherTabAgent2.sessionManager.session = {
-      active: true,
-      did: 'bob-did',
-      handle: 'bob.test',
-      accessJwt: 'bob-access-jwt-2',
-      refreshJwt: 'bob-refresh-jwt-2',
-    }
     state = run(state, [
       {
         type: 'synced-accounts',
         syncedAccounts: [
-          agentToSessionAccountOrThrow(anotherTabAgent1),
-          agentToSessionAccountOrThrow(anotherTabAgent2),
+          makeAccount('https://jay.com', {
+            active: true,
+            did: 'jay-did',
+            handle: 'jay.test',
+            accessJwt: 'jay-access-jwt-1',
+            refreshJwt: 'jay-refresh-jwt-1',
+          }),
+          makeAccount('https://alice.com', {
+            active: true,
+            did: 'bob-did',
+            handle: 'bob.test',
+            accessJwt: 'bob-access-jwt-2',
+            refreshJwt: 'bob-refresh-jwt-2',
+          }),
         ],
         syncedCurrentDid: 'bob-did',
       },
@@ -1580,8 +1593,8 @@ describe('session', () => {
     expect(state.accounts[1].did).toBe('bob-did')
     expect(state.accounts[1].accessJwt).toBe('bob-access-jwt-2')
     // Keep Bob logged in.
-    // (We patch up agent.session outside the reducer for this to work.)
-    expect(state.currentAgentState.did).toBe('bob-did')
+    // (The bundle is rebuilt from the synced tokens outside the reducer.)
+    expect(state.currentBundleState.did).toBe('bob-did')
     expect(state.needsPersist).toBe(false)
     expect(printState(state)).toMatchInlineSnapshot(`
       {
@@ -1617,8 +1630,8 @@ describe('session', () => {
             "status": undefined,
           },
         ],
-        "currentAgentState": {
-          "agent": {
+        "currentBundleState": {
+          "bundle": {
             "service": "https://bob.com/",
           },
           "did": "bob-did",
@@ -1627,18 +1640,18 @@ describe('session', () => {
       }
     `)
 
-    const anotherTabAgent3 = new AtpAgent({service: 'https://clarence.com'})
-    anotherTabAgent3.sessionManager.session = {
-      active: true,
-      did: 'clarence-did',
-      handle: 'clarence.test',
-      accessJwt: 'clarence-access-jwt-2',
-      refreshJwt: 'clarence-refresh-jwt-2',
-    }
     state = run(state, [
       {
         type: 'synced-accounts',
-        syncedAccounts: [agentToSessionAccountOrThrow(anotherTabAgent3)],
+        syncedAccounts: [
+          makeAccount('https://clarence.com', {
+            active: true,
+            did: 'clarence-did',
+            handle: 'clarence.test',
+            accessJwt: 'clarence-access-jwt-2',
+            refreshJwt: 'clarence-refresh-jwt-2',
+          }),
+        ],
         syncedCurrentDid: 'clarence-did',
       },
     ])
@@ -1646,7 +1659,7 @@ describe('session', () => {
     expect(state.accounts[0].did).toBe('clarence-did')
     // Log out because we have no matching user.
     // (In practice, we'll resume this session outside the reducer.)
-    expect(state.currentAgentState.did).toBe(undefined)
+    expect(state.currentBundleState.did).toBe(undefined)
     expect(state.needsPersist).toBe(false)
     expect(printState(state)).toMatchInlineSnapshot(`
       {
@@ -1667,8 +1680,8 @@ describe('session', () => {
             "status": undefined,
           },
         ],
-        "currentAgentState": {
-          "agent": {
+        "currentBundleState": {
+          "bundle": {
             "service": "https://public.api.bsky.app/",
           },
           "did": undefined,
@@ -1677,6 +1690,94 @@ describe('session', () => {
       }
     `)
   })
+
+  it('replaces the current bundle on same-did cross-tab sync', () => {
+    let state = getInitialState([])
+
+    const aliceBundle = makeBundle('https://alice.com')
+    state = run(state, [
+      {
+        type: 'switched-to-account',
+        newBundle: aliceBundle,
+        newAccount: makeAccount('https://alice.com', {
+          active: true,
+          did: 'alice-did',
+          handle: 'alice.test',
+          accessJwt: 'alice-access-jwt-1',
+          refreshJwt: 'alice-refresh-jwt-1',
+        }),
+      },
+    ])
+    expect(state.currentBundleState.bundle).toBe(aliceBundle)
+    expect(state.accounts[0].accessJwt).toBe('alice-access-jwt-1')
+
+    // A fresh bundle rebuilt from synced tokens (no network).
+    const aliceBundle2 = makeBundle('https://alice.com')
+    const aliceAccount2 = makeAccount('https://alice.com', {
+      active: true,
+      did: 'alice-did',
+      handle: 'alice.test',
+      accessJwt: 'alice-access-jwt-2',
+      refreshJwt: 'alice-refresh-jwt-2',
+    })
+    state = run(state, [
+      {
+        type: 'replaced-current-bundle',
+        newBundle: aliceBundle2,
+        newAccount: aliceAccount2,
+      },
+    ])
+    // The bundle is swapped in place, the did is preserved.
+    expect(state.currentBundleState.bundle).toBe(aliceBundle2)
+    expect(state.currentBundleState.did).toBe('alice-did')
+    // The matching account entry is replaced with the synced one.
+    expect(state.accounts.length).toBe(1)
+    expect(state.accounts[0].did).toBe('alice-did')
+    expect(state.accounts[0].accessJwt).toBe('alice-access-jwt-2')
+    expect(state.accounts[0].refreshJwt).toBe('alice-refresh-jwt-2')
+    // Synced from another tab - don't persist.
+    expect(state.needsPersist).toBe(false)
+  })
+
+  it('does not touch the bundle on partial-refresh-session', () => {
+    let state = getInitialState([])
+
+    const aliceBundle = makeBundle('https://alice.com')
+    state = run(state, [
+      {
+        type: 'switched-to-account',
+        newBundle: aliceBundle,
+        newAccount: makeAccount('https://alice.com', {
+          active: true,
+          did: 'alice-did',
+          handle: 'alice.test',
+          accessJwt: 'alice-access-jwt-1',
+          refreshJwt: 'alice-refresh-jwt-1',
+          email: 'alice@foo.bar',
+          emailAuthFactor: false,
+          emailConfirmed: false,
+        }),
+      },
+    ])
+    expect(state.currentBundleState.bundle).toBe(aliceBundle)
+    expect(state.accounts[0].emailConfirmed).toBe(false)
+    expect(state.accounts[0].emailAuthFactor).toBe(false)
+
+    state = run(state, [
+      {
+        type: 'partial-refresh-session',
+        accountDid: 'alice-did',
+        patch: {emailConfirmed: true, emailAuthFactor: true},
+      },
+    ])
+    // The account email fields are patched.
+    expect(state.accounts[0].emailConfirmed).toBe(true)
+    expect(state.accounts[0].emailAuthFactor).toBe(true)
+    // The bundle is untouched - no session mutation, same reference.
+    expect(state.currentBundleState.bundle).toBe(aliceBundle)
+    expect(state.currentBundleState.did).toBe('alice-did')
+    expect(state.needsPersist).toBe(true)
+  })
 })
 
 function run(initialState: State, actions: Action[]): State {
@@ -1690,9 +1791,9 @@ function run(initialState: State, actions: Action[]): State {
 function printState(state: State) {
   return {
     accounts: state.accounts,
-    currentAgentState: {
-      agent: {service: state.currentAgentState.agent.service},
-      did: state.currentAgentState.did,
+    currentBundleState: {
+      bundle: {service: state.currentBundleState.bundle.service},
+      did: state.currentBundleState.did,
     },
     needsPersist: state.needsPersist,
   }
diff --git a/src/state/session/agent-config.ts b/src/state/session/agent-config.ts
deleted file mode 100644
index 3ee2718a39..0000000000
--- a/src/state/session/agent-config.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import AsyncStorage from '@react-native-async-storage/async-storage'
-
-const PREFIX = 'agent-labelers'
-
-export async function saveLabelers(did: string, value: string[]) {
-  await AsyncStorage.setItem(`${PREFIX}:${did}`, JSON.stringify(value))
-}
-
-export async function readLabelers(did: string): Promise<string[] | undefined> {
-  const rawData = await AsyncStorage.getItem(`${PREFIX}:${did}`)
-  return rawData ? JSON.parse(rawData) : undefined
-}
diff --git a/src/state/session/agent.ts b/src/state/session/agent.ts
index 78e9f79610..7246454ed2 100644
--- a/src/state/session/agent.ts
+++ b/src/state/session/agent.ts
@@ -1,338 +1,17 @@
 import {
   Agent as BaseAgent,
-  type AppBskyActorProfile,
-  AtpAgent,
   type AtprotoServiceType,
-  type AtpSessionData,
-  type AtpSessionEvent,
   type Did,
-  type Un$Typed,
 } from '@atproto/api'
-import {TID} from '@atproto/common-web'
-
-import {networkRetry} from '#/lib/async/retry'
-import {
-  BLUESKY_PROXY_HEADER,
-  BSKY_SERVICE,
-  DISCOVER_SAVED_FEED,
-  IS_PROD_SERVICE,
-  PUBLIC_BSKY_SERVICE,
-  TIMELINE_SAVED_FEED,
-} from '#/lib/constants'
-import {logger} from '#/logger'
-import {snoozeBirthdateUpdateAllowedForDid} from '#/state/birthdate'
-import {restrictChatSettings} from '#/state/queries/messages/restrictChatSettings'
-import {snoozeEmailConfirmationPrompt} from '#/state/shell/reminders'
-import {
-  prefetchAgeAssuranceServerData,
-  setBirthdateForDid,
-  setCreatedAtForDid,
-} from '#/ageAssurance/data'
-import {unsafeGetAndComputeAgeAssurance} from '#/ageAssurance/state'
-import {features} from '#/analytics'
-import {emitNetworkConfirmed, emitNetworkLost} from '../events'
-import {addSessionErrorLog} from './logging'
-import {
-  configureModerationForAccount,
-  configureModerationForGuest,
-} from './moderation'
-import {type SessionAccount} from './types'
-import {isSessionExpired, isSignupQueued} from './util'
 
 export type ProxyHeaderValue = `${Did}#${AtprotoServiceType}`
 
-export function createPublicAgent() {
-  configureModerationForGuest() // Side effect but only relevant for tests
-
-  const agent = new BskyAppAgent({service: PUBLIC_BSKY_SERVICE})
-  agent.configureProxy(BLUESKY_PROXY_HEADER.get())
-  return agent
-}
-
-export async function createAgentAndResume(
-  storedAccount: SessionAccount,
-  onSessionChange: (
-    agent: AtpAgent,
-    did: string,
-    event: AtpSessionEvent,
-  ) => void,
-) {
-  const agent = new BskyAppAgent({service: storedAccount.service})
-  if (storedAccount.pdsUrl) {
-    agent.sessionManager.pdsUrl = new URL(storedAccount.pdsUrl)
-  }
-  const gates = features.refresh({
-    strategy: 'prefer-low-latency',
-  })
-  const moderation = configureModerationForAccount(agent, storedAccount)
-  const prevSession: AtpSessionData = sessionAccountToSession(storedAccount)
-  if (isSessionExpired(storedAccount)) {
-    await networkRetry(1, () => agent.resumeSession(prevSession))
-  } else {
-    agent.sessionManager.session = prevSession
-  }
-
-  // after session is attached
-  const aa = prefetchAgeAssuranceServerData({agent})
-
-  agent.configureProxy(BLUESKY_PROXY_HEADER.get())
-
-  return agent.prepare({
-    resolvers: [gates, moderation, aa],
-    onSessionChange,
-  })
-}
-
-export async function createAgentAndLogin(
-  {
-    service,
-    identifier,
-    password,
-    authFactorToken,
-  }: {
-    service: string
-    identifier: string
-    password: string
-    authFactorToken?: string
-  },
-  onSessionChange: (
-    agent: AtpAgent,
-    did: string,
-    event: AtpSessionEvent,
-  ) => void,
-) {
-  const agent = new BskyAppAgent({service})
-  await agent.login({
-    identifier,
-    password,
-    authFactorToken,
-    allowTakendown: true,
-  })
-
-  const account = agentToSessionAccountOrThrow(agent)
-  const gates = features.refresh({strategy: 'prefer-fresh-gates'})
-  const moderation = configureModerationForAccount(agent, account)
-  const aa = prefetchAgeAssuranceServerData({agent})
-
-  agent.configureProxy(BLUESKY_PROXY_HEADER.get())
-
-  return agent.prepare({
-    resolvers: [gates, moderation, aa],
-    onSessionChange,
-  })
-}
-
-export async function createAgentAndCreateAccount(
-  {
-    service,
-    email,
-    password,
-    handle,
-    birthDate,
-    inviteCode,
-    verificationPhone,
-    verificationCode,
-  }: {
-    service: string
-    email: string
-    password: string
-    handle: string
-    birthDate: Date
-    inviteCode?: string
-    verificationPhone?: string
-    verificationCode?: string
-  },
-  onSessionChange: (
-    agent: AtpAgent,
-    did: string,
-    event: AtpSessionEvent,
-  ) => void,
-) {
-  const agent = new BskyAppAgent({service})
-  await agent.createAccount({
-    email,
-    password,
-    handle,
-    inviteCode,
-    verificationPhone,
-    verificationCode,
-  })
-  const account = agentToSessionAccountOrThrow(agent)
-  const gates = features.refresh({strategy: 'prefer-fresh-gates'})
-  const moderation = configureModerationForAccount(agent, account)
-
-  const createdAt = new Date().toISOString()
-  const birthdate = birthDate.toISOString()
-
-  /*
-   * Since we have a race with account creation, profile creation, and AA
-   * state, set these values locally to ensure sync reads. Values are written
-   * to the server in the next step, so on subsequent reloads, the server will
-   * be the source of truth.
-   */
-  setCreatedAtForDid({did: account.did, createdAt})
-  setBirthdateForDid({did: account.did, birthdate})
-  snoozeBirthdateUpdateAllowedForDid(account.did)
-  // do this last
-  const aa = prefetchAgeAssuranceServerData({agent})
-
-  // Not awaited so that we can still get into onboarding.
-  // This is OK because we won't let you toggle adult stuff until you set the date.
-  if (IS_PROD_SERVICE(service)) {
-    void Promise.allSettled([
-      networkRetry(3, () => {
-        return agent.setPersonalDetails({
-          birthDate: birthdate,
-        })
-      }).catch(e => {
-        logger.info(`createAgentAndCreateAccount: failed to set birthDate`)
-        throw e
-      }),
-      networkRetry(3, () => {
-        return agent.upsertProfile(prev => {
-          const next: Un$Typed<AppBskyActorProfile.Record> = prev || {}
-          next.displayName = handle
-          next.createdAt = createdAt
-          return next
-        })
-      }).catch(e => {
-        logger.info(
-          `createAgentAndCreateAccount: failed to set initial profile`,
-        )
-        throw e
-      }),
-      networkRetry(1, () => {
-        return agent.overwriteSavedFeeds([
-          {
-            ...DISCOVER_SAVED_FEED,
-            id: TID.nextStr(),
-          },
-          {
-            ...TIMELINE_SAVED_FEED,
-            id: TID.nextStr(),
-          },
-        ])
-      }).catch(e => {
-        logger.info(`createAgentAndCreateAccount: failed to set initial feeds`)
-        throw e
-      }),
-      // wait for AA data to load first, then check state
-      aa.then(() => {
-        const {flags} = unsafeGetAndComputeAgeAssurance({did: account.did})
-        if (flags?.chatDisabled || flags?.groupChatDisabled) {
-          void restrictChatSettings({
-            agent,
-            restrictIncoming: flags.chatDisabled,
-            restrictGroupInvites: flags.groupChatDisabled,
-          })
-        }
-      }),
-    ]).then(promises => {
-      const rejected = promises.filter(p => p.status === 'rejected')
-      if (rejected.length > 0) {
-        logger.error(
-          `session: createAgentAndCreateAccount failed to save personal details and feeds`,
-        )
-      }
-    })
-  } else {
-    void Promise.allSettled([
-      networkRetry(3, () => {
-        return agent.setPersonalDetails({
-          birthDate: birthDate.toISOString(),
-        })
-      }).catch(e => {
-        logger.info(`createAgentAndCreateAccount: failed to set birthDate`)
-        throw e
-      }),
-      networkRetry(3, () => {
-        return agent.upsertProfile(prev => {
-          const next: Un$Typed<AppBskyActorProfile.Record> = prev || {}
-          next.createdAt = prev?.createdAt || new Date().toISOString()
-          return next
-        })
-      }).catch(e => {
-        logger.info(
-          `createAgentAndCreateAccount: failed to set initial profile`,
-        )
-        throw e
-      }),
-    ]).then(promises => {
-      const rejected = promises.filter(p => p.status === 'rejected')
-      if (rejected.length > 0) {
-        logger.error(
-          `session: createAgentAndCreateAccount failed to save personal details and feeds`,
-        )
-      }
-    })
-  }
-
-  try {
-    // snooze first prompt after signup, defer to next prompt
-    snoozeEmailConfirmationPrompt()
-  } catch (e: any) {
-    logger.error(e, {message: `session: failed snoozeEmailConfirmationPrompt`})
-  }
-
-  agent.configureProxy(BLUESKY_PROXY_HEADER.get())
-
-  return agent.prepare({
-    resolvers: [gates, moderation, aa],
-    onSessionChange,
-  })
-}
-
-export function agentToSessionAccountOrThrow(agent: AtpAgent): SessionAccount {
-  const account = agentToSessionAccount(agent)
-  if (!account) {
-    throw Error('Expected an active session')
-  }
-  return account
-}
-
-export function agentToSessionAccount(
-  agent: AtpAgent,
-): SessionAccount | undefined {
-  if (!agent.session) {
-    return undefined
-  }
-  return {
-    service: agent.serviceUrl.toString(),
-    did: agent.session.did,
-    handle: agent.session.handle,
-    email: agent.session.email,
-    emailConfirmed: agent.session.emailConfirmed || false,
-    emailAuthFactor: agent.session.emailAuthFactor || false,
-    refreshJwt: agent.session.refreshJwt,
-    accessJwt: agent.session.accessJwt,
-    signupQueued: isSignupQueued(agent.session.accessJwt),
-    active: agent.session.active,
-    status: agent.session.status,
-    pdsUrl: agent.pdsUrl?.toString(),
-    isSelfHosted: !agent.serviceUrl.toString().startsWith(BSKY_SERVICE),
-  }
-}
-
-export function sessionAccountToSession(
-  account: SessionAccount,
-): AtpSessionData {
-  return {
-    // Sorted in the same property order as when returned by BskyAgent (alphabetical).
-    accessJwt: account.accessJwt ?? '',
-    did: account.did,
-    email: account.email,
-    emailAuthFactor: account.emailAuthFactor,
-    emailConfirmed: account.emailConfirmed,
-    handle: account.handle,
-    refreshJwt: account.refreshJwt ?? '',
-    /**
-     * @see https://github.com/bluesky-social/atproto/blob/c5d36d5ba2a2c2a5c4f366a5621c06a5608e361e/packages/api/src/agent.ts#L188
-     */
-    active: account.active ?? true,
-    status: account.status,
-  }
-}
-
+/**
+ * A bare `Agent` that applies a service-proxy header on construction.
+ *
+ * Used for the unauthenticated, service-specific calls that cannot go through
+ * the session agent (PDS detection, password reset, handle availability).
+ */
 export class Agent extends BaseAgent {
   constructor(
     proxyHeader: ProxyHeaderValue | null,
@@ -344,74 +23,3 @@ export class Agent extends BaseAgent {
     }
   }
 }
-
-// Not exported. Use factories above to create it.
-// WARN: In the factories above, we _manually set a proxy header_ for the agent after we do whatever it is we are supposed to do.
-// Ideally, we wouldn't be doing this. However, since there is so much logic that requires making calls to the PDS right now, it
-// feels safer to just let those run as-is and set the header afterward.
-let realFetch = globalThis.fetch
-class BskyAppAgent extends AtpAgent {
-  persistSessionHandler: ((event: AtpSessionEvent) => void) | undefined =
-    undefined
-
-  constructor({service}: {service: string}) {
-    super({
-      service,
-      async fetch(...args) {
-        let success = false
-        try {
-          const result = await realFetch(...args)
-          success = true
-          return result
-        } catch (e) {
-          success = false
-          throw e
-        } finally {
-          if (success) {
-            emitNetworkConfirmed()
-          } else {
-            emitNetworkLost()
-          }
-        }
-      },
-      persistSession: (event: AtpSessionEvent) => {
-        if (this.persistSessionHandler) {
-          this.persistSessionHandler(event)
-        }
-      },
-    })
-  }
-
-  async prepare({
-    resolvers,
-    onSessionChange,
-  }: {
-    // Not awaited in the calling code so we can delay blocking on them.
-    resolvers: Promise<unknown>[]
-    onSessionChange: (
-      agent: AtpAgent,
-      did: string,
-      event: AtpSessionEvent,
-    ) => void
-  }) {
-    // There's nothing else left to do, so block on them here.
-    await Promise.all(resolvers)
-
-    // Now the agent is ready.
-    const account = agentToSessionAccountOrThrow(this)
-    this.persistSessionHandler = event => {
-      onSessionChange(this, account.did, event)
-      if (event !== 'create' && event !== 'update') {
-        addSessionErrorLog(account.did, event)
-      }
-    }
-    return {account, agent: this}
-  }
-
-  dispose() {
-    this.sessionManager.session = undefined
-    this.persistSessionHandler = undefined
-  }
-}
-
-export type {BskyAppAgent}
diff --git a/src/state/session/bridge-agent.ts b/src/state/session/bridge-agent.ts
new file mode 100644
index 0000000000..0c692a6c17
--- /dev/null
+++ b/src/state/session/bridge-agent.ts
@@ -0,0 +1,442 @@
+import {
+  AtpAgent,
+  type AtpAgentLoginOpts,
+  type AtpSessionData,
+  type ComAtprotoServerCreateAccount,
+  type ComAtprotoServerCreateSession,
+  type ComAtprotoServerRefreshSession,
+  CredentialSession,
+} from '@atproto/api'
+import {
+  type PasswordSession,
+  type SessionData,
+} from '@atproto/lex-password-session'
+
+import {BLUESKY_PROXY_HEADER, PUBLIC_BSKY_SERVICE} from '#/lib/constants'
+import {configureModerationForGuest} from './moderation'
+import {networkAwareFetch} from './network'
+
+const UNSUPPORTED =
+  'Not supported on PasswordSessionManager; use the session factories in session-core'
+
+/**
+ * Convert live `PasswordSession` session data into the `AtpSessionData` shape
+ * that `CredentialSession.session` consumers expect.
+ *
+ * The only real adaptation is `active`: `AtpSessionData` requires it, while the
+ * lexicon payload leaves it optional (absent means active, per the lexicon
+ * docs).
+ */
+function toAtpSessionData(d: SessionData): AtpSessionData {
+  return {
+    refreshJwt: d.refreshJwt,
+    accessJwt: d.accessJwt,
+    handle: d.handle,
+    did: d.did,
+    email: d.email,
+    emailConfirmed: d.emailConfirmed,
+    emailAuthFactor: d.emailAuthFactor,
+    active: d.active ?? true,
+    status: d.status,
+  }
+}
+
+/**
+ * Parse a URL without throwing.
+ */
+function parseUrl(input: string): URL | undefined {
+  try {
+    return new URL(input)
+  } catch {
+    return undefined
+  }
+}
+
+/**
+ * Read a property off an unknown value the way JS optional chaining would,
+ * without narrowing assumptions about the shape of a `LexMap`.
+ */
+function prop(value: unknown, key: string): unknown {
+  return typeof value === 'object' && value !== null
+    ? (value as Record<string, unknown>)[key]
+    : undefined
+}
+
+/**
+ * The PDS endpoint declared by a DID document, or `undefined`.
+ *
+ * This deliberately mirrors `extractPdsUrl` in `@atproto/lex-password-session`,
+ * which is the predicate `PasswordSession` uses to route its own requests: the
+ * first service entry whose `id` ends with `#atproto_pds`, taking its
+ * `serviceEndpoint` if it parses as a URL. It is looser than the
+ * `isValidDidDoc` + `getPdsEndpoint` pair from `@atproto/common-web` (no doc
+ * schema validation, no `type` check), and that is the point - a stricter
+ * predicate here would let `dispatchUrl` disagree with the host requests
+ * actually go to, which in turn mints service-auth tokens (video upload) for
+ * the wrong audience.
+ */
+function extractPdsUrl(didDoc: SessionData['didDoc']): URL | undefined {
+  const services = prop(didDoc, 'service')
+  if (!Array.isArray(services)) {
+    return undefined
+  }
+  /*
+   * `find`, not a scan: the inner session stops at the first `#atproto_pds`
+   * entry and gives up if its endpoint does not parse, rather than falling
+   * through to a later entry.
+   */
+  const pds = services.find(service => {
+    const id = prop(service, 'id')
+    return typeof id === 'string' && id.endsWith('#atproto_pds')
+  })
+  const endpoint = prop(pds, 'serviceEndpoint')
+  return typeof endpoint === 'string' ? parseUrl(endpoint) : undefined
+}
+
+/**
+ * A `CredentialSession` whose auth core is a `PasswordSession`.
+ *
+ * This is the compat shim that lets a `PasswordSession` sit under `AtpAgent`:
+ * every call site that reads `agent.session`, `agent.pdsUrl`,
+ * `agent.dispatchUrl`, `agent.did` or calls `agent.resumeSession()` keeps
+ * working, while the actual tokens, refresh serialization and PDS routing live
+ * in the `PasswordSession` underneath.
+ *
+ * A `null` inner session means "logged out" - the public/guest agent. In that
+ * mode requests still go out (unauthenticated) through the inherited `fetch`.
+ */
+export class PasswordSessionManager extends CredentialSession {
+  #inner: PasswordSession | null
+  #storedPdsUrl: URL | undefined
+  #disposed = false
+
+  /*
+   * Identity caches for the two pull-through accessors. Each holds the
+   * `SessionData` it was derived from so a repeated read returns the very same
+   * object (see the note on identity stability below). Keying on the whole
+   * `SessionData` rather than the individual field works because
+   * `PasswordSession` replaces the object wholesale on every rotation.
+   */
+  #sessionSource: SessionData | undefined
+  #sessionValue: AtpSessionData | undefined
+  #pdsSource: SessionData | undefined
+  #pdsValue: URL | undefined
+
+  constructor(
+    inner: PasswordSession | null,
+    {service, pdsUrl}: {service: string; pdsUrl?: string},
+  ) {
+    /*
+     * `persistSession` is deliberately undefined: the inner `PasswordSession`
+     * owns persistence through its own hooks, and none of the inherited methods
+     * that would call this handler survive the overrides below.
+     */
+    super(new URL(service), networkAwareFetch, undefined)
+
+    this.#inner = inner
+    this.#storedPdsUrl = pdsUrl ? parseUrl(pdsUrl) : undefined
+
+    /*
+     * `session` and `pdsUrl` are pull-through accessors over the inner session
+     * rather than mirrored values, installed here with `defineProperty` for two
+     * reasons.
+     *
+     * Why accessors at all: a mirror has to be written on every token rotation,
+     * and any missed write silently serves stale tokens. Pulling through cannot
+     * drift.
+     *
+     * Why `defineProperty` and not `get session()` in the class body: the
+     * parent declares `session` and `pdsUrl` as *properties*, and TypeScript
+     * rejects overriding a property with an accessor (TS2611). Installing them
+     * at runtime sidesteps that, and it is safe as long as
+     * `CredentialSession`'s emitted constructor does not assign either one
+     * (both are declaration-only), so there is nothing to clobber and no
+     * ordering hazard.
+     *
+     * For the same reason this class must NOT redeclare `session`/`pdsUrl` as
+     * fields: under `useDefineForClassFields` semantics (target esnext) a field
+     * declaration emits an own-property definition that would overwrite these
+     * accessors with `undefined`.
+     */
+    Object.defineProperty(this, 'session', {
+      configurable: true,
+      get: () => this.#readSession(),
+      set: () => {
+        throw new Error('PasswordSessionManager.session is read-only')
+      },
+    })
+    Object.defineProperty(this, 'pdsUrl', {
+      configurable: true,
+      get: () => this.#readPdsUrl(),
+      set: () => {
+        throw new Error('PasswordSessionManager.pdsUrl is read-only')
+      },
+    })
+  }
+
+  /**
+   * The inner session's live data, or `undefined` when there is nothing to read
+   * from.
+   *
+   * `PasswordSession`'s `session`/`did`/`handle` getters *throw* `Logged out`
+   * once the session has been destroyed. Every read in this class funnels
+   * through here so that failure mode can never escape into the app, which
+   * reads `agent.session` from render paths.
+   */
+  #liveData(): SessionData | undefined {
+    if (this.#disposed || !this.#inner || this.#inner.destroyed) {
+      return undefined
+    }
+    return this.#inner.session
+  }
+
+  /**
+   * The `session` accessor's implementation.
+   *
+   * Identity-cached on the source `SessionData`: consecutive reads with no
+   * intervening token rotation return the same object, and a rotation produces
+   * a new one. `CredentialSession` declares `session` as a plain field, so
+   * consumers are entitled to treat it as a value whose identity changes only
+   * when the session does; this class is read from render paths, and returning
+   * a freshly allocated object on every read would break that expectation for
+   * any memo, dependency array or reference comparison built on top of it.
+   */
+  #readSession(): AtpSessionData | undefined {
+    const live = this.#liveData()
+    if (!live) {
+      this.#sessionSource = undefined
+      this.#sessionValue = undefined
+      return undefined
+    }
+    if (live !== this.#sessionSource) {
+      this.#sessionSource = live
+      this.#sessionValue = toAtpSessionData(live)
+    }
+    return this.#sessionValue
+  }
+
+  /**
+   * The `pdsUrl` accessor's implementation.
+   *
+   * The DID document's PDS endpoint wins when there is one, derived with
+   * {@link extractPdsUrl} so this agrees exactly with the inner session's own
+   * routing. Before the first refresh delivers a didDoc (the non-expired resume
+   * fast path, which makes no network call) we fall back to the `pdsUrl`
+   * persisted on the account, so the very first requests still reach the right
+   * host - entryway accounts have `service: bsky.social` but live on a
+   * different PDS.
+   *
+   * Identity-cached on the didDoc for the same reason as `session`.
+   */
+  #readPdsUrl(): URL | undefined {
+    const live = this.#liveData()
+    if (!live) {
+      this.#pdsSource = undefined
+      this.#pdsValue = undefined
+      return undefined
+    }
+    if (live !== this.#pdsSource) {
+      this.#pdsSource = live
+      this.#pdsValue = extractPdsUrl(live.didDoc) ?? this.#storedPdsUrl
+    }
+    return this.#pdsValue
+  }
+
+  /*
+   * `did`, `hasSession` and `dispatchUrl` are deliberately NOT overridden: the
+   * inherited getters read `this.session` / `this.pdsUrl`, which resolve
+   * through the accessors above, so they are already live.
+   */
+
+  override async fetchHandler(
+    url: string,
+    init?: RequestInit,
+  ): Promise<Response> {
+    /*
+     * Absolutizing against `dispatchUrl` routes to the stored PDS on the resume
+     * fast path and to the didDoc PDS from the first refresh onwards, since
+     * `PasswordSession` resolves an already absolute URL against its own base
+     * as a no-op.
+     */
+    const target = new URL(url, this.dispatchUrl)
+    const inner = this.#disposed ? null : this.#inner
+
+    /*
+     * A caller that set its own `authorization` header bypasses the inner
+     * session entirely. This is mandatory: `PasswordSession.fetchHandler`
+     * throws `TypeError` on a pre-set authorization header rather than
+     * deferring to it.
+     *
+     * Bypassing also means these requests get no refresh-on-401 retry, since
+     * that lives in `PasswordSession.fetchHandler`. That is intentional: the
+     * caller supplied its own credential (a service-auth token, say), so
+     * rotating the session's tokens would not make the request any more likely
+     * to succeed on a retry.
+     */
+    if (
+      !inner ||
+      inner.destroyed ||
+      new Headers(init?.headers).has('authorization')
+    ) {
+      return (0, this.fetch)(target, init)
+    }
+
+    /*
+     * `init ?? {}` because `PasswordSession.fetchHandler` reads `init.headers`
+     * unguarded, while the inherited signature makes `init` optional.
+     */
+    return inner.fetchHandler(target.href, init ?? {})
+  }
+
+  /**
+   * Refresh the session, rejecting if nothing was refreshed.
+   *
+   * This restores the contract of the `CredentialSession.refreshSession` this
+   * class replaces, which rejected on any refresh failure.
+   * `PasswordSession.refresh()` does not: on a transient failure (a 500, a
+   * network error) it reports through `onUpdateFailure` and then *resolves*
+   * with the unchanged session data, reserving rejection for the cases where
+   * the session is definitively gone. Callers here read resolution as "tokens
+   * rotated" - `SignupQueued` refreshes and then re-checks the token scope, and
+   * the various verification dialogs refresh and then close - so a resolved
+   * no-op would silently loop or report success.
+   *
+   * The signal is the identity of the returned `SessionData`, not a field
+   * comparison: `PasswordSession` builds a brand new object on every successful
+   * rotation and returns the existing one untouched on a transient failure, so
+   * identity separates the two exactly. Comparing against the data captured
+   * immediately before the call also gets concurrent refreshes right - if
+   * another caller's refresh rotated the tokens while ours was queued behind it
+   * (`PasswordSession` serializes refreshes), the data we get back still
+   * differs from what we captured, which is a success for our caller.
+   */
+  override async refreshSession(): Promise<ComAtprotoServerRefreshSession.Response> {
+    const inner = this.#disposed ? null : this.#inner
+    if (!inner || inner.destroyed) {
+      throw new Error('No session to refresh')
+    }
+    const before = this.#liveData()
+    const data = await inner.refresh()
+    if (data === before) {
+      throw new Error('Failed to refresh session')
+    }
+    /*
+     * Re-shape the lex payload into the `@atproto/api` XRPC response envelope.
+     * `headers` is empty because the inner session does not surface response
+     * headers, and no caller in this app reads them off a refresh.
+     */
+    return {
+      success: true,
+      headers: {},
+      data: {
+        accessJwt: data.accessJwt,
+        refreshJwt: data.refreshJwt,
+        handle: data.handle,
+        did: data.did,
+        didDoc: data.didDoc,
+        email: data.email,
+        emailConfirmed: data.emailConfirmed,
+        emailAuthFactor: data.emailAuthFactor,
+        active: data.active,
+        status: data.status,
+      },
+    }
+  }
+
+  /**
+   * Force a refresh, ignoring the passed-in session data.
+   *
+   * The inner session already owns its tokens, so there is nothing to install;
+   * every call site in the app uses `resumeSession` as "refresh my session
+   * now". The returned envelope is the refresh one, which is structurally a
+   * superset of `ComAtprotoServerGetSession.Response` (the shape `AtpAgent`
+   * advertises), so both layers stay type-correct.
+   *
+   * It inherits {@link PasswordSessionManager.refreshSession}'s contract, so it
+   * rejects rather than resolving when no tokens were rotated.
+   */
+  override resumeSession(
+    _session: AtpSessionData,
+  ): Promise<ComAtprotoServerRefreshSession.Response> {
+    return this.refreshSession()
+  }
+
+  override async logout(): Promise<void> {
+    const inner = this.#inner
+    if (!inner || inner.destroyed) {
+      return
+    }
+    try {
+      await inner.logout()
+    } catch {
+      /* matches the parent, which swallows delete-session failures */
+    }
+  }
+
+  override login(
+    _opts: AtpAgentLoginOpts,
+  ): Promise<ComAtprotoServerCreateSession.Response> {
+    return Promise.reject(new Error(UNSUPPORTED))
+  }
+
+  override createAccount(
+    _data: ComAtprotoServerCreateAccount.InputSchema,
+    _opts?: ComAtprotoServerCreateAccount.CallOptions,
+  ): Promise<ComAtprotoServerCreateAccount.Response> {
+    return Promise.reject(new Error(UNSUPPORTED))
+  }
+
+  /**
+   * Detach this manager from its inner session.
+   *
+   * All reads then behave as logged out and requests fall back to the
+   * unauthenticated `fetch` path. The inner session is left alone: it may still
+   * be shared, and logging out is a separate, explicit operation.
+   */
+  dispose() {
+    this.#disposed = true
+  }
+}
+
+/*
+ * Declaration merging to narrow the inherited `sessionManager` (typed as
+ * `CredentialSession` by `AtpAgent`) to the manager `BskyAppAgent` actually
+ * receives. A `declare` class field would be the direct way to say this, but
+ * babel's TypeScript transform rejects `declare` fields in this config, and a
+ * `get sessionManager()` override is forbidden because the parent declares it
+ * as a property (TS2611). The merge is sound: the constructor passes the
+ * manager straight to `super`, which assigns it.
+ */
+// eslint-disable-next-line typescript/no-unsafe-declaration-merging
+export interface BskyAppAgent {
+  readonly sessionManager: PasswordSessionManager
+}
+
+/**
+ * The app's `AtpAgent`, backed by a `PasswordSession`.
+ *
+ * Everything interesting lives in {@link PasswordSessionManager}; this exists
+ * so `useAgent()` consumers keep getting a real `AtpAgent` (proxy headers,
+ * labeler headers, the `app`/`com`/`chat` namespaces) and so the agent can be
+ * disposed alongside its session.
+ */
+export class BskyAppAgent extends AtpAgent {
+  constructor(manager: PasswordSessionManager) {
+    super(manager)
+  }
+
+  dispose() {
+    this.sessionManager.dispose()
+  }
+}
+
+/** Build the logged-out agent used for public/guest browsing. */
+export function createPublicAgent() {
+  configureModerationForGuest() // Side effect but only relevant for tests
+
+  const agent = new BskyAppAgent(
+    new PasswordSessionManager(null, {service: PUBLIC_BSKY_SERVICE}),
+  )
+  agent.configureProxy(BLUESKY_PROXY_HEADER.get())
+  return agent
+}
diff --git a/src/state/session/create-account.ts b/src/state/session/create-account.ts
new file mode 100644
index 0000000000..fd67681482
--- /dev/null
+++ b/src/state/session/create-account.ts
@@ -0,0 +1,243 @@
+import {type AppBskyActorProfile, type Un$Typed} from '@atproto/api'
+import {TID} from '@atproto/common-web'
+import {PasswordSession} from '@atproto/lex-password-session'
+
+import {networkRetry} from '#/lib/async/retry'
+import {
+  BLUESKY_PROXY_HEADER,
+  DISCOVER_SAVED_FEED,
+  IS_PROD_SERVICE,
+  TIMELINE_SAVED_FEED,
+} from '#/lib/constants'
+import {logger} from '#/logger'
+import {snoozeBirthdateUpdateAllowedForDid} from '#/state/birthdate'
+import {restrictChatSettings} from '#/state/queries/messages/restrictChatSettings'
+import {snoozeEmailConfirmationPrompt} from '#/state/shell/reminders'
+import {
+  prefetchAgeAssuranceServerData,
+  setBirthdateForDid,
+  setCreatedAtForDid,
+} from '#/ageAssurance/data'
+import {unsafeGetAndComputeAgeAssurance} from '#/ageAssurance/state'
+import {features} from '#/analytics'
+import {type BskyAppAgent} from './bridge-agent'
+import {configureModerationForAccount} from './moderation'
+import {
+  buildBundle,
+  finishPreparation,
+  makeSessionHooks,
+  type OnSessionChange,
+  registerBundleKillSwitch,
+  type SessionBundle,
+} from './session-core'
+import {sessionDataToSessionAccount} from './session-data'
+import {type SessionAccount} from './types'
+
+/** Create an account, prepare its session, and start post-signup writes. */
+export async function createSessionBundleAndCreateAccount(
+  {
+    service,
+    email,
+    password,
+    handle,
+    birthDate,
+    inviteCode,
+    verificationPhone,
+    verificationCode,
+  }: {
+    service: string
+    email: string
+    password: string
+    handle: string
+    birthDate: Date
+    inviteCode?: string
+    verificationPhone?: string
+    verificationCode?: string
+  },
+  onSessionChange: OnSessionChange,
+): Promise<{account: SessionAccount; bundle: SessionBundle}> {
+  let bundle!: SessionBundle
+  let accountDid = ''
+  const hooks = makeSessionHooks({
+    onSessionChange,
+    getBundle: () => bundle,
+    getDid: () => accountDid,
+  })
+
+  const session = await PasswordSession.createAccount(
+    {
+      email,
+      password,
+      /* the lexicon types handle as `${string}.${string}`; user input is a plain string */
+      handle: handle as `${string}.${string}`,
+      inviteCode,
+      verificationPhone,
+      verificationCode,
+    },
+    {...hooks, service},
+  )
+
+  bundle = buildBundle(session)
+  registerBundleKillSwitch(bundle, hooks.kill)
+  // Seed the hook and the deferred writes with refresh-stable account fields.
+  const earlyAccount = snapshotNewAccount(session, email)
+  accountDid = earlyAccount.did
+
+  const gates = features.refresh({strategy: 'prefer-fresh-gates'})
+  configureModerationForAccount(bundle.agent, earlyAccount)
+
+  const createdAt = new Date().toISOString()
+  const birthdate = birthDate.toISOString()
+
+  /*
+   * Since we have a race with account creation, profile creation, and AA
+   * state, set these values locally to ensure sync reads. Values are written
+   * to the server in the next step, so on subsequent reloads, the server will
+   * be the source of truth.
+   */
+  setCreatedAtForDid({did: earlyAccount.did, createdAt})
+  setBirthdateForDid({did: earlyAccount.did, birthdate})
+  snoozeBirthdateUpdateAllowedForDid(earlyAccount.did)
+  // Start the prefetch after seeding its synchronous birthdate inputs.
+  const aa = prefetchAgeAssuranceServerData({agent: bundle.agent})
+
+  const isProd = Boolean(IS_PROD_SERVICE(service))
+  const postSignupTasks: Promise<unknown>[] = [
+    savePersonalDetails(bundle.agent, birthdate),
+    initializeProfile(bundle.agent, {handle, createdAt, isProd}),
+  ]
+  if (isProd) {
+    postSignupTasks.push(
+      initializeSavedFeeds(bundle.agent),
+      restrictChatAfterAgeAssurance(aa, bundle.agent, earlyAccount.did),
+    )
+  }
+  // Post-signup writes are not required to enter onboarding.
+  void reportPostSignupFailures(postSignupTasks)
+
+  try {
+    // snooze first prompt after signup, defer to next prompt
+    snoozeEmailConfirmationPrompt()
+  } catch (e) {
+    logger.error(e instanceof Error ? e : String(e), {
+      message: `session: failed snoozeEmailConfirmationPrompt`,
+    })
+  }
+
+  bundle.agent.configureProxy(BLUESKY_PROXY_HEADER.get())
+
+  // Preparation may auto-refresh the session while hooks are still disarmed.
+  const account = await finishPreparation(
+    bundle,
+    Promise.all([gates, aa]),
+    () => snapshotNewAccount(session, email),
+  )
+  hooks.arm()
+  return {account, bundle}
+}
+
+/**
+ * Snapshot a just-created session as a `SessionAccount`.
+ *
+ * `com.atproto.server.createAccount` returns only tokens, handle, did and
+ * didDoc, so the session carries no email state or `active` flag until the
+ * first refresh. Synthesize those fields from the creation input so the
+ * persisted account does not briefly claim the email is unknown.
+ */
+function snapshotNewAccount(
+  session: PasswordSession,
+  email: string,
+): SessionAccount {
+  const account = sessionDataToSessionAccount(
+    session.session,
+    session.session.service,
+  )
+  if (!account) {
+    throw Error('Expected an active session')
+  }
+  return {
+    ...account,
+    email: account.email ?? email,
+    emailConfirmed: account.emailConfirmed ?? false,
+    emailAuthFactor: account.emailAuthFactor ?? false,
+    active: account.active ?? true,
+  }
+}
+
+function savePersonalDetails(agent: BskyAppAgent, birthDate: string) {
+  return retryPostSignupTask('set birthDate', 3, () =>
+    agent.setPersonalDetails({birthDate}),
+  )
+}
+
+function initializeProfile(
+  agent: BskyAppAgent,
+  {
+    handle,
+    createdAt,
+    isProd,
+  }: {
+    handle: string
+    createdAt: string
+    isProd: boolean
+  },
+) {
+  return retryPostSignupTask('set initial profile', 3, () =>
+    agent.upsertProfile(prev => {
+      const next: Un$Typed<AppBskyActorProfile.Record> = prev || {}
+      if (isProd) {
+        next.displayName = handle
+        next.createdAt = createdAt
+      } else {
+        next.createdAt = prev?.createdAt || new Date().toISOString()
+      }
+      return next
+    }),
+  )
+}
+
+function initializeSavedFeeds(agent: BskyAppAgent) {
+  return retryPostSignupTask('set initial feeds', 1, () =>
+    agent.overwriteSavedFeeds([
+      {...DISCOVER_SAVED_FEED, id: TID.nextStr()},
+      {...TIMELINE_SAVED_FEED, id: TID.nextStr()},
+    ]),
+  )
+}
+
+function restrictChatAfterAgeAssurance(
+  ageAssurance: Promise<unknown>,
+  agent: BskyAppAgent,
+  did: string,
+) {
+  return ageAssurance.then(() => {
+    const {flags} = unsafeGetAndComputeAgeAssurance({did})
+    if (flags?.chatDisabled || flags?.groupChatDisabled) {
+      void restrictChatSettings({
+        agent,
+        restrictIncoming: flags.chatDisabled,
+        restrictGroupInvites: flags.groupChatDisabled,
+      })
+    }
+  })
+}
+
+function retryPostSignupTask<T>(
+  description: string,
+  retries: number,
+  task: () => Promise<T>,
+) {
+  return networkRetry(retries, task).catch(e => {
+    logger.info(`createSessionBundleAndCreateAccount: failed to ${description}`)
+    throw e
+  })
+}
+
+async function reportPostSignupFailures(tasks: Promise<unknown>[]) {
+  const results = await Promise.allSettled(tasks)
+  if (results.some(result => result.status === 'rejected')) {
+    logger.error(
+      `session: createSessionBundleAndCreateAccount failed to save post-signup settings`,
+    )
+  }
+}
diff --git a/src/state/session/expiry-rescue.ts b/src/state/session/expiry-rescue.ts
new file mode 100644
index 0000000000..f750a1ba5c
--- /dev/null
+++ b/src/state/session/expiry-rescue.ts
@@ -0,0 +1,30 @@
+import {type SessionAccount} from './types'
+
+/** Maximum failed token generations considered during one expiry rescue. */
+export const MAX_EXPIRY_RESCUE_GENERATIONS = 5
+
+/** Pick the first unfailed token generation newer than the one that expired. */
+export function pickExpiryRescueCandidate({
+  dyingRefreshJwt,
+  candidates,
+  failedRefreshJwts,
+}: {
+  dyingRefreshJwt: string
+  candidates: (SessionAccount | undefined)[]
+  failedRefreshJwts: ReadonlySet<string>
+}): SessionAccount | undefined {
+  if (failedRefreshJwts.size >= MAX_EXPIRY_RESCUE_GENERATIONS) {
+    return undefined
+  }
+  for (const candidate of candidates) {
+    const refreshJwt = candidate?.refreshJwt
+    if (
+      refreshJwt &&
+      refreshJwt !== dyingRefreshJwt &&
+      !failedRefreshJwts.has(refreshJwt)
+    ) {
+      return candidate
+    }
+  }
+  return undefined
+}
diff --git a/src/state/session/index.tsx b/src/state/session/index.tsx
index fd31261a9d..1a22a0e215 100644
--- a/src/state/session/index.tsx
+++ b/src/state/session/index.tsx
@@ -3,12 +3,14 @@ import {
   useCallback,
   useContext,
   useEffect,
+  useInsertionEffect,
   useMemo,
   useRef,
   useState,
   useSyncExternalStore,
 } from 'react'
-import {type AtpAgent, type AtpSessionEvent} from '@atproto/api'
+import {type AtpAgent} from '@atproto/api'
+import {type SessionData} from '@atproto/lex-password-session'
 
 import * as persisted from '#/state/persisted'
 import {useCloseAllActiveElements} from '#/state/util'
@@ -16,17 +18,28 @@ import {useGlobalDialogsControlContext} from '#/components/dialogs/Context'
 import {AnalyticsContext, useAnalyticsBase, utils} from '#/analytics'
 import {IS_WEB} from '#/env'
 import {emitSessionDropped} from '../events'
-import {
-  agentToSessionAccount,
-  type BskyAppAgent,
-  createAgentAndCreateAccount,
-  createAgentAndLogin,
-  createAgentAndResume,
-  sessionAccountToSession,
-} from './agent'
+import {createSessionBundleAndCreateAccount} from './create-account'
+import {pickExpiryRescueCandidate} from './expiry-rescue'
 import {type Action, getInitialState, reducer, type State} from './reducer'
-export {isSignupQueued} from './util'
-import {addSessionDebugLog} from './logging'
+import {
+  type AtpSessionEvent,
+  createSessionBundleAndLogin,
+  createSessionBundleAndResume,
+  createSessionBundleFromStoredAccount,
+  disposeBundle,
+  type PublicSessionBundle,
+  type SessionBundle,
+  sessionDataToSessionAccount,
+} from './session-core'
+export {isSignupQueued} from './session-data'
+import {
+  addSessionDebugLog,
+  getBundleId,
+  redactAccount,
+  redactPersistedSession,
+  redactSessionData,
+  redactState,
+} from './logging'
 export type {SessionAccount} from '#/state/session/types'
 
 import {clearPersistedQueryStorage} from '#/lib/persisted-query-storage'
@@ -47,8 +60,11 @@ const StateContext = createContext<SessionStateContext>({
 })
 StateContext.displayName = 'SessionStateContext'
 
-const AgentContext = createContext<AtpAgent | null>(null)
-AgentContext.displayName = 'SessionAgentContext'
+/** Active account bundle, or the public bundle when logged out. */
+const BundleContext = createContext<SessionBundle | PublicSessionBundle | null>(
+  null,
+)
+BundleContext.displayName = 'SessionBundleContext'
 
 const ApiContext = createContext<SessionApiContext>({
   createAccount: async () => {},
@@ -68,7 +84,7 @@ class SessionStore {
   constructor() {
     // Careful: By the time this runs, `persisted` needs to already be filled.
     const initialState = getInitialState(persisted.get('session').accounts)
-    addSessionDebugLog({type: 'reducer:init', state: initialState})
+    addSessionDebugLog({type: 'reducer:init', state: redactState(initialState)})
     this.state = initialState
   }
 
@@ -92,10 +108,13 @@ class SessionStore {
       const persistedData = {
         accounts: nextState.accounts,
         currentAccount: nextState.accounts.find(
-          a => a.did === nextState.currentAgentState.did,
+          a => a.did === nextState.currentBundleState.did,
         ),
       }
-      addSessionDebugLog({type: 'persisted:broadcast', data: persistedData})
+      addSessionDebugLog({
+        type: 'persisted:broadcast',
+        data: redactPersistedSession(persistedData),
+      })
       void persisted.write('session', persistedData)
     }
     this.listeners.forEach(listener => listener())
@@ -110,15 +129,118 @@ export function Provider({children}: React.PropsWithChildren<{}>) {
   const state = useSyncExternalStore(store.subscribe, store.getState)
   const onboardingDispatch = useOnboardingDispatch()
 
-  const onAgentSessionChange = useCallback(
-    (agent: AtpAgent, accountDid: string, sessionEvent: AtpSessionEvent) => {
-      const refreshedAccount = agentToSessionAccount(agent) // Mutable, so snapshot it right away.
-      if (sessionEvent === 'expired' || sessionEvent === 'create-failed') {
+  // Refresh-token generations that have already failed during expiry rescue.
+  const failedExpiryTokensRef = useRef<Map<string, Set<string>>>(new Map())
+  /*
+   * Rescued bundles need this callback for their own events. A ref avoids a
+   * self-reference in the callback's dependency list. It is filled by the
+   * insertion effect below, which commits well before any session hook can
+   * fire: hooks are armed only after an asynchronous session factory resolves.
+   */
+  const onSessionChangeRef = useRef<
+    | ((
+        bundle: SessionBundle,
+        accountDid: string,
+        sessionEvent: AtpSessionEvent,
+        sessionData?: SessionData,
+      ) => void)
+    | null
+  >(null)
+
+  const onSessionChange = useCallback(
+    (
+      bundle: SessionBundle,
+      accountDid: string,
+      sessionEvent: AtpSessionEvent,
+      sessionData?: SessionData,
+    ) => {
+      if (sessionEvent === 'update' && sessionData) {
+        failedExpiryTokensRef.current.get(accountDid)?.clear()
+      }
+
+      /*
+       * PasswordSession invokes its hooks before updating its live getter. Use
+       * the delivered payload so a refresh persists the newly rotated tokens.
+       *
+       * A refresh payload carries no didDoc unless the server sends one, so the
+       * stored account's `pdsUrl` is threaded in as the fallback. Without it the
+       * refresh would persist `pdsUrl: undefined` and the next cold start would
+       * route pre-refresh requests to the entryway instead of the PDS.
+       */
+      const refreshedAccount =
+        sessionEvent === 'update' && sessionData
+          ? sessionDataToSessionAccount(
+              sessionData,
+              sessionData.service,
+              store.getState().accounts.find(a => a.did === accountDid)?.pdsUrl,
+            )
+          : undefined
+
+      /*
+       * A stale tab may expire a token after another tab has already rotated it.
+       * Prefer a newer persisted or reducer generation over logging every tab
+       * out. Failed generations are recorded and bounded to guarantee that a
+       * repeatedly expiring session eventually falls through to logout.
+       */
+      if (sessionEvent === 'expired') {
+        const current = store.getState()
+        const currentBundle = current.currentBundleState.bundle as unknown as
+          | SessionBundle
+          | PublicSessionBundle
+        const dyingRefreshJwt = sessionData?.refreshJwt
+        // Stale bundle events are handled by the reducer's identity guard.
+        if (
+          currentBundle === bundle &&
+          current.currentBundleState.did === accountDid &&
+          dyingRefreshJwt
+        ) {
+          let failedSet = failedExpiryTokensRef.current.get(accountDid)
+          if (!failedSet) {
+            failedSet = new Set()
+            failedExpiryTokensRef.current.set(accountDid, failedSet)
+          }
+          failedSet.add(dyingRefreshJwt)
+
+          const persistedCandidate = persisted
+            .readLatest('session')
+            .accounts.find(a => a.did === accountDid)
+          const reducerCandidate = current.accounts.find(
+            a => a.did === accountDid,
+          )
+          const candidate = pickExpiryRescueCandidate({
+            dyingRefreshJwt,
+            candidates: [persistedCandidate, reducerCandidate],
+            failedRefreshJwts: failedSet,
+          })
+
+          if (candidate) {
+            const rebuilt = createSessionBundleFromStoredAccount(
+              candidate,
+              onSessionChangeRef.current!,
+            )
+            if (rebuilt) {
+              store.dispatch({
+                type: 'replaced-current-bundle',
+                newBundle: rebuilt.bundle,
+                newAccount: rebuilt.account,
+              })
+              return
+            }
+          }
+        }
+      }
+
+      // Only the current bundle may report that its session was dropped.
+      if (
+        sessionEvent === 'expired' &&
+        store.getState().currentBundleState.bundle === bundle
+      ) {
         emitSessionDropped()
       }
+      // Bundle identity prevents stale sessions from changing the active account.
       store.dispatch({
-        type: 'received-agent-event',
-        agent,
+        type: 'received-session-event',
+        bundle,
         refreshedAccount,
         accountDid,
         sessionEvent,
@@ -126,48 +248,65 @@ export function Provider({children}: React.PropsWithChildren<{}>) {
     },
     [store],
   )
+  /*
+   * Writing the ref during render is forbidden under React Compiler. An
+   * insertion effect is the earliest commit-time slot, and the only reader
+   * (`onSessionChange`'s expiry-rescue path) runs from armed session hooks,
+   * which cannot fire before the first commit.
+   */
+  useInsertionEffect(() => {
+    onSessionChangeRef.current = onSessionChange
+  }, [onSessionChange])
 
   const createAccount = useCallback<SessionApiContext['createAccount']>(
     async (params, metrics) => {
       addSessionDebugLog({type: 'method:start', method: 'createAccount'})
       const signal = cancelPendingTask()
       ax.metric('account:create:begin', {})
-      const {agent, account} = await createAgentAndCreateAccount(
+      const {bundle, account} = await createSessionBundleAndCreateAccount(
         params,
-        onAgentSessionChange,
+        onSessionChange,
       )
 
       if (signal.aborted) {
+        // The factory returns an armed bundle, so a superseded signup must dispose it.
+        disposeBundle(bundle)
         return
       }
       store.dispatch({
         type: 'switched-to-account',
-        newAgent: agent,
+        newBundle: bundle,
         newAccount: account,
       })
       ax.metric('account:create:success', metrics, {
         session: utils.accountToSessionMetadata(account),
       })
-      addSessionDebugLog({type: 'method:end', method: 'createAccount', account})
+      addSessionDebugLog({
+        type: 'method:end',
+        method: 'createAccount',
+        account: redactAccount(account),
+      })
     },
-    [ax, store, onAgentSessionChange, cancelPendingTask],
+    [ax, store, onSessionChange, cancelPendingTask],
   )
 
   const login = useCallback<SessionApiContext['login']>(
     async (params, logContext) => {
       addSessionDebugLog({type: 'method:start', method: 'login'})
       const signal = cancelPendingTask()
-      const {agent, account} = await createAgentAndLogin(
+      const {bundle, account} = await createSessionBundleAndLogin(
         params,
-        onAgentSessionChange,
+        onSessionChange,
       )
 
       if (signal.aborted) {
+        // The factory returns an armed bundle, so a superseded login must dispose it.
+        disposeBundle(bundle)
         return
       }
       store.dispatch({
         type: 'switched-to-account',
-        newAgent: agent,
+        newBundle: bundle,
         newAccount: account,
       })
       ax.metric(
@@ -175,9 +314,13 @@ export function Provider({children}: React.PropsWithChildren<{}>) {
         {logContext, withPassword: true},
         {session: utils.accountToSessionMetadata(account)},
       )
-      addSessionDebugLog({type: 'method:end', method: 'login', account})
+      addSessionDebugLog({
+        type: 'method:end',
+        method: 'login',
+        account: redactAccount(account),
+      })
     },
-    [ax, store, onAgentSessionChange, cancelPendingTask],
+    [ax, store, onSessionChange, cancelPendingTask],
   )
 
   const logoutCurrentAccount = useCallback<
@@ -196,17 +339,17 @@ export function Provider({children}: React.PropsWithChildren<{}>) {
         {
           session: utils.accountToSessionMetadata(
             prevState.accounts.find(
-              a => a.did === prevState.currentAgentState.did,
+              a => a.did === prevState.currentBundleState.did,
             ),
           ),
         },
       )
       addSessionDebugLog({type: 'method:end', method: 'logout'})
-      if (prevState.currentAgentState.did) {
+      if (prevState.currentBundleState.did) {
         clearAgeAssuranceServerDataForDid({
-          did: prevState.currentAgentState.did,
+          did: prevState.currentBundleState.did,
         })
-        void clearPersistedQueryStorage(prevState.currentAgentState.did)
+        void clearPersistedQueryStorage(prevState.currentBundleState.did)
       }
       // reset onboarding flow on logout
       onboardingDispatch({type: 'skip'})
@@ -230,7 +373,7 @@ export function Provider({children}: React.PropsWithChildren<{}>) {
         {
           session: utils.accountToSessionMetadata(
             prevState.accounts.find(
-              a => a.did === prevState.currentAgentState.did,
+              a => a.did === prevState.currentBundleState.did,
             ),
           ),
         },
@@ -251,61 +394,94 @@ export function Provider({children}: React.PropsWithChildren<{}>) {
       addSessionDebugLog({
         type: 'method:start',
         method: 'resumeSession',
-        account: storedAccount,
+        account: redactAccount(storedAccount),
       })
       const signal = cancelPendingTask()
-      const {agent, account} = await createAgentAndResume(
+      const {bundle, account} = await createSessionBundleAndResume(
         storedAccount,
-        onAgentSessionChange,
+        onSessionChange,
       )
 
       if (signal.aborted) {
+        // The factory returns an armed bundle, so a superseded resume must dispose it.
+        disposeBundle(bundle)
+        return
+      }
+      /*
+       * A cross-tab logout may clear or remove the account while resume is in
+       * flight. Check the account entry rather than the current did so ordinary
+       * account switching remains valid.
+       */
+      const latest = store.getState()
+      const latestEntry = latest.accounts.find(a => a.did === account.did)
+      if (!latestEntry || !latestEntry.refreshJwt) {
+        disposeBundle(bundle)
         return
       }
       store.dispatch({
         type: 'switched-to-account',
-        newAgent: agent,
+        newBundle: bundle,
         newAccount: account,
       })
-      addSessionDebugLog({type: 'method:end', method: 'resumeSession', account})
+      addSessionDebugLog({
+        type: 'method:end',
+        method: 'resumeSession',
+        account: redactAccount(account),
+      })
       if (isSwitchingAccounts) {
         // reset onboarding flow on switch account
         onboardingDispatch({type: 'skip'})
       }
     },
-    [store, onAgentSessionChange, cancelPendingTask, onboardingDispatch],
+    [store, onSessionChange, cancelPendingTask, onboardingDispatch],
   )
 
   const partialRefreshSession = useCallback<
     SessionApiContext['partialRefreshSession']
   >(async () => {
-    const agent = state.currentAgentState.agent as BskyAppAgent
+    /*
+     * Read the live bundle rather than the one captured by this render: a
+     * dispatch that lands before the next render would otherwise leave this
+     * holding a disposed bundle, whose agent dispatches unauthenticated.
+     */
+    const bundle = store.getState().currentBundleState
+      .bundle as unknown as SessionBundle
     const signal = cancelPendingTask()
-    const {data} = await agent.com.atproto.server.getSession()
+    /* getSession targets the PDS; only the persisted account fields are patched. */
+    const {data} = await bundle.agent.com.atproto.server.getSession()
     if (signal.aborted) return
     store.dispatch({
       type: 'partial-refresh-session',
-      accountDid: agent.session!.did,
+      /*
+       * Read the did off the response rather than the session: the bundle may
+       * have been disposed while the request was in flight, and the live
+       * getters throw in that state.
+       */
+      accountDid: data.did,
       patch: {
         emailConfirmed: data.emailConfirmed,
         emailAuthFactor: data.emailAuthFactor,
       },
     })
-  }, [store, state, cancelPendingTask])
+  }, [store, cancelPendingTask])
 
   const removeAccount = useCallback<SessionApiContext['removeAccount']>(
     account => {
       addSessionDebugLog({
         type: 'method:start',
         method: 'removeAccount',
-        account,
+        account: redactAccount(account),
       })
       cancelPendingTask()
       store.dispatch({
         type: 'removed-account',
         accountDid: account.did,
       })
-      addSessionDebugLog({type: 'method:end', method: 'removeAccount', account})
+      addSessionDebugLog({
+        type: 'method:end',
+        method: 'removeAccount',
+        account: redactAccount(account),
+      })
       clearAgeAssuranceServerDataForDid({did: account.did})
     },
     [store, cancelPendingTask],
@@ -313,7 +489,10 @@ export function Provider({children}: React.PropsWithChildren<{}>) {
   useEffect(() => {
     return persisted.onUpdate('session', nextSession => {
       const synced = nextSession
-      addSessionDebugLog({type: 'persisted:receive', data: synced})
+      addSessionDebugLog({
+        type: 'persisted:receive',
+        data: redactPersistedSession(synced),
+      })
       store.dispatch({
         type: 'synced-accounts',
         syncedAccounts: synced.accounts,
@@ -322,38 +501,91 @@ export function Provider({children}: React.PropsWithChildren<{}>) {
       const syncedAccount = synced.accounts.find(
         a => a.did === synced.currentAccount?.did,
       )
+      /*
+       * Cancel pending work when another tab logs out the account this tab
+       * considers current. Do not cancel unrelated work between logged-out tabs.
+       */
+      const syncedDid = syncedAccount?.refreshJwt
+        ? syncedAccount.did
+        : undefined
+      if (
+        syncedDid === undefined &&
+        state.currentBundleState.did !== undefined
+      ) {
+        cancelPendingTask()
+      }
       if (syncedAccount && syncedAccount.refreshJwt) {
-        if (syncedAccount.did !== state.currentAgentState.did) {
-          /*
-           * Web handling: if leader tab has switched to a diff account that is
-           * stale, it will refresh the session before triggering the update to
-           * follower tabs. Follower tabs will therefore receive the fresh
-           * session. See APP-1960, or ask Eric.
-           */
+        if (syncedAccount.did !== state.currentBundleState.did) {
+          // The leader refreshes before broadcasting, so followers receive fresh tokens.
           void resumeSession(syncedAccount)
         } else {
-          const agent = state.currentAgentState.agent as AtpAgent
-          const prevSession = agent.session
-          // eslint-disable-next-line react-compiler/react-compiler
-          agent.sessionManager.session = sessionAccountToSession(syncedAccount)
-          addSessionDebugLog({
-            type: 'agent:patch',
-            agent,
-            prevSession,
-            nextSession: agent.session,
+          /*
+           * PasswordSession cannot be patched in place. Rebuild from the tokens
+           * the leader already refreshed, then dispose the previous bundle.
+           */
+          const prevBundle = state.currentBundleState.bundle as unknown as
+            | SessionBundle
+            | PublicSessionBundle
+          // Avoid replacing the live bundle for an unrelated account update.
+          const live =
+            prevBundle.session && !prevBundle.session.destroyed
+              ? prevBundle.session.session
+              : undefined
+          if (
+            live &&
+            live.accessJwt === syncedAccount.accessJwt &&
+            live.refreshJwt === syncedAccount.refreshJwt
+          ) {
+            return
+          }
+          const rebuilt = createSessionBundleFromStoredAccount(
+            syncedAccount,
+            onSessionChange,
+            newBundle => {
+              const current = store.getState()
+              const latestAccount = current.accounts.find(
+                account => account.did === syncedAccount.did,
+              )
+              const isCurrent =
+                current.currentBundleState.bundle === prevBundle &&
+                latestAccount?.accessJwt === syncedAccount.accessJwt &&
+                latestAccount?.refreshJwt === syncedAccount.refreshJwt
+              if (isCurrent) {
+                addSessionDebugLog({
+                  type: 'bundle:patch',
+                  bundleId: getBundleId(newBundle),
+                  prevSession: redactSessionData(
+                    prevBundle.session && !prevBundle.session.destroyed
+                      ? prevBundle.session.session
+                      : undefined,
+                  ),
+                  nextSession: redactSessionData(newBundle.session.session),
+                })
+              }
+              return isCurrent
+            },
+          )
+          if (!rebuilt) {
+            return
+          }
+          const {bundle: newBundle, account: newAccount} = rebuilt
+          store.dispatch({
+            type: 'replaced-current-bundle',
+            newBundle,
+            newAccount,
           })
         }
       }
     })
-  }, [store, state, resumeSession])
+  }, [store, state, resumeSession, onSessionChange, cancelPendingTask])
 
   const stateContext = useMemo(
     () => ({
       accounts: state.accounts,
       currentAccount: state.accounts.find(
-        a => a.did === state.currentAgentState.did,
+        a => a.did === state.currentBundleState.did,
       ),
-      hasSession: !!state.currentAgentState.did,
+      hasSession: !!state.currentBundleState.did,
     }),
     [state],
   )
@@ -379,26 +611,38 @@ export function Provider({children}: React.PropsWithChildren<{}>) {
     ],
   )
 
+  const bundle = state.currentBundleState.bundle as unknown as
+    | SessionBundle
+    | PublicSessionBundle
+
   // @ts-expect-error window type is not declared, debug only
   // eslint-disable-next-line react-hooks/immutability
-  if (__DEV__ && IS_WEB) window.agent = state.currentAgentState.agent
+  if (__DEV__ && IS_WEB) window.agent = bundle.agent
 
-  const agent = state.currentAgentState.agent as BskyAppAgent
-  const currentAgentRef = useRef(agent)
+  const currentBundleRef = useRef(bundle)
+  /*
+   * Disposal is deferred to this post-commit effect deliberately: components may
+   * still render against the outgoing bundle during the commit that swaps it, so
+   * tearing its agent down inline would pull the agent out from under them. The
+   * reducer's bundle-identity guard drops any events the not-yet-disposed session
+   * emits in that window.
+   */
   useEffect(() => {
-    if (currentAgentRef.current !== agent) {
-      // Read the previous value and immediately advance the pointer.
-      const prevAgent = currentAgentRef.current
-      currentAgentRef.current = agent
-      addSessionDebugLog({type: 'agent:switch', prevAgent, nextAgent: agent})
-      // We never reuse agents so let's fully neutralize the previous one.
-      // This ensures it won't try to consume any refresh tokens.
-      prevAgent.dispose()
+    if (currentBundleRef.current !== bundle) {
+      const prevBundle = currentBundleRef.current
+      currentBundleRef.current = bundle
+      addSessionDebugLog({
+        type: 'bundle:switch',
+        prevBundleId: getBundleId(prevBundle),
+        nextBundleId: getBundleId(bundle),
+      })
+      // Replaced bundles must never consume another refresh token.
+      disposeBundle(prevBundle)
     }
-  }, [agent])
+  }, [bundle])
 
   return (
-    <AgentContext.Provider value={agent}>
+    <BundleContext.Provider value={bundle}>
       <StateContext.Provider value={stateContext}>
         <ApiContext.Provider value={api}>
           <AnalyticsContext
@@ -411,7 +655,7 @@ export function Provider({children}: React.PropsWithChildren<{}>) {
           </AnalyticsContext>
         </ApiContext.Provider>
       </StateContext.Provider>
-    </AgentContext.Provider>
+    </BundleContext.Provider>
   )
 }
 
@@ -453,10 +697,13 @@ export function useRequireAuth() {
   )
 }
 
+/**
+ * The active session's agent, or the public agent when logged out.
+ */
 export function useAgent(): AtpAgent {
-  const agent = useContext(AgentContext)
-  if (!agent) {
+  const bundle = useContext(BundleContext)
+  if (!bundle) {
     throw Error('useAgent() must be below <SessionProvider>.')
   }
-  return agent
+  return bundle.agent
 }
diff --git a/src/state/session/logging.ts b/src/state/session/logging.ts
index da017d823f..adc495d54d 100644
--- a/src/state/session/logging.ts
+++ b/src/state/session/logging.ts
@@ -1,21 +1,140 @@
-import {type AtpSessionData, type AtpSessionEvent} from '@atproto/api'
+import {type SessionData} from '@atproto/lex-password-session'
 
 import {type Schema} from '../persisted'
 import {type Action, type State} from './reducer'
-import {type SessionAccount} from './types'
+import {type AtpSessionEvent, type SessionAccount} from './types'
 
 type Reducer = (state: State, action: Action) => State
 
+/**
+ * An account reduced to the fields that are safe to ship off-device.
+ *
+ * Credentials become presence booleans and PII (email, service, pdsUrl) is
+ * dropped entirely. The log only ever needs to answer "which account was live,
+ * and did it still hold credentials?". The stubs at the bottom of this file are
+ * expected to be revived against Sentry or Bitdrift, so no payload type may be
+ * capable of carrying a live JWT in the first place.
+ */
+export type RedactedAccount = {
+  did: string
+  handle: string
+  active: boolean | undefined
+  status: string | undefined
+  signupQueued: boolean | undefined
+  hasAccessJwt: boolean
+  hasRefreshJwt: boolean
+}
+
+/** The account list plus the current did, in redacted form. */
+export type RedactedSessionSnapshot = {
+  accounts: RedactedAccount[]
+  currentDid: string | undefined
+}
+
+/** Live session data reduced to identity plus credential presence. */
+export type RedactedSessionData = {
+  did: string
+  handle: string
+  hasAccessJwt: boolean
+  hasRefreshJwt: boolean
+}
+
+function redact(account: SessionAccount): RedactedAccount {
+  return {
+    did: account.did,
+    handle: account.handle,
+    active: account.active,
+    status: account.status,
+    signupQueued: account.signupQueued,
+    hasAccessJwt: !!account.accessJwt,
+    hasRefreshJwt: !!account.refreshJwt,
+  }
+}
+
+export function redactAccount(
+  account: SessionAccount | undefined,
+): RedactedAccount | undefined {
+  return account ? redact(account) : undefined
+}
+
+export function redactState(state: State): RedactedSessionSnapshot {
+  return {
+    accounts: state.accounts.map(redact),
+    currentDid: state.currentBundleState.did,
+  }
+}
+
+export function redactPersistedSession(
+  data: Schema['session'],
+): RedactedSessionSnapshot {
+  return {
+    accounts: data.accounts.map(redact),
+    currentDid: data.currentAccount?.did,
+  }
+}
+
+export function redactSessionData(
+  data: SessionData | undefined,
+): RedactedSessionData | undefined {
+  if (!data) return undefined
+  return {
+    did: data.did,
+    handle: data.handle,
+    hasAccessJwt: !!data.accessJwt,
+    hasRefreshJwt: !!data.refreshJwt,
+  }
+}
+
+/*
+ * Bundles are logged for identity only - which one was live, and which one
+ * replaced it. Logging the object itself would reach its session, and through
+ * it the tokens, so each is mapped to an opaque per-run id instead.
+ */
+const bundleIds = new WeakMap<object, string>()
+const runId = Math.random().toString(36).slice(2)
+let nextBundleId = 1
+
+export function getBundleId(bundle: object): string {
+  let id = bundleIds.get(bundle)
+  if (id === undefined) {
+    id = runId + '::' + nextBundleId++
+    bundleIds.set(bundle, id)
+  }
+  return id
+}
+
+/** An action reduced to its discriminant plus the did it targets, if any. */
+type RedactedAction = {
+  type: Action['type']
+  accountDid?: string
+}
+
+function redactAction(action: Action): RedactedAction {
+  switch (action.type) {
+    case 'received-session-event':
+    case 'removed-account':
+    case 'partial-refresh-session':
+      return {type: action.type, accountDid: action.accountDid}
+    case 'switched-to-account':
+    case 'replaced-current-bundle':
+      return {type: action.type, accountDid: action.newAccount.did}
+    case 'synced-accounts':
+      return {type: action.type, accountDid: action.syncedCurrentDid}
+    default:
+      return {type: action.type}
+  }
+}
+
 type Log =
   | {
       type: 'reducer:init'
-      state: State
+      state: RedactedSessionSnapshot
     }
   | {
       type: 'reducer:call'
-      action: Action
-      prevState: State
-      nextState: State
+      action: RedactedAction
+      prevState: RedactedSessionSnapshot
+      nextState: RedactedSessionSnapshot
     }
   | {
       type: 'method:start'
@@ -25,7 +144,7 @@ type Log =
         | 'logout'
         | 'resumeSession'
         | 'removeAccount'
-      account?: SessionAccount
+      account?: RedactedAccount
     }
   | {
       type: 'method:end'
@@ -35,32 +154,41 @@ type Log =
         | 'logout'
         | 'resumeSession'
         | 'removeAccount'
-      account?: SessionAccount
+      account?: RedactedAccount
     }
   | {
       type: 'persisted:broadcast'
-      data: Schema['session']
+      data: RedactedSessionSnapshot
     }
   | {
       type: 'persisted:receive'
-      data: Schema['session']
+      data: RedactedSessionSnapshot
     }
   | {
-      type: 'agent:switch'
-      prevAgent: object
-      nextAgent: object
+      type: 'bundle:switch'
+      prevBundleId: string
+      nextBundleId: string
     }
   | {
-      type: 'agent:patch'
-      agent: object
-      prevSession: AtpSessionData | undefined
-      nextSession: AtpSessionData | undefined
+      /*
+       * Dev-only bundle-swap log. Bundles are identified by their opaque ids;
+       * the session snapshots record only identity and credential presence.
+       */
+      type: 'bundle:patch'
+      bundleId: string
+      prevSession: RedactedSessionData | undefined
+      nextSession: RedactedSessionData | undefined
     }
 
 export function wrapSessionReducerForLogging(reducer: Reducer): Reducer {
   return function loggingWrapper(prevState: State, action: Action): State {
     const nextState = reducer(prevState, action)
-    addSessionDebugLog({type: 'reducer:call', prevState, action, nextState})
+    addSessionDebugLog({
+      type: 'reducer:call',
+      prevState: redactState(prevState),
+      action: redactAction(action),
+      nextState: redactState(nextState),
+    })
     return nextState
   }
 }
diff --git a/src/state/session/moderation.ts b/src/state/session/moderation.ts
index 8fc234d732..2354fab4fa 100644
--- a/src/state/session/moderation.ts
+++ b/src/state/session/moderation.ts
@@ -1,10 +1,31 @@
 import {AtpAgent, BSKY_LABELER_DID} from '@atproto/api'
 
 import {IS_TEST_USER} from '#/lib/constants'
+import {account as accountStorage} from '#/storage'
 import {configureAdditionalModerationAuthorities} from './additional-moderation-authorities'
-import {readLabelers} from './agent-config'
 import {type SessionAccount} from './types'
 
+/**
+ * Cache an account's subscribed labeler DIDs. Called on every preferences
+ * fetch, so the cache is eventually consistent with the server.
+ */
+export function saveLabelers(did: string, value: string[]) {
+  accountStorage.set([did, 'labelers'], value)
+}
+
+/**
+ * Read the cached labeler DIDs for an account, or `undefined` if none have
+ * been cached yet (first session on this device) or the entry is unreadable.
+ */
+export function readLabelers(did: string): string[] | undefined {
+  try {
+    return accountStorage.get([did, 'labelers'])
+  } catch {
+    /* a corrupt entry fails JSON.parse inside Storage.get; treat as no cache */
+    return undefined
+  }
+}
+
 export function configureModerationForGuest() {
   // This global mutation is *only* OK because this code is only relevant for testing.
   // Don't add any other global behavior here!
@@ -12,7 +33,12 @@ export function configureModerationForGuest() {
   configureAdditionalModerationAuthorities()
 }
 
-export async function configureModerationForAccount(
+/**
+ * Configure global app labelers and the account's cached labeler
+ * subscriptions. Fully synchronous so session setup can apply labeler headers
+ * in the same tick, before any request goes out.
+ */
+export function configureModerationForAccount(
   agent: AtpAgent,
   account: SessionAccount,
 ) {
@@ -20,11 +46,12 @@ export async function configureModerationForAccount(
   // Don't add any other global behavior here!
   switchToBskyAppLabeler()
   if (IS_TEST_USER(account.handle)) {
-    await trySwitchToTestAppLabeler(agent)
+    // Test accounts may briefly use the production authority while this resolves.
+    void trySwitchToTestAppLabeler(agent)
   }
 
   // The code below is actually relevant to production (and isn't global).
-  const labelerDids = await readLabelers(account.did).catch(_ => {})
+  const labelerDids = readLabelers(account.did)
   if (labelerDids) {
     agent.configureLabelersHeader(
       labelerDids.filter(did => did !== BSKY_LABELER_DID),
@@ -41,6 +68,7 @@ function switchToBskyAppLabeler() {
   AtpAgent.configure({appLabelers: [BSKY_LABELER_DID]})
 }
 
+/** Resolve and install the test environment's moderation authority. */
 async function trySwitchToTestAppLabeler(agent: AtpAgent) {
   const did = (
     await agent
diff --git a/src/state/session/network.ts b/src/state/session/network.ts
new file mode 100644
index 0000000000..84e92d564b
--- /dev/null
+++ b/src/state/session/network.ts
@@ -0,0 +1,23 @@
+import {emitNetworkConfirmed, emitNetworkLost} from '#/state/events'
+
+/*
+ * Captured once at module load so the wrapper below is immune to later
+ * monkey-patching of globalThis.fetch.
+ */
+const realFetch = globalThis.fetch
+
+/**
+ * Fetch wrapper that reports network reachability to the app-wide event bus.
+ * Any resolved response (including HTTP errors) confirms the network is up; a
+ * thrown error (DNS failure, timeout, offline) reports it as lost.
+ */
+export const networkAwareFetch: typeof fetch = async (...args) => {
+  try {
+    const res = await realFetch(...args)
+    emitNetworkConfirmed()
+    return res
+  } catch (e) {
+    emitNetworkLost()
+    throw e
+  }
+}
diff --git a/src/state/session/reducer.ts b/src/state/session/reducer.ts
index d22dd4a021..8571539f87 100644
--- a/src/state/session/reducer.ts
+++ b/src/state/session/reducer.ts
@@ -1,43 +1,43 @@
-import {type AtpAgent, type AtpSessionEvent} from '@atproto/api'
-
 import {unregisterPushToken} from '#/lib/notifications/notifications'
 import {logger} from '#/lib/notifications/util'
-import {createPublicAgent} from './agent'
 import {wrapSessionReducerForLogging} from './logging'
-import {type SessionAccount} from './types'
+import {createPublicSessionBundle} from './session-core'
+import {type AtpSessionEvent, type SessionAccount} from './types'
 import {createTemporaryAgentsAndResume} from './util'
 
-// A hack so that the reducer can't read anything from the agent.
-// From the reducer's point of view, it should be a completely opaque object.
-type OpaqueBskyAgent = {
+// Keep session internals outside the reducer's static view of a bundle.
+type OpaqueSessionBundle = {
   readonly service: URL
-  readonly api: unknown
-  readonly app: unknown
-  readonly com: unknown
 }
 
-type AgentState = {
-  readonly agent: OpaqueBskyAgent
+type BundleState = {
+  readonly bundle: OpaqueSessionBundle
   readonly did: string | undefined
 }
 
 export type State = {
   readonly accounts: SessionAccount[]
-  readonly currentAgentState: AgentState
-  needsPersist: boolean // Mutated in an effect.
+  readonly currentBundleState: BundleState
+  needsPersist: boolean // Cleared after persistence is scheduled.
 }
 
 export type Action =
   | {
-      type: 'received-agent-event'
-      agent: OpaqueBskyAgent
+      type: 'received-session-event'
+      bundle: OpaqueSessionBundle
       accountDid: string
       refreshedAccount: SessionAccount | undefined
       sessionEvent: AtpSessionEvent
     }
   | {
       type: 'switched-to-account'
-      newAgent: OpaqueBskyAgent
+      newBundle: OpaqueSessionBundle
+      newAccount: SessionAccount
+    }
+  | {
+      // Replace an immutable session from synced or rescued tokens without rebroadcasting.
+      type: 'replaced-current-bundle'
+      newBundle: OpaqueSessionBundle
       newAccount: SessionAccount
     }
   | {
@@ -61,9 +61,9 @@ export type Action =
       patch: Pick<SessionAccount, 'emailConfirmed' | 'emailAuthFactor'>
     }
 
-function createPublicAgentState(): AgentState {
+function createPublicBundleState(): BundleState {
   return {
-    agent: createPublicAgent(),
+    bundle: createPublicSessionBundle(),
     did: undefined,
   }
 }
@@ -71,22 +71,20 @@ function createPublicAgentState(): AgentState {
 export function getInitialState(persistedAccounts: SessionAccount[]): State {
   return {
     accounts: persistedAccounts,
-    currentAgentState: createPublicAgentState(),
+    currentBundleState: createPublicBundleState(),
     needsPersist: false,
   }
 }
 
 let reducer = (state: State, action: Action): State => {
   switch (action.type) {
-    case 'received-agent-event': {
-      const {agent, accountDid, refreshedAccount, sessionEvent} = action
-      if (
-        refreshedAccount === undefined &&
-        agent !== state.currentAgentState.agent
-      ) {
-        // If the session got cleared out (e.g. due to expiry or network error) but
-        // this account isn't the active one, don't clear it out at this time.
-        // This way, if the problem is transient, it'll work on next resume.
+    case 'received-session-event': {
+      const {bundle, accountDid, refreshedAccount, sessionEvent} = action
+      if (bundle !== state.currentBundleState.bundle) {
+        /*
+         * Stale bundles must neither log out the current account nor restore
+         * tokens after logout or an account switch.
+         */
         return state
       }
       if (sessionEvent === 'network-error') {
@@ -98,7 +96,6 @@ let reducer = (state: State, action: Action): State => {
         !existingAccount ||
         JSON.stringify(existingAccount) === JSON.stringify(refreshedAccount)
       ) {
-        // Fast path without a state update.
         return state
       }
       return {
@@ -118,26 +115,40 @@ let reducer = (state: State, action: Action): State => {
             return a
           }
         }),
-        currentAgentState: refreshedAccount
-          ? state.currentAgentState
-          : createPublicAgentState(), // Log out if expired.
+        currentBundleState: refreshedAccount
+          ? state.currentBundleState
+          : createPublicBundleState(), // Log out if expired.
         needsPersist: true,
       }
     }
     case 'switched-to-account': {
-      const {newAccount, newAgent} = action
+      const {newAccount, newBundle} = action
       return {
         accounts: [
           newAccount,
           ...state.accounts.filter(a => a.did !== newAccount.did),
         ],
-        currentAgentState: {
+        currentBundleState: {
           did: newAccount.did,
-          agent: newAgent,
+          bundle: newBundle,
         },
         needsPersist: true,
       }
     }
+    case 'replaced-current-bundle': {
+      const {newBundle, newAccount} = action
+      return {
+        ...state,
+        currentBundleState: {
+          did: state.currentBundleState.did,
+          bundle: newBundle,
+        },
+        accounts: state.accounts.map(a =>
+          a.did === newAccount.did ? newAccount : a,
+        ),
+        needsPersist: false, // Synced from another tab. Don't persist to avoid cycles.
+      }
+    }
     case 'removed-account': {
       const {accountDid} = action
 
@@ -159,16 +170,16 @@ let reducer = (state: State, action: Action): State => {
 
       return {
         accounts: state.accounts.filter(a => a.did !== accountDid),
-        currentAgentState:
-          state.currentAgentState.did === accountDid
-            ? createPublicAgentState() // Log out if removing the current one.
-            : state.currentAgentState,
+        currentBundleState:
+          state.currentBundleState.did === accountDid
+            ? createPublicBundleState() // Log out if removing the current one.
+            : state.currentBundleState,
         needsPersist: true,
       }
     }
     case 'logged-out-current-account': {
-      const {currentAgentState} = state
-      const accountDid = currentAgentState.did
+      const {currentBundleState} = state
+      const accountDid = currentBundleState.did
       // side effect
       const account = state.accounts.find(a => a.did === accountDid)
       if (account && accountDid) {
@@ -195,7 +206,7 @@ let reducer = (state: State, action: Action): State => {
               }
             : a,
         ),
-        currentAgentState: createPublicAgentState(),
+        currentBundleState: createPublicBundleState(),
         needsPersist: true,
       }
     }
@@ -216,7 +227,7 @@ let reducer = (state: State, action: Action): State => {
           refreshJwt: undefined,
           accessJwt: undefined,
         })),
-        currentAgentState: createPublicAgentState(),
+        currentBundleState: createPublicBundleState(),
         needsPersist: true,
       }
     }
@@ -224,33 +235,19 @@ let reducer = (state: State, action: Action): State => {
       const {syncedAccounts, syncedCurrentDid} = action
       return {
         accounts: syncedAccounts,
-        currentAgentState:
-          syncedCurrentDid === state.currentAgentState.did
-            ? state.currentAgentState
-            : createPublicAgentState(), // Log out if different user.
+        currentBundleState:
+          syncedCurrentDid === state.currentBundleState.did
+            ? state.currentBundleState
+            : createPublicBundleState(), // Log out if different user.
         needsPersist: false, // Synced from another tab. Don't persist to avoid cycles.
       }
     }
     case 'partial-refresh-session': {
       const {accountDid, patch} = action
-      const agent = state.currentAgentState.agent as AtpAgent
-
-      /*
-       * Only mutating values that are safe. Be very careful with this.
-       */
-      if (agent.session) {
-        agent.session.emailConfirmed =
-          patch.emailConfirmed ?? agent.session.emailConfirmed
-        agent.session.emailAuthFactor =
-          patch.emailAuthFactor ?? agent.session.emailAuthFactor
-      }
 
+      // PasswordSession has no setter; consumers read these fields from the account.
       return {
         ...state,
-        currentAgentState: {
-          ...state.currentAgentState,
-          agent,
-        },
         accounts: state.accounts.map(a => {
           if (a.did === accountDid) {
             return {
diff --git a/src/state/session/session-core.ts b/src/state/session/session-core.ts
new file mode 100644
index 0000000000..5e3a9e8a8f
--- /dev/null
+++ b/src/state/session/session-core.ts
@@ -0,0 +1,438 @@
+import {
+  PasswordSession,
+  type PasswordSessionOptions,
+  type SessionData,
+} from '@atproto/lex-password-session'
+
+import {BLUESKY_PROXY_HEADER, PUBLIC_BSKY_SERVICE} from '#/lib/constants'
+import {logger} from '#/logger'
+import {prefetchAgeAssuranceServerData} from '#/ageAssurance/data'
+import {features} from '#/analytics'
+import {
+  BskyAppAgent,
+  createPublicAgent,
+  PasswordSessionManager,
+} from './bridge-agent'
+import {addSessionErrorLog} from './logging'
+import {configureModerationForAccount} from './moderation'
+import {networkAwareFetch} from './network'
+import {
+  isSessionExpired,
+  sessionAccountToSessionData,
+  sessionDataToSessionAccount,
+} from './session-data'
+import {type AtpSessionEvent, type SessionAccount} from './types'
+
+export {networkAwareFetch} from './network'
+export {
+  isSignupQueued,
+  sessionAccountToSessionData,
+  sessionDataToSessionAccount,
+} from './session-data'
+export type {AtpSessionEvent} from './types'
+
+/**
+ * The service the bundle authenticated against.
+ *
+ * `PasswordSession`'s getters throw once the session is destroyed, so the read
+ * is guarded and falls back to the public service.
+ */
+function deriveServiceUrl(session: PasswordSession | null): URL {
+  return new URL(
+    session && !session.destroyed
+      ? session.session.service
+      : PUBLIC_BSKY_SERVICE,
+  )
+}
+
+/** An `AtpAgent` bridged over one `PasswordSession`, the bundle's sole auth core. */
+export type SessionBundle = {
+  session: PasswordSession
+  agent: BskyAppAgent
+  readonly service: URL
+}
+
+/**
+ * `PasswordSession` exposes no local (logout-free) destroy, so disposal is
+ * implemented by disabling its injected fetch and hooks. Keep that lifecycle
+ * state private and tied to bundle identity.
+ */
+const bundleKillSwitches = new WeakMap<SessionBundle, () => void>()
+
+/**
+ * Register the lifecycle closure used by {@link disposeBundle}.
+ *
+ * Disposing also detaches the bridge agent from its session, so a stale
+ * bundle's `agent.session` / `agent.pdsUrl` read as `undefined` rather than
+ * serving tokens the app has stopped tracking.
+ */
+export function registerBundleKillSwitch(
+  bundle: SessionBundle,
+  kill: () => void,
+) {
+  bundleKillSwitches.set(bundle, () => {
+    kill()
+    bundle.agent.dispose()
+  })
+}
+
+/**
+ * Wrap a session in the bridge agent.
+ *
+ * `storedPdsUrl` seeds {@link PasswordSessionManager}'s PDS routing so requests
+ * made before the first refresh delivers a didDoc still reach the right host.
+ * Once a didDoc arrives the manager prefers its endpoint.
+ */
+export function buildBundle(
+  session: PasswordSession,
+  storedPdsUrl?: string,
+): SessionBundle {
+  const manager = new PasswordSessionManager(session, {
+    service: deriveServiceUrl(session).toString(),
+    pdsUrl: storedPdsUrl,
+  })
+  return {
+    session,
+    agent: new BskyAppAgent(manager),
+    get service() {
+      return deriveServiceUrl(session)
+    },
+  }
+}
+
+/**
+ * PasswordSession delivers `sessionData` before updating its live getter. The
+ * provider uses that payload for rotated tokens and expiry rescue.
+ */
+export type OnSessionChange = (
+  bundle: SessionBundle,
+  did: string,
+  event: AtpSessionEvent,
+  sessionData?: SessionData,
+) => void
+
+/**
+ * Hooks stay inert during initial session preparation. `kill()` disarms them
+ * and disables the injected fetch so a disposed session cannot refresh or
+ * dispatch.
+ */
+export function makeSessionHooks({
+  onSessionChange,
+  getBundle,
+  getDid,
+}: {
+  onSessionChange: OnSessionChange
+  /** Deferred: hooks are created before the bundle exists. */
+  getBundle: () => SessionBundle
+  /** Deferred: hooks are created before the bundle exists. */
+  getDid: () => string
+}) {
+  let armed = false
+  let killed = false
+  const dispatch = (event: AtpSessionEvent, sessionData?: SessionData) => {
+    if (!armed) {
+      return
+    }
+    /*
+     * A hook must never throw. PasswordSession awaits its hooks inside the
+     * assignment to its internal session promise, so a synchronous throw here
+     * leaves that promise permanently rejected: every later request fails, and
+     * because the session is never marked destroyed, disposeBundle cannot even
+     * see that the bundle is dead. The dispatch path reaches reducer side
+     * effects and event emitters, so treat it as capable of throwing.
+     */
+    try {
+      const did = getDid()
+      onSessionChange(getBundle(), did, event, sessionData)
+      if (event !== 'update') {
+        addSessionErrorLog(did, event)
+      }
+    } catch (e) {
+      logger.error(e instanceof Error ? e : String(e), {
+        message: `session: onSessionChange threw for a '${event}' event`,
+      })
+    }
+  }
+  const hooks: PasswordSessionOptions = {
+    fetch: (input, init) => {
+      if (killed) {
+        throw new Error('session disposed')
+      }
+      return networkAwareFetch(input, init)
+    },
+    onUpdated(data) {
+      dispatch('update', data)
+    },
+    onDeleted(data) {
+      dispatch('expired', data)
+    },
+    onUpdateFailure() {
+      dispatch('network-error')
+    },
+  }
+  return Object.assign(hooks, {
+    arm() {
+      armed = true
+    },
+    kill() {
+      killed = true
+      armed = false
+    },
+  })
+}
+
+/** The agent exposed while logged out. */
+export type PublicSessionBundle = {
+  session: null
+  agent: BskyAppAgent
+  readonly service: URL
+}
+
+/**
+ * Build the logged-out bundle. `createPublicAgent` installs the guest
+ * moderation authorities as part of building the agent.
+ */
+export function createPublicSessionBundle(): PublicSessionBundle {
+  return {
+    session: null,
+    agent: createPublicAgent(),
+    service: new URL(PUBLIC_BSKY_SERVICE),
+  }
+}
+
+/**
+ * Run the prepare tail shared by the asynchronous factories.
+ *
+ * Preparation does real network work, so it can both reject and - when a
+ * request gets a 401 and the session's own refresh then fails definitively -
+ * destroy the session underneath us.
+ *
+ * A session destroyed during preparation is fatal rather than recoverable. The
+ * hooks are still disarmed at that point, so the session's `expired` event was
+ * swallowed and nothing will ever tell the reducer to log the account out;
+ * returning the bundle anyway would leave the app looking signed in over a
+ * session that can only make unauthenticated requests. Failing instead matches
+ * what `CredentialSession.resumeSession` did on a revoked token, and every
+ * caller already handles a rejected factory. Checking `destroyed` first also
+ * keeps `PasswordSession`'s `Logged out` getter throw from escaping as the
+ * opaque rejection a caller would surface, so `snapshot` only ever runs against
+ * a live session.
+ *
+ * Both failure modes dispose: the bundle is fully built by this point, and a
+ * still-live session left behind would keep its refresh and dispatch paths
+ * alive with nothing tracking it. (Disposal is a no-op for the destroyed case,
+ * where the session already refuses to refresh and the bridge agent already
+ * reads as logged out - but the two paths are indistinguishable to the caller,
+ * so both go through it.)
+ */
+export async function finishPreparation<T>(
+  bundle: SessionBundle,
+  preparation: Promise<unknown>,
+  snapshot: () => T,
+): Promise<T> {
+  try {
+    await preparation
+    if (bundle.session.destroyed) {
+      throw new Error('Session was revoked while it was being prepared')
+    }
+    return snapshot()
+  } catch (e) {
+    disposeBundle(bundle)
+    throw e
+  }
+}
+
+/**
+ * Resume a stored account into a {@link SessionBundle}. Expired sessions take a
+ * network resume; still-valid stored tokens take a synchronous no-network fast
+ * path. Hooks are armed only after the prepare tail resolves.
+ */
+export async function createSessionBundleAndResume(
+  storedAccount: SessionAccount,
+  onSessionChange: OnSessionChange,
+): Promise<{account: SessionAccount; bundle: SessionBundle}> {
+  const gates = features.refresh({strategy: 'prefer-low-latency'})
+  let bundle!: SessionBundle
+  const hooks = makeSessionHooks({
+    onSessionChange,
+    getBundle: () => bundle,
+    getDid: () => storedAccount.did,
+  })
+
+  let session: PasswordSession
+  const sessionData = sessionAccountToSessionData(storedAccount)
+  if (isSessionExpired(storedAccount)) {
+    /*
+     * The arm latch swallows resume's initial onUpdated event.
+     *
+     * There is deliberately no network retry here: `resume` rejects only when
+     * the session is definitively invalid, and it swallows everything else -
+     * a failed refresh reports through `onUpdateFailure` and resolves with the
+     * stale tokens. So an offline cold start now stays signed in with dead
+     * tokens (requests fail until connectivity returns) rather than throwing
+     * the way the old `CredentialSession.resumeSession` did, and retrying a
+     * definitive rejection would only repeat a request that cannot succeed.
+     */
+    session = await PasswordSession.resume(sessionData, hooks)
+  } else {
+    // Sync fast path: trust the stored tokens, no network.
+    session = new PasswordSession(sessionData, hooks)
+  }
+
+  bundle = buildBundle(session, storedAccount.pdsUrl)
+  registerBundleKillSwitch(bundle, hooks.kill)
+  // The returned account is captured again after asynchronous preparation.
+  const earlyAccount =
+    sessionDataToSessionAccount(
+      session.session,
+      session.session.service,
+      storedAccount.pdsUrl,
+    ) ?? storedAccount
+
+  configureModerationForAccount(bundle.agent, earlyAccount)
+  const aa = prefetchAgeAssuranceServerData({agent: bundle.agent})
+
+  /*
+   * The proxy header is applied after the PDS-targeting setup above, so those
+   * calls run without it.
+   */
+  bundle.agent.configureProxy(BLUESKY_PROXY_HEADER.get())
+
+  // Preparation may auto-refresh the session while hooks are still disarmed.
+  const account = await finishPreparation(
+    bundle,
+    Promise.all([gates, aa]),
+    () =>
+      sessionDataToSessionAccount(
+        session.session,
+        session.session.service,
+        storedAccount.pdsUrl,
+      ) ?? storedAccount,
+  )
+  hooks.arm()
+  return {account, bundle}
+}
+
+/**
+ * Log in with credentials and build a {@link SessionBundle}.
+ */
+export async function createSessionBundleAndLogin(
+  {
+    service,
+    identifier,
+    password,
+    authFactorToken,
+  }: {
+    service: string
+    identifier: string
+    password: string
+    authFactorToken?: string
+  },
+  onSessionChange: OnSessionChange,
+): Promise<{account: SessionAccount; bundle: SessionBundle}> {
+  let bundle!: SessionBundle
+  let accountDid = ''
+  const hooks = makeSessionHooks({
+    onSessionChange,
+    getBundle: () => bundle,
+    getDid: () => accountDid,
+  })
+
+  const session = await PasswordSession.login({
+    ...hooks,
+    service,
+    identifier,
+    password,
+    authFactorToken,
+    allowTakendown: true,
+  })
+
+  bundle = buildBundle(session)
+  registerBundleKillSwitch(bundle, hooks.kill)
+  // Seed the hook's did before it is armed.
+  const earlyAccount = sessionDataToSessionAccountOrThrow(session)
+  accountDid = earlyAccount.did
+
+  const gates = features.refresh({strategy: 'prefer-fresh-gates'})
+  configureModerationForAccount(bundle.agent, earlyAccount)
+  const aa = prefetchAgeAssuranceServerData({agent: bundle.agent})
+
+  bundle.agent.configureProxy(BLUESKY_PROXY_HEADER.get())
+
+  // Preparation may auto-refresh the session while hooks are still disarmed.
+  const account = await finishPreparation(
+    bundle,
+    Promise.all([gates, aa]),
+    () => sessionDataToSessionAccountOrThrow(session),
+  )
+  hooks.arm()
+  return {account, bundle}
+}
+
+/**
+ * Rebuild a bundle synchronously from stored tokens. The optional guard runs
+ * after construction but before hooks are armed; rejected bundles are disposed.
+ */
+export function createSessionBundleFromStoredAccount(
+  storedAccount: SessionAccount,
+  onSessionChange: OnSessionChange,
+  shouldActivate: (
+    bundle: SessionBundle,
+    account: SessionAccount,
+  ) => boolean = () => true,
+): {account: SessionAccount; bundle: SessionBundle} | undefined {
+  let bundle!: SessionBundle
+  const hooks = makeSessionHooks({
+    onSessionChange,
+    getBundle: () => bundle,
+    getDid: () => storedAccount.did,
+  })
+  const session = new PasswordSession(
+    sessionAccountToSessionData(storedAccount),
+    hooks,
+  )
+  bundle = buildBundle(session, storedAccount.pdsUrl)
+  registerBundleKillSwitch(bundle, hooks.kill)
+  configureModerationForAccount(bundle.agent, storedAccount)
+  bundle.agent.configureProxy(BLUESKY_PROXY_HEADER.get())
+
+  const account = session.destroyed
+    ? storedAccount
+    : (sessionDataToSessionAccount(
+        session.session,
+        session.session.service,
+        storedAccount.pdsUrl,
+      ) ?? storedAccount)
+  if (!shouldActivate(bundle, account)) {
+    disposeBundle(bundle)
+    return undefined
+  }
+  hooks.arm()
+  return {account, bundle}
+}
+
+export function sessionDataToSessionAccountOrThrow(
+  session: PasswordSession,
+): SessionAccount {
+  const account = sessionDataToSessionAccount(
+    session.session,
+    session.session.service,
+  )
+  if (!account) {
+    throw Error('Expected an active session')
+  }
+  return account
+}
+
+/**
+ * Disable a replaced bundle without revoking its server session. PasswordSession
+ * has no local destroy operation, so the registered lifecycle closure disables
+ * its fetch and hooks instead.
+ */
+export function disposeBundle(bundle: SessionBundle | PublicSessionBundle) {
+  const session = bundle.session
+  if (!session || session.destroyed) {
+    return
+  }
+  bundleKillSwitches.get(bundle)?.()
+}
diff --git a/src/state/session/session-data.ts b/src/state/session/session-data.ts
new file mode 100644
index 0000000000..2fab1cbd99
--- /dev/null
+++ b/src/state/session/session-data.ts
@@ -0,0 +1,107 @@
+import {type AtpSessionData} from '@atproto/api'
+import {getPdsEndpoint, isValidDidDoc} from '@atproto/common-web'
+import {type SessionData} from '@atproto/lex-password-session'
+import {jwtDecode} from 'jwt-decode'
+
+import {BSKY_SERVICE} from '#/lib/constants'
+import {isJwtExpired} from '#/lib/jwt'
+import {hasProp} from '#/lib/type-guards'
+import {type SessionAccount} from './types'
+
+/** Whether an access token was issued for a queued (waitlisted) signup. */
+export function isSignupQueued(accessJwt: string | undefined) {
+  if (accessJwt) {
+    const sessData = jwtDecode(accessJwt)
+    return (
+      hasProp(sessData, 'scope') &&
+      sessData.scope === 'com.atproto.signupQueued'
+    )
+  }
+  return false
+}
+
+/**
+ * Convert live `PasswordSession` session data into the persisted
+ * `SessionAccount` snapshot.
+ *
+ * The object literal's field order is load-bearing: the reducer's
+ * `JSON.stringify` fast path and the session test snapshots depend on
+ * byte-stable serialization. `service` and `pdsUrl` are normalized through
+ * `new URL().toString()` for a stable trailing slash.
+ *
+ * `pdsUrl` comes from the DID document or a pre-refresh stored value. It does
+ * not fall back to the login service.
+ */
+export function sessionDataToSessionAccount(
+  session: SessionData | null | undefined,
+  service: string,
+  storedPdsUrl?: string,
+): SessionAccount | undefined {
+  if (!session) {
+    return undefined
+  }
+  const normalizedService = new URL(service).toString()
+  const didDocPdsUrl =
+    session.didDoc && isValidDidDoc(session.didDoc)
+      ? getPdsEndpoint(session.didDoc)
+      : undefined
+  const pdsUrl = didDocPdsUrl ?? storedPdsUrl
+  return {
+    service: normalizedService,
+    did: session.did,
+    handle: session.handle,
+    email: session.email,
+    emailConfirmed: session.emailConfirmed || false,
+    emailAuthFactor: session.emailAuthFactor || false,
+    refreshJwt: session.refreshJwt,
+    accessJwt: session.accessJwt,
+    signupQueued: isSignupQueued(session.accessJwt),
+    active: session.active,
+    status: session.status,
+    pdsUrl: pdsUrl ? new URL(pdsUrl).toString() : undefined,
+    isSelfHosted: !normalizedService.startsWith(BSKY_SERVICE),
+  }
+}
+
+/** Convert a persisted account into data suitable for `PasswordSession`. */
+export function sessionAccountToSessionData(
+  account: SessionAccount,
+): SessionData {
+  return {
+    accessJwt: account.accessJwt ?? '',
+    active: account.active ?? true,
+    did: account.did as SessionData['did'],
+    email: account.email,
+    emailAuthFactor: account.emailAuthFactor,
+    emailConfirmed: account.emailConfirmed,
+    handle: account.handle as SessionData['handle'],
+    refreshJwt: account.refreshJwt ?? '',
+    status: account.status,
+    service: account.service,
+  }
+}
+
+/** Convert a persisted account into data suitable for `AtpAgent`. */
+export function sessionAccountToSession(
+  account: SessionAccount,
+): AtpSessionData {
+  return {
+    // Sorted in the same property order as when returned by BskyAgent (alphabetical).
+    accessJwt: account.accessJwt ?? '',
+    did: account.did,
+    email: account.email,
+    emailAuthFactor: account.emailAuthFactor,
+    emailConfirmed: account.emailConfirmed,
+    handle: account.handle,
+    refreshJwt: account.refreshJwt ?? '',
+    /**
+     * @see https://github.com/bluesky-social/atproto/blob/c5d36d5ba2a2c2a5c4f366a5621c06a5608e361e/packages/api/src/agent.ts#L188
+     */
+    active: account.active ?? true,
+    status: account.status,
+  }
+}
+
+export function isSessionExpired(account: SessionAccount) {
+  return account.accessJwt ? isJwtExpired(account.accessJwt) : true
+}
diff --git a/src/state/session/types.ts b/src/state/session/types.ts
index 8a9afba42c..ca1bca62f1 100644
--- a/src/state/session/types.ts
+++ b/src/state/session/types.ts
@@ -3,6 +3,9 @@ import {type Metrics} from '#/analytics/metrics'
 
 export type SessionAccount = PersistedAccount
 
+/** Session-change events understood by the reducer and logging hooks. */
+export type AtpSessionEvent = 'update' | 'expired' | 'network-error'
+
 export type SessionStateContext = {
   accounts: SessionAccount[]
   currentAccount: SessionAccount | undefined
@@ -44,11 +47,9 @@ export type SessionApiContext = {
   ) => Promise<void>
   removeAccount: (account: SessionAccount) => void
   /**
-   * Calls `getSession` and updates select fields on the current account and
-   * `BskyAgent`. This is an alternative to `resumeSession`, which updates
-   * current account/agent using the `persistSessionHandler`, but is more load
-   * bearing. This patches in updates without causing any side effects via
-   * `persistSessionHandler`.
+   * Calls `getSession` and patches the email fields of the current account.
+   * Unlike `resumeSession`, this does not rotate tokens or rebuild the session,
+   * so it produces no session-change side effects.
    */
   partialRefreshSession: () => Promise<void>
 }
diff --git a/src/state/session/util.ts b/src/state/session/util.ts
index ea6d817f36..af1c2846c7 100644
--- a/src/state/session/util.ts
+++ b/src/state/session/util.ts
@@ -1,36 +1,16 @@
 import AtpAgent from '@atproto/api'
-import {jwtDecode} from 'jwt-decode'
 
-import {isJwtExpired} from '#/lib/jwt'
-import {hasProp} from '#/lib/type-guards'
 import * as persisted from '#/state/persisted'
-import {sessionAccountToSession} from './agent'
+import {sessionAccountToSession} from './session-data'
 import {type SessionAccount} from './types'
 
+export {isSessionExpired, isSignupQueued} from './session-data'
+
 export function readLastActiveAccount() {
   const {currentAccount, accounts} = persisted.get('session')
   return accounts.find(a => a.did === currentAccount?.did)
 }
 
-export function isSignupQueued(accessJwt: string | undefined) {
-  if (accessJwt) {
-    const sessData = jwtDecode(accessJwt)
-    return (
-      hasProp(sessData, 'scope') &&
-      sessData.scope === 'com.atproto.signupQueued'
-    )
-  }
-  return false
-}
-
-export function isSessionExpired(account: SessionAccount) {
-  if (account.accessJwt) {
-    return isJwtExpired(account.accessJwt)
-  } else {
-    return true
-  }
-}
-
 /**
  * Creates and attempted to resumeSession for every stored session.
  * Intended to be used to send push token revokations just before logout.
diff --git a/src/storage/schema.ts b/src/storage/schema.ts
index 2f4424792d..53b4ffb022 100644
--- a/src/storage/schema.ts
+++ b/src/storage/schema.ts
@@ -108,4 +108,15 @@ export type Account = {
    * account after a switch, until that account's preferences loaded.
    */
   isBetaUser?: boolean
+
+  /**
+   * The account's subscribed labeler DIDs, cached from preferences so the
+   * `atproto-accept-labelers` header can be configured synchronously at
+   * session start, before preferences load. Eventually consistent: rewritten
+   * on every preferences fetch (see `saveLabelers` in
+   * `#/state/session/moderation`). Until the first fetch lands there is
+   * simply no cache entry and initial requests go out without per-account
+   * labeler headers.
+   */
+  labelers?: string[]
 }
diff --git a/src/view/com/composer/drafts/state/api.ts b/src/view/com/composer/drafts/state/api.ts
index 12ed4acf5a..b8fddc618f 100644
--- a/src/view/com/composer/drafts/state/api.ts
+++ b/src/view/com/composer/drafts/state/api.ts
@@ -11,7 +11,7 @@ import {mimeToExt} from '#/lib/media/video/util'
 import {shortenLinks} from '#/lib/strings/rich-text-manip'
 import {type ComposerImage} from '#/state/gallery'
 import {threadgateAllowUISettingToAllowRecordValue} from '#/state/queries/threadgate/util'
-import {createPublicAgent} from '#/state/session/agent'
+import {createPublicAgent} from '#/state/session/bridge-agent'
 import {
   type ComposerState,
   type EmbedDraft,

From 532681d5c0f4c53c35908e53ebff2b07ba4380e8 Mon Sep 17 00:00:00 2001
From: Samuel Newman <mozzius@protonmail.com>
Date: Thu, 13 Aug 2026 22:26:12 +0300
Subject: [PATCH 03/32] [SDK] Add lexicon codegen pipeline (`@atproto/lex`)
 (#11346)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
---
 .github/workflows/lint.yml                    |    9 +-
 .gitignore                                    |    3 +
 .oxlintrc.json                                |    1 +
 .prettierignore                               |    1 +
 lexicons.json                                 | 1332 +++++++++++++++++
 lexicons/app/bsky/actor/defs.json             |  994 ++++++++++++
 lexicons/app/bsky/actor/getPreferences.json   |   30 +
 lexicons/app/bsky/actor/getProfile.json       |   31 +
 lexicons/app/bsky/actor/getProfiles.json      |   45 +
 lexicons/app/bsky/actor/getSuggestions.json   |   54 +
 lexicons/app/bsky/actor/profile.json          |   75 +
 lexicons/app/bsky/actor/putPreferences.json   |   26 +
 lexicons/app/bsky/actor/searchActors.json     |   54 +
 .../app/bsky/actor/searchActorsTypeahead.json |   48 +
 lexicons/app/bsky/actor/status.json           |   48 +
 lexicons/app/bsky/ageassurance/begin.json     |   61 +
 lexicons/app/bsky/ageassurance/defs.json      |  333 +++++
 lexicons/app/bsky/ageassurance/getConfig.json |   18 +
 lexicons/app/bsky/ageassurance/getState.json  |   45 +
 .../app/bsky/bookmark/createBookmark.json     |   37 +
 lexicons/app/bsky/bookmark/defs.json          |   47 +
 .../app/bsky/bookmark/deleteBookmark.json     |   32 +
 lexicons/app/bsky/bookmark/getBookmarks.json  |   46 +
 lexicons/app/bsky/contact/defs.json           |   67 +
 lexicons/app/bsky/contact/dismissMatch.json   |   42 +
 lexicons/app/bsky/contact/getMatches.json     |   60 +
 lexicons/app/bsky/contact/getSyncStatus.json  |   36 +
 lexicons/app/bsky/contact/importContacts.json |   72 +
 lexicons/app/bsky/contact/removeData.json     |   33 +
 .../app/bsky/contact/sendNotification.json    |   40 +
 .../bsky/contact/startPhoneVerification.json  |   47 +
 lexicons/app/bsky/contact/verifyPhone.json    |   63 +
 lexicons/app/bsky/draft/createDraft.json      |   48 +
 lexicons/app/bsky/draft/defs.json             |  296 ++++
 lexicons/app/bsky/draft/deleteDraft.json      |   26 +
 lexicons/app/bsky/draft/getDrafts.json        |   46 +
 lexicons/app/bsky/draft/updateDraft.json      |   26 +
 lexicons/app/bsky/embed/defs.json             |   25 +
 lexicons/app/bsky/embed/external.json         |  210 +++
 lexicons/app/bsky/embed/gallery.json          |   99 ++
 .../app/bsky/embed/getEmbedExternalView.json  |   62 +
 lexicons/app/bsky/embed/images.json           |   93 ++
 lexicons/app/bsky/embed/record.json           |  162 ++
 lexicons/app/bsky/embed/recordWithMedia.json  |   52 +
 lexicons/app/bsky/embed/video.json            |  108 ++
 lexicons/app/bsky/feed/defs.json              |  545 +++++++
 .../app/bsky/feed/describeFeedGenerator.json  |   61 +
 lexicons/app/bsky/feed/generator.json         |   73 +
 lexicons/app/bsky/feed/getActorFeeds.json     |   53 +
 lexicons/app/bsky/feed/getActorLikes.json     |   61 +
 lexicons/app/bsky/feed/getAuthorFeed.json     |   77 +
 lexicons/app/bsky/feed/getFeed.json           |   58 +
 lexicons/app/bsky/feed/getFeedGenerator.json  |   49 +
 lexicons/app/bsky/feed/getFeedGenerators.json |   44 +
 lexicons/app/bsky/feed/getFeedSkeleton.json   |   64 +
 lexicons/app/bsky/feed/getLikes.json          |   90 ++
 lexicons/app/bsky/feed/getListFeed.json       |   59 +
 lexicons/app/bsky/feed/getPostThread.json     |   66 +
 lexicons/app/bsky/feed/getPosts.json          |   46 +
 lexicons/app/bsky/feed/getQuotes.json         |   68 +
 lexicons/app/bsky/feed/getRepostedBy.json     |   68 +
 lexicons/app/bsky/feed/getSuggestedFeeds.json |   46 +
 lexicons/app/bsky/feed/getTimeline.json       |   50 +
 lexicons/app/bsky/feed/like.json              |   33 +
 lexicons/app/bsky/feed/post.json              |  146 ++
 lexicons/app/bsky/feed/postgate.json          |   55 +
 lexicons/app/bsky/feed/repost.json            |   33 +
 lexicons/app/bsky/feed/searchPosts.json       |  113 ++
 lexicons/app/bsky/feed/searchPostsV2.json     |  251 ++++
 lexicons/app/bsky/feed/sendInteractions.json  |   40 +
 lexicons/app/bsky/feed/threadgate.json        |   81 +
 lexicons/app/bsky/graph/block.json            |   30 +
 lexicons/app/bsky/graph/defs.json             |  353 +++++
 lexicons/app/bsky/graph/follow.json           |   33 +
 .../app/bsky/graph/getActorStarterPacks.json  |   53 +
 lexicons/app/bsky/graph/getBlocks.json        |   46 +
 lexicons/app/bsky/graph/getFollowers.json     |   66 +
 lexicons/app/bsky/graph/getFollows.json       |   66 +
 .../app/bsky/graph/getKnownFollowers.json     |   58 +
 lexicons/app/bsky/graph/getList.json          |   59 +
 lexicons/app/bsky/graph/getListBlocks.json    |   46 +
 lexicons/app/bsky/graph/getListMutes.json     |   46 +
 lexicons/app/bsky/graph/getLists.json         |   65 +
 .../bsky/graph/getListsWithMembership.json    |   82 +
 lexicons/app/bsky/graph/getMutes.json         |   46 +
 lexicons/app/bsky/graph/getRelationships.json |   64 +
 lexicons/app/bsky/graph/getStarterPack.json   |   39 +
 lexicons/app/bsky/graph/getStarterPacks.json  |   45 +
 .../graph/getStarterPacksWithMembership.json  |   71 +
 .../graph/getSuggestedFollowsByActor.json     |   54 +
 lexicons/app/bsky/graph/list.json             |   63 +
 lexicons/app/bsky/graph/listblock.json        |   30 +
 lexicons/app/bsky/graph/listitem.json         |   36 +
 lexicons/app/bsky/graph/muteActor.json        |   34 +
 lexicons/app/bsky/graph/muteActorList.json    |   26 +
 lexicons/app/bsky/graph/muteThread.json       |   26 +
 .../app/bsky/graph/searchStarterPacks.json    |   53 +
 .../app/bsky/graph/searchStarterPacksV2.json  |   57 +
 lexicons/app/bsky/graph/starterpack.json      |   70 +
 lexicons/app/bsky/graph/unmuteActor.json      |   26 +
 lexicons/app/bsky/graph/unmuteActorList.json  |   26 +
 lexicons/app/bsky/graph/unmuteThread.json     |   26 +
 lexicons/app/bsky/graph/verification.json     |   42 +
 lexicons/app/bsky/labeler/defs.json           |  153 ++
 lexicons/app/bsky/labeler/getServices.json    |   51 +
 lexicons/app/bsky/labeler/service.json        |   59 +
 .../app/bsky/notification/declaration.json    |   29 +
 lexicons/app/bsky/notification/defs.json      |  175 +++
 .../app/bsky/notification/getPreferences.json |   30 +
 .../app/bsky/notification/getUnreadCount.json |   37 +
 .../listActivitySubscriptions.json            |   46 +
 .../bsky/notification/listNotifications.json  |  139 ++
 .../notification/putActivitySubscription.json |   50 +
 .../app/bsky/notification/putPreferences.json |   25 +
 .../bsky/notification/putPreferencesV2.json   |   87 ++
 .../app/bsky/notification/registerPush.json   |   47 +
 .../app/bsky/notification/unregisterPush.json |   43 +
 .../app/bsky/notification/updateSeen.json     |   26 +
 lexicons/app/bsky/richtext/facet.json         |   90 ++
 lexicons/app/bsky/unspecced/defs.json         |  259 ++++
 .../bsky/unspecced/getAgeAssuranceState.json  |   17 +
 lexicons/app/bsky/unspecced/getConfig.json    |   45 +
 .../getOnboardingSuggestedStarterPacks.json   |   37 +
 .../unspecced/getPopularFeedGenerators.json   |   46 +
 .../bsky/unspecced/getPostThreadOtherV2.json  |   56 +
 .../app/bsky/unspecced/getPostThreadV2.json   |   94 ++
 .../app/bsky/unspecced/getSuggestedFeeds.json |   37 +
 .../unspecced/getSuggestedFeedsSkeleton.json  |   42 +
 .../getSuggestedOnboardingUsers.json          |   49 +
 .../unspecced/getSuggestedStarterPacks.json   |   37 +
 .../getSuggestedStarterPacksSkeleton.json     |   42 +
 .../app/bsky/unspecced/getSuggestedUsers.json |   49 +
 .../getSuggestedUsersForDiscover.json         |   41 +
 .../getSuggestedUsersForExplore.json          |   45 +
 .../getSuggestedUsersForSeeMore.json          |   45 +
 .../unspecced/getSuggestedUsersSkeleton.json  |   54 +
 .../unspecced/getSuggestionsSkeleton.json     |   66 +
 .../bsky/unspecced/getTaggedSuggestions.json  |   47 +
 .../app/bsky/unspecced/getTrendingTopics.json |   49 +
 lexicons/app/bsky/unspecced/getTrends.json    |   41 +
 .../app/bsky/unspecced/getTrendsSkeleton.json |   42 +
 .../app/bsky/unspecced/initAgeAssurance.json  |   49 +
 .../bsky/unspecced/searchActorsSkeleton.json  |   67 +
 .../bsky/unspecced/searchPostsSkeleton.json   |  110 ++
 .../unspecced/searchStarterPacksSkeleton.json |   63 +
 lexicons/app/bsky/video/defs.json             |   58 +
 lexicons/app/bsky/video/getJobStatus.json     |   37 +
 lexicons/app/bsky/video/getUploadLimits.json  |   37 +
 lexicons/app/bsky/video/uploadVideo.json      |   29 +
 lexicons/chat/bsky/actor/declaration.json     |   37 +
 lexicons/chat/bsky/actor/defs.json            |  105 ++
 lexicons/chat/bsky/actor/deleteAccount.json   |   17 +
 .../chat/bsky/actor/exportAccountData.json    |   13 +
 lexicons/chat/bsky/actor/getStatus.json       |   36 +
 lexicons/chat/bsky/convo/acceptConvo.json     |   42 +
 lexicons/chat/bsky/convo/addReaction.json     |   73 +
 lexicons/chat/bsky/convo/defs.json            | 1312 ++++++++++++++++
 .../chat/bsky/convo/deleteMessageForSelf.json |   45 +
 lexicons/chat/bsky/convo/getConvo.json        |   42 +
 .../chat/bsky/convo/getConvoAvailability.json |   46 +
 .../chat/bsky/convo/getConvoForMembers.json   |   63 +
 lexicons/chat/bsky/convo/getConvoMembers.json |   57 +
 lexicons/chat/bsky/convo/getLog.json          |   71 +
 lexicons/chat/bsky/convo/getMessages.json     |   69 +
 lexicons/chat/bsky/convo/getUnreadCounts.json |   41 +
 lexicons/chat/bsky/convo/leaveConvo.json      |   52 +
 .../chat/bsky/convo/listConvoRequests.json    |   49 +
 lexicons/chat/bsky/convo/listConvos.json      |   77 +
 lexicons/chat/bsky/convo/lockConvo.json       |   51 +
 lexicons/chat/bsky/convo/muteConvo.json       |   45 +
 lexicons/chat/bsky/convo/removeReaction.json  |   69 +
 lexicons/chat/bsky/convo/sendMessage.json     |   48 +
 .../chat/bsky/convo/sendMessageBatch.json     |   75 +
 lexicons/chat/bsky/convo/unlockConvo.json     |   51 +
 lexicons/chat/bsky/convo/unmuteConvo.json     |   45 +
 lexicons/chat/bsky/convo/updateAllRead.json   |   41 +
 lexicons/chat/bsky/convo/updateRead.json      |   48 +
 lexicons/chat/bsky/embed/joinLink.json        |   36 +
 lexicons/chat/bsky/group/addMembers.json      |   88 ++
 .../chat/bsky/group/approveJoinRequest.json   |   56 +
 lexicons/chat/bsky/group/createGroup.json     |   76 +
 lexicons/chat/bsky/group/createJoinLink.json  |   60 +
 lexicons/chat/bsky/group/defs.json            |  192 +++
 lexicons/chat/bsky/group/disableJoinLink.json |   51 +
 lexicons/chat/bsky/group/editGroup.json       |   58 +
 lexicons/chat/bsky/group/editJoinLink.json    |   58 +
 lexicons/chat/bsky/group/enableJoinLink.json  |   54 +
 .../chat/bsky/group/getJoinLinkPreviews.json  |   49 +
 .../chat/bsky/group/listJoinRequests.json     |   60 +
 .../chat/bsky/group/listMutualGroups.json     |   53 +
 .../chat/bsky/group/rejectJoinRequest.json    |   46 +
 lexicons/chat/bsky/group/removeMembers.json   |   57 +
 lexicons/chat/bsky/group/requestJoin.json     |   68 +
 .../bsky/group/updateJoinRequestsRead.json    |   41 +
 .../chat/bsky/group/withdrawJoinRequest.json  |   38 +
 lexicons/chat/bsky/moderation/defs.json       |   81 +
 .../bsky/moderation/getActorMetadata.json     |   70 +
 lexicons/chat/bsky/moderation/getConvo.json   |   42 +
 .../chat/bsky/moderation/getConvoMembers.json |   57 +
 lexicons/chat/bsky/moderation/getConvos.json  |   45 +
 .../bsky/moderation/getMessageContext.json    |   63 +
 .../bsky/moderation/subscribeModEvents.json   |  675 +++++++++
 .../bsky/moderation/updateActorAccess.json    |   32 +
 lexicons/chat/bsky/notification/defs.json     |   43 +
 .../bsky/notification/getPreferences.json     |   26 +
 .../bsky/notification/putPreferences.json     |   42 +
 lexicons/com/atproto/admin/defs.json          |  132 ++
 lexicons/com/atproto/admin/deleteAccount.json |   26 +
 .../atproto/admin/disableAccountInvites.json  |   30 +
 .../com/atproto/admin/disableInviteCodes.json |   31 +
 .../atproto/admin/enableAccountInvites.json   |   30 +
 .../com/atproto/admin/getAccountInfo.json     |   30 +
 .../com/atproto/admin/getAccountInfos.json    |   44 +
 .../com/atproto/admin/getInviteCodes.json     |   54 +
 .../com/atproto/admin/getSubjectStatus.json   |   55 +
 .../com/atproto/admin/searchAccounts.json     |   49 +
 lexicons/com/atproto/admin/sendEmail.json     |   56 +
 .../com/atproto/admin/updateAccountEmail.json |   31 +
 .../atproto/admin/updateAccountHandle.json    |   31 +
 .../atproto/admin/updateAccountPassword.json  |   30 +
 .../admin/updateAccountSigningKey.json        |   32 +
 .../atproto/admin/updateSubjectStatus.json    |   61 +
 lexicons/com/atproto/identity/defs.json       |   30 +
 .../getRecommendedDidCredentials.json         |   38 +
 .../com/atproto/identity/refreshIdentity.json |   47 +
 .../requestPlcOperationSignature.json         |   11 +
 lexicons/com/atproto/identity/resolveDid.json |   49 +
 .../com/atproto/identity/resolveHandle.json   |   45 +
 .../com/atproto/identity/resolveIdentity.json |   45 +
 .../atproto/identity/signPlcOperation.json    |   56 +
 .../atproto/identity/submitPlcOperation.json  |   25 +
 .../com/atproto/identity/updateHandle.json    |   27 +
 lexicons/com/atproto/label/defs.json          |  190 +++
 lexicons/com/atproto/label/queryLabels.json   |   64 +
 .../com/atproto/label/subscribeLabels.json    |   70 +
 .../com/atproto/lexicon/resolveLexicon.json   |   58 +
 lexicons/com/atproto/lexicon/schema.json      |   24 +
 .../com/atproto/moderation/createReport.json  |  104 ++
 lexicons/com/atproto/moderation/defs.json     |   96 ++
 lexicons/com/atproto/repo/applyWrites.json    |  196 +++
 lexicons/com/atproto/repo/createRecord.json   |   90 ++
 lexicons/com/atproto/repo/defs.json           |   24 +
 lexicons/com/atproto/repo/deleteRecord.json   |   66 +
 lexicons/com/atproto/repo/describeRepo.json   |   63 +
 lexicons/com/atproto/repo/getRecord.json      |   69 +
 lexicons/com/atproto/repo/importRepo.json     |   14 +
 .../com/atproto/repo/listMissingBlobs.json    |   63 +
 lexicons/com/atproto/repo/listRecords.json    |   86 ++
 lexicons/com/atproto/repo/putRecord.json      |   98 ++
 lexicons/com/atproto/repo/strongRef.json      |   25 +
 lexicons/com/atproto/repo/uploadBlob.json     |   28 +
 .../com/atproto/server/activateAccount.json   |   11 +
 .../atproto/server/checkAccountStatus.json    |   58 +
 lexicons/com/atproto/server/confirmEmail.json |   43 +
 .../com/atproto/server/createAccount.json     |  113 ++
 .../com/atproto/server/createAppPassword.json |   65 +
 .../com/atproto/server/createInviteCode.json  |   43 +
 .../com/atproto/server/createInviteCodes.json |   73 +
 .../com/atproto/server/createSession.json     |   97 ++
 .../com/atproto/server/deactivateAccount.json |   24 +
 lexicons/com/atproto/server/defs.json         |   64 +
 .../com/atproto/server/deleteAccount.json     |   42 +
 .../com/atproto/server/deleteSession.json     |   19 +
 .../com/atproto/server/describeServer.json    |   73 +
 .../atproto/server/getAccountInviteCodes.json |   48 +
 .../com/atproto/server/getServiceAuth.json    |   53 +
 lexicons/com/atproto/server/getSession.json   |   55 +
 .../com/atproto/server/listAppPasswords.json  |   53 +
 .../com/atproto/server/refreshSession.json    |   74 +
 .../atproto/server/requestAccountDelete.json  |   11 +
 .../server/requestEmailConfirmation.json      |   11 +
 .../atproto/server/requestEmailUpdate.json    |   25 +
 .../atproto/server/requestPasswordReset.json  |   25 +
 .../com/atproto/server/reserveSigningKey.json |   39 +
 .../com/atproto/server/resetPassword.json     |   37 +
 .../com/atproto/server/revokeAppPassword.json |   25 +
 lexicons/com/atproto/server/updateEmail.json  |   43 +
 lexicons/com/atproto/sync/defs.json           |   17 +
 lexicons/com/atproto/sync/getBlob.json        |   50 +
 lexicons/com/atproto/sync/getBlocks.json      |   52 +
 lexicons/com/atproto/sync/getCheckout.json    |   27 +
 lexicons/com/atproto/sync/getHead.json        |   44 +
 lexicons/com/atproto/sync/getHostStatus.json  |   54 +
 .../com/atproto/sync/getLatestCommit.json     |   58 +
 lexicons/com/atproto/sync/getRecord.json      |   55 +
 lexicons/com/atproto/sync/getRepo.json        |   46 +
 lexicons/com/atproto/sync/getRepoStatus.json  |   65 +
 lexicons/com/atproto/sync/listBlobs.json      |   73 +
 lexicons/com/atproto/sync/listHosts.json      |   70 +
 lexicons/com/atproto/sync/listRepos.json      |   84 ++
 .../atproto/sync/listReposByCollection.json   |   66 +
 lexicons/com/atproto/sync/notifyOfUpdate.json |   26 +
 lexicons/com/atproto/sync/requestCrawl.json   |   31 +
 lexicons/com/atproto/sync/subscribeRepos.json |  276 ++++
 .../atproto/temp/checkHandleAvailability.json |   88 ++
 .../com/atproto/temp/checkSignupQueue.json    |   22 +
 lexicons/com/germnetwork/declaration.json     |   75 +
 lexicons/tools/ozone/report/defs.json         |  212 +++
 package.json                                  |   14 +-
 pnpm-lock.yaml                                |  410 ++++-
 pnpm-workspace.yaml                           |    5 +-
 src/lib/strings/__tests__/errors.test.ts      |    2 +-
 src/lib/strings/errors.ts                     |    2 +-
 src/screens/Signup/state.ts                   |    2 +-
 304 files changed, 22682 insertions(+), 55 deletions(-)
 create mode 100644 lexicons.json
 create mode 100644 lexicons/app/bsky/actor/defs.json
 create mode 100644 lexicons/app/bsky/actor/getPreferences.json
 create mode 100644 lexicons/app/bsky/actor/getProfile.json
 create mode 100644 lexicons/app/bsky/actor/getProfiles.json
 create mode 100644 lexicons/app/bsky/actor/getSuggestions.json
 create mode 100644 lexicons/app/bsky/actor/profile.json
 create mode 100644 lexicons/app/bsky/actor/putPreferences.json
 create mode 100644 lexicons/app/bsky/actor/searchActors.json
 create mode 100644 lexicons/app/bsky/actor/searchActorsTypeahead.json
 create mode 100644 lexicons/app/bsky/actor/status.json
 create mode 100644 lexicons/app/bsky/ageassurance/begin.json
 create mode 100644 lexicons/app/bsky/ageassurance/defs.json
 create mode 100644 lexicons/app/bsky/ageassurance/getConfig.json
 create mode 100644 lexicons/app/bsky/ageassurance/getState.json
 create mode 100644 lexicons/app/bsky/bookmark/createBookmark.json
 create mode 100644 lexicons/app/bsky/bookmark/defs.json
 create mode 100644 lexicons/app/bsky/bookmark/deleteBookmark.json
 create mode 100644 lexicons/app/bsky/bookmark/getBookmarks.json
 create mode 100644 lexicons/app/bsky/contact/defs.json
 create mode 100644 lexicons/app/bsky/contact/dismissMatch.json
 create mode 100644 lexicons/app/bsky/contact/getMatches.json
 create mode 100644 lexicons/app/bsky/contact/getSyncStatus.json
 create mode 100644 lexicons/app/bsky/contact/importContacts.json
 create mode 100644 lexicons/app/bsky/contact/removeData.json
 create mode 100644 lexicons/app/bsky/contact/sendNotification.json
 create mode 100644 lexicons/app/bsky/contact/startPhoneVerification.json
 create mode 100644 lexicons/app/bsky/contact/verifyPhone.json
 create mode 100644 lexicons/app/bsky/draft/createDraft.json
 create mode 100644 lexicons/app/bsky/draft/defs.json
 create mode 100644 lexicons/app/bsky/draft/deleteDraft.json
 create mode 100644 lexicons/app/bsky/draft/getDrafts.json
 create mode 100644 lexicons/app/bsky/draft/updateDraft.json
 create mode 100644 lexicons/app/bsky/embed/defs.json
 create mode 100644 lexicons/app/bsky/embed/external.json
 create mode 100644 lexicons/app/bsky/embed/gallery.json
 create mode 100644 lexicons/app/bsky/embed/getEmbedExternalView.json
 create mode 100644 lexicons/app/bsky/embed/images.json
 create mode 100644 lexicons/app/bsky/embed/record.json
 create mode 100644 lexicons/app/bsky/embed/recordWithMedia.json
 create mode 100644 lexicons/app/bsky/embed/video.json
 create mode 100644 lexicons/app/bsky/feed/defs.json
 create mode 100644 lexicons/app/bsky/feed/describeFeedGenerator.json
 create mode 100644 lexicons/app/bsky/feed/generator.json
 create mode 100644 lexicons/app/bsky/feed/getActorFeeds.json
 create mode 100644 lexicons/app/bsky/feed/getActorLikes.json
 create mode 100644 lexicons/app/bsky/feed/getAuthorFeed.json
 create mode 100644 lexicons/app/bsky/feed/getFeed.json
 create mode 100644 lexicons/app/bsky/feed/getFeedGenerator.json
 create mode 100644 lexicons/app/bsky/feed/getFeedGenerators.json
 create mode 100644 lexicons/app/bsky/feed/getFeedSkeleton.json
 create mode 100644 lexicons/app/bsky/feed/getLikes.json
 create mode 100644 lexicons/app/bsky/feed/getListFeed.json
 create mode 100644 lexicons/app/bsky/feed/getPostThread.json
 create mode 100644 lexicons/app/bsky/feed/getPosts.json
 create mode 100644 lexicons/app/bsky/feed/getQuotes.json
 create mode 100644 lexicons/app/bsky/feed/getRepostedBy.json
 create mode 100644 lexicons/app/bsky/feed/getSuggestedFeeds.json
 create mode 100644 lexicons/app/bsky/feed/getTimeline.json
 create mode 100644 lexicons/app/bsky/feed/like.json
 create mode 100644 lexicons/app/bsky/feed/post.json
 create mode 100644 lexicons/app/bsky/feed/postgate.json
 create mode 100644 lexicons/app/bsky/feed/repost.json
 create mode 100644 lexicons/app/bsky/feed/searchPosts.json
 create mode 100644 lexicons/app/bsky/feed/searchPostsV2.json
 create mode 100644 lexicons/app/bsky/feed/sendInteractions.json
 create mode 100644 lexicons/app/bsky/feed/threadgate.json
 create mode 100644 lexicons/app/bsky/graph/block.json
 create mode 100644 lexicons/app/bsky/graph/defs.json
 create mode 100644 lexicons/app/bsky/graph/follow.json
 create mode 100644 lexicons/app/bsky/graph/getActorStarterPacks.json
 create mode 100644 lexicons/app/bsky/graph/getBlocks.json
 create mode 100644 lexicons/app/bsky/graph/getFollowers.json
 create mode 100644 lexicons/app/bsky/graph/getFollows.json
 create mode 100644 lexicons/app/bsky/graph/getKnownFollowers.json
 create mode 100644 lexicons/app/bsky/graph/getList.json
 create mode 100644 lexicons/app/bsky/graph/getListBlocks.json
 create mode 100644 lexicons/app/bsky/graph/getListMutes.json
 create mode 100644 lexicons/app/bsky/graph/getLists.json
 create mode 100644 lexicons/app/bsky/graph/getListsWithMembership.json
 create mode 100644 lexicons/app/bsky/graph/getMutes.json
 create mode 100644 lexicons/app/bsky/graph/getRelationships.json
 create mode 100644 lexicons/app/bsky/graph/getStarterPack.json
 create mode 100644 lexicons/app/bsky/graph/getStarterPacks.json
 create mode 100644 lexicons/app/bsky/graph/getStarterPacksWithMembership.json
 create mode 100644 lexicons/app/bsky/graph/getSuggestedFollowsByActor.json
 create mode 100644 lexicons/app/bsky/graph/list.json
 create mode 100644 lexicons/app/bsky/graph/listblock.json
 create mode 100644 lexicons/app/bsky/graph/listitem.json
 create mode 100644 lexicons/app/bsky/graph/muteActor.json
 create mode 100644 lexicons/app/bsky/graph/muteActorList.json
 create mode 100644 lexicons/app/bsky/graph/muteThread.json
 create mode 100644 lexicons/app/bsky/graph/searchStarterPacks.json
 create mode 100644 lexicons/app/bsky/graph/searchStarterPacksV2.json
 create mode 100644 lexicons/app/bsky/graph/starterpack.json
 create mode 100644 lexicons/app/bsky/graph/unmuteActor.json
 create mode 100644 lexicons/app/bsky/graph/unmuteActorList.json
 create mode 100644 lexicons/app/bsky/graph/unmuteThread.json
 create mode 100644 lexicons/app/bsky/graph/verification.json
 create mode 100644 lexicons/app/bsky/labeler/defs.json
 create mode 100644 lexicons/app/bsky/labeler/getServices.json
 create mode 100644 lexicons/app/bsky/labeler/service.json
 create mode 100644 lexicons/app/bsky/notification/declaration.json
 create mode 100644 lexicons/app/bsky/notification/defs.json
 create mode 100644 lexicons/app/bsky/notification/getPreferences.json
 create mode 100644 lexicons/app/bsky/notification/getUnreadCount.json
 create mode 100644 lexicons/app/bsky/notification/listActivitySubscriptions.json
 create mode 100644 lexicons/app/bsky/notification/listNotifications.json
 create mode 100644 lexicons/app/bsky/notification/putActivitySubscription.json
 create mode 100644 lexicons/app/bsky/notification/putPreferences.json
 create mode 100644 lexicons/app/bsky/notification/putPreferencesV2.json
 create mode 100644 lexicons/app/bsky/notification/registerPush.json
 create mode 100644 lexicons/app/bsky/notification/unregisterPush.json
 create mode 100644 lexicons/app/bsky/notification/updateSeen.json
 create mode 100644 lexicons/app/bsky/richtext/facet.json
 create mode 100644 lexicons/app/bsky/unspecced/defs.json
 create mode 100644 lexicons/app/bsky/unspecced/getAgeAssuranceState.json
 create mode 100644 lexicons/app/bsky/unspecced/getConfig.json
 create mode 100644 lexicons/app/bsky/unspecced/getOnboardingSuggestedStarterPacks.json
 create mode 100644 lexicons/app/bsky/unspecced/getPopularFeedGenerators.json
 create mode 100644 lexicons/app/bsky/unspecced/getPostThreadOtherV2.json
 create mode 100644 lexicons/app/bsky/unspecced/getPostThreadV2.json
 create mode 100644 lexicons/app/bsky/unspecced/getSuggestedFeeds.json
 create mode 100644 lexicons/app/bsky/unspecced/getSuggestedFeedsSkeleton.json
 create mode 100644 lexicons/app/bsky/unspecced/getSuggestedOnboardingUsers.json
 create mode 100644 lexicons/app/bsky/unspecced/getSuggestedStarterPacks.json
 create mode 100644 lexicons/app/bsky/unspecced/getSuggestedStarterPacksSkeleton.json
 create mode 100644 lexicons/app/bsky/unspecced/getSuggestedUsers.json
 create mode 100644 lexicons/app/bsky/unspecced/getSuggestedUsersForDiscover.json
 create mode 100644 lexicons/app/bsky/unspecced/getSuggestedUsersForExplore.json
 create mode 100644 lexicons/app/bsky/unspecced/getSuggestedUsersForSeeMore.json
 create mode 100644 lexicons/app/bsky/unspecced/getSuggestedUsersSkeleton.json
 create mode 100644 lexicons/app/bsky/unspecced/getSuggestionsSkeleton.json
 create mode 100644 lexicons/app/bsky/unspecced/getTaggedSuggestions.json
 create mode 100644 lexicons/app/bsky/unspecced/getTrendingTopics.json
 create mode 100644 lexicons/app/bsky/unspecced/getTrends.json
 create mode 100644 lexicons/app/bsky/unspecced/getTrendsSkeleton.json
 create mode 100644 lexicons/app/bsky/unspecced/initAgeAssurance.json
 create mode 100644 lexicons/app/bsky/unspecced/searchActorsSkeleton.json
 create mode 100644 lexicons/app/bsky/unspecced/searchPostsSkeleton.json
 create mode 100644 lexicons/app/bsky/unspecced/searchStarterPacksSkeleton.json
 create mode 100644 lexicons/app/bsky/video/defs.json
 create mode 100644 lexicons/app/bsky/video/getJobStatus.json
 create mode 100644 lexicons/app/bsky/video/getUploadLimits.json
 create mode 100644 lexicons/app/bsky/video/uploadVideo.json
 create mode 100644 lexicons/chat/bsky/actor/declaration.json
 create mode 100644 lexicons/chat/bsky/actor/defs.json
 create mode 100644 lexicons/chat/bsky/actor/deleteAccount.json
 create mode 100644 lexicons/chat/bsky/actor/exportAccountData.json
 create mode 100644 lexicons/chat/bsky/actor/getStatus.json
 create mode 100644 lexicons/chat/bsky/convo/acceptConvo.json
 create mode 100644 lexicons/chat/bsky/convo/addReaction.json
 create mode 100644 lexicons/chat/bsky/convo/defs.json
 create mode 100644 lexicons/chat/bsky/convo/deleteMessageForSelf.json
 create mode 100644 lexicons/chat/bsky/convo/getConvo.json
 create mode 100644 lexicons/chat/bsky/convo/getConvoAvailability.json
 create mode 100644 lexicons/chat/bsky/convo/getConvoForMembers.json
 create mode 100644 lexicons/chat/bsky/convo/getConvoMembers.json
 create mode 100644 lexicons/chat/bsky/convo/getLog.json
 create mode 100644 lexicons/chat/bsky/convo/getMessages.json
 create mode 100644 lexicons/chat/bsky/convo/getUnreadCounts.json
 create mode 100644 lexicons/chat/bsky/convo/leaveConvo.json
 create mode 100644 lexicons/chat/bsky/convo/listConvoRequests.json
 create mode 100644 lexicons/chat/bsky/convo/listConvos.json
 create mode 100644 lexicons/chat/bsky/convo/lockConvo.json
 create mode 100644 lexicons/chat/bsky/convo/muteConvo.json
 create mode 100644 lexicons/chat/bsky/convo/removeReaction.json
 create mode 100644 lexicons/chat/bsky/convo/sendMessage.json
 create mode 100644 lexicons/chat/bsky/convo/sendMessageBatch.json
 create mode 100644 lexicons/chat/bsky/convo/unlockConvo.json
 create mode 100644 lexicons/chat/bsky/convo/unmuteConvo.json
 create mode 100644 lexicons/chat/bsky/convo/updateAllRead.json
 create mode 100644 lexicons/chat/bsky/convo/updateRead.json
 create mode 100644 lexicons/chat/bsky/embed/joinLink.json
 create mode 100644 lexicons/chat/bsky/group/addMembers.json
 create mode 100644 lexicons/chat/bsky/group/approveJoinRequest.json
 create mode 100644 lexicons/chat/bsky/group/createGroup.json
 create mode 100644 lexicons/chat/bsky/group/createJoinLink.json
 create mode 100644 lexicons/chat/bsky/group/defs.json
 create mode 100644 lexicons/chat/bsky/group/disableJoinLink.json
 create mode 100644 lexicons/chat/bsky/group/editGroup.json
 create mode 100644 lexicons/chat/bsky/group/editJoinLink.json
 create mode 100644 lexicons/chat/bsky/group/enableJoinLink.json
 create mode 100644 lexicons/chat/bsky/group/getJoinLinkPreviews.json
 create mode 100644 lexicons/chat/bsky/group/listJoinRequests.json
 create mode 100644 lexicons/chat/bsky/group/listMutualGroups.json
 create mode 100644 lexicons/chat/bsky/group/rejectJoinRequest.json
 create mode 100644 lexicons/chat/bsky/group/removeMembers.json
 create mode 100644 lexicons/chat/bsky/group/requestJoin.json
 create mode 100644 lexicons/chat/bsky/group/updateJoinRequestsRead.json
 create mode 100644 lexicons/chat/bsky/group/withdrawJoinRequest.json
 create mode 100644 lexicons/chat/bsky/moderation/defs.json
 create mode 100644 lexicons/chat/bsky/moderation/getActorMetadata.json
 create mode 100644 lexicons/chat/bsky/moderation/getConvo.json
 create mode 100644 lexicons/chat/bsky/moderation/getConvoMembers.json
 create mode 100644 lexicons/chat/bsky/moderation/getConvos.json
 create mode 100644 lexicons/chat/bsky/moderation/getMessageContext.json
 create mode 100644 lexicons/chat/bsky/moderation/subscribeModEvents.json
 create mode 100644 lexicons/chat/bsky/moderation/updateActorAccess.json
 create mode 100644 lexicons/chat/bsky/notification/defs.json
 create mode 100644 lexicons/chat/bsky/notification/getPreferences.json
 create mode 100644 lexicons/chat/bsky/notification/putPreferences.json
 create mode 100644 lexicons/com/atproto/admin/defs.json
 create mode 100644 lexicons/com/atproto/admin/deleteAccount.json
 create mode 100644 lexicons/com/atproto/admin/disableAccountInvites.json
 create mode 100644 lexicons/com/atproto/admin/disableInviteCodes.json
 create mode 100644 lexicons/com/atproto/admin/enableAccountInvites.json
 create mode 100644 lexicons/com/atproto/admin/getAccountInfo.json
 create mode 100644 lexicons/com/atproto/admin/getAccountInfos.json
 create mode 100644 lexicons/com/atproto/admin/getInviteCodes.json
 create mode 100644 lexicons/com/atproto/admin/getSubjectStatus.json
 create mode 100644 lexicons/com/atproto/admin/searchAccounts.json
 create mode 100644 lexicons/com/atproto/admin/sendEmail.json
 create mode 100644 lexicons/com/atproto/admin/updateAccountEmail.json
 create mode 100644 lexicons/com/atproto/admin/updateAccountHandle.json
 create mode 100644 lexicons/com/atproto/admin/updateAccountPassword.json
 create mode 100644 lexicons/com/atproto/admin/updateAccountSigningKey.json
 create mode 100644 lexicons/com/atproto/admin/updateSubjectStatus.json
 create mode 100644 lexicons/com/atproto/identity/defs.json
 create mode 100644 lexicons/com/atproto/identity/getRecommendedDidCredentials.json
 create mode 100644 lexicons/com/atproto/identity/refreshIdentity.json
 create mode 100644 lexicons/com/atproto/identity/requestPlcOperationSignature.json
 create mode 100644 lexicons/com/atproto/identity/resolveDid.json
 create mode 100644 lexicons/com/atproto/identity/resolveHandle.json
 create mode 100644 lexicons/com/atproto/identity/resolveIdentity.json
 create mode 100644 lexicons/com/atproto/identity/signPlcOperation.json
 create mode 100644 lexicons/com/atproto/identity/submitPlcOperation.json
 create mode 100644 lexicons/com/atproto/identity/updateHandle.json
 create mode 100644 lexicons/com/atproto/label/defs.json
 create mode 100644 lexicons/com/atproto/label/queryLabels.json
 create mode 100644 lexicons/com/atproto/label/subscribeLabels.json
 create mode 100644 lexicons/com/atproto/lexicon/resolveLexicon.json
 create mode 100644 lexicons/com/atproto/lexicon/schema.json
 create mode 100644 lexicons/com/atproto/moderation/createReport.json
 create mode 100644 lexicons/com/atproto/moderation/defs.json
 create mode 100644 lexicons/com/atproto/repo/applyWrites.json
 create mode 100644 lexicons/com/atproto/repo/createRecord.json
 create mode 100644 lexicons/com/atproto/repo/defs.json
 create mode 100644 lexicons/com/atproto/repo/deleteRecord.json
 create mode 100644 lexicons/com/atproto/repo/describeRepo.json
 create mode 100644 lexicons/com/atproto/repo/getRecord.json
 create mode 100644 lexicons/com/atproto/repo/importRepo.json
 create mode 100644 lexicons/com/atproto/repo/listMissingBlobs.json
 create mode 100644 lexicons/com/atproto/repo/listRecords.json
 create mode 100644 lexicons/com/atproto/repo/putRecord.json
 create mode 100644 lexicons/com/atproto/repo/strongRef.json
 create mode 100644 lexicons/com/atproto/repo/uploadBlob.json
 create mode 100644 lexicons/com/atproto/server/activateAccount.json
 create mode 100644 lexicons/com/atproto/server/checkAccountStatus.json
 create mode 100644 lexicons/com/atproto/server/confirmEmail.json
 create mode 100644 lexicons/com/atproto/server/createAccount.json
 create mode 100644 lexicons/com/atproto/server/createAppPassword.json
 create mode 100644 lexicons/com/atproto/server/createInviteCode.json
 create mode 100644 lexicons/com/atproto/server/createInviteCodes.json
 create mode 100644 lexicons/com/atproto/server/createSession.json
 create mode 100644 lexicons/com/atproto/server/deactivateAccount.json
 create mode 100644 lexicons/com/atproto/server/defs.json
 create mode 100644 lexicons/com/atproto/server/deleteAccount.json
 create mode 100644 lexicons/com/atproto/server/deleteSession.json
 create mode 100644 lexicons/com/atproto/server/describeServer.json
 create mode 100644 lexicons/com/atproto/server/getAccountInviteCodes.json
 create mode 100644 lexicons/com/atproto/server/getServiceAuth.json
 create mode 100644 lexicons/com/atproto/server/getSession.json
 create mode 100644 lexicons/com/atproto/server/listAppPasswords.json
 create mode 100644 lexicons/com/atproto/server/refreshSession.json
 create mode 100644 lexicons/com/atproto/server/requestAccountDelete.json
 create mode 100644 lexicons/com/atproto/server/requestEmailConfirmation.json
 create mode 100644 lexicons/com/atproto/server/requestEmailUpdate.json
 create mode 100644 lexicons/com/atproto/server/requestPasswordReset.json
 create mode 100644 lexicons/com/atproto/server/reserveSigningKey.json
 create mode 100644 lexicons/com/atproto/server/resetPassword.json
 create mode 100644 lexicons/com/atproto/server/revokeAppPassword.json
 create mode 100644 lexicons/com/atproto/server/updateEmail.json
 create mode 100644 lexicons/com/atproto/sync/defs.json
 create mode 100644 lexicons/com/atproto/sync/getBlob.json
 create mode 100644 lexicons/com/atproto/sync/getBlocks.json
 create mode 100644 lexicons/com/atproto/sync/getCheckout.json
 create mode 100644 lexicons/com/atproto/sync/getHead.json
 create mode 100644 lexicons/com/atproto/sync/getHostStatus.json
 create mode 100644 lexicons/com/atproto/sync/getLatestCommit.json
 create mode 100644 lexicons/com/atproto/sync/getRecord.json
 create mode 100644 lexicons/com/atproto/sync/getRepo.json
 create mode 100644 lexicons/com/atproto/sync/getRepoStatus.json
 create mode 100644 lexicons/com/atproto/sync/listBlobs.json
 create mode 100644 lexicons/com/atproto/sync/listHosts.json
 create mode 100644 lexicons/com/atproto/sync/listRepos.json
 create mode 100644 lexicons/com/atproto/sync/listReposByCollection.json
 create mode 100644 lexicons/com/atproto/sync/notifyOfUpdate.json
 create mode 100644 lexicons/com/atproto/sync/requestCrawl.json
 create mode 100644 lexicons/com/atproto/sync/subscribeRepos.json
 create mode 100644 lexicons/com/atproto/temp/checkHandleAvailability.json
 create mode 100644 lexicons/com/atproto/temp/checkSignupQueue.json
 create mode 100644 lexicons/com/germnetwork/declaration.json
 create mode 100644 lexicons/tools/ozone/report/defs.json

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index f07079b5c0..e63de19c73 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -22,7 +22,14 @@ jobs:
       fail-fast: false
       matrix:
         job:
-          [lint, prettier, 'typecheck:ios', 'typecheck:android', 'typecheck:web']
+          [
+            lint,
+            prettier,
+            'lexicons:verify',
+            'typecheck:ios',
+            'typecheck:android',
+            'typecheck:web',
+          ]
     steps:
       - name: ⬇️ Check out Git repository
         uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
diff --git a/.gitignore b/.gitignore
index 8a38445859..a9d64c266c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -117,6 +117,9 @@ src/locale/locales/**/messages.js
 src/locale/locales/**/messages.mjs
 src/locale/locales/**/messages.ts
 
+# generated lexicon schemas (pnpm lexicons:generate)
+src/lexicons/
+
 # local builds
 *.apk
 *.aab
diff --git a/.oxlintrc.json b/.oxlintrc.json
index 63739f1f48..5868f74bb8 100644
--- a/.oxlintrc.json
+++ b/.oxlintrc.json
@@ -62,6 +62,7 @@
     "bskyogcard/**",
     "src/locale/locales/_build/**",
     "src/locale/locales/**/*.js",
+    "src/lexicons/**",
     "*.e2e.ts",
     "*.e2e.tsx",
     "eslint.config.mjs",
diff --git a/.prettierignore b/.prettierignore
index afc71dbac1..be1658124a 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -18,6 +18,7 @@
 android
 ios
 src/locale/locales
+src/lexicons
 lib/react-compiler-runtime
 bskyweb/static
 coverage
diff --git a/lexicons.json b/lexicons.json
new file mode 100644
index 0000000000..614e09e817
--- /dev/null
+++ b/lexicons.json
@@ -0,0 +1,1332 @@
+{
+  "version": 1,
+  "lexicons": [
+    "app.bsky.actor.defs",
+    "app.bsky.actor.getPreferences",
+    "app.bsky.actor.getProfile",
+    "app.bsky.actor.getProfiles",
+    "app.bsky.actor.getSuggestions",
+    "app.bsky.actor.profile",
+    "app.bsky.actor.putPreferences",
+    "app.bsky.actor.searchActors",
+    "app.bsky.actor.searchActorsTypeahead",
+    "app.bsky.actor.status",
+    "app.bsky.ageassurance.begin",
+    "app.bsky.ageassurance.defs",
+    "app.bsky.ageassurance.getConfig",
+    "app.bsky.ageassurance.getState",
+    "app.bsky.bookmark.createBookmark",
+    "app.bsky.bookmark.defs",
+    "app.bsky.bookmark.deleteBookmark",
+    "app.bsky.bookmark.getBookmarks",
+    "app.bsky.contact.defs",
+    "app.bsky.contact.dismissMatch",
+    "app.bsky.contact.getMatches",
+    "app.bsky.contact.getSyncStatus",
+    "app.bsky.contact.importContacts",
+    "app.bsky.contact.removeData",
+    "app.bsky.contact.sendNotification",
+    "app.bsky.contact.startPhoneVerification",
+    "app.bsky.contact.verifyPhone",
+    "app.bsky.draft.createDraft",
+    "app.bsky.draft.defs",
+    "app.bsky.draft.deleteDraft",
+    "app.bsky.draft.getDrafts",
+    "app.bsky.draft.updateDraft",
+    "app.bsky.embed.defs",
+    "app.bsky.embed.external",
+    "app.bsky.embed.gallery",
+    "app.bsky.embed.getEmbedExternalView",
+    "app.bsky.embed.images",
+    "app.bsky.embed.record",
+    "app.bsky.embed.recordWithMedia",
+    "app.bsky.embed.video",
+    "app.bsky.feed.defs",
+    "app.bsky.feed.describeFeedGenerator",
+    "app.bsky.feed.generator",
+    "app.bsky.feed.getActorFeeds",
+    "app.bsky.feed.getActorLikes",
+    "app.bsky.feed.getAuthorFeed",
+    "app.bsky.feed.getFeed",
+    "app.bsky.feed.getFeedGenerator",
+    "app.bsky.feed.getFeedGenerators",
+    "app.bsky.feed.getFeedSkeleton",
+    "app.bsky.feed.getLikes",
+    "app.bsky.feed.getListFeed",
+    "app.bsky.feed.getPostThread",
+    "app.bsky.feed.getPosts",
+    "app.bsky.feed.getQuotes",
+    "app.bsky.feed.getRepostedBy",
+    "app.bsky.feed.getSuggestedFeeds",
+    "app.bsky.feed.getTimeline",
+    "app.bsky.feed.like",
+    "app.bsky.feed.post",
+    "app.bsky.feed.postgate",
+    "app.bsky.feed.repost",
+    "app.bsky.feed.searchPosts",
+    "app.bsky.feed.searchPostsV2",
+    "app.bsky.feed.sendInteractions",
+    "app.bsky.feed.threadgate",
+    "app.bsky.graph.block",
+    "app.bsky.graph.defs",
+    "app.bsky.graph.follow",
+    "app.bsky.graph.getActorStarterPacks",
+    "app.bsky.graph.getBlocks",
+    "app.bsky.graph.getFollowers",
+    "app.bsky.graph.getFollows",
+    "app.bsky.graph.getKnownFollowers",
+    "app.bsky.graph.getList",
+    "app.bsky.graph.getListBlocks",
+    "app.bsky.graph.getListMutes",
+    "app.bsky.graph.getLists",
+    "app.bsky.graph.getListsWithMembership",
+    "app.bsky.graph.getMutes",
+    "app.bsky.graph.getRelationships",
+    "app.bsky.graph.getStarterPack",
+    "app.bsky.graph.getStarterPacks",
+    "app.bsky.graph.getStarterPacksWithMembership",
+    "app.bsky.graph.getSuggestedFollowsByActor",
+    "app.bsky.graph.list",
+    "app.bsky.graph.listblock",
+    "app.bsky.graph.listitem",
+    "app.bsky.graph.muteActor",
+    "app.bsky.graph.muteActorList",
+    "app.bsky.graph.muteThread",
+    "app.bsky.graph.searchStarterPacks",
+    "app.bsky.graph.searchStarterPacksV2",
+    "app.bsky.graph.starterpack",
+    "app.bsky.graph.unmuteActor",
+    "app.bsky.graph.unmuteActorList",
+    "app.bsky.graph.unmuteThread",
+    "app.bsky.graph.verification",
+    "app.bsky.labeler.defs",
+    "app.bsky.labeler.getServices",
+    "app.bsky.labeler.service",
+    "app.bsky.notification.declaration",
+    "app.bsky.notification.defs",
+    "app.bsky.notification.getPreferences",
+    "app.bsky.notification.getUnreadCount",
+    "app.bsky.notification.listActivitySubscriptions",
+    "app.bsky.notification.listNotifications",
+    "app.bsky.notification.putActivitySubscription",
+    "app.bsky.notification.putPreferences",
+    "app.bsky.notification.putPreferencesV2",
+    "app.bsky.notification.registerPush",
+    "app.bsky.notification.unregisterPush",
+    "app.bsky.notification.updateSeen",
+    "app.bsky.richtext.facet",
+    "app.bsky.video.defs",
+    "app.bsky.video.getJobStatus",
+    "app.bsky.video.getUploadLimits",
+    "app.bsky.video.uploadVideo",
+    "chat.bsky.actor.declaration",
+    "chat.bsky.actor.defs",
+    "chat.bsky.actor.deleteAccount",
+    "chat.bsky.actor.exportAccountData",
+    "chat.bsky.actor.getStatus",
+    "chat.bsky.convo.acceptConvo",
+    "chat.bsky.convo.addReaction",
+    "chat.bsky.convo.defs",
+    "chat.bsky.convo.deleteMessageForSelf",
+    "chat.bsky.convo.getConvo",
+    "chat.bsky.convo.getConvoAvailability",
+    "chat.bsky.convo.getConvoForMembers",
+    "chat.bsky.convo.getConvoMembers",
+    "chat.bsky.convo.getLog",
+    "chat.bsky.convo.getMessages",
+    "chat.bsky.convo.getUnreadCounts",
+    "chat.bsky.convo.leaveConvo",
+    "chat.bsky.convo.listConvoRequests",
+    "chat.bsky.convo.listConvos",
+    "chat.bsky.convo.lockConvo",
+    "chat.bsky.convo.muteConvo",
+    "chat.bsky.convo.removeReaction",
+    "chat.bsky.convo.sendMessage",
+    "chat.bsky.convo.sendMessageBatch",
+    "chat.bsky.convo.unlockConvo",
+    "chat.bsky.convo.unmuteConvo",
+    "chat.bsky.convo.updateAllRead",
+    "chat.bsky.convo.updateRead",
+    "chat.bsky.embed.joinLink",
+    "chat.bsky.group.addMembers",
+    "chat.bsky.group.approveJoinRequest",
+    "chat.bsky.group.createGroup",
+    "chat.bsky.group.createJoinLink",
+    "chat.bsky.group.defs",
+    "chat.bsky.group.disableJoinLink",
+    "chat.bsky.group.editGroup",
+    "chat.bsky.group.editJoinLink",
+    "chat.bsky.group.enableJoinLink",
+    "chat.bsky.group.getJoinLinkPreviews",
+    "chat.bsky.group.listJoinRequests",
+    "chat.bsky.group.listMutualGroups",
+    "chat.bsky.group.rejectJoinRequest",
+    "chat.bsky.group.removeMembers",
+    "chat.bsky.group.requestJoin",
+    "chat.bsky.group.updateJoinRequestsRead",
+    "chat.bsky.group.withdrawJoinRequest",
+    "chat.bsky.moderation.defs",
+    "chat.bsky.moderation.getActorMetadata",
+    "chat.bsky.moderation.getConvo",
+    "chat.bsky.moderation.getConvoMembers",
+    "chat.bsky.moderation.getConvos",
+    "chat.bsky.moderation.getMessageContext",
+    "chat.bsky.moderation.subscribeModEvents",
+    "chat.bsky.moderation.updateActorAccess",
+    "chat.bsky.notification.defs",
+    "chat.bsky.notification.getPreferences",
+    "chat.bsky.notification.putPreferences",
+    "com.atproto.admin.defs",
+    "com.atproto.admin.deleteAccount",
+    "com.atproto.admin.disableAccountInvites",
+    "com.atproto.admin.disableInviteCodes",
+    "com.atproto.admin.enableAccountInvites",
+    "com.atproto.admin.getAccountInfo",
+    "com.atproto.admin.getAccountInfos",
+    "com.atproto.admin.getInviteCodes",
+    "com.atproto.admin.getSubjectStatus",
+    "com.atproto.admin.searchAccounts",
+    "com.atproto.admin.sendEmail",
+    "com.atproto.admin.updateAccountEmail",
+    "com.atproto.admin.updateAccountHandle",
+    "com.atproto.admin.updateAccountPassword",
+    "com.atproto.admin.updateAccountSigningKey",
+    "com.atproto.admin.updateSubjectStatus",
+    "com.atproto.identity.defs",
+    "com.atproto.identity.getRecommendedDidCredentials",
+    "com.atproto.identity.refreshIdentity",
+    "com.atproto.identity.requestPlcOperationSignature",
+    "com.atproto.identity.resolveDid",
+    "com.atproto.identity.resolveHandle",
+    "com.atproto.identity.resolveIdentity",
+    "com.atproto.identity.signPlcOperation",
+    "com.atproto.identity.submitPlcOperation",
+    "com.atproto.identity.updateHandle",
+    "com.atproto.label.defs",
+    "com.atproto.label.queryLabels",
+    "com.atproto.label.subscribeLabels",
+    "com.atproto.lexicon.resolveLexicon",
+    "com.atproto.lexicon.schema",
+    "com.atproto.moderation.createReport",
+    "com.atproto.moderation.defs",
+    "com.atproto.repo.applyWrites",
+    "com.atproto.repo.createRecord",
+    "com.atproto.repo.defs",
+    "com.atproto.repo.deleteRecord",
+    "com.atproto.repo.describeRepo",
+    "com.atproto.repo.getRecord",
+    "com.atproto.repo.importRepo",
+    "com.atproto.repo.listMissingBlobs",
+    "com.atproto.repo.listRecords",
+    "com.atproto.repo.putRecord",
+    "com.atproto.repo.strongRef",
+    "com.atproto.repo.uploadBlob",
+    "com.atproto.server.activateAccount",
+    "com.atproto.server.checkAccountStatus",
+    "com.atproto.server.confirmEmail",
+    "com.atproto.server.createAccount",
+    "com.atproto.server.createAppPassword",
+    "com.atproto.server.createInviteCode",
+    "com.atproto.server.createInviteCodes",
+    "com.atproto.server.createSession",
+    "com.atproto.server.deactivateAccount",
+    "com.atproto.server.defs",
+    "com.atproto.server.deleteAccount",
+    "com.atproto.server.deleteSession",
+    "com.atproto.server.describeServer",
+    "com.atproto.server.getAccountInviteCodes",
+    "com.atproto.server.getServiceAuth",
+    "com.atproto.server.getSession",
+    "com.atproto.server.listAppPasswords",
+    "com.atproto.server.refreshSession",
+    "com.atproto.server.requestAccountDelete",
+    "com.atproto.server.requestEmailConfirmation",
+    "com.atproto.server.requestEmailUpdate",
+    "com.atproto.server.requestPasswordReset",
+    "com.atproto.server.reserveSigningKey",
+    "com.atproto.server.resetPassword",
+    "com.atproto.server.revokeAppPassword",
+    "com.atproto.server.updateEmail",
+    "com.atproto.sync.defs",
+    "com.atproto.sync.getBlob",
+    "com.atproto.sync.getBlocks",
+    "com.atproto.sync.getCheckout",
+    "com.atproto.sync.getHead",
+    "com.atproto.sync.getHostStatus",
+    "com.atproto.sync.getLatestCommit",
+    "com.atproto.sync.getRecord",
+    "com.atproto.sync.getRepo",
+    "com.atproto.sync.getRepoStatus",
+    "com.atproto.sync.listBlobs",
+    "com.atproto.sync.listHosts",
+    "com.atproto.sync.listRepos",
+    "com.atproto.sync.listReposByCollection",
+    "com.atproto.sync.notifyOfUpdate",
+    "com.atproto.sync.requestCrawl",
+    "com.atproto.sync.subscribeRepos",
+    "com.germnetwork.declaration",
+    "tools.ozone.report.defs"
+  ],
+  "resolutions": {
+    "app.bsky.actor.defs": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.actor.defs",
+      "cid": "bafyreiaxduxpwdpjgvve3klfs4flkwjwfqiurszw4o6jvjarpqqmeqwiza"
+    },
+    "app.bsky.actor.getPreferences": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.actor.getPreferences",
+      "cid": "bafyreiftuoh6n5npkyelejxbzettltmgl46xm3qot5nkn7lm365ej2ahii"
+    },
+    "app.bsky.actor.getProfile": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.actor.getProfile",
+      "cid": "bafyreigrtosreva7e5m7bwbbfsmw77gkdnieizgxwpobw5iobuck3j54xa"
+    },
+    "app.bsky.actor.getProfiles": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.actor.getProfiles",
+      "cid": "bafyreihphrndnt2cvnv3nk442f6kohdnpagk4xip74f2jn36uoal25vhta"
+    },
+    "app.bsky.actor.getSuggestions": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.actor.getSuggestions",
+      "cid": "bafyreig7dhef4df3n72bj6pvklzija26yk5szxdzlixm5x72bingowmf3m"
+    },
+    "app.bsky.actor.profile": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.actor.profile",
+      "cid": "bafyreia6umzg3a6d7mjbow4p57tviey45muohklhgsvjoamcctoiusr4pe"
+    },
+    "app.bsky.actor.putPreferences": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.actor.putPreferences",
+      "cid": "bafyreietfhhwbwb3ltcffsonhw5p62z233frhe6edls67su5a3evqrykju"
+    },
+    "app.bsky.actor.searchActors": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.actor.searchActors",
+      "cid": "bafyreidfkzp3tcbxvqo3aty2prhnaiqoxxbjhrapaqmko2gtnymtgxyqdi"
+    },
+    "app.bsky.actor.searchActorsTypeahead": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.actor.searchActorsTypeahead",
+      "cid": "bafyreigydtxvpnrndvk7iws4uypd6adqzohcdafeuqajiqmmbcqq5vatmu"
+    },
+    "app.bsky.actor.status": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.actor.status",
+      "cid": "bafyreifdg4b64wohpwkh5lydc6tckvol2rspnpni6dec6recy2rhvlnz4a"
+    },
+    "app.bsky.ageassurance.begin": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.ageassurance.begin",
+      "cid": "bafyreieqogxqzohb5fdtw5jiqckscgipkbrtvluoodscm45ajw2ba26zpm"
+    },
+    "app.bsky.ageassurance.defs": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.ageassurance.defs",
+      "cid": "bafyreig2g6pata4a2yjc7aiqoyybi3jzu76trduxlswte2gzhqdx252sie"
+    },
+    "app.bsky.ageassurance.getConfig": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.ageassurance.getConfig",
+      "cid": "bafyreifpfw7n3y6vqhiyqaqiyrmxm3lypkamyfk7dk6jzho7ujjujou6xq"
+    },
+    "app.bsky.ageassurance.getState": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.ageassurance.getState",
+      "cid": "bafyreialq63q3obxzsrzbwx25stjmtha3frlifzbgkvtthr535oal3467y"
+    },
+    "app.bsky.bookmark.createBookmark": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.bookmark.createBookmark",
+      "cid": "bafyreiegg2yu2jl5kfswirsylpn56ro2pj7lkfsufvrnv7xik7xdw27kfi"
+    },
+    "app.bsky.bookmark.defs": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.bookmark.defs",
+      "cid": "bafyreifi3xao6wlbsnrzt36xnrfcvl5pil7jw7owrgqpmppfzy52dpy7e4"
+    },
+    "app.bsky.bookmark.deleteBookmark": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.bookmark.deleteBookmark",
+      "cid": "bafyreig6rcgoqayi4fwgx5k5va3cnfsjykvc3fes7rmcfpszdd745hvatu"
+    },
+    "app.bsky.bookmark.getBookmarks": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.bookmark.getBookmarks",
+      "cid": "bafyreicnazdriby4i3uu3nelt5ur4o3575ivjuw5pxlfj46tvfmglpny2e"
+    },
+    "app.bsky.contact.defs": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.contact.defs",
+      "cid": "bafyreidsqrf3mf6g3zphne4t2swm6hbgd3ojk2nzlmwj6ezsvq62o3abgu"
+    },
+    "app.bsky.contact.dismissMatch": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.contact.dismissMatch",
+      "cid": "bafyreihtnfxggnq2n6ijlvrmtmpspwz3pzceprcfzqpa6iwjftpoknkory"
+    },
+    "app.bsky.contact.getMatches": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.contact.getMatches",
+      "cid": "bafyreihk7c54sgsxyh3bhtwd3cf5kdzjh4lauwwpbogau3zm65acfc3b2u"
+    },
+    "app.bsky.contact.getSyncStatus": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.contact.getSyncStatus",
+      "cid": "bafyreicozb7ibbr4h6xeh23jdjpfs6thxvodudypurdwqajwdnnj7lrioi"
+    },
+    "app.bsky.contact.importContacts": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.contact.importContacts",
+      "cid": "bafyreihzcos4jxddkpsk3isoxpgmw2x4rqbvp4b3f475cxwnfdzngnl7by"
+    },
+    "app.bsky.contact.removeData": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.contact.removeData",
+      "cid": "bafyreidtbulghr5cv27rzcato5esrgigddaafde2kgkz6hnivaimclynla"
+    },
+    "app.bsky.contact.sendNotification": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.contact.sendNotification",
+      "cid": "bafyreietl2pnpkuxeip5ftk7xvvrkuzdu4ndsn2nldt4wf2vbteyj5v6ju"
+    },
+    "app.bsky.contact.startPhoneVerification": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.contact.startPhoneVerification",
+      "cid": "bafyreif6jrd6gkonvwlvfkv2wyx5tnk4ayuv2xihcao7kyzdms42s34bhe"
+    },
+    "app.bsky.contact.verifyPhone": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.contact.verifyPhone",
+      "cid": "bafyreiapgsesqmksilfc6nxndzglbxquxtmk3gwiikie44rangg2drplti"
+    },
+    "app.bsky.draft.createDraft": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.draft.createDraft",
+      "cid": "bafyreid43zfsfg4wk4p3mf3gihwhpqh4d5rmpw7l5n3zks3kl53bsrsaba"
+    },
+    "app.bsky.draft.defs": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.draft.defs",
+      "cid": "bafyreiewy3wgajj4al6xifjc2e5gpg4yyj4laf2gl7pe3liekulfzxnlcu"
+    },
+    "app.bsky.draft.deleteDraft": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.draft.deleteDraft",
+      "cid": "bafyreicxw6nrrrikakfdaue3x45vfp4w62mncscdkpivpeom2orx2ae3su"
+    },
+    "app.bsky.draft.getDrafts": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.draft.getDrafts",
+      "cid": "bafyreiewac2qwebwwtm4mtvk3aobtsyhbqug3hplhftjlbbn6bvuuxyumy"
+    },
+    "app.bsky.draft.updateDraft": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.draft.updateDraft",
+      "cid": "bafyreicjy2aatoptybrtogj3nckokmkjpbmelvkej5bkfvxfcs5enu2fhu"
+    },
+    "app.bsky.embed.defs": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.embed.defs",
+      "cid": "bafyreia42uud4qil67wknywzbxfyxc3b7woewsii54cakq2ould3ldetei"
+    },
+    "app.bsky.embed.external": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.embed.external",
+      "cid": "bafyreigwach36azu4xg3jvcmb6fe53umfln3wkuj5srqsvcjaypa6rw534"
+    },
+    "app.bsky.embed.gallery": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.embed.gallery",
+      "cid": "bafyreia4tixag4sadkirfo63qfma6fz3ifbqanify4e6ce6swkl5lwjnfq"
+    },
+    "app.bsky.embed.getEmbedExternalView": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.embed.getEmbedExternalView",
+      "cid": "bafyreicnv2umobvrfrlo6tqw7umcsxv77owcwit3vld7l46fphpy5uuzky"
+    },
+    "app.bsky.embed.images": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.embed.images",
+      "cid": "bafyreifw77mkqkzlvm5csjwutkrnaivsjvlhg2qxdlwwabqpahlyyjrpwi"
+    },
+    "app.bsky.embed.record": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.embed.record",
+      "cid": "bafyreia7yq4c6rqkz32fjf6gj5rcvxsirguducn545s3dvls7qutnn2ali"
+    },
+    "app.bsky.embed.recordWithMedia": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.embed.recordWithMedia",
+      "cid": "bafyreidszvpeqf7copdmowm4ln4eyhahlqxktlvootjjjdmtkwy6s62jya"
+    },
+    "app.bsky.embed.video": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.embed.video",
+      "cid": "bafyreie3nug4ezpwodl6yrpgv5edkazzn22t7ea4yaeuun4rctyekkngai"
+    },
+    "app.bsky.feed.defs": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.feed.defs",
+      "cid": "bafyreibg2zvz4n25vtd5yfqlodqra72s4h4lz7vwdexoutv3523wbw6jca"
+    },
+    "app.bsky.feed.describeFeedGenerator": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.feed.describeFeedGenerator",
+      "cid": "bafyreigzxk3um5hbi7gbuh5bhmob75bxlfh5bonfsl7h5dmt7woxdhxq54"
+    },
+    "app.bsky.feed.generator": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.feed.generator",
+      "cid": "bafyreig2rppxkltsbe3523gavulrgprwjkyyb7mvmor22fdkoas6hrc2ju"
+    },
+    "app.bsky.feed.getActorFeeds": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.feed.getActorFeeds",
+      "cid": "bafyreihqvune35emnr3vby6ldv2tzy57cfcgst2qy5icwpeay4mdvughfq"
+    },
+    "app.bsky.feed.getActorLikes": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.feed.getActorLikes",
+      "cid": "bafyreiaxgdm2fv6bjzh2hdixgc3teprs7z46ja273kzevjnsp3hi224xoy"
+    },
+    "app.bsky.feed.getAuthorFeed": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.feed.getAuthorFeed",
+      "cid": "bafyreiha5ca2lkguxvh22smjuehn2evxhyqk7isuiyqy6b23raljriv5a4"
+    },
+    "app.bsky.feed.getFeed": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.feed.getFeed",
+      "cid": "bafyreihnhxqdfxojwo4xnedj55kskjki3opd2oiz3pfa5nm2ijr5janlq4"
+    },
+    "app.bsky.feed.getFeedGenerator": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.feed.getFeedGenerator",
+      "cid": "bafyreibdzaan7vboli3ywi7wqzkibc2puukhfpg5rcdgizxlr7fbxx5gcy"
+    },
+    "app.bsky.feed.getFeedGenerators": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.feed.getFeedGenerators",
+      "cid": "bafyreiervdq422lralzyssoewrfstcmqxsqimtmdskkqeflllszjnq32em"
+    },
+    "app.bsky.feed.getFeedSkeleton": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.feed.getFeedSkeleton",
+      "cid": "bafyreidmn4nltqygzpd3vzobfkrkxcypbfirremfhzuluhlavwp5ht637m"
+    },
+    "app.bsky.feed.getLikes": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.feed.getLikes",
+      "cid": "bafyreib6ylalknwxizbtbwsdmja4rhjswwczut5ivjdavfgew27m7knqou"
+    },
+    "app.bsky.feed.getListFeed": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.feed.getListFeed",
+      "cid": "bafyreifvox2w2c6ybgioi6ofgp2i6pz44guwvo76w26miv4hpy7fgiwvlq"
+    },
+    "app.bsky.feed.getPostThread": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.feed.getPostThread",
+      "cid": "bafyreif37upfzfu7t4rv3pqzz3swu2oc4nrxdxfr3xqjsrrmgyckneitta"
+    },
+    "app.bsky.feed.getPosts": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.feed.getPosts",
+      "cid": "bafyreihy4tanaizkynghab46n3qztsspvoaqtbrkzinvxi4igeylg5ghji"
+    },
+    "app.bsky.feed.getQuotes": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.feed.getQuotes",
+      "cid": "bafyreiftjmrnfpwtri5v47e7yfdgjgpfqds6kx3duf3t2x7vn7qdtbttfy"
+    },
+    "app.bsky.feed.getRepostedBy": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.feed.getRepostedBy",
+      "cid": "bafyreif4v4aucwv4xvwnub6w2npmioqpa6nn4t5dsbqophoyfnimhsuweq"
+    },
+    "app.bsky.feed.getSuggestedFeeds": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.feed.getSuggestedFeeds",
+      "cid": "bafyreif4v4aldmcoc2nkyanu6t3ks4jazqsiffq5gp54tuyn5o6rk2ff5e"
+    },
+    "app.bsky.feed.getTimeline": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.feed.getTimeline",
+      "cid": "bafyreihumvisufuf6t7ibkyhg4psri37pj535mhmyr4t6mn7ogvgcxpul4"
+    },
+    "app.bsky.feed.like": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.feed.like",
+      "cid": "bafyreiasvjidnd3sazbx46rzgipfkpejq4mgfuzwv2xrdaesp64t4dl2ry"
+    },
+    "app.bsky.feed.post": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.feed.post",
+      "cid": "bafyreia7rgxu7467phwpcgzaw62l5bzmxufkpikrc5zm4q3xhjmuhq4pti"
+    },
+    "app.bsky.feed.postgate": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.feed.postgate",
+      "cid": "bafyreiai5efexyluyptv5tbl6kqbqlnneczqzexcqnxmitmulyjfaftgva"
+    },
+    "app.bsky.feed.repost": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.feed.repost",
+      "cid": "bafyreihks43jtwanviarzctwx2vvcyloivuxo2kdi7ex24gog5dfn4s5au"
+    },
+    "app.bsky.feed.searchPosts": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.feed.searchPosts",
+      "cid": "bafyreif3xl6jj27tktxmxr3gtmf74wuxj6y6xnoycs7cclvifh4ncsi6mi"
+    },
+    "app.bsky.feed.searchPostsV2": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.feed.searchPostsV2",
+      "cid": "bafyreiemtjvwfo6xuab6vkwbji46d7wms5xdzad6vygjymmcqr326quwqu"
+    },
+    "app.bsky.feed.sendInteractions": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.feed.sendInteractions",
+      "cid": "bafyreicaoiskxpn2lmbzxuvpzawbsqxoewko3drbsxms222obabj2dkque"
+    },
+    "app.bsky.feed.threadgate": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.feed.threadgate",
+      "cid": "bafyreiht77wd6duduz4yqp62m6dwma5dy7gdihps4g2nd73acfzqlglvdi"
+    },
+    "app.bsky.graph.block": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.graph.block",
+      "cid": "bafyreifalnveckyi2375ek5b5uyg4ef23mktcdktmgiwwsb3rygdls7owm"
+    },
+    "app.bsky.graph.defs": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.graph.defs",
+      "cid": "bafyreifcipomli7yggtl46xufgxlnrw7se6xmsdxmzgfcz2tiu76ljatxm"
+    },
+    "app.bsky.graph.follow": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.graph.follow",
+      "cid": "bafyreiav7u7jchqtsxr2yy3gsazfqqziw5tcrfniuprrmoariruj3cft5u"
+    },
+    "app.bsky.graph.getActorStarterPacks": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.graph.getActorStarterPacks",
+      "cid": "bafyreihm57pc7dmeig4lxcv3x53z53y27obkkxnopimax7dbtqx4enqf7i"
+    },
+    "app.bsky.graph.getBlocks": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.graph.getBlocks",
+      "cid": "bafyreic3yp4tuxthww5sidvv27gmg3ha3argl3moconhmcccwvooobggve"
+    },
+    "app.bsky.graph.getFollowers": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.graph.getFollowers",
+      "cid": "bafyreiaboxa4aux2y5jxut5kw4iqlnctlswklofvgkhxl2wn7rkbjjrzru"
+    },
+    "app.bsky.graph.getFollows": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.graph.getFollows",
+      "cid": "bafyreicun6mwmjgrdmrtmnfqv3ws37g5okcmo3uiaf2qwopk3bhtj5rqae"
+    },
+    "app.bsky.graph.getKnownFollowers": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.graph.getKnownFollowers",
+      "cid": "bafyreia3bjqeaj5uk2zlkhk5pipefehy2mlrdp3hoqtgu3np3tvbg6xjuq"
+    },
+    "app.bsky.graph.getList": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.graph.getList",
+      "cid": "bafyreigplofixg524nkirazfh3loe36lvqqeg6jfqvrggzztspkefwm4re"
+    },
+    "app.bsky.graph.getListBlocks": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.graph.getListBlocks",
+      "cid": "bafyreiagod73i7ecuzpyxwlibrwimo7u4ew75nzc2b3ajdocc5sg6eszpy"
+    },
+    "app.bsky.graph.getListMutes": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.graph.getListMutes",
+      "cid": "bafyreictd7aefsbizbn66bmhfbyvxbirbuz4uiqcp4o5tb3eiyun42wm4a"
+    },
+    "app.bsky.graph.getLists": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.graph.getLists",
+      "cid": "bafyreiffrqdk7vdses2qzrmmfotwyvncuhvq7anaw64x7wmlz5cix5nihy"
+    },
+    "app.bsky.graph.getListsWithMembership": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.graph.getListsWithMembership",
+      "cid": "bafyreifgvypq6ahfxtkbdmudh7bb7vib6c7kvkit6ks3gjoagor747cxfy"
+    },
+    "app.bsky.graph.getMutes": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.graph.getMutes",
+      "cid": "bafyreibnvq62dmchuulpzvvl6w2x6z4mofnqdrfbsvc5ynoo6cazr7wove"
+    },
+    "app.bsky.graph.getRelationships": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.graph.getRelationships",
+      "cid": "bafyreiabszfuqanet2tbyyx7plxmknfegygnfyaydhwyialt4cbo24k5dq"
+    },
+    "app.bsky.graph.getStarterPack": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.graph.getStarterPack",
+      "cid": "bafyreia77gh56vqe3ws26ntm7pffj43uhvl6l66vpb7uhxrhpih6rvne6m"
+    },
+    "app.bsky.graph.getStarterPacks": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.graph.getStarterPacks",
+      "cid": "bafyreighxbnsgugwwjnu37nzoca7qtpipvf2l5ijz2z74ghdfrgppqfoaa"
+    },
+    "app.bsky.graph.getStarterPacksWithMembership": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.graph.getStarterPacksWithMembership",
+      "cid": "bafyreigpeb22avssmmfqiveh3hem6qnxrduyyhkxc3ixpfgehmhkskgssy"
+    },
+    "app.bsky.graph.getSuggestedFollowsByActor": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.graph.getSuggestedFollowsByActor",
+      "cid": "bafyreih4zuul6xlijankc73dx7bax3gbeva2dlfnzabk335y7iaptxbmr4"
+    },
+    "app.bsky.graph.list": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.graph.list",
+      "cid": "bafyreihqckm5nkbamel2pljhk5lbjfqfmczmb7a5eglpic7ontdx3r4sey"
+    },
+    "app.bsky.graph.listblock": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.graph.listblock",
+      "cid": "bafyreieomtmr6mpvgnbbgwfkdqlyatwymvu4vdnhldpqetzczlj4eywxqq"
+    },
+    "app.bsky.graph.listitem": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.graph.listitem",
+      "cid": "bafyreiegh2vyadmieea52lnt574lfcddprhpuz5moqhqiij56egfvyf62m"
+    },
+    "app.bsky.graph.muteActor": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.graph.muteActor",
+      "cid": "bafyreiebgeqbzitzytuvuu23nxgiyxjdh3iawcxonsiu6t2aubqd6ugt6m"
+    },
+    "app.bsky.graph.muteActorList": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.graph.muteActorList",
+      "cid": "bafyreihadi2x64bpzncb2xfo5ww4mvajftf4qd3nxmsjud7assloxzfm44"
+    },
+    "app.bsky.graph.muteThread": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.graph.muteThread",
+      "cid": "bafyreib6ppci3qzye6wktkm4byxtb5mnl2vg22fm7oawcdvof2tfogx4dy"
+    },
+    "app.bsky.graph.searchStarterPacks": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.graph.searchStarterPacks",
+      "cid": "bafyreia446ip6mbnwpml6hlvxab7jtsud7zczde3u6zmnsa3op4bpxu7um"
+    },
+    "app.bsky.graph.searchStarterPacksV2": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.graph.searchStarterPacksV2",
+      "cid": "bafyreiftevu66nkth5uprlwhoxtxloz4aqym25hu3wj2bal2vcuupa6uky"
+    },
+    "app.bsky.graph.starterpack": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.graph.starterpack",
+      "cid": "bafyreiejgf46gibbkpmjtgt5yyiir3wyxgrtvnfxtcdeyxrdrdnsvwgjc4"
+    },
+    "app.bsky.graph.unmuteActor": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.graph.unmuteActor",
+      "cid": "bafyreihqc6o54652e56jmvzpaf7ix4liws4bmnd2bklc2qkuqjozfcvka4"
+    },
+    "app.bsky.graph.unmuteActorList": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.graph.unmuteActorList",
+      "cid": "bafyreiamqj5gh6x36dzdk6ve7kfjvzotqjfcg2nplgch7woshqrubbe2ee"
+    },
+    "app.bsky.graph.unmuteThread": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.graph.unmuteThread",
+      "cid": "bafyreiahpkqj4v7b3ujk45ufdcvynu2dxjtunzi2oipu7kzdupybmysgzu"
+    },
+    "app.bsky.graph.verification": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.graph.verification",
+      "cid": "bafyreidn7abfzt5p4gcujys2w4seigbhcfnscos6fmh4hnce2gdormbwpa"
+    },
+    "app.bsky.labeler.defs": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.labeler.defs",
+      "cid": "bafyreicxx5i36v5dbqk5vvfzhnta5gajrvc544mnepux4wksrkid7mw3q4"
+    },
+    "app.bsky.labeler.getServices": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.labeler.getServices",
+      "cid": "bafyreife7p4pjij5jvmngdlxfq4cjzqe2cx7himnkf7zgxsykcxg6klpl4"
+    },
+    "app.bsky.labeler.service": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.labeler.service",
+      "cid": "bafyreihr336i3ys6rc4ezhk2wwpeyufnp2ma2n6dxljd2ogksi4sjo6aqe"
+    },
+    "app.bsky.notification.declaration": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.notification.declaration",
+      "cid": "bafyreibjnupqb7xke5eeeehpcm2gecacduwd4ebifcovgigzdpo42jq3kq"
+    },
+    "app.bsky.notification.defs": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.notification.defs",
+      "cid": "bafyreifzktxnol5rafjoznauk5j7ub2gsxxm7qjskg3vqmcgn6krrsz55u"
+    },
+    "app.bsky.notification.getPreferences": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.notification.getPreferences",
+      "cid": "bafyreibaz7cyl7ytpextx7bv6oaguadj5bdvpf4hksw6t737zkfw5y3rue"
+    },
+    "app.bsky.notification.getUnreadCount": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.notification.getUnreadCount",
+      "cid": "bafyreih2vxe7vy3hcp7fwka7cwenxbkx2d7nd2s3whffh23dn3wxt65s7m"
+    },
+    "app.bsky.notification.listActivitySubscriptions": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.notification.listActivitySubscriptions",
+      "cid": "bafyreien2hslzbpoypvz3shv6tphkmdtccejieg5lricwl6stdjomiu3zi"
+    },
+    "app.bsky.notification.listNotifications": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.notification.listNotifications",
+      "cid": "bafyreigqqfk3gvslu36fvmx3fc3yi4ibmsmbfvty55rq4vw7cvfhecpxge"
+    },
+    "app.bsky.notification.putActivitySubscription": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.notification.putActivitySubscription",
+      "cid": "bafyreifvbgf53yncsrjpzwa5xwnlax7vyesflkg6fmxb2367vfa6fv7kwu"
+    },
+    "app.bsky.notification.putPreferences": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.notification.putPreferences",
+      "cid": "bafyreihbqjdbhra45czd5m5665btugrie7bwsiwzehutjdwygyy5dsq4fi"
+    },
+    "app.bsky.notification.putPreferencesV2": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.notification.putPreferencesV2",
+      "cid": "bafyreiefun5klfddbnd7gfodnlcbn7ing45qo6lbmsahau7qgw4zlgv42i"
+    },
+    "app.bsky.notification.registerPush": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.notification.registerPush",
+      "cid": "bafyreiayl6ngk3ckmaorocgbwxf2ruqgficcbkm2xvoja2crnyul66u3hy"
+    },
+    "app.bsky.notification.unregisterPush": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.notification.unregisterPush",
+      "cid": "bafyreiboilq7jye3s7isayixm6iqjbsxrfzizaj727obtdda6qzh56at6y"
+    },
+    "app.bsky.notification.updateSeen": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.notification.updateSeen",
+      "cid": "bafyreigzds576ji7wzi6alzn4wegtfzk2iqagwtugbw3byb2v3xvqho4hi"
+    },
+    "app.bsky.richtext.facet": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.richtext.facet",
+      "cid": "bafyreidg56eo7zynf6ihz4xb627vwoqf5idnevkmwp7sxc4tijg6xngbu4"
+    },
+    "app.bsky.video.defs": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.video.defs",
+      "cid": "bafyreibxabe2aejhtnjbwsnt7va4bvge35p7lzcjt2nwmf2c4taww46yyq"
+    },
+    "app.bsky.video.getJobStatus": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.video.getJobStatus",
+      "cid": "bafyreia5xkrbastzzbpodjm242orufiswrz5aasjqrqtuvb6lmmfwixmqy"
+    },
+    "app.bsky.video.getUploadLimits": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.video.getUploadLimits",
+      "cid": "bafyreidlw3fozroigsbrz73jtqdoc7dkdpxi4oie3df7nb3vnycy2kkz2y"
+    },
+    "app.bsky.video.uploadVideo": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.video.uploadVideo",
+      "cid": "bafyreibvsdivxr54ooykqhsy3i6n6f7223hbfnnnzs4h6xrzr5kvvztuvy"
+    },
+    "chat.bsky.actor.declaration": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/chat.bsky.actor.declaration",
+      "cid": "bafyreih4ivey4vqreb2ebujlt7iranqyizxkv5kpm3ksdlgkinkgcu53pu"
+    },
+    "chat.bsky.actor.defs": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/chat.bsky.actor.defs",
+      "cid": "bafyreigiv5fo5iufd3ahma6tgtozm35xibvx276nhjsjwuvsvxh3zj7u7q"
+    },
+    "chat.bsky.actor.deleteAccount": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/chat.bsky.actor.deleteAccount",
+      "cid": "bafyreierykzslwmkkugpyio3yiaxguttd5his5i4ow7re7wzcbxfogerrq"
+    },
+    "chat.bsky.actor.exportAccountData": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/chat.bsky.actor.exportAccountData",
+      "cid": "bafyreigwllvtmdetzfvgrzwhtzjilnj3gfxaj45yd32oe436etzp7yghai"
+    },
+    "chat.bsky.actor.getStatus": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/chat.bsky.actor.getStatus",
+      "cid": "bafyreib7f6wo5xsnfz37ywggtvqbcuxigf325q6pezshyhzyp2n5pdlzhu"
+    },
+    "chat.bsky.convo.acceptConvo": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/chat.bsky.convo.acceptConvo",
+      "cid": "bafyreih2ob7rsibl3h3so356rcdo2fop3dosxkna75w2u45qflbtw2r7qm"
+    },
+    "chat.bsky.convo.addReaction": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/chat.bsky.convo.addReaction",
+      "cid": "bafyreia2odzz7wk5vfdjxchttbr44ojcxks72ytdmeybpub6zqt3l327vi"
+    },
+    "chat.bsky.convo.defs": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/chat.bsky.convo.defs",
+      "cid": "bafyreibpb3r5pqc3yrjslx7ntfl5vvgdlgqanuwbcvq3q7sfhayi75x7uu"
+    },
+    "chat.bsky.convo.deleteMessageForSelf": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/chat.bsky.convo.deleteMessageForSelf",
+      "cid": "bafyreicsfbucwa3y5jdtzv6focgl5dao2lhmaa22jljllwjp6rz4noxowe"
+    },
+    "chat.bsky.convo.getConvo": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/chat.bsky.convo.getConvo",
+      "cid": "bafyreidjox5oa467rn7x6xjuko23w5ekypjbkdryia4hz5s7isswhxrilu"
+    },
+    "chat.bsky.convo.getConvoAvailability": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/chat.bsky.convo.getConvoAvailability",
+      "cid": "bafyreidnzzp2b7w4pedgnspgwlzl7oc4uuwxlbh3asteu6s4rgcuagnzl4"
+    },
+    "chat.bsky.convo.getConvoForMembers": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/chat.bsky.convo.getConvoForMembers",
+      "cid": "bafyreicheufh7jkrstr6hgpggylildyh3k5tihbh5747dumqe5nabp24fi"
+    },
+    "chat.bsky.convo.getConvoMembers": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/chat.bsky.convo.getConvoMembers",
+      "cid": "bafyreigup3axpdj3r3p4s3x7qgarrysft3vognwzgetl4bn3n2bgocxl4m"
+    },
+    "chat.bsky.convo.getLog": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/chat.bsky.convo.getLog",
+      "cid": "bafyreicc4wwkmh5rskpzyriwad4lte64rk2w7vnzzzofy6tnhbisxsint4"
+    },
+    "chat.bsky.convo.getMessages": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/chat.bsky.convo.getMessages",
+      "cid": "bafyreif2fjad4zrbjwhbuk3ny7yfnv6sjyr6llrveh2dr4i2aovwe77yia"
+    },
+    "chat.bsky.convo.getUnreadCounts": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/chat.bsky.convo.getUnreadCounts",
+      "cid": "bafyreibuu7abhy74gxfprerxpiimjit43fhcrrewe43zhili7rmr4crrsi"
+    },
+    "chat.bsky.convo.leaveConvo": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/chat.bsky.convo.leaveConvo",
+      "cid": "bafyreigdjs5t2jod6zojwnj5giqucsad257vhocykv6fftkj3qkqzqlqua"
+    },
+    "chat.bsky.convo.listConvoRequests": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/chat.bsky.convo.listConvoRequests",
+      "cid": "bafyreieoce2dsrg6czlm7tkfi7glxjvqh6wwvfq777s5zxi6hyzqjeqo3e"
+    },
+    "chat.bsky.convo.listConvos": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/chat.bsky.convo.listConvos",
+      "cid": "bafyreifxh52sx6i7vrlj2xi5h3yd56dmawkplcfdsfiu4npou6rutz4pge"
+    },
+    "chat.bsky.convo.lockConvo": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/chat.bsky.convo.lockConvo",
+      "cid": "bafyreidnrgfxtyg233wfvasho34p34k2tiekrpiticcl4sau7k2masydby"
+    },
+    "chat.bsky.convo.muteConvo": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/chat.bsky.convo.muteConvo",
+      "cid": "bafyreihpyxtotf6ltd6w6ayoirar7obxoqlijljov6yrb7r5qztq3ag74e"
+    },
+    "chat.bsky.convo.removeReaction": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/chat.bsky.convo.removeReaction",
+      "cid": "bafyreiagvcoqprw5jew2m4uoeg6i32wu6ld2ltgjgb2d2s36k4o6i7arb4"
+    },
+    "chat.bsky.convo.sendMessage": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/chat.bsky.convo.sendMessage",
+      "cid": "bafyreih7yu45wtptd7qjg6iomrugxucfw7zkkz7ijjj7o3bddee3od2q3m"
+    },
+    "chat.bsky.convo.sendMessageBatch": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/chat.bsky.convo.sendMessageBatch",
+      "cid": "bafyreifvinecphums77xvuuspqgjkgfa7cpre3zavtrkh5tffmi643q2rq"
+    },
+    "chat.bsky.convo.unlockConvo": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/chat.bsky.convo.unlockConvo",
+      "cid": "bafyreiaind2trvtuo2bgqupx4acxx5vvfhvvo4xwencwcf2trnrithwkya"
+    },
+    "chat.bsky.convo.unmuteConvo": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/chat.bsky.convo.unmuteConvo",
+      "cid": "bafyreifbip4w4q4dnm2bvhtaxr4ut3yrzck4xkdu2ifnkoggyqigsuasbe"
+    },
+    "chat.bsky.convo.updateAllRead": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/chat.bsky.convo.updateAllRead",
+      "cid": "bafyreiewx6wmllc4nujgtakvu4jiapnrjtbqyxvugohuu7xfy3bhrn4wq4"
+    },
+    "chat.bsky.convo.updateRead": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/chat.bsky.convo.updateRead",
+      "cid": "bafyreihba5bopb5vnlqqvtavipybqgemp6itwrz4xysnp6yi6iow5ntnv4"
+    },
+    "chat.bsky.embed.joinLink": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/chat.bsky.embed.joinLink",
+      "cid": "bafyreib3z65a2myai4hc55vxa7woue4bmelo2a4dlgnawps746w3l2y72q"
+    },
+    "chat.bsky.group.addMembers": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/chat.bsky.group.addMembers",
+      "cid": "bafyreiftelalu5yc3zctgch7req6syovskusqgma5vyyd4elas5rs47tvy"
+    },
+    "chat.bsky.group.approveJoinRequest": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/chat.bsky.group.approveJoinRequest",
+      "cid": "bafyreicykc372f7ebk7c3wrco75wgox3poyop7w3duovvn2piqzsvhzthq"
+    },
+    "chat.bsky.group.createGroup": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/chat.bsky.group.createGroup",
+      "cid": "bafyreidhalpchhospn2hwox54navotl4svw4pmt33aynj22gp52ofoxzau"
+    },
+    "chat.bsky.group.createJoinLink": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/chat.bsky.group.createJoinLink",
+      "cid": "bafyreicxjzsyjrqbkwd7vztmaxstgulx5naln55gsppix27pjnoz5okv7i"
+    },
+    "chat.bsky.group.defs": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/chat.bsky.group.defs",
+      "cid": "bafyreiexck6gwns5nesq44mqgsikwrjkgplz33cemxaq365xwdcxeoqjje"
+    },
+    "chat.bsky.group.disableJoinLink": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/chat.bsky.group.disableJoinLink",
+      "cid": "bafyreiholtxhmuqku64fkv6rjl2rn3jyicutkcuieoviys3zdzx6lh43n4"
+    },
+    "chat.bsky.group.editGroup": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/chat.bsky.group.editGroup",
+      "cid": "bafyreifwwj2mzridii6sm6wlc5sxgu7g6k67bijvylus4jnbvfcup7ecfe"
+    },
+    "chat.bsky.group.editJoinLink": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/chat.bsky.group.editJoinLink",
+      "cid": "bafyreiafmbnein4xpbr76jzofk53ut6u5opeuwyorilkhpe3u2kzgavlde"
+    },
+    "chat.bsky.group.enableJoinLink": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/chat.bsky.group.enableJoinLink",
+      "cid": "bafyreib45q6ccuobjlws7sysjojabo6gvww6wlgy7dif5ejkoasb23l7su"
+    },
+    "chat.bsky.group.getJoinLinkPreviews": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/chat.bsky.group.getJoinLinkPreviews",
+      "cid": "bafyreigrglu52cdsrc7sxxflwoxr6eg6paw4zsd7ioy7kyue2kqfdjyqn4"
+    },
+    "chat.bsky.group.listJoinRequests": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/chat.bsky.group.listJoinRequests",
+      "cid": "bafyreigoj66wx3sx7nbav4ywxckk7ggjklxvy2w5tmmnrapib7nfpgh3ci"
+    },
+    "chat.bsky.group.listMutualGroups": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/chat.bsky.group.listMutualGroups",
+      "cid": "bafyreihp23gsqmaie6uzouxfqi6zwhr3wqglqjblbcawkp6asirzmqq4oi"
+    },
+    "chat.bsky.group.rejectJoinRequest": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/chat.bsky.group.rejectJoinRequest",
+      "cid": "bafyreiaztaygpnfglcldsdbh5dunovp2nz3kenetahycpymoxxrxkafiha"
+    },
+    "chat.bsky.group.removeMembers": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/chat.bsky.group.removeMembers",
+      "cid": "bafyreidfkumfvrtsseaavuhs2lfblcsmrjbkeaeojh2u576jze5xrfcasy"
+    },
+    "chat.bsky.group.requestJoin": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/chat.bsky.group.requestJoin",
+      "cid": "bafyreiatzqdp7zlnbqmbti6xt3orag7yqyuqr6tqzwzzp52gq7hlu3it6q"
+    },
+    "chat.bsky.group.updateJoinRequestsRead": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/chat.bsky.group.updateJoinRequestsRead",
+      "cid": "bafyreieod4o3cdfkhev6tia63q6yrdk3pgwvrrpyxggswxpp6pzwjj2jyi"
+    },
+    "chat.bsky.group.withdrawJoinRequest": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/chat.bsky.group.withdrawJoinRequest",
+      "cid": "bafyreicdn25bcyya4for6vtdhhkjaeyfbkldgaxqtqoh5hfwljbrxszezy"
+    },
+    "chat.bsky.moderation.defs": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/chat.bsky.moderation.defs",
+      "cid": "bafyreiee3r5j2psnahumolqrbr6gj6adqt3ov3xflbeibnyfzlwwc3e5km"
+    },
+    "chat.bsky.moderation.getActorMetadata": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/chat.bsky.moderation.getActorMetadata",
+      "cid": "bafyreifo2qp6ozex6phd5dd2sewpyltlnzijjqmfl5xpujxk3mkx6b4pze"
+    },
+    "chat.bsky.moderation.getConvo": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/chat.bsky.moderation.getConvo",
+      "cid": "bafyreie6ds2blosf5zeg7eralqp5jmbbvsv4befevms3nyqoihblzxwzsy"
+    },
+    "chat.bsky.moderation.getConvoMembers": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/chat.bsky.moderation.getConvoMembers",
+      "cid": "bafyreicm4fvldxqk5zdwopjjrsukl7wpib2ixqgkfc3nrszorx46i4np34"
+    },
+    "chat.bsky.moderation.getConvos": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/chat.bsky.moderation.getConvos",
+      "cid": "bafyreif5k5jqz4546omvosnx2sey4apq4nebiizwo3xit6q2knf2tteoey"
+    },
+    "chat.bsky.moderation.getMessageContext": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/chat.bsky.moderation.getMessageContext",
+      "cid": "bafyreih436hnrsenvuaelqk5bz4esvjku2kz3blwh7lk5fmmjfzn5uxaei"
+    },
+    "chat.bsky.moderation.subscribeModEvents": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/chat.bsky.moderation.subscribeModEvents",
+      "cid": "bafyreifb7xeucadmhsbzezibkn4hxyezzajfydjfyy3tjmwm7bwjmiam3u"
+    },
+    "chat.bsky.moderation.updateActorAccess": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/chat.bsky.moderation.updateActorAccess",
+      "cid": "bafyreif3kv6qzqf533kjoodzu6s2cf3qypyafsntemeir6uuac4dnnzlwe"
+    },
+    "chat.bsky.notification.defs": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/chat.bsky.notification.defs",
+      "cid": "bafyreifv3xy2nhjxvr4uqfheezyp3bo2eczvihqto4kp4mmkirnpkmmt4u"
+    },
+    "chat.bsky.notification.getPreferences": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/chat.bsky.notification.getPreferences",
+      "cid": "bafyreicfjpp5ldakcwyo7wmq6e5kpwtizn5owdd7cux4pbif6s2u6dbxne"
+    },
+    "chat.bsky.notification.putPreferences": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/chat.bsky.notification.putPreferences",
+      "cid": "bafyreiatnvy5wssiuzrjtdtv3sd2yarrd3xiaijpeuvsnopq3neh52bfay"
+    },
+    "com.atproto.admin.defs": {
+      "uri": "at://did:plc:6msi3pj7krzih5qxqtryxlzw/com.atproto.lexicon.schema/com.atproto.admin.defs",
+      "cid": "bafyreicuagseedq4ko6lx6ublh6agdyeaox4pkvbaq7yj54s2d66yjk2h4"
+    },
+    "com.atproto.admin.deleteAccount": {
+      "uri": "at://did:plc:6msi3pj7krzih5qxqtryxlzw/com.atproto.lexicon.schema/com.atproto.admin.deleteAccount",
+      "cid": "bafyreigzxdce4ztwo2n5xxahr6fwd4bozc4budnaepl26mbejpa3q2ess4"
+    },
+    "com.atproto.admin.disableAccountInvites": {
+      "uri": "at://did:plc:6msi3pj7krzih5qxqtryxlzw/com.atproto.lexicon.schema/com.atproto.admin.disableAccountInvites",
+      "cid": "bafyreihi35g5ngllvyykzlq3fdfqs4xjiuao7nxg37ealsdtqcdquvj2ce"
+    },
+    "com.atproto.admin.disableInviteCodes": {
+      "uri": "at://did:plc:6msi3pj7krzih5qxqtryxlzw/com.atproto.lexicon.schema/com.atproto.admin.disableInviteCodes",
+      "cid": "bafyreiatqxhcmu23qc2nkttjf2e7gjsdhbh6x5nrqambamo5fcwq523eey"
+    },
+    "com.atproto.admin.enableAccountInvites": {
+      "uri": "at://did:plc:6msi3pj7krzih5qxqtryxlzw/com.atproto.lexicon.schema/com.atproto.admin.enableAccountInvites",
+      "cid": "bafyreid5xvqhkbpywbk5eaumneqzdcxtkj5lh45hzmcbed4exzvqk37p2i"
+    },
+    "com.atproto.admin.getAccountInfo": {
+      "uri": "at://did:plc:6msi3pj7krzih5qxqtryxlzw/com.atproto.lexicon.schema/com.atproto.admin.getAccountInfo",
+      "cid": "bafyreifcp3jeg332nfwatctxwjiokqv72tyuppb2mzwjxih7qdtr2glou4"
+    },
+    "com.atproto.admin.getAccountInfos": {
+      "uri": "at://did:plc:6msi3pj7krzih5qxqtryxlzw/com.atproto.lexicon.schema/com.atproto.admin.getAccountInfos",
+      "cid": "bafyreib7kdehrlwtxbpdkdk3hxswvjdgw63yadellwf4n32qofh5pbf2zy"
+    },
+    "com.atproto.admin.getInviteCodes": {
+      "uri": "at://did:plc:6msi3pj7krzih5qxqtryxlzw/com.atproto.lexicon.schema/com.atproto.admin.getInviteCodes",
+      "cid": "bafyreiec5v6odvpqm3qfcxmuq5nihskij7xmb5nij32vve426z6s7tii24"
+    },
+    "com.atproto.admin.getSubjectStatus": {
+      "uri": "at://did:plc:6msi3pj7krzih5qxqtryxlzw/com.atproto.lexicon.schema/com.atproto.admin.getSubjectStatus",
+      "cid": "bafyreicx3n74uhu3jtolm6vvtxx4xy3vo57iu4boxn7chocuokx3q7fazm"
+    },
+    "com.atproto.admin.searchAccounts": {
+      "uri": "at://did:plc:6msi3pj7krzih5qxqtryxlzw/com.atproto.lexicon.schema/com.atproto.admin.searchAccounts",
+      "cid": "bafyreigqi7z4ic2ljca6zvmtzha4gdnsa25gsn4pw2upqymrh6lelkzqjy"
+    },
+    "com.atproto.admin.sendEmail": {
+      "uri": "at://did:plc:6msi3pj7krzih5qxqtryxlzw/com.atproto.lexicon.schema/com.atproto.admin.sendEmail",
+      "cid": "bafyreig7vffo7s4diefuoylvl6crosfo5mcc74hlnpkd24fb3xs2wyewbi"
+    },
+    "com.atproto.admin.updateAccountEmail": {
+      "uri": "at://did:plc:6msi3pj7krzih5qxqtryxlzw/com.atproto.lexicon.schema/com.atproto.admin.updateAccountEmail",
+      "cid": "bafyreidlzhtftznouwxruqumookeupzk4iytlvm5giwziuv4m7wzi76lf4"
+    },
+    "com.atproto.admin.updateAccountHandle": {
+      "uri": "at://did:plc:6msi3pj7krzih5qxqtryxlzw/com.atproto.lexicon.schema/com.atproto.admin.updateAccountHandle",
+      "cid": "bafyreidsj323nackffydrz3buggrubayxwnhxu2v2sf3saoiao44im6dnm"
+    },
+    "com.atproto.admin.updateAccountPassword": {
+      "uri": "at://did:plc:6msi3pj7krzih5qxqtryxlzw/com.atproto.lexicon.schema/com.atproto.admin.updateAccountPassword",
+      "cid": "bafyreieptac2cku6iazjjbgn6oy2ivaleofleprdhiysprato336fapghq"
+    },
+    "com.atproto.admin.updateAccountSigningKey": {
+      "uri": "at://did:plc:6msi3pj7krzih5qxqtryxlzw/com.atproto.lexicon.schema/com.atproto.admin.updateAccountSigningKey",
+      "cid": "bafyreibzf73rasuo5rhzjjugexi5l7tpyahcmmjg2rl2bweoxyb3672cca"
+    },
+    "com.atproto.admin.updateSubjectStatus": {
+      "uri": "at://did:plc:6msi3pj7krzih5qxqtryxlzw/com.atproto.lexicon.schema/com.atproto.admin.updateSubjectStatus",
+      "cid": "bafyreieirresnt6qdfshzsaaikwpstoql5q5n7vlbfadkmjwzuweeojuyu"
+    },
+    "com.atproto.identity.defs": {
+      "uri": "at://did:plc:6msi3pj7krzih5qxqtryxlzw/com.atproto.lexicon.schema/com.atproto.identity.defs",
+      "cid": "bafyreiftikhen7lwpyay4e4sycmmflexkroqjwwpfuqtmog3vjhs2qnz3m"
+    },
+    "com.atproto.identity.getRecommendedDidCredentials": {
+      "uri": "at://did:plc:6msi3pj7krzih5qxqtryxlzw/com.atproto.lexicon.schema/com.atproto.identity.getRecommendedDidCredentials",
+      "cid": "bafyreidkfpbromp7kjmpbzkbcamycj3722sxvcm47pabju744ytk2ljhay"
+    },
+    "com.atproto.identity.refreshIdentity": {
+      "uri": "at://did:plc:6msi3pj7krzih5qxqtryxlzw/com.atproto.lexicon.schema/com.atproto.identity.refreshIdentity",
+      "cid": "bafyreiabglay3heljv6azsioza4lbbq7ocfnllbugb4ep4cmoofvhbz74q"
+    },
+    "com.atproto.identity.requestPlcOperationSignature": {
+      "uri": "at://did:plc:6msi3pj7krzih5qxqtryxlzw/com.atproto.lexicon.schema/com.atproto.identity.requestPlcOperationSignature",
+      "cid": "bafyreiefkbiptbpxy4ijubutlp2lbjzlkdqbbvt77uguxwg2lns7ba2anm"
+    },
+    "com.atproto.identity.resolveDid": {
+      "uri": "at://did:plc:6msi3pj7krzih5qxqtryxlzw/com.atproto.lexicon.schema/com.atproto.identity.resolveDid",
+      "cid": "bafyreicy6cgn4agn5jnteswy624asmf74k34do54sptozrcmyrlglvnufu"
+    },
+    "com.atproto.identity.resolveHandle": {
+      "uri": "at://did:plc:6msi3pj7krzih5qxqtryxlzw/com.atproto.lexicon.schema/com.atproto.identity.resolveHandle",
+      "cid": "bafyreigckmqtt3jrtzd7tvigjatnz6ajqyafs26h5pwcudwag2anedxnmu"
+    },
+    "com.atproto.identity.resolveIdentity": {
+      "uri": "at://did:plc:6msi3pj7krzih5qxqtryxlzw/com.atproto.lexicon.schema/com.atproto.identity.resolveIdentity",
+      "cid": "bafyreibc3gr2wcoogckav25quul7dz24jnq7oevwvrve4fhanmyypujpai"
+    },
+    "com.atproto.identity.signPlcOperation": {
+      "uri": "at://did:plc:6msi3pj7krzih5qxqtryxlzw/com.atproto.lexicon.schema/com.atproto.identity.signPlcOperation",
+      "cid": "bafyreicjgnk7lmloumjsgwpk6fbnplcu7or23edto4vgdow2quxq2okjha"
+    },
+    "com.atproto.identity.submitPlcOperation": {
+      "uri": "at://did:plc:6msi3pj7krzih5qxqtryxlzw/com.atproto.lexicon.schema/com.atproto.identity.submitPlcOperation",
+      "cid": "bafyreigu67ehin43bdmkt5oyrwsttvzon3lsmp4fkfpzlyptpfnx2hozau"
+    },
+    "com.atproto.identity.updateHandle": {
+      "uri": "at://did:plc:6msi3pj7krzih5qxqtryxlzw/com.atproto.lexicon.schema/com.atproto.identity.updateHandle",
+      "cid": "bafyreibzqwkofzc7g5j7vatyyzolgnarm3zd2g6swegkc3ivz4xivm2buu"
+    },
+    "com.atproto.label.defs": {
+      "uri": "at://did:plc:6msi3pj7krzih5qxqtryxlzw/com.atproto.lexicon.schema/com.atproto.label.defs",
+      "cid": "bafyreidp2wpcbzl2qiob2uwoc7lhntojx3tjcr553mmahw2f5cumtm3wpm"
+    },
+    "com.atproto.label.queryLabels": {
+      "uri": "at://did:plc:6msi3pj7krzih5qxqtryxlzw/com.atproto.lexicon.schema/com.atproto.label.queryLabels",
+      "cid": "bafyreig424opkctuzynvqvbwcoqafbqzqu6tl2kilwif7ivnwcdmafbhni"
+    },
+    "com.atproto.label.subscribeLabels": {
+      "uri": "at://did:plc:6msi3pj7krzih5qxqtryxlzw/com.atproto.lexicon.schema/com.atproto.label.subscribeLabels",
+      "cid": "bafyreigeyxddcuwebpvscyy2l7s3urxsbdtzpjrljncjo4az62woytutx4"
+    },
+    "com.atproto.lexicon.resolveLexicon": {
+      "uri": "at://did:plc:6msi3pj7krzih5qxqtryxlzw/com.atproto.lexicon.schema/com.atproto.lexicon.resolveLexicon",
+      "cid": "bafyreihyejjwx2cpbv3ikfojbq57jmtmilhjjsamqwfeiwkg2vanxxaz6m"
+    },
+    "com.atproto.lexicon.schema": {
+      "uri": "at://did:plc:6msi3pj7krzih5qxqtryxlzw/com.atproto.lexicon.schema/com.atproto.lexicon.schema",
+      "cid": "bafyreigtmtzisxiuao4kcswgnbud7wmpkcnsdb6h2kenhbnaolsx7bpiq4"
+    },
+    "com.atproto.moderation.createReport": {
+      "uri": "at://did:plc:6msi3pj7krzih5qxqtryxlzw/com.atproto.lexicon.schema/com.atproto.moderation.createReport",
+      "cid": "bafyreib5kl3klngngi47k7nx2g2bmrg2roj52q3dobvuf73kr3exvn73n4"
+    },
+    "com.atproto.moderation.defs": {
+      "uri": "at://did:plc:6msi3pj7krzih5qxqtryxlzw/com.atproto.lexicon.schema/com.atproto.moderation.defs",
+      "cid": "bafyreideawy4rlpgces2oebk5q4kpurbonhb5qtl4pes7dvxsc5osaiksy"
+    },
+    "com.atproto.repo.applyWrites": {
+      "uri": "at://did:plc:6msi3pj7krzih5qxqtryxlzw/com.atproto.lexicon.schema/com.atproto.repo.applyWrites",
+      "cid": "bafyreidwfwif7k5uncwqxhpxpxhvdkgedbvp6kqy6r4nozii433lwlajba"
+    },
+    "com.atproto.repo.createRecord": {
+      "uri": "at://did:plc:6msi3pj7krzih5qxqtryxlzw/com.atproto.lexicon.schema/com.atproto.repo.createRecord",
+      "cid": "bafyreihyvpmy2l4ou2v5etx25j5lbqty6tvna7gsxdqge76rbb7gltulei"
+    },
+    "com.atproto.repo.defs": {
+      "uri": "at://did:plc:6msi3pj7krzih5qxqtryxlzw/com.atproto.lexicon.schema/com.atproto.repo.defs",
+      "cid": "bafyreigmp5xfpkhnmwr3l5o626ued2gc2ouioykj2tpgqjqqajvbvm3wlm"
+    },
+    "com.atproto.repo.deleteRecord": {
+      "uri": "at://did:plc:6msi3pj7krzih5qxqtryxlzw/com.atproto.lexicon.schema/com.atproto.repo.deleteRecord",
+      "cid": "bafyreibwdxbyhuuljujl7g4ylwdso2x2ov6yv6nk3ext3sr7kjvvubkula"
+    },
+    "com.atproto.repo.describeRepo": {
+      "uri": "at://did:plc:6msi3pj7krzih5qxqtryxlzw/com.atproto.lexicon.schema/com.atproto.repo.describeRepo",
+      "cid": "bafyreif5ho6rtknjmiqjclrfogiqyzxnix2fzpwxyftfebplkj4q23pnrm"
+    },
+    "com.atproto.repo.getRecord": {
+      "uri": "at://did:plc:6msi3pj7krzih5qxqtryxlzw/com.atproto.lexicon.schema/com.atproto.repo.getRecord",
+      "cid": "bafyreihdnm3v25uaptt5vjvnpfsfgb6fbhxew2ye3l6q4ndm7xi5wpc4vy"
+    },
+    "com.atproto.repo.importRepo": {
+      "uri": "at://did:plc:6msi3pj7krzih5qxqtryxlzw/com.atproto.lexicon.schema/com.atproto.repo.importRepo",
+      "cid": "bafyreihymzggr6n33y3ile7hiy5zekxkgqc6ypkoby5og7tr6buqiasabu"
+    },
+    "com.atproto.repo.listMissingBlobs": {
+      "uri": "at://did:plc:6msi3pj7krzih5qxqtryxlzw/com.atproto.lexicon.schema/com.atproto.repo.listMissingBlobs",
+      "cid": "bafyreiayrrhk77vn3az63mor2bepw2qnkskr5awxvpzb5xtgwtzr5z6v3u"
+    },
+    "com.atproto.repo.listRecords": {
+      "uri": "at://did:plc:6msi3pj7krzih5qxqtryxlzw/com.atproto.lexicon.schema/com.atproto.repo.listRecords",
+      "cid": "bafyreihv666jp6lxncj6amcgsu5qrvwq4rwmtc7xbxzndxqdwxamlsatee"
+    },
+    "com.atproto.repo.putRecord": {
+      "uri": "at://did:plc:6msi3pj7krzih5qxqtryxlzw/com.atproto.lexicon.schema/com.atproto.repo.putRecord",
+      "cid": "bafyreigevzo2cypxpaj5re2u35so36df4rkgx6oh4zpi4zwicfvzqfdqpa"
+    },
+    "com.atproto.repo.strongRef": {
+      "uri": "at://did:plc:6msi3pj7krzih5qxqtryxlzw/com.atproto.lexicon.schema/com.atproto.repo.strongRef",
+      "cid": "bafyreifrkdbnkvfjujntdaeigolnrjj3srrs53tfixjhmacclps72qlov4"
+    },
+    "com.atproto.repo.uploadBlob": {
+      "uri": "at://did:plc:6msi3pj7krzih5qxqtryxlzw/com.atproto.lexicon.schema/com.atproto.repo.uploadBlob",
+      "cid": "bafyreifj5rusrt7rd763rqcnyh7srwukrdn427m7qrhwyb5hiayyyq4lxe"
+    },
+    "com.atproto.server.activateAccount": {
+      "uri": "at://did:plc:6msi3pj7krzih5qxqtryxlzw/com.atproto.lexicon.schema/com.atproto.server.activateAccount",
+      "cid": "bafyreih4z7qtht643ddxszglbworpyttngm4iahyne5vp5n6puvysckc2u"
+    },
+    "com.atproto.server.checkAccountStatus": {
+      "uri": "at://did:plc:6msi3pj7krzih5qxqtryxlzw/com.atproto.lexicon.schema/com.atproto.server.checkAccountStatus",
+      "cid": "bafyreiggejdmd3ezjwphxo6jgcaf4cnwwc2jxq5so7gvet3suozhb2a52q"
+    },
+    "com.atproto.server.confirmEmail": {
+      "uri": "at://did:plc:6msi3pj7krzih5qxqtryxlzw/com.atproto.lexicon.schema/com.atproto.server.confirmEmail",
+      "cid": "bafyreigsd23jlgjwtbbvv2pueoiuji3qini232nwzhjiex6tj7ehc57cdy"
+    },
+    "com.atproto.server.createAccount": {
+      "uri": "at://did:plc:6msi3pj7krzih5qxqtryxlzw/com.atproto.lexicon.schema/com.atproto.server.createAccount",
+      "cid": "bafyreie6o2sq47ukysnnnwxcb7eocpyyazetp5n3m4u3n5f7v5xr7qn62u"
+    },
+    "com.atproto.server.createAppPassword": {
+      "uri": "at://did:plc:6msi3pj7krzih5qxqtryxlzw/com.atproto.lexicon.schema/com.atproto.server.createAppPassword",
+      "cid": "bafyreickddwu7udrphtmvpcajiittidvobrror7tztxkshnnhcxyexylbu"
+    },
+    "com.atproto.server.createInviteCode": {
+      "uri": "at://did:plc:6msi3pj7krzih5qxqtryxlzw/com.atproto.lexicon.schema/com.atproto.server.createInviteCode",
+      "cid": "bafyreicce55wknsshpysqc2torzhkuo6v555piprncrkw7glptinbssbli"
+    },
+    "com.atproto.server.createInviteCodes": {
+      "uri": "at://did:plc:6msi3pj7krzih5qxqtryxlzw/com.atproto.lexicon.schema/com.atproto.server.createInviteCodes",
+      "cid": "bafyreidpwhayukm2ytzncekfinio4dehp5y6ksmwpvrxwl4fhdnqh62ewa"
+    },
+    "com.atproto.server.createSession": {
+      "uri": "at://did:plc:6msi3pj7krzih5qxqtryxlzw/com.atproto.lexicon.schema/com.atproto.server.createSession",
+      "cid": "bafyreieftxrfcsudzvfk5l73r2cukzwa6axzkfjs2l7dxtieyqnkdngwsq"
+    },
+    "com.atproto.server.deactivateAccount": {
+      "uri": "at://did:plc:6msi3pj7krzih5qxqtryxlzw/com.atproto.lexicon.schema/com.atproto.server.deactivateAccount",
+      "cid": "bafyreicewuflgo55i4yr7wblmnfcfsrqehy6zrq5jcqap2igkniantarwu"
+    },
+    "com.atproto.server.defs": {
+      "uri": "at://did:plc:6msi3pj7krzih5qxqtryxlzw/com.atproto.lexicon.schema/com.atproto.server.defs",
+      "cid": "bafyreie6rctvespvjvdsway3keyu5yy25eqordhq44jmkxbf6roirlidwm"
+    },
+    "com.atproto.server.deleteAccount": {
+      "uri": "at://did:plc:6msi3pj7krzih5qxqtryxlzw/com.atproto.lexicon.schema/com.atproto.server.deleteAccount",
+      "cid": "bafyreie44rxc4ax3u2hg54636cgjedydzvy2q2cnifsayo3kxlpockkhzu"
+    },
+    "com.atproto.server.deleteSession": {
+      "uri": "at://did:plc:6msi3pj7krzih5qxqtryxlzw/com.atproto.lexicon.schema/com.atproto.server.deleteSession",
+      "cid": "bafyreiave4iopcsa62d5hm42ctf4n6z2ajkdqhz5evq53hmw26hghoz35q"
+    },
+    "com.atproto.server.describeServer": {
+      "uri": "at://did:plc:6msi3pj7krzih5qxqtryxlzw/com.atproto.lexicon.schema/com.atproto.server.describeServer",
+      "cid": "bafyreidjve4qbhebxzppq23ogsto6luddd63mmn7a57rmml6qi3yf7n3ee"
+    },
+    "com.atproto.server.getAccountInviteCodes": {
+      "uri": "at://did:plc:6msi3pj7krzih5qxqtryxlzw/com.atproto.lexicon.schema/com.atproto.server.getAccountInviteCodes",
+      "cid": "bafyreibeczlag36upzn67uqsheo4st47z7nbpvfrdgko777633saur7jui"
+    },
+    "com.atproto.server.getServiceAuth": {
+      "uri": "at://did:plc:6msi3pj7krzih5qxqtryxlzw/com.atproto.lexicon.schema/com.atproto.server.getServiceAuth",
+      "cid": "bafyreigjuxsvldkifmwzdrzvziq2ldomzoqizsv5umwgumjv77ld56wxyi"
+    },
+    "com.atproto.server.getSession": {
+      "uri": "at://did:plc:6msi3pj7krzih5qxqtryxlzw/com.atproto.lexicon.schema/com.atproto.server.getSession",
+      "cid": "bafyreihjh3lkkbdznrs5jfnt6mhxtnaitviqqma6zmoltt3weknwxlc5ae"
+    },
+    "com.atproto.server.listAppPasswords": {
+      "uri": "at://did:plc:6msi3pj7krzih5qxqtryxlzw/com.atproto.lexicon.schema/com.atproto.server.listAppPasswords",
+      "cid": "bafyreic7ipzaep5tjfw6pzvcl5goidfhkvquzvwyfftqnlgnc6eu2sjqjy"
+    },
+    "com.atproto.server.refreshSession": {
+      "uri": "at://did:plc:6msi3pj7krzih5qxqtryxlzw/com.atproto.lexicon.schema/com.atproto.server.refreshSession",
+      "cid": "bafyreie5cdpsl3ibp473xuycfxakryp5svq4gzdcwnfdzwm5xkxyzux2ly"
+    },
+    "com.atproto.server.requestAccountDelete": {
+      "uri": "at://did:plc:6msi3pj7krzih5qxqtryxlzw/com.atproto.lexicon.schema/com.atproto.server.requestAccountDelete",
+      "cid": "bafyreietqywku2g5whu4hehlopx3mwwrnkhupuw3udhp76ovdsqrhbhzgm"
+    },
+    "com.atproto.server.requestEmailConfirmation": {
+      "uri": "at://did:plc:6msi3pj7krzih5qxqtryxlzw/com.atproto.lexicon.schema/com.atproto.server.requestEmailConfirmation",
+      "cid": "bafyreidwpigpyhtbka5bgc3qkyr6ifp2j22bwdpjuitb2b3sjy5fae6cj4"
+    },
+    "com.atproto.server.requestEmailUpdate": {
+      "uri": "at://did:plc:6msi3pj7krzih5qxqtryxlzw/com.atproto.lexicon.schema/com.atproto.server.requestEmailUpdate",
+      "cid": "bafyreibd4flizyrui5mlyv5icokqhgocw2txvgjpmxkjrd6ok43jpjbleq"
+    },
+    "com.atproto.server.requestPasswordReset": {
+      "uri": "at://did:plc:6msi3pj7krzih5qxqtryxlzw/com.atproto.lexicon.schema/com.atproto.server.requestPasswordReset",
+      "cid": "bafyreihcycgtiyv5ah2nnpbbez3qleo2y2a3cf5uvz34tcaliicke2osfa"
+    },
+    "com.atproto.server.reserveSigningKey": {
+      "uri": "at://did:plc:6msi3pj7krzih5qxqtryxlzw/com.atproto.lexicon.schema/com.atproto.server.reserveSigningKey",
+      "cid": "bafyreig4anpzivr7yutnqobuqdtta6ls6i4xbarupyud5bwztmmpnvcr2u"
+    },
+    "com.atproto.server.resetPassword": {
+      "uri": "at://did:plc:6msi3pj7krzih5qxqtryxlzw/com.atproto.lexicon.schema/com.atproto.server.resetPassword",
+      "cid": "bafyreighhpnpsmoauobk4gqxpa5qtirodft25gcxnfxme7ic5zpv73tu6u"
+    },
+    "com.atproto.server.revokeAppPassword": {
+      "uri": "at://did:plc:6msi3pj7krzih5qxqtryxlzw/com.atproto.lexicon.schema/com.atproto.server.revokeAppPassword",
+      "cid": "bafyreif7fouud77wtwkbbxrgz2ixc7pofd7klamsrxotvs4cw63dzcqqvi"
+    },
+    "com.atproto.server.updateEmail": {
+      "uri": "at://did:plc:6msi3pj7krzih5qxqtryxlzw/com.atproto.lexicon.schema/com.atproto.server.updateEmail",
+      "cid": "bafyreia57t6r2crv7hinanwkcfyhqfcbt3qnfqponrj3j5owwlepnbxb7u"
+    },
+    "com.atproto.sync.defs": {
+      "uri": "at://did:plc:6msi3pj7krzih5qxqtryxlzw/com.atproto.lexicon.schema/com.atproto.sync.defs",
+      "cid": "bafyreia6vzfbj2nfmr7kn7fwy6lnugozgimpdcg2f3vovgsa4fk6fsfhse"
+    },
+    "com.atproto.sync.getBlob": {
+      "uri": "at://did:plc:6msi3pj7krzih5qxqtryxlzw/com.atproto.lexicon.schema/com.atproto.sync.getBlob",
+      "cid": "bafyreigievymssvpqn7v5gb6q7hrlepcyzy7xko5rnfrk2ywcjcfbd3574"
+    },
+    "com.atproto.sync.getBlocks": {
+      "uri": "at://did:plc:6msi3pj7krzih5qxqtryxlzw/com.atproto.lexicon.schema/com.atproto.sync.getBlocks",
+      "cid": "bafyreie5jvieoangaotlziavns65njosj5pklfqv6u5psgtkhdgmk25lpa"
+    },
+    "com.atproto.sync.getCheckout": {
+      "uri": "at://did:plc:6msi3pj7krzih5qxqtryxlzw/com.atproto.lexicon.schema/com.atproto.sync.getCheckout",
+      "cid": "bafyreiba6hvjo2chopkgwsy5n2sumywx2qhqvqycd5a6tqfsnbf5nodkzm"
+    },
+    "com.atproto.sync.getHead": {
+      "uri": "at://did:plc:6msi3pj7krzih5qxqtryxlzw/com.atproto.lexicon.schema/com.atproto.sync.getHead",
+      "cid": "bafyreiecq2pcytdy56ucv22a7snlt5lgacmfvemioj5jjyco6uo7t7akwi"
+    },
+    "com.atproto.sync.getHostStatus": {
+      "uri": "at://did:plc:6msi3pj7krzih5qxqtryxlzw/com.atproto.lexicon.schema/com.atproto.sync.getHostStatus",
+      "cid": "bafyreiazetpylsjgp5qfnu6qfb6ahthgjw7spbcl7hpyiz3srl7wnebdsq"
+    },
+    "com.atproto.sync.getLatestCommit": {
+      "uri": "at://did:plc:6msi3pj7krzih5qxqtryxlzw/com.atproto.lexicon.schema/com.atproto.sync.getLatestCommit",
+      "cid": "bafyreifewzvfus7z6rnmtv74lpulhldvikqmhzepwqdlaqmhllgyg4oejq"
+    },
+    "com.atproto.sync.getRecord": {
+      "uri": "at://did:plc:6msi3pj7krzih5qxqtryxlzw/com.atproto.lexicon.schema/com.atproto.sync.getRecord",
+      "cid": "bafyreiermob6nqcfc6hlhmvuo7jv3imo7hfy3og34oom2p3qe6tldajoru"
+    },
+    "com.atproto.sync.getRepo": {
+      "uri": "at://did:plc:6msi3pj7krzih5qxqtryxlzw/com.atproto.lexicon.schema/com.atproto.sync.getRepo",
+      "cid": "bafyreieyt5x6wf4pgcn56tb2724uplmwcqjivkubmi25km3xrvroz6dw5q"
+    },
+    "com.atproto.sync.getRepoStatus": {
+      "uri": "at://did:plc:6msi3pj7krzih5qxqtryxlzw/com.atproto.lexicon.schema/com.atproto.sync.getRepoStatus",
+      "cid": "bafyreidv752rhe2abwz2rp2akok2gnopmsk4wlwrwsf22uwhfzst6nh4ry"
+    },
+    "com.atproto.sync.listBlobs": {
+      "uri": "at://did:plc:6msi3pj7krzih5qxqtryxlzw/com.atproto.lexicon.schema/com.atproto.sync.listBlobs",
+      "cid": "bafyreidjsbhbe5rstmx5tjbbjjrznqr2ehlqkdklvlnhlcndhdjycnuc4a"
+    },
+    "com.atproto.sync.listHosts": {
+      "uri": "at://did:plc:6msi3pj7krzih5qxqtryxlzw/com.atproto.lexicon.schema/com.atproto.sync.listHosts",
+      "cid": "bafyreigxo77zttzvqzmhhvttfs7kom5npwjxkapmnmpirjyg7oui5tpwbe"
+    },
+    "com.atproto.sync.listRepos": {
+      "uri": "at://did:plc:6msi3pj7krzih5qxqtryxlzw/com.atproto.lexicon.schema/com.atproto.sync.listRepos",
+      "cid": "bafyreic6q46ptlr4kv4eonzw3isiqegom5ldr32onhrv2kyrmppgakss2i"
+    },
+    "com.atproto.sync.listReposByCollection": {
+      "uri": "at://did:plc:6msi3pj7krzih5qxqtryxlzw/com.atproto.lexicon.schema/com.atproto.sync.listReposByCollection",
+      "cid": "bafyreicl2azqcl4poa5cqyp3ghlomqkzswmu4uqff6cpwk2c7bjrhth75y"
+    },
+    "com.atproto.sync.notifyOfUpdate": {
+      "uri": "at://did:plc:6msi3pj7krzih5qxqtryxlzw/com.atproto.lexicon.schema/com.atproto.sync.notifyOfUpdate",
+      "cid": "bafyreigohysvh6tjme6ihyygbrnjckr7e3rgmsoes6tx7xxhszulbek6gm"
+    },
+    "com.atproto.sync.requestCrawl": {
+      "uri": "at://did:plc:6msi3pj7krzih5qxqtryxlzw/com.atproto.lexicon.schema/com.atproto.sync.requestCrawl",
+      "cid": "bafyreiepdcevsxqy6matus3wn2n3htnyihgc3etubne2ay3idq7h523hte"
+    },
+    "com.atproto.sync.subscribeRepos": {
+      "uri": "at://did:plc:6msi3pj7krzih5qxqtryxlzw/com.atproto.lexicon.schema/com.atproto.sync.subscribeRepos",
+      "cid": "bafyreid5fdkjulxpnbfqwi4hjehx7ibzzj2h5ln7nachurdzqcpihytbuu"
+    },
+    "com.germnetwork.declaration": {
+      "uri": "at://did:plc:qyqmmncrm6qx33kpy7vqndik/com.atproto.lexicon.schema/com.germnetwork.declaration",
+      "cid": "bafyreickqsspgkujwucg3low5or64ywjryf44eua6xtszd6zsl2yteumoi"
+    },
+    "tools.ozone.report.defs": {
+      "uri": "at://did:plc:33dt5kftu3jq2h5h4jjlqezt/com.atproto.lexicon.schema/tools.ozone.report.defs",
+      "cid": "bafyreic3l2rmh2ugirt3jz372wcvy333m7t2ynlyzj2k54oshijs6lxdfu"
+    }
+  }
+}
diff --git a/lexicons/app/bsky/actor/defs.json b/lexicons/app/bsky/actor/defs.json
new file mode 100644
index 0000000000..2e6403ff51
--- /dev/null
+++ b/lexicons/app/bsky/actor/defs.json
@@ -0,0 +1,994 @@
+{
+  "id": "app.bsky.actor.defs",
+  "defs": {
+    "nux": {
+      "type": "object",
+      "required": [
+        "id",
+        "completed"
+      ],
+      "properties": {
+        "id": {
+          "type": "string",
+          "maxLength": 100
+        },
+        "data": {
+          "type": "string",
+          "maxLength": 3000,
+          "description": "Arbitrary data for the NUX. The structure is defined by the NUX itself. Limited to 300 characters.",
+          "maxGraphemes": 300
+        },
+        "completed": {
+          "type": "boolean",
+          "default": false
+        },
+        "expiresAt": {
+          "type": "string",
+          "format": "datetime",
+          "description": "The date and time at which the NUX will expire and should be considered completed."
+        }
+      },
+      "description": "A new user experiences (NUX) storage object"
+    },
+    "mutedWord": {
+      "type": "object",
+      "required": [
+        "value",
+        "targets"
+      ],
+      "properties": {
+        "id": {
+          "type": "string"
+        },
+        "value": {
+          "type": "string",
+          "maxLength": 10000,
+          "description": "The muted word itself.",
+          "maxGraphemes": 1000
+        },
+        "targets": {
+          "type": "array",
+          "items": {
+            "ref": "app.bsky.actor.defs#mutedWordTarget",
+            "type": "ref"
+          },
+          "description": "The intended targets of the muted word."
+        },
+        "expiresAt": {
+          "type": "string",
+          "format": "datetime",
+          "description": "The date and time at which the muted word will expire and no longer be applied."
+        },
+        "actorTarget": {
+          "type": "string",
+          "default": "all",
+          "description": "Groups of users to apply the muted word to. If undefined, applies to all users.",
+          "knownValues": [
+            "all",
+            "exclude-following"
+          ]
+        }
+      },
+      "description": "A word that the account owner has muted."
+    },
+    "savedFeed": {
+      "type": "object",
+      "required": [
+        "id",
+        "type",
+        "value",
+        "pinned"
+      ],
+      "properties": {
+        "id": {
+          "type": "string"
+        },
+        "type": {
+          "type": "string",
+          "knownValues": [
+            "feed",
+            "list",
+            "timeline"
+          ]
+        },
+        "value": {
+          "type": "string"
+        },
+        "pinned": {
+          "type": "boolean"
+        }
+      }
+    },
+    "statusView": {
+      "type": "object",
+      "required": [
+        "status",
+        "record"
+      ],
+      "properties": {
+        "cid": {
+          "type": "string",
+          "format": "cid"
+        },
+        "uri": {
+          "type": "string",
+          "format": "at-uri"
+        },
+        "embed": {
+          "refs": [
+            "app.bsky.embed.external#view"
+          ],
+          "type": "union",
+          "description": "An optional embed associated with the status."
+        },
+        "labels": {
+          "type": "array",
+          "items": {
+            "ref": "com.atproto.label.defs#label",
+            "type": "ref"
+          }
+        },
+        "record": {
+          "type": "unknown"
+        },
+        "status": {
+          "type": "string",
+          "description": "The status for the account.",
+          "knownValues": [
+            "app.bsky.actor.status#live"
+          ]
+        },
+        "isActive": {
+          "type": "boolean",
+          "description": "True if the status is not expired, false if it is expired. Only present if expiration was set."
+        },
+        "expiresAt": {
+          "type": "string",
+          "format": "datetime",
+          "description": "The date when this status will expire. The application might choose to no longer return the status after expiration."
+        },
+        "isDisabled": {
+          "type": "boolean",
+          "description": "True if the user's go-live access has been disabled by a moderator, false otherwise."
+        }
+      }
+    },
+    "preferences": {
+      "type": "array",
+      "items": {
+        "refs": [
+          "#adultContentPref",
+          "#contentLabelPref",
+          "#savedFeedsPref",
+          "#savedFeedsPrefV2",
+          "#personalDetailsPref",
+          "#declaredAgePref",
+          "#feedViewPref",
+          "#threadViewPref",
+          "#interestsPref",
+          "#mutedWordsPref",
+          "#hiddenPostsPref",
+          "#bskyAppStatePref",
+          "#labelersPref",
+          "#postInteractionSettingsPref",
+          "#verificationPrefs",
+          "#liveEventPreferences"
+        ],
+        "type": "union"
+      }
+    },
+    "profileView": {
+      "type": "object",
+      "required": [
+        "did",
+        "handle"
+      ],
+      "properties": {
+        "did": {
+          "type": "string",
+          "format": "did"
+        },
+        "debug": {
+          "type": "unknown",
+          "description": "Debug information for internal development"
+        },
+        "avatar": {
+          "type": "string",
+          "format": "uri"
+        },
+        "handle": {
+          "type": "string",
+          "format": "handle"
+        },
+        "labels": {
+          "type": "array",
+          "items": {
+            "ref": "com.atproto.label.defs#label",
+            "type": "ref"
+          }
+        },
+        "status": {
+          "ref": "#statusView",
+          "type": "ref"
+        },
+        "viewer": {
+          "ref": "#viewerState",
+          "type": "ref"
+        },
+        "pronouns": {
+          "type": "string"
+        },
+        "createdAt": {
+          "type": "string",
+          "format": "datetime"
+        },
+        "indexedAt": {
+          "type": "string",
+          "format": "datetime"
+        },
+        "associated": {
+          "ref": "#profileAssociated",
+          "type": "ref"
+        },
+        "description": {
+          "type": "string",
+          "maxLength": 2560,
+          "maxGraphemes": 256
+        },
+        "displayName": {
+          "type": "string",
+          "maxLength": 640,
+          "maxGraphemes": 64
+        },
+        "verification": {
+          "ref": "#verificationState",
+          "type": "ref"
+        }
+      }
+    },
+    "viewerState": {
+      "type": "object",
+      "properties": {
+        "muted": {
+          "type": "boolean",
+          "description": "Whether the account is fully muted, directly or via a mutelist. False when the mute is scoped to specific kinds; see mutedOnlyReposts and mutedOnlyQuoteposts."
+        },
+        "blocking": {
+          "type": "string",
+          "format": "at-uri"
+        },
+        "blockedBy": {
+          "type": "boolean"
+        },
+        "following": {
+          "type": "string",
+          "format": "at-uri"
+        },
+        "followedBy": {
+          "type": "string",
+          "format": "at-uri"
+        },
+        "mutedByList": {
+          "ref": "app.bsky.graph.defs#listViewBasic",
+          "type": "ref"
+        },
+        "blockingByList": {
+          "ref": "app.bsky.graph.defs#listViewBasic",
+          "type": "ref"
+        },
+        "knownFollowers": {
+          "ref": "#knownFollowers",
+          "type": "ref",
+          "description": "This property is present only in selected cases, as an optimization."
+        },
+        "mutedOnlyReposts": {
+          "type": "boolean",
+          "description": "Whether the account's reposts are muted. Scoped mutes are exclusive with muted: this can be true while muted is false. If muted is true, this will be false."
+        },
+        "mutedOnlyQuoteposts": {
+          "type": "boolean",
+          "description": "Whether the account's quote posts are muted. Scoped mutes are exclusive with muted: this can be true while muted is false. If muted is true, this will be false."
+        },
+        "activitySubscription": {
+          "ref": "app.bsky.notification.defs#activitySubscription",
+          "type": "ref",
+          "description": "This property is present only in selected cases, as an optimization."
+        }
+      },
+      "description": "Metadata about the requesting account's relationship with the subject account. Only has meaningful content for authed requests."
+    },
+    "feedViewPref": {
+      "type": "object",
+      "required": [
+        "feed"
+      ],
+      "properties": {
+        "feed": {
+          "type": "string",
+          "description": "The URI of the feed, or an identifier which describes the feed."
+        },
+        "hideReplies": {
+          "type": "boolean",
+          "description": "Hide replies in the feed."
+        },
+        "hideReposts": {
+          "type": "boolean",
+          "description": "Hide reposts in the feed."
+        },
+        "hideQuotePosts": {
+          "type": "boolean",
+          "description": "Hide quote posts in the feed."
+        },
+        "hideRepliesByLikeCount": {
+          "type": "integer",
+          "description": "Hide replies in the feed if they do not have this number of likes."
+        },
+        "hideRepliesByUnfollowed": {
+          "type": "boolean",
+          "default": true,
+          "description": "Hide replies in the feed if they are not by followed users."
+        }
+      }
+    },
+    "labelersPref": {
+      "type": "object",
+      "required": [
+        "labelers"
+      ],
+      "properties": {
+        "labelers": {
+          "type": "array",
+          "items": {
+            "ref": "#labelerPrefItem",
+            "type": "ref"
+          }
+        }
+      }
+    },
+    "interestsPref": {
+      "type": "object",
+      "required": [
+        "tags"
+      ],
+      "properties": {
+        "tags": {
+          "type": "array",
+          "items": {
+            "type": "string",
+            "maxLength": 640,
+            "maxGraphemes": 64
+          },
+          "maxLength": 100,
+          "description": "A list of tags which describe the account owner's interests gathered during onboarding."
+        }
+      }
+    },
+    "knownFollowers": {
+      "type": "object",
+      "required": [
+        "count",
+        "followers"
+      ],
+      "properties": {
+        "count": {
+          "type": "integer"
+        },
+        "followers": {
+          "type": "array",
+          "items": {
+            "ref": "#profileViewBasic",
+            "type": "ref"
+          },
+          "maxLength": 5,
+          "minLength": 0
+        }
+      },
+      "description": "The subject's followers whom you also follow"
+    },
+    "mutedWordsPref": {
+      "type": "object",
+      "required": [
+        "items"
+      ],
+      "properties": {
+        "items": {
+          "type": "array",
+          "items": {
+            "ref": "app.bsky.actor.defs#mutedWord",
+            "type": "ref"
+          },
+          "description": "A list of words the account owner has muted."
+        }
+      }
+    },
+    "savedFeedsPref": {
+      "type": "object",
+      "required": [
+        "pinned",
+        "saved"
+      ],
+      "properties": {
+        "saved": {
+          "type": "array",
+          "items": {
+            "type": "string",
+            "format": "at-uri"
+          }
+        },
+        "pinned": {
+          "type": "array",
+          "items": {
+            "type": "string",
+            "format": "at-uri"
+          }
+        },
+        "timelineIndex": {
+          "type": "integer"
+        }
+      }
+    },
+    "threadViewPref": {
+      "type": "object",
+      "properties": {
+        "sort": {
+          "type": "string",
+          "description": "Sorting mode for threads.",
+          "knownValues": [
+            "oldest",
+            "newest",
+            "most-likes",
+            "random",
+            "hotness"
+          ]
+        }
+      }
+    },
+    "declaredAgePref": {
+      "type": "object",
+      "properties": {
+        "isOverAge13": {
+          "type": "boolean",
+          "description": "Indicates if the user has declared that they are over 13 years of age."
+        },
+        "isOverAge16": {
+          "type": "boolean",
+          "description": "Indicates if the user has declared that they are over 16 years of age."
+        },
+        "isOverAge18": {
+          "type": "boolean",
+          "description": "Indicates if the user has declared that they are over 18 years of age."
+        }
+      },
+      "description": "Read-only preference containing value(s) inferred from the user's declared birthdate. Absence of this preference object in the response indicates that the user has not made a declaration."
+    },
+    "hiddenPostsPref": {
+      "type": "object",
+      "required": [
+        "items"
+      ],
+      "properties": {
+        "items": {
+          "type": "array",
+          "items": {
+            "type": "string",
+            "format": "at-uri"
+          },
+          "description": "A list of URIs of posts the account owner has hidden."
+        }
+      }
+    },
+    "labelerPrefItem": {
+      "type": "object",
+      "required": [
+        "did"
+      ],
+      "properties": {
+        "did": {
+          "type": "string",
+          "format": "did"
+        }
+      }
+    },
+    "mutedWordTarget": {
+      "type": "string",
+      "maxLength": 640,
+      "knownValues": [
+        "content",
+        "tag"
+      ],
+      "maxGraphemes": 64
+    },
+    "adultContentPref": {
+      "type": "object",
+      "required": [
+        "enabled"
+      ],
+      "properties": {
+        "enabled": {
+          "type": "boolean",
+          "default": false
+        }
+      }
+    },
+    "bskyAppStatePref": {
+      "type": "object",
+      "properties": {
+        "nuxs": {
+          "type": "array",
+          "items": {
+            "ref": "app.bsky.actor.defs#nux",
+            "type": "ref"
+          },
+          "maxLength": 100,
+          "description": "Storage for NUXs the user has encountered."
+        },
+        "isBetaUser": {
+          "type": "boolean",
+          "description": "Indicates if the user is participating in the beta features program."
+        },
+        "queuedNudges": {
+          "type": "array",
+          "items": {
+            "type": "string",
+            "maxLength": 100
+          },
+          "maxLength": 1000,
+          "description": "An array of tokens which identify nudges (modals, popups, tours, highlight dots) that should be shown to the user."
+        },
+        "activeProgressGuide": {
+          "ref": "#bskyAppProgressGuide",
+          "type": "ref"
+        }
+      },
+      "description": "A grab bag of state that's specific to the bsky.app program. Third-party apps shouldn't use this."
+    },
+    "contentLabelPref": {
+      "type": "object",
+      "required": [
+        "label",
+        "visibility"
+      ],
+      "properties": {
+        "label": {
+          "type": "string"
+        },
+        "labelerDid": {
+          "type": "string",
+          "format": "did",
+          "description": "Which labeler does this preference apply to? If undefined, applies globally."
+        },
+        "visibility": {
+          "type": "string",
+          "knownValues": [
+            "ignore",
+            "show",
+            "warn",
+            "hide"
+          ]
+        }
+      }
+    },
+    "profileViewBasic": {
+      "type": "object",
+      "required": [
+        "did",
+        "handle"
+      ],
+      "properties": {
+        "did": {
+          "type": "string",
+          "format": "did"
+        },
+        "debug": {
+          "type": "unknown",
+          "description": "Debug information for internal development"
+        },
+        "avatar": {
+          "type": "string",
+          "format": "uri"
+        },
+        "handle": {
+          "type": "string",
+          "format": "handle"
+        },
+        "labels": {
+          "type": "array",
+          "items": {
+            "ref": "com.atproto.label.defs#label",
+            "type": "ref"
+          }
+        },
+        "status": {
+          "ref": "#statusView",
+          "type": "ref"
+        },
+        "viewer": {
+          "ref": "#viewerState",
+          "type": "ref"
+        },
+        "pronouns": {
+          "type": "string"
+        },
+        "createdAt": {
+          "type": "string",
+          "format": "datetime"
+        },
+        "associated": {
+          "ref": "#profileAssociated",
+          "type": "ref"
+        },
+        "displayName": {
+          "type": "string",
+          "maxLength": 640,
+          "maxGraphemes": 64
+        },
+        "verification": {
+          "ref": "#verificationState",
+          "type": "ref"
+        }
+      }
+    },
+    "savedFeedsPrefV2": {
+      "type": "object",
+      "required": [
+        "items"
+      ],
+      "properties": {
+        "items": {
+          "type": "array",
+          "items": {
+            "ref": "app.bsky.actor.defs#savedFeed",
+            "type": "ref"
+          }
+        }
+      }
+    },
+    "verificationView": {
+      "type": "object",
+      "required": [
+        "issuer",
+        "uri",
+        "isValid",
+        "createdAt"
+      ],
+      "properties": {
+        "uri": {
+          "type": "string",
+          "format": "at-uri",
+          "description": "The AT-URI of the verification record."
+        },
+        "issuer": {
+          "type": "string",
+          "format": "did",
+          "description": "The user who issued this verification."
+        },
+        "isValid": {
+          "type": "boolean",
+          "description": "True if the verification passes validation, otherwise false."
+        },
+        "createdAt": {
+          "type": "string",
+          "format": "datetime",
+          "description": "Timestamp when the verification was created."
+        },
+        "issuerHandle": {
+          "type": "string",
+          "format": "handle",
+          "description": "The handle of the issuer."
+        },
+        "issuerDisplayName": {
+          "type": "string",
+          "description": "The display name of the issuer."
+        }
+      },
+      "description": "An individual verification for an associated subject."
+    },
+    "profileAssociated": {
+      "type": "object",
+      "properties": {
+        "chat": {
+          "ref": "#profileAssociatedChat",
+          "type": "ref"
+        },
+        "germ": {
+          "ref": "#profileAssociatedGerm",
+          "type": "ref"
+        },
+        "lists": {
+          "type": "integer"
+        },
+        "labeler": {
+          "type": "boolean"
+        },
+        "feedgens": {
+          "type": "integer"
+        },
+        "starterPacks": {
+          "type": "integer"
+        },
+        "activitySubscription": {
+          "ref": "#profileAssociatedActivitySubscription",
+          "type": "ref"
+        }
+      }
+    },
+    "verificationPrefs": {
+      "type": "object",
+      "required": [],
+      "properties": {
+        "hideBadges": {
+          "type": "boolean",
+          "default": false,
+          "description": "Hide the blue check badges for verified accounts and trusted verifiers."
+        }
+      },
+      "description": "Preferences for how verified accounts appear in the app."
+    },
+    "verificationState": {
+      "type": "object",
+      "required": [
+        "verifications",
+        "verifiedStatus",
+        "trustedVerifierStatus"
+      ],
+      "properties": {
+        "verifications": {
+          "type": "array",
+          "items": {
+            "ref": "#verificationView",
+            "type": "ref"
+          },
+          "description": "All verifications issued by trusted verifiers on behalf of this user. Verifications by untrusted verifiers are not included."
+        },
+        "verifiedStatus": {
+          "type": "string",
+          "description": "The user's status as a verified account.",
+          "knownValues": [
+            "valid",
+            "invalid",
+            "none"
+          ]
+        },
+        "trustedVerifierStatus": {
+          "type": "string",
+          "description": "The user's status as a trusted verifier.",
+          "knownValues": [
+            "valid",
+            "invalid",
+            "none"
+          ]
+        }
+      },
+      "description": "Represents the verification information about the user this object is attached to."
+    },
+    "personalDetailsPref": {
+      "type": "object",
+      "properties": {
+        "birthDate": {
+          "type": "string",
+          "format": "datetime",
+          "description": "The birth date of account owner."
+        }
+      }
+    },
+    "profileViewDetailed": {
+      "type": "object",
+      "required": [
+        "did",
+        "handle"
+      ],
+      "properties": {
+        "did": {
+          "type": "string",
+          "format": "did"
+        },
+        "debug": {
+          "type": "unknown",
+          "description": "Debug information for internal development"
+        },
+        "avatar": {
+          "type": "string",
+          "format": "uri"
+        },
+        "banner": {
+          "type": "string",
+          "format": "uri"
+        },
+        "handle": {
+          "type": "string",
+          "format": "handle"
+        },
+        "labels": {
+          "type": "array",
+          "items": {
+            "ref": "com.atproto.label.defs#label",
+            "type": "ref"
+          }
+        },
+        "status": {
+          "ref": "#statusView",
+          "type": "ref"
+        },
+        "viewer": {
+          "ref": "#viewerState",
+          "type": "ref"
+        },
+        "website": {
+          "type": "string",
+          "format": "uri"
+        },
+        "pronouns": {
+          "type": "string"
+        },
+        "createdAt": {
+          "type": "string",
+          "format": "datetime"
+        },
+        "indexedAt": {
+          "type": "string",
+          "format": "datetime"
+        },
+        "associated": {
+          "ref": "#profileAssociated",
+          "type": "ref"
+        },
+        "pinnedPost": {
+          "ref": "com.atproto.repo.strongRef",
+          "type": "ref"
+        },
+        "postsCount": {
+          "type": "integer"
+        },
+        "description": {
+          "type": "string",
+          "maxLength": 2560,
+          "maxGraphemes": 256
+        },
+        "displayName": {
+          "type": "string",
+          "maxLength": 640,
+          "maxGraphemes": 64
+        },
+        "followsCount": {
+          "type": "integer"
+        },
+        "verification": {
+          "ref": "#verificationState",
+          "type": "ref"
+        },
+        "followersCount": {
+          "type": "integer"
+        },
+        "joinedViaStarterPack": {
+          "ref": "app.bsky.graph.defs#starterPackViewBasic",
+          "type": "ref"
+        }
+      }
+    },
+    "bskyAppProgressGuide": {
+      "type": "object",
+      "required": [
+        "guide"
+      ],
+      "properties": {
+        "guide": {
+          "type": "string",
+          "maxLength": 100
+        }
+      },
+      "description": "If set, an active progress guide. Once completed, can be set to undefined. Should have unspecced fields tracking progress."
+    },
+    "liveEventPreferences": {
+      "type": "object",
+      "properties": {
+        "hideAllFeeds": {
+          "type": "boolean",
+          "default": false,
+          "description": "Whether to hide all feeds from live events."
+        },
+        "hiddenFeedIds": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "description": "A list of feed IDs that the user has hidden from live events."
+        }
+      },
+      "description": "Preferences for live events."
+    },
+    "profileAssociatedChat": {
+      "type": "object",
+      "required": [
+        "allowIncoming"
+      ],
+      "properties": {
+        "allowIncoming": {
+          "type": "string",
+          "knownValues": [
+            "all",
+            "none",
+            "following"
+          ]
+        },
+        "allowGroupInvites": {
+          "type": "string",
+          "knownValues": [
+            "all",
+            "none",
+            "following"
+          ]
+        }
+      }
+    },
+    "profileAssociatedGerm": {
+      "type": "object",
+      "required": [
+        "showButtonTo",
+        "messageMeUrl"
+      ],
+      "properties": {
+        "messageMeUrl": {
+          "type": "string",
+          "format": "uri"
+        },
+        "showButtonTo": {
+          "type": "string",
+          "knownValues": [
+            "usersIFollow",
+            "everyone"
+          ]
+        }
+      }
+    },
+    "postInteractionSettingsPref": {
+      "type": "object",
+      "required": [],
+      "properties": {
+        "threadgateAllowRules": {
+          "type": "array",
+          "items": {
+            "refs": [
+              "app.bsky.feed.threadgate#mentionRule",
+              "app.bsky.feed.threadgate#followerRule",
+              "app.bsky.feed.threadgate#followingRule",
+              "app.bsky.feed.threadgate#listRule"
+            ],
+            "type": "union"
+          },
+          "maxLength": 5,
+          "description": "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."
+        },
+        "postgateEmbeddingRules": {
+          "type": "array",
+          "items": {
+            "refs": [
+              "app.bsky.feed.postgate#disableRule"
+            ],
+            "type": "union"
+          },
+          "maxLength": 5,
+          "description": "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."
+        }
+      },
+      "description": "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."
+    },
+    "profileAssociatedActivitySubscription": {
+      "type": "object",
+      "required": [
+        "allowSubscriptions"
+      ],
+      "properties": {
+        "allowSubscriptions": {
+          "type": "string",
+          "knownValues": [
+            "followers",
+            "mutuals",
+            "none"
+          ]
+        }
+      }
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/actor/getPreferences.json b/lexicons/app/bsky/actor/getPreferences.json
new file mode 100644
index 0000000000..513d27e6a9
--- /dev/null
+++ b/lexicons/app/bsky/actor/getPreferences.json
@@ -0,0 +1,30 @@
+{
+  "id": "app.bsky.actor.getPreferences",
+  "defs": {
+    "main": {
+      "type": "query",
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "preferences"
+          ],
+          "properties": {
+            "preferences": {
+              "ref": "app.bsky.actor.defs#preferences",
+              "type": "ref"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "parameters": {
+        "type": "params",
+        "properties": {}
+      },
+      "description": "Get private preferences attached to the current account. Expected use is synchronization between multiple devices, and import/export during account migration. Requires auth."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/actor/getProfile.json b/lexicons/app/bsky/actor/getProfile.json
new file mode 100644
index 0000000000..cbdde68df6
--- /dev/null
+++ b/lexicons/app/bsky/actor/getProfile.json
@@ -0,0 +1,31 @@
+{
+  "id": "app.bsky.actor.getProfile",
+  "defs": {
+    "main": {
+      "type": "query",
+      "output": {
+        "schema": {
+          "ref": "app.bsky.actor.defs#profileViewDetailed",
+          "type": "ref"
+        },
+        "encoding": "application/json"
+      },
+      "parameters": {
+        "type": "params",
+        "required": [
+          "actor"
+        ],
+        "properties": {
+          "actor": {
+            "type": "string",
+            "format": "at-identifier",
+            "description": "Handle or DID of account to fetch profile of."
+          }
+        }
+      },
+      "description": "Get detailed profile view of an actor. Does not require auth, but contains relevant metadata with auth."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/actor/getProfiles.json b/lexicons/app/bsky/actor/getProfiles.json
new file mode 100644
index 0000000000..23f0693417
--- /dev/null
+++ b/lexicons/app/bsky/actor/getProfiles.json
@@ -0,0 +1,45 @@
+{
+  "id": "app.bsky.actor.getProfiles",
+  "defs": {
+    "main": {
+      "type": "query",
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "profiles"
+          ],
+          "properties": {
+            "profiles": {
+              "type": "array",
+              "items": {
+                "ref": "app.bsky.actor.defs#profileViewDetailed",
+                "type": "ref"
+              }
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "parameters": {
+        "type": "params",
+        "required": [
+          "actors"
+        ],
+        "properties": {
+          "actors": {
+            "type": "array",
+            "items": {
+              "type": "string",
+              "format": "at-identifier"
+            },
+            "maxLength": 25
+          }
+        }
+      },
+      "description": "Get detailed profile views of multiple actors."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/actor/getSuggestions.json b/lexicons/app/bsky/actor/getSuggestions.json
new file mode 100644
index 0000000000..84afa86b36
--- /dev/null
+++ b/lexicons/app/bsky/actor/getSuggestions.json
@@ -0,0 +1,54 @@
+{
+  "id": "app.bsky.actor.getSuggestions",
+  "defs": {
+    "main": {
+      "type": "query",
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "actors"
+          ],
+          "properties": {
+            "recId": {
+              "type": "integer",
+              "description": "DEPRECATED: use recIdStr instead."
+            },
+            "actors": {
+              "type": "array",
+              "items": {
+                "ref": "app.bsky.actor.defs#profileView",
+                "type": "ref"
+              }
+            },
+            "cursor": {
+              "type": "string"
+            },
+            "recIdStr": {
+              "type": "string",
+              "description": "Snowflake for this recommendation, use when submitting recommendation events."
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "parameters": {
+        "type": "params",
+        "properties": {
+          "limit": {
+            "type": "integer",
+            "default": 50,
+            "maximum": 100,
+            "minimum": 1
+          },
+          "cursor": {
+            "type": "string"
+          }
+        }
+      },
+      "description": "Get a list of suggested actors. Expected use is discovery of accounts to follow during new account onboarding."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/actor/profile.json b/lexicons/app/bsky/actor/profile.json
new file mode 100644
index 0000000000..256405db65
--- /dev/null
+++ b/lexicons/app/bsky/actor/profile.json
@@ -0,0 +1,75 @@
+{
+  "id": "app.bsky.actor.profile",
+  "defs": {
+    "main": {
+      "key": "literal:self",
+      "type": "record",
+      "record": {
+        "type": "object",
+        "properties": {
+          "avatar": {
+            "type": "blob",
+            "accept": [
+              "image/png",
+              "image/jpeg"
+            ],
+            "maxSize": 1000000,
+            "description": "Small image to be displayed next to posts from account. AKA, 'profile picture'"
+          },
+          "banner": {
+            "type": "blob",
+            "accept": [
+              "image/png",
+              "image/jpeg"
+            ],
+            "maxSize": 1000000,
+            "description": "Larger horizontal image to display behind profile view."
+          },
+          "labels": {
+            "refs": [
+              "com.atproto.label.defs#selfLabels"
+            ],
+            "type": "union",
+            "description": "Self-label values, specific to the Bluesky application, on the overall account."
+          },
+          "website": {
+            "type": "string",
+            "format": "uri"
+          },
+          "pronouns": {
+            "type": "string",
+            "maxLength": 200,
+            "description": "Free-form pronouns text.",
+            "maxGraphemes": 20
+          },
+          "createdAt": {
+            "type": "string",
+            "format": "datetime"
+          },
+          "pinnedPost": {
+            "ref": "com.atproto.repo.strongRef",
+            "type": "ref"
+          },
+          "description": {
+            "type": "string",
+            "maxLength": 2560,
+            "description": "Free-form profile description text.",
+            "maxGraphemes": 256
+          },
+          "displayName": {
+            "type": "string",
+            "maxLength": 640,
+            "maxGraphemes": 64
+          },
+          "joinedViaStarterPack": {
+            "ref": "com.atproto.repo.strongRef",
+            "type": "ref"
+          }
+        }
+      },
+      "description": "A declaration of a Bluesky account profile."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/actor/putPreferences.json b/lexicons/app/bsky/actor/putPreferences.json
new file mode 100644
index 0000000000..824d5a2e80
--- /dev/null
+++ b/lexicons/app/bsky/actor/putPreferences.json
@@ -0,0 +1,26 @@
+{
+  "id": "app.bsky.actor.putPreferences",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "input": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "preferences"
+          ],
+          "properties": {
+            "preferences": {
+              "ref": "app.bsky.actor.defs#preferences",
+              "type": "ref"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "description": "Set the private preferences attached to the account."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/actor/searchActors.json b/lexicons/app/bsky/actor/searchActors.json
new file mode 100644
index 0000000000..1e097e505f
--- /dev/null
+++ b/lexicons/app/bsky/actor/searchActors.json
@@ -0,0 +1,54 @@
+{
+  "id": "app.bsky.actor.searchActors",
+  "defs": {
+    "main": {
+      "type": "query",
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "actors"
+          ],
+          "properties": {
+            "actors": {
+              "type": "array",
+              "items": {
+                "ref": "app.bsky.actor.defs#profileView",
+                "type": "ref"
+              }
+            },
+            "cursor": {
+              "type": "string"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "parameters": {
+        "type": "params",
+        "properties": {
+          "q": {
+            "type": "string",
+            "description": "Search query string. Syntax, phrase, boolean, and faceting is unspecified, but Lucene query syntax is recommended."
+          },
+          "term": {
+            "type": "string",
+            "description": "DEPRECATED: use 'q' instead."
+          },
+          "limit": {
+            "type": "integer",
+            "default": 25,
+            "maximum": 100,
+            "minimum": 1
+          },
+          "cursor": {
+            "type": "string"
+          }
+        }
+      },
+      "description": "Find actors (profiles) matching search criteria. Does not require auth."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/actor/searchActorsTypeahead.json b/lexicons/app/bsky/actor/searchActorsTypeahead.json
new file mode 100644
index 0000000000..9f11920c7e
--- /dev/null
+++ b/lexicons/app/bsky/actor/searchActorsTypeahead.json
@@ -0,0 +1,48 @@
+{
+  "id": "app.bsky.actor.searchActorsTypeahead",
+  "defs": {
+    "main": {
+      "type": "query",
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "actors"
+          ],
+          "properties": {
+            "actors": {
+              "type": "array",
+              "items": {
+                "ref": "app.bsky.actor.defs#profileViewBasic",
+                "type": "ref"
+              }
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "parameters": {
+        "type": "params",
+        "properties": {
+          "q": {
+            "type": "string",
+            "description": "Search query prefix; not a full query string."
+          },
+          "term": {
+            "type": "string",
+            "description": "DEPRECATED: use 'q' instead."
+          },
+          "limit": {
+            "type": "integer",
+            "default": 10,
+            "maximum": 100,
+            "minimum": 1
+          }
+        }
+      },
+      "description": "Find actor suggestions for a prefix search term. Expected use is for auto-completion during text field entry. Does not require auth."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/actor/status.json b/lexicons/app/bsky/actor/status.json
new file mode 100644
index 0000000000..7fd193c4d5
--- /dev/null
+++ b/lexicons/app/bsky/actor/status.json
@@ -0,0 +1,48 @@
+{
+  "id": "app.bsky.actor.status",
+  "defs": {
+    "live": {
+      "type": "token",
+      "description": "Advertises an account as currently offering live content."
+    },
+    "main": {
+      "key": "literal:self",
+      "type": "record",
+      "record": {
+        "type": "object",
+        "required": [
+          "status",
+          "createdAt"
+        ],
+        "properties": {
+          "embed": {
+            "refs": [
+              "app.bsky.embed.external"
+            ],
+            "type": "union",
+            "description": "An optional embed associated with the status."
+          },
+          "status": {
+            "type": "string",
+            "description": "The status for the account.",
+            "knownValues": [
+              "app.bsky.actor.status#live"
+            ]
+          },
+          "createdAt": {
+            "type": "string",
+            "format": "datetime"
+          },
+          "durationMinutes": {
+            "type": "integer",
+            "minimum": 1,
+            "description": "The duration of the status in minutes. Applications can choose to impose minimum and maximum limits."
+          }
+        }
+      },
+      "description": "A declaration of a Bluesky account status."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/ageassurance/begin.json b/lexicons/app/bsky/ageassurance/begin.json
new file mode 100644
index 0000000000..0354e12190
--- /dev/null
+++ b/lexicons/app/bsky/ageassurance/begin.json
@@ -0,0 +1,61 @@
+{
+  "id": "app.bsky.ageassurance.begin",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "input": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "email",
+            "language",
+            "countryCode"
+          ],
+          "properties": {
+            "email": {
+              "type": "string",
+              "description": "The user's email address to receive Age Assurance instructions."
+            },
+            "language": {
+              "type": "string",
+              "description": "The user's preferred language for communication during the Age Assurance process."
+            },
+            "regionCode": {
+              "type": "string",
+              "description": "An optional ISO 3166-2 code of the user's region or state within the country."
+            },
+            "countryCode": {
+              "type": "string",
+              "description": "An ISO 3166-1 alpha-2 code of the user's location."
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "errors": [
+        {
+          "name": "InvalidEmail"
+        },
+        {
+          "name": "DidTooLong"
+        },
+        {
+          "name": "InvalidInitiation"
+        },
+        {
+          "name": "RegionNotSupported"
+        }
+      ],
+      "output": {
+        "schema": {
+          "ref": "app.bsky.ageassurance.defs#state",
+          "type": "ref"
+        },
+        "encoding": "application/json"
+      },
+      "description": "Initiate Age Assurance for an account."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/ageassurance/defs.json b/lexicons/app/bsky/ageassurance/defs.json
new file mode 100644
index 0000000000..2589abfd0f
--- /dev/null
+++ b/lexicons/app/bsky/ageassurance/defs.json
@@ -0,0 +1,333 @@
+{
+  "id": "app.bsky.ageassurance.defs",
+  "defs": {
+    "event": {
+      "type": "object",
+      "required": [
+        "createdAt",
+        "status",
+        "access",
+        "attemptId",
+        "countryCode"
+      ],
+      "properties": {
+        "email": {
+          "type": "string",
+          "description": "The email used for Age Assurance."
+        },
+        "access": {
+          "type": "string",
+          "description": "The access level granted based on Age Assurance data we've processed.",
+          "knownValues": [
+            "unknown",
+            "none",
+            "safe",
+            "full"
+          ]
+        },
+        "initIp": {
+          "type": "string",
+          "description": "The IP address used when initiating the Age Assurance flow."
+        },
+        "initUa": {
+          "type": "string",
+          "description": "The user agent used when initiating the Age Assurance flow."
+        },
+        "status": {
+          "type": "string",
+          "description": "The status of the Age Assurance process.",
+          "knownValues": [
+            "unknown",
+            "pending",
+            "assured",
+            "blocked"
+          ]
+        },
+        "attemptId": {
+          "type": "string",
+          "description": "The unique identifier for this instance of the Age Assurance flow, in UUID format."
+        },
+        "createdAt": {
+          "type": "string",
+          "format": "datetime",
+          "description": "The date and time of this write operation."
+        },
+        "completeIp": {
+          "type": "string",
+          "description": "The IP address used when completing the Age Assurance flow."
+        },
+        "completeUa": {
+          "type": "string",
+          "description": "The user agent used when completing the Age Assurance flow."
+        },
+        "regionCode": {
+          "type": "string",
+          "description": "The ISO 3166-2 region code provided when beginning the Age Assurance flow."
+        },
+        "countryCode": {
+          "type": "string",
+          "description": "The ISO 3166-1 alpha-2 country code provided when beginning the Age Assurance flow."
+        }
+      },
+      "description": "Object used to store Age Assurance data in stash."
+    },
+    "state": {
+      "type": "object",
+      "required": [
+        "status",
+        "access"
+      ],
+      "properties": {
+        "access": {
+          "ref": "app.bsky.ageassurance.defs#access",
+          "type": "ref"
+        },
+        "status": {
+          "ref": "app.bsky.ageassurance.defs#status",
+          "type": "ref"
+        },
+        "lastInitiatedAt": {
+          "type": "string",
+          "format": "datetime",
+          "description": "The timestamp when this state was last updated."
+        }
+      },
+      "description": "The user's computed Age Assurance state."
+    },
+    "access": {
+      "type": "string",
+      "description": "The access level granted based on Age Assurance data we've processed.",
+      "knownValues": [
+        "unknown",
+        "none",
+        "safe",
+        "full"
+      ]
+    },
+    "config": {
+      "type": "object",
+      "required": [
+        "regions"
+      ],
+      "properties": {
+        "regions": {
+          "type": "array",
+          "items": {
+            "ref": "app.bsky.ageassurance.defs#configRegion",
+            "type": "ref"
+          },
+          "description": "The per-region Age Assurance configuration."
+        }
+      },
+      "description": ""
+    },
+    "status": {
+      "type": "string",
+      "description": "The status of the Age Assurance process.",
+      "knownValues": [
+        "unknown",
+        "pending",
+        "assured",
+        "blocked"
+      ]
+    },
+    "configRegion": {
+      "type": "object",
+      "required": [
+        "countryCode",
+        "minAccessAge",
+        "rules"
+      ],
+      "properties": {
+        "rules": {
+          "type": "array",
+          "items": {
+            "refs": [
+              "#configRegionRuleDefault",
+              "#configRegionRuleIfDeclaredOverAge",
+              "#configRegionRuleIfDeclaredUnderAge",
+              "#configRegionRuleIfAssuredOverAge",
+              "#configRegionRuleIfAssuredUnderAge",
+              "#configRegionRuleIfAccountNewerThan",
+              "#configRegionRuleIfAccountOlderThan"
+            ],
+            "type": "union"
+          },
+          "description": "The ordered list of Age Assurance rules that apply to this region. Rules should be applied in order, and the first matching rule determines the access level granted. The rules array should always include a default rule as the last item."
+        },
+        "platforms": {
+          "type": "array",
+          "items": {
+            "type": "string",
+            "knownValues": [
+              "web",
+              "ios",
+              "android"
+            ]
+          },
+          "description": "The platforms this configuration applies to. If omitted, the configuration applies to all platforms."
+        },
+        "regionCode": {
+          "type": "string",
+          "description": "The ISO 3166-2 region code this configuration applies to. If omitted, the configuration applies to the entire country."
+        },
+        "countryCode": {
+          "type": "string",
+          "description": "The ISO 3166-1 alpha-2 country code this configuration applies to."
+        },
+        "minAccessAge": {
+          "type": "integer",
+          "description": "The minimum age (as a whole integer) required to use Bluesky in this region."
+        },
+        "additionalVerificationMethods": {
+          "type": "array",
+          "items": {
+            "type": "string",
+            "knownValues": [
+              "device"
+            ]
+          },
+          "description": "Verification methods permitted in this region in addition to the third-party (KWS) flow, which is always supported. `device` permits using the native on-device age APIs (e.g. Apple Declared Age Range, Google Play Age Signals)."
+        }
+      },
+      "description": "The Age Assurance configuration for a specific region."
+    },
+    "stateMetadata": {
+      "type": "object",
+      "required": [],
+      "properties": {
+        "accountCreatedAt": {
+          "type": "string",
+          "format": "datetime",
+          "description": "The account creation timestamp."
+        }
+      },
+      "description": "Additional metadata needed to compute Age Assurance state client-side."
+    },
+    "configRegionRuleDefault": {
+      "type": "object",
+      "required": [
+        "access"
+      ],
+      "properties": {
+        "access": {
+          "ref": "app.bsky.ageassurance.defs#access",
+          "type": "ref"
+        }
+      },
+      "description": "Age Assurance rule that applies by default."
+    },
+    "configRegionRuleIfAssuredOverAge": {
+      "type": "object",
+      "required": [
+        "age",
+        "access"
+      ],
+      "properties": {
+        "age": {
+          "type": "integer",
+          "description": "The age threshold as a whole integer."
+        },
+        "access": {
+          "ref": "app.bsky.ageassurance.defs#access",
+          "type": "ref"
+        }
+      },
+      "description": "Age Assurance rule that applies if the user has been assured to be equal-to or over a certain age."
+    },
+    "configRegionRuleIfAssuredUnderAge": {
+      "type": "object",
+      "required": [
+        "age",
+        "access"
+      ],
+      "properties": {
+        "age": {
+          "type": "integer",
+          "description": "The age threshold as a whole integer."
+        },
+        "access": {
+          "ref": "app.bsky.ageassurance.defs#access",
+          "type": "ref"
+        }
+      },
+      "description": "Age Assurance rule that applies if the user has been assured to be under a certain age."
+    },
+    "configRegionRuleIfDeclaredOverAge": {
+      "type": "object",
+      "required": [
+        "age",
+        "access"
+      ],
+      "properties": {
+        "age": {
+          "type": "integer",
+          "description": "The age threshold as a whole integer."
+        },
+        "access": {
+          "ref": "app.bsky.ageassurance.defs#access",
+          "type": "ref"
+        }
+      },
+      "description": "Age Assurance rule that applies if the user has declared themselves equal-to or over a certain age."
+    },
+    "configRegionRuleIfAccountNewerThan": {
+      "type": "object",
+      "required": [
+        "date",
+        "access"
+      ],
+      "properties": {
+        "date": {
+          "type": "string",
+          "format": "datetime",
+          "description": "The date threshold as a datetime string."
+        },
+        "access": {
+          "ref": "app.bsky.ageassurance.defs#access",
+          "type": "ref"
+        }
+      },
+      "description": "Age Assurance rule that applies if the account is equal-to or newer than a certain date."
+    },
+    "configRegionRuleIfAccountOlderThan": {
+      "type": "object",
+      "required": [
+        "date",
+        "access"
+      ],
+      "properties": {
+        "date": {
+          "type": "string",
+          "format": "datetime",
+          "description": "The date threshold as a datetime string."
+        },
+        "access": {
+          "ref": "app.bsky.ageassurance.defs#access",
+          "type": "ref"
+        }
+      },
+      "description": "Age Assurance rule that applies if the account is older than a certain date."
+    },
+    "configRegionRuleIfDeclaredUnderAge": {
+      "type": "object",
+      "required": [
+        "age",
+        "access"
+      ],
+      "properties": {
+        "age": {
+          "type": "integer",
+          "description": "The age threshold as a whole integer."
+        },
+        "access": {
+          "ref": "app.bsky.ageassurance.defs#access",
+          "type": "ref"
+        }
+      },
+      "description": "Age Assurance rule that applies if the user has declared themselves under a certain age."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/ageassurance/getConfig.json b/lexicons/app/bsky/ageassurance/getConfig.json
new file mode 100644
index 0000000000..793d5b9519
--- /dev/null
+++ b/lexicons/app/bsky/ageassurance/getConfig.json
@@ -0,0 +1,18 @@
+{
+  "id": "app.bsky.ageassurance.getConfig",
+  "defs": {
+    "main": {
+      "type": "query",
+      "output": {
+        "schema": {
+          "ref": "app.bsky.ageassurance.defs#config",
+          "type": "ref"
+        },
+        "encoding": "application/json"
+      },
+      "description": "Returns Age Assurance configuration for use on the client."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/ageassurance/getState.json b/lexicons/app/bsky/ageassurance/getState.json
new file mode 100644
index 0000000000..42c7cd0ba9
--- /dev/null
+++ b/lexicons/app/bsky/ageassurance/getState.json
@@ -0,0 +1,45 @@
+{
+  "id": "app.bsky.ageassurance.getState",
+  "defs": {
+    "main": {
+      "type": "query",
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "state",
+            "metadata"
+          ],
+          "properties": {
+            "state": {
+              "ref": "app.bsky.ageassurance.defs#state",
+              "type": "ref"
+            },
+            "metadata": {
+              "ref": "app.bsky.ageassurance.defs#stateMetadata",
+              "type": "ref"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "parameters": {
+        "type": "params",
+        "required": [
+          "countryCode"
+        ],
+        "properties": {
+          "regionCode": {
+            "type": "string"
+          },
+          "countryCode": {
+            "type": "string"
+          }
+        }
+      },
+      "description": "Returns server-computed Age Assurance state, if available, and any additional metadata needed to compute Age Assurance state client-side."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/bookmark/createBookmark.json b/lexicons/app/bsky/bookmark/createBookmark.json
new file mode 100644
index 0000000000..378d494a2f
--- /dev/null
+++ b/lexicons/app/bsky/bookmark/createBookmark.json
@@ -0,0 +1,37 @@
+{
+  "id": "app.bsky.bookmark.createBookmark",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "input": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "uri",
+            "cid"
+          ],
+          "properties": {
+            "cid": {
+              "type": "string",
+              "format": "cid"
+            },
+            "uri": {
+              "type": "string",
+              "format": "at-uri"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "errors": [
+        {
+          "name": "UnsupportedCollection",
+          "description": "The URI to be bookmarked is for an unsupported collection."
+        }
+      ],
+      "description": "Creates a private bookmark for the specified record. Currently, only `app.bsky.feed.post` records are supported. Requires authentication."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/bookmark/defs.json b/lexicons/app/bsky/bookmark/defs.json
new file mode 100644
index 0000000000..f499e55cd5
--- /dev/null
+++ b/lexicons/app/bsky/bookmark/defs.json
@@ -0,0 +1,47 @@
+{
+  "id": "app.bsky.bookmark.defs",
+  "defs": {
+    "bookmark": {
+      "type": "object",
+      "required": [
+        "subject"
+      ],
+      "properties": {
+        "subject": {
+          "ref": "com.atproto.repo.strongRef",
+          "type": "ref",
+          "description": "A strong ref to the record to be bookmarked. Currently, only `app.bsky.feed.post` records are supported."
+        }
+      },
+      "description": "Object used to store bookmark data in stash."
+    },
+    "bookmarkView": {
+      "type": "object",
+      "required": [
+        "subject",
+        "item"
+      ],
+      "properties": {
+        "item": {
+          "refs": [
+            "app.bsky.feed.defs#blockedPost",
+            "app.bsky.feed.defs#notFoundPost",
+            "app.bsky.feed.defs#postView"
+          ],
+          "type": "union"
+        },
+        "subject": {
+          "ref": "com.atproto.repo.strongRef",
+          "type": "ref",
+          "description": "A strong ref to the bookmarked record."
+        },
+        "createdAt": {
+          "type": "string",
+          "format": "datetime"
+        }
+      }
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/bookmark/deleteBookmark.json b/lexicons/app/bsky/bookmark/deleteBookmark.json
new file mode 100644
index 0000000000..52d5c3c2f5
--- /dev/null
+++ b/lexicons/app/bsky/bookmark/deleteBookmark.json
@@ -0,0 +1,32 @@
+{
+  "id": "app.bsky.bookmark.deleteBookmark",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "input": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "uri"
+          ],
+          "properties": {
+            "uri": {
+              "type": "string",
+              "format": "at-uri"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "errors": [
+        {
+          "name": "UnsupportedCollection",
+          "description": "The URI to be bookmarked is for an unsupported collection."
+        }
+      ],
+      "description": "Deletes a private bookmark for the specified record. Currently, only `app.bsky.feed.post` records are supported. Requires authentication."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/bookmark/getBookmarks.json b/lexicons/app/bsky/bookmark/getBookmarks.json
new file mode 100644
index 0000000000..301914d4c2
--- /dev/null
+++ b/lexicons/app/bsky/bookmark/getBookmarks.json
@@ -0,0 +1,46 @@
+{
+  "id": "app.bsky.bookmark.getBookmarks",
+  "defs": {
+    "main": {
+      "type": "query",
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "bookmarks"
+          ],
+          "properties": {
+            "cursor": {
+              "type": "string"
+            },
+            "bookmarks": {
+              "type": "array",
+              "items": {
+                "ref": "app.bsky.bookmark.defs#bookmarkView",
+                "type": "ref"
+              }
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "parameters": {
+        "type": "params",
+        "properties": {
+          "limit": {
+            "type": "integer",
+            "default": 50,
+            "maximum": 100,
+            "minimum": 1
+          },
+          "cursor": {
+            "type": "string"
+          }
+        }
+      },
+      "description": "Gets views of records bookmarked by the authenticated user. Requires authentication."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/contact/defs.json b/lexicons/app/bsky/contact/defs.json
new file mode 100644
index 0000000000..68f0179fb3
--- /dev/null
+++ b/lexicons/app/bsky/contact/defs.json
@@ -0,0 +1,67 @@
+{
+  "id": "app.bsky.contact.defs",
+  "defs": {
+    "syncStatus": {
+      "type": "object",
+      "required": [
+        "syncedAt",
+        "matchesCount"
+      ],
+      "properties": {
+        "syncedAt": {
+          "type": "string",
+          "format": "datetime",
+          "description": "Last date when contacts where imported."
+        },
+        "matchesCount": {
+          "type": "integer",
+          "minimum": 0,
+          "description": "Number of existing contact matches resulting of the user imports and of their imported contacts having imported the user. Matches stop being counted when the user either follows the matched contact or dismisses the match."
+        }
+      }
+    },
+    "notification": {
+      "type": "object",
+      "required": [
+        "from",
+        "to"
+      ],
+      "properties": {
+        "to": {
+          "type": "string",
+          "format": "did",
+          "description": "The DID of who this notification should go to."
+        },
+        "from": {
+          "type": "string",
+          "format": "did",
+          "description": "The DID of who this notification comes from."
+        }
+      },
+      "description": "A stash object to be sent via bsync representing a notification to be created."
+    },
+    "matchAndContactIndex": {
+      "type": "object",
+      "required": [
+        "match",
+        "contactIndex"
+      ],
+      "properties": {
+        "match": {
+          "ref": "app.bsky.actor.defs#profileView",
+          "type": "ref",
+          "description": "Profile of the matched user."
+        },
+        "contactIndex": {
+          "type": "integer",
+          "maximum": 999,
+          "minimum": 0,
+          "description": "The index of this match in the import contact input."
+        }
+      },
+      "description": "Associates a profile with the positional index of the contact import input in the call to `app.bsky.contact.importContacts`, so clients can know which phone caused a particular match."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/contact/dismissMatch.json b/lexicons/app/bsky/contact/dismissMatch.json
new file mode 100644
index 0000000000..27cb2b3d7a
--- /dev/null
+++ b/lexicons/app/bsky/contact/dismissMatch.json
@@ -0,0 +1,42 @@
+{
+  "id": "app.bsky.contact.dismissMatch",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "input": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "subject"
+          ],
+          "properties": {
+            "subject": {
+              "type": "string",
+              "format": "did",
+              "description": "The subject's DID to dismiss the match with."
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "errors": [
+        {
+          "name": "InvalidDid"
+        },
+        {
+          "name": "InternalError"
+        }
+      ],
+      "output": {
+        "schema": {
+          "type": "object",
+          "properties": {}
+        },
+        "encoding": "application/json"
+      },
+      "description": "Removes a match that was found via contact import. It shouldn't appear again if the same contact is re-imported. Requires authentication."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/contact/getMatches.json b/lexicons/app/bsky/contact/getMatches.json
new file mode 100644
index 0000000000..cce3cac464
--- /dev/null
+++ b/lexicons/app/bsky/contact/getMatches.json
@@ -0,0 +1,60 @@
+{
+  "id": "app.bsky.contact.getMatches",
+  "defs": {
+    "main": {
+      "type": "query",
+      "errors": [
+        {
+          "name": "InvalidDid"
+        },
+        {
+          "name": "InvalidLimit"
+        },
+        {
+          "name": "InvalidCursor"
+        },
+        {
+          "name": "InternalError"
+        }
+      ],
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "matches"
+          ],
+          "properties": {
+            "cursor": {
+              "type": "string"
+            },
+            "matches": {
+              "type": "array",
+              "items": {
+                "ref": "app.bsky.actor.defs#profileView",
+                "type": "ref"
+              }
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "parameters": {
+        "type": "params",
+        "properties": {
+          "limit": {
+            "type": "integer",
+            "default": 50,
+            "maximum": 100,
+            "minimum": 1
+          },
+          "cursor": {
+            "type": "string"
+          }
+        }
+      },
+      "description": "Returns the matched contacts (contacts that were mutually imported). Excludes dismissed matches. Requires authentication."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/contact/getSyncStatus.json b/lexicons/app/bsky/contact/getSyncStatus.json
new file mode 100644
index 0000000000..53dc538f78
--- /dev/null
+++ b/lexicons/app/bsky/contact/getSyncStatus.json
@@ -0,0 +1,36 @@
+{
+  "id": "app.bsky.contact.getSyncStatus",
+  "defs": {
+    "main": {
+      "type": "query",
+      "errors": [
+        {
+          "name": "InvalidDid"
+        },
+        {
+          "name": "InternalError"
+        }
+      ],
+      "output": {
+        "schema": {
+          "type": "object",
+          "properties": {
+            "syncStatus": {
+              "ref": "app.bsky.contact.defs#syncStatus",
+              "type": "ref",
+              "description": "If present, indicates the user has imported their contacts. If not present, indicates the user never used the feature or called `app.bsky.contact.removeData` and didn't import again since."
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "parameters": {
+        "type": "params",
+        "properties": {}
+      },
+      "description": "Gets the user's current contact import status. Requires authentication."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/contact/importContacts.json b/lexicons/app/bsky/contact/importContacts.json
new file mode 100644
index 0000000000..70092e2583
--- /dev/null
+++ b/lexicons/app/bsky/contact/importContacts.json
@@ -0,0 +1,72 @@
+{
+  "id": "app.bsky.contact.importContacts",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "input": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "token",
+            "contacts"
+          ],
+          "properties": {
+            "token": {
+              "type": "string",
+              "description": "JWT to authenticate the call. Use the JWT received as a response to the call to `app.bsky.contact.verifyPhone`."
+            },
+            "contacts": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              },
+              "maxLength": 1000,
+              "minLength": 1,
+              "description": "List of phone numbers in global E.164 format (e.g., '+12125550123'). Phone numbers that cannot be normalized into a valid phone number will be discarded. Should not repeat the 'phone' input used in `app.bsky.contact.verifyPhone`."
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "errors": [
+        {
+          "name": "InvalidDid"
+        },
+        {
+          "name": "InvalidContacts"
+        },
+        {
+          "name": "TooManyContacts"
+        },
+        {
+          "name": "InvalidToken"
+        },
+        {
+          "name": "InternalError"
+        }
+      ],
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "matchesAndContactIndexes"
+          ],
+          "properties": {
+            "matchesAndContactIndexes": {
+              "type": "array",
+              "items": {
+                "ref": "app.bsky.contact.defs#matchAndContactIndex",
+                "type": "ref"
+              },
+              "description": "The users that matched during import and their indexes on the input contacts, so the client can correlate with its local list."
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "description": "Import contacts for securely matching with other users. This follows the protocol explained in https://docs.bsky.app/blog/contact-import-rfc. Requires authentication."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/contact/removeData.json b/lexicons/app/bsky/contact/removeData.json
new file mode 100644
index 0000000000..de8a938336
--- /dev/null
+++ b/lexicons/app/bsky/contact/removeData.json
@@ -0,0 +1,33 @@
+{
+  "id": "app.bsky.contact.removeData",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "input": {
+        "schema": {
+          "type": "object",
+          "properties": {}
+        },
+        "encoding": "application/json"
+      },
+      "errors": [
+        {
+          "name": "InvalidDid"
+        },
+        {
+          "name": "InternalError"
+        }
+      ],
+      "output": {
+        "schema": {
+          "type": "object",
+          "properties": {}
+        },
+        "encoding": "application/json"
+      },
+      "description": "Removes all stored hashes used for contact matching, existing matches, and sync status. Requires authentication."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/contact/sendNotification.json b/lexicons/app/bsky/contact/sendNotification.json
new file mode 100644
index 0000000000..400120ce6f
--- /dev/null
+++ b/lexicons/app/bsky/contact/sendNotification.json
@@ -0,0 +1,40 @@
+{
+  "id": "app.bsky.contact.sendNotification",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "input": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "from",
+            "to"
+          ],
+          "properties": {
+            "to": {
+              "type": "string",
+              "format": "did",
+              "description": "The DID of who this notification should go to."
+            },
+            "from": {
+              "type": "string",
+              "format": "did",
+              "description": "The DID of who this notification comes from."
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "output": {
+        "schema": {
+          "type": "object",
+          "properties": {}
+        },
+        "encoding": "application/json"
+      },
+      "description": "System endpoint to send notifications related to contact imports. Requires role authentication."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/contact/startPhoneVerification.json b/lexicons/app/bsky/contact/startPhoneVerification.json
new file mode 100644
index 0000000000..d2dcad8769
--- /dev/null
+++ b/lexicons/app/bsky/contact/startPhoneVerification.json
@@ -0,0 +1,47 @@
+{
+  "id": "app.bsky.contact.startPhoneVerification",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "input": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "phone"
+          ],
+          "properties": {
+            "phone": {
+              "type": "string",
+              "description": "The phone number to receive the code via SMS."
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "errors": [
+        {
+          "name": "RateLimitExceeded"
+        },
+        {
+          "name": "InvalidDid"
+        },
+        {
+          "name": "InvalidPhone"
+        },
+        {
+          "name": "InternalError"
+        }
+      ],
+      "output": {
+        "schema": {
+          "type": "object",
+          "properties": {}
+        },
+        "encoding": "application/json"
+      },
+      "description": "Starts a phone verification flow. The phone passed will receive a code via SMS that should be passed to `app.bsky.contact.verifyPhone`. Requires authentication."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/contact/verifyPhone.json b/lexicons/app/bsky/contact/verifyPhone.json
new file mode 100644
index 0000000000..20386c25f6
--- /dev/null
+++ b/lexicons/app/bsky/contact/verifyPhone.json
@@ -0,0 +1,63 @@
+{
+  "id": "app.bsky.contact.verifyPhone",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "input": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "phone",
+            "code"
+          ],
+          "properties": {
+            "code": {
+              "type": "string",
+              "description": "The code received via SMS as a result of the call to `app.bsky.contact.startPhoneVerification`."
+            },
+            "phone": {
+              "type": "string",
+              "description": "The phone number to verify. Should be the same as the one passed to `app.bsky.contact.startPhoneVerification`."
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "errors": [
+        {
+          "name": "RateLimitExceeded"
+        },
+        {
+          "name": "InvalidDid"
+        },
+        {
+          "name": "InvalidPhone"
+        },
+        {
+          "name": "InvalidCode"
+        },
+        {
+          "name": "InternalError"
+        }
+      ],
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "token"
+          ],
+          "properties": {
+            "token": {
+              "type": "string",
+              "description": "JWT to be used in a call to `app.bsky.contact.importContacts`. It is only valid for a single call."
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "description": "Verifies control over a phone number with a code received via SMS and starts a contact import session. Requires authentication."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/draft/createDraft.json b/lexicons/app/bsky/draft/createDraft.json
new file mode 100644
index 0000000000..d3c5c830bf
--- /dev/null
+++ b/lexicons/app/bsky/draft/createDraft.json
@@ -0,0 +1,48 @@
+{
+  "id": "app.bsky.draft.createDraft",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "input": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "draft"
+          ],
+          "properties": {
+            "draft": {
+              "ref": "app.bsky.draft.defs#draft",
+              "type": "ref"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "errors": [
+        {
+          "name": "DraftLimitReached",
+          "description": "Trying to insert a new draft when the limit was already reached."
+        }
+      ],
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "id"
+          ],
+          "properties": {
+            "id": {
+              "type": "string",
+              "format": "tid",
+              "description": "The ID of the created draft."
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "description": "Inserts a draft using private storage (stash). An upper limit of drafts might be enforced. Requires authentication."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/draft/defs.json b/lexicons/app/bsky/draft/defs.json
new file mode 100644
index 0000000000..507432944d
--- /dev/null
+++ b/lexicons/app/bsky/draft/defs.json
@@ -0,0 +1,296 @@
+{
+  "id": "app.bsky.draft.defs",
+  "defs": {
+    "draft": {
+      "type": "object",
+      "required": [
+        "posts"
+      ],
+      "properties": {
+        "langs": {
+          "type": "array",
+          "items": {
+            "type": "string",
+            "format": "language"
+          },
+          "maxLength": 3,
+          "description": "Indicates human language of posts primary text content."
+        },
+        "posts": {
+          "type": "array",
+          "items": {
+            "ref": "#draftPost",
+            "type": "ref"
+          },
+          "maxLength": 100,
+          "minLength": 1,
+          "description": "Array of draft posts that compose this draft."
+        },
+        "deviceId": {
+          "type": "string",
+          "maxLength": 100,
+          "description": "UUIDv4 identifier of the device that created this draft."
+        },
+        "deviceName": {
+          "type": "string",
+          "maxLength": 100,
+          "description": "The device and/or platform on which the draft was created."
+        },
+        "threadgateAllow": {
+          "type": "array",
+          "items": {
+            "refs": [
+              "app.bsky.feed.threadgate#mentionRule",
+              "app.bsky.feed.threadgate#followerRule",
+              "app.bsky.feed.threadgate#followingRule",
+              "app.bsky.feed.threadgate#listRule"
+            ],
+            "type": "union"
+          },
+          "maxLength": 5,
+          "description": "Allow-rules for the threadgate to be created when this draft is published."
+        },
+        "postgateEmbeddingRules": {
+          "type": "array",
+          "items": {
+            "refs": [
+              "app.bsky.feed.postgate#disableRule"
+            ],
+            "type": "union"
+          },
+          "maxLength": 5,
+          "description": "Embedding rules for the postgates to be created when this draft is published."
+        }
+      },
+      "description": "A draft containing an array of draft posts."
+    },
+    "draftPost": {
+      "type": "object",
+      "required": [
+        "text"
+      ],
+      "properties": {
+        "text": {
+          "type": "string",
+          "maxLength": 10000,
+          "description": "The primary post content. It has a higher limit than post contents to allow storing a larger text that can later be refined into smaller posts.",
+          "maxGraphemes": 1000
+        },
+        "labels": {
+          "refs": [
+            "com.atproto.label.defs#selfLabels"
+          ],
+          "type": "union",
+          "description": "Self-label values for this post. Effectively content warnings."
+        },
+        "embedImages": {
+          "type": "array",
+          "items": {
+            "ref": "#draftEmbedImage",
+            "type": "ref"
+          },
+          "maxLength": 4
+        },
+        "embedVideos": {
+          "type": "array",
+          "items": {
+            "ref": "#draftEmbedVideo",
+            "type": "ref"
+          },
+          "maxLength": 1
+        },
+        "embedGallery": {
+          "ref": "#draftEmbedGallery",
+          "type": "ref"
+        },
+        "embedRecords": {
+          "type": "array",
+          "items": {
+            "ref": "#draftEmbedRecord",
+            "type": "ref"
+          },
+          "maxLength": 1
+        },
+        "embedExternals": {
+          "type": "array",
+          "items": {
+            "ref": "#draftEmbedExternal",
+            "type": "ref"
+          },
+          "maxLength": 1
+        }
+      },
+      "description": "One of the posts that compose a draft."
+    },
+    "draftView": {
+      "type": "object",
+      "required": [
+        "id",
+        "draft",
+        "createdAt",
+        "updatedAt"
+      ],
+      "properties": {
+        "id": {
+          "type": "string",
+          "format": "tid",
+          "description": "A TID to be used as a draft identifier."
+        },
+        "draft": {
+          "ref": "#draft",
+          "type": "ref"
+        },
+        "createdAt": {
+          "type": "string",
+          "format": "datetime",
+          "description": "The time the draft was created."
+        },
+        "updatedAt": {
+          "type": "string",
+          "format": "datetime",
+          "description": "The time the draft was last updated."
+        }
+      },
+      "description": "View to present drafts data to users."
+    },
+    "draftWithId": {
+      "type": "object",
+      "required": [
+        "id",
+        "draft"
+      ],
+      "properties": {
+        "id": {
+          "type": "string",
+          "format": "tid",
+          "description": "A TID to be used as a draft identifier."
+        },
+        "draft": {
+          "ref": "#draft",
+          "type": "ref"
+        }
+      },
+      "description": "A draft with an identifier, used to store drafts in private storage (stash)."
+    },
+    "draftEmbedImage": {
+      "type": "object",
+      "required": [
+        "localRef"
+      ],
+      "properties": {
+        "alt": {
+          "type": "string",
+          "maxGraphemes": 2000
+        },
+        "localRef": {
+          "ref": "#draftEmbedLocalRef",
+          "type": "ref"
+        }
+      }
+    },
+    "draftEmbedVideo": {
+      "type": "object",
+      "required": [
+        "localRef"
+      ],
+      "properties": {
+        "alt": {
+          "type": "string",
+          "maxGraphemes": 2000
+        },
+        "captions": {
+          "type": "array",
+          "items": {
+            "ref": "#draftEmbedCaption",
+            "type": "ref"
+          },
+          "maxLength": 20
+        },
+        "localRef": {
+          "ref": "#draftEmbedLocalRef",
+          "type": "ref"
+        }
+      }
+    },
+    "draftEmbedRecord": {
+      "type": "object",
+      "required": [
+        "record"
+      ],
+      "properties": {
+        "record": {
+          "ref": "com.atproto.repo.strongRef",
+          "type": "ref"
+        }
+      }
+    },
+    "draftEmbedCaption": {
+      "type": "object",
+      "required": [
+        "lang",
+        "content"
+      ],
+      "properties": {
+        "lang": {
+          "type": "string",
+          "format": "language"
+        },
+        "content": {
+          "type": "string",
+          "maxLength": 10000
+        }
+      }
+    },
+    "draftEmbedGallery": {
+      "type": "object",
+      "required": [
+        "items"
+      ],
+      "properties": {
+        "items": {
+          "ref": "#draftEmbedGalleryItems",
+          "type": "ref"
+        }
+      }
+    },
+    "draftEmbedExternal": {
+      "type": "object",
+      "required": [
+        "uri"
+      ],
+      "properties": {
+        "uri": {
+          "type": "string",
+          "format": "uri"
+        }
+      }
+    },
+    "draftEmbedLocalRef": {
+      "type": "object",
+      "required": [
+        "path"
+      ],
+      "properties": {
+        "path": {
+          "type": "string",
+          "maxLength": 1024,
+          "minLength": 1,
+          "description": "Local, on-device ref to file to be embedded. Embeds are currently device-bound for drafts."
+        }
+      }
+    },
+    "draftEmbedGalleryItems": {
+      "type": "array",
+      "items": {
+        "refs": [
+          "#draftEmbedImage"
+        ],
+        "type": "union"
+      },
+      "maxLength": 20,
+      "description": "The schema-level maxLength of 20 is a future-proof ceiling. Clients should currently enforce a soft limit of 10 items in authoring UIs."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/draft/deleteDraft.json b/lexicons/app/bsky/draft/deleteDraft.json
new file mode 100644
index 0000000000..a88f3d48d2
--- /dev/null
+++ b/lexicons/app/bsky/draft/deleteDraft.json
@@ -0,0 +1,26 @@
+{
+  "id": "app.bsky.draft.deleteDraft",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "input": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "id"
+          ],
+          "properties": {
+            "id": {
+              "type": "string",
+              "format": "tid"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "description": "Deletes a draft by ID. Requires authentication."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/draft/getDrafts.json b/lexicons/app/bsky/draft/getDrafts.json
new file mode 100644
index 0000000000..aba35d59f8
--- /dev/null
+++ b/lexicons/app/bsky/draft/getDrafts.json
@@ -0,0 +1,46 @@
+{
+  "id": "app.bsky.draft.getDrafts",
+  "defs": {
+    "main": {
+      "type": "query",
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "drafts"
+          ],
+          "properties": {
+            "cursor": {
+              "type": "string"
+            },
+            "drafts": {
+              "type": "array",
+              "items": {
+                "ref": "app.bsky.draft.defs#draftView",
+                "type": "ref"
+              }
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "parameters": {
+        "type": "params",
+        "properties": {
+          "limit": {
+            "type": "integer",
+            "default": 50,
+            "maximum": 100,
+            "minimum": 1
+          },
+          "cursor": {
+            "type": "string"
+          }
+        }
+      },
+      "description": "Gets views of user drafts. Requires authentication."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/draft/updateDraft.json b/lexicons/app/bsky/draft/updateDraft.json
new file mode 100644
index 0000000000..a99f331e1b
--- /dev/null
+++ b/lexicons/app/bsky/draft/updateDraft.json
@@ -0,0 +1,26 @@
+{
+  "id": "app.bsky.draft.updateDraft",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "input": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "draft"
+          ],
+          "properties": {
+            "draft": {
+              "ref": "app.bsky.draft.defs#draftWithId",
+              "type": "ref"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "description": "Updates a draft using private storage (stash). If the draft ID points to a non-existing ID, the update will be silently ignored. This is done because updates don't enforce draft limit, so it accepts all writes, but will ignore invalid ones. Requires authentication."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/embed/defs.json b/lexicons/app/bsky/embed/defs.json
new file mode 100644
index 0000000000..9aff68864c
--- /dev/null
+++ b/lexicons/app/bsky/embed/defs.json
@@ -0,0 +1,25 @@
+{
+  "id": "app.bsky.embed.defs",
+  "defs": {
+    "aspectRatio": {
+      "type": "object",
+      "required": [
+        "width",
+        "height"
+      ],
+      "properties": {
+        "width": {
+          "type": "integer",
+          "minimum": 1
+        },
+        "height": {
+          "type": "integer",
+          "minimum": 1
+        }
+      },
+      "description": "width:height represents an aspect ratio. It may be approximate, and may not correspond to absolute dimensions in any given unit."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/embed/external.json b/lexicons/app/bsky/embed/external.json
new file mode 100644
index 0000000000..d4bd886490
--- /dev/null
+++ b/lexicons/app/bsky/embed/external.json
@@ -0,0 +1,210 @@
+{
+  "id": "app.bsky.embed.external",
+  "defs": {
+    "main": {
+      "type": "object",
+      "required": [
+        "external"
+      ],
+      "properties": {
+        "external": {
+          "ref": "#external",
+          "type": "ref"
+        }
+      },
+      "description": "A representation of some externally linked content (eg, a URL and 'card'), embedded in a Bluesky record (eg, a post)."
+    },
+    "view": {
+      "type": "object",
+      "required": [
+        "external"
+      ],
+      "properties": {
+        "external": {
+          "ref": "#viewExternal",
+          "type": "ref"
+        }
+      }
+    },
+    "colorRGB": {
+      "type": "object",
+      "required": [
+        "r",
+        "g",
+        "b"
+      ],
+      "properties": {
+        "b": {
+          "type": "integer",
+          "maximum": 255,
+          "minimum": 0
+        },
+        "g": {
+          "type": "integer",
+          "maximum": 255,
+          "minimum": 0
+        },
+        "r": {
+          "type": "integer",
+          "maximum": 255,
+          "minimum": 0
+        }
+      },
+      "description": "RGB color definition, inspired by site.standard.theme.color#rgb"
+    },
+    "external": {
+      "type": "object",
+      "required": [
+        "uri",
+        "title",
+        "description"
+      ],
+      "properties": {
+        "uri": {
+          "type": "string",
+          "format": "uri"
+        },
+        "thumb": {
+          "type": "blob",
+          "accept": [
+            "image/*"
+          ],
+          "maxSize": 1000000
+        },
+        "title": {
+          "type": "string"
+        },
+        "description": {
+          "type": "string"
+        },
+        "associatedRefs": {
+          "type": "array",
+          "items": {
+            "ref": "com.atproto.repo.strongRef",
+            "type": "ref"
+          },
+          "description": "StrongRefs (uri+cid) of the Atmosphere records that backed this view."
+        }
+      }
+    },
+    "viewExternal": {
+      "type": "object",
+      "required": [
+        "uri",
+        "title",
+        "description"
+      ],
+      "properties": {
+        "uri": {
+          "type": "string",
+          "format": "uri"
+        },
+        "thumb": {
+          "type": "string",
+          "format": "uri"
+        },
+        "title": {
+          "type": "string"
+        },
+        "labels": {
+          "type": "array",
+          "items": {
+            "ref": "com.atproto.label.defs#label",
+            "type": "ref"
+          }
+        },
+        "source": {
+          "ref": "#viewExternalSource",
+          "type": "ref"
+        },
+        "createdAt": {
+          "type": "string",
+          "format": "datetime",
+          "description": "When the external content was created, if available. Example: a publication date, for an article."
+        },
+        "updatedAt": {
+          "type": "string",
+          "format": "datetime",
+          "description": "When the external content was updated, if available."
+        },
+        "description": {
+          "type": "string"
+        },
+        "readingTime": {
+          "type": "integer",
+          "description": "Estimated reading time in minutes, if applicable and available."
+        },
+        "associatedRefs": {
+          "type": "array",
+          "items": {
+            "ref": "com.atproto.repo.strongRef",
+            "type": "ref"
+          },
+          "description": "StrongRefs (uri+cid) of the Atmosphere records that backed this view."
+        },
+        "associatedProfiles": {
+          "type": "array",
+          "items": {
+            "ref": "app.bsky.actor.defs#profileViewBasic",
+            "type": "ref"
+          },
+          "description": "Profiles of the owners of the Atmosphere records that backed this view."
+        }
+      }
+    },
+    "viewExternalSource": {
+      "type": "object",
+      "required": [
+        "uri",
+        "title"
+      ],
+      "properties": {
+        "uri": {
+          "type": "string",
+          "format": "uri",
+          "description": "URI of the source, if available. Example: the https:// URL of a site.standard.publication record."
+        },
+        "icon": {
+          "type": "string",
+          "format": "uri",
+          "description": "Fully-qualified URL where an icon representing the source can be fetched. For example, CDN location provided by the App View."
+        },
+        "theme": {
+          "ref": "#viewExternalSourceTheme",
+          "type": "ref"
+        },
+        "title": {
+          "type": "string"
+        },
+        "description": {
+          "type": "string"
+        }
+      },
+      "description": "The source of an external embed, such as a standard.site publication."
+    },
+    "viewExternalSourceTheme": {
+      "type": "object",
+      "properties": {
+        "accentRGB": {
+          "ref": "#colorRGB",
+          "type": "ref"
+        },
+        "backgroundRGB": {
+          "ref": "#colorRGB",
+          "type": "ref"
+        },
+        "foregroundRGB": {
+          "ref": "#colorRGB",
+          "type": "ref"
+        },
+        "accentForegroundRGB": {
+          "ref": "#colorRGB",
+          "type": "ref"
+        }
+      },
+      "description": "The theme colors of an external source, such as a site.standard.publication. These colors may be used when rendering an embed from that source."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/embed/gallery.json b/lexicons/app/bsky/embed/gallery.json
new file mode 100644
index 0000000000..39f8a3024e
--- /dev/null
+++ b/lexicons/app/bsky/embed/gallery.json
@@ -0,0 +1,99 @@
+{
+  "id": "app.bsky.embed.gallery",
+  "defs": {
+    "main": {
+      "type": "object",
+      "required": [
+        "items"
+      ],
+      "properties": {
+        "items": {
+          "type": "array",
+          "items": {
+            "refs": [
+              "#image"
+            ],
+            "type": "union",
+            "description": "The media items in the gallery. Each item may be of a different type, but all types must be supported by the client."
+          },
+          "maxLength": 20,
+          "description": "The schema-level maxLength of 20 is a future-proof ceiling. Clients should currently enforce a soft limit of 10 items in authoring UIs."
+        }
+      }
+    },
+    "view": {
+      "type": "object",
+      "required": [
+        "items"
+      ],
+      "properties": {
+        "items": {
+          "type": "array",
+          "items": {
+            "refs": [
+              "#viewImage"
+            ],
+            "type": "union"
+          }
+        }
+      }
+    },
+    "image": {
+      "type": "object",
+      "required": [
+        "image",
+        "alt",
+        "aspectRatio"
+      ],
+      "properties": {
+        "alt": {
+          "type": "string",
+          "description": "Alt text description of the image, for accessibility."
+        },
+        "image": {
+          "type": "blob",
+          "accept": [
+            "image/*"
+          ],
+          "maxSize": 2000000
+        },
+        "aspectRatio": {
+          "ref": "app.bsky.embed.defs#aspectRatio",
+          "type": "ref"
+        }
+      }
+    },
+    "viewImage": {
+      "type": "object",
+      "required": [
+        "thumbnail",
+        "fullsize",
+        "alt",
+        "aspectRatio"
+      ],
+      "properties": {
+        "alt": {
+          "type": "string",
+          "description": "Alt text description of the image, for accessibility."
+        },
+        "fullsize": {
+          "type": "string",
+          "format": "uri",
+          "description": "Fully-qualified URL where a large version of the image can be fetched. May or may not be the exact original blob. For example, CDN location provided by the App View."
+        },
+        "thumbnail": {
+          "type": "string",
+          "format": "uri",
+          "description": "Fully-qualified URL where a thumbnail of the image can be fetched. For example, CDN location provided by the App View."
+        },
+        "aspectRatio": {
+          "ref": "app.bsky.embed.defs#aspectRatio",
+          "type": "ref"
+        }
+      }
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1,
+  "description": "An assortment of media embedded in a Bluesky record (eg, a post)."
+}
diff --git a/lexicons/app/bsky/embed/getEmbedExternalView.json b/lexicons/app/bsky/embed/getEmbedExternalView.json
new file mode 100644
index 0000000000..7b60eb3fc9
--- /dev/null
+++ b/lexicons/app/bsky/embed/getEmbedExternalView.json
@@ -0,0 +1,62 @@
+{
+  "id": "app.bsky.embed.getEmbedExternalView",
+  "defs": {
+    "main": {
+      "type": "query",
+      "output": {
+        "schema": {
+          "type": "object",
+          "properties": {
+            "view": {
+              "ref": "app.bsky.embed.external#view",
+              "type": "ref",
+              "description": "Hydrated view of the embed. Present only when the resolved records back the requested URL and supply enough information to populate the required `viewExternal` fields. Omitted alongside the rest of the response when no records resolved or validation failed."
+            },
+            "associatedRefs": {
+              "type": "array",
+              "items": {
+                "ref": "com.atproto.repo.strongRef",
+                "type": "ref"
+              },
+              "description": "StrongRefs (URI+CID) of the Atmosphere records that backed this view, suitable for embedding into a post's external.associatedRefs."
+            },
+            "associatedRecords": {
+              "type": "array",
+              "items": {
+                "type": "unknown",
+                "description": "The raw record data of the Atmosphere records that backed this view. This is returned for convenience, to avoid the need for the client to separately fetch the record data for the associatedRefs. Example: the site.standard.document and site.standard.publication records that backed this view."
+              }
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "parameters": {
+        "type": "params",
+        "required": [
+          "url",
+          "uris"
+        ],
+        "properties": {
+          "url": {
+            "type": "string",
+            "format": "uri",
+            "description": "The canonical web URL the embed represents (typically the URL the user pasted into the composer). Used as the returned view's `uri`. May be used for validation in the future."
+          },
+          "uris": {
+            "type": "array",
+            "items": {
+              "type": "string",
+              "format": "at-uri"
+            },
+            "maxLength": 4,
+            "description": "AT-URIs of any Atmosphere records that can be resolved and used to construct #externalView views. Example: a site.standard.document and optionally its associated site.standard.publication."
+          }
+        }
+      },
+      "description": "Resolve one or more AT-URIs into the data needed to render an enhanced external embed. Returns `associatedRefs` (strongRefs to embed into a post's external.associatedRefs), the raw `associatedRecords`, and a hydrated `view`. The response is empty (`{}`) when no records were resolvable, or when validation determined the resolved records don't actually back the requested URL; clients should fall back to their own link-card rendering in that case and skip writing strongRefs to the post."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/embed/images.json b/lexicons/app/bsky/embed/images.json
new file mode 100644
index 0000000000..7f9c30c263
--- /dev/null
+++ b/lexicons/app/bsky/embed/images.json
@@ -0,0 +1,93 @@
+{
+  "id": "app.bsky.embed.images",
+  "defs": {
+    "main": {
+      "type": "object",
+      "required": [
+        "images"
+      ],
+      "properties": {
+        "images": {
+          "type": "array",
+          "items": {
+            "ref": "#image",
+            "type": "ref"
+          },
+          "maxLength": 4
+        }
+      }
+    },
+    "view": {
+      "type": "object",
+      "required": [
+        "images"
+      ],
+      "properties": {
+        "images": {
+          "type": "array",
+          "items": {
+            "ref": "#viewImage",
+            "type": "ref"
+          },
+          "maxLength": 4
+        }
+      }
+    },
+    "image": {
+      "type": "object",
+      "required": [
+        "image",
+        "alt"
+      ],
+      "properties": {
+        "alt": {
+          "type": "string",
+          "description": "Alt text description of the image, for accessibility."
+        },
+        "image": {
+          "type": "blob",
+          "accept": [
+            "image/*"
+          ],
+          "maxSize": 2000000,
+          "description": "The raw image file. May be up to 2 MB, formerly limited to 1 MB."
+        },
+        "aspectRatio": {
+          "ref": "app.bsky.embed.defs#aspectRatio",
+          "type": "ref"
+        }
+      }
+    },
+    "viewImage": {
+      "type": "object",
+      "required": [
+        "thumb",
+        "fullsize",
+        "alt"
+      ],
+      "properties": {
+        "alt": {
+          "type": "string",
+          "description": "Alt text description of the image, for accessibility."
+        },
+        "thumb": {
+          "type": "string",
+          "format": "uri",
+          "description": "Fully-qualified URL where a thumbnail of the image can be fetched. For example, CDN location provided by the App View."
+        },
+        "fullsize": {
+          "type": "string",
+          "format": "uri",
+          "description": "Fully-qualified URL where a large version of the image can be fetched. May or may not be the exact original blob. For example, CDN location provided by the App View."
+        },
+        "aspectRatio": {
+          "ref": "app.bsky.embed.defs#aspectRatio",
+          "type": "ref"
+        }
+      }
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1,
+  "description": "A set of images embedded in a Bluesky record (eg, a post)."
+}
diff --git a/lexicons/app/bsky/embed/record.json b/lexicons/app/bsky/embed/record.json
new file mode 100644
index 0000000000..3aef654207
--- /dev/null
+++ b/lexicons/app/bsky/embed/record.json
@@ -0,0 +1,162 @@
+{
+  "id": "app.bsky.embed.record",
+  "defs": {
+    "main": {
+      "type": "object",
+      "required": [
+        "record"
+      ],
+      "properties": {
+        "record": {
+          "ref": "com.atproto.repo.strongRef",
+          "type": "ref"
+        }
+      }
+    },
+    "view": {
+      "type": "object",
+      "required": [
+        "record"
+      ],
+      "properties": {
+        "record": {
+          "refs": [
+            "#viewRecord",
+            "#viewNotFound",
+            "#viewBlocked",
+            "#viewDetached",
+            "app.bsky.feed.defs#generatorView",
+            "app.bsky.graph.defs#listView",
+            "app.bsky.labeler.defs#labelerView",
+            "app.bsky.graph.defs#starterPackViewBasic"
+          ],
+          "type": "union"
+        }
+      }
+    },
+    "viewRecord": {
+      "type": "object",
+      "required": [
+        "uri",
+        "cid",
+        "author",
+        "value",
+        "indexedAt"
+      ],
+      "properties": {
+        "cid": {
+          "type": "string",
+          "format": "cid"
+        },
+        "uri": {
+          "type": "string",
+          "format": "at-uri"
+        },
+        "value": {
+          "type": "unknown",
+          "description": "The record data itself."
+        },
+        "author": {
+          "ref": "app.bsky.actor.defs#profileViewBasic",
+          "type": "ref"
+        },
+        "embeds": {
+          "type": "array",
+          "items": {
+            "refs": [
+              "app.bsky.embed.images#view",
+              "app.bsky.embed.video#view",
+              "app.bsky.embed.gallery#view",
+              "app.bsky.embed.external#view",
+              "app.bsky.embed.record#view",
+              "app.bsky.embed.recordWithMedia#view"
+            ],
+            "type": "union"
+          }
+        },
+        "labels": {
+          "type": "array",
+          "items": {
+            "ref": "com.atproto.label.defs#label",
+            "type": "ref"
+          }
+        },
+        "indexedAt": {
+          "type": "string",
+          "format": "datetime"
+        },
+        "likeCount": {
+          "type": "integer"
+        },
+        "quoteCount": {
+          "type": "integer"
+        },
+        "replyCount": {
+          "type": "integer"
+        },
+        "repostCount": {
+          "type": "integer"
+        }
+      }
+    },
+    "viewBlocked": {
+      "type": "object",
+      "required": [
+        "uri",
+        "blocked",
+        "author"
+      ],
+      "properties": {
+        "uri": {
+          "type": "string",
+          "format": "at-uri"
+        },
+        "author": {
+          "ref": "app.bsky.feed.defs#blockedAuthor",
+          "type": "ref"
+        },
+        "blocked": {
+          "type": "boolean",
+          "const": true
+        }
+      }
+    },
+    "viewDetached": {
+      "type": "object",
+      "required": [
+        "uri",
+        "detached"
+      ],
+      "properties": {
+        "uri": {
+          "type": "string",
+          "format": "at-uri"
+        },
+        "detached": {
+          "type": "boolean",
+          "const": true
+        }
+      }
+    },
+    "viewNotFound": {
+      "type": "object",
+      "required": [
+        "uri",
+        "notFound"
+      ],
+      "properties": {
+        "uri": {
+          "type": "string",
+          "format": "at-uri"
+        },
+        "notFound": {
+          "type": "boolean",
+          "const": true
+        }
+      }
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1,
+  "description": "A representation of a record embedded in a Bluesky record (eg, a post). For example, a quote-post, or sharing a feed generator record."
+}
diff --git a/lexicons/app/bsky/embed/recordWithMedia.json b/lexicons/app/bsky/embed/recordWithMedia.json
new file mode 100644
index 0000000000..76da14a364
--- /dev/null
+++ b/lexicons/app/bsky/embed/recordWithMedia.json
@@ -0,0 +1,52 @@
+{
+  "id": "app.bsky.embed.recordWithMedia",
+  "defs": {
+    "main": {
+      "type": "object",
+      "required": [
+        "record",
+        "media"
+      ],
+      "properties": {
+        "media": {
+          "refs": [
+            "app.bsky.embed.images",
+            "app.bsky.embed.video",
+            "app.bsky.embed.gallery",
+            "app.bsky.embed.external"
+          ],
+          "type": "union"
+        },
+        "record": {
+          "ref": "app.bsky.embed.record",
+          "type": "ref"
+        }
+      }
+    },
+    "view": {
+      "type": "object",
+      "required": [
+        "record",
+        "media"
+      ],
+      "properties": {
+        "media": {
+          "refs": [
+            "app.bsky.embed.images#view",
+            "app.bsky.embed.video#view",
+            "app.bsky.embed.gallery#view",
+            "app.bsky.embed.external#view"
+          ],
+          "type": "union"
+        },
+        "record": {
+          "ref": "app.bsky.embed.record#view",
+          "type": "ref"
+        }
+      }
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1,
+  "description": "A representation of a record embedded in a Bluesky record (eg, a post), alongside other compatible embeds. For example, a quote post and image, or a quote post and external URL card."
+}
diff --git a/lexicons/app/bsky/embed/video.json b/lexicons/app/bsky/embed/video.json
new file mode 100644
index 0000000000..67278da9c2
--- /dev/null
+++ b/lexicons/app/bsky/embed/video.json
@@ -0,0 +1,108 @@
+{
+  "id": "app.bsky.embed.video",
+  "defs": {
+    "main": {
+      "type": "object",
+      "required": [
+        "video"
+      ],
+      "properties": {
+        "alt": {
+          "type": "string",
+          "maxLength": 10000,
+          "description": "Alt text description of the video, for accessibility.",
+          "maxGraphemes": 1000
+        },
+        "video": {
+          "type": "blob",
+          "accept": [
+            "video/mp4"
+          ],
+          "maxSize": 100000000,
+          "description": "The mp4 video file. May be up to 100mb, formerly limited to 50mb."
+        },
+        "captions": {
+          "type": "array",
+          "items": {
+            "ref": "#caption",
+            "type": "ref"
+          },
+          "maxLength": 20
+        },
+        "aspectRatio": {
+          "ref": "app.bsky.embed.defs#aspectRatio",
+          "type": "ref"
+        },
+        "presentation": {
+          "type": "string",
+          "description": "A hint to the client about how to present the video.",
+          "knownValues": [
+            "default",
+            "gif"
+          ]
+        }
+      }
+    },
+    "view": {
+      "type": "object",
+      "required": [
+        "cid",
+        "playlist"
+      ],
+      "properties": {
+        "alt": {
+          "type": "string",
+          "maxLength": 10000,
+          "maxGraphemes": 1000
+        },
+        "cid": {
+          "type": "string",
+          "format": "cid"
+        },
+        "playlist": {
+          "type": "string",
+          "format": "uri"
+        },
+        "thumbnail": {
+          "type": "string",
+          "format": "uri"
+        },
+        "aspectRatio": {
+          "ref": "app.bsky.embed.defs#aspectRatio",
+          "type": "ref"
+        },
+        "presentation": {
+          "type": "string",
+          "description": "A hint to the client about how to present the video.",
+          "knownValues": [
+            "default",
+            "gif"
+          ]
+        }
+      }
+    },
+    "caption": {
+      "type": "object",
+      "required": [
+        "lang",
+        "file"
+      ],
+      "properties": {
+        "file": {
+          "type": "blob",
+          "accept": [
+            "text/vtt"
+          ],
+          "maxSize": 20000
+        },
+        "lang": {
+          "type": "string",
+          "format": "language"
+        }
+      }
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1,
+  "description": "A video embedded in a Bluesky record (eg, a post)."
+}
diff --git a/lexicons/app/bsky/feed/defs.json b/lexicons/app/bsky/feed/defs.json
new file mode 100644
index 0000000000..436782d4ec
--- /dev/null
+++ b/lexicons/app/bsky/feed/defs.json
@@ -0,0 +1,545 @@
+{
+  "id": "app.bsky.feed.defs",
+  "defs": {
+    "postView": {
+      "type": "object",
+      "required": [
+        "uri",
+        "cid",
+        "author",
+        "record",
+        "indexedAt"
+      ],
+      "properties": {
+        "cid": {
+          "type": "string",
+          "format": "cid"
+        },
+        "uri": {
+          "type": "string",
+          "format": "at-uri"
+        },
+        "debug": {
+          "type": "unknown",
+          "description": "Debug information for internal development"
+        },
+        "embed": {
+          "refs": [
+            "app.bsky.embed.images#view",
+            "app.bsky.embed.video#view",
+            "app.bsky.embed.gallery#view",
+            "app.bsky.embed.external#view",
+            "app.bsky.embed.record#view",
+            "app.bsky.embed.recordWithMedia#view"
+          ],
+          "type": "union"
+        },
+        "author": {
+          "ref": "app.bsky.actor.defs#profileViewBasic",
+          "type": "ref"
+        },
+        "labels": {
+          "type": "array",
+          "items": {
+            "ref": "com.atproto.label.defs#label",
+            "type": "ref"
+          }
+        },
+        "record": {
+          "type": "unknown"
+        },
+        "viewer": {
+          "ref": "#viewerState",
+          "type": "ref"
+        },
+        "indexedAt": {
+          "type": "string",
+          "format": "datetime"
+        },
+        "likeCount": {
+          "type": "integer"
+        },
+        "quoteCount": {
+          "type": "integer"
+        },
+        "replyCount": {
+          "type": "integer"
+        },
+        "threadgate": {
+          "ref": "#threadgateView",
+          "type": "ref"
+        },
+        "repostCount": {
+          "type": "integer"
+        },
+        "bookmarkCount": {
+          "type": "integer"
+        }
+      }
+    },
+    "replyRef": {
+      "type": "object",
+      "required": [
+        "root",
+        "parent"
+      ],
+      "properties": {
+        "root": {
+          "refs": [
+            "#postView",
+            "#notFoundPost",
+            "#blockedPost"
+          ],
+          "type": "union"
+        },
+        "parent": {
+          "refs": [
+            "#postView",
+            "#notFoundPost",
+            "#blockedPost"
+          ],
+          "type": "union"
+        },
+        "grandparentAuthor": {
+          "ref": "app.bsky.actor.defs#profileViewBasic",
+          "type": "ref",
+          "description": "When parent is a reply to another post, this is the author of that post."
+        }
+      }
+    },
+    "reasonPin": {
+      "type": "object",
+      "properties": {}
+    },
+    "blockedPost": {
+      "type": "object",
+      "required": [
+        "uri",
+        "blocked",
+        "author"
+      ],
+      "properties": {
+        "uri": {
+          "type": "string",
+          "format": "at-uri"
+        },
+        "author": {
+          "ref": "#blockedAuthor",
+          "type": "ref"
+        },
+        "blocked": {
+          "type": "boolean",
+          "const": true
+        }
+      }
+    },
+    "interaction": {
+      "type": "object",
+      "properties": {
+        "item": {
+          "type": "string",
+          "format": "at-uri"
+        },
+        "event": {
+          "type": "string",
+          "knownValues": [
+            "app.bsky.feed.defs#requestLess",
+            "app.bsky.feed.defs#requestMore",
+            "app.bsky.feed.defs#clickthroughItem",
+            "app.bsky.feed.defs#clickthroughAuthor",
+            "app.bsky.feed.defs#clickthroughReposter",
+            "app.bsky.feed.defs#clickthroughEmbed",
+            "app.bsky.feed.defs#interactionSeen",
+            "app.bsky.feed.defs#interactionLike",
+            "app.bsky.feed.defs#interactionRepost",
+            "app.bsky.feed.defs#interactionReply",
+            "app.bsky.feed.defs#interactionQuote",
+            "app.bsky.feed.defs#interactionShare"
+          ]
+        },
+        "reqId": {
+          "type": "string",
+          "maxLength": 100,
+          "description": "Unique identifier per request that may be passed back alongside interactions."
+        },
+        "feedContext": {
+          "type": "string",
+          "maxLength": 2000,
+          "description": "Context on a feed item that was originally supplied by the feed generator on getFeedSkeleton."
+        }
+      }
+    },
+    "requestLess": {
+      "type": "token",
+      "description": "Request that less content like the given feed item be shown in the feed"
+    },
+    "requestMore": {
+      "type": "token",
+      "description": "Request that more content like the given feed item be shown in the feed"
+    },
+    "viewerState": {
+      "type": "object",
+      "properties": {
+        "like": {
+          "type": "string",
+          "format": "at-uri"
+        },
+        "pinned": {
+          "type": "boolean"
+        },
+        "repost": {
+          "type": "string",
+          "format": "at-uri"
+        },
+        "bookmarked": {
+          "type": "boolean"
+        },
+        "threadMuted": {
+          "type": "boolean"
+        },
+        "replyDisabled": {
+          "type": "boolean"
+        },
+        "embeddingDisabled": {
+          "type": "boolean"
+        }
+      },
+      "description": "Metadata about the requesting account's relationship with the subject content. Only has meaningful content for authed requests."
+    },
+    "feedViewPost": {
+      "type": "object",
+      "required": [
+        "post"
+      ],
+      "properties": {
+        "post": {
+          "ref": "#postView",
+          "type": "ref"
+        },
+        "reply": {
+          "ref": "#replyRef",
+          "type": "ref"
+        },
+        "reqId": {
+          "type": "string",
+          "maxLength": 100,
+          "description": "Unique identifier per request that may be passed back alongside interactions."
+        },
+        "reason": {
+          "refs": [
+            "#reasonRepost",
+            "#reasonPin"
+          ],
+          "type": "union"
+        },
+        "feedContext": {
+          "type": "string",
+          "maxLength": 2000,
+          "description": "Context provided by feed generator that may be passed back alongside interactions."
+        }
+      }
+    },
+    "notFoundPost": {
+      "type": "object",
+      "required": [
+        "uri",
+        "notFound"
+      ],
+      "properties": {
+        "uri": {
+          "type": "string",
+          "format": "at-uri"
+        },
+        "notFound": {
+          "type": "boolean",
+          "const": true
+        }
+      }
+    },
+    "reasonRepost": {
+      "type": "object",
+      "required": [
+        "by",
+        "indexedAt"
+      ],
+      "properties": {
+        "by": {
+          "ref": "app.bsky.actor.defs#profileViewBasic",
+          "type": "ref"
+        },
+        "cid": {
+          "type": "string",
+          "format": "cid"
+        },
+        "uri": {
+          "type": "string",
+          "format": "at-uri"
+        },
+        "indexedAt": {
+          "type": "string",
+          "format": "datetime"
+        }
+      }
+    },
+    "blockedAuthor": {
+      "type": "object",
+      "required": [
+        "did"
+      ],
+      "properties": {
+        "did": {
+          "type": "string",
+          "format": "did"
+        },
+        "viewer": {
+          "ref": "app.bsky.actor.defs#viewerState",
+          "type": "ref"
+        }
+      }
+    },
+    "generatorView": {
+      "type": "object",
+      "required": [
+        "uri",
+        "cid",
+        "did",
+        "creator",
+        "displayName",
+        "indexedAt"
+      ],
+      "properties": {
+        "cid": {
+          "type": "string",
+          "format": "cid"
+        },
+        "did": {
+          "type": "string",
+          "format": "did"
+        },
+        "uri": {
+          "type": "string",
+          "format": "at-uri"
+        },
+        "avatar": {
+          "type": "string",
+          "format": "uri"
+        },
+        "labels": {
+          "type": "array",
+          "items": {
+            "ref": "com.atproto.label.defs#label",
+            "type": "ref"
+          }
+        },
+        "viewer": {
+          "ref": "#generatorViewerState",
+          "type": "ref"
+        },
+        "creator": {
+          "ref": "app.bsky.actor.defs#profileView",
+          "type": "ref"
+        },
+        "indexedAt": {
+          "type": "string",
+          "format": "datetime"
+        },
+        "likeCount": {
+          "type": "integer",
+          "minimum": 0
+        },
+        "contentMode": {
+          "type": "string",
+          "knownValues": [
+            "app.bsky.feed.defs#contentModeUnspecified",
+            "app.bsky.feed.defs#contentModeVideo"
+          ]
+        },
+        "description": {
+          "type": "string",
+          "maxLength": 3000,
+          "maxGraphemes": 300
+        },
+        "displayName": {
+          "type": "string"
+        },
+        "descriptionFacets": {
+          "type": "array",
+          "items": {
+            "ref": "app.bsky.richtext.facet",
+            "type": "ref"
+          }
+        },
+        "acceptsInteractions": {
+          "type": "boolean"
+        }
+      }
+    },
+    "threadContext": {
+      "type": "object",
+      "properties": {
+        "rootAuthorLike": {
+          "type": "string",
+          "format": "at-uri"
+        }
+      },
+      "description": "Metadata about this post within the context of the thread it is in."
+    },
+    "threadViewPost": {
+      "type": "object",
+      "required": [
+        "post"
+      ],
+      "properties": {
+        "post": {
+          "ref": "#postView",
+          "type": "ref"
+        },
+        "parent": {
+          "refs": [
+            "#threadViewPost",
+            "#notFoundPost",
+            "#blockedPost"
+          ],
+          "type": "union"
+        },
+        "replies": {
+          "type": "array",
+          "items": {
+            "refs": [
+              "#threadViewPost",
+              "#notFoundPost",
+              "#blockedPost"
+            ],
+            "type": "union"
+          }
+        },
+        "threadContext": {
+          "ref": "#threadContext",
+          "type": "ref"
+        }
+      }
+    },
+    "threadgateView": {
+      "type": "object",
+      "properties": {
+        "cid": {
+          "type": "string",
+          "format": "cid"
+        },
+        "uri": {
+          "type": "string",
+          "format": "at-uri"
+        },
+        "lists": {
+          "type": "array",
+          "items": {
+            "ref": "app.bsky.graph.defs#listViewBasic",
+            "type": "ref"
+          }
+        },
+        "record": {
+          "type": "unknown"
+        }
+      }
+    },
+    "interactionLike": {
+      "type": "token",
+      "description": "User liked the feed item"
+    },
+    "interactionSeen": {
+      "type": "token",
+      "description": "Feed item was seen by user"
+    },
+    "clickthroughItem": {
+      "type": "token",
+      "description": "User clicked through to the feed item"
+    },
+    "contentModeVideo": {
+      "type": "token",
+      "description": "Declares the feed generator returns posts containing app.bsky.embed.video embeds."
+    },
+    "interactionQuote": {
+      "type": "token",
+      "description": "User quoted the feed item"
+    },
+    "interactionReply": {
+      "type": "token",
+      "description": "User replied to the feed item"
+    },
+    "interactionShare": {
+      "type": "token",
+      "description": "User shared the feed item"
+    },
+    "skeletonFeedPost": {
+      "type": "object",
+      "required": [
+        "post"
+      ],
+      "properties": {
+        "post": {
+          "type": "string",
+          "format": "at-uri"
+        },
+        "reason": {
+          "refs": [
+            "#skeletonReasonRepost",
+            "#skeletonReasonPin"
+          ],
+          "type": "union"
+        },
+        "feedContext": {
+          "type": "string",
+          "maxLength": 2000,
+          "description": "Context that will be passed through to client and may be passed to feed generator back alongside interactions."
+        }
+      }
+    },
+    "clickthroughEmbed": {
+      "type": "token",
+      "description": "User clicked through to the embedded content of the feed item"
+    },
+    "interactionRepost": {
+      "type": "token",
+      "description": "User reposted the feed item"
+    },
+    "skeletonReasonPin": {
+      "type": "object",
+      "properties": {}
+    },
+    "clickthroughAuthor": {
+      "type": "token",
+      "description": "User clicked through to the author of the feed item"
+    },
+    "clickthroughReposter": {
+      "type": "token",
+      "description": "User clicked through to the reposter of the feed item"
+    },
+    "generatorViewerState": {
+      "type": "object",
+      "properties": {
+        "like": {
+          "type": "string",
+          "format": "at-uri"
+        }
+      }
+    },
+    "skeletonReasonRepost": {
+      "type": "object",
+      "required": [
+        "repost"
+      ],
+      "properties": {
+        "repost": {
+          "type": "string",
+          "format": "at-uri"
+        }
+      }
+    },
+    "contentModeUnspecified": {
+      "type": "token",
+      "description": "Declares the feed generator returns any types of posts."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/feed/describeFeedGenerator.json b/lexicons/app/bsky/feed/describeFeedGenerator.json
new file mode 100644
index 0000000000..1549935910
--- /dev/null
+++ b/lexicons/app/bsky/feed/describeFeedGenerator.json
@@ -0,0 +1,61 @@
+{
+  "id": "app.bsky.feed.describeFeedGenerator",
+  "defs": {
+    "feed": {
+      "type": "object",
+      "required": [
+        "uri"
+      ],
+      "properties": {
+        "uri": {
+          "type": "string",
+          "format": "at-uri"
+        }
+      }
+    },
+    "main": {
+      "type": "query",
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "did",
+            "feeds"
+          ],
+          "properties": {
+            "did": {
+              "type": "string",
+              "format": "did"
+            },
+            "feeds": {
+              "type": "array",
+              "items": {
+                "ref": "#feed",
+                "type": "ref"
+              }
+            },
+            "links": {
+              "ref": "#links",
+              "type": "ref"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "description": "Get information about a feed generator, including policies and offered feed URIs. Does not require auth; implemented by Feed Generator services (not App View)."
+    },
+    "links": {
+      "type": "object",
+      "properties": {
+        "privacyPolicy": {
+          "type": "string"
+        },
+        "termsOfService": {
+          "type": "string"
+        }
+      }
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/feed/generator.json b/lexicons/app/bsky/feed/generator.json
new file mode 100644
index 0000000000..082a6ca372
--- /dev/null
+++ b/lexicons/app/bsky/feed/generator.json
@@ -0,0 +1,73 @@
+{
+  "id": "app.bsky.feed.generator",
+  "defs": {
+    "main": {
+      "key": "any",
+      "type": "record",
+      "record": {
+        "type": "object",
+        "required": [
+          "did",
+          "displayName",
+          "createdAt"
+        ],
+        "properties": {
+          "did": {
+            "type": "string",
+            "format": "did"
+          },
+          "avatar": {
+            "type": "blob",
+            "accept": [
+              "image/png",
+              "image/jpeg"
+            ],
+            "maxSize": 1000000
+          },
+          "labels": {
+            "refs": [
+              "com.atproto.label.defs#selfLabels"
+            ],
+            "type": "union",
+            "description": "Self-label values"
+          },
+          "createdAt": {
+            "type": "string",
+            "format": "datetime"
+          },
+          "contentMode": {
+            "type": "string",
+            "knownValues": [
+              "app.bsky.feed.defs#contentModeUnspecified",
+              "app.bsky.feed.defs#contentModeVideo"
+            ]
+          },
+          "description": {
+            "type": "string",
+            "maxLength": 3000,
+            "maxGraphemes": 300
+          },
+          "displayName": {
+            "type": "string",
+            "maxLength": 240,
+            "maxGraphemes": 24
+          },
+          "descriptionFacets": {
+            "type": "array",
+            "items": {
+              "ref": "app.bsky.richtext.facet",
+              "type": "ref"
+            }
+          },
+          "acceptsInteractions": {
+            "type": "boolean",
+            "description": "Declaration that a feed accepts feedback interactions from a client through app.bsky.feed.sendInteractions"
+          }
+        }
+      },
+      "description": "Record declaring of the existence of a feed generator, and containing metadata about it. The record can exist in any repository."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/feed/getActorFeeds.json b/lexicons/app/bsky/feed/getActorFeeds.json
new file mode 100644
index 0000000000..f0a41e2cb4
--- /dev/null
+++ b/lexicons/app/bsky/feed/getActorFeeds.json
@@ -0,0 +1,53 @@
+{
+  "id": "app.bsky.feed.getActorFeeds",
+  "defs": {
+    "main": {
+      "type": "query",
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "feeds"
+          ],
+          "properties": {
+            "feeds": {
+              "type": "array",
+              "items": {
+                "ref": "app.bsky.feed.defs#generatorView",
+                "type": "ref"
+              }
+            },
+            "cursor": {
+              "type": "string"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "parameters": {
+        "type": "params",
+        "required": [
+          "actor"
+        ],
+        "properties": {
+          "actor": {
+            "type": "string",
+            "format": "at-identifier"
+          },
+          "limit": {
+            "type": "integer",
+            "default": 50,
+            "maximum": 100,
+            "minimum": 1
+          },
+          "cursor": {
+            "type": "string"
+          }
+        }
+      },
+      "description": "Get a list of feeds (feed generator records) created by the actor (in the actor's repo)."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/feed/getActorLikes.json b/lexicons/app/bsky/feed/getActorLikes.json
new file mode 100644
index 0000000000..532b7df2f4
--- /dev/null
+++ b/lexicons/app/bsky/feed/getActorLikes.json
@@ -0,0 +1,61 @@
+{
+  "id": "app.bsky.feed.getActorLikes",
+  "defs": {
+    "main": {
+      "type": "query",
+      "errors": [
+        {
+          "name": "BlockedActor"
+        },
+        {
+          "name": "BlockedByActor"
+        }
+      ],
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "feed"
+          ],
+          "properties": {
+            "feed": {
+              "type": "array",
+              "items": {
+                "ref": "app.bsky.feed.defs#feedViewPost",
+                "type": "ref"
+              }
+            },
+            "cursor": {
+              "type": "string"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "parameters": {
+        "type": "params",
+        "required": [
+          "actor"
+        ],
+        "properties": {
+          "actor": {
+            "type": "string",
+            "format": "at-identifier"
+          },
+          "limit": {
+            "type": "integer",
+            "default": 50,
+            "maximum": 100,
+            "minimum": 1
+          },
+          "cursor": {
+            "type": "string"
+          }
+        }
+      },
+      "description": "Get a list of posts liked by an actor. Requires auth, actor must be the requesting account."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/feed/getAuthorFeed.json b/lexicons/app/bsky/feed/getAuthorFeed.json
new file mode 100644
index 0000000000..4d113c3123
--- /dev/null
+++ b/lexicons/app/bsky/feed/getAuthorFeed.json
@@ -0,0 +1,77 @@
+{
+  "id": "app.bsky.feed.getAuthorFeed",
+  "defs": {
+    "main": {
+      "type": "query",
+      "errors": [
+        {
+          "name": "BlockedActor"
+        },
+        {
+          "name": "BlockedByActor"
+        }
+      ],
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "feed"
+          ],
+          "properties": {
+            "feed": {
+              "type": "array",
+              "items": {
+                "ref": "app.bsky.feed.defs#feedViewPost",
+                "type": "ref"
+              }
+            },
+            "cursor": {
+              "type": "string"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "parameters": {
+        "type": "params",
+        "required": [
+          "actor"
+        ],
+        "properties": {
+          "actor": {
+            "type": "string",
+            "format": "at-identifier"
+          },
+          "limit": {
+            "type": "integer",
+            "default": 50,
+            "maximum": 100,
+            "minimum": 1
+          },
+          "cursor": {
+            "type": "string"
+          },
+          "filter": {
+            "type": "string",
+            "default": "posts_with_replies",
+            "description": "Combinations of post/repost types to include in response.",
+            "knownValues": [
+              "posts_with_replies",
+              "posts_no_replies",
+              "posts_with_media",
+              "posts_and_author_threads",
+              "posts_with_video"
+            ]
+          },
+          "includePins": {
+            "type": "boolean",
+            "default": false
+          }
+        }
+      },
+      "description": "Get a view of an actor's 'author feed' (post and reposts by the author). Does not require auth."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/feed/getFeed.json b/lexicons/app/bsky/feed/getFeed.json
new file mode 100644
index 0000000000..6d19d64b96
--- /dev/null
+++ b/lexicons/app/bsky/feed/getFeed.json
@@ -0,0 +1,58 @@
+{
+  "id": "app.bsky.feed.getFeed",
+  "defs": {
+    "main": {
+      "type": "query",
+      "errors": [
+        {
+          "name": "UnknownFeed"
+        }
+      ],
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "feed"
+          ],
+          "properties": {
+            "feed": {
+              "type": "array",
+              "items": {
+                "ref": "app.bsky.feed.defs#feedViewPost",
+                "type": "ref"
+              }
+            },
+            "cursor": {
+              "type": "string"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "parameters": {
+        "type": "params",
+        "required": [
+          "feed"
+        ],
+        "properties": {
+          "feed": {
+            "type": "string",
+            "format": "at-uri"
+          },
+          "limit": {
+            "type": "integer",
+            "default": 50,
+            "maximum": 100,
+            "minimum": 1
+          },
+          "cursor": {
+            "type": "string"
+          }
+        }
+      },
+      "description": "Get a hydrated feed from an actor's selected feed generator. Implemented by App View."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/feed/getFeedGenerator.json b/lexicons/app/bsky/feed/getFeedGenerator.json
new file mode 100644
index 0000000000..9403bbc5fa
--- /dev/null
+++ b/lexicons/app/bsky/feed/getFeedGenerator.json
@@ -0,0 +1,49 @@
+{
+  "id": "app.bsky.feed.getFeedGenerator",
+  "defs": {
+    "main": {
+      "type": "query",
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "view",
+            "isOnline",
+            "isValid"
+          ],
+          "properties": {
+            "view": {
+              "ref": "app.bsky.feed.defs#generatorView",
+              "type": "ref"
+            },
+            "isValid": {
+              "type": "boolean",
+              "description": "Indicates whether the feed generator service is compatible with the record declaration."
+            },
+            "isOnline": {
+              "type": "boolean",
+              "description": "Indicates whether the feed generator service has been online recently, or else seems to be inactive."
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "parameters": {
+        "type": "params",
+        "required": [
+          "feed"
+        ],
+        "properties": {
+          "feed": {
+            "type": "string",
+            "format": "at-uri",
+            "description": "AT-URI of the feed generator record."
+          }
+        }
+      },
+      "description": "Get information about a feed generator. Implemented by AppView."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/feed/getFeedGenerators.json b/lexicons/app/bsky/feed/getFeedGenerators.json
new file mode 100644
index 0000000000..79938c932b
--- /dev/null
+++ b/lexicons/app/bsky/feed/getFeedGenerators.json
@@ -0,0 +1,44 @@
+{
+  "id": "app.bsky.feed.getFeedGenerators",
+  "defs": {
+    "main": {
+      "type": "query",
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "feeds"
+          ],
+          "properties": {
+            "feeds": {
+              "type": "array",
+              "items": {
+                "ref": "app.bsky.feed.defs#generatorView",
+                "type": "ref"
+              }
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "parameters": {
+        "type": "params",
+        "required": [
+          "feeds"
+        ],
+        "properties": {
+          "feeds": {
+            "type": "array",
+            "items": {
+              "type": "string",
+              "format": "at-uri"
+            }
+          }
+        }
+      },
+      "description": "Get information about a list of feed generators."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/feed/getFeedSkeleton.json b/lexicons/app/bsky/feed/getFeedSkeleton.json
new file mode 100644
index 0000000000..f9ca591405
--- /dev/null
+++ b/lexicons/app/bsky/feed/getFeedSkeleton.json
@@ -0,0 +1,64 @@
+{
+  "id": "app.bsky.feed.getFeedSkeleton",
+  "defs": {
+    "main": {
+      "type": "query",
+      "errors": [
+        {
+          "name": "UnknownFeed"
+        }
+      ],
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "feed"
+          ],
+          "properties": {
+            "feed": {
+              "type": "array",
+              "items": {
+                "ref": "app.bsky.feed.defs#skeletonFeedPost",
+                "type": "ref"
+              }
+            },
+            "reqId": {
+              "type": "string",
+              "maxLength": 100,
+              "description": "Unique identifier per request that may be passed back alongside interactions."
+            },
+            "cursor": {
+              "type": "string"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "parameters": {
+        "type": "params",
+        "required": [
+          "feed"
+        ],
+        "properties": {
+          "feed": {
+            "type": "string",
+            "format": "at-uri",
+            "description": "Reference to feed generator record describing the specific feed being requested."
+          },
+          "limit": {
+            "type": "integer",
+            "default": 50,
+            "maximum": 100,
+            "minimum": 1
+          },
+          "cursor": {
+            "type": "string"
+          }
+        }
+      },
+      "description": "Get a skeleton of a feed provided by a feed generator. Auth is optional, depending on provider requirements, and provides the DID of the requester. Implemented by Feed Generator Service."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/feed/getLikes.json b/lexicons/app/bsky/feed/getLikes.json
new file mode 100644
index 0000000000..db5c83ecda
--- /dev/null
+++ b/lexicons/app/bsky/feed/getLikes.json
@@ -0,0 +1,90 @@
+{
+  "id": "app.bsky.feed.getLikes",
+  "defs": {
+    "like": {
+      "type": "object",
+      "required": [
+        "indexedAt",
+        "createdAt",
+        "actor"
+      ],
+      "properties": {
+        "actor": {
+          "ref": "app.bsky.actor.defs#profileView",
+          "type": "ref"
+        },
+        "createdAt": {
+          "type": "string",
+          "format": "datetime"
+        },
+        "indexedAt": {
+          "type": "string",
+          "format": "datetime"
+        }
+      }
+    },
+    "main": {
+      "type": "query",
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "uri",
+            "likes"
+          ],
+          "properties": {
+            "cid": {
+              "type": "string",
+              "format": "cid"
+            },
+            "uri": {
+              "type": "string",
+              "format": "at-uri"
+            },
+            "likes": {
+              "type": "array",
+              "items": {
+                "ref": "#like",
+                "type": "ref"
+              }
+            },
+            "cursor": {
+              "type": "string"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "parameters": {
+        "type": "params",
+        "required": [
+          "uri"
+        ],
+        "properties": {
+          "cid": {
+            "type": "string",
+            "format": "cid",
+            "description": "CID of the subject record (aka, specific version of record), to filter likes."
+          },
+          "uri": {
+            "type": "string",
+            "format": "at-uri",
+            "description": "AT-URI of the subject (eg, a post record)."
+          },
+          "limit": {
+            "type": "integer",
+            "default": 50,
+            "maximum": 100,
+            "minimum": 1
+          },
+          "cursor": {
+            "type": "string"
+          }
+        }
+      },
+      "description": "Get like records which reference a subject (by AT-URI and CID)."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/feed/getListFeed.json b/lexicons/app/bsky/feed/getListFeed.json
new file mode 100644
index 0000000000..7d9311799f
--- /dev/null
+++ b/lexicons/app/bsky/feed/getListFeed.json
@@ -0,0 +1,59 @@
+{
+  "id": "app.bsky.feed.getListFeed",
+  "defs": {
+    "main": {
+      "type": "query",
+      "errors": [
+        {
+          "name": "UnknownList"
+        }
+      ],
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "feed"
+          ],
+          "properties": {
+            "feed": {
+              "type": "array",
+              "items": {
+                "ref": "app.bsky.feed.defs#feedViewPost",
+                "type": "ref"
+              }
+            },
+            "cursor": {
+              "type": "string"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "parameters": {
+        "type": "params",
+        "required": [
+          "list"
+        ],
+        "properties": {
+          "list": {
+            "type": "string",
+            "format": "at-uri",
+            "description": "Reference (AT-URI) to the list record."
+          },
+          "limit": {
+            "type": "integer",
+            "default": 50,
+            "maximum": 100,
+            "minimum": 1
+          },
+          "cursor": {
+            "type": "string"
+          }
+        }
+      },
+      "description": "Get a feed of recent posts from a list (posts and reposts from any actors on the list). Does not require auth."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/feed/getPostThread.json b/lexicons/app/bsky/feed/getPostThread.json
new file mode 100644
index 0000000000..b62a78a00a
--- /dev/null
+++ b/lexicons/app/bsky/feed/getPostThread.json
@@ -0,0 +1,66 @@
+{
+  "id": "app.bsky.feed.getPostThread",
+  "defs": {
+    "main": {
+      "type": "query",
+      "errors": [
+        {
+          "name": "NotFound"
+        }
+      ],
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "thread"
+          ],
+          "properties": {
+            "thread": {
+              "refs": [
+                "app.bsky.feed.defs#threadViewPost",
+                "app.bsky.feed.defs#notFoundPost",
+                "app.bsky.feed.defs#blockedPost"
+              ],
+              "type": "union"
+            },
+            "threadgate": {
+              "ref": "app.bsky.feed.defs#threadgateView",
+              "type": "ref"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "parameters": {
+        "type": "params",
+        "required": [
+          "uri"
+        ],
+        "properties": {
+          "uri": {
+            "type": "string",
+            "format": "at-uri",
+            "description": "Reference (AT-URI) to post record."
+          },
+          "depth": {
+            "type": "integer",
+            "default": 6,
+            "maximum": 1000,
+            "minimum": 0,
+            "description": "How many levels of reply depth should be included in response."
+          },
+          "parentHeight": {
+            "type": "integer",
+            "default": 80,
+            "maximum": 1000,
+            "minimum": 0,
+            "description": "How many levels of parent (and grandparent, etc) post to include."
+          }
+        }
+      },
+      "description": "Get posts in a thread. Does not require auth, but additional metadata and filtering will be applied for authed requests."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/feed/getPosts.json b/lexicons/app/bsky/feed/getPosts.json
new file mode 100644
index 0000000000..c52de1aecd
--- /dev/null
+++ b/lexicons/app/bsky/feed/getPosts.json
@@ -0,0 +1,46 @@
+{
+  "id": "app.bsky.feed.getPosts",
+  "defs": {
+    "main": {
+      "type": "query",
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "posts"
+          ],
+          "properties": {
+            "posts": {
+              "type": "array",
+              "items": {
+                "ref": "app.bsky.feed.defs#postView",
+                "type": "ref"
+              }
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "parameters": {
+        "type": "params",
+        "required": [
+          "uris"
+        ],
+        "properties": {
+          "uris": {
+            "type": "array",
+            "items": {
+              "type": "string",
+              "format": "at-uri"
+            },
+            "maxLength": 25,
+            "description": "List of post AT-URIs to return hydrated views for."
+          }
+        }
+      },
+      "description": "Gets post views for a specified list of posts (by AT-URI). This is sometimes referred to as 'hydrating' a 'feed skeleton'."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/feed/getQuotes.json b/lexicons/app/bsky/feed/getQuotes.json
new file mode 100644
index 0000000000..cc507ec925
--- /dev/null
+++ b/lexicons/app/bsky/feed/getQuotes.json
@@ -0,0 +1,68 @@
+{
+  "id": "app.bsky.feed.getQuotes",
+  "defs": {
+    "main": {
+      "type": "query",
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "uri",
+            "posts"
+          ],
+          "properties": {
+            "cid": {
+              "type": "string",
+              "format": "cid"
+            },
+            "uri": {
+              "type": "string",
+              "format": "at-uri"
+            },
+            "posts": {
+              "type": "array",
+              "items": {
+                "ref": "app.bsky.feed.defs#postView",
+                "type": "ref"
+              }
+            },
+            "cursor": {
+              "type": "string"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "parameters": {
+        "type": "params",
+        "required": [
+          "uri"
+        ],
+        "properties": {
+          "cid": {
+            "type": "string",
+            "format": "cid",
+            "description": "If supplied, filters to quotes of specific version (by CID) of the post record."
+          },
+          "uri": {
+            "type": "string",
+            "format": "at-uri",
+            "description": "Reference (AT-URI) of post record"
+          },
+          "limit": {
+            "type": "integer",
+            "default": 50,
+            "maximum": 100,
+            "minimum": 1
+          },
+          "cursor": {
+            "type": "string"
+          }
+        }
+      },
+      "description": "Get a list of quotes for a given post."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/feed/getRepostedBy.json b/lexicons/app/bsky/feed/getRepostedBy.json
new file mode 100644
index 0000000000..3df7fa8f53
--- /dev/null
+++ b/lexicons/app/bsky/feed/getRepostedBy.json
@@ -0,0 +1,68 @@
+{
+  "id": "app.bsky.feed.getRepostedBy",
+  "defs": {
+    "main": {
+      "type": "query",
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "uri",
+            "repostedBy"
+          ],
+          "properties": {
+            "cid": {
+              "type": "string",
+              "format": "cid"
+            },
+            "uri": {
+              "type": "string",
+              "format": "at-uri"
+            },
+            "cursor": {
+              "type": "string"
+            },
+            "repostedBy": {
+              "type": "array",
+              "items": {
+                "ref": "app.bsky.actor.defs#profileView",
+                "type": "ref"
+              }
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "parameters": {
+        "type": "params",
+        "required": [
+          "uri"
+        ],
+        "properties": {
+          "cid": {
+            "type": "string",
+            "format": "cid",
+            "description": "If supplied, filters to reposts of specific version (by CID) of the post record."
+          },
+          "uri": {
+            "type": "string",
+            "format": "at-uri",
+            "description": "Reference (AT-URI) of post record"
+          },
+          "limit": {
+            "type": "integer",
+            "default": 50,
+            "maximum": 100,
+            "minimum": 1
+          },
+          "cursor": {
+            "type": "string"
+          }
+        }
+      },
+      "description": "Get a list of reposts for a given post."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/feed/getSuggestedFeeds.json b/lexicons/app/bsky/feed/getSuggestedFeeds.json
new file mode 100644
index 0000000000..26cb0d1b49
--- /dev/null
+++ b/lexicons/app/bsky/feed/getSuggestedFeeds.json
@@ -0,0 +1,46 @@
+{
+  "id": "app.bsky.feed.getSuggestedFeeds",
+  "defs": {
+    "main": {
+      "type": "query",
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "feeds"
+          ],
+          "properties": {
+            "feeds": {
+              "type": "array",
+              "items": {
+                "ref": "app.bsky.feed.defs#generatorView",
+                "type": "ref"
+              }
+            },
+            "cursor": {
+              "type": "string"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "parameters": {
+        "type": "params",
+        "properties": {
+          "limit": {
+            "type": "integer",
+            "default": 50,
+            "maximum": 100,
+            "minimum": 1
+          },
+          "cursor": {
+            "type": "string"
+          }
+        }
+      },
+      "description": "Get a list of suggested feeds (feed generators) for the requesting account."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/feed/getTimeline.json b/lexicons/app/bsky/feed/getTimeline.json
new file mode 100644
index 0000000000..e35dbbc1cb
--- /dev/null
+++ b/lexicons/app/bsky/feed/getTimeline.json
@@ -0,0 +1,50 @@
+{
+  "id": "app.bsky.feed.getTimeline",
+  "defs": {
+    "main": {
+      "type": "query",
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "feed"
+          ],
+          "properties": {
+            "feed": {
+              "type": "array",
+              "items": {
+                "ref": "app.bsky.feed.defs#feedViewPost",
+                "type": "ref"
+              }
+            },
+            "cursor": {
+              "type": "string"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "parameters": {
+        "type": "params",
+        "properties": {
+          "limit": {
+            "type": "integer",
+            "default": 50,
+            "maximum": 100,
+            "minimum": 1
+          },
+          "cursor": {
+            "type": "string"
+          },
+          "algorithm": {
+            "type": "string",
+            "description": "Variant 'algorithm' for timeline. Implementation-specific. NOTE: most feed flexibility has been moved to feed generator mechanism."
+          }
+        }
+      },
+      "description": "Get a view of the requesting account's home timeline. This is expected to be some form of reverse-chronological feed."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/feed/like.json b/lexicons/app/bsky/feed/like.json
new file mode 100644
index 0000000000..2b941f743c
--- /dev/null
+++ b/lexicons/app/bsky/feed/like.json
@@ -0,0 +1,33 @@
+{
+  "id": "app.bsky.feed.like",
+  "defs": {
+    "main": {
+      "key": "tid",
+      "type": "record",
+      "record": {
+        "type": "object",
+        "required": [
+          "subject",
+          "createdAt"
+        ],
+        "properties": {
+          "via": {
+            "ref": "com.atproto.repo.strongRef",
+            "type": "ref"
+          },
+          "subject": {
+            "ref": "com.atproto.repo.strongRef",
+            "type": "ref"
+          },
+          "createdAt": {
+            "type": "string",
+            "format": "datetime"
+          }
+        }
+      },
+      "description": "Record declaring a 'like' of a piece of subject content."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/feed/post.json b/lexicons/app/bsky/feed/post.json
new file mode 100644
index 0000000000..50b8a53c88
--- /dev/null
+++ b/lexicons/app/bsky/feed/post.json
@@ -0,0 +1,146 @@
+{
+  "id": "app.bsky.feed.post",
+  "defs": {
+    "main": {
+      "key": "tid",
+      "type": "record",
+      "record": {
+        "type": "object",
+        "required": [
+          "text",
+          "createdAt"
+        ],
+        "properties": {
+          "tags": {
+            "type": "array",
+            "items": {
+              "type": "string",
+              "maxLength": 640,
+              "maxGraphemes": 64
+            },
+            "maxLength": 8,
+            "description": "Additional hashtags, in addition to any included in post text and facets."
+          },
+          "text": {
+            "type": "string",
+            "maxLength": 3000,
+            "description": "The primary post content. May be an empty string, if there are embeds.",
+            "maxGraphemes": 300
+          },
+          "embed": {
+            "refs": [
+              "app.bsky.embed.images",
+              "app.bsky.embed.video",
+              "app.bsky.embed.gallery",
+              "app.bsky.embed.external",
+              "app.bsky.embed.record",
+              "app.bsky.embed.recordWithMedia"
+            ],
+            "type": "union"
+          },
+          "langs": {
+            "type": "array",
+            "items": {
+              "type": "string",
+              "format": "language"
+            },
+            "maxLength": 3,
+            "description": "Indicates human language of post primary text content."
+          },
+          "reply": {
+            "ref": "#replyRef",
+            "type": "ref"
+          },
+          "facets": {
+            "type": "array",
+            "items": {
+              "ref": "app.bsky.richtext.facet",
+              "type": "ref"
+            },
+            "description": "Annotations of text (mentions, URLs, hashtags, etc)"
+          },
+          "labels": {
+            "refs": [
+              "com.atproto.label.defs#selfLabels"
+            ],
+            "type": "union",
+            "description": "Self-label values for this post. Effectively content warnings."
+          },
+          "entities": {
+            "type": "array",
+            "items": {
+              "ref": "#entity",
+              "type": "ref"
+            },
+            "description": "DEPRECATED: replaced by app.bsky.richtext.facet."
+          },
+          "createdAt": {
+            "type": "string",
+            "format": "datetime",
+            "description": "Client-declared timestamp when this post was originally created."
+          }
+        }
+      },
+      "description": "Record containing a Bluesky post."
+    },
+    "entity": {
+      "type": "object",
+      "required": [
+        "index",
+        "type",
+        "value"
+      ],
+      "properties": {
+        "type": {
+          "type": "string",
+          "description": "Expected values are 'mention' and 'link'."
+        },
+        "index": {
+          "ref": "#textSlice",
+          "type": "ref"
+        },
+        "value": {
+          "type": "string"
+        }
+      },
+      "description": "Deprecated: use facets instead."
+    },
+    "replyRef": {
+      "type": "object",
+      "required": [
+        "root",
+        "parent"
+      ],
+      "properties": {
+        "root": {
+          "ref": "com.atproto.repo.strongRef",
+          "type": "ref"
+        },
+        "parent": {
+          "ref": "com.atproto.repo.strongRef",
+          "type": "ref"
+        }
+      }
+    },
+    "textSlice": {
+      "type": "object",
+      "required": [
+        "start",
+        "end"
+      ],
+      "properties": {
+        "end": {
+          "type": "integer",
+          "minimum": 0
+        },
+        "start": {
+          "type": "integer",
+          "minimum": 0
+        }
+      },
+      "description": "Deprecated. Use app.bsky.richtext instead -- A text segment. Start is inclusive, end is exclusive. Indices are for utf16-encoded strings."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/feed/postgate.json b/lexicons/app/bsky/feed/postgate.json
new file mode 100644
index 0000000000..9fa0775a68
--- /dev/null
+++ b/lexicons/app/bsky/feed/postgate.json
@@ -0,0 +1,55 @@
+{
+  "id": "app.bsky.feed.postgate",
+  "defs": {
+    "main": {
+      "key": "tid",
+      "type": "record",
+      "record": {
+        "type": "object",
+        "required": [
+          "post",
+          "createdAt"
+        ],
+        "properties": {
+          "post": {
+            "type": "string",
+            "format": "at-uri",
+            "description": "Reference (AT-URI) to the post record."
+          },
+          "createdAt": {
+            "type": "string",
+            "format": "datetime"
+          },
+          "embeddingRules": {
+            "type": "array",
+            "items": {
+              "refs": [
+                "#disableRule"
+              ],
+              "type": "union"
+            },
+            "maxLength": 5,
+            "description": "List of rules defining who can embed this post. If value is an empty array or is undefined, no particular rules apply and anyone can embed."
+          },
+          "detachedEmbeddingUris": {
+            "type": "array",
+            "items": {
+              "type": "string",
+              "format": "at-uri"
+            },
+            "maxLength": 50,
+            "description": "List of AT-URIs embedding this post that the author has detached from."
+          }
+        }
+      },
+      "description": "Record defining interaction rules for a post. The record key (rkey) of the postgate record must match the record key of the post, and that record must be in the same repository."
+    },
+    "disableRule": {
+      "type": "object",
+      "properties": {},
+      "description": "Disables embedding of this post."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/feed/repost.json b/lexicons/app/bsky/feed/repost.json
new file mode 100644
index 0000000000..6563b1f5e4
--- /dev/null
+++ b/lexicons/app/bsky/feed/repost.json
@@ -0,0 +1,33 @@
+{
+  "id": "app.bsky.feed.repost",
+  "defs": {
+    "main": {
+      "key": "tid",
+      "type": "record",
+      "record": {
+        "type": "object",
+        "required": [
+          "subject",
+          "createdAt"
+        ],
+        "properties": {
+          "via": {
+            "ref": "com.atproto.repo.strongRef",
+            "type": "ref"
+          },
+          "subject": {
+            "ref": "com.atproto.repo.strongRef",
+            "type": "ref"
+          },
+          "createdAt": {
+            "type": "string",
+            "format": "datetime"
+          }
+        }
+      },
+      "description": "Record representing a 'repost' of an existing Bluesky post."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/feed/searchPosts.json b/lexicons/app/bsky/feed/searchPosts.json
new file mode 100644
index 0000000000..23ba045c24
--- /dev/null
+++ b/lexicons/app/bsky/feed/searchPosts.json
@@ -0,0 +1,113 @@
+{
+  "id": "app.bsky.feed.searchPosts",
+  "defs": {
+    "main": {
+      "type": "query",
+      "errors": [
+        {
+          "name": "BadQueryString"
+        }
+      ],
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "posts"
+          ],
+          "properties": {
+            "posts": {
+              "type": "array",
+              "items": {
+                "ref": "app.bsky.feed.defs#postView",
+                "type": "ref"
+              }
+            },
+            "cursor": {
+              "type": "string"
+            },
+            "hitsTotal": {
+              "type": "integer",
+              "description": "Count of search hits. Optional, may be rounded/truncated, and may not be possible to paginate through all hits."
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "parameters": {
+        "type": "params",
+        "required": [
+          "q"
+        ],
+        "properties": {
+          "q": {
+            "type": "string",
+            "description": "Search query string; syntax, phrase, boolean, and faceting is unspecified, but Lucene query syntax is recommended."
+          },
+          "tag": {
+            "type": "array",
+            "items": {
+              "type": "string",
+              "maxLength": 640,
+              "maxGraphemes": 64
+            },
+            "description": "Filter to posts with the given tag (hashtag), based on rich-text facet or tag field. Do not include the hash (#) prefix. Multiple tags can be specified, with 'AND' matching."
+          },
+          "url": {
+            "type": "string",
+            "format": "uri",
+            "description": "Filter to posts with links (facet links or embeds) pointing to this URL. Server may apply URL normalization or fuzzy matching."
+          },
+          "lang": {
+            "type": "string",
+            "format": "language",
+            "description": "Filter to posts in the given language. Expected to be based on post language field, though server may override language detection."
+          },
+          "sort": {
+            "type": "string",
+            "default": "latest",
+            "description": "Specifies the ranking order of results.",
+            "knownValues": [
+              "top",
+              "latest"
+            ]
+          },
+          "limit": {
+            "type": "integer",
+            "default": 25,
+            "maximum": 100,
+            "minimum": 1
+          },
+          "since": {
+            "type": "string",
+            "description": "Filter results for posts after the indicated datetime (inclusive). Expected to use 'sortAt' timestamp, which may not match 'createdAt'. Can be a datetime, or just an ISO date (YYYY-MM-DD)."
+          },
+          "until": {
+            "type": "string",
+            "description": "Filter results for posts before the indicated datetime (not inclusive). Expected to use 'sortAt' timestamp, which may not match 'createdAt'. Can be a datetime, or just an ISO date (YYY-MM-DD)."
+          },
+          "author": {
+            "type": "string",
+            "format": "at-identifier",
+            "description": "Filter to posts by the given account. Handles are resolved to DID before query-time."
+          },
+          "cursor": {
+            "type": "string",
+            "description": "Optional pagination mechanism; may not necessarily allow scrolling through entire result set."
+          },
+          "domain": {
+            "type": "string",
+            "description": "Filter to posts with URLs (facet links or embeds) linking to the given domain (hostname). Server may apply hostname normalization."
+          },
+          "mentions": {
+            "type": "string",
+            "format": "at-identifier",
+            "description": "Filter to posts which mention the given account. Handles are resolved to DID before query-time. Only matches rich-text facet mentions."
+          }
+        }
+      },
+      "description": "Find posts matching search criteria, returning views of those posts. Note that this API endpoint may require authentication (eg, not public) for some service providers and implementations."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/feed/searchPostsV2.json b/lexicons/app/bsky/feed/searchPostsV2.json
new file mode 100644
index 0000000000..0d3ba5cc16
--- /dev/null
+++ b/lexicons/app/bsky/feed/searchPostsV2.json
@@ -0,0 +1,251 @@
+{
+  "id": "app.bsky.feed.searchPostsV2",
+  "defs": {
+    "main": {
+      "type": "query",
+      "errors": [
+        {
+          "name": "BadQueryString"
+        }
+      ],
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "posts"
+          ],
+          "properties": {
+            "posts": {
+              "type": "array",
+              "items": {
+                "ref": "app.bsky.feed.defs#postView",
+                "type": "ref"
+              },
+              "description": "Hydrated views of matching posts."
+            },
+            "cursor": {
+              "type": "string",
+              "description": "Cursor for the next page of results."
+            },
+            "hitsTotal": {
+              "type": "integer",
+              "description": "Estimated total number of matching hits. May be rounded or truncated."
+            },
+            "detectedQueryLanguages": {
+              "type": "array",
+              "items": {
+                "type": "string",
+                "knownValues": [
+                  "ja",
+                  "zh",
+                  "ko",
+                  "th",
+                  "ar"
+                ]
+              },
+              "description": "Query languages detected for CJK, Thai, or Arabic text. Empty or omitted for other scripts."
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "parameters": {
+        "type": "params",
+        "required": [],
+        "properties": {
+          "sort": {
+            "type": "string",
+            "description": "Ranking order for results. 'recent' sorts by recency; 'top' uses search ranking.",
+            "knownValues": [
+              "recent",
+              "top"
+            ]
+          },
+          "urls": {
+            "type": "array",
+            "items": {
+              "type": "string",
+              "format": "uri"
+            },
+            "description": "Include posts that link to any of these URLs."
+          },
+          "limit": {
+            "type": "integer",
+            "default": 25,
+            "maximum": 100,
+            "minimum": 1,
+            "description": "Maximum number of results to return."
+          },
+          "query": {
+            "type": "string",
+            "description": "Search query string. A query or at least one filter is required."
+          },
+          "since": {
+            "type": "string",
+            "description": "Include posts indexed at or after this timestamp. Can be a datetime, or just an ISO date (YYYY-MM-DD)."
+          },
+          "until": {
+            "type": "string",
+            "description": "Include posts indexed before this timestamp. Defaults to the current time. Can be a datetime, or just an ISO date (YYYY-MM-DD)."
+          },
+          "cursor": {
+            "type": "string",
+            "description": "Optional pagination cursor."
+          },
+          "allTime": {
+            "type": "boolean",
+            "description": "Search the full index instead of the recent-post window."
+          },
+          "authors": {
+            "type": "array",
+            "items": {
+              "type": "string",
+              "format": "at-identifier"
+            },
+            "description": "Include posts by any of these authors. Handles are resolved to DIDs before searching."
+          },
+          "domains": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "description": "Include posts that link to any of these domains."
+          },
+          "hasMedia": {
+            "type": "boolean",
+            "description": "Include only posts with media."
+          },
+          "hasVideo": {
+            "type": "boolean",
+            "description": "Include only posts with video."
+          },
+          "hashtags": {
+            "type": "array",
+            "items": {
+              "type": "string",
+              "maxLength": 640,
+              "maxGraphemes": 64
+            },
+            "description": "Include posts tagged with any of these hashtags. Do not include the hash (#) prefix."
+          },
+          "mentions": {
+            "type": "array",
+            "items": {
+              "type": "string",
+              "format": "at-identifier"
+            },
+            "description": "Include posts that mention any of these accounts. Handles are resolved to DIDs before searching."
+          },
+          "following": {
+            "type": "boolean",
+            "description": "Include only posts from accounts followed by the viewer."
+          },
+          "languages": {
+            "type": "array",
+            "items": {
+              "type": "string",
+              "format": "language"
+            },
+            "description": "Include posts whose language matches any of these language codes."
+          },
+          "excludeUrls": {
+            "type": "array",
+            "items": {
+              "type": "string",
+              "format": "uri"
+            },
+            "description": "Exclude posts that link to any of these URLs."
+          },
+          "repliesOnly": {
+            "type": "boolean",
+            "description": "Include only replies. Mutually exclusive with excludeReplies."
+          },
+          "queryLanguage": {
+            "type": "string",
+            "description": "Language analyzer hint for the query text. If unset, the server auto-detects when possible.",
+            "knownValues": [
+              "ja",
+              "zh",
+              "ko",
+              "th",
+              "ar"
+            ]
+          },
+          "threadRootUri": {
+            "type": "string",
+            "format": "at-uri",
+            "description": "Include only posts in the thread rooted at this post URI."
+          },
+          "embeddedAtUris": {
+            "type": "array",
+            "items": {
+              "type": "string",
+              "format": "at-uri"
+            },
+            "description": "Include posts that embed any of these AT URIs."
+          },
+          "excludeAuthors": {
+            "type": "array",
+            "items": {
+              "type": "string",
+              "format": "at-identifier"
+            },
+            "description": "Exclude posts by any of these authors. Handles are resolved to DIDs before searching."
+          },
+          "excludeDomains": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "description": "Exclude posts that link to any of these domains."
+          },
+          "excludeReplies": {
+            "type": "boolean",
+            "description": "Exclude replies from results. Mutually exclusive with repliesOnly."
+          },
+          "replyParentUri": {
+            "type": "string",
+            "format": "at-uri",
+            "description": "Include only direct replies to this parent post URI."
+          },
+          "excludeHashtags": {
+            "type": "array",
+            "items": {
+              "type": "string",
+              "maxLength": 640,
+              "maxGraphemes": 64
+            },
+            "description": "Exclude posts tagged with any of these hashtags. Do not include the hash (#) prefix."
+          },
+          "excludeMentions": {
+            "type": "array",
+            "items": {
+              "type": "string",
+              "format": "at-identifier"
+            },
+            "description": "Exclude posts that mention any of these accounts. Handles are resolved to DIDs before searching."
+          },
+          "excludeLanguages": {
+            "type": "array",
+            "items": {
+              "type": "string",
+              "format": "language"
+            },
+            "description": "Exclude posts whose language matches any of these language codes."
+          },
+          "excludeEmbeddedAtUris": {
+            "type": "array",
+            "items": {
+              "type": "string",
+              "format": "at-uri"
+            },
+            "description": "Exclude posts that embed any of these AT URIs."
+          }
+        }
+      },
+      "description": "Find posts matching a search query or filters, returning search hits for matching post records."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/feed/sendInteractions.json b/lexicons/app/bsky/feed/sendInteractions.json
new file mode 100644
index 0000000000..eea9f6c1fc
--- /dev/null
+++ b/lexicons/app/bsky/feed/sendInteractions.json
@@ -0,0 +1,40 @@
+{
+  "id": "app.bsky.feed.sendInteractions",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "input": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "interactions"
+          ],
+          "properties": {
+            "feed": {
+              "type": "string",
+              "format": "at-uri"
+            },
+            "interactions": {
+              "type": "array",
+              "items": {
+                "ref": "app.bsky.feed.defs#interaction",
+                "type": "ref"
+              }
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "output": {
+        "schema": {
+          "type": "object",
+          "properties": {}
+        },
+        "encoding": "application/json"
+      },
+      "description": "Send information about interactions with feed items back to the feed generator that served them."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/feed/threadgate.json b/lexicons/app/bsky/feed/threadgate.json
new file mode 100644
index 0000000000..8b4d3c6117
--- /dev/null
+++ b/lexicons/app/bsky/feed/threadgate.json
@@ -0,0 +1,81 @@
+{
+  "id": "app.bsky.feed.threadgate",
+  "defs": {
+    "main": {
+      "key": "tid",
+      "type": "record",
+      "record": {
+        "type": "object",
+        "required": [
+          "post",
+          "createdAt"
+        ],
+        "properties": {
+          "post": {
+            "type": "string",
+            "format": "at-uri",
+            "description": "Reference (AT-URI) to the post record."
+          },
+          "allow": {
+            "type": "array",
+            "items": {
+              "refs": [
+                "#mentionRule",
+                "#followerRule",
+                "#followingRule",
+                "#listRule"
+              ],
+              "type": "union"
+            },
+            "maxLength": 5,
+            "description": "List of rules defining who can reply to this post. If value is an empty array, no one can reply. If value is undefined, anyone can reply."
+          },
+          "createdAt": {
+            "type": "string",
+            "format": "datetime"
+          },
+          "hiddenReplies": {
+            "type": "array",
+            "items": {
+              "type": "string",
+              "format": "at-uri"
+            },
+            "maxLength": 300,
+            "description": "List of hidden reply URIs."
+          }
+        }
+      },
+      "description": "Record defining interaction gating rules for a thread (aka, reply controls). The record key (rkey) of the threadgate record must match the record key of the thread's root post, and that record must be in the same repository."
+    },
+    "listRule": {
+      "type": "object",
+      "required": [
+        "list"
+      ],
+      "properties": {
+        "list": {
+          "type": "string",
+          "format": "at-uri"
+        }
+      },
+      "description": "Allow replies from actors on a list."
+    },
+    "mentionRule": {
+      "type": "object",
+      "properties": {},
+      "description": "Allow replies from actors mentioned in your post."
+    },
+    "followerRule": {
+      "type": "object",
+      "properties": {},
+      "description": "Allow replies from actors who follow you."
+    },
+    "followingRule": {
+      "type": "object",
+      "properties": {},
+      "description": "Allow replies from actors you follow."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/graph/block.json b/lexicons/app/bsky/graph/block.json
new file mode 100644
index 0000000000..bc0cd214df
--- /dev/null
+++ b/lexicons/app/bsky/graph/block.json
@@ -0,0 +1,30 @@
+{
+  "id": "app.bsky.graph.block",
+  "defs": {
+    "main": {
+      "key": "tid",
+      "type": "record",
+      "record": {
+        "type": "object",
+        "required": [
+          "subject",
+          "createdAt"
+        ],
+        "properties": {
+          "subject": {
+            "type": "string",
+            "format": "did",
+            "description": "DID of the account to be blocked."
+          },
+          "createdAt": {
+            "type": "string",
+            "format": "datetime"
+          }
+        }
+      },
+      "description": "Record declaring a 'block' relationship against another account. NOTE: blocks are public in Bluesky; see blog posts for details."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/graph/defs.json b/lexicons/app/bsky/graph/defs.json
new file mode 100644
index 0000000000..eca42fc875
--- /dev/null
+++ b/lexicons/app/bsky/graph/defs.json
@@ -0,0 +1,353 @@
+{
+  "id": "app.bsky.graph.defs",
+  "defs": {
+    "modlist": {
+      "type": "token",
+      "description": "A list of actors to apply an aggregate moderation action (mute/block) on."
+    },
+    "listView": {
+      "type": "object",
+      "required": [
+        "uri",
+        "cid",
+        "creator",
+        "name",
+        "purpose",
+        "indexedAt"
+      ],
+      "properties": {
+        "cid": {
+          "type": "string",
+          "format": "cid"
+        },
+        "uri": {
+          "type": "string",
+          "format": "at-uri"
+        },
+        "name": {
+          "type": "string",
+          "maxLength": 64,
+          "minLength": 1
+        },
+        "avatar": {
+          "type": "string",
+          "format": "uri"
+        },
+        "labels": {
+          "type": "array",
+          "items": {
+            "ref": "com.atproto.label.defs#label",
+            "type": "ref"
+          }
+        },
+        "viewer": {
+          "ref": "#listViewerState",
+          "type": "ref"
+        },
+        "creator": {
+          "ref": "app.bsky.actor.defs#profileView",
+          "type": "ref"
+        },
+        "purpose": {
+          "ref": "#listPurpose",
+          "type": "ref"
+        },
+        "indexedAt": {
+          "type": "string",
+          "format": "datetime"
+        },
+        "description": {
+          "type": "string",
+          "maxLength": 3000,
+          "maxGraphemes": 300
+        },
+        "listItemCount": {
+          "type": "integer",
+          "minimum": 0
+        },
+        "descriptionFacets": {
+          "type": "array",
+          "items": {
+            "ref": "app.bsky.richtext.facet",
+            "type": "ref"
+          }
+        }
+      }
+    },
+    "curatelist": {
+      "type": "token",
+      "description": "A list of actors used for curation purposes such as list feeds or interaction gating."
+    },
+    "listPurpose": {
+      "type": "string",
+      "knownValues": [
+        "app.bsky.graph.defs#modlist",
+        "app.bsky.graph.defs#curatelist",
+        "app.bsky.graph.defs#referencelist"
+      ]
+    },
+    "listItemView": {
+      "type": "object",
+      "required": [
+        "uri",
+        "subject"
+      ],
+      "properties": {
+        "uri": {
+          "type": "string",
+          "format": "at-uri"
+        },
+        "subject": {
+          "ref": "app.bsky.actor.defs#profileView",
+          "type": "ref"
+        }
+      }
+    },
+    "relationship": {
+      "type": "object",
+      "required": [
+        "did"
+      ],
+      "properties": {
+        "did": {
+          "type": "string",
+          "format": "did"
+        },
+        "blocking": {
+          "type": "string",
+          "format": "at-uri",
+          "description": "if the actor blocks this DID, this is the AT-URI of the block record"
+        },
+        "blockedBy": {
+          "type": "string",
+          "format": "at-uri",
+          "description": "if the actor is blocked by this DID, contains the AT-URI of the block record"
+        },
+        "following": {
+          "type": "string",
+          "format": "at-uri",
+          "description": "if the actor follows this DID, this is the AT-URI of the follow record"
+        },
+        "followedBy": {
+          "type": "string",
+          "format": "at-uri",
+          "description": "if the actor is followed by this DID, contains the AT-URI of the follow record"
+        },
+        "blockedByList": {
+          "type": "string",
+          "format": "at-uri",
+          "description": "if the actor is blocked by this DID via a block list, contains the AT-URI of the listblock record"
+        },
+        "blockingByList": {
+          "type": "string",
+          "format": "at-uri",
+          "description": "if the actor blocks this DID via a block list, this is the AT-URI of the listblock record"
+        }
+      },
+      "description": "lists the bi-directional graph relationships between one actor (not indicated in the object), and the target actors (the DID included in the object)"
+    },
+    "listViewBasic": {
+      "type": "object",
+      "required": [
+        "uri",
+        "cid",
+        "name",
+        "purpose"
+      ],
+      "properties": {
+        "cid": {
+          "type": "string",
+          "format": "cid"
+        },
+        "uri": {
+          "type": "string",
+          "format": "at-uri"
+        },
+        "name": {
+          "type": "string",
+          "maxLength": 64,
+          "minLength": 1
+        },
+        "avatar": {
+          "type": "string",
+          "format": "uri"
+        },
+        "labels": {
+          "type": "array",
+          "items": {
+            "ref": "com.atproto.label.defs#label",
+            "type": "ref"
+          }
+        },
+        "viewer": {
+          "ref": "#listViewerState",
+          "type": "ref"
+        },
+        "purpose": {
+          "ref": "#listPurpose",
+          "type": "ref"
+        },
+        "indexedAt": {
+          "type": "string",
+          "format": "datetime"
+        },
+        "listItemCount": {
+          "type": "integer",
+          "minimum": 0
+        }
+      }
+    },
+    "notFoundActor": {
+      "type": "object",
+      "required": [
+        "actor",
+        "notFound"
+      ],
+      "properties": {
+        "actor": {
+          "type": "string",
+          "format": "at-identifier"
+        },
+        "notFound": {
+          "type": "boolean",
+          "const": true
+        }
+      },
+      "description": "indicates that a handle or DID could not be resolved"
+    },
+    "referencelist": {
+      "type": "token",
+      "description": "A list of actors used for only for reference purposes such as within a starter pack."
+    },
+    "listViewerState": {
+      "type": "object",
+      "properties": {
+        "muted": {
+          "type": "boolean"
+        },
+        "blocked": {
+          "type": "string",
+          "format": "at-uri"
+        }
+      }
+    },
+    "starterPackView": {
+      "type": "object",
+      "required": [
+        "uri",
+        "cid",
+        "record",
+        "creator",
+        "indexedAt"
+      ],
+      "properties": {
+        "cid": {
+          "type": "string",
+          "format": "cid"
+        },
+        "uri": {
+          "type": "string",
+          "format": "at-uri"
+        },
+        "list": {
+          "ref": "#listViewBasic",
+          "type": "ref"
+        },
+        "feeds": {
+          "type": "array",
+          "items": {
+            "ref": "app.bsky.feed.defs#generatorView",
+            "type": "ref"
+          },
+          "maxLength": 3
+        },
+        "labels": {
+          "type": "array",
+          "items": {
+            "ref": "com.atproto.label.defs#label",
+            "type": "ref"
+          }
+        },
+        "record": {
+          "type": "unknown"
+        },
+        "creator": {
+          "ref": "app.bsky.actor.defs#profileViewBasic",
+          "type": "ref"
+        },
+        "indexedAt": {
+          "type": "string",
+          "format": "datetime"
+        },
+        "joinedWeekCount": {
+          "type": "integer",
+          "minimum": 0
+        },
+        "listItemsSample": {
+          "type": "array",
+          "items": {
+            "ref": "#listItemView",
+            "type": "ref"
+          },
+          "maxLength": 12
+        },
+        "joinedAllTimeCount": {
+          "type": "integer",
+          "minimum": 0
+        }
+      }
+    },
+    "starterPackViewBasic": {
+      "type": "object",
+      "required": [
+        "uri",
+        "cid",
+        "record",
+        "creator",
+        "indexedAt"
+      ],
+      "properties": {
+        "cid": {
+          "type": "string",
+          "format": "cid"
+        },
+        "uri": {
+          "type": "string",
+          "format": "at-uri"
+        },
+        "labels": {
+          "type": "array",
+          "items": {
+            "ref": "com.atproto.label.defs#label",
+            "type": "ref"
+          }
+        },
+        "record": {
+          "type": "unknown"
+        },
+        "creator": {
+          "ref": "app.bsky.actor.defs#profileViewBasic",
+          "type": "ref"
+        },
+        "indexedAt": {
+          "type": "string",
+          "format": "datetime"
+        },
+        "listItemCount": {
+          "type": "integer",
+          "minimum": 0
+        },
+        "joinedWeekCount": {
+          "type": "integer",
+          "minimum": 0
+        },
+        "joinedAllTimeCount": {
+          "type": "integer",
+          "minimum": 0
+        }
+      }
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/graph/follow.json b/lexicons/app/bsky/graph/follow.json
new file mode 100644
index 0000000000..1918ba075d
--- /dev/null
+++ b/lexicons/app/bsky/graph/follow.json
@@ -0,0 +1,33 @@
+{
+  "id": "app.bsky.graph.follow",
+  "defs": {
+    "main": {
+      "key": "tid",
+      "type": "record",
+      "record": {
+        "type": "object",
+        "required": [
+          "subject",
+          "createdAt"
+        ],
+        "properties": {
+          "via": {
+            "ref": "com.atproto.repo.strongRef",
+            "type": "ref"
+          },
+          "subject": {
+            "type": "string",
+            "format": "did"
+          },
+          "createdAt": {
+            "type": "string",
+            "format": "datetime"
+          }
+        }
+      },
+      "description": "Record declaring a social 'follow' relationship of another account. Duplicate follows will be ignored by the AppView."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/graph/getActorStarterPacks.json b/lexicons/app/bsky/graph/getActorStarterPacks.json
new file mode 100644
index 0000000000..8cccf2b909
--- /dev/null
+++ b/lexicons/app/bsky/graph/getActorStarterPacks.json
@@ -0,0 +1,53 @@
+{
+  "id": "app.bsky.graph.getActorStarterPacks",
+  "defs": {
+    "main": {
+      "type": "query",
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "starterPacks"
+          ],
+          "properties": {
+            "cursor": {
+              "type": "string"
+            },
+            "starterPacks": {
+              "type": "array",
+              "items": {
+                "ref": "app.bsky.graph.defs#starterPackViewBasic",
+                "type": "ref"
+              }
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "parameters": {
+        "type": "params",
+        "required": [
+          "actor"
+        ],
+        "properties": {
+          "actor": {
+            "type": "string",
+            "format": "at-identifier"
+          },
+          "limit": {
+            "type": "integer",
+            "default": 50,
+            "maximum": 100,
+            "minimum": 1
+          },
+          "cursor": {
+            "type": "string"
+          }
+        }
+      },
+      "description": "Get a list of starter packs created by the actor."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/graph/getBlocks.json b/lexicons/app/bsky/graph/getBlocks.json
new file mode 100644
index 0000000000..35e2b289fa
--- /dev/null
+++ b/lexicons/app/bsky/graph/getBlocks.json
@@ -0,0 +1,46 @@
+{
+  "id": "app.bsky.graph.getBlocks",
+  "defs": {
+    "main": {
+      "type": "query",
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "blocks"
+          ],
+          "properties": {
+            "blocks": {
+              "type": "array",
+              "items": {
+                "ref": "app.bsky.actor.defs#profileView",
+                "type": "ref"
+              }
+            },
+            "cursor": {
+              "type": "string"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "parameters": {
+        "type": "params",
+        "properties": {
+          "limit": {
+            "type": "integer",
+            "default": 50,
+            "maximum": 100,
+            "minimum": 1
+          },
+          "cursor": {
+            "type": "string"
+          }
+        }
+      },
+      "description": "Enumerates which accounts the requesting account is currently blocking. Requires auth."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/graph/getFollowers.json b/lexicons/app/bsky/graph/getFollowers.json
new file mode 100644
index 0000000000..80374a1331
--- /dev/null
+++ b/lexicons/app/bsky/graph/getFollowers.json
@@ -0,0 +1,66 @@
+{
+  "id": "app.bsky.graph.getFollowers",
+  "defs": {
+    "main": {
+      "type": "query",
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "subject",
+            "followers"
+          ],
+          "properties": {
+            "cursor": {
+              "type": "string"
+            },
+            "subject": {
+              "ref": "app.bsky.actor.defs#profileView",
+              "type": "ref"
+            },
+            "followers": {
+              "type": "array",
+              "items": {
+                "ref": "app.bsky.actor.defs#profileView",
+                "type": "ref"
+              }
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "parameters": {
+        "type": "params",
+        "required": [
+          "actor"
+        ],
+        "properties": {
+          "sort": {
+            "type": "string",
+            "description": "Sort order of the returned followers.",
+            "knownValues": [
+              "latest",
+              "top"
+            ]
+          },
+          "actor": {
+            "type": "string",
+            "format": "at-identifier"
+          },
+          "limit": {
+            "type": "integer",
+            "default": 50,
+            "maximum": 100,
+            "minimum": 1
+          },
+          "cursor": {
+            "type": "string"
+          }
+        }
+      },
+      "description": "Enumerates accounts which follow a specified account (actor)."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/graph/getFollows.json b/lexicons/app/bsky/graph/getFollows.json
new file mode 100644
index 0000000000..eab30c336c
--- /dev/null
+++ b/lexicons/app/bsky/graph/getFollows.json
@@ -0,0 +1,66 @@
+{
+  "id": "app.bsky.graph.getFollows",
+  "defs": {
+    "main": {
+      "type": "query",
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "subject",
+            "follows"
+          ],
+          "properties": {
+            "cursor": {
+              "type": "string"
+            },
+            "follows": {
+              "type": "array",
+              "items": {
+                "ref": "app.bsky.actor.defs#profileView",
+                "type": "ref"
+              }
+            },
+            "subject": {
+              "ref": "app.bsky.actor.defs#profileView",
+              "type": "ref"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "parameters": {
+        "type": "params",
+        "required": [
+          "actor"
+        ],
+        "properties": {
+          "sort": {
+            "type": "string",
+            "description": "Sort order of the returned follows.",
+            "knownValues": [
+              "latest",
+              "top"
+            ]
+          },
+          "actor": {
+            "type": "string",
+            "format": "at-identifier"
+          },
+          "limit": {
+            "type": "integer",
+            "default": 50,
+            "maximum": 100,
+            "minimum": 1
+          },
+          "cursor": {
+            "type": "string"
+          }
+        }
+      },
+      "description": "Enumerates accounts which a specified account (actor) follows."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/graph/getKnownFollowers.json b/lexicons/app/bsky/graph/getKnownFollowers.json
new file mode 100644
index 0000000000..2c705fc3c1
--- /dev/null
+++ b/lexicons/app/bsky/graph/getKnownFollowers.json
@@ -0,0 +1,58 @@
+{
+  "id": "app.bsky.graph.getKnownFollowers",
+  "defs": {
+    "main": {
+      "type": "query",
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "subject",
+            "followers"
+          ],
+          "properties": {
+            "cursor": {
+              "type": "string"
+            },
+            "subject": {
+              "ref": "app.bsky.actor.defs#profileView",
+              "type": "ref"
+            },
+            "followers": {
+              "type": "array",
+              "items": {
+                "ref": "app.bsky.actor.defs#profileView",
+                "type": "ref"
+              }
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "parameters": {
+        "type": "params",
+        "required": [
+          "actor"
+        ],
+        "properties": {
+          "actor": {
+            "type": "string",
+            "format": "at-identifier"
+          },
+          "limit": {
+            "type": "integer",
+            "default": 50,
+            "maximum": 100,
+            "minimum": 1
+          },
+          "cursor": {
+            "type": "string"
+          }
+        }
+      },
+      "description": "Enumerates accounts which follow a specified account (actor) and are followed by the viewer."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/graph/getList.json b/lexicons/app/bsky/graph/getList.json
new file mode 100644
index 0000000000..b5a6e226ae
--- /dev/null
+++ b/lexicons/app/bsky/graph/getList.json
@@ -0,0 +1,59 @@
+{
+  "id": "app.bsky.graph.getList",
+  "defs": {
+    "main": {
+      "type": "query",
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "list",
+            "items"
+          ],
+          "properties": {
+            "list": {
+              "ref": "app.bsky.graph.defs#listView",
+              "type": "ref"
+            },
+            "items": {
+              "type": "array",
+              "items": {
+                "ref": "app.bsky.graph.defs#listItemView",
+                "type": "ref"
+              }
+            },
+            "cursor": {
+              "type": "string"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "parameters": {
+        "type": "params",
+        "required": [
+          "list"
+        ],
+        "properties": {
+          "list": {
+            "type": "string",
+            "format": "at-uri",
+            "description": "Reference (AT-URI) of the list record to hydrate."
+          },
+          "limit": {
+            "type": "integer",
+            "default": 50,
+            "maximum": 100,
+            "minimum": 1
+          },
+          "cursor": {
+            "type": "string"
+          }
+        }
+      },
+      "description": "Gets a 'view' (with additional context) of a specified list."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/graph/getListBlocks.json b/lexicons/app/bsky/graph/getListBlocks.json
new file mode 100644
index 0000000000..03477a13b6
--- /dev/null
+++ b/lexicons/app/bsky/graph/getListBlocks.json
@@ -0,0 +1,46 @@
+{
+  "id": "app.bsky.graph.getListBlocks",
+  "defs": {
+    "main": {
+      "type": "query",
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "lists"
+          ],
+          "properties": {
+            "lists": {
+              "type": "array",
+              "items": {
+                "ref": "app.bsky.graph.defs#listView",
+                "type": "ref"
+              }
+            },
+            "cursor": {
+              "type": "string"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "parameters": {
+        "type": "params",
+        "properties": {
+          "limit": {
+            "type": "integer",
+            "default": 50,
+            "maximum": 100,
+            "minimum": 1
+          },
+          "cursor": {
+            "type": "string"
+          }
+        }
+      },
+      "description": "Get mod lists that the requesting account (actor) is blocking. Requires auth."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/graph/getListMutes.json b/lexicons/app/bsky/graph/getListMutes.json
new file mode 100644
index 0000000000..ea54aab6d2
--- /dev/null
+++ b/lexicons/app/bsky/graph/getListMutes.json
@@ -0,0 +1,46 @@
+{
+  "id": "app.bsky.graph.getListMutes",
+  "defs": {
+    "main": {
+      "type": "query",
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "lists"
+          ],
+          "properties": {
+            "lists": {
+              "type": "array",
+              "items": {
+                "ref": "app.bsky.graph.defs#listView",
+                "type": "ref"
+              }
+            },
+            "cursor": {
+              "type": "string"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "parameters": {
+        "type": "params",
+        "properties": {
+          "limit": {
+            "type": "integer",
+            "default": 50,
+            "maximum": 100,
+            "minimum": 1
+          },
+          "cursor": {
+            "type": "string"
+          }
+        }
+      },
+      "description": "Enumerates mod lists that the requesting account (actor) currently has muted. Requires auth."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/graph/getLists.json b/lexicons/app/bsky/graph/getLists.json
new file mode 100644
index 0000000000..03c960da01
--- /dev/null
+++ b/lexicons/app/bsky/graph/getLists.json
@@ -0,0 +1,65 @@
+{
+  "id": "app.bsky.graph.getLists",
+  "defs": {
+    "main": {
+      "type": "query",
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "lists"
+          ],
+          "properties": {
+            "lists": {
+              "type": "array",
+              "items": {
+                "ref": "app.bsky.graph.defs#listView",
+                "type": "ref"
+              }
+            },
+            "cursor": {
+              "type": "string"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "parameters": {
+        "type": "params",
+        "required": [
+          "actor"
+        ],
+        "properties": {
+          "actor": {
+            "type": "string",
+            "format": "at-identifier",
+            "description": "The account (actor) to enumerate lists from."
+          },
+          "limit": {
+            "type": "integer",
+            "default": 50,
+            "maximum": 100,
+            "minimum": 1
+          },
+          "cursor": {
+            "type": "string"
+          },
+          "purposes": {
+            "type": "array",
+            "items": {
+              "type": "string",
+              "knownValues": [
+                "modlist",
+                "curatelist"
+              ]
+            },
+            "description": "Optional filter by list purpose. If not specified, all supported types are returned."
+          }
+        }
+      },
+      "description": "Enumerates the lists created by a specified account (actor)."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/graph/getListsWithMembership.json b/lexicons/app/bsky/graph/getListsWithMembership.json
new file mode 100644
index 0000000000..7e0b34a666
--- /dev/null
+++ b/lexicons/app/bsky/graph/getListsWithMembership.json
@@ -0,0 +1,82 @@
+{
+  "id": "app.bsky.graph.getListsWithMembership",
+  "defs": {
+    "main": {
+      "type": "query",
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "listsWithMembership"
+          ],
+          "properties": {
+            "cursor": {
+              "type": "string"
+            },
+            "listsWithMembership": {
+              "type": "array",
+              "items": {
+                "ref": "#listWithMembership",
+                "type": "ref"
+              }
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "parameters": {
+        "type": "params",
+        "required": [
+          "actor"
+        ],
+        "properties": {
+          "actor": {
+            "type": "string",
+            "format": "at-identifier",
+            "description": "The account (actor) to check for membership."
+          },
+          "limit": {
+            "type": "integer",
+            "default": 50,
+            "maximum": 100,
+            "minimum": 1
+          },
+          "cursor": {
+            "type": "string"
+          },
+          "purposes": {
+            "type": "array",
+            "items": {
+              "type": "string",
+              "knownValues": [
+                "modlist",
+                "curatelist"
+              ]
+            },
+            "description": "Optional filter by list purpose. If not specified, all supported types are returned."
+          }
+        }
+      },
+      "description": "Enumerates the lists created by the session user, and includes membership information about `actor` in those lists. Only supports curation and moderation lists (no reference lists, used in starter packs). Requires auth."
+    },
+    "listWithMembership": {
+      "type": "object",
+      "required": [
+        "list"
+      ],
+      "properties": {
+        "list": {
+          "ref": "app.bsky.graph.defs#listView",
+          "type": "ref"
+        },
+        "listItem": {
+          "ref": "app.bsky.graph.defs#listItemView",
+          "type": "ref"
+        }
+      },
+      "description": "A list and an optional list item indicating membership of a target user to that list."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/graph/getMutes.json b/lexicons/app/bsky/graph/getMutes.json
new file mode 100644
index 0000000000..ad6303cd0d
--- /dev/null
+++ b/lexicons/app/bsky/graph/getMutes.json
@@ -0,0 +1,46 @@
+{
+  "id": "app.bsky.graph.getMutes",
+  "defs": {
+    "main": {
+      "type": "query",
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "mutes"
+          ],
+          "properties": {
+            "mutes": {
+              "type": "array",
+              "items": {
+                "ref": "app.bsky.actor.defs#profileView",
+                "type": "ref"
+              }
+            },
+            "cursor": {
+              "type": "string"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "parameters": {
+        "type": "params",
+        "properties": {
+          "limit": {
+            "type": "integer",
+            "default": 50,
+            "maximum": 100,
+            "minimum": 1
+          },
+          "cursor": {
+            "type": "string"
+          }
+        }
+      },
+      "description": "Enumerates accounts that the requesting account (actor) currently has fully muted. Mutes scoped to specific kinds of content (only reposts, only quote posts) are not included. Responses may contain more items than the requested limit. Requires auth."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/graph/getRelationships.json b/lexicons/app/bsky/graph/getRelationships.json
new file mode 100644
index 0000000000..84cc69fe59
--- /dev/null
+++ b/lexicons/app/bsky/graph/getRelationships.json
@@ -0,0 +1,64 @@
+{
+  "id": "app.bsky.graph.getRelationships",
+  "defs": {
+    "main": {
+      "type": "query",
+      "errors": [
+        {
+          "name": "ActorNotFound",
+          "description": "the primary actor at-identifier could not be resolved"
+        }
+      ],
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "relationships"
+          ],
+          "properties": {
+            "actor": {
+              "type": "string",
+              "format": "did"
+            },
+            "relationships": {
+              "type": "array",
+              "items": {
+                "refs": [
+                  "app.bsky.graph.defs#relationship",
+                  "app.bsky.graph.defs#notFoundActor"
+                ],
+                "type": "union"
+              }
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "parameters": {
+        "type": "params",
+        "required": [
+          "actor"
+        ],
+        "properties": {
+          "actor": {
+            "type": "string",
+            "format": "at-identifier",
+            "description": "Primary account requesting relationships for."
+          },
+          "others": {
+            "type": "array",
+            "items": {
+              "type": "string",
+              "format": "at-identifier"
+            },
+            "maxLength": 30,
+            "description": "List of 'other' accounts to be related back to the primary."
+          }
+        }
+      },
+      "description": "Enumerates public relationships between one account, and a list of other accounts. Does not require auth."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/graph/getStarterPack.json b/lexicons/app/bsky/graph/getStarterPack.json
new file mode 100644
index 0000000000..aa8ef6ce2a
--- /dev/null
+++ b/lexicons/app/bsky/graph/getStarterPack.json
@@ -0,0 +1,39 @@
+{
+  "id": "app.bsky.graph.getStarterPack",
+  "defs": {
+    "main": {
+      "type": "query",
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "starterPack"
+          ],
+          "properties": {
+            "starterPack": {
+              "ref": "app.bsky.graph.defs#starterPackView",
+              "type": "ref"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "parameters": {
+        "type": "params",
+        "required": [
+          "starterPack"
+        ],
+        "properties": {
+          "starterPack": {
+            "type": "string",
+            "format": "at-uri",
+            "description": "Reference (AT-URI) of the starter pack record."
+          }
+        }
+      },
+      "description": "Gets a view of a starter pack."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/graph/getStarterPacks.json b/lexicons/app/bsky/graph/getStarterPacks.json
new file mode 100644
index 0000000000..15d73a1e55
--- /dev/null
+++ b/lexicons/app/bsky/graph/getStarterPacks.json
@@ -0,0 +1,45 @@
+{
+  "id": "app.bsky.graph.getStarterPacks",
+  "defs": {
+    "main": {
+      "type": "query",
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "starterPacks"
+          ],
+          "properties": {
+            "starterPacks": {
+              "type": "array",
+              "items": {
+                "ref": "app.bsky.graph.defs#starterPackViewBasic",
+                "type": "ref"
+              }
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "parameters": {
+        "type": "params",
+        "required": [
+          "uris"
+        ],
+        "properties": {
+          "uris": {
+            "type": "array",
+            "items": {
+              "type": "string",
+              "format": "at-uri"
+            },
+            "maxLength": 25
+          }
+        }
+      },
+      "description": "Get views for a list of starter packs."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/graph/getStarterPacksWithMembership.json b/lexicons/app/bsky/graph/getStarterPacksWithMembership.json
new file mode 100644
index 0000000000..c57d254ce3
--- /dev/null
+++ b/lexicons/app/bsky/graph/getStarterPacksWithMembership.json
@@ -0,0 +1,71 @@
+{
+  "id": "app.bsky.graph.getStarterPacksWithMembership",
+  "defs": {
+    "main": {
+      "type": "query",
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "starterPacksWithMembership"
+          ],
+          "properties": {
+            "cursor": {
+              "type": "string"
+            },
+            "starterPacksWithMembership": {
+              "type": "array",
+              "items": {
+                "ref": "#starterPackWithMembership",
+                "type": "ref"
+              }
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "parameters": {
+        "type": "params",
+        "required": [
+          "actor"
+        ],
+        "properties": {
+          "actor": {
+            "type": "string",
+            "format": "at-identifier",
+            "description": "The account (actor) to check for membership."
+          },
+          "limit": {
+            "type": "integer",
+            "default": 50,
+            "maximum": 100,
+            "minimum": 1
+          },
+          "cursor": {
+            "type": "string"
+          }
+        }
+      },
+      "description": "Enumerates the starter packs created by the session user, and includes membership information about `actor` in those starter packs. Requires auth."
+    },
+    "starterPackWithMembership": {
+      "type": "object",
+      "required": [
+        "starterPack"
+      ],
+      "properties": {
+        "listItem": {
+          "ref": "app.bsky.graph.defs#listItemView",
+          "type": "ref"
+        },
+        "starterPack": {
+          "ref": "app.bsky.graph.defs#starterPackView",
+          "type": "ref"
+        }
+      },
+      "description": "A starter pack and an optional list item indicating membership of a target user to that starter pack."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/graph/getSuggestedFollowsByActor.json b/lexicons/app/bsky/graph/getSuggestedFollowsByActor.json
new file mode 100644
index 0000000000..12b617d0a4
--- /dev/null
+++ b/lexicons/app/bsky/graph/getSuggestedFollowsByActor.json
@@ -0,0 +1,54 @@
+{
+  "id": "app.bsky.graph.getSuggestedFollowsByActor",
+  "defs": {
+    "main": {
+      "type": "query",
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "suggestions"
+          ],
+          "properties": {
+            "recId": {
+              "type": "integer",
+              "description": "DEPRECATED: use recIdStr instead."
+            },
+            "recIdStr": {
+              "type": "string",
+              "description": "Snowflake for this recommendation, use when submitting recommendation events."
+            },
+            "isFallback": {
+              "type": "boolean",
+              "default": false,
+              "description": "DEPRECATED, unused. Previously: if true, response has fallen-back to generic results, and is not scoped using relativeToDid"
+            },
+            "suggestions": {
+              "type": "array",
+              "items": {
+                "ref": "app.bsky.actor.defs#profileView",
+                "type": "ref"
+              }
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "parameters": {
+        "type": "params",
+        "required": [
+          "actor"
+        ],
+        "properties": {
+          "actor": {
+            "type": "string",
+            "format": "at-identifier"
+          }
+        }
+      },
+      "description": "Enumerates follows similar to a given account (actor). Expected use is to recommend additional accounts immediately after following one account."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/graph/list.json b/lexicons/app/bsky/graph/list.json
new file mode 100644
index 0000000000..dd67d4e99b
--- /dev/null
+++ b/lexicons/app/bsky/graph/list.json
@@ -0,0 +1,63 @@
+{
+  "id": "app.bsky.graph.list",
+  "defs": {
+    "main": {
+      "key": "tid",
+      "type": "record",
+      "record": {
+        "type": "object",
+        "required": [
+          "name",
+          "purpose",
+          "createdAt"
+        ],
+        "properties": {
+          "name": {
+            "type": "string",
+            "maxLength": 64,
+            "minLength": 1,
+            "description": "Display name for list; can not be empty."
+          },
+          "avatar": {
+            "type": "blob",
+            "accept": [
+              "image/png",
+              "image/jpeg"
+            ],
+            "maxSize": 1000000
+          },
+          "labels": {
+            "refs": [
+              "com.atproto.label.defs#selfLabels"
+            ],
+            "type": "union"
+          },
+          "purpose": {
+            "ref": "app.bsky.graph.defs#listPurpose",
+            "type": "ref",
+            "description": "Defines the purpose of the list (aka, moderation-oriented or curration-oriented)"
+          },
+          "createdAt": {
+            "type": "string",
+            "format": "datetime"
+          },
+          "description": {
+            "type": "string",
+            "maxLength": 3000,
+            "maxGraphemes": 300
+          },
+          "descriptionFacets": {
+            "type": "array",
+            "items": {
+              "ref": "app.bsky.richtext.facet",
+              "type": "ref"
+            }
+          }
+        }
+      },
+      "description": "Record representing a list of accounts (actors). Scope includes both moderation-oriented lists and curration-oriented lists."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/graph/listblock.json b/lexicons/app/bsky/graph/listblock.json
new file mode 100644
index 0000000000..cef4b85255
--- /dev/null
+++ b/lexicons/app/bsky/graph/listblock.json
@@ -0,0 +1,30 @@
+{
+  "id": "app.bsky.graph.listblock",
+  "defs": {
+    "main": {
+      "key": "tid",
+      "type": "record",
+      "record": {
+        "type": "object",
+        "required": [
+          "subject",
+          "createdAt"
+        ],
+        "properties": {
+          "subject": {
+            "type": "string",
+            "format": "at-uri",
+            "description": "Reference (AT-URI) to the mod list record."
+          },
+          "createdAt": {
+            "type": "string",
+            "format": "datetime"
+          }
+        }
+      },
+      "description": "Record representing a block relationship against an entire an entire list of accounts (actors)."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/graph/listitem.json b/lexicons/app/bsky/graph/listitem.json
new file mode 100644
index 0000000000..edfb268b35
--- /dev/null
+++ b/lexicons/app/bsky/graph/listitem.json
@@ -0,0 +1,36 @@
+{
+  "id": "app.bsky.graph.listitem",
+  "defs": {
+    "main": {
+      "key": "tid",
+      "type": "record",
+      "record": {
+        "type": "object",
+        "required": [
+          "subject",
+          "list",
+          "createdAt"
+        ],
+        "properties": {
+          "list": {
+            "type": "string",
+            "format": "at-uri",
+            "description": "Reference (AT-URI) to the list record (app.bsky.graph.list)."
+          },
+          "subject": {
+            "type": "string",
+            "format": "did",
+            "description": "The account which is included on the list."
+          },
+          "createdAt": {
+            "type": "string",
+            "format": "datetime"
+          }
+        }
+      },
+      "description": "Record representing an account's inclusion on a specific list. The AppView will ignore duplicate listitem records."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/graph/muteActor.json b/lexicons/app/bsky/graph/muteActor.json
new file mode 100644
index 0000000000..3f5866cca0
--- /dev/null
+++ b/lexicons/app/bsky/graph/muteActor.json
@@ -0,0 +1,34 @@
+{
+  "id": "app.bsky.graph.muteActor",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "input": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "actor"
+          ],
+          "properties": {
+            "actor": {
+              "type": "string",
+              "format": "at-identifier"
+            },
+            "onlyReposts": {
+              "type": "boolean",
+              "description": "Restrict the mute to the account's reposts. When any 'only' scope is set, just the scoped content is muted; when none are set, the account is fully muted. Repeat calls replace the stored scope rather than adding to it."
+            },
+            "onlyQuoteposts": {
+              "type": "boolean",
+              "description": "Restrict the mute to the account's quote posts. See onlyReposts."
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "description": "Creates a mute relationship for the specified account. If a mute already exists for the account, it is updated in place: the stored scope is replaced with the scope in this request. Mutes are private in Bluesky. Requires auth."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/graph/muteActorList.json b/lexicons/app/bsky/graph/muteActorList.json
new file mode 100644
index 0000000000..7a2d060d03
--- /dev/null
+++ b/lexicons/app/bsky/graph/muteActorList.json
@@ -0,0 +1,26 @@
+{
+  "id": "app.bsky.graph.muteActorList",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "input": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "list"
+          ],
+          "properties": {
+            "list": {
+              "type": "string",
+              "format": "at-uri"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "description": "Creates a mute relationship for the specified list of accounts. Mutes are private in Bluesky. Requires auth."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/graph/muteThread.json b/lexicons/app/bsky/graph/muteThread.json
new file mode 100644
index 0000000000..7cfb6890f2
--- /dev/null
+++ b/lexicons/app/bsky/graph/muteThread.json
@@ -0,0 +1,26 @@
+{
+  "id": "app.bsky.graph.muteThread",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "input": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "root"
+          ],
+          "properties": {
+            "root": {
+              "type": "string",
+              "format": "at-uri"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "description": "Mutes a thread preventing notifications from the thread and any of its children. Mutes are private in Bluesky. Requires auth."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/graph/searchStarterPacks.json b/lexicons/app/bsky/graph/searchStarterPacks.json
new file mode 100644
index 0000000000..20ac032f3f
--- /dev/null
+++ b/lexicons/app/bsky/graph/searchStarterPacks.json
@@ -0,0 +1,53 @@
+{
+  "id": "app.bsky.graph.searchStarterPacks",
+  "defs": {
+    "main": {
+      "type": "query",
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "starterPacks"
+          ],
+          "properties": {
+            "cursor": {
+              "type": "string"
+            },
+            "starterPacks": {
+              "type": "array",
+              "items": {
+                "ref": "app.bsky.graph.defs#starterPackViewBasic",
+                "type": "ref"
+              }
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "parameters": {
+        "type": "params",
+        "required": [
+          "q"
+        ],
+        "properties": {
+          "q": {
+            "type": "string",
+            "description": "Search query string. Syntax, phrase, boolean, and faceting is unspecified, but Lucene query syntax is recommended."
+          },
+          "limit": {
+            "type": "integer",
+            "default": 25,
+            "maximum": 100,
+            "minimum": 1
+          },
+          "cursor": {
+            "type": "string"
+          }
+        }
+      },
+      "description": "Find starter packs matching search criteria. Does not require auth."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/graph/searchStarterPacksV2.json b/lexicons/app/bsky/graph/searchStarterPacksV2.json
new file mode 100644
index 0000000000..9d6949e0e2
--- /dev/null
+++ b/lexicons/app/bsky/graph/searchStarterPacksV2.json
@@ -0,0 +1,57 @@
+{
+  "id": "app.bsky.graph.searchStarterPacksV2",
+  "defs": {
+    "main": {
+      "type": "query",
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "starterPacks"
+          ],
+          "properties": {
+            "cursor": {
+              "type": "string"
+            },
+            "hitsTotal": {
+              "type": "integer",
+              "description": "Estimated total number of matching hits. May be rounded or truncated."
+            },
+            "starterPacks": {
+              "type": "array",
+              "items": {
+                "ref": "app.bsky.graph.defs#starterPackView",
+                "type": "ref"
+              }
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "parameters": {
+        "type": "params",
+        "required": [
+          "q"
+        ],
+        "properties": {
+          "q": {
+            "type": "string",
+            "description": "Search query string. Syntax, phrase, boolean, and faceting is unspecified, but Lucene query syntax is recommended."
+          },
+          "limit": {
+            "type": "integer",
+            "default": 25,
+            "maximum": 100,
+            "minimum": 1
+          },
+          "cursor": {
+            "type": "string"
+          }
+        }
+      },
+      "description": "Find starter packs matching search criteria. Does not require auth."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/graph/starterpack.json b/lexicons/app/bsky/graph/starterpack.json
new file mode 100644
index 0000000000..add9530335
--- /dev/null
+++ b/lexicons/app/bsky/graph/starterpack.json
@@ -0,0 +1,70 @@
+{
+  "id": "app.bsky.graph.starterpack",
+  "defs": {
+    "main": {
+      "key": "tid",
+      "type": "record",
+      "record": {
+        "type": "object",
+        "required": [
+          "name",
+          "list",
+          "createdAt"
+        ],
+        "properties": {
+          "list": {
+            "type": "string",
+            "format": "at-uri",
+            "description": "Reference (AT-URI) to the list record."
+          },
+          "name": {
+            "type": "string",
+            "maxLength": 500,
+            "minLength": 1,
+            "description": "Display name for starter pack; can not be empty.",
+            "maxGraphemes": 50
+          },
+          "feeds": {
+            "type": "array",
+            "items": {
+              "ref": "#feedItem",
+              "type": "ref"
+            },
+            "maxLength": 3
+          },
+          "createdAt": {
+            "type": "string",
+            "format": "datetime"
+          },
+          "description": {
+            "type": "string",
+            "maxLength": 3000,
+            "maxGraphemes": 300
+          },
+          "descriptionFacets": {
+            "type": "array",
+            "items": {
+              "ref": "app.bsky.richtext.facet",
+              "type": "ref"
+            }
+          }
+        }
+      },
+      "description": "Record defining a starter pack of actors and feeds for new users."
+    },
+    "feedItem": {
+      "type": "object",
+      "required": [
+        "uri"
+      ],
+      "properties": {
+        "uri": {
+          "type": "string",
+          "format": "at-uri"
+        }
+      }
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/graph/unmuteActor.json b/lexicons/app/bsky/graph/unmuteActor.json
new file mode 100644
index 0000000000..8b9ca6cdb2
--- /dev/null
+++ b/lexicons/app/bsky/graph/unmuteActor.json
@@ -0,0 +1,26 @@
+{
+  "id": "app.bsky.graph.unmuteActor",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "input": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "actor"
+          ],
+          "properties": {
+            "actor": {
+              "type": "string",
+              "format": "at-identifier"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "description": "Unmutes the specified account. Requires auth."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/graph/unmuteActorList.json b/lexicons/app/bsky/graph/unmuteActorList.json
new file mode 100644
index 0000000000..b770634928
--- /dev/null
+++ b/lexicons/app/bsky/graph/unmuteActorList.json
@@ -0,0 +1,26 @@
+{
+  "id": "app.bsky.graph.unmuteActorList",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "input": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "list"
+          ],
+          "properties": {
+            "list": {
+              "type": "string",
+              "format": "at-uri"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "description": "Unmutes the specified list of accounts. Requires auth."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/graph/unmuteThread.json b/lexicons/app/bsky/graph/unmuteThread.json
new file mode 100644
index 0000000000..5b86269582
--- /dev/null
+++ b/lexicons/app/bsky/graph/unmuteThread.json
@@ -0,0 +1,26 @@
+{
+  "id": "app.bsky.graph.unmuteThread",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "input": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "root"
+          ],
+          "properties": {
+            "root": {
+              "type": "string",
+              "format": "at-uri"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "description": "Unmutes the specified thread. Requires auth."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/graph/verification.json b/lexicons/app/bsky/graph/verification.json
new file mode 100644
index 0000000000..6d55ebf909
--- /dev/null
+++ b/lexicons/app/bsky/graph/verification.json
@@ -0,0 +1,42 @@
+{
+  "id": "app.bsky.graph.verification",
+  "defs": {
+    "main": {
+      "key": "tid",
+      "type": "record",
+      "record": {
+        "type": "object",
+        "required": [
+          "subject",
+          "handle",
+          "displayName",
+          "createdAt"
+        ],
+        "properties": {
+          "handle": {
+            "type": "string",
+            "format": "handle",
+            "description": "Handle of the subject the verification applies to at the moment of verifying, which might not be the same at the time of viewing. The verification is only valid if the current handle matches the one at the time of verifying."
+          },
+          "subject": {
+            "type": "string",
+            "format": "did",
+            "description": "DID of the subject the verification applies to."
+          },
+          "createdAt": {
+            "type": "string",
+            "format": "datetime",
+            "description": "Date of when the verification was created."
+          },
+          "displayName": {
+            "type": "string",
+            "description": "Display name of the subject the verification applies to at the moment of verifying, which might not be the same at the time of viewing. The verification is only valid if the current displayName matches the one at the time of verifying."
+          }
+        }
+      },
+      "description": "Record declaring a verification relationship between two accounts. Verifications are only considered valid by an app if issued by an account the app considers trusted."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/labeler/defs.json b/lexicons/app/bsky/labeler/defs.json
new file mode 100644
index 0000000000..20de6e051b
--- /dev/null
+++ b/lexicons/app/bsky/labeler/defs.json
@@ -0,0 +1,153 @@
+{
+  "id": "app.bsky.labeler.defs",
+  "defs": {
+    "labelerView": {
+      "type": "object",
+      "required": [
+        "uri",
+        "cid",
+        "creator",
+        "indexedAt"
+      ],
+      "properties": {
+        "cid": {
+          "type": "string",
+          "format": "cid"
+        },
+        "uri": {
+          "type": "string",
+          "format": "at-uri"
+        },
+        "labels": {
+          "type": "array",
+          "items": {
+            "ref": "com.atproto.label.defs#label",
+            "type": "ref"
+          }
+        },
+        "viewer": {
+          "ref": "#labelerViewerState",
+          "type": "ref"
+        },
+        "creator": {
+          "ref": "app.bsky.actor.defs#profileView",
+          "type": "ref"
+        },
+        "indexedAt": {
+          "type": "string",
+          "format": "datetime"
+        },
+        "likeCount": {
+          "type": "integer",
+          "minimum": 0
+        }
+      }
+    },
+    "labelerPolicies": {
+      "type": "object",
+      "required": [
+        "labelValues"
+      ],
+      "properties": {
+        "labelValues": {
+          "type": "array",
+          "items": {
+            "ref": "com.atproto.label.defs#labelValue",
+            "type": "ref"
+          },
+          "description": "The label values which this labeler publishes. May include global or custom labels."
+        },
+        "labelValueDefinitions": {
+          "type": "array",
+          "items": {
+            "ref": "com.atproto.label.defs#labelValueDefinition",
+            "type": "ref"
+          },
+          "description": "Label values created by this labeler and scoped exclusively to it. Labels defined here will override global label definitions for this labeler."
+        }
+      }
+    },
+    "labelerViewerState": {
+      "type": "object",
+      "properties": {
+        "like": {
+          "type": "string",
+          "format": "at-uri"
+        }
+      }
+    },
+    "labelerViewDetailed": {
+      "type": "object",
+      "required": [
+        "uri",
+        "cid",
+        "creator",
+        "policies",
+        "indexedAt"
+      ],
+      "properties": {
+        "cid": {
+          "type": "string",
+          "format": "cid"
+        },
+        "uri": {
+          "type": "string",
+          "format": "at-uri"
+        },
+        "labels": {
+          "type": "array",
+          "items": {
+            "ref": "com.atproto.label.defs#label",
+            "type": "ref"
+          }
+        },
+        "viewer": {
+          "ref": "#labelerViewerState",
+          "type": "ref"
+        },
+        "creator": {
+          "ref": "app.bsky.actor.defs#profileView",
+          "type": "ref"
+        },
+        "policies": {
+          "ref": "app.bsky.labeler.defs#labelerPolicies",
+          "type": "ref"
+        },
+        "indexedAt": {
+          "type": "string",
+          "format": "datetime"
+        },
+        "likeCount": {
+          "type": "integer",
+          "minimum": 0
+        },
+        "reasonTypes": {
+          "type": "array",
+          "items": {
+            "ref": "com.atproto.moderation.defs#reasonType",
+            "type": "ref"
+          },
+          "description": "The set of report reason 'codes' which are in-scope for this service to review and action. These usually align to policy categories. If not defined (distinct from empty array), all reason types are allowed."
+        },
+        "subjectTypes": {
+          "type": "array",
+          "items": {
+            "ref": "com.atproto.moderation.defs#subjectType",
+            "type": "ref"
+          },
+          "description": "The set of subject types (account, record, etc) this service accepts reports on."
+        },
+        "subjectCollections": {
+          "type": "array",
+          "items": {
+            "type": "string",
+            "format": "nsid"
+          },
+          "description": "Set of record types (collection NSIDs) which can be reported to this service. If not defined (distinct from empty array), default is any record type."
+        }
+      }
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/labeler/getServices.json b/lexicons/app/bsky/labeler/getServices.json
new file mode 100644
index 0000000000..84a8856569
--- /dev/null
+++ b/lexicons/app/bsky/labeler/getServices.json
@@ -0,0 +1,51 @@
+{
+  "id": "app.bsky.labeler.getServices",
+  "defs": {
+    "main": {
+      "type": "query",
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "views"
+          ],
+          "properties": {
+            "views": {
+              "type": "array",
+              "items": {
+                "refs": [
+                  "app.bsky.labeler.defs#labelerView",
+                  "app.bsky.labeler.defs#labelerViewDetailed"
+                ],
+                "type": "union"
+              }
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "parameters": {
+        "type": "params",
+        "required": [
+          "dids"
+        ],
+        "properties": {
+          "dids": {
+            "type": "array",
+            "items": {
+              "type": "string",
+              "format": "did"
+            }
+          },
+          "detailed": {
+            "type": "boolean",
+            "default": false
+          }
+        }
+      },
+      "description": "Get information about a list of labeler services."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/labeler/service.json b/lexicons/app/bsky/labeler/service.json
new file mode 100644
index 0000000000..65f20e1fee
--- /dev/null
+++ b/lexicons/app/bsky/labeler/service.json
@@ -0,0 +1,59 @@
+{
+  "id": "app.bsky.labeler.service",
+  "defs": {
+    "main": {
+      "key": "literal:self",
+      "type": "record",
+      "record": {
+        "type": "object",
+        "required": [
+          "policies",
+          "createdAt"
+        ],
+        "properties": {
+          "labels": {
+            "refs": [
+              "com.atproto.label.defs#selfLabels"
+            ],
+            "type": "union"
+          },
+          "policies": {
+            "ref": "app.bsky.labeler.defs#labelerPolicies",
+            "type": "ref"
+          },
+          "createdAt": {
+            "type": "string",
+            "format": "datetime"
+          },
+          "reasonTypes": {
+            "type": "array",
+            "items": {
+              "ref": "com.atproto.moderation.defs#reasonType",
+              "type": "ref"
+            },
+            "description": "The set of report reason 'codes' which are in-scope for this service to review and action. These usually align to policy categories. If not defined (distinct from empty array), all reason types are allowed."
+          },
+          "subjectTypes": {
+            "type": "array",
+            "items": {
+              "ref": "com.atproto.moderation.defs#subjectType",
+              "type": "ref"
+            },
+            "description": "The set of subject types (account, record, etc) this service accepts reports on."
+          },
+          "subjectCollections": {
+            "type": "array",
+            "items": {
+              "type": "string",
+              "format": "nsid"
+            },
+            "description": "Set of record types (collection NSIDs) which can be reported to this service. If not defined (distinct from empty array), default is any record type."
+          }
+        }
+      },
+      "description": "A declaration of the existence of labeler service."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/notification/declaration.json b/lexicons/app/bsky/notification/declaration.json
new file mode 100644
index 0000000000..185af94404
--- /dev/null
+++ b/lexicons/app/bsky/notification/declaration.json
@@ -0,0 +1,29 @@
+{
+  "id": "app.bsky.notification.declaration",
+  "defs": {
+    "main": {
+      "key": "literal:self",
+      "type": "record",
+      "record": {
+        "type": "object",
+        "required": [
+          "allowSubscriptions"
+        ],
+        "properties": {
+          "allowSubscriptions": {
+            "type": "string",
+            "description": "A declaration of the user's preference for allowing activity subscriptions from other users. Absence of a record implies 'followers'.",
+            "knownValues": [
+              "followers",
+              "mutuals",
+              "none"
+            ]
+          }
+        }
+      },
+      "description": "A declaration of the user's choices related to notifications that can be produced by them."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/notification/defs.json b/lexicons/app/bsky/notification/defs.json
new file mode 100644
index 0000000000..3e767ca298
--- /dev/null
+++ b/lexicons/app/bsky/notification/defs.json
@@ -0,0 +1,175 @@
+{
+  "id": "app.bsky.notification.defs",
+  "defs": {
+    "preference": {
+      "type": "object",
+      "required": [
+        "list",
+        "push"
+      ],
+      "properties": {
+        "list": {
+          "type": "boolean"
+        },
+        "push": {
+          "type": "boolean"
+        }
+      }
+    },
+    "preferences": {
+      "type": "object",
+      "required": [
+        "chat",
+        "follow",
+        "like",
+        "likeViaRepost",
+        "mention",
+        "quote",
+        "reply",
+        "repost",
+        "repostViaRepost",
+        "starterpackJoined",
+        "subscribedPost",
+        "unverified",
+        "verified"
+      ],
+      "properties": {
+        "chat": {
+          "ref": "#chatPreference",
+          "type": "ref",
+          "description": "Deprecated: use chat.bsky.notification preferences instead. This will only return a default value."
+        },
+        "like": {
+          "ref": "#filterablePreference",
+          "type": "ref"
+        },
+        "quote": {
+          "ref": "#filterablePreference",
+          "type": "ref"
+        },
+        "reply": {
+          "ref": "#filterablePreference",
+          "type": "ref"
+        },
+        "follow": {
+          "ref": "#filterablePreference",
+          "type": "ref"
+        },
+        "repost": {
+          "ref": "#filterablePreference",
+          "type": "ref"
+        },
+        "mention": {
+          "ref": "#filterablePreference",
+          "type": "ref"
+        },
+        "verified": {
+          "ref": "#preference",
+          "type": "ref"
+        },
+        "unverified": {
+          "ref": "#preference",
+          "type": "ref"
+        },
+        "likeViaRepost": {
+          "ref": "#filterablePreference",
+          "type": "ref"
+        },
+        "subscribedPost": {
+          "ref": "#preference",
+          "type": "ref"
+        },
+        "repostViaRepost": {
+          "ref": "#filterablePreference",
+          "type": "ref"
+        },
+        "starterpackJoined": {
+          "ref": "#preference",
+          "type": "ref"
+        }
+      }
+    },
+    "recordDeleted": {
+      "type": "object",
+      "properties": {}
+    },
+    "chatPreference": {
+      "type": "object",
+      "required": [
+        "include",
+        "push"
+      ],
+      "properties": {
+        "push": {
+          "type": "boolean"
+        },
+        "include": {
+          "type": "string",
+          "knownValues": [
+            "all",
+            "accepted"
+          ]
+        }
+      },
+      "description": "Deprecated: use chat.bsky.notification preferences instead. This will only return a default value."
+    },
+    "activitySubscription": {
+      "type": "object",
+      "required": [
+        "post",
+        "reply"
+      ],
+      "properties": {
+        "post": {
+          "type": "boolean"
+        },
+        "reply": {
+          "type": "boolean"
+        }
+      }
+    },
+    "filterablePreference": {
+      "type": "object",
+      "required": [
+        "include",
+        "list",
+        "push"
+      ],
+      "properties": {
+        "list": {
+          "type": "boolean"
+        },
+        "push": {
+          "type": "boolean"
+        },
+        "include": {
+          "type": "string",
+          "knownValues": [
+            "all",
+            "follows"
+          ]
+        }
+      }
+    },
+    "subjectActivitySubscription": {
+      "type": "object",
+      "required": [
+        "subject",
+        "activitySubscription"
+      ],
+      "properties": {
+        "subject": {
+          "type": "string",
+          "format": "did"
+        },
+        "activitySubscription": {
+          "ref": "#activitySubscription",
+          "type": "ref"
+        }
+      },
+      "description": "Object used to store activity subscription data in stash."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/notification/getPreferences.json b/lexicons/app/bsky/notification/getPreferences.json
new file mode 100644
index 0000000000..54482fb455
--- /dev/null
+++ b/lexicons/app/bsky/notification/getPreferences.json
@@ -0,0 +1,30 @@
+{
+  "id": "app.bsky.notification.getPreferences",
+  "defs": {
+    "main": {
+      "type": "query",
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "preferences"
+          ],
+          "properties": {
+            "preferences": {
+              "ref": "app.bsky.notification.defs#preferences",
+              "type": "ref"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "parameters": {
+        "type": "params",
+        "properties": {}
+      },
+      "description": "Get notification-related preferences for an account. Requires auth."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/notification/getUnreadCount.json b/lexicons/app/bsky/notification/getUnreadCount.json
new file mode 100644
index 0000000000..87a37810d9
--- /dev/null
+++ b/lexicons/app/bsky/notification/getUnreadCount.json
@@ -0,0 +1,37 @@
+{
+  "id": "app.bsky.notification.getUnreadCount",
+  "defs": {
+    "main": {
+      "type": "query",
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "count"
+          ],
+          "properties": {
+            "count": {
+              "type": "integer"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "parameters": {
+        "type": "params",
+        "properties": {
+          "seenAt": {
+            "type": "string",
+            "format": "datetime"
+          },
+          "priority": {
+            "type": "boolean"
+          }
+        }
+      },
+      "description": "Count the number of unread notifications for the requesting account. Requires auth."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/notification/listActivitySubscriptions.json b/lexicons/app/bsky/notification/listActivitySubscriptions.json
new file mode 100644
index 0000000000..350b822ac9
--- /dev/null
+++ b/lexicons/app/bsky/notification/listActivitySubscriptions.json
@@ -0,0 +1,46 @@
+{
+  "id": "app.bsky.notification.listActivitySubscriptions",
+  "defs": {
+    "main": {
+      "type": "query",
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "subscriptions"
+          ],
+          "properties": {
+            "cursor": {
+              "type": "string"
+            },
+            "subscriptions": {
+              "type": "array",
+              "items": {
+                "ref": "app.bsky.actor.defs#profileView",
+                "type": "ref"
+              }
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "parameters": {
+        "type": "params",
+        "properties": {
+          "limit": {
+            "type": "integer",
+            "default": 50,
+            "maximum": 100,
+            "minimum": 1
+          },
+          "cursor": {
+            "type": "string"
+          }
+        }
+      },
+      "description": "Enumerate all accounts to which the requesting account is subscribed to receive notifications for. Requires auth."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/notification/listNotifications.json b/lexicons/app/bsky/notification/listNotifications.json
new file mode 100644
index 0000000000..2c2aa20207
--- /dev/null
+++ b/lexicons/app/bsky/notification/listNotifications.json
@@ -0,0 +1,139 @@
+{
+  "id": "app.bsky.notification.listNotifications",
+  "defs": {
+    "main": {
+      "type": "query",
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "notifications"
+          ],
+          "properties": {
+            "cursor": {
+              "type": "string"
+            },
+            "seenAt": {
+              "type": "string",
+              "format": "datetime"
+            },
+            "priority": {
+              "type": "boolean"
+            },
+            "notifications": {
+              "type": "array",
+              "items": {
+                "ref": "#notification",
+                "type": "ref"
+              }
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "parameters": {
+        "type": "params",
+        "properties": {
+          "limit": {
+            "type": "integer",
+            "default": 50,
+            "maximum": 100,
+            "minimum": 1
+          },
+          "cursor": {
+            "type": "string"
+          },
+          "seenAt": {
+            "type": "string",
+            "format": "datetime"
+          },
+          "reasons": {
+            "type": "array",
+            "items": {
+              "type": "string",
+              "description": "A reason that matches the reason property of #notification."
+            },
+            "description": "Notification reasons to include in response."
+          },
+          "priority": {
+            "type": "boolean"
+          }
+        }
+      },
+      "description": "Enumerate notifications for the requesting account. Requires auth."
+    },
+    "notification": {
+      "type": "object",
+      "required": [
+        "uri",
+        "cid",
+        "author",
+        "reason",
+        "record",
+        "isRead",
+        "indexedAt"
+      ],
+      "properties": {
+        "cid": {
+          "type": "string",
+          "format": "cid"
+        },
+        "uri": {
+          "type": "string",
+          "format": "at-uri"
+        },
+        "author": {
+          "ref": "app.bsky.actor.defs#profileView",
+          "type": "ref"
+        },
+        "isRead": {
+          "type": "boolean"
+        },
+        "labels": {
+          "type": "array",
+          "items": {
+            "ref": "com.atproto.label.defs#label",
+            "type": "ref"
+          }
+        },
+        "reason": {
+          "type": "string",
+          "description": "The reason why this notification was delivered - e.g. your post was liked, or you received a new follower.",
+          "knownValues": [
+            "like",
+            "repost",
+            "follow",
+            "mention",
+            "reply",
+            "quote",
+            "starterpack-joined",
+            "verified",
+            "unverified",
+            "like-via-repost",
+            "repost-via-repost",
+            "subscribed-post",
+            "contact-match"
+          ]
+        },
+        "record": {
+          "type": "unknown"
+        },
+        "indexedAt": {
+          "type": "string",
+          "format": "datetime"
+        },
+        "starterPack": {
+          "ref": "app.bsky.graph.defs#starterPackViewBasic",
+          "type": "ref",
+          "description": "The starter pack associated with this notification. Present when the notification is for a follow originating from a starter pack."
+        },
+        "reasonSubject": {
+          "type": "string",
+          "format": "at-uri"
+        }
+      }
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/notification/putActivitySubscription.json b/lexicons/app/bsky/notification/putActivitySubscription.json
new file mode 100644
index 0000000000..65cc67b335
--- /dev/null
+++ b/lexicons/app/bsky/notification/putActivitySubscription.json
@@ -0,0 +1,50 @@
+{
+  "id": "app.bsky.notification.putActivitySubscription",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "input": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "subject",
+            "activitySubscription"
+          ],
+          "properties": {
+            "subject": {
+              "type": "string",
+              "format": "did"
+            },
+            "activitySubscription": {
+              "ref": "app.bsky.notification.defs#activitySubscription",
+              "type": "ref"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "subject"
+          ],
+          "properties": {
+            "subject": {
+              "type": "string",
+              "format": "did"
+            },
+            "activitySubscription": {
+              "ref": "app.bsky.notification.defs#activitySubscription",
+              "type": "ref"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "description": "Puts an activity subscription entry. The key should be omitted for creation and provided for updates. Requires auth."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/notification/putPreferences.json b/lexicons/app/bsky/notification/putPreferences.json
new file mode 100644
index 0000000000..2875de467b
--- /dev/null
+++ b/lexicons/app/bsky/notification/putPreferences.json
@@ -0,0 +1,25 @@
+{
+  "id": "app.bsky.notification.putPreferences",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "input": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "priority"
+          ],
+          "properties": {
+            "priority": {
+              "type": "boolean"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "description": "Set notification-related preferences for an account. Requires auth."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/notification/putPreferencesV2.json b/lexicons/app/bsky/notification/putPreferencesV2.json
new file mode 100644
index 0000000000..6a5d98fbda
--- /dev/null
+++ b/lexicons/app/bsky/notification/putPreferencesV2.json
@@ -0,0 +1,87 @@
+{
+  "id": "app.bsky.notification.putPreferencesV2",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "input": {
+        "schema": {
+          "type": "object",
+          "properties": {
+            "chat": {
+              "ref": "app.bsky.notification.defs#chatPreference",
+              "type": "ref",
+              "description": "Deprecated: use chat.bsky.notification preferences instead. Setting this won't stick and the default values will be returned."
+            },
+            "like": {
+              "ref": "app.bsky.notification.defs#filterablePreference",
+              "type": "ref"
+            },
+            "quote": {
+              "ref": "app.bsky.notification.defs#filterablePreference",
+              "type": "ref"
+            },
+            "reply": {
+              "ref": "app.bsky.notification.defs#filterablePreference",
+              "type": "ref"
+            },
+            "follow": {
+              "ref": "app.bsky.notification.defs#filterablePreference",
+              "type": "ref"
+            },
+            "repost": {
+              "ref": "app.bsky.notification.defs#filterablePreference",
+              "type": "ref"
+            },
+            "mention": {
+              "ref": "app.bsky.notification.defs#filterablePreference",
+              "type": "ref"
+            },
+            "verified": {
+              "ref": "app.bsky.notification.defs#preference",
+              "type": "ref"
+            },
+            "unverified": {
+              "ref": "app.bsky.notification.defs#preference",
+              "type": "ref"
+            },
+            "likeViaRepost": {
+              "ref": "app.bsky.notification.defs#filterablePreference",
+              "type": "ref"
+            },
+            "subscribedPost": {
+              "ref": "app.bsky.notification.defs#preference",
+              "type": "ref"
+            },
+            "repostViaRepost": {
+              "ref": "app.bsky.notification.defs#filterablePreference",
+              "type": "ref"
+            },
+            "starterpackJoined": {
+              "ref": "app.bsky.notification.defs#preference",
+              "type": "ref"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "preferences"
+          ],
+          "properties": {
+            "preferences": {
+              "ref": "app.bsky.notification.defs#preferences",
+              "type": "ref"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "description": "Set notification-related preferences for an account. Requires auth."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/notification/registerPush.json b/lexicons/app/bsky/notification/registerPush.json
new file mode 100644
index 0000000000..db1fff3ab7
--- /dev/null
+++ b/lexicons/app/bsky/notification/registerPush.json
@@ -0,0 +1,47 @@
+{
+  "id": "app.bsky.notification.registerPush",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "input": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "serviceDid",
+            "token",
+            "platform",
+            "appId"
+          ],
+          "properties": {
+            "appId": {
+              "type": "string"
+            },
+            "token": {
+              "type": "string"
+            },
+            "platform": {
+              "type": "string",
+              "knownValues": [
+                "ios",
+                "android",
+                "web"
+              ]
+            },
+            "serviceDid": {
+              "type": "string",
+              "format": "did"
+            },
+            "ageRestricted": {
+              "type": "boolean",
+              "description": "Set to true when the actor is age restricted"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "description": "Register to receive push notifications, via a specified service, for the requesting account. Requires auth."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/notification/unregisterPush.json b/lexicons/app/bsky/notification/unregisterPush.json
new file mode 100644
index 0000000000..a73bd6afde
--- /dev/null
+++ b/lexicons/app/bsky/notification/unregisterPush.json
@@ -0,0 +1,43 @@
+{
+  "id": "app.bsky.notification.unregisterPush",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "input": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "serviceDid",
+            "token",
+            "platform",
+            "appId"
+          ],
+          "properties": {
+            "appId": {
+              "type": "string"
+            },
+            "token": {
+              "type": "string"
+            },
+            "platform": {
+              "type": "string",
+              "knownValues": [
+                "ios",
+                "android",
+                "web"
+              ]
+            },
+            "serviceDid": {
+              "type": "string",
+              "format": "did"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "description": "The inverse of registerPush - inform a specified service that push notifications should no longer be sent to the given token for the requesting account. Requires auth."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/notification/updateSeen.json b/lexicons/app/bsky/notification/updateSeen.json
new file mode 100644
index 0000000000..128b8611e3
--- /dev/null
+++ b/lexicons/app/bsky/notification/updateSeen.json
@@ -0,0 +1,26 @@
+{
+  "id": "app.bsky.notification.updateSeen",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "input": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "seenAt"
+          ],
+          "properties": {
+            "seenAt": {
+              "type": "string",
+              "format": "datetime"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "description": "Notify server that the requesting account has seen notifications. Requires auth."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/richtext/facet.json b/lexicons/app/bsky/richtext/facet.json
new file mode 100644
index 0000000000..39b039b790
--- /dev/null
+++ b/lexicons/app/bsky/richtext/facet.json
@@ -0,0 +1,90 @@
+{
+  "id": "app.bsky.richtext.facet",
+  "defs": {
+    "tag": {
+      "type": "object",
+      "required": [
+        "tag"
+      ],
+      "properties": {
+        "tag": {
+          "type": "string",
+          "maxLength": 640,
+          "maxGraphemes": 64
+        }
+      },
+      "description": "Facet feature for a hashtag. The text usually includes a '#' prefix, but the facet reference should not (except in the case of 'double hash tags')."
+    },
+    "link": {
+      "type": "object",
+      "required": [
+        "uri"
+      ],
+      "properties": {
+        "uri": {
+          "type": "string",
+          "format": "uri"
+        }
+      },
+      "description": "Facet feature for a URL. The text URL may have been simplified or truncated, but the facet reference should be a complete URL."
+    },
+    "main": {
+      "type": "object",
+      "required": [
+        "index",
+        "features"
+      ],
+      "properties": {
+        "index": {
+          "ref": "#byteSlice",
+          "type": "ref"
+        },
+        "features": {
+          "type": "array",
+          "items": {
+            "refs": [
+              "#mention",
+              "#link",
+              "#tag"
+            ],
+            "type": "union"
+          }
+        }
+      },
+      "description": "Annotation of a sub-string within rich text."
+    },
+    "mention": {
+      "type": "object",
+      "required": [
+        "did"
+      ],
+      "properties": {
+        "did": {
+          "type": "string",
+          "format": "did"
+        }
+      },
+      "description": "Facet feature for mention of another account. The text is usually a handle, including a '@' prefix, but the facet reference is a DID."
+    },
+    "byteSlice": {
+      "type": "object",
+      "required": [
+        "byteStart",
+        "byteEnd"
+      ],
+      "properties": {
+        "byteEnd": {
+          "type": "integer",
+          "minimum": 0
+        },
+        "byteStart": {
+          "type": "integer",
+          "minimum": 0
+        }
+      },
+      "description": "Specifies the sub-string range a facet feature applies to. Start index is inclusive, end index is exclusive. Indices are zero-indexed, counting bytes of the UTF-8 encoded text. NOTE: some languages, like Javascript, use UTF-16 or Unicode codepoints for string slice indexing; in these languages, convert to byte arrays before working with facets."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/unspecced/defs.json b/lexicons/app/bsky/unspecced/defs.json
new file mode 100644
index 0000000000..609de81f8f
--- /dev/null
+++ b/lexicons/app/bsky/unspecced/defs.json
@@ -0,0 +1,259 @@
+{
+  "lexicon": 1,
+  "id": "app.bsky.unspecced.defs",
+  "defs": {
+    "skeletonSearchPost": {
+      "type": "object",
+      "required": ["uri"],
+      "properties": {
+        "uri": {
+          "type": "string",
+          "format": "at-uri"
+        }
+      }
+    },
+    "skeletonSearchActor": {
+      "type": "object",
+      "required": ["did"],
+      "properties": {
+        "did": {
+          "type": "string",
+          "format": "did"
+        }
+      }
+    },
+    "skeletonSearchStarterPack": {
+      "type": "object",
+      "required": ["uri"],
+      "properties": {
+        "uri": {
+          "type": "string",
+          "format": "at-uri"
+        }
+      }
+    },
+    "trendingTopic": {
+      "type": "object",
+      "required": ["topic", "link"],
+      "properties": {
+        "topic": {
+          "type": "string"
+        },
+        "displayName": {
+          "type": "string"
+        },
+        "description": {
+          "type": "string"
+        },
+        "link": {
+          "type": "string"
+        }
+      }
+    },
+    "skeletonTrend": {
+      "type": "object",
+      "required": [
+        "topic",
+        "displayName",
+        "link",
+        "startedAt",
+        "postCount",
+        "dids"
+      ],
+      "properties": {
+        "topic": {
+          "type": "string"
+        },
+        "displayName": {
+          "type": "string"
+        },
+        "description": {
+          "type": "string"
+        },
+        "link": {
+          "type": "string"
+        },
+        "startedAt": {
+          "type": "string",
+          "format": "datetime"
+        },
+        "postCount": {
+          "type": "integer"
+        },
+        "status": {
+          "type": "string",
+          "knownValues": ["hot"]
+        },
+        "category": {
+          "type": "string"
+        },
+        "dids": {
+          "type": "array",
+          "items": {
+            "type": "string",
+            "format": "did"
+          }
+        }
+      }
+    },
+    "trendView": {
+      "type": "object",
+      "required": [
+        "topic",
+        "displayName",
+        "link",
+        "startedAt",
+        "postCount",
+        "actors"
+      ],
+      "properties": {
+        "topic": {
+          "type": "string"
+        },
+        "displayName": {
+          "type": "string"
+        },
+        "description": {
+          "type": "string"
+        },
+        "link": {
+          "type": "string"
+        },
+        "startedAt": {
+          "type": "string",
+          "format": "datetime"
+        },
+        "postCount": {
+          "type": "integer"
+        },
+        "status": {
+          "type": "string",
+          "knownValues": ["hot"]
+        },
+        "category": {
+          "type": "string"
+        },
+        "actors": {
+          "type": "array",
+          "items": {
+            "type": "ref",
+            "ref": "app.bsky.actor.defs#profileViewBasic"
+          }
+        }
+      }
+    },
+    "threadItemPost": {
+      "type": "object",
+      "required": [
+        "post",
+        "moreParents",
+        "moreReplies",
+        "opThread",
+        "hiddenByThreadgate",
+        "mutedByViewer"
+      ],
+      "properties": {
+        "post": {
+          "type": "ref",
+          "ref": "app.bsky.feed.defs#postView"
+        },
+        "moreParents": {
+          "type": "boolean",
+          "description": "This post has more parents that were not present in the response. This is just a boolean, without the number of parents."
+        },
+        "moreReplies": {
+          "type": "integer",
+          "description": "This post has more replies that were not present in the response. This is a numeric value, which is best-effort and might not be accurate."
+        },
+        "opThread": {
+          "type": "boolean",
+          "description": "This post is part of a contiguous thread by the OP from the thread root. Many different OP threads can happen in the same thread."
+        },
+        "hiddenByThreadgate": {
+          "type": "boolean",
+          "description": "The threadgate created by the author indicates this post as a reply to be hidden for everyone consuming the thread."
+        },
+        "mutedByViewer": {
+          "type": "boolean",
+          "description": "This is by an account muted by the viewer requesting it."
+        }
+      }
+    },
+    "threadItemNoUnauthenticated": {
+      "type": "object",
+      "properties": {}
+    },
+    "threadItemNotFound": {
+      "type": "object",
+      "properties": {}
+    },
+    "threadItemBlocked": {
+      "type": "object",
+      "required": ["author"],
+      "properties": {
+        "author": {
+          "type": "ref",
+          "ref": "app.bsky.feed.defs#blockedAuthor"
+        }
+      }
+    },
+    "ageAssuranceState": {
+      "type": "object",
+      "description": "The computed state of the age assurance process, returned to the user in question on certain authenticated requests.",
+      "required": ["status"],
+      "properties": {
+        "lastInitiatedAt": {
+          "type": "string",
+          "format": "datetime",
+          "description": "The timestamp when this state was last updated."
+        },
+        "status": {
+          "type": "string",
+          "description": "The status of the age assurance process.",
+          "knownValues": ["unknown", "pending", "assured", "blocked"]
+        }
+      }
+    },
+    "ageAssuranceEvent": {
+      "type": "object",
+      "description": "Object used to store age assurance data in stash.",
+      "required": ["createdAt", "status", "attemptId"],
+      "properties": {
+        "createdAt": {
+          "type": "string",
+          "format": "datetime",
+          "description": "The date and time of this write operation."
+        },
+        "status": {
+          "type": "string",
+          "description": "The status of the age assurance process.",
+          "knownValues": ["unknown", "pending", "assured"]
+        },
+        "attemptId": {
+          "type": "string",
+          "description": "The unique identifier for this instance of the age assurance flow, in UUID format."
+        },
+        "email": {
+          "type": "string",
+          "description": "The email used for AA."
+        },
+        "initIp": {
+          "type": "string",
+          "description": "The IP address used when initiating the AA flow."
+        },
+        "initUa": {
+          "type": "string",
+          "description": "The user agent used when initiating the AA flow."
+        },
+        "completeIp": {
+          "type": "string",
+          "description": "The IP address used when completing the AA flow."
+        },
+        "completeUa": {
+          "type": "string",
+          "description": "The user agent used when completing the AA flow."
+        }
+      }
+    }
+  }
+}
diff --git a/lexicons/app/bsky/unspecced/getAgeAssuranceState.json b/lexicons/app/bsky/unspecced/getAgeAssuranceState.json
new file mode 100644
index 0000000000..3bd42b3246
--- /dev/null
+++ b/lexicons/app/bsky/unspecced/getAgeAssuranceState.json
@@ -0,0 +1,17 @@
+{
+  "lexicon": 1,
+  "id": "app.bsky.unspecced.getAgeAssuranceState",
+  "defs": {
+    "main": {
+      "type": "query",
+      "description": "Returns the current state of the age assurance process for an account. This is used to check if the user has completed age assurance or if further action is required.",
+      "output": {
+        "encoding": "application/json",
+        "schema": {
+          "type": "ref",
+          "ref": "app.bsky.unspecced.defs#ageAssuranceState"
+        }
+      }
+    }
+  }
+}
diff --git a/lexicons/app/bsky/unspecced/getConfig.json b/lexicons/app/bsky/unspecced/getConfig.json
new file mode 100644
index 0000000000..1e40f80dc2
--- /dev/null
+++ b/lexicons/app/bsky/unspecced/getConfig.json
@@ -0,0 +1,45 @@
+{
+  "lexicon": 1,
+  "id": "app.bsky.unspecced.getConfig",
+  "defs": {
+    "main": {
+      "type": "query",
+      "description": "Get miscellaneous runtime configuration.",
+      "output": {
+        "encoding": "application/json",
+        "schema": {
+          "type": "object",
+          "required": [],
+          "properties": {
+            "checkEmailConfirmed": {
+              "type": "boolean"
+            },
+            "liveNow": {
+              "type": "array",
+              "items": {
+                "type": "ref",
+                "ref": "#liveNowConfig"
+              }
+            }
+          }
+        }
+      }
+    },
+    "liveNowConfig": {
+      "type": "object",
+      "required": ["did", "domains"],
+      "properties": {
+        "did": {
+          "type": "string",
+          "format": "did"
+        },
+        "domains": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/lexicons/app/bsky/unspecced/getOnboardingSuggestedStarterPacks.json b/lexicons/app/bsky/unspecced/getOnboardingSuggestedStarterPacks.json
new file mode 100644
index 0000000000..60b1490137
--- /dev/null
+++ b/lexicons/app/bsky/unspecced/getOnboardingSuggestedStarterPacks.json
@@ -0,0 +1,37 @@
+{
+  "lexicon": 1,
+  "id": "app.bsky.unspecced.getOnboardingSuggestedStarterPacks",
+  "defs": {
+    "main": {
+      "type": "query",
+      "description": "Get a list of suggested starterpacks for onboarding",
+      "parameters": {
+        "type": "params",
+        "properties": {
+          "limit": {
+            "type": "integer",
+            "minimum": 1,
+            "maximum": 25,
+            "default": 10
+          }
+        }
+      },
+      "output": {
+        "encoding": "application/json",
+        "schema": {
+          "type": "object",
+          "required": ["starterPacks"],
+          "properties": {
+            "starterPacks": {
+              "type": "array",
+              "items": {
+                "type": "ref",
+                "ref": "app.bsky.graph.defs#starterPackView"
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/lexicons/app/bsky/unspecced/getPopularFeedGenerators.json b/lexicons/app/bsky/unspecced/getPopularFeedGenerators.json
new file mode 100644
index 0000000000..407ff66e3a
--- /dev/null
+++ b/lexicons/app/bsky/unspecced/getPopularFeedGenerators.json
@@ -0,0 +1,46 @@
+{
+  "lexicon": 1,
+  "id": "app.bsky.unspecced.getPopularFeedGenerators",
+  "defs": {
+    "main": {
+      "type": "query",
+      "description": "An unspecced view of globally popular feed generators.",
+      "parameters": {
+        "type": "params",
+        "properties": {
+          "limit": {
+            "type": "integer",
+            "minimum": 1,
+            "maximum": 100,
+            "default": 50
+          },
+          "cursor": {
+            "type": "string"
+          },
+          "query": {
+            "type": "string"
+          }
+        }
+      },
+      "output": {
+        "encoding": "application/json",
+        "schema": {
+          "type": "object",
+          "required": ["feeds"],
+          "properties": {
+            "cursor": {
+              "type": "string"
+            },
+            "feeds": {
+              "type": "array",
+              "items": {
+                "type": "ref",
+                "ref": "app.bsky.feed.defs#generatorView"
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/lexicons/app/bsky/unspecced/getPostThreadOtherV2.json b/lexicons/app/bsky/unspecced/getPostThreadOtherV2.json
new file mode 100644
index 0000000000..7fab28bfeb
--- /dev/null
+++ b/lexicons/app/bsky/unspecced/getPostThreadOtherV2.json
@@ -0,0 +1,56 @@
+{
+  "lexicon": 1,
+  "id": "app.bsky.unspecced.getPostThreadOtherV2",
+  "defs": {
+    "main": {
+      "type": "query",
+      "description": "(NOTE: this endpoint is under development and WILL change without notice. Don't use it until it is moved out of `unspecced` or your application WILL break) Get additional posts under a thread e.g. replies hidden by threadgate. Based on an anchor post at any depth of the tree, returns top-level replies below that anchor. It does not include ancestors nor the anchor itself. This should be called after exhausting `app.bsky.unspecced.getPostThreadV2`. Does not require auth, but additional metadata and filtering will be applied for authed requests.",
+      "parameters": {
+        "type": "params",
+        "required": ["anchor"],
+        "properties": {
+          "anchor": {
+            "type": "string",
+            "format": "at-uri",
+            "description": "Reference (AT-URI) to post record. This is the anchor post."
+          }
+        }
+      },
+      "output": {
+        "encoding": "application/json",
+        "schema": {
+          "type": "object",
+          "required": ["thread"],
+          "properties": {
+            "thread": {
+              "type": "array",
+              "description": "A flat list of other thread items. The depth of each item is indicated by the depth property inside the item.",
+              "items": {
+                "type": "ref",
+                "ref": "#threadItem"
+              }
+            }
+          }
+        }
+      }
+    },
+    "threadItem": {
+      "type": "object",
+      "required": ["uri", "depth", "value"],
+      "properties": {
+        "uri": {
+          "type": "string",
+          "format": "at-uri"
+        },
+        "depth": {
+          "type": "integer",
+          "description": "The nesting level of this item in the thread. Depth 0 means the anchor item. Items above have negative depths, items below have positive depths."
+        },
+        "value": {
+          "type": "union",
+          "refs": ["app.bsky.unspecced.defs#threadItemPost"]
+        }
+      }
+    }
+  }
+}
diff --git a/lexicons/app/bsky/unspecced/getPostThreadV2.json b/lexicons/app/bsky/unspecced/getPostThreadV2.json
new file mode 100644
index 0000000000..e38dfde964
--- /dev/null
+++ b/lexicons/app/bsky/unspecced/getPostThreadV2.json
@@ -0,0 +1,94 @@
+{
+  "lexicon": 1,
+  "id": "app.bsky.unspecced.getPostThreadV2",
+  "defs": {
+    "main": {
+      "type": "query",
+      "description": "(NOTE: this endpoint is under development and WILL change without notice. Don't use it until it is moved out of `unspecced` or your application WILL break) Get posts in a thread. It is based in an anchor post at any depth of the tree, and returns posts above it (recursively resolving the parent, without further branching to their replies) and below it (recursive replies, with branching to their replies). Does not require auth, but additional metadata and filtering will be applied for authed requests.",
+      "parameters": {
+        "type": "params",
+        "required": ["anchor"],
+        "properties": {
+          "anchor": {
+            "type": "string",
+            "format": "at-uri",
+            "description": "Reference (AT-URI) to post record. This is the anchor post, and the thread will be built around it. It can be any post in the tree, not necessarily a root post."
+          },
+          "above": {
+            "type": "boolean",
+            "description": "Whether to include parents above the anchor.",
+            "default": true
+          },
+          "below": {
+            "type": "integer",
+            "description": "How many levels of replies to include below the anchor.",
+            "default": 6,
+            "minimum": 0,
+            "maximum": 20
+          },
+          "branchingFactor": {
+            "type": "integer",
+            "description": "Maximum of replies to include at each level of the thread, except for the direct replies to the anchor, which are (NOTE: currently, during unspecced phase) all returned (NOTE: later they might be paginated).",
+            "default": 10,
+            "minimum": 0,
+            "maximum": 100
+          },
+          "sort": {
+            "type": "string",
+            "description": "Sorting for the thread replies.",
+            "knownValues": ["newest", "oldest", "top"],
+            "default": "oldest"
+          }
+        }
+      },
+      "output": {
+        "encoding": "application/json",
+        "schema": {
+          "type": "object",
+          "required": ["thread", "hasOtherReplies"],
+          "properties": {
+            "thread": {
+              "type": "array",
+              "description": "A flat list of thread items. The depth of each item is indicated by the depth property inside the item.",
+              "items": {
+                "type": "ref",
+                "ref": "#threadItem"
+              }
+            },
+            "threadgate": {
+              "type": "ref",
+              "ref": "app.bsky.feed.defs#threadgateView"
+            },
+            "hasOtherReplies": {
+              "type": "boolean",
+              "description": "Whether this thread has additional replies. If true, a call can be made to the `getPostThreadOtherV2` endpoint to retrieve them."
+            }
+          }
+        }
+      }
+    },
+    "threadItem": {
+      "type": "object",
+      "required": ["uri", "depth", "value"],
+      "properties": {
+        "uri": {
+          "type": "string",
+          "format": "at-uri"
+        },
+        "depth": {
+          "type": "integer",
+          "description": "The nesting level of this item in the thread. Depth 0 means the anchor item. Items above have negative depths, items below have positive depths."
+        },
+        "value": {
+          "type": "union",
+          "refs": [
+            "app.bsky.unspecced.defs#threadItemPost",
+            "app.bsky.unspecced.defs#threadItemNoUnauthenticated",
+            "app.bsky.unspecced.defs#threadItemNotFound",
+            "app.bsky.unspecced.defs#threadItemBlocked"
+          ]
+        }
+      }
+    }
+  }
+}
diff --git a/lexicons/app/bsky/unspecced/getSuggestedFeeds.json b/lexicons/app/bsky/unspecced/getSuggestedFeeds.json
new file mode 100644
index 0000000000..1a723a0bbb
--- /dev/null
+++ b/lexicons/app/bsky/unspecced/getSuggestedFeeds.json
@@ -0,0 +1,37 @@
+{
+  "lexicon": 1,
+  "id": "app.bsky.unspecced.getSuggestedFeeds",
+  "defs": {
+    "main": {
+      "type": "query",
+      "description": "Get a list of suggested feeds",
+      "parameters": {
+        "type": "params",
+        "properties": {
+          "limit": {
+            "type": "integer",
+            "minimum": 1,
+            "maximum": 25,
+            "default": 10
+          }
+        }
+      },
+      "output": {
+        "encoding": "application/json",
+        "schema": {
+          "type": "object",
+          "required": ["feeds"],
+          "properties": {
+            "feeds": {
+              "type": "array",
+              "items": {
+                "type": "ref",
+                "ref": "app.bsky.feed.defs#generatorView"
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/lexicons/app/bsky/unspecced/getSuggestedFeedsSkeleton.json b/lexicons/app/bsky/unspecced/getSuggestedFeedsSkeleton.json
new file mode 100644
index 0000000000..c0b72da680
--- /dev/null
+++ b/lexicons/app/bsky/unspecced/getSuggestedFeedsSkeleton.json
@@ -0,0 +1,42 @@
+{
+  "lexicon": 1,
+  "id": "app.bsky.unspecced.getSuggestedFeedsSkeleton",
+  "defs": {
+    "main": {
+      "type": "query",
+      "description": "Get a skeleton of suggested feeds. Intended to be called and hydrated by app.bsky.unspecced.getSuggestedFeeds",
+      "parameters": {
+        "type": "params",
+        "properties": {
+          "viewer": {
+            "type": "string",
+            "format": "did",
+            "description": "DID of the account making the request (not included for public/unauthenticated queries)."
+          },
+          "limit": {
+            "type": "integer",
+            "minimum": 1,
+            "maximum": 25,
+            "default": 10
+          }
+        }
+      },
+      "output": {
+        "encoding": "application/json",
+        "schema": {
+          "type": "object",
+          "required": ["feeds"],
+          "properties": {
+            "feeds": {
+              "type": "array",
+              "items": {
+                "type": "string",
+                "format": "at-uri"
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/lexicons/app/bsky/unspecced/getSuggestedOnboardingUsers.json b/lexicons/app/bsky/unspecced/getSuggestedOnboardingUsers.json
new file mode 100644
index 0000000000..24e45566ef
--- /dev/null
+++ b/lexicons/app/bsky/unspecced/getSuggestedOnboardingUsers.json
@@ -0,0 +1,49 @@
+{
+  "lexicon": 1,
+  "id": "app.bsky.unspecced.getSuggestedOnboardingUsers",
+  "defs": {
+    "main": {
+      "type": "query",
+      "description": "Get a list of suggested users for onboarding",
+      "parameters": {
+        "type": "params",
+        "properties": {
+          "category": {
+            "type": "string",
+            "description": "Category of users to get suggestions for."
+          },
+          "limit": {
+            "type": "integer",
+            "minimum": 1,
+            "maximum": 50,
+            "default": 25
+          }
+        }
+      },
+      "output": {
+        "encoding": "application/json",
+        "schema": {
+          "type": "object",
+          "required": ["actors"],
+          "properties": {
+            "actors": {
+              "type": "array",
+              "items": {
+                "type": "ref",
+                "ref": "app.bsky.actor.defs#profileView"
+              }
+            },
+            "recId": {
+              "type": "string",
+              "description": "DEPRECATED: use recIdStr instead."
+            },
+            "recIdStr": {
+              "type": "string",
+              "description": "Snowflake for this recommendation, use when submitting recommendation events."
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/lexicons/app/bsky/unspecced/getSuggestedStarterPacks.json b/lexicons/app/bsky/unspecced/getSuggestedStarterPacks.json
new file mode 100644
index 0000000000..d4bdd22643
--- /dev/null
+++ b/lexicons/app/bsky/unspecced/getSuggestedStarterPacks.json
@@ -0,0 +1,37 @@
+{
+  "lexicon": 1,
+  "id": "app.bsky.unspecced.getSuggestedStarterPacks",
+  "defs": {
+    "main": {
+      "type": "query",
+      "description": "Get a list of suggested starterpacks",
+      "parameters": {
+        "type": "params",
+        "properties": {
+          "limit": {
+            "type": "integer",
+            "minimum": 1,
+            "maximum": 25,
+            "default": 10
+          }
+        }
+      },
+      "output": {
+        "encoding": "application/json",
+        "schema": {
+          "type": "object",
+          "required": ["starterPacks"],
+          "properties": {
+            "starterPacks": {
+              "type": "array",
+              "items": {
+                "type": "ref",
+                "ref": "app.bsky.graph.defs#starterPackView"
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/lexicons/app/bsky/unspecced/getSuggestedStarterPacksSkeleton.json b/lexicons/app/bsky/unspecced/getSuggestedStarterPacksSkeleton.json
new file mode 100644
index 0000000000..cf5d88e060
--- /dev/null
+++ b/lexicons/app/bsky/unspecced/getSuggestedStarterPacksSkeleton.json
@@ -0,0 +1,42 @@
+{
+  "lexicon": 1,
+  "id": "app.bsky.unspecced.getSuggestedStarterPacksSkeleton",
+  "defs": {
+    "main": {
+      "type": "query",
+      "description": "Get a skeleton of suggested starterpacks. Intended to be called and hydrated by app.bsky.unspecced.getSuggestedStarterpacks",
+      "parameters": {
+        "type": "params",
+        "properties": {
+          "viewer": {
+            "type": "string",
+            "format": "did",
+            "description": "DID of the account making the request (not included for public/unauthenticated queries)."
+          },
+          "limit": {
+            "type": "integer",
+            "minimum": 1,
+            "maximum": 25,
+            "default": 10
+          }
+        }
+      },
+      "output": {
+        "encoding": "application/json",
+        "schema": {
+          "type": "object",
+          "required": ["starterPacks"],
+          "properties": {
+            "starterPacks": {
+              "type": "array",
+              "items": {
+                "type": "string",
+                "format": "at-uri"
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/lexicons/app/bsky/unspecced/getSuggestedUsers.json b/lexicons/app/bsky/unspecced/getSuggestedUsers.json
new file mode 100644
index 0000000000..705e21c9d6
--- /dev/null
+++ b/lexicons/app/bsky/unspecced/getSuggestedUsers.json
@@ -0,0 +1,49 @@
+{
+  "lexicon": 1,
+  "id": "app.bsky.unspecced.getSuggestedUsers",
+  "defs": {
+    "main": {
+      "type": "query",
+      "description": "Get a list of suggested users",
+      "parameters": {
+        "type": "params",
+        "properties": {
+          "category": {
+            "type": "string",
+            "description": "Category of users to get suggestions for."
+          },
+          "limit": {
+            "type": "integer",
+            "minimum": 1,
+            "maximum": 50,
+            "default": 25
+          }
+        }
+      },
+      "output": {
+        "encoding": "application/json",
+        "schema": {
+          "type": "object",
+          "required": ["actors"],
+          "properties": {
+            "actors": {
+              "type": "array",
+              "items": {
+                "type": "ref",
+                "ref": "app.bsky.actor.defs#profileView"
+              }
+            },
+            "recId": {
+              "type": "string",
+              "description": "DEPRECATED: use recIdStr instead."
+            },
+            "recIdStr": {
+              "type": "string",
+              "description": "Snowflake for this recommendation, use when submitting recommendation events."
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/lexicons/app/bsky/unspecced/getSuggestedUsersForDiscover.json b/lexicons/app/bsky/unspecced/getSuggestedUsersForDiscover.json
new file mode 100644
index 0000000000..7d0f289d12
--- /dev/null
+++ b/lexicons/app/bsky/unspecced/getSuggestedUsersForDiscover.json
@@ -0,0 +1,41 @@
+{
+  "lexicon": 1,
+  "id": "app.bsky.unspecced.getSuggestedUsersForDiscover",
+  "defs": {
+    "main": {
+      "type": "query",
+      "description": "Get a list of suggested users for the Discover page",
+      "parameters": {
+        "type": "params",
+        "properties": {
+          "limit": {
+            "type": "integer",
+            "minimum": 1,
+            "maximum": 50,
+            "default": 25
+          }
+        }
+      },
+      "output": {
+        "encoding": "application/json",
+        "schema": {
+          "type": "object",
+          "required": ["actors"],
+          "properties": {
+            "actors": {
+              "type": "array",
+              "items": {
+                "type": "ref",
+                "ref": "app.bsky.actor.defs#profileView"
+              }
+            },
+            "recIdStr": {
+              "type": "string",
+              "description": "Snowflake for this recommendation, use when submitting recommendation events."
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/lexicons/app/bsky/unspecced/getSuggestedUsersForExplore.json b/lexicons/app/bsky/unspecced/getSuggestedUsersForExplore.json
new file mode 100644
index 0000000000..a37a21a7eb
--- /dev/null
+++ b/lexicons/app/bsky/unspecced/getSuggestedUsersForExplore.json
@@ -0,0 +1,45 @@
+{
+  "lexicon": 1,
+  "id": "app.bsky.unspecced.getSuggestedUsersForExplore",
+  "defs": {
+    "main": {
+      "type": "query",
+      "description": "Get a list of suggested users for the Explore page",
+      "parameters": {
+        "type": "params",
+        "properties": {
+          "category": {
+            "type": "string",
+            "description": "Category of users to get suggestions for."
+          },
+          "limit": {
+            "type": "integer",
+            "minimum": 1,
+            "maximum": 50,
+            "default": 25
+          }
+        }
+      },
+      "output": {
+        "encoding": "application/json",
+        "schema": {
+          "type": "object",
+          "required": ["actors"],
+          "properties": {
+            "actors": {
+              "type": "array",
+              "items": {
+                "type": "ref",
+                "ref": "app.bsky.actor.defs#profileView"
+              }
+            },
+            "recIdStr": {
+              "type": "string",
+              "description": "Snowflake for this recommendation, use when submitting recommendation events."
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/lexicons/app/bsky/unspecced/getSuggestedUsersForSeeMore.json b/lexicons/app/bsky/unspecced/getSuggestedUsersForSeeMore.json
new file mode 100644
index 0000000000..1938df7e55
--- /dev/null
+++ b/lexicons/app/bsky/unspecced/getSuggestedUsersForSeeMore.json
@@ -0,0 +1,45 @@
+{
+  "lexicon": 1,
+  "id": "app.bsky.unspecced.getSuggestedUsersForSeeMore",
+  "defs": {
+    "main": {
+      "type": "query",
+      "description": "Get a list of suggested users for the See More page",
+      "parameters": {
+        "type": "params",
+        "properties": {
+          "category": {
+            "type": "string",
+            "description": "Category of users to get suggestions for."
+          },
+          "limit": {
+            "type": "integer",
+            "minimum": 1,
+            "maximum": 50,
+            "default": 25
+          }
+        }
+      },
+      "output": {
+        "encoding": "application/json",
+        "schema": {
+          "type": "object",
+          "required": ["actors"],
+          "properties": {
+            "actors": {
+              "type": "array",
+              "items": {
+                "type": "ref",
+                "ref": "app.bsky.actor.defs#profileView"
+              }
+            },
+            "recIdStr": {
+              "type": "string",
+              "description": "Snowflake for this recommendation, use when submitting recommendation events."
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/lexicons/app/bsky/unspecced/getSuggestedUsersSkeleton.json b/lexicons/app/bsky/unspecced/getSuggestedUsersSkeleton.json
new file mode 100644
index 0000000000..3fed8dd95d
--- /dev/null
+++ b/lexicons/app/bsky/unspecced/getSuggestedUsersSkeleton.json
@@ -0,0 +1,54 @@
+{
+  "lexicon": 1,
+  "id": "app.bsky.unspecced.getSuggestedUsersSkeleton",
+  "defs": {
+    "main": {
+      "type": "query",
+      "description": "Get a skeleton of suggested users. Intended to be called and hydrated by app.bsky.unspecced.getSuggestedUsers",
+      "parameters": {
+        "type": "params",
+        "properties": {
+          "viewer": {
+            "type": "string",
+            "format": "did",
+            "description": "DID of the account making the request (not included for public/unauthenticated queries)."
+          },
+          "category": {
+            "type": "string",
+            "description": "Category of users to get suggestions for."
+          },
+          "limit": {
+            "type": "integer",
+            "minimum": 1,
+            "maximum": 50,
+            "default": 25
+          }
+        }
+      },
+      "output": {
+        "encoding": "application/json",
+        "schema": {
+          "type": "object",
+          "required": ["dids"],
+          "properties": {
+            "dids": {
+              "type": "array",
+              "items": {
+                "type": "string",
+                "format": "did"
+              }
+            },
+            "recId": {
+              "type": "string",
+              "description": "DEPRECATED: use recIdStr instead."
+            },
+            "recIdStr": {
+              "type": "string",
+              "description": "Snowflake for this recommendation, use when submitting recommendation events."
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/lexicons/app/bsky/unspecced/getSuggestionsSkeleton.json b/lexicons/app/bsky/unspecced/getSuggestionsSkeleton.json
new file mode 100644
index 0000000000..466815ed47
--- /dev/null
+++ b/lexicons/app/bsky/unspecced/getSuggestionsSkeleton.json
@@ -0,0 +1,66 @@
+{
+  "lexicon": 1,
+  "id": "app.bsky.unspecced.getSuggestionsSkeleton",
+  "defs": {
+    "main": {
+      "type": "query",
+      "description": "Get a skeleton of suggested actors. Intended to be called and then hydrated through app.bsky.actor.getSuggestions",
+      "parameters": {
+        "type": "params",
+        "properties": {
+          "viewer": {
+            "type": "string",
+            "format": "did",
+            "description": "DID of the account making the request (not included for public/unauthenticated queries). Used to boost followed accounts in ranking."
+          },
+          "limit": {
+            "type": "integer",
+            "minimum": 1,
+            "maximum": 100,
+            "default": 50
+          },
+          "cursor": {
+            "type": "string"
+          },
+          "relativeToDid": {
+            "type": "string",
+            "format": "did",
+            "description": "DID of the account to get suggestions relative to. If not provided, suggestions will be based on the viewer."
+          }
+        }
+      },
+      "output": {
+        "encoding": "application/json",
+        "schema": {
+          "type": "object",
+          "required": ["actors"],
+          "properties": {
+            "cursor": {
+              "type": "string"
+            },
+            "actors": {
+              "type": "array",
+              "items": {
+                "type": "ref",
+                "ref": "app.bsky.unspecced.defs#skeletonSearchActor"
+              }
+            },
+            "relativeToDid": {
+              "type": "string",
+              "format": "did",
+              "description": "DID of the account these suggestions are relative to. If this is returned undefined, suggestions are based on the viewer."
+            },
+            "recId": {
+              "type": "integer",
+              "description": "DEPRECATED: use recIdStr instead."
+            },
+            "recIdStr": {
+              "type": "string",
+              "description": "Snowflake for this recommendation, use when submitting recommendation events."
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/lexicons/app/bsky/unspecced/getTaggedSuggestions.json b/lexicons/app/bsky/unspecced/getTaggedSuggestions.json
new file mode 100644
index 0000000000..f81459098d
--- /dev/null
+++ b/lexicons/app/bsky/unspecced/getTaggedSuggestions.json
@@ -0,0 +1,47 @@
+{
+  "lexicon": 1,
+  "id": "app.bsky.unspecced.getTaggedSuggestions",
+  "defs": {
+    "main": {
+      "type": "query",
+      "description": "Get a list of suggestions (feeds and users) tagged with categories",
+      "parameters": {
+        "type": "params",
+        "properties": {}
+      },
+      "output": {
+        "encoding": "application/json",
+        "schema": {
+          "type": "object",
+          "required": ["suggestions"],
+          "properties": {
+            "suggestions": {
+              "type": "array",
+              "items": {
+                "type": "ref",
+                "ref": "#suggestion"
+              }
+            }
+          }
+        }
+      }
+    },
+    "suggestion": {
+      "type": "object",
+      "required": ["tag", "subjectType", "subject"],
+      "properties": {
+        "tag": {
+          "type": "string"
+        },
+        "subjectType": {
+          "type": "string",
+          "knownValues": ["actor", "feed"]
+        },
+        "subject": {
+          "type": "string",
+          "format": "uri"
+        }
+      }
+    }
+  }
+}
diff --git a/lexicons/app/bsky/unspecced/getTrendingTopics.json b/lexicons/app/bsky/unspecced/getTrendingTopics.json
new file mode 100644
index 0000000000..097dc1c54d
--- /dev/null
+++ b/lexicons/app/bsky/unspecced/getTrendingTopics.json
@@ -0,0 +1,49 @@
+{
+  "lexicon": 1,
+  "id": "app.bsky.unspecced.getTrendingTopics",
+  "defs": {
+    "main": {
+      "type": "query",
+      "description": "Get a list of trending topics",
+      "parameters": {
+        "type": "params",
+        "properties": {
+          "viewer": {
+            "type": "string",
+            "format": "did",
+            "description": "DID of the account making the request (not included for public/unauthenticated queries). Used to boost followed accounts in ranking."
+          },
+          "limit": {
+            "type": "integer",
+            "minimum": 1,
+            "maximum": 25,
+            "default": 10
+          }
+        }
+      },
+      "output": {
+        "encoding": "application/json",
+        "schema": {
+          "type": "object",
+          "required": ["topics", "suggested"],
+          "properties": {
+            "topics": {
+              "type": "array",
+              "items": {
+                "type": "ref",
+                "ref": "app.bsky.unspecced.defs#trendingTopic"
+              }
+            },
+            "suggested": {
+              "type": "array",
+              "items": {
+                "type": "ref",
+                "ref": "app.bsky.unspecced.defs#trendingTopic"
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/lexicons/app/bsky/unspecced/getTrends.json b/lexicons/app/bsky/unspecced/getTrends.json
new file mode 100644
index 0000000000..b857c8681b
--- /dev/null
+++ b/lexicons/app/bsky/unspecced/getTrends.json
@@ -0,0 +1,41 @@
+{
+  "lexicon": 1,
+  "id": "app.bsky.unspecced.getTrends",
+  "defs": {
+    "main": {
+      "type": "query",
+      "description": "Get the current trends on the network",
+      "parameters": {
+        "type": "params",
+        "properties": {
+          "limit": {
+            "type": "integer",
+            "minimum": 1,
+            "maximum": 25,
+            "default": 10
+          }
+        }
+      },
+      "output": {
+        "encoding": "application/json",
+        "schema": {
+          "type": "object",
+          "required": ["trends"],
+          "properties": {
+            "trends": {
+              "type": "array",
+              "items": {
+                "type": "ref",
+                "ref": "app.bsky.unspecced.defs#trendView"
+              }
+            },
+            "recIdStr": {
+              "type": "string",
+              "description": "Snowflake for this recommendation, use when submitting recommendation events."
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/lexicons/app/bsky/unspecced/getTrendsSkeleton.json b/lexicons/app/bsky/unspecced/getTrendsSkeleton.json
new file mode 100644
index 0000000000..d0b6272bb6
--- /dev/null
+++ b/lexicons/app/bsky/unspecced/getTrendsSkeleton.json
@@ -0,0 +1,42 @@
+{
+  "lexicon": 1,
+  "id": "app.bsky.unspecced.getTrendsSkeleton",
+  "defs": {
+    "main": {
+      "type": "query",
+      "description": "Get the skeleton of trends on the network. Intended to be called and then hydrated through app.bsky.unspecced.getTrends",
+      "parameters": {
+        "type": "params",
+        "properties": {
+          "viewer": {
+            "type": "string",
+            "format": "did",
+            "description": "DID of the account making the request (not included for public/unauthenticated queries)."
+          },
+          "limit": {
+            "type": "integer",
+            "minimum": 1,
+            "maximum": 25,
+            "default": 10
+          }
+        }
+      },
+      "output": {
+        "encoding": "application/json",
+        "schema": {
+          "type": "object",
+          "required": ["trends"],
+          "properties": {
+            "trends": {
+              "type": "array",
+              "items": {
+                "type": "ref",
+                "ref": "app.bsky.unspecced.defs#skeletonTrend"
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/lexicons/app/bsky/unspecced/initAgeAssurance.json b/lexicons/app/bsky/unspecced/initAgeAssurance.json
new file mode 100644
index 0000000000..236c07cf36
--- /dev/null
+++ b/lexicons/app/bsky/unspecced/initAgeAssurance.json
@@ -0,0 +1,49 @@
+{
+  "lexicon": 1,
+  "id": "app.bsky.unspecced.initAgeAssurance",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "description": "Initiate age assurance for an account. This is a one-time action that will start the process of verifying the user's age.",
+      "input": {
+        "encoding": "application/json",
+        "schema": {
+          "type": "object",
+          "required": ["email", "language", "countryCode"],
+          "properties": {
+            "email": {
+              "type": "string",
+              "description": "The user's email address to receive assurance instructions."
+            },
+            "language": {
+              "type": "string",
+              "description": "The user's preferred language for communication during the assurance process."
+            },
+            "countryCode": {
+              "type": "string",
+              "description": "An ISO 3166-1 alpha-2 code of the user's location."
+            }
+          }
+        }
+      },
+      "output": {
+        "encoding": "application/json",
+        "schema": {
+          "type": "ref",
+          "ref": "app.bsky.unspecced.defs#ageAssuranceState"
+        }
+      },
+      "errors": [
+        {
+          "name": "InvalidEmail"
+        },
+        {
+          "name": "DidTooLong"
+        },
+        {
+          "name": "InvalidInitiation"
+        }
+      ]
+    }
+  }
+}
diff --git a/lexicons/app/bsky/unspecced/searchActorsSkeleton.json b/lexicons/app/bsky/unspecced/searchActorsSkeleton.json
new file mode 100644
index 0000000000..71784336a3
--- /dev/null
+++ b/lexicons/app/bsky/unspecced/searchActorsSkeleton.json
@@ -0,0 +1,67 @@
+{
+  "lexicon": 1,
+  "id": "app.bsky.unspecced.searchActorsSkeleton",
+  "defs": {
+    "main": {
+      "type": "query",
+      "description": "Backend Actors (profile) search, returns only skeleton.",
+      "parameters": {
+        "type": "params",
+        "required": ["q"],
+        "properties": {
+          "q": {
+            "type": "string",
+            "description": "Search query string; syntax, phrase, boolean, and faceting is unspecified, but Lucene query syntax is recommended. For typeahead search, only simple term match is supported, not full syntax."
+          },
+          "viewer": {
+            "type": "string",
+            "format": "did",
+            "description": "DID of the account making the request (not included for public/unauthenticated queries). Used to boost followed accounts in ranking."
+          },
+          "typeahead": {
+            "type": "boolean",
+            "description": "If true, acts as fast/simple 'typeahead' query."
+          },
+          "limit": {
+            "type": "integer",
+            "minimum": 1,
+            "maximum": 100,
+            "default": 25
+          },
+          "cursor": {
+            "type": "string",
+            "description": "Optional pagination mechanism; may not necessarily allow scrolling through entire result set."
+          }
+        }
+      },
+      "output": {
+        "encoding": "application/json",
+        "schema": {
+          "type": "object",
+          "required": ["actors"],
+          "properties": {
+            "cursor": {
+              "type": "string"
+            },
+            "hitsTotal": {
+              "type": "integer",
+              "description": "Count of search hits. Optional, may be rounded/truncated, and may not be possible to paginate through all hits."
+            },
+            "actors": {
+              "type": "array",
+              "items": {
+                "type": "ref",
+                "ref": "app.bsky.unspecced.defs#skeletonSearchActor"
+              }
+            }
+          }
+        }
+      },
+      "errors": [
+        {
+          "name": "BadQueryString"
+        }
+      ]
+    }
+  }
+}
diff --git a/lexicons/app/bsky/unspecced/searchPostsSkeleton.json b/lexicons/app/bsky/unspecced/searchPostsSkeleton.json
new file mode 100644
index 0000000000..63c3cf4858
--- /dev/null
+++ b/lexicons/app/bsky/unspecced/searchPostsSkeleton.json
@@ -0,0 +1,110 @@
+{
+  "lexicon": 1,
+  "id": "app.bsky.unspecced.searchPostsSkeleton",
+  "defs": {
+    "main": {
+      "type": "query",
+      "description": "Backend Posts search, returns only skeleton",
+      "parameters": {
+        "type": "params",
+        "required": ["q"],
+        "properties": {
+          "q": {
+            "type": "string",
+            "description": "Search query string; syntax, phrase, boolean, and faceting is unspecified, but Lucene query syntax is recommended."
+          },
+          "sort": {
+            "type": "string",
+            "knownValues": ["top", "latest"],
+            "default": "latest",
+            "description": "Specifies the ranking order of results."
+          },
+          "since": {
+            "type": "string",
+            "description": "Filter results for posts after the indicated datetime (inclusive). Expected to use 'sortAt' timestamp, which may not match 'createdAt'. Can be a datetime, or just an ISO date (YYYY-MM-DD)."
+          },
+          "until": {
+            "type": "string",
+            "description": "Filter results for posts before the indicated datetime (not inclusive). Expected to use 'sortAt' timestamp, which may not match 'createdAt'. Can be a datetime, or just an ISO date (YYY-MM-DD)."
+          },
+          "mentions": {
+            "type": "string",
+            "format": "at-identifier",
+            "description": "Filter to posts which mention the given account. Handles are resolved to DID before query-time. Only matches rich-text facet mentions."
+          },
+          "author": {
+            "type": "string",
+            "format": "at-identifier",
+            "description": "Filter to posts by the given account. Handles are resolved to DID before query-time."
+          },
+          "lang": {
+            "type": "string",
+            "format": "language",
+            "description": "Filter to posts in the given language. Expected to be based on post language field, though server may override language detection."
+          },
+          "domain": {
+            "type": "string",
+            "description": "Filter to posts with URLs (facet links or embeds) linking to the given domain (hostname). Server may apply hostname normalization."
+          },
+          "url": {
+            "type": "string",
+            "format": "uri",
+            "description": "Filter to posts with links (facet links or embeds) pointing to this URL. Server may apply URL normalization or fuzzy matching."
+          },
+          "tag": {
+            "type": "array",
+            "items": {
+              "type": "string",
+              "maxLength": 640,
+              "maxGraphemes": 64
+            },
+            "description": "Filter to posts with the given tag (hashtag), based on rich-text facet or tag field. Do not include the hash (#) prefix. Multiple tags can be specified, with 'AND' matching."
+          },
+          "viewer": {
+            "type": "string",
+            "format": "did",
+            "description": "DID of the account making the request (not included for public/unauthenticated queries). Used for 'from:me' queries."
+          },
+          "limit": {
+            "type": "integer",
+            "minimum": 1,
+            "maximum": 100,
+            "default": 25
+          },
+          "cursor": {
+            "type": "string",
+            "description": "Optional pagination mechanism; may not necessarily allow scrolling through entire result set."
+          }
+        }
+      },
+      "output": {
+        "encoding": "application/json",
+        "schema": {
+          "type": "object",
+          "required": ["posts"],
+          "properties": {
+            "cursor": {
+              "type": "string"
+            },
+            "hitsTotal": {
+              "type": "integer",
+              "description": "Count of search hits. Optional, may be rounded/truncated, and may not be possible to paginate through all hits."
+            },
+            "posts": {
+              "type": "array",
+              "items": {
+                "type": "ref",
+                "ref": "app.bsky.unspecced.defs#skeletonSearchPost"
+              }
+            }
+          }
+        }
+      },
+      "errors": [
+        {
+          "name": "BadQueryString"
+        }
+      ]
+    }
+  }
+}
diff --git a/lexicons/app/bsky/unspecced/searchStarterPacksSkeleton.json b/lexicons/app/bsky/unspecced/searchStarterPacksSkeleton.json
new file mode 100644
index 0000000000..80c1b88179
--- /dev/null
+++ b/lexicons/app/bsky/unspecced/searchStarterPacksSkeleton.json
@@ -0,0 +1,63 @@
+{
+  "lexicon": 1,
+  "id": "app.bsky.unspecced.searchStarterPacksSkeleton",
+  "defs": {
+    "main": {
+      "type": "query",
+      "description": "Backend Starter Pack search, returns only skeleton.",
+      "parameters": {
+        "type": "params",
+        "required": ["q"],
+        "properties": {
+          "q": {
+            "type": "string",
+            "description": "Search query string; syntax, phrase, boolean, and faceting is unspecified, but Lucene query syntax is recommended."
+          },
+          "viewer": {
+            "type": "string",
+            "format": "did",
+            "description": "DID of the account making the request (not included for public/unauthenticated queries)."
+          },
+          "limit": {
+            "type": "integer",
+            "minimum": 1,
+            "maximum": 100,
+            "default": 25
+          },
+          "cursor": {
+            "type": "string",
+            "description": "Optional pagination mechanism; may not necessarily allow scrolling through entire result set."
+          }
+        }
+      },
+      "output": {
+        "encoding": "application/json",
+        "schema": {
+          "type": "object",
+          "required": ["starterPacks"],
+          "properties": {
+            "cursor": {
+              "type": "string"
+            },
+            "hitsTotal": {
+              "type": "integer",
+              "description": "Count of search hits. Optional, may be rounded/truncated, and may not be possible to paginate through all hits."
+            },
+            "starterPacks": {
+              "type": "array",
+              "items": {
+                "type": "ref",
+                "ref": "app.bsky.unspecced.defs#skeletonSearchStarterPack"
+              }
+            }
+          }
+        }
+      },
+      "errors": [
+        {
+          "name": "BadQueryString"
+        }
+      ]
+    }
+  }
+}
diff --git a/lexicons/app/bsky/video/defs.json b/lexicons/app/bsky/video/defs.json
new file mode 100644
index 0000000000..a5bcb22bcd
--- /dev/null
+++ b/lexicons/app/bsky/video/defs.json
@@ -0,0 +1,58 @@
+{
+  "id": "app.bsky.video.defs",
+  "defs": {
+    "jobStatus": {
+      "type": "object",
+      "required": [
+        "jobId",
+        "did",
+        "state"
+      ],
+      "properties": {
+        "did": {
+          "type": "string",
+          "format": "did"
+        },
+        "blob": {
+          "type": "blob"
+        },
+        "error": {
+          "type": "string"
+        },
+        "jobId": {
+          "type": "string"
+        },
+        "state": {
+          "type": "string",
+          "description": "The state of the video processing job. All values not listed as a known value indicate that the job is in process.",
+          "knownValues": [
+            "JOB_STATE_COMPLETED",
+            "JOB_STATE_FAILED"
+          ]
+        },
+        "message": {
+          "type": "string"
+        },
+        "progress": {
+          "type": "integer",
+          "maximum": 100,
+          "minimum": 0,
+          "description": "Progress within the current processing state."
+        },
+        "failureCode": {
+          "type": "string",
+          "description": "A machine-readable code for why the video processing job failed.",
+          "knownValues": [
+            "validation_failure",
+            "encoding_failure",
+            "pds_upload_failure",
+            "pds_upload_unsupported_blob_size",
+            "generic_failure"
+          ]
+        }
+      }
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/video/getJobStatus.json b/lexicons/app/bsky/video/getJobStatus.json
new file mode 100644
index 0000000000..7fb3ae4a46
--- /dev/null
+++ b/lexicons/app/bsky/video/getJobStatus.json
@@ -0,0 +1,37 @@
+{
+  "id": "app.bsky.video.getJobStatus",
+  "defs": {
+    "main": {
+      "type": "query",
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "jobStatus"
+          ],
+          "properties": {
+            "jobStatus": {
+              "ref": "app.bsky.video.defs#jobStatus",
+              "type": "ref"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "parameters": {
+        "type": "params",
+        "required": [
+          "jobId"
+        ],
+        "properties": {
+          "jobId": {
+            "type": "string"
+          }
+        }
+      },
+      "description": "Get status details for a video processing job."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/video/getUploadLimits.json b/lexicons/app/bsky/video/getUploadLimits.json
new file mode 100644
index 0000000000..fdc11082ec
--- /dev/null
+++ b/lexicons/app/bsky/video/getUploadLimits.json
@@ -0,0 +1,37 @@
+{
+  "id": "app.bsky.video.getUploadLimits",
+  "defs": {
+    "main": {
+      "type": "query",
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "canUpload"
+          ],
+          "properties": {
+            "error": {
+              "type": "string"
+            },
+            "message": {
+              "type": "string"
+            },
+            "canUpload": {
+              "type": "boolean"
+            },
+            "remainingDailyBytes": {
+              "type": "integer"
+            },
+            "remainingDailyVideos": {
+              "type": "integer"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "description": "Get video upload limits for the authenticated user."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/app/bsky/video/uploadVideo.json b/lexicons/app/bsky/video/uploadVideo.json
new file mode 100644
index 0000000000..01330b1b9a
--- /dev/null
+++ b/lexicons/app/bsky/video/uploadVideo.json
@@ -0,0 +1,29 @@
+{
+  "id": "app.bsky.video.uploadVideo",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "input": {
+        "encoding": "video/mp4"
+      },
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "jobStatus"
+          ],
+          "properties": {
+            "jobStatus": {
+              "ref": "app.bsky.video.defs#jobStatus",
+              "type": "ref"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "description": "Upload a video to be processed then stored on the PDS."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/chat/bsky/actor/declaration.json b/lexicons/chat/bsky/actor/declaration.json
new file mode 100644
index 0000000000..de04440ac7
--- /dev/null
+++ b/lexicons/chat/bsky/actor/declaration.json
@@ -0,0 +1,37 @@
+{
+  "id": "chat.bsky.actor.declaration",
+  "defs": {
+    "main": {
+      "key": "literal:self",
+      "type": "record",
+      "record": {
+        "type": "object",
+        "required": [
+          "allowIncoming"
+        ],
+        "properties": {
+          "allowIncoming": {
+            "type": "string",
+            "knownValues": [
+              "all",
+              "none",
+              "following"
+            ]
+          },
+          "allowGroupInvites": {
+            "type": "string",
+            "description": "Declaration about group chat invitation preferences for the record owner.",
+            "knownValues": [
+              "all",
+              "none",
+              "following"
+            ]
+          }
+        }
+      },
+      "description": "A declaration of a Bluesky chat account."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/chat/bsky/actor/defs.json b/lexicons/chat/bsky/actor/defs.json
new file mode 100644
index 0000000000..87b18d714b
--- /dev/null
+++ b/lexicons/chat/bsky/actor/defs.json
@@ -0,0 +1,105 @@
+{
+  "id": "chat.bsky.actor.defs",
+  "defs": {
+    "memberRole": {
+      "type": "string",
+      "knownValues": [
+        "owner",
+        "standard"
+      ]
+    },
+    "groupConvoMember": {
+      "type": "object",
+      "required": [
+        "role"
+      ],
+      "properties": {
+        "role": {
+          "ref": "#memberRole",
+          "type": "ref",
+          "description": "The member's role within this conversation. Only present in group conversation member lists."
+        },
+        "addedBy": {
+          "ref": "#profileViewBasic",
+          "type": "ref",
+          "description": "Who added this member. Only present if the member was added (instead of joining via link)."
+        }
+      },
+      "description": "A current group convo member."
+    },
+    "profileViewBasic": {
+      "type": "object",
+      "required": [
+        "did",
+        "handle"
+      ],
+      "properties": {
+        "did": {
+          "type": "string",
+          "format": "did"
+        },
+        "kind": {
+          "refs": [
+            "#directConvoMember",
+            "#groupConvoMember",
+            "#pastGroupConvoMember"
+          ],
+          "type": "union",
+          "description": "Union field that has data specific to different kinds of convos."
+        },
+        "avatar": {
+          "type": "string",
+          "format": "uri"
+        },
+        "handle": {
+          "type": "string",
+          "format": "handle"
+        },
+        "labels": {
+          "type": "array",
+          "items": {
+            "ref": "com.atproto.label.defs#label",
+            "type": "ref"
+          }
+        },
+        "viewer": {
+          "ref": "app.bsky.actor.defs#viewerState",
+          "type": "ref"
+        },
+        "createdAt": {
+          "type": "string",
+          "format": "datetime"
+        },
+        "associated": {
+          "ref": "app.bsky.actor.defs#profileAssociated",
+          "type": "ref"
+        },
+        "displayName": {
+          "type": "string",
+          "maxLength": 640,
+          "maxGraphemes": 64
+        },
+        "chatDisabled": {
+          "type": "boolean",
+          "description": "Set to true when the actor cannot actively participate in conversations"
+        },
+        "verification": {
+          "ref": "app.bsky.actor.defs#verificationState",
+          "type": "ref"
+        }
+      }
+    },
+    "directConvoMember": {
+      "type": "object",
+      "properties": {}
+    },
+    "pastGroupConvoMember": {
+      "type": "object",
+      "required": [],
+      "properties": {},
+      "description": "A past group convo member."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/chat/bsky/actor/deleteAccount.json b/lexicons/chat/bsky/actor/deleteAccount.json
new file mode 100644
index 0000000000..f8955411db
--- /dev/null
+++ b/lexicons/chat/bsky/actor/deleteAccount.json
@@ -0,0 +1,17 @@
+{
+  "id": "chat.bsky.actor.deleteAccount",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "output": {
+        "schema": {
+          "type": "object",
+          "properties": {}
+        },
+        "encoding": "application/json"
+      }
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/chat/bsky/actor/exportAccountData.json b/lexicons/chat/bsky/actor/exportAccountData.json
new file mode 100644
index 0000000000..dd8b9bfdda
--- /dev/null
+++ b/lexicons/chat/bsky/actor/exportAccountData.json
@@ -0,0 +1,13 @@
+{
+  "id": "chat.bsky.actor.exportAccountData",
+  "defs": {
+    "main": {
+      "type": "query",
+      "output": {
+        "encoding": "application/jsonl"
+      }
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/chat/bsky/actor/getStatus.json b/lexicons/chat/bsky/actor/getStatus.json
new file mode 100644
index 0000000000..4e1311a97b
--- /dev/null
+++ b/lexicons/chat/bsky/actor/getStatus.json
@@ -0,0 +1,36 @@
+{
+  "id": "chat.bsky.actor.getStatus",
+  "defs": {
+    "main": {
+      "type": "query",
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "chatDisabled",
+            "canCreateGroups",
+            "groupMemberLimit"
+          ],
+          "properties": {
+            "chatDisabled": {
+              "type": "boolean",
+              "description": "True when the viewer's account is disabled and cannot actively participate in chat."
+            },
+            "canCreateGroups": {
+              "type": "boolean",
+              "description": "Whether the viewer's account is allowed to create group chats. New accounts are restricted from creating groups."
+            },
+            "groupMemberLimit": {
+              "type": "integer",
+              "description": "The maximum number of members allowed in a group conversation."
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "description": "Get the authenticated viewer's chat status: whether their account is chat-disabled and whether their group-membership additions are restricted to accounts they follow."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/chat/bsky/convo/acceptConvo.json b/lexicons/chat/bsky/convo/acceptConvo.json
new file mode 100644
index 0000000000..bafc162b11
--- /dev/null
+++ b/lexicons/chat/bsky/convo/acceptConvo.json
@@ -0,0 +1,42 @@
+{
+  "id": "chat.bsky.convo.acceptConvo",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "input": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "convoId"
+          ],
+          "properties": {
+            "convoId": {
+              "type": "string"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "errors": [
+        {
+          "name": "InvalidConvo"
+        }
+      ],
+      "output": {
+        "schema": {
+          "type": "object",
+          "properties": {
+            "rev": {
+              "type": "string",
+              "description": "Rev when the convo was accepted. If not present, the convo was already accepted."
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "description": "Marks a conversation as accepted, so it is shown in the list of accepted convos instead on the request convos."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/chat/bsky/convo/addReaction.json b/lexicons/chat/bsky/convo/addReaction.json
new file mode 100644
index 0000000000..7f317c84a9
--- /dev/null
+++ b/lexicons/chat/bsky/convo/addReaction.json
@@ -0,0 +1,73 @@
+{
+  "id": "chat.bsky.convo.addReaction",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "input": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "convoId",
+            "messageId",
+            "value"
+          ],
+          "properties": {
+            "value": {
+              "type": "string",
+              "maxLength": 64,
+              "minLength": 1,
+              "maxGraphemes": 1,
+              "minGraphemes": 1
+            },
+            "convoId": {
+              "type": "string"
+            },
+            "messageId": {
+              "type": "string"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "errors": [
+        {
+          "name": "InvalidConvo"
+        },
+        {
+          "name": "ReactionNotAllowed",
+          "description": "Indicates that reactions are not allowed on this message, e.g. because it is a system message."
+        },
+        {
+          "name": "ReactionMessageDeleted",
+          "description": "Indicates that the message has been deleted and reactions can no longer be added/removed."
+        },
+        {
+          "name": "ReactionLimitReached",
+          "description": "Indicates that the message has the maximum number of reactions allowed for a single user, and the requested reaction wasn't yet present. If it was already present, the request will not fail since it is idempotent."
+        },
+        {
+          "name": "ReactionInvalidValue",
+          "description": "Indicates the value for the reaction is not acceptable. In general, this means it is not an emoji."
+        }
+      ],
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "message"
+          ],
+          "properties": {
+            "message": {
+              "ref": "chat.bsky.convo.defs#messageView",
+              "type": "ref"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "description": "Adds an emoji reaction to a message. Requires authentication. It is idempotent, so multiple calls from the same user with the same emoji result in a single reaction."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/chat/bsky/convo/defs.json b/lexicons/chat/bsky/convo/defs.json
new file mode 100644
index 0000000000..eecef5ac5c
--- /dev/null
+++ b/lexicons/chat/bsky/convo/defs.json
@@ -0,0 +1,1312 @@
+{
+  "id": "chat.bsky.convo.defs",
+  "defs": {
+    "convoRef": {
+      "type": "object",
+      "required": [
+        "did",
+        "convoId"
+      ],
+      "properties": {
+        "did": {
+          "type": "string",
+          "format": "did"
+        },
+        "convoId": {
+          "type": "string"
+        }
+      }
+    },
+    "replyRef": {
+      "type": "object",
+      "required": [
+        "messageId"
+      ],
+      "properties": {
+        "messageId": {
+          "type": "string"
+        }
+      },
+      "description": "A reference to another message within the same convo, used to indicate that a message is a reply to it."
+    },
+    "convoKind": {
+      "type": "string",
+      "knownValues": [
+        "direct",
+        "group"
+      ]
+    },
+    "convoView": {
+      "type": "object",
+      "required": [
+        "id",
+        "rev",
+        "members",
+        "muted",
+        "unreadCount"
+      ],
+      "properties": {
+        "id": {
+          "type": "string"
+        },
+        "rev": {
+          "type": "string"
+        },
+        "kind": {
+          "refs": [
+            "#directConvo",
+            "#groupConvo"
+          ],
+          "type": "union",
+          "description": "Union field that has data specific to different kinds of convos."
+        },
+        "muted": {
+          "type": "boolean"
+        },
+        "status": {
+          "ref": "#convoStatus",
+          "type": "ref",
+          "description": "Convo status for the viewer member (not the convo itself)."
+        },
+        "members": {
+          "type": "array",
+          "items": {
+            "ref": "chat.bsky.actor.defs#profileViewBasic",
+            "type": "ref"
+          },
+          "description": "Members of this conversation. For direct convos, it will be an immutable list of the 2 members. For group convos, it will a list of important members (the first few members, the viewer, the member who added the viewer, the member who sent the last message, the member who sent the last reaction), but will not contain the full list of members. Use chat.bsky.convo.getConvoMembers to list all members."
+        },
+        "lastMessage": {
+          "refs": [
+            "#messageView",
+            "#deletedMessageView",
+            "#systemMessageView"
+          ],
+          "type": "union"
+        },
+        "unreadCount": {
+          "type": "integer"
+        },
+        "lastReaction": {
+          "refs": [
+            "#messageAndReactionView"
+          ],
+          "type": "union"
+        }
+      }
+    },
+    "groupConvo": {
+      "type": "object",
+      "required": [
+        "createdAt",
+        "lockStatus",
+        "lockStatusModerationOverride",
+        "memberCount",
+        "memberLimit",
+        "name"
+      ],
+      "properties": {
+        "name": {
+          "type": "string",
+          "maxLength": 500,
+          "description": "The display name of the group conversation.",
+          "maxGraphemes": 50
+        },
+        "joinLink": {
+          "ref": "chat.bsky.group.defs#joinLinkView",
+          "type": "ref"
+        },
+        "createdAt": {
+          "type": "string",
+          "format": "datetime"
+        },
+        "lockStatus": {
+          "ref": "#convoLockStatus",
+          "type": "ref",
+          "description": "The lock status of the conversation."
+        },
+        "memberCount": {
+          "type": "integer",
+          "description": "The total number of members in the group conversation."
+        },
+        "memberLimit": {
+          "type": "integer",
+          "description": "The maximum number of members allowed in the group conversation."
+        },
+        "joinRequestCount": {
+          "type": "integer",
+          "description": "The total number of pending join requests for the group conversation. Only present for the owner. Capped at 21."
+        },
+        "unreadJoinRequestCount": {
+          "type": "integer",
+          "description": "The number of unread join requests for the group conversation. Only present for the owner."
+        },
+        "lockStatusModerationOverride": {
+          "type": "boolean",
+          "description": "Whether the lock status is being forced by a moderation override (account inactivation or convo takedown) rather than the owner's own setting."
+        }
+      }
+    },
+    "messageRef": {
+      "type": "object",
+      "required": [
+        "did",
+        "messageId",
+        "convoId"
+      ],
+      "properties": {
+        "did": {
+          "type": "string",
+          "format": "did"
+        },
+        "convoId": {
+          "type": "string"
+        },
+        "messageId": {
+          "type": "string"
+        }
+      }
+    },
+    "convoStatus": {
+      "type": "string",
+      "knownValues": [
+        "request",
+        "accepted"
+      ]
+    },
+    "directConvo": {
+      "type": "object",
+      "properties": {}
+    },
+    "messageView": {
+      "type": "object",
+      "required": [
+        "id",
+        "rev",
+        "text",
+        "sender",
+        "sentAt"
+      ],
+      "properties": {
+        "id": {
+          "type": "string"
+        },
+        "rev": {
+          "type": "string"
+        },
+        "text": {
+          "type": "string",
+          "maxLength": 10000,
+          "maxGraphemes": 1000
+        },
+        "embed": {
+          "refs": [
+            "app.bsky.embed.record#view",
+            "chat.bsky.embed.joinLink#view"
+          ],
+          "type": "union"
+        },
+        "facets": {
+          "type": "array",
+          "items": {
+            "ref": "app.bsky.richtext.facet",
+            "type": "ref"
+          },
+          "description": "Annotations of text (mentions, URLs, hashtags, etc)"
+        },
+        "sender": {
+          "ref": "#messageViewSender",
+          "type": "ref"
+        },
+        "sentAt": {
+          "type": "string",
+          "format": "datetime"
+        },
+        "replyTo": {
+          "refs": [
+            "#messageView",
+            "#deletedMessageView",
+            "#messageBeforeUserJoinedGroupView"
+          ],
+          "type": "union",
+          "description": "If set, the message this message is replying to. The full view of the referenced message is embedded so the client can render it inline. Only a single level is embedded: the embedded message will not itself have a populated 'replyTo' field even if it was also a reply."
+        },
+        "reactions": {
+          "type": "array",
+          "items": {
+            "ref": "#reactionView",
+            "type": "ref"
+          },
+          "description": "Reactions to this message, in ascending order of creation time."
+        }
+      }
+    },
+    "logAddMember": {
+      "type": "object",
+      "required": [
+        "rev",
+        "convoId",
+        "message",
+        "relatedProfiles"
+      ],
+      "properties": {
+        "rev": {
+          "type": "string"
+        },
+        "convoId": {
+          "type": "string"
+        },
+        "message": {
+          "ref": "#systemMessageView",
+          "type": "ref",
+          "description": "A system message with data of type #systemMessageDataAddMember"
+        },
+        "relatedProfiles": {
+          "type": "array",
+          "items": {
+            "ref": "chat.bsky.actor.defs#profileViewBasic",
+            "type": "ref"
+          },
+          "description": "Profiles referred in the system message."
+        }
+      },
+      "description": "Event indicating a member was added to a group convo. The member who was added gets a logBeginConvo (to create the convo) but also a logAddMember (to show the system message as the first message the user sees)."
+    },
+    "logEditGroup": {
+      "type": "object",
+      "required": [
+        "rev",
+        "convoId",
+        "message"
+      ],
+      "properties": {
+        "rev": {
+          "type": "string"
+        },
+        "convoId": {
+          "type": "string"
+        },
+        "message": {
+          "ref": "#systemMessageView",
+          "type": "ref",
+          "description": "A system message with data of type #systemMessageDataEditGroup"
+        }
+      },
+      "description": "Event indicating info about group convo was edited."
+    },
+    "logLockConvo": {
+      "type": "object",
+      "required": [
+        "rev",
+        "convoId",
+        "message",
+        "relatedProfiles"
+      ],
+      "properties": {
+        "rev": {
+          "type": "string"
+        },
+        "convoId": {
+          "type": "string"
+        },
+        "message": {
+          "ref": "#systemMessageView",
+          "type": "ref",
+          "description": "A system message with data of type #systemMessageDataLockConvo"
+        },
+        "relatedProfiles": {
+          "type": "array",
+          "items": {
+            "ref": "chat.bsky.actor.defs#profileViewBasic",
+            "type": "ref"
+          },
+          "description": "Profiles referred in the system message."
+        }
+      },
+      "description": "Event indicating a group convo was locked."
+    },
+    "logMuteConvo": {
+      "type": "object",
+      "required": [
+        "rev",
+        "convoId"
+      ],
+      "properties": {
+        "rev": {
+          "type": "string"
+        },
+        "convoId": {
+          "type": "string"
+        }
+      },
+      "description": "Event indicating the viewer muted a convo. Can be direct or group."
+    },
+    "logReadConvo": {
+      "type": "object",
+      "required": [
+        "rev",
+        "convoId",
+        "message"
+      ],
+      "properties": {
+        "rev": {
+          "type": "string"
+        },
+        "convoId": {
+          "type": "string"
+        },
+        "message": {
+          "refs": [
+            "#messageView",
+            "#deletedMessageView",
+            "#systemMessageView"
+          ],
+          "type": "union"
+        }
+      },
+      "description": "Event indicating a convo was read up to a certain message."
+    },
+    "messageInput": {
+      "type": "object",
+      "required": [
+        "text"
+      ],
+      "properties": {
+        "text": {
+          "type": "string",
+          "maxLength": 10000,
+          "maxGraphemes": 1000
+        },
+        "embed": {
+          "refs": [
+            "app.bsky.embed.record",
+            "chat.bsky.embed.joinLink"
+          ],
+          "type": "union"
+        },
+        "facets": {
+          "type": "array",
+          "items": {
+            "ref": "app.bsky.richtext.facet",
+            "type": "ref"
+          },
+          "description": "Annotations of text (mentions, URLs, hashtags, etc)"
+        },
+        "replyTo": {
+          "ref": "#replyRef",
+          "type": "ref",
+          "description": "If set, the message this message is replying to. The referenced message must be in the same convo."
+        }
+      }
+    },
+    "reactionView": {
+      "type": "object",
+      "required": [
+        "value",
+        "sender",
+        "createdAt"
+      ],
+      "properties": {
+        "value": {
+          "type": "string"
+        },
+        "sender": {
+          "ref": "#reactionViewSender",
+          "type": "ref"
+        },
+        "createdAt": {
+          "type": "string",
+          "format": "datetime"
+        }
+      }
+    },
+    "logBeginConvo": {
+      "type": "object",
+      "required": [
+        "rev",
+        "convoId"
+      ],
+      "properties": {
+        "rev": {
+          "type": "string"
+        },
+        "convoId": {
+          "type": "string"
+        }
+      },
+      "description": "Event indicating a convo containing the viewer was started. Can be direct or group. When a member is added to a group convo, they also get this event."
+    },
+    "logLeaveConvo": {
+      "type": "object",
+      "required": [
+        "rev",
+        "convoId"
+      ],
+      "properties": {
+        "rev": {
+          "type": "string"
+        },
+        "convoId": {
+          "type": "string"
+        }
+      },
+      "description": "Event indicating the viewer left a convo. Can be direct or group."
+    },
+    "logMemberJoin": {
+      "type": "object",
+      "required": [
+        "rev",
+        "convoId",
+        "message",
+        "relatedProfiles"
+      ],
+      "properties": {
+        "rev": {
+          "type": "string"
+        },
+        "convoId": {
+          "type": "string"
+        },
+        "message": {
+          "ref": "#systemMessageView",
+          "type": "ref",
+          "description": "A system message with data of type #systemMessageDataMemberJoin"
+        },
+        "relatedProfiles": {
+          "type": "array",
+          "items": {
+            "ref": "chat.bsky.actor.defs#profileViewBasic",
+            "type": "ref"
+          },
+          "description": "Profiles referred in the system message."
+        }
+      },
+      "description": "Event indicating a member joined a group convo via join link. The member who was added gets a logBeginConvo (to create the convo) but also a logMemberJoin (to show the system message as the first message the user sees)."
+    },
+    "logAcceptConvo": {
+      "type": "object",
+      "required": [
+        "rev",
+        "convoId"
+      ],
+      "properties": {
+        "rev": {
+          "type": "string"
+        },
+        "convoId": {
+          "type": "string"
+        }
+      },
+      "description": "Event indicating the viewer accepted a convo, and it can be moved out of the request inbox. Can be direct or group."
+    },
+    "logAddReaction": {
+      "type": "object",
+      "required": [
+        "rev",
+        "convoId",
+        "message",
+        "reaction"
+      ],
+      "properties": {
+        "rev": {
+          "type": "string"
+        },
+        "convoId": {
+          "type": "string"
+        },
+        "message": {
+          "refs": [
+            "#messageView",
+            "#deletedMessageView"
+          ],
+          "type": "union"
+        },
+        "reaction": {
+          "ref": "#reactionView",
+          "type": "ref"
+        },
+        "relatedProfiles": {
+          "type": "array",
+          "items": {
+            "ref": "chat.bsky.actor.defs#profileViewBasic",
+            "type": "ref"
+          },
+          "description": "Profiles referred in the message and reaction views. This isn't required for compatibility, because it was added later, but should generally be present."
+        }
+      },
+      "description": "Event indicating a reaction was added to a message."
+    },
+    "logMemberLeave": {
+      "type": "object",
+      "required": [
+        "rev",
+        "convoId",
+        "message",
+        "relatedProfiles"
+      ],
+      "properties": {
+        "rev": {
+          "type": "string"
+        },
+        "convoId": {
+          "type": "string"
+        },
+        "message": {
+          "ref": "#systemMessageView",
+          "type": "ref",
+          "description": "A system message with data of type #systemMessageDataMemberLeave"
+        },
+        "relatedProfiles": {
+          "type": "array",
+          "items": {
+            "ref": "chat.bsky.actor.defs#profileViewBasic",
+            "type": "ref"
+          },
+          "description": "Profiles referred in the system message."
+        }
+      },
+      "description": "Event indicating a member voluntarily left a group convo. The member who was removed gets a logLeaveConvo (to leave the convo) but not a logMemberLeave (because they already left, so can't see the system message)."
+    },
+    "logReadMessage": {
+      "type": "object",
+      "required": [
+        "rev",
+        "convoId",
+        "message"
+      ],
+      "properties": {
+        "rev": {
+          "type": "string"
+        },
+        "convoId": {
+          "type": "string"
+        },
+        "message": {
+          "refs": [
+            "#messageView",
+            "#deletedMessageView",
+            "#systemMessageView"
+          ],
+          "type": "union"
+        }
+      },
+      "description": "DEPRECATED: use logReadConvo instead. Event indicating a convo was read up to a certain message."
+    },
+    "logUnlockConvo": {
+      "type": "object",
+      "required": [
+        "rev",
+        "convoId",
+        "message",
+        "relatedProfiles"
+      ],
+      "properties": {
+        "rev": {
+          "type": "string"
+        },
+        "convoId": {
+          "type": "string"
+        },
+        "message": {
+          "ref": "#systemMessageView",
+          "type": "ref",
+          "description": "A system message with data of type #systemMessageDataUnlockConvo"
+        },
+        "relatedProfiles": {
+          "type": "array",
+          "items": {
+            "ref": "chat.bsky.actor.defs#profileViewBasic",
+            "type": "ref"
+          },
+          "description": "Profiles referred in the system message."
+        }
+      },
+      "description": "Event indicating a group convo was unlocked."
+    },
+    "logUnmuteConvo": {
+      "type": "object",
+      "required": [
+        "rev",
+        "convoId"
+      ],
+      "properties": {
+        "rev": {
+          "type": "string"
+        },
+        "convoId": {
+          "type": "string"
+        }
+      },
+      "description": "Event indicating the viewer unmuted a convo. Can be direct or group."
+    },
+    "convoLockStatus": {
+      "type": "string",
+      "knownValues": [
+        "unlocked",
+        "locked",
+        "locked-permanently"
+      ]
+    },
+    "logEditJoinLink": {
+      "type": "object",
+      "required": [
+        "rev",
+        "convoId",
+        "message"
+      ],
+      "properties": {
+        "rev": {
+          "type": "string"
+        },
+        "convoId": {
+          "type": "string"
+        },
+        "message": {
+          "ref": "#systemMessageView",
+          "type": "ref",
+          "description": "A system message with data of type #systemMessageDataEditJoinLink"
+        }
+      },
+      "description": "Event indicating a settings about a join link for a group convo were edited."
+    },
+    "logRemoveMember": {
+      "type": "object",
+      "required": [
+        "rev",
+        "convoId",
+        "message",
+        "relatedProfiles"
+      ],
+      "properties": {
+        "rev": {
+          "type": "string"
+        },
+        "convoId": {
+          "type": "string"
+        },
+        "message": {
+          "ref": "#systemMessageView",
+          "type": "ref",
+          "description": "A system message with data of type #systemMessageDataRemoveMember"
+        },
+        "relatedProfiles": {
+          "type": "array",
+          "items": {
+            "ref": "chat.bsky.actor.defs#profileViewBasic",
+            "type": "ref"
+          },
+          "description": "Profiles referred in the system message."
+        }
+      },
+      "description": "Event indicating a member was removed from a group convo. The member who was removed gets a logLeaveConvo (to leave the convo) but not a logRemoveMember (because they already left, so can't see the system message)."
+    },
+    "logCreateMessage": {
+      "type": "object",
+      "required": [
+        "rev",
+        "convoId",
+        "message"
+      ],
+      "properties": {
+        "rev": {
+          "type": "string"
+        },
+        "convoId": {
+          "type": "string"
+        },
+        "message": {
+          "refs": [
+            "#messageView",
+            "#deletedMessageView"
+          ],
+          "type": "union"
+        },
+        "relatedProfiles": {
+          "type": "array",
+          "items": {
+            "ref": "chat.bsky.actor.defs#profileViewBasic",
+            "type": "ref"
+          },
+          "description": "Profiles referred to in the message view. This isn't required for compatibility, because it was added later, but should generally be present."
+        }
+      },
+      "description": "Event indicating a user-originated message was created. Is not emitted for system messages."
+    },
+    "logDeleteMessage": {
+      "type": "object",
+      "required": [
+        "rev",
+        "convoId",
+        "message"
+      ],
+      "properties": {
+        "rev": {
+          "type": "string"
+        },
+        "convoId": {
+          "type": "string"
+        },
+        "message": {
+          "refs": [
+            "#messageView",
+            "#deletedMessageView"
+          ],
+          "type": "union"
+        }
+      },
+      "description": "Event indicating a user-originated message was deleted. Is not emitted for system messages."
+    },
+    "logCreateJoinLink": {
+      "type": "object",
+      "required": [
+        "rev",
+        "convoId",
+        "message"
+      ],
+      "properties": {
+        "rev": {
+          "type": "string"
+        },
+        "convoId": {
+          "type": "string"
+        },
+        "message": {
+          "ref": "#systemMessageView",
+          "type": "ref",
+          "description": "A system message with data of type #systemMessageDataCreateJoinLink"
+        }
+      },
+      "description": "Event indicating a join link was created for a group convo."
+    },
+    "logEnableJoinLink": {
+      "type": "object",
+      "required": [
+        "rev",
+        "convoId",
+        "message"
+      ],
+      "properties": {
+        "rev": {
+          "type": "string"
+        },
+        "convoId": {
+          "type": "string"
+        },
+        "message": {
+          "ref": "#systemMessageView",
+          "type": "ref",
+          "description": "A system message with data of type #systemMessageDataEnableJoinLink"
+        }
+      },
+      "description": "Event indicating a join link was enabled for a group convo."
+    },
+    "logRemoveReaction": {
+      "type": "object",
+      "required": [
+        "rev",
+        "convoId",
+        "message",
+        "reaction"
+      ],
+      "properties": {
+        "rev": {
+          "type": "string"
+        },
+        "convoId": {
+          "type": "string"
+        },
+        "message": {
+          "refs": [
+            "#messageView",
+            "#deletedMessageView"
+          ],
+          "type": "union"
+        },
+        "reaction": {
+          "ref": "#reactionView",
+          "type": "ref"
+        },
+        "relatedProfiles": {
+          "type": "array",
+          "items": {
+            "ref": "chat.bsky.actor.defs#profileViewBasic",
+            "type": "ref"
+          },
+          "description": "Profiles referred in the message and reaction views. This isn't required for compatibility, because it was added later, but should generally be present."
+        }
+      },
+      "description": "Event indicating a reaction was removed from a message."
+    },
+    "messageViewSender": {
+      "type": "object",
+      "required": [
+        "did"
+      ],
+      "properties": {
+        "did": {
+          "type": "string",
+          "format": "did"
+        }
+      }
+    },
+    "systemMessageView": {
+      "type": "object",
+      "required": [
+        "id",
+        "rev",
+        "sentAt",
+        "data"
+      ],
+      "properties": {
+        "id": {
+          "type": "string"
+        },
+        "rev": {
+          "type": "string"
+        },
+        "data": {
+          "refs": [
+            "#systemMessageDataAddMember",
+            "#systemMessageDataRemoveMember",
+            "#systemMessageDataMemberJoin",
+            "#systemMessageDataMemberLeave",
+            "#systemMessageDataLockConvo",
+            "#systemMessageDataUnlockConvo",
+            "#systemMessageDataLockConvoPermanently",
+            "#systemMessageDataEditGroup",
+            "#systemMessageDataCreateJoinLink",
+            "#systemMessageDataEditJoinLink",
+            "#systemMessageDataEnableJoinLink",
+            "#systemMessageDataDisableJoinLink"
+          ],
+          "type": "union"
+        },
+        "sentAt": {
+          "type": "string",
+          "format": "datetime"
+        }
+      }
+    },
+    "deletedMessageView": {
+      "type": "object",
+      "required": [
+        "id",
+        "rev",
+        "sender",
+        "sentAt"
+      ],
+      "properties": {
+        "id": {
+          "type": "string"
+        },
+        "rev": {
+          "type": "string"
+        },
+        "sender": {
+          "ref": "#messageViewSender",
+          "type": "ref"
+        },
+        "sentAt": {
+          "type": "string",
+          "format": "datetime"
+        }
+      }
+    },
+    "logDisableJoinLink": {
+      "type": "object",
+      "required": [
+        "rev",
+        "convoId",
+        "message"
+      ],
+      "properties": {
+        "rev": {
+          "type": "string"
+        },
+        "convoId": {
+          "type": "string"
+        },
+        "message": {
+          "ref": "#systemMessageView",
+          "type": "ref",
+          "description": "A system message with data of type #systemMessageDataDisableJoinLink"
+        }
+      },
+      "description": "Event indicating a join link was disabled for a group convo."
+    },
+    "reactionViewSender": {
+      "type": "object",
+      "required": [
+        "did"
+      ],
+      "properties": {
+        "did": {
+          "type": "string",
+          "format": "did"
+        }
+      }
+    },
+    "logReadJoinRequests": {
+      "type": "object",
+      "required": [
+        "rev",
+        "convoId"
+      ],
+      "properties": {
+        "rev": {
+          "type": "string"
+        },
+        "convoId": {
+          "type": "string"
+        }
+      },
+      "description": "Event indicating the group owner marked join requests as read. Only the owner gets this."
+    },
+    "logRejectJoinRequest": {
+      "type": "object",
+      "required": [
+        "rev",
+        "convoId",
+        "member"
+      ],
+      "properties": {
+        "rev": {
+          "type": "string"
+        },
+        "member": {
+          "ref": "chat.bsky.actor.defs#profileViewBasic",
+          "type": "ref",
+          "description": "Prospective member who requested to join."
+        },
+        "convoId": {
+          "type": "string"
+        }
+      },
+      "description": "Event indicating a join request was rejected by the viewer. Only the owner gets this."
+    },
+    "logApproveJoinRequest": {
+      "type": "object",
+      "required": [
+        "rev",
+        "convoId",
+        "member"
+      ],
+      "properties": {
+        "rev": {
+          "type": "string"
+        },
+        "member": {
+          "ref": "chat.bsky.actor.defs#profileViewBasic",
+          "type": "ref",
+          "description": "Prospective member who requested to join."
+        },
+        "convoId": {
+          "type": "string"
+        }
+      },
+      "description": "Event indicating a join request was approved by the viewer. Only the owner gets this. The approved member gets a logBeginConvo."
+    },
+    "logIncomingJoinRequest": {
+      "type": "object",
+      "required": [
+        "rev",
+        "convoId",
+        "member"
+      ],
+      "properties": {
+        "rev": {
+          "type": "string"
+        },
+        "member": {
+          "ref": "chat.bsky.actor.defs#profileViewBasic",
+          "type": "ref",
+          "description": "Prospective member who requested to join."
+        },
+        "convoId": {
+          "type": "string"
+        }
+      },
+      "description": "Event indicating a join request was made to a group the viewer owns. Only the owner gets this."
+    },
+    "logOutgoingJoinRequest": {
+      "type": "object",
+      "required": [
+        "rev",
+        "convoId"
+      ],
+      "properties": {
+        "rev": {
+          "type": "string"
+        },
+        "convoId": {
+          "type": "string"
+        }
+      },
+      "description": "Event indicating a join request was made by the requester. Only requester actor gets this."
+    },
+    "messageAndReactionView": {
+      "type": "object",
+      "required": [
+        "message",
+        "reaction"
+      ],
+      "properties": {
+        "message": {
+          "ref": "#messageView",
+          "type": "ref"
+        },
+        "reaction": {
+          "ref": "#reactionView",
+          "type": "ref"
+        }
+      }
+    },
+    "logLockConvoPermanently": {
+      "type": "object",
+      "required": [
+        "rev",
+        "convoId",
+        "message",
+        "relatedProfiles"
+      ],
+      "properties": {
+        "rev": {
+          "type": "string"
+        },
+        "convoId": {
+          "type": "string"
+        },
+        "message": {
+          "ref": "#systemMessageView",
+          "type": "ref",
+          "description": "A system message with data of type #systemMessageDataLockConvoPermanently"
+        },
+        "relatedProfiles": {
+          "type": "array",
+          "items": {
+            "ref": "chat.bsky.actor.defs#profileViewBasic",
+            "type": "ref"
+          },
+          "description": "Profiles referred in the system message."
+        }
+      },
+      "description": "Event indicating a group convo was locked permanently."
+    },
+    "systemMessageReferredUser": {
+      "type": "object",
+      "required": [
+        "did"
+      ],
+      "properties": {
+        "did": {
+          "type": "string",
+          "format": "did"
+        }
+      }
+    },
+    "systemMessageDataAddMember": {
+      "type": "object",
+      "required": [
+        "member",
+        "role",
+        "addedBy"
+      ],
+      "properties": {
+        "role": {
+          "ref": "chat.bsky.actor.defs#memberRole",
+          "type": "ref",
+          "description": "Role the user was added to the group with. The role from 'member' will reflect the current data, not historical."
+        },
+        "member": {
+          "ref": "#systemMessageReferredUser",
+          "type": "ref",
+          "description": "Current view of the member who was added."
+        },
+        "addedBy": {
+          "ref": "#systemMessageReferredUser",
+          "type": "ref"
+        }
+      },
+      "description": "System message indicating a user was added to the group convo."
+    },
+    "systemMessageDataEditGroup": {
+      "type": "object",
+      "properties": {
+        "newName": {
+          "type": "string",
+          "description": "Group name that replaced the old."
+        },
+        "oldName": {
+          "type": "string",
+          "description": "Group name that was replaced."
+        }
+      },
+      "description": "System message indicating the group info was edited."
+    },
+    "systemMessageDataLockConvo": {
+      "type": "object",
+      "required": [
+        "lockedBy"
+      ],
+      "properties": {
+        "lockedBy": {
+          "ref": "#systemMessageReferredUser",
+          "type": "ref",
+          "description": "Current view of the member who locked the group."
+        }
+      },
+      "description": "System message indicating the group convo was locked."
+    },
+    "systemMessageDataMemberJoin": {
+      "type": "object",
+      "required": [
+        "member",
+        "role"
+      ],
+      "properties": {
+        "role": {
+          "ref": "chat.bsky.actor.defs#memberRole",
+          "type": "ref",
+          "description": "Role the user was added to the group with. The role from 'member' will reflect the current data, not historical."
+        },
+        "member": {
+          "ref": "#systemMessageReferredUser",
+          "type": "ref",
+          "description": "Current view of the member who joined."
+        },
+        "approvedBy": {
+          "ref": "#systemMessageReferredUser",
+          "type": "ref",
+          "description": "If join link was configured to require approval, this will be set to who approved the request. Undefined if approval was not required."
+        }
+      },
+      "description": "System message indicating a user joined the group convo via join link."
+    },
+    "systemMessageDataMemberLeave": {
+      "type": "object",
+      "required": [
+        "member"
+      ],
+      "properties": {
+        "member": {
+          "ref": "#systemMessageReferredUser",
+          "type": "ref",
+          "description": "Current view of the member who left the group."
+        }
+      },
+      "description": "System message indicating a user voluntarily left the group convo."
+    },
+    "systemMessageDataUnlockConvo": {
+      "type": "object",
+      "required": [
+        "unlockedBy"
+      ],
+      "properties": {
+        "unlockedBy": {
+          "ref": "#systemMessageReferredUser",
+          "type": "ref",
+          "description": "Current view of the member who unlocked the group."
+        }
+      },
+      "description": "System message indicating the group convo was unlocked."
+    },
+    "systemMessageDataEditJoinLink": {
+      "type": "object",
+      "properties": {},
+      "description": "System message indicating the group join link was edited."
+    },
+    "systemMessageDataRemoveMember": {
+      "type": "object",
+      "required": [
+        "member",
+        "removedBy"
+      ],
+      "properties": {
+        "member": {
+          "ref": "#systemMessageReferredUser",
+          "type": "ref",
+          "description": "Current view of the member who was removed."
+        },
+        "removedBy": {
+          "ref": "#systemMessageReferredUser",
+          "type": "ref"
+        }
+      },
+      "description": "System message indicating a user was removed from the group convo."
+    },
+    "logWithdrawIncomingJoinRequest": {
+      "type": "object",
+      "required": [
+        "rev",
+        "convoId",
+        "member"
+      ],
+      "properties": {
+        "rev": {
+          "type": "string"
+        },
+        "member": {
+          "ref": "chat.bsky.actor.defs#profileViewBasic",
+          "type": "ref",
+          "description": "Prospective member who withdrew their join request."
+        },
+        "convoId": {
+          "type": "string"
+        }
+      },
+      "description": "Event indicating a prospective member withdrew their join request. Only the owner gets this."
+    },
+    "logWithdrawOutgoingJoinRequest": {
+      "type": "object",
+      "required": [
+        "rev",
+        "convoId"
+      ],
+      "properties": {
+        "rev": {
+          "type": "string"
+        },
+        "convoId": {
+          "type": "string"
+        }
+      },
+      "description": "Event indicating the viewer withdrew their own join request. Only requester actor gets this."
+    },
+    "systemMessageDataCreateJoinLink": {
+      "type": "object",
+      "properties": {},
+      "description": "System message indicating the group join link was created."
+    },
+    "systemMessageDataEnableJoinLink": {
+      "type": "object",
+      "properties": {},
+      "description": "System message indicating the group join link was enabled."
+    },
+    "messageBeforeUserJoinedGroupView": {
+      "type": "object",
+      "properties": {},
+      "description": "Placeholder embedded in place of a reply's parent message when that parent was sent before the viewer joined the group convo. The viewer has no access to that history, so no message data is carried."
+    },
+    "systemMessageDataDisableJoinLink": {
+      "type": "object",
+      "properties": {},
+      "description": "System message indicating the group join link was disabled."
+    },
+    "systemMessageDataLockConvoPermanently": {
+      "type": "object",
+      "required": [
+        "lockedBy"
+      ],
+      "properties": {
+        "lockedBy": {
+          "ref": "#systemMessageReferredUser",
+          "type": "ref",
+          "description": "Current view of the member who locked the group."
+        }
+      },
+      "description": "System message indicating the group convo was locked permanently."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/chat/bsky/convo/deleteMessageForSelf.json b/lexicons/chat/bsky/convo/deleteMessageForSelf.json
new file mode 100644
index 0000000000..39e4c109a0
--- /dev/null
+++ b/lexicons/chat/bsky/convo/deleteMessageForSelf.json
@@ -0,0 +1,45 @@
+{
+  "id": "chat.bsky.convo.deleteMessageForSelf",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "input": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "convoId",
+            "messageId"
+          ],
+          "properties": {
+            "convoId": {
+              "type": "string"
+            },
+            "messageId": {
+              "type": "string"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "errors": [
+        {
+          "name": "InvalidConvo"
+        },
+        {
+          "name": "MessageDeleteNotAllowed",
+          "description": "Indicates that this message cannot be deleted, e.g. because it is a system message."
+        }
+      ],
+      "output": {
+        "schema": {
+          "ref": "chat.bsky.convo.defs#deletedMessageView",
+          "type": "ref"
+        },
+        "encoding": "application/json"
+      },
+      "description": "Marks a message as deleted for the viewer, so they won't see that message in future enumerations."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/chat/bsky/convo/getConvo.json b/lexicons/chat/bsky/convo/getConvo.json
new file mode 100644
index 0000000000..cbe3b2684e
--- /dev/null
+++ b/lexicons/chat/bsky/convo/getConvo.json
@@ -0,0 +1,42 @@
+{
+  "id": "chat.bsky.convo.getConvo",
+  "defs": {
+    "main": {
+      "type": "query",
+      "errors": [
+        {
+          "name": "InvalidConvo"
+        }
+      ],
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "convo"
+          ],
+          "properties": {
+            "convo": {
+              "ref": "chat.bsky.convo.defs#convoView",
+              "type": "ref"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "parameters": {
+        "type": "params",
+        "required": [
+          "convoId"
+        ],
+        "properties": {
+          "convoId": {
+            "type": "string"
+          }
+        }
+      },
+      "description": "Gets an existing conversation by its ID."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/chat/bsky/convo/getConvoAvailability.json b/lexicons/chat/bsky/convo/getConvoAvailability.json
new file mode 100644
index 0000000000..37c3c745cf
--- /dev/null
+++ b/lexicons/chat/bsky/convo/getConvoAvailability.json
@@ -0,0 +1,46 @@
+{
+  "id": "chat.bsky.convo.getConvoAvailability",
+  "defs": {
+    "main": {
+      "type": "query",
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "canChat"
+          ],
+          "properties": {
+            "convo": {
+              "ref": "chat.bsky.convo.defs#convoView",
+              "type": "ref"
+            },
+            "canChat": {
+              "type": "boolean"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "parameters": {
+        "type": "params",
+        "required": [
+          "members"
+        ],
+        "properties": {
+          "members": {
+            "type": "array",
+            "items": {
+              "type": "string",
+              "format": "did"
+            },
+            "maxLength": 10,
+            "minLength": 1
+          }
+        }
+      },
+      "description": "Check whether the requester and the other members can start a 1-1 chat. Only applicable to direct (non-group) conversations. If an existing convo is found for these members, it is returned. Does not create a new convo if it doesn't exist."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/chat/bsky/convo/getConvoForMembers.json b/lexicons/chat/bsky/convo/getConvoForMembers.json
new file mode 100644
index 0000000000..21c12ead32
--- /dev/null
+++ b/lexicons/chat/bsky/convo/getConvoForMembers.json
@@ -0,0 +1,63 @@
+{
+  "id": "chat.bsky.convo.getConvoForMembers",
+  "defs": {
+    "main": {
+      "type": "query",
+      "errors": [
+        {
+          "name": "AccountSuspended"
+        },
+        {
+          "name": "BlockedActor"
+        },
+        {
+          "name": "BlockedSubject"
+        },
+        {
+          "name": "MessagesDisabled"
+        },
+        {
+          "name": "NotFollowedBySender"
+        },
+        {
+          "name": "RecipientNotFound"
+        }
+      ],
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "convo"
+          ],
+          "properties": {
+            "convo": {
+              "ref": "chat.bsky.convo.defs#convoView",
+              "type": "ref"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "parameters": {
+        "type": "params",
+        "required": [
+          "members"
+        ],
+        "properties": {
+          "members": {
+            "type": "array",
+            "items": {
+              "type": "string",
+              "format": "did"
+            },
+            "maxLength": 10,
+            "minLength": 1
+          }
+        }
+      },
+      "description": "Get or create a 1-1 conversation for the given members. Always returns the same direct (non-group) conversation. To create a group conversation, use createGroup."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/chat/bsky/convo/getConvoMembers.json b/lexicons/chat/bsky/convo/getConvoMembers.json
new file mode 100644
index 0000000000..0e89f0e916
--- /dev/null
+++ b/lexicons/chat/bsky/convo/getConvoMembers.json
@@ -0,0 +1,57 @@
+{
+  "id": "chat.bsky.convo.getConvoMembers",
+  "defs": {
+    "main": {
+      "type": "query",
+      "errors": [
+        {
+          "name": "InvalidConvo"
+        }
+      ],
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "members"
+          ],
+          "properties": {
+            "cursor": {
+              "type": "string"
+            },
+            "members": {
+              "type": "array",
+              "items": {
+                "ref": "chat.bsky.actor.defs#profileViewBasic",
+                "type": "ref"
+              }
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "parameters": {
+        "type": "params",
+        "required": [
+          "convoId"
+        ],
+        "properties": {
+          "limit": {
+            "type": "integer",
+            "default": 50,
+            "maximum": 100,
+            "minimum": 1
+          },
+          "cursor": {
+            "type": "string"
+          },
+          "convoId": {
+            "type": "string"
+          }
+        }
+      },
+      "description": "Returns a paginated list of members from a conversation."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/chat/bsky/convo/getLog.json b/lexicons/chat/bsky/convo/getLog.json
new file mode 100644
index 0000000000..42c738d46d
--- /dev/null
+++ b/lexicons/chat/bsky/convo/getLog.json
@@ -0,0 +1,71 @@
+{
+  "id": "chat.bsky.convo.getLog",
+  "defs": {
+    "main": {
+      "type": "query",
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "logs"
+          ],
+          "properties": {
+            "logs": {
+              "type": "array",
+              "items": {
+                "refs": [
+                  "chat.bsky.convo.defs#logBeginConvo",
+                  "chat.bsky.convo.defs#logAcceptConvo",
+                  "chat.bsky.convo.defs#logLeaveConvo",
+                  "chat.bsky.convo.defs#logMuteConvo",
+                  "chat.bsky.convo.defs#logUnmuteConvo",
+                  "chat.bsky.convo.defs#logCreateMessage",
+                  "chat.bsky.convo.defs#logDeleteMessage",
+                  "chat.bsky.convo.defs#logReadMessage",
+                  "chat.bsky.convo.defs#logAddReaction",
+                  "chat.bsky.convo.defs#logRemoveReaction",
+                  "chat.bsky.convo.defs#logReadConvo",
+                  "chat.bsky.convo.defs#logAddMember",
+                  "chat.bsky.convo.defs#logRemoveMember",
+                  "chat.bsky.convo.defs#logMemberJoin",
+                  "chat.bsky.convo.defs#logMemberLeave",
+                  "chat.bsky.convo.defs#logLockConvo",
+                  "chat.bsky.convo.defs#logUnlockConvo",
+                  "chat.bsky.convo.defs#logLockConvoPermanently",
+                  "chat.bsky.convo.defs#logEditGroup",
+                  "chat.bsky.convo.defs#logCreateJoinLink",
+                  "chat.bsky.convo.defs#logEditJoinLink",
+                  "chat.bsky.convo.defs#logEnableJoinLink",
+                  "chat.bsky.convo.defs#logDisableJoinLink",
+                  "chat.bsky.convo.defs#logIncomingJoinRequest",
+                  "chat.bsky.convo.defs#logApproveJoinRequest",
+                  "chat.bsky.convo.defs#logRejectJoinRequest",
+                  "chat.bsky.convo.defs#logOutgoingJoinRequest",
+                  "chat.bsky.convo.defs#logWithdrawIncomingJoinRequest",
+                  "chat.bsky.convo.defs#logWithdrawOutgoingJoinRequest",
+                  "chat.bsky.convo.defs#logReadJoinRequests"
+                ],
+                "type": "union"
+              }
+            },
+            "cursor": {
+              "type": "string"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "parameters": {
+        "type": "params",
+        "required": [],
+        "properties": {
+          "cursor": {
+            "type": "string"
+          }
+        }
+      }
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/chat/bsky/convo/getMessages.json b/lexicons/chat/bsky/convo/getMessages.json
new file mode 100644
index 0000000000..b157290de8
--- /dev/null
+++ b/lexicons/chat/bsky/convo/getMessages.json
@@ -0,0 +1,69 @@
+{
+  "id": "chat.bsky.convo.getMessages",
+  "defs": {
+    "main": {
+      "type": "query",
+      "errors": [
+        {
+          "name": "InvalidConvo"
+        }
+      ],
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "messages"
+          ],
+          "properties": {
+            "cursor": {
+              "type": "string"
+            },
+            "messages": {
+              "type": "array",
+              "items": {
+                "refs": [
+                  "chat.bsky.convo.defs#messageView",
+                  "chat.bsky.convo.defs#deletedMessageView",
+                  "chat.bsky.convo.defs#systemMessageView"
+                ],
+                "type": "union"
+              }
+            },
+            "relatedProfiles": {
+              "type": "array",
+              "items": {
+                "ref": "chat.bsky.actor.defs#profileViewBasic",
+                "type": "ref"
+              },
+              "description": "Set of all members who authored or reacted to the returned messages. Members referred to by system messages are also included."
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "parameters": {
+        "type": "params",
+        "required": [
+          "convoId"
+        ],
+        "properties": {
+          "limit": {
+            "type": "integer",
+            "default": 50,
+            "maximum": 100,
+            "minimum": 1
+          },
+          "cursor": {
+            "type": "string"
+          },
+          "convoId": {
+            "type": "string"
+          }
+        }
+      },
+      "description": "Returns a page of messages from a conversation."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/chat/bsky/convo/getUnreadCounts.json b/lexicons/chat/bsky/convo/getUnreadCounts.json
new file mode 100644
index 0000000000..ddfe955a2b
--- /dev/null
+++ b/lexicons/chat/bsky/convo/getUnreadCounts.json
@@ -0,0 +1,41 @@
+{
+  "id": "chat.bsky.convo.getUnreadCounts",
+  "defs": {
+    "main": {
+      "type": "query",
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "unreadAcceptedConvos",
+            "unreadRequestConvos"
+          ],
+          "properties": {
+            "unreadRequestConvos": {
+              "type": "integer",
+              "description": "Number of unread, unlocked request convos. Includes convos with unread messages, but not with unread join request, since only the owner of a group has join requests to read, and the group would necessarily be accepted. Capped at 100, where 100 means more than 99."
+            },
+            "unreadAcceptedConvos": {
+              "type": "integer",
+              "description": "Number of unread, unlocked accepted convos. Counts convos with unread messages and unread join requests. Capped at 100, where 100 means more than 99."
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "parameters": {
+        "type": "params",
+        "properties": {
+          "includeGroupChats": {
+            "type": "boolean",
+            "default": true,
+            "description": "When false, group convos are excluded from the counts."
+          }
+        }
+      },
+      "description": "Returns unread conversation counts for conversations that are unlocked, not muted, split by convo status. Direct convos are excluded when a block relationship exists between the actor and the other member, or when the other member's account is deleted or deactivated. Group convos are considered unread if they have unread join request counts."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/chat/bsky/convo/leaveConvo.json b/lexicons/chat/bsky/convo/leaveConvo.json
new file mode 100644
index 0000000000..b1e74ca2d2
--- /dev/null
+++ b/lexicons/chat/bsky/convo/leaveConvo.json
@@ -0,0 +1,52 @@
+{
+  "id": "chat.bsky.convo.leaveConvo",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "input": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "convoId"
+          ],
+          "properties": {
+            "convoId": {
+              "type": "string"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "errors": [
+        {
+          "name": "InvalidConvo"
+        },
+        {
+          "name": "OwnerCannotLeave",
+          "description": "The owner of a group conversation cannot leave before locking the group."
+        }
+      ],
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "convoId",
+            "rev"
+          ],
+          "properties": {
+            "rev": {
+              "type": "string"
+            },
+            "convoId": {
+              "type": "string"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "description": "Leaves a conversation (direct or group). For group, this effectively removes membership. For direct, membership is never removed, only changed to remove from enumerations by the user who left."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/chat/bsky/convo/listConvoRequests.json b/lexicons/chat/bsky/convo/listConvoRequests.json
new file mode 100644
index 0000000000..6be7fea5fc
--- /dev/null
+++ b/lexicons/chat/bsky/convo/listConvoRequests.json
@@ -0,0 +1,49 @@
+{
+  "id": "chat.bsky.convo.listConvoRequests",
+  "defs": {
+    "main": {
+      "type": "query",
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "requests"
+          ],
+          "properties": {
+            "cursor": {
+              "type": "string"
+            },
+            "requests": {
+              "type": "array",
+              "items": {
+                "refs": [
+                  "chat.bsky.convo.defs#convoView",
+                  "chat.bsky.group.defs#joinRequestConvoView"
+                ],
+                "type": "union"
+              }
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "parameters": {
+        "type": "params",
+        "properties": {
+          "limit": {
+            "type": "integer",
+            "default": 50,
+            "maximum": 100,
+            "minimum": 1
+          },
+          "cursor": {
+            "type": "string"
+          }
+        }
+      },
+      "description": "Returns a page of incoming conversation requests for the user. Direct convo requests are returned as convoView; group join requests made by the user are returned as joinRequestConvoView."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/chat/bsky/convo/listConvos.json b/lexicons/chat/bsky/convo/listConvos.json
new file mode 100644
index 0000000000..2ac41d00b3
--- /dev/null
+++ b/lexicons/chat/bsky/convo/listConvos.json
@@ -0,0 +1,77 @@
+{
+  "id": "chat.bsky.convo.listConvos",
+  "defs": {
+    "main": {
+      "type": "query",
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "convos"
+          ],
+          "properties": {
+            "convos": {
+              "type": "array",
+              "items": {
+                "ref": "chat.bsky.convo.defs#convoView",
+                "type": "ref"
+              }
+            },
+            "cursor": {
+              "type": "string"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "parameters": {
+        "type": "params",
+        "properties": {
+          "kind": {
+            "type": "string",
+            "description": "Filter by conversation kind.",
+            "knownValues": [
+              "direct",
+              "group"
+            ]
+          },
+          "limit": {
+            "type": "integer",
+            "default": 50,
+            "maximum": 100,
+            "minimum": 1
+          },
+          "cursor": {
+            "type": "string"
+          },
+          "status": {
+            "type": "string",
+            "description": "Filter convos by their status. It is discouraged to call with \"request\" and preferred to call chat.bsky.convo.listConvoRequests, which also includes group join requests made by the user.",
+            "knownValues": [
+              "request",
+              "accepted"
+            ]
+          },
+          "readState": {
+            "type": "string",
+            "knownValues": [
+              "unread"
+            ]
+          },
+          "lockStatus": {
+            "type": "string",
+            "description": "Filter by conversation lock status. Values follow chat.bsky.convo.defs#convoLockStatus.",
+            "knownValues": [
+              "unlocked",
+              "locked",
+              "locked-permanently"
+            ]
+          }
+        }
+      },
+      "description": "Returns a page of conversations (direct or group) for the user."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/chat/bsky/convo/lockConvo.json b/lexicons/chat/bsky/convo/lockConvo.json
new file mode 100644
index 0000000000..fb0177b0b6
--- /dev/null
+++ b/lexicons/chat/bsky/convo/lockConvo.json
@@ -0,0 +1,51 @@
+{
+  "id": "chat.bsky.convo.lockConvo",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "input": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "convoId"
+          ],
+          "properties": {
+            "convoId": {
+              "type": "string"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "errors": [
+        {
+          "name": "ConvoLocked"
+        },
+        {
+          "name": "InvalidConvo"
+        },
+        {
+          "name": "InsufficientRole"
+        }
+      ],
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "convo"
+          ],
+          "properties": {
+            "convo": {
+              "ref": "chat.bsky.convo.defs#convoView",
+              "type": "ref"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "description": "Locks a group convo so no more content (messages, reactions) can be added to it."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/chat/bsky/convo/muteConvo.json b/lexicons/chat/bsky/convo/muteConvo.json
new file mode 100644
index 0000000000..091136aaf6
--- /dev/null
+++ b/lexicons/chat/bsky/convo/muteConvo.json
@@ -0,0 +1,45 @@
+{
+  "id": "chat.bsky.convo.muteConvo",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "input": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "convoId"
+          ],
+          "properties": {
+            "convoId": {
+              "type": "string"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "errors": [
+        {
+          "name": "InvalidConvo"
+        }
+      ],
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "convo"
+          ],
+          "properties": {
+            "convo": {
+              "ref": "chat.bsky.convo.defs#convoView",
+              "type": "ref"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "description": "Mutes a conversation, preventing notifications related to it."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/chat/bsky/convo/removeReaction.json b/lexicons/chat/bsky/convo/removeReaction.json
new file mode 100644
index 0000000000..8bcdd28e21
--- /dev/null
+++ b/lexicons/chat/bsky/convo/removeReaction.json
@@ -0,0 +1,69 @@
+{
+  "id": "chat.bsky.convo.removeReaction",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "input": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "convoId",
+            "messageId",
+            "value"
+          ],
+          "properties": {
+            "value": {
+              "type": "string",
+              "maxLength": 64,
+              "minLength": 1,
+              "maxGraphemes": 1,
+              "minGraphemes": 1
+            },
+            "convoId": {
+              "type": "string"
+            },
+            "messageId": {
+              "type": "string"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "errors": [
+        {
+          "name": "InvalidConvo"
+        },
+        {
+          "name": "ReactionNotAllowed",
+          "description": "Indicates that reactions are not allowed on this message, e.g. because it is a system message."
+        },
+        {
+          "name": "ReactionMessageDeleted",
+          "description": "Indicates that the message has been deleted and reactions can no longer be added/removed."
+        },
+        {
+          "name": "ReactionInvalidValue",
+          "description": "Indicates the value for the reaction is not acceptable. In general, this means it is not an emoji."
+        }
+      ],
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "message"
+          ],
+          "properties": {
+            "message": {
+              "ref": "chat.bsky.convo.defs#messageView",
+              "type": "ref"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "description": "Removes an emoji reaction from a message. Requires authentication. It is idempotent, so multiple calls from the same user with the same emoji result in that reaction not being present, even if it already wasn't."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/chat/bsky/convo/sendMessage.json b/lexicons/chat/bsky/convo/sendMessage.json
new file mode 100644
index 0000000000..612bc292ca
--- /dev/null
+++ b/lexicons/chat/bsky/convo/sendMessage.json
@@ -0,0 +1,48 @@
+{
+  "id": "chat.bsky.convo.sendMessage",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "input": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "convoId",
+            "message"
+          ],
+          "properties": {
+            "convoId": {
+              "type": "string"
+            },
+            "message": {
+              "ref": "chat.bsky.convo.defs#messageInput",
+              "type": "ref"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "errors": [
+        {
+          "name": "ConvoLocked"
+        },
+        {
+          "name": "InvalidConvo"
+        },
+        {
+          "name": "ReplyTargetNotFound"
+        }
+      ],
+      "output": {
+        "schema": {
+          "ref": "chat.bsky.convo.defs#messageView",
+          "type": "ref"
+        },
+        "encoding": "application/json"
+      },
+      "description": "Sends a message to a conversation."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/chat/bsky/convo/sendMessageBatch.json b/lexicons/chat/bsky/convo/sendMessageBatch.json
new file mode 100644
index 0000000000..843443f167
--- /dev/null
+++ b/lexicons/chat/bsky/convo/sendMessageBatch.json
@@ -0,0 +1,75 @@
+{
+  "id": "chat.bsky.convo.sendMessageBatch",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "input": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "items"
+          ],
+          "properties": {
+            "items": {
+              "type": "array",
+              "items": {
+                "ref": "#batchItem",
+                "type": "ref"
+              },
+              "maxLength": 100
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "errors": [
+        {
+          "name": "ConvoLocked"
+        },
+        {
+          "name": "InvalidConvo"
+        },
+        {
+          "name": "ReplyTargetNotFound"
+        }
+      ],
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "items"
+          ],
+          "properties": {
+            "items": {
+              "type": "array",
+              "items": {
+                "ref": "chat.bsky.convo.defs#messageView",
+                "type": "ref"
+              }
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "description": "Sends a batch of messages to a conversation."
+    },
+    "batchItem": {
+      "type": "object",
+      "required": [
+        "convoId",
+        "message"
+      ],
+      "properties": {
+        "convoId": {
+          "type": "string"
+        },
+        "message": {
+          "ref": "chat.bsky.convo.defs#messageInput",
+          "type": "ref"
+        }
+      }
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/chat/bsky/convo/unlockConvo.json b/lexicons/chat/bsky/convo/unlockConvo.json
new file mode 100644
index 0000000000..83c3c8fe8a
--- /dev/null
+++ b/lexicons/chat/bsky/convo/unlockConvo.json
@@ -0,0 +1,51 @@
+{
+  "id": "chat.bsky.convo.unlockConvo",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "input": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "convoId"
+          ],
+          "properties": {
+            "convoId": {
+              "type": "string"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "errors": [
+        {
+          "name": "InvalidConvo"
+        },
+        {
+          "name": "InsufficientRole"
+        },
+        {
+          "name": "ConvoLockedByModeration"
+        }
+      ],
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "convo"
+          ],
+          "properties": {
+            "convo": {
+              "ref": "chat.bsky.convo.defs#convoView",
+              "type": "ref"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "description": "Unlocks a group convo so it is able to receive new content."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/chat/bsky/convo/unmuteConvo.json b/lexicons/chat/bsky/convo/unmuteConvo.json
new file mode 100644
index 0000000000..813146cd53
--- /dev/null
+++ b/lexicons/chat/bsky/convo/unmuteConvo.json
@@ -0,0 +1,45 @@
+{
+  "id": "chat.bsky.convo.unmuteConvo",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "input": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "convoId"
+          ],
+          "properties": {
+            "convoId": {
+              "type": "string"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "errors": [
+        {
+          "name": "InvalidConvo"
+        }
+      ],
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "convo"
+          ],
+          "properties": {
+            "convo": {
+              "ref": "chat.bsky.convo.defs#convoView",
+              "type": "ref"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "description": "Unmutes a conversation, allowing notifications related to it."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/chat/bsky/convo/updateAllRead.json b/lexicons/chat/bsky/convo/updateAllRead.json
new file mode 100644
index 0000000000..288e873196
--- /dev/null
+++ b/lexicons/chat/bsky/convo/updateAllRead.json
@@ -0,0 +1,41 @@
+{
+  "id": "chat.bsky.convo.updateAllRead",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "input": {
+        "schema": {
+          "type": "object",
+          "properties": {
+            "status": {
+              "type": "string",
+              "knownValues": [
+                "request",
+                "accepted"
+              ]
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "updatedCount"
+          ],
+          "properties": {
+            "updatedCount": {
+              "type": "integer",
+              "description": "The count of updated convos."
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "description": "Sets conversations from a user as read to the latest message, with filters."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/chat/bsky/convo/updateRead.json b/lexicons/chat/bsky/convo/updateRead.json
new file mode 100644
index 0000000000..1aa6d1152c
--- /dev/null
+++ b/lexicons/chat/bsky/convo/updateRead.json
@@ -0,0 +1,48 @@
+{
+  "id": "chat.bsky.convo.updateRead",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "input": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "convoId"
+          ],
+          "properties": {
+            "convoId": {
+              "type": "string"
+            },
+            "messageId": {
+              "type": "string"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "errors": [
+        {
+          "name": "InvalidConvo"
+        }
+      ],
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "convo"
+          ],
+          "properties": {
+            "convo": {
+              "ref": "chat.bsky.convo.defs#convoView",
+              "type": "ref"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "description": "Updates the read state of a conversation from, optionally specifying the last read message."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/chat/bsky/embed/joinLink.json b/lexicons/chat/bsky/embed/joinLink.json
new file mode 100644
index 0000000000..0dc09657b9
--- /dev/null
+++ b/lexicons/chat/bsky/embed/joinLink.json
@@ -0,0 +1,36 @@
+{
+  "id": "chat.bsky.embed.joinLink",
+  "defs": {
+    "main": {
+      "type": "object",
+      "required": [
+        "code"
+      ],
+      "properties": {
+        "code": {
+          "type": "string",
+          "description": "The join link code."
+        }
+      }
+    },
+    "view": {
+      "type": "object",
+      "required": [
+        "joinLinkPreview"
+      ],
+      "properties": {
+        "joinLinkPreview": {
+          "refs": [
+            "chat.bsky.group.defs#joinLinkPreviewView",
+            "chat.bsky.group.defs#disabledJoinLinkPreviewView",
+            "chat.bsky.group.defs#invalidJoinLinkPreviewView"
+          ],
+          "type": "union"
+        }
+      }
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1,
+  "description": "A join link embedded in a chat message."
+}
diff --git a/lexicons/chat/bsky/group/addMembers.json b/lexicons/chat/bsky/group/addMembers.json
new file mode 100644
index 0000000000..39a14a5b83
--- /dev/null
+++ b/lexicons/chat/bsky/group/addMembers.json
@@ -0,0 +1,88 @@
+{
+  "id": "chat.bsky.group.addMembers",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "input": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "convoId",
+            "members"
+          ],
+          "properties": {
+            "convoId": {
+              "type": "string"
+            },
+            "members": {
+              "type": "array",
+              "items": {
+                "type": "string",
+                "format": "did"
+              },
+              "minLength": 1
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "errors": [
+        {
+          "name": "AccountSuspended"
+        },
+        {
+          "name": "BlockedActor"
+        },
+        {
+          "name": "BlockedSubject"
+        },
+        {
+          "name": "ConvoLocked"
+        },
+        {
+          "name": "InsufficientRole"
+        },
+        {
+          "name": "InvalidConvo"
+        },
+        {
+          "name": "MemberLimitReached"
+        },
+        {
+          "name": "NotFollowedBySender"
+        },
+        {
+          "name": "RecipientNotFound"
+        },
+        {
+          "name": "UserForbidsGroups"
+        }
+      ],
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "convo"
+          ],
+          "properties": {
+            "convo": {
+              "ref": "chat.bsky.convo.defs#convoView",
+              "type": "ref"
+            },
+            "addedMembers": {
+              "type": "array",
+              "items": {
+                "ref": "chat.bsky.actor.defs#profileViewBasic",
+                "type": "ref"
+              }
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "description": "Adds members to a group. The members are added in 'request' status, so they have to accept it. This creates convo memberships."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/chat/bsky/group/approveJoinRequest.json b/lexicons/chat/bsky/group/approveJoinRequest.json
new file mode 100644
index 0000000000..c8186db259
--- /dev/null
+++ b/lexicons/chat/bsky/group/approveJoinRequest.json
@@ -0,0 +1,56 @@
+{
+  "id": "chat.bsky.group.approveJoinRequest",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "input": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "convoId",
+            "member"
+          ],
+          "properties": {
+            "member": {
+              "type": "string",
+              "format": "did"
+            },
+            "convoId": {
+              "type": "string"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "errors": [
+        {
+          "name": "InvalidConvo"
+        },
+        {
+          "name": "InsufficientRole"
+        },
+        {
+          "name": "MemberLimitReached"
+        }
+      ],
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "convo"
+          ],
+          "properties": {
+            "convo": {
+              "ref": "chat.bsky.convo.defs#convoView",
+              "type": "ref"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "description": "Approves a request to join a group (via join link) the user owns. Action taken by the group owner."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/chat/bsky/group/createGroup.json b/lexicons/chat/bsky/group/createGroup.json
new file mode 100644
index 0000000000..efe5e72041
--- /dev/null
+++ b/lexicons/chat/bsky/group/createGroup.json
@@ -0,0 +1,76 @@
+{
+  "id": "chat.bsky.group.createGroup",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "input": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "members",
+            "name"
+          ],
+          "properties": {
+            "name": {
+              "type": "string",
+              "maxLength": 500,
+              "minLength": 1,
+              "maxGraphemes": 50
+            },
+            "members": {
+              "type": "array",
+              "items": {
+                "type": "string",
+                "format": "did"
+              },
+              "maxLength": 10000,
+              "description": "The members to add to the group. The owner is automatically added. Implementations may enforce a lower maximum than the 10,000-item schema limit; Bluesky currently supports up to 100 total members. If the owner is included in this list, the list may contain up to the implementation's total member limit. Otherwise, it may contain one fewer."
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "errors": [
+        {
+          "name": "AccountSuspended"
+        },
+        {
+          "name": "BlockedActor"
+        },
+        {
+          "name": "BlockedSubject"
+        },
+        {
+          "name": "NewAccountCannotCreateGroup"
+        },
+        {
+          "name": "NotFollowedBySender"
+        },
+        {
+          "name": "RecipientNotFound"
+        },
+        {
+          "name": "UserForbidsGroups"
+        }
+      ],
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "convo"
+          ],
+          "properties": {
+            "convo": {
+              "ref": "chat.bsky.convo.defs#convoView",
+              "type": "ref"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "description": "Creates a group convo, specifying the members to be added to it. Unlike getConvoForMembers, this isn't idempotent. It will create new groups even if the membership is identical to pre-existing groups. Will create 'request' membership for all members, except the owner who is 'accepted'."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/chat/bsky/group/createJoinLink.json b/lexicons/chat/bsky/group/createJoinLink.json
new file mode 100644
index 0000000000..679f1bc3b3
--- /dev/null
+++ b/lexicons/chat/bsky/group/createJoinLink.json
@@ -0,0 +1,60 @@
+{
+  "id": "chat.bsky.group.createJoinLink",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "input": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "convoId",
+            "joinRule"
+          ],
+          "properties": {
+            "convoId": {
+              "type": "string"
+            },
+            "joinRule": {
+              "ref": "chat.bsky.group.defs#joinRule",
+              "type": "ref"
+            },
+            "requireApproval": {
+              "type": "boolean",
+              "default": false
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "errors": [
+        {
+          "name": "EnabledJoinLinkAlreadyExists"
+        },
+        {
+          "name": "InvalidConvo"
+        },
+        {
+          "name": "InsufficientRole"
+        }
+      ],
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "joinLink"
+          ],
+          "properties": {
+            "joinLink": {
+              "ref": "chat.bsky.group.defs#joinLinkView",
+              "type": "ref"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "description": "Creates a join link for the group convo."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/chat/bsky/group/defs.json b/lexicons/chat/bsky/group/defs.json
new file mode 100644
index 0000000000..3b1cc4bef3
--- /dev/null
+++ b/lexicons/chat/bsky/group/defs.json
@@ -0,0 +1,192 @@
+{
+  "id": "chat.bsky.group.defs",
+  "defs": {
+    "joinRule": {
+      "type": "string",
+      "knownValues": [
+        "anyone",
+        "followedByOwner"
+      ]
+    },
+    "joinLinkView": {
+      "type": "object",
+      "required": [
+        "code",
+        "enabledStatus",
+        "requireApproval",
+        "joinRule",
+        "createdAt"
+      ],
+      "properties": {
+        "code": {
+          "type": "string"
+        },
+        "joinRule": {
+          "ref": "#joinRule",
+          "type": "ref"
+        },
+        "createdAt": {
+          "type": "string",
+          "format": "datetime"
+        },
+        "enabledStatus": {
+          "ref": "#linkEnabledStatus",
+          "type": "ref"
+        },
+        "requireApproval": {
+          "type": "boolean"
+        }
+      },
+      "description": "Join link view to be used within a group view, so the convo is surrounding, not specified inside this view."
+    },
+    "joinRequestView": {
+      "type": "object",
+      "required": [
+        "convoId",
+        "requestedBy",
+        "requestedAt"
+      ],
+      "properties": {
+        "convoId": {
+          "type": "string"
+        },
+        "requestedAt": {
+          "type": "string",
+          "format": "datetime"
+        },
+        "requestedBy": {
+          "ref": "chat.bsky.actor.defs#profileViewBasic",
+          "type": "ref"
+        }
+      },
+      "description": "A join request from the perspective of the group owner."
+    },
+    "linkEnabledStatus": {
+      "type": "string",
+      "knownValues": [
+        "enabled",
+        "disabled"
+      ]
+    },
+    "joinLinkPreviewView": {
+      "type": "object",
+      "required": [
+        "convoId",
+        "code",
+        "name",
+        "owner",
+        "memberCount",
+        "memberLimit",
+        "requireApproval",
+        "joinRule"
+      ],
+      "properties": {
+        "code": {
+          "type": "string"
+        },
+        "name": {
+          "type": "string"
+        },
+        "convo": {
+          "ref": "chat.bsky.convo.defs#convoView",
+          "type": "ref",
+          "description": "Present only if the request is authenticated and the user is a member of the group."
+        },
+        "owner": {
+          "ref": "chat.bsky.actor.defs#profileViewBasic",
+          "type": "ref"
+        },
+        "viewer": {
+          "ref": "#joinLinkViewerState",
+          "type": "ref"
+        },
+        "convoId": {
+          "type": "string"
+        },
+        "joinRule": {
+          "ref": "#joinRule",
+          "type": "ref"
+        },
+        "memberCount": {
+          "type": "integer"
+        },
+        "memberLimit": {
+          "type": "integer"
+        },
+        "requireApproval": {
+          "type": "boolean"
+        }
+      },
+      "description": "Preview that can be shown in feeds, including to unauthenticated viewers."
+    },
+    "joinLinkViewerState": {
+      "type": "object",
+      "properties": {
+        "requestedAt": {
+          "type": "string",
+          "format": "datetime"
+        }
+      }
+    },
+    "joinRequestConvoView": {
+      "type": "object",
+      "required": [
+        "convoId",
+        "name",
+        "owner",
+        "memberCount",
+        "memberLimit",
+        "viewer"
+      ],
+      "properties": {
+        "name": {
+          "type": "string"
+        },
+        "owner": {
+          "ref": "chat.bsky.actor.defs#profileViewBasic",
+          "type": "ref"
+        },
+        "viewer": {
+          "ref": "#joinLinkViewerState",
+          "type": "ref"
+        },
+        "convoId": {
+          "type": "string"
+        },
+        "memberCount": {
+          "type": "integer"
+        },
+        "memberLimit": {
+          "type": "integer"
+        }
+      },
+      "description": "A join request from the perspective of the requester, including enough group context to render the request in a list (e.g. group name, owner, member count)."
+    },
+    "invalidJoinLinkPreviewView": {
+      "type": "object",
+      "required": [
+        "code"
+      ],
+      "properties": {
+        "code": {
+          "type": "string"
+        }
+      },
+      "description": "Preview for a join link code that does not map to an existing link. Carries only the code so clients can correlate with the input and render an invalid state."
+    },
+    "disabledJoinLinkPreviewView": {
+      "type": "object",
+      "required": [
+        "code"
+      ],
+      "properties": {
+        "code": {
+          "type": "string"
+        }
+      },
+      "description": "Preview for a disabled join link. Carries only the code so clients can correlate with the input and render a disabled state."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/chat/bsky/group/disableJoinLink.json b/lexicons/chat/bsky/group/disableJoinLink.json
new file mode 100644
index 0000000000..e240344a17
--- /dev/null
+++ b/lexicons/chat/bsky/group/disableJoinLink.json
@@ -0,0 +1,51 @@
+{
+  "id": "chat.bsky.group.disableJoinLink",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "input": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "convoId"
+          ],
+          "properties": {
+            "convoId": {
+              "type": "string"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "errors": [
+        {
+          "name": "InvalidConvo"
+        },
+        {
+          "name": "InsufficientRole"
+        },
+        {
+          "name": "NoJoinLink"
+        }
+      ],
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "joinLink"
+          ],
+          "properties": {
+            "joinLink": {
+              "ref": "chat.bsky.group.defs#joinLinkView",
+              "type": "ref"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "description": "Disables the active join link for the group convo."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/chat/bsky/group/editGroup.json b/lexicons/chat/bsky/group/editGroup.json
new file mode 100644
index 0000000000..2ce53704cd
--- /dev/null
+++ b/lexicons/chat/bsky/group/editGroup.json
@@ -0,0 +1,58 @@
+{
+  "id": "chat.bsky.group.editGroup",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "input": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "convoId",
+            "name"
+          ],
+          "properties": {
+            "name": {
+              "type": "string",
+              "maxLength": 500,
+              "minLength": 1,
+              "maxGraphemes": 50
+            },
+            "convoId": {
+              "type": "string"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "errors": [
+        {
+          "name": "ConvoLocked"
+        },
+        {
+          "name": "InvalidConvo"
+        },
+        {
+          "name": "InsufficientRole"
+        }
+      ],
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "convo"
+          ],
+          "properties": {
+            "convo": {
+              "ref": "chat.bsky.convo.defs#convoView",
+              "type": "ref"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "description": "Edits group settings."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/chat/bsky/group/editJoinLink.json b/lexicons/chat/bsky/group/editJoinLink.json
new file mode 100644
index 0000000000..17bc143555
--- /dev/null
+++ b/lexicons/chat/bsky/group/editJoinLink.json
@@ -0,0 +1,58 @@
+{
+  "id": "chat.bsky.group.editJoinLink",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "input": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "convoId"
+          ],
+          "properties": {
+            "convoId": {
+              "type": "string"
+            },
+            "joinRule": {
+              "ref": "chat.bsky.group.defs#joinRule",
+              "type": "ref"
+            },
+            "requireApproval": {
+              "type": "boolean"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "errors": [
+        {
+          "name": "InvalidConvo"
+        },
+        {
+          "name": "InsufficientRole"
+        },
+        {
+          "name": "NoJoinLink"
+        }
+      ],
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "joinLink"
+          ],
+          "properties": {
+            "joinLink": {
+              "ref": "chat.bsky.group.defs#joinLinkView",
+              "type": "ref"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "description": "Edits the existing join link settings for the group convo."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/chat/bsky/group/enableJoinLink.json b/lexicons/chat/bsky/group/enableJoinLink.json
new file mode 100644
index 0000000000..ed82a96495
--- /dev/null
+++ b/lexicons/chat/bsky/group/enableJoinLink.json
@@ -0,0 +1,54 @@
+{
+  "id": "chat.bsky.group.enableJoinLink",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "input": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "convoId"
+          ],
+          "properties": {
+            "convoId": {
+              "type": "string"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "errors": [
+        {
+          "name": "InvalidConvo"
+        },
+        {
+          "name": "InsufficientRole"
+        },
+        {
+          "name": "NoJoinLink"
+        },
+        {
+          "name": "LinkAlreadyEnabled"
+        }
+      ],
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "joinLink"
+          ],
+          "properties": {
+            "joinLink": {
+              "ref": "chat.bsky.group.defs#joinLinkView",
+              "type": "ref"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "description": "Re-enables a previously disabled join link for the group convo."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/chat/bsky/group/getJoinLinkPreviews.json b/lexicons/chat/bsky/group/getJoinLinkPreviews.json
new file mode 100644
index 0000000000..c9c8491cad
--- /dev/null
+++ b/lexicons/chat/bsky/group/getJoinLinkPreviews.json
@@ -0,0 +1,49 @@
+{
+  "id": "chat.bsky.group.getJoinLinkPreviews",
+  "defs": {
+    "main": {
+      "type": "query",
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "joinLinkPreviews"
+          ],
+          "properties": {
+            "joinLinkPreviews": {
+              "type": "array",
+              "items": {
+                "refs": [
+                  "chat.bsky.group.defs#joinLinkPreviewView",
+                  "chat.bsky.group.defs#disabledJoinLinkPreviewView",
+                  "chat.bsky.group.defs#invalidJoinLinkPreviewView"
+                ],
+                "type": "union"
+              }
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "parameters": {
+        "type": "params",
+        "required": [
+          "codes"
+        ],
+        "properties": {
+          "codes": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "maxLength": 50,
+            "minLength": 1
+          }
+        }
+      },
+      "description": "Get public information about groups from join links. The output array matches the input codes one-to-one by position (and each view also carries its 'code'). Disabled codes return a disabledJoinLinkPreviewView, and codes that do not map to a previewable link return an invalidJoinLinkPreviewView."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/chat/bsky/group/listJoinRequests.json b/lexicons/chat/bsky/group/listJoinRequests.json
new file mode 100644
index 0000000000..b8ecd295dd
--- /dev/null
+++ b/lexicons/chat/bsky/group/listJoinRequests.json
@@ -0,0 +1,60 @@
+{
+  "id": "chat.bsky.group.listJoinRequests",
+  "defs": {
+    "main": {
+      "type": "query",
+      "errors": [
+        {
+          "name": "InvalidConvo"
+        },
+        {
+          "name": "InsufficientRole"
+        }
+      ],
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "requests"
+          ],
+          "properties": {
+            "cursor": {
+              "type": "string"
+            },
+            "requests": {
+              "type": "array",
+              "items": {
+                "ref": "chat.bsky.group.defs#joinRequestView",
+                "type": "ref"
+              }
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "parameters": {
+        "type": "params",
+        "required": [
+          "convoId"
+        ],
+        "properties": {
+          "limit": {
+            "type": "integer",
+            "default": 50,
+            "maximum": 100,
+            "minimum": 1
+          },
+          "cursor": {
+            "type": "string"
+          },
+          "convoId": {
+            "type": "string"
+          }
+        }
+      },
+      "description": "Lists a page of request to join a group (via join link) the user owns. Shows the data from the owner's point of view."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/chat/bsky/group/listMutualGroups.json b/lexicons/chat/bsky/group/listMutualGroups.json
new file mode 100644
index 0000000000..26d04f1edd
--- /dev/null
+++ b/lexicons/chat/bsky/group/listMutualGroups.json
@@ -0,0 +1,53 @@
+{
+  "id": "chat.bsky.group.listMutualGroups",
+  "defs": {
+    "main": {
+      "type": "query",
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "convos"
+          ],
+          "properties": {
+            "convos": {
+              "type": "array",
+              "items": {
+                "ref": "chat.bsky.convo.defs#convoView",
+                "type": "ref"
+              }
+            },
+            "cursor": {
+              "type": "string"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "parameters": {
+        "type": "params",
+        "required": [
+          "subject"
+        ],
+        "properties": {
+          "limit": {
+            "type": "integer",
+            "default": 50,
+            "maximum": 100,
+            "minimum": 1
+          },
+          "cursor": {
+            "type": "string"
+          },
+          "subject": {
+            "type": "string",
+            "format": "did"
+          }
+        }
+      },
+      "description": "Returns a page of group conversations that both the requester and the specified actor are members of."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/chat/bsky/group/rejectJoinRequest.json b/lexicons/chat/bsky/group/rejectJoinRequest.json
new file mode 100644
index 0000000000..fb8edf64ea
--- /dev/null
+++ b/lexicons/chat/bsky/group/rejectJoinRequest.json
@@ -0,0 +1,46 @@
+{
+  "id": "chat.bsky.group.rejectJoinRequest",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "input": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "convoId",
+            "member"
+          ],
+          "properties": {
+            "member": {
+              "type": "string",
+              "format": "did"
+            },
+            "convoId": {
+              "type": "string"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "errors": [
+        {
+          "name": "InvalidConvo"
+        },
+        {
+          "name": "InsufficientRole"
+        }
+      ],
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [],
+          "properties": {}
+        },
+        "encoding": "application/json"
+      },
+      "description": "Rejects a request to join a group (via join link) the user owns. Action taken by the group owner."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/chat/bsky/group/removeMembers.json b/lexicons/chat/bsky/group/removeMembers.json
new file mode 100644
index 0000000000..e7e795a6bb
--- /dev/null
+++ b/lexicons/chat/bsky/group/removeMembers.json
@@ -0,0 +1,57 @@
+{
+  "id": "chat.bsky.group.removeMembers",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "input": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "convoId",
+            "members"
+          ],
+          "properties": {
+            "convoId": {
+              "type": "string"
+            },
+            "members": {
+              "type": "array",
+              "items": {
+                "type": "string",
+                "format": "did"
+              },
+              "minLength": 1
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "errors": [
+        {
+          "name": "InvalidConvo"
+        },
+        {
+          "name": "InsufficientRole"
+        }
+      ],
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "convo"
+          ],
+          "properties": {
+            "convo": {
+              "ref": "chat.bsky.convo.defs#convoView",
+              "type": "ref"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "description": "Removes members from a group. This deletes convo memberships, doesn't just set a status."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/chat/bsky/group/requestJoin.json b/lexicons/chat/bsky/group/requestJoin.json
new file mode 100644
index 0000000000..b3cbbd6b4c
--- /dev/null
+++ b/lexicons/chat/bsky/group/requestJoin.json
@@ -0,0 +1,68 @@
+{
+  "id": "chat.bsky.group.requestJoin",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "input": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "code"
+          ],
+          "properties": {
+            "code": {
+              "type": "string"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "errors": [
+        {
+          "name": "ConvoLocked"
+        },
+        {
+          "name": "FollowRequired"
+        },
+        {
+          "name": "InvalidCode"
+        },
+        {
+          "name": "LinkDisabled"
+        },
+        {
+          "name": "MemberLimitReached"
+        },
+        {
+          "name": "UserKicked"
+        }
+      ],
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "status"
+          ],
+          "properties": {
+            "convo": {
+              "ref": "chat.bsky.convo.defs#convoView",
+              "type": "ref",
+              "description": "The group convo joined. This is only present in the case of status=joined"
+            },
+            "status": {
+              "type": "string",
+              "knownValues": [
+                "joined",
+                "pending"
+              ]
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "description": "Sends a request to join a group (via join link) to the group owner. Action taken by the prospective group member."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/chat/bsky/group/updateJoinRequestsRead.json b/lexicons/chat/bsky/group/updateJoinRequestsRead.json
new file mode 100644
index 0000000000..e80c671d5e
--- /dev/null
+++ b/lexicons/chat/bsky/group/updateJoinRequestsRead.json
@@ -0,0 +1,41 @@
+{
+  "id": "chat.bsky.group.updateJoinRequestsRead",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "input": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "convoId"
+          ],
+          "properties": {
+            "convoId": {
+              "type": "string"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "errors": [
+        {
+          "name": "InvalidConvo"
+        },
+        {
+          "name": "InsufficientRole"
+        }
+      ],
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [],
+          "properties": {}
+        },
+        "encoding": "application/json"
+      },
+      "description": "Marks all join requests as read for the group owner."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/chat/bsky/group/withdrawJoinRequest.json b/lexicons/chat/bsky/group/withdrawJoinRequest.json
new file mode 100644
index 0000000000..4d13bb4249
--- /dev/null
+++ b/lexicons/chat/bsky/group/withdrawJoinRequest.json
@@ -0,0 +1,38 @@
+{
+  "id": "chat.bsky.group.withdrawJoinRequest",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "input": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "convoId"
+          ],
+          "properties": {
+            "convoId": {
+              "type": "string"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "errors": [
+        {
+          "name": "InvalidJoinRequest"
+        }
+      ],
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [],
+          "properties": {}
+        },
+        "encoding": "application/json"
+      },
+      "description": "Withdraws a pending request to join a group. Action taken by the prospective member who originally requested to join."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/chat/bsky/moderation/defs.json b/lexicons/chat/bsky/moderation/defs.json
new file mode 100644
index 0000000000..895b3bee77
--- /dev/null
+++ b/lexicons/chat/bsky/moderation/defs.json
@@ -0,0 +1,81 @@
+{
+  "id": "chat.bsky.moderation.defs",
+  "defs": {
+    "convoView": {
+      "type": "object",
+      "required": [
+        "id",
+        "rev"
+      ],
+      "properties": {
+        "id": {
+          "type": "string"
+        },
+        "rev": {
+          "type": "string"
+        },
+        "kind": {
+          "refs": [
+            "#directConvo",
+            "#groupConvo"
+          ],
+          "type": "union",
+          "description": "Union field that has data specific to different kinds of convos."
+        }
+      },
+      "description": "A view of a conversation for moderation purposes. Unlike chat.bsky.convo.defs#convoView, it does not include viewer-specific data (such as muted, unreadCount, status, lastMessage, lastReaction), since the requester is a moderator and not a member of the conversation. The member list is not included; use chat.bsky.moderation.getConvoMembers to list members."
+    },
+    "groupConvo": {
+      "type": "object",
+      "required": [
+        "createdAt",
+        "joinRequestCount",
+        "lockStatus",
+        "memberCount",
+        "memberLimit",
+        "name"
+      ],
+      "properties": {
+        "name": {
+          "type": "string",
+          "maxLength": 500,
+          "description": "The display name of the group conversation.",
+          "maxGraphemes": 50
+        },
+        "joinLink": {
+          "ref": "chat.bsky.group.defs#joinLinkView",
+          "type": "ref"
+        },
+        "createdAt": {
+          "type": "string",
+          "format": "datetime"
+        },
+        "lockStatus": {
+          "ref": "chat.bsky.convo.defs#convoLockStatus",
+          "type": "ref",
+          "description": "The lock status of the conversation."
+        },
+        "memberCount": {
+          "type": "integer",
+          "description": "The total number of members in the group conversation."
+        },
+        "memberLimit": {
+          "type": "integer",
+          "description": "The maximum number of members allowed in the group conversation."
+        },
+        "joinRequestCount": {
+          "type": "integer",
+          "description": "The total number of pending join requests for the group conversation. This information is only visible to the owner and to moderators. Capped at 21."
+        }
+      },
+      "description": "Data specific to a group conversation, for moderation purposes. Unlike chat.bsky.convo.defs#groupConvo, it does not include viewer-specific data (such as unreadJoinRequestCount), since the requester is a moderator and not a member of the conversation."
+    },
+    "directConvo": {
+      "type": "object",
+      "properties": {},
+      "description": "Data specific to a direct conversation, for moderation purposes."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/chat/bsky/moderation/getActorMetadata.json b/lexicons/chat/bsky/moderation/getActorMetadata.json
new file mode 100644
index 0000000000..3f20fe2170
--- /dev/null
+++ b/lexicons/chat/bsky/moderation/getActorMetadata.json
@@ -0,0 +1,70 @@
+{
+  "id": "chat.bsky.moderation.getActorMetadata",
+  "defs": {
+    "main": {
+      "type": "query",
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "day",
+            "month",
+            "all"
+          ],
+          "properties": {
+            "all": {
+              "ref": "#metadata",
+              "type": "ref"
+            },
+            "day": {
+              "ref": "#metadata",
+              "type": "ref"
+            },
+            "month": {
+              "ref": "#metadata",
+              "type": "ref"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "parameters": {
+        "type": "params",
+        "required": [
+          "actor"
+        ],
+        "properties": {
+          "actor": {
+            "type": "string",
+            "format": "did"
+          }
+        }
+      }
+    },
+    "metadata": {
+      "type": "object",
+      "required": [
+        "messagesSent",
+        "messagesReceived",
+        "convos",
+        "convosStarted"
+      ],
+      "properties": {
+        "convos": {
+          "type": "integer"
+        },
+        "messagesSent": {
+          "type": "integer"
+        },
+        "convosStarted": {
+          "type": "integer"
+        },
+        "messagesReceived": {
+          "type": "integer"
+        }
+      }
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/chat/bsky/moderation/getConvo.json b/lexicons/chat/bsky/moderation/getConvo.json
new file mode 100644
index 0000000000..a9213df585
--- /dev/null
+++ b/lexicons/chat/bsky/moderation/getConvo.json
@@ -0,0 +1,42 @@
+{
+  "id": "chat.bsky.moderation.getConvo",
+  "defs": {
+    "main": {
+      "type": "query",
+      "errors": [
+        {
+          "name": "InvalidConvo"
+        }
+      ],
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "convo"
+          ],
+          "properties": {
+            "convo": {
+              "ref": "chat.bsky.moderation.defs#convoView",
+              "type": "ref"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "parameters": {
+        "type": "params",
+        "required": [
+          "convoId"
+        ],
+        "properties": {
+          "convoId": {
+            "type": "string"
+          }
+        }
+      },
+      "description": "Gets an existing conversation by its ID, for moderation purposes. Does not require the requester to be a member of the conversation."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/chat/bsky/moderation/getConvoMembers.json b/lexicons/chat/bsky/moderation/getConvoMembers.json
new file mode 100644
index 0000000000..236663422c
--- /dev/null
+++ b/lexicons/chat/bsky/moderation/getConvoMembers.json
@@ -0,0 +1,57 @@
+{
+  "id": "chat.bsky.moderation.getConvoMembers",
+  "defs": {
+    "main": {
+      "type": "query",
+      "errors": [
+        {
+          "name": "InvalidConvo"
+        }
+      ],
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "members"
+          ],
+          "properties": {
+            "cursor": {
+              "type": "string"
+            },
+            "members": {
+              "type": "array",
+              "items": {
+                "ref": "chat.bsky.actor.defs#profileViewBasic",
+                "type": "ref"
+              }
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "parameters": {
+        "type": "params",
+        "required": [
+          "convoId"
+        ],
+        "properties": {
+          "limit": {
+            "type": "integer",
+            "default": 50,
+            "maximum": 100,
+            "minimum": 1
+          },
+          "cursor": {
+            "type": "string"
+          },
+          "convoId": {
+            "type": "string"
+          }
+        }
+      },
+      "description": "Returns a paginated list of members from a conversation, for moderation purposes. Does not require the requester to be a member of the conversation."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/chat/bsky/moderation/getConvos.json b/lexicons/chat/bsky/moderation/getConvos.json
new file mode 100644
index 0000000000..2169dc64dd
--- /dev/null
+++ b/lexicons/chat/bsky/moderation/getConvos.json
@@ -0,0 +1,45 @@
+{
+  "id": "chat.bsky.moderation.getConvos",
+  "defs": {
+    "main": {
+      "type": "query",
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "convos"
+          ],
+          "properties": {
+            "convos": {
+              "type": "array",
+              "items": {
+                "ref": "chat.bsky.moderation.defs#convoView",
+                "type": "ref"
+              }
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "parameters": {
+        "type": "params",
+        "required": [
+          "convoIds"
+        ],
+        "properties": {
+          "convoIds": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "maxLength": 100,
+            "minLength": 1
+          }
+        }
+      },
+      "description": "Gets existing conversations by their IDs, for moderation purposes. Does not require the requester to be a member of the conversations. Unknown IDs are silently omitted from the response."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/chat/bsky/moderation/getMessageContext.json b/lexicons/chat/bsky/moderation/getMessageContext.json
new file mode 100644
index 0000000000..f88034c105
--- /dev/null
+++ b/lexicons/chat/bsky/moderation/getMessageContext.json
@@ -0,0 +1,63 @@
+{
+  "id": "chat.bsky.moderation.getMessageContext",
+  "defs": {
+    "main": {
+      "type": "query",
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "messages"
+          ],
+          "properties": {
+            "messages": {
+              "type": "array",
+              "items": {
+                "refs": [
+                  "chat.bsky.convo.defs#messageView",
+                  "chat.bsky.convo.defs#systemMessageView"
+                ],
+                "type": "union"
+              }
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "parameters": {
+        "type": "params",
+        "required": [
+          "messageId"
+        ],
+        "properties": {
+          "after": {
+            "type": "integer",
+            "default": 5,
+            "description": "Number of user messages after the target to include. System messages between the target and the latest returned user message are also included, capped per gap by `maxInterleavedSystemMessages`. If there are no user messages after the target, up to `maxInterleavedSystemMessages` system messages immediately following the target are returned instead."
+          },
+          "before": {
+            "type": "integer",
+            "default": 5,
+            "description": "Number of user messages before the target to include. System messages between the earliest returned user message and the target are also included, capped per gap by `maxInterleavedSystemMessages`. If there are no user messages before the target, up to `maxInterleavedSystemMessages` system messages immediately preceding the target are returned instead."
+          },
+          "convoId": {
+            "type": "string",
+            "description": "Conversation that the message is from. NOTE: this field will eventually be required."
+          },
+          "messageId": {
+            "type": "string"
+          },
+          "maxInterleavedSystemMessages": {
+            "type": "integer",
+            "default": 10,
+            "maximum": 1000,
+            "minimum": 0,
+            "description": "Maximum number of system messages to include per gap between consecutive returned messages (and per side when there are no user messages on that side). Within a gap, the system messages closest to the earlier message are kept."
+          }
+        }
+      }
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/chat/bsky/moderation/subscribeModEvents.json b/lexicons/chat/bsky/moderation/subscribeModEvents.json
new file mode 100644
index 0000000000..277c85b248
--- /dev/null
+++ b/lexicons/chat/bsky/moderation/subscribeModEvents.json
@@ -0,0 +1,675 @@
+{
+  "id": "chat.bsky.moderation.subscribeModEvents",
+  "defs": {
+    "main": {
+      "type": "subscription",
+      "errors": [
+        {
+          "name": "FutureCursor"
+        },
+        {
+          "name": "ConsumerTooSlow",
+          "description": "If the consumer of the stream can not keep up with events, and a backlog gets too large, the server will drop the connection."
+        }
+      ],
+      "message": {
+        "schema": {
+          "refs": [
+            "#eventConvoFirstMessage",
+            "#eventGroupChatCreated",
+            "#eventGroupChatMemberAdded",
+            "#eventGroupChatMemberJoined",
+            "#eventGroupChatJoinRequest",
+            "#eventGroupChatJoinRequestApproved",
+            "#eventGroupChatJoinRequestRejected",
+            "#eventChatAccepted",
+            "#eventGroupChatMemberLeft",
+            "#eventGroupChatUpdated",
+            "#eventRateLimitExceeded"
+          ],
+          "type": "union"
+        }
+      },
+      "parameters": {
+        "type": "params",
+        "properties": {
+          "cursor": {
+            "type": "string",
+            "description": "The last known event seq number to backfill from. Use '2222222222222' to backfill from the beginning. Don't specify a cursor to listen only for new events."
+          }
+        }
+      },
+      "description": "Subscribe to stream of chat events targeted to moderation. Private endpoint."
+    },
+    "eventChatAccepted": {
+      "type": "object",
+      "required": [
+        "actorDid",
+        "convoCreatedAt",
+        "convoId",
+        "createdAt",
+        "method",
+        "rev"
+      ],
+      "properties": {
+        "rev": {
+          "type": "string"
+        },
+        "method": {
+          "type": "string",
+          "description": "How the convo was accepted.",
+          "knownValues": [
+            "explicit",
+            "message"
+          ]
+        },
+        "convoId": {
+          "type": "string"
+        },
+        "actorDid": {
+          "type": "string",
+          "format": "did",
+          "description": "The DID of the person accepting the convo."
+        },
+        "ownerDid": {
+          "type": "string",
+          "format": "did",
+          "description": "The DID of the group chat owner. Only present for group convos."
+        },
+        "createdAt": {
+          "type": "string",
+          "format": "datetime"
+        },
+        "groupName": {
+          "type": "string",
+          "description": "The name of the group chat. Only present for group convos."
+        },
+        "convoCreatedAt": {
+          "type": "string",
+          "format": "datetime",
+          "description": "When the convo was originally created."
+        },
+        "groupMemberCount": {
+          "type": "integer",
+          "description": "Current member count at the time of the event. Only present for group convos."
+        }
+      },
+      "description": "Fired when a user accepts a chat convo, either explicitly or by sending a message."
+    },
+    "eventGroupChatCreated": {
+      "type": "object",
+      "required": [
+        "actorDid",
+        "convoCreatedAt",
+        "convoId",
+        "createdAt",
+        "groupMemberCount",
+        "groupName",
+        "initialMemberDids",
+        "ownerDid",
+        "rev"
+      ],
+      "properties": {
+        "rev": {
+          "type": "string"
+        },
+        "convoId": {
+          "type": "string"
+        },
+        "actorDid": {
+          "type": "string",
+          "format": "did",
+          "description": "The DID of the actor performing the action. For this event, same as ownerDid."
+        },
+        "ownerDid": {
+          "type": "string",
+          "format": "did",
+          "description": "The DID of the group chat owner."
+        },
+        "createdAt": {
+          "type": "string",
+          "format": "datetime"
+        },
+        "groupName": {
+          "type": "string",
+          "description": "The name set at creation time."
+        },
+        "convoCreatedAt": {
+          "type": "string",
+          "format": "datetime",
+          "description": "When the group was originally created."
+        },
+        "groupMemberCount": {
+          "type": "integer",
+          "description": "Current member count at the time of the event."
+        },
+        "initialMemberDids": {
+          "type": "array",
+          "items": {
+            "type": "string",
+            "format": "did"
+          },
+          "description": "DIDs of everyone added at creation time."
+        }
+      },
+      "description": "Fire when a group chat is created."
+    },
+    "eventGroupChatUpdated": {
+      "type": "object",
+      "required": [
+        "actorDid",
+        "convoCreatedAt",
+        "convoId",
+        "createdAt",
+        "groupMemberCount",
+        "groupName",
+        "ownerDid",
+        "rev",
+        "updateType"
+      ],
+      "properties": {
+        "rev": {
+          "type": "string"
+        },
+        "convoId": {
+          "type": "string"
+        },
+        "newName": {
+          "type": "string",
+          "description": "The new group name. Only present when updateType is 'name_changed'."
+        },
+        "oldName": {
+          "type": "string",
+          "description": "The previous group name. Only present when updateType is 'name_changed'."
+        },
+        "actorDid": {
+          "type": "string",
+          "format": "did",
+          "description": "The DID of the actor performing the action (the owner)."
+        },
+        "ownerDid": {
+          "type": "string",
+          "format": "did",
+          "description": "The DID of the group chat owner."
+        },
+        "createdAt": {
+          "type": "string",
+          "format": "datetime"
+        },
+        "groupName": {
+          "type": "string",
+          "description": "Current group name."
+        },
+        "lockReason": {
+          "type": "string",
+          "description": "Why the group was locked. Only present when updateType is 'locked'.",
+          "knownValues": [
+            "owner_action",
+            "owner_left",
+            "owner_deactivated",
+            "owner_deleted",
+            "owner_suspended",
+            "owner_taken_down",
+            "label_applied",
+            "convo_taken_down"
+          ]
+        },
+        "updateType": {
+          "type": "string",
+          "description": "What changed.",
+          "knownValues": [
+            "name_changed",
+            "locked",
+            "locked_permanently",
+            "unlocked",
+            "join_link_created",
+            "join_link_disabled",
+            "join_link_settings_changed"
+          ]
+        },
+        "joinLinkCode": {
+          "type": "string",
+          "description": "The code of the join link. Only present when updateType is join-link-related."
+        },
+        "convoCreatedAt": {
+          "type": "string",
+          "format": "datetime",
+          "description": "When the group was originally created."
+        },
+        "groupMemberCount": {
+          "type": "integer",
+          "description": "Current member count at the time of the event."
+        },
+        "joinLinkFollowersOnly": {
+          "type": "boolean",
+          "description": "Whether the join link is restricted to followers of the owner. Only present when updateType is join-link-related."
+        },
+        "joinLinkRequiresApproval": {
+          "type": "boolean",
+          "description": "Whether the join link requires owner approval to join. Only present when updateType is join-link-related."
+        }
+      },
+      "description": "Fired when a group chat's metadata or status changes."
+    },
+    "eventConvoFirstMessage": {
+      "type": "object",
+      "required": [
+        "createdAt",
+        "rev",
+        "convoId",
+        "user",
+        "recipients"
+      ],
+      "properties": {
+        "rev": {
+          "type": "string"
+        },
+        "user": {
+          "type": "string",
+          "format": "did",
+          "description": "The DID of the message author."
+        },
+        "convoId": {
+          "type": "string"
+        },
+        "createdAt": {
+          "type": "string",
+          "format": "datetime"
+        },
+        "messageId": {
+          "type": "string"
+        },
+        "recipients": {
+          "type": "array",
+          "items": {
+            "type": "string",
+            "format": "did"
+          },
+          "description": "The list of DIDs message recipients. Does not include the sender, which is in the `user` field"
+        }
+      },
+      "description": "Fired when the first message was sent on a convo."
+    },
+    "eventRateLimitExceeded": {
+      "type": "object",
+      "required": [
+        "actorDid",
+        "createdAt",
+        "endpoint",
+        "rev"
+      ],
+      "properties": {
+        "rev": {
+          "type": "string"
+        },
+        "actorDid": {
+          "type": "string",
+          "format": "did",
+          "description": "The DID of the user who hit the rate limit."
+        },
+        "endpoint": {
+          "type": "string",
+          "description": "The NSID of the endpoint that was rate limited."
+        },
+        "createdAt": {
+          "type": "string",
+          "format": "datetime"
+        }
+      },
+      "description": "Fired when a user exceeds a rate limit."
+    },
+    "eventGroupChatMemberLeft": {
+      "type": "object",
+      "required": [
+        "actorDid",
+        "convoCreatedAt",
+        "convoId",
+        "createdAt",
+        "groupMemberCount",
+        "groupName",
+        "leaveMethod",
+        "ownerDid",
+        "rev",
+        "subjectDid"
+      ],
+      "properties": {
+        "rev": {
+          "type": "string"
+        },
+        "convoId": {
+          "type": "string"
+        },
+        "actorDid": {
+          "type": "string",
+          "format": "did",
+          "description": "The DID of the actor. For voluntary: the person leaving. For kicked: the owner."
+        },
+        "ownerDid": {
+          "type": "string",
+          "format": "did",
+          "description": "The DID of the group chat owner."
+        },
+        "createdAt": {
+          "type": "string",
+          "format": "datetime"
+        },
+        "groupName": {
+          "type": "string"
+        },
+        "subjectDid": {
+          "type": "string",
+          "format": "did",
+          "description": "The DID of the member who left or was removed."
+        },
+        "leaveMethod": {
+          "type": "string",
+          "description": "How the member left.",
+          "knownValues": [
+            "voluntary",
+            "kicked"
+          ]
+        },
+        "convoCreatedAt": {
+          "type": "string",
+          "format": "datetime",
+          "description": "When the group was originally created."
+        },
+        "groupMemberCount": {
+          "type": "integer",
+          "description": "Current member count at the time of the event."
+        }
+      },
+      "description": "Fired when a member leaves or is removed from a group chat."
+    },
+    "eventGroupChatJoinRequest": {
+      "type": "object",
+      "required": [
+        "actorDid",
+        "convoCreatedAt",
+        "convoId",
+        "createdAt",
+        "groupMemberCount",
+        "groupName",
+        "joinLinkCode",
+        "ownerDid",
+        "rev",
+        "subjectFollowsOwner"
+      ],
+      "properties": {
+        "rev": {
+          "type": "string"
+        },
+        "convoId": {
+          "type": "string"
+        },
+        "actorDid": {
+          "type": "string",
+          "format": "did",
+          "description": "The DID of the person requesting to join."
+        },
+        "ownerDid": {
+          "type": "string",
+          "format": "did",
+          "description": "The DID of the group chat owner."
+        },
+        "createdAt": {
+          "type": "string",
+          "format": "datetime"
+        },
+        "groupName": {
+          "type": "string"
+        },
+        "joinLinkCode": {
+          "type": "string",
+          "description": "The code of the join link used to request joining."
+        },
+        "convoCreatedAt": {
+          "type": "string",
+          "format": "datetime",
+          "description": "When the group was originally created."
+        },
+        "groupMemberCount": {
+          "type": "integer",
+          "description": "Current member count at the time of the event."
+        },
+        "subjectFollowsOwner": {
+          "type": "boolean",
+          "description": "Whether the requesting member follows the group owner."
+        }
+      },
+      "description": "Fired when a user requests to join a group chat via an join link that requires approval."
+    },
+    "eventGroupChatMemberAdded": {
+      "type": "object",
+      "required": [
+        "actorDid",
+        "convoCreatedAt",
+        "convoId",
+        "createdAt",
+        "groupMemberCount",
+        "groupName",
+        "ownerDid",
+        "requestMembersCount",
+        "rev",
+        "subjectDid",
+        "subjectFollowsOwner"
+      ],
+      "properties": {
+        "rev": {
+          "type": "string"
+        },
+        "convoId": {
+          "type": "string"
+        },
+        "actorDid": {
+          "type": "string",
+          "format": "did",
+          "description": "The DID of the actor performing the action. For this event, same as ownerDid."
+        },
+        "ownerDid": {
+          "type": "string",
+          "format": "did",
+          "description": "The DID of the group chat owner."
+        },
+        "createdAt": {
+          "type": "string",
+          "format": "datetime"
+        },
+        "groupName": {
+          "type": "string"
+        },
+        "subjectDid": {
+          "type": "string",
+          "format": "did",
+          "description": "The DID of the member who was added."
+        },
+        "convoCreatedAt": {
+          "type": "string",
+          "format": "datetime",
+          "description": "When the group was originally created."
+        },
+        "groupMemberCount": {
+          "type": "integer",
+          "description": "Current member count at the time of the event."
+        },
+        "requestMembersCount": {
+          "type": "integer",
+          "description": "The number of members who have not yet accepted the convo."
+        },
+        "subjectFollowsOwner": {
+          "type": "boolean",
+          "description": "Whether the added member follows the group owner."
+        }
+      },
+      "description": "Fired when a member is added to a group chat. Note that members are added in the 'request' state."
+    },
+    "eventGroupChatMemberJoined": {
+      "type": "object",
+      "required": [
+        "actorDid",
+        "convoCreatedAt",
+        "convoId",
+        "createdAt",
+        "groupMemberCount",
+        "groupName",
+        "joinLinkCode",
+        "ownerDid",
+        "rev",
+        "subjectFollowsOwner"
+      ],
+      "properties": {
+        "rev": {
+          "type": "string"
+        },
+        "convoId": {
+          "type": "string"
+        },
+        "actorDid": {
+          "type": "string",
+          "format": "did",
+          "description": "The DID of the person joining."
+        },
+        "ownerDid": {
+          "type": "string",
+          "format": "did",
+          "description": "The DID of the group chat owner."
+        },
+        "createdAt": {
+          "type": "string",
+          "format": "datetime"
+        },
+        "groupName": {
+          "type": "string"
+        },
+        "joinLinkCode": {
+          "type": "string",
+          "description": "The code of the join link used to join."
+        },
+        "convoCreatedAt": {
+          "type": "string",
+          "format": "datetime",
+          "description": "When the group was originally created."
+        },
+        "groupMemberCount": {
+          "type": "integer",
+          "description": "Current member count at the time of the event."
+        },
+        "subjectFollowsOwner": {
+          "type": "boolean",
+          "description": "Whether the joining member follows the group owner."
+        }
+      },
+      "description": "Fired when a member joins a group chat via an join link that does not require approval."
+    },
+    "eventGroupChatJoinRequestApproved": {
+      "type": "object",
+      "required": [
+        "actorDid",
+        "convoCreatedAt",
+        "convoId",
+        "createdAt",
+        "groupMemberCount",
+        "groupName",
+        "ownerDid",
+        "rev",
+        "subjectDid"
+      ],
+      "properties": {
+        "rev": {
+          "type": "string"
+        },
+        "convoId": {
+          "type": "string"
+        },
+        "actorDid": {
+          "type": "string",
+          "format": "did",
+          "description": "The DID of the owner approving the request."
+        },
+        "ownerDid": {
+          "type": "string",
+          "format": "did",
+          "description": "The DID of the group chat owner."
+        },
+        "createdAt": {
+          "type": "string",
+          "format": "datetime"
+        },
+        "groupName": {
+          "type": "string"
+        },
+        "subjectDid": {
+          "type": "string",
+          "format": "did",
+          "description": "The DID of the member whose request was approved."
+        },
+        "convoCreatedAt": {
+          "type": "string",
+          "format": "datetime",
+          "description": "When the group was originally created."
+        },
+        "groupMemberCount": {
+          "type": "integer",
+          "description": "Current member count at the time of the event."
+        }
+      },
+      "description": "Fired when a join request is approved by the group owner."
+    },
+    "eventGroupChatJoinRequestRejected": {
+      "type": "object",
+      "required": [
+        "actorDid",
+        "convoCreatedAt",
+        "convoId",
+        "createdAt",
+        "groupMemberCount",
+        "groupName",
+        "ownerDid",
+        "rev",
+        "subjectDid"
+      ],
+      "properties": {
+        "rev": {
+          "type": "string"
+        },
+        "convoId": {
+          "type": "string"
+        },
+        "actorDid": {
+          "type": "string",
+          "format": "did",
+          "description": "The DID of the owner rejecting the request."
+        },
+        "ownerDid": {
+          "type": "string",
+          "format": "did",
+          "description": "The DID of the group chat owner."
+        },
+        "createdAt": {
+          "type": "string",
+          "format": "datetime"
+        },
+        "groupName": {
+          "type": "string"
+        },
+        "subjectDid": {
+          "type": "string",
+          "format": "did",
+          "description": "The DID of the member whose request was rejected."
+        },
+        "convoCreatedAt": {
+          "type": "string",
+          "format": "datetime",
+          "description": "When the group was originally created."
+        },
+        "groupMemberCount": {
+          "type": "integer",
+          "description": "Current member count at the time of the event."
+        }
+      },
+      "description": "Fired when a join request is rejected by the group owner."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/chat/bsky/moderation/updateActorAccess.json b/lexicons/chat/bsky/moderation/updateActorAccess.json
new file mode 100644
index 0000000000..8e2d711a17
--- /dev/null
+++ b/lexicons/chat/bsky/moderation/updateActorAccess.json
@@ -0,0 +1,32 @@
+{
+  "id": "chat.bsky.moderation.updateActorAccess",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "input": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "actor",
+            "allowAccess"
+          ],
+          "properties": {
+            "ref": {
+              "type": "string"
+            },
+            "actor": {
+              "type": "string",
+              "format": "did"
+            },
+            "allowAccess": {
+              "type": "boolean"
+            }
+          }
+        },
+        "encoding": "application/json"
+      }
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/chat/bsky/notification/defs.json b/lexicons/chat/bsky/notification/defs.json
new file mode 100644
index 0000000000..927f7242de
--- /dev/null
+++ b/lexicons/chat/bsky/notification/defs.json
@@ -0,0 +1,43 @@
+{
+  "id": "chat.bsky.notification.defs",
+  "defs": {
+    "preferences": {
+      "type": "object",
+      "required": [
+        "chat",
+        "chatRequest"
+      ],
+      "properties": {
+        "chat": {
+          "ref": "#chatPreference",
+          "type": "ref"
+        },
+        "chatRequest": {
+          "ref": "#chatPreference",
+          "type": "ref"
+        }
+      }
+    },
+    "chatPreference": {
+      "type": "object",
+      "required": [
+        "include",
+        "push"
+      ],
+      "properties": {
+        "push": {
+          "type": "boolean"
+        },
+        "include": {
+          "type": "string",
+          "knownValues": [
+            "all",
+            "follows"
+          ]
+        }
+      }
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/chat/bsky/notification/getPreferences.json b/lexicons/chat/bsky/notification/getPreferences.json
new file mode 100644
index 0000000000..e1924b0ea9
--- /dev/null
+++ b/lexicons/chat/bsky/notification/getPreferences.json
@@ -0,0 +1,26 @@
+{
+  "id": "chat.bsky.notification.getPreferences",
+  "defs": {
+    "main": {
+      "type": "query",
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "preferences"
+          ],
+          "properties": {
+            "preferences": {
+              "ref": "chat.bsky.notification.defs#preferences",
+              "type": "ref"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "description": "Get the requesting account's chat notification preferences. Defaults are returned for accounts that have not set any preferences. Requires auth."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/chat/bsky/notification/putPreferences.json b/lexicons/chat/bsky/notification/putPreferences.json
new file mode 100644
index 0000000000..1d278ddb8a
--- /dev/null
+++ b/lexicons/chat/bsky/notification/putPreferences.json
@@ -0,0 +1,42 @@
+{
+  "id": "chat.bsky.notification.putPreferences",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "input": {
+        "schema": {
+          "type": "object",
+          "properties": {
+            "chat": {
+              "ref": "chat.bsky.notification.defs#chatPreference",
+              "type": "ref"
+            },
+            "chatRequest": {
+              "ref": "chat.bsky.notification.defs#chatPreference",
+              "type": "ref"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "preferences"
+          ],
+          "properties": {
+            "preferences": {
+              "ref": "chat.bsky.notification.defs#preferences",
+              "type": "ref"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "description": "Set the requesting account's chat notification preferences. Only the provided preferences are updated; omitted preferences are left unchanged."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/com/atproto/admin/defs.json b/lexicons/com/atproto/admin/defs.json
new file mode 100644
index 0000000000..ee74d849c7
--- /dev/null
+++ b/lexicons/com/atproto/admin/defs.json
@@ -0,0 +1,132 @@
+{
+  "id": "com.atproto.admin.defs",
+  "defs": {
+    "repoRef": {
+      "type": "object",
+      "required": [
+        "did"
+      ],
+      "properties": {
+        "did": {
+          "type": "string",
+          "format": "did"
+        }
+      }
+    },
+    "statusAttr": {
+      "type": "object",
+      "required": [
+        "applied"
+      ],
+      "properties": {
+        "ref": {
+          "type": "string"
+        },
+        "applied": {
+          "type": "boolean"
+        }
+      }
+    },
+    "accountView": {
+      "type": "object",
+      "required": [
+        "did",
+        "handle",
+        "indexedAt"
+      ],
+      "properties": {
+        "did": {
+          "type": "string",
+          "format": "did"
+        },
+        "email": {
+          "type": "string"
+        },
+        "handle": {
+          "type": "string",
+          "format": "handle"
+        },
+        "invites": {
+          "type": "array",
+          "items": {
+            "ref": "com.atproto.server.defs#inviteCode",
+            "type": "ref"
+          }
+        },
+        "indexedAt": {
+          "type": "string",
+          "format": "datetime"
+        },
+        "invitedBy": {
+          "ref": "com.atproto.server.defs#inviteCode",
+          "type": "ref"
+        },
+        "inviteNote": {
+          "type": "string"
+        },
+        "deactivatedAt": {
+          "type": "string",
+          "format": "datetime"
+        },
+        "relatedRecords": {
+          "type": "array",
+          "items": {
+            "type": "unknown"
+          }
+        },
+        "invitesDisabled": {
+          "type": "boolean"
+        },
+        "emailConfirmedAt": {
+          "type": "string",
+          "format": "datetime"
+        },
+        "threatSignatures": {
+          "type": "array",
+          "items": {
+            "ref": "#threatSignature",
+            "type": "ref"
+          }
+        }
+      }
+    },
+    "repoBlobRef": {
+      "type": "object",
+      "required": [
+        "did",
+        "cid"
+      ],
+      "properties": {
+        "cid": {
+          "type": "string",
+          "format": "cid"
+        },
+        "did": {
+          "type": "string",
+          "format": "did"
+        },
+        "recordUri": {
+          "type": "string",
+          "format": "at-uri"
+        }
+      }
+    },
+    "threatSignature": {
+      "type": "object",
+      "required": [
+        "property",
+        "value"
+      ],
+      "properties": {
+        "value": {
+          "type": "string"
+        },
+        "property": {
+          "type": "string"
+        }
+      }
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/com/atproto/admin/deleteAccount.json b/lexicons/com/atproto/admin/deleteAccount.json
new file mode 100644
index 0000000000..33497c78c1
--- /dev/null
+++ b/lexicons/com/atproto/admin/deleteAccount.json
@@ -0,0 +1,26 @@
+{
+  "id": "com.atproto.admin.deleteAccount",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "input": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "did"
+          ],
+          "properties": {
+            "did": {
+              "type": "string",
+              "format": "did"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "description": "Delete a user account as an administrator."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/com/atproto/admin/disableAccountInvites.json b/lexicons/com/atproto/admin/disableAccountInvites.json
new file mode 100644
index 0000000000..3263b02e14
--- /dev/null
+++ b/lexicons/com/atproto/admin/disableAccountInvites.json
@@ -0,0 +1,30 @@
+{
+  "id": "com.atproto.admin.disableAccountInvites",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "input": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "account"
+          ],
+          "properties": {
+            "note": {
+              "type": "string",
+              "description": "Optional reason for disabled invites."
+            },
+            "account": {
+              "type": "string",
+              "format": "did"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "description": "Disable an account from receiving new invite codes, but does not invalidate existing codes."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/com/atproto/admin/disableInviteCodes.json b/lexicons/com/atproto/admin/disableInviteCodes.json
new file mode 100644
index 0000000000..97ed72bd54
--- /dev/null
+++ b/lexicons/com/atproto/admin/disableInviteCodes.json
@@ -0,0 +1,31 @@
+{
+  "id": "com.atproto.admin.disableInviteCodes",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "input": {
+        "schema": {
+          "type": "object",
+          "properties": {
+            "codes": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            "accounts": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "description": "Disable some set of codes and/or all codes associated with a set of users."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/com/atproto/admin/enableAccountInvites.json b/lexicons/com/atproto/admin/enableAccountInvites.json
new file mode 100644
index 0000000000..d7bc1f7dd2
--- /dev/null
+++ b/lexicons/com/atproto/admin/enableAccountInvites.json
@@ -0,0 +1,30 @@
+{
+  "id": "com.atproto.admin.enableAccountInvites",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "input": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "account"
+          ],
+          "properties": {
+            "note": {
+              "type": "string",
+              "description": "Optional reason for enabled invites."
+            },
+            "account": {
+              "type": "string",
+              "format": "did"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "description": "Re-enable an account's ability to receive invite codes."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/com/atproto/admin/getAccountInfo.json b/lexicons/com/atproto/admin/getAccountInfo.json
new file mode 100644
index 0000000000..d64dd43920
--- /dev/null
+++ b/lexicons/com/atproto/admin/getAccountInfo.json
@@ -0,0 +1,30 @@
+{
+  "id": "com.atproto.admin.getAccountInfo",
+  "defs": {
+    "main": {
+      "type": "query",
+      "output": {
+        "schema": {
+          "ref": "com.atproto.admin.defs#accountView",
+          "type": "ref"
+        },
+        "encoding": "application/json"
+      },
+      "parameters": {
+        "type": "params",
+        "required": [
+          "did"
+        ],
+        "properties": {
+          "did": {
+            "type": "string",
+            "format": "did"
+          }
+        }
+      },
+      "description": "Get details about an account."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/com/atproto/admin/getAccountInfos.json b/lexicons/com/atproto/admin/getAccountInfos.json
new file mode 100644
index 0000000000..b23ec065f8
--- /dev/null
+++ b/lexicons/com/atproto/admin/getAccountInfos.json
@@ -0,0 +1,44 @@
+{
+  "id": "com.atproto.admin.getAccountInfos",
+  "defs": {
+    "main": {
+      "type": "query",
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "infos"
+          ],
+          "properties": {
+            "infos": {
+              "type": "array",
+              "items": {
+                "ref": "com.atproto.admin.defs#accountView",
+                "type": "ref"
+              }
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "parameters": {
+        "type": "params",
+        "required": [
+          "dids"
+        ],
+        "properties": {
+          "dids": {
+            "type": "array",
+            "items": {
+              "type": "string",
+              "format": "did"
+            }
+          }
+        }
+      },
+      "description": "Get details about some accounts."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/com/atproto/admin/getInviteCodes.json b/lexicons/com/atproto/admin/getInviteCodes.json
new file mode 100644
index 0000000000..085de7dfdf
--- /dev/null
+++ b/lexicons/com/atproto/admin/getInviteCodes.json
@@ -0,0 +1,54 @@
+{
+  "id": "com.atproto.admin.getInviteCodes",
+  "defs": {
+    "main": {
+      "type": "query",
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "codes"
+          ],
+          "properties": {
+            "codes": {
+              "type": "array",
+              "items": {
+                "ref": "com.atproto.server.defs#inviteCode",
+                "type": "ref"
+              }
+            },
+            "cursor": {
+              "type": "string"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "parameters": {
+        "type": "params",
+        "properties": {
+          "sort": {
+            "type": "string",
+            "default": "recent",
+            "knownValues": [
+              "recent",
+              "usage"
+            ]
+          },
+          "limit": {
+            "type": "integer",
+            "default": 100,
+            "maximum": 500,
+            "minimum": 1
+          },
+          "cursor": {
+            "type": "string"
+          }
+        }
+      },
+      "description": "Get an admin view of invite codes."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/com/atproto/admin/getSubjectStatus.json b/lexicons/com/atproto/admin/getSubjectStatus.json
new file mode 100644
index 0000000000..ad10fd9d45
--- /dev/null
+++ b/lexicons/com/atproto/admin/getSubjectStatus.json
@@ -0,0 +1,55 @@
+{
+  "id": "com.atproto.admin.getSubjectStatus",
+  "defs": {
+    "main": {
+      "type": "query",
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "subject"
+          ],
+          "properties": {
+            "subject": {
+              "refs": [
+                "com.atproto.admin.defs#repoRef",
+                "com.atproto.repo.strongRef",
+                "com.atproto.admin.defs#repoBlobRef"
+              ],
+              "type": "union"
+            },
+            "takedown": {
+              "ref": "com.atproto.admin.defs#statusAttr",
+              "type": "ref"
+            },
+            "deactivated": {
+              "ref": "com.atproto.admin.defs#statusAttr",
+              "type": "ref"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "parameters": {
+        "type": "params",
+        "properties": {
+          "did": {
+            "type": "string",
+            "format": "did"
+          },
+          "uri": {
+            "type": "string",
+            "format": "at-uri"
+          },
+          "blob": {
+            "type": "string",
+            "format": "cid"
+          }
+        }
+      },
+      "description": "Get the service-specific admin status of a subject (account, record, or blob)."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/com/atproto/admin/searchAccounts.json b/lexicons/com/atproto/admin/searchAccounts.json
new file mode 100644
index 0000000000..57770a2f87
--- /dev/null
+++ b/lexicons/com/atproto/admin/searchAccounts.json
@@ -0,0 +1,49 @@
+{
+  "id": "com.atproto.admin.searchAccounts",
+  "defs": {
+    "main": {
+      "type": "query",
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "accounts"
+          ],
+          "properties": {
+            "cursor": {
+              "type": "string"
+            },
+            "accounts": {
+              "type": "array",
+              "items": {
+                "ref": "com.atproto.admin.defs#accountView",
+                "type": "ref"
+              }
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "parameters": {
+        "type": "params",
+        "properties": {
+          "email": {
+            "type": "string"
+          },
+          "limit": {
+            "type": "integer",
+            "default": 50,
+            "maximum": 100,
+            "minimum": 1
+          },
+          "cursor": {
+            "type": "string"
+          }
+        }
+      },
+      "description": "Get list of accounts that matches your search query."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/com/atproto/admin/sendEmail.json b/lexicons/com/atproto/admin/sendEmail.json
new file mode 100644
index 0000000000..d619342572
--- /dev/null
+++ b/lexicons/com/atproto/admin/sendEmail.json
@@ -0,0 +1,56 @@
+{
+  "id": "com.atproto.admin.sendEmail",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "input": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "recipientDid",
+            "content",
+            "senderDid"
+          ],
+          "properties": {
+            "comment": {
+              "type": "string",
+              "description": "Additional comment by the sender that won't be used in the email itself but helpful to provide more context for moderators/reviewers"
+            },
+            "content": {
+              "type": "string"
+            },
+            "subject": {
+              "type": "string"
+            },
+            "senderDid": {
+              "type": "string",
+              "format": "did"
+            },
+            "recipientDid": {
+              "type": "string",
+              "format": "did"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "sent"
+          ],
+          "properties": {
+            "sent": {
+              "type": "boolean"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "description": "Send email to a user's account email address."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/com/atproto/admin/updateAccountEmail.json b/lexicons/com/atproto/admin/updateAccountEmail.json
new file mode 100644
index 0000000000..e42c2320fb
--- /dev/null
+++ b/lexicons/com/atproto/admin/updateAccountEmail.json
@@ -0,0 +1,31 @@
+{
+  "id": "com.atproto.admin.updateAccountEmail",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "input": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "account",
+            "email"
+          ],
+          "properties": {
+            "email": {
+              "type": "string"
+            },
+            "account": {
+              "type": "string",
+              "format": "at-identifier",
+              "description": "The handle or DID of the repo."
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "description": "Administrative action to update an account's email."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/com/atproto/admin/updateAccountHandle.json b/lexicons/com/atproto/admin/updateAccountHandle.json
new file mode 100644
index 0000000000..aa1cc6d593
--- /dev/null
+++ b/lexicons/com/atproto/admin/updateAccountHandle.json
@@ -0,0 +1,31 @@
+{
+  "id": "com.atproto.admin.updateAccountHandle",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "input": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "did",
+            "handle"
+          ],
+          "properties": {
+            "did": {
+              "type": "string",
+              "format": "did"
+            },
+            "handle": {
+              "type": "string",
+              "format": "handle"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "description": "Administrative action to update an account's handle."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/com/atproto/admin/updateAccountPassword.json b/lexicons/com/atproto/admin/updateAccountPassword.json
new file mode 100644
index 0000000000..c87cf4e198
--- /dev/null
+++ b/lexicons/com/atproto/admin/updateAccountPassword.json
@@ -0,0 +1,30 @@
+{
+  "id": "com.atproto.admin.updateAccountPassword",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "input": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "did",
+            "password"
+          ],
+          "properties": {
+            "did": {
+              "type": "string",
+              "format": "did"
+            },
+            "password": {
+              "type": "string"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "description": "Update the password for a user account as an administrator."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/com/atproto/admin/updateAccountSigningKey.json b/lexicons/com/atproto/admin/updateAccountSigningKey.json
new file mode 100644
index 0000000000..47f3584b8a
--- /dev/null
+++ b/lexicons/com/atproto/admin/updateAccountSigningKey.json
@@ -0,0 +1,32 @@
+{
+  "id": "com.atproto.admin.updateAccountSigningKey",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "input": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "did",
+            "signingKey"
+          ],
+          "properties": {
+            "did": {
+              "type": "string",
+              "format": "did"
+            },
+            "signingKey": {
+              "type": "string",
+              "format": "did",
+              "description": "Did-key formatted public key"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "description": "Administrative action to update an account's signing key in their Did document."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/com/atproto/admin/updateSubjectStatus.json b/lexicons/com/atproto/admin/updateSubjectStatus.json
new file mode 100644
index 0000000000..35ba17b451
--- /dev/null
+++ b/lexicons/com/atproto/admin/updateSubjectStatus.json
@@ -0,0 +1,61 @@
+{
+  "id": "com.atproto.admin.updateSubjectStatus",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "input": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "subject"
+          ],
+          "properties": {
+            "subject": {
+              "refs": [
+                "com.atproto.admin.defs#repoRef",
+                "com.atproto.repo.strongRef",
+                "com.atproto.admin.defs#repoBlobRef"
+              ],
+              "type": "union"
+            },
+            "takedown": {
+              "ref": "com.atproto.admin.defs#statusAttr",
+              "type": "ref"
+            },
+            "deactivated": {
+              "ref": "com.atproto.admin.defs#statusAttr",
+              "type": "ref"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "subject"
+          ],
+          "properties": {
+            "subject": {
+              "refs": [
+                "com.atproto.admin.defs#repoRef",
+                "com.atproto.repo.strongRef",
+                "com.atproto.admin.defs#repoBlobRef"
+              ],
+              "type": "union"
+            },
+            "takedown": {
+              "ref": "com.atproto.admin.defs#statusAttr",
+              "type": "ref"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "description": "Update the service-specific admin status of a subject (account, record, or blob)."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/com/atproto/identity/defs.json b/lexicons/com/atproto/identity/defs.json
new file mode 100644
index 0000000000..3ee467f515
--- /dev/null
+++ b/lexicons/com/atproto/identity/defs.json
@@ -0,0 +1,30 @@
+{
+  "id": "com.atproto.identity.defs",
+  "defs": {
+    "identityInfo": {
+      "type": "object",
+      "required": [
+        "did",
+        "handle",
+        "didDoc"
+      ],
+      "properties": {
+        "did": {
+          "type": "string",
+          "format": "did"
+        },
+        "didDoc": {
+          "type": "unknown",
+          "description": "The complete DID document for the identity."
+        },
+        "handle": {
+          "type": "string",
+          "format": "handle",
+          "description": "The validated handle of the account; or 'handle.invalid' if the handle did not bi-directionally match the DID document."
+        }
+      }
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/com/atproto/identity/getRecommendedDidCredentials.json b/lexicons/com/atproto/identity/getRecommendedDidCredentials.json
new file mode 100644
index 0000000000..057c62e481
--- /dev/null
+++ b/lexicons/com/atproto/identity/getRecommendedDidCredentials.json
@@ -0,0 +1,38 @@
+{
+  "id": "com.atproto.identity.getRecommendedDidCredentials",
+  "defs": {
+    "main": {
+      "type": "query",
+      "output": {
+        "schema": {
+          "type": "object",
+          "properties": {
+            "services": {
+              "type": "unknown"
+            },
+            "alsoKnownAs": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            "rotationKeys": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              },
+              "description": "Recommended rotation keys for PLC dids. Should be undefined (or ignored) for did:webs."
+            },
+            "verificationMethods": {
+              "type": "unknown"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "description": "Describe the credentials that should be included in the DID doc of an account that is migrating to this service."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/com/atproto/identity/refreshIdentity.json b/lexicons/com/atproto/identity/refreshIdentity.json
new file mode 100644
index 0000000000..5dd7fe46b6
--- /dev/null
+++ b/lexicons/com/atproto/identity/refreshIdentity.json
@@ -0,0 +1,47 @@
+{
+  "id": "com.atproto.identity.refreshIdentity",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "input": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "identifier"
+          ],
+          "properties": {
+            "identifier": {
+              "type": "string",
+              "format": "at-identifier"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "errors": [
+        {
+          "name": "HandleNotFound",
+          "description": "The resolution process confirmed that the handle does not resolve to any DID."
+        },
+        {
+          "name": "DidNotFound",
+          "description": "The DID resolution process confirmed that there is no current DID."
+        },
+        {
+          "name": "DidDeactivated",
+          "description": "The DID previously existed, but has been deactivated."
+        }
+      ],
+      "output": {
+        "schema": {
+          "ref": "com.atproto.identity.defs#identityInfo",
+          "type": "ref"
+        },
+        "encoding": "application/json"
+      },
+      "description": "Request that the server re-resolve an identity (DID and handle). The server may ignore this request, or require authentication, depending on the role, implementation, and policy of the server."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/com/atproto/identity/requestPlcOperationSignature.json b/lexicons/com/atproto/identity/requestPlcOperationSignature.json
new file mode 100644
index 0000000000..0d79ffc7aa
--- /dev/null
+++ b/lexicons/com/atproto/identity/requestPlcOperationSignature.json
@@ -0,0 +1,11 @@
+{
+  "id": "com.atproto.identity.requestPlcOperationSignature",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "description": "Request an email with a code to in order to request a signed PLC operation. Requires Auth."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/com/atproto/identity/resolveDid.json b/lexicons/com/atproto/identity/resolveDid.json
new file mode 100644
index 0000000000..e6e8c88d90
--- /dev/null
+++ b/lexicons/com/atproto/identity/resolveDid.json
@@ -0,0 +1,49 @@
+{
+  "id": "com.atproto.identity.resolveDid",
+  "defs": {
+    "main": {
+      "type": "query",
+      "errors": [
+        {
+          "name": "DidNotFound",
+          "description": "The DID resolution process confirmed that there is no current DID."
+        },
+        {
+          "name": "DidDeactivated",
+          "description": "The DID previously existed, but has been deactivated."
+        }
+      ],
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "didDoc"
+          ],
+          "properties": {
+            "didDoc": {
+              "type": "unknown",
+              "description": "The complete DID document for the identity."
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "parameters": {
+        "type": "params",
+        "required": [
+          "did"
+        ],
+        "properties": {
+          "did": {
+            "type": "string",
+            "format": "did",
+            "description": "DID to resolve."
+          }
+        }
+      },
+      "description": "Resolves DID to DID document. Does not bi-directionally verify handle."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/com/atproto/identity/resolveHandle.json b/lexicons/com/atproto/identity/resolveHandle.json
new file mode 100644
index 0000000000..855e1b9827
--- /dev/null
+++ b/lexicons/com/atproto/identity/resolveHandle.json
@@ -0,0 +1,45 @@
+{
+  "id": "com.atproto.identity.resolveHandle",
+  "defs": {
+    "main": {
+      "type": "query",
+      "errors": [
+        {
+          "name": "HandleNotFound",
+          "description": "The resolution process confirmed that the handle does not resolve to any DID."
+        }
+      ],
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "did"
+          ],
+          "properties": {
+            "did": {
+              "type": "string",
+              "format": "did"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "parameters": {
+        "type": "params",
+        "required": [
+          "handle"
+        ],
+        "properties": {
+          "handle": {
+            "type": "string",
+            "format": "handle",
+            "description": "The handle to resolve."
+          }
+        }
+      },
+      "description": "Resolves an atproto handle (hostname) to a DID. Does not necessarily bi-directionally verify against the the DID document."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/com/atproto/identity/resolveIdentity.json b/lexicons/com/atproto/identity/resolveIdentity.json
new file mode 100644
index 0000000000..4da92470e3
--- /dev/null
+++ b/lexicons/com/atproto/identity/resolveIdentity.json
@@ -0,0 +1,45 @@
+{
+  "id": "com.atproto.identity.resolveIdentity",
+  "defs": {
+    "main": {
+      "type": "query",
+      "errors": [
+        {
+          "name": "HandleNotFound",
+          "description": "The resolution process confirmed that the handle does not resolve to any DID."
+        },
+        {
+          "name": "DidNotFound",
+          "description": "The DID resolution process confirmed that there is no current DID."
+        },
+        {
+          "name": "DidDeactivated",
+          "description": "The DID previously existed, but has been deactivated."
+        }
+      ],
+      "output": {
+        "schema": {
+          "ref": "com.atproto.identity.defs#identityInfo",
+          "type": "ref"
+        },
+        "encoding": "application/json"
+      },
+      "parameters": {
+        "type": "params",
+        "required": [
+          "identifier"
+        ],
+        "properties": {
+          "identifier": {
+            "type": "string",
+            "format": "at-identifier",
+            "description": "Handle or DID to resolve."
+          }
+        }
+      },
+      "description": "Resolves an identity (DID or Handle) to a full identity (DID document and verified handle)."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/com/atproto/identity/signPlcOperation.json b/lexicons/com/atproto/identity/signPlcOperation.json
new file mode 100644
index 0000000000..0922c60e43
--- /dev/null
+++ b/lexicons/com/atproto/identity/signPlcOperation.json
@@ -0,0 +1,56 @@
+{
+  "id": "com.atproto.identity.signPlcOperation",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "input": {
+        "schema": {
+          "type": "object",
+          "properties": {
+            "token": {
+              "type": "string",
+              "description": "A token received through com.atproto.identity.requestPlcOperationSignature"
+            },
+            "services": {
+              "type": "unknown"
+            },
+            "alsoKnownAs": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            "rotationKeys": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            "verificationMethods": {
+              "type": "unknown"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "operation"
+          ],
+          "properties": {
+            "operation": {
+              "type": "unknown",
+              "description": "A signed DID PLC operation."
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "description": "Signs a PLC operation to update some value(s) in the requesting DID's document."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/com/atproto/identity/submitPlcOperation.json b/lexicons/com/atproto/identity/submitPlcOperation.json
new file mode 100644
index 0000000000..ee0a6b2206
--- /dev/null
+++ b/lexicons/com/atproto/identity/submitPlcOperation.json
@@ -0,0 +1,25 @@
+{
+  "id": "com.atproto.identity.submitPlcOperation",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "input": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "operation"
+          ],
+          "properties": {
+            "operation": {
+              "type": "unknown"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "description": "Validates a PLC operation to ensure that it doesn't violate a service's constraints or get the identity into a bad state, then submits it to the PLC registry"
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/com/atproto/identity/updateHandle.json b/lexicons/com/atproto/identity/updateHandle.json
new file mode 100644
index 0000000000..5ad0daabf7
--- /dev/null
+++ b/lexicons/com/atproto/identity/updateHandle.json
@@ -0,0 +1,27 @@
+{
+  "id": "com.atproto.identity.updateHandle",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "input": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "handle"
+          ],
+          "properties": {
+            "handle": {
+              "type": "string",
+              "format": "handle",
+              "description": "The new handle."
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "description": "Updates the current account's handle. Verifies handle validity, and updates did:plc document if necessary. Implemented by PDS, and requires auth."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/com/atproto/label/defs.json b/lexicons/com/atproto/label/defs.json
new file mode 100644
index 0000000000..4c2a357295
--- /dev/null
+++ b/lexicons/com/atproto/label/defs.json
@@ -0,0 +1,190 @@
+{
+  "id": "com.atproto.label.defs",
+  "defs": {
+    "label": {
+      "type": "object",
+      "required": [
+        "src",
+        "uri",
+        "val",
+        "cts"
+      ],
+      "properties": {
+        "cid": {
+          "type": "string",
+          "format": "cid",
+          "description": "Optionally, CID specifying the specific version of 'uri' resource this label applies to."
+        },
+        "cts": {
+          "type": "string",
+          "format": "datetime",
+          "description": "Timestamp when this label was created."
+        },
+        "exp": {
+          "type": "string",
+          "format": "datetime",
+          "description": "Timestamp at which this label expires (no longer applies)."
+        },
+        "neg": {
+          "type": "boolean",
+          "description": "If true, this is a negation label, overwriting a previous label."
+        },
+        "sig": {
+          "type": "bytes",
+          "description": "Signature of dag-cbor encoded label."
+        },
+        "src": {
+          "type": "string",
+          "format": "did",
+          "description": "DID of the actor who created this label."
+        },
+        "uri": {
+          "type": "string",
+          "format": "uri",
+          "description": "AT URI of the record, repository (account), or other resource that this label applies to."
+        },
+        "val": {
+          "type": "string",
+          "maxLength": 128,
+          "description": "The short string name of the value or type of this label."
+        },
+        "ver": {
+          "type": "integer",
+          "description": "The AT Protocol version of the label object."
+        }
+      },
+      "description": "Metadata tag on an atproto resource (eg, repo or record)."
+    },
+    "selfLabel": {
+      "type": "object",
+      "required": [
+        "val"
+      ],
+      "properties": {
+        "val": {
+          "type": "string",
+          "maxLength": 128,
+          "description": "The short string name of the value or type of this label."
+        }
+      },
+      "description": "Metadata tag on an atproto record, published by the author within the record. Note that schemas should use #selfLabels, not #selfLabel."
+    },
+    "labelValue": {
+      "type": "string",
+      "knownValues": [
+        "!hide",
+        "!warn",
+        "!no-unauthenticated",
+        "porn",
+        "sexual",
+        "nudity",
+        "graphic-media",
+        "bot"
+      ]
+    },
+    "selfLabels": {
+      "type": "object",
+      "required": [
+        "values"
+      ],
+      "properties": {
+        "values": {
+          "type": "array",
+          "items": {
+            "ref": "#selfLabel",
+            "type": "ref"
+          },
+          "maxLength": 10
+        }
+      },
+      "description": "Metadata tags on an atproto record, published by the author within the record."
+    },
+    "labelValueDefinition": {
+      "type": "object",
+      "required": [
+        "identifier",
+        "severity",
+        "blurs",
+        "locales"
+      ],
+      "properties": {
+        "blurs": {
+          "type": "string",
+          "description": "What should this label hide in the UI, if applied? 'content' hides all of the target; 'media' hides the images/video/audio; 'none' hides nothing.",
+          "knownValues": [
+            "content",
+            "media",
+            "none"
+          ]
+        },
+        "locales": {
+          "type": "array",
+          "items": {
+            "ref": "#labelValueDefinitionStrings",
+            "type": "ref"
+          }
+        },
+        "severity": {
+          "type": "string",
+          "description": "How should a client visually convey this label? 'inform' means neutral and informational; 'alert' means negative and warning; 'none' means show nothing.",
+          "knownValues": [
+            "inform",
+            "alert",
+            "none"
+          ]
+        },
+        "adultOnly": {
+          "type": "boolean",
+          "description": "Does the user need to have adult content enabled in order to configure this label?"
+        },
+        "identifier": {
+          "type": "string",
+          "maxLength": 100,
+          "description": "The value of the label being defined. Must only include lowercase ascii and the '-' character ([a-z-]+).",
+          "maxGraphemes": 100
+        },
+        "defaultSetting": {
+          "type": "string",
+          "default": "warn",
+          "description": "The default setting for this label.",
+          "knownValues": [
+            "ignore",
+            "warn",
+            "hide"
+          ]
+        }
+      },
+      "description": "Declares a label value and its expected interpretations and behaviors."
+    },
+    "labelValueDefinitionStrings": {
+      "type": "object",
+      "required": [
+        "lang",
+        "name",
+        "description"
+      ],
+      "properties": {
+        "lang": {
+          "type": "string",
+          "format": "language",
+          "description": "The code of the language these strings are written in."
+        },
+        "name": {
+          "type": "string",
+          "maxLength": 640,
+          "description": "A short human-readable name for the label.",
+          "maxGraphemes": 64
+        },
+        "description": {
+          "type": "string",
+          "maxLength": 100000,
+          "description": "A longer description of what the label means and why it might be applied.",
+          "maxGraphemes": 10000
+        }
+      },
+      "description": "Strings which describe the label in the UI, localized into a specific language."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/com/atproto/label/queryLabels.json b/lexicons/com/atproto/label/queryLabels.json
new file mode 100644
index 0000000000..d147ecbcbc
--- /dev/null
+++ b/lexicons/com/atproto/label/queryLabels.json
@@ -0,0 +1,64 @@
+{
+  "id": "com.atproto.label.queryLabels",
+  "defs": {
+    "main": {
+      "type": "query",
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "labels"
+          ],
+          "properties": {
+            "cursor": {
+              "type": "string"
+            },
+            "labels": {
+              "type": "array",
+              "items": {
+                "ref": "com.atproto.label.defs#label",
+                "type": "ref"
+              }
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "parameters": {
+        "type": "params",
+        "required": [
+          "uriPatterns"
+        ],
+        "properties": {
+          "limit": {
+            "type": "integer",
+            "default": 50,
+            "maximum": 250,
+            "minimum": 1
+          },
+          "cursor": {
+            "type": "string"
+          },
+          "sources": {
+            "type": "array",
+            "items": {
+              "type": "string",
+              "format": "did"
+            },
+            "description": "Optional list of label sources (DIDs) to filter on."
+          },
+          "uriPatterns": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "description": "List of AT URI patterns to match (boolean 'OR'). Each may be a prefix (ending with '*'; will match inclusive of the string leading to '*'), or a full URI."
+          }
+        }
+      },
+      "description": "Find labels relevant to the provided AT-URI patterns. Public endpoint for moderation services, though may return different or additional results with auth."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/com/atproto/label/subscribeLabels.json b/lexicons/com/atproto/label/subscribeLabels.json
new file mode 100644
index 0000000000..984ed19220
--- /dev/null
+++ b/lexicons/com/atproto/label/subscribeLabels.json
@@ -0,0 +1,70 @@
+{
+  "id": "com.atproto.label.subscribeLabels",
+  "defs": {
+    "info": {
+      "type": "object",
+      "required": [
+        "name"
+      ],
+      "properties": {
+        "name": {
+          "type": "string",
+          "knownValues": [
+            "OutdatedCursor"
+          ]
+        },
+        "message": {
+          "type": "string"
+        }
+      }
+    },
+    "main": {
+      "type": "subscription",
+      "errors": [
+        {
+          "name": "FutureCursor"
+        }
+      ],
+      "message": {
+        "schema": {
+          "refs": [
+            "#labels",
+            "#info"
+          ],
+          "type": "union"
+        }
+      },
+      "parameters": {
+        "type": "params",
+        "properties": {
+          "cursor": {
+            "type": "integer",
+            "description": "The last known event seq number to backfill from."
+          }
+        }
+      },
+      "description": "Subscribe to stream of labels (and negations). Public endpoint implemented by mod services. Uses same sequencing scheme as repo event stream."
+    },
+    "labels": {
+      "type": "object",
+      "required": [
+        "seq",
+        "labels"
+      ],
+      "properties": {
+        "seq": {
+          "type": "integer"
+        },
+        "labels": {
+          "type": "array",
+          "items": {
+            "ref": "com.atproto.label.defs#label",
+            "type": "ref"
+          }
+        }
+      }
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/com/atproto/lexicon/resolveLexicon.json b/lexicons/com/atproto/lexicon/resolveLexicon.json
new file mode 100644
index 0000000000..6807a4dcf8
--- /dev/null
+++ b/lexicons/com/atproto/lexicon/resolveLexicon.json
@@ -0,0 +1,58 @@
+{
+  "id": "com.atproto.lexicon.resolveLexicon",
+  "defs": {
+    "main": {
+      "type": "query",
+      "errors": [
+        {
+          "name": "LexiconNotFound",
+          "description": "No lexicon was resolved for the NSID."
+        }
+      ],
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "uri",
+            "cid",
+            "schema"
+          ],
+          "properties": {
+            "cid": {
+              "type": "string",
+              "format": "cid",
+              "description": "The CID of the lexicon schema record."
+            },
+            "uri": {
+              "type": "string",
+              "format": "at-uri",
+              "description": "The AT-URI of the lexicon schema record."
+            },
+            "schema": {
+              "ref": "com.atproto.lexicon.schema#main",
+              "type": "ref",
+              "description": "The resolved lexicon schema record."
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "parameters": {
+        "type": "params",
+        "required": [
+          "nsid"
+        ],
+        "properties": {
+          "nsid": {
+            "type": "string",
+            "format": "nsid",
+            "description": "The lexicon NSID to resolve."
+          }
+        }
+      },
+      "description": "Resolves an atproto lexicon (NSID) to a schema."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/com/atproto/lexicon/schema.json b/lexicons/com/atproto/lexicon/schema.json
new file mode 100644
index 0000000000..824b1086d8
--- /dev/null
+++ b/lexicons/com/atproto/lexicon/schema.json
@@ -0,0 +1,24 @@
+{
+  "id": "com.atproto.lexicon.schema",
+  "defs": {
+    "main": {
+      "key": "nsid",
+      "type": "record",
+      "record": {
+        "type": "object",
+        "required": [
+          "lexicon"
+        ],
+        "properties": {
+          "lexicon": {
+            "type": "integer",
+            "description": "Indicates the 'version' of the Lexicon language. Must be '1' for the current atproto/Lexicon schema system."
+          }
+        }
+      },
+      "description": "Representation of Lexicon schemas themselves, when published as atproto records. Note that the schema language is not defined in Lexicon; this meta schema currently only includes a single version field ('lexicon'). See the atproto specifications for description of the other expected top-level fields ('id', 'defs', etc)."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/com/atproto/moderation/createReport.json b/lexicons/com/atproto/moderation/createReport.json
new file mode 100644
index 0000000000..ee6f58525f
--- /dev/null
+++ b/lexicons/com/atproto/moderation/createReport.json
@@ -0,0 +1,104 @@
+{
+  "id": "com.atproto.moderation.createReport",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "input": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "reasonType",
+            "subject"
+          ],
+          "properties": {
+            "reason": {
+              "type": "string",
+              "maxLength": 20000,
+              "description": "Additional context about the content and violation.",
+              "maxGraphemes": 2000
+            },
+            "modTool": {
+              "ref": "#modTool",
+              "type": "ref"
+            },
+            "subject": {
+              "refs": [
+                "com.atproto.admin.defs#repoRef",
+                "com.atproto.repo.strongRef"
+              ],
+              "type": "union"
+            },
+            "reasonType": {
+              "ref": "com.atproto.moderation.defs#reasonType",
+              "type": "ref",
+              "description": "Indicates the broad category of violation the report is for."
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "id",
+            "reasonType",
+            "subject",
+            "reportedBy",
+            "createdAt"
+          ],
+          "properties": {
+            "id": {
+              "type": "integer"
+            },
+            "reason": {
+              "type": "string",
+              "maxLength": 20000,
+              "maxGraphemes": 2000
+            },
+            "subject": {
+              "refs": [
+                "com.atproto.admin.defs#repoRef",
+                "com.atproto.repo.strongRef"
+              ],
+              "type": "union"
+            },
+            "createdAt": {
+              "type": "string",
+              "format": "datetime"
+            },
+            "reasonType": {
+              "ref": "com.atproto.moderation.defs#reasonType",
+              "type": "ref"
+            },
+            "reportedBy": {
+              "type": "string",
+              "format": "did"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "description": "Submit a moderation report regarding an atproto account or record. Implemented by moderation services (with PDS proxying), and requires auth."
+    },
+    "modTool": {
+      "type": "object",
+      "required": [
+        "name"
+      ],
+      "properties": {
+        "meta": {
+          "type": "unknown",
+          "description": "Additional arbitrary metadata about the source"
+        },
+        "name": {
+          "type": "string",
+          "description": "Name/identifier of the source (e.g., 'bsky-app/android', 'bsky-web/chrome')"
+        }
+      },
+      "description": "Moderation tool information for tracing the source of the action"
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/com/atproto/moderation/defs.json b/lexicons/com/atproto/moderation/defs.json
new file mode 100644
index 0000000000..57fff90b21
--- /dev/null
+++ b/lexicons/com/atproto/moderation/defs.json
@@ -0,0 +1,96 @@
+{
+  "id": "com.atproto.moderation.defs",
+  "defs": {
+    "reasonRude": {
+      "type": "token",
+      "description": "Rude, harassing, explicit, or otherwise unwelcoming behavior. Prefer new lexicon definition `tools.ozone.report.defs#reasonHarassmentOther`."
+    },
+    "reasonSpam": {
+      "type": "token",
+      "description": "Spam: frequent unwanted promotion, replies, mentions. Prefer new lexicon definition `tools.ozone.report.defs#reasonMisleadingSpam`."
+    },
+    "reasonType": {
+      "type": "string",
+      "knownValues": [
+        "com.atproto.moderation.defs#reasonSpam",
+        "com.atproto.moderation.defs#reasonViolation",
+        "com.atproto.moderation.defs#reasonMisleading",
+        "com.atproto.moderation.defs#reasonSexual",
+        "com.atproto.moderation.defs#reasonRude",
+        "com.atproto.moderation.defs#reasonOther",
+        "com.atproto.moderation.defs#reasonAppeal",
+        "tools.ozone.report.defs#reasonAppeal",
+        "tools.ozone.report.defs#reasonOther",
+        "tools.ozone.report.defs#reasonViolenceAnimal",
+        "tools.ozone.report.defs#reasonViolenceThreats",
+        "tools.ozone.report.defs#reasonViolenceGraphicContent",
+        "tools.ozone.report.defs#reasonViolenceGlorification",
+        "tools.ozone.report.defs#reasonViolenceExtremistContent",
+        "tools.ozone.report.defs#reasonViolenceTrafficking",
+        "tools.ozone.report.defs#reasonViolenceOther",
+        "tools.ozone.report.defs#reasonSexualAbuseContent",
+        "tools.ozone.report.defs#reasonSexualNCII",
+        "tools.ozone.report.defs#reasonSexualDeepfake",
+        "tools.ozone.report.defs#reasonSexualAnimal",
+        "tools.ozone.report.defs#reasonSexualUnlabeled",
+        "tools.ozone.report.defs#reasonSexualOther",
+        "tools.ozone.report.defs#reasonChildSafetyCSAM",
+        "tools.ozone.report.defs#reasonChildSafetyGroom",
+        "tools.ozone.report.defs#reasonChildSafetyPrivacy",
+        "tools.ozone.report.defs#reasonChildSafetyHarassment",
+        "tools.ozone.report.defs#reasonChildSafetyOther",
+        "tools.ozone.report.defs#reasonHarassmentTroll",
+        "tools.ozone.report.defs#reasonHarassmentTargeted",
+        "tools.ozone.report.defs#reasonHarassmentHateSpeech",
+        "tools.ozone.report.defs#reasonHarassmentDoxxing",
+        "tools.ozone.report.defs#reasonHarassmentOther",
+        "tools.ozone.report.defs#reasonMisleadingBot",
+        "tools.ozone.report.defs#reasonMisleadingImpersonation",
+        "tools.ozone.report.defs#reasonMisleadingSpam",
+        "tools.ozone.report.defs#reasonMisleadingScam",
+        "tools.ozone.report.defs#reasonMisleadingElections",
+        "tools.ozone.report.defs#reasonMisleadingOther",
+        "tools.ozone.report.defs#reasonRuleSiteSecurity",
+        "tools.ozone.report.defs#reasonRuleProhibitedSales",
+        "tools.ozone.report.defs#reasonRuleBanEvasion",
+        "tools.ozone.report.defs#reasonRuleOther",
+        "tools.ozone.report.defs#reasonSelfHarmContent",
+        "tools.ozone.report.defs#reasonSelfHarmED",
+        "tools.ozone.report.defs#reasonSelfHarmStunts",
+        "tools.ozone.report.defs#reasonSelfHarmSubstances",
+        "tools.ozone.report.defs#reasonSelfHarmOther"
+      ]
+    },
+    "reasonOther": {
+      "type": "token",
+      "description": "Reports not falling under another report category. Prefer new lexicon definition `tools.ozone.report.defs#reasonOther`."
+    },
+    "subjectType": {
+      "type": "string",
+      "description": "Tag describing a type of subject that might be reported.",
+      "knownValues": [
+        "account",
+        "record",
+        "chat"
+      ]
+    },
+    "reasonAppeal": {
+      "type": "token",
+      "description": "Appeal a previously taken moderation action"
+    },
+    "reasonSexual": {
+      "type": "token",
+      "description": "Unwanted or mislabeled sexual content. Prefer new lexicon definition `tools.ozone.report.defs#reasonSexualUnlabeled`."
+    },
+    "reasonViolation": {
+      "type": "token",
+      "description": "Direct violation of server rules, laws, terms of service. Prefer new lexicon definition `tools.ozone.report.defs#reasonRuleOther`."
+    },
+    "reasonMisleading": {
+      "type": "token",
+      "description": "Misleading identity, affiliation, or content. Prefer new lexicon definition `tools.ozone.report.defs#reasonMisleadingOther`."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/com/atproto/repo/applyWrites.json b/lexicons/com/atproto/repo/applyWrites.json
new file mode 100644
index 0000000000..f82bf2ba88
--- /dev/null
+++ b/lexicons/com/atproto/repo/applyWrites.json
@@ -0,0 +1,196 @@
+{
+  "id": "com.atproto.repo.applyWrites",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "input": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "repo",
+            "writes"
+          ],
+          "properties": {
+            "repo": {
+              "type": "string",
+              "format": "at-identifier",
+              "description": "The handle or DID of the repo (aka, current account)."
+            },
+            "writes": {
+              "type": "array",
+              "items": {
+                "refs": [
+                  "#create",
+                  "#update",
+                  "#delete"
+                ],
+                "type": "union",
+                "closed": true
+              }
+            },
+            "validate": {
+              "type": "boolean",
+              "description": "Can be set to 'false' to skip Lexicon schema validation of record data across all operations, 'true' to require it, or leave unset to validate only for known Lexicons."
+            },
+            "swapCommit": {
+              "type": "string",
+              "format": "cid",
+              "description": "If provided, the entire operation will fail if the current repo commit CID does not match this value. Used to prevent conflicting repo mutations."
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "errors": [
+        {
+          "name": "InvalidSwap",
+          "description": "Indicates that the 'swapCommit' parameter did not match current commit."
+        }
+      ],
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [],
+          "properties": {
+            "commit": {
+              "ref": "com.atproto.repo.defs#commitMeta",
+              "type": "ref"
+            },
+            "results": {
+              "type": "array",
+              "items": {
+                "refs": [
+                  "#createResult",
+                  "#updateResult",
+                  "#deleteResult"
+                ],
+                "type": "union",
+                "closed": true
+              }
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "description": "Apply a batch transaction of repository creates, updates, and deletes. Requires auth, implemented by PDS."
+    },
+    "create": {
+      "type": "object",
+      "required": [
+        "collection",
+        "value"
+      ],
+      "properties": {
+        "rkey": {
+          "type": "string",
+          "format": "record-key",
+          "maxLength": 512,
+          "description": "NOTE: maxLength is redundant with record-key format. Keeping it temporarily to ensure backwards compatibility."
+        },
+        "value": {
+          "type": "unknown"
+        },
+        "collection": {
+          "type": "string",
+          "format": "nsid"
+        }
+      },
+      "description": "Operation which creates a new record."
+    },
+    "delete": {
+      "type": "object",
+      "required": [
+        "collection",
+        "rkey"
+      ],
+      "properties": {
+        "rkey": {
+          "type": "string",
+          "format": "record-key"
+        },
+        "collection": {
+          "type": "string",
+          "format": "nsid"
+        }
+      },
+      "description": "Operation which deletes an existing record."
+    },
+    "update": {
+      "type": "object",
+      "required": [
+        "collection",
+        "rkey",
+        "value"
+      ],
+      "properties": {
+        "rkey": {
+          "type": "string",
+          "format": "record-key"
+        },
+        "value": {
+          "type": "unknown"
+        },
+        "collection": {
+          "type": "string",
+          "format": "nsid"
+        }
+      },
+      "description": "Operation which updates an existing record."
+    },
+    "createResult": {
+      "type": "object",
+      "required": [
+        "uri",
+        "cid"
+      ],
+      "properties": {
+        "cid": {
+          "type": "string",
+          "format": "cid"
+        },
+        "uri": {
+          "type": "string",
+          "format": "at-uri"
+        },
+        "validationStatus": {
+          "type": "string",
+          "knownValues": [
+            "valid",
+            "unknown"
+          ]
+        }
+      }
+    },
+    "deleteResult": {
+      "type": "object",
+      "required": [],
+      "properties": {}
+    },
+    "updateResult": {
+      "type": "object",
+      "required": [
+        "uri",
+        "cid"
+      ],
+      "properties": {
+        "cid": {
+          "type": "string",
+          "format": "cid"
+        },
+        "uri": {
+          "type": "string",
+          "format": "at-uri"
+        },
+        "validationStatus": {
+          "type": "string",
+          "knownValues": [
+            "valid",
+            "unknown"
+          ]
+        }
+      }
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/com/atproto/repo/createRecord.json b/lexicons/com/atproto/repo/createRecord.json
new file mode 100644
index 0000000000..2483457b9e
--- /dev/null
+++ b/lexicons/com/atproto/repo/createRecord.json
@@ -0,0 +1,90 @@
+{
+  "id": "com.atproto.repo.createRecord",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "input": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "repo",
+            "collection",
+            "record"
+          ],
+          "properties": {
+            "repo": {
+              "type": "string",
+              "format": "at-identifier",
+              "description": "The handle or DID of the repo (aka, current account)."
+            },
+            "rkey": {
+              "type": "string",
+              "format": "record-key",
+              "maxLength": 512,
+              "description": "The Record Key."
+            },
+            "record": {
+              "type": "unknown",
+              "description": "The record itself. Must contain a $type field."
+            },
+            "validate": {
+              "type": "boolean",
+              "description": "Can be set to 'false' to skip Lexicon schema validation of record data, 'true' to require it, or leave unset to validate only for known Lexicons."
+            },
+            "collection": {
+              "type": "string",
+              "format": "nsid",
+              "description": "The NSID of the record collection."
+            },
+            "swapCommit": {
+              "type": "string",
+              "format": "cid",
+              "description": "Compare and swap with the previous commit by CID."
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "errors": [
+        {
+          "name": "InvalidSwap",
+          "description": "Indicates that 'swapCommit' didn't match current repo commit."
+        }
+      ],
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "uri",
+            "cid"
+          ],
+          "properties": {
+            "cid": {
+              "type": "string",
+              "format": "cid"
+            },
+            "uri": {
+              "type": "string",
+              "format": "at-uri"
+            },
+            "commit": {
+              "ref": "com.atproto.repo.defs#commitMeta",
+              "type": "ref"
+            },
+            "validationStatus": {
+              "type": "string",
+              "knownValues": [
+                "valid",
+                "unknown"
+              ]
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "description": "Create a single new repository record. Requires auth, implemented by PDS."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/com/atproto/repo/defs.json b/lexicons/com/atproto/repo/defs.json
new file mode 100644
index 0000000000..f0d13f7d45
--- /dev/null
+++ b/lexicons/com/atproto/repo/defs.json
@@ -0,0 +1,24 @@
+{
+  "id": "com.atproto.repo.defs",
+  "defs": {
+    "commitMeta": {
+      "type": "object",
+      "required": [
+        "cid",
+        "rev"
+      ],
+      "properties": {
+        "cid": {
+          "type": "string",
+          "format": "cid"
+        },
+        "rev": {
+          "type": "string",
+          "format": "tid"
+        }
+      }
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/com/atproto/repo/deleteRecord.json b/lexicons/com/atproto/repo/deleteRecord.json
new file mode 100644
index 0000000000..21a25165de
--- /dev/null
+++ b/lexicons/com/atproto/repo/deleteRecord.json
@@ -0,0 +1,66 @@
+{
+  "id": "com.atproto.repo.deleteRecord",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "input": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "repo",
+            "collection",
+            "rkey"
+          ],
+          "properties": {
+            "repo": {
+              "type": "string",
+              "format": "at-identifier",
+              "description": "The handle or DID of the repo (aka, current account)."
+            },
+            "rkey": {
+              "type": "string",
+              "format": "record-key",
+              "description": "The Record Key."
+            },
+            "collection": {
+              "type": "string",
+              "format": "nsid",
+              "description": "The NSID of the record collection."
+            },
+            "swapCommit": {
+              "type": "string",
+              "format": "cid",
+              "description": "Compare and swap with the previous commit by CID."
+            },
+            "swapRecord": {
+              "type": "string",
+              "format": "cid",
+              "description": "Compare and swap with the previous record by CID."
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "errors": [
+        {
+          "name": "InvalidSwap"
+        }
+      ],
+      "output": {
+        "schema": {
+          "type": "object",
+          "properties": {
+            "commit": {
+              "ref": "com.atproto.repo.defs#commitMeta",
+              "type": "ref"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "description": "Delete a repository record, or ensure it doesn't exist. Requires auth, implemented by PDS."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/com/atproto/repo/describeRepo.json b/lexicons/com/atproto/repo/describeRepo.json
new file mode 100644
index 0000000000..05e9cb42cd
--- /dev/null
+++ b/lexicons/com/atproto/repo/describeRepo.json
@@ -0,0 +1,63 @@
+{
+  "id": "com.atproto.repo.describeRepo",
+  "defs": {
+    "main": {
+      "type": "query",
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "handle",
+            "did",
+            "didDoc",
+            "collections",
+            "handleIsCorrect"
+          ],
+          "properties": {
+            "did": {
+              "type": "string",
+              "format": "did"
+            },
+            "didDoc": {
+              "type": "unknown",
+              "description": "The complete DID document for this account."
+            },
+            "handle": {
+              "type": "string",
+              "format": "handle"
+            },
+            "collections": {
+              "type": "array",
+              "items": {
+                "type": "string",
+                "format": "nsid"
+              },
+              "description": "List of all the collections (NSIDs) for which this repo contains at least one record."
+            },
+            "handleIsCorrect": {
+              "type": "boolean",
+              "description": "Indicates if handle is currently valid (resolves bi-directionally)"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "parameters": {
+        "type": "params",
+        "required": [
+          "repo"
+        ],
+        "properties": {
+          "repo": {
+            "type": "string",
+            "format": "at-identifier",
+            "description": "The handle or DID of the repo."
+          }
+        }
+      },
+      "description": "Get information about an account and repository, including the list of collections. Does not require auth."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/com/atproto/repo/getRecord.json b/lexicons/com/atproto/repo/getRecord.json
new file mode 100644
index 0000000000..ffbaf8ee74
--- /dev/null
+++ b/lexicons/com/atproto/repo/getRecord.json
@@ -0,0 +1,69 @@
+{
+  "id": "com.atproto.repo.getRecord",
+  "defs": {
+    "main": {
+      "type": "query",
+      "errors": [
+        {
+          "name": "RecordNotFound"
+        }
+      ],
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "uri",
+            "value"
+          ],
+          "properties": {
+            "cid": {
+              "type": "string",
+              "format": "cid"
+            },
+            "uri": {
+              "type": "string",
+              "format": "at-uri"
+            },
+            "value": {
+              "type": "unknown"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "parameters": {
+        "type": "params",
+        "required": [
+          "repo",
+          "collection",
+          "rkey"
+        ],
+        "properties": {
+          "cid": {
+            "type": "string",
+            "format": "cid",
+            "description": "The CID of the version of the record. If not specified, then return the most recent version."
+          },
+          "repo": {
+            "type": "string",
+            "format": "at-identifier",
+            "description": "The handle or DID of the repo."
+          },
+          "rkey": {
+            "type": "string",
+            "format": "record-key",
+            "description": "The Record Key."
+          },
+          "collection": {
+            "type": "string",
+            "format": "nsid",
+            "description": "The NSID of the record collection."
+          }
+        }
+      },
+      "description": "Get a single record from a repository. Does not require auth."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/com/atproto/repo/importRepo.json b/lexicons/com/atproto/repo/importRepo.json
new file mode 100644
index 0000000000..897e329160
--- /dev/null
+++ b/lexicons/com/atproto/repo/importRepo.json
@@ -0,0 +1,14 @@
+{
+  "id": "com.atproto.repo.importRepo",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "input": {
+        "encoding": "application/vnd.ipld.car"
+      },
+      "description": "Import a repo in the form of a CAR file. Requires Content-Length HTTP header to be set."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/com/atproto/repo/listMissingBlobs.json b/lexicons/com/atproto/repo/listMissingBlobs.json
new file mode 100644
index 0000000000..41c831af66
--- /dev/null
+++ b/lexicons/com/atproto/repo/listMissingBlobs.json
@@ -0,0 +1,63 @@
+{
+  "id": "com.atproto.repo.listMissingBlobs",
+  "defs": {
+    "main": {
+      "type": "query",
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "blobs"
+          ],
+          "properties": {
+            "blobs": {
+              "type": "array",
+              "items": {
+                "ref": "#recordBlob",
+                "type": "ref"
+              }
+            },
+            "cursor": {
+              "type": "string"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "parameters": {
+        "type": "params",
+        "properties": {
+          "limit": {
+            "type": "integer",
+            "default": 500,
+            "maximum": 1000,
+            "minimum": 1
+          },
+          "cursor": {
+            "type": "string"
+          }
+        }
+      },
+      "description": "Returns a list of missing blobs for the requesting account. Intended to be used in the account migration flow."
+    },
+    "recordBlob": {
+      "type": "object",
+      "required": [
+        "cid",
+        "recordUri"
+      ],
+      "properties": {
+        "cid": {
+          "type": "string",
+          "format": "cid"
+        },
+        "recordUri": {
+          "type": "string",
+          "format": "at-uri"
+        }
+      }
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/com/atproto/repo/listRecords.json b/lexicons/com/atproto/repo/listRecords.json
new file mode 100644
index 0000000000..c34f519ed8
--- /dev/null
+++ b/lexicons/com/atproto/repo/listRecords.json
@@ -0,0 +1,86 @@
+{
+  "id": "com.atproto.repo.listRecords",
+  "defs": {
+    "main": {
+      "type": "query",
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "records"
+          ],
+          "properties": {
+            "cursor": {
+              "type": "string"
+            },
+            "records": {
+              "type": "array",
+              "items": {
+                "ref": "#record",
+                "type": "ref"
+              }
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "parameters": {
+        "type": "params",
+        "required": [
+          "repo",
+          "collection"
+        ],
+        "properties": {
+          "repo": {
+            "type": "string",
+            "format": "at-identifier",
+            "description": "The handle or DID of the repo."
+          },
+          "limit": {
+            "type": "integer",
+            "default": 50,
+            "maximum": 100,
+            "minimum": 1,
+            "description": "The number of records to return."
+          },
+          "cursor": {
+            "type": "string"
+          },
+          "reverse": {
+            "type": "boolean",
+            "description": "Flag to reverse the order of the returned records."
+          },
+          "collection": {
+            "type": "string",
+            "format": "nsid",
+            "description": "The NSID of the record type."
+          }
+        }
+      },
+      "description": "List a range of records in a repository, matching a specific collection. Does not require auth."
+    },
+    "record": {
+      "type": "object",
+      "required": [
+        "uri",
+        "cid",
+        "value"
+      ],
+      "properties": {
+        "cid": {
+          "type": "string",
+          "format": "cid"
+        },
+        "uri": {
+          "type": "string",
+          "format": "at-uri"
+        },
+        "value": {
+          "type": "unknown"
+        }
+      }
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/com/atproto/repo/putRecord.json b/lexicons/com/atproto/repo/putRecord.json
new file mode 100644
index 0000000000..6584a2048a
--- /dev/null
+++ b/lexicons/com/atproto/repo/putRecord.json
@@ -0,0 +1,98 @@
+{
+  "id": "com.atproto.repo.putRecord",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "input": {
+        "schema": {
+          "type": "object",
+          "nullable": [
+            "swapRecord"
+          ],
+          "required": [
+            "repo",
+            "collection",
+            "rkey",
+            "record"
+          ],
+          "properties": {
+            "repo": {
+              "type": "string",
+              "format": "at-identifier",
+              "description": "The handle or DID of the repo (aka, current account)."
+            },
+            "rkey": {
+              "type": "string",
+              "format": "record-key",
+              "maxLength": 512,
+              "description": "The Record Key."
+            },
+            "record": {
+              "type": "unknown",
+              "description": "The record to write."
+            },
+            "validate": {
+              "type": "boolean",
+              "description": "Can be set to 'false' to skip Lexicon schema validation of record data, 'true' to require it, or leave unset to validate only for known Lexicons."
+            },
+            "collection": {
+              "type": "string",
+              "format": "nsid",
+              "description": "The NSID of the record collection."
+            },
+            "swapCommit": {
+              "type": "string",
+              "format": "cid",
+              "description": "Compare and swap with the previous commit by CID."
+            },
+            "swapRecord": {
+              "type": "string",
+              "format": "cid",
+              "description": "Compare and swap with the previous record by CID. WARNING: nullable and optional field; may cause problems with golang implementation"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "errors": [
+        {
+          "name": "InvalidSwap"
+        }
+      ],
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "uri",
+            "cid"
+          ],
+          "properties": {
+            "cid": {
+              "type": "string",
+              "format": "cid"
+            },
+            "uri": {
+              "type": "string",
+              "format": "at-uri"
+            },
+            "commit": {
+              "ref": "com.atproto.repo.defs#commitMeta",
+              "type": "ref"
+            },
+            "validationStatus": {
+              "type": "string",
+              "knownValues": [
+                "valid",
+                "unknown"
+              ]
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "description": "Write a repository record, creating or updating it as needed. Requires auth, implemented by PDS."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/com/atproto/repo/strongRef.json b/lexicons/com/atproto/repo/strongRef.json
new file mode 100644
index 0000000000..f45cca3908
--- /dev/null
+++ b/lexicons/com/atproto/repo/strongRef.json
@@ -0,0 +1,25 @@
+{
+  "id": "com.atproto.repo.strongRef",
+  "defs": {
+    "main": {
+      "type": "object",
+      "required": [
+        "uri",
+        "cid"
+      ],
+      "properties": {
+        "cid": {
+          "type": "string",
+          "format": "cid"
+        },
+        "uri": {
+          "type": "string",
+          "format": "at-uri"
+        }
+      }
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1,
+  "description": "A URI with a content-hash fingerprint."
+}
diff --git a/lexicons/com/atproto/repo/uploadBlob.json b/lexicons/com/atproto/repo/uploadBlob.json
new file mode 100644
index 0000000000..9b1bdd4a93
--- /dev/null
+++ b/lexicons/com/atproto/repo/uploadBlob.json
@@ -0,0 +1,28 @@
+{
+  "id": "com.atproto.repo.uploadBlob",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "input": {
+        "encoding": "*/*"
+      },
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "blob"
+          ],
+          "properties": {
+            "blob": {
+              "type": "blob"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "description": "Upload a new blob, to be referenced from a repository record. The blob will be deleted if it is not referenced within a time window (eg, minutes). Blob restrictions (mimetype, size, etc) are enforced when the reference is created. Requires auth, implemented by PDS."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/com/atproto/server/activateAccount.json b/lexicons/com/atproto/server/activateAccount.json
new file mode 100644
index 0000000000..459607c827
--- /dev/null
+++ b/lexicons/com/atproto/server/activateAccount.json
@@ -0,0 +1,11 @@
+{
+  "id": "com.atproto.server.activateAccount",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "description": "Activates a currently deactivated account. Used to finalize account migration after the account's repo is imported and identity is setup."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/com/atproto/server/checkAccountStatus.json b/lexicons/com/atproto/server/checkAccountStatus.json
new file mode 100644
index 0000000000..289ca52c2e
--- /dev/null
+++ b/lexicons/com/atproto/server/checkAccountStatus.json
@@ -0,0 +1,58 @@
+{
+  "id": "com.atproto.server.checkAccountStatus",
+  "defs": {
+    "main": {
+      "type": "query",
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "activated",
+            "validDid",
+            "repoCommit",
+            "repoRev",
+            "repoBlocks",
+            "indexedRecords",
+            "privateStateValues",
+            "expectedBlobs",
+            "importedBlobs"
+          ],
+          "properties": {
+            "repoRev": {
+              "type": "string"
+            },
+            "validDid": {
+              "type": "boolean"
+            },
+            "activated": {
+              "type": "boolean"
+            },
+            "repoBlocks": {
+              "type": "integer"
+            },
+            "repoCommit": {
+              "type": "string",
+              "format": "cid"
+            },
+            "expectedBlobs": {
+              "type": "integer"
+            },
+            "importedBlobs": {
+              "type": "integer"
+            },
+            "indexedRecords": {
+              "type": "integer"
+            },
+            "privateStateValues": {
+              "type": "integer"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "description": "Returns the status of an account, especially as pertaining to import or recovery. Can be called many times over the course of an account migration. Requires auth and can only be called pertaining to oneself."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/com/atproto/server/confirmEmail.json b/lexicons/com/atproto/server/confirmEmail.json
new file mode 100644
index 0000000000..4412676285
--- /dev/null
+++ b/lexicons/com/atproto/server/confirmEmail.json
@@ -0,0 +1,43 @@
+{
+  "id": "com.atproto.server.confirmEmail",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "input": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "email",
+            "token"
+          ],
+          "properties": {
+            "email": {
+              "type": "string"
+            },
+            "token": {
+              "type": "string"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "errors": [
+        {
+          "name": "AccountNotFound"
+        },
+        {
+          "name": "ExpiredToken"
+        },
+        {
+          "name": "InvalidToken"
+        },
+        {
+          "name": "InvalidEmail"
+        }
+      ],
+      "description": "Confirm an email using a token from com.atproto.server.requestEmailConfirmation."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/com/atproto/server/createAccount.json b/lexicons/com/atproto/server/createAccount.json
new file mode 100644
index 0000000000..5b14ca30ce
--- /dev/null
+++ b/lexicons/com/atproto/server/createAccount.json
@@ -0,0 +1,113 @@
+{
+  "id": "com.atproto.server.createAccount",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "input": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "handle"
+          ],
+          "properties": {
+            "did": {
+              "type": "string",
+              "format": "did",
+              "description": "Pre-existing atproto DID, being imported to a new account."
+            },
+            "email": {
+              "type": "string"
+            },
+            "plcOp": {
+              "type": "unknown",
+              "description": "A signed DID PLC operation to be submitted as part of importing an existing account to this instance. NOTE: this optional field may be updated when full account migration is implemented."
+            },
+            "handle": {
+              "type": "string",
+              "format": "handle",
+              "description": "Requested handle for the account."
+            },
+            "password": {
+              "type": "string",
+              "description": "Initial account password. May need to meet instance-specific password strength requirements."
+            },
+            "inviteCode": {
+              "type": "string"
+            },
+            "recoveryKey": {
+              "type": "string",
+              "description": "DID PLC rotation key (aka, recovery key) to be included in PLC creation operation."
+            },
+            "verificationCode": {
+              "type": "string"
+            },
+            "verificationPhone": {
+              "type": "string"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "errors": [
+        {
+          "name": "InvalidHandle"
+        },
+        {
+          "name": "InvalidPassword"
+        },
+        {
+          "name": "InvalidInviteCode"
+        },
+        {
+          "name": "HandleNotAvailable"
+        },
+        {
+          "name": "UnsupportedDomain"
+        },
+        {
+          "name": "UnresolvableDid"
+        },
+        {
+          "name": "IncompatibleDidDoc"
+        }
+      ],
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "accessJwt",
+            "refreshJwt",
+            "handle",
+            "did"
+          ],
+          "properties": {
+            "did": {
+              "type": "string",
+              "format": "did",
+              "description": "The DID of the new account."
+            },
+            "didDoc": {
+              "type": "unknown",
+              "description": "Complete DID document."
+            },
+            "handle": {
+              "type": "string",
+              "format": "handle"
+            },
+            "accessJwt": {
+              "type": "string"
+            },
+            "refreshJwt": {
+              "type": "string"
+            }
+          },
+          "description": "Account login session returned on successful account creation."
+        },
+        "encoding": "application/json"
+      },
+      "description": "Create an account. Implemented by PDS."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/com/atproto/server/createAppPassword.json b/lexicons/com/atproto/server/createAppPassword.json
new file mode 100644
index 0000000000..72e24ba7b2
--- /dev/null
+++ b/lexicons/com/atproto/server/createAppPassword.json
@@ -0,0 +1,65 @@
+{
+  "id": "com.atproto.server.createAppPassword",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "input": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "name"
+          ],
+          "properties": {
+            "name": {
+              "type": "string",
+              "description": "A short name for the App Password, to help distinguish them."
+            },
+            "privileged": {
+              "type": "boolean",
+              "description": "If an app password has 'privileged' access to possibly sensitive account state. Meant for use with trusted clients."
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "errors": [
+        {
+          "name": "AccountTakedown"
+        }
+      ],
+      "output": {
+        "schema": {
+          "ref": "#appPassword",
+          "type": "ref"
+        },
+        "encoding": "application/json"
+      },
+      "description": "Create an App Password."
+    },
+    "appPassword": {
+      "type": "object",
+      "required": [
+        "name",
+        "password",
+        "createdAt"
+      ],
+      "properties": {
+        "name": {
+          "type": "string"
+        },
+        "password": {
+          "type": "string"
+        },
+        "createdAt": {
+          "type": "string",
+          "format": "datetime"
+        },
+        "privileged": {
+          "type": "boolean"
+        }
+      }
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/com/atproto/server/createInviteCode.json b/lexicons/com/atproto/server/createInviteCode.json
new file mode 100644
index 0000000000..d355ddfec3
--- /dev/null
+++ b/lexicons/com/atproto/server/createInviteCode.json
@@ -0,0 +1,43 @@
+{
+  "id": "com.atproto.server.createInviteCode",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "input": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "useCount"
+          ],
+          "properties": {
+            "useCount": {
+              "type": "integer"
+            },
+            "forAccount": {
+              "type": "string",
+              "format": "did"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "code"
+          ],
+          "properties": {
+            "code": {
+              "type": "string"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "description": "Create an invite code."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/com/atproto/server/createInviteCodes.json b/lexicons/com/atproto/server/createInviteCodes.json
new file mode 100644
index 0000000000..4843e28dc0
--- /dev/null
+++ b/lexicons/com/atproto/server/createInviteCodes.json
@@ -0,0 +1,73 @@
+{
+  "id": "com.atproto.server.createInviteCodes",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "input": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "codeCount",
+            "useCount"
+          ],
+          "properties": {
+            "useCount": {
+              "type": "integer"
+            },
+            "codeCount": {
+              "type": "integer",
+              "default": 1
+            },
+            "forAccounts": {
+              "type": "array",
+              "items": {
+                "type": "string",
+                "format": "did"
+              }
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "codes"
+          ],
+          "properties": {
+            "codes": {
+              "type": "array",
+              "items": {
+                "ref": "#accountCodes",
+                "type": "ref"
+              }
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "description": "Create invite codes."
+    },
+    "accountCodes": {
+      "type": "object",
+      "required": [
+        "account",
+        "codes"
+      ],
+      "properties": {
+        "codes": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "account": {
+          "type": "string"
+        }
+      }
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/com/atproto/server/createSession.json b/lexicons/com/atproto/server/createSession.json
new file mode 100644
index 0000000000..1b353cbb59
--- /dev/null
+++ b/lexicons/com/atproto/server/createSession.json
@@ -0,0 +1,97 @@
+{
+  "id": "com.atproto.server.createSession",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "input": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "identifier",
+            "password"
+          ],
+          "properties": {
+            "password": {
+              "type": "string"
+            },
+            "identifier": {
+              "type": "string",
+              "description": "Handle or other identifier supported by the server for the authenticating user."
+            },
+            "allowTakendown": {
+              "type": "boolean",
+              "description": "When true, instead of throwing error for takendown accounts, a valid response with a narrow scoped token will be returned"
+            },
+            "authFactorToken": {
+              "type": "string"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "errors": [
+        {
+          "name": "AccountTakedown"
+        },
+        {
+          "name": "AuthFactorTokenRequired"
+        }
+      ],
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "accessJwt",
+            "refreshJwt",
+            "handle",
+            "did"
+          ],
+          "properties": {
+            "did": {
+              "type": "string",
+              "format": "did"
+            },
+            "email": {
+              "type": "string"
+            },
+            "active": {
+              "type": "boolean"
+            },
+            "didDoc": {
+              "type": "unknown"
+            },
+            "handle": {
+              "type": "string",
+              "format": "handle"
+            },
+            "status": {
+              "type": "string",
+              "description": "If active=false, this optional field indicates a possible reason for why the account is not active. If active=false and no status is supplied, then the host makes no claim for why the repository is no longer being hosted.",
+              "knownValues": [
+                "takendown",
+                "suspended",
+                "deactivated"
+              ]
+            },
+            "accessJwt": {
+              "type": "string"
+            },
+            "refreshJwt": {
+              "type": "string"
+            },
+            "emailConfirmed": {
+              "type": "boolean"
+            },
+            "emailAuthFactor": {
+              "type": "boolean"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "description": "Create an authentication session."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/com/atproto/server/deactivateAccount.json b/lexicons/com/atproto/server/deactivateAccount.json
new file mode 100644
index 0000000000..0607e0efc6
--- /dev/null
+++ b/lexicons/com/atproto/server/deactivateAccount.json
@@ -0,0 +1,24 @@
+{
+  "id": "com.atproto.server.deactivateAccount",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "input": {
+        "schema": {
+          "type": "object",
+          "properties": {
+            "deleteAfter": {
+              "type": "string",
+              "format": "datetime",
+              "description": "A recommendation to server as to how long they should hold onto the deactivated account before deleting."
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "description": "Deactivates a currently active account. Stops serving of repo, and future writes to repo until reactivated. Used to finalize account migration with the old host after the account has been activated on the new host."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/com/atproto/server/defs.json b/lexicons/com/atproto/server/defs.json
new file mode 100644
index 0000000000..60cdf91571
--- /dev/null
+++ b/lexicons/com/atproto/server/defs.json
@@ -0,0 +1,64 @@
+{
+  "id": "com.atproto.server.defs",
+  "defs": {
+    "inviteCode": {
+      "type": "object",
+      "required": [
+        "code",
+        "available",
+        "disabled",
+        "forAccount",
+        "createdBy",
+        "createdAt",
+        "uses"
+      ],
+      "properties": {
+        "code": {
+          "type": "string"
+        },
+        "uses": {
+          "type": "array",
+          "items": {
+            "ref": "#inviteCodeUse",
+            "type": "ref"
+          }
+        },
+        "disabled": {
+          "type": "boolean"
+        },
+        "available": {
+          "type": "integer"
+        },
+        "createdAt": {
+          "type": "string",
+          "format": "datetime"
+        },
+        "createdBy": {
+          "type": "string"
+        },
+        "forAccount": {
+          "type": "string"
+        }
+      }
+    },
+    "inviteCodeUse": {
+      "type": "object",
+      "required": [
+        "usedBy",
+        "usedAt"
+      ],
+      "properties": {
+        "usedAt": {
+          "type": "string",
+          "format": "datetime"
+        },
+        "usedBy": {
+          "type": "string",
+          "format": "did"
+        }
+      }
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/com/atproto/server/deleteAccount.json b/lexicons/com/atproto/server/deleteAccount.json
new file mode 100644
index 0000000000..6743a74431
--- /dev/null
+++ b/lexicons/com/atproto/server/deleteAccount.json
@@ -0,0 +1,42 @@
+{
+  "id": "com.atproto.server.deleteAccount",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "input": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "did",
+            "password",
+            "token"
+          ],
+          "properties": {
+            "did": {
+              "type": "string",
+              "format": "did"
+            },
+            "token": {
+              "type": "string"
+            },
+            "password": {
+              "type": "string"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "errors": [
+        {
+          "name": "ExpiredToken"
+        },
+        {
+          "name": "InvalidToken"
+        }
+      ],
+      "description": "Delete an actor's account with a token and password. Can only be called after requesting a deletion token. Requires auth."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/com/atproto/server/deleteSession.json b/lexicons/com/atproto/server/deleteSession.json
new file mode 100644
index 0000000000..e2cc504c39
--- /dev/null
+++ b/lexicons/com/atproto/server/deleteSession.json
@@ -0,0 +1,19 @@
+{
+  "id": "com.atproto.server.deleteSession",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "errors": [
+        {
+          "name": "InvalidToken"
+        },
+        {
+          "name": "ExpiredToken"
+        }
+      ],
+      "description": "Delete the current session. Requires auth using the 'refreshJwt' (not the 'accessJwt')."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/com/atproto/server/describeServer.json b/lexicons/com/atproto/server/describeServer.json
new file mode 100644
index 0000000000..25dc2d2912
--- /dev/null
+++ b/lexicons/com/atproto/server/describeServer.json
@@ -0,0 +1,73 @@
+{
+  "id": "com.atproto.server.describeServer",
+  "defs": {
+    "main": {
+      "type": "query",
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "did",
+            "availableUserDomains"
+          ],
+          "properties": {
+            "did": {
+              "type": "string",
+              "format": "did"
+            },
+            "links": {
+              "ref": "#links",
+              "type": "ref",
+              "description": "URLs of service policy documents."
+            },
+            "contact": {
+              "ref": "#contact",
+              "type": "ref",
+              "description": "Contact information"
+            },
+            "inviteCodeRequired": {
+              "type": "boolean",
+              "description": "If true, an invite code must be supplied to create an account on this instance."
+            },
+            "availableUserDomains": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              },
+              "description": "List of domain suffixes that can be used in account handles."
+            },
+            "phoneVerificationRequired": {
+              "type": "boolean",
+              "description": "If true, a phone verification token must be supplied to create an account on this instance."
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "description": "Describes the server's account creation requirements and capabilities. Implemented by PDS."
+    },
+    "links": {
+      "type": "object",
+      "properties": {
+        "privacyPolicy": {
+          "type": "string",
+          "format": "uri"
+        },
+        "termsOfService": {
+          "type": "string",
+          "format": "uri"
+        }
+      }
+    },
+    "contact": {
+      "type": "object",
+      "properties": {
+        "email": {
+          "type": "string"
+        }
+      }
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/com/atproto/server/getAccountInviteCodes.json b/lexicons/com/atproto/server/getAccountInviteCodes.json
new file mode 100644
index 0000000000..6b6bb1fa32
--- /dev/null
+++ b/lexicons/com/atproto/server/getAccountInviteCodes.json
@@ -0,0 +1,48 @@
+{
+  "id": "com.atproto.server.getAccountInviteCodes",
+  "defs": {
+    "main": {
+      "type": "query",
+      "errors": [
+        {
+          "name": "DuplicateCreate"
+        }
+      ],
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "codes"
+          ],
+          "properties": {
+            "codes": {
+              "type": "array",
+              "items": {
+                "ref": "com.atproto.server.defs#inviteCode",
+                "type": "ref"
+              }
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "parameters": {
+        "type": "params",
+        "properties": {
+          "includeUsed": {
+            "type": "boolean",
+            "default": true
+          },
+          "createAvailable": {
+            "type": "boolean",
+            "default": true,
+            "description": "Controls whether any new 'earned' but not 'created' invites should be created."
+          }
+        }
+      },
+      "description": "Get all invite codes for the current account. Requires auth."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/com/atproto/server/getServiceAuth.json b/lexicons/com/atproto/server/getServiceAuth.json
new file mode 100644
index 0000000000..80f5a1148c
--- /dev/null
+++ b/lexicons/com/atproto/server/getServiceAuth.json
@@ -0,0 +1,53 @@
+{
+  "id": "com.atproto.server.getServiceAuth",
+  "defs": {
+    "main": {
+      "type": "query",
+      "errors": [
+        {
+          "name": "BadExpiration",
+          "description": "Indicates that the requested expiration date is not a valid. May be in the past or may be reliant on the requested scopes."
+        }
+      ],
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "token"
+          ],
+          "properties": {
+            "token": {
+              "type": "string"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "parameters": {
+        "type": "params",
+        "required": [
+          "aud"
+        ],
+        "properties": {
+          "aud": {
+            "type": "string",
+            "format": "did",
+            "description": "The DID of the service that the token will be used to authenticate with"
+          },
+          "exp": {
+            "type": "integer",
+            "description": "The time in Unix Epoch seconds that the JWT expires. Defaults to 60 seconds in the future. The service may enforce certain time bounds on tokens depending on the requested scope."
+          },
+          "lxm": {
+            "type": "string",
+            "format": "nsid",
+            "description": "Lexicon (XRPC) method to bind the requested token to"
+          }
+        }
+      },
+      "description": "Get a signed token on behalf of the requesting DID for the requested service."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/com/atproto/server/getSession.json b/lexicons/com/atproto/server/getSession.json
new file mode 100644
index 0000000000..8e9810d72e
--- /dev/null
+++ b/lexicons/com/atproto/server/getSession.json
@@ -0,0 +1,55 @@
+{
+  "id": "com.atproto.server.getSession",
+  "defs": {
+    "main": {
+      "type": "query",
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "handle",
+            "did"
+          ],
+          "properties": {
+            "did": {
+              "type": "string",
+              "format": "did"
+            },
+            "email": {
+              "type": "string"
+            },
+            "active": {
+              "type": "boolean"
+            },
+            "didDoc": {
+              "type": "unknown"
+            },
+            "handle": {
+              "type": "string",
+              "format": "handle"
+            },
+            "status": {
+              "type": "string",
+              "description": "If active=false, this optional field indicates a possible reason for why the account is not active. If active=false and no status is supplied, then the host makes no claim for why the repository is no longer being hosted.",
+              "knownValues": [
+                "takendown",
+                "suspended",
+                "deactivated"
+              ]
+            },
+            "emailConfirmed": {
+              "type": "boolean"
+            },
+            "emailAuthFactor": {
+              "type": "boolean"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "description": "Get information about the current auth session. Requires auth."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/com/atproto/server/listAppPasswords.json b/lexicons/com/atproto/server/listAppPasswords.json
new file mode 100644
index 0000000000..8ff2678ea3
--- /dev/null
+++ b/lexicons/com/atproto/server/listAppPasswords.json
@@ -0,0 +1,53 @@
+{
+  "id": "com.atproto.server.listAppPasswords",
+  "defs": {
+    "main": {
+      "type": "query",
+      "errors": [
+        {
+          "name": "AccountTakedown"
+        }
+      ],
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "passwords"
+          ],
+          "properties": {
+            "passwords": {
+              "type": "array",
+              "items": {
+                "ref": "#appPassword",
+                "type": "ref"
+              }
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "description": "List all App Passwords."
+    },
+    "appPassword": {
+      "type": "object",
+      "required": [
+        "name",
+        "createdAt"
+      ],
+      "properties": {
+        "name": {
+          "type": "string"
+        },
+        "createdAt": {
+          "type": "string",
+          "format": "datetime"
+        },
+        "privileged": {
+          "type": "boolean"
+        }
+      }
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/com/atproto/server/refreshSession.json b/lexicons/com/atproto/server/refreshSession.json
new file mode 100644
index 0000000000..3924c2b665
--- /dev/null
+++ b/lexicons/com/atproto/server/refreshSession.json
@@ -0,0 +1,74 @@
+{
+  "id": "com.atproto.server.refreshSession",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "errors": [
+        {
+          "name": "AccountTakedown"
+        },
+        {
+          "name": "InvalidToken"
+        },
+        {
+          "name": "ExpiredToken"
+        }
+      ],
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "accessJwt",
+            "refreshJwt",
+            "handle",
+            "did"
+          ],
+          "properties": {
+            "did": {
+              "type": "string",
+              "format": "did"
+            },
+            "email": {
+              "type": "string"
+            },
+            "active": {
+              "type": "boolean"
+            },
+            "didDoc": {
+              "type": "unknown"
+            },
+            "handle": {
+              "type": "string",
+              "format": "handle"
+            },
+            "status": {
+              "type": "string",
+              "description": "Hosting status of the account. If not specified, then assume 'active'.",
+              "knownValues": [
+                "takendown",
+                "suspended",
+                "deactivated"
+              ]
+            },
+            "accessJwt": {
+              "type": "string"
+            },
+            "refreshJwt": {
+              "type": "string"
+            },
+            "emailConfirmed": {
+              "type": "boolean"
+            },
+            "emailAuthFactor": {
+              "type": "boolean"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "description": "Refresh an authentication session. Requires auth using the 'refreshJwt' (not the 'accessJwt')."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/com/atproto/server/requestAccountDelete.json b/lexicons/com/atproto/server/requestAccountDelete.json
new file mode 100644
index 0000000000..94c21ae5a6
--- /dev/null
+++ b/lexicons/com/atproto/server/requestAccountDelete.json
@@ -0,0 +1,11 @@
+{
+  "id": "com.atproto.server.requestAccountDelete",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "description": "Initiate a user account deletion via email."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/com/atproto/server/requestEmailConfirmation.json b/lexicons/com/atproto/server/requestEmailConfirmation.json
new file mode 100644
index 0000000000..808c2aa4f7
--- /dev/null
+++ b/lexicons/com/atproto/server/requestEmailConfirmation.json
@@ -0,0 +1,11 @@
+{
+  "id": "com.atproto.server.requestEmailConfirmation",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "description": "Request an email with a code to confirm ownership of email."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/com/atproto/server/requestEmailUpdate.json b/lexicons/com/atproto/server/requestEmailUpdate.json
new file mode 100644
index 0000000000..158ba0f990
--- /dev/null
+++ b/lexicons/com/atproto/server/requestEmailUpdate.json
@@ -0,0 +1,25 @@
+{
+  "id": "com.atproto.server.requestEmailUpdate",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "tokenRequired"
+          ],
+          "properties": {
+            "tokenRequired": {
+              "type": "boolean"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "description": "Request a token in order to update email."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/com/atproto/server/requestPasswordReset.json b/lexicons/com/atproto/server/requestPasswordReset.json
new file mode 100644
index 0000000000..fdb81f40e4
--- /dev/null
+++ b/lexicons/com/atproto/server/requestPasswordReset.json
@@ -0,0 +1,25 @@
+{
+  "id": "com.atproto.server.requestPasswordReset",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "input": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "email"
+          ],
+          "properties": {
+            "email": {
+              "type": "string"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "description": "Initiate a user account password reset via email."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/com/atproto/server/reserveSigningKey.json b/lexicons/com/atproto/server/reserveSigningKey.json
new file mode 100644
index 0000000000..cd54f637fa
--- /dev/null
+++ b/lexicons/com/atproto/server/reserveSigningKey.json
@@ -0,0 +1,39 @@
+{
+  "id": "com.atproto.server.reserveSigningKey",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "input": {
+        "schema": {
+          "type": "object",
+          "properties": {
+            "did": {
+              "type": "string",
+              "format": "did",
+              "description": "The DID to reserve a key for."
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "signingKey"
+          ],
+          "properties": {
+            "signingKey": {
+              "type": "string",
+              "description": "The public key for the reserved signing key, in did:key serialization."
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "description": "Reserve a repo signing key, for use with account creation. Necessary so that a DID PLC update operation can be constructed during an account migraiton. Public and does not require auth; implemented by PDS. NOTE: this endpoint may change when full account migration is implemented."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/com/atproto/server/resetPassword.json b/lexicons/com/atproto/server/resetPassword.json
new file mode 100644
index 0000000000..b8857cfca0
--- /dev/null
+++ b/lexicons/com/atproto/server/resetPassword.json
@@ -0,0 +1,37 @@
+{
+  "id": "com.atproto.server.resetPassword",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "input": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "token",
+            "password"
+          ],
+          "properties": {
+            "token": {
+              "type": "string"
+            },
+            "password": {
+              "type": "string"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "errors": [
+        {
+          "name": "ExpiredToken"
+        },
+        {
+          "name": "InvalidToken"
+        }
+      ],
+      "description": "Reset a user account password using a token."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/com/atproto/server/revokeAppPassword.json b/lexicons/com/atproto/server/revokeAppPassword.json
new file mode 100644
index 0000000000..362306cc96
--- /dev/null
+++ b/lexicons/com/atproto/server/revokeAppPassword.json
@@ -0,0 +1,25 @@
+{
+  "id": "com.atproto.server.revokeAppPassword",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "input": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "name"
+          ],
+          "properties": {
+            "name": {
+              "type": "string"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "description": "Revoke an App Password by name."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/com/atproto/server/updateEmail.json b/lexicons/com/atproto/server/updateEmail.json
new file mode 100644
index 0000000000..a5390b4de3
--- /dev/null
+++ b/lexicons/com/atproto/server/updateEmail.json
@@ -0,0 +1,43 @@
+{
+  "id": "com.atproto.server.updateEmail",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "input": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "email"
+          ],
+          "properties": {
+            "email": {
+              "type": "string"
+            },
+            "token": {
+              "type": "string",
+              "description": "Requires a token from com.atproto.sever.requestEmailUpdate if the account's email has been confirmed."
+            },
+            "emailAuthFactor": {
+              "type": "boolean"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "errors": [
+        {
+          "name": "ExpiredToken"
+        },
+        {
+          "name": "InvalidToken"
+        },
+        {
+          "name": "TokenRequired"
+        }
+      ],
+      "description": "Update an account's email."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/com/atproto/sync/defs.json b/lexicons/com/atproto/sync/defs.json
new file mode 100644
index 0000000000..3f2f42fe8c
--- /dev/null
+++ b/lexicons/com/atproto/sync/defs.json
@@ -0,0 +1,17 @@
+{
+  "id": "com.atproto.sync.defs",
+  "defs": {
+    "hostStatus": {
+      "type": "string",
+      "knownValues": [
+        "active",
+        "idle",
+        "offline",
+        "throttled",
+        "banned"
+      ]
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/com/atproto/sync/getBlob.json b/lexicons/com/atproto/sync/getBlob.json
new file mode 100644
index 0000000000..b571d31736
--- /dev/null
+++ b/lexicons/com/atproto/sync/getBlob.json
@@ -0,0 +1,50 @@
+{
+  "id": "com.atproto.sync.getBlob",
+  "defs": {
+    "main": {
+      "type": "query",
+      "errors": [
+        {
+          "name": "BlobNotFound"
+        },
+        {
+          "name": "RepoNotFound"
+        },
+        {
+          "name": "RepoTakendown"
+        },
+        {
+          "name": "RepoSuspended"
+        },
+        {
+          "name": "RepoDeactivated"
+        }
+      ],
+      "output": {
+        "encoding": "*/*"
+      },
+      "parameters": {
+        "type": "params",
+        "required": [
+          "did",
+          "cid"
+        ],
+        "properties": {
+          "cid": {
+            "type": "string",
+            "format": "cid",
+            "description": "The CID of the blob to fetch"
+          },
+          "did": {
+            "type": "string",
+            "format": "did",
+            "description": "The DID of the account."
+          }
+        }
+      },
+      "description": "Get a blob associated with a given account. Returns the full blob as originally uploaded. Does not require auth; implemented by PDS."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/com/atproto/sync/getBlocks.json b/lexicons/com/atproto/sync/getBlocks.json
new file mode 100644
index 0000000000..8cd269ecea
--- /dev/null
+++ b/lexicons/com/atproto/sync/getBlocks.json
@@ -0,0 +1,52 @@
+{
+  "id": "com.atproto.sync.getBlocks",
+  "defs": {
+    "main": {
+      "type": "query",
+      "errors": [
+        {
+          "name": "BlockNotFound"
+        },
+        {
+          "name": "RepoNotFound"
+        },
+        {
+          "name": "RepoTakendown"
+        },
+        {
+          "name": "RepoSuspended"
+        },
+        {
+          "name": "RepoDeactivated"
+        }
+      ],
+      "output": {
+        "encoding": "application/vnd.ipld.car"
+      },
+      "parameters": {
+        "type": "params",
+        "required": [
+          "did",
+          "cids"
+        ],
+        "properties": {
+          "did": {
+            "type": "string",
+            "format": "did",
+            "description": "The DID of the repo."
+          },
+          "cids": {
+            "type": "array",
+            "items": {
+              "type": "string",
+              "format": "cid"
+            }
+          }
+        }
+      },
+      "description": "Get data blocks from a given repo, by CID. For example, intermediate MST nodes, or records. Does not require auth; implemented by PDS."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/com/atproto/sync/getCheckout.json b/lexicons/com/atproto/sync/getCheckout.json
new file mode 100644
index 0000000000..9e5b0b3066
--- /dev/null
+++ b/lexicons/com/atproto/sync/getCheckout.json
@@ -0,0 +1,27 @@
+{
+  "id": "com.atproto.sync.getCheckout",
+  "defs": {
+    "main": {
+      "type": "query",
+      "output": {
+        "encoding": "application/vnd.ipld.car"
+      },
+      "parameters": {
+        "type": "params",
+        "required": [
+          "did"
+        ],
+        "properties": {
+          "did": {
+            "type": "string",
+            "format": "did",
+            "description": "The DID of the repo."
+          }
+        }
+      },
+      "description": "DEPRECATED - please use com.atproto.sync.getRepo instead"
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/com/atproto/sync/getHead.json b/lexicons/com/atproto/sync/getHead.json
new file mode 100644
index 0000000000..fc5af39d45
--- /dev/null
+++ b/lexicons/com/atproto/sync/getHead.json
@@ -0,0 +1,44 @@
+{
+  "id": "com.atproto.sync.getHead",
+  "defs": {
+    "main": {
+      "type": "query",
+      "errors": [
+        {
+          "name": "HeadNotFound"
+        }
+      ],
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "root"
+          ],
+          "properties": {
+            "root": {
+              "type": "string",
+              "format": "cid"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "parameters": {
+        "type": "params",
+        "required": [
+          "did"
+        ],
+        "properties": {
+          "did": {
+            "type": "string",
+            "format": "did",
+            "description": "The DID of the repo."
+          }
+        }
+      },
+      "description": "DEPRECATED - please use com.atproto.sync.getLatestCommit instead"
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/com/atproto/sync/getHostStatus.json b/lexicons/com/atproto/sync/getHostStatus.json
new file mode 100644
index 0000000000..86d563fa24
--- /dev/null
+++ b/lexicons/com/atproto/sync/getHostStatus.json
@@ -0,0 +1,54 @@
+{
+  "id": "com.atproto.sync.getHostStatus",
+  "defs": {
+    "main": {
+      "type": "query",
+      "errors": [
+        {
+          "name": "HostNotFound"
+        }
+      ],
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "hostname"
+          ],
+          "properties": {
+            "seq": {
+              "type": "integer",
+              "description": "Recent repo stream event sequence number. May be delayed from actual stream processing (eg, persisted cursor not in-memory cursor)."
+            },
+            "status": {
+              "ref": "com.atproto.sync.defs#hostStatus",
+              "type": "ref"
+            },
+            "hostname": {
+              "type": "string"
+            },
+            "accountCount": {
+              "type": "integer",
+              "description": "Number of accounts on the server which are associated with the upstream host. Note that the upstream may actually have more accounts."
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "parameters": {
+        "type": "params",
+        "required": [
+          "hostname"
+        ],
+        "properties": {
+          "hostname": {
+            "type": "string",
+            "description": "Hostname of the host (eg, PDS or relay) being queried."
+          }
+        }
+      },
+      "description": "Returns information about a specified upstream host, as consumed by the server. Implemented by relays."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/com/atproto/sync/getLatestCommit.json b/lexicons/com/atproto/sync/getLatestCommit.json
new file mode 100644
index 0000000000..e8ce2cd800
--- /dev/null
+++ b/lexicons/com/atproto/sync/getLatestCommit.json
@@ -0,0 +1,58 @@
+{
+  "id": "com.atproto.sync.getLatestCommit",
+  "defs": {
+    "main": {
+      "type": "query",
+      "errors": [
+        {
+          "name": "RepoNotFound"
+        },
+        {
+          "name": "RepoTakendown"
+        },
+        {
+          "name": "RepoSuspended"
+        },
+        {
+          "name": "RepoDeactivated"
+        }
+      ],
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "cid",
+            "rev"
+          ],
+          "properties": {
+            "cid": {
+              "type": "string",
+              "format": "cid"
+            },
+            "rev": {
+              "type": "string",
+              "format": "tid"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "parameters": {
+        "type": "params",
+        "required": [
+          "did"
+        ],
+        "properties": {
+          "did": {
+            "type": "string",
+            "format": "did",
+            "description": "The DID of the repo."
+          }
+        }
+      },
+      "description": "Get the current commit CID & revision of the specified repo. Does not require auth."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/com/atproto/sync/getRecord.json b/lexicons/com/atproto/sync/getRecord.json
new file mode 100644
index 0000000000..330826046d
--- /dev/null
+++ b/lexicons/com/atproto/sync/getRecord.json
@@ -0,0 +1,55 @@
+{
+  "id": "com.atproto.sync.getRecord",
+  "defs": {
+    "main": {
+      "type": "query",
+      "errors": [
+        {
+          "name": "RecordNotFound"
+        },
+        {
+          "name": "RepoNotFound"
+        },
+        {
+          "name": "RepoTakendown"
+        },
+        {
+          "name": "RepoSuspended"
+        },
+        {
+          "name": "RepoDeactivated"
+        }
+      ],
+      "output": {
+        "encoding": "application/vnd.ipld.car"
+      },
+      "parameters": {
+        "type": "params",
+        "required": [
+          "did",
+          "collection",
+          "rkey"
+        ],
+        "properties": {
+          "did": {
+            "type": "string",
+            "format": "did",
+            "description": "The DID of the repo."
+          },
+          "rkey": {
+            "type": "string",
+            "format": "record-key",
+            "description": "Record Key"
+          },
+          "collection": {
+            "type": "string",
+            "format": "nsid"
+          }
+        }
+      },
+      "description": "Get data blocks needed to prove the existence or non-existence of record in the current version of repo. Does not require auth."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/com/atproto/sync/getRepo.json b/lexicons/com/atproto/sync/getRepo.json
new file mode 100644
index 0000000000..3ec4c0489b
--- /dev/null
+++ b/lexicons/com/atproto/sync/getRepo.json
@@ -0,0 +1,46 @@
+{
+  "id": "com.atproto.sync.getRepo",
+  "defs": {
+    "main": {
+      "type": "query",
+      "errors": [
+        {
+          "name": "RepoNotFound"
+        },
+        {
+          "name": "RepoTakendown"
+        },
+        {
+          "name": "RepoSuspended"
+        },
+        {
+          "name": "RepoDeactivated"
+        }
+      ],
+      "output": {
+        "encoding": "application/vnd.ipld.car"
+      },
+      "parameters": {
+        "type": "params",
+        "required": [
+          "did"
+        ],
+        "properties": {
+          "did": {
+            "type": "string",
+            "format": "did",
+            "description": "The DID of the repo."
+          },
+          "since": {
+            "type": "string",
+            "format": "tid",
+            "description": "The revision ('rev') of the repo to create a diff from."
+          }
+        }
+      },
+      "description": "Download a repository export as CAR file. Optionally only a 'diff' since a previous revision. Does not require auth; implemented by PDS."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/com/atproto/sync/getRepoStatus.json b/lexicons/com/atproto/sync/getRepoStatus.json
new file mode 100644
index 0000000000..698b80d509
--- /dev/null
+++ b/lexicons/com/atproto/sync/getRepoStatus.json
@@ -0,0 +1,65 @@
+{
+  "id": "com.atproto.sync.getRepoStatus",
+  "defs": {
+    "main": {
+      "type": "query",
+      "errors": [
+        {
+          "name": "RepoNotFound"
+        }
+      ],
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "did",
+            "active"
+          ],
+          "properties": {
+            "did": {
+              "type": "string",
+              "format": "did"
+            },
+            "rev": {
+              "type": "string",
+              "format": "tid",
+              "description": "Optional field, the current rev of the repo, if active=true"
+            },
+            "active": {
+              "type": "boolean"
+            },
+            "status": {
+              "type": "string",
+              "description": "If active=false, this optional field indicates a possible reason for why the account is not active. If active=false and no status is supplied, then the host makes no claim for why the repository is no longer being hosted.",
+              "knownValues": [
+                "takendown",
+                "suspended",
+                "deleted",
+                "deactivated",
+                "desynchronized",
+                "throttled"
+              ]
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "parameters": {
+        "type": "params",
+        "required": [
+          "did"
+        ],
+        "properties": {
+          "did": {
+            "type": "string",
+            "format": "did",
+            "description": "The DID of the repo."
+          }
+        }
+      },
+      "description": "Get the hosting status for a repository, on this server. Expected to be implemented by PDS and Relay."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/com/atproto/sync/listBlobs.json b/lexicons/com/atproto/sync/listBlobs.json
new file mode 100644
index 0000000000..ee98c6ecb6
--- /dev/null
+++ b/lexicons/com/atproto/sync/listBlobs.json
@@ -0,0 +1,73 @@
+{
+  "id": "com.atproto.sync.listBlobs",
+  "defs": {
+    "main": {
+      "type": "query",
+      "errors": [
+        {
+          "name": "RepoNotFound"
+        },
+        {
+          "name": "RepoTakendown"
+        },
+        {
+          "name": "RepoSuspended"
+        },
+        {
+          "name": "RepoDeactivated"
+        }
+      ],
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "cids"
+          ],
+          "properties": {
+            "cids": {
+              "type": "array",
+              "items": {
+                "type": "string",
+                "format": "cid"
+              }
+            },
+            "cursor": {
+              "type": "string"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "parameters": {
+        "type": "params",
+        "required": [
+          "did"
+        ],
+        "properties": {
+          "did": {
+            "type": "string",
+            "format": "did",
+            "description": "The DID of the repo."
+          },
+          "limit": {
+            "type": "integer",
+            "default": 500,
+            "maximum": 1000,
+            "minimum": 1
+          },
+          "since": {
+            "type": "string",
+            "format": "tid",
+            "description": "Optional revision of the repo to list blobs since."
+          },
+          "cursor": {
+            "type": "string"
+          }
+        }
+      },
+      "description": "List blob CIDs for an account, since some repo revision. Does not require auth; implemented by PDS."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/com/atproto/sync/listHosts.json b/lexicons/com/atproto/sync/listHosts.json
new file mode 100644
index 0000000000..66f78df6e1
--- /dev/null
+++ b/lexicons/com/atproto/sync/listHosts.json
@@ -0,0 +1,70 @@
+{
+  "id": "com.atproto.sync.listHosts",
+  "defs": {
+    "host": {
+      "type": "object",
+      "required": [
+        "hostname"
+      ],
+      "properties": {
+        "seq": {
+          "type": "integer",
+          "description": "Recent repo stream event sequence number. May be delayed from actual stream processing (eg, persisted cursor not in-memory cursor)."
+        },
+        "status": {
+          "ref": "com.atproto.sync.defs#hostStatus",
+          "type": "ref"
+        },
+        "hostname": {
+          "type": "string",
+          "description": "hostname of server; not a URL (no scheme)"
+        },
+        "accountCount": {
+          "type": "integer"
+        }
+      }
+    },
+    "main": {
+      "type": "query",
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "hosts"
+          ],
+          "properties": {
+            "hosts": {
+              "type": "array",
+              "items": {
+                "ref": "#host",
+                "type": "ref"
+              },
+              "description": "Sort order is not formally specified. Recommended order is by time host was first seen by the server, with oldest first."
+            },
+            "cursor": {
+              "type": "string"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "parameters": {
+        "type": "params",
+        "properties": {
+          "limit": {
+            "type": "integer",
+            "default": 200,
+            "maximum": 1000,
+            "minimum": 1
+          },
+          "cursor": {
+            "type": "string"
+          }
+        }
+      },
+      "description": "Enumerates upstream hosts (eg, PDS or relay instances) that this service consumes from. Implemented by relays."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/com/atproto/sync/listRepos.json b/lexicons/com/atproto/sync/listRepos.json
new file mode 100644
index 0000000000..0341bccc9d
--- /dev/null
+++ b/lexicons/com/atproto/sync/listRepos.json
@@ -0,0 +1,84 @@
+{
+  "id": "com.atproto.sync.listRepos",
+  "defs": {
+    "main": {
+      "type": "query",
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "repos"
+          ],
+          "properties": {
+            "repos": {
+              "type": "array",
+              "items": {
+                "ref": "#repo",
+                "type": "ref"
+              }
+            },
+            "cursor": {
+              "type": "string"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "parameters": {
+        "type": "params",
+        "properties": {
+          "limit": {
+            "type": "integer",
+            "default": 500,
+            "maximum": 1000,
+            "minimum": 1
+          },
+          "cursor": {
+            "type": "string"
+          }
+        }
+      },
+      "description": "Enumerates all the DID, rev, and commit CID for all repos hosted by this service. Does not require auth; implemented by PDS and Relay."
+    },
+    "repo": {
+      "type": "object",
+      "required": [
+        "did",
+        "head",
+        "rev"
+      ],
+      "properties": {
+        "did": {
+          "type": "string",
+          "format": "did"
+        },
+        "rev": {
+          "type": "string",
+          "format": "tid"
+        },
+        "head": {
+          "type": "string",
+          "format": "cid",
+          "description": "Current repo commit CID"
+        },
+        "active": {
+          "type": "boolean"
+        },
+        "status": {
+          "type": "string",
+          "description": "If active=false, this optional field indicates a possible reason for why the account is not active. If active=false and no status is supplied, then the host makes no claim for why the repository is no longer being hosted.",
+          "knownValues": [
+            "takendown",
+            "suspended",
+            "deleted",
+            "deactivated",
+            "desynchronized",
+            "throttled"
+          ]
+        }
+      }
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/com/atproto/sync/listReposByCollection.json b/lexicons/com/atproto/sync/listReposByCollection.json
new file mode 100644
index 0000000000..c472ae9102
--- /dev/null
+++ b/lexicons/com/atproto/sync/listReposByCollection.json
@@ -0,0 +1,66 @@
+{
+  "id": "com.atproto.sync.listReposByCollection",
+  "defs": {
+    "main": {
+      "type": "query",
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "repos"
+          ],
+          "properties": {
+            "repos": {
+              "type": "array",
+              "items": {
+                "ref": "#repo",
+                "type": "ref"
+              }
+            },
+            "cursor": {
+              "type": "string"
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "parameters": {
+        "type": "params",
+        "required": [
+          "collection"
+        ],
+        "properties": {
+          "limit": {
+            "type": "integer",
+            "default": 500,
+            "maximum": 2000,
+            "minimum": 1,
+            "description": "Maximum size of response set. Recommend setting a large maximum (1000+) when enumerating large DID lists."
+          },
+          "cursor": {
+            "type": "string"
+          },
+          "collection": {
+            "type": "string",
+            "format": "nsid"
+          }
+        }
+      },
+      "description": "Enumerates all the DIDs which have records with the given collection NSID."
+    },
+    "repo": {
+      "type": "object",
+      "required": [
+        "did"
+      ],
+      "properties": {
+        "did": {
+          "type": "string",
+          "format": "did"
+        }
+      }
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/com/atproto/sync/notifyOfUpdate.json b/lexicons/com/atproto/sync/notifyOfUpdate.json
new file mode 100644
index 0000000000..aa674c7380
--- /dev/null
+++ b/lexicons/com/atproto/sync/notifyOfUpdate.json
@@ -0,0 +1,26 @@
+{
+  "id": "com.atproto.sync.notifyOfUpdate",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "input": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "hostname"
+          ],
+          "properties": {
+            "hostname": {
+              "type": "string",
+              "description": "Hostname of the current service (usually a PDS) that is notifying of update."
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "description": "Notify a crawling service of a recent update, and that crawling should resume. Intended use is after a gap between repo stream events caused the crawling service to disconnect. Does not require auth; implemented by Relay. DEPRECATED: just use com.atproto.sync.requestCrawl"
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/com/atproto/sync/requestCrawl.json b/lexicons/com/atproto/sync/requestCrawl.json
new file mode 100644
index 0000000000..6245282cc8
--- /dev/null
+++ b/lexicons/com/atproto/sync/requestCrawl.json
@@ -0,0 +1,31 @@
+{
+  "id": "com.atproto.sync.requestCrawl",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "input": {
+        "schema": {
+          "type": "object",
+          "required": [
+            "hostname"
+          ],
+          "properties": {
+            "hostname": {
+              "type": "string",
+              "description": "Hostname of the current service (eg, PDS) that is requesting to be crawled."
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "errors": [
+        {
+          "name": "HostBanned"
+        }
+      ],
+      "description": "Request a service to persistently crawl hosted repos. Expected use is new PDS instances declaring their existence to Relays. Does not require auth."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/com/atproto/sync/subscribeRepos.json b/lexicons/com/atproto/sync/subscribeRepos.json
new file mode 100644
index 0000000000..4408da07e6
--- /dev/null
+++ b/lexicons/com/atproto/sync/subscribeRepos.json
@@ -0,0 +1,276 @@
+{
+  "id": "com.atproto.sync.subscribeRepos",
+  "defs": {
+    "info": {
+      "type": "object",
+      "required": [
+        "name"
+      ],
+      "properties": {
+        "name": {
+          "type": "string",
+          "knownValues": [
+            "OutdatedCursor"
+          ]
+        },
+        "message": {
+          "type": "string"
+        }
+      }
+    },
+    "main": {
+      "type": "subscription",
+      "errors": [
+        {
+          "name": "FutureCursor"
+        },
+        {
+          "name": "ConsumerTooSlow",
+          "description": "If the consumer of the stream can not keep up with events, and a backlog gets too large, the server will drop the connection."
+        }
+      ],
+      "message": {
+        "schema": {
+          "refs": [
+            "#commit",
+            "#sync",
+            "#identity",
+            "#account",
+            "#info"
+          ],
+          "type": "union"
+        }
+      },
+      "parameters": {
+        "type": "params",
+        "properties": {
+          "cursor": {
+            "type": "integer",
+            "description": "The last known event seq number to backfill from."
+          }
+        }
+      },
+      "description": "Repository event stream, aka Firehose endpoint. Outputs repo commits with diff data, and identity update events, for all repositories on the current server. See the atproto specifications for details around stream sequencing, repo versioning, CAR diff format, and more. Public and does not require auth; implemented by PDS and Relay."
+    },
+    "sync": {
+      "type": "object",
+      "required": [
+        "seq",
+        "did",
+        "blocks",
+        "rev",
+        "time"
+      ],
+      "properties": {
+        "did": {
+          "type": "string",
+          "format": "did",
+          "description": "The account this repo event corresponds to. Must match that in the commit object."
+        },
+        "rev": {
+          "type": "string",
+          "description": "The rev of the commit. This value must match that in the commit object."
+        },
+        "seq": {
+          "type": "integer",
+          "description": "The stream sequence number of this message."
+        },
+        "time": {
+          "type": "string",
+          "format": "datetime",
+          "description": "Timestamp of when this message was originally broadcast."
+        },
+        "blocks": {
+          "type": "bytes",
+          "maxLength": 10000,
+          "description": "CAR file containing the commit, as a block. The CAR header must include the commit block CID as the first 'root'."
+        }
+      },
+      "description": "Updates the repo to a new state, without necessarily including that state on the firehose. Used to recover from broken commit streams, data loss incidents, or in situations where upstream host does not know recent state of the repository."
+    },
+    "commit": {
+      "type": "object",
+      "nullable": [
+        "since"
+      ],
+      "required": [
+        "seq",
+        "rebase",
+        "tooBig",
+        "repo",
+        "commit",
+        "rev",
+        "since",
+        "blocks",
+        "ops",
+        "blobs",
+        "time"
+      ],
+      "properties": {
+        "ops": {
+          "type": "array",
+          "items": {
+            "ref": "#repoOp",
+            "type": "ref",
+            "description": "List of repo mutation operations in this commit (eg, records created, updated, or deleted)."
+          },
+          "maxLength": 200
+        },
+        "rev": {
+          "type": "string",
+          "format": "tid",
+          "description": "The rev of the emitted commit. Note that this information is also in the commit object included in blocks, unless this is a tooBig event."
+        },
+        "seq": {
+          "type": "integer",
+          "description": "The stream sequence number of this message."
+        },
+        "repo": {
+          "type": "string",
+          "format": "did",
+          "description": "The repo this event comes from. Note that all other message types name this field 'did'."
+        },
+        "time": {
+          "type": "string",
+          "format": "datetime",
+          "description": "Timestamp of when this message was originally broadcast."
+        },
+        "blobs": {
+          "type": "array",
+          "items": {
+            "type": "cid-link",
+            "description": "DEPRECATED -- will soon always be empty. List of new blobs (by CID) referenced by records in this commit."
+          }
+        },
+        "since": {
+          "type": "string",
+          "format": "tid",
+          "description": "The rev of the last emitted commit from this repo (if any)."
+        },
+        "blocks": {
+          "type": "bytes",
+          "maxLength": 2000000,
+          "description": "CAR file containing relevant blocks, as a diff since the previous repo state. The commit must be included as a block, and the commit block CID must be the first entry in the CAR header 'roots' list."
+        },
+        "commit": {
+          "type": "cid-link",
+          "description": "Repo commit object CID."
+        },
+        "rebase": {
+          "type": "boolean",
+          "description": "DEPRECATED -- unused"
+        },
+        "tooBig": {
+          "type": "boolean",
+          "description": "DEPRECATED -- replaced by #sync event and data limits. Indicates that this commit contained too many ops, or data size was too large. Consumers will need to make a separate request to get missing data."
+        },
+        "prevData": {
+          "type": "cid-link",
+          "description": "The root CID of the MST tree for the previous commit from this repo (indicated by the 'since' revision field in this message). Corresponds to the 'data' field in the repo commit object. NOTE: this field is effectively required for the 'inductive' version of firehose."
+        }
+      },
+      "description": "Represents an update of repository state. Note that empty commits are allowed, which include no repo data changes, but an update to rev and signature."
+    },
+    "repoOp": {
+      "type": "object",
+      "nullable": [
+        "cid"
+      ],
+      "required": [
+        "action",
+        "path",
+        "cid"
+      ],
+      "properties": {
+        "cid": {
+          "type": "cid-link",
+          "description": "For creates and updates, the new record CID. For deletions, null."
+        },
+        "path": {
+          "type": "string"
+        },
+        "prev": {
+          "type": "cid-link",
+          "description": "For updates and deletes, the previous record CID (required for inductive firehose). For creations, field should not be defined."
+        },
+        "action": {
+          "type": "string",
+          "knownValues": [
+            "create",
+            "update",
+            "delete"
+          ]
+        }
+      },
+      "description": "A repo operation, ie a mutation of a single record."
+    },
+    "account": {
+      "type": "object",
+      "required": [
+        "seq",
+        "did",
+        "time",
+        "active"
+      ],
+      "properties": {
+        "did": {
+          "type": "string",
+          "format": "did"
+        },
+        "seq": {
+          "type": "integer"
+        },
+        "time": {
+          "type": "string",
+          "format": "datetime"
+        },
+        "active": {
+          "type": "boolean",
+          "description": "Indicates that the account has a repository which can be fetched from the host that emitted this event."
+        },
+        "status": {
+          "type": "string",
+          "description": "If active=false, this optional field indicates a reason for why the account is not active.",
+          "knownValues": [
+            "takendown",
+            "suspended",
+            "deleted",
+            "deactivated",
+            "desynchronized",
+            "throttled"
+          ]
+        }
+      },
+      "description": "Represents a change to an account's status on a host (eg, PDS or Relay). The semantics of this event are that the status is at the host which emitted the event, not necessarily that at the currently active PDS. Eg, a Relay takedown would emit a takedown with active=false, even if the PDS is still active."
+    },
+    "identity": {
+      "type": "object",
+      "required": [
+        "seq",
+        "did",
+        "time"
+      ],
+      "properties": {
+        "did": {
+          "type": "string",
+          "format": "did"
+        },
+        "seq": {
+          "type": "integer"
+        },
+        "time": {
+          "type": "string",
+          "format": "datetime"
+        },
+        "handle": {
+          "type": "string",
+          "format": "handle",
+          "description": "The current handle for the account, or 'handle.invalid' if validation fails. This field is optional, might have been validated or passed-through from an upstream source. Semantics and behaviors for PDS vs Relay may evolve in the future; see atproto specs for more details."
+        }
+      },
+      "description": "Represents a change to an account's identity. Could be an updated handle, signing key, or pds hosting endpoint. Serves as a prod to all downstream services to refresh their identity cache."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/com/atproto/temp/checkHandleAvailability.json b/lexicons/com/atproto/temp/checkHandleAvailability.json
new file mode 100644
index 0000000000..ffbdd6f732
--- /dev/null
+++ b/lexicons/com/atproto/temp/checkHandleAvailability.json
@@ -0,0 +1,88 @@
+{
+  "lexicon": 1,
+  "id": "com.atproto.temp.checkHandleAvailability",
+  "defs": {
+    "main": {
+      "type": "query",
+      "description": "Checks whether the provided handle is available. If the handle is not available, available suggestions will be returned. Optional inputs will be used to generate suggestions.",
+      "parameters": {
+        "type": "params",
+        "required": ["handle"],
+        "properties": {
+          "handle": {
+            "type": "string",
+            "format": "handle",
+            "description": "Tentative handle. Will be checked for availability or used to build handle suggestions."
+          },
+          "email": {
+            "type": "string",
+            "description": "User-provided email. Might be used to build handle suggestions."
+          },
+          "birthDate": {
+            "type": "string",
+            "format": "datetime",
+            "description": "User-provided birth date. Might be used to build handle suggestions."
+          }
+        }
+      },
+      "output": {
+        "encoding": "application/json",
+        "schema": {
+          "type": "object",
+          "required": ["handle", "result"],
+          "properties": {
+            "handle": {
+              "type": "string",
+              "format": "handle",
+              "description": "Echo of the input handle."
+            },
+            "result": {
+              "type": "union",
+              "refs": ["#resultAvailable", "#resultUnavailable"]
+            }
+          }
+        }
+      },
+      "errors": [
+        {
+          "name": "InvalidEmail",
+          "description": "An invalid email was provided."
+        }
+      ]
+    },
+    "resultAvailable": {
+      "type": "object",
+      "description": "Indicates the provided handle is available.",
+      "properties": {}
+    },
+    "resultUnavailable": {
+      "type": "object",
+      "description": "Indicates the provided handle is unavailable and gives suggestions of available handles.",
+      "required": ["suggestions"],
+      "properties": {
+        "suggestions": {
+          "type": "array",
+          "description": "List of suggested handles based on the provided inputs.",
+          "items": {
+            "type": "ref",
+            "ref": "#suggestion"
+          }
+        }
+      }
+    },
+    "suggestion": {
+      "type": "object",
+      "required": ["handle", "method"],
+      "properties": {
+        "handle": {
+          "type": "string",
+          "format": "handle"
+        },
+        "method": {
+          "type": "string",
+          "description": "Method used to build this suggestion. Should be considered opaque to clients. Can be used for metrics."
+        }
+      }
+    }
+  }
+}
diff --git a/lexicons/com/atproto/temp/checkSignupQueue.json b/lexicons/com/atproto/temp/checkSignupQueue.json
new file mode 100644
index 0000000000..b7d9e65d7c
--- /dev/null
+++ b/lexicons/com/atproto/temp/checkSignupQueue.json
@@ -0,0 +1,22 @@
+{
+  "lexicon": 1,
+  "id": "com.atproto.temp.checkSignupQueue",
+  "defs": {
+    "main": {
+      "type": "query",
+      "description": "Check accounts location in signup queue.",
+      "output": {
+        "encoding": "application/json",
+        "schema": {
+          "type": "object",
+          "required": ["activated"],
+          "properties": {
+            "activated": { "type": "boolean" },
+            "placeInQueue": { "type": "integer" },
+            "estimatedTimeMs": { "type": "integer" }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/lexicons/com/germnetwork/declaration.json b/lexicons/com/germnetwork/declaration.json
new file mode 100644
index 0000000000..2c9e42486d
--- /dev/null
+++ b/lexicons/com/germnetwork/declaration.json
@@ -0,0 +1,75 @@
+{
+  "id": "com.germnetwork.declaration",
+  "defs": {
+    "main": {
+      "key": "literal:self",
+      "type": "record",
+      "record": {
+        "type": "object",
+        "required": [
+          "version",
+          "currentKey"
+        ],
+        "properties": {
+          "version": {
+            "type": "string",
+            "maxLength": 14,
+            "minLength": 5,
+            "description": "Semver version number, without pre-release or build information, for the format of opaque content"
+          },
+          "messageMe": {
+            "ref": "#messageMe",
+            "type": "ref",
+            "description": "Controls who can message this account"
+          },
+          "currentKey": {
+            "type": "bytes",
+            "description": "Opaque value, an ed25519 public key prefixed with a byte enum"
+          },
+          "keyPackage": {
+            "type": "bytes",
+            "description": "Opaque value, contains MLS KeyPackage(s), and other signature data, and is signed by the currentKey"
+          },
+          "continuityProofs": {
+            "type": "array",
+            "items": {
+              "type": "bytes"
+            },
+            "maxLength": 1000,
+            "description": "Array of opaque values to allow for key rolling"
+          }
+        }
+      },
+      "description": "A declaration of a Germ Network account"
+    },
+    "messageMe": {
+      "type": "object",
+      "required": [
+        "showButtonTo",
+        "messageMeUrl"
+      ],
+      "properties": {
+        "messageMeUrl": {
+          "type": "string",
+          "format": "uri",
+          "maxLength": 2047,
+          "minLength": 1,
+          "description": "A URL to present to an account that does not have its own com.germnetwork.declaration record, must have an empty fragment component, where the app should fill in the fragment component with the DIDs of the two accounts who wish to message each other"
+        },
+        "showButtonTo": {
+          "type": "string",
+          "maxLength": 100,
+          "minLength": 1,
+          "description": "The policy of who can message the account, this value is included in the keyPackage, but is duplicated here to allow applications to decide if they should show a 'Message on Germ' button to the viewer.",
+          "knownValues": [
+            "none",
+            "usersIFollow",
+            "everyone"
+          ]
+        }
+      }
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/lexicons/tools/ozone/report/defs.json b/lexicons/tools/ozone/report/defs.json
new file mode 100644
index 0000000000..2742fbd1ff
--- /dev/null
+++ b/lexicons/tools/ozone/report/defs.json
@@ -0,0 +1,212 @@
+{
+  "id": "tools.ozone.report.defs",
+  "defs": {
+    "reasonType": {
+      "type": "string",
+      "knownValues": [
+        "tools.ozone.report.defs#reasonAppeal",
+        "tools.ozone.report.defs#reasonOther",
+        "tools.ozone.report.defs#reasonViolenceAnimal",
+        "tools.ozone.report.defs#reasonViolenceThreats",
+        "tools.ozone.report.defs#reasonViolenceGraphicContent",
+        "tools.ozone.report.defs#reasonViolenceGlorification",
+        "tools.ozone.report.defs#reasonViolenceExtremistContent",
+        "tools.ozone.report.defs#reasonViolenceTrafficking",
+        "tools.ozone.report.defs#reasonViolenceOther",
+        "tools.ozone.report.defs#reasonSexualAbuseContent",
+        "tools.ozone.report.defs#reasonSexualNCII",
+        "tools.ozone.report.defs#reasonSexualDeepfake",
+        "tools.ozone.report.defs#reasonSexualAnimal",
+        "tools.ozone.report.defs#reasonSexualUnlabeled",
+        "tools.ozone.report.defs#reasonSexualOther",
+        "tools.ozone.report.defs#reasonChildSafetyCSAM",
+        "tools.ozone.report.defs#reasonChildSafetyGroom",
+        "tools.ozone.report.defs#reasonChildSafetyPrivacy",
+        "tools.ozone.report.defs#reasonChildSafetyHarassment",
+        "tools.ozone.report.defs#reasonChildSafetyOther",
+        "tools.ozone.report.defs#reasonHarassmentTroll",
+        "tools.ozone.report.defs#reasonHarassmentTargeted",
+        "tools.ozone.report.defs#reasonHarassmentHateSpeech",
+        "tools.ozone.report.defs#reasonHarassmentDoxxing",
+        "tools.ozone.report.defs#reasonHarassmentOther",
+        "tools.ozone.report.defs#reasonMisleadingBot",
+        "tools.ozone.report.defs#reasonMisleadingImpersonation",
+        "tools.ozone.report.defs#reasonMisleadingSpam",
+        "tools.ozone.report.defs#reasonMisleadingScam",
+        "tools.ozone.report.defs#reasonMisleadingElections",
+        "tools.ozone.report.defs#reasonMisleadingOther",
+        "tools.ozone.report.defs#reasonRuleSiteSecurity",
+        "tools.ozone.report.defs#reasonRuleProhibitedSales",
+        "tools.ozone.report.defs#reasonRuleBanEvasion",
+        "tools.ozone.report.defs#reasonRuleOther",
+        "tools.ozone.report.defs#reasonSelfHarmContent",
+        "tools.ozone.report.defs#reasonSelfHarmED",
+        "tools.ozone.report.defs#reasonSelfHarmStunts",
+        "tools.ozone.report.defs#reasonSelfHarmSubstances",
+        "tools.ozone.report.defs#reasonSelfHarmOther"
+      ]
+    },
+    "reasonOther": {
+      "type": "token",
+      "description": "An issue not included in these options"
+    },
+    "reasonAppeal": {
+      "type": "token",
+      "description": "Appeal a previously taken moderation action"
+    },
+    "reasonRuleOther": {
+      "type": "token",
+      "description": "Other"
+    },
+    "reasonSelfHarmED": {
+      "type": "token",
+      "description": "Eating disorders"
+    },
+    "reasonSexualNCII": {
+      "type": "token",
+      "description": "Non-consensual intimate imagery"
+    },
+    "reasonSexualOther": {
+      "type": "token",
+      "description": "Other sexual violence content"
+    },
+    "reasonSexualAnimal": {
+      "type": "token",
+      "description": "Animal sexual abuse"
+    },
+    "reasonMisleadingBot": {
+      "type": "token",
+      "description": "Fake account or bot"
+    },
+    "reasonSelfHarmOther": {
+      "type": "token",
+      "description": "Other dangerous content"
+    },
+    "reasonViolenceOther": {
+      "type": "token",
+      "description": "Other violent content"
+    },
+    "reasonMisleadingScam": {
+      "type": "token",
+      "description": "Scam"
+    },
+    "reasonMisleadingSpam": {
+      "type": "token",
+      "description": "Spam"
+    },
+    "reasonRuleBanEvasion": {
+      "type": "token",
+      "description": "Banned user returning"
+    },
+    "reasonSelfHarmStunts": {
+      "type": "token",
+      "description": "Dangerous challenges or activities"
+    },
+    "reasonSexualDeepfake": {
+      "type": "token",
+      "description": "Deepfake adult content"
+    },
+    "reasonViolenceAnimal": {
+      "type": "token",
+      "description": "Animal welfare violations"
+    },
+    "reasonChildSafetyCSAM": {
+      "type": "token",
+      "description": "Child sexual abuse material (CSAM). These reports will be sent only be sent to the application's Moderation Authority."
+    },
+    "reasonHarassmentOther": {
+      "type": "token",
+      "description": "Other harassing or hateful content"
+    },
+    "reasonHarassmentTroll": {
+      "type": "token",
+      "description": "Trolling"
+    },
+    "reasonMisleadingOther": {
+      "type": "token",
+      "description": "Other misleading content"
+    },
+    "reasonSelfHarmContent": {
+      "type": "token",
+      "description": "Content promoting or depicting self-harm"
+    },
+    "reasonSexualUnlabeled": {
+      "type": "token",
+      "description": "Unlabelled adult content"
+    },
+    "reasonViolenceThreats": {
+      "type": "token",
+      "description": "Threats or incitement"
+    },
+    "reasonChildSafetyGroom": {
+      "type": "token",
+      "description": "Grooming or predatory behavior. These reports will be sent only be sent to the application's Moderation Authority."
+    },
+    "reasonChildSafetyOther": {
+      "type": "token",
+      "description": "Other child safety. These reports will be sent only be sent to the application's Moderation Authority."
+    },
+    "reasonRuleSiteSecurity": {
+      "type": "token",
+      "description": "Hacking or system attacks"
+    },
+    "reasonHarassmentDoxxing": {
+      "type": "token",
+      "description": "Doxxing"
+    },
+    "reasonChildSafetyPrivacy": {
+      "type": "token",
+      "description": "Privacy violation involving a minor"
+    },
+    "reasonHarassmentTargeted": {
+      "type": "token",
+      "description": "Targeted harassment"
+    },
+    "reasonSelfHarmSubstances": {
+      "type": "token",
+      "description": "Dangerous substances or drug abuse"
+    },
+    "reasonSexualAbuseContent": {
+      "type": "token",
+      "description": "Adult sexual abuse content"
+    },
+    "reasonMisleadingElections": {
+      "type": "token",
+      "description": "False information about elections"
+    },
+    "reasonRuleProhibitedSales": {
+      "type": "token",
+      "description": "Promoting or selling prohibited items or services"
+    },
+    "reasonViolenceTrafficking": {
+      "type": "token",
+      "description": "Human trafficking"
+    },
+    "reasonHarassmentHateSpeech": {
+      "type": "token",
+      "description": "Hate speech"
+    },
+    "reasonChildSafetyHarassment": {
+      "type": "token",
+      "description": "Harassment or bullying of minors"
+    },
+    "reasonViolenceGlorification": {
+      "type": "token",
+      "description": "Glorification of violence"
+    },
+    "reasonViolenceGraphicContent": {
+      "type": "token",
+      "description": "Graphic violent content"
+    },
+    "reasonMisleadingImpersonation": {
+      "type": "token",
+      "description": "Impersonation"
+    },
+    "reasonViolenceExtremistContent": {
+      "type": "token",
+      "description": "Extremist content. These reports will be sent only be sent to the application's Moderation Authority."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}
diff --git a/package.json b/package.json
index 93d671ff31..e084d19641 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
   },
   "scripts": {
     "prepare": "is-ci || husky",
-    "postinstall": "pnpm intl:compile-if-needed",
+    "postinstall": "pnpm lexicons:generate && pnpm intl:compile-if-needed",
     "prebuild": "EXPO_NO_GIT_STATUS=1 expo prebuild --clean",
     "android": "expo run:android --variant debugOptimized",
     "android:prod": "expo run:android --variant release",
@@ -62,6 +62,10 @@
     "lint": "oxlint --quiet src modules",
     "lint-native": "swiftlint ./modules && ktlint ./modules",
     "lint-native:fix": "swiftlint --fix ./modules && ktlint --format ./modules",
+    "lexicons:generate": "lex build --clear --index-file --import-ext ''",
+    "lexicons:install": "lex install",
+    "lexicons:update": "lex install --update",
+    "lexicons:verify": "lex install --ci",
     "typecheck": "pnpm run typecheck:ios && pnpm run typecheck:android && pnpm run typecheck:web",
     "typecheck:ios": "tsc --project ./tsconfig.check.ios.json",
     "typecheck:android": "tsc --project ./tsconfig.check.android.json",
@@ -97,10 +101,10 @@
   },
   "dependencies": {
     "@atproto/api": "0.20.39",
-    "@atproto/common-web": "0.5.7",
-    "@atproto/lex-client": "0.3.0",
-    "@atproto/lex-password-session": "0.1.8",
-    "@atproto/syntax": "0.7.2",
+    "@atproto/common-web": "0.5.9",
+    "@atproto/lex": "0.3.6",
+    "@atproto/lex-password-session": "0.2.0",
+    "@atproto/syntax": "0.7.4",
     "@bitdrift/react-native": "^0.6.8",
     "@braintree/sanitize-url": "^6.0.2",
     "@bsky.app/alf": "^0.1.15",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index b4baf4a374..fa725d0bff 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -246,17 +246,17 @@ importers:
         specifier: 0.20.39
         version: 0.20.39
       '@atproto/common-web':
-        specifier: 0.5.7
-        version: 0.5.7
-      '@atproto/lex-client':
-        specifier: 0.3.0
-        version: 0.3.0
+        specifier: 0.5.9
+        version: 0.5.9
+      '@atproto/lex':
+        specifier: 0.3.6
+        version: 0.3.6
       '@atproto/lex-password-session':
-        specifier: 0.1.8
-        version: 0.1.8
+        specifier: 0.2.0
+        version: 0.2.0
       '@atproto/syntax':
-        specifier: 0.7.2
-        version: 0.7.2
+        specifier: 0.7.4
+        version: 0.7.4
       '@bitdrift/react-native':
         specifier: ^0.6.8
         version: 0.6.14(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1)
@@ -881,52 +881,97 @@ packages:
       graphql:
         optional: true
 
-  '@atproto/api@0.20.39':
-    resolution: {integrity: sha512-FRjwAmYe0kKlWsAe8IvfbmAAKyjpXnl2NV67vWEEjux0FwIEIG6JbOo6YkD5tjK2xjL0Daa429R0E8phmxRrrQ==}
+  '@atproto-labs/did-resolver@0.3.7':
+    resolution: {integrity: sha512-F3M3U5cU1QSAXX3J5auGEc5N2pgDgpirAjvyDFsytXuyWfrjWfTPd/H+DZrrED7gK+noW0cAWtxxjdX7/cTSVQ==}
     engines: {node: '>=22'}
 
-  '@atproto/common-web@0.5.7':
-    resolution: {integrity: sha512-lvU8lFO5UByacsl3AReXkpTWjcPBS8mBqt40B45HwCt+s58a+xT/YI/+AUpmzSmsPVZCpeCmP6wgsOSC8RILXg==}
+  '@atproto-labs/fetch@0.3.5':
+    resolution: {integrity: sha512-iDFZEoNqfL17EVKE+uNzdUD7YF8LWhEhxeBtP6x+PNuAxoXv3ip9vLmB8nNzNxFwVn++FipfDtSiPqmziv1bdA==}
+    engines: {node: '>=22'}
+
+  '@atproto-labs/pipe@0.2.4':
+    resolution: {integrity: sha512-n67jCcrC+ouAeO10cWkpPzzLMlDi/lDCU30Us+LGqhOPhT6c4t5ASdBLQi9W3jUQtRzQBt3G9zipF+xKWNvVbw==}
+    engines: {node: '>=22'}
+
+  '@atproto-labs/simple-store-memory@0.2.6':
+    resolution: {integrity: sha512-DD1v7MEfYF3BAcEpMTTpzfBLWLoI2HuyBhku2YpjHoqPrRrhCtE1alkxfPHjtjJVIjuU/XNU0cF/wB3+5FiKsA==}
+    engines: {node: '>=22'}
+
+  '@atproto-labs/simple-store@0.5.1':
+    resolution: {integrity: sha512-vfvoDhu6ds6BT3Pqe+d2/LBU1WpDRtt69y6zltlfMCoucPm82m1j50/Wb6xTvv+oZ+2j0JyZVXsmXQ12SWYQJg==}
+    engines: {node: '>=22'}
+
+  '@atproto/api@0.20.39':
+    resolution: {integrity: sha512-FRjwAmYe0kKlWsAe8IvfbmAAKyjpXnl2NV67vWEEjux0FwIEIG6JbOo6YkD5tjK2xjL0Daa429R0E8phmxRrrQ==}
     engines: {node: '>=22'}
 
   '@atproto/common-web@0.5.9':
     resolution: {integrity: sha512-2c5C6YV8352JJz9Z5fNfcsstllaKGAb3cQW9aO7unMAGh/FzTGFq+xOwNMW2lTeagO6z530uxYm8AiSRM6O+DQ==}
     engines: {node: '>=22'}
 
-  '@atproto/lex-client@0.3.0':
-    resolution: {integrity: sha512-P+S3hWdIIOgNTun7J42dvxSyCkQog3Q2ShTjvcwP761TqiRex7zDWaRAaT9gvCy6I4pRuNdBCStysjSMlJeSdg==}
+  '@atproto/common@0.8.0':
+    resolution: {integrity: sha512-fBtd08LdouLqNaL8SaGLEIa0l3Ue27yR810jhUu+iBv/xdoXp+1G0pxvPe6JUStH7YGtf/v/v0w/cRGh1xUOaA==}
     engines: {node: '>=22'}
 
-  '@atproto/lex-data@0.1.6':
-    resolution: {integrity: sha512-rvovRrYWDEuerX+ZeQbdI5dKs0bYvuMjhwDOtT+pkOvdY4MkfN41DJCz/RAYVAQ7noPdaalB6pAX9euukheE/w==}
+  '@atproto/crypto@0.5.4':
+    resolution: {integrity: sha512-UR0BkuYNYuFtw+dA+y/oPPxzX0SWRnGJ+1Cfh/jGP1BvjRUyezK3omjpeLms5fYrXbM9vnfX+ckJFJqkBgLOdw==}
+    engines: {node: '>=22'}
+
+  '@atproto/did@0.5.4':
+    resolution: {integrity: sha512-BlnwQ+obL+4ZA71KH/EzZ3TY+cpSxnLiUI85mjBJIQwvDF/oN2sQA18wIj9jpduviIt2b/cMtlJuzHjzBkfXvw==}
+    engines: {node: '>=22'}
+
+  '@atproto/lex-builder@0.1.12':
+    resolution: {integrity: sha512-uo3mcdoOgqBfQnf+PhYYLNEBdUTgoNe2ARYb3cUaiec8O0oritOeZndUDgmths06ACrlqFkZNTV1YJX6CsH71g==}
+    engines: {node: '>=22'}
+
+  '@atproto/lex-cbor@0.1.6':
+    resolution: {integrity: sha512-PxLQy7jzV8u9zTGURNF8ZczLPk+ZH+WNx/2z/z7RacJbu7sWNpx26U2pC7cIkWtt4jyDaruaLhssw3w3atLotA==}
+    engines: {node: '>=22'}
+
+  '@atproto/lex-client@0.3.3':
+    resolution: {integrity: sha512-sWChe7Jukm9uxDfxT6ElICp6vMTqAFmwcHdSLdMDtsKBZSrwO7vWL9F6rpoMPyxS29Ob9nNAhMg30kKfZrb+uw==}
     engines: {node: '>=22'}
 
   '@atproto/lex-data@0.1.7':
     resolution: {integrity: sha512-kW/dPLqo/WgCLV+XESR4JKwV6c1rZWJGOfuPupZGTjEDAKoBbKXdaEzX9/1vKQYbZ9U3j0DS/n7OFFK7wBugyQ==}
     engines: {node: '>=22'}
 
-  '@atproto/lex-json@0.1.5':
-    resolution: {integrity: sha512-qOp6+Za5p/xDXACYIP3vySbKaf9CJDwiZEN78ghPT1gRoJohKG3ONt/WmvOxBVJqc6VTRaqEpbG9vX9oLF2qsA==}
+  '@atproto/lex-document@0.1.9':
+    resolution: {integrity: sha512-TmpwttQ9pKCXlvwUlJ/5HMZPtJMFBvgZ1bunEeQD5JfU6n/sgK/fob8tfjhTdL2QrpZMtM6opMEk3w5STm1RDQ==}
+    engines: {node: '>=22'}
+
+  '@atproto/lex-installer@0.1.15':
+    resolution: {integrity: sha512-4/xDyY7yxxs66vF0WZB+7fcuEy4I5IRDyDoQFzLQx7C6PlQ76/e/PxvYTff7x0/N6hknmOlANODnnxo3rtdnCA==}
     engines: {node: '>=22'}
 
   '@atproto/lex-json@0.1.6':
     resolution: {integrity: sha512-mvrAd0lbyuecIHjyld8QN6MN6CBf4j0GCxLzegsvLh0SvDf+GbYWklkcQqmITL44yFQOwmA/QNIQj0Uvh7+R/g==}
     engines: {node: '>=22'}
 
-  '@atproto/lex-password-session@0.1.8':
-    resolution: {integrity: sha512-Zr3HLu6rgadiq2w82VSThOQcNfwTJNlrzlT8n9oBXDBw3CUEq3cTMatzTpdk4HYqv0unaqhaEowcKhJ4eWvSxQ==}
+  '@atproto/lex-password-session@0.2.0':
+    resolution: {integrity: sha512-u958Etax/bPVr9FWko+/B5nRcU1klQHvrdiVtYb4lkgrM6uvV7BvaFJZYEu5DzlEeqNAZ9a65PmbC1F5oyUBjQ==}
+    engines: {node: '>=22'}
+
+  '@atproto/lex-resolver@0.2.8':
+    resolution: {integrity: sha512-j3dIxeEAStp/RzJS4MECRDPuOFX41mX9fnteGgrQhe9053eRuTnl2oTyJbV7rKgzy+hEI4jH6X6Y4wOStjUb/Q==}
     engines: {node: '>=22'}
 
   '@atproto/lex-schema@0.2.5':
     resolution: {integrity: sha512-/tP3dRqaZu0EIoq0BSVzhvFGL6u0uu2KFDV21i73DpFsg6TXOTddKJ9bvgK83XdAJYL7PWi703XsaR31v9u5Qg==}
     engines: {node: '>=22'}
 
+  '@atproto/lex@0.3.6':
+    resolution: {integrity: sha512-8Hpc6MbfkPJKaO5CvvIerEylbihI5GfrY5DzapZD4rV2TWfm3RU+DzeRpsxQJ0W9WOZRYvp1JnBcq/gZ48Qb0g==}
+    engines: {node: '>=22'}
+    hasBin: true
+
   '@atproto/lexicon@0.7.11':
     resolution: {integrity: sha512-ukCZMCWmiu7fAlssBbLs+IMaf2K2R9mADaTKz2jEeC/xeZ3jT77Ka0S2G+ELBB+Dc9ijBACU0iPMQLhquOkuzQ==}
     engines: {node: '>=22'}
 
-  '@atproto/syntax@0.7.2':
-    resolution: {integrity: sha512-tZ1Tr0R9pK4bI4Zs69t29cjMlCFQvRNBeNkqJC5pGeNuCt64D0eoF7s/AlqeVmYppClmQ0xJquggGgsMDP6j7w==}
+  '@atproto/repo@0.10.11':
+    resolution: {integrity: sha512-QqDzEv8d6NUuqZ0xvWG+n8DfWd4Vuka04nyuD9oglKsj5avB1zbEsWx3Oit1oYtZFUf9JSVWMDqMXhu3UbB+lA==}
     engines: {node: '>=22'}
 
   '@atproto/syntax@0.7.4':
@@ -2336,6 +2381,14 @@ packages:
   '@messageformat/parser@5.1.1':
     resolution: {integrity: sha512-3p0YRGCcTUCYvBKLIxtDDyrJ0YijGIwrTRu1DT8gIviIDZru8H23+FkY6MJBzM1n9n20CiM4VeDYuBsrrwnLjg==}
 
+  '@noble/curves@1.9.7':
+    resolution: {integrity: sha512-gbKGcRUYIjA3/zCCNaWDciTMFI0dCkvou3TL8Zmy5Nc7sJ47a0jtOeZoTaMxkuqRo9cRhjOdZJXegxYE5FN/xw==}
+    engines: {node: ^14.21.3 || >=16}
+
+  '@noble/hashes@1.8.0':
+    resolution: {integrity: sha512-jCs9ldd7NwzpgXDIf6P3+NrHh9/sD6CQdxHyjQI+h/6rDNo88ypBxxz45UDuZHz9r3tNz7N/VInSVoVdtXEI4A==}
+    engines: {node: ^14.21.3 || >=16}
+
   '@nodelib/fs.scandir@2.1.5':
     resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==}
     engines: {node: '>= 8'}
@@ -2500,6 +2553,9 @@ packages:
     cpu: [x64]
     os: [win32]
 
+  '@pinojs/redact@0.4.0':
+    resolution: {integrity: sha512-k2ENnmBugE/rzQfEcdWHcCY+/FM3VLzH9cYEsbdsoqrvzAKRhUZeRNhAZvB8OitQJ1TBed3yqWtdjzS6wJKBwg==}
+
   '@pkgjs/parseargs@0.11.0':
     resolution: {integrity: sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==}
     engines: {node: '>=14'}
@@ -3661,6 +3717,9 @@ packages:
     resolution: {integrity: sha512-HqmEUIGRJ5fSXchkVgR5F7qn48bDBzv0kWj/Kfu5e6uci4UlEeng4331LnBkWffb++Ei3FOVLxo8JJWMFBDMeQ==}
     engines: {node: '>= 10'}
 
+  '@ts-morph/common@0.28.1':
+    resolution: {integrity: sha512-W74iWf7ILp1ZKNYXY5qbddNaml7e9Sedv5lvU1V8lftlitkc9Pq1A+jlH23ltDgWYeZFFEqGCD1Ies9hqu3O+g==}
+
   '@types/babel__core@7.20.5':
     resolution: {integrity: sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==}
 
@@ -4246,6 +4305,10 @@ packages:
   asynckit@0.4.0:
     resolution: {integrity: sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==}
 
+  atomic-sleep@1.0.0:
+    resolution: {integrity: sha512-kNOjDqAh7px0XWNI+4QbzoiR/nTkHAWNud2uvnJquD1/x5a7EQZMJT0AczqK0Qn67oY/TTQ1LbUKajZpp3I9tQ==}
+    engines: {node: '>=8.0.0'}
+
   available-typed-arrays@1.0.7:
     resolution: {integrity: sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==}
     engines: {node: '>= 0.4'}
@@ -4488,6 +4551,10 @@ packages:
   caniuse-lite@1.0.30001792:
     resolution: {integrity: sha512-hVLMUZFgR4JJ6ACt1uEESvQN1/dBVqPAKY0hgrV70eN3391K6juAfTjKZLKvOMsx8PxA7gsY1/tLMMTcfFLLpw==}
 
+  cborg@4.5.8:
+    resolution: {integrity: sha512-6/viltD51JklRhq4L7jC3zgy6gryuG5xfZ3kzpE+PravtyeQLeQmCYLREhQH7pWENg5pY4Yu/XCd6a7dKScVlw==}
+    hasBin: true
+
   cborg@5.1.1:
     resolution: {integrity: sha512-BDbSRIp6XrQXkTc7g+DN0RB9RrDPTUfals2ecWUlt3juPLjbAvy/V72mJcXY0Ehu0Dq/3WpNCOCT68HUTbW+lw==}
     hasBin: true
@@ -4591,6 +4658,10 @@ packages:
     resolution: {integrity: sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==}
     engines: {node: '>=12'}
 
+  cliui@9.0.1:
+    resolution: {integrity: sha512-k7ndgKhwoQveBL+/1tqGJYNz097I7WOvwbmmU2AR5+magtbjPWQTS1C5vzGkBC8Ym8UWRzfKUzUUqFLypY4Q+w==}
+    engines: {node: '>=20'}
+
   clone@1.0.4:
     resolution: {integrity: sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==}
     engines: {node: '>=0.8'}
@@ -4599,6 +4670,9 @@ packages:
     resolution: {integrity: sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==}
     engines: {iojs: '>= 1.0.0', node: '>= 0.12.0'}
 
+  code-block-writer@13.0.3:
+    resolution: {integrity: sha512-Oofo0pq3IKnsFtuHqSF7TqBfr71aeyZDVJ0HpmqB7FBM2qEigL0iPONSCZSO9pE9dZTAxANe5XHG9Uy0YMv8cg==}
+
   collect-v8-coverage@1.0.3:
     resolution: {integrity: sha512-1L5aqIkwPfiodaMgQunkF1zRhNqifHBmtbbbxcr6yVxxBnliw4TDOW6NxpO8DJLgJ16OT+Y4ztZqP6p/FtXnAw==}
 
@@ -4722,6 +4796,9 @@ packages:
   core-js-pure@3.49.0:
     resolution: {integrity: sha512-XM4RFka59xATyJv/cS3O3Kml72hQXUeGRuuTmMYFxwzc9/7C8OYTaIR/Ji+Yt8DXzsFLNhat15cE/JP15HrCgw==}
 
+  core-js@3.50.0:
+    resolution: {integrity: sha512-BRWgOLKkFeCgRudR6zrs8p9XJZcE14grzKMMssoYrk6krtuEZ7MTKPIY5RzOnqsEKIR9kst7wNzphttraT+Yqw==}
+
   core-util-is@1.0.3:
     resolution: {integrity: sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==}
 
@@ -7421,6 +7498,10 @@ packages:
   obuf@1.1.2:
     resolution: {integrity: sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==}
 
+  on-exit-leak-free@2.1.2:
+    resolution: {integrity: sha512-0eJJY6hXLGf1udHwfNftBqH+g73EU4B504nZeKpz1sYRKafAghwxEJunB2O7rDZkL4PGfsMVnTXZ2EjibbqcsA==}
+    engines: {node: '>=14.0.0'}
+
   on-finished@2.3.0:
     resolution: {integrity: sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==}
     engines: {node: '>= 0.8'}
@@ -7556,6 +7637,9 @@ packages:
   pascal-case@3.1.2:
     resolution: {integrity: sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==}
 
+  path-browserify@1.0.1:
+    resolution: {integrity: sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==}
+
   path-exists@3.0.0:
     resolution: {integrity: sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==}
     engines: {node: '>=4'}
@@ -7623,6 +7707,16 @@ packages:
     resolution: {integrity: sha512-MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg==}
     engines: {node: '>=0.10.0'}
 
+  pino-abstract-transport@3.0.0:
+    resolution: {integrity: sha512-wlfUczU+n7Hy/Ha5j9a/gZNy7We5+cXp8YL+X+PG8S0KXxw7n/JXA3c46Y0zQznIJ83URJiwy7Lh56WLokNuxg==}
+
+  pino-std-serializers@7.1.0:
+    resolution: {integrity: sha512-BndPH67/JxGExRgiX1dX0w1FvZck5Wa4aal9198SrRhZjH3GxKQUKIBnYJTdj2HDN3UQAS06HlfcSbQj2OHmaw==}
+
+  pino@10.3.1:
+    resolution: {integrity: sha512-r34yH/GlQpKZbU1BvFFqOjhISRo1MNx1tWYsYvmj6KIRHSPMT2+yHOEb1SG6NMvRoHRF0a07kCOox/9yakl1vg==}
+    hasBin: true
+
   pirates@4.0.7:
     resolution: {integrity: sha512-TfySrs/5nm8fQJDcBDuUng3VOUKsd7S+zqvbOTiGXHfxX4wK31ard+hoNuvkicM/2YFzlpDgABOevKSsB4G/FA==}
     engines: {node: '>= 6'}
@@ -7867,6 +7961,11 @@ packages:
     engines: {node: '>=14'}
     hasBin: true
 
+  prettier@3.9.6:
+    resolution: {integrity: sha512-OpN0zzVdiaiAhxpuuj5efpIS4sY9j7bY6uR5mnj5yPzGkdkjNKSJeUThPb60Jw29QuAZgA4o+/iB49kFiaBX6g==}
+    engines: {node: '>=14'}
+    hasBin: true
+
   pretty-bytes@5.6.0:
     resolution: {integrity: sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==}
     engines: {node: '>=6'}
@@ -7889,6 +7988,9 @@ packages:
   process-nextick-args@2.0.1:
     resolution: {integrity: sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==}
 
+  process-warning@5.1.0:
+    resolution: {integrity: sha512-jQSaVHsPgtyw60e1rQ/A+/ArPEj/S8pS/vFnyGa/gYFXrKk/6RuDkoqVDQ5NI5MmS01698ltlAk0NoDBNLujRw==}
+
   progress@2.0.3:
     resolution: {integrity: sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==}
     engines: {node: '>=0.4.0'}
@@ -8016,6 +8118,9 @@ packages:
   queue@6.0.2:
     resolution: {integrity: sha512-iHZWu+q3IdFZFX36ro/lKBkSvfkztY5Y7HMiPlOUjhupPcG2JMfst2KKEpu5XndviX/3UhFbRngUPNKtgvtZiA==}
 
+  quick-format-unescaped@4.0.4:
+    resolution: {integrity: sha512-tYC1Q1hgyRuHgloV/YXs2w15unPVh8qfu/qCTfhTYamaw7fyhumKa2yGpdSo87vY32rIclj+4fWYQXUMs9EHvg==}
+
   radix-ui@1.4.3:
     resolution: {integrity: sha512-aWizCQiyeAenIdUbqEpXgRA1ya65P13NKn/W8rWkcN0OPkRDxdBVLWnIEDsS2RpwCK2nobI7oMUSmexzTDyAmA==}
     peerDependencies:
@@ -8317,6 +8422,13 @@ packages:
     resolution: {integrity: sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==}
     engines: {node: '>=8.10.0'}
 
+  real-require@0.2.0:
+    resolution: {integrity: sha512-57frrGM/OCTLqLOAh0mhVA9VBMHd+9U7Zb2THMGdBUoZVOtGbJzjxsYGDJ3A9AYYCP4hn6y1TVbaOfzWtm5GFg==}
+    engines: {node: '>= 12.13.0'}
+
+  real-require@1.0.0:
+    resolution: {integrity: sha512-P4nbQYQfePJxRSmY+v/KINxVucm4NF3p3s7pJveMTtom52FR4YGltUQLB8idDXwDDWW+eYrWDFbuzUnjoWHF7g==}
+
   redent@3.0.0:
     resolution: {integrity: sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==}
     engines: {node: '>=8'}
@@ -8472,6 +8584,10 @@ packages:
     resolution: {integrity: sha512-x/+Cz4YrimQxQccJf5mKEbIa1NzeCRNI5Ecl/ekmlYaampdNLPalVyIcCZNNH3MvmqBugV5TMYZXv0ljslUlaw==}
     engines: {node: '>= 0.4'}
 
+  safe-stable-stringify@2.5.0:
+    resolution: {integrity: sha512-b3rppTKm9T+PsVCBEOUR46GWI7fdOs00VKZ1+9c1EWDaDMvjQc6tUwuFyIprgGgTcWoVHSKrU8H31ZHA2e0RHA==}
+    engines: {node: '>=10'}
+
   safer-buffer@2.1.2:
     resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==}
 
@@ -8648,6 +8764,9 @@ packages:
   sockjs@0.3.24:
     resolution: {integrity: sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ==}
 
+  sonic-boom@4.2.1:
+    resolution: {integrity: sha512-w6AxtubXa2wTXAUsZMMWERrsIRAdrK0Sc+FUytWvYAhBJLyuI4llrMIC1DtlNSdI99EI86KZum2MMq3EAZlF9Q==}
+
   sonner-native@0.26.4:
     resolution: {integrity: sha512-wBE/pctNfz+ieXjpYX7uu5hH38ws8xRmH0AFmEdEgkOS363k6N8QfFoyjGqDmdUDy15m4AAvOjd2Wz/jATukIA==}
     peerDependencies:
@@ -8712,6 +8831,10 @@ packages:
     resolution: {integrity: sha512-43ZssAJaMusuKWL8sKUBQXHWOpq8d6CfN/u1p4gUzfJkM05C8rxTmYrkIPTXapZpORA6LkkzcUulJ8FqA7Uudw==}
     engines: {node: '>=6'}
 
+  split2@4.2.0:
+    resolution: {integrity: sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg==}
+    engines: {node: '>= 10.x'}
+
   sprintf-js@1.0.3:
     resolution: {integrity: sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==}
 
@@ -8970,6 +9093,10 @@ packages:
   thenify@3.3.1:
     resolution: {integrity: sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==}
 
+  thread-stream@4.2.0:
+    resolution: {integrity: sha512-e2zZ96wSChazBsbENf/Pcm/4swHt2cEKQ92rhUjkL9GCKiTDJIaTBenjE/m9DXi0QBmTMDkFDdOomUy20A1tDQ==}
+    engines: {node: '>=20'}
+
   threads@1.7.0:
     resolution: {integrity: sha512-Mx5NBSHX3sQYR6iI9VYbgHKBLisyB+xROCBGjjWm1O9wb9vfLxdaGtmT/KCjUqMsSNW6nERzCW3T6H43LqjDZQ==}
 
@@ -9036,6 +9163,9 @@ packages:
   ts-interface-checker@0.1.13:
     resolution: {integrity: sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==}
 
+  ts-morph@27.0.2:
+    resolution: {integrity: sha512-fhUhgeljcrdZ+9DZND1De1029PrE+cMkIP7ooqkLRTrRLTqcki2AstsyJm0vRNbTbVCNJ0idGlbBrfqc7/nA8w==}
+
   ts-plugin-sort-import-suggestions@1.0.4:
     resolution: {integrity: sha512-85n5lm2OQQ+b7aRNK9omU1gmjMNXRsgeLwojm5u4OSY5sVBkAHTcgMQPEeHMNlyyfFW0uXnwgqAU0pNfhD96Bw==}
 
@@ -9107,6 +9237,9 @@ packages:
   uc.micro@2.1.0:
     resolution: {integrity: sha512-ARDJmphmdvUk6Glw7y9DQ2bFkKBHwQHLi2lsaH6PPmz/Ka9sFOBsBluozhDltWmnv9u/cF6Rt87znRTPV+yp/A==}
 
+  uint8arrays@5.1.1:
+    resolution: {integrity: sha512-9muQwa4wZG4dKi9gMAIBtnk2Pw87SRpvWTH6lOGm19V2Uqxr4uomUf2PGqPnWc+qs06sN8owUU4jfcoWOcfwVQ==}
+
   unbox-primitive@1.1.0:
     resolution: {integrity: sha512-nWJ91DjeOkej/TA8pXQ3myruKpKEYgqvpw9lz4OPHj/NWFNluYrjbz9j01CJ8yKQd2g4jFoOkINCTW2I5LEEyw==}
     engines: {node: '>= 0.4'}
@@ -9263,6 +9396,9 @@ packages:
     resolution: {integrity: sha512-OljLrQ9SQdOUqTaQxqL5dEfZWrXExyyWsozYlAWFawPVNuD83igl7uJD2RTkNMbniIYgt8l81eCJGIdQF7avLQ==}
     engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
 
+  varint@6.0.0:
+    resolution: {integrity: sha512-cXEIW6cfr15lFv563k4GuVuW/fiwjknytD37jIOLSdSWuOI6WnO/oKwmP2FQTU2l01LP8/M5TSAJpzUaGe3uWg==}
+
   vary@1.1.2:
     resolution: {integrity: sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==}
     engines: {node: '>= 0.8'}
@@ -9539,6 +9675,10 @@ packages:
     resolution: {integrity: sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==}
     engines: {node: '>=12'}
 
+  yargs-parser@22.0.0:
+    resolution: {integrity: sha512-rwu/ClNdSMpkSrUb+d6BRsSkLUq1fmfsY6TOpYzTwvwkg1/NRG85KBy3kq++A8LKQwX6lsu+aWad+2khvuXrqw==}
+    engines: {node: ^20.19.0 || ^22.12.0 || >=23}
+
   yargs@15.4.1:
     resolution: {integrity: sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==}
     engines: {node: '>=8'}
@@ -9547,6 +9687,10 @@ packages:
     resolution: {integrity: sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==}
     engines: {node: '>=12'}
 
+  yargs@18.1.0:
+    resolution: {integrity: sha512-2rAgRKu54VsHkqI0/tYkmluGXHD4KW7yZoycuqDQ15QOTnc2VVfy0nN/1eMhnQLO00A+dwtK20xuCnc1YGeUyg==}
+    engines: {node: ^20.19.0 || ^22.12.0 || >=23}
+
   yauzl@3.3.0:
     resolution: {integrity: sha512-PtGEvEP30p7sbIBJKUBjUnqgTVOyMURc4dLo9iNyAJnNIEz9pm88cCXF21w94Kg3k6RXkeZh5DHOGS0qEONvNQ==}
     engines: {node: '>=12'}
@@ -9568,6 +9712,28 @@ snapshots:
 
   '@0no-co/graphql.web@1.2.0': {}
 
+  '@atproto-labs/did-resolver@0.3.7':
+    dependencies:
+      '@atproto-labs/fetch': 0.3.5
+      '@atproto-labs/pipe': 0.2.4
+      '@atproto-labs/simple-store': 0.5.1
+      '@atproto-labs/simple-store-memory': 0.2.6
+      '@atproto/did': 0.5.4
+      zod: 3.25.76
+
+  '@atproto-labs/fetch@0.3.5':
+    dependencies:
+      '@atproto-labs/pipe': 0.2.4
+
+  '@atproto-labs/pipe@0.2.4': {}
+
+  '@atproto-labs/simple-store-memory@0.2.6':
+    dependencies:
+      '@atproto-labs/simple-store': 0.5.1
+      lru-cache: 10.4.3
+
+  '@atproto-labs/simple-store@0.5.1': {}
+
   '@atproto/api@0.20.39':
     dependencies:
       '@atproto/common-web': 0.5.9
@@ -9579,13 +9745,6 @@ snapshots:
       tlds: 1.261.0
       zod: 3.25.76
 
-  '@atproto/common-web@0.5.7':
-    dependencies:
-      '@atproto/lex-data': 0.1.6
-      '@atproto/lex-json': 0.1.5
-      '@atproto/syntax': 0.7.2
-      zod: 3.25.76
-
   '@atproto/common-web@0.5.9':
     dependencies:
       '@atproto/lex-data': 0.1.7
@@ -9593,28 +9752,66 @@ snapshots:
       '@atproto/syntax': 0.7.4
       zod: 3.25.76
 
-  '@atproto/lex-client@0.3.0':
+  '@atproto/common@0.8.0':
+    dependencies:
+      '@atproto/common-web': 0.5.9
+      '@atproto/lex-cbor': 0.1.6
+      '@atproto/lex-data': 0.1.7
+      multiformats: 13.4.2
+      pino: 10.3.1
+
+  '@atproto/crypto@0.5.4':
+    dependencies:
+      '@noble/curves': 1.9.7
+      '@noble/hashes': 1.8.0
+      uint8arrays: 5.1.1
+
+  '@atproto/did@0.5.4':
+    dependencies:
+      zod: 3.25.76
+
+  '@atproto/lex-builder@0.1.12':
+    dependencies:
+      '@atproto/lex-document': 0.1.9
+      '@atproto/lex-schema': 0.2.5
+      prettier: 3.9.6
+      ts-morph: 27.0.2
+      tslib: 2.8.1
+
+  '@atproto/lex-cbor@0.1.6':
+    dependencies:
+      '@atproto/lex-data': 0.1.7
+      cborg: 4.5.8
+      tslib: 2.8.1
+
+  '@atproto/lex-client@0.3.3':
     dependencies:
       '@atproto/lex-data': 0.1.7
       '@atproto/lex-json': 0.1.6
       '@atproto/lex-schema': 0.2.5
       tslib: 2.8.1
 
-  '@atproto/lex-data@0.1.6':
-    dependencies:
-      multiformats: 13.4.2
-      tslib: 2.8.1
-      unicode-segmenter: 0.14.5
-
   '@atproto/lex-data@0.1.7':
     dependencies:
       multiformats: 13.4.2
       tslib: 2.8.1
       unicode-segmenter: 0.14.5
 
-  '@atproto/lex-json@0.1.5':
+  '@atproto/lex-document@0.1.9':
     dependencies:
-      '@atproto/lex-data': 0.1.6
+      '@atproto/lex-schema': 0.2.5
+      core-js: 3.50.0
+      tslib: 2.8.1
+
+  '@atproto/lex-installer@0.1.15':
+    dependencies:
+      '@atproto/lex-builder': 0.1.12
+      '@atproto/lex-cbor': 0.1.6
+      '@atproto/lex-data': 0.1.7
+      '@atproto/lex-document': 0.1.9
+      '@atproto/lex-resolver': 0.2.8
+      '@atproto/lex-schema': 0.2.5
+      '@atproto/syntax': 0.7.4
       tslib: 2.8.1
 
   '@atproto/lex-json@0.1.6':
@@ -9622,12 +9819,24 @@ snapshots:
       '@atproto/lex-data': 0.1.7
       tslib: 2.8.1
 
-  '@atproto/lex-password-session@0.1.8':
+  '@atproto/lex-password-session@0.2.0':
     dependencies:
-      '@atproto/lex-client': 0.3.0
+      '@atproto/lex-client': 0.3.3
       '@atproto/lex-schema': 0.2.5
       tslib: 2.8.1
 
+  '@atproto/lex-resolver@0.2.8':
+    dependencies:
+      '@atproto-labs/did-resolver': 0.3.7
+      '@atproto/crypto': 0.5.4
+      '@atproto/lex-client': 0.3.3
+      '@atproto/lex-data': 0.1.7
+      '@atproto/lex-document': 0.1.9
+      '@atproto/lex-schema': 0.2.5
+      '@atproto/repo': 0.10.11
+      '@atproto/syntax': 0.7.4
+      tslib: 2.8.1
+
   '@atproto/lex-schema@0.2.5':
     dependencies:
       '@atproto/lex-data': 0.1.7
@@ -9635,6 +9844,17 @@ snapshots:
       '@standard-schema/spec': 1.1.0
       tslib: 2.8.1
 
+  '@atproto/lex@0.3.6':
+    dependencies:
+      '@atproto/lex-builder': 0.1.12
+      '@atproto/lex-client': 0.3.3
+      '@atproto/lex-data': 0.1.7
+      '@atproto/lex-installer': 0.1.15
+      '@atproto/lex-json': 0.1.6
+      '@atproto/lex-schema': 0.2.5
+      tslib: 2.8.1
+      yargs: 18.1.0
+
   '@atproto/lexicon@0.7.11':
     dependencies:
       '@atproto/common-web': 0.5.9
@@ -9642,10 +9862,16 @@ snapshots:
       multiformats: 13.4.2
       zod: 3.25.76
 
-  '@atproto/syntax@0.7.2':
+  '@atproto/repo@0.10.11':
     dependencies:
-      iso-datestring-validator: 2.2.2
-      tslib: 2.8.1
+      '@atproto/common': 0.8.0
+      '@atproto/common-web': 0.5.9
+      '@atproto/crypto': 0.5.4
+      '@atproto/lex-cbor': 0.1.6
+      '@atproto/lex-data': 0.1.7
+      '@atproto/syntax': 0.7.4
+      varint: 6.0.0
+      zod: 3.25.76
 
   '@atproto/syntax@0.7.4':
     dependencies:
@@ -11557,6 +11783,12 @@ snapshots:
     dependencies:
       moo: 0.5.3
 
+  '@noble/curves@1.9.7':
+    dependencies:
+      '@noble/hashes': 1.8.0
+
+  '@noble/hashes@1.8.0': {}
+
   '@nodelib/fs.scandir@2.1.5':
     dependencies:
       '@nodelib/fs.stat': 2.0.5
@@ -11644,6 +11876,8 @@ snapshots:
   '@oxlint/binding-win32-x64-msvc@1.73.0':
     optional: true
 
+  '@pinojs/redact@0.4.0': {}
+
   '@pkgjs/parseargs@0.11.0':
     optional: true
 
@@ -12938,6 +13172,12 @@ snapshots:
 
   '@tootallnate/once@2.0.1': {}
 
+  '@ts-morph/common@0.28.1':
+    dependencies:
+      minimatch: 10.2.5
+      path-browserify: 1.0.1
+      tinyglobby: 0.2.16
+
   '@types/babel__core@7.20.5':
     dependencies:
       '@babel/parser': 7.29.3
@@ -13522,6 +13762,8 @@ snapshots:
 
   asynckit@0.4.0: {}
 
+  atomic-sleep@1.0.0: {}
+
   available-typed-arrays@1.0.7:
     dependencies:
       possible-typed-array-names: 1.1.0
@@ -13869,6 +14111,8 @@ snapshots:
 
   caniuse-lite@1.0.30001792: {}
 
+  cborg@4.5.8: {}
+
   cborg@5.1.1: {}
 
   chalk@2.4.2:
@@ -13991,10 +14235,18 @@ snapshots:
       strip-ansi: 6.0.1
       wrap-ansi: 7.0.0
 
+  cliui@9.0.1:
+    dependencies:
+      string-width: 7.2.0
+      strip-ansi: 7.2.0
+      wrap-ansi: 9.0.2
+
   clone@1.0.4: {}
 
   co@4.6.0: {}
 
+  code-block-writer@13.0.3: {}
+
   collect-v8-coverage@1.0.3: {}
 
   color-convert@1.9.3:
@@ -14106,6 +14358,8 @@ snapshots:
 
   core-js-pure@3.49.0: {}
 
+  core-js@3.50.0: {}
+
   core-util-is@1.0.3: {}
 
   cosmiconfig@8.3.6(@typescript/typescript6@6.0.2):
@@ -17308,6 +17562,8 @@ snapshots:
 
   obuf@1.1.2: {}
 
+  on-exit-leak-free@2.1.2: {}
+
   on-finished@2.3.0:
     dependencies:
       ee-first: 1.1.1
@@ -17479,6 +17735,8 @@ snapshots:
       no-case: 3.0.4
       tslib: 2.8.1
 
+  path-browserify@1.0.1: {}
+
   path-exists@3.0.0: {}
 
   path-exists@4.0.0: {}
@@ -17523,6 +17781,26 @@ snapshots:
 
   pinkie@2.0.4: {}
 
+  pino-abstract-transport@3.0.0:
+    dependencies:
+      split2: 4.2.0
+
+  pino-std-serializers@7.1.0: {}
+
+  pino@10.3.1:
+    dependencies:
+      '@pinojs/redact': 0.4.0
+      atomic-sleep: 1.0.0
+      on-exit-leak-free: 2.1.2
+      pino-abstract-transport: 3.0.0
+      pino-std-serializers: 7.1.0
+      process-warning: 5.1.0
+      quick-format-unescaped: 4.0.4
+      real-require: 0.2.0
+      safe-stable-stringify: 2.5.0
+      sonic-boom: 4.2.1
+      thread-stream: 4.2.0
+
   pirates@4.0.7: {}
 
   pkg-dir@4.2.0:
@@ -17744,6 +18022,8 @@ snapshots:
 
   prettier@3.8.3: {}
 
+  prettier@3.9.6: {}
+
   pretty-bytes@5.6.0: {}
 
   pretty-error@4.0.0:
@@ -17768,6 +18048,8 @@ snapshots:
 
   process-nextick-args@2.0.1: {}
 
+  process-warning@5.1.0: {}
+
   progress@2.0.3: {}
 
   promise@7.3.1:
@@ -17938,6 +18220,8 @@ snapshots:
     dependencies:
       inherits: 2.0.4
 
+  quick-format-unescaped@4.0.4: {}
+
   radix-ui@1.4.3(@types/react-dom@19.1.11(@types/react@19.1.17))(@types/react@19.1.17)(react-dom@19.1.0(react@19.1.0))(react@19.1.0):
     dependencies:
       '@radix-ui/primitive': 1.1.3
@@ -18351,6 +18635,10 @@ snapshots:
     dependencies:
       picomatch: 2.3.2
 
+  real-require@0.2.0: {}
+
+  real-require@1.0.0: {}
+
   redent@3.0.0:
     dependencies:
       indent-string: 4.0.0
@@ -18517,6 +18805,8 @@ snapshots:
       es-errors: 1.3.0
       is-regex: 1.2.1
 
+  safe-stable-stringify@2.5.0: {}
+
   safer-buffer@2.1.2: {}
 
   sax@1.6.0: {}
@@ -18727,6 +19017,10 @@ snapshots:
       uuid: 8.3.2
       websocket-driver: 0.7.4
 
+  sonic-boom@4.2.1:
+    dependencies:
+      atomic-sleep: 1.0.0
+
   sonner-native@0.26.4(dd52c15d65a2604bcf203dfed917879b):
     dependencies:
       react: 19.1.0
@@ -18795,6 +19089,8 @@ snapshots:
 
   split-on-first@1.1.0: {}
 
+  split2@4.2.0: {}
+
   sprintf-js@1.0.3: {}
 
   stable@0.1.8: {}
@@ -19050,6 +19346,10 @@ snapshots:
     dependencies:
       any-promise: 1.3.0
 
+  thread-stream@4.2.0:
+    dependencies:
+      real-require: 1.0.0
+
   threads@1.7.0(supports-color@8.1.1):
     dependencies:
       callsites: 3.1.0
@@ -19116,6 +19416,11 @@ snapshots:
 
   ts-interface-checker@0.1.13: {}
 
+  ts-morph@27.0.2:
+    dependencies:
+      '@ts-morph/common': 0.28.1
+      code-block-writer: 13.0.3
+
   ts-plugin-sort-import-suggestions@1.0.4: {}
 
   tslib@2.8.1: {}
@@ -19204,6 +19509,10 @@ snapshots:
 
   uc.micro@2.1.0: {}
 
+  uint8arrays@5.1.1:
+    dependencies:
+      multiformats: 13.4.2
+
   unbox-primitive@1.1.0:
     dependencies:
       call-bound: 1.0.4
@@ -19335,6 +19644,8 @@ snapshots:
 
   validate-npm-package-name@5.0.1: {}
 
+  varint@6.0.0: {}
+
   vary@1.1.2: {}
 
   vlq@1.0.1: {}
@@ -19661,6 +19972,8 @@ snapshots:
 
   yargs-parser@21.1.1: {}
 
+  yargs-parser@22.0.0: {}
+
   yargs@15.4.1:
     dependencies:
       cliui: 6.0.0
@@ -19685,6 +19998,15 @@ snapshots:
       y18n: 5.0.8
       yargs-parser: 21.1.1
 
+  yargs@18.1.0:
+    dependencies:
+      cliui: 9.0.1
+      escalade: 3.2.0
+      get-caller-file: 2.0.5
+      string-width: 8.2.1
+      y18n: 5.0.8
+      yargs-parser: 22.0.0
+
   yauzl@3.3.0:
     dependencies:
       buffer-crc32: 0.2.13
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index aa9a37f930..372e071c73 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -16,8 +16,9 @@ overrides:
   'react-native-screens': '4.24.0'
 allowBuilds:
   '@sentry/cli': true
-  'core-js-pure': true
-  'esbuild': true
+  'core-js': false
+  'core-js-pure': false
+  'esbuild': false
   'unrs-resolver': true
 patchedDependencies:
   '@sentry/expo-upload-sourcemaps@8.18.0': patches/@sentry__expo-upload-sourcemaps@8.18.0.patch
diff --git a/src/lib/strings/__tests__/errors.test.ts b/src/lib/strings/__tests__/errors.test.ts
index 03cdd422c8..1d9ccd8a3d 100644
--- a/src/lib/strings/__tests__/errors.test.ts
+++ b/src/lib/strings/__tests__/errors.test.ts
@@ -1,5 +1,5 @@
 import {XRPCError} from '@atproto/api'
-import {LexError, XrpcResponseError} from '@atproto/lex-client'
+import {LexError, XrpcResponseError} from '@atproto/lex'
 import {beforeAll, describe, expect, it} from '@jest/globals'
 import {i18n} from '@lingui/core'
 
diff --git a/src/lib/strings/errors.ts b/src/lib/strings/errors.ts
index 4f793ec195..fb2b0c5b9d 100644
--- a/src/lib/strings/errors.ts
+++ b/src/lib/strings/errors.ts
@@ -1,5 +1,5 @@
 import {XRPCError} from '@atproto/api'
-import {LexError} from '@atproto/lex-client'
+import {LexError} from '@atproto/lex'
 import {t} from '@lingui/core/macro'
 
 /**
diff --git a/src/screens/Signup/state.ts b/src/screens/Signup/state.ts
index 33a5d26a64..8acbd47908 100644
--- a/src/screens/Signup/state.ts
+++ b/src/screens/Signup/state.ts
@@ -1,7 +1,7 @@
 import {createContext, useCallback, useContext} from 'react'
 import {LayoutAnimation} from 'react-native'
 import {type ComAtprotoServerDescribeServer} from '@atproto/api'
-import {XrpcResponseError} from '@atproto/lex-client'
+import {XrpcResponseError} from '@atproto/lex'
 import {useLingui} from '@lingui/react/macro'
 import * as EmailValidator from 'email-validator'
 

From 837771a31180038d6b6e9a92b940dd867a5ba0cb Mon Sep 17 00:00:00 2001
From: Samuel Newman <mozzius@protonmail.com>
Date: Thu, 13 Aug 2026 22:26:13 +0300
Subject: [PATCH 04/32] [SDK] Add lex client seam and typed xrpc error matching
 (#11348)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
---
 src/lib/__tests__/xrpc-error.test.ts          |  91 +++++++++
 src/lib/lexClient.ts                          |  26 +++
 src/lib/xrpc-error.ts                         |  59 ++++++
 src/screens/Signup/state.ts                   |  43 ++---
 .../queries/trending/useGetTrendsQuery.ts     |  12 +-
 src/state/session/__tests__/clients-test.ts   | 179 ++++++++++++++++++
 src/state/session/clients.ts                  |  71 +++++++
 src/state/session/index.tsx                   |  21 ++
 8 files changed, 467 insertions(+), 35 deletions(-)
 create mode 100644 src/lib/__tests__/xrpc-error.test.ts
 create mode 100644 src/lib/lexClient.ts
 create mode 100644 src/lib/xrpc-error.ts
 create mode 100644 src/state/session/__tests__/clients-test.ts
 create mode 100644 src/state/session/clients.ts

diff --git a/src/lib/__tests__/xrpc-error.test.ts b/src/lib/__tests__/xrpc-error.test.ts
new file mode 100644
index 0000000000..5c09fb4f08
--- /dev/null
+++ b/src/lib/__tests__/xrpc-error.test.ts
@@ -0,0 +1,91 @@
+import {
+  getMain,
+  type Procedure,
+  type Query,
+  XrpcInternalError,
+  XrpcResponseError,
+} from '@atproto/lex'
+import {describe, expect, it} from '@jest/globals'
+
+import {app, com} from '#/lexicons'
+import {matchXrpcError} from '../xrpc-error'
+
+const createAccount = com.atproto.server.createAccount
+const getTrends = app.bsky.unspecced.getTrends
+
+/**
+ * An `XrpcResponseError` as a lex `Client` would construct it: the method
+ * schema it was thrown for, plus the server's error response and its parsed
+ * payload.
+ */
+function responseError(method: Procedure | Query, error: string, status = 400) {
+  return new XrpcResponseError(
+    method,
+    new Response(JSON.stringify({error}), {
+      status,
+      headers: {'content-type': 'application/json'},
+    }),
+    {encoding: 'application/json', body: {error}},
+  )
+}
+
+describe('matchXrpcError', () => {
+  it('returns a code declared by the method', () => {
+    const e = responseError(getMain(createAccount), 'InvalidHandle')
+    expect(matchXrpcError(e, createAccount)).toBe('InvalidHandle')
+  })
+
+  it('accepts the .main schema as well as the namespace', () => {
+    const e = responseError(getMain(createAccount), 'InvalidInviteCode')
+    expect(matchXrpcError(e, createAccount.main)).toBe('InvalidInviteCode')
+  })
+
+  it('returns undefined for a code the method does not declare', () => {
+    const e = responseError(getMain(createAccount), 'RateLimitExceeded')
+    expect(matchXrpcError(e, createAccount)).toBeUndefined()
+  })
+
+  it('returns undefined for a method that declares no errors at all', () => {
+    const e = responseError(getMain(getTrends), 'InvalidHandle')
+    expect(matchXrpcError(e, getTrends)).toBeUndefined()
+  })
+
+  it('does not match a declared code thrown for a different method', () => {
+    /*
+     * `InvalidHandle` is declared by createAccount but this error came from a
+     * getTrends call, so scoping must reject it.
+     */
+    const e = responseError(getMain(getTrends), 'InvalidHandle')
+    expect(matchXrpcError(e, createAccount)).toBeUndefined()
+  })
+
+  it('returns undefined for a lex error carrying no server code', () => {
+    const e = new XrpcInternalError(getMain(createAccount), 'boom')
+    expect(matchXrpcError(e, createAccount)).toBeUndefined()
+  })
+
+  it('returns undefined for non-lex errors and non-errors', () => {
+    expect(matchXrpcError(new Error('InvalidHandle'), createAccount)).toBe(
+      undefined,
+    )
+    expect(matchXrpcError('InvalidHandle', createAccount)).toBeUndefined()
+    expect(matchXrpcError(undefined, createAccount)).toBeUndefined()
+  })
+
+  it('narrows the result to the declared-errors union', () => {
+    const e = responseError(getMain(createAccount), 'InvalidHandle')
+    const code = matchXrpcError(e, createAccount)
+
+    /*
+     * A misspelled or undeclared code is not comparable to the narrowed union,
+     * which is what makes a typo'd `switch` case a compile error (TS2678 /
+     * TS2367) rather than a branch that never runs.
+     */
+    // @ts-expect-error 'InvalidHandel' is not a declared createAccount error
+    expect(code === 'InvalidHandel').toBe(false)
+    // @ts-expect-error 'RateLimitExceeded' is not declared by createAccount
+    expect(code === 'RateLimitExceeded').toBe(false)
+
+    expect(code === 'UnsupportedDomain').toBe(false)
+  })
+})
diff --git a/src/lib/lexClient.ts b/src/lib/lexClient.ts
new file mode 100644
index 0000000000..40b0640665
--- /dev/null
+++ b/src/lib/lexClient.ts
@@ -0,0 +1,26 @@
+import {
+  type Agent,
+  type AgentOptions,
+  Client,
+  type ClientOptions,
+} from '@atproto/lex'
+
+/**
+ * App-standard factory for lex {@link Client}s. Use this instead of `new
+ * Client(...)` so every client shares the same lenient response processing.
+ *
+ * lex-client defaults to strict Lex processing, which rejects responses
+ * containing the LEGACY blob reference format (objects with `cid` and
+ * `mimeType` properties instead of `$type: 'blob'`). Older records on the
+ * network still carry these, and rejecting them would drop records the app
+ * currently renders. Lenient mode also relaxes datetime format checks (e.g.
+ * missing timezones) and blob MIME/size constraints. `Client.configure` only
+ * accepts `appLabelers` globally, so the option is defaulted here, per
+ * constructed client.
+ */
+export function createLexClient(
+  agent: Agent | AgentOptions,
+  options?: ClientOptions,
+): Client {
+  return new Client(agent, {strictResponseProcessing: false, ...options})
+}
diff --git a/src/lib/xrpc-error.ts b/src/lib/xrpc-error.ts
new file mode 100644
index 0000000000..25f9a1277e
--- /dev/null
+++ b/src/lib/xrpc-error.ts
@@ -0,0 +1,59 @@
+import {
+  getMain,
+  type InferMethodError,
+  type Main,
+  type Procedure,
+  type Query,
+  XrpcResponseError,
+} from '@atproto/lex'
+
+/**
+ * Same nsid means `e` was thrown for this method schema, so `e` can be
+ * treated as an `XrpcResponseError<M>` - which is what lets the SDK's
+ * `matchesSchemaErrors()` narrow `e.error` to M's declared errors.
+ */
+function isThrownFor<M extends Procedure | Query>(
+  e: XrpcResponseError,
+  schema: M,
+): e is XrpcResponseError<M> {
+  return e.method.nsid === schema.nsid
+}
+
+/**
+ * The lexicon error code carried by `e`, narrowed to the errors DECLARED by
+ * `method`, or `undefined` when `e` is not such an error.
+ *
+ * `XrpcResponseError.error` is the open `LexErrorCode` union, so comparing it
+ * as a plain string lets a typo silently never match. Narrowing the return type
+ * to `InferMethodError<M>` makes a `switch` over the result reject an
+ * undeclared or misspelled `case` at compile time:
+ *
+ * ```ts
+ * switch (matchXrpcError(e, com.atproto.server.createAccount)) {
+ *   case 'InvalidHandle':
+ *     ...
+ * }
+ * ```
+ *
+ * Matching is scoped to `method`: `XrpcError` records the method schema it was
+ * thrown for, so a declared code arriving from a DIFFERENT call does not match.
+ * Undeclared codes, non-XRPC errors, and the internal/fetch lex errors (which
+ * carry no server error code) all return `undefined`.
+ *
+ * `method` accepts the same value passed to `client.call` - either the
+ * generated method namespace (`com.atproto.server.createAccount`) or its
+ * `.main` schema - via lex's `Main<M>`.
+ */
+export function matchXrpcError<M extends Procedure | Query>(
+  e: unknown,
+  method: Main<M>,
+): InferMethodError<M> | undefined {
+  if (!(e instanceof XrpcResponseError)) {
+    return undefined
+  }
+  const schema = getMain(method)
+  if (isThrownFor(e, schema) && e.matchesSchemaErrors()) {
+    return e.error
+  }
+  return undefined
+}
diff --git a/src/screens/Signup/state.ts b/src/screens/Signup/state.ts
index 8acbd47908..9f0ce29bcf 100644
--- a/src/screens/Signup/state.ts
+++ b/src/screens/Signup/state.ts
@@ -1,7 +1,6 @@
 import {createContext, useCallback, useContext} from 'react'
 import {LayoutAnimation} from 'react-native'
 import {type ComAtprotoServerDescribeServer} from '@atproto/api'
-import {XrpcResponseError} from '@atproto/lex'
 import {useLingui} from '@lingui/react/macro'
 import * as EmailValidator from 'email-validator'
 
@@ -9,9 +8,11 @@ import {DEFAULT_SERVICE} from '#/lib/constants'
 import {cleanError, isNetworkError} from '#/lib/strings/errors'
 import {createFullHandle} from '#/lib/strings/handles'
 import {getAge} from '#/lib/strings/time'
+import {matchXrpcError} from '#/lib/xrpc-error'
 import {useSessionApi} from '#/state/session'
 import {useOnboardingDispatch} from '#/state/shell'
 import {type AnalyticsContextType, useAnalytics} from '#/analytics'
+import {com} from '#/lexicons'
 
 export type ServiceDescription = ComAtprotoServerDescribeServer.OutputSchema
 
@@ -258,34 +259,13 @@ export const useSignupContext = () => useContext(SignupContext)
  * failure is unexpected and should be reported to Sentry.
  */
 function classifyExpectedSignupError(e: unknown): string | undefined {
-  /*
-   * TODO: `XrpcResponseError.error` is the open `LexErrorCode` union, so these
-   * codes are compared as plain strings and a typo silently never matches.
-   * Once the generated lexicons land, replace this (and every multi-code error
-   * site) with a shared helper that narrows against the method schema:
-   *
-   *   function matchXrpcError<M extends Procedure | Query>(
-   *     e: unknown,
-   *     method: Main<M>,
-   *   ): InferMethodError<M> | undefined
-   *
-   *   switch (matchXrpcError(e, com.atproto.server.createAccount)) {
-   *     case 'InvalidHandle': ...
-   *   }
-   *
-   * The return type is the method's declared-errors union, so a typo'd case is
-   * a compile error, and undeclared codes fall through to `undefined`. The
-   * helper should also match `e.method.nsid` so a declared code from a
-   * different call cannot match, mirroring the old per-method error classes.
-   */
-  if (e instanceof XrpcResponseError) {
-    switch (e.error) {
-      case 'InvalidHandle':
-      case 'HandleNotAvailable':
-      case 'InvalidPassword':
-      case 'UnsupportedDomain':
-        return e.error
-    }
+  const code = matchXrpcError(e, com.atproto.server.createAccount)
+  switch (code) {
+    case 'InvalidHandle':
+    case 'HandleNotAvailable':
+    case 'InvalidPassword':
+    case 'UnsupportedDomain':
+      return code
   }
   /* the server sends no typed error for this case */
   if (String(e).includes('Email already taken')) return 'EmailTaken'
@@ -376,7 +356,10 @@ export function useSubmitSignup() {
       } catch (err) {
         const e = err as Error
         let errMsg = e.toString()
-        if (e instanceof XrpcResponseError && e.error === 'InvalidInviteCode') {
+        if (
+          matchXrpcError(e, com.atproto.server.createAccount) ===
+          'InvalidInviteCode'
+        ) {
           dispatch({
             type: 'setError',
             value: l`Invite code not accepted. Check that you input it correctly and try again.`,
diff --git a/src/state/queries/trending/useGetTrendsQuery.ts b/src/state/queries/trending/useGetTrendsQuery.ts
index 757e868d1f..e7d6806b3e 100644
--- a/src/state/queries/trending/useGetTrendsQuery.ts
+++ b/src/state/queries/trending/useGetTrendsQuery.ts
@@ -1,5 +1,5 @@
 import {useCallback, useMemo} from 'react'
-import {type AppBskyUnspeccedGetTrends, hasMutedWord} from '@atproto/api'
+import {hasMutedWord} from '@atproto/api'
 import {useQuery} from '@tanstack/react-query'
 
 import {
@@ -10,7 +10,8 @@ import {logger} from '#/logger'
 import {getContentLanguages} from '#/state/preferences/languages'
 import {STALE} from '#/state/queries'
 import {usePreferencesQuery} from '#/state/queries/preferences'
-import {useAgent} from '#/state/session'
+import {useLexClient} from '#/state/session'
+import {app} from '#/lexicons'
 
 export const DEFAULT_LIMIT = 5
 
@@ -32,7 +33,7 @@ export const createGetTrendsQueryKey = (limit?: number) =>
   limit === undefined ? ['trends'] : ['trends', {limit}]
 
 export function useGetTrendsQuery(props: QueryProps = {}) {
-  const agent = useAgent()
+  const client = useLexClient()
   const {data: preferences} = usePreferencesQuery()
   const limit = props.limit ?? DEFAULT_LIMIT
   const mutedWords = useMemo(() => {
@@ -46,7 +47,8 @@ export function useGetTrendsQuery(props: QueryProps = {}) {
     queryKey: createGetTrendsQueryKey(limit),
     queryFn: async () => {
       const contentLangs = getContentLanguages().join(',')
-      const {data} = await agent.app.bsky.unspecced.getTrends(
+      const data = await client.call(
+        app.bsky.unspecced.getTrends,
         {
           limit,
         },
@@ -63,7 +65,7 @@ export function useGetTrendsQuery(props: QueryProps = {}) {
       return data
     },
     select: useCallback(
-      (data: AppBskyUnspeccedGetTrends.OutputSchema) => {
+      (data: app.bsky.unspecced.getTrends.$OutputBody) => {
         return {
           recId: data.recIdStr,
           trends: dedupe(
diff --git a/src/state/session/__tests__/clients-test.ts b/src/state/session/__tests__/clients-test.ts
new file mode 100644
index 0000000000..f90841dbc8
--- /dev/null
+++ b/src/state/session/__tests__/clients-test.ts
@@ -0,0 +1,179 @@
+import {Client} from '@atproto/lex'
+import {PasswordSession} from '@atproto/lex-password-session'
+import {beforeEach, describe, expect, it, jest} from '@jest/globals'
+
+jest.mock('#/state/events', () => ({
+  emitNetworkConfirmed: jest.fn(),
+  emitNetworkLost: jest.fn(),
+}))
+
+jest.mock('jwt-decode', () => ({
+  jwtDecode() {
+    return {scope: 'com.atproto.access'}
+  },
+}))
+
+import {app} from '#/lexicons'
+import {BskyAppAgent, PasswordSessionManager} from '../bridge-agent'
+import {agentToLexClient} from '../clients'
+import {sessionAccountToSessionData} from '../session-data'
+import {
+  asFetch,
+  DID,
+  HANDLE,
+  json,
+  makeAccount,
+  makeMockFetch,
+  type MockFetch,
+  SERVICE,
+} from './mock-fetch'
+
+const PROFILE_BODY = {
+  did: DID,
+  handle: HANDLE,
+}
+
+/** A mock fetch that answers `getProfile` and records every request. */
+function makeProfileFetch(): MockFetch {
+  return makeMockFetch({
+    'app.bsky.actor.getProfile': () => json(PROFILE_BODY),
+  })
+}
+
+/** An authenticated agent whose whole network path is the mock fetch. */
+function setup(fetchMock: MockFetch = makeProfileFetch()) {
+  const account = makeAccount()
+  const inner = new PasswordSession(sessionAccountToSessionData(account), {
+    fetch: asFetch(fetchMock),
+  })
+  const manager = new PasswordSessionManager(inner, {
+    service: account.service,
+  })
+  manager.setFetch(asFetch(fetchMock))
+  const agent = new BskyAppAgent(manager)
+  return {agent, fetchMock}
+}
+
+/** A logged-out agent whose whole network path is the mock fetch. */
+function setupPublic(fetchMock: MockFetch = makeProfileFetch()) {
+  const manager = new PasswordSessionManager(null, {service: SERVICE})
+  manager.setFetch(asFetch(fetchMock))
+  return {agent: new BskyAppAgent(manager), fetchMock}
+}
+
+/** The `init` a mock fetch was called with for a given nsid. */
+function initFor(mock: MockFetch, nsid: string): RequestInit | undefined {
+  const call = mock.mock.calls.find(c => {
+    const url = c[0] instanceof URL ? c[0].href : String(c[0])
+    return url.includes(`/xrpc/${nsid}`)
+  })
+  return call?.[1]
+}
+
+describe('agentToLexClient', () => {
+  let fetchMock: MockFetch
+
+  beforeEach(() => {
+    fetchMock = makeProfileFetch()
+  })
+
+  it('memoizes one client per agent', () => {
+    const {agent: agentA} = setup(fetchMock)
+    const {agent: agentB} = setup(fetchMock)
+
+    const clientA1 = agentToLexClient(agentA)
+    const clientA2 = agentToLexClient(agentA)
+    const clientB = agentToLexClient(agentB)
+
+    expect(clientA1).toBeInstanceOf(Client)
+    expect(clientA1).toBe(clientA2)
+    expect(clientA1).not.toBe(clientB)
+  })
+
+  it('passes through the agent did', () => {
+    const {agent} = setup(fetchMock)
+    expect(agentToLexClient(agent).did).toBe(DID)
+  })
+
+  it('reflects an undefined did on a logged-out agent', () => {
+    const {agent} = setupPublic(fetchMock)
+    expect(agentToLexClient(agent).did).toBeUndefined()
+  })
+
+  it('routes client.call through the agent to the network', async () => {
+    const {agent} = setup(fetchMock)
+
+    const body = await agentToLexClient(agent).call(app.bsky.actor.getProfile, {
+      actor: HANDLE,
+    })
+
+    expect(body.handle).toBe(HANDLE)
+    const call = fetchMock.mock.calls.find(c => {
+      const url = c[0] instanceof URL ? c[0].href : String(c[0])
+      return url.includes('/xrpc/app.bsky.actor.getProfile')
+    })
+    expect(call).toBeDefined()
+    const url = call![0] instanceof URL ? call![0].href : String(call![0])
+    expect(url).toContain(`actor=${HANDLE}`)
+  })
+
+  it('emits the agent proxy header', async () => {
+    const {agent} = setup(fetchMock)
+    agent.configureProxy('did:web:api.bsky.app#bsky_appview')
+
+    await agentToLexClient(agent).call(app.bsky.actor.getProfile, {
+      actor: HANDLE,
+    })
+
+    const init = initFor(fetchMock, 'app.bsky.actor.getProfile')
+    expect(new Headers(init?.headers).get('atproto-proxy')).toBe(
+      'did:web:api.bsky.app#bsky_appview',
+    )
+  })
+
+  it('emits the agent labeler header exactly once', async () => {
+    const {agent} = setup(fetchMock)
+    agent.configureLabelersHeader(['did:plc:labeler'])
+
+    await agentToLexClient(agent).call(app.bsky.actor.getProfile, {
+      actor: HANDLE,
+    })
+
+    const init = initFor(fetchMock, 'app.bsky.actor.getProfile')
+    const labelers = new Headers(init?.headers).get('atproto-accept-labelers')
+    expect(labelers).toContain('did:plc:labeler')
+    /*
+     * The client contributes no labelers of its own, so the agent's single
+     * entry must not be duplicated.
+     */
+    const entries = labelers!
+      .split(',')
+      .filter(l => l.includes('did:plc:labeler'))
+    expect(entries).toHaveLength(1)
+  })
+
+  it('sends the session access token', async () => {
+    const {agent} = setup(fetchMock)
+
+    await agentToLexClient(agent).call(app.bsky.actor.getProfile, {
+      actor: HANDLE,
+    })
+
+    const init = initFor(fetchMock, 'app.bsky.actor.getProfile')
+    expect(new Headers(init?.headers).get('authorization')).toBe(
+      'Bearer access-jwt',
+    )
+  })
+
+  it('falls back to unauthenticated requests once the agent is disposed', async () => {
+    const {agent} = setup(fetchMock)
+    const client = agentToLexClient(agent)
+    agent.dispose()
+
+    await client.call(app.bsky.actor.getProfile, {actor: HANDLE})
+
+    const init = initFor(fetchMock, 'app.bsky.actor.getProfile')
+    expect(new Headers(init?.headers).has('authorization')).toBe(false)
+    expect(client.did).toBeUndefined()
+  })
+})
diff --git a/src/state/session/clients.ts b/src/state/session/clients.ts
new file mode 100644
index 0000000000..ff6a597ac7
--- /dev/null
+++ b/src/state/session/clients.ts
@@ -0,0 +1,71 @@
+import {type Client} from '@atproto/lex'
+
+import {PUBLIC_BSKY_SERVICE} from '#/lib/constants'
+import {createLexClient} from '#/lib/lexClient'
+import {type BskyAppAgent} from './bridge-agent'
+import {networkAwareFetch} from './network'
+
+/*
+ * One client per agent, so that repeated reads for the same agent return the
+ * same instance. Client identity is observable: a lex `Client` is passed to
+ * React Query `queryFn`s and read from render paths, so a freshly allocated
+ * client on every read would break any dependency array or reference
+ * comparison built on top of it.
+ *
+ * Keying on the agent also ties client lifetime to agent lifetime. A disposed
+ * agent's `fetchHandler` falls back to unauthenticated fetch, and session
+ * rotation builds a new agent rather than mutating the old one, so a client
+ * derived from a stale agent becomes unreachable exactly when its agent does.
+ */
+const lexClients = new WeakMap<BskyAppAgent, Client>()
+
+/**
+ * The lex {@link Client} for an agent, memoized per agent.
+ *
+ * The wrapped handler is `agent.fetchHandler`, NOT
+ * `agent.sessionManager.fetchHandler`. The agent-level handler is where
+ * `atproto-proxy` and `atproto-accept-labelers` are set before the request is
+ * passed down to the session manager, which only adds authorization and PDS
+ * routing. Because the agent already emits both headers, the client is
+ * deliberately built with neither a `service` option nor labelers - setting
+ * either here would emit them a second time.
+ */
+export function agentToLexClient(agent: BskyAppAgent): Client {
+  const existing = lexClients.get(agent)
+  if (existing) {
+    return existing
+  }
+  const client = createLexClient({
+    get did() {
+      return agent.did
+    },
+    fetchHandler: (path, init) => agent.fetchHandler(path, init),
+  })
+  lexClients.set(agent, client)
+  return client
+}
+
+let publicLexClient: Client | undefined
+
+/**
+ * The unauthenticated {@link Client} for public reads, pointed at the public
+ * appview.
+ *
+ * A single module-level instance for the same identity-stability reason as
+ * {@link agentToLexClient}: there is no session to scope it to, so it lives for
+ * the lifetime of the process. Requests go through {@link networkAwareFetch} so
+ * public reads feed the app's reachability signal like authenticated ones do.
+ *
+ * Unlike the public agent it parallels, this client sends neither
+ * `atproto-proxy` nor `atproto-accept-labelers`. `createPublicAgent` configures
+ * the app labeler and the proxy header, so a logged-out appview *agent* read
+ * does carry labelers while the same read through this client does not. A
+ * consumer that needs moderation labels on public reads must configure labelers
+ * itself before issuing the request.
+ */
+export function getPublicLexClient(): Client {
+  return (publicLexClient ??= createLexClient({
+    service: PUBLIC_BSKY_SERVICE,
+    fetch: networkAwareFetch,
+  }))
+}
diff --git a/src/state/session/index.tsx b/src/state/session/index.tsx
index 1a22a0e215..618804ee7b 100644
--- a/src/state/session/index.tsx
+++ b/src/state/session/index.tsx
@@ -10,6 +10,7 @@ import {
   useSyncExternalStore,
 } from 'react'
 import {type AtpAgent} from '@atproto/api'
+import {type Client} from '@atproto/lex'
 import {type SessionData} from '@atproto/lex-password-session'
 
 import * as persisted from '#/state/persisted'
@@ -18,6 +19,7 @@ import {useGlobalDialogsControlContext} from '#/components/dialogs/Context'
 import {AnalyticsContext, useAnalyticsBase, utils} from '#/analytics'
 import {IS_WEB} from '#/env'
 import {emitSessionDropped} from '../events'
+import {agentToLexClient, getPublicLexClient} from './clients'
 import {createSessionBundleAndCreateAccount} from './create-account'
 import {pickExpiryRescueCandidate} from './expiry-rescue'
 import {type Action, getInitialState, reducer, type State} from './reducer'
@@ -707,3 +709,22 @@ export function useAgent(): AtpAgent {
   }
   return bundle.agent
 }
+
+/**
+ * The lex client for the active session, or for the public agent when logged
+ * out.
+ */
+export function useLexClient(): Client {
+  const bundle = useContext(BundleContext)
+  if (!bundle) {
+    throw Error('useLexClient() must be below <SessionProvider>.')
+  }
+  return agentToLexClient(bundle.agent)
+}
+
+/**
+ * The unauthenticated lex client for public reads.
+ */
+export function usePublicLexClient(): Client {
+  return getPublicLexClient()
+}

From e1ba8fe1b055f33026f93a7237a48887b89d12ef Mon Sep 17 00:00:00 2001
From: Samuel Newman <mozzius@protonmail.com>
Date: Thu, 13 Aug 2026 22:26:13 +0300
Subject: [PATCH 05/32] [SDK] Add lexicon schema helpers to `#/types/bsky`
 (#11349)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
---
 src/types/bsky/__tests__/index.test.ts | 208 +++++++++++++++++++++++++
 src/types/bsky/index.ts                | 168 +++++++++++++++++++-
 2 files changed, 374 insertions(+), 2 deletions(-)
 create mode 100644 src/types/bsky/__tests__/index.test.ts

diff --git a/src/types/bsky/__tests__/index.test.ts b/src/types/bsky/__tests__/index.test.ts
new file mode 100644
index 0000000000..b0b4466b2c
--- /dev/null
+++ b/src/types/bsky/__tests__/index.test.ts
@@ -0,0 +1,208 @@
+import {AppBskyFeedPost} from '@atproto/api'
+
+import {app} from '#/lexicons'
+import * as bsky from '#/types/bsky'
+
+const now = () => new Date().toISOString()
+
+/**
+ * A structurally valid `app.bsky.feed.post` record.
+ */
+const validPost = {
+  $type: 'app.bsky.feed.post',
+  text: 'hello world',
+  createdAt: now(),
+}
+
+/**
+ * Right `$type`, but the body is invalid (`text` is not a string, `createdAt`
+ * is not a datetime). Passes a `$type`-only guard, fails full validation.
+ */
+const invalidPost = {
+  $type: 'app.bsky.feed.post',
+  text: 123,
+  createdAt: 'not-a-datetime',
+}
+
+/**
+ * A different record type entirely - should fail even the fast guard.
+ */
+const wrongType = {
+  $type: 'app.bsky.feed.like',
+  subject: {uri: 'at://x', cid: 'y'},
+  createdAt: now(),
+}
+
+describe('types/bsky lexicon schema helpers (#/lexicons)', () => {
+  describe('isType (fast, $type-only)', () => {
+    it('accepts a valid record', () => {
+      expect(bsky.isType(app.bsky.feed.post, validPost)).toBe(true)
+    })
+
+    it('rejects a $type mismatch', () => {
+      expect(bsky.isType(app.bsky.feed.post, wrongType)).toBe(false)
+    })
+
+    it('accepts an invalid body that has the right $type (dangerous semantics)', () => {
+      /*
+       * Mirrors `dangerousIsType`: only the `$type` is checked, so a
+       * structurally invalid record still passes.
+       */
+      expect(bsky.isType(app.bsky.feed.post, invalidPost)).toBe(true)
+    })
+
+    it('rejects a record with no $type at all', () => {
+      expect(
+        bsky.isType(app.bsky.feed.post, {text: 'hi', createdAt: now()}),
+      ).toBe(false)
+    })
+
+    it('accepts a schema passed as its namespace module or its main schema', () => {
+      expect(bsky.isType(app.bsky.feed.post, validPost)).toBe(true)
+      expect(bsky.isType(app.bsky.feed.post.main, validPost)).toBe(true)
+    })
+
+    it('returns false (does not throw) for null, undefined and non-objects', () => {
+      /*
+       * Mirrors the `dangerousIsType`/`is$typed` behavior - call sites pass
+       * e.g. `post.record` which may be undefined.
+       */
+      expect(bsky.isType(app.bsky.feed.post, null)).toBe(false)
+      expect(bsky.isType(app.bsky.feed.post, undefined)).toBe(false)
+      expect(bsky.isType(app.bsky.feed.post, 'string')).toBe(false)
+    })
+
+    it('requires a present $type for typed-object def schemas', () => {
+      /*
+       * The generated TypedObjectSchema.isTypeOf treats a missing $type as a
+       * match (maybe-typed semantics). Our helper must NOT: when
+       * discriminating unions by $type, an object without $type would
+       * otherwise satisfy every branch.
+       */
+      expect(bsky.isType(app.bsky.feed.defs.postView, {foo: 1})).toBe(false)
+      expect(bsky.isType(app.bsky.feed.defs.postView, {})).toBe(false)
+      expect(
+        bsky.isType(app.bsky.feed.defs.postView, {
+          $type: 'app.bsky.feed.defs#postView',
+        }),
+      ).toBe(true)
+    })
+
+    it('rejects what the schema own isTypeOf would accept or throw on', () => {
+      /*
+       * Pins the upstream behavior that justifies the hand-rolled check in
+       * `isType`. If either of these expectations starts failing, upstream has
+       * changed and `isType` can consider delegating to `isTypeOf`.
+       */
+      expect(app.bsky.feed.defs.postView.isTypeOf({})).toBe(true)
+      expect(() =>
+        app.bsky.feed.post.main.isTypeOf(
+          null as unknown as {$type?: 'app.bsky.feed.post'},
+        ),
+      ).toThrow()
+    })
+  })
+
+  describe('matches (full validation guard)', () => {
+    it('accepts a valid record', () => {
+      expect(bsky.matches(app.bsky.feed.post, validPost)).toBe(true)
+    })
+
+    it('accepts a schema passed as its namespace module or its main schema', () => {
+      expect(bsky.matches(app.bsky.feed.post, validPost)).toBe(true)
+      expect(bsky.matches(app.bsky.feed.post.main, validPost)).toBe(true)
+    })
+
+    it('rejects a $type mismatch', () => {
+      expect(bsky.matches(app.bsky.feed.post, wrongType)).toBe(false)
+    })
+
+    it('rejects an invalid body even though the $type matches', () => {
+      expect(bsky.matches(app.bsky.feed.post, invalidPost)).toBe(false)
+    })
+
+    it('rejects null and undefined', () => {
+      expect(bsky.matches(app.bsky.feed.post, null)).toBe(false)
+      expect(bsky.matches(app.bsky.feed.post, undefined)).toBe(false)
+    })
+  })
+
+  describe('safeParse (full validation, no throw)', () => {
+    it('succeeds and returns the value for a valid record', () => {
+      const result = bsky.safeParse(app.bsky.feed.post, validPost)
+      expect(result.success).toBe(true)
+      if (result.success) {
+        expect(result.value.text).toBe('hello world')
+      }
+    })
+
+    it('fails with a reason for an invalid record', () => {
+      const result = bsky.safeParse(app.bsky.feed.post, invalidPost)
+      expect(result.success).toBe(false)
+      if (!result.success) {
+        expect(result.reason).toBeDefined()
+      }
+    })
+
+    it('accepts a schema passed as its main schema', () => {
+      const result = bsky.safeParse(app.bsky.feed.post.main, validPost)
+      expect(result.success).toBe(true)
+    })
+  })
+
+  describe('parse (full validation, throws)', () => {
+    it('returns the typed value for a valid record', () => {
+      const record = bsky.parse(app.bsky.feed.post, validPost)
+      expect(record.text).toBe('hello world')
+    })
+
+    it('throws for an invalid record', () => {
+      expect(() => bsky.parse(app.bsky.feed.post, invalidPost)).toThrow()
+    })
+
+    it('accepts a schema passed as its main schema', () => {
+      expect(bsky.parse(app.bsky.feed.post.main, validPost).text).toBe(
+        'hello world',
+      )
+    })
+  })
+})
+
+describe('types/bsky validator helpers (@atproto/api)', () => {
+  it('dangerousIsType accepts the right $type without validating the body', () => {
+    expect(
+      bsky.dangerousIsType<AppBskyFeedPost.Record>(
+        validPost,
+        AppBskyFeedPost.isRecord,
+      ),
+    ).toBe(true)
+    // Right $type, invalid body - still passes the fast guard.
+    expect(
+      bsky.dangerousIsType<AppBskyFeedPost.Record>(
+        invalidPost,
+        AppBskyFeedPost.isRecord,
+      ),
+    ).toBe(true)
+    expect(
+      bsky.dangerousIsType<AppBskyFeedPost.Record>(
+        wrongType,
+        AppBskyFeedPost.isRecord,
+      ),
+    ).toBe(false)
+  })
+
+  it('validate fully validates the body', () => {
+    expect(
+      bsky.validate<AppBskyFeedPost.Record>(
+        validPost,
+        AppBskyFeedPost.validateRecord,
+      ),
+    ).toBe(true)
+    expect(
+      bsky.validate<AppBskyFeedPost.Record>(
+        invalidPost,
+        AppBskyFeedPost.validateRecord,
+      ),
+    ).toBe(false)
+  })
+})
diff --git a/src/types/bsky/index.ts b/src/types/bsky/index.ts
index d482f9515b..1d498bc130 100644
--- a/src/types/bsky/index.ts
+++ b/src/types/bsky/index.ts
@@ -1,4 +1,16 @@
-import {type ValidationResult} from '@atproto/lexicon'
+import {
+  getMain,
+  type InferInput,
+  type InferOutput,
+  type Main,
+  type ParseOptions,
+  type RecordSchema,
+  type Schema,
+  type TypedObjectSchema,
+  type ValidateOptions,
+  type ValidationResult,
+} from '@atproto/lex'
+import {type ValidationResult as LegacyValidationResult} from '@atproto/lexicon'
 
 export * as post from '#/types/bsky/post'
 export * as profile from '#/types/bsky/profile'
@@ -45,7 +57,159 @@ export function dangerousIsType<R extends {$type?: string}>(
  */
 export function validate<R extends {$type?: string}>(
   record: unknown,
-  validator: (v: unknown) => ValidationResult<R>,
+  validator: (v: unknown) => LegacyValidationResult<R>,
 ): record is R {
   return validator(record).success
 }
+
+/*
+ * Two families of helpers live in this file, distinguished by the validation
+ * surface they consume.
+ *
+ * `dangerousIsType` and `validate` (above) operate on the standalone
+ * `is*`/`validate*` functions exported by '@atproto/api' - the record and the
+ * validator are passed separately, e.g.
+ * `dangerousIsType(v, AppBskyFeedPost.isRecord)`.
+ *
+ * `isType`, `matches`, `parse`, and `safeParse` (below) operate on the
+ * generated lexicon schema objects from '#/lexicons'. That codegen attaches
+ * the validation surface directly to each schema, so these helpers take the
+ * schema object itself:
+ *
+ * ```ts
+ * import {app} from '#/lexicons'
+ * import * as bsky from '#/types/bsky'
+ *
+ * bsky.isType(app.bsky.feed.post, v)
+ * bsky.matches(app.bsky.feed.post, v)
+ * ```
+ *
+ * Every generated namespace module (e.g. `app.bsky.feed.post`) re-exports its
+ * `main` schema, and bare defs (e.g. `app.bsky.feed.defs.postView`) are schema
+ * objects directly. Both forms are accepted here - `getMain` unwraps a module
+ * to its `main` schema and passes a bare schema through unchanged - so call
+ * sites can pass whichever is in scope.
+ */
+
+/**
+ * A generated lexicon schema that carries a `$type` and therefore supports the
+ * fast, `$type`-only {@link isType} check: a record schema (`app.bsky.feed.post`)
+ * or a typed-object def schema (`app.bsky.feed.defs.postView`).
+ */
+type TypedSchema = RecordSchema | TypedObjectSchema
+
+/**
+ * Fast type checking without full schema validation, for use with data we
+ * trust, or for non-critical path use cases. This only compares the `$type`
+ * string; it does NOT assert the rest of the object matches the schema. An
+ * invalid record with the right `$type` will pass.
+ *
+ * This is the '#/lexicons' equivalent of {@link dangerousIsType}. For full
+ * validation of the object schema, use {@link matches}, {@link parse}, or
+ * {@link safeParse} from this same file.
+ *
+ * Usage:
+ * ```ts
+ * import {app} from '#/lexicons'
+ * import * as bsky from '#/types/bsky'
+ *
+ * if (bsky.isType(app.bsky.feed.post, item)) {
+ *   // `item` is narrowed to the post record type here
+ * }
+ * ```
+ */
+export function isType<S extends TypedSchema>(
+  schema: Main<S>,
+  value: unknown,
+): value is InferInput<S> {
+  /*
+   * Deliberately NOT delegating to the schema's `isTypeOf`: the generated
+   * `TypedObjectSchema.isTypeOf` treats a MISSING `$type` as a match
+   * (maybe-typed semantics), which would let any plain object satisfy any
+   * def-schema check and break `$type`-discriminated unions. The old
+   * `dangerousIsType` required a present, matching `$type`, and so do we.
+   * The nullish/object guard also mirrors the old `is$typed` behavior of
+   * returning false (not throwing) for null/undefined input.
+   */
+  return (
+    value != null &&
+    typeof value === 'object' &&
+    (value as {$type?: unknown}).$type === getMain(schema).$type
+  )
+}
+
+/**
+ * Fully validates the object against the schema (strict, no coercion), which
+ * has a performance cost, and narrows the value on success.
+ *
+ * This is the '#/lexicons' equivalent of {@link validate}. For faster checks
+ * with data we trust, like that from our app view, use {@link isType} from this
+ * same file.
+ *
+ * Usage:
+ * ```ts
+ * import {app} from '#/lexicons'
+ * import * as bsky from '#/types/bsky'
+ *
+ * if (bsky.matches(app.bsky.feed.post, item)) {
+ *   // `item` is narrowed to the post record type here
+ * }
+ * ```
+ */
+export function matches<S extends Schema>(
+  schema: Main<S>,
+  value: unknown,
+  options?: ValidateOptions,
+): value is InferInput<S> {
+  return getMain(schema).matches(value, options)
+}
+
+/**
+ * Fully validates and parses the value against the schema, returning the typed
+ * value or throwing a `LexValidationError` on failure. Parsing may apply
+ * schema transformations such as default values.
+ *
+ * Prefer {@link safeParse} where you want to branch on failure without a
+ * try/catch, or {@link matches} where you only need a type guard.
+ *
+ * Usage:
+ * ```ts
+ * import {app} from '#/lexicons'
+ * import * as bsky from '#/types/bsky'
+ *
+ * const record = bsky.parse(app.bsky.feed.post, item) // typed, or throws
+ * ```
+ */
+export function parse<S extends Schema>(
+  schema: Main<S>,
+  value: unknown,
+  options?: ParseOptions,
+): InferOutput<S> {
+  return getMain(schema).parse(value, options)
+}
+
+/**
+ * Fully validates and parses the value against the schema, returning a
+ * discriminated `ValidationResult` instead of throwing. Parsing may apply
+ * schema transformations such as default values.
+ *
+ * Usage:
+ * ```ts
+ * import {app} from '#/lexicons'
+ * import * as bsky from '#/types/bsky'
+ *
+ * const result = bsky.safeParse(app.bsky.feed.post, item)
+ * if (result.success) {
+ *   // `result.value` is the typed post record
+ * } else {
+ *   // `result.reason` is the LexValidationError
+ * }
+ * ```
+ */
+export function safeParse<S extends Schema>(
+  schema: Main<S>,
+  value: unknown,
+  options?: ParseOptions,
+): ValidationResult<InferOutput<S>> {
+  return getMain(schema).safeParse(value, options)
+}

From c52e730112eaf3917687e31e963ef65951a7f7db Mon Sep 17 00:00:00 2001
From: Samuel Newman <mozzius@protonmail.com>
Date: Thu, 13 Aug 2026 22:26:14 +0300
Subject: [PATCH 06/32] [SDK] Add pds and chat clients and the canonical client
 hooks (#11350)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
---
 src/lib/constants.ts                          |  16 ++
 .../queries/trending/useGetTrendsQuery.ts     |   4 +-
 src/state/session/__tests__/clients-test.ts   | 196 ++++++++++++++++--
 .../__tests__/provider-clients-test.tsx       | 193 +++++++++++++++++
 src/state/session/clients.ts                  | 122 +++++++++--
 src/state/session/index.tsx                   |  74 ++++++-
 6 files changed, 565 insertions(+), 40 deletions(-)
 create mode 100644 src/state/session/__tests__/provider-clients-test.tsx

diff --git a/src/lib/constants.ts b/src/lib/constants.ts
index bc079c7af5..1a89fa5b5e 100644
--- a/src/lib/constants.ts
+++ b/src/lib/constants.ts
@@ -1,5 +1,6 @@
 import {type Insets, Platform} from 'react-native'
 import {type AppBskyActorDefs, BSKY_LABELER_DID} from '@atproto/api'
+import {type Service} from '@atproto/lex'
 
 import {type ProxyHeaderValue} from '#/state/session/agent'
 import {BLUESKY_PROXY_DID, CHAT_PROXY_DID, IS_DEV} from '#/env'
@@ -247,6 +248,21 @@ export const BLUESKY_PROXY_HEADER = {
   },
 }
 
+/**
+ * The chat service's proxy target, in the `did#service_id` form a lex client's
+ * `service` option takes. A client constructed with it emits `atproto-proxy:
+ * <this value>` on every request, which is what routes `chat.bsky.*` calls to
+ * the chat service.
+ *
+ * The DID comes from the env-configurable `CHAT_PROXY_DID` (via
+ * `EXPO_PUBLIC_CHAT_PROXY_DID`) rather than a hard-coded constant, so the
+ * target can be retargeted per environment.
+ *
+ * This is the client-level equivalent of {@link DM_SERVICE_HEADERS}, which
+ * carries the same value as a per-call header.
+ */
+export const CHAT_PROXY_SERVICE: Service = `${CHAT_PROXY_DID}#bsky_chat`
+
 export const DM_SERVICE_HEADERS = {
   'atproto-proxy': `${CHAT_PROXY_DID}#bsky_chat`,
 }
diff --git a/src/state/queries/trending/useGetTrendsQuery.ts b/src/state/queries/trending/useGetTrendsQuery.ts
index e7d6806b3e..8fe0ad845e 100644
--- a/src/state/queries/trending/useGetTrendsQuery.ts
+++ b/src/state/queries/trending/useGetTrendsQuery.ts
@@ -10,7 +10,7 @@ import {logger} from '#/logger'
 import {getContentLanguages} from '#/state/preferences/languages'
 import {STALE} from '#/state/queries'
 import {usePreferencesQuery} from '#/state/queries/preferences'
-import {useLexClient} from '#/state/session'
+import {useAppviewClient} from '#/state/session'
 import {app} from '#/lexicons'
 
 export const DEFAULT_LIMIT = 5
@@ -33,7 +33,7 @@ export const createGetTrendsQueryKey = (limit?: number) =>
   limit === undefined ? ['trends'] : ['trends', {limit}]
 
 export function useGetTrendsQuery(props: QueryProps = {}) {
-  const client = useLexClient()
+  const client = useAppviewClient()
   const {data: preferences} = usePreferencesQuery()
   const limit = props.limit ?? DEFAULT_LIMIT
   const mutedWords = useMemo(() => {
diff --git a/src/state/session/__tests__/clients-test.ts b/src/state/session/__tests__/clients-test.ts
index f90841dbc8..452de11d9d 100644
--- a/src/state/session/__tests__/clients-test.ts
+++ b/src/state/session/__tests__/clients-test.ts
@@ -13,9 +13,16 @@ jest.mock('jwt-decode', () => ({
   },
 }))
 
-import {app} from '#/lexicons'
+import {CHAT_PROXY_SERVICE} from '#/lib/constants'
+import {app, chat, com} from '#/lexicons'
 import {BskyAppAgent, PasswordSessionManager} from '../bridge-agent'
-import {agentToLexClient} from '../clients'
+import {
+  agentToAppviewClient,
+  agentToChatClient,
+  agentToPdsClient,
+  getUnauthenticatedThrowingClient,
+  NotAuthenticatedError,
+} from '../clients'
 import {sessionAccountToSessionData} from '../session-data'
 import {
   asFetch,
@@ -26,6 +33,7 @@ import {
   makeMockFetch,
   type MockFetch,
   SERVICE,
+  urlsOf,
 } from './mock-fetch'
 
 const PROFILE_BODY = {
@@ -70,7 +78,7 @@ function initFor(mock: MockFetch, nsid: string): RequestInit | undefined {
   return call?.[1]
 }
 
-describe('agentToLexClient', () => {
+describe('agentToAppviewClient', () => {
   let fetchMock: MockFetch
 
   beforeEach(() => {
@@ -81,9 +89,9 @@ describe('agentToLexClient', () => {
     const {agent: agentA} = setup(fetchMock)
     const {agent: agentB} = setup(fetchMock)
 
-    const clientA1 = agentToLexClient(agentA)
-    const clientA2 = agentToLexClient(agentA)
-    const clientB = agentToLexClient(agentB)
+    const clientA1 = agentToAppviewClient(agentA)
+    const clientA2 = agentToAppviewClient(agentA)
+    const clientB = agentToAppviewClient(agentB)
 
     expect(clientA1).toBeInstanceOf(Client)
     expect(clientA1).toBe(clientA2)
@@ -92,20 +100,23 @@ describe('agentToLexClient', () => {
 
   it('passes through the agent did', () => {
     const {agent} = setup(fetchMock)
-    expect(agentToLexClient(agent).did).toBe(DID)
+    expect(agentToAppviewClient(agent).did).toBe(DID)
   })
 
   it('reflects an undefined did on a logged-out agent', () => {
     const {agent} = setupPublic(fetchMock)
-    expect(agentToLexClient(agent).did).toBeUndefined()
+    expect(agentToAppviewClient(agent).did).toBeUndefined()
   })
 
   it('routes client.call through the agent to the network', async () => {
     const {agent} = setup(fetchMock)
 
-    const body = await agentToLexClient(agent).call(app.bsky.actor.getProfile, {
-      actor: HANDLE,
-    })
+    const body = await agentToAppviewClient(agent).call(
+      app.bsky.actor.getProfile,
+      {
+        actor: HANDLE,
+      },
+    )
 
     expect(body.handle).toBe(HANDLE)
     const call = fetchMock.mock.calls.find(c => {
@@ -121,7 +132,7 @@ describe('agentToLexClient', () => {
     const {agent} = setup(fetchMock)
     agent.configureProxy('did:web:api.bsky.app#bsky_appview')
 
-    await agentToLexClient(agent).call(app.bsky.actor.getProfile, {
+    await agentToAppviewClient(agent).call(app.bsky.actor.getProfile, {
       actor: HANDLE,
     })
 
@@ -135,7 +146,7 @@ describe('agentToLexClient', () => {
     const {agent} = setup(fetchMock)
     agent.configureLabelersHeader(['did:plc:labeler'])
 
-    await agentToLexClient(agent).call(app.bsky.actor.getProfile, {
+    await agentToAppviewClient(agent).call(app.bsky.actor.getProfile, {
       actor: HANDLE,
     })
 
@@ -155,7 +166,7 @@ describe('agentToLexClient', () => {
   it('sends the session access token', async () => {
     const {agent} = setup(fetchMock)
 
-    await agentToLexClient(agent).call(app.bsky.actor.getProfile, {
+    await agentToAppviewClient(agent).call(app.bsky.actor.getProfile, {
       actor: HANDLE,
     })
 
@@ -167,7 +178,7 @@ describe('agentToLexClient', () => {
 
   it('falls back to unauthenticated requests once the agent is disposed', async () => {
     const {agent} = setup(fetchMock)
-    const client = agentToLexClient(agent)
+    const client = agentToAppviewClient(agent)
     agent.dispose()
 
     await client.call(app.bsky.actor.getProfile, {actor: HANDLE})
@@ -177,3 +188,158 @@ describe('agentToLexClient', () => {
     expect(client.did).toBeUndefined()
   })
 })
+
+describe('agentToPdsClient', () => {
+  let fetchMock: MockFetch
+
+  beforeEach(() => {
+    fetchMock = makeProfileFetch()
+  })
+
+  it('memoizes one client per agent', () => {
+    const {agent: agentA} = setup(fetchMock)
+    const {agent: agentB} = setup(fetchMock)
+
+    const clientA1 = agentToPdsClient(agentA)
+    const clientA2 = agentToPdsClient(agentA)
+
+    expect(clientA1).toBeInstanceOf(Client)
+    expect(clientA1).toBe(clientA2)
+    expect(clientA1).not.toBe(agentToPdsClient(agentB))
+  })
+
+  it('is a distinct client from the appview client for the same agent', () => {
+    const {agent} = setup(fetchMock)
+    expect(agentToPdsClient(agent)).not.toBe(agentToAppviewClient(agent))
+  })
+
+  it('passes through the agent did', () => {
+    const {agent} = setup(fetchMock)
+    expect(agentToPdsClient(agent).did).toBe(DID)
+  })
+
+  it('sends the session access token', async () => {
+    const {agent} = setup(fetchMock)
+
+    await agentToPdsClient(agent).call(com.atproto.server.getSession, {})
+
+    const init = initFor(fetchMock, 'com.atproto.server.getSession')
+    expect(new Headers(init?.headers).get('authorization')).toBe(
+      'Bearer access-jwt',
+    )
+  })
+
+  it('emits neither the proxy nor the labeler header the agent is configured with', async () => {
+    /*
+     * The load-bearing difference from the appview client: this client wraps the
+     * session manager, below the agent layer that sets both headers, so a
+     * request reaches the account's PDS instead of being proxied onward.
+     */
+    const {agent} = setup(fetchMock)
+    agent.configureProxy('did:web:api.bsky.app#bsky_appview')
+    agent.configureLabelersHeader(['did:plc:labeler'])
+
+    await agentToPdsClient(agent).call(com.atproto.server.getSession, {})
+
+    const headers = new Headers(
+      initFor(fetchMock, 'com.atproto.server.getSession')?.headers,
+    )
+    expect(headers.get('atproto-proxy')).toBeNull()
+    expect(headers.get('atproto-accept-labelers')).toBeNull()
+  })
+
+  it('resolves the relative xrpc path against the account host', async () => {
+    /*
+     * lex-client hands its fetchHandler an origin-less `/xrpc/<nsid>` path; the
+     * session manager absolutizes it against dispatchUrl.
+     */
+    const {agent} = setup(fetchMock)
+
+    await agentToPdsClient(agent).call(com.atproto.server.getSession, {})
+
+    expect(urlsOf(fetchMock)).toContain(
+      `${SERVICE}/xrpc/com.atproto.server.getSession`,
+    )
+  })
+})
+
+describe('agentToChatClient', () => {
+  let fetchMock: MockFetch
+
+  beforeEach(() => {
+    fetchMock = makeProfileFetch()
+  })
+
+  it('memoizes one client per agent, distinct from the pds client', () => {
+    const {agent} = setup(fetchMock)
+
+    const client = agentToChatClient(agent)
+
+    expect(client).toBeInstanceOf(Client)
+    expect(client).toBe(agentToChatClient(agent))
+    expect(client).not.toBe(agentToPdsClient(agent))
+  })
+
+  it('emits the chat proxy header exactly once, with the session token', async () => {
+    const {agent} = setup(fetchMock)
+
+    /* the stub body fails listConvos output validation; headers are recorded pre-parse */
+    await agentToChatClient(agent)
+      .call(chat.bsky.convo.listConvos, {})
+      .catch(() => {})
+
+    const headers = new Headers(
+      initFor(fetchMock, 'chat.bsky.convo.listConvos')?.headers,
+    )
+    /*
+     * An exact match, not `toContain`: `Headers` comma-joins repeated entries
+     * for the same name, so a second contributor would show up here.
+     */
+    expect(headers.get('atproto-proxy')).toBe(CHAT_PROXY_SERVICE)
+    expect(headers.get('authorization')).toBe('Bearer access-jwt')
+  })
+
+  it('does not emit the agent labeler header', async () => {
+    const {agent} = setup(fetchMock)
+    agent.configureLabelersHeader(['did:plc:labeler'])
+
+    await agentToChatClient(agent)
+      .call(chat.bsky.convo.listConvos, {})
+      .catch(() => {})
+
+    const headers = new Headers(
+      initFor(fetchMock, 'chat.bsky.convo.listConvos')?.headers,
+    )
+    expect(headers.get('atproto-accept-labelers')).toBeNull()
+  })
+})
+
+describe('getUnauthenticatedThrowingClient', () => {
+  it('is a stable singleton with no did', () => {
+    const client = getUnauthenticatedThrowingClient()
+
+    expect(client.did).toBeUndefined()
+    /* identity is stable so it is safe in React Query keys */
+    expect(getUnauthenticatedThrowingClient()).toBe(client)
+  })
+
+  it('rejects any call with NotAuthenticatedError as the cause, with no fetch', async () => {
+    /*
+     * The throwing fetchHandler fires before any network I/O. lex-client wraps a
+     * fetchHandler throw in an internal error whose `cause` is the original, so
+     * the NotAuthenticatedError surfaces there.
+     */
+    const fetchMock = makeProfileFetch()
+    const err = await getUnauthenticatedThrowingClient()
+      .call(com.atproto.server.getSession, {})
+      .then(() => undefined)
+      .catch((e: unknown) => e)
+
+    expect((err as Error).cause).toBeInstanceOf(NotAuthenticatedError)
+    expect(((err as Error).cause as Error).name).toBe('NotAuthenticatedError')
+    expect(((err as Error).cause as Error).message).toBe(
+      'Not authenticated: this operation requires an active session',
+    )
+    expect(fetchMock).not.toHaveBeenCalled()
+  })
+})
diff --git a/src/state/session/__tests__/provider-clients-test.tsx b/src/state/session/__tests__/provider-clients-test.tsx
new file mode 100644
index 0000000000..58ea9ad6fe
--- /dev/null
+++ b/src/state/session/__tests__/provider-clients-test.tsx
@@ -0,0 +1,193 @@
+import {type Client} from '@atproto/lex'
+import {PasswordSession} from '@atproto/lex-password-session'
+import {beforeEach, describe, expect, it, jest} from '@jest/globals'
+import {act, render} from '@testing-library/react-native'
+
+import {type SessionAccount} from '../types'
+
+/*
+ * The provider pulls the whole app shell in through `#/state/util` and the
+ * account factories. These mocks cut the tree back to the session lifecycle
+ * itself, mirroring provider-abort-test.tsx.
+ */
+jest.mock('#/state/persisted', () => {
+  const {
+    defaults,
+  }: typeof import('#/state/persisted/schema') = require('#/state/persisted/schema')
+  return {
+    defaults,
+    get: (key: keyof typeof defaults) => defaults[key],
+    write: () => Promise.resolve(),
+    readLatest: (key: keyof typeof defaults) => defaults[key],
+    onUpdate: () => () => {},
+  }
+})
+jest.mock('#/state/util', () => ({useCloseAllActiveElements: () => () => {}}))
+jest.mock('#/components/dialogs/Context', () => ({
+  useGlobalDialogsControlContext: () => ({signinDialogControl: {open() {}}}),
+}))
+jest.mock('#/analytics', () => ({
+  AnalyticsContext: ({children}: {children: React.ReactNode}) => children,
+  useAnalyticsBase: () => ({metric() {}, logger: {debug() {}, error() {}}}),
+  utils: {accountToSessionMetadata: () => ({}), useMeta: () => undefined},
+}))
+jest.mock('#/state/shell/onboarding', () => ({
+  useOnboardingDispatch: () => () => {},
+}))
+jest.mock('#/ageAssurance/data', () => ({
+  clearAgeAssuranceServerDataForAll: () => {},
+  clearAgeAssuranceServerDataForDid: () => {},
+}))
+jest.mock('#/lib/persisted-query-storage', () => ({
+  clearPersistedQueryStorage: () => Promise.resolve(),
+}))
+jest.mock('#/lib/notifications/notifications', () => ({
+  unregisterPushToken: () => Promise.resolve(),
+}))
+jest.mock('jwt-decode', () => ({
+  jwtDecode: () => ({scope: 'com.atproto.access'}),
+}))
+jest.mock('#/state/events', () => ({
+  emitSessionDropped: () => {},
+  emitNetworkConfirmed: () => {},
+  emitNetworkLost: () => {},
+}))
+
+const mockLogin = jest.fn<(...args: unknown[]) => Promise<unknown>>()
+jest.mock('../session-core', () => ({
+  ...jest.requireActual<object>('../session-core'),
+  createSessionBundleAndLogin: (...args: unknown[]) => mockLogin(...args),
+}))
+jest.mock('../create-account', () => ({
+  createSessionBundleAndCreateAccount: () => new Promise(() => {}),
+}))
+
+import {
+  Provider,
+  useAppviewClient,
+  useChatClient,
+  useMaybeChatClient,
+  useMaybePdsClient,
+  usePdsClient,
+  useSessionApi,
+} from '#/state/session'
+import {type SessionApiContext} from '#/state/session/types'
+import {BskyAppAgent, PasswordSessionManager} from '../bridge-agent'
+import {
+  agentToAppviewClient,
+  agentToChatClient,
+  agentToPdsClient,
+  getUnauthenticatedThrowingClient,
+} from '../clients'
+import {type SessionBundle} from '../session-core'
+import {sessionAccountToSessionData} from '../session-data'
+import {asFetch, makeAccount, makeMockFetch} from './mock-fetch'
+
+type Clients = {
+  appview: Client
+  pds: Client
+  chat: Client
+  maybePds: Client | null
+  maybeChat: Client | null
+}
+
+/**
+ * Build a bundle whose agent is a real `BskyAppAgent` over a real
+ * `PasswordSession`, since the client builders derive from the agent. Only the
+ * fields the provider reads are populated.
+ */
+function makeBundle(account: SessionAccount): SessionBundle {
+  const fetchMock = makeMockFetch()
+  const session = new PasswordSession(sessionAccountToSessionData(account), {
+    fetch: asFetch(fetchMock),
+  })
+  const manager = new PasswordSessionManager(session, {
+    service: account.service,
+  })
+  manager.setFetch(asFetch(fetchMock))
+  return {
+    session,
+    agent: new BskyAppAgent(manager),
+    service: new URL(account.service),
+  }
+}
+
+/** Render the provider and hand back the client hooks' current values. */
+function renderClients(): {api: SessionApiContext; clients: () => Clients} {
+  let api!: SessionApiContext
+  let clients!: Clients
+  function Probe() {
+    api = useSessionApi()
+    clients = {
+      appview: useAppviewClient(),
+      pds: usePdsClient(),
+      chat: useChatClient(),
+      maybePds: useMaybePdsClient(),
+      maybeChat: useMaybeChatClient(),
+    }
+    return null
+  }
+  render(
+    <Provider>
+      <Probe />
+    </Provider>,
+  )
+  return {api, clients: () => clients}
+}
+
+beforeEach(() => {
+  mockLogin.mockReset()
+})
+
+describe('client hooks while logged out', () => {
+  it('serves the public agent for appview reads', () => {
+    const {clients} = renderClients()
+    expect(clients().appview).toBeDefined()
+    /* the logged-out bundle's agent IS the public agent, so no separate branch */
+    expect(clients().appview.did).toBeUndefined()
+  })
+
+  it('serves the throwing client for the write surfaces', () => {
+    const {clients} = renderClients()
+    const throwing = getUnauthenticatedThrowingClient()
+    expect(clients().pds).toBe(throwing)
+    expect(clients().chat).toBe(throwing)
+  })
+
+  it('serves null from the maybe variants', () => {
+    const {clients} = renderClients()
+    expect(clients().maybePds).toBeNull()
+    expect(clients().maybeChat).toBeNull()
+  })
+})
+
+describe('client hooks with a session', () => {
+  it('derives every surface from the session bundle agent', async () => {
+    const account = makeAccount()
+    const bundle = makeBundle(account)
+    const {api, clients} = renderClients()
+
+    mockLogin.mockResolvedValueOnce({bundle, account})
+    await act(async () => {
+      await api.login({} as never, 'LoginForm')
+    })
+
+    expect(clients().appview).toBe(agentToAppviewClient(bundle.agent))
+    expect(clients().pds).toBe(agentToPdsClient(bundle.agent))
+    expect(clients().chat).toBe(agentToChatClient(bundle.agent))
+  })
+
+  it('serves the same clients from the maybe variants', async () => {
+    const account = makeAccount()
+    const bundle = makeBundle(account)
+    const {api, clients} = renderClients()
+
+    mockLogin.mockResolvedValueOnce({bundle, account})
+    await act(async () => {
+      await api.login({} as never, 'LoginForm')
+    })
+
+    expect(clients().maybePds).toBe(clients().pds)
+    expect(clients().maybeChat).toBe(clients().chat)
+  })
+})
diff --git a/src/state/session/clients.ts b/src/state/session/clients.ts
index ff6a597ac7..4daf5368b3 100644
--- a/src/state/session/clients.ts
+++ b/src/state/session/clients.ts
@@ -1,15 +1,15 @@
 import {type Client} from '@atproto/lex'
 
-import {PUBLIC_BSKY_SERVICE} from '#/lib/constants'
+import {CHAT_PROXY_SERVICE, PUBLIC_BSKY_SERVICE} from '#/lib/constants'
 import {createLexClient} from '#/lib/lexClient'
 import {type BskyAppAgent} from './bridge-agent'
 import {networkAwareFetch} from './network'
 
 /*
- * One client per agent, so that repeated reads for the same agent return the
- * same instance. Client identity is observable: a lex `Client` is passed to
- * React Query `queryFn`s and read from render paths, so a freshly allocated
- * client on every read would break any dependency array or reference
+ * One client per agent, per surface, so that repeated reads for the same agent
+ * return the same instance. Client identity is observable: a lex `Client` is
+ * passed to React Query `queryFn`s and read from render paths, so a freshly
+ * allocated client on every read would break any dependency array or reference
  * comparison built on top of it.
  *
  * Keying on the agent also ties client lifetime to agent lifetime. A disposed
@@ -17,10 +17,12 @@ import {networkAwareFetch} from './network'
  * rotation builds a new agent rather than mutating the old one, so a client
  * derived from a stale agent becomes unreachable exactly when its agent does.
  */
-const lexClients = new WeakMap<BskyAppAgent, Client>()
+const appviewClients = new WeakMap<BskyAppAgent, Client>()
+const pdsClients = new WeakMap<BskyAppAgent, Client>()
+const chatClients = new WeakMap<BskyAppAgent, Client>()
 
 /**
- * The lex {@link Client} for an agent, memoized per agent.
+ * The appview {@link Client} for an agent, memoized per agent.
  *
  * The wrapped handler is `agent.fetchHandler`, NOT
  * `agent.sessionManager.fetchHandler`. The agent-level handler is where
@@ -30,8 +32,8 @@ const lexClients = new WeakMap<BskyAppAgent, Client>()
  * deliberately built with neither a `service` option nor labelers - setting
  * either here would emit them a second time.
  */
-export function agentToLexClient(agent: BskyAppAgent): Client {
-  const existing = lexClients.get(agent)
+export function agentToAppviewClient(agent: BskyAppAgent): Client {
+  const existing = appviewClients.get(agent)
   if (existing) {
     return existing
   }
@@ -41,10 +43,101 @@ export function agentToLexClient(agent: BskyAppAgent): Client {
     },
     fetchHandler: (path, init) => agent.fetchHandler(path, init),
   })
-  lexClients.set(agent, client)
+  appviewClients.set(agent, client)
   return client
 }
 
+/**
+ * The account-host {@link Client} for an agent, memoized per agent.
+ *
+ * This wraps `agent.sessionManager.fetchHandler`, one layer below
+ * {@link agentToAppviewClient}. That layer does authorization and refresh-on-401
+ * and resolves the request against `dispatchUrl` (the account's PDS), but it
+ * does NOT set `atproto-proxy` or `atproto-accept-labelers`, so requests reach
+ * the PDS itself rather than being proxied onward. That is the right transport
+ * for `com.atproto.*` repo/server/identity calls.
+ *
+ * No `service` option for the same reason: adding one would reintroduce the
+ * proxy header this client exists to avoid.
+ *
+ * The handler is wrapped in a closure rather than passed by reference because
+ * `PasswordSessionManager.fetchHandler` reads `this`. Relative paths are
+ * intentional: lex-client hands its handler an origin-less
+ * `/xrpc/<nsid>[?query]` path, which the session manager absolutizes against
+ * `dispatchUrl`.
+ */
+export function agentToPdsClient(agent: BskyAppAgent): Client {
+  const existing = pdsClients.get(agent)
+  if (existing) {
+    return existing
+  }
+  const client = createLexClient({
+    get did() {
+      return agent.did
+    },
+    fetchHandler: (path, init) => agent.sessionManager.fetchHandler(path, init),
+  })
+  pdsClients.set(agent, client)
+  return client
+}
+
+/**
+ * The chat {@link Client} for an agent, memoized per agent.
+ *
+ * Same session-manager transport as {@link agentToPdsClient} - authorization
+ * and PDS routing, no agent-level proxy or labeler headers - but constructed
+ * with {@link CHAT_PROXY_SERVICE} as its `service`, so lex-client emits
+ * `atproto-proxy: <CHAT_PROXY_SERVICE>` on every request and `chat.bsky.*`
+ * calls are proxied to the chat service.
+ */
+export function agentToChatClient(agent: BskyAppAgent): Client {
+  const existing = chatClients.get(agent)
+  if (existing) {
+    return existing
+  }
+  const client = createLexClient(
+    {
+      get did() {
+        return agent.did
+      },
+      fetchHandler: (path, init) =>
+        agent.sessionManager.fetchHandler(path, init),
+    },
+    {service: CHAT_PROXY_SERVICE},
+  )
+  chatClients.set(agent, client)
+  return client
+}
+
+/** Thrown when a write/auth-only client is used with no active session. */
+export class NotAuthenticatedError extends Error {
+  constructor(op = 'this operation') {
+    super(`Not authenticated: ${op} requires an active session`)
+    this.name = 'NotAuthenticatedError'
+  }
+}
+
+let unauthedClient: Client | undefined
+
+/**
+ * A {@link Client} that throws {@link NotAuthenticatedError} on any request,
+ * before any network I/O. It is the logged-out value of the write/auth-only
+ * hooks (`usePdsClient`/`useChatClient`) so an unauthenticated call fails
+ * immediately and legibly instead of silently hitting public infrastructure,
+ * which would answer with an opaque 4xx.
+ *
+ * A single module-level instance, so its identity is stable across renders -
+ * safe to use in React Query keys and as a hook return value.
+ */
+export function getUnauthenticatedThrowingClient(): Client {
+  return (unauthedClient ??= createLexClient({
+    did: undefined,
+    fetchHandler: () => {
+      throw new NotAuthenticatedError()
+    },
+  }))
+}
+
 let publicLexClient: Client | undefined
 
 /**
@@ -52,9 +145,10 @@ let publicLexClient: Client | undefined
  * appview.
  *
  * A single module-level instance for the same identity-stability reason as
- * {@link agentToLexClient}: there is no session to scope it to, so it lives for
- * the lifetime of the process. Requests go through {@link networkAwareFetch} so
- * public reads feed the app's reachability signal like authenticated ones do.
+ * {@link agentToAppviewClient}: there is no session to scope it to, so it lives
+ * for the lifetime of the process. Requests go through
+ * {@link networkAwareFetch} so public reads feed the app's reachability signal
+ * like authenticated ones do.
  *
  * Unlike the public agent it parallels, this client sends neither
  * `atproto-proxy` nor `atproto-accept-labelers`. `createPublicAgent` configures
@@ -63,7 +157,7 @@ let publicLexClient: Client | undefined
  * consumer that needs moderation labels on public reads must configure labelers
  * itself before issuing the request.
  */
-export function getPublicLexClient(): Client {
+export function getPublicAppviewClient(): Client {
   return (publicLexClient ??= createLexClient({
     service: PUBLIC_BSKY_SERVICE,
     fetch: networkAwareFetch,
diff --git a/src/state/session/index.tsx b/src/state/session/index.tsx
index 618804ee7b..01bca93c36 100644
--- a/src/state/session/index.tsx
+++ b/src/state/session/index.tsx
@@ -19,7 +19,13 @@ import {useGlobalDialogsControlContext} from '#/components/dialogs/Context'
 import {AnalyticsContext, useAnalyticsBase, utils} from '#/analytics'
 import {IS_WEB} from '#/env'
 import {emitSessionDropped} from '../events'
-import {agentToLexClient, getPublicLexClient} from './clients'
+import {
+  agentToAppviewClient,
+  agentToChatClient,
+  agentToPdsClient,
+  getPublicAppviewClient,
+  getUnauthenticatedThrowingClient,
+} from './clients'
 import {createSessionBundleAndCreateAccount} from './create-account'
 import {pickExpiryRescueCandidate} from './expiry-rescue'
 import {type Action, getInitialState, reducer, type State} from './reducer'
@@ -711,20 +717,70 @@ export function useAgent(): AtpAgent {
 }
 
 /**
- * The lex client for the active session, or for the public agent when logged
- * out.
+ * Client for appview reads.
+ *
+ * When logged out the bundle's agent is the public agent built by
+ * `createPublicAgent`, which is configured with the appview proxy and dispatches
+ * unauthenticated, so the logged-out fallback is the agent itself - there is no
+ * separate public branch here.
  */
-export function useLexClient(): Client {
+export function useAppviewClient(): Client {
   const bundle = useContext(BundleContext)
   if (!bundle) {
-    throw Error('useLexClient() must be below <SessionProvider>.')
+    throw Error('useAppviewClient() must be below <SessionProvider>.')
   }
-  return agentToLexClient(bundle.agent)
+  return agentToAppviewClient(bundle.agent)
 }
 
 /**
- * The unauthenticated lex client for public reads.
+ * Client for account-host requests. It shares the active session's auth
+ * lifecycle but sets no proxy or labeler headers, so calls target the PDS.
+ * Logged out, calls throw `NotAuthenticatedError` before network I/O. Use
+ * {@link useMaybePdsClient} when the caller must branch on authentication.
  */
-export function usePublicLexClient(): Client {
-  return getPublicLexClient()
+export function usePdsClient(): Client {
+  const bundle = useContext(BundleContext)
+  if (!bundle) {
+    throw Error('usePdsClient() must be below <SessionProvider>.')
+  }
+  return bundle.session
+    ? agentToPdsClient(bundle.agent)
+    : getUnauthenticatedThrowingClient()
+}
+
+/**
+ * Client for `chat.bsky.*` calls. Logged-out calls throw
+ * `NotAuthenticatedError`; use {@link useMaybeChatClient} to branch on auth.
+ */
+export function useChatClient(): Client {
+  const bundle = useContext(BundleContext)
+  if (!bundle) {
+    throw Error('useChatClient() must be below <SessionProvider>.')
+  }
+  return bundle.session
+    ? agentToChatClient(bundle.agent)
+    : getUnauthenticatedThrowingClient()
+}
+
+/**
+ * Account-host client for the active session, or `null` when logged out.
+ */
+export function useMaybePdsClient(): Client | null {
+  const bundle = useContext(BundleContext)
+  return bundle?.session ? agentToPdsClient(bundle.agent) : null
+}
+
+/**
+ * Chat client for the active session, or `null` when logged out.
+ */
+export function useMaybeChatClient(): Client | null {
+  const bundle = useContext(BundleContext)
+  return bundle?.session ? agentToChatClient(bundle.agent) : null
+}
+
+/**
+ * The unauthenticated client for public appview reads.
+ */
+export function usePublicAppviewClient(): Client {
+  return getPublicAppviewClient()
 }

From b804f267ccc50591b4f53fb42efc76becccb7575 Mon Sep 17 00:00:00 2001
From: Samuel Newman <mozzius@protonmail.com>
Date: Thu, 13 Aug 2026 22:26:14 +0300
Subject: [PATCH 07/32] [SDK] Widen `#/types/bsky` views to dual-world unions
 (#11353)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
---
 src/types/bsky/__tests__/post.test.ts        | 277 +++++++++++++++++++
 src/types/bsky/__tests__/starterPack.test.ts |  99 +++++++
 src/types/bsky/post.ts                       | 132 ++++++---
 src/types/bsky/profile.ts                    |  15 +-
 src/types/bsky/starterPack.ts                |  49 +++-
 5 files changed, 529 insertions(+), 43 deletions(-)
 create mode 100644 src/types/bsky/__tests__/post.test.ts
 create mode 100644 src/types/bsky/__tests__/starterPack.test.ts

diff --git a/src/types/bsky/__tests__/post.test.ts b/src/types/bsky/__tests__/post.test.ts
new file mode 100644
index 0000000000..6db1d23878
--- /dev/null
+++ b/src/types/bsky/__tests__/post.test.ts
@@ -0,0 +1,277 @@
+import {
+  type $Typed as $TypedApi,
+  type AppBskyEmbedRecord,
+  type AppBskyFeedDefs,
+} from '@atproto/api'
+import {type $Typed} from '@atproto/lex'
+
+import {type app} from '#/lexicons'
+import {
+  type Embed,
+  type EmbedType,
+  parseEmbed,
+  parseEmbedRecordView,
+} from '#/types/bsky/post'
+
+const now = () => new Date().toISOString()
+
+const imagesView = {
+  $type: 'app.bsky.embed.images#view',
+  images: [
+    {
+      $type: 'app.bsky.embed.images#viewImage',
+      thumb: 'https://example.com/thumb.jpg',
+      fullsize: 'https://example.com/full.jpg',
+      alt: 'alt text',
+    },
+  ],
+}
+
+const galleryView = {
+  $type: 'app.bsky.embed.gallery#view',
+  items: [
+    {
+      $type: 'app.bsky.embed.gallery#viewImage',
+      thumbnail: 'https://example.com/thumb.jpg',
+      fullsize: 'https://example.com/full.jpg',
+      alt: 'alt text',
+      aspectRatio: {width: 1, height: 1},
+    },
+  ],
+}
+
+const externalView = {
+  $type: 'app.bsky.embed.external#view',
+  external: {
+    $type: 'app.bsky.embed.external#viewExternal',
+    uri: 'https://example.com',
+    title: 'title',
+    description: 'description',
+  },
+}
+
+const videoView = {
+  $type: 'app.bsky.embed.video#view',
+  cid: 'bafyvideo',
+  playlist: 'https://example.com/playlist.m3u8',
+}
+
+const viewRecord = {
+  $type: 'app.bsky.embed.record#viewRecord',
+  uri: 'at://did:plc:abc/app.bsky.feed.post/123',
+  cid: 'bafypost',
+  author: {
+    $type: 'app.bsky.actor.defs#profileViewBasic',
+    did: 'did:plc:abc',
+    handle: 'alice.test',
+  },
+  value: {$type: 'app.bsky.feed.post', text: 'hello', createdAt: now()},
+  indexedAt: now(),
+}
+
+const recordView = {
+  $type: 'app.bsky.embed.record#view',
+  record: viewRecord,
+}
+
+const generatorView = {
+  $type: 'app.bsky.feed.defs#generatorView',
+  uri: 'at://did:plc:abc/app.bsky.feed.generator/feed',
+  cid: 'bafyfeed',
+  did: 'did:web:example.com',
+  creator: {
+    $type: 'app.bsky.actor.defs#profileView',
+    did: 'did:plc:abc',
+    handle: 'alice.test',
+  },
+  displayName: 'Cool feed',
+  indexedAt: now(),
+}
+
+const starterPackViewBasic = {
+  $type: 'app.bsky.graph.defs#starterPackViewBasic',
+  uri: 'at://did:plc:abc/app.bsky.graph.starterpack/123',
+  cid: 'bafypack',
+  record: {},
+  creator: {
+    $type: 'app.bsky.actor.defs#profileViewBasic',
+    did: 'did:plc:abc',
+    handle: 'alice.test',
+  },
+  indexedAt: now(),
+}
+
+/**
+ * Casts a fixture into the `parseEmbed` input position. The fixtures are plain
+ * objects standing in for app view responses; the guards under test only read
+ * `$type`, so the structural detail beyond that is not load-bearing.
+ */
+const asEmbed = (v: unknown) => v as app.bsky.feed.defs.PostView['embed']
+
+/*
+ * Type-level assertions for the dual-world widening. These are compile-time
+ * only: each widened arm must accept both the `#/lexicons` view and the
+ * `@atproto/api` view, and `parseEmbed` must accept a `PostView.embed` from
+ * either world, because both worlds have live producers.
+ */
+type Assignable<From, To> = From extends To ? true : false
+type Expect<T extends true> = T
+
+type _PostArmAcceptsNewWorld = Expect<
+  Assignable<
+    {type: 'post'; view: $Typed<app.bsky.embed.record.ViewRecord>},
+    EmbedType<'post'>
+  >
+>
+type _PostArmAcceptsOldWorld = Expect<
+  Assignable<
+    {type: 'post'; view: $TypedApi<AppBskyEmbedRecord.ViewRecord>},
+    EmbedType<'post'>
+  >
+>
+type _ParseEmbedAcceptsNewWorld = Expect<
+  Assignable<
+    app.bsky.feed.defs.PostView['embed'],
+    Parameters<typeof parseEmbed>[0]
+  >
+>
+type _ParseEmbedAcceptsOldWorld = Expect<
+  Assignable<
+    AppBskyFeedDefs.PostView['embed'],
+    Parameters<typeof parseEmbed>[0]
+  >
+>
+type _ParseEmbedReturnsEmbed = Expect<
+  Assignable<ReturnType<typeof parseEmbed>, Embed>
+>
+
+describe('types/bsky/post parseEmbed', () => {
+  it('parses an images view', () => {
+    const embed = parseEmbed(asEmbed(imagesView))
+    expect(embed.type).toBe('images')
+    if (embed.type === 'images') {
+      expect(embed.view.images).toHaveLength(1)
+    }
+  })
+
+  it('parses a gallery view', () => {
+    const embed = parseEmbed(asEmbed(galleryView))
+    expect(embed.type).toBe('gallery')
+    if (embed.type === 'gallery') {
+      expect(embed.view.items).toHaveLength(1)
+    }
+  })
+
+  it('parses an external view', () => {
+    const embed = parseEmbed(asEmbed(externalView))
+    expect(embed.type).toBe('link')
+    if (embed.type === 'link') {
+      expect(embed.view.external.uri).toBe('https://example.com')
+    }
+  })
+
+  it('parses a video view', () => {
+    const embed = parseEmbed(asEmbed(videoView))
+    expect(embed.type).toBe('video')
+    if (embed.type === 'video') {
+      expect(embed.view.playlist).toBe('https://example.com/playlist.m3u8')
+    }
+  })
+
+  it('parses a record view through to its inner record', () => {
+    const embed = parseEmbed(asEmbed(recordView))
+    expect(embed.type).toBe('post')
+    if (embed.type === 'post') {
+      expect(embed.view.uri).toBe('at://did:plc:abc/app.bsky.feed.post/123')
+    }
+  })
+
+  it('parses a recordWithMedia view into both halves', () => {
+    const embed = parseEmbed(
+      asEmbed({
+        $type: 'app.bsky.embed.recordWithMedia#view',
+        record: recordView,
+        media: imagesView,
+      }),
+    )
+    expect(embed.type).toBe('post_with_media')
+    if (embed.type === 'post_with_media') {
+      expect(embed.view.type).toBe('post')
+      expect(embed.media.type).toBe('images')
+    }
+  })
+
+  it('returns the unknown arm for an unrecognised $type', () => {
+    const embed = parseEmbed(asEmbed({$type: 'com.example.someEmbed#view'}))
+    expect(embed).toEqual({type: 'unknown', view: null})
+  })
+
+  it('returns the unknown arm for undefined', () => {
+    expect(parseEmbed(undefined)).toEqual({type: 'unknown', view: null})
+  })
+
+  it('does not match an embed with no $type', () => {
+    expect(parseEmbed(asEmbed({images: []}))).toEqual({
+      type: 'unknown',
+      view: null,
+    })
+  })
+})
+
+describe('types/bsky/post parseEmbedRecordView', () => {
+  const asRecordView = (record: unknown) =>
+    ({record}) as app.bsky.embed.record.View
+
+  it('parses each known record variant', () => {
+    expect(parseEmbedRecordView(asRecordView(viewRecord)).type).toBe('post')
+    expect(
+      parseEmbedRecordView(
+        asRecordView({$type: 'app.bsky.embed.record#viewNotFound'}),
+      ).type,
+    ).toBe('post_not_found')
+    expect(
+      parseEmbedRecordView(
+        asRecordView({$type: 'app.bsky.embed.record#viewBlocked'}),
+      ).type,
+    ).toBe('post_blocked')
+    expect(
+      parseEmbedRecordView(
+        asRecordView({$type: 'app.bsky.embed.record#viewDetached'}),
+      ).type,
+    ).toBe('post_detached')
+    expect(parseEmbedRecordView(asRecordView(generatorView)).type).toBe('feed')
+    expect(
+      parseEmbedRecordView(
+        asRecordView({$type: 'app.bsky.graph.defs#listView'}),
+      ).type,
+    ).toBe('list')
+    expect(
+      parseEmbedRecordView(
+        asRecordView({$type: 'app.bsky.labeler.defs#labelerView'}),
+      ).type,
+    ).toBe('labeler')
+    expect(parseEmbedRecordView(asRecordView(starterPackViewBasic)).type).toBe(
+      'starter_pack',
+    )
+  })
+
+  it('returns the unknown arm for an unrecognised record', () => {
+    expect(
+      parseEmbedRecordView(asRecordView({$type: 'com.example.thing'})),
+    ).toEqual({type: 'unknown', view: null})
+  })
+})
+
+describe('types/bsky/post Embed dual-world types', () => {
+  it('has the compile-time dual-world assertions above satisfied', () => {
+    /*
+     * The assertions are the `_*` types declared at module scope; a failure
+     * surfaces as a typecheck error, not a test failure. This case exists so the
+     * intent is visible when reading the suite.
+     */
+    const parsedNewWorld: Embed = parseEmbed(
+      asEmbed({$type: 'app.bsky.embed.images#view', images: []}),
+    )
+    expect(parsedNewWorld.type).toBe('images')
+  })
+})
diff --git a/src/types/bsky/__tests__/starterPack.test.ts b/src/types/bsky/__tests__/starterPack.test.ts
new file mode 100644
index 0000000000..b973766f2e
--- /dev/null
+++ b/src/types/bsky/__tests__/starterPack.test.ts
@@ -0,0 +1,99 @@
+import {type AppBskyGraphDefs} from '@atproto/api'
+
+import {type app} from '#/lexicons'
+import {
+  type AnyStarterPackView,
+  isBasicView,
+  isView,
+} from '#/types/bsky/starterPack'
+
+const now = () => new Date().toISOString()
+
+const creator = {
+  $type: 'app.bsky.actor.defs#profileViewBasic',
+  did: 'did:plc:abc',
+  handle: 'alice.test',
+}
+
+const basicView = {
+  $type: 'app.bsky.graph.defs#starterPackViewBasic',
+  uri: 'at://did:plc:abc/app.bsky.graph.starterpack/123',
+  cid: 'bafypack',
+  record: {},
+  creator,
+  indexedAt: now(),
+}
+
+const fullView = {
+  ...basicView,
+  $type: 'app.bsky.graph.defs#starterPackView',
+}
+
+/*
+ * Type-level assertions for the dual-world widening: the alias must accept a
+ * starter pack view from either world, because both have live producers. These
+ * are compile-time only - a failure surfaces as a typecheck error.
+ */
+type Assignable<From, To> = From extends To ? true : false
+type Expect<T extends true> = T
+
+type _AcceptsNewBasicView = Expect<
+  Assignable<app.bsky.graph.defs.StarterPackViewBasic, AnyStarterPackView>
+>
+type _AcceptsNewFullView = Expect<
+  Assignable<app.bsky.graph.defs.StarterPackView, AnyStarterPackView>
+>
+type _AcceptsOldBasicView = Expect<
+  Assignable<AppBskyGraphDefs.StarterPackViewBasic, AnyStarterPackView>
+>
+type _AcceptsOldFullView = Expect<
+  Assignable<AppBskyGraphDefs.StarterPackView, AnyStarterPackView>
+>
+
+describe('types/bsky/starterPack guards', () => {
+  describe('isBasicView', () => {
+    it('accepts a basic view', () => {
+      expect(isBasicView(basicView)).toBe(true)
+    })
+
+    it('rejects the full view', () => {
+      expect(isBasicView(fullView)).toBe(false)
+    })
+
+    it('rejects a missing or absent $type', () => {
+      expect(isBasicView({uri: 'at://x', cid: 'y'})).toBe(false)
+      expect(isBasicView(null)).toBe(false)
+      expect(isBasicView(undefined)).toBe(false)
+      expect(isBasicView('string')).toBe(false)
+    })
+  })
+
+  describe('isView', () => {
+    it('accepts the full view', () => {
+      expect(isView(fullView)).toBe(true)
+    })
+
+    it('rejects the basic view', () => {
+      expect(isView(basicView)).toBe(false)
+    })
+
+    it('rejects a missing or absent $type', () => {
+      expect(isView({uri: 'at://x', cid: 'y'})).toBe(false)
+      expect(isView(null)).toBe(false)
+      expect(isView(undefined)).toBe(false)
+    })
+  })
+
+  it('narrows a view from either world to a readable shape', () => {
+    /*
+     * The `$type` string is world-independent, so one guard narrows values from
+     * both producers; the narrowed union stays structurally readable.
+     */
+    for (const view of [basicView, fullView]) {
+      if (isBasicView(view) || isView(view)) {
+        expect(typeof view.uri).toBe('string')
+        expect(typeof view.creator.did).toBe('string')
+      }
+    }
+  })
+})
diff --git a/src/types/bsky/post.ts b/src/types/bsky/post.ts
index 43621ef63b..2c8e3f4d87 100644
--- a/src/types/bsky/post.ts
+++ b/src/types/bsky/post.ts
@@ -1,64 +1,110 @@
 import {
-  type $Typed,
-  AppBskyEmbedExternal,
-  AppBskyEmbedGallery,
-  AppBskyEmbedImages,
-  AppBskyEmbedRecord,
-  AppBskyEmbedRecordWithMedia,
-  AppBskyEmbedVideo,
-  AppBskyFeedDefs,
-  AppBskyGraphDefs,
-  AppBskyLabelerDefs,
+  type $Typed as $TypedApi,
+  type AppBskyEmbedExternal,
+  type AppBskyEmbedGallery,
+  type AppBskyEmbedImages,
+  type AppBskyEmbedRecord,
+  type AppBskyEmbedVideo,
+  type AppBskyFeedDefs,
+  type AppBskyGraphDefs,
+  type AppBskyLabelerDefs,
 } from '@atproto/api'
+import {type $Typed} from '@atproto/lex'
 
+import {app} from '#/lexicons'
+import {isType} from '#/types/bsky'
+
+/*
+ * Each `view` slot below accepts both the generated `#/lexicons` view and the
+ * `@atproto/api` view of the same def, because both worlds have live producers:
+ * `parseEmbed` narrows with the `#/lexicons` schemas and so returns new-world
+ * views, while call sites that build an `Embed` by hand still pass views
+ * produced through the `@atproto/api` agent.
+ *
+ * The two worlds share the same `$type` strings, so the guards in this file
+ * narrow a value from either producer; only the static type differs.
+ *
+ * TODO: remove the @atproto/api arms once all producers emit #/lexicons views
+ */
 export type Embed =
   | {
       type: 'post'
-      view: $Typed<AppBskyEmbedRecord.ViewRecord>
+      view:
+        | $Typed<app.bsky.embed.record.ViewRecord>
+        | $TypedApi<AppBskyEmbedRecord.ViewRecord>
     }
   | {
       type: 'post_not_found'
-      view: $Typed<AppBskyEmbedRecord.ViewNotFound>
+      view:
+        | $Typed<app.bsky.embed.record.ViewNotFound>
+        | $TypedApi<AppBskyEmbedRecord.ViewNotFound>
     }
   | {
       type: 'post_blocked'
-      view: $Typed<AppBskyEmbedRecord.ViewBlocked>
+      view:
+        | $Typed<app.bsky.embed.record.ViewBlocked>
+        | $TypedApi<AppBskyEmbedRecord.ViewBlocked>
     }
   | {
       type: 'post_detached'
-      view: $Typed<AppBskyEmbedRecord.ViewDetached>
+      view:
+        | $Typed<app.bsky.embed.record.ViewDetached>
+        | $TypedApi<AppBskyEmbedRecord.ViewDetached>
     }
   | {
       type: 'feed'
-      view: $Typed<AppBskyFeedDefs.GeneratorView>
+      view:
+        | $Typed<app.bsky.feed.defs.GeneratorView>
+        | $TypedApi<AppBskyFeedDefs.GeneratorView>
     }
   | {
       type: 'list'
-      view: $Typed<AppBskyGraphDefs.ListView>
+      view:
+        | $Typed<app.bsky.graph.defs.ListView>
+        | $TypedApi<AppBskyGraphDefs.ListView>
     }
   | {
       type: 'labeler'
-      view: $Typed<AppBskyLabelerDefs.LabelerView>
+      view:
+        | $Typed<app.bsky.labeler.defs.LabelerView>
+        | $TypedApi<AppBskyLabelerDefs.LabelerView>
     }
   | {
       type: 'starter_pack'
-      view: $Typed<AppBskyGraphDefs.StarterPackViewBasic>
+      view:
+        | $Typed<app.bsky.graph.defs.StarterPackViewBasic>
+        | $TypedApi<AppBskyGraphDefs.StarterPackViewBasic>
     }
   | {
       type: 'images'
-      view: $Typed<AppBskyEmbedImages.View>
+      /*
+       * Only the `@atproto/api` view, unlike the other arms: the ImageEmbed
+       * consumer reads `view.images` directly, and the `#/lexicons` view is
+       * assignable to this slot, so `parseEmbed`'s new-world value flows in
+       * while the consumer keeps a single structural shape to read from.
+       */
+      view: $TypedApi<AppBskyEmbedImages.View>
     }
   | {
       type: 'gallery'
-      view: $Typed<AppBskyEmbedGallery.View>
+      /*
+       * Old-world only for the same reason as the `images` arm above: the
+       * consumer narrows `view.items` with `AppBskyEmbedGallery.isViewImage`,
+       * which cannot narrow the new view's `Unknown$TypedObject` arm.
+       */
+      view: $TypedApi<AppBskyEmbedGallery.View>
     }
   | {
       type: 'link'
-      view: $Typed<AppBskyEmbedExternal.View>
+      view:
+        | $Typed<app.bsky.embed.external.View>
+        | $TypedApi<AppBskyEmbedExternal.View>
     }
   | {
       type: 'video'
-      view: $Typed<AppBskyEmbedVideo.View>
+      view:
+        | $Typed<app.bsky.embed.video.View>
+        | $TypedApi<AppBskyEmbedVideo.View>
     }
   | {
       type: 'post_with_media'
@@ -72,43 +118,45 @@ export type Embed =
 
 export type EmbedType<T extends Embed['type']> = Extract<Embed, {type: T}>
 
-export function parseEmbedRecordView({record}: AppBskyEmbedRecord.View): Embed {
-  if (AppBskyEmbedRecord.isViewRecord(record)) {
+export function parseEmbedRecordView({
+  record,
+}: app.bsky.embed.record.View): Embed {
+  if (isType(app.bsky.embed.record.viewRecord, record)) {
     return {
       type: 'post',
       view: record,
     }
-  } else if (AppBskyEmbedRecord.isViewNotFound(record)) {
+  } else if (isType(app.bsky.embed.record.viewNotFound, record)) {
     return {
       type: 'post_not_found',
       view: record,
     }
-  } else if (AppBskyEmbedRecord.isViewBlocked(record)) {
+  } else if (isType(app.bsky.embed.record.viewBlocked, record)) {
     return {
       type: 'post_blocked',
       view: record,
     }
-  } else if (AppBskyEmbedRecord.isViewDetached(record)) {
+  } else if (isType(app.bsky.embed.record.viewDetached, record)) {
     return {
       type: 'post_detached',
       view: record,
     }
-  } else if (AppBskyFeedDefs.isGeneratorView(record)) {
+  } else if (isType(app.bsky.feed.defs.generatorView, record)) {
     return {
       type: 'feed',
       view: record,
     }
-  } else if (AppBskyGraphDefs.isListView(record)) {
+  } else if (isType(app.bsky.graph.defs.listView, record)) {
     return {
       type: 'list',
       view: record,
     }
-  } else if (AppBskyLabelerDefs.isLabelerView(record)) {
+  } else if (isType(app.bsky.labeler.defs.labelerView, record)) {
     return {
       type: 'labeler',
       view: record,
     }
-  } else if (AppBskyGraphDefs.isStarterPackViewBasic(record)) {
+  } else if (isType(app.bsky.graph.defs.starterPackViewBasic, record)) {
     return {
       type: 'starter_pack',
       view: record,
@@ -121,30 +169,38 @@ export function parseEmbedRecordView({record}: AppBskyEmbedRecord.View): Embed {
   }
 }
 
-export function parseEmbed(embed: AppBskyFeedDefs.PostView['embed']): Embed {
-  if (AppBskyEmbedImages.isView(embed)) {
+export function parseEmbed(
+  /*
+   * Accepts a `PostView.embed` from either world; the `#/lexicons` guards below
+   * narrow on `$type`, which is world-independent.
+   */
+  embed:
+    | app.bsky.feed.defs.PostView['embed']
+    | AppBskyFeedDefs.PostView['embed'],
+): Embed {
+  if (isType(app.bsky.embed.images.view, embed)) {
     return {
       type: 'images',
       view: embed,
     }
-  } else if (AppBskyEmbedGallery.isView(embed)) {
+  } else if (isType(app.bsky.embed.gallery.view, embed)) {
     return {
       type: 'gallery',
       view: embed,
     }
-  } else if (AppBskyEmbedExternal.isView(embed)) {
+  } else if (isType(app.bsky.embed.external.view, embed)) {
     return {
       type: 'link',
       view: embed,
     }
-  } else if (AppBskyEmbedVideo.isView(embed)) {
+  } else if (isType(app.bsky.embed.video.view, embed)) {
     return {
       type: 'video',
       view: embed,
     }
-  } else if (AppBskyEmbedRecord.isView(embed)) {
+  } else if (isType(app.bsky.embed.record.view, embed)) {
     return parseEmbedRecordView(embed)
-  } else if (AppBskyEmbedRecordWithMedia.isView(embed)) {
+  } else if (isType(app.bsky.embed.recordWithMedia.view, embed)) {
     return {
       type: 'post_with_media',
       view: parseEmbedRecordView(embed.record),
diff --git a/src/types/bsky/profile.ts b/src/types/bsky/profile.ts
index 12c8146ae1..4231a6d0fe 100644
--- a/src/types/bsky/profile.ts
+++ b/src/types/bsky/profile.ts
@@ -1,9 +1,22 @@
 import {type AppBskyActorDefs, type ChatBskyActorDefs} from '@atproto/api'
 
+import {type app, type chat} from '#/lexicons'
+
 /**
- * Matches any profile view exported by our SDK
+ * Matches any profile view exported by our SDK, in either world.
+ *
+ * Both the generated `#/lexicons` views and the `@atproto/api` views are
+ * accepted because both are live producers: queries migrated to the lexicon
+ * client emit the former, unmigrated ones emit the latter, and consumers of
+ * this alias take profiles from both.
+ *
+ * TODO: remove the @atproto/api arms once all producers emit #/lexicons views
  */
 export type AnyProfileView =
+  | app.bsky.actor.defs.ProfileViewBasic
+  | app.bsky.actor.defs.ProfileView
+  | app.bsky.actor.defs.ProfileViewDetailed
+  | chat.bsky.actor.defs.ProfileViewBasic
   | AppBskyActorDefs.ProfileViewBasic
   | AppBskyActorDefs.ProfileView
   | AppBskyActorDefs.ProfileViewDetailed
diff --git a/src/types/bsky/starterPack.ts b/src/types/bsky/starterPack.ts
index 0064e16bc6..23df0e4631 100644
--- a/src/types/bsky/starterPack.ts
+++ b/src/types/bsky/starterPack.ts
@@ -1,11 +1,52 @@
-import {AppBskyGraphDefs} from '@atproto/api'
+import {type AppBskyGraphDefs} from '@atproto/api'
 
-export const isBasicView = AppBskyGraphDefs.isStarterPackViewBasic
-export const isView = AppBskyGraphDefs.isStarterPackView
+import {app} from '#/lexicons'
+
+/*
+ * `$type`-only guards for starter pack views. They compare against the
+ * `#/lexicons` schema's `$type` string rather than delegating to the schema's
+ * `isTypeOf` (which treats a missing `$type` as a match), matching the
+ * present-and-equal semantics of the old `@atproto/api`
+ * `AppBskyGraphDefs.isStarterPackView*` helpers.
+ *
+ * The `$type` string is identical in both worlds, so a single check narrows a
+ * value from either producer; the narrowed type is the union of both worlds'
+ * views for the same reason {@link AnyStarterPackView} is.
+ */
+export function isBasicView(
+  v: unknown,
+): v is
+  | app.bsky.graph.defs.StarterPackViewBasic
+  | AppBskyGraphDefs.StarterPackViewBasic {
+  return (
+    v != null &&
+    typeof v === 'object' &&
+    (v as {$type?: unknown}).$type ===
+      app.bsky.graph.defs.starterPackViewBasic.$type
+  )
+}
+
+export function isView(
+  v: unknown,
+): v is app.bsky.graph.defs.StarterPackView | AppBskyGraphDefs.StarterPackView {
+  return (
+    v != null &&
+    typeof v === 'object' &&
+    (v as {$type?: unknown}).$type === app.bsky.graph.defs.starterPackView.$type
+  )
+}
 
 /**
- * Matches any starter pack view exported by our SDK
+ * Matches any starter pack view exported by our SDK, in either world.
+ *
+ * Both the generated `#/lexicons` views and the `@atproto/api` views are
+ * accepted because both are live producers: queries migrated to the lexicon
+ * client emit the former, unmigrated ones emit the latter.
+ *
+ * TODO: remove the @atproto/api arms once all producers emit #/lexicons views
  */
 export type AnyStarterPackView =
+  | app.bsky.graph.defs.StarterPackViewBasic
+  | app.bsky.graph.defs.StarterPackView
   | AppBskyGraphDefs.StarterPackViewBasic
   | AppBskyGraphDefs.StarterPackView

From 855457c9faa8bfb1a66025894f2feaa3f55d22a2 Mon Sep 17 00:00:00 2001
From: Samuel Newman <mozzius@protonmail.com>
Date: Thu, 13 Aug 2026 22:26:14 +0300
Subject: [PATCH 08/32] [SDK] Migrate discovery and post-thread queries to the
 appview client (#11355)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
---
 src/state/queries/search-posts-v2.ts          | 38 +++++++++--------
 src/state/queries/service-config.ts           |  9 ++--
 src/state/queries/starter-pack-search.ts      | 15 ++++---
 .../trending/useGetSuggestedFeedsQuery.ts     |  8 ++--
 .../useGetSuggestedOnboardingUsersQuery.ts    | 16 ++++---
 .../useGetSuggestedUsersForDiscoverQuery.ts   | 35 +++++++---------
 .../useGetSuggestedUsersForExploreQuery.ts    | 16 ++++---
 .../useGetSuggestedUsersForSeeMoreQuery.ts    | 16 ++++---
 ...useOnboardingSuggestedStarterPacksQuery.ts | 32 +++++++-------
 src/state/queries/usePostThread/index.ts      | 25 +++++++----
 .../queries/useSuggestedStarterPacksQuery.ts  | 11 ++---
 src/view/com/composer/Composer.tsx            | 42 +++++++++++--------
 12 files changed, 137 insertions(+), 126 deletions(-)

diff --git a/src/state/queries/search-posts-v2.ts b/src/state/queries/search-posts-v2.ts
index e33328b5a0..185212f8ef 100644
--- a/src/state/queries/search-posts-v2.ts
+++ b/src/state/queries/search-posts-v2.ts
@@ -1,10 +1,5 @@
 import {useCallback, useMemo, useRef} from 'react'
-import {
-  type AppBskyFeedDefs,
-  type AppBskyFeedSearchPostsV2,
-  AtUri,
-  moderatePost,
-} from '@atproto/api'
+import {type AppBskyFeedDefs, AtUri, moderatePost} from '@atproto/api'
 import {
   type InfiniteData,
   type QueryClient,
@@ -13,8 +8,9 @@ import {
 } from '@tanstack/react-query'
 
 import {useModerationOpts} from '#/state/preferences/moderation-opts'
-import {useAgent} from '#/state/session'
+import {useAppviewClient} from '#/state/session'
 import {type SearchFilters} from '#/screens/Search/searchParams'
+import {app} from '#/lexicons'
 import {
   appendFromMe,
   buildSearchPostsV2Filters,
@@ -48,7 +44,7 @@ export function useSearchPostsV2Query({
   enabled?: boolean
   filters?: SearchFilters
 }) {
-  const agent = useAgent()
+  const client = useAppviewClient()
   const moderationOpts = useModerationOpts()
   const selectArgs = useMemo(
     () => ({
@@ -59,15 +55,15 @@ export function useSearchPostsV2Query({
     [query, filters?.author, filters?.from, moderationOpts],
   )
   const lastRun = useRef<{
-    data: InfiniteData<AppBskyFeedSearchPostsV2.OutputSchema>
+    data: InfiniteData<app.bsky.feed.searchPostsV2.$OutputBody>
     args: typeof selectArgs
-    result: InfiniteData<AppBskyFeedSearchPostsV2.OutputSchema>
+    result: InfiniteData<app.bsky.feed.searchPostsV2.$OutputBody>
   } | null>(null)
 
   return useInfiniteQuery<
-    AppBskyFeedSearchPostsV2.OutputSchema,
+    app.bsky.feed.searchPostsV2.$OutputBody,
     Error,
-    InfiniteData<AppBskyFeedSearchPostsV2.OutputSchema>,
+    InfiniteData<app.bsky.feed.searchPostsV2.$OutputBody>,
     QueryKey,
     string | undefined
   >({
@@ -79,9 +75,18 @@ export function useSearchPostsV2Query({
        * dialog; see buildSearchPostsV2Filters for how the two sources combine.
        */
       const {q, ...embedded} = extractSearchPostsParams(query)
-      const builtFilters = buildSearchPostsV2Filters(embedded, filters)
+      /*
+       * The generated params brand format-constrained strings (uri,
+       * at-identifier, language) as template-literal types. The builder emits
+       * plain strings parsed from user input, which are runtime-identical, so
+       * the brand is asserted rather than re-validated here.
+       */
+      const builtFilters = buildSearchPostsV2Filters(
+        embedded,
+        filters,
+      ) as app.bsky.feed.searchPostsV2.$Params
       const finalQuery = appendFromMe(q, filters?.from === 'me')
-      const res = await agent.app.bsky.feed.searchPostsV2({
+      return await client.call(app.bsky.feed.searchPostsV2, {
         ...builtFilters,
         query: finalQuery,
         limit: 25,
@@ -93,13 +98,12 @@ export function useSearchPostsV2Query({
         sort: sort === 'latest' ? 'recent' : sort,
         allTime: true,
       })
-      return res.data
     },
     initialPageParam: undefined,
     getNextPageParam: lastPage => lastPage.cursor,
     enabled: enabled ?? !!moderationOpts,
     select: useCallback(
-      (data: InfiniteData<AppBskyFeedSearchPostsV2.OutputSchema>) => {
+      (data: InfiniteData<app.bsky.feed.searchPostsV2.$OutputBody>) => {
         const {moderationOpts, isSearchingSpecificUser} = selectArgs
 
         /*
@@ -177,7 +181,7 @@ export function* findAllPostsInQueryData(
   uri: string,
 ): Generator<AppBskyFeedDefs.PostView, undefined> {
   const queryDatas = queryClient.getQueriesData<
-    InfiniteData<AppBskyFeedSearchPostsV2.OutputSchema>
+    InfiniteData<app.bsky.feed.searchPostsV2.$OutputBody>
   >({
     queryKey: [searchPostsQueryKeyRoot],
   })
diff --git a/src/state/queries/service-config.ts b/src/state/queries/service-config.ts
index 890a49a5cf..e9f8277b46 100644
--- a/src/state/queries/service-config.ts
+++ b/src/state/queries/service-config.ts
@@ -1,7 +1,8 @@
 import {useQuery} from '@tanstack/react-query'
 
 import {STALE} from '#/state/queries'
-import {useAgent} from '#/state/session'
+import {useAppviewClient} from '#/state/session'
+import {app} from '#/lexicons'
 
 type ServiceConfig = {
   checkEmailConfirmed: boolean
@@ -13,17 +14,17 @@ type ServiceConfig = {
 }
 
 export function useServiceConfigQuery() {
-  const agent = useAgent()
+  const client = useAppviewClient()
   return useQuery<ServiceConfig>({
     refetchOnWindowFocus: true,
     staleTime: STALE.MINUTES.FIVE,
     queryKey: ['service-config'],
     queryFn: async () => {
       try {
-        const {data} = await agent.api.app.bsky.unspecced.getConfig()
+        const data = await client.call(app.bsky.unspecced.getConfig)
         return {
           checkEmailConfirmed: Boolean(data.checkEmailConfirmed),
-          // @ts-expect-error not included in types atm
+          // @ts-expect-error not included in the lexicon atm
           topicsEnabled: Boolean(data.topicsEnabled),
           liveNow: data.liveNow ?? [],
         }
diff --git a/src/state/queries/starter-pack-search.ts b/src/state/queries/starter-pack-search.ts
index 7987d1e07f..fd6c2ed51c 100644
--- a/src/state/queries/starter-pack-search.ts
+++ b/src/state/queries/starter-pack-search.ts
@@ -1,4 +1,3 @@
-import {type AppBskyGraphSearchStarterPacksV2} from '@atproto/api'
 import {
   type InfiniteData,
   keepPreviousData,
@@ -7,7 +6,8 @@ import {
 } from '@tanstack/react-query'
 
 import {STALE} from '#/state/queries'
-import {useAgent} from '#/state/session'
+import {useAppviewClient} from '#/state/session'
+import {app} from '#/lexicons'
 
 export const RQKEY_ROOT = 'starter-pack-search'
 export const RQKEY = (query: string, limit?: number) => [
@@ -27,23 +27,22 @@ export function useStarterPackSearch({
   maintainData?: boolean
   limit?: number
 }) {
-  const agent = useAgent()
+  const client = useAppviewClient()
   return useInfiniteQuery<
-    AppBskyGraphSearchStarterPacksV2.OutputSchema,
+    app.bsky.graph.searchStarterPacksV2.$OutputBody,
     Error,
-    InfiniteData<AppBskyGraphSearchStarterPacksV2.OutputSchema>,
+    InfiniteData<app.bsky.graph.searchStarterPacksV2.$OutputBody>,
     QueryKey,
     string | undefined
   >({
     staleTime: STALE.MINUTES.FIVE,
     queryKey: RQKEY(query, limit),
     queryFn: async ({pageParam}) => {
-      const res = await agent.app.bsky.graph.searchStarterPacksV2({
+      return await client.call(app.bsky.graph.searchStarterPacksV2, {
         q: query,
         limit,
         cursor: pageParam,
       })
-      return res.data
     },
     enabled: enabled && !!query,
     initialPageParam: undefined,
@@ -54,7 +53,7 @@ export function useStarterPackSearch({
 }
 
 function select(
-  data: InfiniteData<AppBskyGraphSearchStarterPacksV2.OutputSchema>,
+  data: InfiniteData<app.bsky.graph.searchStarterPacksV2.$OutputBody>,
 ) {
   // enforce uniqueness
   const uris = new Set()
diff --git a/src/state/queries/trending/useGetSuggestedFeedsQuery.ts b/src/state/queries/trending/useGetSuggestedFeedsQuery.ts
index 42d27d9f39..85cf0be794 100644
--- a/src/state/queries/trending/useGetSuggestedFeedsQuery.ts
+++ b/src/state/queries/trending/useGetSuggestedFeedsQuery.ts
@@ -7,14 +7,15 @@ import {
 import {getContentLanguages} from '#/state/preferences/languages'
 import {STALE} from '#/state/queries'
 import {usePreferencesQuery} from '#/state/queries/preferences'
-import {useAgent} from '#/state/session'
+import {useAppviewClient} from '#/state/session'
+import {app} from '#/lexicons'
 
 export const DEFAULT_LIMIT = 15
 
 export const createGetSuggestedFeedsQueryKey = () => ['suggested-feeds']
 
 export function useGetSuggestedFeedsQuery({enabled}: {enabled?: boolean}) {
-  const agent = useAgent()
+  const client = useAppviewClient()
   const {data: preferences} = usePreferencesQuery()
   const savedFeeds = preferences?.savedFeeds
 
@@ -24,7 +25,8 @@ export function useGetSuggestedFeedsQuery({enabled}: {enabled?: boolean}) {
     queryKey: createGetSuggestedFeedsQueryKey(),
     queryFn: async () => {
       const contentLangs = getContentLanguages().join(',')
-      const {data} = await agent.app.bsky.unspecced.getSuggestedFeeds(
+      const data = await client.call(
+        app.bsky.unspecced.getSuggestedFeeds,
         {
           limit: DEFAULT_LIMIT,
         },
diff --git a/src/state/queries/trending/useGetSuggestedOnboardingUsersQuery.ts b/src/state/queries/trending/useGetSuggestedOnboardingUsersQuery.ts
index 3697c51a7c..f8ffefe68d 100644
--- a/src/state/queries/trending/useGetSuggestedOnboardingUsersQuery.ts
+++ b/src/state/queries/trending/useGetSuggestedOnboardingUsersQuery.ts
@@ -1,7 +1,3 @@
-import {
-  type AppBskyActorDefs,
-  type AppBskyUnspeccedGetSuggestedOnboardingUsers,
-} from '@atproto/api'
 import {type QueryClient, useQuery} from '@tanstack/react-query'
 
 import {createBskyTopicsHeader} from '#/lib/api/feed/utils'
@@ -9,7 +5,8 @@ import {logger} from '#/logger'
 import {getContentLanguages} from '#/state/preferences/languages'
 import {STALE} from '#/state/queries'
 import {usePreferencesQuery} from '#/state/queries/preferences'
-import {useAgent} from '#/state/session'
+import {useAppviewClient} from '#/state/session'
+import {app} from '#/lexicons'
 
 export type QueryProps = {
   category?: string | null
@@ -30,7 +27,7 @@ export const createGetSuggestedOnboardingUsersQueryKey = (
 ]
 
 export function useGetSuggestedOnboardingUsersQuery(props: QueryProps) {
-  const agent = useAgent()
+  const client = useAppviewClient()
   const {data: preferences} = usePreferencesQuery()
 
   return useQuery({
@@ -42,7 +39,8 @@ export function useGetSuggestedOnboardingUsersQuery(props: QueryProps) {
 
       const overrideInterests = props.overrideInterests.join(',')
 
-      const {data} = await agent.app.bsky.unspecced.getSuggestedOnboardingUsers(
+      const data = await client.call(
+        app.bsky.unspecced.getSuggestedOnboardingUsers,
         {
           category: props.category ?? undefined,
           limit: props.limit || 10,
@@ -66,9 +64,9 @@ export function useGetSuggestedOnboardingUsersQuery(props: QueryProps) {
 export function* findAllProfilesInQueryData(
   queryClient: QueryClient,
   did: string,
-): Generator<AppBskyActorDefs.ProfileView, void> {
+): Generator<app.bsky.actor.defs.ProfileView, void> {
   const responses =
-    queryClient.getQueriesData<AppBskyUnspeccedGetSuggestedOnboardingUsers.OutputSchema>(
+    queryClient.getQueriesData<app.bsky.unspecced.getSuggestedOnboardingUsers.$OutputBody>(
       {
         queryKey: [getSuggestedOnboardingUsersQueryKeyRoot],
       },
diff --git a/src/state/queries/trending/useGetSuggestedUsersForDiscoverQuery.ts b/src/state/queries/trending/useGetSuggestedUsersForDiscoverQuery.ts
index c18a4d05c4..6e46e073ce 100644
--- a/src/state/queries/trending/useGetSuggestedUsersForDiscoverQuery.ts
+++ b/src/state/queries/trending/useGetSuggestedUsersForDiscoverQuery.ts
@@ -1,7 +1,3 @@
-import {
-  type AppBskyActorDefs,
-  type AppBskyUnspeccedGetSuggestedUsersForDiscover,
-} from '@atproto/api'
 import {type QueryClient, useQuery} from '@tanstack/react-query'
 
 import {
@@ -12,7 +8,8 @@ import {logger} from '#/logger'
 import {getContentLanguages} from '#/state/preferences/languages'
 import {STALE} from '#/state/queries'
 import {usePreferencesQuery} from '#/state/queries/preferences'
-import {useAgent} from '#/state/session'
+import {useAppviewClient} from '#/state/session'
+import {app} from '#/lexicons'
 
 export type QueryProps = {
   limit?: number
@@ -25,7 +22,7 @@ export const createGetSuggestedUsersForDiscoverQueryKey = (props: {
 }) => [getSuggestedUsersForDiscoverQueryKeyRoot, props.limit]
 
 export function useGetSuggestedUsersForDiscoverQuery(props: QueryProps = {}) {
-  const agent = useAgent()
+  const client = useAppviewClient()
   const {data: preferences} = usePreferencesQuery()
 
   return useQuery({
@@ -35,18 +32,18 @@ export function useGetSuggestedUsersForDiscoverQuery(props: QueryProps = {}) {
       const contentLangs = getContentLanguages().join(',')
       const userInterests = aggregateUserInterests(preferences)
 
-      const {data} =
-        await agent.app.bsky.unspecced.getSuggestedUsersForDiscover(
-          {
-            limit: props.limit || 10,
+      const data = await client.call(
+        app.bsky.unspecced.getSuggestedUsersForDiscover,
+        {
+          limit: props.limit || 10,
+        },
+        {
+          headers: {
+            ...createBskyTopicsHeader(userInterests),
+            'Accept-Language': contentLangs,
           },
-          {
-            headers: {
-              ...createBskyTopicsHeader(userInterests),
-              'Accept-Language': contentLangs,
-            },
-          },
-        )
+        },
+      )
       if (!data.recIdStr) {
         logger.debug('getSuggestedUsersForDiscover response missing recIdStr')
       }
@@ -58,9 +55,9 @@ export function useGetSuggestedUsersForDiscoverQuery(props: QueryProps = {}) {
 export function* findAllProfilesInQueryData(
   queryClient: QueryClient,
   did: string,
-): Generator<AppBskyActorDefs.ProfileView, void> {
+): Generator<app.bsky.actor.defs.ProfileView, void> {
   const responses =
-    queryClient.getQueriesData<AppBskyUnspeccedGetSuggestedUsersForDiscover.OutputSchema>(
+    queryClient.getQueriesData<app.bsky.unspecced.getSuggestedUsersForDiscover.$OutputBody>(
       {
         queryKey: [getSuggestedUsersForDiscoverQueryKeyRoot],
       },
diff --git a/src/state/queries/trending/useGetSuggestedUsersForExploreQuery.ts b/src/state/queries/trending/useGetSuggestedUsersForExploreQuery.ts
index a2e56573e5..1f729bb269 100644
--- a/src/state/queries/trending/useGetSuggestedUsersForExploreQuery.ts
+++ b/src/state/queries/trending/useGetSuggestedUsersForExploreQuery.ts
@@ -1,7 +1,3 @@
-import {
-  type AppBskyActorDefs,
-  type AppBskyUnspeccedGetSuggestedUsersForExplore,
-} from '@atproto/api'
 import {type QueryClient, useQuery} from '@tanstack/react-query'
 
 import {
@@ -12,7 +8,8 @@ import {logger} from '#/logger'
 import {getContentLanguages} from '#/state/preferences/languages'
 import {STALE} from '#/state/queries'
 import {usePreferencesQuery} from '#/state/queries/preferences'
-import {useAgent} from '#/state/session'
+import {useAppviewClient} from '#/state/session'
+import {app} from '#/lexicons'
 
 export type QueryProps = {
   category?: string | null
@@ -26,7 +23,7 @@ export const createGetSuggestedUsersForExploreQueryKey = (
 ) => [getSuggestedUsersForExploreQueryKeyRoot, props.category, props.limit]
 
 export function useGetSuggestedUsersForExploreQuery(props: QueryProps = {}) {
-  const agent = useAgent()
+  const client = useAppviewClient()
   const {data: preferences} = usePreferencesQuery()
 
   return useQuery({
@@ -36,7 +33,8 @@ export function useGetSuggestedUsersForExploreQuery(props: QueryProps = {}) {
       const contentLangs = getContentLanguages().join(',')
       const userInterests = aggregateUserInterests(preferences)
 
-      const {data} = await agent.app.bsky.unspecced.getSuggestedUsersForExplore(
+      const data = await client.call(
+        app.bsky.unspecced.getSuggestedUsersForExplore,
         {
           category: props.category ?? undefined,
           limit: props.limit || 10,
@@ -60,9 +58,9 @@ export function useGetSuggestedUsersForExploreQuery(props: QueryProps = {}) {
 export function* findAllProfilesInQueryData(
   queryClient: QueryClient,
   did: string,
-): Generator<AppBskyActorDefs.ProfileView, void> {
+): Generator<app.bsky.actor.defs.ProfileView, void> {
   const responses =
-    queryClient.getQueriesData<AppBskyUnspeccedGetSuggestedUsersForExplore.OutputSchema>(
+    queryClient.getQueriesData<app.bsky.unspecced.getSuggestedUsersForExplore.$OutputBody>(
       {
         queryKey: [getSuggestedUsersForExploreQueryKeyRoot],
       },
diff --git a/src/state/queries/trending/useGetSuggestedUsersForSeeMoreQuery.ts b/src/state/queries/trending/useGetSuggestedUsersForSeeMoreQuery.ts
index 73fdf6b451..94c0b7735d 100644
--- a/src/state/queries/trending/useGetSuggestedUsersForSeeMoreQuery.ts
+++ b/src/state/queries/trending/useGetSuggestedUsersForSeeMoreQuery.ts
@@ -1,7 +1,3 @@
-import {
-  type AppBskyActorDefs,
-  type AppBskyUnspeccedGetSuggestedUsersForSeeMore,
-} from '@atproto/api'
 import {type QueryClient, useQuery} from '@tanstack/react-query'
 
 import {
@@ -12,7 +8,8 @@ import {logger} from '#/logger'
 import {getContentLanguages} from '#/state/preferences/languages'
 import {STALE} from '#/state/queries'
 import {usePreferencesQuery} from '#/state/queries/preferences'
-import {useAgent} from '#/state/session'
+import {useAppviewClient} from '#/state/session'
+import {app} from '#/lexicons'
 
 export type QueryProps = {
   category?: string | null
@@ -28,7 +25,7 @@ export const createGetSuggestedUsersForSeeMoreQueryKey = (props: {
 }) => [getSuggestedUsersForSeeMoreQueryKeyRoot, props.category, props.limit]
 
 export function useGetSuggestedUsersForSeeMoreQuery(props: QueryProps = {}) {
-  const agent = useAgent()
+  const client = useAppviewClient()
   const {data: preferences} = usePreferencesQuery()
 
   return useQuery({
@@ -42,7 +39,8 @@ export function useGetSuggestedUsersForSeeMoreQuery(props: QueryProps = {}) {
       const contentLangs = getContentLanguages().join(',')
       const userInterests = aggregateUserInterests(preferences)
 
-      const {data} = await agent.app.bsky.unspecced.getSuggestedUsersForSeeMore(
+      const data = await client.call(
+        app.bsky.unspecced.getSuggestedUsersForSeeMore,
         {
           category: props.category ?? undefined,
           limit: props.limit || 50,
@@ -66,9 +64,9 @@ export function useGetSuggestedUsersForSeeMoreQuery(props: QueryProps = {}) {
 export function* findAllProfilesInQueryData(
   queryClient: QueryClient,
   did: string,
-): Generator<AppBskyActorDefs.ProfileView, void> {
+): Generator<app.bsky.actor.defs.ProfileView, void> {
   const responses =
-    queryClient.getQueriesData<AppBskyUnspeccedGetSuggestedUsersForSeeMore.OutputSchema>(
+    queryClient.getQueriesData<app.bsky.unspecced.getSuggestedUsersForSeeMore.$OutputBody>(
       {
         queryKey: [getSuggestedUsersForSeeMoreQueryKeyRoot],
       },
diff --git a/src/state/queries/useOnboardingSuggestedStarterPacksQuery.ts b/src/state/queries/useOnboardingSuggestedStarterPacksQuery.ts
index 5e76ebf100..f0b5a053e3 100644
--- a/src/state/queries/useOnboardingSuggestedStarterPacksQuery.ts
+++ b/src/state/queries/useOnboardingSuggestedStarterPacksQuery.ts
@@ -7,7 +7,8 @@ import {
 import {getContentLanguages} from '#/state/preferences/languages'
 import {STALE} from '#/state/queries'
 import {usePreferencesQuery} from '#/state/queries/preferences'
-import {useAgent} from '#/state/session'
+import {useAppviewClient} from '#/state/session'
+import {app} from '#/lexicons'
 
 export const createOnboardingSuggestedStarterPacksQueryKey = (
   interests?: string[],
@@ -20,7 +21,7 @@ export function useOnboardingSuggestedStarterPacksQuery({
   enabled?: boolean
   overrideInterests?: string[]
 }) {
-  const agent = useAgent()
+  const client = useAppviewClient()
   const {data: preferences} = usePreferencesQuery()
   const contentLangs = getContentLanguages().join(',')
 
@@ -29,21 +30,20 @@ export function useOnboardingSuggestedStarterPacksQuery({
     staleTime: STALE.MINUTES.THREE,
     queryKey: createOnboardingSuggestedStarterPacksQueryKey(overrideInterests),
     queryFn: async () => {
-      const {data} =
-        await agent.app.bsky.unspecced.getOnboardingSuggestedStarterPacks(
-          {limit: 6},
-          {
-            headers: {
-              ...createBskyTopicsHeader(
-                overrideInterests
-                  ? overrideInterests.join(',')
-                  : aggregateUserInterests(preferences),
-              ),
-              'Accept-Language': contentLangs,
-            },
+      return await client.call(
+        app.bsky.unspecced.getOnboardingSuggestedStarterPacks,
+        {limit: 6},
+        {
+          headers: {
+            ...createBskyTopicsHeader(
+              overrideInterests
+                ? overrideInterests.join(',')
+                : aggregateUserInterests(preferences),
+            ),
+            'Accept-Language': contentLangs,
           },
-        )
-      return data
+        },
+      )
     },
   })
 }
diff --git a/src/state/queries/usePostThread/index.ts b/src/state/queries/usePostThread/index.ts
index ceb87fe47b..b4e217f4bd 100644
--- a/src/state/queries/usePostThread/index.ts
+++ b/src/state/queries/usePostThread/index.ts
@@ -1,4 +1,5 @@
 import {useCallback, useMemo, useState} from 'react'
+import {type AtUriString} from '@atproto/syntax'
 import {useQuery, useQueryClient} from '@tanstack/react-query'
 
 import {useModerationOpts} from '#/state/preferences/moderation-opts'
@@ -27,10 +28,11 @@ import {
 } from '#/state/queries/usePostThread/types'
 import {getThreadgateRecord} from '#/state/queries/usePostThread/utils'
 import * as views from '#/state/queries/usePostThread/views'
-import {useAgent, useSession} from '#/state/session'
+import {useAppviewClient, useSession} from '#/state/session'
 import {useMergeThreadgateHiddenReplies} from '#/state/threadgate-hidden-replies'
 import {useBreakpoints} from '#/alf'
 import {IS_WEB} from '#/env'
+import {app} from '#/lexicons'
 
 export * from '#/state/queries/usePostThread/context'
 export {useUpdatePostThreadThreadgateQueryCache} from '#/state/queries/usePostThread/queryCache'
@@ -38,7 +40,7 @@ export * from '#/state/queries/usePostThread/types'
 
 export function usePostThread({anchor}: {anchor?: string}) {
   const qc = useQueryClient()
-  const agent = useAgent()
+  const client = useAppviewClient()
   const {hasSession} = useSession()
   const {gtPhone} = useBreakpoints()
   const moderationOpts = useModerationOpts()
@@ -71,8 +73,8 @@ export function usePostThread({anchor}: {anchor?: string}) {
     enabled: isThreadPreferencesLoaded && !!anchor && !!moderationOpts,
     queryKey: postThreadQueryKey,
     async queryFn(ctx) {
-      const {data} = await agent.app.bsky.unspecced.getPostThreadV2({
-        anchor: anchor!,
+      const data = await client.call(app.bsky.unspecced.getPostThreadV2, {
+        anchor: anchor! as AtUriString,
         branchingFactor: view === 'linear' ? LINEAR_VIEW_BF : TREE_VIEW_BF,
         below,
         sort: sort,
@@ -93,18 +95,24 @@ export function usePostThread({anchor}: {anchor?: string}) {
         ctx.meta.hasOtherReplies = true
       }
 
+      /*
+       * The generated views type `threadgate.record` as an opaque lex map and
+       * brand at-uris, so the response is asserted to the exported result type
+       * here; the record swap-in below and every downstream consumer of the
+       * thread read that narrower contract.
+       */
       const result = {
         thread: data.thread || [],
         threadgate: data.threadgate,
         hasOtherReplies: !!ctx.meta.hasOtherReplies,
-      }
+      } as UsePostThreadQueryResult
 
       const record = getThreadgateRecord(result.threadgate)
       if (result.threadgate && record) {
         result.threadgate.record = record
       }
 
-      return result as UsePostThreadQueryResult
+      return result
     },
     placeholderData() {
       if (!anchor) return
@@ -161,10 +169,9 @@ export function usePostThread({anchor}: {anchor?: string}) {
     enabled: additionalQueryEnabled,
     queryKey: postThreadOtherQueryKey,
     async queryFn() {
-      const {data} = await agent.app.bsky.unspecced.getPostThreadOtherV2({
-        anchor: anchor!,
+      return await client.call(app.bsky.unspecced.getPostThreadOtherV2, {
+        anchor: anchor! as AtUriString,
       })
-      return data
     },
   })
   const serverOtherThreadItems: ThreadItem[] = useMemo(() => {
diff --git a/src/state/queries/useSuggestedStarterPacksQuery.ts b/src/state/queries/useSuggestedStarterPacksQuery.ts
index 6cb1dd0869..bcd394312e 100644
--- a/src/state/queries/useSuggestedStarterPacksQuery.ts
+++ b/src/state/queries/useSuggestedStarterPacksQuery.ts
@@ -7,7 +7,8 @@ import {
 import {getContentLanguages} from '#/state/preferences/languages'
 import {STALE} from '#/state/queries'
 import {usePreferencesQuery} from '#/state/queries/preferences'
-import {useAgent} from '#/state/session'
+import {useAppviewClient} from '#/state/session'
+import {app} from '#/lexicons'
 
 export const createSuggestedStarterPacksQueryKey = (interests?: string[]) => [
   'suggested-starter-packs',
@@ -21,7 +22,7 @@ export function useSuggestedStarterPacksQuery({
   enabled?: boolean
   overrideInterests?: string[]
 }) {
-  const agent = useAgent()
+  const client = useAppviewClient()
   const {data: preferences} = usePreferencesQuery()
   const contentLangs = getContentLanguages().join(',')
 
@@ -30,8 +31,9 @@ export function useSuggestedStarterPacksQuery({
     staleTime: STALE.MINUTES.THREE,
     queryKey: createSuggestedStarterPacksQueryKey(overrideInterests),
     queryFn: async () => {
-      const {data} = await agent.app.bsky.unspecced.getSuggestedStarterPacks(
-        undefined,
+      return await client.call(
+        app.bsky.unspecced.getSuggestedStarterPacks,
+        {},
         {
           headers: {
             ...createBskyTopicsHeader(
@@ -43,7 +45,6 @@ export function useSuggestedStarterPacksQuery({
           },
         },
       )
-      return data
     },
   })
 }
diff --git a/src/view/com/composer/Composer.tsx b/src/view/com/composer/Composer.tsx
index f9129c56e9..6c7c2280c2 100644
--- a/src/view/com/composer/Composer.tsx
+++ b/src/view/com/composer/Composer.tsx
@@ -47,12 +47,12 @@ import {type ImagePickerAsset} from 'expo-image-picker'
 import {
   AppBskyDraftCreateDraft,
   AppBskyUnspeccedDefs,
-  type AppBskyUnspeccedGetPostThreadV2,
-  type AtpAgent,
   AtUri,
   ChatBskyGroupDefs,
   type RichText,
 } from '@atproto/api'
+import {type Client} from '@atproto/lex'
+import {type AtUriString} from '@atproto/syntax'
 import {plural} from '@lingui/core/macro'
 import {Trans, useLingui} from '@lingui/react/macro'
 import {useNavigation} from '@react-navigation/native'
@@ -96,7 +96,7 @@ import {
 import {usePreferencesQuery} from '#/state/queries/preferences'
 import {useProfileQuery} from '#/state/queries/profile'
 import {resolveLinkQueryOptions} from '#/state/queries/resolve-link'
-import {useAgent, useSession} from '#/state/session'
+import {useAgent, useAppviewClient, useSession} from '#/state/session'
 import {useComposerControls} from '#/state/shell/composer'
 import {type ComposerOpts, type OnPostSuccessData} from '#/state/shell/composer'
 import {CharProgress} from '#/view/com/composer/char-progress/CharProgress'
@@ -144,6 +144,7 @@ import {
   IS_WEB_SAFARI,
 } from '#/env'
 import {type Gif} from '#/features/gifPicker/types'
+import {app} from '#/lexicons'
 import {BottomSheetPortalProvider} from '../../../../modules/bottom-sheet'
 import {
   draftToComposerPosts,
@@ -275,6 +276,7 @@ export const ComposePost = ({
     ? VIDEO_10_MINUTE_MAX_DURATION_MS
     : VIDEO_MAX_DURATION_MS
   const agent = useAgent()
+  const client = useAppviewClient()
   const queryClient = useQueryClient()
   const currentDid = currentAccount!.did
   const {closeComposer} = useComposerControls()
@@ -1105,23 +1107,26 @@ export const ComposePost = ({
             5,
             _e => true,
             async () => {
-              const res = await agent.app.bsky.unspecced.getPostThreadV2({
-                anchor: postUri!,
-                above: false,
-                below: filteredThread.posts.length - 1,
-                branchingFactor: 1,
-              })
-              if (res.data.thread.length !== filteredThread.posts.length) {
+              const res = await client.call(
+                app.bsky.unspecced.getPostThreadV2,
+                {
+                  anchor: postUri! as AtUriString,
+                  above: false,
+                  below: filteredThread.posts.length - 1,
+                  branchingFactor: 1,
+                },
+              )
+              if (res.thread.length !== filteredThread.posts.length) {
                 throw new Error(`composer: app view is not ready`)
               }
               if (
-                !res.data.thread.every(p =>
+                !res.thread.every(p =>
                   AppBskyUnspeccedDefs.isThreadItemPost(p.value),
                 )
               ) {
                 throw new Error(`composer: app view returned non-post items`)
               }
-              return res.data.thread
+              return res.thread
             },
             1e3,
           )
@@ -1224,8 +1229,8 @@ export const ComposePost = ({
     setLangPrefs.savePostLanguageToHistory()
     if (initQuote) {
       // We want to wait for the quote count to update before we call `onPost`, which will refetch data
-      void whenAppViewReady(agent, initQuote.uri, res => {
-        const anchor = res.data.thread.at(0)
+      void whenAppViewReady(client, initQuote.uri, res => {
+        const anchor = res.thread.at(0)
         if (
           AppBskyUnspeccedDefs.isThreadItemPost(anchor?.value) &&
           anchor.value.post.quoteCount !== initQuote.quoteCount
@@ -1272,6 +1277,7 @@ export const ComposePost = ({
     l,
     ax,
     agent,
+    client,
     canPost,
     isPublishing,
     currentLanguages,
@@ -2486,17 +2492,17 @@ function useKeyboardVerticalOffset() {
 }
 
 async function whenAppViewReady(
-  agent: AtpAgent,
+  client: Client,
   uri: string,
-  fn: (res: AppBskyUnspeccedGetPostThreadV2.Response) => boolean,
+  fn: (res: app.bsky.unspecced.getPostThreadV2.$OutputBody) => boolean,
 ) {
   await until(
     5, // 5 tries
     1e3, // 1s delay between tries
     fn,
     () =>
-      agent.app.bsky.unspecced.getPostThreadV2({
-        anchor: uri,
+      client.call(app.bsky.unspecced.getPostThreadV2, {
+        anchor: uri as AtUriString,
         above: false,
         below: 0,
         branchingFactor: 0,

From 0912119c7790f761f0f4e59574dcd4a8cfdd4c65 Mon Sep 17 00:00:00 2001
From: Samuel Newman <mozzius@protonmail.com>
Date: Thu, 13 Aug 2026 22:26:15 +0300
Subject: [PATCH 09/32] [SDK] Migrate profile and graph read queries to the
 appview client (#11356)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
---
 src/state/queries/actor-starter-packs.ts      | 20 +++++-----
 src/state/queries/known-followers.ts          | 23 ++++++-----
 src/state/queries/list-members.ts             | 23 ++++++-----
 src/state/queries/lists-with-membership.ts    | 35 +++++++++--------
 src/state/queries/my-blocked-accounts.ts      | 16 ++++----
 src/state/queries/my-lists.ts                 | 38 ++++++++++---------
 src/state/queries/my-muted-accounts.ts        | 16 ++++----
 src/state/queries/pinned-post.ts              | 10 +++--
 src/state/queries/profile-feedgens.ts         | 23 ++++++-----
 src/state/queries/profile-followers.ts        | 32 +++++++++-------
 src/state/queries/profile-follows.ts          | 29 ++++++++------
 src/state/queries/profile-lists.ts            | 18 ++++-----
 src/state/queries/suggested-follows.ts        | 29 +++++++-------
 .../useUpdateProfileVerificationCache.ts      | 16 +++++---
 14 files changed, 180 insertions(+), 148 deletions(-)

diff --git a/src/state/queries/actor-starter-packs.ts b/src/state/queries/actor-starter-packs.ts
index 97cc3b5e05..cef91c6bd6 100644
--- a/src/state/queries/actor-starter-packs.ts
+++ b/src/state/queries/actor-starter-packs.ts
@@ -1,6 +1,8 @@
+import {type DidString} from '@atproto/syntax'
 import {type QueryClient, useInfiniteQuery} from '@tanstack/react-query'
 
-import {useAgent} from '#/state/session'
+import {useAppviewClient} from '#/state/session'
+import {app} from '#/lexicons'
 
 export const RQKEY_ROOT = 'actor-starter-packs'
 export const RQKEY_WITH_MEMBERSHIP_ROOT = 'actor-starter-packs-with-membership'
@@ -17,17 +19,17 @@ export function useActorStarterPacksQuery({
   did?: string
   enabled?: boolean
 }) {
-  const agent = useAgent()
+  const client = useAppviewClient()
 
   return useInfiniteQuery({
     queryKey: RQKEY(did),
     queryFn: async ({pageParam}: {pageParam?: string}) => {
-      const res = await agent.app.bsky.graph.getActorStarterPacks({
-        actor: did!,
+      return await client.call(app.bsky.graph.getActorStarterPacks, {
+        // the enabled flag prevents this from running until did is set
+        actor: did! as DidString,
         limit: 10,
         cursor: pageParam,
       })
-      return res.data
     },
     enabled: Boolean(did) && enabled,
     initialPageParam: undefined,
@@ -42,17 +44,17 @@ export function useActorStarterPacksWithMembershipsQuery({
   did?: string
   enabled?: boolean
 }) {
-  const agent = useAgent()
+  const client = useAppviewClient()
 
   return useInfiniteQuery({
     queryKey: RQKEY_WITH_MEMBERSHIP(did),
     queryFn: async ({pageParam}: {pageParam?: string}) => {
-      const res = await agent.app.bsky.graph.getStarterPacksWithMembership({
-        actor: did!,
+      return await client.call(app.bsky.graph.getStarterPacksWithMembership, {
+        // the enabled flag prevents this from running until did is set
+        actor: did! as DidString,
         limit: 10,
         cursor: pageParam,
       })
-      return res.data
     },
     enabled: Boolean(did) && enabled,
     initialPageParam: undefined,
diff --git a/src/state/queries/known-followers.ts b/src/state/queries/known-followers.ts
index 05bbd5e67c..3106456f9d 100644
--- a/src/state/queries/known-followers.ts
+++ b/src/state/queries/known-followers.ts
@@ -1,7 +1,5 @@
-import {
-  type AppBskyActorDefs,
-  type AppBskyGraphGetKnownFollowers,
-} from '@atproto/api'
+import {type AppBskyActorDefs} from '@atproto/api'
+import {type DidString} from '@atproto/syntax'
 import {
   type InfiniteData,
   type QueryClient,
@@ -9,7 +7,8 @@ import {
   useInfiniteQuery,
 } from '@tanstack/react-query'
 
-import {useAgent} from '#/state/session'
+import {useAppviewClient} from '#/state/session'
+import {app} from '#/lexicons'
 
 const PAGE_SIZE = 50
 type RQPageParam = string | undefined
@@ -18,22 +17,22 @@ const RQKEY_ROOT = 'profile-known-followers'
 export const RQKEY = (did: string) => [RQKEY_ROOT, did]
 
 export function useProfileKnownFollowersQuery(did: string | undefined) {
-  const agent = useAgent()
+  const client = useAppviewClient()
   return useInfiniteQuery<
-    AppBskyGraphGetKnownFollowers.OutputSchema,
+    app.bsky.graph.getKnownFollowers.$OutputBody,
     Error,
-    InfiniteData<AppBskyGraphGetKnownFollowers.OutputSchema>,
+    InfiniteData<app.bsky.graph.getKnownFollowers.$OutputBody>,
     QueryKey,
     RQPageParam
   >({
     queryKey: RQKEY(did || ''),
     async queryFn({pageParam}: {pageParam: RQPageParam}) {
-      const res = await agent.app.bsky.graph.getKnownFollowers({
-        actor: did!,
+      return await client.call(app.bsky.graph.getKnownFollowers, {
+        // the enabled flag prevents this from running until did is set
+        actor: did! as DidString,
         limit: PAGE_SIZE,
         cursor: pageParam,
       })
-      return res.data
     },
     initialPageParam: undefined,
     getNextPageParam: lastPage => lastPage.cursor,
@@ -46,7 +45,7 @@ export function* findAllProfilesInQueryData(
   did: string,
 ): Generator<AppBskyActorDefs.ProfileView, void> {
   const queryDatas = queryClient.getQueriesData<
-    InfiniteData<AppBskyGraphGetKnownFollowers.OutputSchema>
+    InfiniteData<app.bsky.graph.getKnownFollowers.$OutputBody>
   >({
     queryKey: [RQKEY_ROOT],
   })
diff --git a/src/state/queries/list-members.ts b/src/state/queries/list-members.ts
index c43c7bb983..bde6666dc6 100644
--- a/src/state/queries/list-members.ts
+++ b/src/state/queries/list-members.ts
@@ -1,9 +1,9 @@
 import {
   type AppBskyActorDefs,
   type AppBskyGraphDefs,
-  type AppBskyGraphGetList,
   type AtpAgent,
 } from '@atproto/api'
+import {type AtUriString} from '@atproto/syntax'
 import {
   type InfiniteData,
   type QueryClient,
@@ -13,7 +13,8 @@ import {
 } from '@tanstack/react-query'
 
 import {STALE} from '#/state/queries'
-import {useAgent} from '#/state/session'
+import {useAgent, useAppviewClient} from '#/state/session'
+import {app} from '#/lexicons'
 
 const PAGE_SIZE = 30
 type RQPageParam = string | undefined
@@ -24,23 +25,23 @@ export const RQKEY = (uri: string) => [RQKEY_ROOT, uri]
 export const RQKEY_ALL = (uri: string) => [RQKEY_ROOT_ALL, uri]
 
 export function useListMembersQuery(uri?: string, limit: number = PAGE_SIZE) {
-  const agent = useAgent()
+  const client = useAppviewClient()
   return useInfiniteQuery<
-    AppBskyGraphGetList.OutputSchema,
+    app.bsky.graph.getList.$OutputBody,
     Error,
-    InfiniteData<AppBskyGraphGetList.OutputSchema>,
+    InfiniteData<app.bsky.graph.getList.$OutputBody>,
     QueryKey,
     RQPageParam
   >({
     staleTime: STALE.MINUTES.ONE,
     queryKey: RQKEY(uri ?? ''),
     async queryFn({pageParam}: {pageParam: RQPageParam}) {
-      const res = await agent.app.bsky.graph.getList({
-        list: uri!, // the enabled flag will prevent this from running until uri is set
+      return await client.call(app.bsky.graph.getList, {
+        // the enabled flag will prevent this from running until uri is set
+        list: uri! as AtUriString,
         limit,
         cursor: pageParam,
       })
-      return res.data
     },
     initialPageParam: undefined,
     getNextPageParam: lastPage => lastPage.cursor,
@@ -60,6 +61,10 @@ export function useAllListMembersQuery(uri?: string) {
   })
 }
 
+/*
+ * Still on the legacy agent: four call sites outside this cluster pass their
+ * own `AtpAgent`, so the parameter type is migrated with those consumers.
+ */
 export async function getAllListMembers(agent: AtpAgent, uri: string) {
   let hasMore = true
   let cursor: string | undefined
@@ -95,7 +100,7 @@ export function* findAllProfilesInQueryData(
   did: string,
 ): Generator<AppBskyActorDefs.ProfileView, void> {
   const queryDatas = queryClient.getQueriesData<
-    InfiniteData<AppBskyGraphGetList.OutputSchema>
+    InfiniteData<app.bsky.graph.getList.$OutputBody>
   >({
     queryKey: [RQKEY_ROOT],
   })
diff --git a/src/state/queries/lists-with-membership.ts b/src/state/queries/lists-with-membership.ts
index 3147b8845f..1bd09704b9 100644
--- a/src/state/queries/lists-with-membership.ts
+++ b/src/state/queries/lists-with-membership.ts
@@ -1,7 +1,5 @@
-import {
-  type AppBskyActorDefs,
-  type AppBskyGraphGetListsWithMembership,
-} from '@atproto/api'
+import {type AppBskyActorDefs} from '@atproto/api'
+import {type AtIdentifierString} from '@atproto/syntax'
 import {
   type InfiniteData,
   type QueryClient,
@@ -10,10 +8,11 @@ import {
 } from '@tanstack/react-query'
 
 import {createQueryKey} from '#/state/queries/util'
-import {useAgent} from '#/state/session'
+import {useAppviewClient} from '#/state/session'
+import {app} from '#/lexicons'
 
 export type ListWithMembership =
-  AppBskyGraphGetListsWithMembership.ListWithMembership
+  app.bsky.graph.getListsWithMembership.ListWithMembership
 
 const listsWithMembershipQueryKeyRoot = 'lists-with-membership'
 export const createListsWithMembershipQueryKey = (args: {actor: string}) =>
@@ -26,23 +25,23 @@ export function useListsWithMembershipQuery({
   actor: string | undefined
   enabled?: boolean
 }) {
-  const agent = useAgent()
+  const client = useAppviewClient()
 
   return useInfiniteQuery<
-    AppBskyGraphGetListsWithMembership.OutputSchema,
+    app.bsky.graph.getListsWithMembership.$OutputBody,
     Error,
-    InfiniteData<AppBskyGraphGetListsWithMembership.OutputSchema>,
+    InfiniteData<app.bsky.graph.getListsWithMembership.$OutputBody>,
     QueryKey,
     string | undefined
   >({
     queryKey: createListsWithMembershipQueryKey({actor: actor ?? ''}),
     queryFn: async ({pageParam}: {pageParam?: string}) => {
-      const res = await agent.app.bsky.graph.getListsWithMembership({
-        actor: actor!, // the enabled flag prevents this from running until actor is set
+      return await client.call(app.bsky.graph.getListsWithMembership, {
+        // the enabled flag prevents this from running until actor is set
+        actor: actor! as AtIdentifierString,
         limit: 50,
         cursor: pageParam,
       })
-      return res.data
     },
     enabled: Boolean(actor) && enabled,
     initialPageParam: undefined,
@@ -64,7 +63,7 @@ export function updateListMembershipOptimistically({
   subject: AppBskyActorDefs.ProfileView
 }) {
   queryClient.setQueryData<
-    InfiniteData<AppBskyGraphGetListsWithMembership.OutputSchema>
+    InfiniteData<app.bsky.graph.getListsWithMembership.$OutputBody>
   >(createListsWithMembershipQueryKey({actor}), old => {
     if (!old) return old
 
@@ -74,12 +73,18 @@ export function updateListMembershipOptimistically({
         ...page,
         listsWithMembership: page.listsWithMembership.map(lwm => {
           if (lwm.list.uri === listUri) {
+            /*
+             * Callers hand over a plain at-uri and an old-world ProfileView,
+             * whose `uri`/`did` are unbranded strings. They are runtime
+             * identical to the generated branded forms, so the synthesised
+             * listItem is asserted rather than re-validated.
+             */
             return {
               ...lwm,
               listItem: {
                 uri: membershipUri,
                 subject,
-              },
+              } as app.bsky.graph.defs.ListItemView,
             }
           }
           return lwm
@@ -99,7 +104,7 @@ export function removeListMembershipOptimistically({
   listUri: string
 }) {
   queryClient.setQueryData<
-    InfiniteData<AppBskyGraphGetListsWithMembership.OutputSchema>
+    InfiniteData<app.bsky.graph.getListsWithMembership.$OutputBody>
   >(createListsWithMembershipQueryKey({actor}), old => {
     if (!old) return old
 
diff --git a/src/state/queries/my-blocked-accounts.ts b/src/state/queries/my-blocked-accounts.ts
index a2e29136f5..2cbe1dea29 100644
--- a/src/state/queries/my-blocked-accounts.ts
+++ b/src/state/queries/my-blocked-accounts.ts
@@ -1,4 +1,4 @@
-import {type AppBskyActorDefs, type AppBskyGraphGetBlocks} from '@atproto/api'
+import {type AppBskyActorDefs} from '@atproto/api'
 import {
   type InfiniteData,
   type QueryClient,
@@ -6,28 +6,28 @@ import {
   useInfiniteQuery,
 } from '@tanstack/react-query'
 
-import {useAgent} from '#/state/session'
+import {useAppviewClient} from '#/state/session'
+import {app} from '#/lexicons'
 
 const RQKEY_ROOT = 'my-blocked-accounts'
 export const RQKEY = () => [RQKEY_ROOT]
 type RQPageParam = string | undefined
 
 export function useMyBlockedAccountsQuery() {
-  const agent = useAgent()
+  const client = useAppviewClient()
   return useInfiniteQuery<
-    AppBskyGraphGetBlocks.OutputSchema,
+    app.bsky.graph.getBlocks.$OutputBody,
     Error,
-    InfiniteData<AppBskyGraphGetBlocks.OutputSchema>,
+    InfiniteData<app.bsky.graph.getBlocks.$OutputBody>,
     QueryKey,
     RQPageParam
   >({
     queryKey: RQKEY(),
     async queryFn({pageParam}: {pageParam: RQPageParam}) {
-      const res = await agent.app.bsky.graph.getBlocks({
+      return await client.call(app.bsky.graph.getBlocks, {
         limit: 30,
         cursor: pageParam,
       })
-      return res.data
     },
     initialPageParam: undefined,
     getNextPageParam: lastPage => lastPage.cursor,
@@ -39,7 +39,7 @@ export function* findAllProfilesInQueryData(
   did: string,
 ): Generator<AppBskyActorDefs.ProfileView, void> {
   const queryDatas = queryClient.getQueriesData<
-    InfiniteData<AppBskyGraphGetBlocks.OutputSchema>
+    InfiniteData<app.bsky.graph.getBlocks.$OutputBody>
   >({
     queryKey: [RQKEY_ROOT],
   })
diff --git a/src/state/queries/my-lists.ts b/src/state/queries/my-lists.ts
index aeb9cf4568..d4538104dd 100644
--- a/src/state/queries/my-lists.ts
+++ b/src/state/queries/my-lists.ts
@@ -1,9 +1,11 @@
 import {type AppBskyGraphDefs} from '@atproto/api'
+import {type DidString} from '@atproto/syntax'
 import {type QueryClient, useQuery} from '@tanstack/react-query'
 
 import {accumulate} from '#/lib/async/accumulate'
 import {STALE} from '#/state/queries'
-import {useAgent, useSession} from '#/state/session'
+import {useAppviewClient, useSession} from '#/state/session'
+import {app} from '#/lexicons'
 
 export type MyListsFilter =
   | 'all'
@@ -16,7 +18,7 @@ export const RQKEY = (filter: MyListsFilter) => [RQKEY_ROOT, filter]
 
 export function useMyListsQuery(filter: MyListsFilter) {
   const {currentAccount} = useSession()
-  const agent = useAgent()
+  const client = useAppviewClient()
   return useQuery<AppBskyGraphDefs.ListView[]>({
     staleTime: STALE.MINUTES.ONE,
     queryKey: RQKEY(filter),
@@ -24,42 +26,42 @@ export function useMyListsQuery(filter: MyListsFilter) {
       let lists: AppBskyGraphDefs.ListView[] = []
       const promises = [
         accumulate(cursor =>
-          agent.app.bsky.graph
-            .getLists({
-              actor: currentAccount!.did,
+          client
+            .call(app.bsky.graph.getLists, {
+              actor: currentAccount!.did as DidString,
               cursor,
               limit: 50,
             })
-            .then(res => ({
-              cursor: res.data.cursor,
-              items: res.data.lists,
+            .then(data => ({
+              cursor: data.cursor,
+              items: data.lists,
             })),
         ),
       ]
       if (filter === 'all-including-subscribed' || filter === 'mod') {
         promises.push(
           accumulate(cursor =>
-            agent.app.bsky.graph
-              .getListMutes({
+            client
+              .call(app.bsky.graph.getListMutes, {
                 cursor,
                 limit: 50,
               })
-              .then(res => ({
-                cursor: res.data.cursor,
-                items: res.data.lists,
+              .then(data => ({
+                cursor: data.cursor,
+                items: data.lists,
               })),
           ),
         )
         promises.push(
           accumulate(cursor =>
-            agent.app.bsky.graph
-              .getListBlocks({
+            client
+              .call(app.bsky.graph.getListBlocks, {
                 cursor,
                 limit: 50,
               })
-              .then(res => ({
-                cursor: res.data.cursor,
-                items: res.data.lists,
+              .then(data => ({
+                cursor: data.cursor,
+                items: data.lists,
               })),
           ),
         )
diff --git a/src/state/queries/my-muted-accounts.ts b/src/state/queries/my-muted-accounts.ts
index bf36b90296..cd1c6bc6ba 100644
--- a/src/state/queries/my-muted-accounts.ts
+++ b/src/state/queries/my-muted-accounts.ts
@@ -1,4 +1,4 @@
-import {type AppBskyActorDefs, type AppBskyGraphGetMutes} from '@atproto/api'
+import {type AppBskyActorDefs} from '@atproto/api'
 import {
   type InfiniteData,
   type QueryClient,
@@ -6,28 +6,28 @@ import {
   useInfiniteQuery,
 } from '@tanstack/react-query'
 
-import {useAgent} from '#/state/session'
+import {useAppviewClient} from '#/state/session'
+import {app} from '#/lexicons'
 
 const RQKEY_ROOT = 'my-muted-accounts'
 export const RQKEY = () => [RQKEY_ROOT]
 type RQPageParam = string | undefined
 
 export function useMyMutedAccountsQuery() {
-  const agent = useAgent()
+  const client = useAppviewClient()
   return useInfiniteQuery<
-    AppBskyGraphGetMutes.OutputSchema,
+    app.bsky.graph.getMutes.$OutputBody,
     Error,
-    InfiniteData<AppBskyGraphGetMutes.OutputSchema>,
+    InfiniteData<app.bsky.graph.getMutes.$OutputBody>,
     QueryKey,
     RQPageParam
   >({
     queryKey: RQKEY(),
     async queryFn({pageParam}: {pageParam: RQPageParam}) {
-      const res = await agent.app.bsky.graph.getMutes({
+      return await client.call(app.bsky.graph.getMutes, {
         limit: 30,
         cursor: pageParam,
       })
-      return res.data
     },
     initialPageParam: undefined,
     getNextPageParam: lastPage => lastPage.cursor,
@@ -39,7 +39,7 @@ export function* findAllProfilesInQueryData(
   did: string,
 ): Generator<AppBskyActorDefs.ProfileView, void> {
   const queryDatas = queryClient.getQueriesData<
-    InfiniteData<AppBskyGraphGetMutes.OutputSchema>
+    InfiniteData<app.bsky.graph.getMutes.$OutputBody>
   >({
     queryKey: [RQKEY_ROOT],
   })
diff --git a/src/state/queries/pinned-post.ts b/src/state/queries/pinned-post.ts
index 09a0b4c9b9..d132127e68 100644
--- a/src/state/queries/pinned-post.ts
+++ b/src/state/queries/pinned-post.ts
@@ -1,3 +1,4 @@
+import {type DidString} from '@atproto/syntax'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {useMutation, useQueryClient} from '@tanstack/react-query'
@@ -5,14 +6,15 @@ import {useMutation, useQueryClient} from '@tanstack/react-query'
 import {logger} from '#/logger'
 import {RQKEY as FEED_RQKEY} from '#/state/queries/post-feed'
 import * as Toast from '#/components/Toast'
+import {app} from '#/lexicons'
 import {updatePostShadow} from '../cache/post-shadow'
-import {useAgent, useSession} from '../session'
+import {useAppviewClient, useSession} from '../session'
 import {useProfileUpdateMutation} from './profile'
 
 export function usePinnedPostMutation() {
   const {_} = useLingui()
   const {currentAccount} = useSession()
-  const agent = useAgent()
+  const client = useAppviewClient()
   const queryClient = useQueryClient()
   const {mutateAsync: profileUpdateMutate} = useProfileUpdateMutation()
 
@@ -33,8 +35,8 @@ export function usePinnedPostMutation() {
 
         // get the currently pinned post so we can optimistically remove the pin from it
         if (!currentAccount) throw new Error('Not signed in')
-        const {data: profile} = await agent.getProfile({
-          actor: currentAccount.did,
+        const profile = await client.call(app.bsky.actor.getProfile, {
+          actor: currentAccount.did as DidString,
         })
         prevPinnedPost = profile.pinnedPost?.uri
         if (prevPinnedPost && prevPinnedPost !== postUri) {
diff --git a/src/state/queries/profile-feedgens.ts b/src/state/queries/profile-feedgens.ts
index 56e7c70182..7bdcd62b64 100644
--- a/src/state/queries/profile-feedgens.ts
+++ b/src/state/queries/profile-feedgens.ts
@@ -1,14 +1,13 @@
-import {
-  type AppBskyFeedGetActorFeeds,
-  moderateFeedGenerator,
-} from '@atproto/api'
+import {moderateFeedGenerator} from '@atproto/api'
+import {type DidString} from '@atproto/syntax'
 import {
   type InfiniteData,
   type QueryKey,
   useInfiniteQuery,
 } from '@tanstack/react-query'
 
-import {useAgent} from '#/state/session'
+import {useAppviewClient} from '#/state/session'
+import {app} from '#/lexicons'
 import {useModerationOpts} from '../preferences/moderation-opts'
 
 const PAGE_SIZE = 50
@@ -24,25 +23,25 @@ export function useProfileFeedgensQuery(
 ) {
   const moderationOpts = useModerationOpts()
   const enabled = opts?.enabled !== false && Boolean(moderationOpts)
-  const agent = useAgent()
+  const client = useAppviewClient()
   return useInfiniteQuery<
-    AppBskyFeedGetActorFeeds.OutputSchema,
+    app.bsky.feed.getActorFeeds.$OutputBody,
     Error,
-    InfiniteData<AppBskyFeedGetActorFeeds.OutputSchema>,
+    InfiniteData<app.bsky.feed.getActorFeeds.$OutputBody>,
     QueryKey,
     RQPageParam
   >({
     queryKey: RQKEY(did),
     async queryFn({pageParam}: {pageParam: RQPageParam}) {
-      const res = await agent.app.bsky.feed.getActorFeeds({
-        actor: did,
+      const data = await client.call(app.bsky.feed.getActorFeeds, {
+        actor: did as DidString,
         limit: PAGE_SIZE,
         cursor: pageParam,
       })
-      res.data.feeds.sort((a, b) => {
+      data.feeds.sort((a, b) => {
         return (b.likeCount || 0) - (a.likeCount || 0)
       })
-      return res.data
+      return data
     },
     initialPageParam: undefined,
     getNextPageParam: lastPage => lastPage.cursor,
diff --git a/src/state/queries/profile-followers.ts b/src/state/queries/profile-followers.ts
index 62968af2d8..5022ae9576 100644
--- a/src/state/queries/profile-followers.ts
+++ b/src/state/queries/profile-followers.ts
@@ -1,7 +1,5 @@
-import {
-  type AppBskyActorDefs,
-  type AppBskyGraphGetFollowers,
-} from '@atproto/api'
+import {type AppBskyActorDefs} from '@atproto/api'
+import {type DidString} from '@atproto/syntax'
 import {
   type InfiniteData,
   type QueryClient,
@@ -9,8 +7,9 @@ import {
   useInfiniteQuery,
 } from '@tanstack/react-query'
 
-import {useAgent} from '#/state/session'
+import {useAppviewClient} from '#/state/session'
 import {useAnalytics} from '#/analytics'
+import {app} from '#/lexicons'
 
 const DEFAULT_SORT = 'latest'
 const PAGE_SIZE = 30
@@ -33,26 +32,31 @@ export function useProfileFollowersQuery(
 ) {
   const ax = useAnalytics()
   const isSortEnabled = ax.features.enabled(ax.features.FollowSortEnable)
-  const agent = useAgent()
+  const client = useAppviewClient()
 
   const sortParam = isSortEnabled ? sort || DEFAULT_SORT : undefined
 
   return useInfiniteQuery<
-    AppBskyGraphGetFollowers.OutputSchema,
+    app.bsky.graph.getFollowers.$OutputBody,
     Error,
-    InfiniteData<AppBskyGraphGetFollowers.OutputSchema>,
+    InfiniteData<app.bsky.graph.getFollowers.$OutputBody>,
     QueryKey,
     RQPageParam
   >({
     queryKey: RQKEY(did || '', sortParam),
     async queryFn({pageParam}: {pageParam: RQPageParam}) {
-      const res = await agent.app.bsky.graph.getFollowers({
-        actor: did || '',
+      /*
+       * The vendored lexicon does not declare `sort`, so it is spread in only
+       * when set and the whole params object is asserted. lex forwards
+       * undeclared params verbatim but rejects an undeclared key whose value
+       * is `undefined`, hence the conditional spread.
+       */
+      return await client.call(app.bsky.graph.getFollowers, {
+        actor: (did || '') as DidString,
         limit: PAGE_SIZE,
         cursor: pageParam,
-        sort: sortParam,
-      })
-      return res.data
+        ...(sortParam ? {sort: sortParam} : {}),
+      } as app.bsky.graph.getFollowers.$Params)
     },
     initialPageParam: undefined,
     getNextPageParam: lastPage => lastPage.cursor,
@@ -65,7 +69,7 @@ export function* findAllProfilesInQueryData(
   did: string,
 ): Generator<AppBskyActorDefs.ProfileView, void> {
   const queryDatas = queryClient.getQueriesData<
-    InfiniteData<AppBskyGraphGetFollowers.OutputSchema>
+    InfiniteData<app.bsky.graph.getFollowers.$OutputBody>
   >({
     queryKey: [RQKEY_ROOT],
   })
diff --git a/src/state/queries/profile-follows.ts b/src/state/queries/profile-follows.ts
index 1c4d5dc69c..1cd857af16 100644
--- a/src/state/queries/profile-follows.ts
+++ b/src/state/queries/profile-follows.ts
@@ -1,4 +1,5 @@
-import {type AppBskyActorDefs, type AppBskyGraphGetFollows} from '@atproto/api'
+import {type AppBskyActorDefs} from '@atproto/api'
+import {type DidString} from '@atproto/syntax'
 import {
   type InfiniteData,
   type QueryClient,
@@ -7,8 +8,9 @@ import {
 } from '@tanstack/react-query'
 
 import {STALE} from '#/state/queries'
-import {useAgent} from '#/state/session'
+import {useAppviewClient} from '#/state/session'
 import {useAnalytics} from '#/analytics'
+import {app} from '#/lexicons'
 
 const DEFAULT_SORT = 'latest'
 const PAGE_SIZE = 30
@@ -34,27 +36,32 @@ export function useProfileFollowsQuery(
 ) {
   const ax = useAnalytics()
   const isSortEnabled = ax.features.enabled(ax.features.FollowSortEnable)
-  const agent = useAgent()
+  const client = useAppviewClient()
 
   const sortParam = isSortEnabled ? sort || DEFAULT_SORT : undefined
 
   return useInfiniteQuery<
-    AppBskyGraphGetFollows.OutputSchema,
+    app.bsky.graph.getFollows.$OutputBody,
     Error,
-    InfiniteData<AppBskyGraphGetFollows.OutputSchema>,
+    InfiniteData<app.bsky.graph.getFollows.$OutputBody>,
     QueryKey,
     RQPageParam
   >({
     staleTime: STALE.MINUTES.ONE,
     queryKey: RQKEY(did || '', sortParam),
     async queryFn({pageParam}: {pageParam: RQPageParam}) {
-      const res = await agent.app.bsky.graph.getFollows({
-        actor: did || '',
+      /*
+       * The vendored lexicon does not declare `sort`, so it is spread in only
+       * when set and the whole params object is asserted. lex forwards
+       * undeclared params verbatim but rejects an undeclared key whose value
+       * is `undefined`, hence the conditional spread.
+       */
+      return await client.call(app.bsky.graph.getFollows, {
+        actor: (did || '') as DidString,
         limit: limit || PAGE_SIZE,
         cursor: pageParam,
-        sort: sortParam,
-      })
-      return res.data
+        ...(sortParam ? {sort: sortParam} : {}),
+      } as app.bsky.graph.getFollows.$Params)
     },
     initialPageParam: undefined,
     getNextPageParam: lastPage => lastPage.cursor,
@@ -67,7 +74,7 @@ export function* findAllProfilesInQueryData(
   did: string,
 ): Generator<AppBskyActorDefs.ProfileView, void> {
   const queryDatas = queryClient.getQueriesData<
-    InfiniteData<AppBskyGraphGetFollows.OutputSchema>
+    InfiniteData<app.bsky.graph.getFollows.$OutputBody>
   >({
     queryKey: [RQKEY_ROOT],
   })
diff --git a/src/state/queries/profile-lists.ts b/src/state/queries/profile-lists.ts
index 965da72e51..0237876513 100644
--- a/src/state/queries/profile-lists.ts
+++ b/src/state/queries/profile-lists.ts
@@ -1,11 +1,13 @@
-import {type AppBskyGraphGetLists, moderateUserList} from '@atproto/api'
+import {moderateUserList} from '@atproto/api'
+import {type DidString} from '@atproto/syntax'
 import {
   type InfiniteData,
   type QueryKey,
   useInfiniteQuery,
 } from '@tanstack/react-query'
 
-import {useAgent} from '#/state/session'
+import {useAppviewClient} from '#/state/session'
+import {app} from '#/lexicons'
 import {useModerationOpts} from '../preferences/moderation-opts'
 
 const PAGE_SIZE = 30
@@ -17,23 +19,21 @@ export const RQKEY = (did: string) => [RQKEY_ROOT, did]
 export function useProfileListsQuery(did: string, opts?: {enabled?: boolean}) {
   const moderationOpts = useModerationOpts()
   const enabled = opts?.enabled !== false && Boolean(moderationOpts)
-  const agent = useAgent()
+  const client = useAppviewClient()
   return useInfiniteQuery<
-    AppBskyGraphGetLists.OutputSchema,
+    app.bsky.graph.getLists.$OutputBody,
     Error,
-    InfiniteData<AppBskyGraphGetLists.OutputSchema>,
+    InfiniteData<app.bsky.graph.getLists.$OutputBody>,
     QueryKey,
     RQPageParam
   >({
     queryKey: RQKEY(did),
     async queryFn({pageParam}: {pageParam: RQPageParam}) {
-      const res = await agent.app.bsky.graph.getLists({
-        actor: did,
+      return await client.call(app.bsky.graph.getLists, {
+        actor: did as DidString,
         limit: PAGE_SIZE,
         cursor: pageParam,
       })
-
-      return res.data
     },
     initialPageParam: undefined,
     getNextPageParam: lastPage => lastPage.cursor,
diff --git a/src/state/queries/suggested-follows.ts b/src/state/queries/suggested-follows.ts
index 7197eb2980..12f726baea 100644
--- a/src/state/queries/suggested-follows.ts
+++ b/src/state/queries/suggested-follows.ts
@@ -1,9 +1,6 @@
 import {useCallback, useMemo} from 'react'
-import {
-  type AppBskyActorDefs,
-  type AppBskyActorGetSuggestions,
-  type AppBskyGraphGetSuggestedFollowsByActor,
-} from '@atproto/api'
+import {type AppBskyActorDefs} from '@atproto/api'
+import {type DidString} from '@atproto/syntax'
 import {
   type InfiniteData,
   type QueryClient,
@@ -12,7 +9,8 @@ import {
 } from '@tanstack/react-query'
 
 import {STALE} from '#/state/queries'
-import {useAgent} from '#/state/session'
+import {useAppviewClient} from '#/state/session'
+import {app} from '#/lexicons'
 import type * as bsky from '#/types/bsky'
 
 const suggestedFollowsQueryKeyRoot = 'suggested-follows'
@@ -32,18 +30,21 @@ export function useSuggestedFollowsByActorQuery({
   enabled?: boolean
   staleTime?: number
 }) {
-  const agent = useAgent()
+  const client = useAppviewClient()
   return useQuery({
     staleTime,
     queryKey: suggestedFollowsByActorQueryKey(did),
     queryFn: async () => {
-      const res = await agent.app.bsky.graph.getSuggestedFollowsByActor({
-        actor: did,
-      })
-      const suggestions = res.data.suggestions.filter(
+      const data = await client.call(
+        app.bsky.graph.getSuggestedFollowsByActor,
+        {
+          actor: did as DidString,
+        },
+      )
+      const suggestions = data.suggestions.filter(
         profile => !profile.viewer?.following,
       )
-      return {suggestions, recId: res.data.recIdStr}
+      return {suggestions, recId: data.recIdStr}
     },
     enabled,
   })
@@ -112,7 +113,7 @@ function* findAllProfilesInSuggestedFollowsQueryData(
   did: string,
 ) {
   const queryDatas = queryClient.getQueriesData<
-    InfiniteData<AppBskyActorGetSuggestions.OutputSchema>
+    InfiniteData<app.bsky.actor.getSuggestions.$OutputBody>
   >({
     queryKey: [suggestedFollowsQueryKeyRoot],
   })
@@ -135,7 +136,7 @@ function* findAllProfilesInSuggestedFollowsByActorQueryData(
   did: string,
 ) {
   const queryDatas =
-    queryClient.getQueriesData<AppBskyGraphGetSuggestedFollowsByActor.OutputSchema>(
+    queryClient.getQueriesData<app.bsky.graph.getSuggestedFollowsByActor.$OutputBody>(
       {
         queryKey: [suggestedFollowsByActorQueryKeyRoot],
       },
diff --git a/src/state/queries/verification/useUpdateProfileVerificationCache.ts b/src/state/queries/verification/useUpdateProfileVerificationCache.ts
index f5ccf1458b..08da1244c5 100644
--- a/src/state/queries/verification/useUpdateProfileVerificationCache.ts
+++ b/src/state/queries/verification/useUpdateProfileVerificationCache.ts
@@ -1,9 +1,11 @@
 import {useCallback} from 'react'
+import {type DidString} from '@atproto/syntax'
 import {useQueryClient} from '@tanstack/react-query'
 
 import {logger} from '#/logger'
 import {updateProfileShadow} from '#/state/cache/profile-shadow'
-import {useAgent} from '#/state/session'
+import {useAppviewClient} from '#/state/session'
+import {app} from '#/lexicons'
 import type * as bsky from '#/types/bsky'
 
 /**
@@ -13,13 +15,17 @@ import type * as bsky from '#/types/bsky'
  */
 export function useUpdateProfileVerificationCache() {
   const qc = useQueryClient()
-  const agent = useAgent()
+  const client = useAppviewClient()
 
   return useCallback(
     async ({profile}: {profile: bsky.profile.AnyProfileView}) => {
       try {
-        const {data: updated} = await agent.getProfile({
-          actor: profile.did ?? '',
+        if (!profile.did) {
+          logger.warn(`useUpdateProfileVerificationCache: no did`, {profile})
+          return
+        }
+        const updated = await client.call(app.bsky.actor.getProfile, {
+          actor: profile.did as DidString,
         })
         updateProfileShadow(qc, profile.did, {
           verification: updated.verification,
@@ -30,6 +36,6 @@ export function useUpdateProfileVerificationCache() {
         })
       }
     },
-    [agent, qc],
+    [client, qc],
   )
 }

From 0e8e0b2ab4755caebc5be7133f90db950dcdb9b9 Mon Sep 17 00:00:00 2001
From: Samuel Newman <mozzius@protonmail.com>
Date: Thu, 13 Aug 2026 22:26:15 +0300
Subject: [PATCH 10/32] [SDK] Migrate chat convo queries to the chat client
 (#11357)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Co-authored-by: Matthieu Sieben <matthieusieben@users.noreply.github.com>
---
 src/components/dms/LeaveConvoPrompt.tsx       | 18 +++++---
 src/components/dms/dialogs/NewChatDialog.tsx  | 46 +++++++++----------
 .../dms/dialogs/ShareViaChatDialog.tsx        | 46 +++++++++----------
 src/components/moderation/BlockDialog.tsx     | 23 +++++-----
 .../Messages/ConversationSettings/index.tsx   |  6 ++-
 .../Messages/components/ChatLocked.tsx        |  8 +++-
 .../queries/messages/accept-conversation.ts   | 13 ++----
 src/state/queries/messages/conversation.ts    | 27 ++++-------
 .../messages/get-convo-availability.ts        | 20 ++++----
 .../queries/messages/get-convo-for-members.ts | 17 ++++---
 src/state/queries/messages/get-status.ts      | 15 +++---
 .../queries/messages/get-unread-counts.ts     | 14 +++---
 .../queries/messages/leave-conversation.ts    | 13 ++----
 .../messages/list-conversation-requests.tsx   | 15 +++---
 .../queries/messages/list-conversations.tsx   | 26 +++++------
 .../queries/messages/list-convo-members.ts    | 26 +++++++----
 .../queries/messages/lock-conversation.ts     | 18 ++------
 .../queries/messages/mute-conversation.ts     | 18 ++------
 src/state/queries/messages/update-all-read.ts | 13 ++----
 19 files changed, 171 insertions(+), 211 deletions(-)

diff --git a/src/components/dms/LeaveConvoPrompt.tsx b/src/components/dms/LeaveConvoPrompt.tsx
index 5e9943e53f..a69dfcf845 100644
--- a/src/components/dms/LeaveConvoPrompt.tsx
+++ b/src/components/dms/LeaveConvoPrompt.tsx
@@ -1,14 +1,15 @@
-import {ChatBskyConvoLeaveConvo} from '@atproto/api'
 import {useLingui} from '@lingui/react/macro'
 import {StackActions, useNavigation} from '@react-navigation/native'
 
 import {type NavigationProp} from '#/lib/routes/types'
 import {isNetworkError} from '#/lib/strings/errors'
+import {matchXrpcError} from '#/lib/xrpc-error'
 import {useLeaveConvo} from '#/state/queries/messages/leave-conversation'
 import {type DialogOuterProps} from '#/components/Dialog'
 import * as Prompt from '#/components/Prompt'
 import * as Toast from '#/components/Toast'
 import {IS_NATIVE} from '#/env'
+import {chat} from '#/lexicons'
 
 export function LeaveConvoPrompt({
   control,
@@ -36,12 +37,15 @@ export function LeaveConvoPrompt({
       let errorMessage = l`Could not leave chat`
       if (isNetworkError(error)) {
         errorMessage = l`A network error occurred. Please check your internet connection.`
-      } else if (error instanceof ChatBskyConvoLeaveConvo.InvalidConvoError) {
-        errorMessage = l`Conversation not found.`
-      } else if (
-        error instanceof ChatBskyConvoLeaveConvo.OwnerCannotLeaveError
-      ) {
-        errorMessage = l`Owner must lock the group before leaving.`
+      } else {
+        switch (matchXrpcError(error, chat.bsky.convo.leaveConvo)) {
+          case 'InvalidConvo':
+            errorMessage = l`Conversation not found.`
+            break
+          case 'OwnerCannotLeave':
+            errorMessage = l`Owner must lock the group before leaving.`
+            break
+        }
       }
       Toast.show(errorMessage, {type: 'error'})
     },
diff --git a/src/components/dms/dialogs/NewChatDialog.tsx b/src/components/dms/dialogs/NewChatDialog.tsx
index fd9eaa8880..4cca14bd0a 100644
--- a/src/components/dms/dialogs/NewChatDialog.tsx
+++ b/src/components/dms/dialogs/NewChatDialog.tsx
@@ -1,12 +1,10 @@
 import {useCallback} from 'react'
-import {
-  ChatBskyConvoGetConvoForMembers,
-  ChatBskyGroupCreateGroup,
-} from '@atproto/api'
+import {ChatBskyGroupCreateGroup} from '@atproto/api'
 import {Trans, useLingui} from '@lingui/react/macro'
 
 import {useRequireEmailVerification} from '#/lib/hooks/useRequireEmailVerification'
 import {isNetworkError} from '#/lib/strings/errors'
+import {matchXrpcError} from '#/lib/xrpc-error'
 import {logger} from '#/logger'
 import {useCreateGroupChat} from '#/state/queries/messages/create-group-chat'
 import {useGetConvoForMembers} from '#/state/queries/messages/get-convo-for-members'
@@ -19,6 +17,7 @@ import {InitiateChatFlow} from '#/components/dms/InitiateChatFlow'
 import {MessagePlus_Stroke2_Corner0_Rounded as NewChatIcon} from '#/components/icons/Message'
 import * as Toast from '#/components/Toast'
 import {useAnalytics} from '#/analytics'
+import {chat} from '#/lexicons'
 
 export function NewChat({
   control,
@@ -54,27 +53,24 @@ export function NewChat({
       let errorMessage = l`An issue occurred starting the chat, please try again.`
       if (isNetworkError(error)) {
         errorMessage = l`A network error occurred. Please check your internet connection.`
-      } else if (
-        error instanceof ChatBskyConvoGetConvoForMembers.AccountSuspendedError
-      ) {
-        errorMessage = l`Suspended accounts cannot participate in chat.`
-      } else if (
-        error instanceof ChatBskyConvoGetConvoForMembers.BlockedActorError
-      ) {
-        errorMessage = l`This user has blocked you and cannot be messaged.`
-      } else if (
-        error instanceof ChatBskyConvoGetConvoForMembers.MessagesDisabledError
-      ) {
-        errorMessage = l`This user has disabled chat and cannot be messaged.`
-      } else if (
-        error instanceof
-        ChatBskyConvoGetConvoForMembers.NotFollowedBySenderError
-      ) {
-        errorMessage = l`Chat recipient is not followed by the sender.`
-      } else if (
-        error instanceof ChatBskyConvoGetConvoForMembers.RecipientNotFoundError
-      ) {
-        errorMessage = l`Unable to find the selected recipient.`
+      } else {
+        switch (matchXrpcError(error, chat.bsky.convo.getConvoForMembers)) {
+          case 'AccountSuspended':
+            errorMessage = l`Suspended accounts cannot participate in chat.`
+            break
+          case 'BlockedActor':
+            errorMessage = l`This user has blocked you and cannot be messaged.`
+            break
+          case 'MessagesDisabled':
+            errorMessage = l`This user has disabled chat and cannot be messaged.`
+            break
+          case 'NotFollowedBySender':
+            errorMessage = l`Chat recipient is not followed by the sender.`
+            break
+          case 'RecipientNotFound':
+            errorMessage = l`Unable to find the selected recipient.`
+            break
+        }
       }
       Toast.show(errorMessage, {
         type: 'error',
diff --git a/src/components/dms/dialogs/ShareViaChatDialog.tsx b/src/components/dms/dialogs/ShareViaChatDialog.tsx
index 0463cc694d..6dfb6145f7 100644
--- a/src/components/dms/dialogs/ShareViaChatDialog.tsx
+++ b/src/components/dms/dialogs/ShareViaChatDialog.tsx
@@ -1,11 +1,9 @@
 import {useCallback, useState} from 'react'
-import {
-  ChatBskyConvoGetConvoForMembers,
-  ChatBskyGroupCreateGroup,
-} from '@atproto/api'
+import {ChatBskyGroupCreateGroup} from '@atproto/api'
 import {useLingui} from '@lingui/react/macro'
 
 import {isNetworkError} from '#/lib/strings/errors'
+import {matchXrpcError} from '#/lib/xrpc-error'
 import {logger} from '#/logger'
 import {useCreateGroupChat} from '#/state/queries/messages/create-group-chat'
 import {useGetConvoForMembers} from '#/state/queries/messages/get-convo-for-members'
@@ -14,6 +12,7 @@ import {SearchablePeopleList} from '#/components/dialogs/SearchablePeopleList'
 import {InitiateChatFlow} from '#/components/dms/InitiateChatFlow'
 import * as Toast from '#/components/Toast'
 import {useAnalytics} from '#/analytics'
+import {chat} from '#/lexicons'
 
 export function SendViaChatDialog({
   control,
@@ -69,27 +68,24 @@ function SendViaChatDialogInner({
       let errorMessage = l`An issue occurred starting the chat, please try again.`
       if (isNetworkError(error)) {
         errorMessage = l`A network error occurred. Please check your internet connection.`
-      } else if (
-        error instanceof ChatBskyConvoGetConvoForMembers.AccountSuspendedError
-      ) {
-        errorMessage = l`Suspended accounts cannot participate in chat.`
-      } else if (
-        error instanceof ChatBskyConvoGetConvoForMembers.BlockedActorError
-      ) {
-        errorMessage = l`This user has blocked you and cannot be messaged.`
-      } else if (
-        error instanceof ChatBskyConvoGetConvoForMembers.MessagesDisabledError
-      ) {
-        errorMessage = l`This user has disabled chat and cannot be messaged.`
-      } else if (
-        error instanceof
-        ChatBskyConvoGetConvoForMembers.NotFollowedBySenderError
-      ) {
-        errorMessage = l`Chat recipient is not followed by the sender.`
-      } else if (
-        error instanceof ChatBskyConvoGetConvoForMembers.RecipientNotFoundError
-      ) {
-        errorMessage = l`Unable to find the selected recipient.`
+      } else {
+        switch (matchXrpcError(error, chat.bsky.convo.getConvoForMembers)) {
+          case 'AccountSuspended':
+            errorMessage = l`Suspended accounts cannot participate in chat.`
+            break
+          case 'BlockedActor':
+            errorMessage = l`This user has blocked you and cannot be messaged.`
+            break
+          case 'MessagesDisabled':
+            errorMessage = l`This user has disabled chat and cannot be messaged.`
+            break
+          case 'NotFollowedBySender':
+            errorMessage = l`Chat recipient is not followed by the sender.`
+            break
+          case 'RecipientNotFound':
+            errorMessage = l`Unable to find the selected recipient.`
+            break
+        }
       }
       Toast.show(errorMessage, {
         type: 'error',
diff --git a/src/components/moderation/BlockDialog.tsx b/src/components/moderation/BlockDialog.tsx
index a575cd7433..5ec9e4d9e4 100644
--- a/src/components/moderation/BlockDialog.tsx
+++ b/src/components/moderation/BlockDialog.tsx
@@ -1,14 +1,11 @@
 import {useState} from 'react'
 import {View} from 'react-native'
-import {
-  type ChatBskyConvoDefs,
-  ChatBskyConvoLeaveConvo,
-  ChatBskyGroupRemoveMembers,
-} from '@atproto/api'
+import {type ChatBskyConvoDefs, ChatBskyGroupRemoveMembers} from '@atproto/api'
 import {Trans, useLingui} from '@lingui/react/macro'
 import {useQueryClient} from '@tanstack/react-query'
 
 import {isNetworkError} from '#/lib/strings/errors'
+import {matchXrpcError} from '#/lib/xrpc-error'
 import {logger} from '#/logger'
 import {type Shadow} from '#/state/cache/types'
 import {useLeaveConvo} from '#/state/queries/messages/leave-conversation'
@@ -27,6 +24,7 @@ import {parseConvoView} from '#/components/dms/util'
 import {Loader} from '#/components/Loader'
 import * as Toast from '#/components/Toast'
 import {Text} from '#/components/Typography'
+import {chat} from '#/lexicons'
 import {type AnyProfileView} from '#/types/bsky/profile'
 
 type Item = ChatBskyConvoDefs.ConvoView
@@ -282,12 +280,15 @@ function MutualGroupChat({
         let errorMessage = l`Could not leave chat.`
         if (isNetworkError(error)) {
           errorMessage = l`A network error occurred. Please check your internet connection.`
-        } else if (error instanceof ChatBskyConvoLeaveConvo.InvalidConvoError) {
-          errorMessage = l`Chat not found.`
-        } else if (
-          error instanceof ChatBskyConvoLeaveConvo.OwnerCannotLeaveError
-        ) {
-          errorMessage = l`Chat owners cannot leave a group chat.`
+        } else {
+          switch (matchXrpcError(error, chat.bsky.convo.leaveConvo)) {
+            case 'InvalidConvo':
+              errorMessage = l`Chat not found.`
+              break
+            case 'OwnerCannotLeave':
+              errorMessage = l`Chat owners cannot leave a group chat.`
+              break
+          }
         }
         Toast.show(errorMessage, {type: 'error'})
       },
diff --git a/src/screens/Messages/ConversationSettings/index.tsx b/src/screens/Messages/ConversationSettings/index.tsx
index 5576f28674..5f76a3f565 100644
--- a/src/screens/Messages/ConversationSettings/index.tsx
+++ b/src/screens/Messages/ConversationSettings/index.tsx
@@ -3,7 +3,6 @@ import {Pressable, View} from 'react-native'
 import {
   ChatBskyActorDefs,
   ChatBskyConvoDefs,
-  ChatBskyConvoUnlockConvo,
   type ModerationOpts,
 } from '@atproto/api'
 import {Trans, useLingui} from '@lingui/react/macro'
@@ -19,6 +18,7 @@ import {
   type NativeStackScreenProps,
   type NavigationProp,
 } from '#/lib/routes/types'
+import {matchXrpcError} from '#/lib/xrpc-error'
 import {logger} from '#/logger'
 import {useModerationOpts} from '#/state/preferences/moderation-opts'
 import {useConvoQuery} from '#/state/queries/messages/conversation'
@@ -59,6 +59,7 @@ import * as Toast from '#/components/Toast'
 import {Text} from '#/components/Typography'
 import {useAnalytics} from '#/analytics'
 import {IS_WEB} from '#/env'
+import {chat} from '#/lexicons'
 import * as bsky from '#/types/bsky'
 import {InviteLinkDialog} from '../components/InviteLinkDialog'
 import {AddMembersLink} from './AddMembersLink'
@@ -432,7 +433,8 @@ function SettingsHeader({
         logger.error('Failed to lock group chat', {message: e})
         Toast.show(l`Failed to lock group chat`, {type: 'error'})
       } else if (
-        e instanceof ChatBskyConvoUnlockConvo.ConvoLockedByModerationError
+        matchXrpcError(e, chat.bsky.convo.unlockConvo) ===
+        'ConvoLockedByModeration'
       ) {
         Toast.show(l`This chat is locked by a moderation action`, {
           type: 'error',
diff --git a/src/screens/Messages/components/ChatLocked.tsx b/src/screens/Messages/components/ChatLocked.tsx
index 8718667e9c..c9dcd93c3d 100644
--- a/src/screens/Messages/components/ChatLocked.tsx
+++ b/src/screens/Messages/components/ChatLocked.tsx
@@ -1,10 +1,10 @@
 import {Pressable} from 'react-native'
-import {ChatBskyConvoUnlockConvo} from '@atproto/api'
 import {Trans, useLingui} from '@lingui/react/macro'
 import {useNavigation} from '@react-navigation/native'
 
 import {HITSLOP_10} from '#/lib/constants'
 import {type NavigationProp} from '#/lib/routes/types'
+import {matchXrpcError} from '#/lib/xrpc-error'
 import {logger} from '#/logger'
 import {useLeaveConvo} from '#/state/queries/messages/leave-conversation'
 import {useLockConvo} from '#/state/queries/messages/lock-conversation'
@@ -15,6 +15,7 @@ import {Lock_Stroke2_Corner0_Rounded as LockIcon} from '#/components/icons/Lock'
 import * as Prompt from '#/components/Prompt'
 import * as Toast from '#/components/Toast'
 import {Text} from '#/components/Typography'
+import {chat} from '#/lexicons'
 import {LeaveChatPrompt} from '../ConversationSettings/prompts'
 import {ChatFooter} from './ChatFooter'
 
@@ -41,7 +42,10 @@ export function ChatLocked({
       Toast.show(l({message: 'Group chat unlocked', context: 'toast'}))
     },
     onError: e => {
-      if (e instanceof ChatBskyConvoUnlockConvo.ConvoLockedByModerationError) {
+      if (
+        matchXrpcError(e, chat.bsky.convo.unlockConvo) ===
+        'ConvoLockedByModeration'
+      ) {
         Toast.show(l`This chat is locked by a moderation action`, {
           type: 'error',
         })
diff --git a/src/state/queries/messages/accept-conversation.ts b/src/state/queries/messages/accept-conversation.ts
index 668c7decc3..391f3e49f5 100644
--- a/src/state/queries/messages/accept-conversation.ts
+++ b/src/state/queries/messages/accept-conversation.ts
@@ -4,9 +4,9 @@ import {
 } from '@atproto/api'
 import {useMutation, useQueryClient} from '@tanstack/react-query'
 
-import {DM_SERVICE_HEADERS} from '#/lib/constants'
 import {logger} from '#/logger'
-import {useAgent} from '#/state/session'
+import {useChatClient} from '#/state/session'
+import {chat} from '#/lexicons'
 import {
   type ConvoRequestListQueryData,
   optimisticDelete as optimisticDeleteRequest,
@@ -34,16 +34,11 @@ export function useAcceptConversation(
   },
 ) {
   const queryClient = useQueryClient()
-  const agent = useAgent()
+  const client = useChatClient()
 
   return useMutation({
     mutationFn: async () => {
-      const {data} = await agent.chat.bsky.convo.acceptConvo(
-        {convoId},
-        {headers: DM_SERVICE_HEADERS},
-      )
-
-      return data
+      return await client.call(chat.bsky.convo.acceptConvo, {convoId})
     },
     onMutate: () => {
       // snapshot every convo-list cache up front so onError can restore them
diff --git a/src/state/queries/messages/conversation.ts b/src/state/queries/messages/conversation.ts
index 1b7699c0ef..c0bf8f3551 100644
--- a/src/state/queries/messages/conversation.ts
+++ b/src/state/queries/messages/conversation.ts
@@ -11,10 +11,10 @@ import {
   useQueryClient,
 } from '@tanstack/react-query'
 
-import {DM_SERVICE_HEADERS} from '#/lib/constants'
 import {STALE} from '#/state/queries'
 import {useOnMarkAsRead} from '#/state/queries/messages/list-conversations'
-import {useAgent} from '#/state/session'
+import {useChatClient} from '#/state/session'
+import {chat} from '#/lexicons'
 import {
   RQKEY_PARTIAL as UNREAD_COUNTS_PARTIAL_KEY,
   UNREAD_ACCEPTED_CAP,
@@ -30,15 +30,12 @@ export const RQKEY_ROOT = 'convo'
 export const RQKEY = (convoId: string) => [RQKEY_ROOT, convoId]
 
 export function useConvoQuery({convoId}: {convoId: string}) {
-  const agent = useAgent()
+  const client = useChatClient()
 
   return useQuery({
     queryKey: RQKEY(convoId),
     queryFn: async () => {
-      const {data} = await agent.chat.bsky.convo.getConvo(
-        {convoId},
-        {headers: DM_SERVICE_HEADERS},
-      )
+      const data = await client.call(chat.bsky.convo.getConvo, {convoId})
       return data.convo
     },
     staleTime: STALE.INFINITY,
@@ -55,7 +52,7 @@ export function precacheConvoQuery(
 export function useMarkAsReadMutation() {
   const optimisticUpdate = useOnMarkAsRead()
   const queryClient = useQueryClient()
-  const agent = useAgent()
+  const client = useChatClient()
 
   return useMutation({
     mutationFn: async ({
@@ -67,16 +64,10 @@ export function useMarkAsReadMutation() {
     }) => {
       if (!convoId) throw new Error('No convoId provided')
 
-      await agent.chat.bsky.convo.updateRead(
-        {
-          convoId,
-          messageId,
-        },
-        {
-          encoding: 'application/json',
-          headers: DM_SERVICE_HEADERS,
-        },
-      )
+      await client.call(chat.bsky.convo.updateRead, {
+        convoId,
+        messageId,
+      })
     },
     onMutate({convoId}) {
       if (!convoId) throw new Error('No convoId provided')
diff --git a/src/state/queries/messages/get-convo-availability.ts b/src/state/queries/messages/get-convo-availability.ts
index b73efe7953..31b4bb4166 100644
--- a/src/state/queries/messages/get-convo-availability.ts
+++ b/src/state/queries/messages/get-convo-availability.ts
@@ -1,7 +1,8 @@
+import {type DidString} from '@atproto/syntax'
 import {useQuery} from '@tanstack/react-query'
 
-import {DM_SERVICE_HEADERS} from '#/lib/constants'
-import {useAgent} from '#/state/session'
+import {useChatClient, useSession} from '#/state/session'
+import {chat} from '#/lexicons'
 import {STALE} from '..'
 
 const RQKEY_ROOT = 'convo-availability'
@@ -11,19 +12,18 @@ export function useGetConvoAvailabilityQuery(
   did: string,
   {enabled = true}: {enabled?: boolean} = {},
 ) {
-  const agent = useAgent()
+  const client = useChatClient()
+  const {hasSession} = useSession()
 
   return useQuery({
     queryKey: RQKEY(did),
     queryFn: async () => {
-      const {data} = await agent.chat.bsky.convo.getConvoAvailability(
-        {members: [did]},
-        {headers: DM_SERVICE_HEADERS},
-      )
-
-      return data
+      return client.call(chat.bsky.convo.getConvoAvailability, {
+        // callers pass an already-resolved actor did
+        members: [did as DidString],
+      })
     },
     staleTime: STALE.INFINITY,
-    enabled,
+    enabled: enabled && hasSession,
   })
 }
diff --git a/src/state/queries/messages/get-convo-for-members.ts b/src/state/queries/messages/get-convo-for-members.ts
index 58c1ab524a..20f5380126 100644
--- a/src/state/queries/messages/get-convo-for-members.ts
+++ b/src/state/queries/messages/get-convo-for-members.ts
@@ -1,9 +1,10 @@
 import {type ChatBskyConvoGetConvoForMembers} from '@atproto/api'
+import {type DidString} from '@atproto/syntax'
 import {useMutation, useQueryClient} from '@tanstack/react-query'
 
-import {DM_SERVICE_HEADERS} from '#/lib/constants'
 import {logger} from '#/logger'
-import {useAgent} from '#/state/session'
+import {useChatClient} from '#/state/session'
+import {chat} from '#/lexicons'
 import {precacheConvoQuery} from './conversation'
 
 export function useGetConvoForMembers({
@@ -14,16 +15,14 @@ export function useGetConvoForMembers({
   onError?: (error: Error) => void
 }) {
   const queryClient = useQueryClient()
-  const agent = useAgent()
+  const client = useChatClient()
 
   return useMutation({
     mutationFn: async (members: string[]) => {
-      const {data} = await agent.chat.bsky.convo.getConvoForMembers(
-        {members: members},
-        {headers: DM_SERVICE_HEADERS},
-      )
-
-      return data
+      return await client.call(chat.bsky.convo.getConvoForMembers, {
+        // callers pass already-resolved actor dids
+        members: members as DidString[],
+      })
     },
     onSuccess: data => {
       precacheConvoQuery(queryClient, data.convo)
diff --git a/src/state/queries/messages/get-status.ts b/src/state/queries/messages/get-status.ts
index 89625dca24..465d442cb6 100644
--- a/src/state/queries/messages/get-status.ts
+++ b/src/state/queries/messages/get-status.ts
@@ -1,7 +1,7 @@
 import {useQuery} from '@tanstack/react-query'
 
-import {DM_SERVICE_HEADERS} from '#/lib/constants'
-import {useAgent} from '#/state/session'
+import {useChatClient, useSession} from '#/state/session'
+import {chat} from '#/lexicons'
 import {STALE} from '..'
 import {createQueryKey} from '../util'
 
@@ -9,19 +9,16 @@ const chatActorStatusQueryKey = () =>
   createQueryKey('chat-actor-status', {}, {persistedVersion: 1})
 
 export function useChatActorStatusQuery() {
-  const agent = useAgent()
+  const client = useChatClient()
+  const {hasSession} = useSession()
 
   return useQuery({
     gcTime: STALE.INFINITY,
     staleTime: STALE.SECONDS.FIFTEEN,
     queryKey: chatActorStatusQueryKey(),
     queryFn: async () => {
-      const {data} = await agent.chat.bsky.actor.getStatus(
-        {},
-        {headers: DM_SERVICE_HEADERS},
-      )
-
-      return data
+      return await client.call(chat.bsky.actor.getStatus)
     },
+    enabled: hasSession,
   })
 }
diff --git a/src/state/queries/messages/get-unread-counts.ts b/src/state/queries/messages/get-unread-counts.ts
index 8c276d67f7..5ec532d6ed 100644
--- a/src/state/queries/messages/get-unread-counts.ts
+++ b/src/state/queries/messages/get-unread-counts.ts
@@ -1,8 +1,8 @@
 import {useQuery} from '@tanstack/react-query'
 
-import {DM_SERVICE_HEADERS} from '#/lib/constants'
-import {useAgent, useSession} from '#/state/session'
+import {useChatClient, useSession} from '#/state/session'
 import {useAgeAssurance} from '#/ageAssurance'
+import {chat} from '#/lexicons'
 import {STALE} from '..'
 
 const RQKEY_ROOT = 'convo-unread-counts'
@@ -18,7 +18,7 @@ export const UNREAD_ACCEPTED_CAP = 100
 export const UNREAD_REQUEST_CAP = 100
 
 export function useUnreadCountsQuery() {
-  const agent = useAgent()
+  const client = useChatClient()
   const {hasSession} = useSession()
   const aa = useAgeAssurance()
   const includeGroupChats = !aa.flags.groupChatDisabled
@@ -26,11 +26,9 @@ export function useUnreadCountsQuery() {
   return useQuery({
     queryKey: RQKEY(includeGroupChats),
     queryFn: async () => {
-      const {data} = await agent.chat.bsky.convo.getUnreadCounts(
-        {includeGroupChats},
-        {headers: DM_SERVICE_HEADERS},
-      )
-      return data
+      return await client.call(chat.bsky.convo.getUnreadCounts, {
+        includeGroupChats,
+      })
     },
     staleTime: STALE.SECONDS.FIFTEEN,
     enabled: hasSession,
diff --git a/src/state/queries/messages/leave-conversation.ts b/src/state/queries/messages/leave-conversation.ts
index 51b51bde80..72379d8b30 100644
--- a/src/state/queries/messages/leave-conversation.ts
+++ b/src/state/queries/messages/leave-conversation.ts
@@ -4,10 +4,10 @@ import {
 } from '@atproto/api'
 import {useMutation, useQueryClient} from '@tanstack/react-query'
 
-import {DM_SERVICE_HEADERS} from '#/lib/constants'
 import {logger} from '#/logger'
 import {invalidateJoinLinkPreviewsForConvo} from '#/state/queries/join-links'
-import {useAgent} from '#/state/session'
+import {useChatClient} from '#/state/session'
+import {chat} from '#/lexicons'
 import {
   type ConvoRequestListQueryData,
   optimisticDelete as optimisticDeleteRequest,
@@ -38,19 +38,14 @@ export function useLeaveConvo(
   },
 ) {
   const queryClient = useQueryClient()
-  const agent = useAgent()
+  const client = useChatClient()
 
   return useMutation({
     mutationKey: RQKEY(convoId),
     mutationFn: async () => {
       if (!convoId) throw new Error('No convoId provided')
 
-      const {data} = await agent.chat.bsky.convo.leaveConvo(
-        {convoId},
-        {headers: DM_SERVICE_HEADERS, encoding: 'application/json'},
-      )
-
-      return data
+      return await client.call(chat.bsky.convo.leaveConvo, {convoId})
     },
     onMutate: () => {
       const prevConvoListQueries =
diff --git a/src/state/queries/messages/list-conversation-requests.tsx b/src/state/queries/messages/list-conversation-requests.tsx
index 10023db4eb..38ae8e6c3d 100644
--- a/src/state/queries/messages/list-conversation-requests.tsx
+++ b/src/state/queries/messages/list-conversation-requests.tsx
@@ -9,8 +9,8 @@ import {
   useInfiniteQuery,
 } from '@tanstack/react-query'
 
-import {DM_SERVICE_HEADERS} from '#/lib/constants'
-import {useAgent} from '#/state/session'
+import {useChatClient} from '#/state/session'
+import {chat} from '#/lexicons'
 
 const DEFAULT_LIMIT = 10
 
@@ -26,17 +26,16 @@ export function useListConvoRequests({
   enabled?: boolean
   limit?: number
 } = {}) {
-  const agent = useAgent()
+  const client = useChatClient()
 
   return useInfiniteQuery({
     enabled,
     queryKey: RQKEY(limit),
     queryFn: async ({pageParam}) => {
-      const {data} = await agent.chat.bsky.convo.listConvoRequests(
-        {limit, cursor: pageParam},
-        {headers: DM_SERVICE_HEADERS},
-      )
-      return data
+      return await client.call(chat.bsky.convo.listConvoRequests, {
+        limit,
+        cursor: pageParam,
+      })
     },
     initialPageParam: undefined as RQPageParam,
     getNextPageParam: lastPage => lastPage.cursor,
diff --git a/src/state/queries/messages/list-conversations.tsx b/src/state/queries/messages/list-conversations.tsx
index 1f73c720bd..6d81a96ecc 100644
--- a/src/state/queries/messages/list-conversations.tsx
+++ b/src/state/queries/messages/list-conversations.tsx
@@ -14,11 +14,11 @@ import {
 } from '@tanstack/react-query'
 import throttle from 'lodash.throttle'
 
-import {DM_SERVICE_HEADERS} from '#/lib/constants'
 import {useCurrentConvoId} from '#/state/messages/current-convo-id'
 import {useMessagesEventBus} from '#/state/messages/events'
 import {invalidateJoinLinkPreviewsForConvo} from '#/state/queries/join-links'
-import {useAgent, useSession} from '#/state/session'
+import {useChatClient, useSession} from '#/state/session'
+import {chat} from '#/lexicons'
 import * as bsky from '#/types/bsky'
 import {RQKEY as CONVO_KEY} from './conversation'
 import {
@@ -119,24 +119,20 @@ export function useListConvosQuery({
   limit?: number
   lockStatus?: 'unlocked' | 'locked' | 'locked-permanently'
 } = {}) {
-  const agent = useAgent()
+  const client = useChatClient()
 
   return useInfiniteQuery({
     enabled,
     queryKey: RQKEY(status ?? 'all', readState, kind, lockStatus, limit),
     queryFn: async ({pageParam}) => {
-      const {data} = await agent.chat.bsky.convo.listConvos(
-        {
-          limit,
-          cursor: pageParam,
-          readState: readState === 'unread' ? 'unread' : undefined,
-          kind: kind === 'all' ? undefined : kind,
-          lockStatus,
-          status,
-        },
-        {headers: DM_SERVICE_HEADERS},
-      )
-      return data
+      return await client.call(chat.bsky.convo.listConvos, {
+        limit,
+        cursor: pageParam,
+        readState: readState === 'unread' ? 'unread' : undefined,
+        kind: kind === 'all' ? undefined : kind,
+        lockStatus,
+        status,
+      })
     },
     initialPageParam: undefined as RQPageParam,
     getNextPageParam: lastPage => lastPage.cursor,
diff --git a/src/state/queries/messages/list-convo-members.ts b/src/state/queries/messages/list-convo-members.ts
index d2ff52dd5c..386d82ca82 100644
--- a/src/state/queries/messages/list-convo-members.ts
+++ b/src/state/queries/messages/list-convo-members.ts
@@ -1,10 +1,10 @@
 import {type ChatBskyActorDefs} from '@atproto/api'
 import {type QueryClient, useQuery} from '@tanstack/react-query'
 
-import {DM_SERVICE_HEADERS} from '#/lib/constants'
 import {STALE} from '#/state/queries'
 import {createQueryKey} from '#/state/queries/util'
-import {useAgent} from '#/state/session'
+import {useChatClient} from '#/state/session'
+import {chat} from '#/lexicons'
 
 const RQKEY_ROOT = 'listConvoMembers'
 export const listConvoMembersQueryKey = (convoId: string) =>
@@ -20,19 +20,27 @@ export function useListConvoMembersQuery({
   convoId: string
   placeholderData?: ChatBskyActorDefs.ProfileViewBasic[]
 }) {
-  const agent = useAgent()
+  const client = useChatClient()
 
   return useQuery({
     queryKey: listConvoMembersQueryKey(convoId),
     queryFn: async () => {
-      const members = []
-      let cursor
+      /*
+       * Both locals are annotated because the loop is self-referential: `data`
+       * is inferred from a call whose params include `cursor`, so leaving
+       * `cursor` to be inferred from `data.cursor` is circular. Annotating
+       * `members` with the exported profile type also keeps the hook's result
+       * type unchanged for consumers.
+       */
+      const members: ChatBskyActorDefs.ProfileViewBasic[] = []
+      let cursor: string | undefined
 
       do {
-        const {data} = await agent.chat.bsky.convo.getConvoMembers(
-          {convoId, cursor, limit: LIMIT},
-          {headers: DM_SERVICE_HEADERS},
-        )
+        const data = await client.call(chat.bsky.convo.getConvoMembers, {
+          convoId,
+          cursor,
+          limit: LIMIT,
+        })
         members.push(...data.members)
         cursor = data.cursor
       } while (cursor)
diff --git a/src/state/queries/messages/lock-conversation.ts b/src/state/queries/messages/lock-conversation.ts
index 122c0633b4..13242d59db 100644
--- a/src/state/queries/messages/lock-conversation.ts
+++ b/src/state/queries/messages/lock-conversation.ts
@@ -1,8 +1,8 @@
 import {ChatBskyConvoDefs, type ChatBskyConvoLockConvo} from '@atproto/api'
 import {useMutation, useQueryClient} from '@tanstack/react-query'
 
-import {DM_SERVICE_HEADERS} from '#/lib/constants'
-import {useAgent} from '#/state/session'
+import {useChatClient} from '#/state/session'
+import {chat} from '#/lexicons'
 import {
   rollbackConvoOptimistic,
   updateConvoOptimistic,
@@ -25,23 +25,15 @@ export function useLockConvo(
   },
 ) {
   const queryClient = useQueryClient()
-  const agent = useAgent()
+  const client = useChatClient()
 
   return useMutation({
     mutationFn: async ({lock}: {lock: boolean; silent?: boolean}) => {
       if (!convoId) throw new Error('No convoId provided')
       if (lock) {
-        const {data} = await agent.chat.bsky.convo.lockConvo(
-          {convoId},
-          {headers: DM_SERVICE_HEADERS, encoding: 'application/json'},
-        )
-        return data
+        return await client.call(chat.bsky.convo.lockConvo, {convoId})
       } else {
-        const {data} = await agent.chat.bsky.convo.unlockConvo(
-          {convoId},
-          {headers: DM_SERVICE_HEADERS, encoding: 'application/json'},
-        )
-        return data
+        return await client.call(chat.bsky.convo.unlockConvo, {convoId})
       }
     },
     onMutate: ({lock}) => {
diff --git a/src/state/queries/messages/mute-conversation.ts b/src/state/queries/messages/mute-conversation.ts
index 03a9ab0b4a..2e9e911b5e 100644
--- a/src/state/queries/messages/mute-conversation.ts
+++ b/src/state/queries/messages/mute-conversation.ts
@@ -1,8 +1,8 @@
 import {type ChatBskyConvoMuteConvo} from '@atproto/api'
 import {useMutation, useQueryClient} from '@tanstack/react-query'
 
-import {DM_SERVICE_HEADERS} from '#/lib/constants'
-import {useAgent} from '#/state/session'
+import {useChatClient} from '#/state/session'
+import {chat} from '#/lexicons'
 import {
   rollbackConvoOptimistic,
   updateConvoOptimistic,
@@ -19,23 +19,15 @@ export function useMuteConvo(
   },
 ) {
   const queryClient = useQueryClient()
-  const agent = useAgent()
+  const client = useChatClient()
 
   return useMutation({
     mutationFn: async ({mute}: {mute: boolean}) => {
       if (!convoId) throw new Error('No convoId provided')
       if (mute) {
-        const {data} = await agent.chat.bsky.convo.muteConvo(
-          {convoId},
-          {headers: DM_SERVICE_HEADERS, encoding: 'application/json'},
-        )
-        return data
+        return await client.call(chat.bsky.convo.muteConvo, {convoId})
       } else {
-        const {data} = await agent.chat.bsky.convo.unmuteConvo(
-          {convoId},
-          {headers: DM_SERVICE_HEADERS, encoding: 'application/json'},
-        )
-        return data
+        return await client.call(chat.bsky.convo.unmuteConvo, {convoId})
       }
     },
     onMutate: ({mute}) => {
diff --git a/src/state/queries/messages/update-all-read.ts b/src/state/queries/messages/update-all-read.ts
index 6fbffc58cd..afcb062d16 100644
--- a/src/state/queries/messages/update-all-read.ts
+++ b/src/state/queries/messages/update-all-read.ts
@@ -1,9 +1,9 @@
 import {type ChatBskyConvoGetUnreadCounts} from '@atproto/api'
 import {useMutation, useQueryClient} from '@tanstack/react-query'
 
-import {DM_SERVICE_HEADERS} from '#/lib/constants'
 import {logger} from '#/logger'
-import {useAgent} from '#/state/session'
+import {useChatClient} from '#/state/session'
+import {chat} from '#/lexicons'
 import {RQKEY_PARTIAL as UNREAD_COUNTS_PARTIAL_KEY} from './get-unread-counts'
 import {
   type ConvoRequestListQueryData,
@@ -29,16 +29,11 @@ export function useUpdateAllRead(
   },
 ) {
   const queryClient = useQueryClient()
-  const agent = useAgent()
+  const client = useChatClient()
 
   return useMutation({
     mutationFn: async () => {
-      const {data} = await agent.chat.bsky.convo.updateAllRead(
-        {status},
-        {headers: DM_SERVICE_HEADERS, encoding: 'application/json'},
-      )
-
-      return data
+      return await client.call(chat.bsky.convo.updateAllRead, {status})
     },
     onMutate: () => {
       // snapshot every convo-list cache up front so onError can restore them

From ea4f70fb1e0ead090322307497dd5c960093a01c Mon Sep 17 00:00:00 2001
From: Samuel Newman <mozzius@protonmail.com>
Date: Thu, 13 Aug 2026 22:26:16 +0300
Subject: [PATCH 11/32] [SDK] Migrate group chat and join links to the chat
 client (#11358)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
---
 src/components/dms/dialogs/NewChatDialog.tsx  | 45 ++++++------
 .../dms/dialogs/ShareViaChatDialog.tsx        | 45 ++++++------
 .../intents/GroupChatJoinDialog.tsx           | 69 ++++++++++---------
 src/components/moderation/BlockDialog.tsx     | 19 ++---
 src/screens/Messages/JoinRequests.tsx         | 50 +++++++-------
 .../components/OutgoingRequestListItem.tsx    | 11 ++-
 src/state/queries/join-links.ts               | 58 ++++++++++------
 .../queries/messages/add-group-members.ts     | 17 ++---
 .../queries/messages/create-group-chat.ts     | 18 ++---
 .../queries/messages/create-join-link.ts      | 16 ++---
 .../queries/messages/disable-join-link.ts     | 12 ++--
 .../queries/messages/edit-group-chat-name.ts  | 15 ++--
 src/state/queries/messages/edit-join-link.ts  | 16 ++---
 .../queries/messages/enable-join-link.ts      | 12 ++--
 src/state/queries/messages/join-requests.ts   | 32 +++++----
 .../queries/messages/list-join-requests.ts    | 17 ++---
 .../queries/messages/list-mutual-groups.ts    | 18 ++---
 .../messages/mark-join-request-read.ts        | 11 ++-
 .../queries/messages/remove-from-group.ts     | 17 ++---
 .../messages/request-join-group-chat.ts       | 12 ++--
 .../messages/withdraw-join-group-chat.ts      | 12 ++--
 21 files changed, 263 insertions(+), 259 deletions(-)

diff --git a/src/components/dms/dialogs/NewChatDialog.tsx b/src/components/dms/dialogs/NewChatDialog.tsx
index 4cca14bd0a..7ee103ef9b 100644
--- a/src/components/dms/dialogs/NewChatDialog.tsx
+++ b/src/components/dms/dialogs/NewChatDialog.tsx
@@ -1,5 +1,4 @@
 import {useCallback} from 'react'
-import {ChatBskyGroupCreateGroup} from '@atproto/api'
 import {Trans, useLingui} from '@lingui/react/macro'
 
 import {useRequireEmailVerification} from '#/lib/hooks/useRequireEmailVerification'
@@ -88,29 +87,27 @@ export function NewChat({
       let errorMessage = l`An issue occurred starting the group chat, please try again.`
       if (isNetworkError(error)) {
         errorMessage = l`A network error occurred. Please check your internet connection.`
-      } else if (
-        error instanceof ChatBskyGroupCreateGroup.AccountSuspendedError
-      ) {
-        errorMessage = l`Suspended accounts cannot participate in a group chat.`
-      } else if (error instanceof ChatBskyGroupCreateGroup.BlockedActorError) {
-        errorMessage = l`One of the selected recipients has blocked you and cannot be messaged.`
-      } else if (
-        error instanceof
-        ChatBskyGroupCreateGroup.NewAccountCannotCreateGroupError
-      ) {
-        errorMessage = l`You cannot create a group chat yet.`
-      } else if (
-        error instanceof ChatBskyGroupCreateGroup.NotFollowedBySenderError
-      ) {
-        errorMessage = l`A selected recipient is not followed by the sender.`
-      } else if (
-        error instanceof ChatBskyGroupCreateGroup.RecipientNotFoundError
-      ) {
-        errorMessage = l`Unable to find a selected recipient.`
-      } else if (
-        error instanceof ChatBskyGroupCreateGroup.UserForbidsGroupsError
-      ) {
-        errorMessage = l`One of the selected recipients does not allow group chats.`
+      } else {
+        switch (matchXrpcError(error, chat.bsky.group.createGroup)) {
+          case 'AccountSuspended':
+            errorMessage = l`Suspended accounts cannot participate in a group chat.`
+            break
+          case 'BlockedActor':
+            errorMessage = l`One of the selected recipients has blocked you and cannot be messaged.`
+            break
+          case 'NewAccountCannotCreateGroup':
+            errorMessage = l`You cannot create a group chat yet.`
+            break
+          case 'NotFollowedBySender':
+            errorMessage = l`A selected recipient is not followed by the sender.`
+            break
+          case 'RecipientNotFound':
+            errorMessage = l`Unable to find a selected recipient.`
+            break
+          case 'UserForbidsGroups':
+            errorMessage = l`One of the selected recipients does not allow group chats.`
+            break
+        }
       }
       Toast.show(errorMessage, {
         type: 'error',
diff --git a/src/components/dms/dialogs/ShareViaChatDialog.tsx b/src/components/dms/dialogs/ShareViaChatDialog.tsx
index 6dfb6145f7..f26dd47a57 100644
--- a/src/components/dms/dialogs/ShareViaChatDialog.tsx
+++ b/src/components/dms/dialogs/ShareViaChatDialog.tsx
@@ -1,5 +1,4 @@
 import {useCallback, useState} from 'react'
-import {ChatBskyGroupCreateGroup} from '@atproto/api'
 import {useLingui} from '@lingui/react/macro'
 
 import {isNetworkError} from '#/lib/strings/errors'
@@ -104,29 +103,27 @@ function SendViaChatDialogInner({
       let errorMessage = l`An issue occurred starting the group chat, please try again.`
       if (isNetworkError(error)) {
         errorMessage = l`A network error occurred. Please check your internet connection.`
-      } else if (
-        error instanceof ChatBskyGroupCreateGroup.AccountSuspendedError
-      ) {
-        errorMessage = l`Suspended accounts cannot participate in a group chat.`
-      } else if (error instanceof ChatBskyGroupCreateGroup.BlockedActorError) {
-        errorMessage = l`One of the selected recipients has blocked you and cannot be messaged.`
-      } else if (
-        error instanceof
-        ChatBskyGroupCreateGroup.NewAccountCannotCreateGroupError
-      ) {
-        errorMessage = l`You cannot create a group chat yet.`
-      } else if (
-        error instanceof ChatBskyGroupCreateGroup.NotFollowedBySenderError
-      ) {
-        errorMessage = l`A selected recipient is not followed by the sender.`
-      } else if (
-        error instanceof ChatBskyGroupCreateGroup.RecipientNotFoundError
-      ) {
-        errorMessage = l`Unable to find a selected recipient.`
-      } else if (
-        error instanceof ChatBskyGroupCreateGroup.UserForbidsGroupsError
-      ) {
-        errorMessage = l`One of the selected recipients does not allow group chats.`
+      } else {
+        switch (matchXrpcError(error, chat.bsky.group.createGroup)) {
+          case 'AccountSuspended':
+            errorMessage = l`Suspended accounts cannot participate in a group chat.`
+            break
+          case 'BlockedActor':
+            errorMessage = l`One of the selected recipients has blocked you and cannot be messaged.`
+            break
+          case 'NewAccountCannotCreateGroup':
+            errorMessage = l`You cannot create a group chat yet.`
+            break
+          case 'NotFollowedBySender':
+            errorMessage = l`A selected recipient is not followed by the sender.`
+            break
+          case 'RecipientNotFound':
+            errorMessage = l`Unable to find a selected recipient.`
+            break
+          case 'UserForbidsGroups':
+            errorMessage = l`One of the selected recipients does not allow group chats.`
+            break
+        }
       }
       Toast.show(errorMessage, {
         type: 'error',
diff --git a/src/components/intents/GroupChatJoinDialog.tsx b/src/components/intents/GroupChatJoinDialog.tsx
index 7c506a634d..53782ae271 100644
--- a/src/components/intents/GroupChatJoinDialog.tsx
+++ b/src/components/intents/GroupChatJoinDialog.tsx
@@ -1,11 +1,6 @@
 import {useEffect} from 'react'
 import {View} from 'react-native'
-import {
-  ChatBskyGroupDefs,
-  ChatBskyGroupRequestJoin,
-  ChatBskyGroupWithdrawJoinRequest,
-  moderateProfile,
-} from '@atproto/api'
+import {ChatBskyGroupDefs, moderateProfile} from '@atproto/api'
 import {Plural, Trans, useLingui} from '@lingui/react/macro'
 import {useNavigation} from '@react-navigation/native'
 import {useQueryClient} from '@tanstack/react-query'
@@ -16,6 +11,7 @@ import {makeProfileLink} from '#/lib/routes/links'
 import {type NavigationProp} from '#/lib/routes/types'
 import {isNetworkError} from '#/lib/strings/errors'
 import {sanitizeHandle} from '#/lib/strings/handles'
+import {matchXrpcError} from '#/lib/xrpc-error'
 import {logger} from '#/logger'
 import {useModerationOpts} from '#/state/preferences/moderation-opts'
 import {
@@ -49,6 +45,7 @@ import {Loader} from '#/components/Loader'
 import * as Toast from '#/components/Toast'
 import {Text} from '#/components/Typography'
 import {useAnalytics} from '#/analytics'
+import {chat} from '#/lexicons'
 import {ProfileBadges} from '../ProfileBadges'
 
 export function GroupChatJoinDialog() {
@@ -147,33 +144,37 @@ function GroupChatJoinDialogContent({code}: {code?: string}) {
         let errorMessage = l`Failed to join the group chat. Please try again.`
         if (isNetworkError(error)) {
           errorMessage = l`There was a problem with your internet connection, please try again`
-        } else if (error instanceof ChatBskyGroupRequestJoin.ConvoLockedError) {
-          errorMessage = l`This conversation is locked.`
-        } else if (
-          error instanceof ChatBskyGroupRequestJoin.FollowRequiredError
-        ) {
-          errorMessage = l`Only followers can join this group chat.`
-        } else if (error instanceof ChatBskyGroupRequestJoin.InvalidCodeError) {
-          errorMessage = l`Invalid group chat code.`
-        } else if (
-          error instanceof ChatBskyGroupRequestJoin.LinkDisabledError
-        ) {
-          errorMessage = l`This invite link has been disabled.`
-        } else if (
-          error instanceof ChatBskyGroupRequestJoin.MemberLimitReachedError
-        ) {
-          errorMessage = l`The member limit has been reached.`
-          const preview = data?.joinLinkPreviews[0]
-          if (
-            ChatBskyGroupDefs.isJoinLinkPreviewView(preview) &&
-            preview.convo?.id
-          ) {
-            ax.metric('groupchat:join:memberLimitReached', {
-              convoId: preview.convo.id,
-            })
+        } else {
+          switch (matchXrpcError(error, chat.bsky.group.requestJoin)) {
+            case 'ConvoLocked':
+              errorMessage = l`This conversation is locked.`
+              break
+            case 'FollowRequired':
+              errorMessage = l`Only followers can join this group chat.`
+              break
+            case 'InvalidCode':
+              errorMessage = l`Invalid group chat code.`
+              break
+            case 'LinkDisabled':
+              errorMessage = l`This invite link has been disabled.`
+              break
+            case 'MemberLimitReached': {
+              errorMessage = l`The member limit has been reached.`
+              const preview = data?.joinLinkPreviews[0]
+              if (
+                ChatBskyGroupDefs.isJoinLinkPreviewView(preview) &&
+                preview.convo?.id
+              ) {
+                ax.metric('groupchat:join:memberLimitReached', {
+                  convoId: preview.convo.id,
+                })
+              }
+              break
+            }
+            case 'UserKicked':
+              errorMessage = l`You have been previously removed from this group and can’t join it using this link.`
+              break
           }
-        } else if (error instanceof ChatBskyGroupRequestJoin.UserKickedError) {
-          errorMessage = l`You have been previously removed from this group and can’t join it using this link.`
         }
         Toast.show(errorMessage)
       },
@@ -194,8 +195,8 @@ function GroupChatJoinDialogContent({code}: {code?: string}) {
         if (isNetworkError(error)) {
           errorMessage = l`There was a problem with your internet connection, please try again`
         } else if (
-          error instanceof
-          ChatBskyGroupWithdrawJoinRequest.InvalidJoinRequestError
+          matchXrpcError(error, chat.bsky.group.withdrawJoinRequest) ===
+          'InvalidJoinRequest'
         ) {
           errorMessage = l`Invalid rescind request.`
         }
diff --git a/src/components/moderation/BlockDialog.tsx b/src/components/moderation/BlockDialog.tsx
index 5ec9e4d9e4..d576e071d7 100644
--- a/src/components/moderation/BlockDialog.tsx
+++ b/src/components/moderation/BlockDialog.tsx
@@ -1,6 +1,6 @@
 import {useState} from 'react'
 import {View} from 'react-native'
-import {type ChatBskyConvoDefs, ChatBskyGroupRemoveMembers} from '@atproto/api'
+import {type ChatBskyConvoDefs} from '@atproto/api'
 import {Trans, useLingui} from '@lingui/react/macro'
 import {useQueryClient} from '@tanstack/react-query'
 
@@ -309,14 +309,15 @@ function MutualGroupChat({
         let errorMessage = l`Could not remove member.`
         if (isNetworkError(error)) {
           errorMessage = l`A network error occurred. Please check your internet connection.`
-        } else if (
-          error instanceof ChatBskyGroupRemoveMembers.InvalidConvoError
-        ) {
-          errorMessage = l`Chat not found.`
-        } else if (
-          error instanceof ChatBskyGroupRemoveMembers.InsufficientRoleError
-        ) {
-          errorMessage = l`You must be a chat owner to remove a member.`
+        } else {
+          switch (matchXrpcError(error, chat.bsky.group.removeMembers)) {
+            case 'InvalidConvo':
+              errorMessage = l`Chat not found.`
+              break
+            case 'InsufficientRole':
+              errorMessage = l`You must be a chat owner to remove a member.`
+              break
+          }
         }
         Toast.show(errorMessage, {type: 'error'})
       },
diff --git a/src/screens/Messages/JoinRequests.tsx b/src/screens/Messages/JoinRequests.tsx
index ffe3fb219e..d8d6ff9b06 100644
--- a/src/screens/Messages/JoinRequests.tsx
+++ b/src/screens/Messages/JoinRequests.tsx
@@ -1,10 +1,6 @@
 import {useState} from 'react'
 import {View} from 'react-native'
-import {
-  ChatBskyGroupApproveJoinRequest,
-  type ChatBskyGroupListJoinRequests,
-  ChatBskyGroupRejectJoinRequest,
-} from '@atproto/api'
+import {type ChatBskyGroupListJoinRequests} from '@atproto/api'
 import {Plural, Trans, useLingui} from '@lingui/react/macro'
 import {useNavigation} from '@react-navigation/native'
 import {type InfiniteData, useQueryClient} from '@tanstack/react-query'
@@ -16,6 +12,7 @@ import {
   type NativeStackScreenProps,
   type NavigationProp,
 } from '#/lib/routes/types'
+import {matchXrpcError} from '#/lib/xrpc-error'
 import {logger} from '#/logger'
 import {ConvoProvider, useConvo} from '#/state/messages/convo'
 import {ConvoStatus} from '#/state/messages/convo/types'
@@ -43,6 +40,7 @@ import * as ProfileCard from '#/components/ProfileCard'
 import * as Toast from '#/components/Toast'
 import {Text} from '#/components/Typography'
 import {useAnalytics} from '#/analytics'
+import {chat} from '#/lexicons'
 import type * as bsky from '#/types/bsky'
 import {InviteLinkDialog} from './components/InviteLinkDialog'
 
@@ -190,19 +188,18 @@ function JoinRequestsList({
         let errorMessage = l`Failed to accept join request`
         if (isNetworkError(error)) {
           errorMessage = l`A network error occurred. Please check your internet connection.`
-        } else if (
-          error instanceof ChatBskyGroupApproveJoinRequest.InvalidConvoError
-        ) {
-          errorMessage = l`Conversation not found.`
-        } else if (
-          error instanceof ChatBskyGroupApproveJoinRequest.InsufficientRoleError
-        ) {
-          errorMessage = l`Only admins can accept join requests.`
-        } else if (
-          error instanceof
-          ChatBskyGroupApproveJoinRequest.MemberLimitReachedError
-        ) {
-          errorMessage = l`The member limit has been reached.`
+        } else {
+          switch (matchXrpcError(error, chat.bsky.group.approveJoinRequest)) {
+            case 'InvalidConvo':
+              errorMessage = l`Conversation not found.`
+              break
+            case 'InsufficientRole':
+              errorMessage = l`Only admins can accept join requests.`
+              break
+            case 'MemberLimitReached':
+              errorMessage = l`The member limit has been reached.`
+              break
+          }
         }
         Toast.show(errorMessage, {type: 'error'})
       },
@@ -223,14 +220,15 @@ function JoinRequestsList({
         let errorMessage = l`Failed to reject join request`
         if (isNetworkError(error)) {
           errorMessage = l`A network error occurred. Please check your internet connection.`
-        } else if (
-          error instanceof ChatBskyGroupRejectJoinRequest.InvalidConvoError
-        ) {
-          errorMessage = l`Conversation not found.`
-        } else if (
-          error instanceof ChatBskyGroupRejectJoinRequest.InsufficientRoleError
-        ) {
-          errorMessage = l`Only admins can reject join requests.`
+        } else {
+          switch (matchXrpcError(error, chat.bsky.group.rejectJoinRequest)) {
+            case 'InvalidConvo':
+              errorMessage = l`Conversation not found.`
+              break
+            case 'InsufficientRole':
+              errorMessage = l`Only admins can reject join requests.`
+              break
+          }
         }
         Toast.show(errorMessage, {type: 'error'})
       },
diff --git a/src/screens/Messages/components/OutgoingRequestListItem.tsx b/src/screens/Messages/components/OutgoingRequestListItem.tsx
index b5dcdf08df..eb62f24b81 100644
--- a/src/screens/Messages/components/OutgoingRequestListItem.tsx
+++ b/src/screens/Messages/components/OutgoingRequestListItem.tsx
@@ -1,11 +1,9 @@
 import {View} from 'react-native'
-import {
-  type ChatBskyGroupDefs,
-  ChatBskyGroupWithdrawJoinRequest,
-} from '@atproto/api'
+import {type ChatBskyGroupDefs} from '@atproto/api'
 import {Trans, useLingui} from '@lingui/react/macro'
 
 import {isNetworkError} from '#/lib/strings/errors'
+import {matchXrpcError} from '#/lib/xrpc-error'
 import {useWithdrawJoinGroupChatRequest} from '#/state/queries/messages/withdraw-join-group-chat'
 import {TimeElapsed} from '#/view/com/util/TimeElapsed'
 import {atoms as a, useTheme, web} from '#/alf'
@@ -14,6 +12,7 @@ import {createStaticClick, Link} from '#/components/Link'
 import * as Prompt from '#/components/Prompt'
 import * as Toast from '#/components/Toast'
 import {Text} from '#/components/Typography'
+import {chat} from '#/lexicons'
 
 export function OutgoingRequestListItem({
   convo: convoView,
@@ -35,8 +34,8 @@ export function OutgoingRequestListItem({
         if (isNetworkError(error)) {
           errorMessage = l`There was a problem with your internet connection, please try again`
         } else if (
-          error instanceof
-          ChatBskyGroupWithdrawJoinRequest.InvalidJoinRequestError
+          matchXrpcError(error, chat.bsky.group.withdrawJoinRequest) ===
+          'InvalidJoinRequest'
         ) {
           errorMessage = l`Invalid rescind request.`
         }
diff --git a/src/state/queries/join-links.ts b/src/state/queries/join-links.ts
index ca1db05558..e5dbbc9bed 100644
--- a/src/state/queries/join-links.ts
+++ b/src/state/queries/join-links.ts
@@ -1,17 +1,19 @@
 import {useCallback} from 'react'
 import {
   type $Typed,
-  AtpAgent,
   ChatBskyGroupDefs,
   type ChatBskyGroupGetJoinLinkPreviews,
 } from '@atproto/api'
+import {type Client} from '@atproto/lex'
 import {type QueryClient, useQuery, useQueryClient} from '@tanstack/react-query'
 
-import {CHAT_SERVICE, DM_SERVICE_HEADERS} from '#/lib/constants'
+import {CHAT_SERVICE} from '#/lib/constants'
+import {createLexClient} from '#/lib/lexClient'
 import {logger} from '#/logger'
 import {STALE} from '#/state/queries/index'
 import {createQueryKey, type StructuredQueryKey} from '#/state/queries/util'
-import {useAgent} from '#/state/session'
+import {useChatClient} from '#/state/session'
+import {chat} from '#/lexicons'
 
 /**
  * The three preview shapes we currently support. Excludes the `{$type: string}`
@@ -154,23 +156,39 @@ export function invalidateJoinLinkPreviewsForConvo(
   })
 }
 
+let publicChatClient: Client | undefined
+
+/**
+ * The unauthenticated {@link Client} for the chat service, used to resolve join
+ * links before the viewer has a session.
+ *
+ * It talks to {@link CHAT_SERVICE} directly rather than proxying through a PDS,
+ * so no `atproto-proxy` header is involved. A single module-level instance,
+ * because there is no session to scope it to and reconstructing it per call
+ * would be waste.
+ *
+ * Unlike the public appview client this does NOT wrap `networkAwareFetch`,
+ * matching the plain-fetch behavior of the ad-hoc agent it replaces: a
+ * logged-out link resolution failing says nothing useful about the session's
+ * reachability, so it should not move the app-wide network signal.
+ */
+function getPublicChatClient(): Client {
+  return (publicChatClient ??= createLexClient({service: CHAT_SERVICE}))
+}
+
 async function fetchJoinLinkPreviews({
-  agent,
+  client,
   codes,
   hasSession,
 }: {
-  agent: AtpAgent
+  client: Client
   codes: string[]
   hasSession: boolean
 }) {
-  const previewAgent = new AtpAgent({service: CHAT_SERVICE})
-  const res = hasSession
-    ? await agent.chat.bsky.group.getJoinLinkPreviews(
-        {codes},
-        {headers: DM_SERVICE_HEADERS},
-      )
-    : await previewAgent.chat.bsky.group.getJoinLinkPreviews({codes})
-  return res.data
+  return await (hasSession ? client : getPublicChatClient()).call(
+    chat.bsky.group.getJoinLinkPreviews,
+    {codes},
+  )
 }
 
 export function useJoinLinkPreviewsQuery({
@@ -188,14 +206,14 @@ export function useJoinLinkPreviewsQuery({
    */
   initialData?: ChatBskyGroupGetJoinLinkPreviews.OutputSchema
 }) {
-  const agent = useAgent()
+  const client = useChatClient()
 
   return useQuery({
     queryKey: createJoinLinkPreviewQueryKey({codes: codes ?? [], hasSession}),
     queryFn: async () => {
       if (!codes) throw new Error('No invite code')
       try {
-        return await fetchJoinLinkPreviews({agent, codes, hasSession})
+        return await fetchJoinLinkPreviews({client, codes, hasSession})
       } catch (error) {
         logger.error('Failed to fetch join link preview', {safeMessage: error})
         throw error
@@ -208,13 +226,13 @@ export function useJoinLinkPreviewsQuery({
 }
 
 export function usePrefetchJoinLinkPreviews() {
-  const agent = useAgent()
+  const client = useChatClient()
   const queryClient = useQueryClient()
 
   return ({codes, hasSession}: {codes: string[]; hasSession: boolean}) => {
     return queryClient.prefetchQuery({
       queryKey: createJoinLinkPreviewQueryKey({codes, hasSession}),
-      queryFn: () => fetchJoinLinkPreviews({agent, codes, hasSession}),
+      queryFn: () => fetchJoinLinkPreviews({client, codes, hasSession}),
       staleTime: STALE.SECONDS.FIFTEEN,
     })
   }
@@ -226,7 +244,7 @@ export function usePrefetchJoinLinkPreviews() {
  * Returns undefined if the preview can't be resolved.
  */
 export function useGetJoinLinkPreview() {
-  const agent = useAgent()
+  const client = useChatClient()
   const queryClient = useQueryClient()
 
   return useCallback(
@@ -241,7 +259,7 @@ export function useGetJoinLinkPreview() {
         const data = await queryClient.fetchQuery({
           queryKey: createJoinLinkPreviewQueryKey({codes: [code], hasSession}),
           queryFn: () =>
-            fetchJoinLinkPreviews({agent, codes: [code], hasSession}),
+            fetchJoinLinkPreviews({client, codes: [code], hasSession}),
           staleTime: STALE.SECONDS.FIFTEEN,
         })
         const found = data.joinLinkPreviews[0]
@@ -251,6 +269,6 @@ export function useGetJoinLinkPreview() {
         return undefined
       }
     },
-    [agent, queryClient],
+    [client, queryClient],
   )
 }
diff --git a/src/state/queries/messages/add-group-members.ts b/src/state/queries/messages/add-group-members.ts
index b5ddacbbff..bf4f8a8f4e 100644
--- a/src/state/queries/messages/add-group-members.ts
+++ b/src/state/queries/messages/add-group-members.ts
@@ -4,16 +4,17 @@ import {
   type ChatBskyConvoListConvos,
   type ChatBskyGroupAddMembers,
 } from '@atproto/api'
+import {type DidString} from '@atproto/syntax'
 import {
   type InfiniteData,
   useMutation,
   useQueryClient,
 } from '@tanstack/react-query'
 
-import {DM_SERVICE_HEADERS} from '#/lib/constants'
 import {logger} from '#/logger'
 import {useProfileQuery} from '#/state/queries/profile'
-import {useAgent, useSession} from '#/state/session'
+import {useChatClient, useSession} from '#/state/session'
+import {chat} from '#/lexicons'
 import type * as bsky from '#/types/bsky'
 import {RQKEY as CONVO_KEY} from './conversation'
 import {RQKEY_ROOT as CONVO_LIST_KEY} from './list-conversations'
@@ -30,7 +31,7 @@ export function useAddGroupMembers(
   },
 ) {
   const queryClient = useQueryClient()
-  const agent = useAgent()
+  const client = useChatClient()
   const {currentAccount} = useSession()
   const {data: myProfile} = useProfileQuery({did: currentAccount?.did})
 
@@ -42,11 +43,11 @@ export function useAddGroupMembers(
       profiles: bsky.profile.AnyProfileView[]
     }) => {
       if (!convoId) throw new Error('No convoId provided')
-      const {data} = await agent.chat.bsky.group.addMembers(
-        {convoId, members},
-        {headers: DM_SERVICE_HEADERS, encoding: 'application/json'},
-      )
-      return data
+      return await client.call(chat.bsky.group.addMembers, {
+        convoId,
+        // callers pass already-resolved actor dids
+        members: members as DidString[],
+      })
     },
     onMutate: ({profiles}) => {
       if (!convoId) return
diff --git a/src/state/queries/messages/create-group-chat.ts b/src/state/queries/messages/create-group-chat.ts
index 9f8aadc7d0..4a78a2be6a 100644
--- a/src/state/queries/messages/create-group-chat.ts
+++ b/src/state/queries/messages/create-group-chat.ts
@@ -1,9 +1,10 @@
 import {type ChatBskyGroupCreateGroup} from '@atproto/api'
+import {type DidString} from '@atproto/syntax'
 import {useMutation, useQueryClient} from '@tanstack/react-query'
 
-import {DM_SERVICE_HEADERS} from '#/lib/constants'
 import {logger} from '#/logger'
-import {useAgent} from '#/state/session'
+import {useChatClient} from '#/state/session'
+import {chat} from '#/lexicons'
 import {precacheConvoQuery} from './conversation'
 
 export function useCreateGroupChat({
@@ -14,16 +15,15 @@ export function useCreateGroupChat({
   onError?: (error: Error) => void
 }) {
   const queryClient = useQueryClient()
-  const agent = useAgent()
+  const client = useChatClient()
 
   return useMutation({
     mutationFn: async ({name, members}: {name: string; members: string[]}) => {
-      const {data} = await agent.chat.bsky.group.createGroup(
-        {name, members},
-        {headers: DM_SERVICE_HEADERS},
-      )
-
-      return data
+      return await client.call(chat.bsky.group.createGroup, {
+        name,
+        // callers pass already-resolved actor dids
+        members: members as DidString[],
+      })
     },
     onSuccess: data => {
       precacheConvoQuery(queryClient, data.convo)
diff --git a/src/state/queries/messages/create-join-link.ts b/src/state/queries/messages/create-join-link.ts
index fbac855466..57269b93e3 100644
--- a/src/state/queries/messages/create-join-link.ts
+++ b/src/state/queries/messages/create-join-link.ts
@@ -5,9 +5,9 @@ import {
 } from '@atproto/api'
 import {useMutation, useQueryClient} from '@tanstack/react-query'
 
-import {DM_SERVICE_HEADERS} from '#/lib/constants'
 import {logger} from '#/logger'
-import {useAgent} from '#/state/session'
+import {useChatClient} from '#/state/session'
+import {chat} from '#/lexicons'
 import {
   rollbackConvoOptimistic,
   updateConvoOptimistic,
@@ -24,7 +24,7 @@ export function useCreateJoinLink(
   },
 ) {
   const queryClient = useQueryClient()
-  const agent = useAgent()
+  const client = useChatClient()
 
   return useMutation({
     mutationFn: async ({
@@ -35,11 +35,11 @@ export function useCreateJoinLink(
       requireApproval: boolean
     }) => {
       if (!convoId) throw new Error('No convoId provided')
-      const {data} = await agent.chat.bsky.group.createJoinLink(
-        {convoId, joinRule, requireApproval},
-        {headers: DM_SERVICE_HEADERS, encoding: 'application/json'},
-      )
-      return data
+      return await client.call(chat.bsky.group.createJoinLink, {
+        convoId,
+        joinRule,
+        requireApproval,
+      })
     },
     onMutate: ({joinRule, requireApproval}) => {
       if (!convoId) return
diff --git a/src/state/queries/messages/disable-join-link.ts b/src/state/queries/messages/disable-join-link.ts
index c143feb6cc..b995dbcc6f 100644
--- a/src/state/queries/messages/disable-join-link.ts
+++ b/src/state/queries/messages/disable-join-link.ts
@@ -4,10 +4,10 @@ import {
 } from '@atproto/api'
 import {useMutation, useQueryClient} from '@tanstack/react-query'
 
-import {DM_SERVICE_HEADERS} from '#/lib/constants'
 import {logger} from '#/logger'
 import {invalidateJoinLinkPreviewsForCode} from '#/state/queries/join-links'
-import {useAgent} from '#/state/session'
+import {useChatClient} from '#/state/session'
+import {chat} from '#/lexicons'
 import {
   rollbackConvoOptimistic,
   updateConvoOptimistic,
@@ -24,16 +24,12 @@ export function useDisableJoinLink(
   },
 ) {
   const queryClient = useQueryClient()
-  const agent = useAgent()
+  const client = useChatClient()
 
   return useMutation({
     mutationFn: async () => {
       if (!convoId) throw new Error('No convoId provided')
-      const {data} = await agent.chat.bsky.group.disableJoinLink(
-        {convoId},
-        {headers: DM_SERVICE_HEADERS, encoding: 'application/json'},
-      )
-      return data
+      return await client.call(chat.bsky.group.disableJoinLink, {convoId})
     },
     onMutate: () => {
       if (!convoId) return
diff --git a/src/state/queries/messages/edit-group-chat-name.ts b/src/state/queries/messages/edit-group-chat-name.ts
index ef2a72f4ec..ecc73fd3d3 100644
--- a/src/state/queries/messages/edit-group-chat-name.ts
+++ b/src/state/queries/messages/edit-group-chat-name.ts
@@ -1,9 +1,9 @@
 import {ChatBskyConvoDefs, type ChatBskyGroupEditGroup} from '@atproto/api'
 import {useMutation, useQueryClient} from '@tanstack/react-query'
 
-import {DM_SERVICE_HEADERS} from '#/lib/constants'
 import {logger} from '#/logger'
-import {useAgent} from '#/state/session'
+import {useChatClient} from '#/state/session'
+import {chat} from '#/lexicons'
 import {
   rollbackConvoOptimistic,
   updateConvoOptimistic,
@@ -20,16 +20,15 @@ export function useEditGroupChatName(
   },
 ) {
   const queryClient = useQueryClient()
-  const agent = useAgent()
+  const client = useChatClient()
 
   return useMutation({
     mutationFn: async ({name: groupName}: {name: string}) => {
       if (!convoId) throw new Error('No convoId provided')
-      const {data} = await agent.chat.bsky.group.editGroup(
-        {convoId, name: groupName},
-        {headers: DM_SERVICE_HEADERS, encoding: 'application/json'},
-      )
-      return data
+      return await client.call(chat.bsky.group.editGroup, {
+        convoId,
+        name: groupName,
+      })
     },
     onMutate: ({name: groupName}) => {
       if (!convoId) return
diff --git a/src/state/queries/messages/edit-join-link.ts b/src/state/queries/messages/edit-join-link.ts
index 7e34ce88d9..7870c1f7e3 100644
--- a/src/state/queries/messages/edit-join-link.ts
+++ b/src/state/queries/messages/edit-join-link.ts
@@ -5,9 +5,9 @@ import {
 } from '@atproto/api'
 import {useMutation, useQueryClient} from '@tanstack/react-query'
 
-import {DM_SERVICE_HEADERS} from '#/lib/constants'
 import {logger} from '#/logger'
-import {useAgent} from '#/state/session'
+import {useChatClient} from '#/state/session'
+import {chat} from '#/lexicons'
 import {
   rollbackConvoOptimistic,
   updateConvoOptimistic,
@@ -24,7 +24,7 @@ export function useEditJoinLink(
   },
 ) {
   const queryClient = useQueryClient()
-  const agent = useAgent()
+  const client = useChatClient()
 
   return useMutation({
     mutationFn: async ({
@@ -35,11 +35,11 @@ export function useEditJoinLink(
       requireApproval: boolean
     }) => {
       if (!convoId) throw new Error('No convoId provided')
-      const {data} = await agent.chat.bsky.group.editJoinLink(
-        {convoId, joinRule, requireApproval},
-        {headers: DM_SERVICE_HEADERS, encoding: 'application/json'},
-      )
-      return data
+      return await client.call(chat.bsky.group.editJoinLink, {
+        convoId,
+        joinRule,
+        requireApproval,
+      })
     },
     onMutate: ({joinRule, requireApproval}) => {
       if (!convoId) return
diff --git a/src/state/queries/messages/enable-join-link.ts b/src/state/queries/messages/enable-join-link.ts
index 4febc85441..ef3b168068 100644
--- a/src/state/queries/messages/enable-join-link.ts
+++ b/src/state/queries/messages/enable-join-link.ts
@@ -1,10 +1,10 @@
 import {ChatBskyConvoDefs, type ChatBskyGroupEnableJoinLink} from '@atproto/api'
 import {useMutation, useQueryClient} from '@tanstack/react-query'
 
-import {DM_SERVICE_HEADERS} from '#/lib/constants'
 import {logger} from '#/logger'
 import {invalidateJoinLinkPreviewsForCode} from '#/state/queries/join-links'
-import {useAgent} from '#/state/session'
+import {useChatClient} from '#/state/session'
+import {chat} from '#/lexicons'
 import {
   rollbackConvoOptimistic,
   updateConvoOptimistic,
@@ -21,16 +21,12 @@ export function useEnableJoinLink(
   },
 ) {
   const queryClient = useQueryClient()
-  const agent = useAgent()
+  const client = useChatClient()
 
   return useMutation({
     mutationFn: async () => {
       if (!convoId) throw new Error('No convoId provided')
-      const {data} = await agent.chat.bsky.group.enableJoinLink(
-        {convoId},
-        {headers: DM_SERVICE_HEADERS, encoding: 'application/json'},
-      )
-      return data
+      return await client.call(chat.bsky.group.enableJoinLink, {convoId})
     },
     onMutate: () => {
       if (!convoId) return
diff --git a/src/state/queries/messages/join-requests.ts b/src/state/queries/messages/join-requests.ts
index 179dfafaaf..d36ebd60ae 100644
--- a/src/state/queries/messages/join-requests.ts
+++ b/src/state/queries/messages/join-requests.ts
@@ -4,15 +4,16 @@ import {
   type ChatBskyGroupListJoinRequests,
   type ChatBskyGroupRejectJoinRequest,
 } from '@atproto/api'
+import {type DidString} from '@atproto/syntax'
 import {
   type InfiniteData,
   useMutation,
   useQueryClient,
 } from '@tanstack/react-query'
 
-import {DM_SERVICE_HEADERS} from '#/lib/constants'
 import {logger} from '#/logger'
-import {useAgent} from '#/state/session'
+import {useChatClient} from '#/state/session'
+import {chat} from '#/lexicons'
 import {listConvoMembersQueryKey} from './list-convo-members'
 import {createListJoinRequestsQueryKey} from './list-join-requests'
 
@@ -34,21 +35,28 @@ export function useJoinRequestMutation<A extends JoinRequestAction>(
   },
 ) {
   const queryClient = useQueryClient()
-  const agent = useAgent()
+  const client = useChatClient()
 
   return useMutation({
     mutationFn: async ({member}: {member: string}) => {
       if (!convoId) throw new Error('No convoId provided')
-      const {data} =
+      // callers pass an already-resolved actor did
+      const memberDid = member as DidString
+      const data =
         action === 'approve'
-          ? await agent.chat.bsky.group.approveJoinRequest(
-              {convoId, member},
-              {headers: DM_SERVICE_HEADERS, encoding: 'application/json'},
-            )
-          : await agent.chat.bsky.group.rejectJoinRequest(
-              {convoId, member},
-              {headers: DM_SERVICE_HEADERS, encoding: 'application/json'},
-            )
+          ? await client.call(chat.bsky.group.approveJoinRequest, {
+              convoId,
+              member: memberDid,
+            })
+          : await client.call(chat.bsky.group.rejectJoinRequest, {
+              convoId,
+              member: memberDid,
+            })
+      /*
+       * The two branches have different output schemas, so the union cannot be
+       * narrowed from the `action` value alone - the cast carries the generic's
+       * mapping through, exactly as the pre-migration code did.
+       */
       return data as JoinRequestOutput<A>
     },
     onMutate: ({member}) => {
diff --git a/src/state/queries/messages/list-join-requests.ts b/src/state/queries/messages/list-join-requests.ts
index 64a999c118..bbb82eeca5 100644
--- a/src/state/queries/messages/list-join-requests.ts
+++ b/src/state/queries/messages/list-join-requests.ts
@@ -2,10 +2,10 @@ import {useEffect} from 'react'
 import {ChatBskyConvoDefs} from '@atproto/api'
 import {useInfiniteQuery, useQueryClient} from '@tanstack/react-query'
 
-import {DM_SERVICE_HEADERS} from '#/lib/constants'
 import {useMessagesEventBus} from '#/state/messages/events'
 import {createQueryKey} from '#/state/queries/util'
-import {useAgent} from '#/state/session'
+import {useChatClient} from '#/state/session'
+import {chat} from '#/lexicons'
 import {STALE} from '..'
 
 export const JOIN_REQUESTS_THRESHOLD = 20
@@ -22,7 +22,7 @@ export function useListJoinRequestsQuery({
   convoId: string | undefined
   enabled?: boolean
 }) {
-  const agent = useAgent()
+  const client = useChatClient()
   const queryClient = useQueryClient()
   const messagesBus = useMessagesEventBus()
   const isEnabled = enabled !== false && !!convoId
@@ -54,11 +54,12 @@ export function useListJoinRequestsQuery({
     enabled: isEnabled,
     queryKey: createListJoinRequestsQueryKey({convoId: convoId ?? ''}),
     queryFn: async ({pageParam}) => {
-      const {data} = await agent.chat.bsky.group.listJoinRequests(
-        {convoId: convoId!, cursor: pageParam, limit: JOIN_REQUESTS_THRESHOLD},
-        {headers: DM_SERVICE_HEADERS},
-      )
-      return data
+      return await client.call(chat.bsky.group.listJoinRequests, {
+        // guarded by `isEnabled`
+        convoId: convoId!,
+        cursor: pageParam,
+        limit: JOIN_REQUESTS_THRESHOLD,
+      })
     },
     initialPageParam: undefined as string | undefined,
     getNextPageParam: page => page.cursor,
diff --git a/src/state/queries/messages/list-mutual-groups.ts b/src/state/queries/messages/list-mutual-groups.ts
index 9ff4a1da09..65743a45e7 100644
--- a/src/state/queries/messages/list-mutual-groups.ts
+++ b/src/state/queries/messages/list-mutual-groups.ts
@@ -1,8 +1,9 @@
+import {type DidString} from '@atproto/syntax'
 import {useInfiniteQuery} from '@tanstack/react-query'
 
-import {DM_SERVICE_HEADERS} from '#/lib/constants'
 import {createQueryKey} from '#/state/queries/util'
-import {useAgent} from '#/state/session'
+import {useChatClient} from '#/state/session'
+import {chat} from '#/lexicons'
 
 const listMutualGroupsQueryKeyRoot = 'list-mutual-groups'
 
@@ -18,7 +19,7 @@ export function useListMutualGroupsQuery({
   enabled?: boolean
   limit?: number
 }) {
-  const agent = useAgent()
+  const client = useChatClient()
   const isEnabled = enabled !== false && !!subject
 
   return useInfiniteQuery({
@@ -27,11 +28,12 @@ export function useListMutualGroupsQuery({
     enabled: isEnabled,
     queryKey: createListMutualGroupsQueryKey({subject: subject ?? ''}),
     queryFn: async ({pageParam}) => {
-      const {data} = await agent.chat.bsky.group.listMutualGroups(
-        {subject: subject!, cursor: pageParam, limit},
-        {headers: DM_SERVICE_HEADERS},
-      )
-      return data
+      return await client.call(chat.bsky.group.listMutualGroups, {
+        // guarded by `enabled`, and callers pass a resolved actor did
+        subject: subject as DidString,
+        cursor: pageParam,
+        limit,
+      })
     },
     initialPageParam: undefined as string | undefined,
     getNextPageParam: page => page.cursor,
diff --git a/src/state/queries/messages/mark-join-request-read.ts b/src/state/queries/messages/mark-join-request-read.ts
index ae6d7e88a7..3dfd995af0 100644
--- a/src/state/queries/messages/mark-join-request-read.ts
+++ b/src/state/queries/messages/mark-join-request-read.ts
@@ -1,9 +1,9 @@
 import {ChatBskyConvoDefs} from '@atproto/api'
 import {useMutation, useQueryClient} from '@tanstack/react-query'
 
-import {DM_SERVICE_HEADERS} from '#/lib/constants'
 import {logger} from '#/logger'
-import {useAgent} from '#/state/session'
+import {useChatClient} from '#/state/session'
+import {chat} from '#/lexicons'
 import {RQKEY as CONVO_KEY} from './conversation'
 import {
   type ConvoListQueryData,
@@ -12,15 +12,12 @@ import {
 
 export function useMarkJoinRequestsRead(convoId: string | undefined) {
   const queryClient = useQueryClient()
-  const agent = useAgent()
+  const client = useChatClient()
 
   return useMutation({
     mutationFn: async () => {
       if (!convoId) throw new Error('No convoId provided')
-      await agent.chat.bsky.group.updateJoinRequestsRead(
-        {convoId},
-        {headers: DM_SERVICE_HEADERS, encoding: 'application/json'},
-      )
+      await client.call(chat.bsky.group.updateJoinRequestsRead, {convoId})
     },
     onMutate: () => {
       if (!convoId) return
diff --git a/src/state/queries/messages/remove-from-group.ts b/src/state/queries/messages/remove-from-group.ts
index 95f246be5a..10437ad7e9 100644
--- a/src/state/queries/messages/remove-from-group.ts
+++ b/src/state/queries/messages/remove-from-group.ts
@@ -4,15 +4,16 @@ import {
   type ChatBskyConvoListConvos,
   type ChatBskyGroupRemoveMembers,
 } from '@atproto/api'
+import {type DidString} from '@atproto/syntax'
 import {
   type InfiniteData,
   useMutation,
   useQueryClient,
 } from '@tanstack/react-query'
 
-import {DM_SERVICE_HEADERS} from '#/lib/constants'
 import {logger} from '#/logger'
-import {useAgent} from '#/state/session'
+import {useChatClient} from '#/state/session'
+import {chat} from '#/lexicons'
 import {RQKEY as CONVO_KEY} from './conversation'
 import {RQKEY_ROOT as CONVO_LIST_KEY} from './list-conversations'
 import {listConvoMembersQueryKey} from './list-convo-members'
@@ -28,16 +29,16 @@ export function useRemoveFromGroupChat(
   },
 ) {
   const queryClient = useQueryClient()
-  const agent = useAgent()
+  const client = useChatClient()
 
   return useMutation({
     mutationFn: async ({members}: {members: string[]}) => {
       if (!convoId) throw new Error('No convoId provided')
-      const {data} = await agent.chat.bsky.group.removeMembers(
-        {convoId, members},
-        {headers: DM_SERVICE_HEADERS, encoding: 'application/json'},
-      )
-      return data
+      return await client.call(chat.bsky.group.removeMembers, {
+        convoId,
+        // callers pass already-resolved actor dids
+        members: members as DidString[],
+      })
     },
     onMutate: ({members}) => {
       if (!convoId) return
diff --git a/src/state/queries/messages/request-join-group-chat.ts b/src/state/queries/messages/request-join-group-chat.ts
index f4d5650346..b0a1922007 100644
--- a/src/state/queries/messages/request-join-group-chat.ts
+++ b/src/state/queries/messages/request-join-group-chat.ts
@@ -1,9 +1,9 @@
 import {type ChatBskyGroupRequestJoin} from '@atproto/api'
 import {useMutation, useQueryClient} from '@tanstack/react-query'
 
-import {DM_SERVICE_HEADERS} from '#/lib/constants'
 import {logger} from '#/logger'
-import {useAgent, useSession} from '#/state/session'
+import {useChatClient, useSession} from '#/state/session'
+import {chat} from '#/lexicons'
 import {RQKEY_ROOT as REQUESTS_RQKEY_ROOT} from './list-conversation-requests'
 
 export function useRequestJoinGroupChat({
@@ -13,7 +13,7 @@ export function useRequestJoinGroupChat({
   onSuccess?: (data: ChatBskyGroupRequestJoin.OutputSchema) => void
   onError?: (error: Error) => void
 } = {}) {
-  const agent = useAgent()
+  const client = useChatClient()
   const queryClient = useQueryClient()
   const {hasSession} = useSession()
 
@@ -22,11 +22,7 @@ export function useRequestJoinGroupChat({
       if (!hasSession) throw new Error('Must be logged in to join')
       if (!code) throw new Error('No invite code')
 
-      const res = await agent.chat.bsky.group.requestJoin(
-        {code},
-        {headers: DM_SERVICE_HEADERS},
-      )
-      return res.data
+      return await client.call(chat.bsky.group.requestJoin, {code})
     },
     onSuccess: data => {
       void queryClient.invalidateQueries({queryKey: [REQUESTS_RQKEY_ROOT]})
diff --git a/src/state/queries/messages/withdraw-join-group-chat.ts b/src/state/queries/messages/withdraw-join-group-chat.ts
index 2ede8c941d..736128ee25 100644
--- a/src/state/queries/messages/withdraw-join-group-chat.ts
+++ b/src/state/queries/messages/withdraw-join-group-chat.ts
@@ -1,9 +1,9 @@
 import {type ChatBskyGroupWithdrawJoinRequest} from '@atproto/api'
 import {useMutation, useQueryClient} from '@tanstack/react-query'
 
-import {DM_SERVICE_HEADERS} from '#/lib/constants'
 import {logger} from '#/logger'
-import {useAgent, useSession} from '#/state/session'
+import {useChatClient, useSession} from '#/state/session'
+import {chat} from '#/lexicons'
 import {
   type ConvoRequestListQueryData,
   optimisticDeleteJoinRequest,
@@ -17,7 +17,7 @@ export function useWithdrawJoinGroupChatRequest({
   onSuccess?: (data: ChatBskyGroupWithdrawJoinRequest.OutputSchema) => void
   onError?: (error: Error) => void
 } = {}) {
-  const agent = useAgent()
+  const client = useChatClient()
   const queryClient = useQueryClient()
   const {hasSession} = useSession()
 
@@ -27,11 +27,7 @@ export function useWithdrawJoinGroupChatRequest({
         throw new Error('Must be logged in to withdraw a join request')
       if (!convoId) throw new Error('No convoId provided')
 
-      const res = await agent.chat.bsky.group.withdrawJoinRequest(
-        {convoId},
-        {headers: DM_SERVICE_HEADERS},
-      )
-      return res.data
+      return await client.call(chat.bsky.group.withdrawJoinRequest, {convoId})
     },
     onSuccess: (data, {convoId}) => {
       queryClient.setQueriesData<ConvoRequestListQueryData>(

From 4aae6b2c22a6fdd7459cfbbbee0de9a58e10ef6e Mon Sep 17 00:00:00 2001
From: Samuel Newman <mozzius@protonmail.com>
Date: Thu, 13 Aug 2026 22:26:16 +0300
Subject: [PATCH 12/32] [SDK] Migrate search, bookmarks, contacts and feed
 queries to the lex clients (#11360)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
---
 .../Autocomplete/useAutocomplete/index.ts     |   9 +-
 .../contacts/screens/PhoneInput.tsx           |  40 ++---
 .../contacts/screens/VerifyNumber.tsx         | 139 +++++++++---------
 .../contacts/screens/ViewMatches.tsx          |   9 +-
 src/screens/Settings/FindContactsSettings.tsx |  29 ++--
 src/state/feed-feedback.tsx                   |  35 +++--
 src/state/queries/actor-autocomplete.ts       |  19 +--
 src/state/queries/actor-search.ts             |  17 +--
 .../queries/bookmarks/useBookmarkMutation.ts  |  14 +-
 .../queries/bookmarks/useBookmarksQuery.ts    |  52 ++++---
 src/state/queries/feed.ts                     | 124 +++++++++-------
 src/state/queries/find-contacts.ts            |  41 +++---
 src/state/queries/pds-detection.ts            |  23 ++-
 src/state/queries/resolve-uri.ts              |  28 ++--
 src/view/com/auth/LoggedOut.tsx               |  13 +-
 src/view/com/composer/drafts/state/queries.ts |  45 ++++--
 16 files changed, 350 insertions(+), 287 deletions(-)

diff --git a/src/components/Autocomplete/useAutocomplete/index.ts b/src/components/Autocomplete/useAutocomplete/index.ts
index 498cc766cd..1dc3100f37 100644
--- a/src/components/Autocomplete/useAutocomplete/index.ts
+++ b/src/components/Autocomplete/useAutocomplete/index.ts
@@ -6,13 +6,14 @@ import {isJustAMute, moduiContainsHideableOffense} from '#/lib/moderation'
 import {useModerationOpts} from '#/state/preferences/moderation-opts'
 import {STALE} from '#/state/queries'
 import {DEFAULT_LOGGED_OUT_PREFERENCES} from '#/state/queries/preferences'
-import {useAgent} from '#/state/session'
+import {useAppviewClient} from '#/state/session'
 import {
   type AutocompleteApi,
   type AutocompleteItem,
   type AutocompleteItemType,
   type AutocompleteProfile,
 } from '#/components/Autocomplete/types'
+import {app} from '#/lexicons'
 import {useEmojiSearch} from './useEmojiSearch'
 
 const DEFAULT_MOD_OPTS = {
@@ -31,7 +32,7 @@ export function useAutocomplete({
   limit?: number
   showSearchFallback?: boolean
 }): AutocompleteApi {
-  const agent = useAgent()
+  const client = useAppviewClient()
   const moderationOpts = useModerationOpts()
   const emojiSearch = useEmojiSearch()
 
@@ -52,12 +53,12 @@ export function useAutocomplete({
         // Going from "foo" to "foo." should not clear matches.
         q = q.toLowerCase().trim().replace(/\.$/, '')
 
-        const res = await agent.searchActorsTypeahead({
+        const data = await client.call(app.bsky.actor.searchActorsTypeahead, {
           q,
           limit: limit || 8,
         })
 
-        return (res?.data.actors || []).map(profile => ({
+        return (data?.actors || []).map(profile => ({
           key: profile.did,
           type: 'profile' as const,
           value: '@' + profile.handle,
diff --git a/src/components/contacts/screens/PhoneInput.tsx b/src/components/contacts/screens/PhoneInput.tsx
index 6904789a6e..95d63055c0 100644
--- a/src/components/contacts/screens/PhoneInput.tsx
+++ b/src/components/contacts/screens/PhoneInput.tsx
@@ -2,7 +2,6 @@ import {useState} from 'react'
 import {Keyboard, View} from 'react-native'
 import {KeyboardAvoidingView} from 'react-native-keyboard-controller'
 import {useSafeAreaInsets} from 'react-native-safe-area-context'
-import {AppBskyContactStartPhoneVerification} from '@atproto/api'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
@@ -14,8 +13,9 @@ import {
   getDefaultCountry,
 } from '#/lib/international-telephone-codes'
 import {cleanError, isNetworkError} from '#/lib/strings/errors'
+import {matchXrpcError} from '#/lib/xrpc-error'
 import {logger} from '#/logger'
-import {useAgent} from '#/state/session'
+import {useAppviewClient} from '#/state/session'
 import {OnboardingPosition} from '#/screens/Onboarding/Layout'
 import {
   android,
@@ -34,6 +34,7 @@ import {Loader} from '#/components/Loader'
 import {Text} from '#/components/Typography'
 import {useAnalytics} from '#/analytics'
 import {useGeolocation} from '#/geolocation'
+import {app} from '#/lexicons'
 import {isFindContactsFeatureEnabled} from '../country-allowlist'
 import {
   constructFullPhoneNumber,
@@ -56,7 +57,7 @@ export function PhoneInput({
   const {_} = useLingui()
   const ax = useAnalytics()
   const t = useTheme()
-  const agent = useAgent()
+  const client = useAppviewClient()
   const location = useGeolocation()
   const [countryCode, setCountryCode] = useState(
     () => state.phoneCountryCode ?? getDefaultCountry(location),
@@ -78,7 +79,7 @@ export function PhoneInput({
       phoneNumber: string
     }) => {
       // sends a onetime code to the user's phone number
-      await agent.app.bsky.contact.startPhoneVerification({
+      await client.call(app.bsky.contact.startPhoneVerification, {
         phone: constructFullPhoneNumber(phoneCountryCode, phoneNumber),
       })
     },
@@ -102,23 +103,22 @@ export function PhoneInput({
             msg`A network error occurred. Please check your internet connection`,
           ),
         )
-      } else if (
-        err instanceof
-        AppBskyContactStartPhoneVerification.RateLimitExceededError
-      ) {
-        setError(_(msg`Rate limit exceeded. Please try again later.`))
-      } else if (
-        err instanceof AppBskyContactStartPhoneVerification.InvalidPhoneError
-      ) {
-        setError(
-          _(
-            msg`The verification provider was unable to send a code to your phone number. Please check your phone number and try again.`,
-          ),
-        )
-      } else {
-        logger.error('Verify phone number failed', {safeMessage: err})
-        setError(_(msg`An error occurred. ${cleanError(err)}`))
+        return
       }
+      switch (matchXrpcError(err, app.bsky.contact.startPhoneVerification)) {
+        case 'RateLimitExceeded':
+          setError(_(msg`Rate limit exceeded. Please try again later.`))
+          return
+        case 'InvalidPhone':
+          setError(
+            _(
+              msg`The verification provider was unable to send a code to your phone number. Please check your phone number and try again.`,
+            ),
+          )
+          return
+      }
+      logger.error('Verify phone number failed', {safeMessage: err})
+      setError(_(msg`An error occurred. ${cleanError(err)}`))
     },
   })
 
diff --git a/src/components/contacts/screens/VerifyNumber.tsx b/src/components/contacts/screens/VerifyNumber.tsx
index f9d062f691..0bd5369397 100644
--- a/src/components/contacts/screens/VerifyNumber.tsx
+++ b/src/components/contacts/screens/VerifyNumber.tsx
@@ -1,9 +1,5 @@
 import {useEffect, useMemo, useState} from 'react'
 import {Text as NestedText, View} from 'react-native'
-import {
-  AppBskyContactStartPhoneVerification,
-  AppBskyContactVerifyPhone,
-} from '@atproto/api'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
@@ -11,8 +7,9 @@ import {useMutation} from '@tanstack/react-query'
 
 import {clamp} from '#/lib/numbers'
 import {cleanError, isNetworkError} from '#/lib/strings/errors'
+import {matchXrpcError} from '#/lib/xrpc-error'
 import {logger} from '#/logger'
-import {useAgent} from '#/state/session'
+import {useAppviewClient} from '#/state/session'
 import {OnboardingPosition} from '#/screens/Onboarding/Layout'
 import {atoms as a, useGutters, useTheme} from '#/alf'
 import {Button, ButtonIcon, ButtonText} from '#/components/Button'
@@ -25,6 +22,7 @@ import {Loader} from '#/components/Loader'
 import * as Toast from '#/components/Toast'
 import {Text} from '#/components/Typography'
 import {useAnalytics} from '#/analytics'
+import {app} from '#/lexicons'
 import {OTPInput} from '../components/OTPInput'
 import {constructFullPhoneNumber, prettyPhoneNumber} from '../phone-number'
 import {type Action, type State, useOnPressBackButton} from '../state'
@@ -43,7 +41,7 @@ export function VerifyNumber({
   const t = useTheme()
   const {_} = useLingui()
   const ax = useAnalytics()
-  const agent = useAgent()
+  const client = useAppviewClient()
   const gutters = useGutters([0, 'wide'])
 
   const [otpCode, setOtpCode] = useState('')
@@ -72,8 +70,11 @@ export function VerifyNumber({
     isSuccess,
   } = useMutation({
     mutationFn: async (code: string) => {
-      const res = await agent.app.bsky.contact.verifyPhone({code, phone})
-      return res.data.token
+      const data = await client.call(app.bsky.contact.verifyPhone, {
+        code,
+        phone,
+      })
+      return data.token
     },
     onSuccess: async token => {
       // let the success state show for a moment
@@ -99,44 +100,47 @@ export function VerifyNumber({
             msg`A network error occurred. Please check your internet connection.`,
           ),
         })
-      } else if (err instanceof AppBskyContactVerifyPhone.InvalidCodeError) {
-        setError({
-          retryable: true,
-          isResendError: true,
-          message: _(msg`This code is invalid. Resend to get a new code.`),
-        })
-      } else if (err instanceof AppBskyContactVerifyPhone.InvalidPhoneError) {
-        setError({
-          retryable: false,
-          isResendError: false,
-          message: _(
-            msg`The verification provider was unable to send a code to your phone number. Please check your phone number and try again.`,
-          ),
-        })
-      } else if (
-        err instanceof AppBskyContactVerifyPhone.RateLimitExceededError
-      ) {
-        setError({
-          retryable: true,
-          isResendError: false,
-          message: _(
-            msg`Too many attempts. Please wait a few minutes and try again.`,
-          ),
-        })
-      } else {
-        logger.error('Verify phone number failed', {safeMessage: err})
-        setError({
-          retryable: true,
-          isResendError: false,
-          message: _(msg`An error occurred. ${cleanError(err)}`),
-        })
+        return
       }
+      switch (matchXrpcError(err, app.bsky.contact.verifyPhone)) {
+        case 'InvalidCode':
+          setError({
+            retryable: true,
+            isResendError: true,
+            message: _(msg`This code is invalid. Resend to get a new code.`),
+          })
+          return
+        case 'InvalidPhone':
+          setError({
+            retryable: false,
+            isResendError: false,
+            message: _(
+              msg`The verification provider was unable to send a code to your phone number. Please check your phone number and try again.`,
+            ),
+          })
+          return
+        case 'RateLimitExceeded':
+          setError({
+            retryable: true,
+            isResendError: false,
+            message: _(
+              msg`Too many attempts. Please wait a few minutes and try again.`,
+            ),
+          })
+          return
+      }
+      logger.error('Verify phone number failed', {safeMessage: err})
+      setError({
+        retryable: true,
+        isResendError: false,
+        message: _(msg`An error occurred. ${cleanError(err)}`),
+      })
     },
   })
 
   const {mutate: resendCode, isPending: isResendingCode} = useMutation({
     mutationFn: async () => {
-      await agent.app.bsky.contact.startPhoneVerification({phone: phone})
+      await client.call(app.bsky.contact.startPhoneVerification, {phone: phone})
     },
     onSuccess: () => {
       dispatch({type: 'RESEND_VERIFICATION_CODE'})
@@ -155,35 +159,34 @@ export function VerifyNumber({
             msg`A network error occurred. Please check your internet connection.`,
           ),
         })
-      } else if (
-        err instanceof AppBskyContactStartPhoneVerification.InvalidPhoneError
-      ) {
-        setError({
-          retryable: false,
-          isResendError: true,
-          message: _(
-            msg`The verification provider was unable to send a code to your phone number. Please check your phone number and try again.`,
-          ),
-        })
-      } else if (
-        err instanceof
-        AppBskyContactStartPhoneVerification.RateLimitExceededError
-      ) {
-        setError({
-          retryable: true,
-          isResendError: true,
-          message: _(
-            msg`Too many codes sent. Please wait a few minutes and try again.`,
-          ),
-        })
-      } else {
-        logger.error('Resend failed', {safeMessage: err})
-        setError({
-          retryable: true,
-          isResendError: true,
-          message: _(msg`An error occurred. ${cleanError(err)}`),
-        })
+        return
       }
+      switch (matchXrpcError(err, app.bsky.contact.startPhoneVerification)) {
+        case 'InvalidPhone':
+          setError({
+            retryable: false,
+            isResendError: true,
+            message: _(
+              msg`The verification provider was unable to send a code to your phone number. Please check your phone number and try again.`,
+            ),
+          })
+          return
+        case 'RateLimitExceeded':
+          setError({
+            retryable: true,
+            isResendError: true,
+            message: _(
+              msg`Too many codes sent. Please wait a few minutes and try again.`,
+            ),
+          })
+          return
+      }
+      logger.error('Resend failed', {safeMessage: err})
+      setError({
+        retryable: true,
+        isResendError: true,
+        message: _(msg`An error occurred. ${cleanError(err)}`),
+      })
     },
   })
 
diff --git a/src/components/contacts/screens/ViewMatches.tsx b/src/components/contacts/screens/ViewMatches.tsx
index 3543c604f5..dab3a79c6b 100644
--- a/src/components/contacts/screens/ViewMatches.tsx
+++ b/src/components/contacts/screens/ViewMatches.tsx
@@ -3,6 +3,7 @@ import {View} from 'react-native'
 import {useSafeAreaInsets} from 'react-native-safe-area-context'
 import * as SMS from 'expo-sms'
 import {type ModerationOpts} from '@atproto/api'
+import {type DidString} from '@atproto/syntax'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Plural, Trans} from '@lingui/react/macro'
@@ -20,7 +21,7 @@ import {
   optimisticRemoveMatch,
   useMatchesPassthroughQuery,
 } from '#/state/queries/find-contacts'
-import {useAgent, useSession} from '#/state/session'
+import {useAgent, useAppviewClient, useSession} from '#/state/session'
 import {List, type ListMethods} from '#/view/com/util/List'
 import {UserAvatar} from '#/view/com/util/UserAvatar'
 import {OnboardingPosition} from '#/screens/Onboarding/Layout'
@@ -41,6 +42,7 @@ import * as ProfileCard from '#/components/ProfileCard'
 import * as Toast from '#/components/Toast'
 import {Text} from '#/components/Typography'
 import {useAnalytics} from '#/analytics'
+import {app} from '#/lexicons'
 import type * as bsky from '#/types/bsky'
 import {InviteInfo} from '../components/InviteInfo'
 import {type Action, type Contact, type Match, type State} from '../state'
@@ -90,6 +92,7 @@ export function ViewMatches({
   const moderationOpts = useModerationOpts()
   const queryClient = useQueryClient()
   const agent = useAgent()
+  const client = useAppviewClient()
   const insets = useSafeAreaInsets()
   const listRef = useRef<ListMethods>(null)
 
@@ -218,7 +221,9 @@ export function ViewMatches({
 
   const {mutate: dismissMatch} = useMutation({
     mutationFn: async (did: string) => {
-      await agent.app.bsky.contact.dismissMatch({subject: did})
+      await client.call(app.bsky.contact.dismissMatch, {
+        subject: did as DidString,
+      })
     },
     onMutate: did => {
       ax.metric('contacts:matches:dismiss', {entryPoint: context})
diff --git a/src/screens/Settings/FindContactsSettings.tsx b/src/screens/Settings/FindContactsSettings.tsx
index 57f1edde90..6104fd12b7 100644
--- a/src/screens/Settings/FindContactsSettings.tsx
+++ b/src/screens/Settings/FindContactsSettings.tsx
@@ -1,11 +1,8 @@
 import {useCallback, useEffect, useState} from 'react'
 import {type ListRenderItemInfo, View} from 'react-native'
 import * as Contacts from 'expo-contacts'
-import {
-  type AppBskyContactDefs,
-  type AppBskyContactGetSyncStatus,
-  type ModerationOpts,
-} from '@atproto/api'
+import {type AppBskyContactDefs, type ModerationOpts} from '@atproto/api'
+import {type DidString} from '@atproto/syntax'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Plural, Trans} from '@lingui/react/macro'
@@ -32,7 +29,7 @@ import {
   useContactsMatchesQuery,
   useContactsSyncStatusQuery,
 } from '#/state/queries/find-contacts'
-import {useAgent, useSession} from '#/state/session'
+import {useAgent, useAppviewClient, useSession} from '#/state/session'
 import {ErrorScreen} from '#/view/com/util/error/ErrorScreen'
 import {List} from '#/view/com/util/List'
 import {atoms as a, tokens, useGutters, useTheme} from '#/alf'
@@ -52,6 +49,7 @@ import {Text} from '#/components/Typography'
 import {useAnalytics} from '#/analytics'
 import {IS_NATIVE} from '#/env'
 import {InviteFriendsDialog} from '#/features/inviteFriends'
+import {app} from '#/lexicons'
 import type * as bsky from '#/types/bsky'
 import {bulkWriteFollows} from '../Onboarding/util'
 
@@ -194,7 +192,7 @@ function SyncStatus({
   refetchStatus: () => Promise<any>
 }) {
   const ax = useAnalytics()
-  const agent = useAgent()
+  const client = useAppviewClient()
   const queryClient = useQueryClient()
   const {_} = useLingui()
   const moderationOpts = useModerationOpts()
@@ -219,7 +217,9 @@ function SyncStatus({
 
   const {mutate: dismissMatch} = useMutation({
     mutationFn: async (did: string) => {
-      await agent.app.bsky.contact.dismissMatch({subject: did})
+      await client.call(app.bsky.contact.dismissMatch, {
+        subject: did as DidString,
+      })
     },
     onMutate: async (did: string) => {
       ax.metric('contacts:settings:dismiss', {})
@@ -371,6 +371,7 @@ function StatusHeader({
   const {_} = useLingui()
   const ax = useAnalytics()
   const agent = useAgent()
+  const client = useAppviewClient()
   const queryClient = useQueryClient()
   const {currentAccount} = useSession()
 
@@ -384,12 +385,12 @@ function StatusHeader({
 
       let cursor: string | undefined
       do {
-        const page = await agent.app.bsky.contact.getMatches({
+        const page = await client.call(app.bsky.contact.getMatches, {
           limit: 100,
           cursor,
         })
-        cursor = page.data.cursor
-        for (const profile of page.data.matches) {
+        cursor = page.cursor
+        for (const profile of page.matches) {
           if (
             profile.did !== currentAccount?.did &&
             !isBlockedOrBlocking(profile) &&
@@ -487,17 +488,17 @@ function StatusFooter({syncedAt}: {syncedAt: string}) {
   const {_, i18n} = useLingui()
   const t = useTheme()
   const ax = useAnalytics()
-  const agent = useAgent()
+  const client = useAppviewClient()
   const queryClient = useQueryClient()
 
   const {mutate: removeData, isPending} = useMutation({
     mutationFn: async () => {
-      await agent.app.bsky.contact.removeData({})
+      await client.call(app.bsky.contact.removeData, {})
     },
     onMutate: () => ax.metric('contacts:settings:removeData', {}),
     onSuccess: () => {
       Toast.show(_(msg`Contacts removed`))
-      queryClient.setQueryData<AppBskyContactGetSyncStatus.OutputSchema>(
+      queryClient.setQueryData<app.bsky.contact.getSyncStatus.$OutputBody>(
         findContactsStatusQueryKey,
         {syncStatus: undefined},
       )
diff --git a/src/state/feed-feedback.tsx b/src/state/feed-feedback.tsx
index 15c12e732d..dbd10b3c9d 100644
--- a/src/state/feed-feedback.tsx
+++ b/src/state/feed-feedback.tsx
@@ -8,6 +8,7 @@ import {
 } from 'react'
 import {AppState, type AppStateStatus} from 'react-native'
 import {type AppBskyFeedDefs} from '@atproto/api'
+import {type AtUriString, type DidString} from '@atproto/syntax'
 import throttle from 'lodash.throttle'
 
 import {PROD_FEEDS, STAGING_FEEDS} from '#/lib/constants'
@@ -22,7 +23,8 @@ import {
 } from '#/state/queries/post-feed'
 import {getItemsForFeedback} from '#/view/com/posts/PostFeed'
 import {useAnalytics} from '#/analytics'
-import {useAgent} from './session'
+import {app} from '#/lexicons'
+import {useAppviewClient} from './session'
 
 export const FEEDBACK_FEEDS = [...PROD_FEEDS, ...STAGING_FEEDS]
 
@@ -65,7 +67,7 @@ export function useFeedFeedback(
 ) {
   const ax = useAnalytics()
   const logger = ax.logger.useChild(ax.logger.Context.FeedFeedback)
-  const agent = useAgent()
+  const client = useAppviewClient()
 
   const feed =
     !!feedSourceInfo && isFeedSourceFeedInfo(feedSourceInfo)
@@ -150,16 +152,19 @@ export function useFeedFeedback(
       return
     }
 
-    // Send to the feed
-    agent.app.bsky.feed
-      .sendInteractions(
-        {interactions: interactionsToSend, feed: feed?.uri},
+    /*
+     * Send to the feed. Interactions go to the feed generator rather than the
+     * appview, which the agent did by setting `atproto-proxy` by hand; the
+     * client's per-call `service` option writes that same header.
+     */
+    client
+      .call(
+        app.bsky.feed.sendInteractions,
         {
-          encoding: 'application/json',
-          headers: {
-            'atproto-proxy': `${proxyDid}#bsky_fg`,
-          },
+          interactions: interactionsToSend,
+          feed: feed?.uri as AtUriString | undefined,
         },
+        {service: `${proxyDid as DidString}#bsky_fg`},
       )
       .catch(() => {}) // ignore upstream errors
 
@@ -172,7 +177,7 @@ export function useFeedFeedback(
     )
     throttledFlushAggregatedStats()
     logger.debug('flushed')
-  }, [agent, throttledFlushAggregatedStats, proxyDid, enabled, feed])
+  }, [client, throttledFlushAggregatedStats, proxyDid, enabled, feed])
 
   const sendToFeed = useMemo(
     () =>
@@ -283,9 +288,13 @@ function toString(interaction: AppBskyFeedDefs.Interaction): string {
   }|${interaction.reqId || ''}`
 }
 
-function toInteraction(str: string): AppBskyFeedDefs.Interaction {
+function toInteraction(str: string): app.bsky.feed.defs.Interaction {
   const [item, event, feedContext, reqId] = str.split('|')
-  return {item, event, feedContext, reqId}
+  /*
+   * The fields come from splitting an internally-built key, so neither the
+   * at-uri nor the event token is narrowed by the compiler here.
+   */
+  return {item, event, feedContext, reqId} as app.bsky.feed.defs.Interaction
 }
 
 type AggregatedStats = {
diff --git a/src/state/queries/actor-autocomplete.ts b/src/state/queries/actor-autocomplete.ts
index c8acb39f96..14377c5347 100644
--- a/src/state/queries/actor-autocomplete.ts
+++ b/src/state/queries/actor-autocomplete.ts
@@ -9,7 +9,8 @@ import {keepPreviousData, useQuery, useQueryClient} from '@tanstack/react-query'
 import {isJustAMute, moduiContainsHideableOffense} from '#/lib/moderation'
 import {logger} from '#/logger'
 import {STALE} from '#/state/queries'
-import {useAgent} from '#/state/session'
+import {useAppviewClient} from '#/state/session'
+import {app} from '#/lexicons'
 import {useModerationOpts} from '../preferences/moderation-opts'
 import {DEFAULT_LOGGED_OUT_PREFERENCES} from './preferences'
 
@@ -27,7 +28,7 @@ export function useActorAutocompleteQuery(
   limit?: number,
 ) {
   const moderationOpts = useModerationOpts()
-  const agent = useAgent()
+  const client = useAppviewClient()
 
   prefix = prefix.toLowerCase().trim()
   if (prefix.endsWith('.')) {
@@ -39,13 +40,13 @@ export function useActorAutocompleteQuery(
     staleTime: STALE.MINUTES.ONE,
     queryKey: RQKEY(prefix || ''),
     async queryFn() {
-      const res = prefix
-        ? await agent.searchActorsTypeahead({
+      const data = prefix
+        ? await client.call(app.bsky.actor.searchActorsTypeahead, {
             q: prefix,
             limit: limit || 8,
           })
         : undefined
-      return res?.data.actors || []
+      return data?.actors || []
     },
     select: useCallback(
       (data: AppBskyActorDefs.ProfileViewBasic[]) => {
@@ -65,7 +66,7 @@ export type ActorAutocompleteFn = ReturnType<typeof useActorAutocompleteFn>
 export function useActorAutocompleteFn() {
   const queryClient = useQueryClient()
   const moderationOpts = useModerationOpts()
-  const agent = useAgent()
+  const client = useAppviewClient()
 
   return useCallback(
     async ({query, limit = 8}: {query: string; limit?: number}) => {
@@ -77,7 +78,7 @@ export function useActorAutocompleteFn() {
             staleTime: STALE.MINUTES.ONE,
             queryKey: RQKEY(query || ''),
             queryFn: () =>
-              agent.searchActorsTypeahead({
+              client.call(app.bsky.actor.searchActorsTypeahead, {
                 q: query,
                 limit,
               }),
@@ -91,11 +92,11 @@ export function useActorAutocompleteFn() {
 
       return computeSuggestions({
         q: query,
-        searched: res?.data.actors,
+        searched: res?.actors,
         moderationOpts: moderationOpts || DEFAULT_MOD_OPTS,
       })
     },
-    [queryClient, moderationOpts, agent],
+    [queryClient, moderationOpts, client],
   )
 }
 
diff --git a/src/state/queries/actor-search.ts b/src/state/queries/actor-search.ts
index 84e6d88f29..547bf39b0f 100644
--- a/src/state/queries/actor-search.ts
+++ b/src/state/queries/actor-search.ts
@@ -1,4 +1,3 @@
-import {type AppBskyActorSearchActors} from '@atproto/api'
 import {
   type InfiniteData,
   keepPreviousData,
@@ -8,7 +7,8 @@ import {
 } from '@tanstack/react-query'
 
 import {STALE} from '#/state/queries'
-import {useAgent} from '#/state/session'
+import {useAppviewClient} from '#/state/session'
+import {app} from '#/lexicons'
 
 export const RQKEY_ROOT = 'actor-search'
 export const RQKEY = (query: string, limit?: number) => [
@@ -28,23 +28,22 @@ export function useActorSearch({
   maintainData?: boolean
   limit?: number
 }) {
-  const agent = useAgent()
+  const client = useAppviewClient()
   return useInfiniteQuery<
-    AppBskyActorSearchActors.OutputSchema,
+    app.bsky.actor.searchActors.$OutputBody,
     Error,
-    InfiniteData<AppBskyActorSearchActors.OutputSchema>,
+    InfiniteData<app.bsky.actor.searchActors.$OutputBody>,
     QueryKey,
     string | undefined
   >({
     staleTime: STALE.MINUTES.FIVE,
     queryKey: RQKEY(query, limit),
     queryFn: async ({pageParam}) => {
-      const res = await agent.searchActors({
+      return await client.call(app.bsky.actor.searchActors, {
         q: query,
         limit,
         cursor: pageParam,
       })
-      return res.data
     },
     enabled: enabled && !!query,
     initialPageParam: undefined,
@@ -54,7 +53,7 @@ export function useActorSearch({
   })
 }
 
-function select(data: InfiniteData<AppBskyActorSearchActors.OutputSchema>) {
+function select(data: InfiniteData<app.bsky.actor.searchActors.$OutputBody>) {
   // enforce uniqueness
   const dids = new Set()
 
@@ -77,7 +76,7 @@ export function* findAllProfilesInQueryData(
   did: string,
 ) {
   const queryDatas = queryClient.getQueriesData<
-    InfiniteData<AppBskyActorSearchActors.OutputSchema>
+    InfiniteData<app.bsky.actor.searchActors.$OutputBody>
   >({
     queryKey: [RQKEY_ROOT],
   })
diff --git a/src/state/queries/bookmarks/useBookmarkMutation.ts b/src/state/queries/bookmarks/useBookmarkMutation.ts
index c6e745aa04..af5a4a2d8d 100644
--- a/src/state/queries/bookmarks/useBookmarkMutation.ts
+++ b/src/state/queries/bookmarks/useBookmarkMutation.ts
@@ -1,4 +1,5 @@
 import {type AppBskyFeedDefs} from '@atproto/api'
+import {type AtUriString} from '@atproto/syntax'
 import {useMutation, useQueryClient} from '@tanstack/react-query'
 
 import {isNetworkError} from '#/lib/strings/errors'
@@ -8,7 +9,8 @@ import {
   optimisticallyDeleteBookmark,
   optimisticallySaveBookmark,
 } from '#/state/queries/bookmarks/useBookmarksQuery'
-import {useAgent} from '#/state/session'
+import {useAppviewClient} from '#/state/session'
+import {app} from '#/lexicons'
 
 type MutationArgs =
   | {action: 'create'; post: AppBskyFeedDefs.PostView}
@@ -23,20 +25,20 @@ type MutationArgs =
 
 export function useBookmarkMutation() {
   const qc = useQueryClient()
-  const agent = useAgent()
+  const client = useAppviewClient()
 
   return useMutation({
     async mutationFn(args: MutationArgs) {
       if (args.action === 'create') {
         updatePostShadow(qc, args.post.uri, {bookmarked: true})
-        await agent.app.bsky.bookmark.createBookmark({
-          uri: args.post.uri,
+        await client.call(app.bsky.bookmark.createBookmark, {
+          uri: args.post.uri as AtUriString,
           cid: args.post.cid,
         })
       } else if (args.action === 'delete') {
         updatePostShadow(qc, args.uri, {bookmarked: false})
-        await agent.app.bsky.bookmark.deleteBookmark({
-          uri: args.uri,
+        await client.call(app.bsky.bookmark.deleteBookmark, {
+          uri: args.uri as AtUriString,
         })
       }
     },
diff --git a/src/state/queries/bookmarks/useBookmarksQuery.ts b/src/state/queries/bookmarks/useBookmarksQuery.ts
index 3e8e87a132..14323625f9 100644
--- a/src/state/queries/bookmarks/useBookmarksQuery.ts
+++ b/src/state/queries/bookmarks/useBookmarksQuery.ts
@@ -1,9 +1,4 @@
-import {
-  type $Typed,
-  type AppBskyBookmarkGetBookmarks,
-  AppBskyFeedDefs,
-  AtUri,
-} from '@atproto/api'
+import {type $Typed, AppBskyFeedDefs, AtUri} from '@atproto/api'
 import {
   type InfiniteData,
   type QueryClient,
@@ -16,28 +11,28 @@ import {
   embedViewRecordToPostView,
   getEmbeddedPost,
 } from '#/state/queries/util'
-import {useAgent} from '#/state/session'
+import {useAppviewClient} from '#/state/session'
+import {app} from '#/lexicons'
 import * as bsky from '#/types/bsky'
 
 export const bookmarksQueryKeyRoot = 'bookmarks'
 export const createBookmarksQueryKey = () => [bookmarksQueryKeyRoot]
 
 export function useBookmarksQuery() {
-  const agent = useAgent()
+  const client = useAppviewClient()
 
   return useInfiniteQuery<
-    AppBskyBookmarkGetBookmarks.OutputSchema,
+    app.bsky.bookmark.getBookmarks.$OutputBody,
     Error,
-    InfiniteData<AppBskyBookmarkGetBookmarks.OutputSchema>,
+    InfiniteData<app.bsky.bookmark.getBookmarks.$OutputBody>,
     QueryKey,
     string | undefined
   >({
     queryKey: createBookmarksQueryKey(),
     async queryFn({pageParam}) {
-      const res = await agent.app.bsky.bookmark.getBookmarks({
+      return await client.call(app.bsky.bookmark.getBookmarks, {
         cursor: pageParam,
       })
-      return res.data
     },
     initialPageParam: undefined,
     getNextPageParam: lastPage => lastPage.cursor,
@@ -45,7 +40,7 @@ export function useBookmarksQuery() {
 }
 
 export async function truncateAndInvalidate(qc: QueryClient) {
-  qc.setQueriesData<InfiniteData<AppBskyBookmarkGetBookmarks.OutputSchema>>(
+  qc.setQueriesData<InfiniteData<app.bsky.bookmark.getBookmarks.$OutputBody>>(
     {queryKey: [bookmarksQueryKeyRoot]},
     data => {
       if (data) {
@@ -64,7 +59,7 @@ export async function optimisticallySaveBookmark(
   qc: QueryClient,
   post: AppBskyFeedDefs.PostView,
 ) {
-  qc.setQueriesData<InfiniteData<AppBskyBookmarkGetBookmarks.OutputSchema>>(
+  qc.setQueriesData<InfiniteData<app.bsky.bookmark.getBookmarks.$OutputBody>>(
     {
       queryKey: [bookmarksQueryKeyRoot],
     },
@@ -75,19 +70,22 @@ export async function optimisticallySaveBookmark(
         pages: data.pages.map((page, index) => {
           if (index === 0) {
             post.$type = 'app.bsky.feed.defs#postView'
+            /*
+             * The optimistic entry is synthesized from an `@atproto/api`
+             * `PostView`, whose string fields are unbranded, so it is asserted
+             * to the vendored view type the query data is now keyed on.
+             */
+            const bookmark = {
+              createdAt: new Date().toISOString(),
+              subject: {
+                uri: post.uri,
+                cid: post.cid,
+              },
+              item: post as $Typed<AppBskyFeedDefs.PostView>,
+            } as unknown as app.bsky.bookmark.defs.BookmarkView
             return {
               ...page,
-              bookmarks: [
-                {
-                  createdAt: new Date().toISOString(),
-                  subject: {
-                    uri: post.uri,
-                    cid: post.cid,
-                  },
-                  item: post as $Typed<AppBskyFeedDefs.PostView>,
-                },
-                ...page.bookmarks,
-              ],
+              bookmarks: [bookmark, ...page.bookmarks],
             }
           }
           return page
@@ -101,7 +99,7 @@ export async function optimisticallyDeleteBookmark(
   qc: QueryClient,
   {uri}: {uri: string},
 ) {
-  qc.setQueriesData<InfiniteData<AppBskyBookmarkGetBookmarks.OutputSchema>>(
+  qc.setQueriesData<InfiniteData<app.bsky.bookmark.getBookmarks.$OutputBody>>(
     {
       queryKey: [bookmarksQueryKeyRoot],
     },
@@ -125,7 +123,7 @@ export function* findAllPostsInQueryData(
   uri: string,
 ): Generator<AppBskyFeedDefs.PostView, undefined> {
   const queryDatas = queryClient.getQueriesData<
-    InfiniteData<AppBskyBookmarkGetBookmarks.OutputSchema>
+    InfiniteData<app.bsky.bookmark.getBookmarks.$OutputBody>
   >({
     queryKey: [bookmarksQueryKeyRoot],
   })
diff --git a/src/state/queries/feed.ts b/src/state/queries/feed.ts
index c3ac1acd53..9a9a8c09b9 100644
--- a/src/state/queries/feed.ts
+++ b/src/state/queries/feed.ts
@@ -3,11 +3,11 @@ import {
   type AppBskyActorDefs,
   type AppBskyFeedDefs,
   type AppBskyGraphDefs,
-  type AppBskyUnspeccedGetPopularFeedGenerators,
   AtUri,
   moderateFeedGenerator,
   RichText,
 } from '@atproto/api'
+import {type AtUriString} from '@atproto/syntax'
 import {t} from '@lingui/core/macro'
 import {
   type InfiniteData,
@@ -26,7 +26,8 @@ import {GCTIME, STALE} from '#/state/queries'
 import {RQKEY as listQueryKey} from '#/state/queries/list'
 import {usePreferencesQuery} from '#/state/queries/preferences'
 import {createQueryKey} from '#/state/queries/util'
-import {useAgent, useSession} from '#/state/session'
+import {useAppviewClient, useSession} from '#/state/session'
+import {app} from '#/lexicons'
 import {router} from '#/routes'
 import {useModerationOpts} from '../preferences/moderation-opts'
 import {type FeedDescriptor} from './post-feed'
@@ -184,7 +185,7 @@ export function getAvatarTypeFromUri(uri: string) {
 
 export function useFeedSourceInfoQuery({uri}: {uri: string}) {
   const type = getFeedTypeFromUri(uri)
-  const agent = useAgent()
+  const client = useAppviewClient()
 
   return useQuery({
     staleTime: STALE.INFINITY,
@@ -193,14 +194,16 @@ export function useFeedSourceInfoQuery({uri}: {uri: string}) {
       let view: FeedSourceInfo
 
       if (type === 'feed') {
-        const res = await agent.app.bsky.feed.getFeedGenerator({feed: uri})
-        view = hydrateFeedGenerator(res.data.view)
+        const data = await client.call(app.bsky.feed.getFeedGenerator, {
+          feed: uri as AtUriString,
+        })
+        view = hydrateFeedGenerator(data.view)
       } else {
-        const res = await agent.app.bsky.graph.getList({
-          list: uri,
+        const data = await client.call(app.bsky.graph.getList, {
+          list: uri as AtUriString,
           limit: 1,
         })
-        view = hydrateList(res.data.list)
+        view = hydrateList(data.list)
       }
 
       return view
@@ -234,7 +237,7 @@ export function createGetPopularFeedsQueryKey(
 
 export function useGetPopularFeedsQuery(options?: GetPopularFeedsOptions) {
   const {hasSession} = useSession()
-  const agent = useAgent()
+  const client = useAppviewClient()
   const limit = options?.limit || 10
   const {data: preferences} = usePreferencesQuery()
   const queryClient = useQueryClient()
@@ -255,24 +258,27 @@ export function useGetPopularFeedsQuery(options?: GetPopularFeedsOptions) {
     enabled: Boolean(moderationOpts) && options?.enabled !== false,
     queryKey: createGetPopularFeedsQueryKey(options),
     queryFn: async ({pageParam}) => {
-      const res = await agent.app.bsky.unspecced.getPopularFeedGenerators({
-        limit,
-        cursor: pageParam,
-      })
+      const data = await client.call(
+        app.bsky.unspecced.getPopularFeedGenerators,
+        {
+          limit,
+          cursor: pageParam,
+        },
+      )
 
       // precache feeds
-      for (const feed of res.data.feeds) {
+      for (const feed of data.feeds) {
         const hydratedFeed = hydrateFeedGenerator(feed)
         precacheFeed(queryClient, hydratedFeed)
       }
 
-      return res.data
+      return data
     },
     initialPageParam: undefined as string | undefined,
     getNextPageParam: lastPage => lastPage.cursor,
     select: useCallback(
       (
-        data: InfiniteData<AppBskyUnspeccedGetPopularFeedGenerators.OutputSchema>,
+        data: InfiniteData<app.bsky.unspecced.getPopularFeedGenerators.$OutputBody>,
       ) => {
         const {
           savedFeeds,
@@ -336,24 +342,27 @@ export function useGetPopularFeedsQuery(options?: GetPopularFeedsOptions) {
 }
 
 export function useSearchPopularFeedsMutation() {
-  const agent = useAgent()
+  const client = useAppviewClient()
   const moderationOpts = useModerationOpts()
 
   return useMutation({
     mutationFn: async (query: string) => {
-      const res = await agent.app.bsky.unspecced.getPopularFeedGenerators({
-        limit: 10,
-        query: query,
-      })
+      const data = await client.call(
+        app.bsky.unspecced.getPopularFeedGenerators,
+        {
+          limit: 10,
+          query: query,
+        },
+      )
 
       if (moderationOpts) {
-        return res.data.feeds.filter(feed => {
+        return data.feeds.filter(feed => {
           const decision = moderateFeedGenerator(feed, moderationOpts)
           return !decision.ui('contentMedia').blur
         })
       }
 
-      return res.data.feeds
+      return data.feeds
     },
   })
 }
@@ -371,7 +380,7 @@ export function usePopularFeedsSearch({
   query: string
   enabled?: boolean
 }) {
-  const agent = useAgent()
+  const client = useAppviewClient()
   const moderationOpts = useModerationOpts()
   const enabledInner = enabled ?? Boolean(moderationOpts)
 
@@ -379,12 +388,15 @@ export function usePopularFeedsSearch({
     enabled: enabledInner,
     queryKey: createPopularFeedsSearchQueryKey(query),
     queryFn: async () => {
-      const res = await agent.app.bsky.unspecced.getPopularFeedGenerators({
-        limit: 15,
-        query: query,
-      })
+      const data = await client.call(
+        app.bsky.unspecced.getPopularFeedGenerators,
+        {
+          limit: 15,
+          query: query,
+        },
+      )
 
-      return res.data.feeds
+      return data.feeds
     },
     placeholderData: keepPreviousData,
     select(data) {
@@ -444,7 +456,7 @@ const createPinnedFeedInfosQueryKey = (
 
 export function usePinnedFeedsInfos() {
   const {hasSession} = useSession()
-  const agent = useAgent()
+  const client = useAppviewClient()
   const {data: preferences, isLoading: isLoadingPrefs} = usePreferencesQuery()
   const pinnedItems = preferences?.savedFeeds.filter(feed => feed.pinned) ?? []
 
@@ -467,13 +479,13 @@ export function usePinnedFeedsInfos() {
       const pinnedFeeds = pinnedItems.filter(feed => feed.type === 'feed')
       let feedsPromise = Promise.resolve()
       if (pinnedFeeds.length > 0) {
-        feedsPromise = agent.app.bsky.feed
-          .getFeedGenerators({
-            feeds: pinnedFeeds.map(f => f.value),
+        feedsPromise = client
+          .call(app.bsky.feed.getFeedGenerators, {
+            feeds: pinnedFeeds.map(f => f.value as AtUriString),
           })
-          .then(res => {
-            for (let i = 0; i < res.data.feeds.length; i++) {
-              const feedView = res.data.feeds[i]
+          .then(data => {
+            for (let i = 0; i < data.feeds.length; i++) {
+              const feedView = data.feeds[i]
               resolved.set(feedView.uri, hydrateFeedGenerator(feedView))
             }
           })
@@ -482,13 +494,13 @@ export function usePinnedFeedsInfos() {
       // Get all lists. This currently has to be done individually.
       const pinnedLists = pinnedItems.filter(feed => feed.type === 'list')
       const listsPromises = pinnedLists.map(list =>
-        agent.app.bsky.graph
-          .getList({
-            list: list.value,
+        client
+          .call(app.bsky.graph.getList, {
+            list: list.value as AtUriString,
             limit: 1,
           })
-          .then(res => {
-            const listView = res.data.list
+          .then(data => {
+            const listView = data.list
             resolved.set(listView.uri, hydrateList(listView))
           }),
       )
@@ -551,7 +563,7 @@ export type SavedFeedItem =
     }
 
 export function useSavedFeeds() {
-  const agent = useAgent()
+  const client = useAppviewClient()
   const {data: preferences, isLoading: isLoadingPrefs} = usePreferencesQuery()
   const savedItems = preferences?.savedFeeds ?? []
   const queryClient = useQueryClient()
@@ -582,25 +594,25 @@ export function useSavedFeeds() {
 
       let feedsPromise = Promise.resolve()
       if (savedFeeds.length > 0) {
-        feedsPromise = agent.app.bsky.feed
-          .getFeedGenerators({
-            feeds: savedFeeds.map(f => f.value),
+        feedsPromise = client
+          .call(app.bsky.feed.getFeedGenerators, {
+            feeds: savedFeeds.map(f => f.value as AtUriString),
           })
-          .then(res => {
-            res.data.feeds.forEach(f => {
+          .then(data => {
+            data.feeds.forEach(f => {
               resolvedFeeds.set(f.uri, f)
             })
           })
       }
 
       const listsPromises = savedLists.map(list =>
-        agent.app.bsky.graph
-          .getList({
-            list: list.value,
+        client
+          .call(app.bsky.graph.getList, {
+            list: list.value as AtUriString,
             limit: 1,
           })
-          .then(res => {
-            const listView = res.data.list
+          .then(data => {
+            const listView = data.list
             resolvedLists.set(listView.uri, listView)
           }),
       )
@@ -656,7 +668,7 @@ export function useSavedFeeds() {
 const feedInfoQueryKeyRoot = 'feedInfo'
 
 export function useFeedInfo(feedUri: string | undefined) {
-  const agent = useAgent()
+  const client = useAppviewClient()
 
   return useQuery({
     staleTime: STALE.INFINITY,
@@ -666,11 +678,11 @@ export function useFeedInfo(feedUri: string | undefined) {
         return null
       }
 
-      const res = await agent.app.bsky.feed.getFeedGenerator({
-        feed: feedUri,
+      const data = await client.call(app.bsky.feed.getFeedGenerator, {
+        feed: feedUri as AtUriString,
       })
 
-      const feedSourceInfo = hydrateFeedGenerator(res.data.view)
+      const feedSourceInfo = hydrateFeedGenerator(data.view)
       return feedSourceInfo
     },
   })
diff --git a/src/state/queries/find-contacts.ts b/src/state/queries/find-contacts.ts
index b1eb6c9c5e..e462e6a6c1 100644
--- a/src/state/queries/find-contacts.ts
+++ b/src/state/queries/find-contacts.ts
@@ -1,4 +1,3 @@
-import {type AppBskyContactGetMatches} from '@atproto/api'
 import {
   type InfiniteData,
   type QueryClient,
@@ -6,8 +5,9 @@ import {
   useQuery,
 } from '@tanstack/react-query'
 
-import {useAgent} from '#/state/session'
+import {useAppviewClient} from '#/state/session'
 import {type Match} from '#/components/contacts/state'
+import {app} from '#/lexicons'
 import type * as bsky from '#/types/bsky'
 import {STALE} from '.'
 
@@ -15,13 +15,12 @@ const RQ_KEY_ROOT = 'find-contacts'
 export const findContactsStatusQueryKey = [RQ_KEY_ROOT, 'sync-status']
 
 export function useContactsSyncStatusQuery() {
-  const agent = useAgent()
+  const client = useAppviewClient()
 
   return useQuery({
     queryKey: findContactsStatusQueryKey,
     queryFn: async () => {
-      const status = await agent.app.bsky.contact.getSyncStatus()
-      return status.data
+      return await client.call(app.bsky.contact.getSyncStatus, {})
     },
     staleTime: STALE.SECONDS.THIRTY,
   })
@@ -30,15 +29,14 @@ export function useContactsSyncStatusQuery() {
 export const findContactsGetMatchesQueryKey = [RQ_KEY_ROOT, 'matches']
 
 export function useContactsMatchesQuery() {
-  const agent = useAgent()
+  const client = useAppviewClient()
 
   return useInfiniteQuery({
     queryKey: findContactsGetMatchesQueryKey,
     queryFn: async ({pageParam}) => {
-      const matches = await agent.app.bsky.contact.getMatches({
+      return await client.call(app.bsky.contact.getMatches, {
         cursor: pageParam,
       })
-      return matches.data
     },
     initialPageParam: undefined as string | undefined,
     getNextPageParam: lastPage => lastPage.cursor,
@@ -47,20 +45,19 @@ export function useContactsMatchesQuery() {
 }
 
 export function optimisticRemoveMatch(queryClient: QueryClient, did: string) {
-  queryClient.setQueryData<InfiniteData<AppBskyContactGetMatches.OutputSchema>>(
-    findContactsGetMatchesQueryKey,
-    old => {
-      if (!old) return old
+  queryClient.setQueryData<
+    InfiniteData<app.bsky.contact.getMatches.$OutputBody>
+  >(findContactsGetMatchesQueryKey, old => {
+    if (!old) return old
 
-      return {
-        ...old,
-        pages: old.pages.map(page => ({
-          ...page,
-          matches: page.matches.filter(match => match.did !== did),
-        })),
-      }
-    },
-  )
+    return {
+      ...old,
+      pages: old.pages.map(page => ({
+        ...page,
+        matches: page.matches.filter(match => match.did !== did),
+      })),
+    }
+  })
 }
 
 export const findContactsMatchesPassthroughQueryKey = (dids: string[]) => [
@@ -95,7 +92,7 @@ export function* findAllProfilesInQueryData(
   did: string,
 ): Generator<bsky.profile.AnyProfileView, void> {
   const queryDatas = queryClient.getQueriesData<
-    InfiniteData<AppBskyContactGetMatches.OutputSchema>
+    InfiniteData<app.bsky.contact.getMatches.$OutputBody>
   >({
     queryKey: findContactsGetMatchesQueryKey,
   })
diff --git a/src/state/queries/pds-detection.ts b/src/state/queries/pds-detection.ts
index 697963aa93..1f2b413d6d 100644
--- a/src/state/queries/pds-detection.ts
+++ b/src/state/queries/pds-detection.ts
@@ -1,13 +1,15 @@
 import {useState} from 'react'
 import {type DidDocument, getPdsEndpoint} from '@atproto/common-web'
+import {type HandleString} from '@atproto/syntax'
 import {useQuery, useQueryClient} from '@tanstack/react-query'
 
-import {DEFAULT_SERVICE, PUBLIC_BSKY_SERVICE} from '#/lib/constants'
+import {DEFAULT_SERVICE} from '#/lib/constants'
 import {useDebouncedValue} from '#/lib/hooks/useDebouncedValue'
 import {isNetworkError} from '#/lib/strings/errors'
 import {logger} from '#/logger'
 import {STALE} from '#/state/queries'
-import {Agent} from '#/state/session/agent'
+import {getPublicAppviewClient} from '#/state/session/clients'
+import {com} from '#/lexicons'
 
 const RQKEY_ROOT = 'pds-detection'
 export const RQKEY = (identifier: string) => [RQKEY_ROOT, identifier]
@@ -147,16 +149,25 @@ export async function resolvePdsForIdentifier(
   identifier: string,
 ): Promise<{did: string; pdsUrl: string | null} | null> {
   const norm = normalizeIdentifier(identifier)
-  const agent = new Agent(null, {service: PUBLIC_BSKY_SERVICE})
+  /*
+   * Resolution runs without a session, so this uses the public appview client
+   * rather than a session-scoped one. It matches the unauthenticated,
+   * unproxied public agent this previously constructed by hand.
+   */
+  const client = getPublicAppviewClient()
   try {
     let did: string
     if (norm.startsWith('did:')) {
       did = norm
     } else {
-      const res = await withResolveTimeout(signal =>
-        agent.resolveHandle({handle: norm}, {signal}),
+      const data = await withResolveTimeout(signal =>
+        client.call(
+          com.atproto.identity.resolveHandle,
+          {handle: norm as HandleString},
+          {signal},
+        ),
       )
-      did = res.data.did
+      did = data.did
     }
     logger.debug('pds-detection: resolved identifier to DID', {
       identifier: norm,
diff --git a/src/state/queries/resolve-uri.ts b/src/state/queries/resolve-uri.ts
index 45ef4e2288..9ca0aab36d 100644
--- a/src/state/queries/resolve-uri.ts
+++ b/src/state/queries/resolve-uri.ts
@@ -1,15 +1,18 @@
-import {type AtpAgent, AtUri} from '@atproto/api'
+import {AtUri} from '@atproto/api'
+import {type Client} from '@atproto/lex'
+import {type HandleString} from '@atproto/syntax'
 import {type QueryClient, queryOptions, useQuery} from '@tanstack/react-query'
 
 import {STALE} from '#/state/queries'
-import {useAgent} from '#/state/session'
+import {useAppviewClient} from '#/state/session'
+import {com} from '#/lexicons'
 import {useUnstableProfileViewCache} from './profile'
 
 const RQKEY_ROOT = 'resolved-did'
 export const RQKEY = (didOrHandle: string) => [RQKEY_ROOT, didOrHandle]
 
 const resolvedDidQueryOptions = (
-  agent: AtpAgent,
+  client: Client,
   getUnstableProfile: (did: string) => {did: string} | undefined,
   didOrHandle: string | undefined,
 ) =>
@@ -21,8 +24,15 @@ const resolvedDidQueryOptions = (
       // Just return the did if it's already one
       if (didOrHandle.startsWith('did:')) return didOrHandle
 
-      const res = await agent.resolveHandle({handle: didOrHandle})
-      return res.data.did
+      /*
+       * Resolution stays on the appview client: the old agent call was proxied
+       * to the appview, and the PDS implementation is not equivalent for
+       * handles hosted elsewhere.
+       */
+      const data = await client.call(com.atproto.identity.resolveHandle, {
+        handle: didOrHandle as HandleString,
+      })
+      return data.did
     },
     initialData: () => {
       // Return undefined if no did or handle
@@ -37,11 +47,11 @@ export function useResolveUriQuery(uri: string | undefined) {
   const urip = new AtUri(uri || '')
   const host = urip.host
 
-  const agent = useAgent()
+  const client = useAppviewClient()
   const {getUnstableProfile} = useUnstableProfileViewCache()
 
   return useQuery({
-    ...resolvedDidQueryOptions(agent, getUnstableProfile, host),
+    ...resolvedDidQueryOptions(client, getUnstableProfile, host),
     select: did => ({
       did,
       uri: AtUri.make(did, urip.collection, urip.rkey).toString(),
@@ -50,11 +60,11 @@ export function useResolveUriQuery(uri: string | undefined) {
 }
 
 export function useResolveDidQuery(didOrHandle: string | undefined) {
-  const agent = useAgent()
+  const client = useAppviewClient()
   const {getUnstableProfile} = useUnstableProfileViewCache()
 
   return useQuery(
-    resolvedDidQueryOptions(agent, getUnstableProfile, didOrHandle),
+    resolvedDidQueryOptions(client, getUnstableProfile, didOrHandle),
   )
 }
 
diff --git a/src/view/com/auth/LoggedOut.tsx b/src/view/com/auth/LoggedOut.tsx
index da0038a9cc..5becdd45d3 100644
--- a/src/view/com/auth/LoggedOut.tsx
+++ b/src/view/com/auth/LoggedOut.tsx
@@ -1,13 +1,14 @@
 import {useCallback, useEffect, useState} from 'react'
 import {View} from 'react-native'
 import {useSafeAreaInsets} from 'react-native-safe-area-context'
+import {type DidString} from '@atproto/syntax'
 import {useLingui} from '@lingui/react/macro'
 import {useQueryClient} from '@tanstack/react-query'
 
 import {PressableScale} from '#/lib/custom-animations/PressableScale'
 import {STALE} from '#/state/queries'
 import {profilesQueryKey} from '#/state/queries/profile'
-import {useAgent, useSession} from '#/state/session'
+import {useAppviewClient, useSession} from '#/state/session'
 import {useSetActiveLanding} from '#/state/shell/landing'
 import {
   useLoggedOutView,
@@ -23,6 +24,7 @@ import {atoms as a, native, tokens, useTheme} from '#/alf'
 import {Button, ButtonIcon} from '#/components/Button'
 import {TimesLarge_Stroke2_Corner0_Rounded as XIcon} from '#/components/icons/Times'
 import {useAnalytics} from '#/analytics'
+import {app} from '#/lexicons'
 import {SplashScreen} from './SplashScreen'
 
 enum ScreenState {
@@ -65,19 +67,18 @@ export function LoggedOut({onDismiss}: {onDismiss?: () => void}) {
 
   const queryClient = useQueryClient()
   const {accounts} = useSession()
-  const agent = useAgent()
+  const client = useAppviewClient()
   useEffect(() => {
-    const actors = accounts.map(acc => acc.did)
+    const actors = accounts.map(acc => acc.did as DidString)
     if (actors.length === 0) return
     void queryClient.prefetchQuery({
       queryKey: profilesQueryKey(actors),
       staleTime: STALE.MINUTES.FIVE,
       queryFn: async () => {
-        const res = await agent.getProfiles({actors})
-        return res.data
+        return await client.call(app.bsky.actor.getProfiles, {actors})
       },
     })
-  }, [accounts, agent, queryClient])
+  }, [accounts, client, queryClient])
 
   const onPressDismiss = useCallback(() => {
     if (onDismiss) {
diff --git a/src/view/com/composer/drafts/state/queries.ts b/src/view/com/composer/drafts/state/queries.ts
index 07dd67dd88..0108dbbbff 100644
--- a/src/view/com/composer/drafts/state/queries.ts
+++ b/src/view/com/composer/drafts/state/queries.ts
@@ -1,4 +1,4 @@
-import {AppBskyDraftCreateDraft, AppBskyDraftDefs} from '@atproto/api'
+import {AppBskyDraftDefs} from '@atproto/api'
 import {
   useInfiniteQuery,
   useMutation,
@@ -6,10 +6,12 @@ import {
 } from '@tanstack/react-query'
 
 import {isNetworkError} from '#/lib/strings/errors'
-import {useAgent} from '#/state/session'
+import {matchXrpcError} from '#/lib/xrpc-error'
+import {useAppviewClient} from '#/state/session'
 import {type ComposerState} from '#/view/com/composer/state/composer'
 import {useAnalytics} from '#/analytics'
 import {getDeviceId} from '#/analytics/identifiers'
+import {app} from '#/lexicons'
 import {composerStateToDraft, draftViewToSummary} from './api'
 import {logger} from './logger'
 import * as storage from './storage'
@@ -20,7 +22,7 @@ const DRAFTS_QUERY_KEY = ['drafts']
  * Hook to list all drafts for the current account
  */
 export function useDraftsQuery() {
-  const agent = useAgent()
+  const client = useAppviewClient()
   const ax = useAnalytics()
 
   return useInfiniteQuery({
@@ -28,10 +30,12 @@ export function useDraftsQuery() {
     queryFn: async ({pageParam}) => {
       // Ensure media cache is populated before checking which media exists
       await storage.ensureMediaCachePopulated()
-      const res = await agent.app.bsky.draft.getDrafts({cursor: pageParam})
+      const data = await client.call(app.bsky.draft.getDrafts, {
+        cursor: pageParam,
+      })
       return {
-        cursor: res.data.cursor,
-        drafts: res.data.drafts.map(view =>
+        cursor: data.cursor,
+        drafts: data.drafts.map(view =>
           draftViewToSummary({
             view,
             analytics: ax,
@@ -116,7 +120,7 @@ export async function loadDraftMedia(draft: AppBskyDraftDefs.Draft): Promise<{
  * This ensures we don't lose data if the network request fails.
  */
 export function useSaveDraftMutation() {
-  const agent = useAgent()
+  const client = useAppviewClient()
   const queryClient = useQueryClient()
 
   return useMutation({
@@ -132,7 +136,14 @@ export function useSaveDraftMutation() {
       originalLocalRefs: Set<string> | undefined
     }> => {
       // Convert composer state to server draft format
-      const {draft, localRefPaths} = await composerStateToDraft(composerState)
+      const {draft: apiDraft, localRefPaths} =
+        await composerStateToDraft(composerState)
+      /*
+       * `composerStateToDraft` builds the draft against the `@atproto/api`
+       * types, whose string fields are unbranded, so it is asserted once here
+       * to the vendored input type.
+       */
+      const draft = apiDraft as unknown as app.bsky.draft.defs.Draft
 
       logger.debug('saving draft', {
         existingDraftId,
@@ -147,7 +158,7 @@ export function useSaveDraftMutation() {
         logger.debug('updating existing draft on server', {
           draftId: existingDraftId,
         })
-        await agent.app.bsky.draft.updateDraft({
+        await client.call(app.bsky.draft.updateDraft, {
           draft: {
             id: existingDraftId,
             draft,
@@ -157,8 +168,8 @@ export function useSaveDraftMutation() {
       } else {
         // Create new draft
         logger.debug('creating new draft on server')
-        const res = await agent.app.bsky.draft.createDraft({draft})
-        draftId = res.data.id
+        const data = await client.call(app.bsky.draft.createDraft, {draft})
+        draftId = data.id
         logger.debug('created new draft', {draftId})
       }
 
@@ -203,7 +214,7 @@ export function useSaveDraftMutation() {
     },
     onError: error => {
       // Check for draft limit error
-      if (error instanceof AppBskyDraftCreateDraft.DraftLimitReachedError) {
+      if (matchXrpcError(error, app.bsky.draft.createDraft)) {
         logger.error('Draft limit reached', {safeMessage: error.message})
         // Error will be handled by caller
       } else if (!isNetworkError(error)) {
@@ -220,7 +231,7 @@ export function useSaveDraftMutation() {
  * Takes the full draft data to avoid re-fetching for media cleanup.
  */
 export function useDeleteDraftMutation() {
-  const agent = useAgent()
+  const client = useAppviewClient()
   const queryClient = useQueryClient()
 
   return useMutation({
@@ -231,7 +242,7 @@ export function useDeleteDraftMutation() {
       draft: AppBskyDraftDefs.Draft
     }) => {
       // Delete from server first - if this fails, we keep local media for retry
-      await agent.app.bsky.draft.deleteDraft({id: draftId})
+      await client.call(app.bsky.draft.deleteDraft, {id: draftId})
     },
     onSuccess: async (_, {draft}) => {
       // Only delete local media after server deletion succeeds
@@ -264,7 +275,7 @@ export function useDeleteDraftMutation() {
  * Takes draftId and originalLocalRefs from composer state.
  */
 export function useCleanupPublishedDraftMutation() {
-  const agent = useAgent()
+  const client = useAppviewClient()
   const queryClient = useQueryClient()
 
   return useMutation({
@@ -280,7 +291,9 @@ export function useCleanupPublishedDraftMutation() {
         mediaFileCount: originalLocalRefs.size,
       })
       // Delete from server first
-      await agent.app.bsky.draft.deleteDraft({id: draftId})
+      await client.call(app.bsky.draft.deleteDraft, {
+        id: draftId,
+      })
       logger.debug('deleted draft from server', {draftId})
     },
     onSuccess: async (_, {originalLocalRefs}) => {

From 6f696e4b737be1ceed45a43ee17a17c1aae6b1e5 Mon Sep 17 00:00:00 2001
From: Samuel Newman <mozzius@protonmail.com>
Date: Thu, 13 Aug 2026 22:26:17 +0300
Subject: [PATCH 13/32] [SDK] Migrate the feed api classes to the appview
 client (#11361)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
---
 src/lib/api/feed/author.ts                  |  45 ++++----
 src/lib/api/feed/custom.ts                  |  88 ++++++++--------
 src/lib/api/feed/demo.ts                    |   9 +-
 src/lib/api/feed/following.ts               |  31 +++---
 src/lib/api/feed/home.ts                    |  24 +++--
 src/lib/api/feed/likes.ts                   |  49 +++++----
 src/lib/api/feed/list.ts                    |  45 ++++----
 src/lib/api/feed/merge.ts                   | 111 ++++++++++++--------
 src/lib/api/feed/posts.ts                   |  39 +++----
 src/state/queries/explore-feed-previews.tsx |   9 +-
 src/state/queries/post-feed.ts              |  47 ++++++---
 src/state/queries/post-liked-by.ts          |  30 +++---
 src/state/queries/post-quotes.ts            |  21 ++--
 src/state/queries/post-reposted-by.ts       |  23 ++--
 14 files changed, 314 insertions(+), 257 deletions(-)

diff --git a/src/lib/api/feed/author.ts b/src/lib/api/feed/author.ts
index 3b97b8ef73..92f8d327b4 100644
--- a/src/lib/api/feed/author.ts
+++ b/src/lib/api/feed/author.ts
@@ -1,23 +1,25 @@
-import {
-  AppBskyFeedDefs,
-  type AppBskyFeedGetAuthorFeed as GetAuthorFeed,
-  type AtpAgent,
-} from '@atproto/api'
+import {AppBskyFeedDefs} from '@atproto/api'
+import {type Client, type XrpcRequestParams} from '@atproto/lex'
 
+import {app} from '#/lexicons'
 import {type FeedAPI, type FeedAPIResponse} from './types'
 
+type GetAuthorFeedParams = XrpcRequestParams<
+  typeof app.bsky.feed.getAuthorFeed.main
+>
+
 export class AuthorFeedAPI implements FeedAPI {
-  agent: AtpAgent
-  _params: GetAuthorFeed.QueryParams
+  client: Client
+  _params: GetAuthorFeedParams
 
   constructor({
-    agent,
+    client,
     feedParams,
   }: {
-    agent: AtpAgent
-    feedParams: GetAuthorFeed.QueryParams
+    client: Client
+    feedParams: GetAuthorFeedParams
   }) {
-    this.agent = agent
+    this.client = client
     this._params = feedParams
   }
 
@@ -28,11 +30,11 @@ export class AuthorFeedAPI implements FeedAPI {
   }
 
   async peekLatest(): Promise<AppBskyFeedDefs.FeedViewPost> {
-    const res = await this.agent.getAuthorFeed({
+    const data = await this.client.call(app.bsky.feed.getAuthorFeed, {
       ...this.params,
       limit: 1,
     })
-    return res.data.feed[0]
+    return data.feed[0]
   }
 
   async fetch({
@@ -42,19 +44,20 @@ export class AuthorFeedAPI implements FeedAPI {
     cursor: string | undefined
     limit: number
   }): Promise<FeedAPIResponse> {
-    const res = await this.agent.getAuthorFeed({
+    /*
+     * A failed request rejects rather than resolving, so the error propagates
+     * to the query and drives the feed error UI (blocked actor, rate limit).
+     * The agent behaved the same way - its `success` flag was only ever true -
+     * so the empty-page branch this replaces was unreachable.
+     */
+    const data = await this.client.call(app.bsky.feed.getAuthorFeed, {
       ...this.params,
       cursor,
       limit,
     })
-    if (res.success) {
-      return {
-        cursor: res.data.cursor,
-        feed: this._filter(res.data.feed),
-      }
-    }
     return {
-      feed: [],
+      cursor: data.cursor,
+      feed: this._filter(data.feed),
     }
   }
 
diff --git a/src/lib/api/feed/custom.ts b/src/lib/api/feed/custom.ts
index 54d9dc9067..3b1ec3bec3 100644
--- a/src/lib/api/feed/custom.ts
+++ b/src/lib/api/feed/custom.ts
@@ -1,46 +1,46 @@
-import {
-  type AppBskyFeedDefs,
-  type AppBskyFeedGetFeed as GetCustomFeed,
-  AtpAgent,
-  jsonStringToLex,
-} from '@atproto/api'
+import {type AppBskyFeedDefs, AtpAgent, jsonStringToLex} from '@atproto/api'
+import {type Client, type XrpcRequestParams} from '@atproto/lex'
 
 import {
   getAppLanguageAsContentLanguage,
   getContentLanguages,
 } from '#/state/preferences/languages'
+import {app} from '#/lexicons'
 import {type FeedAPI, type FeedAPIResponse} from './types'
 import {createBskyTopicsHeader, isBlueskyOwnedFeed} from './utils'
 
+type GetCustomFeedParams = XrpcRequestParams<typeof app.bsky.feed.getFeed.main>
+
 export class CustomFeedAPI implements FeedAPI {
-  agent: AtpAgent
-  params: GetCustomFeed.QueryParams
+  client: Client
+  params: GetCustomFeedParams
   userInterests?: string
 
   constructor({
-    agent,
+    client,
     feedParams,
     userInterests,
   }: {
-    agent: AtpAgent
-    feedParams: GetCustomFeed.QueryParams
+    client: Client
+    feedParams: GetCustomFeedParams
     userInterests?: string
   }) {
-    this.agent = agent
+    this.client = client
     this.params = feedParams
     this.userInterests = userInterests
   }
 
   async peekLatest(): Promise<AppBskyFeedDefs.FeedViewPost> {
     const contentLangs = getContentLanguages().join(',')
-    const res = await this.agent.app.bsky.feed.getFeed(
+    const data = await this.client.call(
+      app.bsky.feed.getFeed,
       {
         ...this.params,
         limit: 1,
       },
       {headers: {'Accept-Language': contentLangs}},
     )
-    return res.data.feed[0]
+    return data.feed[0]
   }
 
   async fetch({
@@ -51,11 +51,17 @@ export class CustomFeedAPI implements FeedAPI {
     limit: number
   }): Promise<FeedAPIResponse> {
     const contentLangs = getContentLanguages().join(',')
-    const agent = this.agent
     const isBlueskyOwned = isBlueskyOwnedFeed(this.params.feed)
 
-    const res = agent.did
-      ? await this.agent.app.bsky.feed.getFeed(
+    /*
+     * The authed branch rejects on failure, so the error propagates to the
+     * query and drives the feed error UI (feedgen offline, misconfigured, rate
+     * limited). Only the logged-out branch can resolve without data, and it
+     * signals that with a null body.
+     */
+    const data = this.client.did
+      ? await this.client.call(
+          app.bsky.feed.getFeed,
           {
             ...this.params,
             cursor,
@@ -71,21 +77,22 @@ export class CustomFeedAPI implements FeedAPI {
           },
         )
       : await loggedOutFetch({...this.params, cursor, limit})
-    if (res.success) {
-      // NOTE
-      // some custom feeds fail to enforce the pagination limit
-      // so we manually truncate here
-      // -prf
-      if (res.data.feed.length > limit) {
-        res.data.feed = res.data.feed.slice(0, limit)
-      }
+
+    if (!data) {
       return {
-        cursor: res.data.feed.length ? res.data.cursor : undefined,
-        feed: res.data.feed,
+        feed: [],
       }
     }
+
+    // NOTE
+    // some custom feeds fail to enforce the pagination limit
+    // so we manually truncate here
+    // -prf
+    const feed =
+      data.feed.length > limit ? data.feed.slice(0, limit) : data.feed
     return {
-      feed: [],
+      cursor: feed.length ? data.cursor : undefined,
+      feed,
     }
   }
 }
@@ -105,7 +112,7 @@ async function loggedOutFetch({
   feed: string
   limit: number
   cursor?: string
-}) {
+}): Promise<app.bsky.feed.getFeed.$OutputBody | null> {
   let contentLangs = getAppLanguageAsContentLanguage()
 
   /**
@@ -128,14 +135,15 @@ async function loggedOutFetch({
       headers: {'Accept-Language': contentLangs, ...labelersHeader},
     },
   )
+  /*
+   * The response is hand-decoded rather than validated, so the lex output shape
+   * is asserted here just as the old-world one was.
+   */
   let data = res.ok
-    ? (jsonStringToLex(await res.text()) as GetCustomFeed.OutputSchema)
+    ? (jsonStringToLex(await res.text()) as app.bsky.feed.getFeed.$OutputBody)
     : null
   if (data?.feed?.length) {
-    return {
-      success: true,
-      data,
-    }
+    return data
   }
 
   // no data, try again with language headers removed
@@ -146,17 +154,11 @@ async function loggedOutFetch({
     {method: 'GET', headers: {'Accept-Language': '', ...labelersHeader}},
   )
   data = res.ok
-    ? (jsonStringToLex(await res.text()) as GetCustomFeed.OutputSchema)
+    ? (jsonStringToLex(await res.text()) as app.bsky.feed.getFeed.$OutputBody)
     : null
   if (data?.feed?.length) {
-    return {
-      success: true,
-      data,
-    }
+    return data
   }
 
-  return {
-    success: false,
-    data: {feed: []},
-  }
+  return null
 }
diff --git a/src/lib/api/feed/demo.ts b/src/lib/api/feed/demo.ts
index 42d1046bdc..a4c1c360e9 100644
--- a/src/lib/api/feed/demo.ts
+++ b/src/lib/api/feed/demo.ts
@@ -1,13 +1,14 @@
-import {type AppBskyFeedDefs, type AtpAgent} from '@atproto/api'
+import {type AppBskyFeedDefs} from '@atproto/api'
+import {type Client} from '@atproto/lex'
 
 import {DEMO_FEED} from '#/lib/demo'
 import {type FeedAPI, type FeedAPIResponse} from './types'
 
 export class DemoFeedAPI implements FeedAPI {
-  agent: AtpAgent
+  client: Client
 
-  constructor({agent}: {agent: AtpAgent}) {
-    this.agent = agent
+  constructor({client}: {client: Client}) {
+    this.client = client
   }
 
   async peekLatest(): Promise<AppBskyFeedDefs.FeedViewPost> {
diff --git a/src/lib/api/feed/following.ts b/src/lib/api/feed/following.ts
index 17e96d8e1b..596483577a 100644
--- a/src/lib/api/feed/following.ts
+++ b/src/lib/api/feed/following.ts
@@ -1,19 +1,21 @@
-import {type AppBskyFeedDefs, type AtpAgent} from '@atproto/api'
+import {type AppBskyFeedDefs} from '@atproto/api'
+import {type Client} from '@atproto/lex'
 
+import {app} from '#/lexicons'
 import {type FeedAPI, type FeedAPIResponse} from './types'
 
 export class FollowingFeedAPI implements FeedAPI {
-  agent: AtpAgent
+  client: Client
 
-  constructor({agent}: {agent: AtpAgent}) {
-    this.agent = agent
+  constructor({client}: {client: Client}) {
+    this.client = client
   }
 
   async peekLatest(): Promise<AppBskyFeedDefs.FeedViewPost> {
-    const res = await this.agent.getTimeline({
+    const data = await this.client.call(app.bsky.feed.getTimeline, {
       limit: 1,
     })
-    return res.data.feed[0]
+    return data.feed[0]
   }
 
   async fetch({
@@ -23,18 +25,19 @@ export class FollowingFeedAPI implements FeedAPI {
     cursor: string | undefined
     limit: number
   }): Promise<FeedAPIResponse> {
-    const res = await this.agent.getTimeline({
+    /*
+     * A failed request rejects rather than resolving, so the error propagates
+     * to the query and drives the feed error UI. The agent behaved the same
+     * way - its `success` flag was only ever true - so the empty-page branch
+     * this replaces was unreachable.
+     */
+    const data = await this.client.call(app.bsky.feed.getTimeline, {
       cursor,
       limit,
     })
-    if (res.success) {
-      return {
-        cursor: res.data.cursor,
-        feed: res.data.feed,
-      }
-    }
     return {
-      feed: [],
+      cursor: data.cursor,
+      feed: data.feed,
     }
   }
 }
diff --git a/src/lib/api/feed/home.ts b/src/lib/api/feed/home.ts
index aa13c70bf0..a5ff0f3b93 100644
--- a/src/lib/api/feed/home.ts
+++ b/src/lib/api/feed/home.ts
@@ -1,4 +1,6 @@
-import {type AppBskyFeedDefs, type AtpAgent} from '@atproto/api'
+import {type AppBskyFeedDefs} from '@atproto/api'
+import {type Client} from '@atproto/lex'
+import {type AtUriString} from '@atproto/syntax'
 
 import {PROD_DEFAULT_FEED} from '#/lib/constants'
 import {CustomFeedAPI} from './custom'
@@ -27,7 +29,7 @@ export const FALLBACK_MARKER_POST: AppBskyFeedDefs.FeedViewPost = {
 }
 
 export class HomeFeedAPI implements FeedAPI {
-  agent: AtpAgent
+  client: Client
   following: FollowingFeedAPI
   discover: CustomFeedAPI
   usingDiscover = false
@@ -36,25 +38,25 @@ export class HomeFeedAPI implements FeedAPI {
 
   constructor({
     userInterests,
-    agent,
+    client,
   }: {
     userInterests?: string
-    agent: AtpAgent
+    client: Client
   }) {
-    this.agent = agent
-    this.following = new FollowingFeedAPI({agent})
+    this.client = client
+    this.following = new FollowingFeedAPI({client})
     this.discover = new CustomFeedAPI({
-      agent,
-      feedParams: {feed: PROD_DEFAULT_FEED('whats-hot')},
+      client,
+      feedParams: {feed: PROD_DEFAULT_FEED('whats-hot') as AtUriString},
     })
     this.userInterests = userInterests
   }
 
   reset() {
-    this.following = new FollowingFeedAPI({agent: this.agent})
+    this.following = new FollowingFeedAPI({client: this.client})
     this.discover = new CustomFeedAPI({
-      agent: this.agent,
-      feedParams: {feed: PROD_DEFAULT_FEED('whats-hot')},
+      client: this.client,
+      feedParams: {feed: PROD_DEFAULT_FEED('whats-hot') as AtUriString},
       userInterests: this.userInterests,
     })
     this.usingDiscover = false
diff --git a/src/lib/api/feed/likes.ts b/src/lib/api/feed/likes.ts
index 1511dc833a..d7d63fc4db 100644
--- a/src/lib/api/feed/likes.ts
+++ b/src/lib/api/feed/likes.ts
@@ -1,32 +1,34 @@
-import {
-  type AppBskyFeedDefs,
-  type AppBskyFeedGetActorLikes as GetActorLikes,
-  type AtpAgent,
-} from '@atproto/api'
+import {type AppBskyFeedDefs} from '@atproto/api'
+import {type Client, type XrpcRequestParams} from '@atproto/lex'
 
+import {app} from '#/lexicons'
 import {type FeedAPI, type FeedAPIResponse} from './types'
 
+type GetActorLikesParams = XrpcRequestParams<
+  typeof app.bsky.feed.getActorLikes.main
+>
+
 export class LikesFeedAPI implements FeedAPI {
-  agent: AtpAgent
-  params: GetActorLikes.QueryParams
+  client: Client
+  params: GetActorLikesParams
 
   constructor({
-    agent,
+    client,
     feedParams,
   }: {
-    agent: AtpAgent
-    feedParams: GetActorLikes.QueryParams
+    client: Client
+    feedParams: GetActorLikesParams
   }) {
-    this.agent = agent
+    this.client = client
     this.params = feedParams
   }
 
   async peekLatest(): Promise<AppBskyFeedDefs.FeedViewPost> {
-    const res = await this.agent.getActorLikes({
+    const data = await this.client.call(app.bsky.feed.getActorLikes, {
       ...this.params,
       limit: 1,
     })
-    return res.data.feed[0]
+    return data.feed[0]
   }
 
   async fetch({
@@ -36,21 +38,22 @@ export class LikesFeedAPI implements FeedAPI {
     cursor: string | undefined
     limit: number
   }): Promise<FeedAPIResponse> {
-    const res = await this.agent.getActorLikes({
+    /*
+     * A failed request rejects rather than resolving, so the error propagates
+     * to the query and drives the feed error UI. The agent behaved the same
+     * way - its `success` flag was only ever true - so the empty-page branch
+     * this replaces was unreachable.
+     */
+    const data = await this.client.call(app.bsky.feed.getActorLikes, {
       ...this.params,
       cursor,
       limit,
     })
-    if (res.success) {
-      // HACKFIX: the API incorrectly returns a cursor when there are no items -sfn
-      const isEmptyPage = res.data.feed.length === 0
-      return {
-        cursor: isEmptyPage ? undefined : res.data.cursor,
-        feed: res.data.feed,
-      }
-    }
+    // HACKFIX: the API incorrectly returns a cursor when there are no items -sfn
+    const isEmptyPage = data.feed.length === 0
     return {
-      feed: [],
+      cursor: isEmptyPage ? undefined : data.cursor,
+      feed: data.feed,
     }
   }
 }
diff --git a/src/lib/api/feed/list.ts b/src/lib/api/feed/list.ts
index 9697b0aaf3..e4d07d73d7 100644
--- a/src/lib/api/feed/list.ts
+++ b/src/lib/api/feed/list.ts
@@ -1,32 +1,34 @@
-import {
-  type Agent,
-  type AppBskyFeedDefs,
-  type AppBskyFeedGetListFeed as GetListFeed,
-} from '@atproto/api'
+import {type AppBskyFeedDefs} from '@atproto/api'
+import {type Client, type XrpcRequestParams} from '@atproto/lex'
 
+import {app} from '#/lexicons'
 import {type FeedAPI, type FeedAPIResponse} from './types'
 
+type GetListFeedParams = XrpcRequestParams<
+  typeof app.bsky.feed.getListFeed.main
+>
+
 export class ListFeedAPI implements FeedAPI {
-  agent: Agent
-  params: GetListFeed.QueryParams
+  client: Client
+  params: GetListFeedParams
 
   constructor({
-    agent,
+    client,
     feedParams,
   }: {
-    agent: Agent
-    feedParams: GetListFeed.QueryParams
+    client: Client
+    feedParams: GetListFeedParams
   }) {
-    this.agent = agent
+    this.client = client
     this.params = feedParams
   }
 
   async peekLatest(): Promise<AppBskyFeedDefs.FeedViewPost> {
-    const res = await this.agent.app.bsky.feed.getListFeed({
+    const data = await this.client.call(app.bsky.feed.getListFeed, {
       ...this.params,
       limit: 1,
     })
-    return res.data.feed[0]
+    return data.feed[0]
   }
 
   async fetch({
@@ -36,19 +38,20 @@ export class ListFeedAPI implements FeedAPI {
     cursor: string | undefined
     limit: number
   }): Promise<FeedAPIResponse> {
-    const res = await this.agent.app.bsky.feed.getListFeed({
+    /*
+     * A failed request rejects rather than resolving, so the error propagates
+     * to the query and drives the feed error UI. The agent behaved the same
+     * way - its `success` flag was only ever true - so the empty-page branch
+     * this replaces was unreachable.
+     */
+    const data = await this.client.call(app.bsky.feed.getListFeed, {
       ...this.params,
       cursor,
       limit,
     })
-    if (res.success) {
-      return {
-        cursor: res.data.cursor,
-        feed: res.data.feed,
-      }
-    }
     return {
-      feed: [],
+      cursor: data.cursor,
+      feed: data.feed,
     }
   }
 }
diff --git a/src/lib/api/feed/merge.ts b/src/lib/api/feed/merge.ts
index c341dd53a0..2e3abcb8e3 100644
--- a/src/lib/api/feed/merge.ts
+++ b/src/lib/api/feed/merge.ts
@@ -1,8 +1,6 @@
-import {
-  type AppBskyFeedDefs,
-  type AppBskyFeedGetTimeline,
-  type AtpAgent,
-} from '@atproto/api'
+import {type AppBskyFeedDefs} from '@atproto/api'
+import {type Client} from '@atproto/lex'
+import {type AtUriString} from '@atproto/syntax'
 import shuffle from 'lodash.shuffle'
 
 import {bundleAsync} from '#/lib/async/bundle'
@@ -10,6 +8,7 @@ import {timeout} from '#/lib/async/timeout'
 import {feedUriToHref} from '#/lib/strings/url-helpers'
 import {getContentLanguages} from '#/state/preferences/languages'
 import {type FeedParams} from '#/state/queries/post-feed'
+import {app} from '#/lexicons'
 import {FeedTuner} from '../feed-manip'
 import {type FeedTunerFn} from '../feed-manip'
 import {
@@ -22,9 +21,19 @@ import {createBskyTopicsHeader, isBlueskyOwnedFeed} from './utils'
 const REQUEST_WAIT_MS = 500 // 500ms
 const POST_AGE_CUTOFF = 60e3 * 60 * 24 // 24hours
 
+/**
+ * A page of feed items, or `null` when the source could not produce one. Only
+ * sources that deliberately swallow their own errors return `null`; the rest
+ * reject so the error reaches the caller.
+ */
+type MergeFeedPage = {
+  cursor?: string
+  feed: AppBskyFeedDefs.FeedViewPost[]
+} | null
+
 export class MergeFeedAPI implements FeedAPI {
   userInterests?: string
-  agent: AtpAgent
+  client: Client
   params: FeedParams
   feedTuners: FeedTunerFn[]
   following: MergeFeedSource_Following
@@ -34,29 +43,29 @@ export class MergeFeedAPI implements FeedAPI {
   sampleCursor = 0
 
   constructor({
-    agent,
+    client,
     feedParams,
     feedTuners,
     userInterests,
   }: {
-    agent: AtpAgent
+    client: Client
     feedParams: FeedParams
     feedTuners: FeedTunerFn[]
     userInterests?: string
   }) {
-    this.agent = agent
+    this.client = client
     this.params = feedParams
     this.feedTuners = feedTuners
     this.userInterests = userInterests
     this.following = new MergeFeedSource_Following({
-      agent: this.agent,
+      client: this.client,
       feedTuners: this.feedTuners,
     })
   }
 
   reset() {
     this.following = new MergeFeedSource_Following({
-      agent: this.agent,
+      client: this.client,
       feedTuners: this.feedTuners,
     })
     this.customFeeds = []
@@ -68,7 +77,7 @@ export class MergeFeedAPI implements FeedAPI {
         this.params.mergeFeedSources.map(
           feedUri =>
             new MergeFeedSource_Custom({
-              agent: this.agent,
+              client: this.client,
               feedUri,
               feedTuners: this.feedTuners,
               userInterests: this.userInterests,
@@ -81,10 +90,10 @@ export class MergeFeedAPI implements FeedAPI {
   }
 
   async peekLatest(): Promise<AppBskyFeedDefs.FeedViewPost> {
-    const res = await this.agent.getTimeline({
+    const data = await this.client.call(app.bsky.feed.getTimeline, {
       limit: 1,
     })
-    return res.data.feed[0]
+    return data.feed[0]
   }
 
   async fetch({
@@ -175,7 +184,7 @@ export class MergeFeedAPI implements FeedAPI {
 }
 
 class MergeFeedSource {
-  agent: AtpAgent
+  client: Client
   feedTuners: FeedTunerFn[]
   sourceInfo: ReasonFeedSource | undefined
   cursor: string | undefined = undefined
@@ -183,13 +192,13 @@ class MergeFeedSource {
   hasMore = true
 
   constructor({
-    agent,
+    client,
     feedTuners,
   }: {
-    agent: AtpAgent
+    client: Client
     feedTuners: FeedTunerFn[]
   }) {
-    this.agent = agent
+    this.client = client
     this.feedTuners = feedTuners
   }
 
@@ -210,11 +219,11 @@ class MergeFeedSource {
   }
 
   _fetchNextInner = bundleAsync(async (n: number) => {
-    const res = await this._getFeed(this.cursor, n)
-    if (res.success) {
-      this.cursor = res.data.cursor
-      if (res.data.feed.length) {
-        this.queue = this.queue.concat(res.data.feed)
+    const page = await this._getFeed(this.cursor, n)
+    if (page) {
+      this.cursor = page.cursor
+      if (page.feed.length) {
+        this.queue = this.queue.concat(page.feed)
       } else {
         this.hasMore = false
       }
@@ -226,7 +235,7 @@ class MergeFeedSource {
   protected _getFeed(
     _cursor: string | undefined,
     _limit: number,
-  ): Promise<AppBskyFeedGetTimeline.Response> {
+  ): Promise<MergeFeedPage> {
     throw new Error('Must be overridden')
   }
 }
@@ -238,42 +247,49 @@ class MergeFeedSource_Following extends MergeFeedSource {
     return this._fetchNextInner(n)
   }
 
+  /*
+   * No error handling: a failed timeline read rejects, which is what the agent
+   * did too, so the error still reaches `MergeFeedAPI.fetch` and the query.
+   */
   protected async _getFeed(
     cursor: string | undefined,
     limit: number,
-  ): Promise<AppBskyFeedGetTimeline.Response> {
-    const res = await this.agent.getTimeline({cursor, limit})
+  ): Promise<MergeFeedPage> {
+    const data = await this.client.call(app.bsky.feed.getTimeline, {
+      cursor,
+      limit,
+    })
     // run the tuner pre-emptively to ensure better mixing
-    const slices = this.tuner.tune(res.data.feed, {
+    const slices = this.tuner.tune(data.feed, {
       dryRun: false,
     })
-    res.data.feed = slices.map(slice => slice._feedPost)
-    return res
+    return {
+      cursor: data.cursor,
+      feed: slices.map(slice => slice._feedPost),
+    }
   }
 }
 
 class MergeFeedSource_Custom extends MergeFeedSource {
-  agent: AtpAgent
   minDate: Date
   feedUri: string
   userInterests?: string
 
   constructor({
-    agent,
+    client,
     feedUri,
     feedTuners,
     userInterests,
   }: {
-    agent: AtpAgent
+    client: Client
     feedUri: string
     feedTuners: FeedTunerFn[]
     userInterests?: string
   }) {
     super({
-      agent,
+      client,
       feedTuners,
     })
-    this.agent = agent
     this.feedUri = feedUri
     this.userInterests = userInterests
     this.sourceInfo = {
@@ -287,15 +303,16 @@ class MergeFeedSource_Custom extends MergeFeedSource {
   protected async _getFeed(
     cursor: string | undefined,
     limit: number,
-  ): Promise<AppBskyFeedGetTimeline.Response> {
+  ): Promise<MergeFeedPage> {
     try {
       const contentLangs = getContentLanguages().join(',')
       const isBlueskyOwned = isBlueskyOwnedFeed(this.feedUri)
-      const res = await this.agent.app.bsky.feed.getFeed(
+      const data = await this.client.call(
+        app.bsky.feed.getFeed,
         {
           cursor,
           limit,
-          feed: this.feedUri,
+          feed: this.feedUri as AtUriString,
         },
         {
           headers: {
@@ -310,22 +327,24 @@ class MergeFeedSource_Custom extends MergeFeedSource {
       // some custom feeds fail to enforce the pagination limit
       // so we manually truncate here
       // -prf
-      if (limit && res.data.feed.length > limit) {
-        res.data.feed = res.data.feed.slice(0, limit)
-      }
+      let feed: AppBskyFeedDefs.FeedViewPost[] =
+        limit && data.feed.length > limit
+          ? data.feed.slice(0, limit)
+          : data.feed
       // filter out older posts
-      res.data.feed = res.data.feed.filter(
-        post => new Date(post.post.indexedAt) > this.minDate,
-      )
+      feed = feed.filter(post => new Date(post.post.indexedAt) > this.minDate)
       // attach source info
-      for (const post of res.data.feed) {
+      for (const post of feed) {
         // @ts-ignore
         post.__source = this.sourceInfo
       }
-      return res
+      return {
+        cursor: data.cursor,
+        feed,
+      }
     } catch {
       // dont bubble custom-feed errors
-      return {success: false, headers: {}, data: {feed: []}}
+      return null
     }
   }
 }
diff --git a/src/lib/api/feed/posts.ts b/src/lib/api/feed/posts.ts
index 33eff50997..d2bcfc4317 100644
--- a/src/lib/api/feed/posts.ts
+++ b/src/lib/api/feed/posts.ts
@@ -1,25 +1,25 @@
-import {
-  type Agent,
-  type AppBskyFeedDefs,
-  type AppBskyFeedGetPosts,
-} from '@atproto/api'
+import {type AppBskyFeedDefs} from '@atproto/api'
+import {type Client, type XrpcRequestParams} from '@atproto/lex'
 
 import {logger} from '#/logger'
+import {app} from '#/lexicons'
 import {type FeedAPI, type FeedAPIResponse} from './types'
 
+type GetPostsParams = XrpcRequestParams<typeof app.bsky.feed.getPosts.main>
+
 export class PostListFeedAPI implements FeedAPI {
-  agent: Agent
-  params: AppBskyFeedGetPosts.QueryParams
+  client: Client
+  params: GetPostsParams
   peek: AppBskyFeedDefs.FeedViewPost | null = null
 
   constructor({
-    agent,
+    client,
     feedParams,
   }: {
-    agent: Agent
-    feedParams: AppBskyFeedGetPosts.QueryParams
+    client: Client
+    feedParams: GetPostsParams
   }) {
-    this.agent = agent
+    this.client = client
     if (feedParams.uris.length > 25) {
       logger.warn(
         `Too many URIs provided - expected 25, got ${feedParams.uris.length}`,
@@ -36,17 +36,18 @@ export class PostListFeedAPI implements FeedAPI {
   }
 
   async fetch({}: {}): Promise<FeedAPIResponse> {
-    const res = await this.agent.app.bsky.feed.getPosts({
+    /*
+     * A failed request rejects rather than resolving, so the error propagates
+     * to the query and drives the feed error UI. The agent behaved the same
+     * way - its `success` flag was only ever true - so the empty-page branch
+     * this replaces was unreachable.
+     */
+    const data = await this.client.call(app.bsky.feed.getPosts, {
       ...this.params,
     })
-    if (res.success) {
-      this.peek = {post: res.data.posts[0]}
-      return {
-        feed: res.data.posts.map(post => ({post})),
-      }
-    }
+    this.peek = {post: data.posts[0]}
     return {
-      feed: [],
+      feed: data.posts.map(post => ({post})),
     }
   }
 }
diff --git a/src/state/queries/explore-feed-previews.tsx b/src/state/queries/explore-feed-previews.tsx
index acbc4ee7e1..c340078603 100644
--- a/src/state/queries/explore-feed-previews.tsx
+++ b/src/state/queries/explore-feed-previews.tsx
@@ -5,6 +5,7 @@ import {
   AtUri,
   moderatePost,
 } from '@atproto/api'
+import {type AtUriString} from '@atproto/syntax'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {
@@ -28,7 +29,7 @@ import {
   embedViewRecordToPostView,
   getEmbeddedPost,
 } from '#/state/queries/util'
-import {useAgent} from '#/state/session'
+import {useAppviewClient} from '#/state/session'
 
 const RQKEY_ROOT = 'feed-previews'
 const RQKEY = (feeds: string[]) => [RQKEY_ROOT, feeds]
@@ -121,7 +122,7 @@ export function useFeedPreviews(
 
   const uris = feeds.map(feed => feed.uri)
   const {_} = useLingui()
-  const agent = useAgent()
+  const client = useAppviewClient()
   const {data: preferences} = usePreferencesQuery()
   const userInterests = aggregateUserInterests(preferences)
   const moderationOpts = useModerationOpts()
@@ -143,8 +144,8 @@ export function useFeedPreviews(
     queryFn: async ({pageParam}) => {
       const feed = feeds[pageParam]
       const api = new CustomFeedAPI({
-        agent,
-        feedParams: {feed: feed.uri},
+        client,
+        feedParams: {feed: feed.uri as AtUriString},
         userInterests,
       })
       const data = await api.fetch({cursor: undefined, limit: LIMIT})
diff --git a/src/state/queries/post-feed.ts b/src/state/queries/post-feed.ts
index 959ed81c28..0d5b48acde 100644
--- a/src/state/queries/post-feed.ts
+++ b/src/state/queries/post-feed.ts
@@ -4,12 +4,13 @@ import {
   type AppBskyActorDefs,
   AppBskyFeedDefs,
   type AppBskyFeedPost,
-  type AtpAgent,
   AtUri,
   moderatePost,
   type ModerationDecision,
   type ModerationPrefs,
 } from '@atproto/api'
+import {type Client} from '@atproto/lex'
+import {type AtIdentifierString, type AtUriString} from '@atproto/syntax'
 import {
   type InfiniteData,
   type QueryClient,
@@ -33,7 +34,7 @@ import {DISCOVER_FEED_URI} from '#/lib/constants'
 import {logger} from '#/logger'
 import {STALE} from '#/state/queries'
 import {DEFAULT_LOGGED_OUT_PREFERENCES} from '#/state/queries/preferences/const'
-import {useAgent} from '#/state/session'
+import {useAgent, useAppviewClient} from '#/state/session'
 import * as userActionHistory from '#/state/userActionHistory'
 import {KnownError} from '#/view/com/posts/PostFeedErrorMessage'
 import {useFeedTuners} from '../preferences/feed-tuners'
@@ -149,6 +150,7 @@ export function usePostFeedQuery(
     ) ?? -1
   const enableFollowingToDiscoverFallback = followingPinnedIndex === 0
   const agent = useAgent()
+  const client = useAppviewClient()
   const lastRun = useRef<{
     data: InfiniteData<FeedPageUnselected>
     args: typeof selectArgs
@@ -193,7 +195,7 @@ export function usePostFeedQuery(
               feedDesc,
               feedParams: params || {},
               feedTuners,
-              agent,
+              client,
               // Not in the query key because they don't change:
               userInterests,
               // Not in the query key. Reacting to it switching isn't important:
@@ -443,55 +445,68 @@ function createApi({
   feedParams,
   feedTuners,
   userInterests,
-  agent,
+  client,
   enableFollowingToDiscoverFallback,
 }: {
   feedDesc: FeedDescriptor
   feedParams: FeedParams
   feedTuners: FeedTunerFn[]
   userInterests?: string
-  agent: AtpAgent
+  client: Client
   enableFollowingToDiscoverFallback: boolean
 }) {
   if (feedDesc === 'following') {
     if (feedParams.mergeFeedEnabled) {
       return new MergeFeedAPI({
-        agent,
+        client,
         feedParams,
         feedTuners,
         userInterests,
       })
     } else {
       if (enableFollowingToDiscoverFallback) {
-        return new HomeFeedAPI({agent, userInterests})
+        return new HomeFeedAPI({client, userInterests})
       } else {
-        return new FollowingFeedAPI({agent})
+        return new FollowingFeedAPI({client})
       }
     }
   } else if (feedDesc.startsWith('author')) {
     const [__, actor, filter] = feedDesc.split('|')
-    return new AuthorFeedAPI({agent, feedParams: {actor, filter}})
+    /*
+     * The descriptor is split out of an internally-built string, so neither the
+     * actor identifier nor the filter token is narrowed by the compiler here.
+     */
+    return new AuthorFeedAPI({
+      client,
+      feedParams: {actor: actor as AtIdentifierString, filter},
+    })
   } else if (feedDesc.startsWith('likes')) {
     const [__, actor] = feedDesc.split('|')
-    return new LikesFeedAPI({agent, feedParams: {actor}})
+    return new LikesFeedAPI({
+      client,
+      feedParams: {actor: actor as AtIdentifierString},
+    })
   } else if (feedDesc.startsWith('feedgen')) {
     const [__, feed] = feedDesc.split('|')
     return new CustomFeedAPI({
-      agent,
-      feedParams: {feed},
+      client,
+      feedParams: {feed: feed as AtUriString},
       userInterests,
     })
   } else if (feedDesc.startsWith('list')) {
     const [__, list] = feedDesc.split('|')
-    return new ListFeedAPI({agent, feedParams: {list}})
+    return new ListFeedAPI({client, feedParams: {list: list as AtUriString}})
   } else if (feedDesc.startsWith('posts')) {
     const [__, uriList] = feedDesc.split('|')
-    return new PostListFeedAPI({agent, feedParams: {uris: uriList.split(',')}})
+    return new PostListFeedAPI({
+      client,
+      feedParams: {uris: uriList.split(',') as AtUriString[]},
+    })
   } else if (feedDesc === 'demo') {
-    return new DemoFeedAPI({agent})
+    return new DemoFeedAPI({client})
   } else {
     // shouldnt happen
-    return new FollowingFeedAPI({agent})
+    return new FollowingFeedAPI({client})
   }
 }
 
diff --git a/src/state/queries/post-liked-by.ts b/src/state/queries/post-liked-by.ts
index e4f37c14ca..cc18a46426 100644
--- a/src/state/queries/post-liked-by.ts
+++ b/src/state/queries/post-liked-by.ts
@@ -1,4 +1,5 @@
-import {type AppBskyActorDefs, type AppBskyFeedGetLikes} from '@atproto/api'
+import {type AppBskyActorDefs} from '@atproto/api'
+import {type AtUriString} from '@atproto/syntax'
 import {
   type InfiniteData,
   type QueryClient,
@@ -9,7 +10,8 @@ import {
 
 import {STALE} from '#/state/queries'
 import {createQueryKey} from '#/state/queries/util'
-import {useAgent} from '#/state/session'
+import {useAppviewClient} from '#/state/session'
+import {app} from '#/lexicons'
 
 const PAGE_SIZE = 30
 type RQPageParam = string | undefined
@@ -19,22 +21,22 @@ const RQKEY_ROOT = 'liked-by'
 export const RQKEY = (resolvedUri: string) => [RQKEY_ROOT, resolvedUri]
 
 export function useLikedByQuery(resolvedUri: string | undefined) {
-  const agent = useAgent()
+  const client = useAppviewClient()
   return useInfiniteQuery<
-    AppBskyFeedGetLikes.OutputSchema,
+    app.bsky.feed.getLikes.$OutputBody,
     Error,
-    InfiniteData<AppBskyFeedGetLikes.OutputSchema>,
+    InfiniteData<app.bsky.feed.getLikes.$OutputBody>,
     QueryKey,
     RQPageParam
   >({
     queryKey: RQKEY(resolvedUri || ''),
     async queryFn({pageParam}: {pageParam: RQPageParam}) {
-      const res = await agent.getLikes({
-        uri: resolvedUri || '',
+      return await client.call(app.bsky.feed.getLikes, {
+        // the enabled flag prevents this from running until resolvedUri is set
+        uri: (resolvedUri || '') as AtUriString,
         limit: PAGE_SIZE,
         cursor: pageParam,
       })
-      return res.data
     },
     initialPageParam: undefined,
     getNextPageParam: lastPage => lastPage.cursor,
@@ -59,12 +61,14 @@ export const createLikedBySampleQueryKey = (args: {uri: string}) =>
  * perturb the liked-by screen's pagination.
  */
 export function useLikedBySampleQuery({uri}: {uri: string | undefined}) {
-  const agent = useAgent()
+  const client = useAppviewClient()
   return useQuery({
     queryKey: createLikedBySampleQueryKey({uri: uri ?? ''}),
     queryFn: async () => {
-      const res = await agent.getLikes({uri: uri ?? '', limit: SAMPLE_SIZE})
-      return res.data
+      return await client.call(app.bsky.feed.getLikes, {
+        uri: (uri ?? '') as AtUriString,
+        limit: SAMPLE_SIZE,
+      })
     },
     staleTime: STALE.MINUTES.FIVE,
     enabled: !!uri,
@@ -81,7 +85,7 @@ export function* findAllProfilesInQueryData(
   did: string,
 ): Generator<AppBskyActorDefs.ProfileView, void> {
   const queryDatas = queryClient.getQueriesData<
-    InfiniteData<AppBskyFeedGetLikes.OutputSchema>
+    InfiniteData<app.bsky.feed.getLikes.$OutputBody>
   >({
     queryKey: [RQKEY_ROOT],
   })
@@ -98,7 +102,7 @@ export function* findAllProfilesInQueryData(
     }
   }
   const sampleQueryDatas =
-    queryClient.getQueriesData<AppBskyFeedGetLikes.OutputSchema>({
+    queryClient.getQueriesData<app.bsky.feed.getLikes.$OutputBody>({
       queryKey: [likedBySampleQueryKeyRoot],
     })
   for (const [_queryKey, queryData] of sampleQueryDatas) {
diff --git a/src/state/queries/post-quotes.ts b/src/state/queries/post-quotes.ts
index 1d0fa07e8e..77b5dabcf8 100644
--- a/src/state/queries/post-quotes.ts
+++ b/src/state/queries/post-quotes.ts
@@ -2,9 +2,9 @@ import {
   type AppBskyActorDefs,
   AppBskyEmbedRecord,
   type AppBskyFeedDefs,
-  type AppBskyFeedGetQuotes,
   AtUri,
 } from '@atproto/api'
+import {type AtUriString} from '@atproto/syntax'
 import {
   type InfiniteData,
   type QueryClient,
@@ -12,7 +12,8 @@ import {
   useInfiniteQuery,
 } from '@tanstack/react-query'
 
-import {useAgent} from '#/state/session'
+import {useAppviewClient} from '#/state/session'
+import {app} from '#/lexicons'
 import {
   didOrHandleUriMatches,
   embedViewRecordToPostView,
@@ -26,22 +27,22 @@ const RQKEY_ROOT = 'post-quotes'
 export const RQKEY = (resolvedUri: string) => [RQKEY_ROOT, resolvedUri]
 
 export function usePostQuotesQuery(resolvedUri: string | undefined) {
-  const agent = useAgent()
+  const client = useAppviewClient()
   return useInfiniteQuery<
-    AppBskyFeedGetQuotes.OutputSchema,
+    app.bsky.feed.getQuotes.$OutputBody,
     Error,
-    InfiniteData<AppBskyFeedGetQuotes.OutputSchema>,
+    InfiniteData<app.bsky.feed.getQuotes.$OutputBody>,
     QueryKey,
     RQPageParam
   >({
     queryKey: RQKEY(resolvedUri || ''),
     async queryFn({pageParam}: {pageParam: RQPageParam}) {
-      const res = await agent.api.app.bsky.feed.getQuotes({
-        uri: resolvedUri || '',
+      return await client.call(app.bsky.feed.getQuotes, {
+        // the enabled flag prevents this from running until resolvedUri is set
+        uri: (resolvedUri || '') as AtUriString,
         limit: PAGE_SIZE,
         cursor: pageParam,
       })
-      return res.data
     },
     initialPageParam: undefined,
     getNextPageParam: lastPage => lastPage.cursor,
@@ -72,7 +73,7 @@ export function* findAllProfilesInQueryData(
   did: string,
 ): Generator<AppBskyActorDefs.ProfileViewBasic, void> {
   const queryDatas = queryClient.getQueriesData<
-    InfiniteData<AppBskyFeedGetQuotes.OutputSchema>
+    InfiniteData<app.bsky.feed.getQuotes.$OutputBody>
   >({
     queryKey: [RQKEY_ROOT],
   })
@@ -99,7 +100,7 @@ export function* findAllPostsInQueryData(
   uri: string,
 ): Generator<AppBskyFeedDefs.PostView, undefined> {
   const queryDatas = queryClient.getQueriesData<
-    InfiniteData<AppBskyFeedGetQuotes.OutputSchema>
+    InfiniteData<app.bsky.feed.getQuotes.$OutputBody>
   >({
     queryKey: [RQKEY_ROOT],
   })
diff --git a/src/state/queries/post-reposted-by.ts b/src/state/queries/post-reposted-by.ts
index 814a815aae..d2c5e62385 100644
--- a/src/state/queries/post-reposted-by.ts
+++ b/src/state/queries/post-reposted-by.ts
@@ -1,7 +1,5 @@
-import {
-  type AppBskyActorDefs,
-  type AppBskyFeedGetRepostedBy,
-} from '@atproto/api'
+import {type AppBskyActorDefs} from '@atproto/api'
+import {type AtUriString} from '@atproto/syntax'
 import {
   type InfiniteData,
   type QueryClient,
@@ -9,7 +7,8 @@ import {
   useInfiniteQuery,
 } from '@tanstack/react-query'
 
-import {useAgent} from '#/state/session'
+import {useAppviewClient} from '#/state/session'
+import {app} from '#/lexicons'
 
 const PAGE_SIZE = 30
 type RQPageParam = string | undefined
@@ -19,22 +18,22 @@ const RQKEY_ROOT = 'post-reposted-by'
 export const RQKEY = (resolvedUri: string) => [RQKEY_ROOT, resolvedUri]
 
 export function usePostRepostedByQuery(resolvedUri: string | undefined) {
-  const agent = useAgent()
+  const client = useAppviewClient()
   return useInfiniteQuery<
-    AppBskyFeedGetRepostedBy.OutputSchema,
+    app.bsky.feed.getRepostedBy.$OutputBody,
     Error,
-    InfiniteData<AppBskyFeedGetRepostedBy.OutputSchema>,
+    InfiniteData<app.bsky.feed.getRepostedBy.$OutputBody>,
     QueryKey,
     RQPageParam
   >({
     queryKey: RQKEY(resolvedUri || ''),
     async queryFn({pageParam}: {pageParam: RQPageParam}) {
-      const res = await agent.getRepostedBy({
-        uri: resolvedUri || '',
+      return await client.call(app.bsky.feed.getRepostedBy, {
+        // the enabled flag prevents this from running until resolvedUri is set
+        uri: (resolvedUri || '') as AtUriString,
         limit: PAGE_SIZE,
         cursor: pageParam,
       })
-      return res.data
     },
     initialPageParam: undefined,
     getNextPageParam: lastPage => lastPage.cursor,
@@ -47,7 +46,7 @@ export function* findAllProfilesInQueryData(
   did: string,
 ): Generator<AppBskyActorDefs.ProfileView, void> {
   const queryDatas = queryClient.getQueriesData<
-    InfiniteData<AppBskyFeedGetRepostedBy.OutputSchema>
+    InfiniteData<app.bsky.feed.getRepostedBy.$OutputBody>
   >({
     queryKey: [RQKEY_ROOT],
   })

From f5c166a055af390d2c67a4c4d6e9e2789c6e7ad7 Mon Sep 17 00:00:00 2001
From: Samuel Newman <mozzius@protonmail.com>
Date: Thu, 13 Aug 2026 22:26:17 +0300
Subject: [PATCH 14/32] [SDK] Migrate the notifications cluster to the lex
 clients (#11362)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
---
 .../SubscribeProfileDialog.tsx                | 14 ++++---
 src/state/cache/thread-mutes.tsx              | 15 ++++---
 src/state/queries/activity-subscriptions.ts   | 17 ++++----
 src/state/queries/notifications/feed.ts       |  6 +--
 src/state/queries/notifications/settings.ts   | 35 ++++++++--------
 src/state/queries/notifications/unread.tsx    | 19 +++++----
 src/state/queries/notifications/util.ts       | 40 +++++++++++--------
 .../notifications/NotificationFeedItem.tsx    | 22 +++++-----
 8 files changed, 94 insertions(+), 74 deletions(-)

diff --git a/src/components/activity-notifications/SubscribeProfileDialog.tsx b/src/components/activity-notifications/SubscribeProfileDialog.tsx
index 8a6b8314cd..6731cb3038 100644
--- a/src/components/activity-notifications/SubscribeProfileDialog.tsx
+++ b/src/components/activity-notifications/SubscribeProfileDialog.tsx
@@ -2,10 +2,10 @@ import {useMemo, useState} from 'react'
 import {View} from 'react-native'
 import {
   type AppBskyNotificationDefs,
-  type AppBskyNotificationListActivitySubscriptions,
   type ModerationOpts,
   type Un$Typed,
 } from '@atproto/api'
+import {type DidString} from '@atproto/syntax'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
@@ -20,7 +20,7 @@ import {cleanError} from '#/lib/strings/errors'
 import {sanitizeHandle} from '#/lib/strings/handles'
 import {updateProfileShadow} from '#/state/cache/profile-shadow'
 import {RQKEY_getActivitySubscriptions} from '#/state/queries/activity-subscriptions'
-import {useAgent} from '#/state/session'
+import {useAppviewClient} from '#/state/session'
 import {atoms as a, platform, useTheme, web} from '#/alf'
 import {Admonition} from '#/components/Admonition'
 import {
@@ -37,6 +37,7 @@ import * as Toast from '#/components/Toast'
 import {Text} from '#/components/Typography'
 import {useAnalytics} from '#/analytics'
 import {IS_WEB} from '#/env'
+import {app} from '#/lexicons'
 import type * as bsky from '#/types/bsky'
 
 export function SubscribeProfileDialog({
@@ -74,7 +75,7 @@ function DialogInner({
   const ax = useAnalytics()
   const {_} = useLingui()
   const t = useTheme()
-  const agent = useAgent()
+  const client = useAppviewClient()
   const control = Dialog.useDialogContext()
   const queryClient = useQueryClient()
   const initialState = parseActivitySubscription(
@@ -122,8 +123,9 @@ function DialogInner({
     mutationFn: async (
       activitySubscription: Un$Typed<AppBskyNotificationDefs.ActivitySubscription>,
     ) => {
-      await agent.app.bsky.notification.putActivitySubscription({
-        subject: profile.did,
+      await client.call(app.bsky.notification.putActivitySubscription, {
+        // the profile view carries an already-resolved did
+        subject: profile.did as DidString,
         activitySubscription,
       })
     },
@@ -148,7 +150,7 @@ function DialogInner({
           queryClient.setQueryData(
             RQKEY_getActivitySubscriptions,
             (
-              old?: InfiniteData<AppBskyNotificationListActivitySubscriptions.OutputSchema>,
+              old?: InfiniteData<app.bsky.notification.listActivitySubscriptions.$OutputBody>,
             ) => {
               if (!old) return old
               return {
diff --git a/src/state/cache/thread-mutes.tsx b/src/state/cache/thread-mutes.tsx
index f0d9911348..17f6be9f34 100644
--- a/src/state/cache/thread-mutes.tsx
+++ b/src/state/cache/thread-mutes.tsx
@@ -5,9 +5,11 @@ import {
   useEffect,
   useState,
 } from 'react'
+import {type AtUriString} from '@atproto/syntax'
 
 import * as persisted from '#/state/persisted'
-import {useAgent, useSession} from '../session'
+import {app} from '#/lexicons'
+import {useAppviewClient, useSession} from '../session'
 
 type StateContext = Map<string, boolean>
 type SetStateContext = (uri: string, value: boolean) => void
@@ -56,7 +58,7 @@ export function useSetThreadMute() {
 }
 
 function useMigrateMutes(setThreadMute: SetStateContext) {
-  const agent = useAgent()
+  const client = useAppviewClient()
   const {currentAccount} = useSession()
 
   useEffect(() => {
@@ -87,8 +89,11 @@ function useMigrateMutes(setThreadMute: SetStateContext) {
 
           setThreadMute(root, true)
 
-          await agent.api.app.bsky.graph
-            .muteThread({root})
+          await client
+            .call(app.bsky.graph.muteThread, {
+              // the persisted list only ever holds post at-uris
+              root: root as AtUriString,
+            })
             // not a big deal if this fails, since the post might have been deleted
             .catch(console.error)
         }
@@ -100,5 +105,5 @@ function useMigrateMutes(setThreadMute: SetStateContext) {
         cancelled = true
       }
     }
-  }, [agent, currentAccount, setThreadMute])
+  }, [client, currentAccount, setThreadMute])
 }
diff --git a/src/state/queries/activity-subscriptions.ts b/src/state/queries/activity-subscriptions.ts
index 30964fe7d6..e6dcbd8829 100644
--- a/src/state/queries/activity-subscriptions.ts
+++ b/src/state/queries/activity-subscriptions.ts
@@ -1,7 +1,6 @@
 import {
   type AppBskyActorDefs,
   type AppBskyNotificationDeclaration,
-  type AppBskyNotificationListActivitySubscriptions,
 } from '@atproto/api'
 import {t} from '@lingui/core/macro'
 import {
@@ -13,23 +12,23 @@ import {
   useQueryClient,
 } from '@tanstack/react-query'
 
-import {useAgent, useSession} from '#/state/session'
+import {useAgent, useAppviewClient, useSession} from '#/state/session'
 import * as Toast from '#/components/Toast'
+import {app} from '#/lexicons'
 
 export const RQKEY_getActivitySubscriptions = ['activity-subscriptions']
 export const RQKEY_getNotificationDeclaration = ['notification-declaration']
 
 export function useActivitySubscriptionsQuery() {
-  const agent = useAgent()
+  const client = useAppviewClient()
 
   return useInfiniteQuery({
     queryKey: RQKEY_getActivitySubscriptions,
     queryFn: async ({pageParam}) => {
-      const response =
-        await agent.app.bsky.notification.listActivitySubscriptions({
-          cursor: pageParam,
-        })
-      return response.data
+      return await client.call(
+        app.bsky.notification.listActivitySubscriptions,
+        {cursor: pageParam},
+      )
     },
     initialPageParam: undefined as string | undefined,
     getNextPageParam: prev => prev.cursor,
@@ -111,7 +110,7 @@ export function* findAllProfilesInQueryData(
   did: string,
 ): Generator<AppBskyActorDefs.ProfileView, void> {
   const queryDatas = queryClient.getQueriesData<
-    InfiniteData<AppBskyNotificationListActivitySubscriptions.OutputSchema>
+    InfiniteData<app.bsky.notification.listActivitySubscriptions.$OutputBody>
   >({
     queryKey: RQKEY_getActivitySubscriptions,
   })
diff --git a/src/state/queries/notifications/feed.ts b/src/state/queries/notifications/feed.ts
index cc24d3d0fc..51740e8d50 100644
--- a/src/state/queries/notifications/feed.ts
+++ b/src/state/queries/notifications/feed.ts
@@ -33,7 +33,7 @@ import {
 
 import {useModerationOpts} from '#/state/preferences/moderation-opts'
 import {STALE} from '#/state/queries'
-import {useAgent} from '#/state/session'
+import {useAppviewClient} from '#/state/session'
 import {useThreadgateHiddenReplyUris} from '#/state/threadgate-hidden-replies'
 import type * as bsky from '#/types/bsky'
 import {
@@ -60,7 +60,7 @@ export function useNotificationFeedQuery(opts: {
   enabled?: boolean
   filter: 'all' | 'mentions'
 }) {
-  const agent = useAgent()
+  const client = useAppviewClient()
   const queryClient = useQueryClient()
   const moderationOpts = useModerationOpts()
   const unreads = useUnreadNotificationsApi()
@@ -106,7 +106,7 @@ export function useNotificationFeedQuery(opts: {
           ]
         }
         const {page: fetchedPage} = await fetchPage({
-          agent,
+          client,
           limit: PAGE_SIZE,
           cursor: pageParam,
           queryClient,
diff --git a/src/state/queries/notifications/settings.ts b/src/state/queries/notifications/settings.ts
index 86e8a6c7f1..2cadb519dc 100644
--- a/src/state/queries/notifications/settings.ts
+++ b/src/state/queries/notifications/settings.ts
@@ -10,10 +10,10 @@ import {
   useQueryClient,
 } from '@tanstack/react-query'
 
-import {DM_SERVICE_HEADERS} from '#/lib/constants'
 import {logger} from '#/logger'
-import {useAgent} from '#/state/session'
+import {useAppviewClient, useChatClient} from '#/state/session'
 import * as Toast from '#/components/Toast'
+import {app, chat} from '#/lexicons'
 
 const RQKEY_ROOT = 'notification-settings'
 const RQKEY_APP = [RQKEY_ROOT, 'app']
@@ -67,13 +67,13 @@ type ChatNotificationSettingsUpdate =
 export function useNotificationSettingsQuery({
   enabled,
 }: {enabled?: boolean} = {}) {
-  const agent = useAgent()
+  const client = useAppviewClient()
 
   return useQuery({
     queryKey: RQKEY_APP,
     queryFn: async (): Promise<AppNotificationSettingsPreferences> => {
-      const res = await agent.app.bsky.notification.getPreferences()
-      return appPreferencesWithoutChat(res.data.preferences)
+      const data = await client.call(app.bsky.notification.getPreferences)
+      return appPreferencesWithoutChat(data.preferences)
     },
     enabled,
   })
@@ -82,21 +82,24 @@ export function useNotificationSettingsQuery({
 export function useChatNotificationSettingsQuery({
   enabled,
 }: {enabled?: boolean} = {}) {
-  const agent = useAgent()
+  const client = useChatClient()
 
   return useQuery({
     queryKey: RQKEY_CHAT,
     queryFn: async (): Promise<ChatNotificationSettingsPreferences> => {
-      const res = await agent.chat.bsky.notification.getPreferences(undefined, {
-        headers: DM_SERVICE_HEADERS,
-      })
-      return chatPreferencesForSettings(res.data.preferences)
+      const data = await client.call(chat.bsky.notification.getPreferences)
+      return chatPreferencesForSettings(data.preferences)
     },
     enabled,
   })
 }
 export function useNotificationSettingsUpdateMutation() {
-  const agent = useAgent()
+  /*
+   * App preferences live on the appview and chat preferences on the chat
+   * service, so a combined update fans out over both clients.
+   */
+  const appviewClient = useAppviewClient()
+  const chatClient = useChatClient()
   const queryClient = useQueryClient()
 
   return useMutation({
@@ -104,13 +107,13 @@ export function useNotificationSettingsUpdateMutation() {
       const {appUpdate, chatUpdate} = splitNotificationSettingsUpdate(update)
       await Promise.all([
         hasUpdates(appUpdate)
-          ? agent.app.bsky.notification.putPreferencesV2(appUpdate)
+          ? appviewClient.call(
+              app.bsky.notification.putPreferencesV2,
+              appUpdate,
+            )
           : undefined,
         hasUpdates(chatUpdate)
-          ? agent.chat.bsky.notification.putPreferences(chatUpdate, {
-              headers: DM_SERVICE_HEADERS,
-              encoding: 'application/json',
-            })
+          ? chatClient.call(chat.bsky.notification.putPreferences, chatUpdate)
           : undefined,
       ])
     },
diff --git a/src/state/queries/notifications/unread.tsx b/src/state/queries/notifications/unread.tsx
index bf7505f91b..e905b29ac6 100644
--- a/src/state/queries/notifications/unread.tsx
+++ b/src/state/queries/notifications/unread.tsx
@@ -11,6 +11,7 @@ import {
   useState,
 } from 'react'
 import {AppState} from 'react-native'
+import {type ISODatetimeString} from '@atproto/syntax'
 import {useQueryClient} from '@tanstack/react-query'
 import {EventEmitter} from 'eventemitter3'
 
@@ -18,7 +19,8 @@ import BroadcastChannel from '#/lib/broadcast'
 import {resetBadgeCount} from '#/lib/notifications/notifications'
 import {useModerationOpts} from '#/state/preferences/moderation-opts'
 import {truncateAndInvalidate} from '#/state/queries/util'
-import {useAgent, useSession} from '#/state/session'
+import {useAppviewClient, useSession} from '#/state/session'
+import {app} from '#/lexicons'
 import {RQKEY as RQKEY_NOTIFS} from './feed'
 import {type CachedFeedPage, type FeedPage} from './types'
 import {fetchPage} from './util'
@@ -52,7 +54,7 @@ apiContext.displayName = 'NotificationsUnreadApiContext'
 
 export function Provider({children}: React.PropsWithChildren<{}>) {
   const {hasSession} = useSession()
-  const agent = useAgent()
+  const client = useAppviewClient()
   const queryClient = useQueryClient()
   const moderationOpts = useModerationOpts()
 
@@ -120,9 +122,10 @@ export function Provider({children}: React.PropsWithChildren<{}>) {
     return {
       async markAllRead() {
         // update server
-        await agent.updateSeenNotifications(
-          cacheRef.current.syncedAt.toISOString(),
-        )
+        await client.call(app.bsky.notification.updateSeen, {
+          // toISOString always emits the Z-suffixed form the format requires
+          seenAt: cacheRef.current.syncedAt.toISOString() as ISODatetimeString,
+        })
 
         // update & broadcast
         setNumUnread('')
@@ -135,7 +138,7 @@ export function Provider({children}: React.PropsWithChildren<{}>) {
         isPoll,
       }: {invalidate?: boolean; isPoll?: boolean} = {}) {
         try {
-          if (!agent.session) return
+          if (!hasSession) return
           if (AppState.currentState !== 'active') {
             return
           }
@@ -156,7 +159,7 @@ export function Provider({children}: React.PropsWithChildren<{}>) {
 
           // count
           const {page, indexedAt: lastIndexed} = await fetchPage({
-            agent,
+            client,
             cursor: undefined,
             limit: 40,
             queryClient,
@@ -207,7 +210,7 @@ export function Provider({children}: React.PropsWithChildren<{}>) {
         }
       },
     }
-  }, [setNumUnread, queryClient, moderationOpts, agent])
+  }, [setNumUnread, queryClient, moderationOpts, client, hasSession])
   checkUnreadRef.current = api.checkUnread
 
   return (
diff --git a/src/state/queries/notifications/util.ts b/src/state/queries/notifications/util.ts
index e5d1d81885..4606507700 100644
--- a/src/state/queries/notifications/util.ts
+++ b/src/state/queries/notifications/util.ts
@@ -6,15 +6,17 @@ import {
   type AppBskyGraphDefs,
   AppBskyGraphStarterpack,
   type AppBskyNotificationListNotifications,
-  type AtpAgent,
   hasMutedWord,
   moderateNotification,
   type ModerationOpts,
 } from '@atproto/api'
+import {type Client} from '@atproto/lex'
+import {type AtUriString} from '@atproto/syntax'
 import {type QueryClient} from '@tanstack/react-query'
 import chunk from 'lodash.chunk'
 
 import {labelIsHideableOffense} from '#/lib/moderation'
+import {app} from '#/lexicons'
 import * as bsky from '#/types/bsky'
 import {precacheProfile} from '../profile'
 import {
@@ -38,7 +40,7 @@ const MS_2DAY = MS_1HR * 48
 // =
 
 export async function fetchPage({
-  agent,
+  client,
   cursor,
   limit,
   queryClient,
@@ -46,7 +48,7 @@ export async function fetchPage({
   fetchAdditionalData,
   reasons,
 }: {
-  agent: AtpAgent
+  client: Client
   cursor: string | undefined
   limit: number
   queryClient: QueryClient
@@ -57,16 +59,16 @@ export async function fetchPage({
   page: FeedPage
   indexedAt: string | undefined
 }> {
-  const res = await agent.listNotifications({
+  const data = await client.call(app.bsky.notification.listNotifications, {
     limit,
     cursor,
     reasons,
   })
 
-  const indexedAt = res.data.notifications[0]?.indexedAt
+  const indexedAt = data.notifications[0]?.indexedAt
 
   // filter out notifs by mod rules
-  const notifs = res.data.notifications.filter(
+  const notifs = data.notifications.filter(
     notif => !shouldFilterNotif(notif, moderationOpts),
   )
 
@@ -76,7 +78,7 @@ export async function fetchPage({
   // we fetch subjects of notifications (usually posts) now instead of lazily
   // in the UI to avoid relayouts
   if (fetchAdditionalData) {
-    const subjects = await fetchSubjects(agent, notifsGrouped)
+    const subjects = await fetchSubjects(client, notifsGrouped)
     for (const notif of notifsGrouped) {
       if (notif.subjectUri) {
         if (
@@ -96,17 +98,17 @@ export async function fetchPage({
     }
   }
 
-  let seenAt = res.data.seenAt ? new Date(res.data.seenAt) : new Date()
+  let seenAt = data.seenAt ? new Date(data.seenAt) : new Date()
   if (Number.isNaN(seenAt.getTime())) {
     seenAt = new Date()
   }
 
   return {
     page: {
-      cursor: res.data.cursor,
+      cursor: data.cursor,
       seenAt,
       items: notifsGrouped,
-      priority: res.data.priority ?? false,
+      priority: data.priority ?? false,
     },
     indexedAt,
   }
@@ -207,7 +209,7 @@ export function groupNotifications(
 }
 
 async function fetchSubjects(
-  agent: AtpAgent,
+  client: Client,
   groupedNotifs: FeedNotification[],
 ): Promise<{
   posts: Map<string, AppBskyFeedDefs.PostView>
@@ -224,18 +226,22 @@ async function fetchSubjects(
       packUris.add(notif.notification.reasonSubject)
     }
   }
-  const postUriChunks = chunk(Array.from(postUris), 25)
-  const packUriChunks = chunk(Array.from(packUris), 25)
+  /*
+   * Both uri sets are collected from notification fields the server already
+   * validated as at-uris, so the branded cast reflects what the values are.
+   */
+  const postUriChunks = chunk(Array.from(postUris) as AtUriString[], 25)
+  const packUriChunks = chunk(Array.from(packUris) as AtUriString[], 25)
   const postsChunks = await Promise.all(
     postUriChunks.map(uris =>
-      agent.app.bsky.feed.getPosts({uris}).then(res => res.data.posts),
+      client.call(app.bsky.feed.getPosts, {uris}).then(data => data.posts),
     ),
   )
   const packsChunks = await Promise.all(
     packUriChunks.map(uris =>
-      agent.app.bsky.graph
-        .getStarterPacks({uris})
-        .then(res => res.data.starterPacks),
+      client
+        .call(app.bsky.graph.getStarterPacks, {uris})
+        .then(data => data.starterPacks),
     ),
   )
   const postsMap = new Map<string, AppBskyFeedDefs.PostView>()
diff --git a/src/view/com/notifications/NotificationFeedItem.tsx b/src/view/com/notifications/NotificationFeedItem.tsx
index c11cb8049b..2afb3a0f43 100644
--- a/src/view/com/notifications/NotificationFeedItem.tsx
+++ b/src/view/com/notifications/NotificationFeedItem.tsx
@@ -21,12 +21,13 @@ import {
   type ModerationOpts,
 } from '@atproto/api'
 import {TID} from '@atproto/common-web'
+import {type DidString} from '@atproto/syntax'
 import {plural} from '@lingui/core/macro'
 import {Plural, Trans, useLingui} from '@lingui/react/macro'
 import {useNavigation} from '@react-navigation/native'
 import {useQueryClient} from '@tanstack/react-query'
 
-import {DM_SERVICE_HEADERS, MAX_POST_LINES} from '#/lib/constants'
+import {MAX_POST_LINES} from '#/lib/constants'
 import {useAnimatedValue} from '#/lib/hooks/useAnimatedValue'
 import {makeProfileLink} from '#/lib/routes/links'
 import {type NavigationProp} from '#/lib/routes/types'
@@ -38,7 +39,7 @@ import {useProfileShadow} from '#/state/cache/profile-shadow'
 import {type FeedNotification} from '#/state/queries/notifications/feed'
 import {useProfileFollowMutationQueue} from '#/state/queries/profile'
 import {unstableCacheProfileView} from '#/state/queries/unstable-profile-cache'
-import {useAgent, useSession} from '#/state/session'
+import {useChatClient, useSession} from '#/state/session'
 import {FeedSourceCard} from '#/view/com/feeds/FeedSourceCard'
 import {Post} from '#/view/com/post/Post'
 import {formatCount} from '#/view/com/util/numeric/format'
@@ -73,6 +74,7 @@ import * as Toast from '#/components/Toast'
 import {Text} from '#/components/Typography'
 import {useAnalytics} from '#/analytics'
 import {IS_WEB} from '#/env'
+import {chat} from '#/lexicons'
 import * as bsky from '#/types/bsky'
 
 const MAX_AUTHORS = 5
@@ -911,21 +913,21 @@ function FollowBackButton({profile}: {profile: AppBskyActorDefs.ProfileView}) {
 
 function SayHelloBtn({profile}: {profile: AppBskyActorDefs.ProfileView}) {
   const {t: l} = useLingui()
-  const agent = useAgent()
+  const client = useChatClient()
+  const {currentAccount} = useSession()
   const navigation = useNavigation<NavigationProp>()
   const [isLoading, setIsLoading] = useState(false)
 
   const onPress = async () => {
     try {
       setIsLoading(true)
-      const res = await agent.api.chat.bsky.convo.getConvoForMembers(
-        {
-          members: [profile.did, agent.session!.did],
-        },
-        {headers: DM_SERVICE_HEADERS},
-      )
+      const data = await client.call(chat.bsky.convo.getConvoForMembers, {
+        // both dids are already resolved - one from the profile view, one from
+        // the active session
+        members: [profile.did, currentAccount!.did] as DidString[],
+      })
       navigation.navigate('MessagesConversation', {
-        conversation: res.data.convo.id,
+        conversation: data.convo.id,
       })
     } catch (e) {
       logger.error('Failed to get conversation', {safeMessage: e})

From 34d1c75756b5d4320b870a611d995a17273b37de Mon Sep 17 00:00:00 2001
From: Samuel Newman <mozzius@protonmail.com>
Date: Thu, 13 Aug 2026 22:26:17 +0300
Subject: [PATCH 15/32] [SDK] Migrate the account surface to the pds and
 service clients (#11367)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
---
 oxlint-suppressions.json                      |  6 ---
 .../EmailDialog/data/useRequestEmailUpdate.ts |  7 +--
 .../data/useRequestEmailVerification.ts       |  7 +--
 .../intents/VerifyEmailIntentDialog.tsx       |  7 +--
 src/lib/lexClient.ts                          | 20 +++++++++
 src/screens/Login/ForgotPasswordForm.tsx      | 14 +++---
 src/screens/Login/SetNewPasswordForm.tsx      | 11 +++--
 src/screens/Settings/AppPasswords.tsx         |  4 +-
 .../components/AddAppPasswordDialog.tsx       |  4 +-
 .../components/ChangePasswordDialog.tsx       | 14 +++---
 .../components/DeactivateAccountDialog.tsx    |  9 ++--
 .../components/DeleteAccountDialog.tsx        | 38 +++++++++-------
 src/state/queries/app-passwords.ts            | 28 ++++++------
 src/state/queries/handle-availability.ts      | 43 ++++++++++++-------
 src/state/queries/handle.ts                   | 12 ++++--
 src/state/queries/service.ts                  | 12 ++++--
 16 files changed, 148 insertions(+), 88 deletions(-)

diff --git a/oxlint-suppressions.json b/oxlint-suppressions.json
index 197bd43b1a..3b2304e8fe 100644
--- a/oxlint-suppressions.json
+++ b/oxlint-suppressions.json
@@ -1099,12 +1099,6 @@
     },
     "typescript/no-misused-promises": {
       "count": 2
-    },
-    "typescript/no-unsafe-call": {
-      "count": 2
-    },
-    "typescript/no-unsafe-member-access": {
-      "count": 2
     }
   },
   "src/screens/Settings/components/CopyButton.tsx": {
diff --git a/src/components/dialogs/EmailDialog/data/useRequestEmailUpdate.ts b/src/components/dialogs/EmailDialog/data/useRequestEmailUpdate.ts
index a442662fcf..d6cd418444 100644
--- a/src/components/dialogs/EmailDialog/data/useRequestEmailUpdate.ts
+++ b/src/components/dialogs/EmailDialog/data/useRequestEmailUpdate.ts
@@ -1,13 +1,14 @@
 import {useMutation} from '@tanstack/react-query'
 
-import {useAgent} from '#/state/session'
+import {usePdsClient} from '#/state/session'
+import {com} from '#/lexicons'
 
 export function useRequestEmailUpdate() {
-  const agent = useAgent()
+  const client = usePdsClient()
 
   return useMutation({
     mutationFn: async () => {
-      return (await agent.com.atproto.server.requestEmailUpdate()).data
+      return await client.call(com.atproto.server.requestEmailUpdate)
     },
   })
 }
diff --git a/src/components/dialogs/EmailDialog/data/useRequestEmailVerification.ts b/src/components/dialogs/EmailDialog/data/useRequestEmailVerification.ts
index ae308c7afc..4152e61e58 100644
--- a/src/components/dialogs/EmailDialog/data/useRequestEmailVerification.ts
+++ b/src/components/dialogs/EmailDialog/data/useRequestEmailVerification.ts
@@ -1,13 +1,14 @@
 import {useMutation} from '@tanstack/react-query'
 
-import {useAgent} from '#/state/session'
+import {usePdsClient} from '#/state/session'
+import {com} from '#/lexicons'
 
 export function useRequestEmailVerification() {
-  const agent = useAgent()
+  const client = usePdsClient()
 
   return useMutation({
     mutationFn: async () => {
-      await agent.com.atproto.server.requestEmailConfirmation()
+      await client.call(com.atproto.server.requestEmailConfirmation)
     },
   })
 }
diff --git a/src/components/intents/VerifyEmailIntentDialog.tsx b/src/components/intents/VerifyEmailIntentDialog.tsx
index b3504766f8..272804af0e 100644
--- a/src/components/intents/VerifyEmailIntentDialog.tsx
+++ b/src/components/intents/VerifyEmailIntentDialog.tsx
@@ -4,7 +4,7 @@ import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
 
-import {useAgent, useSession} from '#/state/session'
+import {usePdsClient, useSession} from '#/state/session'
 import {atoms as a, useBreakpoints, useTheme} from '#/alf'
 import {Button, ButtonIcon, ButtonText} from '#/components/Button'
 import * as Dialog from '#/components/Dialog'
@@ -16,6 +16,7 @@ import {useIntentDialogs} from '#/components/intents/IntentDialogs'
 import {Loader} from '#/components/Loader'
 import {Text} from '#/components/Typography'
 import {IS_NATIVE} from '#/env'
+import {com} from '#/lexicons'
 
 export function VerifyEmailIntentDialog() {
   const {verifyEmailDialogControl: control} = useIntentDialogs()
@@ -37,7 +38,7 @@ function Inner({}: {control: DialogControlProps}) {
     'loading' | 'success' | 'failure' | 'resent'
   >('loading')
   const [sending, setSending] = useState(false)
-  const agent = useAgent()
+  const client = usePdsClient()
   const {currentAccount} = useSession()
   const {mutate: confirmEmail} = useConfirmEmail({
     onSuccess: () => setStatus('success'),
@@ -52,7 +53,7 @@ function Inner({}: {control: DialogControlProps}) {
 
   const onPressResendEmail = async () => {
     setSending(true)
-    await agent.com.atproto.server.requestEmailConfirmation()
+    await client.call(com.atproto.server.requestEmailConfirmation)
     setSending(false)
     setStatus('resent')
   }
diff --git a/src/lib/lexClient.ts b/src/lib/lexClient.ts
index 40b0640665..2a865d763c 100644
--- a/src/lib/lexClient.ts
+++ b/src/lib/lexClient.ts
@@ -24,3 +24,23 @@ export function createLexClient(
 ): Client {
   return new Client(agent, {strictResponseProcessing: false, ...options})
 }
+
+/**
+ * An unauthenticated {@link Client} pointed at an arbitrary service URL, for
+ * the PRE-AUTH flows that talk to a host the user typed or picked (hosting
+ * provider description, password reset, handle availability). Those requests
+ * cannot go through a session-scoped client, because there is no session yet.
+ *
+ * Deliberately NOT memoized: `service` is user-supplied and changes as the user
+ * edits it, so there is no stable key to cache on. Each call builds a fresh
+ * client, mirroring the ad-hoc agents these call sites constructed inline. That
+ * keeps client identity per-render, so callers must not put the returned client
+ * in a React Query key or a dependency array.
+ *
+ * Requests use PLAIN `fetch`, not `networkAwareFetch`: the host is untrusted
+ * input, and a typo'd or dead service must not be reported as the app losing
+ * network reachability.
+ */
+export function createServiceClient(service: string): Client {
+  return createLexClient({service})
+}
diff --git a/src/screens/Login/ForgotPasswordForm.tsx b/src/screens/Login/ForgotPasswordForm.tsx
index 79fdbc5d6a..1e9eda430e 100644
--- a/src/screens/Login/ForgotPasswordForm.tsx
+++ b/src/screens/Login/ForgotPasswordForm.tsx
@@ -1,12 +1,11 @@
 import {useCallback, useState} from 'react'
 import {Keyboard, View} from 'react-native'
-import {type ComAtprotoServerDescribeServer} from '@atproto/api'
 import {Trans, useLingui} from '@lingui/react/macro'
 import * as EmailValidator from 'email-validator'
 
+import {createServiceClient} from '#/lib/lexClient'
 import {cleanError, isNetworkError} from '#/lib/strings/errors'
 import {logger} from '#/logger'
-import {Agent} from '#/state/session/agent'
 import {atoms as a, useTheme, web} from '#/alf'
 import {Admonition} from '#/components/Admonition'
 import {Button, ButtonIcon, ButtonText} from '#/components/Button'
@@ -16,9 +15,10 @@ import {At_Stroke2_Corner0_Rounded as At} from '#/components/icons/At'
 import {Loader} from '#/components/Loader'
 import {Text} from '#/components/Typography'
 import {IS_WEB} from '#/env'
+import {com} from '#/lexicons'
 import {FormContainer} from './FormContainer'
 
-type ServiceDescription = ComAtprotoServerDescribeServer.OutputSchema
+type ServiceDescription = com.atproto.server.describeServer.$OutputBody
 
 export const ForgotPasswordForm = ({
   error,
@@ -55,8 +55,12 @@ export const ForgotPasswordForm = ({
     setIsProcessing(true)
 
     try {
-      const agent = new Agent(null, {service: serviceUrl})
-      await agent.com.atproto.server.requestPasswordReset({email})
+      /*
+       * Pre-auth request against a user-chosen host, so it goes through a
+       * one-off service client rather than a session-scoped one.
+       */
+      const client = createServiceClient(serviceUrl)
+      await client.call(com.atproto.server.requestPasswordReset, {email})
       onEmailSent()
     } catch (err) {
       logger.warn('Failed to request password reset', {error: err})
diff --git a/src/screens/Login/SetNewPasswordForm.tsx b/src/screens/Login/SetNewPasswordForm.tsx
index cdc8fe4e0f..f870171be8 100644
--- a/src/screens/Login/SetNewPasswordForm.tsx
+++ b/src/screens/Login/SetNewPasswordForm.tsx
@@ -2,10 +2,10 @@ import {useState} from 'react'
 import {View} from 'react-native'
 import {Trans, useLingui} from '@lingui/react/macro'
 
+import {createServiceClient} from '#/lib/lexClient'
 import {cleanError, isNetworkError} from '#/lib/strings/errors'
 import {checkAndFormatResetCode} from '#/lib/strings/password'
 import {logger} from '#/logger'
-import {Agent} from '#/state/session/agent'
 import {atoms as a, web} from '#/alf'
 import {Admonition} from '#/components/Admonition'
 import {Button, ButtonIcon, ButtonText} from '#/components/Button'
@@ -16,6 +16,7 @@ import {Loader} from '#/components/Loader'
 import {Text} from '#/components/Typography'
 import {useAnalytics} from '#/analytics'
 import {IS_WEB} from '#/env'
+import {com} from '#/lexicons'
 import {FormContainer} from './FormContainer'
 
 export const SetNewPasswordForm = ({
@@ -61,8 +62,12 @@ export const SetNewPasswordForm = ({
     setIsProcessing(true)
 
     try {
-      const agent = new Agent(null, {service: serviceUrl})
-      await agent.com.atproto.server.resetPassword({
+      /*
+       * Pre-auth request against a user-chosen host, so it goes through a
+       * one-off service client rather than a session-scoped one.
+       */
+      const client = createServiceClient(serviceUrl)
+      await client.call(com.atproto.server.resetPassword, {
         token: formattedCode,
         password,
       })
diff --git a/src/screens/Settings/AppPasswords.tsx b/src/screens/Settings/AppPasswords.tsx
index 65ebdf3d4f..49173b9629 100644
--- a/src/screens/Settings/AppPasswords.tsx
+++ b/src/screens/Settings/AppPasswords.tsx
@@ -6,7 +6,6 @@ import Animated, {
   LayoutAnimationConfig,
   LinearTransition,
 } from 'react-native-reanimated'
-import {type ComAtprotoServerListAppPasswords} from '@atproto/api'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
@@ -33,6 +32,7 @@ import {Loader} from '#/components/Loader'
 import * as Prompt from '#/components/Prompt'
 import * as Toast from '#/components/Toast'
 import {Text} from '#/components/Typography'
+import {type com} from '#/lexicons'
 import {AddAppPasswordDialog} from './components/AddAppPasswordDialog'
 import * as SettingsList from './components/SettingsList'
 
@@ -135,7 +135,7 @@ export function AppPasswordsScreen({}: Props) {
 function AppPasswordCard({
   appPassword,
 }: {
-  appPassword: ComAtprotoServerListAppPasswords.AppPassword
+  appPassword: com.atproto.server.listAppPasswords.AppPassword
 }) {
   const t = useTheme()
   const {i18n, _} = useLingui()
diff --git a/src/screens/Settings/components/AddAppPasswordDialog.tsx b/src/screens/Settings/components/AddAppPasswordDialog.tsx
index 5029ad9f16..21b9f1ea1d 100644
--- a/src/screens/Settings/components/AddAppPasswordDialog.tsx
+++ b/src/screens/Settings/components/AddAppPasswordDialog.tsx
@@ -8,7 +8,6 @@ import Animated, {
   SlideInRight,
   SlideOutLeft,
 } from 'react-native-reanimated'
-import {type ComAtprotoServerCreateAppPassword} from '@atproto/api'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
@@ -25,6 +24,7 @@ import {ChevronRight_Stroke2_Corner0_Rounded as ChevronRight} from '#/components
 import {SquareBehindSquare4_Stroke2_Corner0_Rounded as CopyIcon} from '#/components/icons/SquareBehindSquare4'
 import {Text} from '#/components/Typography'
 import {IS_WEB} from '#/env'
+import {type com} from '#/lexicons'
 import {CopyButton} from './CopyButton'
 
 export function AddAppPasswordDialog({
@@ -70,7 +70,7 @@ function CreateDialogInner({passwords}: {passwords: string[]}) {
     error: validationError,
     isPending,
   } = useMutation<
-    ComAtprotoServerCreateAppPassword.AppPassword,
+    com.atproto.server.createAppPassword.AppPassword,
     Error | DisplayableError
   >({
     mutationFn: async () => {
diff --git a/src/screens/Settings/components/ChangePasswordDialog.tsx b/src/screens/Settings/components/ChangePasswordDialog.tsx
index 91cb671792..3015b402b5 100644
--- a/src/screens/Settings/components/ChangePasswordDialog.tsx
+++ b/src/screens/Settings/components/ChangePasswordDialog.tsx
@@ -7,8 +7,9 @@ import * as EmailValidator from 'email-validator'
 
 import {cleanError, isNetworkError} from '#/lib/strings/errors'
 import {checkAndFormatResetCode} from '#/lib/strings/password'
+import {matchXrpcError} from '#/lib/xrpc-error'
 import {logger} from '#/logger'
-import {useAgent, useSession} from '#/state/session'
+import {usePdsClient, useSession} from '#/state/session'
 import {ErrorMessage} from '#/view/com/util/error/ErrorMessage'
 import {android, atoms as a, web} from '#/alf'
 import {Button, ButtonIcon, ButtonText} from '#/components/Button'
@@ -17,6 +18,7 @@ import * as TextField from '#/components/forms/TextField'
 import {Loader} from '#/components/Loader'
 import {Text} from '#/components/Typography'
 import {IS_NATIVE} from '#/env'
+import {com} from '#/lexicons'
 
 enum Stages {
   RequestCode = 'RequestCode',
@@ -44,7 +46,7 @@ export function ChangePasswordDialog({
 function Inner() {
   const {_} = useLingui()
   const {currentAccount} = useSession()
-  const agent = useAgent()
+  const client = usePdsClient()
   const control = Dialog.useDialogContext()
 
   const [stage, setStage] = useState(Stages.RequestCode)
@@ -85,7 +87,7 @@ function Inner() {
     setError('')
     setIsProcessing(true)
     try {
-      await agent.com.atproto.server.requestPasswordReset({
+      await client.call(com.atproto.server.requestPasswordReset, {
         email: currentAccount.email,
       })
       setStage(Stages.ChangePassword)
@@ -129,7 +131,7 @@ function Inner() {
     setError('')
     setIsProcessing(true)
     try {
-      await agent.com.atproto.server.resetPassword({
+      await client.call(com.atproto.server.resetPassword, {
         token: formattedCode,
         password: newPassword,
       })
@@ -141,7 +143,9 @@ function Inner() {
             msg`Unable to contact your service. Please check your internet connection and try again.`,
           ),
         )
-      } else if (e?.toString().includes('Token is invalid')) {
+      } else if (
+        matchXrpcError(e, com.atproto.server.resetPassword) === 'InvalidToken'
+      ) {
         setError(_(msg`This confirmation code is not valid. Please try again.`))
       } else {
         logger.error('Failed to set new password', {safeMessage: e})
diff --git a/src/screens/Settings/components/DeactivateAccountDialog.tsx b/src/screens/Settings/components/DeactivateAccountDialog.tsx
index 036ad38035..eaae97659e 100644
--- a/src/screens/Settings/components/DeactivateAccountDialog.tsx
+++ b/src/screens/Settings/components/DeactivateAccountDialog.tsx
@@ -5,7 +5,7 @@ import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
 
 import {logger} from '#/logger'
-import {useAgent, useSessionApi} from '#/state/session'
+import {usePdsClient, useSessionApi} from '#/state/session'
 import {atoms as a, useTheme} from '#/alf'
 import {Button, ButtonIcon, ButtonText} from '#/components/Button'
 import {type DialogOuterProps} from '#/components/Dialog'
@@ -14,6 +14,7 @@ import {CircleInfo_Stroke2_Corner0_Rounded as CircleInfo} from '#/components/ico
 import {Loader} from '#/components/Loader'
 import * as Prompt from '#/components/Prompt'
 import {Text} from '#/components/Typography'
+import {com} from '#/lexicons'
 
 export function DeactivateAccountDialog({
   control,
@@ -34,7 +35,7 @@ function DeactivateAccountDialogInner({
 }) {
   const t = useTheme()
   const {_} = useLingui()
-  const agent = useAgent()
+  const client = usePdsClient()
   const {logoutCurrentAccount} = useSessionApi()
   const [pending, setPending] = useState(false)
   const [error, setError] = useState<string | undefined>()
@@ -42,7 +43,7 @@ function DeactivateAccountDialogInner({
   const handleDeactivate = useCallback(async () => {
     try {
       setPending(true)
-      await agent.com.atproto.server.deactivateAccount({})
+      await client.call(com.atproto.server.deactivateAccount, {})
       control.close(() => {
         logoutCurrentAccount('Deactivated')
       })
@@ -66,7 +67,7 @@ function DeactivateAccountDialogInner({
     } finally {
       setPending(false)
     }
-  }, [agent, control, logoutCurrentAccount, _, setPending])
+  }, [client, control, logoutCurrentAccount, _, setPending])
 
   return (
     <>
diff --git a/src/screens/Settings/components/DeleteAccountDialog.tsx b/src/screens/Settings/components/DeleteAccountDialog.tsx
index 9903fce3ba..0df008280b 100644
--- a/src/screens/Settings/components/DeleteAccountDialog.tsx
+++ b/src/screens/Settings/components/DeleteAccountDialog.tsx
@@ -1,14 +1,19 @@
 import {useCallback, useRef, useState} from 'react'
 import {type TextInput, View} from 'react-native'
+import {type DidString} from '@atproto/syntax'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
 
-import {DM_SERVICE_HEADERS} from '#/lib/constants'
 import {useCleanError} from '#/lib/hooks/useCleanError'
 import {sanitizeHandle} from '#/lib/strings/handles'
 import {logger} from '#/logger'
-import {useAgent, useSession, useSessionApi} from '#/state/session'
+import {
+  useChatClient,
+  usePdsClient,
+  useSession,
+  useSessionApi,
+} from '#/state/session'
 import {atoms as a, useTheme} from '#/alf'
 import {Admonition} from '#/components/Admonition'
 import {type DialogOuterProps} from '#/components/Dialog'
@@ -24,6 +29,7 @@ import {Loader} from '#/components/Loader'
 import * as Prompt from '#/components/Prompt'
 import * as toast from '#/components/Toast'
 import {Span, Text} from '#/components/Typography'
+import {chat, com} from '#/lexicons'
 import {resetToTab} from '#/Navigation'
 
 const WHITESPACE_RE = /\s/gu
@@ -72,7 +78,8 @@ function DeleteAccountDialogInner({
   const t = useTheme()
   const {_} = useLingui()
   const cleanError = useCleanError()
-  const agent = useAgent()
+  const client = usePdsClient()
+  const chatClient = useChatClient()
   const {currentAccount} = useSession()
   const {removeAccount} = useSessionApi()
 
@@ -89,7 +96,7 @@ function DeleteAccountDialogInner({
     }
     try {
       setEmailState(EmailState.PENDING)
-      await agent.com.atproto.server.requestAccountDelete()
+      await client.call(com.atproto.server.requestAccountDelete)
       setError('')
       setEmailSentCount(prevCount => prevCount + 1)
       setStep(Step.VERIFY_CODE)
@@ -103,7 +110,7 @@ function DeleteAccountDialogInner({
     } finally {
       setEmailState(EmailState.DEFAULT)
     }
-  }, [agent, cleanError, emailState, setEmailState])
+  }, [client, cleanError, emailState, setEmailState])
 
   const confirmDeletion = useCallback(async () => {
     try {
@@ -112,15 +119,15 @@ function DeleteAccountDialogInner({
         throw new Error('Invalid did')
       }
       const token = confirmCode.replace(WHITESPACE_RE, '')
-      // Inform chat service of intent to delete account.
-      const {success} = await agent.chat.bsky.actor.deleteAccount(undefined, {
-        headers: DM_SERVICE_HEADERS,
-      })
-      if (!success) {
-        throw new Error('Failed to inform chat service of account deletion')
-      }
-      await agent.com.atproto.server.deleteAccount({
-        did: currentAccount.did,
+      /*
+       * Inform chat service of intent to delete account. A non-2xx response
+       * throws, so reaching the next line means the chat service accepted it -
+       * the agent's `success` flag has no client-side equivalent.
+       */
+      await chatClient.call(chat.bsky.actor.deleteAccount)
+      await client.call(com.atproto.server.deleteAccount, {
+        // the persisted account did is already resolved
+        did: currentAccount.did as DidString,
         password,
         token,
       })
@@ -142,8 +149,9 @@ function DeleteAccountDialogInner({
     }
   }, [
     _,
-    agent,
+    chatClient,
     cleanError,
+    client,
     confirmCode,
     control,
     currentAccount,
diff --git a/src/state/queries/app-passwords.ts b/src/state/queries/app-passwords.ts
index 12d66dd2cd..4403b1fbd4 100644
--- a/src/state/queries/app-passwords.ts
+++ b/src/state/queries/app-passwords.ts
@@ -1,39 +1,37 @@
-import {type ComAtprotoServerCreateAppPassword} from '@atproto/api'
 import {useMutation, useQuery, useQueryClient} from '@tanstack/react-query'
 
 import {STALE} from '#/state/queries'
-import {useAgent} from '../session'
+import {com} from '#/lexicons'
+import {usePdsClient} from '../session'
 
 const RQKEY_ROOT = 'app-passwords'
 export const RQKEY = () => [RQKEY_ROOT]
 
 export function useAppPasswordsQuery() {
-  const agent = useAgent()
+  const client = usePdsClient()
   return useQuery({
     staleTime: STALE.MINUTES.FIVE,
     queryKey: RQKEY(),
     queryFn: async () => {
-      const res = await agent.com.atproto.server.listAppPasswords({})
-      return res.data.passwords
+      const data = await client.call(com.atproto.server.listAppPasswords)
+      return data.passwords
     },
   })
 }
 
 export function useAppPasswordCreateMutation() {
   const queryClient = useQueryClient()
-  const agent = useAgent()
+  const client = usePdsClient()
   return useMutation<
-    ComAtprotoServerCreateAppPassword.OutputSchema,
+    com.atproto.server.createAppPassword.$OutputBody,
     Error,
     {name: string; privileged: boolean}
   >({
     mutationFn: async ({name, privileged}) => {
-      return (
-        await agent.com.atproto.server.createAppPassword({
-          name,
-          privileged,
-        })
-      ).data
+      return await client.call(com.atproto.server.createAppPassword, {
+        name,
+        privileged,
+      })
     },
     onSuccess() {
       queryClient.invalidateQueries({
@@ -45,10 +43,10 @@ export function useAppPasswordCreateMutation() {
 
 export function useAppPasswordDeleteMutation() {
   const queryClient = useQueryClient()
-  const agent = useAgent()
+  const client = usePdsClient()
   return useMutation<void, Error, {name: string}>({
     mutationFn: async ({name}) => {
-      await agent.com.atproto.server.revokeAppPassword({
+      await client.call(com.atproto.server.revokeAppPassword, {
         name,
       })
     },
diff --git a/src/state/queries/handle-availability.ts b/src/state/queries/handle-availability.ts
index fb25697c76..ab6a2e985b 100644
--- a/src/state/queries/handle-availability.ts
+++ b/src/state/queries/handle-availability.ts
@@ -1,4 +1,4 @@
-import {ComAtprotoTempCheckHandleAvailability} from '@atproto/api'
+import {type DatetimeString, type HandleString} from '@atproto/syntax'
 import {useQuery} from '@tanstack/react-query'
 
 import {
@@ -7,10 +7,11 @@ import {
   PUBLIC_BSKY_SERVICE,
 } from '#/lib/constants'
 import {useDebouncedValue} from '#/lib/hooks/useDebouncedValue'
+import {createServiceClient} from '#/lib/lexClient'
 import {createFullHandle} from '#/lib/strings/handles'
 import {useAnalytics} from '#/analytics'
+import {com} from '#/lexicons'
 import * as bsky from '#/types/bsky'
-import {Agent} from '../session/agent'
 
 export const RQKEY_handleAvailability = (
   handle: string,
@@ -79,25 +80,33 @@ export async function checkHandleAvailability(
   },
 ) {
   if (serviceDid === BSKY_SERVICE_DID) {
-    const agent = new Agent(null, {service: BSKY_SERVICE})
+    /*
+     * Runs pre-auth during signup, so it goes through a one-off service client
+     * rather than a session-scoped one. The target is the fixed entryway rather
+     * than a user-supplied host, but there is still no session to hang a client
+     * off.
+     */
+    const client = createServiceClient(BSKY_SERVICE)
     // entryway has a special API for handle availability
-    const {data} = await agent.com.atproto.temp.checkHandleAvailability({
-      handle,
-      birthDate,
+    const data = await client.call(com.atproto.temp.checkHandleAvailability, {
+      // the caller assembles this from a validated username and domain
+      handle: handle as HandleString,
+      // callers pass an ISO date string built from the birth-date picker
+      birthDate: birthDate as DatetimeString | undefined,
       email,
     })
 
     if (
-      bsky.dangerousIsType<ComAtprotoTempCheckHandleAvailability.ResultAvailable>(
+      bsky.isType(
+        com.atproto.temp.checkHandleAvailability.resultAvailable,
         data.result,
-        ComAtprotoTempCheckHandleAvailability.isResultAvailable,
       )
     ) {
       return {available: true} as const
     } else if (
-      bsky.dangerousIsType<ComAtprotoTempCheckHandleAvailability.ResultUnavailable>(
+      bsky.isType(
+        com.atproto.temp.checkHandleAvailability.resultUnavailable,
         data.result,
-        ComAtprotoTempCheckHandleAvailability.isResultUnavailable,
       )
     ) {
       return {
@@ -110,14 +119,18 @@ export async function checkHandleAvailability(
       )
     }
   } else {
-    // 3rd party PDSes won't have this API so just try and resolve the handle
-    const agent = new Agent(null, {service: PUBLIC_BSKY_SERVICE})
+    /*
+     * 3rd party PDSes won't have this API so just try and resolve the handle.
+     * This is an unauthenticated public-appview read, not a call against the
+     * user's chosen host.
+     */
+    const client = createServiceClient(PUBLIC_BSKY_SERVICE)
     try {
-      const res = await agent.resolveHandle({
-        handle,
+      const data = await client.call(com.atproto.identity.resolveHandle, {
+        handle: handle as HandleString,
       })
 
-      if (res.data.did) {
+      if (data.did) {
         return {available: false} as const
       }
     } catch {}
diff --git a/src/state/queries/handle.ts b/src/state/queries/handle.ts
index c53c878d5f..c400e8bd85 100644
--- a/src/state/queries/handle.ts
+++ b/src/state/queries/handle.ts
@@ -1,8 +1,10 @@
 import {useCallback} from 'react'
+import {type HandleString} from '@atproto/syntax'
 import {useMutation, useQueryClient} from '@tanstack/react-query'
 
 import {STALE} from '#/state/queries'
-import {useAgent} from '#/state/session'
+import {useAgent, usePdsClient} from '#/state/session'
+import {com} from '#/lexicons'
 
 const handleQueryKeyRoot = 'handle'
 const fetchHandleQueryKey = (handleOrDid: string) => [
@@ -36,11 +38,15 @@ export function useUpdateHandleMutation(opts?: {
   onSuccess?: (handle: string) => void
 }) {
   const queryClient = useQueryClient()
-  const agent = useAgent()
+  const client = usePdsClient()
 
   return useMutation({
     mutationFn: async ({handle}: {handle: string}) => {
-      await agent.updateHandle({handle})
+      // `agent.updateHandle` was a pure alias for this method
+      await client.call(com.atproto.identity.updateHandle, {
+        // callers validate the handle before submitting
+        handle: handle as HandleString,
+      })
     },
     onSuccess(_data, variables) {
       opts?.onSuccess?.(variables.handle)
diff --git a/src/state/queries/service.ts b/src/state/queries/service.ts
index e9661db9e3..754ba81652 100644
--- a/src/state/queries/service.ts
+++ b/src/state/queries/service.ts
@@ -1,6 +1,7 @@
 import {useQuery} from '@tanstack/react-query'
 
-import {Agent} from '../session/agent'
+import {createServiceClient} from '#/lib/lexClient'
+import {com} from '#/lexicons'
 
 const RQKEY_ROOT = 'service'
 export const RQKEY = (serviceUrl: string) => [RQKEY_ROOT, serviceUrl]
@@ -9,9 +10,12 @@ export function useServiceQuery(serviceUrl: string) {
   return useQuery({
     queryKey: RQKEY(serviceUrl),
     queryFn: async () => {
-      const agent = new Agent(null, {service: serviceUrl})
-      const res = await agent.com.atproto.server.describeServer()
-      return res.data
+      /*
+       * The host is whatever the user typed or picked, so this describes it
+       * through a one-off service client rather than a session-scoped one.
+       */
+      const client = createServiceClient(serviceUrl)
+      return await client.call(com.atproto.server.describeServer)
     },
     enabled: isValidUrl(serviceUrl),
   })

From d991118215b07d47b84a07705abc0770bfcf3abb Mon Sep 17 00:00:00 2001
From: Samuel Newman <mozzius@protonmail.com>
Date: Thu, 13 Aug 2026 22:26:18 +0300
Subject: [PATCH 16/32] [SDK] Route moderation reports through the appview
 client (#11368)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
---
 .../ageAssurance/AgeAssuranceAppealDialog.tsx | 23 ++++---
 src/components/moderation/AppealForm.tsx      | 48 ++++++++------
 .../moderation/ReportDialog/action.ts         | 64 +++++++++++--------
 .../components/GoLiveDisabledDialog.tsx       | 21 +++---
 src/lib/constants.ts                          | 16 +++--
 .../Messages/components/ChatDisabled.tsx      | 19 +++---
 src/screens/Takendown.tsx                     | 23 +++----
 7 files changed, 127 insertions(+), 87 deletions(-)

diff --git a/src/components/ageAssurance/AgeAssuranceAppealDialog.tsx b/src/components/ageAssurance/AgeAssuranceAppealDialog.tsx
index 1ee126eb28..59df413324 100644
--- a/src/components/ageAssurance/AgeAssuranceAppealDialog.tsx
+++ b/src/components/ageAssurance/AgeAssuranceAppealDialog.tsx
@@ -1,13 +1,14 @@
 import {useState} from 'react'
 import {View} from 'react-native'
 import {ToolsOzoneReportDefs} from '@atproto/api'
+import {type DidString} from '@atproto/syntax'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
 import {useMutation} from '@tanstack/react-query'
 
-import {BLUESKY_MOD_SERVICE_HEADERS} from '#/lib/constants'
-import {useAgent, useSession} from '#/state/session'
+import {MOD_PROXY_SERVICE} from '#/lib/constants'
+import {useAppviewClient, useSession} from '#/state/session'
 import {atoms as a, useBreakpoints, web} from '#/alf'
 import {AgeAssuranceBadge} from '#/components/ageAssurance/AgeAssuranceBadge'
 import {Button, ButtonIcon, ButtonText} from '#/components/Button'
@@ -17,6 +18,7 @@ import * as Toast from '#/components/Toast'
 import {Text} from '#/components/Typography'
 import {logger} from '#/ageAssurance'
 import {useAnalytics} from '#/analytics'
+import {com} from '#/lexicons'
 
 export function AgeAssuranceAppealDialog({
   control,
@@ -42,7 +44,7 @@ function Inner({control}: {control: Dialog.DialogControlProps}) {
   const ax = useAnalytics()
   const {currentAccount} = useSession()
   const {gtPhone} = useBreakpoints()
-  const agent = useAgent()
+  const client = useAppviewClient()
 
   const [details, setDetails] = useState('')
   const isInvalid = details.length > 1000
@@ -51,19 +53,22 @@ function Inner({control}: {control: Dialog.DialogControlProps}) {
     mutationFn: async () => {
       ax.metric('ageAssurance:appealDialogSubmit', {})
 
-      await agent.createModerationReport(
+      if (!currentAccount) {
+        throw new Error('No current account, should be unreachable')
+      }
+
+      await client.call(
+        com.atproto.moderation.createReport,
         {
           reasonType: ToolsOzoneReportDefs.REASONAPPEAL,
           subject: {
             $type: 'com.atproto.admin.defs#repoRef',
-            did: currentAccount?.did,
+            // the persisted account did is already resolved
+            did: currentAccount.did as DidString,
           },
           reason: `AGE_ASSURANCE_INQUIRY: ` + details,
         },
-        {
-          encoding: 'application/json',
-          headers: BLUESKY_MOD_SERVICE_HEADERS,
-        },
+        {service: MOD_PROXY_SERVICE},
       )
     },
     onError: err => {
diff --git a/src/components/moderation/AppealForm.tsx b/src/components/moderation/AppealForm.tsx
index 5432672d1e..606e8162ec 100644
--- a/src/components/moderation/AppealForm.tsx
+++ b/src/components/moderation/AppealForm.tsx
@@ -1,7 +1,8 @@
 import {useState} from 'react'
 import {View} from 'react-native'
 import {type ComAtprotoLabelDefs, ToolsOzoneReportDefs} from '@atproto/api'
-import {XRPCError} from '@atproto/api'
+import {XrpcResponseError} from '@atproto/lex'
+import {type AtUriString, type DidString} from '@atproto/syntax'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
@@ -12,7 +13,7 @@ import {useLabelInfo} from '#/lib/moderation/useLabelInfo'
 import {makeProfileLink} from '#/lib/routes/links'
 import {sanitizeHandle} from '#/lib/strings/handles'
 import {logger} from '#/logger'
-import {useAgent} from '#/state/session'
+import {useAppviewClient} from '#/state/session'
 import {atoms as a, useBreakpoints} from '#/alf'
 import {Admonition} from '#/components/Admonition'
 import {Button, ButtonIcon, ButtonText} from '#/components/Button'
@@ -22,6 +23,7 @@ import {Loader} from '#/components/Loader'
 import * as Toast from '#/components/Toast'
 import {Text} from '#/components/Typography'
 import {IS_ANDROID} from '#/env'
+import {com} from '#/lexicons'
 
 export function AppealForm({
   label,
@@ -38,7 +40,7 @@ export function AppealForm({
   const [details, setDetails] = useState('')
   const {subject} = useLabelSubject({label})
   const isAccountReport = 'did' in subject
-  const agent = useAgent()
+  const client = useAppviewClient()
   const sourceName = labeler
     ? sanitizeHandle(labeler.creator.handle, '@')
     : label.src
@@ -46,28 +48,38 @@ export function AppealForm({
 
   const {mutate, isPending} = useMutation({
     mutationFn: async () => {
-      const $type = !isAccountReport
-        ? 'com.atproto.repo.strongRef'
-        : 'com.atproto.admin.defs#repoRef'
-      await agent.createModerationReport(
+      await client.call(
+        com.atproto.moderation.createReport,
         {
           reasonType: ToolsOzoneReportDefs.REASONAPPEAL,
-          subject: {
-            $type,
-            ...subject,
-          },
+          /*
+           * `useLabelSubject` derives one shape or the other from the label's
+           * `cid`: an at-uri plus cid for a record, or the label's `uri` reused
+           * as the account did.
+           */
+          subject: isAccountReport
+            ? {
+                $type: 'com.atproto.admin.defs#repoRef',
+                did: subject.did as DidString,
+              }
+            : {
+                $type: 'com.atproto.repo.strongRef',
+                uri: subject.uri as AtUriString,
+                cid: subject.cid,
+              },
           reason: details,
         },
-        {
-          encoding: 'application/json',
-          headers: {
-            'atproto-proxy': `${label.src}#atproto_labeler`,
-          },
-        },
+        // the appeal goes to the labeler that applied the label
+        {service: `${label.src as DidString}#atproto_labeler`},
       )
     },
     onError: err => {
-      if (err instanceof XRPCError && err.error === 'AlreadyAppealed') {
+      /*
+       * `AlreadyAppealed` is real server behavior that createReport's lexicon
+       * does NOT declare, so `matchXrpcError` cannot see it and the raw error
+       * code is checked instead. Worth an upstream PR to declare it.
+       */
+      if (err instanceof XrpcResponseError && err.error === 'AlreadyAppealed') {
         setError(
           _(
             msg`You've already appealed this label and it's being reviewed by our moderation team.`,
diff --git a/src/components/moderation/ReportDialog/action.ts b/src/components/moderation/ReportDialog/action.ts
index 20303ddef5..12b483fcab 100644
--- a/src/components/moderation/ReportDialog/action.ts
+++ b/src/components/moderation/ReportDialog/action.ts
@@ -1,22 +1,21 @@
-import {
-  type $Typed,
-  BSKY_LABELER_DID,
-  type ChatBskyConvoDefs,
-  type ComAtprotoModerationCreateReport,
-} from '@atproto/api'
+import {BSKY_LABELER_DID} from '@atproto/api'
+import {type AtUriString, type DidString} from '@atproto/syntax'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {useMutation} from '@tanstack/react-query'
 
 import {logger} from '#/logger'
-import {useAgent} from '#/state/session'
+import {useAppviewClient} from '#/state/session'
+import {com} from '#/lexicons'
 import {NEW_TO_OLD_REASONS_MAP, REPORT_MOD_TOOL_NAME} from './const'
 import {type ReportState} from './state'
 import {type ParsedReportSubject} from './types'
 
+type ReportInput = com.atproto.moderation.createReport.$InputBody
+
 export function useSubmitReportMutation() {
   const {_} = useLingui()
-  const agent = useAgent()
+  const client = useAppviewClient()
 
   return useMutation({
     async mutationFn({
@@ -59,13 +58,7 @@ export function useSubmitReportMutation() {
         reasonType = backwardsCompatibleReasonType
       }
 
-      let report:
-        | ComAtprotoModerationCreateReport.InputSchema
-        | (Omit<ComAtprotoModerationCreateReport.InputSchema, 'subject'> & {
-            subject:
-              | $Typed<ChatBskyConvoDefs.MessageRef>
-              | $Typed<ChatBskyConvoDefs.ConvoRef>
-          })
+      let report: ReportInput
 
       switch (subject.type) {
         case 'account': {
@@ -74,7 +67,8 @@ export function useSubmitReportMutation() {
             reason: state.details,
             subject: {
               $type: 'com.atproto.admin.defs#repoRef',
-              did: subject.did,
+              // the parsed subject carries an already-resolved did
+              did: subject.did as DidString,
             },
           }
           break
@@ -89,7 +83,8 @@ export function useSubmitReportMutation() {
             reason: state.details,
             subject: {
               $type: 'com.atproto.repo.strongRef',
-              uri: subject.uri,
+              // the parsed subject carries an at-uri read off a view
+              uri: subject.uri as AtUriString,
               cid: subject.cid,
             },
           }
@@ -99,12 +94,12 @@ export function useSubmitReportMutation() {
           report = {
             reasonType,
             reason: state.details,
-            subject: {
+            subject: toOpenSubject({
               $type: 'chat.bsky.convo.defs#messageRef',
               messageId: subject.message.id,
               convoId: subject.convoId,
               did: subject.message.sender.did,
-            },
+            }),
           }
           break
         }
@@ -112,11 +107,11 @@ export function useSubmitReportMutation() {
           report = {
             reasonType,
             reason: state.details,
-            subject: {
+            subject: toOpenSubject({
               $type: 'chat.bsky.convo.defs#convoRef',
               convoId: subject.convoId,
               did: subject.did,
-            },
+            }),
           }
           break
         }
@@ -145,13 +140,30 @@ export function useSubmitReportMutation() {
           report,
         })
       } else {
-        await agent.createModerationReport(report, {
-          encoding: 'application/json',
-          headers: {
-            'atproto-proxy': `${labeler.creator.did}#atproto_labeler`,
-          },
+        /*
+         * Reports go to the labeler the user selected rather than Bluesky's, so
+         * the proxy target is built per call from that labeler's creator did.
+         */
+        await client.call(com.atproto.moderation.createReport, report, {
+          service: `${labeler.creator.did as DidString}#atproto_labeler`,
         })
       }
     },
   })
 }
+
+/**
+ * Widen a chat convo ref into `createReport`'s subject union.
+ *
+ * The lexicon declares only `com.atproto.admin.defs#repoRef` and
+ * `com.atproto.repo.strongRef`, but leaves the union OPEN, and the chat service
+ * accepts its own refs there. An open union types its unknown arm as
+ * `{$type: Unknown$Type}`, which a concrete chat ref does not structurally
+ * satisfy, so the widening is asserted here once rather than at each call site.
+ */
+function toOpenSubject(ref: {
+  $type: string
+  [key: string]: unknown
+}): ReportInput['subject'] {
+  return ref as unknown as ReportInput['subject']
+}
diff --git a/src/features/liveNow/components/GoLiveDisabledDialog.tsx b/src/features/liveNow/components/GoLiveDisabledDialog.tsx
index 7eeccdc22b..fda33a9067 100644
--- a/src/features/liveNow/components/GoLiveDisabledDialog.tsx
+++ b/src/features/liveNow/components/GoLiveDisabledDialog.tsx
@@ -1,20 +1,22 @@
 import {useCallback, useState} from 'react'
 import {View} from 'react-native'
 import {type AppBskyActorDefs, ToolsOzoneReportDefs} from '@atproto/api'
+import {type AtUriString} from '@atproto/syntax'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
 import {useMutation} from '@tanstack/react-query'
 
-import {BLUESKY_MOD_SERVICE_HEADERS} from '#/lib/constants'
+import {MOD_PROXY_SERVICE} from '#/lib/constants'
 import {logger} from '#/logger'
-import {useAgent} from '#/state/session'
+import {useAppviewClient} from '#/state/session'
 import {atoms as a, web} from '#/alf'
 import {Button, ButtonIcon, ButtonText} from '#/components/Button'
 import * as Dialog from '#/components/Dialog'
 import {Loader} from '#/components/Loader'
 import * as Toast from '#/components/Toast'
 import {Text} from '#/components/Typography'
+import {com} from '#/lexicons'
 
 export function GoLiveDisabledDialog({
   control,
@@ -39,12 +41,12 @@ export function DialogInner({
   status: AppBskyActorDefs.StatusView
 }) {
   const {_} = useLingui()
-  const agent = useAgent()
+  const client = useAppviewClient()
   const [details, setDetails] = useState('')
 
   const {mutate, isPending} = useMutation({
     mutationFn: async () => {
-      if (!agent.session?.did) {
+      if (!client.did) {
         throw new Error('Not logged in')
       }
       if (!status.uri || !status.cid) {
@@ -56,20 +58,19 @@ export function DialogInner({
           details,
         })
       } else {
-        await agent.createModerationReport(
+        await client.call(
+          com.atproto.moderation.createReport,
           {
             reasonType: ToolsOzoneReportDefs.REASONAPPEAL,
             subject: {
               $type: 'com.atproto.repo.strongRef',
-              uri: status.uri,
+              // a status view's uri is an at-uri produced by the appview
+              uri: status.uri as AtUriString,
               cid: status.cid,
             },
             reason: details,
           },
-          {
-            encoding: 'application/json',
-            headers: BLUESKY_MOD_SERVICE_HEADERS,
-          },
+          {service: MOD_PROXY_SERVICE},
         )
       }
     },
diff --git a/src/lib/constants.ts b/src/lib/constants.ts
index 1a89fa5b5e..156712c809 100644
--- a/src/lib/constants.ts
+++ b/src/lib/constants.ts
@@ -263,14 +263,22 @@ export const BLUESKY_PROXY_HEADER = {
  */
 export const CHAT_PROXY_SERVICE: Service = `${CHAT_PROXY_DID}#bsky_chat`
 
+/**
+ * Bluesky's own moderation service, in the `did#service_id` form a lex client's
+ * per-call `service` option takes. Passing it emits `atproto-proxy: <this
+ * value>` on that one request, routing a `com.atproto.moderation.*` call to
+ * Bluesky's labeler.
+ *
+ * Reports and appeals aimed at a DIFFERENT labeler build their own value from
+ * that labeler's creator did instead, so this is a per-call option rather than a
+ * client-level one like {@link CHAT_PROXY_SERVICE}.
+ */
+export const MOD_PROXY_SERVICE: Service = `${BSKY_LABELER_DID}#atproto_labeler`
+
 export const DM_SERVICE_HEADERS = {
   'atproto-proxy': `${CHAT_PROXY_DID}#bsky_chat`,
 }
 
-export const BLUESKY_MOD_SERVICE_HEADERS = {
-  'atproto-proxy': `${BSKY_LABELER_DID}#atproto_labeler`,
-}
-
 export const BLUESKY_NOTIF_SERVICE_HEADERS = {
   'atproto-proxy': `${BLUESKY_PROXY_DID}#bsky_notif`,
 }
diff --git a/src/screens/Messages/components/ChatDisabled.tsx b/src/screens/Messages/components/ChatDisabled.tsx
index 8095c1e0b9..62f353d1a8 100644
--- a/src/screens/Messages/components/ChatDisabled.tsx
+++ b/src/screens/Messages/components/ChatDisabled.tsx
@@ -1,12 +1,13 @@
 import {useCallback, useState} from 'react'
 import {type StyleProp, View, type ViewStyle} from 'react-native'
 import {ToolsOzoneReportDefs} from '@atproto/api'
+import {type DidString} from '@atproto/syntax'
 import {Trans, useLingui} from '@lingui/react/macro'
 import {useMutation} from '@tanstack/react-query'
 
-import {BLUESKY_MOD_SERVICE_HEADERS} from '#/lib/constants'
+import {MOD_PROXY_SERVICE} from '#/lib/constants'
 import {logger} from '#/logger'
-import {useAgent, useSession} from '#/state/session'
+import {useAppviewClient, useSession} from '#/state/session'
 import {atoms as a, useBreakpoints, useTheme} from '#/alf'
 import {Button, ButtonIcon, ButtonText} from '#/components/Button'
 import * as Dialog from '#/components/Dialog'
@@ -14,6 +15,7 @@ import {Warning_Stroke2_Corner0_Rounded as WarningIcon} from '#/components/icons
 import {Loader} from '#/components/Loader'
 import * as Toast from '#/components/Toast'
 import {Text} from '#/components/Typography'
+import {com} from '#/lexicons'
 
 export function ChatDisabled({
   shape = 'pill',
@@ -92,26 +94,25 @@ function DialogInner() {
   const control = Dialog.useDialogContext()
   const [details, setDetails] = useState('')
   const {gtMobile} = useBreakpoints()
-  const agent = useAgent()
+  const client = useAppviewClient()
   const {currentAccount} = useSession()
 
   const {mutate, isPending} = useMutation({
     mutationFn: async () => {
       if (!currentAccount)
         throw new Error('No current account, should be unreachable')
-      await agent.createModerationReport(
+      await client.call(
+        com.atproto.moderation.createReport,
         {
           reasonType: ToolsOzoneReportDefs.REASONAPPEAL,
           subject: {
             $type: 'com.atproto.admin.defs#repoRef',
-            did: currentAccount.did,
+            // the persisted account did is already resolved
+            did: currentAccount.did as DidString,
           },
           reason: details,
         },
-        {
-          encoding: 'application/json',
-          headers: BLUESKY_MOD_SERVICE_HEADERS,
-        },
+        {service: MOD_PROXY_SERVICE},
       )
     },
     onError: err => {
diff --git a/src/screens/Takendown.tsx b/src/screens/Takendown.tsx
index 5ad254fd1c..5873b00473 100644
--- a/src/screens/Takendown.tsx
+++ b/src/screens/Takendown.tsx
@@ -2,7 +2,8 @@ import {useState} from 'react'
 import {View} from 'react-native'
 import {KeyboardAwareScrollView} from 'react-native-keyboard-controller'
 import {useSafeAreaInsets} from 'react-native-safe-area-context'
-import {type ComAtprotoAdminDefs, ToolsOzoneReportDefs} from '@atproto/api'
+import {ToolsOzoneReportDefs} from '@atproto/api'
+import {type DidString} from '@atproto/syntax'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
@@ -10,11 +11,11 @@ import {useMutation} from '@tanstack/react-query'
 import {countGraphemes} from 'unicode-segmenter/grapheme'
 
 import {
-  BLUESKY_MOD_SERVICE_HEADERS,
   MAX_REPORT_REASON_GRAPHEME_LENGTH,
+  MOD_PROXY_SERVICE,
 } from '#/lib/constants'
 import {cleanError} from '#/lib/strings/errors'
-import {useAgent, useSession, useSessionApi} from '#/state/session'
+import {useAppviewClient, useSession, useSessionApi} from '#/state/session'
 import {CharProgress} from '#/view/com/composer/char-progress/CharProgress'
 import {Logo} from '#/view/icons/Logo'
 import {atoms as a, useBreakpoints, useTheme} from '#/alf'
@@ -24,6 +25,7 @@ import {SimpleInlineLinkText} from '#/components/Link'
 import {Loader} from '#/components/Loader'
 import {P, Text} from '#/components/Typography'
 import {IS_WEB} from '#/env'
+import {com} from '#/lexicons'
 
 const COL_WIDTH = 400
 
@@ -34,7 +36,7 @@ export function Takendown() {
   const {gtMobile} = useBreakpoints()
   const {currentAccount} = useSession()
   const {logoutCurrentAccount} = useSessionApi()
-  const agent = useAgent()
+  const client = useAppviewClient()
   const [isAppealling, setIsAppealling] = useState(false)
   const [reason, setReason] = useState('')
 
@@ -50,19 +52,18 @@ export function Takendown() {
   } = useMutation({
     mutationFn: async (appealText: string) => {
       if (!currentAccount) throw new Error('No session')
-      await agent.com.atproto.moderation.createReport(
+      await client.call(
+        com.atproto.moderation.createReport,
         {
           reasonType: ToolsOzoneReportDefs.REASONAPPEAL,
           subject: {
             $type: 'com.atproto.admin.defs#repoRef',
-            did: currentAccount.did,
-          } satisfies ComAtprotoAdminDefs.RepoRef,
+            // the persisted account did is already resolved
+            did: currentAccount.did as DidString,
+          },
           reason: appealText,
         },
-        {
-          encoding: 'application/json',
-          headers: BLUESKY_MOD_SERVICE_HEADERS,
-        },
+        {service: MOD_PROXY_SERVICE},
       )
     },
     onSuccess: () => setReason(''),

From f6a22c4f05a01c76e0b97f8118ae4ad55fac131f Mon Sep 17 00:00:00 2001
From: Samuel Newman <mozzius@protonmail.com>
Date: Thu, 13 Aug 2026 22:26:18 +0300
Subject: [PATCH 17/32] [SDK] Adopt @bsky.app/sdk and migrate RichText (#11369)

---
 package.json                                  |  3 +-
 pnpm-lock.yaml                                | 27 +++++++++++++++++
 pnpm-workspace.yaml                           |  2 ++
 src/components/FeedCard.tsx                   |  8 ++---
 src/components/Post/Embed/index.tsx           |  5 ++--
 .../PostControls/PostMenu/PostMenuItems.tsx   |  2 +-
 .../PostControls/PostMenu/index.tsx           |  2 +-
 .../ShareMenu/ShareMenuItems.types.tsx        |  2 +-
 .../PostControls/ShareMenu/index.tsx          |  2 +-
 src/components/PostControls/index.tsx         |  2 +-
 src/components/ProfileCard.tsx                |  7 ++---
 src/components/RichText.tsx                   | 10 ++++---
 .../dialogs/lists/CreateOrEditListDialog.tsx  | 22 +++++++++-----
 src/components/dms/MessageContextMenu.tsx     | 11 +++----
 src/components/dms/MessageItem.tsx            |  8 +++--
 src/components/hooks/useRichText.ts           | 15 ++++++----
 src/lib/api/index.ts                          | 15 +++++++---
 src/lib/strings/helpers.ts                    |  2 +-
 src/lib/strings/rich-text-helpers.ts          | 29 +++++++++++++++++--
 src/lib/strings/rich-text-manip.ts            | 12 ++++++--
 .../Messages/components/MessageInputEmbed.tsx | 15 ++++------
 .../Messages/components/MessagesList.tsx      | 20 ++++++++-----
 .../components/ThreadItemAnchor.tsx           |  5 ++--
 .../PostThread/components/ThreadItemPost.tsx  |  5 ++--
 .../components/ThreadItemTreePost.tsx         |  5 ++--
 .../Profile/Header/ProfileHeaderLabeler.tsx   |  2 +-
 .../Profile/Header/ProfileHeaderStandard.tsx  |  2 +-
 src/screens/Profile/Header/index.tsx          |  2 +-
 src/screens/ProfileList/components/Header.tsx |  6 ++--
 .../Search/modules/ExploreTrendingTopics.tsx  |  7 ++---
 src/screens/StarterPack/StarterPackScreen.tsx |  5 ++--
 src/screens/VideoFeed/index.tsx               |  5 ++--
 src/state/queries/feed.ts                     |  7 +++--
 src/state/queries/starter-packs.ts            | 20 ++++++++-----
 src/view/com/composer/Composer.tsx            |  3 +-
 src/view/com/composer/drafts/state/api.ts     |  3 +-
 .../select-language/SuggestedLanguage.tsx     |  2 +-
 src/view/com/composer/state/composer.ts       |  7 +++--
 .../com/composer/text-input/TextInput.tsx     |  6 ++--
 .../composer/text-input/TextInput.types.ts    |  2 +-
 .../com/composer/text-input/TextInput.web.tsx |  6 ++--
 .../composer/text-input/text-input-util.ts    |  6 ++--
 src/view/com/post/Post.tsx                    |  5 ++--
 src/view/com/posts/PostFeed.tsx               |  2 +-
 src/view/com/posts/PostFeedItem.tsx           |  5 ++--
 src/view/screens/DebugMod.tsx                 |  2 +-
 src/view/screens/Profile.tsx                  | 14 +++++----
 47 files changed, 231 insertions(+), 124 deletions(-)

diff --git a/package.json b/package.json
index e084d19641..510955abbf 100644
--- a/package.json
+++ b/package.json
@@ -115,6 +115,7 @@
     "@bsky.app/expo-translate-text": "^0.2.9",
     "@bsky.app/peek-menu": "^0.3.2",
     "@bsky.app/react-native-uitextview": "^2.7.0",
+    "@bsky.app/sdk": "npm:bsky-sdk-preview@0.0.1-preview.2",
     "@bsky.app/sift": "^0.3.9",
     "@bsky.app/tapper": "^0.6.1",
     "@bsky.app/video": "0.3.6",
@@ -339,7 +340,7 @@
       "^await-lock$": "<rootDir>/node_modules/await-lock/build/AwaitLock.js"
     },
     "transformIgnorePatterns": [
-      "node_modules/(?!((jest-)?react-native|@react-native(-community)?)|expo(nent)?|@expo(nent)?/.*|@expo-google-fonts/.*|react-navigation|nanoid|@react-navigation/.*|@unimodules/.*|unimodules|sentry-expo|native-base|normalize-url|react-native-svg|@sentry/.*|sentry-expo|bcp-47-match|@atproto/.*|multiformats|uint8arrays|@ipld/.*|cborg|await-lock)"
+      "node_modules/(?!((jest-)?react-native|@react-native(-community)?)|expo(nent)?|@expo(nent)?/.*|@expo-google-fonts/.*|react-navigation|nanoid|@react-navigation/.*|@unimodules/.*|unimodules|sentry-expo|native-base|normalize-url|react-native-svg|@sentry/.*|sentry-expo|bcp-47-match|@atproto/.*|@bsky.app/sdk|tlds|multiformats|uint8arrays|@ipld/.*|cborg|await-lock)"
     ],
     "modulePathIgnorePatterns": [
       "__tests__/.*/__mocks__",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index fa725d0bff..3b8bcb5f36 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -287,6 +287,9 @@ importers:
       '@bsky.app/react-native-uitextview':
         specifier: ^2.7.0
         version: 2.7.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)
+      '@bsky.app/sdk':
+        specifier: npm:bsky-sdk-preview@0.0.1-preview.2
+        version: bsky-sdk-preview@0.0.1-preview.2(@atproto/lex@0.3.6)
       '@bsky.app/sift':
         specifier: ^0.3.9
         version: 0.3.9(2d5c14016450c7e55c8cd0dffcca6f69)
@@ -889,6 +892,10 @@ packages:
     resolution: {integrity: sha512-iDFZEoNqfL17EVKE+uNzdUD7YF8LWhEhxeBtP6x+PNuAxoXv3ip9vLmB8nNzNxFwVn++FipfDtSiPqmziv1bdA==}
     engines: {node: '>=22'}
 
+  '@atproto-labs/handle-resolver@0.4.8':
+    resolution: {integrity: sha512-38I+j8Efs+cCgW/NX9RFKKu7qv/AF+FqxlKS8sWjXlNZSHQZqPj5cnKVQhSsJCs4ypPB84iKch8w4/STd33bLg==}
+    engines: {node: '>=22'}
+
   '@atproto-labs/pipe@0.2.4':
     resolution: {integrity: sha512-n67jCcrC+ouAeO10cWkpPzzLMlDi/lDCU30Us+LGqhOPhT6c4t5ASdBLQi9W3jUQtRzQBt3G9zipF+xKWNvVbw==}
     engines: {node: '>=22'}
@@ -4505,6 +4512,12 @@ packages:
   bser@2.1.1:
     resolution: {integrity: sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==}
 
+  bsky-sdk-preview@0.0.1-preview.2:
+    resolution: {integrity: sha512-LOcuvzc6UASiI5os1BUIo9dxAeVPIFiplcVSYbaDCgpH+tkpv2mqSqqsCRTP0g2CaVCwozqaTVy+jnsTO6/9BQ==}
+    engines: {node: '>=22.12.0'}
+    peerDependencies:
+      '@atproto/lex': ^0.3.0
+
   buffer-crc32@0.2.13:
     resolution: {integrity: sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==}
 
@@ -9725,6 +9738,13 @@ snapshots:
     dependencies:
       '@atproto-labs/pipe': 0.2.4
 
+  '@atproto-labs/handle-resolver@0.4.8':
+    dependencies:
+      '@atproto-labs/simple-store': 0.5.1
+      '@atproto-labs/simple-store-memory': 0.2.6
+      '@atproto/did': 0.5.4
+      zod: 3.25.76
+
   '@atproto-labs/pipe@0.2.4': {}
 
   '@atproto-labs/simple-store-memory@0.2.6':
@@ -14063,6 +14083,13 @@ snapshots:
     dependencies:
       node-int64: 0.4.0
 
+  bsky-sdk-preview@0.0.1-preview.2(@atproto/lex@0.3.6):
+    dependencies:
+      '@atproto-labs/handle-resolver': 0.4.8
+      '@atproto/lex': 0.3.6
+      '@atproto/syntax': 0.7.4
+      tlds: 1.261.0
+
   buffer-crc32@0.2.13: {}
 
   buffer-from@1.1.2: {}
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index 372e071c73..cbb815b851 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -44,6 +44,7 @@ patchedDependencies:
   'react-native@0.81.5': patches/react-native@0.81.5.patch
 minimumReleaseAgeExclude:
   - '@atproto/*'
+  - '@atproto-labs/*'
   - '@bsky.app/*'
   # todo: remove when old enough
   - '@oxlint-tsgolint/darwin-arm64@7.0.2001'
@@ -53,3 +54,4 @@ minimumReleaseAgeExclude:
   - '@oxlint-tsgolint/win32-arm64@7.0.2001'
   - '@oxlint-tsgolint/win32-x64@7.0.2001'
   - oxlint-tsgolint@7.0.2001
+  - bsky-sdk-preview@0.0.1-preview.2
diff --git a/src/components/FeedCard.tsx b/src/components/FeedCard.tsx
index efd14be4ba..2e7b070fb1 100644
--- a/src/components/FeedCard.tsx
+++ b/src/components/FeedCard.tsx
@@ -1,11 +1,7 @@
 import {useCallback, useEffect, useMemo} from 'react'
 import {type GestureResponderEvent, View} from 'react-native'
-import {
-  type AppBskyFeedDefs,
-  type AppBskyGraphDefs,
-  AtUri,
-  RichText as RichTextApi,
-} from '@atproto/api'
+import {type AppBskyFeedDefs, type AppBskyGraphDefs, AtUri} from '@atproto/api'
+import {RichText as RichTextApi} from '@bsky.app/sdk/richtext'
 import {Plural, Trans, useLingui} from '@lingui/react/macro'
 import {useQueryClient} from '@tanstack/react-query'
 
diff --git a/src/components/Post/Embed/index.tsx b/src/components/Post/Embed/index.tsx
index da930dc6fb..0b143a0df3 100644
--- a/src/components/Post/Embed/index.tsx
+++ b/src/components/Post/Embed/index.tsx
@@ -6,12 +6,13 @@ import {
   AppBskyFeedPost,
   AtUri,
   moderatePost,
-  RichText as RichTextAPI,
 } from '@atproto/api'
+import {RichText as RichTextAPI} from '@bsky.app/sdk/richtext'
 import {Trans} from '@lingui/react/macro'
 import {useQueryClient} from '@tanstack/react-query'
 
 import {makeProfileLink} from '#/lib/routes/links'
+import {asSdkFacets} from '#/lib/strings/rich-text-helpers'
 import {getChatInviteCodeFromUrl} from '#/lib/strings/url-helpers'
 import {useModerationOpts} from '#/state/preferences/moderation-opts'
 import {unstableCacheProfileView} from '#/state/queries/profile'
@@ -295,7 +296,7 @@ export function QuoteEmbed({
       return undefined
     const {text, facets} = quote.record
     return text.trim()
-      ? new RichTextAPI({text: text, facets: facets})
+      ? new RichTextAPI({text: text, facets: asSdkFacets(facets)})
       : undefined
   }, [quote.record])
 
diff --git a/src/components/PostControls/PostMenu/PostMenuItems.tsx b/src/components/PostControls/PostMenu/PostMenuItems.tsx
index b51f6cb7cb..43fdaaf1cd 100644
--- a/src/components/PostControls/PostMenu/PostMenuItems.tsx
+++ b/src/components/PostControls/PostMenu/PostMenuItems.tsx
@@ -11,8 +11,8 @@ import {
   type AppBskyFeedPost,
   type AppBskyFeedThreadgate,
   AtUri,
-  type RichText as RichTextAPI,
 } from '@atproto/api'
+import {type RichText as RichTextAPI} from '@bsky.app/sdk/richtext'
 import {plural} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react/macro'
 import {useNavigation} from '@react-navigation/native'
diff --git a/src/components/PostControls/PostMenu/index.tsx b/src/components/PostControls/PostMenu/index.tsx
index a744efbaa8..c0826683b6 100644
--- a/src/components/PostControls/PostMenu/index.tsx
+++ b/src/components/PostControls/PostMenu/index.tsx
@@ -4,8 +4,8 @@ import {
   type AppBskyFeedDefs,
   type AppBskyFeedPost,
   type AppBskyFeedThreadgate,
-  type RichText as RichTextAPI,
 } from '@atproto/api'
+import {type RichText as RichTextAPI} from '@bsky.app/sdk/richtext'
 import {useLingui} from '@lingui/react/macro'
 
 import {type Shadow} from '#/state/cache/post-shadow'
diff --git a/src/components/PostControls/ShareMenu/ShareMenuItems.types.tsx b/src/components/PostControls/ShareMenu/ShareMenuItems.types.tsx
index 5bc2a8fb6e..ef93865513 100644
--- a/src/components/PostControls/ShareMenu/ShareMenuItems.types.tsx
+++ b/src/components/PostControls/ShareMenu/ShareMenuItems.types.tsx
@@ -3,8 +3,8 @@ import {
   type AppBskyFeedDefs,
   type AppBskyFeedPost,
   type AppBskyFeedThreadgate,
-  type RichText as RichTextAPI,
 } from '@atproto/api'
+import {type RichText as RichTextAPI} from '@bsky.app/sdk/richtext'
 
 import {type Shadow} from '#/state/cache/post-shadow'
 
diff --git a/src/components/PostControls/ShareMenu/index.tsx b/src/components/PostControls/ShareMenu/index.tsx
index efac6a3f01..121cd2a779 100644
--- a/src/components/PostControls/ShareMenu/index.tsx
+++ b/src/components/PostControls/ShareMenu/index.tsx
@@ -5,8 +5,8 @@ import {
   type AppBskyFeedPost,
   type AppBskyFeedThreadgate,
   AtUri,
-  type RichText as RichTextAPI,
 } from '@atproto/api'
+import {type RichText as RichTextAPI} from '@bsky.app/sdk/richtext'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 
diff --git a/src/components/PostControls/index.tsx b/src/components/PostControls/index.tsx
index 1f6be5ab6c..88f30b0561 100644
--- a/src/components/PostControls/index.tsx
+++ b/src/components/PostControls/index.tsx
@@ -4,8 +4,8 @@ import {
   type AppBskyFeedDefs,
   type AppBskyFeedPost,
   type AppBskyFeedThreadgate,
-  type RichText as RichTextAPI,
 } from '@atproto/api'
+import {type RichText as RichTextAPI} from '@bsky.app/sdk/richtext'
 import {plural} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react/macro'
 
diff --git a/src/components/ProfileCard.tsx b/src/components/ProfileCard.tsx
index c37f99c075..8508fecc71 100644
--- a/src/components/ProfileCard.tsx
+++ b/src/components/ProfileCard.tsx
@@ -6,11 +6,8 @@ import {
   View,
   type ViewStyle,
 } from 'react-native'
-import {
-  moderateProfile,
-  type ModerationOpts,
-  RichText as RichTextApi,
-} from '@atproto/api'
+import {moderateProfile, type ModerationOpts} from '@atproto/api'
+import {RichText as RichTextApi} from '@bsky.app/sdk/richtext'
 import {useLingui} from '@lingui/react/macro'
 
 import {getModerationCauseKey} from '#/lib/moderation'
diff --git a/src/components/RichText.tsx b/src/components/RichText.tsx
index 5501193faf..ce73990570 100644
--- a/src/components/RichText.tsx
+++ b/src/components/RichText.tsx
@@ -1,6 +1,6 @@
 import {useMemo} from 'react'
 import {type StyleProp, type TextStyle} from 'react-native'
-import {AppBskyRichtextFacet, RichText as RichTextAPI} from '@atproto/api'
+import {RichText as RichTextAPI} from '@bsky.app/sdk/richtext'
 
 import {toShortUrl} from '#/lib/strings/url-helpers'
 import {android, atoms as a, flatten, type TextStyleProp} from '#/alf'
@@ -9,6 +9,8 @@ import {InlineLinkText, type LinkProps} from '#/components/Link'
 import {ProfileHoverCard} from '#/components/ProfileHoverCard'
 import {RichTextTag} from '#/components/RichTextTag'
 import {Text, type TextProps} from '#/components/Typography'
+import {app} from '#/lexicons'
+import * as bsky from '#/types/bsky'
 
 const WORD_WRAP = {wordWrap: 1}
 // lifted from facet detection in `RichText` impl, _without_ `gm` flags
@@ -139,7 +141,7 @@ export function RichText({
     if (
       mention &&
       (disableMentionFacetValidation ||
-        AppBskyRichtextFacet.validateMention(mention).success) &&
+        bsky.matches(app.bsky.richtext.facet.mention, mention)) &&
       !disableLinks
     ) {
       els.push(
@@ -156,7 +158,7 @@ export function RichText({
           </InlineLinkText>
         </ProfileHoverCard>,
       )
-    } else if (link && AppBskyRichtextFacet.validateLink(link).success) {
+    } else if (link && bsky.matches(app.bsky.richtext.facet.link, link)) {
       const isValidLink = URL_REGEX.test(link.uri)
       if (!isValidLink || disableLinks) {
         els.push(toShortUrl(segment.text))
@@ -181,7 +183,7 @@ export function RichText({
       !disableLinks &&
       enableTags &&
       tag &&
-      AppBskyRichtextFacet.validateTag(tag).success
+      bsky.matches(app.bsky.richtext.facet.tag, tag)
     ) {
       els.push(
         <RichTextTag
diff --git a/src/components/dialogs/lists/CreateOrEditListDialog.tsx b/src/components/dialogs/lists/CreateOrEditListDialog.tsx
index 7164c3ebeb..1f3ec8b7c9 100644
--- a/src/components/dialogs/lists/CreateOrEditListDialog.tsx
+++ b/src/components/dialogs/lists/CreateOrEditListDialog.tsx
@@ -1,13 +1,14 @@
 import {useCallback, useEffect, useMemo, useState} from 'react'
 import {View} from 'react-native'
-import {type AppBskyGraphDefs, RichText as RichTextAPI} from '@atproto/api'
+import {type AppBskyGraphDefs} from '@atproto/api'
+import {RichText as RichTextAPI} from '@bsky.app/sdk/richtext'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Plural, Trans} from '@lingui/react/macro'
 
 import {cleanError} from '#/lib/strings/errors'
 import {isOverMaxGraphemeCount} from '#/lib/strings/helpers'
-import {richTextToString} from '#/lib/strings/rich-text-helpers'
+import {asSdkFacets, richTextToString} from '#/lib/strings/rich-text-helpers'
 import {shortenLinks, stripInvalidMentions} from '#/lib/strings/rich-text-manip'
 import {logger} from '#/logger'
 import {type ImageMeta} from '#/state/gallery'
@@ -15,7 +16,7 @@ import {
   useListCreateMutation,
   useListMetadataMutation,
 } from '#/state/queries/list'
-import {useAgent} from '#/state/session'
+import {useAppviewClient} from '#/state/session'
 import {ErrorMessage} from '#/view/com/util/error/ErrorMessage'
 import {EditableUserAvatar} from '#/view/com/util/UserAvatar'
 import {atoms as a, useTheme, web} from '#/alf'
@@ -133,7 +134,11 @@ function DialogInner({
 
   const {_} = useLingui()
   const t = useTheme()
-  const agent = useAgent()
+  /*
+   * Facet/mention resolution is an appview job - it resolves handles through
+   * the appview, and the public fallback keeps it working when logged out.
+   */
+  const appviewClient = useAppviewClient()
   const control = Dialog.useDialogContext()
   const {
     mutateAsync: createListMutation,
@@ -163,7 +168,10 @@ function DialogInner({
 
     // We want to be working with a blank state here, so let's get the
     // serialized version and turn it back into a RichText
-    const serialized = richTextToString(new RichTextAPI({text, facets}), false)
+    const serialized = richTextToString(
+      new RichTextAPI({text, facets: asSdkFacets(facets)}),
+      false,
+    )
 
     const richText = new RichTextAPI({text: serialized})
     richText.detectFacetsWithoutResolution()
@@ -224,7 +232,7 @@ function DialogInner({
         {cleanNewlines: true},
       )
 
-      await richText.detectFacets(agent)
+      await richText.detectFacets(appviewClient)
       richText = shortenLinks(richText)
       richText = stripInvalidMentions(richText)
 
@@ -272,7 +280,7 @@ function DialogInner({
     setImageError,
     activePurpose,
     isCurateList,
-    agent,
+    appviewClient,
     _,
   ])
 
diff --git a/src/components/dms/MessageContextMenu.tsx b/src/components/dms/MessageContextMenu.tsx
index 1640ecff6d..90b8554b3c 100644
--- a/src/components/dms/MessageContextMenu.tsx
+++ b/src/components/dms/MessageContextMenu.tsx
@@ -2,17 +2,14 @@ import {memo, useCallback} from 'react'
 import {Platform} from 'react-native'
 import {type GestureType} from 'react-native-gesture-handler'
 import * as Clipboard from 'expo-clipboard'
-import {
-  type ChatBskyConvoDefs,
-  type ModerationOpts,
-  RichText,
-} from '@atproto/api'
+import {type ChatBskyConvoDefs, type ModerationOpts} from '@atproto/api'
+import {RichText} from '@bsky.app/sdk/richtext'
 import {plural} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react/macro'
 
 import {EMOJI_REACTION_LIMIT} from '#/lib/constants'
 import {useGoogleTranslate} from '#/lib/hooks/useGoogleTranslate'
-import {richTextToString} from '#/lib/strings/rich-text-helpers'
+import {asSdkFacets, richTextToString} from '#/lib/strings/rich-text-helpers'
 import {useMaybeProfileShadow} from '#/state/cache/profile-shadow'
 import {useConvoActive} from '#/state/messages/convo'
 import {useLanguagePrefs} from '#/state/preferences'
@@ -88,7 +85,7 @@ export let MessageContextMenu = ({
     const str = richTextToString(
       new RichText({
         text: message.text,
-        facets: message.facets,
+        facets: asSdkFacets(message.facets),
       }),
       true,
     )
diff --git a/src/components/dms/MessageItem.tsx b/src/components/dms/MessageItem.tsx
index 7cf3123cea..88a4571b2a 100644
--- a/src/components/dms/MessageItem.tsx
+++ b/src/components/dms/MessageItem.tsx
@@ -28,8 +28,8 @@ import {
   ChatBskyConvoDefs,
   ChatBskyEmbedJoinLink,
   moderateProfile,
-  RichText as RichTextAPI,
 } from '@atproto/api'
+import {RichText as RichTextAPI} from '@bsky.app/sdk/richtext'
 import {plural} from '@lingui/core/macro'
 import {Trans, useLingui} from '@lingui/react/macro'
 import {useQueryClient} from '@tanstack/react-query'
@@ -37,6 +37,7 @@ import {useQueryClient} from '@tanstack/react-query'
 import {isBlockedOrBlocking} from '#/lib/moderation/blocked-and-muted'
 import {createSanitizedDisplayName} from '#/lib/moderation/create-sanitized-display-name'
 import {sanitizeHandle} from '#/lib/strings/handles'
+import {asSdkFacets} from '#/lib/strings/rich-text-helpers'
 import {useMaybeProfileShadow} from '#/state/cache/profile-shadow'
 import {type Shadow} from '#/state/cache/types'
 import {type ConvoItem} from '#/state/messages/convo/types'
@@ -245,7 +246,10 @@ let MessageItem = ({
     ? t.palette.primary_300
     : t.palette.primary_100
 
-  const rt = new RichTextAPI({text: message.text, facets: message.facets})
+  const rt = new RichTextAPI({
+    text: message.text,
+    facets: asSdkFacets(message.facets),
+  })
 
   const isEmojiOnly = isOnlyEmoji(message.text)
 
diff --git a/src/components/hooks/useRichText.ts b/src/components/hooks/useRichText.ts
index a1334bb635..5664d9b6fd 100644
--- a/src/components/hooks/useRichText.ts
+++ b/src/components/hooks/useRichText.ts
@@ -1,13 +1,18 @@
 import {useEffect, useState} from 'react'
-import {RichText as RichTextAPI} from '@atproto/api'
+import {RichText as RichTextAPI} from '@bsky.app/sdk/richtext'
 
-import {useAgent} from '#/state/session'
+import {useAppviewClient} from '#/state/session'
 
 export function useRichText(text: string): [RichTextAPI, boolean] {
   const [prevText, setPrevText] = useState(text)
   const [rawRT, setRawRT] = useState(() => new RichTextAPI({text}))
   const [resolvedRT, setResolvedRT] = useState<RichTextAPI | null>(null)
-  const agent = useAgent()
+  /*
+   * Facet/mention resolution is an appview job - it resolves handles via
+   * `com.atproto.identity.resolveHandle` through the appview. The public
+   * fallback keeps mentions working on logged-out surfaces.
+   */
+  const client = useAppviewClient()
   if (text !== prevText) {
     setPrevText(text)
     setRawRT(new RichTextAPI({text}))
@@ -19,7 +24,7 @@ export function useRichText(text: string): [RichTextAPI, boolean] {
     async function resolveRTFacets() {
       // new each time
       const resolvedRT = new RichTextAPI({text})
-      await resolvedRT.detectFacets(agent)
+      await resolvedRT.detectFacets(client)
       if (!ignore) {
         setResolvedRT(resolvedRT)
       }
@@ -28,7 +33,7 @@ export function useRichText(text: string): [RichTextAPI, boolean] {
     return () => {
       ignore = true
     }
-  }, [text, agent])
+  }, [text, client])
   const isResolving = resolvedRT === null
   return [resolvedRT ?? rawRT, isResolving]
 }
diff --git a/src/lib/api/index.ts b/src/lib/api/index.ts
index 69cc2bf03e..9f81abb77a 100644
--- a/src/lib/api/index.ts
+++ b/src/lib/api/index.ts
@@ -13,9 +13,10 @@ import {
   type ComAtprotoLabelDefs,
   type ComAtprotoRepoApplyWrites,
   type ComAtprotoRepoStrongRef,
-  RichText,
 } from '@atproto/api'
 import {TID} from '@atproto/common-web'
+import {type Client} from '@atproto/lex'
+import {RichText} from '@bsky.app/sdk/richtext'
 import {t} from '@lingui/core/macro'
 import {type QueryClient} from '@tanstack/react-query'
 import {sha256} from 'js-sha256'
@@ -51,6 +52,12 @@ interface PostOpts {
   replyTo?: string
   onStateChange?: (state: string) => void
   langs?: string[]
+  /*
+   * Facet/mention resolution is an appview job - it resolves handles through
+   * the appview, and the public fallback keeps it working when logged out.
+   * The rest of this pipeline still writes through the agent.
+   */
+  appviewClient: Client
 }
 
 export async function post(
@@ -87,7 +94,7 @@ export async function post(
     const draft = thread.posts[i]
 
     // Not awaited to avoid waterfalls.
-    const rtPromise = resolveRT(agent, draft.richtext)
+    const rtPromise = resolveRT(opts.appviewClient, draft.richtext)
     const embedPromise = resolveEmbed(
       agent,
       queryClient,
@@ -196,14 +203,14 @@ export async function post(
   return {uris}
 }
 
-async function resolveRT(agent: AtpAgent, richtext: RichText) {
+async function resolveRT(appviewClient: Client, richtext: RichText) {
   const trimmedText = richtext.text
     // Trim leading whitespace-only lines (but don't break ASCII art).
     .replace(/^(\s*\n)+/, '')
     // Trim any trailing whitespace.
     .trimEnd()
   let rt = new RichText({text: trimmedText}, {cleanNewlines: true})
-  await rt.detectFacets(agent)
+  await rt.detectFacets(appviewClient)
 
   rt = shortenLinks(rt)
   rt = stripInvalidMentions(rt)
diff --git a/src/lib/strings/helpers.ts b/src/lib/strings/helpers.ts
index 77ef18cb55..402807f50f 100644
--- a/src/lib/strings/helpers.ts
+++ b/src/lib/strings/helpers.ts
@@ -1,4 +1,4 @@
-import {type RichText} from '@atproto/api'
+import {type RichText} from '@bsky.app/sdk/richtext'
 import {countGraphemes} from 'unicode-segmenter/grapheme'
 
 import {shortenLinks} from './rich-text-manip'
diff --git a/src/lib/strings/rich-text-helpers.ts b/src/lib/strings/rich-text-helpers.ts
index c2b2ceac52..a6341025ff 100644
--- a/src/lib/strings/rich-text-helpers.ts
+++ b/src/lib/strings/rich-text-helpers.ts
@@ -1,5 +1,7 @@
-import {AppBskyRichtextFacet, type RichText} from '@atproto/api'
+import {type RichText} from '@bsky.app/sdk/richtext'
 
+import {app} from '#/lexicons'
+import * as bsky from '#/types/bsky'
 import {linkRequiresWarning} from './url-helpers'
 
 export function richTextToString(rt: RichText, loose: boolean): string {
@@ -14,7 +16,7 @@ export function richTextToString(rt: RichText, loose: boolean): string {
   for (const segment of rt.segments()) {
     const link = segment.link
 
-    if (link && AppBskyRichtextFacet.validateLink(link).success) {
+    if (link && bsky.matches(app.bsky.richtext.facet.link, link)) {
       const href = link.uri
       const text = segment.text
 
@@ -28,3 +30,26 @@ export function richTextToString(rt: RichText, loose: boolean): string {
 
   return result
 }
+
+/**
+ * Widens facets typed by the legacy `@atproto/api` codegen into the shape the
+ * SDK's `RichText` accepts.
+ *
+ * The two are the same lexicon and identical at runtime; they differ only in
+ * that the SDK brands `did`/`uri` as template literal types, which makes the
+ * legacy `string` versions unassignable. Call this where facets read off an
+ * `@atproto/api` view type are handed to `new RichText(...)`.
+ *
+ * Transitional: it goes away once the view types come from the SDK too.
+ */
+export function asSdkFacets(
+  facets: {index: {byteStart: number; byteEnd: number}; features: unknown[]}[],
+): app.bsky.richtext.facet.Main[]
+export function asSdkFacets(
+  facets:
+    | {index: {byteStart: number; byteEnd: number}; features: unknown[]}[]
+    | undefined,
+): app.bsky.richtext.facet.Main[] | undefined
+export function asSdkFacets(facets: unknown) {
+  return facets as app.bsky.richtext.facet.Main[] | undefined
+}
diff --git a/src/lib/strings/rich-text-manip.ts b/src/lib/strings/rich-text-manip.ts
index 099fbffb0a..fa7a9b4a82 100644
--- a/src/lib/strings/rich-text-manip.ts
+++ b/src/lib/strings/rich-text-manip.ts
@@ -1,5 +1,7 @@
-import {AppBskyRichtextFacet, type RichText, UnicodeString} from '@atproto/api'
+import {type RichText, UnicodeString} from '@bsky.app/sdk/richtext'
 
+import {app} from '#/lexicons'
+import * as bsky from '#/types/bsky'
 import {toShortUrl} from './url-helpers'
 
 export function shortenLinks(rt: RichText): RichText {
@@ -10,7 +12,9 @@ export function shortenLinks(rt: RichText): RichText {
   // enumerate the link facets
   if (rt.facets) {
     for (const facet of rt.facets) {
-      const isLink = !!facet.features.find(AppBskyRichtextFacet.isLink)
+      const isLink = !!facet.features.find(f =>
+        bsky.isType(app.bsky.richtext.facet.link, f),
+      )
       if (!isLink) {
         continue
       }
@@ -40,7 +44,9 @@ export function stripInvalidMentions(rt: RichText): RichText {
   rt = rt.clone()
   if (rt.facets) {
     rt.facets = rt.facets?.filter(facet => {
-      const mention = facet.features.find(AppBskyRichtextFacet.isMention)
+      const mention = facet.features.find(f =>
+        bsky.isType(app.bsky.richtext.facet.mention, f),
+      )
       if (mention && !mention.did) {
         return false
       }
diff --git a/src/screens/Messages/components/MessageInputEmbed.tsx b/src/screens/Messages/components/MessageInputEmbed.tsx
index 477939cd3e..9d1e4c32f6 100644
--- a/src/screens/Messages/components/MessageInputEmbed.tsx
+++ b/src/screens/Messages/components/MessageInputEmbed.tsx
@@ -1,12 +1,7 @@
 import {useCallback, useEffect, useMemo, useState} from 'react'
 import {LayoutAnimation, View} from 'react-native'
-import {
-  AppBskyFeedPost,
-  AppBskyRichtextFacet,
-  AtUri,
-  moderatePost,
-  RichText as RichTextAPI,
-} from '@atproto/api'
+import {AppBskyFeedPost, AtUri, moderatePost} from '@atproto/api'
+import {RichText as RichTextAPI} from '@bsky.app/sdk/richtext'
 import {Trans, useLingui} from '@lingui/react/macro'
 import {type RouteProp, useNavigation, useRoute} from '@react-navigation/native'
 
@@ -16,6 +11,7 @@ import {
   type CommonNavigatorParams,
   type NavigationProp,
 } from '#/lib/routes/types'
+import {asSdkFacets} from '#/lib/strings/rich-text-helpers'
 import {
   convertBskyAppUrlIfNeeded,
   getChatInviteCodeFromUrl,
@@ -36,6 +32,7 @@ import {ContentHider} from '#/components/moderation/ContentHider'
 import {PostAlerts} from '#/components/moderation/PostAlerts'
 import {RichText} from '#/components/RichText'
 import {Text} from '#/components/Typography'
+import {app} from '#/lexicons'
 import * as bsky from '#/types/bsky'
 
 /**
@@ -106,7 +103,7 @@ export function useExtractEmbedFromFacets(
   for (const facet of rt.facets ?? []) {
     for (const feature of facet.features) {
       if (
-        AppBskyRichtextFacet.isLink(feature) &&
+        bsky.isType(app.bsky.richtext.facet.link, feature) &&
         (isBskyPostUrl(feature.uri) || isBskyChatInviteUrl(feature.uri))
       ) {
         uriFromFacet = feature.uri
@@ -176,7 +173,7 @@ function MessageInputPostEmbed({
       return {
         rt: new RichTextAPI({
           text: post.record.text,
-          facets: post.record.facets,
+          facets: asSdkFacets(post.record.facets),
         }),
         record: post.record,
       }
diff --git a/src/screens/Messages/components/MessagesList.tsx b/src/screens/Messages/components/MessagesList.tsx
index 312a2277ad..e9d336a67a 100644
--- a/src/screens/Messages/components/MessagesList.tsx
+++ b/src/screens/Messages/components/MessagesList.tsx
@@ -25,13 +25,12 @@ import {scheduleOnRN} from 'react-native-worklets'
 import {
   type $Typed,
   type AppBskyEmbedRecord,
-  AppBskyRichtextFacet,
   ChatBskyConvoDefs,
   type ChatBskyEmbedJoinLink,
   ChatBskyGroupDefs,
-  RichText,
 } from '@atproto/api'
 import {useScrollEdgeEffectRef} from '@bsky.app/expo-scroll-edge-effect'
+import {RichText} from '@bsky.app/sdk/richtext'
 
 import {useNonReactiveCallback} from '#/lib/hooks/useNonReactiveCallback'
 import {mergeRefs} from '#/lib/merge-refs'
@@ -52,7 +51,7 @@ import {type ConvoState, ConvoStatus} from '#/state/messages/convo/types'
 import {useGetJoinLinkPreview} from '#/state/queries/join-links'
 import {useGetPost} from '#/state/queries/post'
 import {createEmbedViewRecordFromPost} from '#/state/queries/postgate/util'
-import {useAgent, useSession} from '#/state/session'
+import {useAppviewClient, useSession} from '#/state/session'
 import {List, type ListMethods} from '#/view/com/util/List'
 import {MessageComposer} from '#/screens/Messages/components/MessageComposer'
 import {MessageListError} from '#/screens/Messages/components/MessageListError'
@@ -71,6 +70,8 @@ import {Loader} from '#/components/Loader'
 import {Text} from '#/components/Typography'
 import {useAnalytics} from '#/analytics'
 import {IS_ANDROID, IS_NATIVE, IS_WEB} from '#/env'
+import {app} from '#/lexicons'
+import * as bsky from '#/types/bsky'
 import {ChatStatusInfo} from './ChatStatusInfo'
 import {groupSystemMessages, type RenderItem} from './groupSystemMessages'
 import {InviteLinkDialogProvider} from './InviteLinkDialogProvider'
@@ -144,7 +145,11 @@ export function MessagesList({
 }) {
   const ax = useAnalytics()
   const convoState = useConvoActive()
-  const agent = useAgent()
+  /*
+   * Facet/mention resolution is an appview job - it resolves handles through
+   * the appview, and the public fallback keeps it working when logged out.
+   */
+  const appviewClient = useAppviewClient()
   const {hasSession, currentAccount} = useSession()
   const getPost = useGetPost()
   const getJoinLinkPreview = useGetJoinLinkPreview()
@@ -550,7 +555,8 @@ export function MessagesList({
         const linkFacet = rt.facets?.find(facet =>
           facet.features.find(
             feature =>
-              AppBskyRichtextFacet.isLink(feature) && predicate(feature.uri),
+              bsky.isType(app.bsky.richtext.facet.link, feature) &&
+              predicate(feature.uri),
           ),
         )
         if (linkFacet) {
@@ -617,7 +623,7 @@ export function MessagesList({
         replyTo = {messageId: reply.id}
       }
 
-      await rt.detectFacets(agent)
+      await rt.detectFacets(appviewClient)
 
       rt = shortenLinks(rt)
       rt = stripInvalidMentions(rt)
@@ -667,7 +673,7 @@ export function MessagesList({
       }
     },
     [
-      agent,
+      appviewClient,
       convoState,
       getPost,
       getJoinLinkPreview,
diff --git a/src/screens/PostThread/components/ThreadItemAnchor.tsx b/src/screens/PostThread/components/ThreadItemAnchor.tsx
index c4d664238b..4a2f6513e5 100644
--- a/src/screens/PostThread/components/ThreadItemAnchor.tsx
+++ b/src/screens/PostThread/components/ThreadItemAnchor.tsx
@@ -5,8 +5,8 @@ import {
   AppBskyFeedPost,
   type AppBskyFeedThreadgate,
   AtUri,
-  RichText as RichTextAPI,
 } from '@atproto/api'
+import {RichText as RichTextAPI} from '@bsky.app/sdk/richtext'
 import {Plural, Trans, useLingui} from '@lingui/react/macro'
 
 import {useNonReactiveCallback} from '#/lib/hooks/useNonReactiveCallback'
@@ -14,6 +14,7 @@ import {useOpenComposer} from '#/lib/hooks/useOpenComposer'
 import {makeProfileLink} from '#/lib/routes/links'
 import {sanitizeDisplayName} from '#/lib/strings/display-names'
 import {sanitizeHandle} from '#/lib/strings/handles'
+import {asSdkFacets} from '#/lib/strings/rich-text-helpers'
 import {niceDate} from '#/lib/strings/time'
 import {
   POST_TOMBSTONE,
@@ -199,7 +200,7 @@ const ThreadItemAnchorInner = memo(function ThreadItemAnchorInner({
     () =>
       new RichTextAPI({
         text: record.text,
-        facets: record.facets,
+        facets: asSdkFacets(record.facets),
       }),
     [record],
   )
diff --git a/src/screens/PostThread/components/ThreadItemPost.tsx b/src/screens/PostThread/components/ThreadItemPost.tsx
index c7f5b3b5f7..bd256e43b0 100644
--- a/src/screens/PostThread/components/ThreadItemPost.tsx
+++ b/src/screens/PostThread/components/ThreadItemPost.tsx
@@ -4,14 +4,15 @@ import {
   type AppBskyFeedDefs,
   type AppBskyFeedThreadgate,
   AtUri,
-  RichText as RichTextAPI,
 } from '@atproto/api'
+import {RichText as RichTextAPI} from '@bsky.app/sdk/richtext'
 import {Trans} from '@lingui/react/macro'
 
 import {MAX_POST_LINES} from '#/lib/constants'
 import {useOpenComposer} from '#/lib/hooks/useOpenComposer'
 import {makeProfileLink} from '#/lib/routes/links'
 import {countLines} from '#/lib/strings/helpers'
+import {asSdkFacets} from '#/lib/strings/rich-text-helpers'
 import {
   POST_TOMBSTONE,
   type Shadow,
@@ -211,7 +212,7 @@ const ThreadItemPostInner = memo(function ThreadItemPostInner({
     () =>
       new RichTextAPI({
         text: record.text,
-        facets: record.facets,
+        facets: asSdkFacets(record.facets),
       }),
     [record],
   )
diff --git a/src/screens/PostThread/components/ThreadItemTreePost.tsx b/src/screens/PostThread/components/ThreadItemTreePost.tsx
index 1560550329..3f4ae03741 100644
--- a/src/screens/PostThread/components/ThreadItemTreePost.tsx
+++ b/src/screens/PostThread/components/ThreadItemTreePost.tsx
@@ -4,14 +4,15 @@ import {
   type AppBskyFeedDefs,
   type AppBskyFeedThreadgate,
   AtUri,
-  RichText as RichTextAPI,
 } from '@atproto/api'
+import {RichText as RichTextAPI} from '@bsky.app/sdk/richtext'
 import {Trans} from '@lingui/react/macro'
 
 import {MAX_POST_LINES} from '#/lib/constants'
 import {useOpenComposer} from '#/lib/hooks/useOpenComposer'
 import {makeProfileLink} from '#/lib/routes/links'
 import {countLines} from '#/lib/strings/helpers'
+import {asSdkFacets} from '#/lib/strings/rich-text-helpers'
 import {
   POST_TOMBSTONE,
   type Shadow,
@@ -271,7 +272,7 @@ const ThreadItemTreePostInner = memo(function ThreadItemTreePostInner({
     () =>
       new RichTextAPI({
         text: record.text,
-        facets: record.facets,
+        facets: asSdkFacets(record.facets),
       }),
     [record],
   )
diff --git a/src/screens/Profile/Header/ProfileHeaderLabeler.tsx b/src/screens/Profile/Header/ProfileHeaderLabeler.tsx
index 96e136da5c..812e65b6e2 100644
--- a/src/screens/Profile/Header/ProfileHeaderLabeler.tsx
+++ b/src/screens/Profile/Header/ProfileHeaderLabeler.tsx
@@ -5,8 +5,8 @@ import {
   type AppBskyLabelerDefs,
   moderateProfile,
   type ModerationOpts,
-  type RichText as RichTextAPI,
 } from '@atproto/api'
+import {type RichText as RichTextAPI} from '@bsky.app/sdk/richtext'
 import {msg, plural} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Plural, Trans} from '@lingui/react/macro'
diff --git a/src/screens/Profile/Header/ProfileHeaderStandard.tsx b/src/screens/Profile/Header/ProfileHeaderStandard.tsx
index da01ded772..3070997b98 100644
--- a/src/screens/Profile/Header/ProfileHeaderStandard.tsx
+++ b/src/screens/Profile/Header/ProfileHeaderStandard.tsx
@@ -5,8 +5,8 @@ import {
   moderateProfile,
   type ModerationDecision,
   type ModerationOpts,
-  type RichText as RichTextAPI,
 } from '@atproto/api'
+import {type RichText as RichTextAPI} from '@bsky.app/sdk/richtext'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
diff --git a/src/screens/Profile/Header/index.tsx b/src/screens/Profile/Header/index.tsx
index 0b7ab16ec4..dbd8bafcab 100644
--- a/src/screens/Profile/Header/index.tsx
+++ b/src/screens/Profile/Header/index.tsx
@@ -12,8 +12,8 @@ import {
   type AppBskyLabelerDefs,
   moderateProfile,
   type ModerationOpts,
-  type RichText as RichTextAPI,
 } from '@atproto/api'
+import {type RichText as RichTextAPI} from '@bsky.app/sdk/richtext'
 import {useIsFocused} from '@react-navigation/native'
 
 import {sanitizeHandle} from '#/lib/strings/handles'
diff --git a/src/screens/ProfileList/components/Header.tsx b/src/screens/ProfileList/components/Header.tsx
index 9d6c4f3ff7..55f572c554 100644
--- a/src/screens/ProfileList/components/Header.tsx
+++ b/src/screens/ProfileList/components/Header.tsx
@@ -1,12 +1,14 @@
 import {useMemo} from 'react'
 import {View} from 'react-native'
-import {AppBskyGraphDefs, RichText as RichTextAPI} from '@atproto/api'
+import {AppBskyGraphDefs} from '@atproto/api'
+import {RichText as RichTextAPI} from '@bsky.app/sdk/richtext'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
 
 import {useHaptics} from '#/lib/haptics'
 import {makeListLink} from '#/lib/routes/links'
+import {asSdkFacets} from '#/lib/strings/rich-text-helpers'
 import {logger} from '#/logger'
 import {useListBlockMutation, useListMuteMutation} from '#/state/queries/list'
 import {
@@ -128,7 +130,7 @@ export function Header({
       list.description
         ? new RichTextAPI({
             text: list.description,
-            facets: list.descriptionFacets,
+            facets: asSdkFacets(list.descriptionFacets),
           })
         : undefined,
     [list],
diff --git a/src/screens/Search/modules/ExploreTrendingTopics.tsx b/src/screens/Search/modules/ExploreTrendingTopics.tsx
index 38c8cac0a8..60c42323c3 100644
--- a/src/screens/Search/modules/ExploreTrendingTopics.tsx
+++ b/src/screens/Search/modules/ExploreTrendingTopics.tsx
@@ -1,11 +1,8 @@
 import {useMemo} from 'react'
 import {Pressable, View} from 'react-native'
 import {Image} from 'expo-image'
-import {
-  type AppBskyUnspeccedDefs,
-  moderateProfile,
-  RichText as RichTextApi,
-} from '@atproto/api'
+import {type AppBskyUnspeccedDefs, moderateProfile} from '@atproto/api'
+import {RichText as RichTextApi} from '@bsky.app/sdk/richtext'
 import {Plural, Trans, useLingui} from '@lingui/react/macro'
 
 import {useModerationOpts} from '#/state/preferences/moderation-opts'
diff --git a/src/screens/StarterPack/StarterPackScreen.tsx b/src/screens/StarterPack/StarterPackScreen.tsx
index ddbd5cd840..bb9c6506e9 100644
--- a/src/screens/StarterPack/StarterPackScreen.tsx
+++ b/src/screens/StarterPack/StarterPackScreen.tsx
@@ -6,8 +6,8 @@ import {
   AppBskyGraphStarterpack,
   AtUri,
   type ModerationOpts,
-  RichText as RichTextAPI,
 } from '@atproto/api'
+import {RichText as RichTextAPI} from '@bsky.app/sdk/richtext'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Plural, Trans} from '@lingui/react/macro'
@@ -24,6 +24,7 @@ import {
   type NavigationProp,
 } from '#/lib/routes/types'
 import {cleanError} from '#/lib/strings/errors'
+import {asSdkFacets} from '#/lib/strings/rich-text-helpers'
 import {getStarterPackOgCard} from '#/lib/strings/starter-pack'
 import {logger} from '#/logger'
 import {updateProfileShadow} from '#/state/cache/profile-shadow'
@@ -418,7 +419,7 @@ function Header({
   const richText = record.description
     ? new RichTextAPI({
         text: record.description,
-        facets: record.descriptionFacets,
+        facets: asSdkFacets(record.descriptionFacets),
       })
     : undefined
 
diff --git a/src/screens/VideoFeed/index.tsx b/src/screens/VideoFeed/index.tsx
index 6e7bb4139a..38c2e5a89d 100644
--- a/src/screens/VideoFeed/index.tsx
+++ b/src/screens/VideoFeed/index.tsx
@@ -31,8 +31,8 @@ import {
   AppBskyFeedPost,
   AtUri,
   type ModerationDecision,
-  RichText as RichTextAPI,
 } from '@atproto/api'
+import {RichText as RichTextAPI} from '@bsky.app/sdk/richtext'
 import {Trans, useLingui} from '@lingui/react/macro'
 import {
   type RouteProp,
@@ -58,6 +58,7 @@ import {
 import {sanitizeDisplayName} from '#/lib/strings/display-names'
 import {cleanError} from '#/lib/strings/errors'
 import {sanitizeHandle} from '#/lib/strings/handles'
+import {asSdkFacets} from '#/lib/strings/rich-text-helpers'
 import {logger} from '#/logger'
 import {useA11y} from '#/state/a11y'
 import {
@@ -834,7 +835,7 @@ function Overlay({
     : undefined
   const richText = new RichTextAPI({
     text: record?.text || '',
-    facets: record?.facets,
+    facets: asSdkFacets(record?.facets),
   })
   const handle = sanitizeHandle(post.author.handle, '@')
 
diff --git a/src/state/queries/feed.ts b/src/state/queries/feed.ts
index 9a9a8c09b9..a3b90de32b 100644
--- a/src/state/queries/feed.ts
+++ b/src/state/queries/feed.ts
@@ -5,9 +5,9 @@ import {
   type AppBskyGraphDefs,
   AtUri,
   moderateFeedGenerator,
-  RichText,
 } from '@atproto/api'
 import {type AtUriString} from '@atproto/syntax'
+import {RichText} from '@bsky.app/sdk/richtext'
 import {t} from '@lingui/core/macro'
 import {
   type InfiniteData,
@@ -22,6 +22,7 @@ import {
 import {DISCOVER_FEED_URI, DISCOVER_SAVED_FEED} from '#/lib/constants'
 import {sanitizeDisplayName} from '#/lib/strings/display-names'
 import {sanitizeHandle} from '#/lib/strings/handles'
+import {asSdkFacets} from '#/lib/strings/rich-text-helpers'
 import {GCTIME, STALE} from '#/state/queries'
 import {RQKEY as listQueryKey} from '#/state/queries/list'
 import {usePreferencesQuery} from '#/state/queries/preferences'
@@ -104,7 +105,7 @@ export function hydrateFeedGenerator(
 
   const description = new RichText({
     text: view.description || '',
-    facets: (view.descriptionFacets || [])?.slice(),
+    facets: asSdkFacets((view.descriptionFacets || [])?.slice()),
   })
 
   if (!view.descriptionFacets) {
@@ -145,7 +146,7 @@ export function hydrateList(view: AppBskyGraphDefs.ListView): FeedSourceInfo {
 
   const description = new RichText({
     text: view.description || '',
-    facets: (view.descriptionFacets || [])?.slice(),
+    facets: asSdkFacets((view.descriptionFacets || [])?.slice()),
   })
 
   if (!view.descriptionFacets) {
diff --git a/src/state/queries/starter-packs.ts b/src/state/queries/starter-packs.ts
index ddf8365dda..6a1aecef0e 100644
--- a/src/state/queries/starter-packs.ts
+++ b/src/state/queries/starter-packs.ts
@@ -3,11 +3,10 @@ import {
   AppBskyGraphDefs,
   type AppBskyGraphGetStarterPack,
   AppBskyGraphStarterpack,
-  type AppBskyRichtextFacet,
   type AtpAgent,
   AtUri,
-  RichText,
 } from '@atproto/api'
+import {RichText} from '@bsky.app/sdk/richtext'
 import {
   type QueryClient,
   useMutation,
@@ -26,7 +25,8 @@ import {
 import {invalidateActorStarterPacksQuery} from '#/state/queries/actor-starter-packs'
 import {STALE} from '#/state/queries/index'
 import {invalidateListMembersQuery} from '#/state/queries/list-members'
-import {useAgent} from '#/state/session'
+import {useAgent, useAppviewClient} from '#/state/session'
+import {type app} from '#/lexicons'
 import * as bsky from '#/types/bsky'
 
 const RQKEY_ROOT = 'starter-pack'
@@ -105,6 +105,11 @@ export function useCreateStarterPackMutation({
 }) {
   const queryClient = useQueryClient()
   const agent = useAgent()
+  /*
+   * Facet/mention resolution is an appview job - it resolves handles through
+   * the appview, and the public fallback keeps it working when logged out.
+   */
+  const appviewClient = useAppviewClient()
 
   return useMutation<
     {uri: string; cid: string},
@@ -112,10 +117,10 @@ export function useCreateStarterPackMutation({
     UseCreateStarterPackMutationParams
   >({
     mutationFn: async ({name, description, feeds, profiles}) => {
-      let descriptionFacets: AppBskyRichtextFacet.Main[] | undefined
+      let descriptionFacets: app.bsky.richtext.facet.Main[] | undefined
       if (description) {
         const rt = new RichText({text: description})
-        await rt.detectFacets(agent)
+        await rt.detectFacets(appviewClient)
         descriptionFacets = rt.facets
       }
 
@@ -167,6 +172,7 @@ export function useEditStarterPackMutation({
 }) {
   const queryClient = useQueryClient()
   const agent = useAgent()
+  const appviewClient = useAppviewClient()
 
   return useMutation<
     void,
@@ -184,10 +190,10 @@ export function useEditStarterPackMutation({
       currentStarterPack,
       currentListItems,
     }) => {
-      let descriptionFacets: AppBskyRichtextFacet.Main[] | undefined
+      let descriptionFacets: app.bsky.richtext.facet.Main[] | undefined
       if (description) {
         const rt = new RichText({text: description})
-        await rt.detectFacets(agent)
+        await rt.detectFacets(appviewClient)
         descriptionFacets = rt.facets
       }
 
diff --git a/src/view/com/composer/Composer.tsx b/src/view/com/composer/Composer.tsx
index 6c7c2280c2..c2e651556d 100644
--- a/src/view/com/composer/Composer.tsx
+++ b/src/view/com/composer/Composer.tsx
@@ -49,10 +49,10 @@ import {
   AppBskyUnspeccedDefs,
   AtUri,
   ChatBskyGroupDefs,
-  type RichText,
 } from '@atproto/api'
 import {type Client} from '@atproto/lex'
 import {type AtUriString} from '@atproto/syntax'
+import {type RichText} from '@bsky.app/sdk/richtext'
 import {plural} from '@lingui/core/macro'
 import {Trans, useLingui} from '@lingui/react/macro'
 import {useNavigation} from '@react-navigation/native'
@@ -1083,6 +1083,7 @@ export const ComposePost = ({
           replyTo: replyTo?.uri,
           onStateChange: setPublishingStage,
           langs: currentLanguages,
+          appviewClient: client,
         })
       ).uris[0]
 
diff --git a/src/view/com/composer/drafts/state/api.ts b/src/view/com/composer/drafts/state/api.ts
index b8fddc618f..3b5ff9cdf2 100644
--- a/src/view/com/composer/drafts/state/api.ts
+++ b/src/view/com/composer/drafts/state/api.ts
@@ -1,7 +1,8 @@
 /**
  * Type converters for Draft API - convert between ComposerState and server Draft types.
  */
-import {AppBskyDraftDefs, AtUri, RichText} from '@atproto/api'
+import {AppBskyDraftDefs, AtUri} from '@atproto/api'
+import {RichText} from '@bsky.app/sdk/richtext'
 import {nanoid} from 'nanoid/non-secure'
 
 import {resolveLink} from '#/lib/api/resolve'
diff --git a/src/view/com/composer/select-language/SuggestedLanguage.tsx b/src/view/com/composer/select-language/SuggestedLanguage.tsx
index ab731cda22..71a45ec796 100644
--- a/src/view/com/composer/select-language/SuggestedLanguage.tsx
+++ b/src/view/com/composer/select-language/SuggestedLanguage.tsx
@@ -1,11 +1,11 @@
 import {useEffect, useMemo, useRef, useState} from 'react'
 import {Platform, Text as RNText, View} from 'react-native'
-import {RichText} from '@atproto/api'
 import {parseLanguageString} from '@atproto/syntax'
 import {
   guessLanguageAsync,
   type LanguageResult,
 } from '@bsky.app/expo-guess-language'
+import {RichText} from '@bsky.app/sdk/richtext'
 import {Trans, useLingui} from '@lingui/react/macro'
 import debounce from 'lodash.debounce'
 
diff --git a/src/view/com/composer/state/composer.ts b/src/view/com/composer/state/composer.ts
index fc8b341270..3d2aa45992 100644
--- a/src/view/com/composer/state/composer.ts
+++ b/src/view/com/composer/state/composer.ts
@@ -3,9 +3,8 @@ import {
   type AppBskyActorDefs,
   type AppBskyDraftDefs,
   type AppBskyFeedPostgate,
-  AppBskyRichtextFacet,
-  RichText,
 } from '@atproto/api'
+import {RichText} from '@bsky.app/sdk/richtext'
 import {nanoid} from 'nanoid/non-secure'
 
 import {type VideoTelemetry} from '#/lib/media/video/telemetry'
@@ -28,6 +27,8 @@ import {
   suggestLinkCardUri,
 } from '#/view/com/composer/text-input/text-input-util'
 import {type Gif} from '#/features/gifPicker/types'
+import {app} from '#/lexicons'
+import * as bsky from '#/types/bsky'
 import {
   createVideoState,
   type VideoAction,
@@ -677,7 +678,7 @@ export function createComposerState({
     if (initRichText.facets) {
       for (const facet of initRichText.facets) {
         for (const feature of facet.features) {
-          if (AppBskyRichtextFacet.isLink(feature)) {
+          if (bsky.isType(app.bsky.richtext.facet.link, feature)) {
             if (isBskyPostUrl(feature.uri)) {
               detectedPostUris.set(feature.uri, {facet, rt: initRichText})
             } else {
diff --git a/src/view/com/composer/text-input/TextInput.tsx b/src/view/com/composer/text-input/TextInput.tsx
index 88389ffd56..d230b01545 100644
--- a/src/view/com/composer/text-input/TextInput.tsx
+++ b/src/view/com/composer/text-input/TextInput.tsx
@@ -12,7 +12,7 @@ import {
   View,
 } from 'react-native'
 import {type PasteEventPayload, TextInputWrapper} from 'expo-paste-input'
-import {AppBskyRichtextFacet, RichText} from '@atproto/api'
+import {RichText} from '@bsky.app/sdk/richtext'
 import {useLingui} from '@lingui/react/macro'
 
 import {IMAGE_SIZE_CONFIG_POSTS} from '#/lib/constants'
@@ -27,6 +27,8 @@ import {
 import {atoms as a, useAlf} from '#/alf'
 import {normalizeTextStyles} from '#/alf/typography'
 import {IS_ANDROID} from '#/env'
+import {app} from '#/lexicons'
+import * as bsky from '#/types/bsky'
 import {Autocomplete} from './mobile/Autocomplete'
 import {type TextInputProps} from './TextInput.types'
 
@@ -88,7 +90,7 @@ export function TextInput({
       if (newRt.facets) {
         for (const facet of newRt.facets) {
           for (const feature of facet.features) {
-            if (AppBskyRichtextFacet.isLink(feature)) {
+            if (bsky.isType(app.bsky.richtext.facet.link, feature)) {
               if (isUriImage(feature.uri)) {
                 const res = await downloadAndResize({
                   uri: feature.uri,
diff --git a/src/view/com/composer/text-input/TextInput.types.ts b/src/view/com/composer/text-input/TextInput.types.ts
index fab2bc32f8..e60432b41e 100644
--- a/src/view/com/composer/text-input/TextInput.types.ts
+++ b/src/view/com/composer/text-input/TextInput.types.ts
@@ -1,5 +1,5 @@
 import {type TextInput} from 'react-native'
-import {type RichText} from '@atproto/api'
+import {type RichText} from '@bsky.app/sdk/richtext'
 
 export type TextInputRef = {
   focus: () => void
diff --git a/src/view/com/composer/text-input/TextInput.web.tsx b/src/view/com/composer/text-input/TextInput.web.tsx
index e76d9e3f3d..f75d60f4bd 100644
--- a/src/view/com/composer/text-input/TextInput.web.tsx
+++ b/src/view/com/composer/text-input/TextInput.web.tsx
@@ -8,7 +8,7 @@ import {
 } from 'react'
 import {StyleSheet, View} from 'react-native'
 import Animated, {FadeIn, FadeOut} from 'react-native-reanimated'
-import {AppBskyRichtextFacet, RichText} from '@atproto/api'
+import {RichText} from '@bsky.app/sdk/richtext'
 import {Trans} from '@lingui/react/macro'
 import {getSchema} from '@tiptap/core'
 import {Document} from '@tiptap/extension-document'
@@ -40,6 +40,8 @@ import {normalizeTextStyles} from '#/alf/typography'
 import {type Emoji} from '#/components/EmojiPicker'
 import {Portal} from '#/components/Portal'
 import {Text} from '#/components/Typography'
+import {app} from '#/lexicons'
+import * as bsky from '#/types/bsky'
 import {type TextInputProps} from './TextInput.types'
 import {type AutocompleteRef, createSuggestion} from './web/Autocomplete'
 import {LinkDecorator} from './web/LinkDecorator'
@@ -265,7 +267,7 @@ export function TextInput({
         if (newRt.facets) {
           for (const facet of newRt.facets) {
             for (const feature of facet.features) {
-              if (AppBskyRichtextFacet.isLink(feature)) {
+              if (bsky.isType(app.bsky.richtext.facet.link, feature)) {
                 nextDetectedUris.set(feature.uri, {facet, rt: newRt})
               }
             }
diff --git a/src/view/com/composer/text-input/text-input-util.ts b/src/view/com/composer/text-input/text-input-util.ts
index 71db8c3238..998d7074d9 100644
--- a/src/view/com/composer/text-input/text-input-util.ts
+++ b/src/view/com/composer/text-input/text-input-util.ts
@@ -1,8 +1,10 @@
-import {type AppBskyRichtextFacet, type RichText} from '@atproto/api'
+import {type RichText} from '@bsky.app/sdk/richtext'
+
+import {type app} from '#/lexicons'
 
 export type LinkFacetMatch = {
   rt: RichText
-  facet: AppBskyRichtextFacet.Main
+  facet: app.bsky.richtext.facet.Main
 }
 
 export function suggestLinkCardUri(
diff --git a/src/view/com/post/Post.tsx b/src/view/com/post/Post.tsx
index dc17bff725..b67133df65 100644
--- a/src/view/com/post/Post.tsx
+++ b/src/view/com/post/Post.tsx
@@ -6,14 +6,15 @@ import {
   AtUri,
   moderatePost,
   type ModerationDecision,
-  RichText as RichTextAPI,
 } from '@atproto/api'
+import {RichText as RichTextAPI} from '@bsky.app/sdk/richtext'
 import {useQueryClient} from '@tanstack/react-query'
 
 import {MAX_POST_LINES} from '#/lib/constants'
 import {useOpenComposer} from '#/lib/hooks/useOpenComposer'
 import {makeProfileLink} from '#/lib/routes/links'
 import {countLines} from '#/lib/strings/helpers'
+import {asSdkFacets} from '#/lib/strings/rich-text-helpers'
 import {
   POST_TOMBSTONE,
   type Shadow,
@@ -68,7 +69,7 @@ export function Post({
       record
         ? new RichTextAPI({
             text: record.text,
-            facets: record.facets,
+            facets: asSdkFacets(record.facets),
           })
         : undefined,
     [record],
diff --git a/src/view/com/posts/PostFeed.tsx b/src/view/com/posts/PostFeed.tsx
index eea2453739..2ccf3872dc 100644
--- a/src/view/com/posts/PostFeed.tsx
+++ b/src/view/com/posts/PostFeed.tsx
@@ -25,8 +25,8 @@ import {
   AppBskyEmbedImages,
   AppBskyEmbedVideo,
   type AppBskyFeedDefs,
-  type RichText as RichTextType,
 } from '@atproto/api'
+import {type RichText as RichTextType} from '@bsky.app/sdk/richtext'
 import {useLingui} from '@lingui/react/macro'
 import {useQueryClient} from '@tanstack/react-query'
 
diff --git a/src/view/com/posts/PostFeedItem.tsx b/src/view/com/posts/PostFeedItem.tsx
index 57f506c5d1..a95b41635b 100644
--- a/src/view/com/posts/PostFeedItem.tsx
+++ b/src/view/com/posts/PostFeedItem.tsx
@@ -7,8 +7,8 @@ import {
   AppBskyFeedThreadgate,
   AtUri,
   type ModerationDecision,
-  RichText as RichTextAPI,
 } from '@atproto/api'
+import {RichText as RichTextAPI} from '@bsky.app/sdk/richtext'
 import {useQueryClient} from '@tanstack/react-query'
 
 import {type ReasonFeedSource} from '#/lib/api/feed/types'
@@ -17,6 +17,7 @@ import {useOpenComposer} from '#/lib/hooks/useOpenComposer'
 import {usePalette} from '#/lib/hooks/usePalette'
 import {makeProfileLink} from '#/lib/routes/links'
 import {countLines} from '#/lib/strings/helpers'
+import {asSdkFacets} from '#/lib/strings/rich-text-helpers'
 import {
   POST_TOMBSTONE,
   type Shadow,
@@ -104,7 +105,7 @@ export function PostFeedItem({
     () =>
       new RichTextAPI({
         text: record.text,
-        facets: record.facets,
+        facets: asSdkFacets(record.facets),
       }),
     [record],
   )
diff --git a/src/view/screens/DebugMod.tsx b/src/view/screens/DebugMod.tsx
index c3fe8fba8e..d92043966c 100644
--- a/src/view/screens/DebugMod.tsx
+++ b/src/view/screens/DebugMod.tsx
@@ -15,8 +15,8 @@ import {
   type ModerationBehavior,
   type ModerationDecision,
   type ModerationOpts,
-  RichText,
 } from '@atproto/api'
+import {RichText} from '@bsky.app/sdk/richtext'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 
diff --git a/src/view/screens/Profile.tsx b/src/view/screens/Profile.tsx
index ead74bae94..c796bf9586 100644
--- a/src/view/screens/Profile.tsx
+++ b/src/view/screens/Profile.tsx
@@ -6,8 +6,8 @@ import {
   type AppBskyActorDefs,
   moderateProfile,
   type ModerationOpts,
-  RichText as RichTextAPI,
 } from '@atproto/api'
+import {RichText as RichTextAPI} from '@bsky.app/sdk/richtext'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
@@ -33,7 +33,7 @@ import {useLabelerInfoQuery} from '#/state/queries/labeler'
 import {resetProfilePostsQueries} from '#/state/queries/post-feed'
 import {useProfileQuery} from '#/state/queries/profile'
 import {useResolveDidQuery} from '#/state/queries/resolve-uri'
-import {useAgent, useSession} from '#/state/session'
+import {useAppviewClient, useSession} from '#/state/session'
 import {ProfileFeedgens} from '#/view/com/feeds/ProfileFeedgens'
 import {ProfileLists} from '#/view/com/lists/ProfileLists'
 import {PagerWithHeader} from '#/view/com/pager/PagerWithHeader'
@@ -613,7 +613,11 @@ function ProfileScreenLoaded({
 }
 
 function useRichText(text: string): [RichTextAPI, boolean] {
-  const agent = useAgent()
+  /*
+   * Facet/mention resolution is an appview job - it resolves handles through
+   * the appview, and the public fallback keeps it working when logged out.
+   */
+  const client = useAppviewClient()
   const [prevText, setPrevText] = useState(text)
   const [rawRT, setRawRT] = useState(() => new RichTextAPI({text}))
   const [resolvedRT, setResolvedRT] = useState<RichTextAPI | null>(null)
@@ -628,7 +632,7 @@ function useRichText(text: string): [RichTextAPI, boolean] {
     async function resolveRTFacets() {
       // new each time
       const resolvedRT = new RichTextAPI({text})
-      await resolvedRT.detectFacets(agent)
+      await resolvedRT.detectFacets(client)
       if (!ignore) {
         setResolvedRT(resolvedRT)
       }
@@ -637,7 +641,7 @@ function useRichText(text: string): [RichTextAPI, boolean] {
     return () => {
       ignore = true
     }
-  }, [text, agent])
+  }, [text, client])
   const isResolving = resolvedRT === null
   return [resolvedRT ?? rawRT, isResolving]
 }

From 3568cdc42d62bca5968a1f87c12fbca30601716b Mon Sep 17 00:00:00 2001
From: Samuel Newman <mozzius@protonmail.com>
Date: Thu, 13 Aug 2026 22:26:19 +0300
Subject: [PATCH 18/32] [SDK] Migrate getAllListMembers to the appview client
 (#11377)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
---
 .../lists/CreateListFromStarterPackDialog.tsx |  8 +++--
 src/screens/Onboarding/StepFinished/index.tsx |  9 ++++--
 .../StarterPackCard.tsx                       |  5 ++--
 src/screens/StarterPack/StarterPackScreen.tsx |  5 ++--
 src/state/queries/list-members.ts             | 29 +++++++------------
 5 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/src/components/dialogs/lists/CreateListFromStarterPackDialog.tsx b/src/components/dialogs/lists/CreateListFromStarterPackDialog.tsx
index 3e74de5c67..3aabbec9ff 100644
--- a/src/components/dialogs/lists/CreateListFromStarterPackDialog.tsx
+++ b/src/components/dialogs/lists/CreateListFromStarterPackDialog.tsx
@@ -20,7 +20,7 @@ import {wait} from '#/lib/async/wait'
 import {type NavigationProp} from '#/lib/routes/types'
 import {logger} from '#/logger'
 import {getAllListMembers} from '#/state/queries/list-members'
-import {useAgent, useSession} from '#/state/session'
+import {useAgent, useAppviewClient, useSession} from '#/state/session'
 import {atoms as a, platform, useTheme, web} from '#/alf'
 import {Admonition} from '#/components/Admonition'
 import {Button, ButtonText} from '#/components/Button'
@@ -41,6 +41,7 @@ export function CreateListFromStarterPackDialog({
   const {_} = useLingui()
   const t = useTheme()
   const agent = useAgent()
+  const appviewClient = useAppviewClient()
   const ax = useAnalytics()
   const {currentAccount} = useSession()
   const navigation = useNavigation<NavigationProp>()
@@ -73,7 +74,10 @@ export function CreateListFromStarterPackDialog({
       const listItems = await wait(
         3000,
         (async () => {
-          const items = await getAllListMembers(agent, starterPack.list!.uri)
+          const items = await getAllListMembers(
+            appviewClient,
+            starterPack.list!.uri,
+          )
 
           if (items.length > 0) {
             const listitemWrites: $Typed<ComAtprotoRepoApplyWrites.Create>[] =
diff --git a/src/screens/Onboarding/StepFinished/index.tsx b/src/screens/Onboarding/StepFinished/index.tsx
index 11dfd35ceb..05f4ef8626 100644
--- a/src/screens/Onboarding/StepFinished/index.tsx
+++ b/src/screens/Onboarding/StepFinished/index.tsx
@@ -26,7 +26,7 @@ import {useSetHasCheckedForStarterPack} from '#/state/preferences/used-starter-p
 import {getAllListMembers} from '#/state/queries/list-members'
 import {preferencesQueryKey} from '#/state/queries/preferences'
 import {RQKEY as profileRQKey} from '#/state/queries/profile'
-import {useAgent} from '#/state/session'
+import {useAgent, useAppviewClient} from '#/state/session'
 import {useOnboardingDispatch} from '#/state/shell'
 import {
   useActiveStarterPack,
@@ -58,6 +58,7 @@ export function StepFinished() {
   const [saving, setSaving] = useState(false)
   const queryClient = useQueryClient()
   const agent = useAgent()
+  const appviewClient = useAppviewClient()
   const requestNotificationsPermission = useRequestNotificationsPermission()
   const activeStarterPack = useActiveStarterPack()
   const setActiveStarterPack = useSetActiveStarterPack()
@@ -82,7 +83,10 @@ export function StepFinished() {
       }
       try {
         if (starterPack?.list) {
-          listItems = await getAllListMembers(agent, starterPack.list.uri)
+          listItems = await getAllListMembers(
+            appviewClient,
+            starterPack.list.uri,
+          )
         }
       } catch (e) {
         logger.error('Failed to fetch starter pack list items', {
@@ -231,6 +235,7 @@ export function StepFinished() {
     ax,
     queryClient,
     agent,
+    appviewClient,
     dispatch,
     onboardDispatch,
     activeStarterPack,
diff --git a/src/screens/Onboarding/StepSuggestedStarterpacks/StarterPackCard.tsx b/src/screens/Onboarding/StepSuggestedStarterpacks/StarterPackCard.tsx
index b016af65db..fa296dfbd2 100644
--- a/src/screens/Onboarding/StepSuggestedStarterpacks/StarterPackCard.tsx
+++ b/src/screens/Onboarding/StepSuggestedStarterpacks/StarterPackCard.tsx
@@ -11,7 +11,7 @@ import {isBlockedOrBlocking, isMuted} from '#/lib/moderation/blocked-and-muted'
 import {logger} from '#/logger'
 import {updateProfileShadow} from '#/state/cache/profile-shadow'
 import {getAllListMembers} from '#/state/queries/list-members'
-import {useAgent, useSession} from '#/state/session'
+import {useAgent, useAppviewClient, useSession} from '#/state/session'
 import {bulkWriteFollows} from '#/screens/Onboarding/util'
 import {AvatarStack} from '#/screens/Search/components/StarterPackCard'
 import {atoms as a, useBreakpoints, useTheme, web} from '#/alf'
@@ -36,6 +36,7 @@ export function StarterPackCard({
   const {currentAccount} = useSession()
   const {gtPhone} = useBreakpoints()
   const agent = useAgent()
+  const appviewClient = useAppviewClient()
   const queryClient = useQueryClient()
   const record = view.record
   const [isProcessing, setIsProcessing] = useState(false)
@@ -48,7 +49,7 @@ export function StarterPackCard({
 
     let listItems: AppBskyGraphDefs.ListItemView[] = []
     try {
-      listItems = await getAllListMembers(agent, view.list.uri)
+      listItems = await getAllListMembers(appviewClient, view.list.uri)
     } catch (e) {
       setIsProcessing(false)
       Toast.show(_(msg`An error occurred while trying to follow all`), {
diff --git a/src/screens/StarterPack/StarterPackScreen.tsx b/src/screens/StarterPack/StarterPackScreen.tsx
index bb9c6506e9..e7674c00b4 100644
--- a/src/screens/StarterPack/StarterPackScreen.tsx
+++ b/src/screens/StarterPack/StarterPackScreen.tsx
@@ -37,7 +37,7 @@ import {
   useDeleteStarterPackMutation,
   useStarterPackQuery,
 } from '#/state/queries/starter-packs'
-import {useAgent, useSession} from '#/state/session'
+import {useAgent, useAppviewClient, useSession} from '#/state/session'
 import {useSetActiveStarterPack} from '#/state/shell/landing'
 import {useLoggedOutViewControls} from '#/state/shell/logged-out'
 import {
@@ -312,6 +312,7 @@ function Header({
   const t = useTheme()
   const {currentAccount, hasSession} = useSession()
   const agent = useAgent()
+  const appviewClient = useAppviewClient()
   const queryClient = useQueryClient()
   const setActiveStarterPack = useSetActiveStarterPack()
   const {requestSwitchToAccount} = useLoggedOutViewControls()
@@ -354,7 +355,7 @@ function Header({
 
     let listItems: AppBskyGraphDefs.ListItemView[] = []
     try {
-      listItems = await getAllListMembers(agent, starterPack.list.uri)
+      listItems = await getAllListMembers(appviewClient, starterPack.list.uri)
     } catch (e) {
       setIsProcessing(false)
       Toast.show(_(msg`An error occurred while trying to follow all`), {
diff --git a/src/state/queries/list-members.ts b/src/state/queries/list-members.ts
index bde6666dc6..6e70ff4027 100644
--- a/src/state/queries/list-members.ts
+++ b/src/state/queries/list-members.ts
@@ -1,8 +1,5 @@
-import {
-  type AppBskyActorDefs,
-  type AppBskyGraphDefs,
-  type AtpAgent,
-} from '@atproto/api'
+import {type AppBskyActorDefs, type AppBskyGraphDefs} from '@atproto/api'
+import {type Client} from '@atproto/lex'
 import {type AtUriString} from '@atproto/syntax'
 import {
   type InfiniteData,
@@ -13,7 +10,7 @@ import {
 } from '@tanstack/react-query'
 
 import {STALE} from '#/state/queries'
-import {useAgent, useAppviewClient} from '#/state/session'
+import {useAppviewClient} from '#/state/session'
 import {app} from '#/lexicons'
 
 const PAGE_SIZE = 30
@@ -50,36 +47,32 @@ export function useListMembersQuery(uri?: string, limit: number = PAGE_SIZE) {
 }
 
 export function useAllListMembersQuery(uri?: string) {
-  const agent = useAgent()
+  const client = useAppviewClient()
   return useQuery({
     staleTime: STALE.MINUTES.ONE,
     queryKey: RQKEY_ALL(uri ?? ''),
     queryFn: async () => {
-      return getAllListMembers(agent, uri!)
+      return getAllListMembers(client, uri!)
     },
     enabled: Boolean(uri),
   })
 }
 
-/*
- * Still on the legacy agent: four call sites outside this cluster pass their
- * own `AtpAgent`, so the parameter type is migrated with those consumers.
- */
-export async function getAllListMembers(agent: AtpAgent, uri: string) {
+export async function getAllListMembers(client: Client, uri: string) {
   let hasMore = true
   let cursor: string | undefined
   const listItems: AppBskyGraphDefs.ListItemView[] = []
   // We want to cap this at 6 pages, just for anything weird happening with the api
   let i = 0
   while (hasMore && i < 6) {
-    const res = await agent.app.bsky.graph.getList({
-      list: uri,
+    const res = await client.call(app.bsky.graph.getList, {
+      list: uri as AtUriString,
       limit: 50,
       cursor,
     })
-    listItems.push(...res.data.items)
-    hasMore = Boolean(res.data.cursor)
-    cursor = res.data.cursor
+    listItems.push(...res.items)
+    hasMore = Boolean(res.cursor)
+    cursor = res.cursor
     i++
   }
   return listItems

From ca226f589db36803c1be217bd99432be76370cfb Mon Sep 17 00:00:00 2001
From: Samuel Newman <mozzius@protonmail.com>
Date: Thu, 13 Aug 2026 22:26:19 +0300
Subject: [PATCH 19/32] [SDK] Migrate the gate records to raw repo calls on the
 pds client (#11378)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
---
 oxlint-suppressions.json                      | 16 +---
 .../dialogs/PostInteractionSettingsDialog.tsx | 22 ++---
 src/lib/api/index.ts                          |  3 +-
 src/lib/xrpc-error.ts                         | 20 ++++
 .../ModerationInteractionSettings/index.tsx   | 17 +++-
 src/state/queries/postgate/index.ts           | 83 +++++++++--------
 src/state/queries/postgate/util.ts            | 34 +++++--
 src/state/queries/threadgate/index.ts         | 91 +++++++++----------
 src/state/queries/threadgate/util.ts          | 67 +++++++++-----
 src/view/com/composer/state/composer.ts       | 38 +++++---
 .../com/composer/threadgate/ThreadgateBtn.tsx | 23 +++--
 11 files changed, 234 insertions(+), 180 deletions(-)

diff --git a/oxlint-suppressions.json b/oxlint-suppressions.json
index 3b2304e8fe..5ffe12abbc 100644
--- a/oxlint-suppressions.json
+++ b/oxlint-suppressions.json
@@ -1400,16 +1400,13 @@
   },
   "src/state/queries/postgate/index.ts": {
     "typescript/no-explicit-any": {
-      "count": 2
+      "count": 1
     },
     "typescript/no-floating-promises": {
       "count": 1
     },
-    "typescript/no-unsafe-call": {
-      "count": 2
-    },
     "typescript/no-unsafe-member-access": {
-      "count": 3
+      "count": 1
     },
     "typescript/require-await": {
       "count": 2
@@ -1426,18 +1423,9 @@
     }
   },
   "src/state/queries/threadgate/index.ts": {
-    "typescript/no-explicit-any": {
-      "count": 1
-    },
     "typescript/no-floating-promises": {
       "count": 3
     },
-    "typescript/no-unsafe-call": {
-      "count": 2
-    },
-    "typescript/no-unsafe-member-access": {
-      "count": 2
-    },
     "typescript/require-await": {
       "count": 3
     }
diff --git a/src/components/dialogs/PostInteractionSettingsDialog.tsx b/src/components/dialogs/PostInteractionSettingsDialog.tsx
index 8a5c7101cc..63684f4831 100644
--- a/src/components/dialogs/PostInteractionSettingsDialog.tsx
+++ b/src/components/dialogs/PostInteractionSettingsDialog.tsx
@@ -1,10 +1,7 @@
 import {useCallback, useMemo, useState} from 'react'
 import {LayoutAnimation, Text as NestedText, View} from 'react-native'
-import {
-  type AppBskyFeedDefs,
-  type AppBskyFeedPostgate,
-  AtUri,
-} from '@atproto/api'
+import {type AppBskyFeedDefs} from '@atproto/api'
+import {AtUri} from '@atproto/syntax'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Plural, Trans} from '@lingui/react/macro'
@@ -36,7 +33,7 @@ import {
   PostThreadContextProvider,
   usePostThreadContext,
 } from '#/state/queries/usePostThread'
-import {useAgent, useSession} from '#/state/session'
+import {usePdsClient, useSession} from '#/state/session'
 import {UserAvatar} from '#/view/com/util/UserAvatar'
 import {atoms as a, useTheme, web} from '#/alf'
 import {Button, ButtonIcon, ButtonText} from '#/components/Button'
@@ -53,6 +50,7 @@ import * as Toast from '#/components/Toast'
 import {Text} from '#/components/Typography'
 import {useAnalytics} from '#/analytics'
 import {IS_IOS} from '#/env'
+import {type app} from '#/lexicons'
 
 export type PostInteractionSettingsFormProps = {
   canSave?: boolean
@@ -63,8 +61,8 @@ export type PostInteractionSettingsFormProps = {
   persist?: boolean
   onChangePersist?: (v: boolean) => void
 
-  postgate: AppBskyFeedPostgate.Record
-  onChangePostgate: (v: AppBskyFeedPostgate.Record) => void
+  postgate: app.bsky.feed.postgate.Main
+  onChangePostgate: (v: app.bsky.feed.postgate.Main) => void
 
   threadgateAllowUISettings: ThreadgateAllowUISetting[]
   onChangeThreadgateAllowUISettings: (v: ThreadgateAllowUISetting[]) => void
@@ -178,7 +176,7 @@ export function PostInteractionSettingsDialogControlledInner(
   const {mutateAsync: setThreadgateAllow} = useSetThreadgateAllowMutation()
 
   const [editedPostgate, setEditedPostgate] =
-    useState<AppBskyFeedPostgate.Record>()
+    useState<app.bsky.feed.postgate.Main>()
   const [editedAllowUISettings, setEditedAllowUISettings] =
     useState<ThreadgateAllowUISetting[]>()
 
@@ -697,7 +695,7 @@ export function usePrefetchPostInteractionSettings({
 }) {
   const ax = useAnalytics()
   const queryClient = useQueryClient()
-  const agent = useAgent()
+  const pdsClient = usePdsClient()
   const getPost = useGetPost()
 
   return useCallback(async () => {
@@ -706,7 +704,7 @@ export function usePrefetchPostInteractionSettings({
         queryClient.prefetchQuery({
           queryKey: createPostgateQueryKey(postUri),
           queryFn: () =>
-            getPostgateRecord({agent, postUri}).then(res => res ?? null),
+            getPostgateRecord({pdsClient, postUri}).then(res => res ?? null),
           staleTime: STALE.SECONDS.THIRTY,
         }),
         queryClient.prefetchQuery({
@@ -723,5 +721,5 @@ export function usePrefetchPostInteractionSettings({
         safeMessage: e.message,
       })
     }
-  }, [ax, queryClient, agent, postUri, rootPostUri, getPost])
+  }, [ax, queryClient, pdsClient, postUri, rootPostUri, getPost])
 }
diff --git a/src/lib/api/index.ts b/src/lib/api/index.ts
index 9f81abb77a..aee481669e 100644
--- a/src/lib/api/index.ts
+++ b/src/lib/api/index.ts
@@ -16,6 +16,7 @@ import {
 } from '@atproto/api'
 import {TID} from '@atproto/common-web'
 import {type Client} from '@atproto/lex'
+import {toDatetimeString} from '@atproto/syntax'
 import {RichText} from '@bsky.app/sdk/richtext'
 import {t} from '@lingui/core/macro'
 import {type QueryClient} from '@tanstack/react-query'
@@ -145,7 +146,7 @@ export async function post(
         collection: 'app.bsky.feed.threadgate',
         rkey: rkey,
         value: createThreadgateRecord({
-          createdAt: now.toISOString(),
+          createdAt: toDatetimeString(now),
           post: uri,
           allow: threadgateAllowUISettingToAllowRecordValue(thread.threadgate),
         }),
diff --git a/src/lib/xrpc-error.ts b/src/lib/xrpc-error.ts
index 25f9a1277e..855aaf803e 100644
--- a/src/lib/xrpc-error.ts
+++ b/src/lib/xrpc-error.ts
@@ -7,6 +7,8 @@ import {
   XrpcResponseError,
 } from '@atproto/lex'
 
+import {com} from '#/lexicons'
+
 /**
  * Same nsid means `e` was thrown for this method schema, so `e` can be
  * treated as an `XrpcResponseError<M>` - which is what lets the SDK's
@@ -57,3 +59,21 @@ export function matchXrpcError<M extends Procedure | Query>(
   }
   return undefined
 }
+
+/**
+ * Whether `e` is a `com.atproto.repo.getRecord` failure meaning the record is
+ * absent, so the caller can treat the read as "no record" instead of an error.
+ *
+ * `getRecord` declares `RecordNotFound` and both the PDS and the appview throw
+ * it by that name, so the declared code is the primary check. The message
+ * substring is kept as a fallback because that is what the pre-SDK call sites
+ * matched on, and an older PDS in the network may still answer with an
+ * unnamed error whose message carries the text. Dropping it would silently
+ * turn a previously-handled absence into a thrown error.
+ */
+export function isRecordNotFoundError(e: unknown): boolean {
+  if (matchXrpcError(e, com.atproto.repo.getRecord) === 'RecordNotFound') {
+    return true
+  }
+  return e instanceof Error && e.message.includes('Could not locate record:')
+}
diff --git a/src/screens/ModerationInteractionSettings/index.tsx b/src/screens/ModerationInteractionSettings/index.tsx
index 261e6b55ae..12d952c872 100644
--- a/src/screens/ModerationInteractionSettings/index.tsx
+++ b/src/screens/ModerationInteractionSettings/index.tsx
@@ -1,5 +1,6 @@
 import {useCallback, useMemo, useState} from 'react'
 import {View} from 'react-native'
+import {type AtUriString, toDatetimeString} from '@atproto/syntax'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
@@ -22,6 +23,7 @@ import {PostInteractionSettingsForm} from '#/components/dialogs/PostInteractionS
 import * as Layout from '#/components/Layout'
 import {Loader} from '#/components/Loader'
 import * as Toast from '#/components/Toast'
+import {type app} from '#/lexicons'
 
 export function Screen() {
   const gutters = useGutters(['base'])
@@ -68,16 +70,21 @@ function Inner({preferences}: {preferences: UsePreferencesQueryResponse}) {
   const allowUI = useMemo(() => {
     return threadgateRecordToAllowUISetting({
       $type: 'app.bsky.feed.threadgate',
-      post: '',
-      createdAt: new Date().toString(),
-      allow: preferences.postInteractionSettings.threadgateAllowRules,
+      post: '' as AtUriString,
+      createdAt: toDatetimeString(new Date()),
+      /*
+       * Preferences are still typed against the legacy client, so the stored
+       * rules arrive unbranded. Wave B migrates `getPreferences`.
+       */
+      allow: preferences.postInteractionSettings
+        .threadgateAllowRules as app.bsky.feed.threadgate.Main['allow'],
     })
   }, [preferences.postInteractionSettings.threadgateAllowRules])
   const postgate = useMemo(() => {
     return createPostgateRecord({
       post: '',
-      embeddingRules:
-        preferences.postInteractionSettings.postgateEmbeddingRules,
+      embeddingRules: preferences.postInteractionSettings
+        .postgateEmbeddingRules as app.bsky.feed.postgate.Main['embeddingRules'],
     })
   }, [preferences.postInteractionSettings.postgateEmbeddingRules])
 
diff --git a/src/state/queries/postgate/index.ts b/src/state/queries/postgate/index.ts
index 82a52730bc..e213fa73d5 100644
--- a/src/state/queries/postgate/index.ts
+++ b/src/state/queries/postgate/index.ts
@@ -3,13 +3,13 @@ import {
   AppBskyEmbedRecord,
   AppBskyEmbedRecordWithMedia,
   type AppBskyFeedDefs,
-  AppBskyFeedPostgate,
-  type AtpAgent,
-  AtUri,
 } from '@atproto/api'
+import {type Client} from '@atproto/lex'
+import {AtUri, type HandleString} from '@atproto/syntax'
 import {useMutation, useQuery, useQueryClient} from '@tanstack/react-query'
 
 import {networkRetry, retry} from '#/lib/async/retry'
+import {isRecordNotFoundError} from '#/lib/xrpc-error'
 import {logger} from '#/logger'
 import {updatePostShadow} from '#/state/cache/post-shadow'
 import {STALE} from '#/state/queries'
@@ -20,28 +20,28 @@ import {
   mergePostgateRecords,
   POSTGATE_COLLECTION,
 } from '#/state/queries/postgate/util'
-import {useAgent} from '#/state/session'
+import {usePdsClient} from '#/state/session'
+import {app, com} from '#/lexicons'
 import * as bsky from '#/types/bsky'
 
 export async function getPostgateRecord({
-  agent,
+  pdsClient,
   postUri,
 }: {
-  agent: AtpAgent
+  pdsClient: Client
   postUri: string
-}): Promise<AppBskyFeedPostgate.Record | undefined> {
+}): Promise<app.bsky.feed.postgate.Main | undefined> {
   const urip = new AtUri(postUri)
 
   if (!urip.host.startsWith('did:')) {
-    const res = await agent.resolveHandle({
-      handle: urip.host,
+    const {did} = await pdsClient.call(com.atproto.identity.resolveHandle, {
+      handle: urip.host as HandleString,
     })
-    // @ts-expect-error TODO new-sdk-migration
-    urip.host = res.data.did
+    urip.host = did
   }
 
   try {
-    const {data} = await retry(
+    const data = await retry(
       2,
       e => {
         /*
@@ -49,34 +49,31 @@ export async function getPostgateRecord({
          * throwing an error. NB: This will also catch reference errors, such as
          * a typo in the URI.
          */
-        if (e.message.includes(`Could not locate record:`)) {
+        if (isRecordNotFoundError(e)) {
           return false
         }
         return true
       },
       () =>
-        agent.api.com.atproto.repo.getRecord({
+        pdsClient.call(com.atproto.repo.getRecord, {
           repo: urip.host,
           collection: POSTGATE_COLLECTION,
-          rkey: urip.rkey,
+          rkey: urip.rkeySafe,
         }),
     )
 
-    if (
-      data.value &&
-      bsky.validate(data.value, AppBskyFeedPostgate.validateRecord)
-    ) {
+    if (data.value && bsky.matches(app.bsky.feed.postgate, data.value)) {
       return data.value
     } else {
       return undefined
     }
-  } catch (e: any) {
+  } catch (e) {
     /*
      * If the record doesn't exist, we want to return null instead of
      * throwing an error. NB: This will also catch reference errors, such as
      * a typo in the URI.
      */
-    if (e.message.includes(`Could not locate record:`)) {
+    if (isRecordNotFoundError(e)) {
       return undefined
     } else {
       throw e
@@ -85,21 +82,21 @@ export async function getPostgateRecord({
 }
 
 export async function writePostgateRecord({
-  agent,
+  pdsClient,
   postUri,
   postgate,
 }: {
-  agent: AtpAgent
+  pdsClient: Client
   postUri: string
-  postgate: AppBskyFeedPostgate.Record
+  postgate: app.bsky.feed.postgate.Main
 }) {
   const postUrip = new AtUri(postUri)
 
   await networkRetry(2, () =>
-    agent.api.com.atproto.repo.putRecord({
-      repo: agent.session!.did,
+    pdsClient.call(com.atproto.repo.putRecord, {
+      repo: pdsClient.assertDid,
       collection: POSTGATE_COLLECTION,
-      rkey: postUrip.rkey,
+      rkey: postUrip.rkeySafe,
       record: postgate,
     }),
   )
@@ -107,24 +104,24 @@ export async function writePostgateRecord({
 
 export async function upsertPostgate(
   {
-    agent,
+    pdsClient,
     postUri,
   }: {
-    agent: AtpAgent
+    pdsClient: Client
     postUri: string
   },
   callback: (
-    postgate: AppBskyFeedPostgate.Record | undefined,
-  ) => Promise<AppBskyFeedPostgate.Record | undefined>,
+    postgate: app.bsky.feed.postgate.Main | undefined,
+  ) => Promise<app.bsky.feed.postgate.Main | undefined>,
 ) {
   const prev = await getPostgateRecord({
-    agent,
+    pdsClient,
     postUri,
   })
   const next = await callback(prev)
   if (!next) return
   await writePostgateRecord({
-    agent,
+    pdsClient,
     postUri,
     postgate: next,
   })
@@ -135,18 +132,20 @@ export const createPostgateQueryKey = (postUri: string) => [
   postUri,
 ]
 export function usePostgateQuery({postUri}: {postUri: string}) {
-  const agent = useAgent()
+  const pdsClient = usePdsClient()
   return useQuery({
     staleTime: STALE.SECONDS.THIRTY,
     queryKey: createPostgateQueryKey(postUri),
     async queryFn() {
-      return await getPostgateRecord({agent, postUri}).then(res => res ?? null)
+      return await getPostgateRecord({pdsClient, postUri}).then(
+        res => res ?? null,
+      )
     },
   })
 }
 
 export function useWritePostgateMutation() {
-  const agent = useAgent()
+  const pdsClient = usePdsClient()
   const queryClient = useQueryClient()
   return useMutation({
     mutationFn: async ({
@@ -154,10 +153,10 @@ export function useWritePostgateMutation() {
       postgate,
     }: {
       postUri: string
-      postgate: AppBskyFeedPostgate.Record
+      postgate: app.bsky.feed.postgate.Main
     }) => {
       return writePostgateRecord({
-        agent,
+        pdsClient,
         postUri,
         postgate,
       })
@@ -171,7 +170,7 @@ export function useWritePostgateMutation() {
 }
 
 export function useToggleQuoteDetachmentMutation() {
-  const agent = useAgent()
+  const pdsClient = usePdsClient()
   const queryClient = useQueryClient()
   const getPosts = useGetPosts()
   const prevEmbed = useRef<AppBskyFeedDefs.PostView['embed']>(undefined)
@@ -200,7 +199,7 @@ export function useToggleQuoteDetachmentMutation() {
         })
       }
 
-      await upsertPostgate({agent, postUri: quoteUri}, async prev => {
+      await upsertPostgate({pdsClient, postUri: quoteUri}, async prev => {
         if (prev) {
           if (action === 'detach') {
             return mergePostgateRecords(prev, {
@@ -264,7 +263,7 @@ export function useToggleQuoteDetachmentMutation() {
 }
 
 export function useToggleQuotepostEnabledMutation() {
-  const agent = useAgent()
+  const pdsClient = usePdsClient()
 
   return useMutation({
     mutationFn: async ({
@@ -274,7 +273,7 @@ export function useToggleQuotepostEnabledMutation() {
       postUri: string
       action: 'enable' | 'disable'
     }) => {
-      await upsertPostgate({agent, postUri: postUri}, async prev => {
+      await upsertPostgate({pdsClient, postUri: postUri}, async prev => {
         if (prev) {
           if (action === 'disable') {
             return mergePostgateRecords(prev, {
diff --git a/src/state/queries/postgate/util.ts b/src/state/queries/postgate/util.ts
index 0952a1ad09..51c84419d0 100644
--- a/src/state/queries/postgate/util.ts
+++ b/src/state/queries/postgate/util.ts
@@ -3,29 +3,43 @@ import {
   AppBskyEmbedRecord,
   AppBskyEmbedRecordWithMedia,
   type AppBskyFeedDefs,
-  type AppBskyFeedPostgate,
   AtUri,
 } from '@atproto/api'
+import {type AtUriString, toDatetimeString} from '@atproto/syntax'
+
+import {type app} from '#/lexicons'
 
 export const POSTGATE_COLLECTION = 'app.bsky.feed.postgate'
 
+/**
+ * Create a new {@link app.bsky.feed.postgate.Main}. URIs are accepted as plain
+ * strings (callers hold raw AT-URIs, often from legacy-typed views) and
+ * asserted to the branded `AtUriString` here.
+ */
 export function createPostgateRecord(
-  postgate: Partial<AppBskyFeedPostgate.Record> & {
-    post: AppBskyFeedPostgate.Record['post']
+  postgate: Omit<
+    Partial<app.bsky.feed.postgate.Main>,
+    'post' | 'detachedEmbeddingUris'
+  > & {
+    post: string
+    detachedEmbeddingUris?: string[]
   },
-): AppBskyFeedPostgate.Record {
+): app.bsky.feed.postgate.Main {
   return {
     $type: POSTGATE_COLLECTION,
-    createdAt: new Date().toISOString(),
-    post: postgate.post,
-    detachedEmbeddingUris: postgate.detachedEmbeddingUris || [],
+    createdAt: toDatetimeString(new Date()),
+    post: postgate.post as AtUriString,
+    detachedEmbeddingUris: (postgate.detachedEmbeddingUris ||
+      []) as AtUriString[],
     embeddingRules: postgate.embeddingRules || [],
   }
 }
 
 export function mergePostgateRecords(
-  prev: AppBskyFeedPostgate.Record,
-  next: Partial<AppBskyFeedPostgate.Record>,
+  prev: app.bsky.feed.postgate.Main,
+  next: Omit<Partial<app.bsky.feed.postgate.Main>, 'detachedEmbeddingUris'> & {
+    detachedEmbeddingUris?: string[]
+  },
 ) {
   const detachedEmbeddingUris = Array.from(
     new Set([
@@ -199,5 +213,5 @@ export function getMaybeDetachedQuoteEmbed({
 }
 
 export const embeddingRules = {
-  disableRule: {$type: 'app.bsky.feed.postgate#disableRule'},
+  disableRule: {$type: 'app.bsky.feed.postgate#disableRule'} as const,
 }
diff --git a/src/state/queries/threadgate/index.ts b/src/state/queries/threadgate/index.ts
index 561275ca66..bd1a0f6b8c 100644
--- a/src/state/queries/threadgate/index.ts
+++ b/src/state/queries/threadgate/index.ts
@@ -1,12 +1,10 @@
-import {
-  type AppBskyFeedDefs,
-  AppBskyFeedThreadgate,
-  type AtpAgent,
-  AtUri,
-} from '@atproto/api'
+import {type AppBskyFeedDefs} from '@atproto/api'
+import {type Client} from '@atproto/lex'
+import {AtUri, type HandleString} from '@atproto/syntax'
 import {useMutation, useQuery, useQueryClient} from '@tanstack/react-query'
 
 import {networkRetry, retry} from '#/lib/async/retry'
+import {isRecordNotFoundError} from '#/lib/xrpc-error'
 import {STALE} from '#/state/queries'
 import {useGetPost} from '#/state/queries/post'
 import {type ThreadgateAllowUISetting} from '#/state/queries/threadgate/types'
@@ -17,8 +15,9 @@ import {
   threadgateViewToAllowUISetting,
 } from '#/state/queries/threadgate/util'
 import {useUpdatePostThreadThreadgateQueryCache} from '#/state/queries/usePostThread'
-import {useAgent} from '#/state/session'
+import {usePdsClient} from '#/state/session'
 import {useThreadgateHiddenReplyUrisAPI} from '#/state/threadgate-hidden-replies'
+import {app, com} from '#/lexicons'
 import * as bsky from '#/types/bsky'
 
 export * from '#/state/queries/threadgate/types'
@@ -40,9 +39,9 @@ export function useThreadgateRecordQuery({
   initialData,
 }: {
   postUri?: string
-  initialData?: AppBskyFeedThreadgate.Record
+  initialData?: app.bsky.feed.threadgate.Main
 } = {}) {
-  const agent = useAgent()
+  const pdsClient = usePdsClient()
 
   return useQuery({
     enabled: !!postUri,
@@ -51,7 +50,7 @@ export function useThreadgateRecordQuery({
     staleTime: STALE.MINUTES.ONE,
     async queryFn() {
       return getThreadgateRecord({
-        agent,
+        pdsClient,
         postUri: postUri!,
       })
     },
@@ -85,24 +84,23 @@ export function useThreadgateViewQuery({
 }
 
 export async function getThreadgateRecord({
-  agent,
+  pdsClient,
   postUri,
 }: {
-  agent: AtpAgent
+  pdsClient: Client
   postUri: string
-}): Promise<AppBskyFeedThreadgate.Record | null> {
+}): Promise<app.bsky.feed.threadgate.Main | null> {
   const urip = new AtUri(postUri)
 
   if (!urip.host.startsWith('did:')) {
-    const res = await agent.resolveHandle({
-      handle: urip.host,
+    const {did} = await pdsClient.call(com.atproto.identity.resolveHandle, {
+      handle: urip.host as HandleString,
     })
-    // @ts-expect-error TODO new-sdk-migration
-    urip.host = res.data.did
+    urip.host = did
   }
 
   try {
-    const {data} = await retry(
+    const data = await retry(
       2,
       e => {
         /*
@@ -110,34 +108,31 @@ export async function getThreadgateRecord({
          * throwing an error. NB: This will also catch reference errors, such as
          * a typo in the URI.
          */
-        if (e.message.includes(`Could not locate record:`)) {
+        if (isRecordNotFoundError(e)) {
           return false
         }
         return true
       },
       () =>
-        agent.api.com.atproto.repo.getRecord({
+        pdsClient.call(com.atproto.repo.getRecord, {
           repo: urip.host,
           collection: 'app.bsky.feed.threadgate',
-          rkey: urip.rkey,
+          rkey: urip.rkeySafe,
         }),
     )
 
-    if (
-      data.value &&
-      bsky.validate(data.value, AppBskyFeedThreadgate.validateRecord)
-    ) {
+    if (data.value && bsky.matches(app.bsky.feed.threadgate, data.value)) {
       return data.value
     } else {
       return null
     }
-  } catch (e: any) {
+  } catch (e) {
     /*
      * If the record doesn't exist, we want to return null instead of
      * throwing an error. NB: This will also catch reference errors, such as
      * a typo in the URI.
      */
-    if (e.message.includes(`Could not locate record:`)) {
+    if (isRecordNotFoundError(e)) {
       return null
     } else {
       throw e
@@ -146,13 +141,13 @@ export async function getThreadgateRecord({
 }
 
 export async function writeThreadgateRecord({
-  agent,
+  pdsClient,
   postUri,
   threadgate,
 }: {
-  agent: AtpAgent
+  pdsClient: Client
   postUri: string
-  threadgate: AppBskyFeedThreadgate.Record
+  threadgate: app.bsky.feed.threadgate.Main
 }) {
   const postUrip = new AtUri(postUri)
   const record = createThreadgateRecord({
@@ -162,10 +157,10 @@ export async function writeThreadgateRecord({
   })
 
   await networkRetry(2, () =>
-    agent.api.com.atproto.repo.putRecord({
-      repo: agent.session!.did,
+    pdsClient.call(com.atproto.repo.putRecord, {
+      repo: pdsClient.assertDid,
       collection: 'app.bsky.feed.threadgate',
-      rkey: postUrip.rkey,
+      rkey: postUrip.rkeySafe,
       record,
     }),
   )
@@ -173,25 +168,25 @@ export async function writeThreadgateRecord({
 
 export async function upsertThreadgate(
   {
-    agent,
+    pdsClient,
     postUri,
   }: {
-    agent: AtpAgent
+    pdsClient: Client
     postUri: string
   },
   callback: (
-    threadgate: AppBskyFeedThreadgate.Record | null,
-  ) => Promise<AppBskyFeedThreadgate.Record | undefined>,
+    threadgate: app.bsky.feed.threadgate.Main | null,
+  ) => Promise<app.bsky.feed.threadgate.Main | undefined>,
 ) {
   const prev = await getThreadgateRecord({
-    agent,
+    pdsClient,
     postUri,
   })
   const next = await callback(prev)
   if (!next) return
   validateThreadgateRecordOrThrow(next)
   await writeThreadgateRecord({
-    agent,
+    pdsClient,
     postUri,
     threadgate: next,
   })
@@ -201,15 +196,15 @@ export async function upsertThreadgate(
  * Update the allow list for a threadgate record.
  */
 export async function updateThreadgateAllow({
-  agent,
+  pdsClient,
   postUri,
   allow,
 }: {
-  agent: AtpAgent
+  pdsClient: Client
   postUri: string
   allow: ThreadgateAllowUISetting[]
 }) {
-  return upsertThreadgate({agent, postUri}, async prev => {
+  return upsertThreadgate({pdsClient, postUri}, async prev => {
     if (prev) {
       return {
         ...prev,
@@ -225,7 +220,7 @@ export async function updateThreadgateAllow({
 }
 
 export function useSetThreadgateAllowMutation() {
-  const agent = useAgent()
+  const pdsClient = usePdsClient()
   const queryClient = useQueryClient()
   const getPost = useGetPost()
   const updatePostThreadThreadgate = useUpdatePostThreadThreadgateQueryCache()
@@ -238,7 +233,7 @@ export function useSetThreadgateAllowMutation() {
       postUri: string
       allow: ThreadgateAllowUISetting[]
     }) => {
-      return upsertThreadgate({agent, postUri}, async prev => {
+      return upsertThreadgate({pdsClient, postUri}, async prev => {
         if (prev) {
           return {
             ...prev,
@@ -290,7 +285,7 @@ export function useSetThreadgateAllowMutation() {
 }
 
 export function useToggleReplyVisibilityMutation() {
-  const agent = useAgent()
+  const pdsClient = usePdsClient()
   const queryClient = useQueryClient()
   const hiddenReplies = useThreadgateHiddenReplyUrisAPI()
 
@@ -310,7 +305,7 @@ export function useToggleReplyVisibilityMutation() {
         hiddenReplies.removeHiddenReplyUri(replyUri)
       }
 
-      await upsertThreadgate({agent, postUri}, async prev => {
+      await upsertThreadgate({pdsClient, postUri}, async prev => {
         if (prev) {
           if (action === 'hide') {
             return mergeThreadgateRecords(prev, {
@@ -363,9 +358,9 @@ export class InvalidInteractionSettingsError extends Error {
 }
 
 export function validateThreadgateRecordOrThrow(
-  record: AppBskyFeedThreadgate.Record,
+  record: app.bsky.feed.threadgate.Main,
 ) {
-  const result = AppBskyFeedThreadgate.validateRecord(record)
+  const result = bsky.safeParse(app.bsky.feed.threadgate, record)
 
   if (result.success) {
     if ((result.value.hiddenReplies?.length ?? 0) > MAX_HIDDEN_REPLIES) {
diff --git a/src/state/queries/threadgate/util.ts b/src/state/queries/threadgate/util.ts
index 807afef76f..275611df1c 100644
--- a/src/state/queries/threadgate/util.ts
+++ b/src/state/queries/threadgate/util.ts
@@ -1,26 +1,34 @@
-import {type AppBskyFeedDefs, AppBskyFeedThreadgate} from '@atproto/api'
+import {type AppBskyFeedDefs} from '@atproto/api'
+import {type AtUriString, toDatetimeString} from '@atproto/syntax'
 
 import {type ThreadgateAllowUISetting} from '#/state/queries/threadgate/types'
+import {app} from '#/lexicons'
 import * as bsky from '#/types/bsky'
 
+/*
+ * Threadgate VIEWS stay on the legacy client types: they are read-only inputs
+ * from the appview, and branding them here would ripple through every post
+ * component. Only the threadgate RECORD is migrated, because it is written
+ * through `com.atproto.repo.putRecord`, whose body is typed as a lex `LexMap`.
+ */
 export function threadgateViewToAllowUISetting(
   threadgateView: AppBskyFeedDefs.ThreadgateView | undefined,
 ): ThreadgateAllowUISetting[] {
   // Validate the record for clarity, since backwards compat code is a little confusing
   const threadgate =
     threadgateView &&
-    bsky.validate(threadgateView.record, AppBskyFeedThreadgate.validateRecord)
+    bsky.matches(app.bsky.feed.threadgate, threadgateView.record)
       ? threadgateView.record
       : undefined
   return threadgateRecordToAllowUISetting(threadgate)
 }
 
 /**
- * Converts a full {@link AppBskyFeedThreadgate.Record} to a list of
+ * Converts a full {@link app.bsky.feed.threadgate.Main} to a list of
  * {@link ThreadgateAllowUISetting}, for use by app UI.
  */
 export function threadgateRecordToAllowUISetting(
-  threadgate: AppBskyFeedThreadgate.Record | undefined,
+  threadgate: app.bsky.feed.threadgate.Main | undefined,
 ): ThreadgateAllowUISetting[] {
   /*
    * If `threadgate` doesn't exist (default), or if `threadgate.allow === undefined`, it means
@@ -40,13 +48,13 @@ export function threadgateRecordToAllowUISetting(
   const settings: ThreadgateAllowUISetting[] = threadgate.allow
     .map(allow => {
       let setting: ThreadgateAllowUISetting | undefined
-      if (AppBskyFeedThreadgate.isMentionRule(allow)) {
+      if (bsky.isType(app.bsky.feed.threadgate.mentionRule, allow)) {
         setting = {type: 'mention'}
-      } else if (AppBskyFeedThreadgate.isFollowingRule(allow)) {
+      } else if (bsky.isType(app.bsky.feed.threadgate.followingRule, allow)) {
         setting = {type: 'following'}
-      } else if (AppBskyFeedThreadgate.isListRule(allow)) {
+      } else if (bsky.isType(app.bsky.feed.threadgate.listRule, allow)) {
         setting = {type: 'list', list: allow.list}
-      } else if (AppBskyFeedThreadgate.isFollowerRule(allow)) {
+      } else if (bsky.isType(app.bsky.feed.threadgate.followerRule, allow)) {
         setting = {type: 'followers'}
       }
       return setting
@@ -57,7 +65,7 @@ export function threadgateRecordToAllowUISetting(
 
 /**
  * Converts an array of {@link ThreadgateAllowUISetting} to the `allow` prop on
- * {@link AppBskyFeedThreadgate.Record}.
+ * {@link app.bsky.feed.threadgate.Main}.
  *
  * If the `allow` property on the record is undefined, we infer that to mean
  * that everyone can reply. If it's an empty array, we infer that to mean that
@@ -65,12 +73,12 @@ export function threadgateRecordToAllowUISetting(
  */
 export function threadgateAllowUISettingToAllowRecordValue(
   threadgate: ThreadgateAllowUISetting[],
-): AppBskyFeedThreadgate.Record['allow'] {
+): app.bsky.feed.threadgate.Main['allow'] {
   if (threadgate.find(v => v.type === 'everybody')) {
     return undefined
   }
 
-  let allow: Exclude<AppBskyFeedThreadgate.Record['allow'], undefined> = []
+  let allow: Exclude<app.bsky.feed.threadgate.Main['allow'], undefined> = []
 
   if (!threadgate.find(v => v.type === 'nobody')) {
     for (const rule of threadgate) {
@@ -83,7 +91,7 @@ export function threadgateAllowUISettingToAllowRecordValue(
       } else if (rule.type === 'list') {
         allow.push({
           $type: 'app.bsky.feed.threadgate#listRule',
-          list: rule.list,
+          list: rule.list as AtUriString,
         })
       }
     }
@@ -93,18 +101,20 @@ export function threadgateAllowUISettingToAllowRecordValue(
 }
 
 /**
- * Merges two {@link AppBskyFeedThreadgate.Record} objects, combining their
+ * Merges two {@link app.bsky.feed.threadgate.Main} objects, combining their
  * `allow` and `hiddenReplies` arrays and de-deduplicating them.
  *
  * Note: `allow` can be undefined here, be sure you don't accidentally set it
  * to an empty array. See other comments in this file.
  */
 export function mergeThreadgateRecords(
-  prev: AppBskyFeedThreadgate.Record,
-  next: Partial<AppBskyFeedThreadgate.Record>,
-): AppBskyFeedThreadgate.Record {
+  prev: app.bsky.feed.threadgate.Main,
+  next: Omit<Partial<app.bsky.feed.threadgate.Main>, 'hiddenReplies'> & {
+    hiddenReplies?: string[]
+  },
+): app.bsky.feed.threadgate.Main {
   // can be undefined if everyone can reply!
-  const allow: AppBskyFeedThreadgate.Record['allow'] | undefined =
+  const allow: app.bsky.feed.threadgate.Main['allow'] | undefined =
     prev.allow || next.allow
       ? [...(prev.allow || []), ...(next.allow || [])].filter(
           (v, i, a) => a.findIndex(t => t.$type === v.$type) === i,
@@ -112,7 +122,7 @@ export function mergeThreadgateRecords(
       : undefined
   const hiddenReplies = Array.from(
     new Set([...(prev.hiddenReplies || []), ...(next.hiddenReplies || [])]),
-  )
+  ) as AtUriString[]
 
   return createThreadgateRecord({
     post: prev.post,
@@ -122,21 +132,28 @@ export function mergeThreadgateRecords(
 }
 
 /**
- * Create a new {@link AppBskyFeedThreadgate.Record} object with the given
- * properties.
+ * Create a new {@link app.bsky.feed.threadgate.Main} object with the given
+ * properties. `post` is accepted as a plain string (callers hold raw AT-URIs)
+ * and asserted to the branded `AtUriString` here.
  */
 export function createThreadgateRecord(
-  threadgate: Partial<AppBskyFeedThreadgate.Record>,
-): AppBskyFeedThreadgate.Record {
+  threadgate: Omit<
+    Partial<app.bsky.feed.threadgate.Main>,
+    'post' | 'hiddenReplies'
+  > & {
+    post?: string
+    hiddenReplies?: string[]
+  },
+): app.bsky.feed.threadgate.Main {
   if (!threadgate.post) {
     throw new Error('Cannot create a threadgate record without a post URI')
   }
 
   return {
     $type: 'app.bsky.feed.threadgate',
-    post: threadgate.post,
-    createdAt: new Date().toISOString(),
+    post: threadgate.post as AtUriString,
+    createdAt: toDatetimeString(new Date()),
     allow: threadgate.allow, // can be undefined!
-    hiddenReplies: threadgate.hiddenReplies || [],
+    hiddenReplies: (threadgate.hiddenReplies || []) as AtUriString[],
   }
 }
diff --git a/src/view/com/composer/state/composer.ts b/src/view/com/composer/state/composer.ts
index 3d2aa45992..34e6b69508 100644
--- a/src/view/com/composer/state/composer.ts
+++ b/src/view/com/composer/state/composer.ts
@@ -1,9 +1,6 @@
 import {type ImagePickerAsset} from 'expo-image-picker'
-import {
-  type AppBskyActorDefs,
-  type AppBskyDraftDefs,
-  type AppBskyFeedPostgate,
-} from '@atproto/api'
+import {type AppBskyActorDefs, type AppBskyDraftDefs} from '@atproto/api'
+import {type AtUriString, toDatetimeString} from '@atproto/syntax'
 import {RichText} from '@bsky.app/sdk/richtext'
 import {nanoid} from 'nanoid/non-secure'
 
@@ -103,7 +100,7 @@ export type PostAction =
 
 export type ThreadDraft = {
   posts: PostDraft[]
-  postgate: AppBskyFeedPostgate.Record
+  postgate: app.bsky.feed.postgate.Main
   threadgate: ThreadgateAllowUISetting[]
 }
 
@@ -122,7 +119,7 @@ export type ComposerState = {
 }
 
 export type ComposerAction =
-  | {type: 'update_postgate'; postgate: AppBskyFeedPostgate.Record}
+  | {type: 'update_postgate'; postgate: app.bsky.feed.postgate.Main}
   | {type: 'update_threadgate'; threadgate: ThreadgateAllowUISetting[]}
   | {
       type: 'update_post'
@@ -319,13 +316,18 @@ export function composerReducer(
           posts,
           postgate: createPostgateRecord({
             post: '',
-            embeddingRules: postgateEmbeddingRules,
+            /*
+             * Draft records are still typed against the legacy client, so the
+             * stored rules arrive unbranded. Wave B migrates the draft types.
+             */
+            embeddingRules:
+              postgateEmbeddingRules as app.bsky.feed.postgate.Main['embeddingRules'],
           }),
           threadgate: threadgateRecordToAllowUISetting({
             $type: 'app.bsky.feed.threadgate',
-            post: '',
-            createdAt: new Date().toString(),
-            allow: threadgateAllow,
+            post: '' as AtUriString,
+            createdAt: toDatetimeString(new Date()),
+            allow: threadgateAllow as app.bsky.feed.threadgate.Main['allow'],
           }),
         },
       }
@@ -744,13 +746,19 @@ export function createComposerState({
       ],
       postgate: createPostgateRecord({
         post: '',
-        embeddingRules: initInteractionSettings?.postgateEmbeddingRules || [],
+        /*
+         * Preferences are still typed against the legacy client, so the stored
+         * rules arrive unbranded. Wave B migrates `getPreferences`.
+         */
+        embeddingRules: (initInteractionSettings?.postgateEmbeddingRules ||
+          []) as app.bsky.feed.postgate.Main['embeddingRules'],
       }),
       threadgate: threadgateRecordToAllowUISetting({
         $type: 'app.bsky.feed.threadgate',
-        post: '',
-        createdAt: new Date().toString(),
-        allow: initInteractionSettings?.threadgateAllowRules,
+        post: '' as AtUriString,
+        createdAt: toDatetimeString(new Date()),
+        allow:
+          initInteractionSettings?.threadgateAllowRules as app.bsky.feed.threadgate.Main['allow'],
       }),
     },
   }
diff --git a/src/view/com/composer/threadgate/ThreadgateBtn.tsx b/src/view/com/composer/threadgate/ThreadgateBtn.tsx
index 0f342b41c4..2602b9bc45 100644
--- a/src/view/com/composer/threadgate/ThreadgateBtn.tsx
+++ b/src/view/com/composer/threadgate/ThreadgateBtn.tsx
@@ -1,7 +1,7 @@
 import {useEffect, useMemo, useState} from 'react'
 import {Keyboard, type StyleProp, type ViewStyle} from 'react-native'
 import {type AnimatedStyle} from 'react-native-reanimated'
-import {type AppBskyFeedPostgate} from '@atproto/api'
+import {type AtUriString, toDatetimeString} from '@atproto/syntax'
 import {Trans, useLingui} from '@lingui/react/macro'
 import deepEqual from 'fast-deep-equal'
 
@@ -24,6 +24,7 @@ import {Group3_Stroke2_Corner0_Rounded as GroupIcon} from '#/components/icons/Gr
 import * as Tooltip from '#/components/Tooltip'
 import {useAnalytics} from '#/analytics'
 import {IS_NATIVE} from '#/env'
+import {type app} from '#/lexicons'
 import {useThreadgateNudged} from '#/storage/hooks/threadgate-nudged'
 
 export function ThreadgateBtn({
@@ -32,8 +33,8 @@ export function ThreadgateBtn({
   threadgateAllowUISettings,
   onChangeThreadgateAllowUISettings,
 }: {
-  postgate: AppBskyFeedPostgate.Record
-  onChangePostgate: (v: AppBskyFeedPostgate.Record) => void
+  postgate: app.bsky.feed.postgate.Main
+  onChangePostgate: (v: app.bsky.feed.postgate.Main) => void
 
   threadgateAllowUISettings: ThreadgateAllowUISetting[]
   onChangeThreadgateAllowUISettings: (v: ThreadgateAllowUISetting[]) => void
@@ -83,14 +84,20 @@ export function ThreadgateBtn({
 
   const prefThreadgateAllowUISettings = threadgateRecordToAllowUISetting({
     $type: 'app.bsky.feed.threadgate',
-    post: '',
-    createdAt: new Date().toISOString(),
-    allow: preferences?.postInteractionSettings.threadgateAllowRules,
+    post: '' as AtUriString,
+    createdAt: toDatetimeString(new Date()),
+    /*
+     * Preferences are still typed against the legacy client, so the stored
+     * rules arrive unbranded. Wave B migrates `getPreferences`.
+     */
+    allow: preferences?.postInteractionSettings
+      .threadgateAllowRules as app.bsky.feed.threadgate.Main['allow'],
   })
   const prefPostgate = createPostgateRecord({
     post: '',
-    embeddingRules:
-      preferences?.postInteractionSettings?.postgateEmbeddingRules || [],
+    embeddingRules: (preferences?.postInteractionSettings
+      ?.postgateEmbeddingRules ||
+      []) as app.bsky.feed.postgate.Main['embeddingRules'],
   })
 
   const isDirty = useMemo(() => {

From 75e4180800757c6ef9ab295477ffbdfce1ad9973 Mon Sep 17 00:00:00 2001
From: Samuel Newman <mozzius@protonmail.com>
Date: Thu, 13 Aug 2026 22:26:20 +0300
Subject: [PATCH 20/32] [SDK] Migrate the repo writes cluster (#11379)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
---
 .../contacts/screens/ViewMatches.tsx          |   9 +-
 .../lists/CreateListFromStarterPackDialog.tsx |  43 ++---
 src/features/liveNow/index.tsx                |  54 +++---
 src/lib/generate-starterpack.ts               |  94 +++++------
 src/screens/Onboarding/StepFinished/index.tsx |  14 +-
 .../StepSuggestedAccounts/index.tsx           |  10 +-
 .../StarterPackCard.tsx                       |  10 +-
 src/screens/Onboarding/util.ts                |  51 +++---
 src/screens/Profile/components/GermButton.tsx |  51 +++---
 src/screens/Settings/FindContactsSettings.tsx |   9 +-
 src/screens/StarterPack/StarterPackScreen.tsx |  10 +-
 src/state/birthdate.ts                        |   5 +-
 src/state/queries/activity-subscriptions.ts   |  36 ++--
 src/state/queries/list-memberships.ts         |  37 ++--
 src/state/queries/list.ts                     | 153 +++++++++--------
 .../queries/messages/actor-declaration.ts     |  22 ++-
 .../queries/messages/restrictChatSettings.ts  |  22 +--
 src/state/queries/profile.ts                  |  27 +--
 src/state/queries/starter-packs.ts            | 158 ++++++++++--------
 .../useVerificationCreateMutation.tsx         |  35 ++--
 .../useVerificationsRemoveMutation.tsx        |  25 +--
 src/state/session/create-account.ts           |  12 +-
 22 files changed, 488 insertions(+), 399 deletions(-)

diff --git a/src/components/contacts/screens/ViewMatches.tsx b/src/components/contacts/screens/ViewMatches.tsx
index dab3a79c6b..0ef4711919 100644
--- a/src/components/contacts/screens/ViewMatches.tsx
+++ b/src/components/contacts/screens/ViewMatches.tsx
@@ -21,7 +21,7 @@ import {
   optimisticRemoveMatch,
   useMatchesPassthroughQuery,
 } from '#/state/queries/find-contacts'
-import {useAgent, useAppviewClient, useSession} from '#/state/session'
+import {useAppviewClient, usePdsClient, useSession} from '#/state/session'
 import {List, type ListMethods} from '#/view/com/util/List'
 import {UserAvatar} from '#/view/com/util/UserAvatar'
 import {OnboardingPosition} from '#/screens/Onboarding/Layout'
@@ -91,7 +91,7 @@ export function ViewMatches({
   const gutter = useGutters([0, 'wide'])
   const moderationOpts = useModerationOpts()
   const queryClient = useQueryClient()
-  const agent = useAgent()
+  const pdsClient = usePdsClient()
   const client = useAppviewClient()
   const insets = useSafeAreaInsets()
   const listRef = useRef<ListMethods>(null)
@@ -127,7 +127,10 @@ export function ViewMatches({
         })
       }
 
-      const uris = await wait(500, bulkWriteFollows(agent, followableDids))
+      const uris = await wait(
+        500,
+        bulkWriteFollows(pdsClient, client, followableDids),
+      )
 
       for (const did of followableDids) {
         const uri = uris.get(did)
diff --git a/src/components/dialogs/lists/CreateListFromStarterPackDialog.tsx b/src/components/dialogs/lists/CreateListFromStarterPackDialog.tsx
index 3aabbec9ff..ceb07fb0e0 100644
--- a/src/components/dialogs/lists/CreateListFromStarterPackDialog.tsx
+++ b/src/components/dialogs/lists/CreateListFromStarterPackDialog.tsx
@@ -1,13 +1,14 @@
 import {View} from 'react-native'
-import {
-  type $Typed,
-  type AppBskyGraphDefs,
-  type AppBskyGraphListitem,
-  type AppBskyGraphStarterpack,
-  AtUri,
-  type ComAtprotoRepoApplyWrites,
-} from '@atproto/api'
+import {type AppBskyGraphDefs, type AppBskyGraphStarterpack} from '@atproto/api'
 import {TID} from '@atproto/common-web'
+import {type $Typed} from '@atproto/lex'
+import {
+  type AtIdentifierString,
+  AtUri,
+  type AtUriString,
+  type DidString,
+  toDatetimeString,
+} from '@atproto/syntax'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
@@ -20,7 +21,7 @@ import {wait} from '#/lib/async/wait'
 import {type NavigationProp} from '#/lib/routes/types'
 import {logger} from '#/logger'
 import {getAllListMembers} from '#/state/queries/list-members'
-import {useAgent, useAppviewClient, useSession} from '#/state/session'
+import {useAppviewClient, usePdsClient, useSession} from '#/state/session'
 import {atoms as a, platform, useTheme, web} from '#/alf'
 import {Admonition} from '#/components/Admonition'
 import {Button, ButtonText} from '#/components/Button'
@@ -29,6 +30,7 @@ import {Loader} from '#/components/Loader'
 import * as Toast from '#/components/Toast'
 import {Text} from '#/components/Typography'
 import {useAnalytics} from '#/analytics'
+import {app, com} from '#/lexicons'
 import {CreateOrEditListDialog} from './CreateOrEditListDialog'
 
 export function CreateListFromStarterPackDialog({
@@ -40,8 +42,8 @@ export function CreateListFromStarterPackDialog({
 }) {
   const {_} = useLingui()
   const t = useTheme()
-  const agent = useAgent()
   const appviewClient = useAppviewClient()
+  const pdsClient = usePdsClient()
   const ax = useAnalytics()
   const {currentAccount} = useSession()
   const navigation = useNavigation<NavigationProp>()
@@ -80,13 +82,14 @@ export function CreateListFromStarterPackDialog({
           )
 
           if (items.length > 0) {
-            const listitemWrites: $Typed<ComAtprotoRepoApplyWrites.Create>[] =
+            const listitemWrites: $Typed<com.atproto.repo.applyWrites.Create>[] =
               items.map(item => {
-                const listitemRecord: $Typed<AppBskyGraphListitem.Record> = {
+                const listitemRecord: $Typed<app.bsky.graph.listitem.Main> = {
                   $type: 'app.bsky.graph.listitem',
-                  subject: item.subject.did,
-                  list: listUri,
-                  createdAt: new Date().toISOString(),
+                  // the list view is still legacy-typed, so its strings are unbranded
+                  subject: item.subject.did as DidString,
+                  list: listUri as AtUriString,
+                  createdAt: toDatetimeString(new Date()),
                 }
                 return {
                   $type: 'com.atproto.repo.applyWrites#create',
@@ -98,8 +101,8 @@ export function CreateListFromStarterPackDialog({
 
             const chunks = chunk(listitemWrites, 50)
             for (const c of chunks) {
-              await agent.com.atproto.repo.applyWrites({
-                repo: currentAccount.did,
+              await pdsClient.call(com.atproto.repo.applyWrites, {
+                repo: currentAccount.did as AtIdentifierString,
                 writes: c,
               })
             }
@@ -107,10 +110,10 @@ export function CreateListFromStarterPackDialog({
             await until(
               5,
               1e3,
-              (res: {data: {items: unknown[]}}) => res.data.items.length > 0,
+              (res: {items: unknown[]}) => res.items.length > 0,
               () =>
-                agent.app.bsky.graph.getList({
-                  list: listUri,
+                appviewClient.call(app.bsky.graph.getList, {
+                  list: listUri as AtUriString,
                   limit: 1,
                 }),
             )
diff --git a/src/features/liveNow/index.tsx b/src/features/liveNow/index.tsx
index 23f33a5ffc..3b60b688bb 100644
--- a/src/features/liveNow/index.tsx
+++ b/src/features/liveNow/index.tsx
@@ -2,13 +2,12 @@ import {useMemo} from 'react'
 import {
   type $Typed,
   type AppBskyActorDefs,
-  type AppBskyActorStatus,
   AppBskyEmbedExternal,
-  AtUri,
-  ComAtprotoRepoPutRecord,
   moderateStatus,
 } from '@atproto/api'
 import {retry} from '@atproto/common-web'
+import {type l} from '@atproto/lex'
+import {type AtIdentifierString, AtUri, toDatetimeString} from '@atproto/syntax'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {useMutation, useQuery, useQueryClient} from '@tanstack/react-query'
@@ -17,18 +16,20 @@ import {isAfter, parseISO} from 'date-fns'
 import {uploadBlob} from '#/lib/api'
 import {imageToThumb} from '#/lib/api/resolve'
 import {getLinkMeta, type LinkMeta} from '#/lib/link-meta/link-meta'
+import {matchXrpcError} from '#/lib/xrpc-error'
 import {useAppConfig} from '#/state/appConfig'
 import {
   updateProfileShadow,
   useMaybeProfileShadow,
 } from '#/state/cache/profile-shadow'
 import {useModerationOpts} from '#/state/preferences/moderation-opts'
-import {useAgent, useSession} from '#/state/session'
+import {useAgent, usePdsClient, useSession} from '#/state/session'
 import {useTickEveryMinute} from '#/state/shell'
 import {useDialogContext} from '#/components/Dialog'
 import * as Toast from '#/components/Toast'
 import {useAnalytics} from '#/analytics'
 import {getLiveNowHost, getLiveServiceNames} from '#/features/liveNow/utils'
+import {app, com} from '#/lexicons'
 import type * as bsky from '#/types/bsky'
 
 export * from '#/features/liveNow/utils'
@@ -224,6 +225,7 @@ export function useUpsertLiveStatusMutation(
   const ax = useAnalytics()
   const {currentAccount} = useSession()
   const agent = useAgent()
+  const pdsClient = usePdsClient()
   const queryClient = useQueryClient()
   const control = useDialogContext()
   const {_} = useLingui()
@@ -232,10 +234,10 @@ export function useUpsertLiveStatusMutation(
     mutationFn: async () => {
       if (!currentAccount) throw new Error('Not logged in')
 
-      let embed: $Typed<AppBskyEmbedExternal.Main> | undefined
+      let embed: $Typed<app.bsky.embed.external.Main> | undefined
 
       if (linkMeta) {
-        let thumb
+        let thumb: l.BlobRef | undefined
 
         if (linkMeta.image) {
           try {
@@ -246,7 +248,11 @@ export function useUpsertLiveStatusMutation(
                 img.source.path,
                 img.source.mime,
               )
-              thumb = blob.data.blob
+              /*
+               * `uploadBlob` still returns the legacy `BlobRef` class
+               * instance; it moves to the client with the blob pipeline.
+               */
+              thumb = blob.data.blob as unknown as l.BlobRef
             }
           } catch (e: any) {
             ax.logger.error(`Failed to upload thumbnail for live status`, {
@@ -263,7 +269,8 @@ export function useUpsertLiveStatusMutation(
             $type: 'app.bsky.embed.external#external',
             title: linkMeta.title ?? '',
             description: linkMeta.description ?? '',
-            uri: linkMeta.url,
+            // `getLinkMeta` returns a plain url string
+            uri: linkMeta.url as l.UriString,
             thumb,
           },
         }
@@ -271,32 +278,41 @@ export function useUpsertLiveStatusMutation(
 
       const record = {
         $type: 'app.bsky.actor.status',
-        createdAt: createdAt ?? new Date().toISOString(),
+        createdAt: toDatetimeString(
+          createdAt ? new Date(createdAt) : new Date(),
+        ),
         status: 'app.bsky.actor.status#live',
         durationMinutes: duration,
         embed,
-      } satisfies AppBskyActorStatus.Record
+      } satisfies app.bsky.actor.status.Main
 
       const upsert = async () => {
-        const repo = currentAccount.did
+        // the session account is still legacy-typed, so its did is unbranded
+        const repo = currentAccount.did as AtIdentifierString
         const collection = 'app.bsky.actor.status'
 
-        const existing = await agent.com.atproto.repo
-          .getRecord({repo, collection, rkey: 'self'})
+        const existing = await pdsClient
+          .call(com.atproto.repo.getRecord, {repo, collection, rkey: 'self'})
           .catch(_e => undefined)
 
-        await agent.com.atproto.repo.putRecord({
+        /*
+         * Stays on the raw `putRecord`, not `pdsClient.put`: the lexicon lets
+         * `swapRecord` be null (meaning "must not already exist"), while the
+         * record-helper option type is `string | undefined`.
+         */
+        await pdsClient.call(com.atproto.repo.putRecord, {
           repo,
           collection,
           rkey: 'self',
           record,
-          swapRecord: existing?.data.cid || null,
+          swapRecord: existing?.cid || null,
         })
       }
 
       await retry(upsert, {
         maxRetries: 5,
-        retryable: e => e instanceof ComAtprotoRepoPutRecord.InvalidSwapError,
+        retryable: e =>
+          matchXrpcError(e, com.atproto.repo.putRecord) === 'InvalidSwap',
       })
 
       return {
@@ -353,7 +369,7 @@ export function useUpsertLiveStatusMutation(
 export function useRemoveLiveStatusMutation() {
   const ax = useAnalytics()
   const {currentAccount} = useSession()
-  const agent = useAgent()
+  const pdsClient = usePdsClient()
   const queryClient = useQueryClient()
   const control = useDialogContext()
   const {_} = useLingui()
@@ -362,8 +378,8 @@ export function useRemoveLiveStatusMutation() {
     mutationFn: async () => {
       if (!currentAccount) throw new Error('Not logged in')
 
-      await agent.app.bsky.actor.status.delete({
-        repo: currentAccount.did,
+      await pdsClient.delete(app.bsky.actor.status, {
+        repo: currentAccount.did as AtIdentifierString,
         rkey: 'self',
       })
     },
diff --git a/src/lib/generate-starterpack.ts b/src/lib/generate-starterpack.ts
index a53e95a6a3..a786fb47ad 100644
--- a/src/lib/generate-starterpack.ts
+++ b/src/lib/generate-starterpack.ts
@@ -1,11 +1,5 @@
-import {
-  type $Typed,
-  type AppBskyActorDefs,
-  type AppBskyGraphGetStarterPack,
-  type AtpAgent,
-  type ComAtprotoRepoApplyWrites,
-  type Facet,
-} from '@atproto/api'
+import {type Client} from '@atproto/lex'
+import {type AtUriString, toDatetimeString} from '@atproto/syntax'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {useMutation} from '@tanstack/react-query'
@@ -14,7 +8,8 @@ import {until} from '#/lib/async/until'
 import {sanitizeDisplayName} from '#/lib/strings/display-names'
 import {sanitizeHandle} from '#/lib/strings/handles'
 import {enforceLen} from '#/lib/strings/helpers'
-import {useAgent} from '#/state/session'
+import {useAppviewClient, usePdsClient} from '#/state/session'
+import {app, com} from '#/lexicons'
 import type * as bsky from '#/types/bsky'
 
 export const createStarterPackList = async ({
@@ -22,30 +17,27 @@ export const createStarterPackList = async ({
   description,
   descriptionFacets,
   profiles,
-  agent,
+  client,
 }: {
   name: string
   description?: string
-  descriptionFacets?: Facet[]
+  descriptionFacets?: app.bsky.richtext.facet.Main[]
   profiles: bsky.profile.AnyProfileView[]
-  agent: AtpAgent
+  client: Client
 }): Promise<{uri: string; cid: string}> => {
   if (profiles.length === 0) throw new Error('No profiles given')
 
-  const list = await agent.app.bsky.graph.list.create(
-    {repo: agent.session!.did},
-    {
-      name,
-      description,
-      descriptionFacets,
-      avatar: undefined,
-      createdAt: new Date().toISOString(),
-      purpose: 'app.bsky.graph.defs#referencelist',
-    },
-  )
+  const list = await client.create(app.bsky.graph.list, {
+    name,
+    description,
+    descriptionFacets,
+    avatar: undefined,
+    createdAt: toDatetimeString(new Date()),
+    purpose: 'app.bsky.graph.defs#referencelist',
+  })
   if (!list) throw new Error('List creation failed')
-  await agent.com.atproto.repo.applyWrites({
-    repo: agent.session!.did,
+  await client.call(com.atproto.repo.applyWrites, {
+    repo: client.assertDid,
     writes: profiles.map(p => createListItem({did: p.did, listUri: list.uri})),
   })
 
@@ -60,28 +52,27 @@ export function useGenerateStarterPackMutation({
   onError: (e: Error) => void
 }) {
   const {_} = useLingui()
-  const agent = useAgent()
+  const appviewClient = useAppviewClient()
+  const pdsClient = usePdsClient()
 
   return useMutation<{uri: string; cid: string}, Error, void>({
     mutationFn: async () => {
-      let profile: AppBskyActorDefs.ProfileViewDetailed | undefined
-      let profiles: AppBskyActorDefs.ProfileView[] | undefined
+      let profile: app.bsky.actor.defs.ProfileViewDetailed | undefined
+      let profiles: app.bsky.actor.defs.ProfileView[] | undefined
 
       await Promise.all([
         (async () => {
-          profile = (
-            await agent.app.bsky.actor.getProfile({
-              actor: agent.session!.did,
-            })
-          ).data
+          profile = await appviewClient.call(app.bsky.actor.getProfile, {
+            actor: pdsClient.assertDid,
+          })
         })(),
         (async () => {
           profiles = (
-            await agent.app.bsky.actor.searchActors({
+            await appviewClient.call(app.bsky.actor.searchActors, {
               q: encodeURIComponent('*'),
               limit: 49,
             })
-          ).data.actors.filter(p => p.viewer?.following)
+          ).actors.filter(p => p.viewer?.following)
         })(),
       ])
 
@@ -106,23 +97,19 @@ export function useGenerateStarterPackMutation({
       const list = await createStarterPackList({
         name: starterPackName,
         profiles,
-        agent,
+        client: pdsClient,
       })
 
-      return await agent.app.bsky.graph.starterpack.create(
-        {
-          repo: agent.session!.did,
-        },
-        {
-          name: starterPackName,
-          list: list.uri,
-          createdAt: new Date().toISOString(),
-        },
-      )
+      return await pdsClient.create(app.bsky.graph.starterpack, {
+        name: starterPackName,
+        // `create` returns a plain string uri
+        list: list.uri as AtUriString,
+        createdAt: toDatetimeString(new Date()),
+      })
     },
     onSuccess: async data => {
-      await whenAppViewReady(agent, data.uri, v => {
-        return typeof v?.data.starterPack.uri === 'string'
+      await whenAppViewReady(appviewClient, data.uri, v => {
+        return typeof v?.starterPack.uri === 'string'
       })
       onSuccess(data)
     },
@@ -138,7 +125,7 @@ function createListItem({
 }: {
   did: string
   listUri: string
-}): $Typed<ComAtprotoRepoApplyWrites.Create> {
+}): com.atproto.repo.applyWrites.$InputBody['writes'][number] {
   return {
     $type: 'com.atproto.repo.applyWrites#create',
     collection: 'app.bsky.graph.listitem',
@@ -152,14 +139,17 @@ function createListItem({
 }
 
 async function whenAppViewReady(
-  agent: AtpAgent,
+  client: Client,
   uri: string,
-  fn: (res?: AppBskyGraphGetStarterPack.Response) => boolean,
+  fn: (res?: app.bsky.graph.getStarterPack.$OutputBody) => boolean,
 ) {
   await until(
     5, // 5 tries
     1e3, // 1s delay between tries
     fn,
-    () => agent.app.bsky.graph.getStarterPack({starterPack: uri}),
+    () =>
+      client.call(app.bsky.graph.getStarterPack, {
+        starterPack: uri as AtUriString,
+      }),
   )
 }
diff --git a/src/screens/Onboarding/StepFinished/index.tsx b/src/screens/Onboarding/StepFinished/index.tsx
index 05f4ef8626..6f1dea3a4f 100644
--- a/src/screens/Onboarding/StepFinished/index.tsx
+++ b/src/screens/Onboarding/StepFinished/index.tsx
@@ -8,6 +8,7 @@ import {
   type Un$Typed,
 } from '@atproto/api'
 import {TID} from '@atproto/common-web'
+import {type AtUriString} from '@atproto/syntax'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
@@ -26,7 +27,7 @@ import {useSetHasCheckedForStarterPack} from '#/state/preferences/used-starter-p
 import {getAllListMembers} from '#/state/queries/list-members'
 import {preferencesQueryKey} from '#/state/queries/preferences'
 import {RQKEY as profileRQKey} from '#/state/queries/profile'
-import {useAgent, useAppviewClient} from '#/state/session'
+import {useAgent, useAppviewClient, usePdsClient} from '#/state/session'
 import {useOnboardingDispatch} from '#/state/shell'
 import {
   useActiveStarterPack,
@@ -59,6 +60,7 @@ export function StepFinished() {
   const queryClient = useQueryClient()
   const agent = useAgent()
   const appviewClient = useAppviewClient()
+  const pdsClient = usePdsClient()
   const requestNotificationsPermission = useRequestNotificationsPermission()
   const activeStarterPack = useActiveStarterPack()
   const setActiveStarterPack = useSetActiveStarterPack()
@@ -102,10 +104,15 @@ export function StepFinished() {
 
       await Promise.all([
         bulkWriteFollows(
-          agent,
+          pdsClient,
+          appviewClient,
           [BSKY_APP_ACCOUNT_DID, ...(listItems?.map(i => i.subject.did) ?? [])],
           starterPack
-            ? {uri: starterPack.uri, cid: starterPack.cid}
+            ? // the starter pack view is still legacy-typed
+              {
+                uri: starterPack.uri as AtUriString,
+                cid: starterPack.cid,
+              }
             : undefined,
         ),
         (async () => {
@@ -236,6 +243,7 @@ export function StepFinished() {
     queryClient,
     agent,
     appviewClient,
+    pdsClient,
     dispatch,
     onboardDispatch,
     activeStarterPack,
diff --git a/src/screens/Onboarding/StepSuggestedAccounts/index.tsx b/src/screens/Onboarding/StepSuggestedAccounts/index.tsx
index 514e892895..f43d06cdd4 100644
--- a/src/screens/Onboarding/StepSuggestedAccounts/index.tsx
+++ b/src/screens/Onboarding/StepSuggestedAccounts/index.tsx
@@ -14,7 +14,7 @@ import {logger} from '#/logger'
 import {updateProfileShadow} from '#/state/cache/profile-shadow'
 import {useLanguagePrefs} from '#/state/preferences'
 import {useModerationOpts} from '#/state/preferences/moderation-opts'
-import {useAgent, useSession} from '#/state/session'
+import {useAppviewClient, usePdsClient, useSession} from '#/state/session'
 import {
   OnboardingControls,
   OnboardingPosition,
@@ -42,7 +42,8 @@ export function StepSuggestedAccounts() {
   const t = useTheme()
   const {gtMobile} = useBreakpoints()
   const moderationOpts = useModerationOpts()
-  const agent = useAgent()
+  const appviewClient = useAppviewClient()
+  const pdsClient = usePdsClient()
   const {currentAccount} = useSession()
   const queryClient = useQueryClient()
 
@@ -119,7 +120,10 @@ export function StepSuggestedAccounts() {
           followingUri: 'pending',
         })
       }
-      const uris = await wait(1e3, bulkWriteFollows(agent, followableDids))
+      const uris = await wait(
+        1e3,
+        bulkWriteFollows(pdsClient, appviewClient, followableDids),
+      )
       for (const did of followableDids) {
         const uri = uris.get(did)
         updateProfileShadow(queryClient, did, {
diff --git a/src/screens/Onboarding/StepSuggestedStarterpacks/StarterPackCard.tsx b/src/screens/Onboarding/StepSuggestedStarterpacks/StarterPackCard.tsx
index fa296dfbd2..dc208917f5 100644
--- a/src/screens/Onboarding/StepSuggestedStarterpacks/StarterPackCard.tsx
+++ b/src/screens/Onboarding/StepSuggestedStarterpacks/StarterPackCard.tsx
@@ -1,6 +1,7 @@
 import {useState} from 'react'
 import {View} from 'react-native'
 import {type AppBskyGraphDefs, AppBskyGraphStarterpack} from '@atproto/api'
+import {type AtUriString} from '@atproto/syntax'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
@@ -11,7 +12,7 @@ import {isBlockedOrBlocking, isMuted} from '#/lib/moderation/blocked-and-muted'
 import {logger} from '#/logger'
 import {updateProfileShadow} from '#/state/cache/profile-shadow'
 import {getAllListMembers} from '#/state/queries/list-members'
-import {useAgent, useAppviewClient, useSession} from '#/state/session'
+import {useAppviewClient, usePdsClient, useSession} from '#/state/session'
 import {bulkWriteFollows} from '#/screens/Onboarding/util'
 import {AvatarStack} from '#/screens/Search/components/StarterPackCard'
 import {atoms as a, useBreakpoints, useTheme, web} from '#/alf'
@@ -35,8 +36,8 @@ export function StarterPackCard({
   const ax = useAnalytics()
   const {currentAccount} = useSession()
   const {gtPhone} = useBreakpoints()
-  const agent = useAgent()
   const appviewClient = useAppviewClient()
+  const pdsClient = usePdsClient()
   const queryClient = useQueryClient()
   const record = view.record
   const [isProcessing, setIsProcessing] = useState(false)
@@ -74,8 +75,9 @@ export function StarterPackCard({
 
     let followUris: Map<string, string>
     try {
-      followUris = await bulkWriteFollows(agent, dids, {
-        uri: view.uri,
+      followUris = await bulkWriteFollows(pdsClient, appviewClient, dids, {
+        // the starter pack view is still legacy-typed
+        uri: view.uri as AtUriString,
         cid: view.cid,
       })
     } catch (e) {
diff --git a/src/screens/Onboarding/util.ts b/src/screens/Onboarding/util.ts
index f4ecde3c5d..af8a40f092 100644
--- a/src/screens/Onboarding/util.ts
+++ b/src/screens/Onboarding/util.ts
@@ -1,37 +1,34 @@
-import {
-  type $Typed,
-  type AppBskyGraphFollow,
-  type AppBskyGraphGetFollows,
-  type AtpAgent,
-  type ComAtprotoRepoApplyWrites,
-  type ComAtprotoRepoStrongRef,
-} from '@atproto/api'
 import {TID} from '@atproto/common-web'
+import {type $Typed, type Client} from '@atproto/lex'
+import {
+  type AtIdentifierString,
+  type DidString,
+  toDatetimeString,
+} from '@atproto/syntax'
 import chunk from 'lodash.chunk'
 
 import {until} from '#/lib/async/until'
+import {app, com} from '#/lexicons'
 
 export async function bulkWriteFollows(
-  agent: AtpAgent,
+  pdsClient: Client,
+  appviewClient: Client,
   dids: string[],
-  via?: ComAtprotoRepoStrongRef.Main,
+  via?: com.atproto.repo.strongRef.Main,
 ) {
-  const session = agent.session
+  const did = pdsClient.assertDid
 
-  if (!session) {
-    throw new Error(`bulkWriteFollows failed: no session`)
-  }
-
-  const followRecords: $Typed<AppBskyGraphFollow.Record>[] = dids.map(did => {
+  const followRecords: $Typed<app.bsky.graph.follow.Main>[] = dids.map(did => {
     return {
       $type: 'app.bsky.graph.follow',
-      subject: did,
-      createdAt: new Date().toISOString(),
+      // callers hold plain dids read off legacy-typed views
+      subject: did as DidString,
+      createdAt: toDatetimeString(new Date()),
       via,
     }
   })
 
-  const followWrites: $Typed<ComAtprotoRepoApplyWrites.Create>[] =
+  const followWrites: $Typed<com.atproto.repo.applyWrites.Create>[] =
     followRecords.map(r => ({
       $type: 'com.atproto.repo.applyWrites#create',
       collection: 'app.bsky.graph.follow',
@@ -41,35 +38,35 @@ export async function bulkWriteFollows(
 
   const chunks = chunk(followWrites, 50)
   for (const chunk of chunks) {
-    await agent.com.atproto.repo.applyWrites({
-      repo: session.did,
+    await pdsClient.call(com.atproto.repo.applyWrites, {
+      repo: did,
       writes: chunk,
     })
   }
-  await whenFollowsIndexed(agent, session.did, res => !!res.data.follows.length)
+  await whenFollowsIndexed(appviewClient, did, res => !!res.follows.length)
 
   const followUris = new Map<string, string>()
   for (const r of followWrites) {
     followUris.set(
       r.value.subject as string,
-      `at://${session.did}/app.bsky.graph.follow/${r.rkey}`,
+      `at://${did}/app.bsky.graph.follow/${r.rkey}`,
     )
   }
   return followUris
 }
 
 async function whenFollowsIndexed(
-  agent: AtpAgent,
+  appviewClient: Client,
   actor: string,
-  fn: (res: AppBskyGraphGetFollows.Response) => boolean,
+  fn: (res: app.bsky.graph.getFollows.$OutputBody) => boolean,
 ) {
   await until(
     5, // 5 tries
     1e3, // 1s delay between tries
     fn,
     () =>
-      agent.app.bsky.graph.getFollows({
-        actor,
+      appviewClient.call(app.bsky.graph.getFollows, {
+        actor: actor as AtIdentifierString,
         limit: 1,
       }),
   )
diff --git a/src/screens/Profile/components/GermButton.tsx b/src/screens/Profile/components/GermButton.tsx
index 7e32d60bcc..5a69ec42c9 100644
--- a/src/screens/Profile/components/GermButton.tsx
+++ b/src/screens/Profile/components/GermButton.tsx
@@ -1,10 +1,8 @@
 import {Platform, View} from 'react-native'
 import {Image} from 'expo-image'
-import {
-  type AppBskyActorDefs,
-  type AppBskyActorGetProfile,
-  type AtpAgent,
-} from '@atproto/api'
+import {type AppBskyActorDefs} from '@atproto/api'
+import {type Client} from '@atproto/lex'
+import {type DidString} from '@atproto/syntax'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
@@ -13,7 +11,7 @@ import {useMutation, useQueryClient} from '@tanstack/react-query'
 import {until} from '#/lib/async/until'
 import {isNetworkError} from '#/lib/strings/errors'
 import {RQKEY} from '#/state/queries/profile'
-import {useAgent, useSession} from '#/state/session'
+import {useAppviewClient, usePdsClient, useSession} from '#/state/session'
 import {atoms as a, useTheme, web} from '#/alf'
 import {Button, ButtonIcon, ButtonText} from '#/components/Button'
 import * as Dialog from '#/components/Dialog'
@@ -24,6 +22,7 @@ import {Loader} from '#/components/Loader'
 import * as Toast from '#/components/Toast'
 import {Text} from '#/components/Typography'
 import {useAnalytics} from '#/analytics'
+import {app, com} from '#/lexicons'
 import type * as bsky from '#/types/bsky'
 
 export function GermButton({
@@ -119,25 +118,27 @@ function GermSelfButton({did}: {did: string}) {
   const ax = useAnalytics()
   const {_} = useLingui()
   const selfExplanationDialogControl = Dialog.useDialogControl()
-  const agent = useAgent()
+  const appviewClient = useAppviewClient()
+  const pdsClient = usePdsClient()
   const queryClient = useQueryClient()
 
   const {mutate: deleteDeclaration, isPending} = useMutation({
     mutationFn: async () => {
-      const previousRecord = await agent.com.germnetwork.declaration
-        .get({
-          repo: did,
+      const previousRecord = await pdsClient
+        // the profile view is still legacy-typed, so its did is unbranded
+        .get(com.germnetwork.declaration, {
+          repo: did as DidString,
           rkey: 'self',
         })
         .then(res => res.value)
         .catch(() => null)
 
-      await agent.com.germnetwork.declaration.delete({
-        repo: did,
+      await pdsClient.delete(com.germnetwork.declaration, {
+        repo: did as DidString,
         rkey: 'self',
       })
 
-      await whenAppViewReady(agent, did, res => !res.data.associated?.germ)
+      await whenAppViewReady(appviewClient, did, res => !res.associated?.germ)
 
       return previousRecord
     },
@@ -147,14 +148,15 @@ function GermSelfButton({did}: {did: string}) {
       async function undo() {
         if (!previousRecord) return
         try {
-          await agent.com.germnetwork.declaration.put(
-            {
-              repo: did,
-              rkey: 'self',
-            },
-            previousRecord,
+          await pdsClient.put(com.germnetwork.declaration, previousRecord, {
+            repo: did as DidString,
+            rkey: 'self',
+          })
+          await whenAppViewReady(
+            appviewClient,
+            did,
+            res => !!res.associated?.germ,
           )
-          await whenAppViewReady(agent, did, res => !!res.data.associated?.germ)
           await queryClient.refetchQueries({queryKey: RQKEY(did)})
 
           Toast.show(_(msg`Germ DM reconnected`))
@@ -323,14 +325,17 @@ function platform() {
 }
 
 async function whenAppViewReady(
-  agent: AtpAgent,
+  appviewClient: Client,
   actor: string,
-  fn: (res: AppBskyActorGetProfile.Response) => boolean,
+  fn: (res: app.bsky.actor.getProfile.$OutputBody) => boolean,
 ) {
   await until(
     5, // 5 tries
     1e3, // 1s delay between tries
     fn,
-    () => agent.app.bsky.actor.getProfile({actor}),
+    () =>
+      appviewClient.call(app.bsky.actor.getProfile, {
+        actor: actor as DidString,
+      }),
   )
 }
diff --git a/src/screens/Settings/FindContactsSettings.tsx b/src/screens/Settings/FindContactsSettings.tsx
index 6104fd12b7..c8ecdf4102 100644
--- a/src/screens/Settings/FindContactsSettings.tsx
+++ b/src/screens/Settings/FindContactsSettings.tsx
@@ -29,7 +29,7 @@ import {
   useContactsMatchesQuery,
   useContactsSyncStatusQuery,
 } from '#/state/queries/find-contacts'
-import {useAgent, useAppviewClient, useSession} from '#/state/session'
+import {useAppviewClient, usePdsClient, useSession} from '#/state/session'
 import {ErrorScreen} from '#/view/com/util/error/ErrorScreen'
 import {List} from '#/view/com/util/List'
 import {atoms as a, tokens, useGutters, useTheme} from '#/alf'
@@ -370,7 +370,7 @@ function StatusHeader({
 }) {
   const {_} = useLingui()
   const ax = useAnalytics()
-  const agent = useAgent()
+  const pdsClient = usePdsClient()
   const client = useAppviewClient()
   const queryClient = useQueryClient()
   const {currentAccount} = useSession()
@@ -406,7 +406,10 @@ function StatusHeader({
         followCount: didsToFollow.length,
       })
 
-      const uris = await wait(500, bulkWriteFollows(agent, didsToFollow))
+      const uris = await wait(
+        500,
+        bulkWriteFollows(pdsClient, client, didsToFollow),
+      )
 
       for (const did of didsToFollow) {
         const uri = uris.get(did)
diff --git a/src/screens/StarterPack/StarterPackScreen.tsx b/src/screens/StarterPack/StarterPackScreen.tsx
index e7674c00b4..c79e39c190 100644
--- a/src/screens/StarterPack/StarterPackScreen.tsx
+++ b/src/screens/StarterPack/StarterPackScreen.tsx
@@ -7,6 +7,7 @@ import {
   AtUri,
   type ModerationOpts,
 } from '@atproto/api'
+import {type AtUriString} from '@atproto/syntax'
 import {RichText as RichTextAPI} from '@bsky.app/sdk/richtext'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
@@ -37,7 +38,7 @@ import {
   useDeleteStarterPackMutation,
   useStarterPackQuery,
 } from '#/state/queries/starter-packs'
-import {useAgent, useAppviewClient, useSession} from '#/state/session'
+import {useAppviewClient, usePdsClient, useSession} from '#/state/session'
 import {useSetActiveStarterPack} from '#/state/shell/landing'
 import {useLoggedOutViewControls} from '#/state/shell/logged-out'
 import {
@@ -311,8 +312,8 @@ function Header({
   const {_} = useLingui()
   const t = useTheme()
   const {currentAccount, hasSession} = useSession()
-  const agent = useAgent()
   const appviewClient = useAppviewClient()
+  const pdsClient = usePdsClient()
   const queryClient = useQueryClient()
   const setActiveStarterPack = useSetActiveStarterPack()
   const {requestSwitchToAccount} = useLoggedOutViewControls()
@@ -379,8 +380,9 @@ function Header({
 
     let followUris: Map<string, string>
     try {
-      followUris = await bulkWriteFollows(agent, dids, {
-        uri: starterPack.uri,
+      followUris = await bulkWriteFollows(pdsClient, appviewClient, dids, {
+        // the starter pack view is still legacy-typed
+        uri: starterPack.uri as AtUriString,
         cid: starterPack.cid,
       })
     } catch (e) {
diff --git a/src/state/birthdate.ts b/src/state/birthdate.ts
index 183e51aa45..c405febe4e 100644
--- a/src/state/birthdate.ts
+++ b/src/state/birthdate.ts
@@ -3,7 +3,7 @@ import {useMutation, useQueryClient} from '@tanstack/react-query'
 
 import {restrictChatSettings} from '#/state/queries/messages/restrictChatSettings'
 import {preferencesQueryKey} from '#/state/queries/preferences'
-import {useAgent, useSession} from '#/state/session'
+import {useAgent, usePdsClient, useSession} from '#/state/session'
 import {usePatchAgeAssuranceOtherRequiredData} from '#/ageAssurance'
 import {isUnderAge} from '#/ageAssurance/util'
 import {IS_DEV} from '#/env'
@@ -55,6 +55,7 @@ export function useIsBirthdateUpdateAllowed() {
 export function useBirthdateMutation() {
   const queryClient = useQueryClient()
   const agent = useAgent()
+  const pdsClient = usePdsClient()
   const patchOtherRequiredData = usePatchAgeAssuranceOtherRequiredData()
 
   return useMutation<void, unknown, {birthDate: Date}>({
@@ -68,7 +69,7 @@ export function useBirthdateMutation() {
 
       if (isUnderAge(birthDate.toISOString(), 18)) {
         await restrictChatSettings({
-          agent,
+          client: pdsClient,
           restrictIncoming: true,
           restrictGroupInvites: true,
         })
diff --git a/src/state/queries/activity-subscriptions.ts b/src/state/queries/activity-subscriptions.ts
index e6dcbd8829..f77d1001cb 100644
--- a/src/state/queries/activity-subscriptions.ts
+++ b/src/state/queries/activity-subscriptions.ts
@@ -1,7 +1,5 @@
-import {
-  type AppBskyActorDefs,
-  type AppBskyNotificationDeclaration,
-} from '@atproto/api'
+import {type AppBskyActorDefs} from '@atproto/api'
+import {type AtIdentifierString} from '@atproto/syntax'
 import {t} from '@lingui/core/macro'
 import {
   type InfiniteData,
@@ -12,7 +10,8 @@ import {
   useQueryClient,
 } from '@tanstack/react-query'
 
-import {useAgent, useAppviewClient, useSession} from '#/state/session'
+import {isRecordNotFoundError} from '#/lib/xrpc-error'
+import {useAppviewClient, usePdsClient, useSession} from '#/state/session'
 import * as Toast from '#/components/Toast'
 import {app} from '#/lexicons'
 
@@ -36,27 +35,25 @@ export function useActivitySubscriptionsQuery() {
 }
 
 export function useNotificationDeclarationQuery() {
-  const agent = useAgent()
+  const client = usePdsClient()
   const {currentAccount} = useSession()
   return useQuery({
     queryKey: RQKEY_getNotificationDeclaration,
     queryFn: async () => {
       try {
-        const response = await agent.app.bsky.notification.declaration.get({
-          repo: currentAccount!.did,
+        const response = await client.get(app.bsky.notification.declaration, {
+          // the session account is still legacy-typed, so its did is unbranded
+          repo: currentAccount!.did as AtIdentifierString,
           rkey: 'self',
         })
         return response
       } catch (err) {
-        if (
-          err instanceof Error &&
-          err.message.startsWith('Could not locate record')
-        ) {
+        if (isRecordNotFoundError(err)) {
           return {
             value: {
               $type: 'app.bsky.notification.declaration',
               allowSubscriptions: 'followers',
-            } satisfies AppBskyNotificationDeclaration.Record,
+            } satisfies app.bsky.notification.declaration.Main,
           }
         } else {
           throw err
@@ -67,17 +64,18 @@ export function useNotificationDeclarationQuery() {
 }
 
 export function useNotificationDeclarationMutation() {
-  const agent = useAgent()
+  const client = usePdsClient()
   const {currentAccount} = useSession()
   const queryClient = useQueryClient()
   return useMutation({
-    mutationFn: async (record: AppBskyNotificationDeclaration.Record) => {
-      const response = await agent.app.bsky.notification.declaration.put(
+    mutationFn: async (record: app.bsky.notification.declaration.Main) => {
+      const response = await client.put(
+        app.bsky.notification.declaration,
+        record,
         {
-          repo: currentAccount!.did,
+          repo: currentAccount!.did as AtIdentifierString,
           rkey: 'self',
         },
-        record,
       )
       return response
     },
@@ -87,7 +85,7 @@ export function useNotificationDeclarationMutation() {
         (old?: {
           uri: string
           cid: string
-          value: AppBskyNotificationDeclaration.Record
+          value: app.bsky.notification.declaration.Main
         }) => {
           if (!old) return old
           return {
diff --git a/src/state/queries/list-memberships.ts b/src/state/queries/list-memberships.ts
index 75adcd5bb8..68a02fd051 100644
--- a/src/state/queries/list-memberships.ts
+++ b/src/state/queries/list-memberships.ts
@@ -1,8 +1,13 @@
 import {
   type AppBskyActorDefs,
   type AppBskyGraphGetStarterPacksWithMembership,
-  AtUri,
 } from '@atproto/api'
+import {
+  AtUri,
+  type AtUriString,
+  type DidString,
+  toDatetimeString,
+} from '@atproto/syntax'
 import {
   type InfiniteData,
   useMutation,
@@ -13,7 +18,8 @@ import {
   RQKEY as LIST_MEMBERS_RQKEY,
   RQKEY_ALL as LIST_MEMBERS_ALL_RQKEY,
 } from '#/state/queries/list-members'
-import {useAgent, useSession} from '#/state/session'
+import {usePdsClient, useSession} from '#/state/session'
+import {app} from '#/lexicons'
 import type * as bsky from '#/types/bsky'
 import {RQKEY_WITH_MEMBERSHIP as STARTER_PACKS_WITH_MEMBERSHIPS_RKEY} from './actor-starter-packs'
 
@@ -30,7 +36,7 @@ export function useListMembershipAddMutation({
   onError?: (error: Error) => void
 } = {}) {
   const {currentAccount} = useSession()
-  const agent = useAgent()
+  const pdsClient = usePdsClient()
   const queryClient = useQueryClient()
   return useMutation<
     {uri: string; cid: string},
@@ -41,14 +47,15 @@ export function useListMembershipAddMutation({
       if (!currentAccount) {
         throw new Error('Not signed in')
       }
-      const res = await agent.app.bsky.graph.listitem.create(
-        {repo: currentAccount.did},
-        {
-          subject: actorDid,
-          list: listUri,
-          createdAt: new Date().toISOString(),
-        },
-      )
+      /*
+       * The mutation's inputs are plain strings held by legacy-typed views, so
+       * they are asserted to their branded forms here.
+       */
+      const res = await pdsClient.create(app.bsky.graph.listitem, {
+        subject: actorDid as DidString,
+        list: listUri as AtUriString,
+        createdAt: toDatetimeString(new Date()),
+      })
       return res
     },
     onSuccess: (data, variables) => {
@@ -129,7 +136,7 @@ export function useListMembershipRemoveMutation({
   onError?: (error: Error) => void
 } = {}) {
   const {currentAccount} = useSession()
-  const agent = useAgent()
+  const pdsClient = usePdsClient()
   const queryClient = useQueryClient()
   return useMutation<
     void,
@@ -141,9 +148,9 @@ export function useListMembershipRemoveMutation({
         throw new Error('Not signed in')
       }
       const membershipUrip = new AtUri(membershipUri)
-      await agent.app.bsky.graph.listitem.delete({
-        repo: currentAccount.did,
-        rkey: membershipUrip.rkey,
+      await pdsClient.delete(app.bsky.graph.listitem, {
+        repo: currentAccount.did as DidString,
+        rkey: membershipUrip.rkeySafe,
       })
     },
     onSuccess: (data, variables) => {
diff --git a/src/state/queries/list.ts b/src/state/queries/list.ts
index b5deb087c3..ec551bc8e5 100644
--- a/src/state/queries/list.ts
+++ b/src/state/queries/list.ts
@@ -1,14 +1,11 @@
+import {type AppBskyGraphDefs} from '@atproto/api'
+import {type $Typed, type Client, type l} from '@atproto/lex'
 import {
-  type $Typed,
-  type AppBskyGraphDefs,
-  type AppBskyGraphGetList,
-  type AppBskyGraphList,
-  type AtpAgent,
+  type AtIdentifierString,
   AtUri,
-  type ComAtprotoRepoApplyWrites,
-  type Facet,
-  type Un$Typed,
-} from '@atproto/api'
+  type AtUriString,
+  toDatetimeString,
+} from '@atproto/syntax'
 import {useMutation, useQuery, useQueryClient} from '@tanstack/react-query'
 import chunk from 'lodash.chunk'
 
@@ -16,7 +13,13 @@ import {uploadBlob} from '#/lib/api'
 import {until} from '#/lib/async/until'
 import {type ImageMeta} from '#/state/gallery'
 import {STALE} from '#/state/queries'
-import {useAgent, useSession} from '#/state/session'
+import {
+  useAgent,
+  useAppviewClient,
+  usePdsClient,
+  useSession,
+} from '#/state/session'
+import {app, com} from '#/lexicons'
 import {FEED_INFO_RQKEY_ROOT} from './feed'
 import {invalidate as invalidateMyLists} from './my-lists'
 import {RQKEY as PROFILE_LISTS_RQKEY} from './profile-lists'
@@ -25,7 +28,7 @@ export const RQKEY_ROOT = 'list'
 export const RQKEY = (uri: string) => [RQKEY_ROOT, uri]
 
 export function useListQuery(uri?: string) {
-  const agent = useAgent()
+  const client = useAppviewClient()
   return useQuery<AppBskyGraphDefs.ListView, Error>({
     staleTime: STALE.MINUTES.ONE,
     queryKey: RQKEY(uri || ''),
@@ -33,11 +36,11 @@ export function useListQuery(uri?: string) {
       if (!uri) {
         throw new Error('URI not provided')
       }
-      const res = await agent.app.bsky.graph.getList({
-        list: uri,
+      const res = await client.call(app.bsky.graph.getList, {
+        list: uri as AtUriString,
         limit: 1,
       })
-      return res.data.list
+      return res.list
     },
     enabled: !!uri,
   })
@@ -47,13 +50,15 @@ export interface ListCreateMutateParams {
   purpose: string
   name: string
   description: string
-  descriptionFacets: Facet[] | undefined
+  descriptionFacets: app.bsky.richtext.facet.Main[] | undefined
   avatar: ImageMeta | null | undefined
 }
 export function useListCreateMutation() {
   const {currentAccount} = useSession()
   const queryClient = useQueryClient()
   const agent = useAgent()
+  const appviewClient = useAppviewClient()
+  const pdsClient = usePdsClient()
   return useMutation<{uri: string; cid: string}, Error, ListCreateMutateParams>(
     {
       async mutationFn({
@@ -72,33 +77,28 @@ export function useListCreateMutation() {
         ) {
           throw new Error('Invalid list purpose: must be curatelist or modlist')
         }
-        const record: Un$Typed<AppBskyGraphList.Record> = {
+        const record: Omit<app.bsky.graph.list.Main, '$type'> = {
           purpose,
           name,
           description,
           descriptionFacets,
           avatar: undefined,
-          createdAt: new Date().toISOString(),
+          createdAt: toDatetimeString(new Date()),
         }
         if (avatar) {
           const blobRes = await uploadBlob(agent, avatar.path, avatar.mime)
-          record.avatar = blobRes.data.blob
+          /*
+           * `uploadBlob` still returns the legacy `BlobRef` class instance;
+           * it moves to the client with the rest of the blob pipeline.
+           */
+          record.avatar = blobRes.data.blob as unknown as l.BlobRef
         }
-        const res = await agent.app.bsky.graph.list.create(
-          {
-            repo: currentAccount.did,
-          },
-          record,
-        )
+        const res = await pdsClient.create(app.bsky.graph.list, record)
 
         // wait for the appview to update
-        await whenAppViewReady(
-          agent,
-          res.uri,
-          (v: AppBskyGraphGetList.Response) => {
-            return typeof v?.data?.list.uri === 'string'
-          },
-        )
+        await whenAppViewReady(appviewClient, res.uri, v => {
+          return typeof v?.list.uri === 'string'
+        })
         return res
       },
       onSuccess() {
@@ -115,12 +115,14 @@ export interface ListMetadataMutateParams {
   uri: string
   name: string
   description: string
-  descriptionFacets: Facet[] | undefined
+  descriptionFacets: app.bsky.richtext.facet.Main[] | undefined
   avatar: ImageMeta | null | undefined
 }
 export function useListMetadataMutation() {
   const {currentAccount} = useSession()
   const agent = useAgent()
+  const appviewClient = useAppviewClient()
+  const pdsClient = usePdsClient()
   const queryClient = useQueryClient()
   return useMutation<
     {uri: string; cid: string},
@@ -137,7 +139,7 @@ export function useListMetadataMutation() {
       }
 
       // get the current record
-      const {value: record} = await agent.app.bsky.graph.list.get({
+      const {value: record} = await pdsClient.get(app.bsky.graph.list, {
         repo: currentAccount.did,
         rkey,
       })
@@ -148,30 +150,24 @@ export function useListMetadataMutation() {
       record.descriptionFacets = descriptionFacets
       if (avatar) {
         const blobRes = await uploadBlob(agent, avatar.path, avatar.mime)
-        record.avatar = blobRes.data.blob
+        record.avatar = blobRes.data.blob as unknown as l.BlobRef
       } else if (avatar === null) {
         record.avatar = undefined
       }
-      const res = (
-        await agent.com.atproto.repo.putRecord({
-          repo: currentAccount.did,
-          collection: 'app.bsky.graph.list',
-          rkey,
-          record,
-        })
-      ).data
+      const res = await pdsClient.call(com.atproto.repo.putRecord, {
+        repo: currentAccount.did,
+        collection: 'app.bsky.graph.list',
+        rkey,
+        record,
+      })
 
       // wait for the appview to update
-      await whenAppViewReady(
-        agent,
-        res.uri,
-        (v: AppBskyGraphGetList.Response) => {
-          const list = v.data.list
-          return (
-            list.name === record.name && list.description === record.description
-          )
-        },
-      )
+      await whenAppViewReady(appviewClient, res.uri, v => {
+        const list = v.list
+        return (
+          list.name === record.name && list.description === record.description
+        )
+      })
       return res
     },
     onSuccess(data, variables) {
@@ -191,7 +187,8 @@ export function useListMetadataMutation() {
 
 export function useListDeleteMutation() {
   const {currentAccount} = useSession()
-  const agent = useAgent()
+  const appviewClient = useAppviewClient()
+  const pdsClient = usePdsClient()
   const queryClient = useQueryClient()
   return useMutation<void, Error, {uri: string}>({
     mutationFn: async ({uri}) => {
@@ -199,11 +196,12 @@ export function useListDeleteMutation() {
         return
       }
       // fetch all the listitem records that belong to this list
-      let cursor
+      let cursor: string | undefined
       let listitemRecordUris: string[] = []
       for (let i = 0; i < 100; i++) {
-        const res = await agent.app.bsky.graph.listitem.list({
-          repo: currentAccount.did,
+        const res = await pdsClient.list(app.bsky.graph.listitem, {
+          // the session account is still legacy-typed, so its did is unbranded
+          repo: currentAccount.did as AtIdentifierString,
           cursor,
           limit: 100,
         })
@@ -221,12 +219,12 @@ export function useListDeleteMutation() {
       // batch delete the list and listitem records
       const createDel = (
         uri: string,
-      ): $Typed<ComAtprotoRepoApplyWrites.Delete> => {
+      ): $Typed<com.atproto.repo.applyWrites.Delete> => {
         const urip = new AtUri(uri)
         return {
           $type: 'com.atproto.repo.applyWrites#delete',
-          collection: urip.collection,
-          rkey: urip.rkey,
+          collection: urip.collectionSafe,
+          rkey: urip.rkeySafe,
         }
       }
       const writes = listitemRecordUris
@@ -235,15 +233,20 @@ export function useListDeleteMutation() {
 
       // apply in chunks
       for (const writesChunk of chunk(writes, 10)) {
-        await agent.com.atproto.repo.applyWrites({
-          repo: currentAccount.did,
+        await pdsClient.call(com.atproto.repo.applyWrites, {
+          repo: currentAccount.did as AtIdentifierString,
           writes: writesChunk,
         })
       }
 
-      // wait for the appview to update
-      await whenAppViewReady(agent, uri, (v: AppBskyGraphGetList.Response) => {
-        return !v?.success
+      /*
+       * Wait for the appview to update. Once the list is deleted `getList`
+       * throws, `until` catches it and passes `undefined` here, so an absent
+       * body signals a completed delete - the old check read `!v.success` on
+       * the legacy response envelope, which lex does not expose.
+       */
+      await whenAppViewReady(appviewClient, uri, v => {
+        return !v
       })
     },
     onSuccess() {
@@ -259,16 +262,18 @@ export function useListDeleteMutation() {
 export function useListMuteMutation() {
   const queryClient = useQueryClient()
   const agent = useAgent()
+  const appviewClient = useAppviewClient()
   return useMutation<void, Error, {uri: string; mute: boolean}>({
     mutationFn: async ({uri, mute}) => {
+      // `muteModList`/`unmuteModList` are preference writes, migrated in wave B
       if (mute) {
         await agent.muteModList(uri)
       } else {
         await agent.unmuteModList(uri)
       }
 
-      await whenAppViewReady(agent, uri, (v: AppBskyGraphGetList.Response) => {
-        return Boolean(v?.data.list.viewer?.muted) === mute
+      await whenAppViewReady(appviewClient, uri, v => {
+        return Boolean(v?.list.viewer?.muted) === mute
       })
     },
     onSuccess(data, variables) {
@@ -282,18 +287,20 @@ export function useListMuteMutation() {
 export function useListBlockMutation() {
   const queryClient = useQueryClient()
   const agent = useAgent()
+  const appviewClient = useAppviewClient()
   return useMutation<void, Error, {uri: string; block: boolean}>({
     mutationFn: async ({uri, block}) => {
+      // `blockModList`/`unblockModList` write a block record, migrated in wave B
       if (block) {
         await agent.blockModList(uri)
       } else {
         await agent.unblockModList(uri)
       }
 
-      await whenAppViewReady(agent, uri, (v: AppBskyGraphGetList.Response) => {
+      await whenAppViewReady(appviewClient, uri, v => {
         return block
-          ? typeof v?.data.list.viewer?.blocked === 'string'
-          : !v?.data.list.viewer?.blocked
+          ? typeof v?.list.viewer?.blocked === 'string'
+          : !v?.list.viewer?.blocked
       })
     },
     onSuccess(data, variables) {
@@ -305,17 +312,17 @@ export function useListBlockMutation() {
 }
 
 async function whenAppViewReady(
-  agent: AtpAgent,
+  client: Client,
   uri: string,
-  fn: (res: AppBskyGraphGetList.Response) => boolean,
+  fn: (res: app.bsky.graph.getList.$OutputBody) => boolean,
 ) {
   await until(
     5, // 5 tries
     1e3, // 1s delay between tries
     fn,
     () =>
-      agent.app.bsky.graph.getList({
-        list: uri,
+      client.call(app.bsky.graph.getList, {
+        list: uri as AtUriString,
         limit: 1,
       }),
   )
diff --git a/src/state/queries/messages/actor-declaration.ts b/src/state/queries/messages/actor-declaration.ts
index f6cd2d51d5..17f36cbdd8 100644
--- a/src/state/queries/messages/actor-declaration.ts
+++ b/src/state/queries/messages/actor-declaration.ts
@@ -3,11 +3,13 @@ import {
   type AppBskyActorDefs,
   type ChatBskyActorDeclaration,
 } from '@atproto/api'
+import {type DidString} from '@atproto/syntax'
 import {useMutation, useQueryClient} from '@tanstack/react-query'
 
 import {logger} from '#/logger'
-import {useAgent, useSession} from '#/state/session'
+import {usePdsClient, useSession} from '#/state/session'
 import {resolveAllowGroupInvites} from '#/components/dms/util'
+import {com} from '#/lexicons'
 import {RQKEY as PROFILE_RKEY} from '../profile'
 
 export function useUpdateActorDeclaration({
@@ -19,7 +21,7 @@ export function useUpdateActorDeclaration({
 }) {
   const queryClient = useQueryClient()
   const {currentAccount} = useSession()
-  const agent = useAgent()
+  const pdsClient = usePdsClient()
 
   return useMutation({
     mutationFn: async (update: {
@@ -41,8 +43,9 @@ export function useUpdateActorDeclaration({
           update.allowGroupInvites ??
           current?.associated?.chat?.allowGroupInvites,
       })
-      const result = await agent.com.atproto.repo.putRecord({
-        repo: currentAccount.did,
+      const result = await pdsClient.call(com.atproto.repo.putRecord, {
+        // the session account is still legacy-typed, so its did is unbranded
+        repo: currentAccount.did as DidString,
         collection: 'chat.bsky.actor.declaration',
         rkey: 'self',
         record: {
@@ -101,13 +104,13 @@ export function useUpdateActorDeclaration({
 // for use in the settings screen for testing
 export function useDeleteActorDeclaration() {
   const {currentAccount} = useSession()
-  const agent = useAgent()
+  const pdsClient = usePdsClient()
 
   return useMutation({
     mutationFn: async () => {
       if (!currentAccount) throw new Error('Not signed in')
-      const result = await agent.api.com.atproto.repo.deleteRecord({
-        repo: currentAccount.did,
+      const result = await pdsClient.call(com.atproto.repo.deleteRecord, {
+        repo: currentAccount.did as DidString,
         collection: 'chat.bsky.actor.declaration',
         rkey: 'self',
       })
@@ -116,6 +119,11 @@ export function useDeleteActorDeclaration() {
   })
 }
 
+/*
+ * Still takes the legacy agent: its only caller is `getOtherRequiredData` in
+ * `#/ageAssurance/data`, which is blocked on `getPreferences` and so cannot
+ * hand over a lex client yet.
+ */
 export async function fetchActorDeclarationRecord({
   agent,
   did,
diff --git a/src/state/queries/messages/restrictChatSettings.ts b/src/state/queries/messages/restrictChatSettings.ts
index ad33385dc8..b47440bf6b 100644
--- a/src/state/queries/messages/restrictChatSettings.ts
+++ b/src/state/queries/messages/restrictChatSettings.ts
@@ -1,13 +1,12 @@
-import type AtpAgent from '@atproto/api'
-import {type ChatBskyActorDeclaration} from '@atproto/api'
+import {type Client} from '@atproto/lex'
 
 import {networkRetry} from '#/lib/async/retry'
 import {logger} from '#/logger'
 import {
-  getDidFromAgentSession,
   getOtherRequiredDataFromCache,
   setOtherRequiredDataActorDeclarationCache,
 } from '#/ageAssurance/data'
+import {chat} from '#/lexicons'
 
 /**
  * Updates the chat actor declaration record to restrict who can contact the
@@ -24,15 +23,15 @@ import {
  * back to the lexicon defaults when the cache is empty.
  */
 export async function restrictChatSettings({
-  agent,
+  client,
   restrictIncoming = false,
   restrictGroupInvites = false,
 }: {
-  agent: AtpAgent
+  client: Client
   restrictIncoming?: boolean
   restrictGroupInvites?: boolean
 }): Promise<void> {
-  const did = getDidFromAgentSession(agent)
+  const did = client.did
   if (!did) return
 
   const cached = getOtherRequiredDataFromCache({did})?.actorDeclaration
@@ -49,7 +48,7 @@ export async function restrictChatSettings({
     )
   }
 
-  const record: ChatBskyActorDeclaration.Main = {
+  const record: chat.bsky.actor.declaration.Main = {
     $type: 'chat.bsky.actor.declaration',
     allowIncoming: restrictIncoming
       ? 'none'
@@ -69,11 +68,14 @@ export async function restrictChatSettings({
 
   try {
     await networkRetry(3, () =>
-      agent.com.atproto.repo.putRecord({
+      /*
+       * A record helper, not a raw `com.atproto.repo.putRecord`: lex forces
+       * `service: null` on record helpers, so the write lands on the account's
+       * PDS even though the collection is `chat.bsky.*`.
+       */
+      client.put(chat.bsky.actor.declaration, record, {
         repo: did,
-        collection: 'chat.bsky.actor.declaration',
         rkey: 'self',
-        record,
       }),
     )
     // important, update local cache to avoid running this again
diff --git a/src/state/queries/profile.ts b/src/state/queries/profile.ts
index 23fd4340ac..dea8d35eea 100644
--- a/src/state/queries/profile.ts
+++ b/src/state/queries/profile.ts
@@ -10,6 +10,11 @@ import {
   type ComAtprotoRepoUploadBlob,
   type Un$Typed,
 } from '@atproto/api'
+import {
+  type AtIdentifierString,
+  type DidString,
+  toDatetimeString,
+} from '@atproto/syntax'
 import {
   type InfiniteData,
   keepPreviousData,
@@ -33,10 +38,11 @@ import {
   useUnstableProfileViewCache,
 } from '#/state/queries/unstable-profile-cache'
 import {useUpdateProfileVerificationCache} from '#/state/queries/verification/useUpdateProfileVerificationCache'
-import {useAgent, useSession} from '#/state/session'
+import {useAgent, usePdsClient, useSession} from '#/state/session'
 import * as userActionHistory from '#/state/userActionHistory'
 import {useAnalytics} from '#/analytics'
 import {type Metrics, toClout} from '#/analytics/metrics'
+import {app} from '#/lexicons'
 import type * as bsky from '#/types/bsky'
 import {
   ProgressGuideAction,
@@ -634,17 +640,18 @@ export function useProfileBlockMutationQueue(
 
 function useProfileBlockMutation() {
   const {currentAccount} = useSession()
-  const agent = useAgent()
+  const pdsClient = usePdsClient()
   const queryClient = useQueryClient()
   return useMutation<{uri: string; cid: string}, Error, {did: string}>({
     mutationFn: async ({did}) => {
       if (!currentAccount) {
         throw new Error('Not signed in')
       }
-      return await agent.app.bsky.graph.block.create(
-        {repo: currentAccount.did},
-        {subject: did, createdAt: new Date().toISOString()},
-      )
+      return await pdsClient.create(app.bsky.graph.block, {
+        // the profile view is still legacy-typed, so its did is unbranded
+        subject: did as DidString,
+        createdAt: toDatetimeString(new Date()),
+      })
     },
     onSuccess(_, {did}) {
       void queryClient.invalidateQueries({queryKey: RQKEY_MY_BLOCKED()})
@@ -655,16 +662,16 @@ function useProfileBlockMutation() {
 
 function useProfileUnblockMutation() {
   const {currentAccount} = useSession()
-  const agent = useAgent()
+  const pdsClient = usePdsClient()
   const queryClient = useQueryClient()
   return useMutation<void, Error, {did: string; blockUri: string}>({
     mutationFn: async ({blockUri}) => {
       if (!currentAccount) {
         throw new Error('Not signed in')
       }
-      const {rkey} = new AtUri(blockUri)
-      await agent.app.bsky.graph.block.delete({
-        repo: currentAccount.did,
+      const {rkeySafe: rkey} = new AtUri(blockUri)
+      await pdsClient.delete(app.bsky.graph.block, {
+        repo: currentAccount.did as AtIdentifierString,
         rkey,
       })
     },
diff --git a/src/state/queries/starter-packs.ts b/src/state/queries/starter-packs.ts
index 6a1aecef0e..0c781bcfea 100644
--- a/src/state/queries/starter-packs.ts
+++ b/src/state/queries/starter-packs.ts
@@ -1,11 +1,10 @@
 import {
   AppBskyFeedDefs,
   AppBskyGraphDefs,
-  type AppBskyGraphGetStarterPack,
   AppBskyGraphStarterpack,
-  type AtpAgent,
-  AtUri,
 } from '@atproto/api'
+import {type Client, type LexValue} from '@atproto/lex'
+import {AtUri, type AtUriString, toDatetimeString} from '@atproto/syntax'
 import {RichText} from '@bsky.app/sdk/richtext'
 import {
   type QueryClient,
@@ -25,8 +24,8 @@ import {
 import {invalidateActorStarterPacksQuery} from '#/state/queries/actor-starter-packs'
 import {STALE} from '#/state/queries/index'
 import {invalidateListMembersQuery} from '#/state/queries/list-members'
-import {useAgent, useAppviewClient} from '#/state/session'
-import {type app} from '#/lexicons'
+import {useAppviewClient, usePdsClient} from '#/state/session'
+import {app, com} from '#/lexicons'
 import * as bsky from '#/types/bsky'
 
 const RQKEY_ROOT = 'starter-pack'
@@ -56,7 +55,7 @@ export function useStarterPackQuery({
   did?: string
   rkey?: string
 }) {
-  const agent = useAgent()
+  const client = useAppviewClient()
 
   return useQuery<AppBskyGraphDefs.StarterPackView>({
     queryKey: RQKEY(uri ? {uri} : {did, rkey}),
@@ -67,10 +66,10 @@ export function useStarterPackQuery({
         uri = httpStarterPackUriToAtUri(uri) as string
       }
 
-      const res = await agent.app.bsky.graph.getStarterPack({
-        starterPack: uri,
+      const res = await client.call(app.bsky.graph.getStarterPack, {
+        starterPack: uri as AtUriString,
       })
-      return res.data.starterPack
+      return res.starterPack
     },
     enabled: Boolean(uri) || Boolean(did && rkey),
     staleTime: STALE.MINUTES.FIVE,
@@ -104,12 +103,12 @@ export function useCreateStarterPackMutation({
   onError: (e: Error) => void
 }) {
   const queryClient = useQueryClient()
-  const agent = useAgent()
   /*
    * Facet/mention resolution is an appview job - it resolves handles through
    * the appview, and the public fallback keeps it working when logged out.
    */
   const appviewClient = useAppviewClient()
+  const pdsClient = usePdsClient()
 
   return useMutation<
     {uri: string; cid: string},
@@ -130,30 +129,26 @@ export function useCreateStarterPackMutation({
         description,
         profiles,
         descriptionFacets,
-        agent,
+        client: pdsClient,
       })
 
-      return await agent.app.bsky.graph.starterpack.create(
-        {
-          repo: agent.assertDid,
-        },
-        {
-          name,
-          description,
-          descriptionFacets,
-          list: listRes?.uri,
-          feeds: feeds?.map(f => ({uri: f.uri})),
-          createdAt: new Date().toISOString(),
-        },
-      )
+      return await pdsClient.create(app.bsky.graph.starterpack, {
+        name,
+        description,
+        descriptionFacets,
+        // `createStarterPackList` returns a plain string uri
+        list: listRes?.uri as AtUriString,
+        feeds: feeds?.map(f => ({uri: f.uri as AtUriString})),
+        createdAt: toDatetimeString(new Date()),
+      })
     },
     onSuccess: async data => {
-      await whenAppViewReady(agent, data.uri, v => {
-        return typeof v?.data.starterPack.uri === 'string'
+      await whenAppViewReady(appviewClient, data.uri, v => {
+        return typeof v?.starterPack.uri === 'string'
       })
       await invalidateActorStarterPacksQuery({
         queryClient,
-        did: agent.session!.did,
+        did: pdsClient.assertDid,
       })
       onSuccess(data)
     },
@@ -171,8 +166,8 @@ export function useEditStarterPackMutation({
   onError: (error: Error) => void
 }) {
   const queryClient = useQueryClient()
-  const agent = useAgent()
   const appviewClient = useAppviewClient()
+  const pdsClient = usePdsClient()
 
   return useMutation<
     void,
@@ -197,25 +192,29 @@ export function useEditStarterPackMutation({
         descriptionFacets = rt.facets
       }
 
-      if (!AppBskyGraphStarterpack.isRecord(currentStarterPack.record)) {
+      if (!bsky.isType(app.bsky.graph.starterpack, currentStarterPack.record)) {
         throw new Error('Invalid starter pack')
       }
 
       const removedItems = currentListItems.filter(
         i =>
-          i.subject.did !== agent.session?.did &&
+          i.subject.did !== pdsClient.did &&
           !profiles.find(p => p.did === i.subject.did && p.did),
       )
       if (removedItems.length !== 0) {
         const chunks = chunk(removedItems, 50)
         for (const chunk of chunks) {
-          await agent.com.atproto.repo.applyWrites({
-            repo: agent.session!.did,
-            writes: chunk.map(i => ({
-              $type: 'com.atproto.repo.applyWrites#delete',
-              collection: 'app.bsky.graph.listitem',
-              rkey: new AtUri(i.uri).rkey,
-            })),
+          await pdsClient.call(com.atproto.repo.applyWrites, {
+            repo: pdsClient.assertDid,
+            writes: chunk.map(
+              (
+                i,
+              ): com.atproto.repo.applyWrites.$InputBody['writes'][number] => ({
+                $type: 'com.atproto.repo.applyWrites#delete',
+                collection: 'app.bsky.graph.listitem',
+                rkey: new AtUri(i.uri).rkeySafe,
+              }),
+            ),
           })
         }
       }
@@ -226,33 +225,44 @@ export function useEditStarterPackMutation({
       if (addedProfiles.length > 0) {
         const chunks = chunk(addedProfiles, 50)
         for (const chunk of chunks) {
-          await agent.com.atproto.repo.applyWrites({
-            repo: agent.session!.did,
-            writes: chunk.map(p => ({
-              $type: 'com.atproto.repo.applyWrites#create',
-              collection: 'app.bsky.graph.listitem',
-              value: {
-                $type: 'app.bsky.graph.listitem',
-                subject: p.did,
-                list: currentStarterPack.list?.uri,
-                createdAt: new Date().toISOString(),
-              },
-            })),
+          await pdsClient.call(com.atproto.repo.applyWrites, {
+            repo: pdsClient.assertDid,
+            writes: chunk.map(
+              (
+                p,
+              ): com.atproto.repo.applyWrites.$InputBody['writes'][number] => ({
+                $type: 'com.atproto.repo.applyWrites#create',
+                collection: 'app.bsky.graph.listitem',
+                value: {
+                  $type: 'app.bsky.graph.listitem',
+                  subject: p.did,
+                  list: currentStarterPack.list?.uri,
+                  createdAt: new Date().toISOString(),
+                },
+              }),
+            ),
           })
         }
       }
 
       const rkey = parseStarterPackUri(currentStarterPack.uri)!.rkey
-      await agent.com.atproto.repo.putRecord({
-        repo: agent.session!.did,
+      await pdsClient.call(com.atproto.repo.putRecord, {
+        repo: pdsClient.assertDid,
         collection: 'app.bsky.graph.starterpack',
         rkey,
         record: {
+          $type: 'app.bsky.graph.starterpack',
           name,
           description,
           descriptionFacets,
           list: currentStarterPack.list?.uri,
-          feeds,
+          /*
+           * Pre-existing quirk preserved verbatim: the edit path writes whole
+           * `GeneratorView`s where the lexicon declares `feedItem` refs. lex
+           * types the raw `putRecord` body as a `LexValue`, which the legacy
+           * view interface does not structurally satisfy, hence the cast.
+           */
+          feeds: feeds as unknown as LexValue,
           createdAt: currentStarterPack.record.createdAt,
           updatedAt: new Date().toISOString(),
         },
@@ -260,12 +270,12 @@ export function useEditStarterPackMutation({
     },
     onSuccess: async (_, {currentStarterPack}) => {
       const parsed = parseStarterPackUri(currentStarterPack.uri)
-      await whenAppViewReady(agent, currentStarterPack.uri, v => {
-        return currentStarterPack.cid !== v?.data.starterPack.cid
+      await whenAppViewReady(appviewClient, currentStarterPack.uri, v => {
+        return currentStarterPack.cid !== v?.starterPack.cid
       })
       await invalidateActorStarterPacksQuery({
         queryClient,
-        did: agent.session!.did,
+        did: pdsClient.assertDid,
       })
       if (currentStarterPack.list) {
         await invalidateListMembersQuery({
@@ -275,7 +285,7 @@ export function useEditStarterPackMutation({
       }
       await invalidateStarterPack({
         queryClient,
-        did: agent.session!.did,
+        did: pdsClient.assertDid,
         rkey: parsed!.rkey,
       })
       onSuccess()
@@ -293,35 +303,34 @@ export function useDeleteStarterPackMutation({
   onSuccess: () => void
   onError: (error: Error) => void
 }) {
-  const agent = useAgent()
+  const appviewClient = useAppviewClient()
+  const pdsClient = usePdsClient()
   const queryClient = useQueryClient()
 
   return useMutation({
     mutationFn: async ({listUri, rkey}: {listUri?: string; rkey: string}) => {
-      if (!agent.session) {
-        throw new Error(`Requires signed in user`)
-      }
+      const did = pdsClient.assertDid
 
       if (listUri) {
-        await agent.app.bsky.graph.list.delete({
-          repo: agent.session.did,
-          rkey: new AtUri(listUri).rkey,
+        await pdsClient.delete(app.bsky.graph.list, {
+          repo: did,
+          rkey: new AtUri(listUri).rkeySafe,
         })
       }
-      await agent.app.bsky.graph.starterpack.delete({
-        repo: agent.session.did,
+      await pdsClient.delete(app.bsky.graph.starterpack, {
+        repo: did,
         rkey,
       })
     },
     onSuccess: async (_, {listUri, rkey}) => {
       const uri = createStarterPackUri({
-        did: agent.session!.did,
+        did: pdsClient.assertDid,
         rkey,
       })
 
       if (uri) {
-        await whenAppViewReady(agent, uri, v => {
-          return Boolean(v?.data?.starterPack) === false
+        await whenAppViewReady(appviewClient, uri, v => {
+          return Boolean(v?.starterPack) === false
         })
       }
 
@@ -330,11 +339,11 @@ export function useDeleteStarterPackMutation({
       }
       await invalidateActorStarterPacksQuery({
         queryClient,
-        did: agent.session!.did,
+        did: pdsClient.assertDid,
       })
       await invalidateStarterPack({
         queryClient,
-        did: agent.session!.did,
+        did: pdsClient.assertDid,
         rkey,
       })
       onSuccess()
@@ -346,15 +355,18 @@ export function useDeleteStarterPackMutation({
 }
 
 async function whenAppViewReady(
-  agent: AtpAgent,
+  client: Client,
   uri: string,
-  fn: (res?: AppBskyGraphGetStarterPack.Response) => boolean,
+  fn: (res?: app.bsky.graph.getStarterPack.$OutputBody) => boolean,
 ) {
   await until(
     5, // 5 tries
     1e3, // 1s delay between tries
     fn,
-    () => agent.app.bsky.graph.getStarterPack({starterPack: uri}),
+    () =>
+      client.call(app.bsky.graph.getStarterPack, {
+        starterPack: uri as AtUriString,
+      }),
   )
 }
 
diff --git a/src/state/queries/verification/useVerificationCreateMutation.tsx b/src/state/queries/verification/useVerificationCreateMutation.tsx
index 083a6f3b54..4f1a318f48 100644
--- a/src/state/queries/verification/useVerificationCreateMutation.tsx
+++ b/src/state/queries/verification/useVerificationCreateMutation.tsx
@@ -1,15 +1,22 @@
-import {type AppBskyActorGetProfile} from '@atproto/api'
+import {
+  type AtIdentifierString,
+  type DidString,
+  type HandleString,
+  toDatetimeString,
+} from '@atproto/syntax'
 import {useMutation} from '@tanstack/react-query'
 
 import {until} from '#/lib/async/until'
 import {useUpdateProfileVerificationCache} from '#/state/queries/verification/useUpdateProfileVerificationCache'
-import {useAgent, useSession} from '#/state/session'
+import {useAppviewClient, usePdsClient, useSession} from '#/state/session'
 import {useAnalytics} from '#/analytics'
+import {app} from '#/lexicons'
 import type * as bsky from '#/types/bsky'
 
 export function useVerificationCreateMutation() {
   const ax = useAnalytics()
-  const agent = useAgent()
+  const appviewClient = useAppviewClient()
+  const pdsClient = usePdsClient()
   const {currentAccount} = useSession()
   const updateProfileVerificationCache = useUpdateProfileVerificationCache()
 
@@ -19,20 +26,18 @@ export function useVerificationCreateMutation() {
         throw new Error('User not logged in')
       }
 
-      const {uri} = await agent.app.bsky.graph.verification.create(
-        {repo: currentAccount.did},
-        {
-          subject: profile.did,
-          createdAt: new Date().toISOString(),
-          handle: profile.handle,
-          displayName: profile.displayName || '',
-        },
-      )
+      const {uri} = await pdsClient.create(app.bsky.graph.verification, {
+        // the profile view is still legacy-typed, so its strings are unbranded
+        subject: profile.did as DidString,
+        createdAt: toDatetimeString(new Date()),
+        handle: profile.handle as HandleString,
+        displayName: profile.displayName || '',
+      })
 
       await until(
         5,
         1e3,
-        ({data: profile}: AppBskyActorGetProfile.Response) => {
+        (profile: app.bsky.actor.getProfile.$OutputBody) => {
           if (
             profile.verification &&
             profile.verification.verifications.find(v => v.uri === uri)
@@ -42,7 +47,9 @@ export function useVerificationCreateMutation() {
           return false
         },
         () => {
-          return agent.getProfile({actor: profile.did ?? ''})
+          return appviewClient.call(app.bsky.actor.getProfile, {
+            actor: (profile.did ?? '') as AtIdentifierString,
+          })
         },
       )
     },
diff --git a/src/state/queries/verification/useVerificationsRemoveMutation.tsx b/src/state/queries/verification/useVerificationsRemoveMutation.tsx
index 3fa95497fd..657c50c909 100644
--- a/src/state/queries/verification/useVerificationsRemoveMutation.tsx
+++ b/src/state/queries/verification/useVerificationsRemoveMutation.tsx
@@ -1,19 +1,18 @@
-import {
-  type AppBskyActorDefs,
-  type AppBskyActorGetProfile,
-  AtUri,
-} from '@atproto/api'
+import {type AppBskyActorDefs} from '@atproto/api'
+import {type AtIdentifierString, AtUri} from '@atproto/syntax'
 import {useMutation} from '@tanstack/react-query'
 
 import {until} from '#/lib/async/until'
 import {useUpdateProfileVerificationCache} from '#/state/queries/verification/useUpdateProfileVerificationCache'
-import {useAgent, useSession} from '#/state/session'
+import {useAppviewClient, usePdsClient, useSession} from '#/state/session'
 import {useAnalytics} from '#/analytics'
+import {app} from '#/lexicons'
 import type * as bsky from '#/types/bsky'
 
 export function useVerificationsRemoveMutation() {
   const ax = useAnalytics()
-  const agent = useAgent()
+  const appviewClient = useAppviewClient()
+  const pdsClient = usePdsClient()
   const {currentAccount} = useSession()
   const updateProfileVerificationCache = useUpdateProfileVerificationCache()
 
@@ -33,9 +32,8 @@ export function useVerificationsRemoveMutation() {
 
       await Promise.all(
         uris.map(uri => {
-          return agent.app.bsky.graph.verification.delete({
-            repo: currentAccount.did,
-            rkey: new AtUri(uri).rkey,
+          return pdsClient.delete(app.bsky.graph.verification, {
+            rkey: new AtUri(uri).rkeySafe,
           })
         }),
       )
@@ -43,7 +41,7 @@ export function useVerificationsRemoveMutation() {
       await until(
         5,
         1e3,
-        ({data: profile}: AppBskyActorGetProfile.Response) => {
+        (profile: app.bsky.actor.getProfile.$OutputBody) => {
           if (
             !profile.verification?.verifications.some(v => uris.includes(v.uri))
           ) {
@@ -52,7 +50,10 @@ export function useVerificationsRemoveMutation() {
           return false
         },
         () => {
-          return agent.getProfile({actor: profile.did ?? ''})
+          return appviewClient.call(app.bsky.actor.getProfile, {
+            // the profile view is still legacy-typed, so its did is unbranded
+            actor: (profile.did ?? '') as AtIdentifierString,
+          })
         },
       )
     },
diff --git a/src/state/session/create-account.ts b/src/state/session/create-account.ts
index fd67681482..b44bed4dbd 100644
--- a/src/state/session/create-account.ts
+++ b/src/state/session/create-account.ts
@@ -1,5 +1,6 @@
 import {type AppBskyActorProfile, type Un$Typed} from '@atproto/api'
 import {TID} from '@atproto/common-web'
+import {type Client} from '@atproto/lex'
 import {PasswordSession} from '@atproto/lex-password-session'
 
 import {networkRetry} from '#/lib/async/retry'
@@ -21,6 +22,7 @@ import {
 import {unsafeGetAndComputeAgeAssurance} from '#/ageAssurance/state'
 import {features} from '#/analytics'
 import {type BskyAppAgent} from './bridge-agent'
+import {agentToPdsClient} from './clients'
 import {configureModerationForAccount} from './moderation'
 import {
   buildBundle,
@@ -109,7 +111,11 @@ export async function createSessionBundleAndCreateAccount(
   if (isProd) {
     postSignupTasks.push(
       initializeSavedFeeds(bundle.agent),
-      restrictChatAfterAgeAssurance(aa, bundle.agent, earlyAccount.did),
+      restrictChatAfterAgeAssurance(
+        aa,
+        agentToPdsClient(bundle.agent),
+        earlyAccount.did,
+      ),
     )
   }
   // Post-signup writes are not required to enter onboarding.
@@ -207,14 +213,14 @@ function initializeSavedFeeds(agent: BskyAppAgent) {
 
 function restrictChatAfterAgeAssurance(
   ageAssurance: Promise<unknown>,
-  agent: BskyAppAgent,
+  client: Client,
   did: string,
 ) {
   return ageAssurance.then(() => {
     const {flags} = unsafeGetAndComputeAgeAssurance({did})
     if (flags?.chatDisabled || flags?.groupChatDisabled) {
       void restrictChatSettings({
-        agent,
+        client,
         restrictIncoming: flags.chatDisabled,
         restrictGroupInvites: flags.groupChatDisabled,
       })

From 0c93d1e416cddfc00e3f5412a37c6f2d60a3c27d Mon Sep 17 00:00:00 2001
From: Samuel Newman <mozzius@protonmail.com>
Date: Thu, 13 Aug 2026 22:26:20 +0300
Subject: [PATCH 21/32] [SDK] Migrate the post pipeline and blob uploads
 (#11380)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
---
 package.json                                  |   5 +-
 .../contacts/screens/GetContacts.tsx          |  16 +-
 src/features/liveNow/index.tsx                |   9 +-
 src/lib/api/__tests__/computeCid.test.ts      | 121 +++++++++
 src/lib/api/computeCid.ts                     | 148 ++++++++++
 src/lib/api/index.ts                          | 256 ++++++------------
 src/lib/api/legacy-blob.ts                    |  31 +++
 src/lib/api/upload-blob.ts                    |  40 ++-
 src/lib/api/upload-blob.web.ts                |  28 +-
 src/screens/Onboarding/StepFinished/index.tsx |   7 +-
 src/state/queries/list.ts                     |  16 +-
 src/state/queries/profile.ts                  |  19 +-
 src/view/com/composer/Composer.tsx            |  10 +-
 13 files changed, 483 insertions(+), 223 deletions(-)
 create mode 100644 src/lib/api/__tests__/computeCid.test.ts
 create mode 100644 src/lib/api/computeCid.ts
 create mode 100644 src/lib/api/legacy-blob.ts

diff --git a/package.json b/package.json
index 510955abbf..5d92bc833f 100644
--- a/package.json
+++ b/package.json
@@ -333,11 +333,14 @@
       "^multiformats/cid$": "<rootDir>/node_modules/multiformats/dist/src/cid.js",
       "^multiformats/bases/base32$": "<rootDir>/node_modules/multiformats/dist/src/bases/base32.js",
       "^multiformats/hashes/digest$": "<rootDir>/node_modules/multiformats/dist/src/hashes/digest.js",
+      "^multiformats/hashes/hasher$": "<rootDir>/node_modules/multiformats/dist/src/hashes/hasher.js",
       "^multiformats/hashes/sha2$": "<rootDir>/node_modules/multiformats/dist/src/hashes/sha2.js",
       "^uint8arrays/from-string$": "<rootDir>/node_modules/uint8arrays/dist/src/from-string.js",
       "^uint8arrays/to-string$": "<rootDir>/node_modules/uint8arrays/dist/src/to-string.js",
       "^unicode-segmenter/grapheme$": "<rootDir>/node_modules/unicode-segmenter/grapheme.cjs",
-      "^await-lock$": "<rootDir>/node_modules/await-lock/build/AwaitLock.js"
+      "^await-lock$": "<rootDir>/node_modules/await-lock/build/AwaitLock.js",
+      "^@ipld/dag-cbor$": "<rootDir>/node_modules/@ipld/dag-cbor/src/index.js",
+      "^cborg$": "<rootDir>/node_modules/cborg/cborg.js"
     },
     "transformIgnorePatterns": [
       "node_modules/(?!((jest-)?react-native|@react-native(-community)?)|expo(nent)?|@expo(nent)?/.*|@expo-google-fonts/.*|react-navigation|nanoid|@react-navigation/.*|@unimodules/.*|unimodules|sentry-expo|native-base|normalize-url|react-native-svg|@sentry/.*|sentry-expo|bcp-47-match|@atproto/.*|@bsky.app/sdk|tlds|multiformats|uint8arrays|@ipld/.*|cborg|await-lock)"
diff --git a/src/components/contacts/screens/GetContacts.tsx b/src/components/contacts/screens/GetContacts.tsx
index 879864b162..d84e0d1ab0 100644
--- a/src/components/contacts/screens/GetContacts.tsx
+++ b/src/components/contacts/screens/GetContacts.tsx
@@ -8,16 +8,18 @@ import {
   AppBskyContactImportContacts,
   type Un$Typed,
 } from '@atproto/api'
+import {type Client} from '@atproto/lex'
 import {msg, t} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
 import {useMutation, useQueryClient} from '@tanstack/react-query'
 
 import {uploadBlob} from '#/lib/api'
+import {toLegacyBlobRef} from '#/lib/api/legacy-blob'
 import {cleanError, isNetworkError} from '#/lib/strings/errors'
 import {logger} from '#/logger'
 import {findContactsStatusQueryKey} from '#/state/queries/find-contacts'
-import {useAgent} from '#/state/session'
+import {useAgent, usePdsClient} from '#/state/session'
 import {
   Context as OnboardingContext,
   type OnboardingAction,
@@ -55,6 +57,7 @@ export function GetContacts({
   const {_} = useLingui()
   const ax = useAnalytics()
   const agent = useAgent()
+  const pdsClient = usePdsClient()
   const insets = useSafeAreaInsets()
   const gutters = useGutters([0, 'wide'])
   const queryClient = useQueryClient()
@@ -72,7 +75,7 @@ export function GetContacts({
        */
       if (context === 'Onboarding' && maybeOnboardingContext) {
         try {
-          await createProfileRecord(agent, maybeOnboardingContext)
+          await createProfileRecord(agent, pdsClient, maybeOnboardingContext)
         } catch (error) {
           logger.debug('Error creating profile record:', {safeMessage: error})
         }
@@ -326,6 +329,7 @@ function showPermissionDeniedAlert() {
  */
 async function createProfileRecord(
   agent: AtpAgent,
+  pdsClient: Client,
   onboardingContext: {
     state: OnboardingState
     dispatch: React.Dispatch<OnboardingAction>
@@ -334,15 +338,17 @@ async function createProfileRecord(
   const profileStepResults = onboardingContext.state.profileStepResults
   const {imageUri, imageMime} = profileStepResults
   const blobPromise =
-    imageUri && imageMime ? uploadBlob(agent, imageUri, imageMime) : undefined
+    imageUri && imageMime
+      ? uploadBlob(pdsClient, imageUri, imageMime)
+      : undefined
 
   await agent.upsertProfile(async existing => {
     let next: Un$Typed<AppBskyActorProfile.Record> = existing ?? {}
 
     if (blobPromise) {
       const res = await blobPromise
-      if (res.data.blob) {
-        next.avatar = res.data.blob
+      if (res.blob) {
+        next.avatar = toLegacyBlobRef(res.blob)
       }
     }
 
diff --git a/src/features/liveNow/index.tsx b/src/features/liveNow/index.tsx
index 3b60b688bb..525e189ace 100644
--- a/src/features/liveNow/index.tsx
+++ b/src/features/liveNow/index.tsx
@@ -224,7 +224,6 @@ export function useUpsertLiveStatusMutation(
 ) {
   const ax = useAnalytics()
   const {currentAccount} = useSession()
-  const agent = useAgent()
   const pdsClient = usePdsClient()
   const queryClient = useQueryClient()
   const control = useDialogContext()
@@ -244,15 +243,11 @@ export function useUpsertLiveStatusMutation(
             const img = await imageToThumb(linkMeta.image)
             if (img) {
               const blob = await uploadBlob(
-                agent,
+                pdsClient,
                 img.source.path,
                 img.source.mime,
               )
-              /*
-               * `uploadBlob` still returns the legacy `BlobRef` class
-               * instance; it moves to the client with the blob pipeline.
-               */
-              thumb = blob.data.blob as unknown as l.BlobRef
+              thumb = blob.blob
             }
           } catch (e: any) {
             ax.logger.error(`Failed to upload thumbnail for live status`, {
diff --git a/src/lib/api/__tests__/computeCid.test.ts b/src/lib/api/__tests__/computeCid.test.ts
new file mode 100644
index 0000000000..ce0adc4a85
--- /dev/null
+++ b/src/lib/api/__tests__/computeCid.test.ts
@@ -0,0 +1,121 @@
+/*
+ * The jest suite ships global manual mocks for `multiformats/cid` and
+ * `multiformats/hashes/hasher` (in root `__mocks__/`) so unrelated tests don't
+ * pull in real crypto. This test is precisely about the real CID hashing, so we
+ * opt back into the actual implementations here.
+ */
+jest.unmock('multiformats/cid')
+jest.unmock('multiformats/hashes/hasher')
+
+import {BlobRef} from '@atproto/api'
+import {CID} from 'multiformats/cid'
+
+import {computeCid} from '#/lib/api/computeCid'
+import {type app, type com} from '#/lexicons'
+
+/*
+ * Golden-CID regression test for the composer post pipeline.
+ *
+ * `computeCid` hashes a post record in the client so a thread's later posts can
+ * reference earlier posts by CID before the server assigns them. The hash is
+ * byte-sensitive: any drift in how records (especially blobs) are serialized to
+ * DAG-CBOR silently produces the wrong CID and breaks reply chains with NO type
+ * error. These golden values MUST remain byte-identical - they gate the
+ * structural lex-blob shape check.
+ *
+ * The blob CID below is a fixed, deterministic CIDv1/raw/sha256 used purely as a
+ * stable fixture - it is not derived from any real upload.
+ */
+const BLOB_CID = 'bafkreieq5jui4j25lacwomsqgjeswwl3y5zcdrresptwgmfylxo2depppq'
+
+/**
+ * Build a post record with an image embed whose blob is the given value.
+ */
+function postWithImageBlob(blob: unknown): app.bsky.feed.post.Main {
+  return {
+    $type: 'app.bsky.feed.post',
+    createdAt: '2024-01-01T00:00:00.001Z',
+    text: 'post with image',
+    embed: {
+      $type: 'app.bsky.embed.images',
+      images: [
+        {
+          image: blob,
+          alt: 'alt text',
+          aspectRatio: {width: 100, height: 200},
+        },
+      ],
+    },
+  } as app.bsky.feed.post.Main
+}
+
+describe('computeCid', () => {
+  it('case 1: plain post record with no blob', async () => {
+    const record: app.bsky.feed.post.Main = {
+      $type: 'app.bsky.feed.post',
+      createdAt: '2024-01-01T00:00:00.000Z',
+      text: 'hello world',
+    }
+    expect(await computeCid(record)).toBe(
+      'bafyreieawtmh7hwfrqpamqkodza5r62bbfhsepe2iyustgxhgbhi6b2lfi',
+    )
+  })
+
+  it('case 2: record whose embed carries a plain-JSON lex blob', async () => {
+    /*
+     * The blob shape lex `uploadBlob` returns: a plain object
+     * `{$type: 'blob', ref, mimeType, size}` with `ref` a parsed CID. The
+     * structural lex-blob guard passes it through `prepareForHashing`
+     * untouched and DAG-CBOR encodes its CID `ref` as a CID link. The golden
+     * CID below is the byte-identical value the pre-migration `BlobRef` class
+     * instance produced via `.ipld()`.
+     */
+    const blob = {
+      $type: 'blob' as const,
+      ref: CID.parse(BLOB_CID),
+      mimeType: 'image/jpeg',
+      size: 12345,
+    }
+    expect(await computeCid(postWithImageBlob(blob))).toBe(
+      'bafyreiem7g6vja66nebr7he4fshfnlyndyldbvle2n265oixscmepjcbii',
+    )
+  })
+
+  it('case 2b: a legacy BlobRef instance hashes to the same CID', async () => {
+    /*
+     * The video pipeline still yields legacy `BlobRef` class instances, so
+     * `prepareForHashing` keeps its `instanceof` guard. Both branches must
+     * agree: this asserts the SAME golden CID as case 2.
+     */
+    const blob = new BlobRef(CID.parse(BLOB_CID), 'image/jpeg', 12345)
+    expect(await computeCid(postWithImageBlob(blob))).toBe(
+      'bafyreiem7g6vja66nebr7he4fshfnlyndyldbvle2n265oixscmepjcbii',
+    )
+  })
+
+  it('case 3: three-post thread chains reply StrongRef CIDs', async () => {
+    const did = 'did:plc:abc123'
+    const base = new Date('2024-01-01T00:00:00.000Z')
+    const golden = [
+      'bafyreig62rxs34h5rvznfrracwkjlfgad5b25qxglp2hcziqdfas2nw2ee',
+      'bafyreicxcj2tq5jrh5jcaczg3eli5cvxitgzu7kpu3fm5v3njq2byjxirq',
+      'bafyreigvaswuhlpd7dllja2xrqswhqbruyv2kar7mvbn7gdm5ldzu6vkti',
+    ]
+
+    let reply: app.bsky.feed.post.Main['reply'] | undefined
+    for (let i = 0; i < 3; i++) {
+      const now = new Date(base.getTime() + i)
+      const uri = `at://${did}/app.bsky.feed.post/rkey${i}`
+      const record = {
+        $type: 'app.bsky.feed.post',
+        createdAt: now.toISOString(),
+        text: `post ${i}`,
+        reply,
+      } as app.bsky.feed.post.Main
+      const cid = await computeCid(record)
+      expect(cid).toBe(golden[i])
+      const ref = {cid, uri} as com.atproto.repo.strongRef.Main
+      reply = {root: reply?.root ?? ref, parent: ref}
+    }
+  })
+})
diff --git a/src/lib/api/computeCid.ts b/src/lib/api/computeCid.ts
new file mode 100644
index 0000000000..18821793ae
--- /dev/null
+++ b/src/lib/api/computeCid.ts
@@ -0,0 +1,148 @@
+import {BlobRef} from '@atproto/api'
+import {sha256} from 'js-sha256'
+import {CID} from 'multiformats/cid'
+import * as Hasher from 'multiformats/hashes/hasher'
+
+import {type app} from '#/lexicons'
+
+/*
+ * Client-side CID computation for post records, extracted from the post
+ * pipeline so it can be unit-tested in isolation (importing the pipeline pulls
+ * in the native gallery/media chain). See `computeCid.test.ts` for the
+ * golden-CID regression fixtures that gate any change to this serialization.
+ */
+
+// The built-in hashing functions from multiformats (`multiformats/hashes/sha2`)
+// are meant for Node.js, this is the cross-platform equivalent.
+const mf_sha256 = Hasher.from({
+  name: 'sha2-256',
+  code: 0x12,
+  encode: input => {
+    const digest = sha256.arrayBuffer(input)
+    return new Uint8Array(digest)
+  },
+})
+
+export async function computeCid(
+  record: app.bsky.feed.post.Main,
+): Promise<string> {
+  /*
+   * Lazily loaded since it's only needed when posting a thread, and its
+   * `cborg` dependency is ~190KB that would otherwise be in the initial
+   * web bundle.
+   */
+  const dcbor = await importDagCbor()
+  /*
+   * IMPORTANT: `prepareForHashing` prepares the record to be hashed by
+   * removing fields with undefined value, and converting blobs to the right
+   * IPLD representation.
+   */
+  const prepared = prepareForHashing(record)
+  // 1. Encode the record into DAG-CBOR format
+  const encoded = dcbor.encode(prepared)
+  // 2. Hash the record in SHA-256 (code 0x12)
+  const digest = await mf_sha256.digest(encoded)
+  // 3. Create a CIDv1, specifying DAG-CBOR as content (code 0x71)
+  const cid = CID.createV1(0x71, digest)
+  // 4. Get the Base32 representation of the CID (`b` prefix)
+  return cid.toString()
+}
+
+/**
+ * True for a plain-JSON lexicon blob, the shape lex `uploadBlob` returns
+ * (`{$type: 'blob', ref, mimeType, size}` with `ref` a parsed CID). Lex blobs
+ * are plain objects, not class instances.
+ */
+function isLexBlob(v: unknown): boolean {
+  if (v == null || typeof v !== 'object') return false
+  const o = v as Record<string, unknown>
+  return o.$type === 'blob' && 'ref' in o && 'mimeType' in o
+}
+
+/*
+ * Returns a transformed version of the object for use in DAG-CBOR.
+ */
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+function prepareForHashing(v: any): any {
+  /*
+   * A plain-JSON lex blob is already in the right IPLD shape (its `ref` is a
+   * parsed CID that DAG-CBOR encodes as a CID link), so pass it through
+   * untouched.
+   */
+  if (isLexBlob(v)) {
+    return v
+  }
+
+  /*
+   * The video pipeline still reads its blob off the legacy agent
+   * (`app.bsky.video.getJobStatus` in composer `state/video`), which yields a
+   * `BlobRef` class instance. `ipld()` gives the same IPLD shape a lex blob
+   * already has, so both branches hash identically. Drop this guard once the
+   * video client is migrated.
+   */
+  if (v instanceof BlobRef) {
+    return v.ipld()
+  }
+
+  // Walk through arrays
+  if (Array.isArray(v)) {
+    let pure = true
+    const mapped = v.map(value => {
+      if (value !== (value = prepareForHashing(value))) {
+        pure = false
+      }
+      return value
+    })
+    return pure ? v : mapped
+  }
+
+  // Walk through plain objects
+  if (isPlainObject(v)) {
+    const rec = v as Record<string, unknown>
+    const obj: Record<string, unknown> = {}
+    let pure = true
+    for (const key in rec) {
+      let value = rec[key]
+      // `value` is undefined
+      if (value === undefined) {
+        pure = false
+        continue
+      }
+      /*
+       * `prepareForHashing` returned a value that's different from what we had
+       * before
+       */
+      if (value !== (value = prepareForHashing(value))) {
+        pure = false
+      }
+      obj[key] = value
+    }
+    // Return as is if we haven't needed to tamper with anything
+    return pure ? v : obj
+  }
+  return v
+}
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+function isPlainObject(v: any): boolean {
+  if (typeof v !== 'object' || v === null) {
+    return false
+  }
+  const proto = Object.getPrototypeOf(v)
+  return proto === Object.prototype || proto === null
+}
+
+/**
+ * Load `@ipld/dag-cbor` on demand. The dynamic `import()` lets web bundlers
+ * emit it (and its ~190KB `cborg` dependency) as a separate chunk that only
+ * loads when posting a thread. Under jest (which runs without
+ * `--experimental-vm-modules`) dynamic import throws, so we fall back to a
+ * lazy `require`, which resolves through the test moduleNameMapper.
+ */
+function importDagCbor(): Promise<typeof import('@ipld/dag-cbor')> {
+  if (process.env.NODE_ENV === 'test') {
+    // eslint-disable-next-line @typescript-eslint/no-require-imports
+    return Promise.resolve(require('@ipld/dag-cbor'))
+  }
+  return import('@ipld/dag-cbor')
+}
diff --git a/src/lib/api/index.ts b/src/lib/api/index.ts
index aee481669e..e52d4ec4fc 100644
--- a/src/lib/api/index.ts
+++ b/src/lib/api/index.ts
@@ -1,28 +1,14 @@
-import {
-  type $Typed,
-  type AppBskyEmbedExternal,
-  type AppBskyEmbedGallery,
-  type AppBskyEmbedImages,
-  type AppBskyEmbedRecord,
-  type AppBskyEmbedRecordWithMedia,
-  type AppBskyEmbedVideo,
-  AppBskyFeedPost,
-  type AtpAgent,
-  BlobRef,
-  ChatBskyGroupDefs,
-  type ComAtprotoLabelDefs,
-  type ComAtprotoRepoApplyWrites,
-  type ComAtprotoRepoStrongRef,
-} from '@atproto/api'
+import {type AtpAgent, ChatBskyGroupDefs} from '@atproto/api'
 import {TID} from '@atproto/common-web'
-import {type Client} from '@atproto/lex'
-import {toDatetimeString} from '@atproto/syntax'
+import {type $Typed, type Client} from '@atproto/lex'
+import {
+  type AtUriString,
+  toDatetimeString,
+  type UriString,
+} from '@atproto/syntax'
 import {RichText} from '@bsky.app/sdk/richtext'
 import {t} from '@lingui/core/macro'
 import {type QueryClient} from '@tanstack/react-query'
-import {sha256} from 'js-sha256'
-import {CID} from 'multiformats/cid'
-import * as Hasher from 'multiformats/hashes/hasher'
 
 import {IMAGE_SIZE_CONFIG_POSTS} from '#/lib/constants'
 import {isNetworkError} from '#/lib/strings/errors'
@@ -42,8 +28,11 @@ import {
   type PostDraft,
   type ThreadDraft,
 } from '#/view/com/composer/state/composer'
+import {app, com} from '#/lexicons'
 import * as bsky from '#/types/bsky'
 import {createGIFDescription} from '../gif-alt-text'
+import {computeCid} from './computeCid'
+import {fromLegacyBlobRef} from './legacy-blob'
 import {uploadBlob} from './upload-blob'
 
 export {uploadBlob}
@@ -54,13 +43,23 @@ interface PostOpts {
   onStateChange?: (state: string) => void
   langs?: string[]
   /*
-   * Facet/mention resolution is an appview job - it resolves handles through
-   * the appview, and the public fallback keeps it working when logged out.
-   * The rest of this pipeline still writes through the agent.
+   * Facet/mention resolution and reply-root lookup are appview jobs - they
+   * resolve handles and read posts through the appview, and the public
+   * fallback keeps facet detection working when logged out.
    */
   appviewClient: Client
+  /*
+   * The repo write itself (applyWrites) plus every record blob (images,
+   * gallery items, link thumbnails, video captions) goes to the account's own
+   * PDS, never the appview.
+   */
+  pdsClient: Client
 }
 
+/**
+ * The `agent` is only still here for the link/gif resolvers in `resolve.ts`,
+ * which read through it; drop the parameter when those move to the clients.
+ */
 export async function post(
   agent: AtpAgent,
   queryClient: QueryClient,
@@ -70,12 +69,12 @@ export async function post(
   opts.onStateChange?.(t`Processing...`)
 
   let replyPromise:
-    | Promise<AppBskyFeedPost.Record['reply']>
-    | AppBskyFeedPost.Record['reply']
+    | Promise<app.bsky.feed.post.Main['reply']>
+    | app.bsky.feed.post.Main['reply']
     | undefined
   if (opts.replyTo) {
     // Not awaited to avoid waterfalls.
-    replyPromise = resolveReply(agent, opts.replyTo)
+    replyPromise = resolveReply(opts.appviewClient, opts.replyTo)
   }
 
   // add top 3 languages from user preferences if langs is provided
@@ -84,8 +83,8 @@ export async function post(
     langs = opts.langs.slice(0, 3)
   }
 
-  const did = agent.assertDid
-  const writes: $Typed<ComAtprotoRepoApplyWrites.Create>[] = []
+  const did = opts.pdsClient.assertDid
+  const writes: com.atproto.repo.applyWrites.$InputBody['writes'] = []
   const uris: string[] = []
 
   let now = new Date()
@@ -98,11 +97,12 @@ export async function post(
     const rtPromise = resolveRT(opts.appviewClient, draft.richtext)
     const embedPromise = resolveEmbed(
       agent,
+      opts.pdsClient,
       queryClient,
       draft,
       opts.onStateChange,
     )
-    let labels: $Typed<ComAtprotoLabelDefs.SelfLabels> | undefined
+    let labels: $Typed<com.atproto.label.defs.SelfLabels> | undefined
     if (draft.labels.length) {
       labels = {
         $type: 'com.atproto.label.defs#selfLabels',
@@ -115,17 +115,17 @@ export async function post(
     now.setMilliseconds(now.getMilliseconds() + 1)
     tid = TID.next(tid)
     const rkey = tid.toString()
-    const uri = `at://${did}/app.bsky.feed.post/${rkey}`
+    const uri = `at://${did}/app.bsky.feed.post/${rkey}` as AtUriString
     uris.push(uri)
 
     const rt = await rtPromise
     const embed = await embedPromise
     const reply = await replyPromise
-    const record: AppBskyFeedPost.Record = {
+    const record: app.bsky.feed.post.Main = {
       // IMPORTANT: $type has to exist, CID is calculated with the `$type` field
       // present and will produce the wrong CID if you omit it.
       $type: 'app.bsky.feed.post',
-      createdAt: now.toISOString(),
+      createdAt: toDatetimeString(now),
       text: rt.text,
       facets: rt.facets,
       reply,
@@ -164,7 +164,7 @@ export async function post(
         value: {
           ...thread.postgate,
           $type: 'app.bsky.feed.postgate',
-          createdAt: now.toISOString(),
+          createdAt: toDatetimeString(now),
           post: uri,
         },
       })
@@ -182,8 +182,8 @@ export async function post(
   }
 
   try {
-    await agent.com.atproto.repo.applyWrites({
-      repo: agent.assertDid,
+    await opts.pdsClient.call(com.atproto.repo.applyWrites, {
+      repo: did,
       writes: writes,
       validate: true,
     })
@@ -224,9 +224,9 @@ export class ReplyDeletedError extends Error {
   }
 }
 
-async function resolveReply(agent: AtpAgent, replyTo: string) {
-  const {data} = await agent.app.bsky.feed.getPosts({
-    uris: [replyTo],
+async function resolveReply(appviewClient: Client, replyTo: string) {
+  const data = await appviewClient.call(app.bsky.feed.getPosts, {
+    uris: [replyTo as AtUriString],
   })
   const parentPost = data.posts[0]
   if (!parentPost) {
@@ -237,14 +237,9 @@ async function resolveReply(agent: AtpAgent, replyTo: string) {
     uri: parentPost.uri,
     cid: parentPost.cid,
   }
-  let rootRef = parentRef
+  let rootRef: com.atproto.repo.strongRef.Main = parentRef
 
-  if (
-    bsky.dangerousIsType<AppBskyFeedPost.Record>(
-      parentPost.record,
-      AppBskyFeedPost.isRecord,
-    )
-  ) {
+  if (bsky.isType(app.bsky.feed.post, parentPost.record)) {
     if (parentPost.record.reply) {
       rootRef = parentPost.record.reply.root
     }
@@ -258,21 +253,14 @@ async function resolveReply(agent: AtpAgent, replyTo: string) {
 
 async function resolveEmbed(
   agent: AtpAgent,
+  pdsClient: Client,
   queryClient: QueryClient,
   draft: PostDraft,
   onStateChange: ((state: string) => void) | undefined,
-): Promise<
-  | $Typed<AppBskyEmbedImages.Main>
-  | $Typed<AppBskyEmbedGallery.Main>
-  | $Typed<AppBskyEmbedVideo.Main>
-  | $Typed<AppBskyEmbedExternal.Main>
-  | $Typed<AppBskyEmbedRecord.Main>
-  | $Typed<AppBskyEmbedRecordWithMedia.Main>
-  | undefined
-> {
+): Promise<app.bsky.feed.post.Main['embed']> {
   if (draft.embed.quote) {
     const [resolvedMedia, resolvedQuote] = await Promise.all([
-      resolveMedia(agent, queryClient, draft.embed, onStateChange),
+      resolveMedia(agent, pdsClient, queryClient, draft.embed, onStateChange),
       resolveRecord(agent, queryClient, draft.embed.quote.uri),
     ])
     if (resolvedMedia) {
@@ -292,6 +280,7 @@ async function resolveEmbed(
   }
   const resolvedMedia = await resolveMedia(
     agent,
+    pdsClient,
     queryClient,
     draft.embed,
     onStateChange,
@@ -308,7 +297,12 @@ async function resolveEmbed(
     if (resolvedLink.type === 'record') {
       return {
         $type: 'app.bsky.embed.record',
-        record: resolvedLink.record,
+        /*
+         * `resolve.ts` is still legacy-typed - its strong refs and URIs carry
+         * unbranded strings. Assert at the boundary until it moves to the
+         * clients.
+         */
+        record: resolvedLink.record as com.atproto.repo.strongRef.Main,
       }
     }
   }
@@ -317,14 +311,15 @@ async function resolveEmbed(
 
 async function resolveMedia(
   agent: AtpAgent,
+  pdsClient: Client,
   queryClient: QueryClient,
   embedDraft: EmbedDraft,
   onStateChange: ((state: string) => void) | undefined,
 ): Promise<
-  | $Typed<AppBskyEmbedExternal.Main>
-  | $Typed<AppBskyEmbedImages.Main>
-  | $Typed<AppBskyEmbedGallery.Main>
-  | $Typed<AppBskyEmbedVideo.Main>
+  | $Typed<app.bsky.embed.external.Main>
+  | $Typed<app.bsky.embed.images.Main>
+  | $Typed<app.bsky.embed.gallery.Main>
+  | $Typed<app.bsky.embed.video.Main>
   | undefined
 > {
   if (embedDraft.media?.type === 'images') {
@@ -333,7 +328,7 @@ async function resolveMedia(
       count: imagesDraft.length,
     })
     onStateChange?.(t`Uploading images...`)
-    const images: AppBskyEmbedImages.Image[] = await Promise.all(
+    const images: app.bsky.embed.images.Image[] = await Promise.all(
       imagesDraft.map(async (image, i) => {
         logger.debug(`Compressing image #${i}`)
         const {path, width, height, mime} = await compressImage(
@@ -341,9 +336,9 @@ async function resolveMedia(
           IMAGE_SIZE_CONFIG_POSTS,
         )
         logger.debug(`Uploading image #${i}`)
-        const res = await uploadBlob(agent, path, mime)
+        const res = await uploadBlob(pdsClient, path, mime)
         return {
-          image: res.data.blob,
+          image: res.blob,
           alt: image.alt,
           aspectRatio: {width, height},
         }
@@ -360,7 +355,7 @@ async function resolveMedia(
       count: imagesDraft.length,
     })
     onStateChange?.(t`Uploading images...`)
-    const items: $Typed<AppBskyEmbedGallery.Image>[] = await Promise.all(
+    const items: $Typed<app.bsky.embed.gallery.Image>[] = await Promise.all(
       imagesDraft.map(async (image, i) => {
         logger.debug(`Compressing image #${i}`)
         const {path, width, height, mime} = await compressImage(
@@ -368,10 +363,10 @@ async function resolveMedia(
           IMAGE_SIZE_CONFIG_POSTS,
         )
         logger.debug(`Uploading image #${i}`)
-        const res = await uploadBlob(agent, path, mime)
+        const res = await uploadBlob(pdsClient, path, mime)
         return {
           $type: 'app.bsky.embed.gallery#image' as const,
-          image: res.data.blob,
+          image: res.blob,
           alt: image.alt,
           aspectRatio: {width, height},
         }
@@ -391,10 +386,10 @@ async function resolveMedia(
       videoDraft.captions
         .filter(caption => caption.lang !== '')
         .map(async caption => {
-          const {data} = await agent.uploadBlob(caption.file, {
+          const res = await pdsClient.uploadBlob(caption.file, {
             encoding: 'text/vtt',
           })
-          return {lang: caption.lang, file: data.blob}
+          return {lang: caption.lang, file: res.body.blob}
         }),
     )
 
@@ -414,7 +409,11 @@ async function resolveMedia(
 
     return {
       $type: 'app.bsky.embed.video',
-      video: videoDraft.pendingPublish.blobRef,
+      /*
+       * The video pipeline still reads its blob off the legacy agent, so
+       * normalize it to the lex shape before it reaches the lex write.
+       */
+      video: fromLegacyBlobRef(videoDraft.pendingPublish.blobRef),
       alt: videoDraft.altText || undefined,
       captions: captions.length === 0 ? undefined : captions,
       aspectRatio,
@@ -429,17 +428,17 @@ async function resolveMedia(
       agent,
       gifDraft.gif,
     )
-    let blob: BlobRef | undefined
+    let blob: app.bsky.embed.external.External['thumb']
     if (resolvedGif.thumb) {
       onStateChange?.(t`Uploading link thumbnail...`)
       const {path, mime} = resolvedGif.thumb.source
-      const response = await uploadBlob(agent, path, mime)
-      blob = response.data.blob
+      const response = await uploadBlob(pdsClient, path, mime)
+      blob = response.blob
     }
     return {
       $type: 'app.bsky.embed.external',
       external: {
-        uri: resolvedGif.uri,
+        uri: resolvedGif.uri as UriString,
         title: resolvedGif.title,
         description: createGIFDescription(resolvedGif.title, gifDraft.alt),
         thumb: blob,
@@ -453,21 +452,23 @@ async function resolveMedia(
       embedDraft.link.uri,
     )
     if (resolvedLink.type === 'external') {
-      let blob: BlobRef | undefined
+      let blob: app.bsky.embed.external.External['thumb']
       if (resolvedLink.thumb) {
         onStateChange?.(t`Uploading link thumbnail...`)
         const {path, mime} = resolvedLink.thumb.source
-        const response = await uploadBlob(agent, path, mime)
-        blob = response.data.blob
+        const response = await uploadBlob(pdsClient, path, mime)
+        blob = response.blob
       }
       return {
         $type: 'app.bsky.embed.external',
         external: {
-          uri: resolvedLink.uri,
+          uri: resolvedLink.uri as UriString,
           title: resolvedLink.title,
           description: resolvedLink.description,
           thumb: blob,
-          associatedRefs: resolvedLink.associatedRefs,
+          associatedRefs: resolvedLink.associatedRefs as
+            | com.atproto.repo.strongRef.Main[]
+            | undefined,
         },
       }
     }
@@ -478,7 +479,7 @@ async function resolveMedia(
       return {
         $type: 'app.bsky.embed.external',
         external: {
-          uri: resolvedLink.uri,
+          uri: resolvedLink.uri as UriString,
           title: resolvedLink.view.name,
           description: `${resolvedLink.view.memberCount}/${resolvedLink.view.memberLimit}`,
         },
@@ -488,101 +489,18 @@ async function resolveMedia(
   return undefined
 }
 
+/*
+ * `resolve.ts` still resolves through the agent and returns legacy-typed refs;
+ * assert at the boundary until it moves to the clients.
+ */
 async function resolveRecord(
   agent: AtpAgent,
   queryClient: QueryClient,
   uri: string,
-): Promise<ComAtprotoRepoStrongRef.Main> {
+): Promise<com.atproto.repo.strongRef.Main> {
   const resolvedLink = await fetchResolveLinkQuery(queryClient, agent, uri)
   if (resolvedLink.type !== 'record') {
     throw Error(t`Expected uri to resolve to a record`)
   }
-  return resolvedLink.record
-}
-
-// The built-in hashing functions from multiformats (`multiformats/hashes/sha2`)
-// are meant for Node.js, this is the cross-platform equivalent.
-const mf_sha256 = Hasher.from({
-  name: 'sha2-256',
-  code: 0x12,
-  encode: input => {
-    const digest = sha256.arrayBuffer(input)
-    return new Uint8Array(digest)
-  },
-})
-
-async function computeCid(record: AppBskyFeedPost.Record): Promise<string> {
-  /*
-   * Lazily loaded since it's only needed when posting a thread, and its
-   * `cborg` dependency is ~190KB that would otherwise be in the initial
-   * web bundle.
-   */
-  const dcbor = await import('@ipld/dag-cbor')
-  // IMPORTANT: `prepareObject` prepares the record to be hashed by removing
-  // fields with undefined value, and converting BlobRef instances to the
-  // right IPLD representation.
-  const prepared = prepareForHashing(record)
-  // 1. Encode the record into DAG-CBOR format
-  const encoded = dcbor.encode(prepared)
-  // 2. Hash the record in SHA-256 (code 0x12)
-  const digest = await mf_sha256.digest(encoded)
-  // 3. Create a CIDv1, specifying DAG-CBOR as content (code 0x71)
-  const cid = CID.createV1(0x71, digest)
-  // 4. Get the Base32 representation of the CID (`b` prefix)
-  return cid.toString()
-}
-
-// Returns a transformed version of the object for use in DAG-CBOR.
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-function prepareForHashing(v: any): any {
-  // IMPORTANT: BlobRef#ipld() returns the correct object we need for hashing,
-  // the API client will convert this for you but we're hashing in the client,
-  // so we need it *now*.
-  if (v instanceof BlobRef) {
-    return v.ipld()
-  }
-
-  // Walk through arrays
-  if (Array.isArray(v)) {
-    let pure = true
-    const mapped = v.map(value => {
-      if (value !== (value = prepareForHashing(value))) {
-        pure = false
-      }
-      return value
-    })
-    return pure ? v : mapped
-  }
-
-  // Walk through plain objects
-  if (isPlainObject(v)) {
-    const obj: Record<string, unknown> = {}
-    let pure = true
-    for (const key in v) {
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-      let value = v[key]
-      // `value` is undefined
-      if (value === undefined) {
-        pure = false
-        continue
-      }
-      // `prepareObject` returned a value that's different from what we had before
-      if (value !== (value = prepareForHashing(value))) {
-        pure = false
-      }
-      obj[key] = value
-    }
-    // Return as is if we haven't needed to tamper with anything
-    return pure ? v : obj
-  }
-  return v
-}
-
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-function isPlainObject(v: any): boolean {
-  if (typeof v !== 'object' || v === null) {
-    return false
-  }
-  const proto = Object.getPrototypeOf(v)
-  return proto === Object.prototype || proto === null
+  return resolvedLink.record as com.atproto.repo.strongRef.Main
 }
diff --git a/src/lib/api/legacy-blob.ts b/src/lib/api/legacy-blob.ts
new file mode 100644
index 0000000000..a98e375d20
--- /dev/null
+++ b/src/lib/api/legacy-blob.ts
@@ -0,0 +1,31 @@
+import {BlobRef} from '@atproto/api'
+import {type BlobRef as LexBlobRef} from '@atproto/lex'
+
+/**
+ * Bridge a lex blob ref (the plain-JSON `{$type: 'blob', ref, mimeType, size}`
+ * that {@link uploadBlob} now returns) back to the legacy `BlobRef` class
+ * instance.
+ *
+ * Only needed where a blob is handed to a legacy agent write: the legacy
+ * lexicon blob validator checks `value instanceof BlobRef`, so a plain lex
+ * blob fails validation, and the legacy serializer would put the wrong shape
+ * on the wire. Drop each call as its write moves to the lex client.
+ */
+export function toLegacyBlobRef(blob: LexBlobRef): BlobRef {
+  return BlobRef.fromJsonRef(blob as Parameters<typeof BlobRef.fromJsonRef>[0])
+}
+
+/**
+ * Normalize a legacy `BlobRef` class instance to the plain-JSON lex blob shape.
+ *
+ * Required for any blob that reaches a lex write: the lex serializer walks
+ * plain objects, so a class instance goes on the wire with its internal
+ * `original` field and no `$type`. `ipld()` yields exactly the lex shape, and
+ * hashes identically (see `computeCid.test.ts` case 2b).
+ *
+ * Only the video pipeline still needs this - it reads its blob off the legacy
+ * agent (`app.bsky.video.getJobStatus`). Drop it when the video client moves.
+ */
+export function fromLegacyBlobRef(blob: BlobRef): LexBlobRef {
+  return blob.ipld()
+}
diff --git a/src/lib/api/upload-blob.ts b/src/lib/api/upload-blob.ts
index 0bee39b9b1..c679e15d84 100644
--- a/src/lib/api/upload-blob.ts
+++ b/src/lib/api/upload-blob.ts
@@ -1,38 +1,62 @@
 import {copyAsync} from 'expo-file-system/legacy'
-import {type AtpAgent, type ComAtprotoRepoUploadBlob} from '@atproto/api'
+import {type BlobRef, type Client, type EncodingString} from '@atproto/lex'
 
 import {safeDeleteAsync} from '#/lib/media/manip'
 
 /**
- * @param encoding Allows overriding the blob's type
+ * The blob-upload response body: `{blob}`. lex `Client.uploadBlob` returns the
+ * full XRPC response, so this helper unwraps `res.body` for callers.
+ */
+type UploadBlobResult = {blob: BlobRef}
+
+/**
+ * @param encoding Allows overriding the blob's type. Passed as the lex upload
+ * option (NEVER a content-type header - lex-client throws if the encoding is
+ * set via headers).
  */
 export async function uploadBlob(
-  agent: AtpAgent,
+  client: Client,
   input: string | Blob,
   encoding?: string,
-): Promise<ComAtprotoRepoUploadBlob.Response> {
+): Promise<UploadBlobResult> {
   if (typeof input === 'string' && input.startsWith('file:')) {
     const blob = await asBlob(input)
-    return agent.uploadBlob(blob, {encoding})
+    return uploadBlobResult(client, blob, encoding)
   }
 
   if (typeof input === 'string' && input.startsWith('/')) {
     const blob = await asBlob(`file://${input}`)
-    return agent.uploadBlob(blob, {encoding})
+    return uploadBlobResult(client, blob, encoding)
   }
 
   if (typeof input === 'string' && input.startsWith('data:')) {
     const blob = await fetch(input).then(r => r.blob())
-    return agent.uploadBlob(blob, {encoding})
+    return uploadBlobResult(client, blob, encoding)
   }
 
   if (input instanceof Blob) {
-    return agent.uploadBlob(input, {encoding})
+    return uploadBlobResult(client, input, encoding)
   }
 
   throw new TypeError(`Invalid uploadBlob input: ${typeof input}`)
 }
 
+async function uploadBlobResult(
+  client: Client,
+  blob: Blob,
+  encoding?: string,
+): Promise<UploadBlobResult> {
+  const res = await client.uploadBlob(blob, {
+    /*
+     * The lex encoding option is a branded mime string
+     * (`${string}/${string}`); callers pass a plain mime string, so assert the
+     * brand here.
+     */
+    encoding: encoding as EncodingString | undefined,
+  })
+  return {blob: res.body.blob}
+}
+
 async function asBlob(uri: string): Promise<Blob> {
   return withSafeFile(uri, async safeUri => {
     // Note
diff --git a/src/lib/api/upload-blob.web.ts b/src/lib/api/upload-blob.web.ts
index d74e834647..0a58ad42f1 100644
--- a/src/lib/api/upload-blob.web.ts
+++ b/src/lib/api/upload-blob.web.ts
@@ -1,28 +1,42 @@
-import {type AtpAgent, type ComAtprotoRepoUploadBlob} from '@atproto/api'
+import {type BlobRef, type Client, type EncodingString} from '@atproto/lex'
+
+/**
+ * The blob-upload response body: `{blob}`. lex `Client.uploadBlob` returns the
+ * full XRPC response, so this helper unwraps `res.body` for callers.
+ */
+type UploadBlobResult = {blob: BlobRef}
 
 /**
  * @note It is recommended, on web, to use the `file` instance of the file
  * selector input element, rather than a `data:` URL, to avoid
  * loading the file into memory. `File` extends `Blob` "file" instances can
  * be passed directly to this function.
+ *
+ * @param encoding Passed as the lex upload option (NEVER a content-type header
+ * - lex-client throws if the encoding is set via headers).
  */
 export async function uploadBlob(
-  agent: AtpAgent,
+  client: Client,
   input: string | Blob,
   encoding?: string,
-): Promise<ComAtprotoRepoUploadBlob.Response> {
+): Promise<UploadBlobResult> {
+  /*
+   * The lex encoding option is a branded mime string (`${string}/${string}`);
+   * callers pass a plain mime string, so assert the brand here.
+   */
+  const enc = encoding as EncodingString | undefined
   if (
     typeof input === 'string' &&
     (input.startsWith('data:') || input.startsWith('blob:'))
   ) {
     const blob = await fetch(input).then(r => r.blob())
-    return agent.uploadBlob(blob, {encoding})
+    const res = await client.uploadBlob(blob, {encoding: enc})
+    return {blob: res.body.blob}
   }
 
   if (input instanceof Blob) {
-    return agent.uploadBlob(input, {
-      encoding,
-    })
+    const res = await client.uploadBlob(input, {encoding: enc})
+    return {blob: res.body.blob}
   }
 
   throw new TypeError(`Invalid uploadBlob input: ${typeof input}`)
diff --git a/src/screens/Onboarding/StepFinished/index.tsx b/src/screens/Onboarding/StepFinished/index.tsx
index 6f1dea3a4f..706a160003 100644
--- a/src/screens/Onboarding/StepFinished/index.tsx
+++ b/src/screens/Onboarding/StepFinished/index.tsx
@@ -15,6 +15,7 @@ import {Trans} from '@lingui/react/macro'
 import {useQueryClient} from '@tanstack/react-query'
 
 import {uploadBlob} from '#/lib/api'
+import {toLegacyBlobRef} from '#/lib/api/legacy-blob'
 import {
   BSKY_APP_ACCOUNT_DID,
   DISCOVER_SAVED_FEED,
@@ -153,7 +154,7 @@ export function StepFinished() {
           const {imageUri, imageMime} = profileStepResults
           const blobPromise =
             imageUri && imageMime
-              ? uploadBlob(agent, imageUri, imageMime)
+              ? uploadBlob(pdsClient, imageUri, imageMime)
               : undefined
 
           await agent.upsertProfile(async existing => {
@@ -161,8 +162,8 @@ export function StepFinished() {
 
             if (blobPromise) {
               const res = await blobPromise
-              if (res.data.blob) {
-                next.avatar = res.data.blob
+              if (res.blob) {
+                next.avatar = toLegacyBlobRef(res.blob)
               }
             }
 
diff --git a/src/state/queries/list.ts b/src/state/queries/list.ts
index ec551bc8e5..eef0dac585 100644
--- a/src/state/queries/list.ts
+++ b/src/state/queries/list.ts
@@ -1,5 +1,5 @@
 import {type AppBskyGraphDefs} from '@atproto/api'
-import {type $Typed, type Client, type l} from '@atproto/lex'
+import {type $Typed, type Client} from '@atproto/lex'
 import {
   type AtIdentifierString,
   AtUri,
@@ -56,7 +56,6 @@ export interface ListCreateMutateParams {
 export function useListCreateMutation() {
   const {currentAccount} = useSession()
   const queryClient = useQueryClient()
-  const agent = useAgent()
   const appviewClient = useAppviewClient()
   const pdsClient = usePdsClient()
   return useMutation<{uri: string; cid: string}, Error, ListCreateMutateParams>(
@@ -86,12 +85,8 @@ export function useListCreateMutation() {
           createdAt: toDatetimeString(new Date()),
         }
         if (avatar) {
-          const blobRes = await uploadBlob(agent, avatar.path, avatar.mime)
-          /*
-           * `uploadBlob` still returns the legacy `BlobRef` class instance;
-           * it moves to the client with the rest of the blob pipeline.
-           */
-          record.avatar = blobRes.data.blob as unknown as l.BlobRef
+          const blobRes = await uploadBlob(pdsClient, avatar.path, avatar.mime)
+          record.avatar = blobRes.blob
         }
         const res = await pdsClient.create(app.bsky.graph.list, record)
 
@@ -120,7 +115,6 @@ export interface ListMetadataMutateParams {
 }
 export function useListMetadataMutation() {
   const {currentAccount} = useSession()
-  const agent = useAgent()
   const appviewClient = useAppviewClient()
   const pdsClient = usePdsClient()
   const queryClient = useQueryClient()
@@ -149,8 +143,8 @@ export function useListMetadataMutation() {
       record.description = description
       record.descriptionFacets = descriptionFacets
       if (avatar) {
-        const blobRes = await uploadBlob(agent, avatar.path, avatar.mime)
-        record.avatar = blobRes.data.blob as unknown as l.BlobRef
+        const blobRes = await uploadBlob(pdsClient, avatar.path, avatar.mime)
+        record.avatar = blobRes.blob
       } else if (avatar === null) {
         record.avatar = undefined
       }
diff --git a/src/state/queries/profile.ts b/src/state/queries/profile.ts
index dea8d35eea..ae5d4b1ad6 100644
--- a/src/state/queries/profile.ts
+++ b/src/state/queries/profile.ts
@@ -7,7 +7,6 @@ import {
   type AppBskyGraphGetFollows,
   type AtpAgent,
   AtUri,
-  type ComAtprotoRepoUploadBlob,
   type Un$Typed,
 } from '@atproto/api'
 import {
@@ -25,6 +24,7 @@ import {
 } from '@tanstack/react-query'
 
 import {uploadBlob} from '#/lib/api'
+import {toLegacyBlobRef} from '#/lib/api/legacy-blob'
 import {until} from '#/lib/async/until'
 import {useToggleMutationQueue} from '#/lib/hooks/useToggleMutationQueue'
 import {updateProfileShadow} from '#/state/cache/profile-shadow'
@@ -149,6 +149,7 @@ interface ProfileUpdateParams {
 export function useProfileUpdateMutation() {
   const queryClient = useQueryClient()
   const agent = useAgent()
+  const pdsClient = usePdsClient()
   const updateProfileVerificationCache = useUpdateProfileVerificationCache()
   return useMutation<void, Error, ProfileUpdateParams>({
     mutationFn: async ({
@@ -158,22 +159,18 @@ export function useProfileUpdateMutation() {
       newUserBanner,
       checkCommitted,
     }) => {
-      let newUserAvatarPromise:
-        | Promise<ComAtprotoRepoUploadBlob.Response>
-        | undefined
+      let newUserAvatarPromise: ReturnType<typeof uploadBlob> | undefined
       if (newUserAvatar) {
         newUserAvatarPromise = uploadBlob(
-          agent,
+          pdsClient,
           newUserAvatar.path,
           newUserAvatar.mime,
         )
       }
-      let newUserBannerPromise:
-        | Promise<ComAtprotoRepoUploadBlob.Response>
-        | undefined
+      let newUserBannerPromise: ReturnType<typeof uploadBlob> | undefined
       if (newUserBanner) {
         newUserBannerPromise = uploadBlob(
-          agent,
+          pdsClient,
           newUserBanner.path,
           newUserBanner.mime,
         )
@@ -191,13 +188,13 @@ export function useProfileUpdateMutation() {
         }
         if (newUserAvatarPromise) {
           const res = await newUserAvatarPromise
-          next.avatar = res.data.blob
+          next.avatar = toLegacyBlobRef(res.blob)
         } else if (newUserAvatar === null) {
           next.avatar = undefined
         }
         if (newUserBannerPromise) {
           const res = await newUserBannerPromise
-          next.banner = res.data.blob
+          next.banner = toLegacyBlobRef(res.blob)
         } else if (newUserBanner === null) {
           next.banner = undefined
         }
diff --git a/src/view/com/composer/Composer.tsx b/src/view/com/composer/Composer.tsx
index c2e651556d..1388ce0c45 100644
--- a/src/view/com/composer/Composer.tsx
+++ b/src/view/com/composer/Composer.tsx
@@ -96,7 +96,12 @@ import {
 import {usePreferencesQuery} from '#/state/queries/preferences'
 import {useProfileQuery} from '#/state/queries/profile'
 import {resolveLinkQueryOptions} from '#/state/queries/resolve-link'
-import {useAgent, useAppviewClient, useSession} from '#/state/session'
+import {
+  useAgent,
+  useAppviewClient,
+  usePdsClient,
+  useSession,
+} from '#/state/session'
 import {useComposerControls} from '#/state/shell/composer'
 import {type ComposerOpts, type OnPostSuccessData} from '#/state/shell/composer'
 import {CharProgress} from '#/view/com/composer/char-progress/CharProgress'
@@ -277,6 +282,7 @@ export const ComposePost = ({
     : VIDEO_MAX_DURATION_MS
   const agent = useAgent()
   const client = useAppviewClient()
+  const pdsClient = usePdsClient()
   const queryClient = useQueryClient()
   const currentDid = currentAccount!.did
   const {closeComposer} = useComposerControls()
@@ -1084,6 +1090,7 @@ export const ComposePost = ({
           onStateChange: setPublishingStage,
           langs: currentLanguages,
           appviewClient: client,
+          pdsClient,
         })
       ).uris[0]
 
@@ -1279,6 +1286,7 @@ export const ComposePost = ({
     ax,
     agent,
     client,
+    pdsClient,
     canPost,
     isPublishing,
     currentLanguages,

From a4f2811f39f8fbbb515dc249f2c95e81918fbd18 Mon Sep 17 00:00:00 2001
From: Samuel Newman <mozzius@protonmail.com>
Date: Thu, 13 Aug 2026 22:26:20 +0300
Subject: [PATCH 22/32] [SDK] Add refreshSession and migrate the session-pinned
 infra (#11381)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
---
 oxlint-suppressions.json                      |   3 -
 src/ageAssurance/useBeginAgeAssurance.ts      |  32 +--
 .../ageAssurance/AgeAssuranceInitDialog.tsx   |  59 ++---
 .../EmailDialog/data/useConfirmEmail.ts       |  10 +-
 .../EmailDialog/data/useManageEmail2FA.ts     |  10 +-
 .../EmailDialog/data/useUpdateEmail.ts        |  31 ++-
 src/features/liveNow/index.tsx                |   5 +-
 src/lib/api/index.ts                          |   8 +-
 src/lib/api/legacy-blob.ts                    |  15 --
 src/lib/api/resolve.ts                        |   9 +-
 src/lib/constants.ts                          |  11 +-
 src/lib/link-meta/link-meta.ts                |   7 +-
 src/lib/media/video/multipart/types.ts        |   6 +-
 src/lib/media/video/multipart/upload.ts       |  32 ++-
 src/lib/media/video/upload.shared.ts          |  50 +++--
 src/lib/media/video/upload.ts                 |  20 +-
 src/lib/media/video/upload.web.ts             |  22 +-
 src/lib/media/video/util.ts                   |  24 ++-
 src/lib/notifications/notifications.ts        |  49 +++--
 src/screens/Deactivated.tsx                   |  39 ++--
 .../components/ChangeHandleDialog.tsx         |  10 +-
 .../components/DisableEmail2FADialog.tsx      |  24 ++-
 .../Settings/components/ExportCarDialog.tsx   |  51 +++--
 src/screens/SignupQueued.tsx                  |  31 +--
 .../provider-refresh-session-test.tsx         | 204 ++++++++++++++++++
 src/state/session/__tests__/session-test.ts   |   9 +-
 src/state/session/index.tsx                   |  47 ++++
 src/state/session/reducer.ts                  |  14 +-
 src/state/session/types.ts                    |  13 ++
 src/state/session/util.ts                     |  54 +++--
 src/view/com/composer/Composer.tsx            |  18 +-
 src/view/com/composer/state/video.ts          |  27 ++-
 32 files changed, 676 insertions(+), 268 deletions(-)
 create mode 100644 src/state/session/__tests__/provider-refresh-session-test.tsx

diff --git a/oxlint-suppressions.json b/oxlint-suppressions.json
index 5ffe12abbc..1d22db2747 100644
--- a/oxlint-suppressions.json
+++ b/oxlint-suppressions.json
@@ -848,9 +848,6 @@
     },
     "typescript/no-misused-promises": {
       "count": 1
-    },
-    "typescript/no-unsafe-member-access": {
-      "count": 1
     }
   },
   "src/screens/E2E/SharedPreferencesTesterScreen.tsx": {
diff --git a/src/ageAssurance/useBeginAgeAssurance.ts b/src/ageAssurance/useBeginAgeAssurance.ts
index 28a4591747..e6e79e348d 100644
--- a/src/ageAssurance/useBeginAgeAssurance.ts
+++ b/src/ageAssurance/useBeginAgeAssurance.ts
@@ -1,5 +1,4 @@
 import {Platform} from 'react-native'
-import {type AppBskyAgeassuranceBegin, AtpAgent} from '@atproto/api'
 import {useMutation} from '@tanstack/react-query'
 
 import {wait} from '#/lib/async/wait'
@@ -9,26 +8,28 @@ import {
   PUBLIC_APPVIEW_DID,
 } from '#/lib/constants'
 import {isNetworkError} from '#/lib/hooks/useCleanError'
-import {useAgent} from '#/state/session'
+import {createLexClient} from '#/lib/lexClient'
+import {usePdsClient} from '#/state/session'
 import {usePatchAgeAssuranceServerState} from '#/ageAssurance'
 import {logger} from '#/ageAssurance/logger'
 import {useAnalytics} from '#/analytics'
 import {BLUESKY_PROXY_DID} from '#/env'
 import {useGeolocation} from '#/geolocation'
+import {app, com} from '#/lexicons'
 
 const IS_DEV_ENV = BLUESKY_PROXY_DID !== PUBLIC_APPVIEW_DID
 const APPVIEW = IS_DEV_ENV ? DEV_ENV_APPVIEW : PUBLIC_APPVIEW
 
 export function useBeginAgeAssurance() {
   const ax = useAnalytics()
-  const agent = useAgent()
+  const pdsClient = usePdsClient()
   const geolocation = useGeolocation()
   const patchAgeAssuranceStateResponse = usePatchAgeAssuranceServerState()
 
   return useMutation({
     async mutationFn(
       props: Omit<
-        AppBskyAgeassuranceBegin.InputSchema,
+        app.bsky.ageassurance.begin.$InputBody,
         'countryCode' | 'regionCode'
       >,
     ) {
@@ -38,17 +39,22 @@ export function useBeginAgeAssurance() {
         throw new Error(`Geolocation not available, cannot init age assurance.`)
       }
 
-      const {
-        data: {token},
-      } = await agent.com.atproto.server.getServiceAuth({
+      const {token} = await pdsClient.call(com.atproto.server.getServiceAuth, {
         aud: BLUESKY_PROXY_DID,
         lxm: `app.bsky.ageassurance.begin`,
       })
 
-      const appView = new AtpAgent({service: APPVIEW})
-      appView.sessionManager.session = {...agent.session!}
-      appView.sessionManager.session.accessJwt = token
-      appView.sessionManager.session.refreshJwt = ''
+      /*
+       * A single-use client scoped to the service-auth token: it has no session,
+       * so nothing can refresh it, and the request goes straight to the appview
+       * with the token as a static `authorization` header. A raw client is
+       * allowed to preset that header where a session-backed one is not, which
+       * also makes the old `refreshJwt = ''` clone unnecessary.
+       */
+      const scopedClient = createLexClient({
+        service: APPVIEW,
+        headers: {authorization: `Bearer ${token}`},
+      })
 
       ax.metric('ageAssurance:api:begin', {
         platform: Platform.OS,
@@ -60,9 +66,9 @@ export function useBeginAgeAssurance() {
        * 2s wait is good actually. Email sending takes a hot sec and this helps
        * ensure the email is ready for the user once they open their inbox.
        */
-      const {data} = await wait(
+      const data = await wait(
         2e3,
-        appView.app.bsky.ageassurance.begin({
+        scopedClient.call(app.bsky.ageassurance.begin, {
           ...props,
           countryCode,
           regionCode,
diff --git a/src/components/ageAssurance/AgeAssuranceInitDialog.tsx b/src/components/ageAssurance/AgeAssuranceInitDialog.tsx
index 9d74b0c6dc..052c3a4731 100644
--- a/src/components/ageAssurance/AgeAssuranceInitDialog.tsx
+++ b/src/components/ageAssurance/AgeAssuranceInitDialog.tsx
@@ -1,6 +1,6 @@
 import {useState} from 'react'
 import {View} from 'react-native'
-import {XRPCError} from '@atproto/api'
+import {XrpcResponseError} from '@atproto/lex'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
@@ -14,6 +14,7 @@ import {
 import {useGetTimeAgo} from '#/lib/hooks/useTimeAgo'
 import {useTLDs} from '#/lib/hooks/useTLDs'
 import {isEmailMaybeInvalid} from '#/lib/strings/email'
+import {matchXrpcError} from '#/lib/xrpc-error'
 import {type AppLanguage} from '#/locale/languages'
 import {useLanguagePrefs} from '#/state/preferences'
 import {useSession} from '#/state/session'
@@ -33,6 +34,7 @@ import {Text} from '#/components/Typography'
 import {useAgeAssurance} from '#/ageAssurance'
 import {useBeginAgeAssurance} from '#/ageAssurance/useBeginAgeAssurance'
 import {useAnalytics} from '#/analytics'
+import {app} from '#/lexicons'
 
 export {useDialogControl} from '#/components/Dialog/context'
 
@@ -139,30 +141,37 @@ function Inner() {
         msg`Something went wrong, please try again`,
       )
 
-      if (e instanceof XRPCError) {
-        if (e.error === 'InvalidEmail') {
-          error = _(
-            msg`Please enter a valid, non-temporary email address. You may need to access this email in the future.`,
-          )
-          ax.metric('ageAssurance:initDialogError', {code: 'InvalidEmail'})
-        } else if (e.error === 'DidTooLong') {
-          error = (
-            <>
-              <Trans>
-                We're having issues initializing the age assurance process for
-                your account. Please{' '}
-                <SimpleInlineLinkText
-                  to={createSupportLink({code: SupportCode.AA_DID, email})}
-                  label={_(msg`Contact support`)}>
-                  contact support
-                </SimpleInlineLinkText>{' '}
-                for assistance.
-              </Trans>
-            </>
-          )
-          ax.metric('ageAssurance:initDialogError', {code: 'DidTooLong'})
-        } else {
-          ax.metric('ageAssurance:initDialogError', {code: 'other'})
+      if (e instanceof XrpcResponseError) {
+        switch (matchXrpcError(e, app.bsky.ageassurance.begin)) {
+          case 'InvalidEmail':
+            error = _(
+              msg`Please enter a valid, non-temporary email address. You may need to access this email in the future.`,
+            )
+            ax.metric('ageAssurance:initDialogError', {code: 'InvalidEmail'})
+            break
+          case 'DidTooLong':
+            error = (
+              <>
+                <Trans>
+                  We're having issues initializing the age assurance process for
+                  your account. Please{' '}
+                  <SimpleInlineLinkText
+                    to={createSupportLink({code: SupportCode.AA_DID, email})}
+                    label={_(msg`Contact support`)}>
+                    contact support
+                  </SimpleInlineLinkText>{' '}
+                  for assistance.
+                </Trans>
+              </>
+            )
+            ax.metric('ageAssurance:initDialogError', {code: 'DidTooLong'})
+            break
+          default:
+            /*
+             * An undeclared code keeps the generic message rather than surfacing
+             * the server's text, as the old `e.error` fallthrough did.
+             */
+            ax.metric('ageAssurance:initDialogError', {code: 'other'})
         }
       } else {
         const {clean, raw} = cleanError(e)
diff --git a/src/components/dialogs/EmailDialog/data/useConfirmEmail.ts b/src/components/dialogs/EmailDialog/data/useConfirmEmail.ts
index 67466be926..00472be52f 100644
--- a/src/components/dialogs/EmailDialog/data/useConfirmEmail.ts
+++ b/src/components/dialogs/EmailDialog/data/useConfirmEmail.ts
@@ -1,13 +1,15 @@
 import {useMutation} from '@tanstack/react-query'
 
-import {useAgent, useSession} from '#/state/session'
+import {usePdsClient, useSession, useSessionApi} from '#/state/session'
+import {com} from '#/lexicons'
 
 export function useConfirmEmail({
   onSuccess,
   onError,
 }: {onSuccess?: () => void; onError?: () => void} = {}) {
-  const agent = useAgent()
+  const pdsClient = usePdsClient()
   const {currentAccount} = useSession()
+  const {refreshSession} = useSessionApi()
 
   return useMutation({
     mutationFn: async ({token}: {token: string}) => {
@@ -15,12 +17,12 @@ export function useConfirmEmail({
         throw new Error('No email found for the current account')
       }
 
-      await agent.com.atproto.server.confirmEmail({
+      await pdsClient.call(com.atproto.server.confirmEmail, {
         email: currentAccount.email.trim(),
         token: token.trim(),
       })
       // will update session state at root of app
-      await agent.resumeSession(agent.session!)
+      await refreshSession()
     },
     onSuccess,
     onError,
diff --git a/src/components/dialogs/EmailDialog/data/useManageEmail2FA.ts b/src/components/dialogs/EmailDialog/data/useManageEmail2FA.ts
index 358bf86544..d00e487474 100644
--- a/src/components/dialogs/EmailDialog/data/useManageEmail2FA.ts
+++ b/src/components/dialogs/EmailDialog/data/useManageEmail2FA.ts
@@ -1,10 +1,12 @@
 import {useMutation} from '@tanstack/react-query'
 
-import {useAgent, useSession} from '#/state/session'
+import {usePdsClient, useSession, useSessionApi} from '#/state/session'
+import {com} from '#/lexicons'
 
 export function useManageEmail2FA() {
-  const agent = useAgent()
+  const pdsClient = usePdsClient()
   const {currentAccount} = useSession()
+  const {refreshSession} = useSessionApi()
 
   return useMutation({
     mutationFn: async ({
@@ -17,13 +19,13 @@ export function useManageEmail2FA() {
         throw new Error('No email found for the current account')
       }
 
-      await agent.com.atproto.server.updateEmail({
+      await pdsClient.call(com.atproto.server.updateEmail, {
         email: currentAccount.email,
         emailAuthFactor: enabled,
         token,
       })
       // will update session state at root of app
-      await agent.resumeSession(agent.session!)
+      await refreshSession()
     },
   })
 }
diff --git a/src/components/dialogs/EmailDialog/data/useUpdateEmail.ts b/src/components/dialogs/EmailDialog/data/useUpdateEmail.ts
index 2ec1eb6dc2..7293227f59 100644
--- a/src/components/dialogs/EmailDialog/data/useUpdateEmail.ts
+++ b/src/components/dialogs/EmailDialog/data/useUpdateEmail.ts
@@ -1,19 +1,26 @@
+import {type Client} from '@atproto/lex'
 import {useMutation} from '@tanstack/react-query'
 
-import {useAgent} from '#/state/session'
+import {usePdsClient, useSessionApi} from '#/state/session'
 import {useRequestEmailUpdate} from '#/components/dialogs/EmailDialog/data/useRequestEmailUpdate'
+import {com} from '#/lexicons'
 
 async function updateEmailAndRefreshSession(
-  agent: ReturnType<typeof useAgent>,
+  pdsClient: Client,
+  refreshSession: () => Promise<unknown>,
   email: string,
   token?: string,
 ) {
-  await agent.com.atproto.server.updateEmail({email: email.trim(), token})
-  await agent.resumeSession(agent.session!)
+  await pdsClient.call(com.atproto.server.updateEmail, {
+    email: email.trim(),
+    token,
+  })
+  await refreshSession()
 }
 
 export function useUpdateEmail() {
-  const agent = useAgent()
+  const pdsClient = usePdsClient()
+  const {refreshSession} = useSessionApi()
   const {mutateAsync: requestEmailUpdate} = useRequestEmailUpdate()
 
   return useMutation<
@@ -23,7 +30,12 @@ export function useUpdateEmail() {
   >({
     mutationFn: async ({email, token}: {email: string; token?: string}) => {
       if (token) {
-        await updateEmailAndRefreshSession(agent, email, token)
+        await updateEmailAndRefreshSession(
+          pdsClient,
+          refreshSession,
+          email,
+          token,
+        )
         return {
           status: 'success',
         }
@@ -34,7 +46,12 @@ export function useUpdateEmail() {
             status: 'tokenRequired',
           }
         } else {
-          await updateEmailAndRefreshSession(agent, email, token)
+          await updateEmailAndRefreshSession(
+            pdsClient,
+            refreshSession,
+            email,
+            token,
+          )
           return {
             status: 'success',
           }
diff --git a/src/features/liveNow/index.tsx b/src/features/liveNow/index.tsx
index 525e189ace..a9a14fc2d3 100644
--- a/src/features/liveNow/index.tsx
+++ b/src/features/liveNow/index.tsx
@@ -23,7 +23,7 @@ import {
   useMaybeProfileShadow,
 } from '#/state/cache/profile-shadow'
 import {useModerationOpts} from '#/state/preferences/moderation-opts'
-import {useAgent, usePdsClient, useSession} from '#/state/session'
+import {usePdsClient, useSession} from '#/state/session'
 import {useTickEveryMinute} from '#/state/shell'
 import {useDialogContext} from '#/components/Dialog'
 import * as Toast from '#/components/Toast'
@@ -194,7 +194,6 @@ export function useLiveLinkMetaQuery(url: string | null) {
   const liveNowConfig = useLiveNowConfig()
   const {_} = useLingui()
 
-  const agent = useAgent()
   return useQuery({
     enabled: !!url,
     queryKey: ['link-meta', url],
@@ -212,7 +211,7 @@ export function useLiveLinkMetaQuery(url: string | null) {
         )
       }
 
-      return await getLinkMeta(agent, url)
+      return await getLinkMeta(url)
     },
   })
 }
diff --git a/src/lib/api/index.ts b/src/lib/api/index.ts
index e52d4ec4fc..f13c227857 100644
--- a/src/lib/api/index.ts
+++ b/src/lib/api/index.ts
@@ -32,7 +32,6 @@ import {app, com} from '#/lexicons'
 import * as bsky from '#/types/bsky'
 import {createGIFDescription} from '../gif-alt-text'
 import {computeCid} from './computeCid'
-import {fromLegacyBlobRef} from './legacy-blob'
 import {uploadBlob} from './upload-blob'
 
 export {uploadBlob}
@@ -410,10 +409,11 @@ async function resolveMedia(
     return {
       $type: 'app.bsky.embed.video',
       /*
-       * The video pipeline still reads its blob off the legacy agent, so
-       * normalize it to the lex shape before it reaches the lex write.
+       * The video blob is a plain lex blob from the video pipeline
+       * (getJobStatus, in composer state/video). Its structural shape matches
+       * the lexicon blob field and the CID hasher (see computeCid).
        */
-      video: fromLegacyBlobRef(videoDraft.pendingPublish.blobRef),
+      video: videoDraft.pendingPublish.blobRef,
       alt: videoDraft.altText || undefined,
       captions: captions.length === 0 ? undefined : captions,
       aspectRatio,
diff --git a/src/lib/api/legacy-blob.ts b/src/lib/api/legacy-blob.ts
index a98e375d20..b60acadfe4 100644
--- a/src/lib/api/legacy-blob.ts
+++ b/src/lib/api/legacy-blob.ts
@@ -14,18 +14,3 @@ import {type BlobRef as LexBlobRef} from '@atproto/lex'
 export function toLegacyBlobRef(blob: LexBlobRef): BlobRef {
   return BlobRef.fromJsonRef(blob as Parameters<typeof BlobRef.fromJsonRef>[0])
 }
-
-/**
- * Normalize a legacy `BlobRef` class instance to the plain-JSON lex blob shape.
- *
- * Required for any blob that reaches a lex write: the lex serializer walks
- * plain objects, so a class instance goes on the wire with its internal
- * `original` field and no `$type`. `ipld()` yields exactly the lex shape, and
- * hashes identically (see `computeCid.test.ts` case 2b).
- *
- * Only the video pipeline still needs this - it reads its blob off the legacy
- * agent (`app.bsky.video.getJobStatus`). Drop it when the video client moves.
- */
-export function fromLegacyBlobRef(blob: BlobRef): LexBlobRef {
-  return blob.ipld()
-}
diff --git a/src/lib/api/resolve.ts b/src/lib/api/resolve.ts
index 476c0f1a20..67bc46284a 100644
--- a/src/lib/api/resolve.ts
+++ b/src/lib/api/resolve.ts
@@ -184,7 +184,7 @@ export async function resolveLink(
       view: res.data.starterPack,
     }
   }
-  return resolveExternal(agent, uri)
+  return resolveExternal(uri)
 
   // Forked from useGetPost. TODO: move into RQ.
   async function getPost({uri}: {uri: string}) {
@@ -258,11 +258,8 @@ function getFileSlug(url: string | undefined): string | undefined {
   return dotIndex > 0 ? filename.slice(0, dotIndex) : undefined
 }
 
-async function resolveExternal(
-  agent: AtpAgent,
-  uri: string,
-): Promise<ResolvedExternalLink> {
-  const result = await getLinkMeta(agent, uri)
+async function resolveExternal(uri: string): Promise<ResolvedExternalLink> {
+  const result = await getLinkMeta(uri)
   return {
     type: 'external',
     uri: result.url,
diff --git a/src/lib/constants.ts b/src/lib/constants.ts
index 156712c809..9fd7d12b47 100644
--- a/src/lib/constants.ts
+++ b/src/lib/constants.ts
@@ -279,9 +279,14 @@ export const DM_SERVICE_HEADERS = {
   'atproto-proxy': `${CHAT_PROXY_DID}#bsky_chat`,
 }
 
-export const BLUESKY_NOTIF_SERVICE_HEADERS = {
-  'atproto-proxy': `${BLUESKY_PROXY_DID}#bsky_notif`,
-}
+/**
+ * The notification service's proxy target, in the `did#service_id` form a lex
+ * client's per-call `service` option takes. Passing it emits `atproto-proxy:
+ * <this value>` on that one request, which is what routes push registration to
+ * the notification service (replaces the old
+ * `BLUESKY_NOTIF_SERVICE_HEADERS`).
+ */
+export const NOTIF_SERVICE: Service = `${BLUESKY_PROXY_DID}#bsky_notif`
 
 export const webLinks = {
   tos: `https://bsky.social/about/support/tos`,
diff --git a/src/lib/link-meta/link-meta.ts b/src/lib/link-meta/link-meta.ts
index c282a0c4c3..ee96d6db43 100644
--- a/src/lib/link-meta/link-meta.ts
+++ b/src/lib/link-meta/link-meta.ts
@@ -1,4 +1,4 @@
-import {type AppBskyEmbedExternal, type AtpAgent} from '@atproto/api'
+import {type AppBskyEmbedExternal} from '@atproto/api'
 
 import {LINK_META_PROXY} from '#/lib/constants'
 import {getGiphyMetaUri} from '#/lib/strings/embed-player'
@@ -31,7 +31,6 @@ export interface LinkMeta {
 }
 
 export async function getLinkMeta(
-  agent: AtpAgent,
   url: string,
   timeout = 15e3,
 ): Promise<LinkMeta> {
@@ -80,9 +79,7 @@ export async function getLinkMeta(
 
   try {
     const response = await fetch(
-      `${LINK_META_PROXY(agent.serviceUrl.toString() || '')}${encodeURIComponent(
-        url,
-      )}`,
+      `${LINK_META_PROXY('')}${encodeURIComponent(url)}`,
       {signal: controller.signal},
     )
 
diff --git a/src/lib/media/video/multipart/types.ts b/src/lib/media/video/multipart/types.ts
index 16817778c3..a0cfd216e3 100644
--- a/src/lib/media/video/multipart/types.ts
+++ b/src/lib/media/video/multipart/types.ts
@@ -1,3 +1,5 @@
+import {type app} from '#/lexicons'
+
 /**
  * One part of a multipart upload. `partNumber` is 1-indexed to match the S3
  * convention the backend uses.
@@ -57,13 +59,13 @@ export type UploadStatusResponse = {
   expiresAt: string
   state: UploadState
   completedJobId?: string
-  jobStatus?: import('@atproto/api').AppBskyVideoDefs.JobStatus
+  jobStatus?: app.bsky.video.defs.JobStatus
   failureReason?: string
 }
 
 export type FinishUploadResponse = {
   completedJobId: string
-  jobStatus: import('@atproto/api').AppBskyVideoDefs.JobStatus
+  jobStatus: app.bsky.video.defs.JobStatus
 }
 
 export type AbortUploadResponse = Pick<
diff --git a/src/lib/media/video/multipart/upload.ts b/src/lib/media/video/multipart/upload.ts
index 2b45e6d2c6..d3e5210873 100644
--- a/src/lib/media/video/multipart/upload.ts
+++ b/src/lib/media/video/multipart/upload.ts
@@ -1,9 +1,10 @@
-import {type AppBskyVideoDefs, type AtpAgent} from '@atproto/api'
+import {type Client} from '@atproto/lex'
 import {nanoid} from 'nanoid/non-secure'
 
 import {AbortError} from '#/lib/async/cancelable'
 import {type CompressedVideo} from '#/lib/media/video/types'
 import {shouldRetryError} from '#/lib/strings/errors'
+import {type app} from '#/lexicons'
 import {getServiceAuthToken} from '../upload.shared'
 import {mimeToExt} from '../util'
 import {
@@ -29,19 +30,22 @@ export class MultipartFallbackError extends Error {}
 
 export async function uploadVideoMultipart({
   video,
-  agent,
+  client,
+  dispatchUrl,
   setProgress,
   signal,
   onStarted,
 }: {
   video: CompressedVideo
-  agent: AtpAgent
+  client: Client
+  /** The account's PDS/dispatch URL, for the uploadBlob service-auth token. */
+  dispatchUrl: string | URL
   setProgress: (progress: number) => void
   signal: AbortSignal
   onStarted?: () => void
-}): Promise<AppBskyVideoDefs.JobStatus> {
+}): Promise<app.bsky.video.defs.JobStatus> {
   throwIfAborted(signal)
-  const tokenProvider = createTokenProvider(agent, signal)
+  const tokenProvider = createTokenProvider(client, dispatchUrl, signal)
   const token = await tokenProvider.get()
   const name = `${nanoid(12)}.${mimeToExt(video.mimeType)}`
   let session
@@ -134,7 +138,7 @@ async function finishAndRecover({
   getToken: (forceRefresh?: boolean) => Promise<string>
   signal: AbortSignal
   resendMissingParts: (receivedPartNumbers: number[]) => Promise<boolean>
-}): Promise<AppBskyVideoDefs.JobStatus> {
+}): Promise<app.bsky.video.defs.JobStatus> {
   let createdFailures = 0
   let forceTokenRefresh = true
   while (true) {
@@ -224,7 +228,7 @@ async function abortThenFallbackOrResolve(
   jobId: string,
   token: string,
   cause: unknown,
-): Promise<AppBskyVideoDefs.JobStatus> {
+): Promise<app.bsky.video.defs.JobStatus> {
   const result = await abortUploadWithRetry(jobId, token)
   if (result.state === 'aborted') {
     throw new MultipartFallbackError(
@@ -264,7 +268,11 @@ async function abortUploadWithRetry(jobId: string, token: string) {
   throw lastError
 }
 
-function createTokenProvider(agent: AtpAgent, signal: AbortSignal) {
+function createTokenProvider(
+  client: Client,
+  dispatchUrl: string | URL,
+  signal: AbortSignal,
+) {
   let token: string | undefined
   let expiresAt = 0
   let refresh: Promise<string> | undefined
@@ -273,7 +281,7 @@ function createTokenProvider(agent: AtpAgent, signal: AbortSignal) {
     if (!forceRefresh && token && Date.now() < expiresAt - 60_000) return token
     if (!refresh) {
       const exp = Math.floor(Date.now() / 1000) + 60 * 30
-      refresh = getServiceAuthTokenWithRetry(agent, exp, signal)
+      refresh = getServiceAuthTokenWithRetry(client, dispatchUrl, exp, signal)
         .then(nextToken => {
           token = nextToken
           expiresAt = exp * 1000
@@ -290,7 +298,8 @@ function createTokenProvider(agent: AtpAgent, signal: AbortSignal) {
 }
 
 async function getServiceAuthTokenWithRetry(
-  agent: AtpAgent,
+  client: Client,
+  dispatchUrl: string | URL,
   exp: number,
   signal: AbortSignal,
 ) {
@@ -299,7 +308,8 @@ async function getServiceAuthTokenWithRetry(
     throwIfAborted(signal)
     try {
       return await getServiceAuthToken({
-        agent,
+        client,
+        dispatchUrl,
         lxm: 'com.atproto.repo.uploadBlob',
         exp,
       })
diff --git a/src/lib/media/video/upload.shared.ts b/src/lib/media/video/upload.shared.ts
index f8aaa1249b..9e8d99a185 100644
--- a/src/lib/media/video/upload.shared.ts
+++ b/src/lib/media/video/upload.shared.ts
@@ -1,44 +1,62 @@
-import {type AtpAgent} from '@atproto/api'
+import {type Client} from '@atproto/lex'
+import {type DidString, type NsidString} from '@atproto/syntax'
 import {type I18n} from '@lingui/core'
 import {msg} from '@lingui/core/macro'
 
 import {VIDEO_SERVICE_DID} from '#/lib/constants'
 import {UploadLimitError} from '#/lib/media/video/errors'
 import {getServiceAuthAudFromUrl} from '#/lib/strings/url-helpers'
-import {createVideoAgent} from './util'
+import {app, com} from '#/lexicons'
+import {createVideoServiceClient} from './util'
 
 export async function getServiceAuthToken({
-  agent,
+  client,
+  dispatchUrl,
   aud,
   lxm,
   exp,
 }: {
-  agent: AtpAgent
+  client: Client
+  /**
+   * The account's dispatch URL (the old `agent.dispatchUrl`: its PDS, falling
+   * back to the account service). Only needed when `aud` is omitted, so the
+   * default audience can be derived from the PDS host. A lex {@link Client} does
+   * not expose this - it resolves the PDS per request internally - so the caller,
+   * which holds the session, passes it in.
+   */
+  dispatchUrl?: string | URL
   aud?: string
-  lxm: string
+  lxm: NsidString
   exp?: number
 }) {
-  const pdsAud = getServiceAuthAudFromUrl(agent.dispatchUrl)
-  if (!pdsAud) {
-    throw new Error('Agent does not have a PDS URL')
+  let resolvedAud = aud
+  if (!resolvedAud) {
+    if (!dispatchUrl) {
+      throw new Error('Missing service auth audience: no aud or dispatchUrl')
+    }
+    const pdsAud = getServiceAuthAudFromUrl(dispatchUrl)
+    if (!pdsAud) {
+      throw new Error('Agent does not have a PDS URL')
+    }
+    resolvedAud = pdsAud
   }
-  const {data: serviceAuth} = await agent.com.atproto.server.getServiceAuth({
-    aud: aud ?? pdsAud,
+  const {token} = await client.call(com.atproto.server.getServiceAuth, {
+    aud: resolvedAud as DidString,
     lxm,
     exp,
   })
-  return serviceAuth.token
+  return token
 }
 
-export async function getVideoUploadLimits(agent: AtpAgent, i18n: I18n) {
+export async function getVideoUploadLimits(client: Client, i18n: I18n) {
   const token = await getServiceAuthToken({
-    agent,
+    client,
     lxm: 'app.bsky.video.getUploadLimits',
     aud: VIDEO_SERVICE_DID,
   })
-  const videoAgent = createVideoAgent()
-  const {data: limits} = await videoAgent.app.bsky.video
-    .getUploadLimits({}, {headers: {Authorization: `Bearer ${token}`}})
+  const videoClient = createVideoServiceClient(token)
+  const limits = await videoClient
+    .call(app.bsky.video.getUploadLimits)
     .catch(err => {
       if (err instanceof Error) {
         throw new UploadLimitError(err.message)
diff --git a/src/lib/media/video/upload.ts b/src/lib/media/video/upload.ts
index b91ad7a153..287c8f09c6 100644
--- a/src/lib/media/video/upload.ts
+++ b/src/lib/media/video/upload.ts
@@ -1,5 +1,5 @@
 import {createUploadTask, FileSystemUploadType} from 'expo-file-system/legacy'
-import {type AppBskyVideoDefs, type AtpAgent} from '@atproto/api'
+import {type Client} from '@atproto/lex'
 import {type I18n} from '@lingui/core'
 import {msg} from '@lingui/core/macro'
 import {nanoid} from 'nanoid/non-secure'
@@ -11,13 +11,15 @@ import {
   type VideoUploadTransport,
 } from '#/lib/media/video/types'
 import {Features, features} from '#/analytics/features'
+import {type app} from '#/lexicons'
 import {MultipartFallbackError, uploadVideoMultipart} from './multipart/upload'
 import {getServiceAuthToken, getVideoUploadLimits} from './upload.shared'
 import {createVideoEndpointUrl, mimeToExt} from './util'
 
 export async function uploadVideo({
   video,
-  agent,
+  client,
+  dispatchUrl,
   did,
   setProgress,
   signal,
@@ -25,7 +27,9 @@ export async function uploadVideo({
   onTransport,
 }: {
   video: CompressedVideo
-  agent: AtpAgent
+  client: Client
+  /** The account's PDS/dispatch URL, for the uploadBlob service-auth token. */
+  dispatchUrl: string | URL
   did: string
   setProgress: (progress: number) => void
   signal: AbortSignal
@@ -35,13 +39,14 @@ export async function uploadVideo({
   if (signal.aborted) {
     throw new AbortError()
   }
-  await getVideoUploadLimits(agent, i18n)
+  await getVideoUploadLimits(client, i18n)
 
   if (features.isOn(Features.VideoMultipartUploadEnable)) {
     try {
       return await uploadVideoMultipart({
         video,
-        agent,
+        client,
+        dispatchUrl,
         setProgress,
         signal,
         onStarted: () => onTransport?.('multipart'),
@@ -64,7 +69,8 @@ export async function uploadVideo({
     throw new AbortError()
   }
   const token = await getServiceAuthToken({
-    agent,
+    client,
+    dispatchUrl,
     lxm: 'com.atproto.repo.uploadBlob',
     exp: Date.now() / 1000 + 60 * 30, // 30 minutes
   })
@@ -91,7 +97,7 @@ export async function uploadVideo({
     throw new Error('No response')
   }
 
-  const responseBody = JSON.parse(res.body) as AppBskyVideoDefs.JobStatus
+  const responseBody = JSON.parse(res.body) as app.bsky.video.defs.JobStatus
 
   if (!responseBody.jobId) {
     throw new ServerError(
diff --git a/src/lib/media/video/upload.web.ts b/src/lib/media/video/upload.web.ts
index cfefbd797d..90c10a0684 100644
--- a/src/lib/media/video/upload.web.ts
+++ b/src/lib/media/video/upload.web.ts
@@ -1,4 +1,4 @@
-import {type AppBskyVideoDefs, type AtpAgent} from '@atproto/api'
+import {type Client} from '@atproto/lex'
 import {type I18n} from '@lingui/core'
 import {msg} from '@lingui/core/macro'
 import {nanoid} from 'nanoid/non-secure'
@@ -10,13 +10,15 @@ import {
   type VideoUploadTransport,
 } from '#/lib/media/video/types'
 import {Features, features} from '#/analytics/features'
+import {type app} from '#/lexicons'
 import {MultipartFallbackError, uploadVideoMultipart} from './multipart/upload'
 import {getServiceAuthToken, getVideoUploadLimits} from './upload.shared'
 import {createVideoEndpointUrl, mimeToExt} from './util'
 
 export async function uploadVideo({
   video,
-  agent,
+  client,
+  dispatchUrl,
   did,
   setProgress,
   signal,
@@ -24,7 +26,9 @@ export async function uploadVideo({
   onTransport,
 }: {
   video: CompressedVideo
-  agent: AtpAgent
+  client: Client
+  /** The account's PDS/dispatch URL, for the uploadBlob service-auth token. */
+  dispatchUrl: string | URL
   did: string
   setProgress: (progress: number) => void
   signal: AbortSignal
@@ -34,13 +38,14 @@ export async function uploadVideo({
   if (signal.aborted) {
     throw new AbortError()
   }
-  await getVideoUploadLimits(agent, i18n)
+  await getVideoUploadLimits(client, i18n)
 
   if (features.isOn(Features.VideoMultipartUploadEnable)) {
     try {
       return await uploadVideoMultipart({
         video,
-        agent,
+        client,
+        dispatchUrl,
         setProgress,
         signal,
         onStarted: () => onTransport?.('multipart'),
@@ -71,7 +76,8 @@ export async function uploadVideo({
     throw new AbortError()
   }
   const token = await getServiceAuthToken({
-    agent,
+    client,
+    dispatchUrl,
     lxm: 'com.atproto.repo.uploadBlob',
     exp: Date.now() / 1000 + 60 * 30, // 30 minutes
   })
@@ -80,7 +86,7 @@ export async function uploadVideo({
     throw new AbortError()
   }
   const xhr = new XMLHttpRequest()
-  const res = await new Promise<AppBskyVideoDefs.JobStatus>(
+  const res = await new Promise<app.bsky.video.defs.JobStatus>(
     (resolve, reject) => {
       xhr.upload.addEventListener('progress', e => {
         const progress = e.loaded / e.total
@@ -92,7 +98,7 @@ export async function uploadVideo({
         } else if (xhr.readyState === 4) {
           const uploadRes = JSON.parse(
             xhr.responseText,
-          ) as AppBskyVideoDefs.JobStatus
+          ) as app.bsky.video.defs.JobStatus
           resolve(uploadRes)
         } else {
           reject(new ServerError(i18n._(msg`Failed to upload video`)))
diff --git a/src/lib/media/video/util.ts b/src/lib/media/video/util.ts
index 236f0cff3e..7c9686a7f4 100644
--- a/src/lib/media/video/util.ts
+++ b/src/lib/media/video/util.ts
@@ -1,6 +1,5 @@
-import {AtpAgent} from '@atproto/api'
-
 import {type SupportedMimeTypes, VIDEO_SERVICE} from '#/lib/constants'
+import {createLexClient} from '#/lib/lexClient'
 
 export const createVideoEndpointUrl = (
   route: string,
@@ -16,12 +15,29 @@ export const createVideoEndpointUrl = (
   return url.href
 }
 
-export function createVideoAgent() {
-  return new AtpAgent({
+/**
+ * A non-refreshing single-use lex {@link Client} scoped to the video service and
+ * authenticated by a per-call service-auth token. It has no session, so nothing
+ * can refresh it: requests go straight to the video service with the token as a
+ * static `authorization` header, which a raw client - unlike a session-backed
+ * one - is allowed to preset. Mirrors the scoped client in
+ * `#/ageAssurance/useBeginAgeAssurance`.
+ */
+export function createVideoServiceClient(token: string) {
+  return createLexClient({
     service: VIDEO_SERVICE,
+    headers: {authorization: `Bearer ${token}`},
   })
 }
 
+/**
+ * An unauthenticated lex {@link Client} scoped to the video service, for public
+ * reads like `getJobStatus` polling.
+ */
+export function createTokenlessVideoServiceClient() {
+  return createLexClient({service: VIDEO_SERVICE})
+}
+
 export function mimeToExt(mimeType: SupportedMimeTypes | (string & {})) {
   switch (mimeType) {
     case 'video/mp4':
diff --git a/src/lib/notifications/notifications.ts b/src/lib/notifications/notifications.ts
index 6351a8d8e1..5acc6ab06d 100644
--- a/src/lib/notifications/notifications.ts
+++ b/src/lib/notifications/notifications.ts
@@ -2,33 +2,47 @@ import {useCallback, useEffect} from 'react'
 import {Platform} from 'react-native'
 import * as Notifications from 'expo-notifications'
 import {getBadgeCountAsync, setBadgeCountAsync} from 'expo-notifications'
-import {type AppBskyNotificationRegisterPush, type AtpAgent} from '@atproto/api'
+import {type Client} from '@atproto/lex'
 import debounce from 'lodash.debounce'
 
 import {
-  BLUESKY_NOTIF_SERVICE_HEADERS,
+  NOTIF_SERVICE,
   PUBLIC_APPVIEW_DID,
   PUBLIC_STAGING_APPVIEW_DID,
 } from '#/lib/constants'
 import {logger as notyLogger} from '#/lib/notifications/util'
 import {isNetworkError} from '#/lib/strings/errors'
-import {type SessionAccount, useAgent, useSession} from '#/state/session'
+import {type SessionAccount, usePdsClient, useSession} from '#/state/session'
 import BackgroundNotificationHandler from '#/../modules/expo-background-notification-handler'
 import {useAgeAssurance} from '#/ageAssurance'
 import {useAnalytics} from '#/analytics'
 import {IS_DEV, IS_NATIVE} from '#/env'
+import {app} from '#/lexicons'
+
+/**
+ * A resumed single-use account client paired with the account's service origin
+ * and handle. Produced by `createTemporaryClientsAndResume` (session util) and
+ * consumed by {@link unregisterPushToken}, which needs the service host to pick
+ * the appview DID and the handle for a debug log line without reaching into the
+ * session internals.
+ */
+export type TemporaryPushClient = {
+  client: Client
+  service: string
+  handle: string
+}
 
 /**
  * @private
  * Registers the device's push notification token with the Bluesky server.
  */
 async function _registerPushToken({
-  agent,
+  client,
   currentAccount,
   token,
   extra = {},
 }: {
-  agent: AtpAgent
+  client: Client
   currentAccount: SessionAccount
   token: Notifications.DevicePushToken
   extra?: {
@@ -36,7 +50,7 @@ async function _registerPushToken({
   }
 }) {
   try {
-    const payload: AppBskyNotificationRegisterPush.InputSchema = {
+    const payload: app.bsky.notification.registerPush.$InputBody = {
       serviceDid: currentAccount.service?.includes('staging')
         ? PUBLIC_STAGING_APPVIEW_DID
         : PUBLIC_APPVIEW_DID,
@@ -48,8 +62,8 @@ async function _registerPushToken({
 
     notyLogger.debug(`registerPushToken: registering`, {...payload})
 
-    await agent.app.bsky.notification.registerPush(payload, {
-      headers: BLUESKY_NOTIF_SERVICE_HEADERS,
+    await client.call(app.bsky.notification.registerPush, payload, {
+      service: NOTIF_SERVICE,
     })
 
     notyLogger.debug(`registerPushToken: success`)
@@ -74,7 +88,7 @@ const _registerPushTokenDebounced = debounce(_registerPushToken, 100)
  * `_registerPushTokenDebounced` directly.
  */
 export function useRegisterPushToken() {
-  const agent = useAgent()
+  const client = usePdsClient()
   const {currentAccount} = useSession()
 
   return useCallback(
@@ -87,7 +101,7 @@ export function useRegisterPushToken() {
     }) => {
       if (!currentAccount) return
       return _registerPushTokenDebounced({
-        agent,
+        client,
         currentAccount,
         token,
         extra: {
@@ -95,7 +109,7 @@ export function useRegisterPushToken() {
         },
       })
     },
-    [agent, currentAccount],
+    [client, currentAccount],
   )
 }
 
@@ -326,16 +340,17 @@ export async function resetBadgeCount() {
   await setBadgeCountAsync(0)
 }
 
-export async function unregisterPushToken(agents: AtpAgent[]) {
+export async function unregisterPushToken(clients: TemporaryPushClient[]) {
   if (!IS_NATIVE) return
 
   try {
     const token = await getPushToken()
     if (token) {
-      for (const agent of agents) {
-        await agent.app.bsky.notification.unregisterPush(
+      for (const {client, service, handle} of clients) {
+        await client.call(
+          app.bsky.notification.unregisterPush,
           {
-            serviceDid: agent.serviceUrl.hostname.includes('staging')
+            serviceDid: service.includes('staging')
               ? PUBLIC_STAGING_APPVIEW_DID
               : PUBLIC_APPVIEW_DID,
             platform: Platform.OS,
@@ -343,10 +358,10 @@ export async function unregisterPushToken(agents: AtpAgent[]) {
             appId: 'xyz.blueskyweb.app',
           },
           {
-            headers: BLUESKY_NOTIF_SERVICE_HEADERS,
+            service: NOTIF_SERVICE,
           },
         )
-        notyLogger.debug(`Push token unregistered for ${agent.session?.handle}`)
+        notyLogger.debug(`Push token unregistered for ${handle}`)
       }
     } else {
       notyLogger.debug('Tried to unregister push token, but could not find one')
diff --git a/src/screens/Deactivated.tsx b/src/screens/Deactivated.tsx
index 2782c5ef0d..3be42add78 100644
--- a/src/screens/Deactivated.tsx
+++ b/src/screens/Deactivated.tsx
@@ -7,10 +7,11 @@ import {Trans} from '@lingui/react/macro'
 import {useQueryClient} from '@tanstack/react-query'
 
 import {useAccountSwitcher} from '#/lib/hooks/useAccountSwitcher'
+import {isErrorMaybeAppPasswordPermissions} from '#/lib/strings/errors'
 import {logger} from '#/logger'
 import {
   type SessionAccount,
-  useAgent,
+  usePdsClient,
   useSession,
   useSessionApi,
 } from '#/state/session'
@@ -25,6 +26,7 @@ import * as Layout from '#/components/Layout'
 import {Loader} from '#/components/Loader'
 import {Text} from '#/components/Typography'
 import {IS_WEB} from '#/env'
+import {com} from '#/lexicons'
 
 const COL_WIDTH = 400
 
@@ -36,8 +38,8 @@ export function Deactivated() {
   const {onPressSwitchAccount, pendingDid} = useAccountSwitcher()
   const {setShowLoggedOut} = useLoggedOutViewControls()
   const hasOtherAccounts = accounts.length > 1
-  const {logoutCurrentAccount} = useSessionApi()
-  const agent = useAgent()
+  const {logoutCurrentAccount, refreshSession} = useSessionApi()
+  const pdsClient = usePdsClient()
   const [pending, setPending] = useState(false)
   const [error, setError] = useState<string | undefined>()
   const queryClient = useQueryClient()
@@ -70,21 +72,24 @@ export function Deactivated() {
   const handleActivate = useCallback(async () => {
     try {
       setPending(true)
-      await agent.com.atproto.server.activateAccount()
+      await pdsClient.call(com.atproto.server.activateAccount)
       await queryClient.resetQueries()
-      await agent.resumeSession(agent.session!)
+      await refreshSession()
     } catch (e: any) {
-      switch (e.message) {
-        case 'Bad token scope':
-          setError(
-            _(
-              msg`You're signed in with an App Password. Please sign in with your main password to continue deactivating your account.`,
-            ),
-          )
-          break
-        default:
-          setError(_(msg`Something went wrong, please try again`))
-          break
+      /*
+       * `activateAccount` declares no lexicon errors, so the app-password case
+       * arrives as an undeclared code plus a message. The shared helper matches
+       * both that and the plain-string form the old exact `e.message` switch
+       * relied on.
+       */
+      if (isErrorMaybeAppPasswordPermissions(e)) {
+        setError(
+          _(
+            msg`You're signed in with an App Password. Please sign in with your main password to continue deactivating your account.`,
+          ),
+        )
+      } else {
+        setError(_(msg`Something went wrong, please try again`))
       }
 
       logger.error(e, {
@@ -93,7 +98,7 @@ export function Deactivated() {
     } finally {
       setPending(false)
     }
-  }, [_, agent, setPending, setError, queryClient])
+  }, [_, pdsClient, refreshSession, setPending, setError, queryClient])
 
   return (
     <View style={[a.util_screen_outer, a.flex_1]}>
diff --git a/src/screens/Settings/components/ChangeHandleDialog.tsx b/src/screens/Settings/components/ChangeHandleDialog.tsx
index 1b31a7de2a..a8c9474410 100644
--- a/src/screens/Settings/components/ChangeHandleDialog.tsx
+++ b/src/screens/Settings/components/ChangeHandleDialog.tsx
@@ -27,7 +27,7 @@ import {useFetchDid, useUpdateHandleMutation} from '#/state/queries/handle'
 import {RQKEY as RQKEY_PROFILE} from '#/state/queries/profile'
 import {useServiceQuery} from '#/state/queries/service'
 import {useCurrentAccountProfile} from '#/state/queries/useCurrentAccountProfile'
-import {useAgent, useSession} from '#/state/session'
+import {useAgent, useSession, useSessionApi} from '#/state/session'
 import {ErrorScreen} from '#/view/com/util/error/ErrorScreen'
 import {atoms as a, native, useBreakpoints, useTheme} from '#/alf'
 import {Admonition} from '#/components/Admonition'
@@ -152,7 +152,7 @@ function ProvidedHandlePage({
 }) {
   const {_} = useLingui()
   const [subdomain, setSubdomain] = useState('')
-  const agent = useAgent()
+  const {refreshSession} = useSessionApi()
   const control = Dialog.useDialogContext()
   const {currentAccount} = useSession()
   const queryClient = useQueryClient()
@@ -173,7 +173,7 @@ function ProvidedHandlePage({
           queryKey: RQKEY_PROFILE(currentAccount.did),
         })
       }
-      agent.resumeSession(agent.session!).then(() => control.close())
+      refreshSession().then(() => control.close())
     },
   })
 
@@ -311,7 +311,7 @@ function OwnHandlePage({goToServiceHandle}: {goToServiceHandle: () => void}) {
   const {currentAccount} = useSession()
   const [dnsPanel, setDNSPanel] = useState(true)
   const [domain, setDomain] = useState('')
-  const agent = useAgent()
+  const {refreshSession} = useSessionApi()
   const control = Dialog.useDialogContext()
   const fetchDid = useFetchDid()
   const queryClient = useQueryClient()
@@ -328,7 +328,7 @@ function OwnHandlePage({goToServiceHandle}: {goToServiceHandle: () => void}) {
           queryKey: RQKEY_PROFILE(currentAccount.did),
         })
       }
-      agent.resumeSession(agent.session!).then(() => control.close())
+      refreshSession().then(() => control.close())
     },
   })
 
diff --git a/src/screens/Settings/components/DisableEmail2FADialog.tsx b/src/screens/Settings/components/DisableEmail2FADialog.tsx
index 8b774b54f7..c633c82029 100644
--- a/src/screens/Settings/components/DisableEmail2FADialog.tsx
+++ b/src/screens/Settings/components/DisableEmail2FADialog.tsx
@@ -5,7 +5,8 @@ import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
 
 import {cleanError} from '#/lib/strings/errors'
-import {useAgent, useSession} from '#/state/session'
+import {matchXrpcError} from '#/lib/xrpc-error'
+import {usePdsClient, useSession, useSessionApi} from '#/state/session'
 import {ErrorMessage} from '#/view/com/util/error/ErrorMessage'
 import {atoms as a, useBreakpoints, useTheme} from '#/alf'
 import {Button, ButtonIcon, ButtonText} from '#/components/Button'
@@ -16,6 +17,7 @@ import {Loader} from '#/components/Loader'
 import * as Toast from '#/components/Toast'
 import {P, Text} from '#/components/Typography'
 import {IS_NATIVE} from '#/env'
+import {com} from '#/lexicons'
 
 enum Stages {
   Email,
@@ -31,7 +33,8 @@ export function DisableEmail2FADialog({
   const t = useTheme()
   const {gtMobile} = useBreakpoints()
   const {currentAccount} = useSession()
-  const agent = useAgent()
+  const pdsClient = usePdsClient()
+  const {refreshSession} = useSessionApi()
 
   const [stage, setStage] = useState<Stages>(Stages.Email)
   const [confirmationCode, setConfirmationCode] = useState<string>('')
@@ -42,7 +45,7 @@ export function DisableEmail2FADialog({
     setError('')
     setIsProcessing(true)
     try {
-      await agent.com.atproto.server.requestEmailUpdate()
+      await pdsClient.call(com.atproto.server.requestEmailUpdate)
       setStage(Stages.ConfirmCode)
     } catch (e) {
       setError(cleanError(String(e)))
@@ -56,21 +59,26 @@ export function DisableEmail2FADialog({
     setIsProcessing(true)
     try {
       if (currentAccount?.email) {
-        await agent.com.atproto.server.updateEmail({
+        await pdsClient.call(com.atproto.server.updateEmail, {
           email: currentAccount.email,
           token: confirmationCode.trim(),
           emailAuthFactor: false,
         })
-        await agent.resumeSession(agent.session!)
+        await refreshSession()
         Toast.show(_(msg({message: 'Email 2FA disabled', context: 'toast'})))
       }
       control.close()
     } catch (e) {
-      const errMsg = String(e)
-      if (errMsg.includes('Token is invalid')) {
+      /*
+       * The old check matched the PDS message "Token is invalid"; the lexicon
+       * declares that case as `InvalidToken`, so match the code instead.
+       */
+      if (
+        matchXrpcError(e, com.atproto.server.updateEmail) === 'InvalidToken'
+      ) {
         setError(_(msg`Invalid 2FA confirmation code.`))
       } else {
-        setError(cleanError(errMsg))
+        setError(cleanError(e))
       }
     } finally {
       setIsProcessing(false)
diff --git a/src/screens/Settings/components/ExportCarDialog.tsx b/src/screens/Settings/components/ExportCarDialog.tsx
index 13b60dfdaa..6f28aa340f 100644
--- a/src/screens/Settings/components/ExportCarDialog.tsx
+++ b/src/screens/Settings/components/ExportCarDialog.tsx
@@ -1,11 +1,11 @@
 import {useCallback, useState} from 'react'
 import {View} from 'react-native'
+import {type DidString} from '@atproto/syntax'
 import {Trans, useLingui} from '@lingui/react/macro'
 
-import {DM_SERVICE_HEADERS} from '#/lib/constants'
 import {saveBytesToDisk} from '#/lib/media/manip'
 import {logger} from '#/logger'
-import {useAgent} from '#/state/session'
+import {useChatClient, usePdsClient, useSession} from '#/state/session'
 import {atoms as a, useTheme, web} from '#/alf'
 import {Button, ButtonIcon, ButtonText} from '#/components/Button'
 import * as Dialog from '#/components/Dialog'
@@ -14,6 +14,7 @@ import {InlineLinkText} from '#/components/Link'
 import {Loader} from '#/components/Loader'
 import * as Toast from '#/components/Toast'
 import {Text} from '#/components/Typography'
+import {chat, com} from '#/lexicons'
 
 export function ExportCarDialog({
   control,
@@ -22,21 +23,29 @@ export function ExportCarDialog({
 }) {
   const {t: l} = useLingui()
   const t = useTheme()
-  const agent = useAgent()
+  const {currentAccount} = useSession()
+  const pdsClient = usePdsClient()
+  const chatClient = useChatClient()
   const [loading, setLoading] = useState<'repo' | 'chat' | false>(false)
 
   const download = useCallback(async () => {
-    if (!agent.session) {
+    if (!currentAccount) {
       return // shouldn't ever happen
     }
     try {
       setLoading('repo')
-      const did = agent.session.did
-      const downloadRes = await agent.com.atproto.sync.getRepo({did})
+      const did = currentAccount.did as DidString
+      const data = await pdsClient.call(com.atproto.sync.getRepo, {did})
+      /*
+       * getRepo declares `application/vnd.ipld.car`, so lex-client hands back
+       * the raw bytes unparsed and does not surface the response content-type.
+       * The old code already fell back to this same constant when the header was
+       * absent, and the endpoint always returns CAR.
+       */
       const saveRes = await saveBytesToDisk(
         'repo.car',
-        downloadRes.data,
-        downloadRes.headers['content-type'] || 'application/vnd.ipld.car',
+        data,
+        'application/vnd.ipld.car',
       )
 
       if (saveRes) {
@@ -48,28 +57,26 @@ export function ExportCarDialog({
     } finally {
       setLoading(false)
     }
-  }, [l, agent])
+  }, [l, currentAccount, pdsClient])
 
   const downloadChatData = useCallback(async () => {
-    if (!agent.session) {
+    if (!currentAccount) {
       return
     }
     try {
       setLoading('chat')
-      // Using raw fetch because the XRPC client incorrectly tries to JSON-parse
-      // application/jsonl responses (substring match on application/json).
-      const res = await agent.sessionManager.fetchHandler(
-        '/xrpc/chat.bsky.actor.exportAccountData',
-        {headers: DM_SERVICE_HEADERS},
-      )
-      if (!res.ok) {
-        throw new Error(`HTTP ${res.status}`)
-      }
-      const data = new Uint8Array(await res.arrayBuffer())
+      /*
+       * lex-client only JSON-parses a response when the declared output encoding
+       * is `application/json`; this endpoint declares `application/jsonl`, so it
+       * returns the raw bytes. That removes the reason for the old low-level
+       * fetchHandler workaround, and the chat client emits the proxy header
+       * itself, so the per-call DM headers go away too.
+       */
+      const data = await chatClient.call(chat.bsky.actor.exportAccountData)
       const saveRes = await saveBytesToDisk(
         'chat.jsonl',
         data,
-        res.headers.get('content-type') || 'application/jsonl',
+        'application/jsonl',
       )
 
       if (saveRes) {
@@ -81,7 +88,7 @@ export function ExportCarDialog({
     } finally {
       setLoading(false)
     }
-  }, [l, agent])
+  }, [l, currentAccount, chatClient])
 
   return (
     <Dialog.Outer control={control} nativeOptions={{preventExpansion: true}}>
diff --git a/src/screens/SignupQueued.tsx b/src/screens/SignupQueued.tsx
index b83e627404..e0bf7f2edd 100644
--- a/src/screens/SignupQueued.tsx
+++ b/src/screens/SignupQueued.tsx
@@ -7,7 +7,7 @@ import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
 
 import {logger} from '#/logger'
-import {isSignupQueued, useAgent, useSessionApi} from '#/state/session'
+import {isSignupQueued, usePdsClient, useSessionApi} from '#/state/session'
 import {useOnboardingDispatch} from '#/state/shell'
 import {Logo} from '#/view/icons/Logo'
 import {atoms as a, native, useBreakpoints, useTheme, web} from '#/alf'
@@ -15,6 +15,7 @@ import {Button, ButtonIcon, ButtonText} from '#/components/Button'
 import {Loader} from '#/components/Loader'
 import {P, Text} from '#/components/Typography'
 import {IS_IOS, IS_LIQUID_GLASS, IS_WEB} from '#/env'
+import {com} from '#/lexicons'
 
 const COL_WIDTH = 400
 
@@ -24,8 +25,8 @@ export function SignupQueued() {
   const insets = useSafeAreaInsets()
   const {gtMobile} = useBreakpoints()
   const onboardingDispatch = useOnboardingDispatch()
-  const {logoutCurrentAccount} = useSessionApi()
-  const agent = useAgent()
+  const {logoutCurrentAccount, refreshSession} = useSessionApi()
+  const pdsClient = usePdsClient()
 
   const [isProcessing, setProcessing] = useState(false)
   const [estimatedTime, setEstimatedTime] = useState<string | undefined>(
@@ -38,18 +39,23 @@ export function SignupQueued() {
   const checkStatus = useCallback(async () => {
     setProcessing(true)
     try {
-      const res = await agent.com.atproto.temp.checkSignupQueue()
-      if (res.data.activated) {
-        // ready to go, exchange the access token for a usable one and kick off onboarding
-        await agent.sessionManager.refreshSession()
-        if (!isSignupQueued(agent.session?.accessJwt)) {
+      const res = await pdsClient.call(com.atproto.temp.checkSignupQueue)
+      if (res.activated) {
+        /*
+         * Ready to go, exchange the access token for a usable one and kick off
+         * onboarding. The refreshed snapshot carries the new scope; reading
+         * `currentAccount` here would still see the pre-refresh token, since the
+         * session's update hook dispatches a render away.
+         */
+        const refreshed = await refreshSession()
+        if (!isSignupQueued(refreshed?.accessJwt)) {
           onboardingDispatch({type: 'start'})
         }
       } else {
         // not ready, update UI
-        setEstimatedTime(msToString(res.data.estimatedTimeMs))
-        if (typeof res.data.placeInQueue !== 'undefined') {
-          setPlaceInQueue(Math.max(res.data.placeInQueue, 1))
+        setEstimatedTime(msToString(res.estimatedTimeMs))
+        if (typeof res.placeInQueue !== 'undefined') {
+          setPlaceInQueue(Math.max(res.placeInQueue, 1))
         }
       }
     } catch (e: any) {
@@ -62,7 +68,8 @@ export function SignupQueued() {
     setEstimatedTime,
     setPlaceInQueue,
     onboardingDispatch,
-    agent,
+    pdsClient,
+    refreshSession,
   ])
 
   useEffect(() => {
diff --git a/src/state/session/__tests__/provider-refresh-session-test.tsx b/src/state/session/__tests__/provider-refresh-session-test.tsx
new file mode 100644
index 0000000000..6b1e10bdec
--- /dev/null
+++ b/src/state/session/__tests__/provider-refresh-session-test.tsx
@@ -0,0 +1,204 @@
+import {PasswordSession} from '@atproto/lex-password-session'
+import {beforeEach, describe, expect, it, jest} from '@jest/globals'
+import {act, render} from '@testing-library/react-native'
+
+import {type SessionAccount} from '../types'
+
+/*
+ * The provider pulls the whole app shell in through `#/state/util` and the
+ * account factories. These mocks cut the tree back to the session lifecycle
+ * itself, mirroring provider-clients-test.tsx.
+ */
+jest.mock('#/state/persisted', () => {
+  const {
+    defaults,
+  }: typeof import('#/state/persisted/schema') = require('#/state/persisted/schema')
+  return {
+    defaults,
+    get: (key: keyof typeof defaults) => defaults[key],
+    write: () => Promise.resolve(),
+    readLatest: (key: keyof typeof defaults) => defaults[key],
+    onUpdate: () => () => {},
+  }
+})
+jest.mock('#/state/util', () => ({useCloseAllActiveElements: () => () => {}}))
+jest.mock('#/components/dialogs/Context', () => ({
+  useGlobalDialogsControlContext: () => ({signinDialogControl: {open() {}}}),
+}))
+jest.mock('#/analytics', () => ({
+  AnalyticsContext: ({children}: {children: React.ReactNode}) => children,
+  useAnalyticsBase: () => ({metric() {}, logger: {debug() {}, error() {}}}),
+  utils: {accountToSessionMetadata: () => ({}), useMeta: () => undefined},
+}))
+jest.mock('#/state/shell/onboarding', () => ({
+  useOnboardingDispatch: () => () => {},
+}))
+jest.mock('#/ageAssurance/data', () => ({
+  clearAgeAssuranceServerDataForAll: () => {},
+  clearAgeAssuranceServerDataForDid: () => {},
+}))
+jest.mock('#/lib/persisted-query-storage', () => ({
+  clearPersistedQueryStorage: () => Promise.resolve(),
+}))
+jest.mock('#/lib/notifications/notifications', () => ({
+  unregisterPushToken: () => Promise.resolve(),
+}))
+jest.mock('jwt-decode', () => ({
+  jwtDecode: () => ({scope: 'com.atproto.access'}),
+}))
+jest.mock('#/state/events', () => ({
+  emitSessionDropped: () => {},
+  emitNetworkConfirmed: () => {},
+  emitNetworkLost: () => {},
+}))
+
+const mockLogin = jest.fn<(...args: unknown[]) => Promise<unknown>>()
+jest.mock('../session-core', () => ({
+  ...jest.requireActual<object>('../session-core'),
+  createSessionBundleAndLogin: (...args: unknown[]) => mockLogin(...args),
+}))
+jest.mock('../create-account', () => ({
+  createSessionBundleAndCreateAccount: () => new Promise(() => {}),
+}))
+
+import {Provider, useSession, useSessionApi} from '#/state/session'
+import {type SessionApiContext} from '#/state/session/types'
+import {BskyAppAgent, PasswordSessionManager} from '../bridge-agent'
+import {type SessionBundle} from '../session-core'
+import {sessionAccountToSessionData} from '../session-data'
+import {
+  asFetch,
+  DID,
+  HANDLE,
+  json,
+  makeAccount,
+  makeMockFetch,
+  type MockFetch,
+} from './mock-fetch'
+
+/**
+ * Build a bundle whose session is a real `PasswordSession` over the stubbed
+ * network, since `refreshSession` drives the session's own refresh machinery.
+ */
+function makeBundle(
+  account: SessionAccount,
+  fetchMock: MockFetch,
+): SessionBundle {
+  const session = new PasswordSession(sessionAccountToSessionData(account), {
+    fetch: asFetch(fetchMock),
+  })
+  const manager = new PasswordSessionManager(session, {
+    service: account.service,
+  })
+  manager.setFetch(asFetch(fetchMock))
+  return {
+    session,
+    agent: new BskyAppAgent(manager),
+    service: new URL(account.service),
+  }
+}
+
+type Harness = {
+  api: SessionApiContext
+  currentAccount: () => SessionAccount | undefined
+}
+
+function renderProvider(): Harness {
+  let api!: SessionApiContext
+  let currentAccount: SessionAccount | undefined
+  function Probe() {
+    api = useSessionApi()
+    currentAccount = useSession().currentAccount
+    return null
+  }
+  render(
+    <Provider>
+      <Probe />
+    </Provider>,
+  )
+  return {api, currentAccount: () => currentAccount}
+}
+
+/** Render the provider and log `account` in through the stubbed login factory. */
+async function renderLoggedIn(
+  account: SessionAccount,
+  fetchMock: MockFetch,
+): Promise<Harness> {
+  const bundle = makeBundle(account, fetchMock)
+  const harness = renderProvider()
+  mockLogin.mockResolvedValueOnce({bundle, account})
+  await act(async () => {
+    await harness.api.login({} as never, 'LoginForm')
+  })
+  return harness
+}
+
+beforeEach(() => {
+  mockLogin.mockReset()
+})
+
+describe('refreshSession', () => {
+  it('resolves with the rotated account snapshot', async () => {
+    const fetchMock = makeMockFetch()
+    const {api} = await renderLoggedIn(makeAccount(), fetchMock)
+
+    let refreshed: SessionAccount | undefined
+    await act(async () => {
+      refreshed = await api.refreshSession()
+    })
+
+    /* the mock's refresh response rotates both tokens */
+    expect(refreshed?.accessJwt).toBe('access-jwt-2')
+    expect(refreshed?.refreshJwt).toBe('refresh-jwt-2')
+    expect(refreshed?.did).toBe(DID)
+    expect(refreshed?.handle).toBe(HANDLE)
+  })
+
+  it('exposes the fresh tokens before the store has caught up', async () => {
+    const fetchMock = makeMockFetch()
+    const {api, currentAccount} = await renderLoggedIn(makeAccount(), fetchMock)
+
+    /*
+     * The point of the return value: `SignupQueued` branches on the fresh
+     * accessJwt synchronously, without waiting for `onUpdated` -> dispatch ->
+     * re-render.
+     */
+    let refreshed: SessionAccount | undefined
+    const before = currentAccount()?.accessJwt
+    await act(async () => {
+      refreshed = await api.refreshSession()
+    })
+    expect(before).toBe('access-jwt')
+    expect(refreshed?.accessJwt).toBe('access-jwt-2')
+  })
+
+  it('resolves with undefined when logged out', async () => {
+    const {api} = renderProvider()
+
+    let refreshed: SessionAccount | undefined = makeAccount()
+    await act(async () => {
+      refreshed = await api.refreshSession()
+    })
+
+    expect(refreshed).toBeUndefined()
+  })
+
+  it('rejects when the refresh rotated nothing', async () => {
+    /*
+     * A transient failure: `PasswordSession.refresh()` reports through
+     * `onUpdateFailure` and resolves with the SAME data object. Callers read
+     * resolution as "tokens rotated", so this must reject.
+     */
+    const fetchMock = makeMockFetch({
+      'com.atproto.server.refreshSession': () =>
+        json({error: 'InternalServerError'}, 500),
+    })
+    const {api} = await renderLoggedIn(makeAccount(), fetchMock)
+
+    await expect(
+      act(async () => {
+        await api.refreshSession()
+      }),
+    ).rejects.toThrow('Failed to refresh session')
+  })
+})
diff --git a/src/state/session/__tests__/session-test.ts b/src/state/session/__tests__/session-test.ts
index 9cb2db6a59..578b4d26e7 100644
--- a/src/state/session/__tests__/session-test.ts
+++ b/src/state/session/__tests__/session-test.ts
@@ -1,4 +1,3 @@
-import {type AtpAgent} from '@atproto/api'
 import {type SessionData} from '@atproto/lex-password-session'
 import {describe, expect, it, jest} from '@jest/globals'
 
@@ -18,21 +17,21 @@ jest.mock('../../../ageAssurance/state', () => ({
   unsafeGetAndComputeAgeAssurance: () => ({state: {}}),
 }))
 jest.mock('#/lib/notifications/notifications', () => ({
-  unregisterPushToken(_agents: AtpAgent[]) {
+  unregisterPushToken(_clients: unknown[]) {
     return Promise.resolve()
   },
 }))
 /*
  * The logout and account-removal reducer cases fire a push-token side effect
- * whose first step, `createTemporaryAgentsAndResume`, builds real `AtpAgent`s
- * and resumes them over the real network. Under jest that request outlives the
+ * whose first step, `createTemporaryClientsAndResume`, resumes real
+ * `PasswordSession`s over the real network. Under jest that request outlives the
  * suite: it rejects after teardown, and the resulting `logger.error` reaches
  * for `nanoid` in an environment that no longer has it, failing whichever suite
  * happens to be running at that moment. Stubbing the module keeps the side
  * effect synchronous and offline.
  */
 jest.mock('../util', () => ({
-  createTemporaryAgentsAndResume: () => Promise.resolve([]),
+  createTemporaryClientsAndResume: () => Promise.resolve([]),
 }))
 
 // Reuse a bundle within each test: session events are scoped by bundle identity.
diff --git a/src/state/session/index.tsx b/src/state/session/index.tsx
index 01bca93c36..730cdd9808 100644
--- a/src/state/session/index.tsx
+++ b/src/state/session/index.tsx
@@ -82,6 +82,7 @@ const ApiContext = createContext<SessionApiContext>({
   resumeSession: async () => {},
   removeAccount: () => {},
   partialRefreshSession: async () => {},
+  refreshSession: () => Promise.resolve(undefined),
 })
 ApiContext.displayName = 'SessionApiContext'
 
@@ -473,6 +474,50 @@ export function Provider({children}: React.PropsWithChildren<{}>) {
     })
   }, [store, cancelPendingTask])
 
+  /**
+   * Rotate the session's tokens and hand back the resulting account snapshot.
+   *
+   * Rejects when the rotation was a no-op, restoring the contract the
+   * `agent.resumeSession(agent.session!)` call sites were written against (the
+   * bridge agent's `refreshSession` override does the same, for the same
+   * reason). `PasswordSession.refresh()` resolves with the
+   * unchanged `SessionData` on a transient failure - a 500 or a network error
+   * reported through `onUpdateFailure` - and reserves rejection for a
+   * definitively dead session. Callers here all read resolution as "tokens
+   * rotated": the verification dialogs close, `Deactivated` clears its error
+   * state, and `SignupQueued` re-checks the token scope, so a resolved no-op
+   * would report success or loop silently. Identity, not a field comparison, is
+   * the signal: `PasswordSession` allocates a new object per successful
+   * rotation and returns the existing one untouched otherwise. Capturing the
+   * data immediately before the call also handles concurrent refreshes, since a
+   * rotation another caller's queued refresh performed still differs from what
+   * we captured.
+   *
+   * Like {@link partialRefreshSession}, the bundle comes from
+   * `store.getState()` rather than the render's `state`: a dispatch landing
+   * before the next render would otherwise leave this holding a disposed
+   * bundle, and reading live also keeps the callback's identity stable across
+   * unrelated state updates.
+   */
+  const refreshSession = useCallback<
+    SessionApiContext['refreshSession']
+  >(async () => {
+    const bundle = store.getState().currentBundleState.bundle as unknown as
+      | SessionBundle
+      | PublicSessionBundle
+    if (!bundle.session) return undefined // logged out: nothing to refresh
+    const before = bundle.session.session
+    const after = await bundle.session.refresh()
+    if (after === before) {
+      throw new Error('Failed to refresh session')
+    }
+    /*
+     * The session's `onUpdated` hook dispatches the new tokens into the store,
+     * but that lands a render away; this snapshot exposes them immediately.
+     */
+    return sessionDataToSessionAccount(after, after.service)
+  }, [store])
+
   const removeAccount = useCallback<SessionApiContext['removeAccount']>(
     account => {
       addSessionDebugLog({
@@ -607,6 +652,7 @@ export function Provider({children}: React.PropsWithChildren<{}>) {
       resumeSession,
       removeAccount,
       partialRefreshSession,
+      refreshSession,
     }),
     [
       createAccount,
@@ -616,6 +662,7 @@ export function Provider({children}: React.PropsWithChildren<{}>) {
       resumeSession,
       removeAccount,
       partialRefreshSession,
+      refreshSession,
     ],
   )
 
diff --git a/src/state/session/reducer.ts b/src/state/session/reducer.ts
index 8571539f87..06ceb8ece6 100644
--- a/src/state/session/reducer.ts
+++ b/src/state/session/reducer.ts
@@ -3,7 +3,7 @@ import {logger} from '#/lib/notifications/util'
 import {wrapSessionReducerForLogging} from './logging'
 import {createPublicSessionBundle} from './session-core'
 import {type AtpSessionEvent, type SessionAccount} from './types'
-import {createTemporaryAgentsAndResume} from './util'
+import {createTemporaryClientsAndResume} from './util'
 
 // Keep session internals outside the reducer's static view of a bundle.
 type OpaqueSessionBundle = {
@@ -155,8 +155,8 @@ let reducer = (state: State, action: Action): State => {
       // side effect
       const account = state.accounts.find(a => a.did === accountDid)
       if (account) {
-        createTemporaryAgentsAndResume([account])
-          .then(agents => unregisterPushToken(agents))
+        createTemporaryClientsAndResume([account])
+          .then(clients => unregisterPushToken(clients))
           .then(() =>
             logger.debug('Push token unregistered', {did: accountDid}),
           )
@@ -183,8 +183,8 @@ let reducer = (state: State, action: Action): State => {
       // side effect
       const account = state.accounts.find(a => a.did === accountDid)
       if (account && accountDid) {
-        createTemporaryAgentsAndResume([account])
-          .then(agents => unregisterPushToken(agents))
+        createTemporaryClientsAndResume([account])
+          .then(clients => unregisterPushToken(clients))
           .then(() =>
             logger.debug('Push token unregistered', {did: accountDid}),
           )
@@ -211,8 +211,8 @@ let reducer = (state: State, action: Action): State => {
       }
     }
     case 'logged-out-every-account': {
-      createTemporaryAgentsAndResume(state.accounts)
-        .then(agents => unregisterPushToken(agents))
+      createTemporaryClientsAndResume(state.accounts)
+        .then(clients => unregisterPushToken(clients))
         .then(() => logger.debug('Push token unregistered'))
         .catch(err => {
           logger.error('Failed to unregister push token', {
diff --git a/src/state/session/types.ts b/src/state/session/types.ts
index ca1bca62f1..c02e9cca7d 100644
--- a/src/state/session/types.ts
+++ b/src/state/session/types.ts
@@ -52,4 +52,17 @@ export type SessionApiContext = {
    * so it produces no session-change side effects.
    */
   partialRefreshSession: () => Promise<void>
+  /**
+   * Rotates the session's tokens and resolves with the resulting account
+   * snapshot, or `undefined` when logged out.
+   *
+   * Rejects when nothing was rotated, so a resolved promise means "tokens
+   * rotated". Every caller relies on that: the verification dialogs close on
+   * resolution, and `SignupQueued` re-checks the token scope.
+   *
+   * The snapshot is returned rather than read off `currentAccount`, because the
+   * session's `onUpdated` hook -> `store.dispatch` path is a render cycle away
+   * and `SignupQueued` branches synchronously on the fresh `accessJwt`.
+   */
+  refreshSession: () => Promise<SessionAccount | undefined>
 }
diff --git a/src/state/session/util.ts b/src/state/session/util.ts
index af1c2846c7..5c3dcfb01c 100644
--- a/src/state/session/util.ts
+++ b/src/state/session/util.ts
@@ -1,7 +1,10 @@
-import AtpAgent from '@atproto/api'
+import {PasswordSession} from '@atproto/lex-password-session'
 
+import {createLexClient} from '#/lib/lexClient'
+import {type TemporaryPushClient} from '#/lib/notifications/notifications'
 import * as persisted from '#/state/persisted'
-import {sessionAccountToSession} from './session-data'
+import {networkAwareFetch} from './network'
+import {sessionAccountToSessionData} from './session-data'
 import {type SessionAccount} from './types'
 
 export {isSessionExpired, isSignupQueued} from './session-data'
@@ -12,30 +15,41 @@ export function readLastActiveAccount() {
 }
 
 /**
- * Creates and attempted to resumeSession for every stored session.
- * Intended to be used to send push token revokations just before logout.
+ * Resume a single-use session per stored account, for the push-token revocation
+ * sent just before logout.
+ *
+ * The sessions carry no lifecycle hooks - no `onUpdated`, no `onDeleted` - so a
+ * rotation one of them performs can neither persist over nor race the live
+ * session's tokens. That isolation is load-bearing: each exists only long enough
+ * to authenticate one `unregisterPush` call.
+ *
+ * PDS routing is left to the session rather than pinned from the stored
+ * `pdsUrl`, because `resume` refreshes (and fills in a missing didDoc from
+ * `getSession`) before the client issues anything, so the request already goes
+ * to the didDoc PDS.
+ *
+ * `resume` rejects only when a session is definitively dead; a transient network
+ * failure resolves with the stored tokens, which are the same ones the old agent
+ * path would have sent. Definitively dead sessions drop out of the settled list.
  */
-export async function createTemporaryAgentsAndResume(
+export async function createTemporaryClientsAndResume(
   accounts: SessionAccount[],
-) {
-  const agents = await Promise.allSettled(
+): Promise<TemporaryPushClient[]> {
+  const settled = await Promise.allSettled(
     accounts.map(async account => {
-      const agent: AtpAgent = new AtpAgent({service: account.service})
-      if (account.pdsUrl) {
-        agent.sessionManager.pdsUrl = new URL(account.pdsUrl)
-      }
-
-      const session = sessionAccountToSession(account)
-      const res = await agent.resumeSession(session)
-      if (!res.success) throw new Error('Failed to resume session')
-
-      agent.assertAuthenticated() // confirm auth success
-
-      return agent
+      const session = await PasswordSession.resume(
+        sessionAccountToSessionData(account),
+        {fetch: networkAwareFetch},
+      )
+      return {
+        client: createLexClient(session),
+        service: session.session.service,
+        handle: session.session.handle,
+      } satisfies TemporaryPushClient
     }),
   )
 
-  return agents
+  return settled
     .filter(x => x.status === 'fulfilled')
     .map(promise => promise.value)
 }
diff --git a/src/view/com/composer/Composer.tsx b/src/view/com/composer/Composer.tsx
index 1388ce0c45..3f44040444 100644
--- a/src/view/com/composer/Composer.tsx
+++ b/src/view/com/composer/Composer.tsx
@@ -285,6 +285,12 @@ export const ComposePost = ({
   const pdsClient = usePdsClient()
   const queryClient = useQueryClient()
   const currentDid = currentAccount!.did
+  /*
+   * The host the video service-auth token is minted for. This is the same value
+   * that seeds the session's PDS routing, so the audience always matches the host
+   * the upload actually reaches; a mismatch would 401 the upload.
+   */
+  const currentDispatchUrl = currentAccount!.pdsUrl ?? currentAccount!.service
   const {closeComposer} = useComposerControls()
   const {t: l, i18n} = useLingui()
   const requireAltTextEnabled = useRequireAltTextEnabled()
@@ -479,7 +485,8 @@ export const ComposePost = ({
             },
           })
         },
-        agent,
+        pdsClient,
+        currentDispatchUrl,
         currentDid,
         abortController.signal,
         i18n,
@@ -489,7 +496,8 @@ export const ComposePost = ({
     [
       l,
       i18n,
-      agent,
+      pdsClient,
+      currentDispatchUrl,
       currentDid,
       composerDispatch,
       ax.metric,
@@ -661,7 +669,8 @@ export const ComposePost = ({
               },
             })
           },
-          agent,
+          pdsClient,
+          currentDispatchUrl,
           currentDid,
           abortController.signal,
           i18n,
@@ -677,7 +686,8 @@ export const ComposePost = ({
     [
       l,
       i18n,
-      agent,
+      pdsClient,
+      currentDispatchUrl,
       currentDid,
       composerDispatch,
       ax.metric,
diff --git a/src/view/com/composer/state/video.ts b/src/view/com/composer/state/video.ts
index eeca7dca47..4ae825a7f1 100644
--- a/src/view/com/composer/state/video.ts
+++ b/src/view/com/composer/state/video.ts
@@ -1,5 +1,5 @@
 import {type ImagePickerAsset} from 'expo-image-picker'
-import {type AppBskyVideoDefs, type AtpAgent, type BlobRef} from '@atproto/api'
+import {type BlobRef, type Client} from '@atproto/lex'
 import {type I18n} from '@lingui/core'
 import {msg} from '@lingui/core/macro'
 
@@ -14,9 +14,10 @@ import {
 import {type VideoTelemetry} from '#/lib/media/video/telemetry'
 import {type CompressedVideo} from '#/lib/media/video/types'
 import {uploadVideo} from '#/lib/media/video/upload'
-import {createVideoAgent} from '#/lib/media/video/util'
+import {createTokenlessVideoServiceClient} from '#/lib/media/video/util'
 import {isNetworkError} from '#/lib/strings/errors'
 import {logger} from '#/logger'
+import {app} from '#/lexicons'
 import {
   advanceVideoProgress,
   didSkipVideoCompression,
@@ -56,7 +57,7 @@ export type VideoAction =
     }
   | {
       type: 'update_job_status'
-      jobStatus: AppBskyVideoDefs.JobStatus
+      jobStatus: app.bsky.video.defs.JobStatus
       signal: AbortSignal
     }
 
@@ -126,7 +127,7 @@ type ProcessingState = {
   asset: ImagePickerAsset
   video: CompressedVideo
   jobId: string
-  jobStatus: AppBskyVideoDefs.JobStatus | null
+  jobStatus: app.bsky.video.defs.JobStatus | null
   pendingPublish?: undefined
   telemetry: VideoTelemetry
   altText: string
@@ -295,7 +296,8 @@ function trunc2dp(num: number) {
 export async function processVideo(
   asset: ImagePickerAsset,
   dispatch: (action: VideoAction) => void,
-  agent: AtpAgent,
+  client: Client,
+  dispatchUrl: string | URL,
   did: string,
   signal: AbortSignal,
   i18n: I18n,
@@ -339,12 +341,13 @@ export async function processVideo(
     signal,
   })
 
-  let uploadResponse: AppBskyVideoDefs.JobStatus | undefined
+  let uploadResponse: app.bsky.video.defs.JobStatus | undefined
   try {
     telemetry.uploadStarted(video.size)
     uploadResponse = await uploadVideo({
       video,
-      agent,
+      client,
+      dispatchUrl,
       did,
       signal,
       i18n,
@@ -381,12 +384,14 @@ export async function processVideo(
       return // Exit async loop
     }
 
-    const videoAgent = createVideoAgent()
-    let status: AppBskyVideoDefs.JobStatus | undefined
+    const videoClient = createTokenlessVideoServiceClient()
+    let status: app.bsky.video.defs.JobStatus | undefined
     let blob: BlobRef | undefined
     try {
-      const response = await videoAgent.app.bsky.video.getJobStatus({jobId})
-      status = response.data.jobStatus
+      const response = await videoClient.call(app.bsky.video.getJobStatus, {
+        jobId,
+      })
+      status = response.jobStatus
       pollFailures = 0
 
       if (status.state === 'JOB_STATE_COMPLETED') {

From dc31e7fd124571ea9e4cb0c11d46c35052c53ca1 Mon Sep 17 00:00:00 2001
From: Samuel Newman <mozzius@protonmail.com>
Date: Thu, 13 Aug 2026 22:26:21 +0300
Subject: [PATCH 23/32] [SDK] Migrate agent sugar to @bsky.app/sdk actions
 (#11382)

---
 .../components/RedirectOverlay.tsx            |  12 +-
 src/ageAssurance/data.tsx                     | 105 ++++++-----
 .../AgeAssuranceRedirectDialog.tsx            |  12 +-
 .../contacts/screens/GetContacts.tsx          |  80 ++++-----
 .../lists/CreateListFromStarterPackDialog.tsx |   4 +-
 src/features/liveEvents/preferences.ts        |  35 ++--
 src/lib/api/legacy-blob.ts                    |  16 --
 src/screens/Onboarding/StepFinished/index.tsx |  64 +++----
 src/screens/Settings/InterestsSettings.tsx    |   9 +-
 src/screens/Settings/Settings.tsx             |   7 +-
 src/state/birthdate.ts                        |  11 +-
 src/state/queries/labeler.ts                  |  21 ++-
 src/state/queries/like.ts                     |  15 +-
 src/state/queries/list-members.ts             |   2 +-
 src/state/queries/list.ts                     |  26 ++-
 .../queries/messages/actor-declaration.ts     |  28 +--
 src/state/queries/nuxs/index.ts               |  23 ++-
 src/state/queries/pinned-post.ts              |   8 +-
 .../queries/post-interaction-settings.ts      |  11 +-
 src/state/queries/post.ts                     |  56 ++++--
 src/state/queries/preferences/index.ts        | 168 ++++++++++++------
 src/state/queries/profile.ts                  | 135 +++++++-------
 src/state/session/create-account.ts           |  50 +++---
 src/state/session/session-core.ts             |  11 +-
 24 files changed, 520 insertions(+), 389 deletions(-)
 delete mode 100644 src/lib/api/legacy-blob.ts

diff --git a/src/ageAssurance/components/RedirectOverlay.tsx b/src/ageAssurance/components/RedirectOverlay.tsx
index 5a6f5b2934..5b31e94365 100644
--- a/src/ageAssurance/components/RedirectOverlay.tsx
+++ b/src/ageAssurance/components/RedirectOverlay.tsx
@@ -16,7 +16,7 @@ import {Trans} from '@lingui/react/macro'
 import {retry} from '#/lib/async/retry'
 import {wait} from '#/lib/async/wait'
 import {parseLinkingUrl} from '#/lib/parseLinkingUrl'
-import {useAgent, useSession} from '#/state/session'
+import {useAppviewClient, useSession} from '#/state/session'
 import {atoms as a, platform, useBreakpoints, useTheme} from '#/alf'
 import {AgeAssuranceBadge} from '#/components/ageAssurance/AgeAssuranceBadge'
 import {Button, ButtonText} from '#/components/Button'
@@ -176,7 +176,7 @@ function Inner() {
   const t = useTheme()
   const ax = useAnalytics()
   const {_} = useLingui()
-  const agent = useAgent()
+  const appviewClient = useAppviewClient()
   const polling = useRef(false)
   const unmounted = useRef(false)
   const [error, setError] = useState(false)
@@ -196,10 +196,10 @@ function Inner() {
         5,
         () => true,
         async () => {
-          if (!agent.session) return
+          if (!appviewClient.did) return
           if (unmounted.current) return
 
-          const data = await refetchAgeAssuranceServerState({agent})
+          const data = await refetchAgeAssuranceServerState({appviewClient})
 
           if (data?.state.status !== 'assured') {
             throw new Error(
@@ -214,7 +214,7 @@ function Inner() {
     )
       .then(async data => {
         if (!data) return
-        if (!agent.session) return
+        if (!appviewClient.did) return
         if (unmounted.current) return
 
         setSuccess(true)
@@ -230,7 +230,7 @@ function Inner() {
     return () => {
       unmounted.current = true
     }
-  }, [ax, agent])
+  }, [ax, appviewClient])
 
   if (success) {
     return (
diff --git a/src/ageAssurance/data.tsx b/src/ageAssurance/data.tsx
index 9cf6703dfc..2beac738c2 100644
--- a/src/ageAssurance/data.tsx
+++ b/src/ageAssurance/data.tsx
@@ -7,6 +7,8 @@ import {
   AtpAgent,
   type ChatBskyActorDeclaration,
 } from '@atproto/api'
+import {type Client} from '@atproto/lex'
+import {getPreferences} from '@bsky.app/sdk'
 import {createAsyncStoragePersister} from '@tanstack/query-async-storage-persister'
 import {focusManager, QueryClient, useQuery} from '@tanstack/react-query'
 import {persistQueryClient} from '@tanstack/react-query-persist-client'
@@ -21,7 +23,7 @@ import {
   snoozeBirthdateUpdateAllowedForDid,
 } from '#/state/birthdate'
 import {fetchActorDeclarationRecord} from '#/state/queries/messages/actor-declaration'
-import {useAgent, useSession} from '#/state/session'
+import {useAppviewClient, usePdsClient, useSession} from '#/state/session'
 import {DEVICE_SIGNALS_SUPPORTED} from '#/ageAssurance/const'
 import * as debug from '#/ageAssurance/debug'
 import {logger} from '#/ageAssurance/logger'
@@ -37,6 +39,7 @@ import {
 } from '#/ageAssurance/util'
 import {IS_DEV} from '#/env'
 import {useGeolocation} from '#/geolocation'
+import {app} from '#/lexicons'
 import {device} from '#/storage'
 
 /**
@@ -63,12 +66,6 @@ const [, cacheHydrationPromise] = persistQueryClient({
   persister,
 })
 
-export function getDidFromAgentSession(agent: AtpAgent) {
-  const sessionManager = agent.sessionManager
-  if (!sessionManager || !sessionManager.did) return
-  return sessionManager.did
-}
-
 /*
  * Optimistic data
  */
@@ -187,7 +184,7 @@ export function useConfigQuery() {
 export function createServerStateQueryKey({did}: {did: string}) {
   return ['serverState', did]
 }
-export async function getServerState({agent}: {agent: AtpAgent}) {
+export async function getServerState({appviewClient}: {appviewClient: Client}) {
   if (debug.enabled && debug.serverState)
     return debug.resolve(debug.serverState)
   const geolocation = device.get(['mergedGeolocation'])
@@ -195,17 +192,21 @@ export async function getServerState({agent}: {agent: AtpAgent}) {
     logger.error(`getServerState: missing geolocation countryCode`)
     return null
   }
-  const {data} = await agent.app.bsky.ageassurance.getState({
+  const data = await appviewClient.call(app.bsky.ageassurance.getState, {
     countryCode: geolocation.countryCode,
     regionCode: geolocation.regionCode,
   })
-  const did = getDidFromAgentSession(agent)
+  const did = appviewClient.did
   if (data && did && createdAtCache.has(did)) {
     /*
      * If account was just created, just use the local cache if available. On
-     * subsequent reloads, the server should have the correct value.
+     * subsequent reloads, the server should have the correct value. The cache
+     * holds ISO datetime strings (written from `new Date().toISOString()`), so
+     * assert the branded DatetimeString at this boundary.
      */
-    data.metadata.accountCreatedAt = createdAtCache.get(did)
+    data.metadata.accountCreatedAt = createdAtCache.get(
+      did,
+    ) as typeof data.metadata.accountCreatedAt
   }
   return data ?? null
 }
@@ -218,8 +219,12 @@ export function getServerStateFromCache({
     createServerStateQueryKey({did}),
   )
 }
-export async function prefetchServerState({agent}: {agent: AtpAgent}) {
-  const did = getDidFromAgentSession(agent)
+export async function prefetchServerState({
+  appviewClient,
+}: {
+  appviewClient: Client
+}) {
+  const did = appviewClient.did
 
   if (!did) return
 
@@ -234,7 +239,7 @@ export async function prefetchServerState({agent}: {agent: AtpAgent}) {
 
   try {
     logger.debug(`prefetchServerState: resolving...`)
-    const res = await networkRetry(3, () => getServerState({agent}))
+    const res = await networkRetry(3, () => getServerState({appviewClient}))
     if (res) {
       qc.setQueryData<AppBskyAgeassuranceGetState.OutputSchema>(qk, res)
     }
@@ -245,11 +250,15 @@ export async function prefetchServerState({agent}: {agent: AtpAgent}) {
     })
   }
 }
-export async function refetchServerState({agent}: {agent: AtpAgent}) {
-  const did = getDidFromAgentSession(agent)
+export async function refetchServerState({
+  appviewClient,
+}: {
+  appviewClient: Client
+}) {
+  const did = appviewClient.did
   if (!did) return
   logger.debug(`refetchServerState: fetching...`)
-  const res = await networkRetry(3, () => getServerState({agent}))
+  const res = await networkRetry(3, () => getServerState({appviewClient}))
   if (res) {
     qc.setQueryData<AppBskyAgeassuranceGetState.OutputSchema>(
       createServerStateQueryKey({did}),
@@ -279,8 +288,8 @@ export function usePatchServerState() {
   )
 }
 export function useServerStateQuery() {
-  const agent = useAgent()
-  const did = getDidFromAgentSession(agent)
+  const appviewClient = useAppviewClient()
+  const did = appviewClient.did
   const query = useQuery(
     {
       enabled: !!did,
@@ -290,7 +299,7 @@ export function useServerStateQuery() {
       },
       queryKey: createServerStateQueryKey({did: did!}),
       async queryFn() {
-        return getServerState({agent})
+        return getServerState({appviewClient})
       },
     },
     qc,
@@ -342,15 +351,15 @@ export function createOtherRequiredDataQueryKey({did}: {did: string}) {
   return ['otherRequiredData', did]
 }
 async function getOtherRequiredData({
-  agent,
+  accountClient,
 }: {
-  agent: AtpAgent
+  accountClient: Client
 }): Promise<OtherRequiredData> {
   if (debug.enabled) return debug.resolve(debug.otherRequiredData)
-  const did = getDidFromAgentSession(agent)
+  const did = accountClient.did
   const [prefs, actorDeclaration] = await Promise.all([
-    agent.getPreferences(),
-    fetchActorDeclarationRecord({did, agent}),
+    accountClient.call(getPreferences),
+    fetchActorDeclarationRecord({did, client: accountClient}),
   ])
   const data: OtherRequiredData = {
     birthdate: prefs.birthDate ? prefs.birthDate.toISOString() : undefined,
@@ -426,8 +435,12 @@ export function setOtherRequiredDataActorDeclarationCache({
     next,
   )
 }
-export async function prefetchOtherRequiredData({agent}: {agent: AtpAgent}) {
-  const did = getDidFromAgentSession(agent)
+export async function prefetchOtherRequiredData({
+  accountClient,
+}: {
+  accountClient: Client
+}) {
+  const did = accountClient.did
 
   if (!did) return
 
@@ -442,7 +455,9 @@ export async function prefetchOtherRequiredData({agent}: {agent: AtpAgent}) {
 
   try {
     logger.debug(`prefetchOtherRequiredData: resolving...`)
-    const res = await networkRetry(3, () => getOtherRequiredData({agent}))
+    const res = await networkRetry(3, () =>
+      getOtherRequiredData({accountClient}),
+    )
     qc.setQueryData<OtherRequiredData>(qk, res)
   } catch (err) {
     const e = err as Error
@@ -471,8 +486,8 @@ export function usePatchOtherRequiredData() {
   )
 }
 export function useOtherRequiredDataQuery() {
-  const agent = useAgent()
-  const did = getDidFromAgentSession(agent)
+  const accountClient = usePdsClient()
+  const did = accountClient.did
   return useQuery(
     {
       enabled: !!did,
@@ -482,7 +497,7 @@ export function useOtherRequiredDataQuery() {
       },
       queryKey: createOtherRequiredDataQueryKey({did: did!}),
       async queryFn() {
-        return getOtherRequiredData({agent})
+        return getOtherRequiredData({accountClient})
       },
     },
     qc,
@@ -577,8 +592,12 @@ export function setDeviceSignalsForRegion({
     prev => ({...prev, [regionKey]: signals}),
   )
 }
-export async function prefetchDeviceSignals({agent}: {agent: AtpAgent}) {
-  const did = getDidFromAgentSession(agent)
+export async function prefetchDeviceSignals({
+  appviewClient,
+}: {
+  appviewClient: Client
+}) {
+  const did = appviewClient.did
   if (!did) return
 
   /**
@@ -613,8 +632,8 @@ export async function prefetchDeviceSignals({agent}: {agent: AtpAgent}) {
    */
 }
 export function useDeviceSignalsQuery() {
-  const agent = useAgent()
-  const did = getDidFromAgentSession(agent)
+  const appviewClient = useAppviewClient()
+  const did = appviewClient.did
   const {data: config} = useConfigQuery()
   const geolocation = useGeolocation()
   /*
@@ -659,13 +678,19 @@ export function useDeviceSignalsQuery() {
 /**
  * Helper to prefetch all age assurance data from the server.
  */
-export function prefetchAgeAssuranceServerData({agent}: {agent: AtpAgent}) {
+export function prefetchAgeAssuranceServerData({
+  appviewClient,
+  accountClient,
+}: {
+  appviewClient: Client
+  accountClient: Client
+}) {
   return Promise.allSettled([
     // config fetch initiated at the top of the App.platform.tsx files, awaited here
     configPrefetchPromise,
-    prefetchServerState({agent}),
-    prefetchOtherRequiredData({agent}),
-    prefetchDeviceSignals({agent}),
+    prefetchServerState({appviewClient}),
+    prefetchOtherRequiredData({accountClient}),
+    prefetchDeviceSignals({appviewClient}),
   ])
 }
 
diff --git a/src/components/ageAssurance/AgeAssuranceRedirectDialog.tsx b/src/components/ageAssurance/AgeAssuranceRedirectDialog.tsx
index ad584ca203..acf20f38c5 100644
--- a/src/components/ageAssurance/AgeAssuranceRedirectDialog.tsx
+++ b/src/components/ageAssurance/AgeAssuranceRedirectDialog.tsx
@@ -6,7 +6,7 @@ import {Trans} from '@lingui/react/macro'
 
 import {retry} from '#/lib/async/retry'
 import {wait} from '#/lib/async/wait'
-import {useAgent} from '#/state/session'
+import {useAppviewClient} from '#/state/session'
 import {atoms as a, useTheme, web} from '#/alf'
 import {AgeAssuranceBadge} from '#/components/ageAssurance/AgeAssuranceBadge'
 import {Button, ButtonText} from '#/components/Button'
@@ -84,7 +84,7 @@ export function Inner({}: {optimisticState?: AgeAssuranceRedirectDialogState}) {
   const t = useTheme()
   const ax = useAnalytics()
   const {_} = useLingui()
-  const agent = useAgent()
+  const appviewClient = useAppviewClient()
   const polling = useRef(false)
   const unmounted = useRef(false)
   const control = useAgeAssuranceRedirectDialogControl()
@@ -104,10 +104,10 @@ export function Inner({}: {optimisticState?: AgeAssuranceRedirectDialogState}) {
         5,
         () => true,
         async () => {
-          if (!agent.session) return
+          if (!appviewClient.did) return
           if (unmounted.current) return
 
-          const data = await refetchAgeAssuranceServerState({agent})
+          const data = await refetchAgeAssuranceServerState({appviewClient})
 
           if (data?.state.status !== 'assured') {
             throw new Error(
@@ -122,7 +122,7 @@ export function Inner({}: {optimisticState?: AgeAssuranceRedirectDialogState}) {
     )
       .then(async data => {
         if (!data) return
-        if (!agent.session) return
+        if (!appviewClient.did) return
         if (unmounted.current) return
 
         setSuccess(true)
@@ -138,7 +138,7 @@ export function Inner({}: {optimisticState?: AgeAssuranceRedirectDialogState}) {
     return () => {
       unmounted.current = true
     }
-  }, [ax, agent, control])
+  }, [ax, appviewClient, control])
 
   if (success) {
     return (
diff --git a/src/components/contacts/screens/GetContacts.tsx b/src/components/contacts/screens/GetContacts.tsx
index d84e0d1ab0..de5d6cf98b 100644
--- a/src/components/contacts/screens/GetContacts.tsx
+++ b/src/components/contacts/screens/GetContacts.tsx
@@ -2,24 +2,21 @@ import {useContext} from 'react'
 import {Alert, View} from 'react-native'
 import {useSafeAreaInsets} from 'react-native-safe-area-context'
 import * as Contacts from 'expo-contacts'
-import type AtpAgent from '@atproto/api'
-import {
-  type AppBskyActorProfile,
-  AppBskyContactImportContacts,
-  type Un$Typed,
-} from '@atproto/api'
+import {type Un$Typed} from '@atproto/lex'
 import {type Client} from '@atproto/lex'
+import {toDatetimeString} from '@atproto/syntax'
+import {upsertProfile} from '@bsky.app/sdk'
 import {msg, t} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
 import {useMutation, useQueryClient} from '@tanstack/react-query'
 
 import {uploadBlob} from '#/lib/api'
-import {toLegacyBlobRef} from '#/lib/api/legacy-blob'
 import {cleanError, isNetworkError} from '#/lib/strings/errors'
+import {matchXrpcError} from '#/lib/xrpc-error'
 import {logger} from '#/logger'
 import {findContactsStatusQueryKey} from '#/state/queries/find-contacts'
-import {useAgent, usePdsClient} from '#/state/session'
+import {useAppviewClient, usePdsClient} from '#/state/session'
 import {
   Context as OnboardingContext,
   type OnboardingAction,
@@ -32,6 +29,7 @@ import {Loader} from '#/components/Loader'
 import * as Toast from '#/components/Toast'
 import {Text} from '#/components/Typography'
 import {useAnalytics} from '#/analytics'
+import {app} from '#/lexicons'
 import {
   contactsWithPhoneNumbersOnly,
   filterMatchedNumbers,
@@ -56,8 +54,8 @@ export function GetContacts({
 }) {
   const {_} = useLingui()
   const ax = useAnalytics()
-  const agent = useAgent()
   const pdsClient = usePdsClient()
+  const appviewClient = useAppviewClient()
   const insets = useSafeAreaInsets()
   const gutters = useGutters([0, 'wide'])
   const queryClient = useQueryClient()
@@ -75,7 +73,7 @@ export function GetContacts({
        */
       if (context === 'Onboarding' && maybeOnboardingContext) {
         try {
-          await createProfileRecord(agent, pdsClient, maybeOnboardingContext)
+          await createProfileRecord(pdsClient, maybeOnboardingContext)
         } catch (error) {
           logger.debug('Error creating profile record:', {safeMessage: error})
         }
@@ -88,13 +86,13 @@ export function GetContacts({
       )
 
       if (phoneNumbers.length > 0) {
-        const res = await agent.app.bsky.contact.importContacts({
+        const res = await appviewClient.call(app.bsky.contact.importContacts, {
           token: state.token,
           contacts: phoneNumbers.slice(0, MAX_UPLOAD_COUNT),
         })
 
         return {
-          matches: res.data.matchesAndContactIndexes,
+          matches: res.matchesAndContactIndexes,
           indexToContactId,
         }
       } else {
@@ -151,29 +149,30 @@ export function GetContacts({
           ),
           {type: 'error'},
         )
-      } else if (
-        err instanceof AppBskyContactImportContacts.TooManyContactsError
-      ) {
-        Toast.show(
-          _(
-            msg`Too many contacts - you've exceeded the number of contacts you can import to find your friends`,
-          ),
-          {type: 'error'},
-        )
-      } else if (
-        err instanceof AppBskyContactImportContacts.InvalidTokenError
-      ) {
-        Toast.show(
-          _(
-            msg`Could not upload contacts. You need to re-verify your phone number to proceed`,
-          ),
-          {type: 'error'},
-        )
-      } else {
-        logger.error('Error uploading contacts', {safeMessage: err})
-        Toast.show(_(msg`Could not upload contacts. ${cleanError(err)}`), {
-          type: 'error',
-        })
+        return
+      }
+      switch (matchXrpcError(err, app.bsky.contact.importContacts)) {
+        case 'TooManyContacts':
+          Toast.show(
+            _(
+              msg`Too many contacts - you've exceeded the number of contacts you can import to find your friends`,
+            ),
+            {type: 'error'},
+          )
+          break
+        case 'InvalidToken':
+          Toast.show(
+            _(
+              msg`Could not upload contacts. You need to re-verify your phone number to proceed`,
+            ),
+            {type: 'error'},
+          )
+          break
+        default:
+          logger.error('Error uploading contacts', {safeMessage: err})
+          Toast.show(_(msg`Could not upload contacts. ${cleanError(err)}`), {
+            type: 'error',
+          })
       }
     },
   })
@@ -328,7 +327,6 @@ function showPermissionDeniedAlert() {
  * Copied from `#/screens/Onboarding/StepFinished/index.tsx`
  */
 async function createProfileRecord(
-  agent: AtpAgent,
   pdsClient: Client,
   onboardingContext: {
     state: OnboardingState
@@ -342,19 +340,21 @@ async function createProfileRecord(
       ? uploadBlob(pdsClient, imageUri, imageMime)
       : undefined
 
-  await agent.upsertProfile(async existing => {
-    let next: Un$Typed<AppBskyActorProfile.Record> = existing ?? {}
+  await pdsClient.call(upsertProfile, async existing => {
+    let next: Un$Typed<app.bsky.actor.profile.Main> = existing ?? {}
 
     if (blobPromise) {
       const res = await blobPromise
       if (res.blob) {
-        next.avatar = toLegacyBlobRef(res.blob)
+        next.avatar = res.blob
       }
     }
 
     next.displayName = ''
 
-    next.createdAt = new Date().toISOString()
+    if (!next.createdAt) {
+      next.createdAt = toDatetimeString(new Date())
+    }
     return next
   })
 }
diff --git a/src/components/dialogs/lists/CreateListFromStarterPackDialog.tsx b/src/components/dialogs/lists/CreateListFromStarterPackDialog.tsx
index ceb07fb0e0..e6d14b2405 100644
--- a/src/components/dialogs/lists/CreateListFromStarterPackDialog.tsx
+++ b/src/components/dialogs/lists/CreateListFromStarterPackDialog.tsx
@@ -6,7 +6,6 @@ import {
   type AtIdentifierString,
   AtUri,
   type AtUriString,
-  type DidString,
   toDatetimeString,
 } from '@atproto/syntax'
 import {msg} from '@lingui/core/macro'
@@ -86,8 +85,7 @@ export function CreateListFromStarterPackDialog({
               items.map(item => {
                 const listitemRecord: $Typed<app.bsky.graph.listitem.Main> = {
                   $type: 'app.bsky.graph.listitem',
-                  // the list view is still legacy-typed, so its strings are unbranded
-                  subject: item.subject.did as DidString,
+                  subject: item.subject.did,
                   list: listUri as AtUriString,
                   createdAt: toDatetimeString(new Date()),
                 }
diff --git a/src/features/liveEvents/preferences.ts b/src/features/liveEvents/preferences.ts
index 6fb2ac6d11..bd8cbbd645 100644
--- a/src/features/liveEvents/preferences.ts
+++ b/src/features/liveEvents/preferences.ts
@@ -1,12 +1,12 @@
 import {useEffect} from 'react'
-import {type Agent, AppBskyActorDefs, asPredicate} from '@atproto/api'
+import {getPreferences, updateLiveEventPreferences} from '@bsky.app/sdk'
 import {useMutation, useQueryClient} from '@tanstack/react-query'
 
 import {
   preferencesQueryKey,
   usePreferencesQuery,
 } from '#/state/queries/preferences'
-import {useAgent} from '#/state/session'
+import {usePdsClient} from '#/state/session'
 import {useAnalytics} from '#/analytics'
 import * as env from '#/env'
 import {IS_WEB} from '#/env'
@@ -14,10 +14,11 @@ import {
   type LiveEventFeed,
   type LiveEventFeedMetricContext,
 } from '#/features/liveEvents/types'
+import {type app} from '#/lexicons'
 
 export type LiveEventPreferencesAction = Parameters<
-  Agent['updateLiveEventPreferences']
->[0] & {
+  typeof updateLiveEventPreferences
+>[1] & {
   /**
    * Flag that is internal to this hook, do not set when updating prefs
    */
@@ -38,7 +39,7 @@ export function useLiveEventPreferences() {
 
 function useWebOnlyDebugLiveEventPreferences() {
   const queryClient = useQueryClient()
-  const agent = useAgent()
+  const pdsClient = usePdsClient()
 
   useEffect(() => {
     if (env.IS_DEV && IS_WEB && typeof window !== 'undefined') {
@@ -46,14 +47,14 @@ function useWebOnlyDebugLiveEventPreferences() {
       window.__updateLiveEventPreferences = async (
         action: LiveEventPreferencesAction,
       ) => {
-        await agent.updateLiveEventPreferences(action)
+        await pdsClient.call(updateLiveEventPreferences, action)
         // triggers a refetch
         await queryClient.invalidateQueries({
           queryKey: preferencesQueryKey,
         })
       }
     }
-  }, [agent, queryClient])
+  }, [pdsClient, queryClient])
 }
 
 export function useUpdateLiveEventPreferences(props: {
@@ -65,10 +66,10 @@ export function useUpdateLiveEventPreferences(props: {
 }) {
   const ax = useAnalytics()
   const queryClient = useQueryClient()
-  const agent = useAgent()
+  const pdsClient = usePdsClient()
 
   return useMutation<
-    AppBskyActorDefs.LiveEventPreferences,
+    app.bsky.actor.defs.LiveEventPreferences,
     Error,
     LiveEventPreferencesAction,
     {undoAction: LiveEventPreferencesAction | null}
@@ -108,10 +109,14 @@ export function useUpdateLiveEventPreferences(props: {
       }
     },
     mutationFn: async action => {
-      const updated = await agent.updateLiveEventPreferences(action)
-      const prefs = updated.find(p =>
-        asPredicate(AppBskyActorDefs.validateLiveEventPreferences)(p),
-      )
+      /*
+       * The SDK action returns void, so after applying the update we read the
+       * fresh, interpreted preferences back to obtain the updated
+       * `liveEventPreferences` (the SDK extracts it from the raw prefs array for
+       * us, replacing the old `asPredicate(...).find(...)` lookup).
+       */
+      await pdsClient.call(updateLiveEventPreferences, action)
+      const {liveEventPreferences: prefs} = await pdsClient.call(getPreferences)
 
       switch (action.type) {
         case 'hideFeed':
@@ -138,7 +143,7 @@ export function useUpdateLiveEventPreferences(props: {
           break
         }
         case 'toggleHideAllFeeds': {
-          if (prefs!.hideAllFeeds) {
+          if (prefs.hideAllFeeds) {
             ax.metric('liveEvents:hideAllFeedBanners', {
               context: props.metricContext,
             })
@@ -156,7 +161,7 @@ export function useUpdateLiveEventPreferences(props: {
         queryKey: preferencesQueryKey,
       })
 
-      return prefs!
+      return prefs
     },
   })
 }
diff --git a/src/lib/api/legacy-blob.ts b/src/lib/api/legacy-blob.ts
deleted file mode 100644
index b60acadfe4..0000000000
--- a/src/lib/api/legacy-blob.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import {BlobRef} from '@atproto/api'
-import {type BlobRef as LexBlobRef} from '@atproto/lex'
-
-/**
- * Bridge a lex blob ref (the plain-JSON `{$type: 'blob', ref, mimeType, size}`
- * that {@link uploadBlob} now returns) back to the legacy `BlobRef` class
- * instance.
- *
- * Only needed where a blob is handed to a legacy agent write: the legacy
- * lexicon blob validator checks `value instanceof BlobRef`, so a plain lex
- * blob fails validation, and the legacy serializer would put the wrong shape
- * on the wire. Drop each call as its write moves to the lex client.
- */
-export function toLegacyBlobRef(blob: LexBlobRef): BlobRef {
-  return BlobRef.fromJsonRef(blob as Parameters<typeof BlobRef.fromJsonRef>[0])
-}
diff --git a/src/screens/Onboarding/StepFinished/index.tsx b/src/screens/Onboarding/StepFinished/index.tsx
index 706a160003..9eb22efc70 100644
--- a/src/screens/Onboarding/StepFinished/index.tsx
+++ b/src/screens/Onboarding/StepFinished/index.tsx
@@ -1,21 +1,19 @@
 import {useCallback, useState} from 'react'
 import {View} from 'react-native'
-import {
-  type AppBskyActorDefs,
-  type AppBskyActorProfile,
-  type AppBskyGraphDefs,
-  AppBskyGraphStarterpack,
-  type Un$Typed,
-} from '@atproto/api'
 import {TID} from '@atproto/common-web'
-import {type AtUriString} from '@atproto/syntax'
+import {type Un$Typed} from '@atproto/lex'
+import {type AtUriString, toDatetimeString} from '@atproto/syntax'
+import {
+  overwriteSavedFeeds,
+  setInterestsPref,
+  upsertProfile,
+} from '@bsky.app/sdk'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
 import {useQueryClient} from '@tanstack/react-query'
 
 import {uploadBlob} from '#/lib/api'
-import {toLegacyBlobRef} from '#/lib/api/legacy-blob'
 import {
   BSKY_APP_ACCOUNT_DID,
   DISCOVER_SAVED_FEED,
@@ -28,7 +26,7 @@ import {useSetHasCheckedForStarterPack} from '#/state/preferences/used-starter-p
 import {getAllListMembers} from '#/state/queries/list-members'
 import {preferencesQueryKey} from '#/state/queries/preferences'
 import {RQKEY as profileRQKey} from '#/state/queries/profile'
-import {useAgent, useAppviewClient, usePdsClient} from '#/state/session'
+import {useAppviewClient, usePdsClient} from '#/state/session'
 import {useOnboardingDispatch} from '#/state/shell'
 import {
   useActiveStarterPack,
@@ -50,6 +48,7 @@ import {ArrowRight_Stroke2_Corner0_Rounded as ArrowRight} from '#/components/ico
 import {Loader} from '#/components/Loader'
 import {useAnalytics} from '#/analytics'
 import {IS_WEB} from '#/env'
+import {app} from '#/lexicons'
 import * as bsky from '#/types/bsky'
 import {ValuePropositionPager} from './ValuePropositionPager'
 
@@ -59,9 +58,8 @@ export function StepFinished() {
   const onboardDispatch = useOnboardingDispatch()
   const [saving, setSaving] = useState(false)
   const queryClient = useQueryClient()
-  const agent = useAgent()
-  const appviewClient = useAppviewClient()
   const pdsClient = usePdsClient()
+  const appviewClient = useAppviewClient()
   const requestNotificationsPermission = useRequestNotificationsPermission()
   const activeStarterPack = useActiveStarterPack()
   const setActiveStarterPack = useSetActiveStarterPack()
@@ -71,15 +69,15 @@ export function StepFinished() {
   const finishOnboarding = useCallback(async () => {
     setSaving(true)
 
-    let starterPack: AppBskyGraphDefs.StarterPackView | undefined
-    let listItems: AppBskyGraphDefs.ListItemView[] | undefined
+    let starterPack: app.bsky.graph.defs.StarterPackView | undefined
+    let listItems: app.bsky.graph.defs.ListItemView[] | undefined
 
     if (activeStarterPack?.uri) {
       try {
-        const spRes = await agent.app.bsky.graph.getStarterPack({
-          starterPack: activeStarterPack.uri,
+        const spRes = await appviewClient.call(app.bsky.graph.getStarterPack, {
+          starterPack: activeStarterPack.uri as AtUriString,
         })
-        starterPack = spRes.data.starterPack
+        starterPack = spRes.starterPack
       } catch (e) {
         logger.error('Failed to fetch starter pack', {safeMessage: e})
         // don't tell the user, just get them through onboarding.
@@ -109,19 +107,15 @@ export function StepFinished() {
           appviewClient,
           [BSKY_APP_ACCOUNT_DID, ...(listItems?.map(i => i.subject.did) ?? [])],
           starterPack
-            ? // the starter pack view is still legacy-typed
-              {
-                uri: starterPack.uri as AtUriString,
-                cid: starterPack.cid,
-              }
+            ? {uri: starterPack.uri, cid: starterPack.cid}
             : undefined,
         ),
         (async () => {
           // Interests need to get saved first, then we can write the feeds to prefs
-          await agent.setInterestsPref({tags: selectedInterests})
+          await pdsClient.call(setInterestsPref, {tags: selectedInterests})
 
           // Default feeds that every user should have pinned when landing in the app
-          const feedsToSave: AppBskyActorDefs.SavedFeed[] = [
+          const feedsToSave: app.bsky.actor.defs.SavedFeed[] = [
             {
               ...DISCOVER_SAVED_FEED,
               id: TID.nextStr(),
@@ -140,7 +134,7 @@ export function StepFinished() {
           if (starterPack && starterPack.feeds?.length) {
             feedsToSave.push(
               ...starterPack.feeds.map(f => ({
-                type: 'feed',
+                type: 'feed' as const,
                 value: f.uri,
                 pinned: true,
                 id: TID.nextStr(),
@@ -148,7 +142,7 @@ export function StepFinished() {
             )
           }
 
-          await agent.overwriteSavedFeeds(feedsToSave)
+          await pdsClient.call(overwriteSavedFeeds, feedsToSave)
         })(),
         (async () => {
           const {imageUri, imageMime} = profileStepResults
@@ -157,13 +151,13 @@ export function StepFinished() {
               ? uploadBlob(pdsClient, imageUri, imageMime)
               : undefined
 
-          await agent.upsertProfile(async existing => {
-            let next: Un$Typed<AppBskyActorProfile.Record> = existing ?? {}
+          await pdsClient.call(upsertProfile, async existing => {
+            let next: Un$Typed<app.bsky.actor.profile.Main> = existing ?? {}
 
             if (blobPromise) {
               const res = await blobPromise
               if (res.blob) {
-                next.avatar = toLegacyBlobRef(res.blob)
+                next.avatar = res.blob
               }
             }
 
@@ -177,7 +171,7 @@ export function StepFinished() {
             next.displayName = ''
 
             if (!next.createdAt) {
-              next.createdAt = new Date().toISOString()
+              next.createdAt = toDatetimeString(new Date())
             }
             return next
           })
@@ -204,7 +198,7 @@ export function StepFinished() {
         queryKey: preferencesQueryKey,
       }),
       queryClient.invalidateQueries({
-        queryKey: profileRQKey(agent.session?.did ?? ''),
+        queryKey: profileRQKey(pdsClient.did ?? ''),
       }),
     ]).catch(e => {
       logger.error(e)
@@ -221,10 +215,7 @@ export function StepFinished() {
       usedStarterPack: Boolean(starterPack),
       starterPackName:
         starterPack &&
-        bsky.dangerousIsType<AppBskyGraphStarterpack.Record>(
-          starterPack.record,
-          AppBskyGraphStarterpack.isRecord,
-        )
+        bsky.isType(app.bsky.graph.starterpack, starterPack.record)
           ? starterPack.record.name
           : undefined,
       starterPackCreator: starterPack?.creator.did,
@@ -242,9 +233,8 @@ export function StepFinished() {
   }, [
     ax,
     queryClient,
-    agent,
-    appviewClient,
     pdsClient,
+    appviewClient,
     dispatch,
     onboardDispatch,
     activeStarterPack,
diff --git a/src/screens/Settings/InterestsSettings.tsx b/src/screens/Settings/InterestsSettings.tsx
index ced7148669..351ee60ffc 100644
--- a/src/screens/Settings/InterestsSettings.tsx
+++ b/src/screens/Settings/InterestsSettings.tsx
@@ -1,5 +1,6 @@
 import {useMemo, useState} from 'react'
 import {type TextStyle, View, type ViewStyle} from 'react-native'
+import {setInterestsPref} from '@bsky.app/sdk'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
@@ -23,7 +24,7 @@ import {createGetSuggestedUsersForDiscoverQueryKey} from '#/state/queries/trendi
 import {createGetSuggestedUsersForExploreQueryKey} from '#/state/queries/trending/useGetSuggestedUsersForExploreQuery'
 import {createGetSuggestedUsersForSeeMoreQueryKey} from '#/state/queries/trending/useGetSuggestedUsersForSeeMoreQuery'
 import {createSuggestedStarterPacksQueryKey} from '#/state/queries/useSuggestedStarterPacksQuery'
-import {useAgent} from '#/state/session'
+import {usePdsClient} from '#/state/session'
 import {atoms as a, useGutters, useTheme} from '#/alf'
 import {Admonition} from '#/components/Admonition'
 import {Divider} from '#/components/Divider'
@@ -88,7 +89,7 @@ function Inner({
   setIsSaving: (isSaving: boolean) => void
 }) {
   const {_} = useLingui()
-  const agent = useAgent()
+  const pdsClient = usePdsClient()
   const qc = useQueryClient()
   const interestsDisplayNames = useInterestsDisplayNames()
   const preselectedInterests = useMemo(
@@ -110,7 +111,7 @@ function Inner({
       setIsSaving(true)
 
       try {
-        await agent.setInterestsPref({tags: interests})
+        await pdsClient.call(setInterestsPref, {tags: interests})
         qc.setQueriesData(
           {queryKey: preferencesQueryKey},
           (old?: UsePreferencesQueryResponse) => {
@@ -157,7 +158,7 @@ function Inner({
         setIsSaving(false)
       }
     }, 1500)
-  }, [_, agent, setIsSaving, qc, preselectedInterests])
+  }, [_, pdsClient, setIsSaving, qc, preselectedInterests])
 
   const onChangeInterests = async (interests: string[]) => {
     setInterests(interests)
diff --git a/src/screens/Settings/Settings.tsx b/src/screens/Settings/Settings.tsx
index 37d0e9b5fa..0d5b2bcc73 100644
--- a/src/screens/Settings/Settings.tsx
+++ b/src/screens/Settings/Settings.tsx
@@ -2,6 +2,7 @@ import {useState} from 'react'
 import {Alert, LayoutAnimation, Linking, Pressable, View} from 'react-native'
 import {useReducedMotion} from 'react-native-reanimated'
 import {type AppBskyActorDefs, moderateProfile} from '@atproto/api'
+import {removeNuxs} from '@bsky.app/sdk'
 import {Trans, useLingui} from '@lingui/react/macro'
 import {useNavigation} from '@react-navigation/native'
 import {type NativeStackScreenProps} from '@react-navigation/native-stack'
@@ -21,7 +22,7 @@ import {clearStorage} from '#/state/persisted'
 import {useModerationOpts} from '#/state/preferences/moderation-opts'
 import {useDeleteActorDeclaration} from '#/state/queries/messages/actor-declaration'
 import {useProfileQuery, useProfilesQuery} from '#/state/queries/profile'
-import {useAgent} from '#/state/session'
+import {usePdsClient} from '#/state/session'
 import {type SessionAccount, useSession, useSessionApi} from '#/state/session'
 import {useOnboardingDispatch} from '#/state/shell'
 import {useLoggedOutViewControls} from '#/state/shell/logged-out'
@@ -385,7 +386,7 @@ function ProfilePreview({
 
 function DevOptions() {
   const {t: l} = useLingui()
-  const agent = useAgent()
+  const pdsClient = usePdsClient()
   const [override, setOverride] = useStorage(device, [
     'policyUpdateDebugOverride',
   ])
@@ -560,7 +561,7 @@ function DevOptions() {
           <Button
             onPress={() => {
               device.set([PolicyUpdate202508], false)
-              void agent.bskyAppRemoveNuxs([PolicyUpdate202508])
+              void pdsClient.call(removeNuxs, [PolicyUpdate202508])
               Toast.show(`Done`, {
                 type: 'info',
               })
diff --git a/src/state/birthdate.ts b/src/state/birthdate.ts
index c405febe4e..8146836190 100644
--- a/src/state/birthdate.ts
+++ b/src/state/birthdate.ts
@@ -1,9 +1,10 @@
 import {useMemo} from 'react'
+import {setPersonalDetails} from '@bsky.app/sdk'
 import {useMutation, useQueryClient} from '@tanstack/react-query'
 
 import {restrictChatSettings} from '#/state/queries/messages/restrictChatSettings'
 import {preferencesQueryKey} from '#/state/queries/preferences'
-import {useAgent, usePdsClient, useSession} from '#/state/session'
+import {usePdsClient, useSession} from '#/state/session'
 import {usePatchAgeAssuranceOtherRequiredData} from '#/ageAssurance'
 import {isUnderAge} from '#/ageAssurance/util'
 import {IS_DEV} from '#/env'
@@ -54,14 +55,14 @@ export function useIsBirthdateUpdateAllowed() {
 
 export function useBirthdateMutation() {
   const queryClient = useQueryClient()
-  const agent = useAgent()
+  const {currentAccount} = useSession()
   const pdsClient = usePdsClient()
   const patchOtherRequiredData = usePatchAgeAssuranceOtherRequiredData()
 
   return useMutation<void, unknown, {birthDate: Date}>({
     mutationFn: async ({birthDate}: {birthDate: Date}) => {
       const bday = birthDate.toISOString()
-      await agent.setPersonalDetails({birthDate: bday})
+      await pdsClient.call(setPersonalDetails, {birthDate})
       // triggers a refetch
       await queryClient.invalidateQueries({
         queryKey: preferencesQueryKey,
@@ -80,7 +81,9 @@ export function useBirthdateMutation() {
        * birthdate, which may change the user's age assurance access level.
        */
       void patchOtherRequiredData({birthdate: bday})
-      snoozeBirthdateUpdateAllowedForDid(agent.sessionManager.did!)
+      if (currentAccount) {
+        snoozeBirthdateUpdateAllowedForDid(currentAccount.did)
+      }
     },
   })
 }
diff --git a/src/state/queries/labeler.ts b/src/state/queries/labeler.ts
index e7251866fe..b132b73ebe 100644
--- a/src/state/queries/labeler.ts
+++ b/src/state/queries/labeler.ts
@@ -1,4 +1,6 @@
 import {type AppBskyLabelerDefs} from '@atproto/api'
+import {type DidString} from '@atproto/syntax'
+import {addLabeler, removeLabeler} from '@bsky.app/sdk'
 import {useMutation, useQuery, useQueryClient} from '@tanstack/react-query'
 import {z} from 'zod'
 
@@ -9,7 +11,7 @@ import {
   usePreferencesQuery,
 } from '#/state/queries/preferences'
 import {createQueryKey} from '#/state/queries/util'
-import {useAgent} from '#/state/session'
+import {useAgent, usePdsClient} from '#/state/session'
 
 const labelerInfoQueryKeyRoot = 'labeler-info'
 export const labelerInfoQueryKey = (did: string) => [
@@ -78,11 +80,13 @@ export function useLabelersDetailedInfoQuery({dids}: {dids: string[]}) {
 
 export function useRemoveLabelersMutation() {
   const queryClient = useQueryClient()
-  const agent = useAgent()
+  const client = usePdsClient()
 
   return useMutation({
     async mutationFn({dids}: {dids: string[]}) {
-      await Promise.all(dids.map(did => agent.removeLabeler(did)))
+      await Promise.all(
+        dids.map(did => client.call(removeLabeler, did as DidString)),
+      )
     },
     async onSuccess() {
       await queryClient.invalidateQueries({
@@ -95,6 +99,7 @@ export function useRemoveLabelersMutation() {
 export function useLabelerSubscriptionMutation() {
   const queryClient = useQueryClient()
   const agent = useAgent()
+  const pdsClient = usePdsClient()
   const preferences = usePreferencesQuery()
 
   return useMutation({
@@ -136,7 +141,11 @@ export function useLabelerSubscriptionMutation() {
         }
       }
       if (invalidLabelers.length) {
-        await Promise.all(invalidLabelers.map(did => agent.removeLabeler(did)))
+        await Promise.all(
+          invalidLabelers.map(did =>
+            pdsClient.call(removeLabeler, did as DidString),
+          ),
+        )
       }
 
       if (subscribe) {
@@ -144,9 +153,9 @@ export function useLabelerSubscriptionMutation() {
         if (labelerCount >= MAX_LABELERS) {
           throw new Error('MAX_LABELERS')
         }
-        await agent.addLabeler(did)
+        await pdsClient.call(addLabeler, did as DidString)
       } else {
-        await agent.removeLabeler(did)
+        await pdsClient.call(removeLabeler, did as DidString)
       }
     },
     async onSuccess() {
diff --git a/src/state/queries/like.ts b/src/state/queries/like.ts
index fa40300a40..2f626cc428 100644
--- a/src/state/queries/like.ts
+++ b/src/state/queries/like.ts
@@ -1,22 +1,27 @@
+import {type AtUriString} from '@atproto/syntax'
+import {deleteLike, like} from '@bsky.app/sdk'
 import {useMutation} from '@tanstack/react-query'
 
-import {useAgent} from '#/state/session'
+import {usePdsClient} from '#/state/session'
 
 export function useLikeMutation() {
-  const agent = useAgent()
+  const pdsClient = usePdsClient()
   return useMutation({
     mutationFn: async ({uri, cid}: {uri: string; cid: string}) => {
-      const res = await agent.like(uri, cid)
+      const res = await pdsClient.call(like, {
+        uri: uri as AtUriString,
+        cid,
+      })
       return {uri: res.uri}
     },
   })
 }
 
 export function useUnlikeMutation() {
-  const agent = useAgent()
+  const pdsClient = usePdsClient()
   return useMutation({
     mutationFn: async ({uri}: {uri: string}) => {
-      await agent.deleteLike(uri)
+      await pdsClient.call(deleteLike, uri as AtUriString)
     },
   })
 }
diff --git a/src/state/queries/list-members.ts b/src/state/queries/list-members.ts
index 6e70ff4027..d466b92484 100644
--- a/src/state/queries/list-members.ts
+++ b/src/state/queries/list-members.ts
@@ -61,7 +61,7 @@ export function useAllListMembersQuery(uri?: string) {
 export async function getAllListMembers(client: Client, uri: string) {
   let hasMore = true
   let cursor: string | undefined
-  const listItems: AppBskyGraphDefs.ListItemView[] = []
+  const listItems: app.bsky.graph.defs.ListItemView[] = []
   // We want to cap this at 6 pages, just for anything weird happening with the api
   let i = 0
   while (hasMore && i < 6) {
diff --git a/src/state/queries/list.ts b/src/state/queries/list.ts
index eef0dac585..8c9829d0aa 100644
--- a/src/state/queries/list.ts
+++ b/src/state/queries/list.ts
@@ -6,6 +6,12 @@ import {
   type AtUriString,
   toDatetimeString,
 } from '@atproto/syntax'
+import {
+  blockActorList,
+  muteActorList,
+  unblockActorList,
+  unmuteActorList,
+} from '@bsky.app/sdk'
 import {useMutation, useQuery, useQueryClient} from '@tanstack/react-query'
 import chunk from 'lodash.chunk'
 
@@ -13,12 +19,7 @@ import {uploadBlob} from '#/lib/api'
 import {until} from '#/lib/async/until'
 import {type ImageMeta} from '#/state/gallery'
 import {STALE} from '#/state/queries'
-import {
-  useAgent,
-  useAppviewClient,
-  usePdsClient,
-  useSession,
-} from '#/state/session'
+import {useAppviewClient, usePdsClient, useSession} from '#/state/session'
 import {app, com} from '#/lexicons'
 import {FEED_INFO_RQKEY_ROOT} from './feed'
 import {invalidate as invalidateMyLists} from './my-lists'
@@ -255,15 +256,13 @@ export function useListDeleteMutation() {
 
 export function useListMuteMutation() {
   const queryClient = useQueryClient()
-  const agent = useAgent()
   const appviewClient = useAppviewClient()
   return useMutation<void, Error, {uri: string; mute: boolean}>({
     mutationFn: async ({uri, mute}) => {
-      // `muteModList`/`unmuteModList` are preference writes, migrated in wave B
       if (mute) {
-        await agent.muteModList(uri)
+        await appviewClient.call(muteActorList, {list: uri as AtUriString})
       } else {
-        await agent.unmuteModList(uri)
+        await appviewClient.call(unmuteActorList, {list: uri as AtUriString})
       }
 
       await whenAppViewReady(appviewClient, uri, v => {
@@ -280,15 +279,14 @@ export function useListMuteMutation() {
 
 export function useListBlockMutation() {
   const queryClient = useQueryClient()
-  const agent = useAgent()
   const appviewClient = useAppviewClient()
+  const pdsClient = usePdsClient()
   return useMutation<void, Error, {uri: string; block: boolean}>({
     mutationFn: async ({uri, block}) => {
-      // `blockModList`/`unblockModList` write a block record, migrated in wave B
       if (block) {
-        await agent.blockModList(uri)
+        await pdsClient.call(blockActorList, {list: uri as AtUriString})
       } else {
-        await agent.unblockModList(uri)
+        await pdsClient.call(unblockActorList, {list: uri as AtUriString})
       }
 
       await whenAppViewReady(appviewClient, uri, v => {
diff --git a/src/state/queries/messages/actor-declaration.ts b/src/state/queries/messages/actor-declaration.ts
index 17f36cbdd8..0824e52aae 100644
--- a/src/state/queries/messages/actor-declaration.ts
+++ b/src/state/queries/messages/actor-declaration.ts
@@ -1,15 +1,12 @@
-import type AtpAgent from '@atproto/api'
-import {
-  type AppBskyActorDefs,
-  type ChatBskyActorDeclaration,
-} from '@atproto/api'
+import {type AppBskyActorDefs} from '@atproto/api'
+import {type Client} from '@atproto/lex'
 import {type DidString} from '@atproto/syntax'
 import {useMutation, useQueryClient} from '@tanstack/react-query'
 
 import {logger} from '#/logger'
 import {usePdsClient, useSession} from '#/state/session'
 import {resolveAllowGroupInvites} from '#/components/dms/util'
-import {com} from '#/lexicons'
+import {chat, com} from '#/lexicons'
 import {RQKEY as PROFILE_RKEY} from '../profile'
 
 export function useUpdateActorDeclaration({
@@ -119,25 +116,16 @@ export function useDeleteActorDeclaration() {
   })
 }
 
-/*
- * Still takes the legacy agent: its only caller is `getOtherRequiredData` in
- * `#/ageAssurance/data`, which is blocked on `getPreferences` and so cannot
- * hand over a lex client yet.
- */
 export async function fetchActorDeclarationRecord({
-  agent,
+  client,
   did,
 }: {
-  agent: AtpAgent
+  client: Client
   did?: string
 }) {
   if (!did) return
-  const res = await agent.com.atproto.repo
-    .getRecord({
-      repo: did,
-      collection: 'chat.bsky.actor.declaration',
-      rkey: 'self',
-    })
+  const res = await client
+    .get(chat.bsky.actor.declaration, {repo: did as DidString, rkey: 'self'})
     .catch(_e => undefined)
-  return res?.data.value as ChatBskyActorDeclaration.Main
+  return res?.value
 }
diff --git a/src/state/queries/nuxs/index.ts b/src/state/queries/nuxs/index.ts
index b9650d0579..f2802f0406 100644
--- a/src/state/queries/nuxs/index.ts
+++ b/src/state/queries/nuxs/index.ts
@@ -1,3 +1,4 @@
+import {removeNuxs, upsertNux} from '@bsky.app/sdk'
 import {useMutation, useQueryClient} from '@tanstack/react-query'
 
 import {type AppNux, type Nux} from '#/state/queries/nuxs/definitions'
@@ -6,7 +7,8 @@ import {
   preferencesQueryKey,
   usePreferencesQuery,
 } from '#/state/queries/preferences'
-import {useAgent} from '#/state/session'
+import {usePdsClient} from '#/state/session'
+import {type app} from '#/lexicons'
 
 export {Nux} from '#/state/queries/nuxs/definitions'
 
@@ -42,11 +44,11 @@ export function useNuxs():
 
   // if (__DEV__) {
   //   const queryClient = useQueryClient()
-  //   const agent = useAgent()
+  //   const pdsClient = usePdsClient()
 
   //   // @ts-ignore
   //   window.clearNux = async (ids: string[]) => {
-  //     await agent.bskyAppRemoveNuxs(ids)
+  //     await pdsClient.call(removeNuxs, ids)
   //     // triggers a refetch
   //     await queryClient.invalidateQueries({
   //       queryKey: preferencesQueryKey,
@@ -97,12 +99,19 @@ export function useNux<T extends Nux>(
 
 export function useSaveNux() {
   const queryClient = useQueryClient()
-  const agent = useAgent()
+  const pdsClient = usePdsClient()
 
   return useMutation({
     retry: 3,
     mutationFn: async (nux: AppNux) => {
-      await agent.bskyAppUpsertNux(serializeAppNux(nux))
+      /*
+       * `serializeAppNux` still returns the legacy `Nux`, whose strings are
+       * unbranded; it is validated against the same schema the action expects.
+       */
+      await pdsClient.call(
+        upsertNux,
+        serializeAppNux(nux) as app.bsky.actor.defs.Nux,
+      )
       // triggers a refetch
       await queryClient.invalidateQueries({
         queryKey: preferencesQueryKey,
@@ -113,12 +122,12 @@ export function useSaveNux() {
 
 export function useResetNuxs() {
   const queryClient = useQueryClient()
-  const agent = useAgent()
+  const pdsClient = usePdsClient()
 
   return useMutation({
     retry: 3,
     mutationFn: async (ids: string[]) => {
-      await agent.bskyAppRemoveNuxs(ids)
+      await pdsClient.call(removeNuxs, ids)
       // triggers a refetch
       await queryClient.invalidateQueries({
         queryKey: preferencesQueryKey,
diff --git a/src/state/queries/pinned-post.ts b/src/state/queries/pinned-post.ts
index d132127e68..cd3d0cb4a3 100644
--- a/src/state/queries/pinned-post.ts
+++ b/src/state/queries/pinned-post.ts
@@ -6,7 +6,7 @@ import {useMutation, useQueryClient} from '@tanstack/react-query'
 import {logger} from '#/logger'
 import {RQKEY as FEED_RQKEY} from '#/state/queries/post-feed'
 import * as Toast from '#/components/Toast'
-import {app} from '#/lexicons'
+import {app, type com} from '#/lexicons'
 import {updatePostShadow} from '../cache/post-shadow'
 import {useAppviewClient, useSession} from '../session'
 import {useProfileUpdateMutation} from './profile'
@@ -47,7 +47,11 @@ export function usePinnedPostMutation() {
           profile,
           updates: existing => {
             existing.pinnedPost = pinCurrentPost
-              ? {uri: postUri, cid: postCid}
+              ? // the caller's uri/cid are unbranded strings
+                ({
+                  uri: postUri,
+                  cid: postCid,
+                } as com.atproto.repo.strongRef.Main)
               : undefined
             return existing
           },
diff --git a/src/state/queries/post-interaction-settings.ts b/src/state/queries/post-interaction-settings.ts
index af178d7f8b..45d964f435 100644
--- a/src/state/queries/post-interaction-settings.ts
+++ b/src/state/queries/post-interaction-settings.ts
@@ -1,8 +1,9 @@
-import {type AppBskyActorDefs} from '@atproto/api'
+import {setPostInteractionSettings} from '@bsky.app/sdk'
 import {useMutation, useQueryClient} from '@tanstack/react-query'
 
 import {preferencesQueryKey} from '#/state/queries/preferences'
-import {useAgent} from '#/state/session'
+import {usePdsClient} from '#/state/session'
+import {type app} from '#/lexicons'
 
 export function usePostInteractionSettingsMutation({
   onError,
@@ -12,10 +13,10 @@ export function usePostInteractionSettingsMutation({
   onSettled?: () => void
 } = {}) {
   const qc = useQueryClient()
-  const agent = useAgent()
+  const client = usePdsClient()
   return useMutation({
-    async mutationFn(props: AppBskyActorDefs.PostInteractionSettingsPref) {
-      await agent.setPostInteractionSettings(props)
+    async mutationFn(props: app.bsky.actor.defs.PostInteractionSettingsPref) {
+      await client.call(setPostInteractionSettings, props)
     },
     async onSuccess() {
       await qc.invalidateQueries({
diff --git a/src/state/queries/post.ts b/src/state/queries/post.ts
index 79df51d1bf..fd6ba752de 100644
--- a/src/state/queries/post.ts
+++ b/src/state/queries/post.ts
@@ -1,5 +1,7 @@
 import {useCallback} from 'react'
 import {type AppBskyActorDefs, type AppBskyFeedDefs, AtUri} from '@atproto/api'
+import {type AtUriString} from '@atproto/syntax'
+import {deleteLike, deletePost, deleteRepost, like, repost} from '@bsky.app/sdk'
 import {
   type QueryClient,
   useMutation,
@@ -10,10 +12,16 @@ import {
 import {useToggleMutationQueue} from '#/lib/hooks/useToggleMutationQueue'
 import {updatePostShadow} from '#/state/cache/post-shadow'
 import {type Shadow} from '#/state/cache/types'
-import {useAgent, useSession} from '#/state/session'
+import {
+  useAgent,
+  useAppviewClient,
+  usePdsClient,
+  useSession,
+} from '#/state/session'
 import * as userActionHistory from '#/state/userActionHistory'
 import {useAnalytics} from '#/analytics'
 import {type Metrics, toClout} from '#/analytics/metrics'
+import {app} from '#/lexicons'
 import {useIsThreadMuted, useSetThreadMute} from '../cache/thread-mutes'
 import {findProfileQueryData} from './profile'
 
@@ -184,7 +192,7 @@ function usePostLikeMutation(
   const {currentAccount} = useSession()
   const queryClient = useQueryClient()
   const postAuthor = post.author
-  const agent = useAgent()
+  const pdsClient = usePdsClient()
   const ax = useAnalytics()
   return useMutation<
     {uri: string}, // responds with the uri of the like
@@ -215,7 +223,11 @@ function usePostLikeMutation(
             : undefined,
         feedDescriptor: feedDescriptor,
       })
-      return agent.like(uri, cid, via)
+      return pdsClient.call(like, {
+        uri: uri as AtUriString,
+        cid: cid,
+        via: via ? {uri: via.uri as AtUriString, cid: via.cid} : undefined,
+      })
     },
   })
 }
@@ -225,7 +237,7 @@ function usePostUnlikeMutation(
   logContext: Metrics['post:unlike']['logContext'],
   post: Shadow<AppBskyFeedDefs.PostView>,
 ) {
-  const agent = useAgent()
+  const pdsClient = usePdsClient()
   const ax = useAnalytics()
   return useMutation<void, Error, {postUri: string; likeUri: string}>({
     mutationFn: ({postUri, likeUri}) => {
@@ -235,7 +247,7 @@ function usePostUnlikeMutation(
         logContext,
         feedDescriptor,
       })
-      return agent.deleteLike(likeUri)
+      return pdsClient.call(deleteLike, likeUri as AtUriString)
     },
   })
 }
@@ -309,7 +321,7 @@ function usePostRepostMutation(
   logContext: Metrics['post:repost']['logContext'],
   post: Shadow<AppBskyFeedDefs.PostView>,
 ) {
-  const agent = useAgent()
+  const pdsClient = usePdsClient()
   const ax = useAnalytics()
   return useMutation<
     {uri: string}, // responds with the uri of the repost
@@ -323,7 +335,11 @@ function usePostRepostMutation(
         logContext,
         feedDescriptor,
       })
-      return agent.repost(uri, cid, via)
+      return pdsClient.call(repost, {
+        uri: uri as AtUriString,
+        cid: cid,
+        via: via ? {uri: via.uri as AtUriString, cid: via.cid} : undefined,
+      })
     },
   })
 }
@@ -333,7 +349,7 @@ function usePostUnrepostMutation(
   logContext: Metrics['post:unrepost']['logContext'],
   post: Shadow<AppBskyFeedDefs.PostView>,
 ) {
-  const agent = useAgent()
+  const pdsClient = usePdsClient()
   const ax = useAnalytics()
   return useMutation<void, Error, {postUri: string; repostUri: string}>({
     mutationFn: ({postUri, repostUri}) => {
@@ -343,17 +359,17 @@ function usePostUnrepostMutation(
         logContext,
         feedDescriptor,
       })
-      return agent.deleteRepost(repostUri)
+      return pdsClient.call(deleteRepost, repostUri as AtUriString)
     },
   })
 }
 
 export function usePostDeleteMutation() {
   const queryClient = useQueryClient()
-  const agent = useAgent()
+  const pdsClient = usePdsClient()
   return useMutation<void, Error, {uri: string}>({
     mutationFn: async ({uri}) => {
-      await agent.deletePost(uri)
+      await pdsClient.call(deletePost, uri as AtUriString)
     },
     onSuccess(_, variables) {
       updatePostShadow(queryClient, variables.uri, {isDeleted: true})
@@ -407,23 +423,29 @@ export function useThreadMuteMutationQueue(
 }
 
 function useThreadMuteMutation() {
-  const agent = useAgent()
+  const appviewClient = useAppviewClient()
   return useMutation<
     {},
     Error,
     {uri: string} // the root post's uri
   >({
-    mutationFn: ({uri}) => {
-      return agent.api.app.bsky.graph.muteThread({root: uri})
+    mutationFn: async ({uri}) => {
+      await appviewClient.call(app.bsky.graph.muteThread, {
+        root: uri as AtUriString,
+      })
+      return {}
     },
   })
 }
 
 function useThreadUnmuteMutation() {
-  const agent = useAgent()
+  const appviewClient = useAppviewClient()
   return useMutation<{}, Error, {uri: string}>({
-    mutationFn: ({uri}) => {
-      return agent.api.app.bsky.graph.unmuteThread({root: uri})
+    mutationFn: async ({uri}) => {
+      await appviewClient.call(app.bsky.graph.unmuteThread, {
+        root: uri as AtUriString,
+      })
+      return {}
     },
   })
 }
diff --git a/src/state/queries/preferences/index.ts b/src/state/queries/preferences/index.ts
index a5803a9c7b..6358de738c 100644
--- a/src/state/queries/preferences/index.ts
+++ b/src/state/queries/preferences/index.ts
@@ -1,9 +1,28 @@
 import {useCallback} from 'react'
+import {type AppBskyActorDefs} from '@atproto/api'
+import {type DidString} from '@atproto/syntax'
 import {
-  type AppBskyActorDefs,
+  addSavedFeeds,
   type BskyFeedViewPreference,
-  type LabelPreference,
-} from '@atproto/api'
+  dismissNudges,
+  getPreferences,
+  overwriteSavedFeeds,
+  queueNudges,
+  removeMutedWord,
+  removeMutedWords,
+  removeSavedFeeds,
+  setActiveProgressGuide,
+  setAdultContentEnabled,
+  setContentLabelPref,
+  setFeedViewPrefs,
+  setIsBetaUser,
+  setThreadViewPrefs,
+  setVerificationPrefs,
+  updateMutedWord,
+  updateSavedFeeds,
+  upsertMutedWords,
+} from '@bsky.app/sdk'
+import {type LabelPreference} from '@bsky.app/sdk/moderation'
 import {useMutation, useQuery, useQueryClient} from '@tanstack/react-query'
 
 import {PROD_DEFAULT_FEED} from '#/lib/constants'
@@ -20,11 +39,12 @@ import {
   type UsePreferencesQueryResponse,
 } from '#/state/queries/preferences/types'
 import {createQueryKey} from '#/state/queries/util'
-import {useAgent} from '#/state/session'
+import {useAgent, usePdsClient} from '#/state/session'
 import {saveLabelers} from '#/state/session/moderation'
 import {useAgeAssurance} from '#/ageAssurance'
 import {makeAgeRestrictedModerationPrefs} from '#/ageAssurance/util'
 import {useAnalytics} from '#/analytics'
+import {app} from '#/lexicons'
 
 export * from '#/state/queries/preferences/const'
 export * from '#/state/queries/preferences/moderation'
@@ -37,6 +57,7 @@ export const preferencesQueryKey = createQueryKey(
 )
 
 export function usePreferencesQuery() {
+  const client = usePdsClient()
   const agent = useAgent()
   const aa = useAgeAssurance()
 
@@ -47,18 +68,34 @@ export function usePreferencesQuery() {
     queryKey: preferencesQueryKey,
     gcTime: GCTIME.INFINITY,
     queryFn: async () => {
-      if (!agent.did) {
+      if (!client.did) {
         return DEFAULT_LOGGED_OUT_PREFERENCES
       } else {
-        const res = await agent.getPreferences()
+        const res = await client.call(getPreferences)
+
+        const labelerDids = res.moderationPrefs.labelers.map(l => l.did)
 
         // save to local storage to ensure there are labels on initial requests
-        saveLabelers(
-          agent.did,
-          res.moderationPrefs.labelers.map(l => l.did),
-        )
+        saveLabelers(client.did, labelerDids)
 
-        const preferences: UsePreferencesQueryResponse = {
+        /*
+         * `BskyAgent.getPreferences` used to call `configureLabelers` itself,
+         * so subscribing to a labeler took effect on the very next appview
+         * read. The sdk action has no such side effect, and appview reads still
+         * inherit `atproto-accept-labelers` from the agent's fetch handler, so
+         * apply the subscriptions there rather than on the wrapping client -
+         * setting them on both would emit the header twice.
+         */
+        agent.configureLabelers(labelerDids)
+
+        /*
+         * The sdk's `BskyPreferences` is field-for-field identical to the
+         * legacy one that `UsePreferencesQueryResponse` is still derived from;
+         * only its strings are branded (`AtUriString`, `DidString`). Cast at
+         * this one seam so every downstream consumer of the response - notably
+         * the `moderationPrefs` readers - keeps its current types.
+         */
+        const preferences = {
           ...res,
           savedFeeds: res.savedFeeds.filter(f => f.type !== 'unknown'),
           /**
@@ -74,7 +111,7 @@ export function usePreferencesQuery() {
             ...(res.threadViewPrefs ?? {}),
           },
           userAge: res.birthDate ? getAge(res.birthDate) : undefined,
-        }
+        } as UsePreferencesQueryResponse
         return preferences
       }
     },
@@ -113,11 +150,11 @@ export function usePreferencesQuery() {
 
 export function useClearPreferencesMutation() {
   const queryClient = useQueryClient()
-  const agent = useAgent()
+  const client = usePdsClient()
 
   return useMutation({
     mutationFn: async () => {
-      await agent.app.bsky.actor.putPreferences({preferences: []})
+      await client.call(app.bsky.actor.putPreferences, {preferences: []})
       // triggers a refetch
       await queryClient.invalidateQueries({
         queryKey: preferencesQueryKey,
@@ -128,7 +165,7 @@ export function useClearPreferencesMutation() {
 
 export function usePreferencesSetContentLabelMutation() {
   const ax = useAnalytics()
-  const agent = useAgent()
+  const client = usePdsClient()
   const queryClient = useQueryClient()
 
   return useMutation<
@@ -137,7 +174,11 @@ export function usePreferencesSetContentLabelMutation() {
     {label: string; visibility: LabelPreference; labelerDid: string | undefined}
   >({
     mutationFn: async ({label, visibility, labelerDid}) => {
-      await agent.setContentLabelPref(label, visibility, labelerDid)
+      await client.call(setContentLabelPref, {
+        key: label,
+        value: visibility,
+        labelerDid: labelerDid as DidString | undefined,
+      })
       ax.metric('moderation:changeLabelPreference', {preference: visibility})
       // triggers a refetch
       await queryClient.invalidateQueries({
@@ -149,7 +190,7 @@ export function usePreferencesSetContentLabelMutation() {
 
 export function useSetContentLabelMutation() {
   const queryClient = useQueryClient()
-  const agent = useAgent()
+  const client = usePdsClient()
 
   return useMutation({
     mutationFn: async ({
@@ -161,7 +202,11 @@ export function useSetContentLabelMutation() {
       visibility: LabelPreference
       labelerDid?: string
     }) => {
-      await agent.setContentLabelPref(label, visibility, labelerDid)
+      await client.call(setContentLabelPref, {
+        key: label,
+        value: visibility,
+        labelerDid: labelerDid as DidString | undefined,
+      })
       // triggers a refetch
       await queryClient.invalidateQueries({
         queryKey: preferencesQueryKey,
@@ -172,11 +217,11 @@ export function useSetContentLabelMutation() {
 
 export function usePreferencesSetAdultContentMutation() {
   const queryClient = useQueryClient()
-  const agent = useAgent()
+  const client = usePdsClient()
 
   return useMutation<void, unknown, {enabled: boolean}>({
     mutationFn: async ({enabled}) => {
-      await agent.setAdultContentEnabled(enabled)
+      await client.call(setAdultContentEnabled, enabled)
       // triggers a refetch
       await queryClient.invalidateQueries({
         queryKey: preferencesQueryKey,
@@ -187,7 +232,7 @@ export function usePreferencesSetAdultContentMutation() {
 
 export function useSetFeedViewPreferencesMutation() {
   const queryClient = useQueryClient()
-  const agent = useAgent()
+  const client = usePdsClient()
 
   return useMutation<void, unknown, Partial<BskyFeedViewPreference>>({
     mutationFn: async prefs => {
@@ -195,7 +240,7 @@ export function useSetFeedViewPreferencesMutation() {
        * special handling here, merged into `feedViewPrefs` above, since
        * following was previously called `home`
        */
-      await agent.setFeedViewPrefs('home', prefs)
+      await client.call(setFeedViewPrefs, {feed: 'home', ...prefs})
       // triggers a refetch
       await queryClient.invalidateQueries({
         queryKey: preferencesQueryKey,
@@ -212,11 +257,11 @@ export function useSetThreadViewPreferencesMutation({
   onError?: (error: unknown) => void
 }) {
   const queryClient = useQueryClient()
-  const agent = useAgent()
+  const client = usePdsClient()
 
   return useMutation<void, unknown, Partial<ThreadViewPreferences>>({
     mutationFn: async prefs => {
-      await agent.setThreadViewPrefs(prefs)
+      await client.call(setThreadViewPrefs, prefs)
       // triggers a refetch
       await queryClient.invalidateQueries({
         queryKey: preferencesQueryKey,
@@ -229,11 +274,11 @@ export function useSetThreadViewPreferencesMutation({
 
 export function useOverwriteSavedFeedsMutation() {
   const queryClient = useQueryClient()
-  const agent = useAgent()
+  const client = usePdsClient()
 
   return useMutation<void, unknown, AppBskyActorDefs.SavedFeed[]>({
     mutationFn: async savedFeeds => {
-      await agent.overwriteSavedFeeds(savedFeeds)
+      await client.call(overwriteSavedFeeds, savedFeeds)
       // triggers a refetch
       await queryClient.invalidateQueries({
         queryKey: preferencesQueryKey,
@@ -244,7 +289,7 @@ export function useOverwriteSavedFeedsMutation() {
 
 export function useAddSavedFeedsMutation() {
   const queryClient = useQueryClient()
-  const agent = useAgent()
+  const client = usePdsClient()
 
   return useMutation<
     void,
@@ -252,7 +297,7 @@ export function useAddSavedFeedsMutation() {
     Pick<AppBskyActorDefs.SavedFeed, 'type' | 'value' | 'pinned'>[]
   >({
     mutationFn: async savedFeeds => {
-      await agent.addSavedFeeds(savedFeeds)
+      await client.call(addSavedFeeds, savedFeeds)
       // triggers a refetch
       await queryClient.invalidateQueries({
         queryKey: preferencesQueryKey,
@@ -263,11 +308,11 @@ export function useAddSavedFeedsMutation() {
 
 export function useRemoveFeedMutation() {
   const queryClient = useQueryClient()
-  const agent = useAgent()
+  const client = usePdsClient()
 
   return useMutation<void, unknown, Pick<AppBskyActorDefs.SavedFeed, 'id'>>({
     mutationFn: async savedFeed => {
-      await agent.removeSavedFeeds([savedFeed.id])
+      await client.call(removeSavedFeeds, [savedFeed.id])
       // triggers a refetch
       await queryClient.invalidateQueries({
         queryKey: preferencesQueryKey,
@@ -278,7 +323,7 @@ export function useRemoveFeedMutation() {
 
 export function useReplaceForYouWithDiscoverFeedMutation() {
   const queryClient = useQueryClient()
-  const agent = useAgent()
+  const client = usePdsClient()
 
   return useMutation({
     mutationFn: async ({
@@ -289,10 +334,10 @@ export function useReplaceForYouWithDiscoverFeedMutation() {
       discoverFeedConfig: AppBskyActorDefs.SavedFeed | undefined
     }) => {
       if (forYouFeedConfig) {
-        await agent.removeSavedFeeds([forYouFeedConfig.id])
+        await client.call(removeSavedFeeds, [forYouFeedConfig.id])
       }
       if (!discoverFeedConfig) {
-        await agent.addSavedFeeds([
+        await client.call(addSavedFeeds, [
           {
             type: 'feed',
             value: PROD_DEFAULT_FEED('whats-hot'),
@@ -300,7 +345,7 @@ export function useReplaceForYouWithDiscoverFeedMutation() {
           },
         ])
       } else {
-        await agent.updateSavedFeeds([
+        await client.call(updateSavedFeeds, [
           {
             ...discoverFeedConfig,
             pinned: true,
@@ -317,11 +362,11 @@ export function useReplaceForYouWithDiscoverFeedMutation() {
 
 export function useUpdateSavedFeedsMutation() {
   const queryClient = useQueryClient()
-  const agent = useAgent()
+  const client = usePdsClient()
 
   return useMutation<void, unknown, AppBskyActorDefs.SavedFeed[]>({
     mutationFn: async feeds => {
-      await agent.updateSavedFeeds(feeds)
+      await client.call(updateSavedFeeds, feeds)
 
       // triggers a refetch
       await queryClient.invalidateQueries({
@@ -333,11 +378,14 @@ export function useUpdateSavedFeedsMutation() {
 
 export function useUpsertMutedWordsMutation() {
   const queryClient = useQueryClient()
-  const agent = useAgent()
+  const client = usePdsClient()
 
   return useMutation({
     mutationFn: async (mutedWords: AppBskyActorDefs.MutedWord[]) => {
-      await agent.upsertMutedWords(mutedWords)
+      await client.call(
+        upsertMutedWords,
+        mutedWords as app.bsky.actor.defs.MutedWord[],
+      )
       // triggers a refetch
       await queryClient.invalidateQueries({
         queryKey: preferencesQueryKey,
@@ -348,11 +396,14 @@ export function useUpsertMutedWordsMutation() {
 
 export function useUpdateMutedWordMutation() {
   const queryClient = useQueryClient()
-  const agent = useAgent()
+  const client = usePdsClient()
 
   return useMutation({
     mutationFn: async (mutedWord: AppBskyActorDefs.MutedWord) => {
-      await agent.updateMutedWord(mutedWord)
+      await client.call(
+        updateMutedWord,
+        mutedWord as app.bsky.actor.defs.MutedWord,
+      )
       // triggers a refetch
       await queryClient.invalidateQueries({
         queryKey: preferencesQueryKey,
@@ -363,11 +414,14 @@ export function useUpdateMutedWordMutation() {
 
 export function useRemoveMutedWordMutation() {
   const queryClient = useQueryClient()
-  const agent = useAgent()
+  const client = usePdsClient()
 
   return useMutation({
     mutationFn: async (mutedWord: AppBskyActorDefs.MutedWord) => {
-      await agent.removeMutedWord(mutedWord)
+      await client.call(
+        removeMutedWord,
+        mutedWord as app.bsky.actor.defs.MutedWord,
+      )
       // triggers a refetch
       await queryClient.invalidateQueries({
         queryKey: preferencesQueryKey,
@@ -378,11 +432,14 @@ export function useRemoveMutedWordMutation() {
 
 export function useRemoveMutedWordsMutation() {
   const queryClient = useQueryClient()
-  const agent = useAgent()
+  const client = usePdsClient()
 
   return useMutation({
     mutationFn: async (mutedWords: AppBskyActorDefs.MutedWord[]) => {
-      await agent.removeMutedWords(mutedWords)
+      await client.call(
+        removeMutedWords,
+        mutedWords as app.bsky.actor.defs.MutedWord[],
+      )
       // triggers a refetch
       await queryClient.invalidateQueries({
         queryKey: preferencesQueryKey,
@@ -393,11 +450,11 @@ export function useRemoveMutedWordsMutation() {
 
 export function useQueueNudgesMutation() {
   const queryClient = useQueryClient()
-  const agent = useAgent()
+  const client = usePdsClient()
 
   return useMutation({
     mutationFn: async (nudges: string | string[]) => {
-      await agent.bskyAppQueueNudges(nudges)
+      await client.call(queueNudges, Array.isArray(nudges) ? nudges : [nudges])
       // triggers a refetch
       await queryClient.invalidateQueries({
         queryKey: preferencesQueryKey,
@@ -408,11 +465,14 @@ export function useQueueNudgesMutation() {
 
 export function useDismissNudgesMutation() {
   const queryClient = useQueryClient()
-  const agent = useAgent()
+  const client = usePdsClient()
 
   return useMutation({
     mutationFn: async (nudges: string | string[]) => {
-      await agent.bskyAppDismissNudges(nudges)
+      await client.call(
+        dismissNudges,
+        Array.isArray(nudges) ? nudges : [nudges],
+      )
       // triggers a refetch
       await queryClient.invalidateQueries({
         queryKey: preferencesQueryKey,
@@ -423,13 +483,13 @@ export function useDismissNudgesMutation() {
 
 export function useSetActiveProgressGuideMutation() {
   const queryClient = useQueryClient()
-  const agent = useAgent()
+  const client = usePdsClient()
 
   return useMutation({
     mutationFn: async (
       guide: AppBskyActorDefs.BskyAppProgressGuide | undefined,
     ) => {
-      await agent.bskyAppSetActiveProgressGuide(guide)
+      await client.call(setActiveProgressGuide, guide)
       // triggers a refetch
       await queryClient.invalidateQueries({
         queryKey: preferencesQueryKey,
@@ -440,11 +500,11 @@ export function useSetActiveProgressGuideMutation() {
 
 export function useSetIsBetaUserMutation() {
   const queryClient = useQueryClient()
-  const agent = useAgent()
+  const client = usePdsClient()
 
   return useMutation({
     mutationFn: async (isBetaUser: boolean) => {
-      await agent.setIsBetaUser(isBetaUser)
+      await client.call(setIsBetaUser, isBetaUser)
       // triggers a refetch
       await queryClient.invalidateQueries({
         queryKey: preferencesQueryKey,
@@ -456,11 +516,11 @@ export function useSetIsBetaUserMutation() {
 export function useSetVerificationPrefsMutation() {
   const ax = useAnalytics()
   const queryClient = useQueryClient()
-  const agent = useAgent()
+  const client = usePdsClient()
 
   return useMutation<void, unknown, AppBskyActorDefs.VerificationPrefs>({
     mutationFn: async prefs => {
-      await agent.setVerificationPrefs(prefs)
+      await client.call(setVerificationPrefs, prefs)
       if (prefs.hideBadges) {
         ax.metric('verification:settings:hideBadges', {})
       } else {
diff --git a/src/state/queries/profile.ts b/src/state/queries/profile.ts
index ae5d4b1ad6..d673ba3230 100644
--- a/src/state/queries/profile.ts
+++ b/src/state/queries/profile.ts
@@ -3,17 +3,24 @@ import {
   type AppBskyActorDefs,
   type AppBskyActorGetProfile,
   type AppBskyActorGetProfiles,
-  type AppBskyActorProfile,
   type AppBskyGraphGetFollows,
-  type AtpAgent,
   AtUri,
   type Un$Typed,
 } from '@atproto/api'
+import {type Client} from '@atproto/lex'
 import {
   type AtIdentifierString,
+  type AtUriString,
   type DidString,
   toDatetimeString,
 } from '@atproto/syntax'
+import {
+  deleteFollow,
+  follow,
+  muteActor,
+  unmuteActor,
+  upsertProfile,
+} from '@bsky.app/sdk'
 import {
   type InfiniteData,
   keepPreviousData,
@@ -24,7 +31,6 @@ import {
 } from '@tanstack/react-query'
 
 import {uploadBlob} from '#/lib/api'
-import {toLegacyBlobRef} from '#/lib/api/legacy-blob'
 import {until} from '#/lib/async/until'
 import {useToggleMutationQueue} from '#/lib/hooks/useToggleMutationQueue'
 import {updateProfileShadow} from '#/state/cache/profile-shadow'
@@ -38,7 +44,7 @@ import {
   useUnstableProfileViewCache,
 } from '#/state/queries/unstable-profile-cache'
 import {useUpdateProfileVerificationCache} from '#/state/queries/verification/useUpdateProfileVerificationCache'
-import {useAgent, usePdsClient, useSession} from '#/state/session'
+import {useAppviewClient, usePdsClient, useSession} from '#/state/session'
 import * as userActionHistory from '#/state/userActionHistory'
 import {useAnalytics} from '#/analytics'
 import {type Metrics, toClout} from '#/analytics/metrics'
@@ -74,7 +80,7 @@ export function useProfileQuery({
   did: string | undefined
   staleTime?: number
 }) {
-  const agent = useAgent()
+  const client = useAppviewClient()
   const {getUnstableProfile} = useUnstableProfileViewCache()
   return useQuery<AppBskyActorDefs.ProfileViewDetailed>({
     // WARNING
@@ -85,8 +91,9 @@ export function useProfileQuery({
     refetchOnWindowFocus: true,
     queryKey: RQKEY(did ?? ''),
     queryFn: async () => {
-      const res = await agent.getProfile({actor: did ?? ''})
-      return res.data
+      return await client.call(app.bsky.actor.getProfile, {
+        actor: (did ?? '') as AtIdentifierString,
+      })
     },
     placeholderData: () => {
       if (!did) return
@@ -103,21 +110,22 @@ export function useProfilesQuery({
   handles: string[]
   maintainData?: boolean
 }) {
-  const agent = useAgent()
+  const client = useAppviewClient()
   return useQuery({
     enabled: handles.length > 0,
     staleTime: STALE.MINUTES.FIVE,
     queryKey: profilesQueryKey(handles),
     queryFn: async () => {
-      const res = await agent.getProfiles({actors: handles})
-      return res.data
+      return await client.call(app.bsky.actor.getProfiles, {
+        actors: handles as AtIdentifierString[],
+      })
     },
     placeholderData: maintainData ? keepPreviousData : undefined,
   })
 }
 
 export function usePrefetchProfileQuery() {
-  const agent = useAgent()
+  const client = useAppviewClient()
   const queryClient = useQueryClient()
   const prefetchProfileQuery = useCallback(
     async (did: string) => {
@@ -125,12 +133,13 @@ export function usePrefetchProfileQuery() {
         staleTime: STALE.SECONDS.THIRTY,
         queryKey: RQKEY(did),
         queryFn: async () => {
-          const res = await agent.getProfile({actor: did || ''})
-          return res.data
+          return await client.call(app.bsky.actor.getProfile, {
+            actor: (did || '') as AtIdentifierString,
+          })
         },
       })
     },
-    [queryClient, agent],
+    [queryClient, client],
   )
   return prefetchProfileQuery
 }
@@ -138,18 +147,18 @@ export function usePrefetchProfileQuery() {
 interface ProfileUpdateParams {
   profile: AppBskyActorDefs.ProfileViewDetailed
   updates:
-    | Un$Typed<AppBskyActorProfile.Record>
+    | Un$Typed<app.bsky.actor.profile.Main>
     | ((
-        existing: Un$Typed<AppBskyActorProfile.Record>,
-      ) => Un$Typed<AppBskyActorProfile.Record>)
+        existing: Un$Typed<app.bsky.actor.profile.Main>,
+      ) => Un$Typed<app.bsky.actor.profile.Main>)
   newUserAvatar?: ImageMeta | undefined | null
   newUserBanner?: ImageMeta | undefined | null
   checkCommitted?: (res: AppBskyActorGetProfile.Response) => boolean
 }
 export function useProfileUpdateMutation() {
   const queryClient = useQueryClient()
-  const agent = useAgent()
   const pdsClient = usePdsClient()
+  const appviewClient = useAppviewClient()
   const updateProfileVerificationCache = useUpdateProfileVerificationCache()
   return useMutation<void, Error, ProfileUpdateParams>({
     mutationFn: async ({
@@ -175,8 +184,8 @@ export function useProfileUpdateMutation() {
           newUserBanner.mime,
         )
       }
-      await agent.upsertProfile(async existing => {
-        let next: Un$Typed<AppBskyActorProfile.Record> = existing || {}
+      await pdsClient.call(upsertProfile, async existing => {
+        let next: Un$Typed<app.bsky.actor.profile.Main> = existing || {}
         if (typeof updates === 'function') {
           next = updates(next)
         } else {
@@ -188,20 +197,20 @@ export function useProfileUpdateMutation() {
         }
         if (newUserAvatarPromise) {
           const res = await newUserAvatarPromise
-          next.avatar = toLegacyBlobRef(res.blob)
+          next.avatar = res.blob
         } else if (newUserAvatar === null) {
           next.avatar = undefined
         }
         if (newUserBannerPromise) {
           const res = await newUserBannerPromise
-          next.banner = toLegacyBlobRef(res.blob)
+          next.banner = res.blob
         } else if (newUserBanner === null) {
           next.banner = undefined
         }
         return next
       })
       await whenAppViewReady(
-        agent,
+        appviewClient,
         profile.did,
         checkCommitted ||
           (res => {
@@ -252,7 +261,7 @@ export function useProfileFollowMutationQueue(
   position?: number,
   contextProfileDid?: string,
 ) {
-  const agent = useAgent()
+  const client = useAppviewClient()
   const queryClient = useQueryClient()
   const {currentAccount} = useSession()
   const did = profile.did
@@ -333,12 +342,12 @@ export function useProfileFollowMutationQueue(
       }
 
       if (finalFollowingUri) {
-        void agent.app.bsky.graph
-          .getSuggestedFollowsByActor({
-            actor: did,
+        void client
+          .call(app.bsky.graph.getSuggestedFollowsByActor, {
+            actor: did as AtIdentifierString,
           })
           .then(res => {
-            const dids = res.data.suggestions
+            const dids = res.suggestions
               .filter(a => !a.viewer?.following)
               .map(a => a.did)
               .slice(0, 8)
@@ -375,7 +384,7 @@ function useProfileFollowMutation(
 ) {
   const ax = useAnalytics()
   const {currentAccount} = useSession()
-  const agent = useAgent()
+  const pdsClient = usePdsClient()
   const queryClient = useQueryClient()
   const {captureAction} = useProgressGuideControls()
 
@@ -400,7 +409,7 @@ function useProfileFollowMutation(
         position,
         contextProfileDid,
       })
-      return await agent.follow(did)
+      return await pdsClient.call(follow, {did: did as DidString})
     },
   })
 }
@@ -409,11 +418,11 @@ function useProfileUnfollowMutation(
   logContext: Metrics['profile:unfollow']['logContext'],
 ) {
   const ax = useAnalytics()
-  const agent = useAgent()
+  const pdsClient = usePdsClient()
   return useMutation<void, Error, {did: string; followUri: string}>({
     mutationFn: async ({followUri}) => {
       ax.metric('profile:unfollow', {logContext})
-      return await agent.deleteFollow(followUri)
+      return await pdsClient.call(deleteFollow, followUri as AtUriString)
     },
   })
 }
@@ -423,7 +432,7 @@ export function useProfileMuteMutationQueue(
 ) {
   const ax = useAnalytics()
   const queryClient = useQueryClient()
-  const did = profile.did
+  const did = profile.did as DidString
   const initialMuted = profile.viewer?.muted
   const muteMutation = useProfileMuteMutation()
   const unmuteMutation = useProfileUnmuteMutation()
@@ -432,15 +441,11 @@ export function useProfileMuteMutationQueue(
     initialState: initialMuted,
     runMutation: async (_prevMuted, shouldMute) => {
       if (shouldMute) {
-        await muteMutation.mutateAsync({
-          did,
-        })
+        await muteMutation.mutateAsync({did})
         ax.metric('profile:mute', {})
         return true
       } else {
-        await unmuteMutation.mutateAsync({
-          did,
-        })
+        await unmuteMutation.mutateAsync({did})
         ax.metric('profile:unmute', {})
         return false
       }
@@ -485,7 +490,7 @@ export function useProfileMuteRepostsMutationQueue(
 ) {
   const ax = useAnalytics()
   const queryClient = useQueryClient()
-  const did = profile.did
+  const did = profile.did as DidString
   const initialMutedOnlyReposts = !!profile.viewer?.mutedOnlyReposts
   const muteRepostsMutation = useProfileMuteRepostsMutation()
   const unmuteMutation = useProfileUnmuteMutation()
@@ -494,15 +499,11 @@ export function useProfileMuteRepostsMutationQueue(
     initialState: initialMutedOnlyReposts,
     runMutation: async (_prevMutedOnlyReposts, shouldMute) => {
       if (shouldMute) {
-        await muteRepostsMutation.mutateAsync({
-          did,
-        })
+        await muteRepostsMutation.mutateAsync({did})
         ax.metric('profile:muteReposts', {})
         return true
       } else {
-        await unmuteMutation.mutateAsync({
-          did,
-        })
+        await unmuteMutation.mutateAsync({did})
         ax.metric('profile:unmuteReposts', {})
         return false
       }
@@ -536,10 +537,10 @@ export function useProfileMuteRepostsMutationQueue(
 
 function useProfileMuteMutation() {
   const queryClient = useQueryClient()
-  const agent = useAgent()
-  return useMutation<void, Error, {did: string}>({
-    mutationFn: async ({did}) => {
-      await agent.mute(did)
+  const appviewClient = useAppviewClient()
+  return useMutation({
+    mutationFn: async ({did}: {did: DidString}) => {
+      await appviewClient.call(muteActor, {actor: did})
     },
     onSuccess() {
       void queryClient.invalidateQueries({queryKey: RQKEY_MY_MUTED()})
@@ -549,10 +550,14 @@ function useProfileMuteMutation() {
 
 function useProfileMuteRepostsMutation() {
   const queryClient = useQueryClient()
-  const agent = useAgent()
-  return useMutation<void, Error, {did: string}>({
-    mutationFn: async ({did}) => {
-      await agent.mute(did, {onlyReposts: true})
+  const appviewClient = useAppviewClient()
+  return useMutation({
+    mutationFn: async ({did}: {did: DidString}) => {
+      await appviewClient.call(muteActor, {
+        actor: did,
+        // @ts-expect-error missing from this SDK version, remove this
+        onlyReposts: true,
+      })
     },
     onSuccess() {
       void queryClient.invalidateQueries({queryKey: RQKEY_MY_MUTED()})
@@ -562,10 +567,10 @@ function useProfileMuteRepostsMutation() {
 
 function useProfileUnmuteMutation() {
   const queryClient = useQueryClient()
-  const agent = useAgent()
-  return useMutation<void, Error, {did: string}>({
-    mutationFn: async ({did}) => {
-      await agent.unmute(did)
+  const appviewClient = useAppviewClient()
+  return useMutation({
+    mutationFn: async ({did}: {did: DidString}) => {
+      await appviewClient.call(unmuteActor, {actor: did})
     },
     onSuccess() {
       void queryClient.invalidateQueries({queryKey: RQKEY_MY_MUTED()})
@@ -679,7 +684,7 @@ function useProfileUnblockMutation() {
 }
 
 async function whenAppViewReady(
-  agent: AtpAgent,
+  client: Client,
   actor: string,
   fn: (res: AppBskyActorGetProfile.Response) => boolean,
 ) {
@@ -687,7 +692,17 @@ async function whenAppViewReady(
     5, // 5 tries
     1e3, // 1s delay between tries
     fn,
-    () => agent.app.bsky.actor.getProfile({actor}),
+    /*
+     * `checkCommitted` callbacks are still written against the legacy
+     * `Response` envelope, so wrap the lex output until those consumers move.
+     */
+    async () => ({
+      success: true,
+      headers: {},
+      data: await client.call(app.bsky.actor.getProfile, {
+        actor: actor as AtIdentifierString,
+      }),
+    }),
   )
 }
 
diff --git a/src/state/session/create-account.ts b/src/state/session/create-account.ts
index b44bed4dbd..959df45b13 100644
--- a/src/state/session/create-account.ts
+++ b/src/state/session/create-account.ts
@@ -1,7 +1,12 @@
-import {type AppBskyActorProfile, type Un$Typed} from '@atproto/api'
 import {TID} from '@atproto/common-web'
 import {type Client} from '@atproto/lex'
 import {PasswordSession} from '@atproto/lex-password-session'
+import {toDatetimeString} from '@atproto/syntax'
+import {
+  overwriteSavedFeeds,
+  setPersonalDetails,
+  upsertProfile,
+} from '@bsky.app/sdk'
 
 import {networkRetry} from '#/lib/async/retry'
 import {
@@ -21,8 +26,8 @@ import {
 } from '#/ageAssurance/data'
 import {unsafeGetAndComputeAgeAssurance} from '#/ageAssurance/state'
 import {features} from '#/analytics'
-import {type BskyAppAgent} from './bridge-agent'
-import {agentToPdsClient} from './clients'
+import {type app} from '#/lexicons'
+import {agentToAppviewClient, agentToPdsClient} from './clients'
 import {configureModerationForAccount} from './moderation'
 import {
   buildBundle,
@@ -88,7 +93,7 @@ export async function createSessionBundleAndCreateAccount(
   const gates = features.refresh({strategy: 'prefer-fresh-gates'})
   configureModerationForAccount(bundle.agent, earlyAccount)
 
-  const createdAt = new Date().toISOString()
+  const createdAt = toDatetimeString(new Date())
   const birthdate = birthDate.toISOString()
 
   /*
@@ -100,22 +105,23 @@ export async function createSessionBundleAndCreateAccount(
   setCreatedAtForDid({did: earlyAccount.did, createdAt})
   setBirthdateForDid({did: earlyAccount.did, birthdate})
   snoozeBirthdateUpdateAllowedForDid(earlyAccount.did)
+  // Post-signup writes all target the account's own repo and actor store.
+  const pdsClient = agentToPdsClient(bundle.agent)
   // Start the prefetch after seeding its synchronous birthdate inputs.
-  const aa = prefetchAgeAssuranceServerData({agent: bundle.agent})
+  const aa = prefetchAgeAssuranceServerData({
+    appviewClient: agentToAppviewClient(bundle.agent),
+    accountClient: pdsClient,
+  })
 
   const isProd = Boolean(IS_PROD_SERVICE(service))
   const postSignupTasks: Promise<unknown>[] = [
-    savePersonalDetails(bundle.agent, birthdate),
-    initializeProfile(bundle.agent, {handle, createdAt, isProd}),
+    savePersonalDetails(pdsClient, birthDate),
+    initializeProfile(pdsClient, {handle, createdAt, isProd}),
   ]
   if (isProd) {
     postSignupTasks.push(
-      initializeSavedFeeds(bundle.agent),
-      restrictChatAfterAgeAssurance(
-        aa,
-        agentToPdsClient(bundle.agent),
-        earlyAccount.did,
-      ),
+      initializeSavedFeeds(pdsClient),
+      restrictChatAfterAgeAssurance(aa, pdsClient, earlyAccount.did),
     )
   }
   // Post-signup writes are not required to enter onboarding.
@@ -170,41 +176,41 @@ function snapshotNewAccount(
   }
 }
 
-function savePersonalDetails(agent: BskyAppAgent, birthDate: string) {
+function savePersonalDetails(client: Client, birthDate: Date) {
   return retryPostSignupTask('set birthDate', 3, () =>
-    agent.setPersonalDetails({birthDate}),
+    client.call(setPersonalDetails, {birthDate}),
   )
 }
 
 function initializeProfile(
-  agent: BskyAppAgent,
+  client: Client,
   {
     handle,
     createdAt,
     isProd,
   }: {
     handle: string
-    createdAt: string
+    createdAt: ReturnType<typeof toDatetimeString>
     isProd: boolean
   },
 ) {
   return retryPostSignupTask('set initial profile', 3, () =>
-    agent.upsertProfile(prev => {
-      const next: Un$Typed<AppBskyActorProfile.Record> = prev || {}
+    client.call(upsertProfile, prev => {
+      const next: Partial<app.bsky.actor.profile.Main> = prev || {}
       if (isProd) {
         next.displayName = handle
         next.createdAt = createdAt
       } else {
-        next.createdAt = prev?.createdAt || new Date().toISOString()
+        next.createdAt = prev?.createdAt || toDatetimeString(new Date())
       }
       return next
     }),
   )
 }
 
-function initializeSavedFeeds(agent: BskyAppAgent) {
+function initializeSavedFeeds(client: Client) {
   return retryPostSignupTask('set initial feeds', 1, () =>
-    agent.overwriteSavedFeeds([
+    client.call(overwriteSavedFeeds, [
       {...DISCOVER_SAVED_FEED, id: TID.nextStr()},
       {...TIMELINE_SAVED_FEED, id: TID.nextStr()},
     ]),
diff --git a/src/state/session/session-core.ts b/src/state/session/session-core.ts
index 5e3a9e8a8f..759e6afcfa 100644
--- a/src/state/session/session-core.ts
+++ b/src/state/session/session-core.ts
@@ -13,6 +13,7 @@ import {
   createPublicAgent,
   PasswordSessionManager,
 } from './bridge-agent'
+import {agentToAppviewClient, agentToPdsClient} from './clients'
 import {addSessionErrorLog} from './logging'
 import {configureModerationForAccount} from './moderation'
 import {networkAwareFetch} from './network'
@@ -290,7 +291,10 @@ export async function createSessionBundleAndResume(
     ) ?? storedAccount
 
   configureModerationForAccount(bundle.agent, earlyAccount)
-  const aa = prefetchAgeAssuranceServerData({agent: bundle.agent})
+  const aa = prefetchAgeAssuranceServerData({
+    appviewClient: agentToAppviewClient(bundle.agent),
+    accountClient: agentToPdsClient(bundle.agent),
+  })
 
   /*
    * The proxy header is applied after the PDS-targeting setup above, so those
@@ -355,7 +359,10 @@ export async function createSessionBundleAndLogin(
 
   const gates = features.refresh({strategy: 'prefer-fresh-gates'})
   configureModerationForAccount(bundle.agent, earlyAccount)
-  const aa = prefetchAgeAssuranceServerData({agent: bundle.agent})
+  const aa = prefetchAgeAssuranceServerData({
+    appviewClient: agentToAppviewClient(bundle.agent),
+    accountClient: agentToPdsClient(bundle.agent),
+  })
 
   bundle.agent.configureProxy(BLUESKY_PROXY_HEADER.get())
 

From 59d2bf09d7420bf39a8a5dd5cc0beef1552ff3d2 Mon Sep 17 00:00:00 2001
From: Samuel Newman <mozzius@protonmail.com>
Date: Thu, 13 Aug 2026 22:26:21 +0300
Subject: [PATCH 24/32] [SDK] Swap moderation to @bsky.app/sdk and move labeler
 config to Client statics (#11383)

---
 src/ageAssurance/util.ts                      |   2 +-
 .../Autocomplete/useAutocomplete/index.ts     |   3 +-
 src/components/AvatarBubbles.tsx              |   2 +-
 src/components/AvatarStack.tsx                |   2 +-
 src/components/KnownFollowers.tsx             |   8 +-
 src/components/LabelingServiceCard/index.tsx  |   6 +-
 src/components/ListCard.tsx                   |   9 +-
 src/components/NewskieDialog.tsx              |   3 +-
 src/components/Pills.tsx                      |   3 +-
 src/components/Post/Embed/FeedEmbed.tsx       |   2 +-
 src/components/Post/Embed/ListEmbed.tsx       |   2 +-
 src/components/Post/Embed/index.tsx           |   2 +-
 src/components/Post/Embed/types.ts            |   3 +-
 .../PostControls/ShareMenu/RecentChats.tsx    |   8 +-
 src/components/ProfileCard.tsx                |   3 +-
 src/components/ProfileHoverCard/index.web.tsx |   8 +-
 src/components/ProgressGuide/FollowDialog.tsx |   2 +-
 .../StarterPack/Main/ProfilesList.tsx         |   2 +-
 .../Wizard/WizardEditListDialog.tsx           |   7 +-
 .../StarterPack/Wizard/WizardListCard.tsx     |  11 +-
 src/components/VideoPostCard.tsx              |   2 +-
 .../SubscribeProfileButton.tsx                |   2 +-
 .../SubscribeProfileDialog.tsx                |   7 +-
 .../contacts/screens/ViewMatches.tsx          |   2 +-
 src/components/dialogs/MutedWords.tsx         |  18 +--
 .../dialogs/SearchablePeopleList.tsx          |   3 +-
 .../lists/ListAddRemoveUsersDialog.tsx        |   3 +-
 src/components/dms/ActionsWrapper.tsx         |   3 +-
 src/components/dms/ActionsWrapper.web.tsx     |   3 +-
 src/components/dms/BlockedByListDialog.tsx    |   2 +-
 src/components/dms/ChatProfileTabs.tsx        |   2 +-
 src/components/dms/ConvoMenu.tsx              |   2 +-
 src/components/dms/InitiateChatFlow.tsx       |   3 +-
 src/components/dms/MessageContextMenu.tsx     |   3 +-
 src/components/dms/MessageItem.tsx            |   2 +-
 .../dms/MessagesListBlockedFooter.tsx         |   2 +-
 src/components/dms/MessagesListHeader.tsx     |   3 +-
 .../dms/components/GroupChatProfileCard.tsx   |   3 +-
 src/components/dms/util.ts                    |  10 +-
 .../Gallery/maybeApplyGalleryOffsetStyles.ts  |   3 +-
 .../intents/GroupChatJoinDialog.tsx           |   3 +-
 .../interstitials/FeedTrendingTopics.tsx      |   3 +-
 src/components/moderation/ContentHider.tsx    |   2 +-
 src/components/moderation/Hider.tsx           |   2 +-
 src/components/moderation/LabelPreference.tsx |   2 +-
 .../moderation/ModerationDetailsDialog.tsx    |   2 +-
 src/components/moderation/PostAlerts.tsx      |   8 +-
 src/components/moderation/PostHider.tsx       |   7 +-
 .../moderation/ProfileHeaderAlerts.tsx        |   2 +-
 .../moderation/ReportDialog/action.ts         |   2 +-
 .../moderation/ReportDialog/index.tsx         |   7 +-
 .../moderation/ReportDialog/state.test.ts     |  12 +-
 .../moderation/ReportDialog/state.ts          |  10 +-
 src/components/moderation/ScreenHider.tsx     |   2 +-
 src/features/liveEvents/context.tsx           |   2 +-
 .../liveNow/components/LiveStatusDialog.tsx   |   7 +-
 src/features/liveNow/index.tsx                |   2 +-
 src/lib/moderation.ts                         |  15 +-
 .../create-sanitized-display-name.ts          |   2 +-
 src/lib/moderation/subjects.ts                | 133 ++++++++++++++++++
 .../moderation/useLabelBehaviorDescription.ts |   2 +-
 src/lib/moderation/useLabelInfo.ts            |   8 +-
 .../useModerationCauseDescription.ts          |   9 +-
 src/lib/strings/display-names.ts              |   2 +-
 src/screens/Messages/Conversation.tsx         |   3 +-
 .../Messages/ConversationSettings/Member.tsx  |   2 +-
 .../Messages/ConversationSettings/index.tsx   |   7 +-
 src/screens/Messages/JoinRequest.tsx          |   3 +-
 .../Messages/components/ChatListItem.tsx      |   6 +-
 .../Messages/components/ChatStatusInfo.tsx    |   2 +-
 .../Messages/components/InviteLinkDialog.tsx  |   8 +-
 .../Messages/components/MessageInputEmbed.tsx |   3 +-
 .../components/MessagesListInfoPanel.tsx      |   2 +-
 src/screens/Moderation/index.tsx              |   2 +-
 .../ModerationInteractionSettings/index.tsx   |   8 +-
 .../StepSuggestedAccounts/index.tsx           |   2 +-
 .../PostThread/components/LikesStat.tsx       |   3 +-
 src/screens/Profile/Header/DisplayName.tsx    |   3 +-
 .../Profile/Header/ProfileHeaderLabeler.tsx   |  12 +-
 .../Profile/Header/ProfileHeaderStandard.tsx  |   6 +-
 src/screens/Profile/Header/Shell.tsx          |   3 +-
 src/screens/Profile/Header/index.tsx          |  14 +-
 src/screens/Profile/Sections/Labels.tsx       |   8 +-
 src/screens/ProfileList/index.tsx             |   9 +-
 .../Search/components/SearchHistory.tsx       |   3 +-
 .../Search/components/SearchProfileCard.tsx   |   2 +-
 .../Search/components/StarterPackCard.tsx     |   7 +-
 .../modules/ExploreSuggestedAccounts.tsx      |   3 +-
 .../Search/modules/ExploreTrendingTopics.tsx  |   3 +-
 src/screens/Settings/FindContactsSettings.tsx |   3 +-
 .../ActivityNotificationSettings.tsx          |   2 +-
 src/screens/Settings/Settings.tsx             |   3 +-
 .../StarterPack/StarterPackLandingScreen.tsx  |   8 +-
 src/screens/StarterPack/StarterPackScreen.tsx |   8 +-
 src/screens/StarterPack/Wizard/StepFeeds.tsx  |   3 +-
 .../StarterPack/Wizard/StepProfiles.tsx       |   2 +-
 src/screens/StarterPack/Wizard/index.tsx      |   2 +-
 src/screens/VideoFeed/index.tsx               |   2 +-
 src/state/preferences/label-defs.tsx          |   8 +-
 src/state/preferences/moderation-opts.tsx     |  14 +-
 src/state/queries/actor-autocomplete.ts       |   8 +-
 src/state/queries/explore-feed-previews.tsx   |   8 +-
 src/state/queries/feed.ts                     |   2 +-
 src/state/queries/labeler.ts                  |  50 ++++---
 src/state/queries/notifications/feed.ts       |   8 +-
 src/state/queries/notifications/util.ts       |   5 +-
 src/state/queries/post-feed.ts                |   8 +-
 src/state/queries/preferences/const.ts        |   2 +-
 src/state/queries/preferences/index.ts        |  56 +++-----
 src/state/queries/preferences/moderation.ts   |   3 +-
 src/state/queries/preferences/types.ts        |   2 +-
 src/state/queries/profile-feedgens.ts         |   2 +-
 src/state/queries/profile-lists.ts            |   2 +-
 src/state/queries/search-posts-v2.ts          |   3 +-
 .../queries/trending/useGetTrendsQuery.ts     |   2 +-
 src/state/queries/usePostThread/traversal.ts  |   3 +-
 src/state/queries/usePostThread/types.ts      |   2 +-
 src/state/queries/usePostThread/views.ts      |   4 +-
 src/state/session/__tests__/clients-test.ts   |  31 ++++
 .../session/__tests__/session-core-test.ts    |  12 +-
 .../additional-moderation-authorities.ts      |  21 ++-
 src/state/session/clients.ts                  |  60 +++++---
 src/state/session/create-account.ts           |   2 +-
 src/state/session/moderation.ts               |  43 ++++--
 src/state/session/session-core.ts             |  10 +-
 src/state/shell/composer/index.tsx            |   2 +-
 .../composer/text-input/web/Autocomplete.tsx  |   3 +-
 .../com/composer/threadgate/ThreadgateBtn.tsx |   8 +-
 .../notifications/NotificationFeedItem.tsx    |   8 +-
 src/view/com/post-thread/PostQuotes.tsx       |   9 +-
 src/view/com/post/Post.tsx                    |  10 +-
 src/view/com/posts/PostFeedItem.tsx           |   2 +-
 src/view/com/posts/PostFeedReason.tsx         |   3 +-
 src/view/com/util/PostMeta.tsx                |   3 +-
 src/view/com/util/UserAvatar.tsx              |   2 +-
 src/view/com/util/UserBanner.tsx              |   2 +-
 src/view/screens/DebugMod.tsx                 |  17 ++-
 src/view/screens/Profile.tsx                  |   8 +-
 138 files changed, 601 insertions(+), 416 deletions(-)
 create mode 100644 src/lib/moderation/subjects.ts

diff --git a/src/ageAssurance/util.ts b/src/ageAssurance/util.ts
index 2bceab4d16..fcda8056f1 100644
--- a/src/ageAssurance/util.ts
+++ b/src/ageAssurance/util.ts
@@ -4,8 +4,8 @@ import {
   AppBskyAgeassuranceDefs,
   computeAgeAssuranceRegionAccess,
   getAgeAssuranceRegionConfig,
-  type ModerationPrefs,
 } from '@atproto/api'
+import {type ModerationPrefs} from '@bsky.app/sdk/moderation'
 
 import {getAge} from '#/lib/strings/time'
 import {regionName} from '#/locale/helpers'
diff --git a/src/components/Autocomplete/useAutocomplete/index.ts b/src/components/Autocomplete/useAutocomplete/index.ts
index 1dc3100f37..b310876b84 100644
--- a/src/components/Autocomplete/useAutocomplete/index.ts
+++ b/src/components/Autocomplete/useAutocomplete/index.ts
@@ -1,8 +1,9 @@
 import {useCallback, useMemo} from 'react'
-import {moderateProfile, type ModerationOpts} from '@atproto/api'
+import {type ModerationOpts} from '@bsky.app/sdk/moderation'
 import {keepPreviousData, useQuery} from '@tanstack/react-query'
 
 import {isJustAMute, moduiContainsHideableOffense} from '#/lib/moderation'
+import {moderateProfile} from '#/lib/moderation/subjects'
 import {useModerationOpts} from '#/state/preferences/moderation-opts'
 import {STALE} from '#/state/queries'
 import {DEFAULT_LOGGED_OUT_PREFERENCES} from '#/state/queries/preferences'
diff --git a/src/components/AvatarBubbles.tsx b/src/components/AvatarBubbles.tsx
index 49ac4d006f..9b59a2555f 100644
--- a/src/components/AvatarBubbles.tsx
+++ b/src/components/AvatarBubbles.tsx
@@ -8,8 +8,8 @@ import Animated, {
   withDelay,
   withTiming,
 } from 'react-native-reanimated'
-import {moderateProfile} from '@atproto/api'
 
+import {moderateProfile} from '#/lib/moderation/subjects'
 import {useMaybeProfileShadow} from '#/state/cache/profile-shadow'
 import {useModerationOpts} from '#/state/preferences/moderation-opts'
 import {useSession} from '#/state/session'
diff --git a/src/components/AvatarStack.tsx b/src/components/AvatarStack.tsx
index ae42a7470b..f98148f52c 100644
--- a/src/components/AvatarStack.tsx
+++ b/src/components/AvatarStack.tsx
@@ -1,6 +1,6 @@
 import {View} from 'react-native'
-import {moderateProfile} from '@atproto/api'
 
+import {moderateProfile} from '#/lib/moderation/subjects'
 import {logger} from '#/logger'
 import {useModerationOpts} from '#/state/preferences/moderation-opts'
 import {useProfilesQuery} from '#/state/queries/profile'
diff --git a/src/components/KnownFollowers.tsx b/src/components/KnownFollowers.tsx
index 502b08252f..bda482c1c0 100644
--- a/src/components/KnownFollowers.tsx
+++ b/src/components/KnownFollowers.tsx
@@ -1,12 +1,10 @@
 import {useRef} from 'react'
 import {View} from 'react-native'
-import {
-  type AppBskyActorDefs,
-  moderateProfile,
-  type ModerationOpts,
-} from '@atproto/api'
+import {type AppBskyActorDefs} from '@atproto/api'
+import {type ModerationOpts} from '@bsky.app/sdk/moderation'
 import {Plural, Trans, useLingui} from '@lingui/react/macro'
 
+import {moderateProfile} from '#/lib/moderation/subjects'
 import {makeProfileLink} from '#/lib/routes/links'
 import {sanitizeDisplayName} from '#/lib/strings/display-names'
 import {UserAvatar} from '#/view/com/util/UserAvatar'
diff --git a/src/components/LabelingServiceCard/index.tsx b/src/components/LabelingServiceCard/index.tsx
index 10d8c97333..dc40181735 100644
--- a/src/components/LabelingServiceCard/index.tsx
+++ b/src/components/LabelingServiceCard/index.tsx
@@ -1,5 +1,4 @@
 import {View} from 'react-native'
-import {type AppBskyLabelerDefs} from '@atproto/api'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Plural, Trans} from '@lingui/react/macro'
@@ -13,10 +12,11 @@ import {Flag_Stroke2_Corner0_Rounded as Flag} from '#/components/icons/Flag'
 import {Link as InternalLink, type LinkProps} from '#/components/Link'
 import {RichText} from '#/components/RichText'
 import {Text} from '#/components/Typography'
+import {type app} from '#/lexicons'
 import {ChevronRight_Stroke2_Corner0_Rounded as ChevronRight} from '../icons/Chevron'
 
 type LabelingServiceProps = {
-  labeler: AppBskyLabelerDefs.LabelerViewDetailed
+  labeler: app.bsky.labeler.defs.LabelerViewDetailed
 }
 
 export function Outer({
@@ -187,7 +187,7 @@ export function Loader({
   loading?: React.ComponentType<{}>
   error?: React.ComponentType<{error: string}>
   component: React.ComponentType<{
-    labeler: AppBskyLabelerDefs.LabelerViewDetailed
+    labeler: app.bsky.labeler.defs.LabelerViewDetailed
   }>
 }) {
   const {isLoading, data, error} = useLabelerInfoQuery({did})
diff --git a/src/components/ListCard.tsx b/src/components/ListCard.tsx
index 805c365566..021bf05240 100644
--- a/src/components/ListCard.tsx
+++ b/src/components/ListCard.tsx
@@ -1,16 +1,13 @@
 import {useEffect, useMemo} from 'react'
 import {View} from 'react-native'
-import {
-  type AppBskyGraphDefs,
-  AtUri,
-  moderateUserList,
-  type ModerationUI,
-} from '@atproto/api'
+import {type AppBskyGraphDefs, AtUri} from '@atproto/api'
+import {type ModerationUI} from '@bsky.app/sdk/moderation'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
 import {useQueryClient} from '@tanstack/react-query'
 
+import {moderateUserList} from '#/lib/moderation/subjects'
 import {sanitizeHandle} from '#/lib/strings/handles'
 import {useModerationOpts} from '#/state/preferences/moderation-opts'
 import {precacheList} from '#/state/queries/feed'
diff --git a/src/components/NewskieDialog.tsx b/src/components/NewskieDialog.tsx
index 5b17ec4451..7df67d80dc 100644
--- a/src/components/NewskieDialog.tsx
+++ b/src/components/NewskieDialog.tsx
@@ -1,6 +1,6 @@
 import {useMemo, useState} from 'react'
 import {View} from 'react-native'
-import {type AppBskyActorDefs, moderateProfile} from '@atproto/api'
+import {type AppBskyActorDefs} from '@atproto/api'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
@@ -8,6 +8,7 @@ import {differenceInSeconds} from 'date-fns'
 
 import {HITSLOP_10} from '#/lib/constants'
 import {useGetTimeAgo} from '#/lib/hooks/useTimeAgo'
+import {moderateProfile} from '#/lib/moderation/subjects'
 import {sanitizeDisplayName} from '#/lib/strings/display-names'
 import {useModerationOpts} from '#/state/preferences/moderation-opts'
 import {useSession} from '#/state/session'
diff --git a/src/components/Pills.tsx b/src/components/Pills.tsx
index e38afb6c87..70b7c98a2c 100644
--- a/src/components/Pills.tsx
+++ b/src/components/Pills.tsx
@@ -1,6 +1,7 @@
 import {useMemo} from 'react'
 import {View} from 'react-native'
-import {BSKY_LABELER_DID, type ModerationCause} from '@atproto/api'
+import {BSKY_LABELER_DID} from '@atproto/api'
+import {type ModerationCause} from '@bsky.app/sdk/moderation'
 import {Trans, useLingui} from '@lingui/react/macro'
 
 import {useModerationCauseDescription} from '#/lib/moderation/useModerationCauseDescription'
diff --git a/src/components/Post/Embed/FeedEmbed.tsx b/src/components/Post/Embed/FeedEmbed.tsx
index a726c313e1..8871a63b59 100644
--- a/src/components/Post/Embed/FeedEmbed.tsx
+++ b/src/components/Post/Embed/FeedEmbed.tsx
@@ -1,6 +1,6 @@
 import {useMemo} from 'react'
-import {moderateFeedGenerator} from '@atproto/api'
 
+import {moderateFeedGenerator} from '#/lib/moderation/subjects'
 import {useModerationOpts} from '#/state/preferences/moderation-opts'
 import {atoms as a, useTheme} from '#/alf'
 import * as FeedCard from '#/components/FeedCard'
diff --git a/src/components/Post/Embed/ListEmbed.tsx b/src/components/Post/Embed/ListEmbed.tsx
index 47c5b2c287..d6daca265c 100644
--- a/src/components/Post/Embed/ListEmbed.tsx
+++ b/src/components/Post/Embed/ListEmbed.tsx
@@ -1,6 +1,6 @@
 import {useMemo} from 'react'
-import {moderateUserList} from '@atproto/api'
 
+import {moderateUserList} from '#/lib/moderation/subjects'
 import {useModerationOpts} from '#/state/preferences/moderation-opts'
 import {atoms as a, useTheme} from '#/alf'
 import * as ListCard from '#/components/ListCard'
diff --git a/src/components/Post/Embed/index.tsx b/src/components/Post/Embed/index.tsx
index 0b143a0df3..3c31bd72a4 100644
--- a/src/components/Post/Embed/index.tsx
+++ b/src/components/Post/Embed/index.tsx
@@ -5,12 +5,12 @@ import {
   type AppBskyFeedDefs,
   AppBskyFeedPost,
   AtUri,
-  moderatePost,
 } from '@atproto/api'
 import {RichText as RichTextAPI} from '@bsky.app/sdk/richtext'
 import {Trans} from '@lingui/react/macro'
 import {useQueryClient} from '@tanstack/react-query'
 
+import {moderatePost} from '#/lib/moderation/subjects'
 import {makeProfileLink} from '#/lib/routes/links'
 import {asSdkFacets} from '#/lib/strings/rich-text-helpers'
 import {getChatInviteCodeFromUrl} from '#/lib/strings/url-helpers'
diff --git a/src/components/Post/Embed/types.ts b/src/components/Post/Embed/types.ts
index 0ef5569c7d..41031fdf05 100644
--- a/src/components/Post/Embed/types.ts
+++ b/src/components/Post/Embed/types.ts
@@ -1,5 +1,6 @@
 import {type StyleProp, type ViewStyle} from 'react-native'
-import {type AppBskyFeedDefs, type ModerationDecision} from '@atproto/api'
+import {type AppBskyFeedDefs} from '@atproto/api'
+import {type ModerationDecision} from '@bsky.app/sdk/moderation'
 
 export enum PostEmbedViewContext {
   ThreadHighlighted = 'ThreadHighlighted',
diff --git a/src/components/PostControls/ShareMenu/RecentChats.tsx b/src/components/PostControls/ShareMenu/RecentChats.tsx
index bab3cbfded..94086c420d 100644
--- a/src/components/PostControls/ShareMenu/RecentChats.tsx
+++ b/src/components/PostControls/ShareMenu/RecentChats.tsx
@@ -1,9 +1,6 @@
 import {ScrollView, View} from 'react-native'
-import {
-  type ChatBskyActorDefs,
-  moderateProfile,
-  type ModerationOpts,
-} from '@atproto/api'
+import {type ChatBskyActorDefs} from '@atproto/api'
+import {type ModerationOpts} from '@bsky.app/sdk/moderation'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
@@ -11,6 +8,7 @@ import {useNavigation} from '@react-navigation/native'
 
 import {isBlockedOrBlocking, isMuted} from '#/lib/moderation/blocked-and-muted'
 import {createSanitizedDisplayName} from '#/lib/moderation/create-sanitized-display-name'
+import {moderateProfile} from '#/lib/moderation/subjects'
 import {type NavigationProp} from '#/lib/routes/types'
 import {useProfileShadow} from '#/state/cache/profile-shadow'
 import {useModerationOpts} from '#/state/preferences/moderation-opts'
diff --git a/src/components/ProfileCard.tsx b/src/components/ProfileCard.tsx
index 8508fecc71..cdc8d194a1 100644
--- a/src/components/ProfileCard.tsx
+++ b/src/components/ProfileCard.tsx
@@ -6,11 +6,12 @@ import {
   View,
   type ViewStyle,
 } from 'react-native'
-import {moderateProfile, type ModerationOpts} from '@atproto/api'
+import {type ModerationOpts} from '@bsky.app/sdk/moderation'
 import {RichText as RichTextApi} from '@bsky.app/sdk/richtext'
 import {useLingui} from '@lingui/react/macro'
 
 import {getModerationCauseKey} from '#/lib/moderation'
+import {moderateProfile} from '#/lib/moderation/subjects'
 import {makeProfileLink} from '#/lib/routes/links'
 import {forceLTR} from '#/lib/strings/bidi'
 import {NON_BREAKING_SPACE} from '#/lib/strings/constants'
diff --git a/src/components/ProfileHoverCard/index.web.tsx b/src/components/ProfileHoverCard/index.web.tsx
index 46dade016b..74dbb33f28 100644
--- a/src/components/ProfileHoverCard/index.web.tsx
+++ b/src/components/ProfileHoverCard/index.web.tsx
@@ -1,16 +1,14 @@
 import {memo, useCallback, useEffect, useMemo, useReducer, useRef} from 'react'
 import {View} from 'react-native'
-import {
-  type AppBskyActorDefs,
-  moderateProfile,
-  type ModerationOpts,
-} from '@atproto/api'
+import {type AppBskyActorDefs} from '@atproto/api'
+import {type ModerationOpts} from '@bsky.app/sdk/moderation'
 import {flip, offset, shift, size, useFloating} from '@floating-ui/react-dom'
 import {msg, plural} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {useNavigation} from '@react-navigation/native'
 
 import {getModerationCauseKey} from '#/lib/moderation'
+import {moderateProfile} from '#/lib/moderation/subjects'
 import {makeProfileLink} from '#/lib/routes/links'
 import {type NavigationProp} from '#/lib/routes/types'
 import {sanitizeDisplayName} from '#/lib/strings/display-names'
diff --git a/src/components/ProgressGuide/FollowDialog.tsx b/src/components/ProgressGuide/FollowDialog.tsx
index 0ee575fdec..3ff4569964 100644
--- a/src/components/ProgressGuide/FollowDialog.tsx
+++ b/src/components/ProgressGuide/FollowDialog.tsx
@@ -1,6 +1,6 @@
 import {memo, useCallback, useEffect, useMemo, useRef, useState} from 'react'
 import {TextInput, View, type ViewToken} from 'react-native'
-import {type ModerationOpts} from '@atproto/api'
+import {type ModerationOpts} from '@bsky.app/sdk/moderation'
 import {Trans, useLingui} from '@lingui/react/macro'
 
 import {useNonReactiveCallback} from '#/lib/hooks/useNonReactiveCallback'
diff --git a/src/components/StarterPack/Main/ProfilesList.tsx b/src/components/StarterPack/Main/ProfilesList.tsx
index c087f5fa46..dea87c8443 100644
--- a/src/components/StarterPack/Main/ProfilesList.tsx
+++ b/src/components/StarterPack/Main/ProfilesList.tsx
@@ -4,8 +4,8 @@ import {
   type AppBskyActorDefs,
   type AppBskyGraphGetList,
   AtUri,
-  type ModerationOpts,
 } from '@atproto/api'
+import {type ModerationOpts} from '@bsky.app/sdk/moderation'
 import {
   type InfiniteData,
   type UseInfiniteQueryResult,
diff --git a/src/components/StarterPack/Wizard/WizardEditListDialog.tsx b/src/components/StarterPack/Wizard/WizardEditListDialog.tsx
index d0c5d546db..498300491d 100644
--- a/src/components/StarterPack/Wizard/WizardEditListDialog.tsx
+++ b/src/components/StarterPack/Wizard/WizardEditListDialog.tsx
@@ -1,11 +1,8 @@
 import {useRef} from 'react'
 import {type ListRenderItemInfo} from 'react-native'
 import {View} from 'react-native'
-import {
-  type AppBskyActorDefs,
-  type AppBskyFeedDefs,
-  type ModerationOpts,
-} from '@atproto/api'
+import {type AppBskyActorDefs, type AppBskyFeedDefs} from '@atproto/api'
+import {type ModerationOpts} from '@bsky.app/sdk/moderation'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
diff --git a/src/components/StarterPack/Wizard/WizardListCard.tsx b/src/components/StarterPack/Wizard/WizardListCard.tsx
index b48c656a08..353fd77b13 100644
--- a/src/components/StarterPack/Wizard/WizardListCard.tsx
+++ b/src/components/StarterPack/Wizard/WizardListCard.tsx
@@ -1,17 +1,12 @@
 import {Keyboard, View} from 'react-native'
-import {
-  type AppBskyActorDefs,
-  type AppBskyFeedDefs,
-  moderateFeedGenerator,
-  moderateProfile,
-  type ModerationOpts,
-  type ModerationUI,
-} from '@atproto/api'
+import {type AppBskyActorDefs, type AppBskyFeedDefs} from '@atproto/api'
+import {type ModerationOpts, type ModerationUI} from '@bsky.app/sdk/moderation'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
 
 import {DISCOVER_FEED_URI, STARTER_PACK_MAX_SIZE} from '#/lib/constants'
+import {moderateFeedGenerator, moderateProfile} from '#/lib/moderation/subjects'
 import {sanitizeDisplayName} from '#/lib/strings/display-names'
 import {sanitizeHandle} from '#/lib/strings/handles'
 import {useSession} from '#/state/session'
diff --git a/src/components/VideoPostCard.tsx b/src/components/VideoPostCard.tsx
index ba3d83ec16..bb79fa6a78 100644
--- a/src/components/VideoPostCard.tsx
+++ b/src/components/VideoPostCard.tsx
@@ -7,8 +7,8 @@ import {
   AppBskyEmbedVideo,
   type AppBskyFeedDefs,
   AppBskyFeedPost,
-  type ModerationDecision,
 } from '@atproto/api'
+import {type ModerationDecision} from '@bsky.app/sdk/moderation'
 import {useLingui} from '@lingui/react/macro'
 
 import {sanitizeHandle} from '#/lib/strings/handles'
diff --git a/src/components/activity-notifications/SubscribeProfileButton.tsx b/src/components/activity-notifications/SubscribeProfileButton.tsx
index ce9dcd05ae..ed05f8cba0 100644
--- a/src/components/activity-notifications/SubscribeProfileButton.tsx
+++ b/src/components/activity-notifications/SubscribeProfileButton.tsx
@@ -1,5 +1,5 @@
 import {useCallback, useEffect, useState} from 'react'
-import {type ModerationOpts} from '@atproto/api'
+import {type ModerationOpts} from '@bsky.app/sdk/moderation'
 import {Trans, useLingui} from '@lingui/react/macro'
 
 import {useRequireEmailVerification} from '#/lib/hooks/useRequireEmailVerification'
diff --git a/src/components/activity-notifications/SubscribeProfileDialog.tsx b/src/components/activity-notifications/SubscribeProfileDialog.tsx
index 6731cb3038..51d6622407 100644
--- a/src/components/activity-notifications/SubscribeProfileDialog.tsx
+++ b/src/components/activity-notifications/SubscribeProfileDialog.tsx
@@ -1,11 +1,8 @@
 import {useMemo, useState} from 'react'
 import {View} from 'react-native'
-import {
-  type AppBskyNotificationDefs,
-  type ModerationOpts,
-  type Un$Typed,
-} from '@atproto/api'
+import {type AppBskyNotificationDefs, type Un$Typed} from '@atproto/api'
 import {type DidString} from '@atproto/syntax'
+import {type ModerationOpts} from '@bsky.app/sdk/moderation'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
diff --git a/src/components/contacts/screens/ViewMatches.tsx b/src/components/contacts/screens/ViewMatches.tsx
index 0ef4711919..a659d8ae87 100644
--- a/src/components/contacts/screens/ViewMatches.tsx
+++ b/src/components/contacts/screens/ViewMatches.tsx
@@ -2,8 +2,8 @@ import {useCallback, useMemo, useRef, useState} from 'react'
 import {View} from 'react-native'
 import {useSafeAreaInsets} from 'react-native-safe-area-context'
 import * as SMS from 'expo-sms'
-import {type ModerationOpts} from '@atproto/api'
 import {type DidString} from '@atproto/syntax'
+import {type ModerationOpts} from '@bsky.app/sdk/moderation'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Plural, Trans} from '@lingui/react/macro'
diff --git a/src/components/dialogs/MutedWords.tsx b/src/components/dialogs/MutedWords.tsx
index a885f1bf5f..3263113a73 100644
--- a/src/components/dialogs/MutedWords.tsx
+++ b/src/components/dialogs/MutedWords.tsx
@@ -1,6 +1,7 @@
 import {useCallback, useState} from 'react'
 import {View} from 'react-native'
-import {type AppBskyActorDefs, sanitizeMutedWordValue} from '@atproto/api'
+import {type DatetimeString, toDatetimeString} from '@atproto/syntax'
+import {sanitizeMutedWordValue} from '@bsky.app/sdk/utils'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
@@ -35,6 +36,7 @@ import * as Menu from '#/components/Menu'
 import * as Prompt from '#/components/Prompt'
 import {Text} from '#/components/Typography'
 import {IS_NATIVE} from '#/env'
+import {type app} from '#/lexicons'
 
 const ONE_DAY = 24 * 60 * 60 * 1000
 
@@ -68,20 +70,20 @@ function MutedWordsInner() {
     const sanitizedValue = sanitizeMutedWordValue(field)
     const surfaces = ['tag', targets.includes('content') && 'content'].filter(
       Boolean,
-    ) as AppBskyActorDefs.MutedWord['targets']
+    ) as app.bsky.actor.defs.MutedWord['targets']
     const actorTarget = excludeFollowing ? 'exclude-following' : 'all'
 
     const now = Date.now()
     const rawDuration = durations.at(0)
     // undefined evaluates to 'forever'
-    let duration: string | undefined
+    let duration: DatetimeString | undefined
 
     if (rawDuration === '24_hours') {
-      duration = new Date(now + ONE_DAY).toISOString()
+      duration = toDatetimeString(new Date(now + ONE_DAY))
     } else if (rawDuration === '7_days') {
-      duration = new Date(now + 7 * ONE_DAY).toISOString()
+      duration = toDatetimeString(new Date(now + 7 * ONE_DAY))
     } else if (rawDuration === '30_days') {
-      duration = new Date(now + 30 * ONE_DAY).toISOString()
+      duration = toDatetimeString(new Date(now + 30 * ONE_DAY))
     }
 
     if (!sanitizedValue || !surfaces.length) {
@@ -421,7 +423,7 @@ function MutedWordsInner() {
 function MutedWordRow({
   style,
   word,
-}: ViewStyleProp & {word: AppBskyActorDefs.MutedWord}) {
+}: ViewStyleProp & {word: app.bsky.actor.defs.MutedWord}) {
   const t = useTheme()
   const {_} = useLingui()
   const {isPending, mutateAsync: removeMutedWord} = useRemoveMutedWordMutation()
@@ -440,7 +442,7 @@ function MutedWordRow({
     updateMutedWord({
       ...word,
       expiresAt: days
-        ? new Date(Date.now() + days * ONE_DAY).toISOString()
+        ? toDatetimeString(new Date(Date.now() + days * ONE_DAY))
         : undefined,
     })
   }
diff --git a/src/components/dialogs/SearchablePeopleList.tsx b/src/components/dialogs/SearchablePeopleList.tsx
index cf106684a4..221beb9350 100644
--- a/src/components/dialogs/SearchablePeopleList.tsx
+++ b/src/components/dialogs/SearchablePeopleList.tsx
@@ -7,10 +7,11 @@ import {
   useState,
 } from 'react'
 import {TextInput, View} from 'react-native'
-import {moderateProfile, type ModerationOpts} from '@atproto/api'
+import {type ModerationOpts} from '@bsky.app/sdk/moderation'
 import {Plural, Trans, useLingui} from '@lingui/react/macro'
 
 import {createSanitizedDisplayName} from '#/lib/moderation/create-sanitized-display-name'
+import {moderateProfile} from '#/lib/moderation/subjects'
 import {sanitizeHandle} from '#/lib/strings/handles'
 import {useModerationOpts} from '#/state/preferences/moderation-opts'
 import {useActorAutocompleteQuery} from '#/state/queries/actor-autocomplete'
diff --git a/src/components/dialogs/lists/ListAddRemoveUsersDialog.tsx b/src/components/dialogs/lists/ListAddRemoveUsersDialog.tsx
index 8129e9bdb4..a8f04e2857 100644
--- a/src/components/dialogs/lists/ListAddRemoveUsersDialog.tsx
+++ b/src/components/dialogs/lists/ListAddRemoveUsersDialog.tsx
@@ -1,6 +1,7 @@
 import {useCallback, useMemo} from 'react'
 import {View} from 'react-native'
-import {type AppBskyGraphDefs, type ModerationOpts} from '@atproto/api'
+import {type AppBskyGraphDefs} from '@atproto/api'
+import {type ModerationOpts} from '@bsky.app/sdk/moderation'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
diff --git a/src/components/dms/ActionsWrapper.tsx b/src/components/dms/ActionsWrapper.tsx
index ce58dba31c..b9782949b6 100644
--- a/src/components/dms/ActionsWrapper.tsx
+++ b/src/components/dms/ActionsWrapper.tsx
@@ -1,5 +1,6 @@
 import {View} from 'react-native'
-import {type ChatBskyConvoDefs, type ModerationOpts} from '@atproto/api'
+import {type ChatBskyConvoDefs} from '@atproto/api'
+import {type ModerationOpts} from '@bsky.app/sdk/moderation'
 import {useLingui} from '@lingui/react/macro'
 
 import {MessageContextMenu} from '#/components/dms/MessageContextMenu'
diff --git a/src/components/dms/ActionsWrapper.web.tsx b/src/components/dms/ActionsWrapper.web.tsx
index 8d67051535..0ef5503370 100644
--- a/src/components/dms/ActionsWrapper.web.tsx
+++ b/src/components/dms/ActionsWrapper.web.tsx
@@ -1,6 +1,7 @@
 import {useCallback, useRef, useState} from 'react'
 import {Pressable, View} from 'react-native'
-import {type ChatBskyConvoDefs, type ModerationOpts} from '@atproto/api'
+import {type ChatBskyConvoDefs} from '@atproto/api'
+import {type ModerationOpts} from '@bsky.app/sdk/moderation'
 import {plural} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react/macro'
 
diff --git a/src/components/dms/BlockedByListDialog.tsx b/src/components/dms/BlockedByListDialog.tsx
index 2532122087..2521168d79 100644
--- a/src/components/dms/BlockedByListDialog.tsx
+++ b/src/components/dms/BlockedByListDialog.tsx
@@ -1,6 +1,6 @@
 import {Fragment} from 'react'
 import {View} from 'react-native'
-import {type ModerationCause} from '@atproto/api'
+import {type ModerationCause} from '@bsky.app/sdk/moderation'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 
diff --git a/src/components/dms/ChatProfileTabs.tsx b/src/components/dms/ChatProfileTabs.tsx
index bac128c819..341d94392d 100644
--- a/src/components/dms/ChatProfileTabs.tsx
+++ b/src/components/dms/ChatProfileTabs.tsx
@@ -1,10 +1,10 @@
 import {useCallback, useEffect} from 'react'
 import {type ScrollView, View} from 'react-native'
 import Animated, {useAnimatedRef, useSharedValue} from 'react-native-reanimated'
-import {moderateProfile} from '@atproto/api'
 import {useLingui} from '@lingui/react/macro'
 
 import {HITSLOP_10} from '#/lib/constants'
+import {moderateProfile} from '#/lib/moderation/subjects'
 import {sanitizeDisplayName} from '#/lib/strings/display-names'
 import {sanitizeHandle} from '#/lib/strings/handles'
 import {useModerationOpts} from '#/state/preferences/moderation-opts'
diff --git a/src/components/dms/ConvoMenu.tsx b/src/components/dms/ConvoMenu.tsx
index 2eac8cdb3a..9aab1da8c9 100644
--- a/src/components/dms/ConvoMenu.tsx
+++ b/src/components/dms/ConvoMenu.tsx
@@ -1,6 +1,6 @@
 import {memo, useCallback} from 'react'
 import {Keyboard, View} from 'react-native'
-import {type ModerationCause} from '@atproto/api'
+import {type ModerationCause} from '@bsky.app/sdk/moderation'
 import {Trans, useLingui} from '@lingui/react/macro'
 import {useNavigation} from '@react-navigation/native'
 import {useQueryClient} from '@tanstack/react-query'
diff --git a/src/components/dms/InitiateChatFlow.tsx b/src/components/dms/InitiateChatFlow.tsx
index 4e0e71c2f4..3a93b966b0 100644
--- a/src/components/dms/InitiateChatFlow.tsx
+++ b/src/components/dms/InitiateChatFlow.tsx
@@ -7,11 +7,12 @@ import {
   useState,
 } from 'react'
 import {LayoutAnimation, type TextInput, View} from 'react-native'
-import {moderateProfile, type ModerationOpts} from '@atproto/api'
+import {type ModerationOpts} from '@bsky.app/sdk/moderation'
 import {Plural, Trans, useLingui} from '@lingui/react/macro'
 
 import {MAX_GROUP_NAME_GRAPHEME_LENGTH} from '#/lib/constants'
 import {createSanitizedDisplayName} from '#/lib/moderation/create-sanitized-display-name'
+import {moderateProfile} from '#/lib/moderation/subjects'
 import {sanitizeDisplayName} from '#/lib/strings/display-names'
 import {sanitizeHandle} from '#/lib/strings/handles'
 import {isOverMaxGraphemeCount} from '#/lib/strings/helpers'
diff --git a/src/components/dms/MessageContextMenu.tsx b/src/components/dms/MessageContextMenu.tsx
index 90b8554b3c..0bfa156eed 100644
--- a/src/components/dms/MessageContextMenu.tsx
+++ b/src/components/dms/MessageContextMenu.tsx
@@ -2,7 +2,8 @@ import {memo, useCallback} from 'react'
 import {Platform} from 'react-native'
 import {type GestureType} from 'react-native-gesture-handler'
 import * as Clipboard from 'expo-clipboard'
-import {type ChatBskyConvoDefs, type ModerationOpts} from '@atproto/api'
+import {type ChatBskyConvoDefs} from '@atproto/api'
+import {type ModerationOpts} from '@bsky.app/sdk/moderation'
 import {RichText} from '@bsky.app/sdk/richtext'
 import {plural} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react/macro'
diff --git a/src/components/dms/MessageItem.tsx b/src/components/dms/MessageItem.tsx
index 88a4571b2a..a835230db2 100644
--- a/src/components/dms/MessageItem.tsx
+++ b/src/components/dms/MessageItem.tsx
@@ -27,7 +27,6 @@ import {
   type ChatBskyActorDefs,
   ChatBskyConvoDefs,
   ChatBskyEmbedJoinLink,
-  moderateProfile,
 } from '@atproto/api'
 import {RichText as RichTextAPI} from '@bsky.app/sdk/richtext'
 import {plural} from '@lingui/core/macro'
@@ -36,6 +35,7 @@ import {useQueryClient} from '@tanstack/react-query'
 
 import {isBlockedOrBlocking} from '#/lib/moderation/blocked-and-muted'
 import {createSanitizedDisplayName} from '#/lib/moderation/create-sanitized-display-name'
+import {moderateProfile} from '#/lib/moderation/subjects'
 import {sanitizeHandle} from '#/lib/strings/handles'
 import {asSdkFacets} from '#/lib/strings/rich-text-helpers'
 import {useMaybeProfileShadow} from '#/state/cache/profile-shadow'
diff --git a/src/components/dms/MessagesListBlockedFooter.tsx b/src/components/dms/MessagesListBlockedFooter.tsx
index 1fbee421b0..f239a66aa4 100644
--- a/src/components/dms/MessagesListBlockedFooter.tsx
+++ b/src/components/dms/MessagesListBlockedFooter.tsx
@@ -1,6 +1,6 @@
 import {useCallback, useMemo} from 'react'
 import {View} from 'react-native'
-import {type ModerationDecision} from '@atproto/api'
+import {type ModerationDecision} from '@bsky.app/sdk/moderation'
 import {Trans, useLingui} from '@lingui/react/macro'
 
 import {useProfileShadow} from '#/state/cache/profile-shadow'
diff --git a/src/components/dms/MessagesListHeader.tsx b/src/components/dms/MessagesListHeader.tsx
index dc42965dac..75a534b790 100644
--- a/src/components/dms/MessagesListHeader.tsx
+++ b/src/components/dms/MessagesListHeader.tsx
@@ -1,9 +1,10 @@
 import {useMemo} from 'react'
 import {View} from 'react-native'
-import {moderateProfile, type ModerationOpts} from '@atproto/api'
+import {type ModerationOpts} from '@bsky.app/sdk/moderation'
 import {useLingui} from '@lingui/react/macro'
 
 import {createSanitizedDisplayName} from '#/lib/moderation/create-sanitized-display-name'
+import {moderateProfile} from '#/lib/moderation/subjects'
 import {makeProfileLink} from '#/lib/routes/links'
 import {sanitizeHandle} from '#/lib/strings/handles'
 import {useProfileShadow} from '#/state/cache/profile-shadow'
diff --git a/src/components/dms/components/GroupChatProfileCard.tsx b/src/components/dms/components/GroupChatProfileCard.tsx
index 1d704766c2..63fbbbd20c 100644
--- a/src/components/dms/components/GroupChatProfileCard.tsx
+++ b/src/components/dms/components/GroupChatProfileCard.tsx
@@ -1,7 +1,8 @@
 import {View} from 'react-native'
-import {moderateProfile, type ModerationOpts} from '@atproto/api'
+import {type ModerationOpts} from '@bsky.app/sdk/moderation'
 import {Trans} from '@lingui/react/macro'
 
+import {moderateProfile} from '#/lib/moderation/subjects'
 import {sanitizeDisplayName} from '#/lib/strings/display-names'
 import {sanitizeHandle} from '#/lib/strings/handles'
 import {atoms as a, useTheme} from '#/alf'
diff --git a/src/components/dms/util.ts b/src/components/dms/util.ts
index ce0d30a8fd..7347d1512d 100644
--- a/src/components/dms/util.ts
+++ b/src/components/dms/util.ts
@@ -1,13 +1,9 @@
-import {
-  type $Typed,
-  ChatBskyActorDefs,
-  ChatBskyConvoDefs,
-  moderateProfile,
-  type ModerationOpts,
-} from '@atproto/api'
+import {type $Typed, ChatBskyActorDefs, ChatBskyConvoDefs} from '@atproto/api'
+import {type ModerationOpts} from '@bsky.app/sdk/moderation'
 
 import {EMOJI_REACTION_LIMIT} from '#/lib/constants'
 import {isBlockedOrBlocking} from '#/lib/moderation/blocked-and-muted'
+import {moderateProfile} from '#/lib/moderation/subjects'
 import {logger} from '#/logger'
 import {type Shadow} from '#/state/cache/profile-shadow'
 import {type ConvoState, ConvoStatus} from '#/state/messages/convo/types'
diff --git a/src/components/images/Gallery/maybeApplyGalleryOffsetStyles.ts b/src/components/images/Gallery/maybeApplyGalleryOffsetStyles.ts
index eea54b5ed9..5989497c12 100644
--- a/src/components/images/Gallery/maybeApplyGalleryOffsetStyles.ts
+++ b/src/components/images/Gallery/maybeApplyGalleryOffsetStyles.ts
@@ -4,9 +4,8 @@ import {
   AppBskyEmbedRecordWithMedia,
   type AppBskyFeedDefs,
   AppBskyFeedPost,
-  type ModerationCause,
-  type ModerationUI,
 } from '@atproto/api'
+import {type ModerationCause, type ModerationUI} from '@bsky.app/sdk/moderation'
 
 import {unique} from '#/lib/moderation'
 import {type AppModerationCause} from '#/components/Pills'
diff --git a/src/components/intents/GroupChatJoinDialog.tsx b/src/components/intents/GroupChatJoinDialog.tsx
index 53782ae271..b2ec975503 100644
--- a/src/components/intents/GroupChatJoinDialog.tsx
+++ b/src/components/intents/GroupChatJoinDialog.tsx
@@ -1,11 +1,12 @@
 import {useEffect} from 'react'
 import {View} from 'react-native'
-import {ChatBskyGroupDefs, moderateProfile} from '@atproto/api'
+import {ChatBskyGroupDefs} from '@atproto/api'
 import {Plural, Trans, useLingui} from '@lingui/react/macro'
 import {useNavigation} from '@react-navigation/native'
 import {useQueryClient} from '@tanstack/react-query'
 
 import {createSanitizedDisplayName} from '#/lib/moderation/create-sanitized-display-name'
+import {moderateProfile} from '#/lib/moderation/subjects'
 import {useCallOnce} from '#/lib/once'
 import {makeProfileLink} from '#/lib/routes/links'
 import {type NavigationProp} from '#/lib/routes/types'
diff --git a/src/components/interstitials/FeedTrendingTopics.tsx b/src/components/interstitials/FeedTrendingTopics.tsx
index 4d45001f1c..a50b8652d3 100644
--- a/src/components/interstitials/FeedTrendingTopics.tsx
+++ b/src/components/interstitials/FeedTrendingTopics.tsx
@@ -1,8 +1,9 @@
 import {useMemo} from 'react'
 import {Pressable, View} from 'react-native'
-import {type AppBskyUnspeccedDefs, moderateProfile} from '@atproto/api'
+import {type AppBskyUnspeccedDefs} from '@atproto/api'
 import {Plural, Trans, useLingui} from '@lingui/react/macro'
 
+import {moderateProfile} from '#/lib/moderation/subjects'
 import {useModerationOpts} from '#/state/preferences/moderation-opts'
 import {
   useTrendingSettings,
diff --git a/src/components/moderation/ContentHider.tsx b/src/components/moderation/ContentHider.tsx
index cfdc6c7e12..b0f8dddf01 100644
--- a/src/components/moderation/ContentHider.tsx
+++ b/src/components/moderation/ContentHider.tsx
@@ -5,7 +5,7 @@ import {
   View,
   type ViewStyle,
 } from 'react-native'
-import {type ModerationUI} from '@atproto/api'
+import {type ModerationUI} from '@bsky.app/sdk/moderation'
 import {Trans, useLingui} from '@lingui/react/macro'
 
 import {
diff --git a/src/components/moderation/Hider.tsx b/src/components/moderation/Hider.tsx
index 74cc9bd1c8..85d063f088 100644
--- a/src/components/moderation/Hider.tsx
+++ b/src/components/moderation/Hider.tsx
@@ -1,5 +1,5 @@
 import {createContext, useContext, useState} from 'react'
-import {type ModerationUI} from '@atproto/api'
+import {type ModerationUI} from '@bsky.app/sdk/moderation'
 
 import {
   type ModerationCauseDescription,
diff --git a/src/components/moderation/LabelPreference.tsx b/src/components/moderation/LabelPreference.tsx
index a654b46e24..80a83c5e6c 100644
--- a/src/components/moderation/LabelPreference.tsx
+++ b/src/components/moderation/LabelPreference.tsx
@@ -2,7 +2,7 @@ import {View} from 'react-native'
 import {
   type InterpretedLabelValueDefinition,
   type LabelPreference,
-} from '@atproto/api'
+} from '@bsky.app/sdk/moderation'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
diff --git a/src/components/moderation/ModerationDetailsDialog.tsx b/src/components/moderation/ModerationDetailsDialog.tsx
index bf19dc0363..1b2351432e 100644
--- a/src/components/moderation/ModerationDetailsDialog.tsx
+++ b/src/components/moderation/ModerationDetailsDialog.tsx
@@ -1,6 +1,6 @@
 import {useState} from 'react'
 import {View} from 'react-native'
-import {type ModerationCause} from '@atproto/api'
+import {type ModerationCause} from '@bsky.app/sdk/moderation'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
diff --git a/src/components/moderation/PostAlerts.tsx b/src/components/moderation/PostAlerts.tsx
index af8329bec5..4aa3c92a6c 100644
--- a/src/components/moderation/PostAlerts.tsx
+++ b/src/components/moderation/PostAlerts.tsx
@@ -1,10 +1,6 @@
 import {type StyleProp, View, type ViewStyle} from 'react-native'
-import {
-  type AppBskyFeedDefs,
-  type ComAtprotoLabelDefs,
-  type ModerationCause,
-  type ModerationUI,
-} from '@atproto/api'
+import {type AppBskyFeedDefs, type ComAtprotoLabelDefs} from '@atproto/api'
+import {type ModerationCause, type ModerationUI} from '@bsky.app/sdk/moderation'
 import {plural} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react/macro'
 
diff --git a/src/components/moderation/PostHider.tsx b/src/components/moderation/PostHider.tsx
index 5019b7c3e3..54d4acf945 100644
--- a/src/components/moderation/PostHider.tsx
+++ b/src/components/moderation/PostHider.tsx
@@ -7,11 +7,8 @@ import {
   View,
   type ViewStyle,
 } from 'react-native'
-import {
-  type AppBskyActorDefs,
-  type ModerationCause,
-  type ModerationUI,
-} from '@atproto/api'
+import {type AppBskyActorDefs} from '@atproto/api'
+import {type ModerationCause, type ModerationUI} from '@bsky.app/sdk/moderation'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
diff --git a/src/components/moderation/ProfileHeaderAlerts.tsx b/src/components/moderation/ProfileHeaderAlerts.tsx
index e6a13e2944..ee8d472b79 100644
--- a/src/components/moderation/ProfileHeaderAlerts.tsx
+++ b/src/components/moderation/ProfileHeaderAlerts.tsx
@@ -1,5 +1,5 @@
 import {type StyleProp, type ViewStyle} from 'react-native'
-import {type ModerationDecision} from '@atproto/api'
+import {type ModerationDecision} from '@bsky.app/sdk/moderation'
 
 import {getModerationCauseKey, unique} from '#/lib/moderation'
 import * as Pills from '#/components/Pills'
diff --git a/src/components/moderation/ReportDialog/action.ts b/src/components/moderation/ReportDialog/action.ts
index 12b483fcab..6113a280cb 100644
--- a/src/components/moderation/ReportDialog/action.ts
+++ b/src/components/moderation/ReportDialog/action.ts
@@ -145,7 +145,7 @@ export function useSubmitReportMutation() {
          * the proxy target is built per call from that labeler's creator did.
          */
         await client.call(com.atproto.moderation.createReport, report, {
-          service: `${labeler.creator.did as DidString}#atproto_labeler`,
+          service: `${labeler.creator.did}#atproto_labeler`,
         })
       }
     },
diff --git a/src/components/moderation/ReportDialog/index.tsx b/src/components/moderation/ReportDialog/index.tsx
index 7c63d04a47..79ac0be690 100644
--- a/src/components/moderation/ReportDialog/index.tsx
+++ b/src/components/moderation/ReportDialog/index.tsx
@@ -7,7 +7,7 @@ import {
   useState,
 } from 'react'
 import {Pressable, type ScrollView, View} from 'react-native'
-import {type AppBskyLabelerDefs, BSKY_LABELER_DID} from '@atproto/api'
+import {BSKY_LABELER_DID} from '@atproto/api'
 import {Trans, useLingui} from '@lingui/react/macro'
 
 import {wait} from '#/lib/async/wait'
@@ -38,6 +38,7 @@ import {Loader} from '#/components/Loader'
 import {Text} from '#/components/Typography'
 import {useAnalytics} from '#/analytics'
 import {IS_NATIVE} from '#/env'
+import {type app} from '#/lexicons'
 import {useSubmitReportMutation} from './action'
 import {
   BSKY_LABELER_ONLY_REPORT_REASONS,
@@ -1045,8 +1046,8 @@ function LabelerCard({
   labeler,
   onSelect,
 }: {
-  labeler: AppBskyLabelerDefs.LabelerViewDetailed
-  onSelect?: (option: AppBskyLabelerDefs.LabelerViewDetailed) => void
+  labeler: app.bsky.labeler.defs.LabelerViewDetailed
+  onSelect?: (option: app.bsky.labeler.defs.LabelerViewDetailed) => void
 }) {
   const t = useTheme()
   const {t: l} = useLingui()
diff --git a/src/components/moderation/ReportDialog/state.test.ts b/src/components/moderation/ReportDialog/state.test.ts
index e6f399ddf1..4129cdc9e5 100644
--- a/src/components/moderation/ReportDialog/state.test.ts
+++ b/src/components/moderation/ReportDialog/state.test.ts
@@ -1,8 +1,6 @@
-import {
-  type AppBskyLabelerDefs,
-  ToolsOzoneReportDefs as OzoneReportDefs,
-} from '@atproto/api'
+import {ToolsOzoneReportDefs as OzoneReportDefs} from '@atproto/api'
 
+import {type app} from '#/lexicons'
 import {
   getNciiQualificationOutcome,
   initialState,
@@ -83,7 +81,7 @@ describe('reducer NCII qualification', () => {
     let state = selectNciiOption()
     state = reducer(state, {
       type: 'selectLabeler',
-      labeler: {} as AppBskyLabelerDefs.LabelerViewDetailed,
+      labeler: {} as app.bsky.labeler.defs.LabelerViewDetailed,
     })
     expect(state.activeStepIndex1).toBe(2)
   })
@@ -92,7 +90,7 @@ describe('reducer NCII qualification', () => {
     let state = selectNciiOption()
     state = reducer(state, {
       type: 'selectLabeler',
-      labeler: {} as AppBskyLabelerDefs.LabelerViewDetailed,
+      labeler: {} as app.bsky.labeler.defs.LabelerViewDetailed,
     })
     state = reducer(state, {
       type: 'answerNciiQuestion',
@@ -110,7 +108,7 @@ describe('reducer NCII qualification', () => {
 })
 
 describe('reducer video timestamp', () => {
-  const labeler = {} as AppBskyLabelerDefs.LabelerViewDetailed
+  const labeler = {} as app.bsky.labeler.defs.LabelerViewDetailed
   const opted: ReportState = {...initialState, includeVideoTimestamp: true}
 
   it('is off by default', () => {
diff --git a/src/components/moderation/ReportDialog/state.ts b/src/components/moderation/ReportDialog/state.ts
index 921074952d..2dc55a6638 100644
--- a/src/components/moderation/ReportDialog/state.ts
+++ b/src/components/moderation/ReportDialog/state.ts
@@ -1,13 +1,11 @@
-import {
-  type AppBskyLabelerDefs,
-  ToolsOzoneReportDefs as OzoneReportDefs,
-} from '@atproto/api'
+import {ToolsOzoneReportDefs as OzoneReportDefs} from '@atproto/api'
 
 import {OTHER_REPORT_REASONS} from '#/components/moderation/ReportDialog/const'
 import {
   type ReportCategoryConfig,
   type ReportOption,
 } from '#/components/moderation/ReportDialog/utils/useReportOptions'
+import {type app} from '#/lexicons'
 
 export type NciiQualification = {
   isDepicted?: boolean
@@ -16,7 +14,7 @@ export type NciiQualification = {
 export type ReportState = {
   selectedCategory?: ReportCategoryConfig
   selectedOption?: ReportOption
-  selectedLabeler?: AppBskyLabelerDefs.LabelerViewDetailed
+  selectedLabeler?: app.bsky.labeler.defs.LabelerViewDetailed
   details?: string
   detailsOpen: boolean
   activeStepIndex1: number
@@ -71,7 +69,7 @@ export type ReportAction =
     }
   | {
       type: 'selectLabeler'
-      labeler: AppBskyLabelerDefs.LabelerViewDetailed
+      labeler: app.bsky.labeler.defs.LabelerViewDetailed
     }
   | {
       type: 'clearLabeler'
diff --git a/src/components/moderation/ScreenHider.tsx b/src/components/moderation/ScreenHider.tsx
index 3c0d4584b8..9557121a05 100644
--- a/src/components/moderation/ScreenHider.tsx
+++ b/src/components/moderation/ScreenHider.tsx
@@ -5,7 +5,7 @@ import {
   View,
   type ViewStyle,
 } from 'react-native'
-import {type ModerationUI} from '@atproto/api'
+import {type ModerationUI} from '@bsky.app/sdk/moderation'
 import {Trans, useLingui} from '@lingui/react/macro'
 import {useNavigation} from '@react-navigation/native'
 
diff --git a/src/features/liveEvents/context.tsx b/src/features/liveEvents/context.tsx
index 3de2534a8e..0d333ba3a1 100644
--- a/src/features/liveEvents/context.tsx
+++ b/src/features/liveEvents/context.tsx
@@ -1,5 +1,5 @@
 import {createContext, useContext, useMemo} from 'react'
-import {hasMutedWord} from '@atproto/api'
+import {hasMutedWord} from '@bsky.app/sdk/moderation'
 import {QueryClient, useQuery} from '@tanstack/react-query'
 
 import {useOnAppStateChange} from '#/lib/appState'
diff --git a/src/features/liveNow/components/LiveStatusDialog.tsx b/src/features/liveNow/components/LiveStatusDialog.tsx
index 0d3598451c..ba69b35ff9 100644
--- a/src/features/liveNow/components/LiveStatusDialog.tsx
+++ b/src/features/liveNow/components/LiveStatusDialog.tsx
@@ -1,16 +1,13 @@
 import {useCallback, useMemo} from 'react'
 import {View} from 'react-native'
 import {Image} from 'expo-image'
-import {
-  type AppBskyActorDefs,
-  type AppBskyEmbedExternal,
-  moderateStatus,
-} from '@atproto/api'
+import {type AppBskyActorDefs, type AppBskyEmbedExternal} from '@atproto/api'
 import {Trans, useLingui} from '@lingui/react/macro'
 import {useNavigation} from '@react-navigation/native'
 import {useQueryClient} from '@tanstack/react-query'
 
 import {useOpenLink} from '#/lib/hooks/useOpenLink'
+import {moderateStatus} from '#/lib/moderation/subjects'
 import {type NavigationProp} from '#/lib/routes/types'
 import {sanitizeHandle} from '#/lib/strings/handles'
 import {toNiceDomain} from '#/lib/strings/url-helpers'
diff --git a/src/features/liveNow/index.tsx b/src/features/liveNow/index.tsx
index a9a14fc2d3..ec96777e85 100644
--- a/src/features/liveNow/index.tsx
+++ b/src/features/liveNow/index.tsx
@@ -3,7 +3,6 @@ import {
   type $Typed,
   type AppBskyActorDefs,
   AppBskyEmbedExternal,
-  moderateStatus,
 } from '@atproto/api'
 import {retry} from '@atproto/common-web'
 import {type l} from '@atproto/lex'
@@ -16,6 +15,7 @@ import {isAfter, parseISO} from 'date-fns'
 import {uploadBlob} from '#/lib/api'
 import {imageToThumb} from '#/lib/api/resolve'
 import {getLinkMeta, type LinkMeta} from '#/lib/link-meta/link-meta'
+import {moderateStatus} from '#/lib/moderation/subjects'
 import {matchXrpcError} from '#/lib/xrpc-error'
 import {useAppConfig} from '#/state/appConfig'
 import {
diff --git a/src/lib/moderation.ts b/src/lib/moderation.ts
index 0d2e3c4dbd..68b424347b 100644
--- a/src/lib/moderation.ts
+++ b/src/lib/moderation.ts
@@ -1,18 +1,17 @@
 import {useMemo} from 'react'
+import {AtpAgent, type ComAtprotoLabelDefs} from '@atproto/api'
 import {
-  type AppBskyLabelerDefs,
-  AtpAgent,
-  type ComAtprotoLabelDefs,
   type InterpretedLabelValueDefinition,
   LABELS,
   type ModerationCause,
   type ModerationOpts,
   type ModerationUI,
-} from '@atproto/api'
+} from '@bsky.app/sdk/moderation'
 
 import {sanitizeDisplayName} from '#/lib/strings/display-names'
 import {sanitizeHandle} from '#/lib/strings/handles'
 import {type AppModerationCause} from '#/components/Pills'
+import {type app} from '#/lexicons'
 
 export const ADULT_CONTENT_LABELS = ['sexual', 'nudity', 'porn'] as const
 export const OTHER_SELF_LABELS = ['graphic-media'] as const
@@ -102,8 +101,8 @@ export function lookupLabelValueDefinition(
 export function isAppLabeler(
   labeler:
     | string
-    | AppBskyLabelerDefs.LabelerView
-    | AppBskyLabelerDefs.LabelerViewDetailed,
+    | app.bsky.labeler.defs.LabelerView
+    | app.bsky.labeler.defs.LabelerViewDetailed,
 ): boolean {
   if (typeof labeler === 'string') {
     return AtpAgent.appLabelers.includes(labeler)
@@ -114,8 +113,8 @@ export function isAppLabeler(
 export function isLabelerSubscribed(
   labeler:
     | string
-    | AppBskyLabelerDefs.LabelerView
-    | AppBskyLabelerDefs.LabelerViewDetailed,
+    | app.bsky.labeler.defs.LabelerView
+    | app.bsky.labeler.defs.LabelerViewDetailed,
   modOpts: ModerationOpts,
 ) {
   labeler = typeof labeler === 'string' ? labeler : labeler.creator.did
diff --git a/src/lib/moderation/create-sanitized-display-name.ts b/src/lib/moderation/create-sanitized-display-name.ts
index d15564d385..1298afd7ef 100644
--- a/src/lib/moderation/create-sanitized-display-name.ts
+++ b/src/lib/moderation/create-sanitized-display-name.ts
@@ -1,4 +1,4 @@
-import {type ModerationUI} from '@atproto/api'
+import {type ModerationUI} from '@bsky.app/sdk/moderation'
 
 import {sanitizeDisplayName} from '#/lib/strings/display-names'
 import {sanitizeHandle} from '#/lib/strings/handles'
diff --git a/src/lib/moderation/subjects.ts b/src/lib/moderation/subjects.ts
new file mode 100644
index 0000000000..c1621b300c
--- /dev/null
+++ b/src/lib/moderation/subjects.ts
@@ -0,0 +1,133 @@
+import {
+  type AppBskyActorDefs,
+  type AppBskyFeedDefs,
+  type AppBskyGraphDefs,
+  type AppBskyNotificationListNotifications,
+  type AppBskyRichtextFacet,
+  type ChatBskyActorDefs,
+} from '@atproto/api'
+import {
+  hasMutedWord as sdkHasMutedWord,
+  moderateFeedGenerator as sdkModerateFeedGenerator,
+  moderateNotification as sdkModerateNotification,
+  moderatePost as sdkModeratePost,
+  moderateProfile as sdkModerateProfile,
+  moderateStatus as sdkModerateStatus,
+  moderateUserList as sdkModerateUserList,
+  type ModerationDecision,
+  type ModerationOpts,
+} from '@bsky.app/sdk/moderation'
+
+import {type app, type chat} from '#/lexicons'
+
+/*
+ * TRANSITIONAL. The moderation implementation now comes from
+ * `@bsky.app/sdk/moderation`, whose subject types are the generated
+ * `#/lexicons` views - so their `did`/`uri`/`cid` fields are branded
+ * (`DidString`, `AtUriString`). Many read paths still emit the identically
+ * shaped `@atproto/api` views, whose same fields are plain `string`.
+ *
+ * A plain `string` is not assignable to a branded template-literal type, so
+ * every `moderate*` call taking an unmigrated view fails to typecheck even
+ * though the value is byte-identical - the runtime only ever reads `.did`,
+ * `.labels` and `.viewer`, none of which the brand affects.
+ *
+ * These wrappers widen each subject parameter to accept a view from either
+ * world and drop the brand on the way in. Delete this module once every
+ * producer emits `#/lexicons` views (the `@atproto/api` removal pass) and point
+ * callers back at `@bsky.app/sdk/moderation` directly.
+ */
+
+type AnyProfileSubject =
+  | app.bsky.actor.defs.ProfileViewBasic
+  | app.bsky.actor.defs.ProfileView
+  | app.bsky.actor.defs.ProfileViewDetailed
+  | chat.bsky.actor.defs.ProfileViewBasic
+  | AppBskyActorDefs.ProfileViewBasic
+  | AppBskyActorDefs.ProfileView
+  | AppBskyActorDefs.ProfileViewDetailed
+  | ChatBskyActorDefs.ProfileViewBasic
+
+type AnyPostSubject = app.bsky.feed.defs.PostView | AppBskyFeedDefs.PostView
+
+type AnyUserListSubject =
+  | app.bsky.graph.defs.ListViewBasic
+  | app.bsky.graph.defs.ListView
+  | AppBskyGraphDefs.ListViewBasic
+  | AppBskyGraphDefs.ListView
+
+type AnyFeedGeneratorSubject =
+  | app.bsky.feed.defs.GeneratorView
+  | AppBskyFeedDefs.GeneratorView
+
+type AnyNotificationSubject =
+  | app.bsky.notification.listNotifications.Notification
+  | AppBskyNotificationListNotifications.Notification
+
+export function moderateProfile(
+  subject: AnyProfileSubject,
+  opts: ModerationOpts,
+): ModerationDecision {
+  return sdkModerateProfile(subject as app.bsky.actor.defs.ProfileView, opts)
+}
+
+export function moderateStatus(
+  subject: AnyProfileSubject,
+  opts: ModerationOpts,
+): ModerationDecision {
+  return sdkModerateStatus(subject as app.bsky.actor.defs.ProfileView, opts)
+}
+
+export function moderatePost(
+  subject: AnyPostSubject,
+  opts: ModerationOpts,
+): ModerationDecision {
+  return sdkModeratePost(subject as app.bsky.feed.defs.PostView, opts)
+}
+
+export function moderateUserList(
+  subject: AnyUserListSubject,
+  opts: ModerationOpts,
+): ModerationDecision {
+  return sdkModerateUserList(subject as app.bsky.graph.defs.ListView, opts)
+}
+
+export function moderateFeedGenerator(
+  subject: AnyFeedGeneratorSubject,
+  opts: ModerationOpts,
+): ModerationDecision {
+  return sdkModerateFeedGenerator(
+    subject as app.bsky.feed.defs.GeneratorView,
+    opts,
+  )
+}
+
+export function moderateNotification(
+  subject: AnyNotificationSubject,
+  opts: ModerationOpts,
+): ModerationDecision {
+  return sdkModerateNotification(
+    subject as app.bsky.notification.listNotifications.Notification,
+    opts,
+  )
+}
+
+/**
+ * Widens `facets`/`actor` for the same reason the `moderate*` wrappers widen
+ * their subjects: mute-word matching reads only `text`/`features`/`langs`, none
+ * of which the brand affects.
+ */
+export function hasMutedWord(params: {
+  mutedWords: app.bsky.actor.defs.MutedWord[]
+  text: string
+  facets?: app.bsky.richtext.facet.Main[] | AppBskyRichtextFacet.Main[]
+  outlineTags?: string[]
+  languages?: string[]
+  actor?: AnyProfileSubject
+}): boolean {
+  return sdkHasMutedWord({
+    ...params,
+    facets: params.facets as app.bsky.richtext.facet.Main[] | undefined,
+    actor: params.actor as app.bsky.actor.defs.ProfileView | undefined,
+  })
+}
diff --git a/src/lib/moderation/useLabelBehaviorDescription.ts b/src/lib/moderation/useLabelBehaviorDescription.ts
index cdded25924..e97ecef33c 100644
--- a/src/lib/moderation/useLabelBehaviorDescription.ts
+++ b/src/lib/moderation/useLabelBehaviorDescription.ts
@@ -1,7 +1,7 @@
 import {
   type InterpretedLabelValueDefinition,
   type LabelPreference,
-} from '@atproto/api'
+} from '@bsky.app/sdk/moderation'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 
diff --git a/src/lib/moderation/useLabelInfo.ts b/src/lib/moderation/useLabelInfo.ts
index f398406078..fc565c3d45 100644
--- a/src/lib/moderation/useLabelInfo.ts
+++ b/src/lib/moderation/useLabelInfo.ts
@@ -1,10 +1,9 @@
+import {type ComAtprotoLabelDefs} from '@atproto/api'
 import {
-  type AppBskyLabelerDefs,
-  type ComAtprotoLabelDefs,
   type InterpretedLabelValueDefinition,
   interpretLabelValueDefinition,
   LABELS,
-} from '@atproto/api'
+} from '@bsky.app/sdk/moderation'
 import {useLingui} from '@lingui/react'
 import * as bcp47Match from 'bcp-47-match'
 
@@ -13,12 +12,13 @@ import {
   useGlobalLabelStrings,
 } from '#/lib/moderation/useGlobalLabelStrings'
 import {useLabelDefinitions} from '#/state/preferences'
+import {type app} from '#/lexicons'
 
 export interface LabelInfo {
   label: ComAtprotoLabelDefs.Label
   def: InterpretedLabelValueDefinition
   strings: ComAtprotoLabelDefs.LabelValueDefinitionStrings
-  labeler: AppBskyLabelerDefs.LabelerViewDetailed | undefined
+  labeler: app.bsky.labeler.defs.LabelerViewDetailed | undefined
 }
 
 export function useLabelInfo(label: ComAtprotoLabelDefs.Label): LabelInfo {
diff --git a/src/lib/moderation/useModerationCauseDescription.ts b/src/lib/moderation/useModerationCauseDescription.ts
index d11d16dca3..3cdbb30961 100644
--- a/src/lib/moderation/useModerationCauseDescription.ts
+++ b/src/lib/moderation/useModerationCauseDescription.ts
@@ -1,9 +1,6 @@
 import {useMemo} from 'react'
-import {
-  BSKY_LABELER_DID,
-  type ModerationCause,
-  type ModerationCauseSource,
-} from '@atproto/api'
+import {BSKY_LABELER_DID} from '@atproto/api'
+import {type ModerationCause} from '@bsky.app/sdk/moderation'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 
@@ -25,7 +22,7 @@ export interface ModerationCauseDescription {
   description: string
   source?: string
   sourceDisplayName?: string
-  sourceType?: ModerationCauseSource['type']
+  sourceType?: ModerationCause['source']['type']
   sourceAvi?: string
   sourceDid?: string
   isSubjectAccount?: boolean
diff --git a/src/lib/strings/display-names.ts b/src/lib/strings/display-names.ts
index 612a317eaf..8ba2e1d215 100644
--- a/src/lib/strings/display-names.ts
+++ b/src/lib/strings/display-names.ts
@@ -1,4 +1,4 @@
-import {type ModerationUI} from '@atproto/api'
+import {type ModerationUI} from '@bsky.app/sdk/moderation'
 
 // \u2705 = ✅
 // \u2713 = ✓
diff --git a/src/screens/Messages/Conversation.tsx b/src/screens/Messages/Conversation.tsx
index 1e2f4037a8..503248754c 100644
--- a/src/screens/Messages/Conversation.tsx
+++ b/src/screens/Messages/Conversation.tsx
@@ -1,7 +1,7 @@
 import {useCallback, useEffect, useMemo, useState} from 'react'
 import {type LayoutChangeEvent, View} from 'react-native'
 import {useSafeAreaInsets} from 'react-native-safe-area-context'
-import {ChatBskyConvoDefs, moderateProfile} from '@atproto/api'
+import {ChatBskyConvoDefs} from '@atproto/api'
 import {
   ScrollEdgeEffect,
   ScrollEdgeEffectProvider,
@@ -18,6 +18,7 @@ import {type NativeStackScreenProps} from '@react-navigation/native-stack'
 
 import {useNonReactiveCallback} from '#/lib/hooks/useNonReactiveCallback'
 import {useViewportZoomLock} from '#/lib/hooks/useViewportZoomLock'
+import {moderateProfile} from '#/lib/moderation/subjects'
 import {
   type CommonNavigatorParams,
   type NavigationProp,
diff --git a/src/screens/Messages/ConversationSettings/Member.tsx b/src/screens/Messages/ConversationSettings/Member.tsx
index 20cc0fee52..8fe07978e8 100644
--- a/src/screens/Messages/ConversationSettings/Member.tsx
+++ b/src/screens/Messages/ConversationSettings/Member.tsx
@@ -1,9 +1,9 @@
 import {View} from 'react-native'
-import {moderateProfile} from '@atproto/api'
 import {Trans, useLingui} from '@lingui/react/macro'
 
 import {isBlockedOrBlocking} from '#/lib/moderation/blocked-and-muted'
 import {createSanitizedDisplayName} from '#/lib/moderation/create-sanitized-display-name'
+import {moderateProfile} from '#/lib/moderation/subjects'
 import {logger} from '#/logger'
 import {useProfileShadow} from '#/state/cache/profile-shadow'
 import {useModerationOpts} from '#/state/preferences/moderation-opts'
diff --git a/src/screens/Messages/ConversationSettings/index.tsx b/src/screens/Messages/ConversationSettings/index.tsx
index 5f76a3f565..80806ae534 100644
--- a/src/screens/Messages/ConversationSettings/index.tsx
+++ b/src/screens/Messages/ConversationSettings/index.tsx
@@ -1,10 +1,7 @@
 import {useEffect, useState} from 'react'
 import {Pressable, View} from 'react-native'
-import {
-  ChatBskyActorDefs,
-  ChatBskyConvoDefs,
-  type ModerationOpts,
-} from '@atproto/api'
+import {ChatBskyActorDefs, ChatBskyConvoDefs} from '@atproto/api'
+import {type ModerationOpts} from '@bsky.app/sdk/moderation'
 import {Trans, useLingui} from '@lingui/react/macro'
 import {useNavigation} from '@react-navigation/native'
 
diff --git a/src/screens/Messages/JoinRequest.tsx b/src/screens/Messages/JoinRequest.tsx
index 6ce57a151b..06faecaffe 100644
--- a/src/screens/Messages/JoinRequest.tsx
+++ b/src/screens/Messages/JoinRequest.tsx
@@ -1,11 +1,12 @@
 import {useEffect} from 'react'
 import {View} from 'react-native'
 import {ImageBackground} from 'expo-image'
-import {ChatBskyGroupDefs, moderateProfile} from '@atproto/api'
+import {ChatBskyGroupDefs} from '@atproto/api'
 import {type ThemeName} from '@bsky.app/alf'
 import {Trans, useLingui} from '@lingui/react/macro'
 
 import {createSanitizedDisplayName} from '#/lib/moderation/create-sanitized-display-name'
+import {moderateProfile} from '#/lib/moderation/subjects'
 import {sanitizeHandle} from '#/lib/strings/handles'
 import {useModerationOpts} from '#/state/preferences/moderation-opts'
 import {useJoinLinkPreviewsQuery} from '#/state/queries/join-links'
diff --git a/src/screens/Messages/components/ChatListItem.tsx b/src/screens/Messages/components/ChatListItem.tsx
index 0acd0c28e7..ad2a1d731c 100644
--- a/src/screens/Messages/components/ChatListItem.tsx
+++ b/src/screens/Messages/components/ChatListItem.tsx
@@ -1,11 +1,10 @@
 import {useCallback, useMemo, useState} from 'react'
 import {type GestureResponderEvent, View} from 'react-native'
+import {ChatBskyConvoDefs} from '@atproto/api'
 import {
-  ChatBskyConvoDefs,
-  moderateProfile,
   type ModerationDecision,
   type ModerationOpts,
-} from '@atproto/api'
+} from '@bsky.app/sdk/moderation'
 import {plural} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react/macro'
 import {useQueryClient} from '@tanstack/react-query'
@@ -13,6 +12,7 @@ import {useQueryClient} from '@tanstack/react-query'
 import {GestureActionView} from '#/lib/custom-animations/GestureActionView'
 import {useHaptics} from '#/lib/haptics'
 import {createSanitizedDisplayName} from '#/lib/moderation/create-sanitized-display-name'
+import {moderateProfile} from '#/lib/moderation/subjects'
 import {decrementBadgeCount} from '#/lib/notifications/notifications'
 import {sanitizeHandle} from '#/lib/strings/handles'
 import {
diff --git a/src/screens/Messages/components/ChatStatusInfo.tsx b/src/screens/Messages/components/ChatStatusInfo.tsx
index e2e9a75faa..4d3ebe2ab8 100644
--- a/src/screens/Messages/components/ChatStatusInfo.tsx
+++ b/src/screens/Messages/components/ChatStatusInfo.tsx
@@ -1,10 +1,10 @@
 import {useCallback, useMemo} from 'react'
 import {View} from 'react-native'
 import {LinearGradient} from 'expo-linear-gradient'
-import {moderateProfile} from '@atproto/api'
 import {Trans, useLingui} from '@lingui/react/macro'
 
 import {createSanitizedDisplayName} from '#/lib/moderation/create-sanitized-display-name'
+import {moderateProfile} from '#/lib/moderation/subjects'
 import {sanitizeHandle} from '#/lib/strings/handles'
 import {useProfileShadow} from '#/state/cache/profile-shadow'
 import {type ActiveConvoStates} from '#/state/messages/convo'
diff --git a/src/screens/Messages/components/InviteLinkDialog.tsx b/src/screens/Messages/components/InviteLinkDialog.tsx
index 22acd577b0..a2a32a41c5 100644
--- a/src/screens/Messages/components/InviteLinkDialog.tsx
+++ b/src/screens/Messages/components/InviteLinkDialog.tsx
@@ -1,15 +1,13 @@
 import {useState} from 'react'
 import {View} from 'react-native'
 import {Image} from 'expo-image'
-import {
-  type ChatBskyGroupDefs,
-  moderateProfile,
-  type ModerationOpts,
-} from '@atproto/api'
+import {type ChatBskyGroupDefs} from '@atproto/api'
+import {type ModerationOpts} from '@bsky.app/sdk/moderation'
 import {Plural, Trans, useLingui} from '@lingui/react/macro'
 
 import {useOpenComposer} from '#/lib/hooks/useOpenComposer'
 import {createSanitizedDisplayName} from '#/lib/moderation/create-sanitized-display-name'
+import {moderateProfile} from '#/lib/moderation/subjects'
 import {shareUrl} from '#/lib/sharing'
 import {useCreateJoinLink} from '#/state/queries/messages/create-join-link'
 import {useDisableJoinLink} from '#/state/queries/messages/disable-join-link'
diff --git a/src/screens/Messages/components/MessageInputEmbed.tsx b/src/screens/Messages/components/MessageInputEmbed.tsx
index 9d1e4c32f6..7740c7ea50 100644
--- a/src/screens/Messages/components/MessageInputEmbed.tsx
+++ b/src/screens/Messages/components/MessageInputEmbed.tsx
@@ -1,11 +1,12 @@
 import {useCallback, useEffect, useMemo, useState} from 'react'
 import {LayoutAnimation, View} from 'react-native'
-import {AppBskyFeedPost, AtUri, moderatePost} from '@atproto/api'
+import {AppBskyFeedPost, AtUri} from '@atproto/api'
 import {RichText as RichTextAPI} from '@bsky.app/sdk/richtext'
 import {Trans, useLingui} from '@lingui/react/macro'
 import {type RouteProp, useNavigation, useRoute} from '@react-navigation/native'
 
 import {HITSLOP_20} from '#/lib/constants'
+import {moderatePost} from '#/lib/moderation/subjects'
 import {makeProfileLink} from '#/lib/routes/links'
 import {
   type CommonNavigatorParams,
diff --git a/src/screens/Messages/components/MessagesListInfoPanel.tsx b/src/screens/Messages/components/MessagesListInfoPanel.tsx
index b5c39a42dc..297ef8632f 100644
--- a/src/screens/Messages/components/MessagesListInfoPanel.tsx
+++ b/src/screens/Messages/components/MessagesListInfoPanel.tsx
@@ -1,9 +1,9 @@
 import {View} from 'react-native'
-import {moderateProfile} from '@atproto/api'
 import {Trans, useLingui} from '@lingui/react/macro'
 import {useNavigation} from '@react-navigation/native'
 
 import {createSanitizedDisplayName} from '#/lib/moderation/create-sanitized-display-name'
+import {moderateProfile} from '#/lib/moderation/subjects'
 import {type NavigationProp} from '#/lib/routes/types'
 import {isInvalidHandle, sanitizeHandle} from '#/lib/strings/handles'
 import {useModerationOpts} from '#/state/preferences/moderation-opts'
diff --git a/src/screens/Moderation/index.tsx b/src/screens/Moderation/index.tsx
index 9aea34b89d..416390f075 100644
--- a/src/screens/Moderation/index.tsx
+++ b/src/screens/Moderation/index.tsx
@@ -1,6 +1,6 @@
 import {Fragment, useCallback} from 'react'
 import {Linking, View} from 'react-native'
-import {LABELS} from '@atproto/api'
+import {LABELS} from '@bsky.app/sdk/moderation'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
diff --git a/src/screens/ModerationInteractionSettings/index.tsx b/src/screens/ModerationInteractionSettings/index.tsx
index 12d952c872..9ce833a8e5 100644
--- a/src/screens/ModerationInteractionSettings/index.tsx
+++ b/src/screens/ModerationInteractionSettings/index.tsx
@@ -23,7 +23,6 @@ import {PostInteractionSettingsForm} from '#/components/dialogs/PostInteractionS
 import * as Layout from '#/components/Layout'
 import {Loader} from '#/components/Loader'
 import * as Toast from '#/components/Toast'
-import {type app} from '#/lexicons'
 
 export function Screen() {
   const gutters = useGutters(['base'])
@@ -76,15 +75,14 @@ function Inner({preferences}: {preferences: UsePreferencesQueryResponse}) {
        * Preferences are still typed against the legacy client, so the stored
        * rules arrive unbranded. Wave B migrates `getPreferences`.
        */
-      allow: preferences.postInteractionSettings
-        .threadgateAllowRules as app.bsky.feed.threadgate.Main['allow'],
+      allow: preferences.postInteractionSettings.threadgateAllowRules,
     })
   }, [preferences.postInteractionSettings.threadgateAllowRules])
   const postgate = useMemo(() => {
     return createPostgateRecord({
       post: '',
-      embeddingRules: preferences.postInteractionSettings
-        .postgateEmbeddingRules as app.bsky.feed.postgate.Main['embeddingRules'],
+      embeddingRules:
+        preferences.postInteractionSettings.postgateEmbeddingRules,
     })
   }, [preferences.postInteractionSettings.postgateEmbeddingRules])
 
diff --git a/src/screens/Onboarding/StepSuggestedAccounts/index.tsx b/src/screens/Onboarding/StepSuggestedAccounts/index.tsx
index f43d06cdd4..982ee15611 100644
--- a/src/screens/Onboarding/StepSuggestedAccounts/index.tsx
+++ b/src/screens/Onboarding/StepSuggestedAccounts/index.tsx
@@ -1,6 +1,6 @@
 import {useCallback, useEffect, useMemo, useRef, useState} from 'react'
 import {View} from 'react-native'
-import {type ModerationOpts} from '@atproto/api'
+import {type ModerationOpts} from '@bsky.app/sdk/moderation'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
diff --git a/src/screens/PostThread/components/LikesStat.tsx b/src/screens/PostThread/components/LikesStat.tsx
index eab32dc274..de219f4743 100644
--- a/src/screens/PostThread/components/LikesStat.tsx
+++ b/src/screens/PostThread/components/LikesStat.tsx
@@ -1,7 +1,8 @@
 import {View} from 'react-native'
-import {type AppBskyFeedDefs, AtUri, moderateProfile} from '@atproto/api'
+import {type AppBskyFeedDefs, AtUri} from '@atproto/api'
 import {Plural, Trans, useLingui} from '@lingui/react/macro'
 
+import {moderateProfile} from '#/lib/moderation/subjects'
 import {makeProfileLink} from '#/lib/routes/links'
 import {sanitizeDisplayName} from '#/lib/strings/display-names'
 import {useModerationOpts} from '#/state/preferences/moderation-opts'
diff --git a/src/screens/Profile/Header/DisplayName.tsx b/src/screens/Profile/Header/DisplayName.tsx
index 8bf50fee2d..ac99ba82b4 100644
--- a/src/screens/Profile/Header/DisplayName.tsx
+++ b/src/screens/Profile/Header/DisplayName.tsx
@@ -1,5 +1,6 @@
 import {View} from 'react-native'
-import {type AppBskyActorDefs, type ModerationDecision} from '@atproto/api'
+import {type AppBskyActorDefs} from '@atproto/api'
+import {type ModerationDecision} from '@bsky.app/sdk/moderation'
 
 import {sanitizeDisplayName} from '#/lib/strings/display-names'
 import {sanitizeHandle} from '#/lib/strings/handles'
diff --git a/src/screens/Profile/Header/ProfileHeaderLabeler.tsx b/src/screens/Profile/Header/ProfileHeaderLabeler.tsx
index 812e65b6e2..a7979f17ae 100644
--- a/src/screens/Profile/Header/ProfileHeaderLabeler.tsx
+++ b/src/screens/Profile/Header/ProfileHeaderLabeler.tsx
@@ -1,11 +1,7 @@
 import {memo, useCallback, useMemo, useState} from 'react'
 import {View} from 'react-native'
-import {
-  type AppBskyActorDefs,
-  type AppBskyLabelerDefs,
-  moderateProfile,
-  type ModerationOpts,
-} from '@atproto/api'
+import {type AppBskyActorDefs} from '@atproto/api'
+import {type ModerationOpts} from '@bsky.app/sdk/moderation'
 import {type RichText as RichTextAPI} from '@bsky.app/sdk/richtext'
 import {msg, plural} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
@@ -15,6 +11,7 @@ import {Plural, Trans} from '@lingui/react/macro'
 import {MAX_LABELERS} from '#/lib/constants'
 import {useHaptics} from '#/lib/haptics'
 import {isAppLabeler} from '#/lib/moderation'
+import {moderateProfile} from '#/lib/moderation/subjects'
 import {useProfileShadow} from '#/state/cache/profile-shadow'
 import {type Shadow} from '#/state/cache/types'
 import {useLabelerSubscriptionMutation} from '#/state/queries/labeler'
@@ -37,6 +34,7 @@ import * as Toast from '#/components/Toast'
 import {Text} from '#/components/Typography'
 import {useAnalytics} from '#/analytics'
 import {IS_IOS} from '#/env'
+import {type app} from '#/lexicons'
 import {ProfileHeaderDisplayName} from './DisplayName'
 import {EditProfileDialog} from './EditProfileDialog'
 import {ProfileHeaderHandle} from './Handle'
@@ -45,7 +43,7 @@ import {ProfileHeaderShell} from './Shell'
 
 interface Props {
   profile: AppBskyActorDefs.ProfileViewDetailed
-  labeler: AppBskyLabelerDefs.LabelerViewDetailed
+  labeler: app.bsky.labeler.defs.LabelerViewDetailed
   descriptionRT: RichTextAPI | null
   moderationOpts: ModerationOpts
   hideBackButton?: boolean
diff --git a/src/screens/Profile/Header/ProfileHeaderStandard.tsx b/src/screens/Profile/Header/ProfileHeaderStandard.tsx
index 3070997b98..b7cfff7ab9 100644
--- a/src/screens/Profile/Header/ProfileHeaderStandard.tsx
+++ b/src/screens/Profile/Header/ProfileHeaderStandard.tsx
@@ -1,17 +1,17 @@
 import {memo, useMemo, useState} from 'react'
 import {View} from 'react-native'
+import {type AppBskyActorDefs} from '@atproto/api'
 import {
-  type AppBskyActorDefs,
-  moderateProfile,
   type ModerationDecision,
   type ModerationOpts,
-} from '@atproto/api'
+} from '@bsky.app/sdk/moderation'
 import {type RichText as RichTextAPI} from '@bsky.app/sdk/richtext'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
 
 import {useHaptics} from '#/lib/haptics'
+import {moderateProfile} from '#/lib/moderation/subjects'
 import {sanitizeDisplayName} from '#/lib/strings/display-names'
 import {logger} from '#/logger'
 import {type Shadow, useProfileShadow} from '#/state/cache/profile-shadow'
diff --git a/src/screens/Profile/Header/Shell.tsx b/src/screens/Profile/Header/Shell.tsx
index a142e1139c..4521ba9edf 100644
--- a/src/screens/Profile/Header/Shell.tsx
+++ b/src/screens/Profile/Header/Shell.tsx
@@ -5,8 +5,9 @@ import Animated, {
   useAnimatedRef,
 } from 'react-native-reanimated'
 import {useSafeAreaInsets} from 'react-native-safe-area-context'
-import {type AppBskyActorDefs, type ModerationDecision} from '@atproto/api'
+import {type AppBskyActorDefs} from '@atproto/api'
 import {utils} from '@bsky.app/alf'
+import {type ModerationDecision} from '@bsky.app/sdk/moderation'
 import {useLingui} from '@lingui/react/macro'
 import {useNavigation} from '@react-navigation/native'
 
diff --git a/src/screens/Profile/Header/index.tsx b/src/screens/Profile/Header/index.tsx
index dbd8bafcab..eff65c854d 100644
--- a/src/screens/Profile/Header/index.tsx
+++ b/src/screens/Profile/Header/index.tsx
@@ -7,15 +7,12 @@ import Animated, {
 } from 'react-native-reanimated'
 import {useSafeAreaInsets} from 'react-native-safe-area-context'
 import {scheduleOnRN} from 'react-native-worklets'
-import {
-  type AppBskyActorDefs,
-  type AppBskyLabelerDefs,
-  moderateProfile,
-  type ModerationOpts,
-} from '@atproto/api'
+import {type AppBskyActorDefs} from '@atproto/api'
+import {type ModerationOpts} from '@bsky.app/sdk/moderation'
 import {type RichText as RichTextAPI} from '@bsky.app/sdk/richtext'
 import {useIsFocused} from '@react-navigation/native'
 
+import {moderateProfile} from '#/lib/moderation/subjects'
 import {sanitizeHandle} from '#/lib/strings/handles'
 import {useProfileShadow} from '#/state/cache/profile-shadow'
 import {useModerationOpts} from '#/state/preferences/moderation-opts'
@@ -26,6 +23,7 @@ import {atoms as a, useTheme} from '#/alf'
 import {Header} from '#/components/Layout'
 import * as ProfileCard from '#/components/ProfileCard'
 import {IS_NATIVE} from '#/env'
+import {type app} from '#/lexicons'
 import {
   HeaderLabelerButtons,
   ProfileHeaderLabeler,
@@ -61,7 +59,7 @@ export {ProfileHeaderLoading}
 
 interface Props {
   profile: AppBskyActorDefs.ProfileViewDetailed
-  labeler: AppBskyLabelerDefs.LabelerViewDetailed | undefined
+  labeler: app.bsky.labeler.defs.LabelerViewDetailed | undefined
   descriptionRT: RichTextAPI | null
   moderationOpts: ModerationOpts
   hideBackButton?: boolean
@@ -106,7 +104,7 @@ const MinimalHeader = memo(function MinimalHeader({
 }: {
   onLayout: (e: LayoutChangeEvent) => void
   profile: AppBskyActorDefs.ProfileViewDetailed
-  labeler?: AppBskyLabelerDefs.LabelerViewDetailed
+  labeler?: app.bsky.labeler.defs.LabelerViewDetailed
   hideBackButton?: boolean
 }) {
   const t = useTheme()
diff --git a/src/screens/Profile/Sections/Labels.tsx b/src/screens/Profile/Sections/Labels.tsx
index 8c70d40392..649c214acb 100644
--- a/src/screens/Profile/Sections/Labels.tsx
+++ b/src/screens/Profile/Sections/Labels.tsx
@@ -1,11 +1,10 @@
 import {useCallback, useEffect, useImperativeHandle, useMemo} from 'react'
 import {type ListRenderItemInfo, View} from 'react-native'
 import {
-  type AppBskyLabelerDefs,
   type InterpretedLabelValueDefinition,
   interpretLabelValueDefinitions,
   type ModerationOpts,
-} from '@atproto/api'
+} from '@bsky.app/sdk/moderation'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
@@ -21,13 +20,14 @@ import {Loader} from '#/components/Loader'
 import {LabelerLabelPreference} from '#/components/moderation/LabelPreference'
 import {Text} from '#/components/Typography'
 import {IS_IOS, IS_NATIVE} from '#/env'
+import {type app} from '#/lexicons'
 import {ErrorState} from '../ErrorState'
 import {type SectionRef} from './types'
 
 interface LabelsSectionProps {
   ref: React.Ref<SectionRef>
   isLabelerLoading: boolean
-  labelerInfo: AppBskyLabelerDefs.LabelerViewDetailed | undefined
+  labelerInfo: app.bsky.labeler.defs.LabelerViewDetailed | undefined
   labelerError: Error | null
   moderationOpts: ModerationOpts
   scrollElRef: ListRef
@@ -161,7 +161,7 @@ export function LabelerListHeader({
 }: {
   isLabelerLoading: boolean
   labelerError?: Error | null
-  labelerInfo?: AppBskyLabelerDefs.LabelerViewDetailed
+  labelerInfo?: app.bsky.labeler.defs.LabelerViewDetailed
   hasValues: boolean
   isSubscribed: boolean
 }) {
diff --git a/src/screens/ProfileList/index.tsx b/src/screens/ProfileList/index.tsx
index 77af470cd5..ef0221631d 100644
--- a/src/screens/ProfileList/index.tsx
+++ b/src/screens/ProfileList/index.tsx
@@ -1,12 +1,8 @@
 import {useCallback, useMemo, useRef, useState} from 'react'
 import {View} from 'react-native'
 import {useAnimatedRef} from 'react-native-reanimated'
-import {
-  AppBskyGraphDefs,
-  AtUri,
-  moderateUserList,
-  type ModerationOpts,
-} from '@atproto/api'
+import {AppBskyGraphDefs, AtUri} from '@atproto/api'
+import {type ModerationOpts} from '@bsky.app/sdk/moderation'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
@@ -15,6 +11,7 @@ import {useQueryClient} from '@tanstack/react-query'
 
 import {useOpenComposer} from '#/lib/hooks/useOpenComposer'
 import {useSetTitle} from '#/lib/hooks/useSetTitle'
+import {moderateUserList} from '#/lib/moderation/subjects'
 import {
   type CommonNavigatorParams,
   type NativeStackScreenProps,
diff --git a/src/screens/Search/components/SearchHistory.tsx b/src/screens/Search/components/SearchHistory.tsx
index 31186726b2..b71f5ef312 100644
--- a/src/screens/Search/components/SearchHistory.tsx
+++ b/src/screens/Search/components/SearchHistory.tsx
@@ -1,8 +1,9 @@
 import {ScrollView, View} from 'react-native'
-import {moderateProfile, type ModerationOpts} from '@atproto/api'
+import {type ModerationOpts} from '@bsky.app/sdk/moderation'
 import {Plural, Trans, useLingui} from '@lingui/react/macro'
 
 import {createHitslop} from '#/lib/constants'
+import {moderateProfile} from '#/lib/moderation/subjects'
 import {makeProfileLink} from '#/lib/routes/links'
 import {sanitizeDisplayName} from '#/lib/strings/display-names'
 import {sanitizeHandle} from '#/lib/strings/handles'
diff --git a/src/screens/Search/components/SearchProfileCard.tsx b/src/screens/Search/components/SearchProfileCard.tsx
index a5ca18ee13..b848739ed3 100644
--- a/src/screens/Search/components/SearchProfileCard.tsx
+++ b/src/screens/Search/components/SearchProfileCard.tsx
@@ -1,6 +1,6 @@
 import {useCallback} from 'react'
 import {View} from 'react-native'
-import {type ModerationOpts} from '@atproto/api'
+import {type ModerationOpts} from '@bsky.app/sdk/moderation'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {useQueryClient} from '@tanstack/react-query'
diff --git a/src/screens/Search/components/StarterPackCard.tsx b/src/screens/Search/components/StarterPackCard.tsx
index 9831746b42..949bdd6ebf 100644
--- a/src/screens/Search/components/StarterPackCard.tsx
+++ b/src/screens/Search/components/StarterPackCard.tsx
@@ -1,14 +1,11 @@
 import {useState} from 'react'
 import {View} from 'react-native'
-import {
-  type AppBskyGraphDefs,
-  AppBskyGraphStarterpack,
-  moderateProfile,
-} from '@atproto/api'
+import {type AppBskyGraphDefs, AppBskyGraphStarterpack} from '@atproto/api'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
 
+import {moderateProfile} from '#/lib/moderation/subjects'
 import {sanitizeHandle} from '#/lib/strings/handles'
 import {useModerationOpts} from '#/state/preferences/moderation-opts'
 import {useSession} from '#/state/session'
diff --git a/src/screens/Search/modules/ExploreSuggestedAccounts.tsx b/src/screens/Search/modules/ExploreSuggestedAccounts.tsx
index c32d4eefd3..ef6dc0cba9 100644
--- a/src/screens/Search/modules/ExploreSuggestedAccounts.tsx
+++ b/src/screens/Search/modules/ExploreSuggestedAccounts.tsx
@@ -1,6 +1,7 @@
 import {memo, useEffect} from 'react'
 import {View} from 'react-native'
-import {type AppBskyActorSearchActors, type ModerationOpts} from '@atproto/api'
+import {type AppBskyActorSearchActors} from '@atproto/api'
+import {type ModerationOpts} from '@bsky.app/sdk/moderation'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {type InfiniteData} from '@tanstack/react-query'
diff --git a/src/screens/Search/modules/ExploreTrendingTopics.tsx b/src/screens/Search/modules/ExploreTrendingTopics.tsx
index 60c42323c3..27356efff9 100644
--- a/src/screens/Search/modules/ExploreTrendingTopics.tsx
+++ b/src/screens/Search/modules/ExploreTrendingTopics.tsx
@@ -1,10 +1,11 @@
 import {useMemo} from 'react'
 import {Pressable, View} from 'react-native'
 import {Image} from 'expo-image'
-import {type AppBskyUnspeccedDefs, moderateProfile} from '@atproto/api'
+import {type AppBskyUnspeccedDefs} from '@atproto/api'
 import {RichText as RichTextApi} from '@bsky.app/sdk/richtext'
 import {Plural, Trans, useLingui} from '@lingui/react/macro'
 
+import {moderateProfile} from '#/lib/moderation/subjects'
 import {useModerationOpts} from '#/state/preferences/moderation-opts'
 import {
   useTrendingSettings,
diff --git a/src/screens/Settings/FindContactsSettings.tsx b/src/screens/Settings/FindContactsSettings.tsx
index c8ecdf4102..1fb0f3b2a8 100644
--- a/src/screens/Settings/FindContactsSettings.tsx
+++ b/src/screens/Settings/FindContactsSettings.tsx
@@ -1,8 +1,9 @@
 import {useCallback, useEffect, useState} from 'react'
 import {type ListRenderItemInfo, View} from 'react-native'
 import * as Contacts from 'expo-contacts'
-import {type AppBskyContactDefs, type ModerationOpts} from '@atproto/api'
+import {type AppBskyContactDefs} from '@atproto/api'
 import {type DidString} from '@atproto/syntax'
+import {type ModerationOpts} from '@bsky.app/sdk/moderation'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Plural, Trans} from '@lingui/react/macro'
diff --git a/src/screens/Settings/NotificationSettings/ActivityNotificationSettings.tsx b/src/screens/Settings/NotificationSettings/ActivityNotificationSettings.tsx
index 3aaf5e10e5..0da3356f5e 100644
--- a/src/screens/Settings/NotificationSettings/ActivityNotificationSettings.tsx
+++ b/src/screens/Settings/NotificationSettings/ActivityNotificationSettings.tsx
@@ -1,6 +1,6 @@
 import {useCallback, useMemo} from 'react'
 import {type ListRenderItemInfo, Text as RNText, View} from 'react-native'
-import {type ModerationOpts} from '@atproto/api'
+import {type ModerationOpts} from '@bsky.app/sdk/moderation'
 import {Trans, useLingui} from '@lingui/react/macro'
 
 import {createSanitizedDisplayName} from '#/lib/moderation/create-sanitized-display-name'
diff --git a/src/screens/Settings/Settings.tsx b/src/screens/Settings/Settings.tsx
index 0d5b2bcc73..0fff031f87 100644
--- a/src/screens/Settings/Settings.tsx
+++ b/src/screens/Settings/Settings.tsx
@@ -1,7 +1,7 @@
 import {useState} from 'react'
 import {Alert, LayoutAnimation, Linking, Pressable, View} from 'react-native'
 import {useReducedMotion} from 'react-native-reanimated'
-import {type AppBskyActorDefs, moderateProfile} from '@atproto/api'
+import {type AppBskyActorDefs} from '@atproto/api'
 import {removeNuxs} from '@bsky.app/sdk'
 import {Trans, useLingui} from '@lingui/react/macro'
 import {useNavigation} from '@react-navigation/native'
@@ -10,6 +10,7 @@ import {type NativeStackScreenProps} from '@react-navigation/native-stack'
 import {HELP_DESK_URL, HITSLOP_10} from '#/lib/constants'
 import {useAccountSwitcher} from '#/lib/hooks/useAccountSwitcher'
 import {useApplyPullRequestOTAUpdate} from '#/lib/hooks/useOTAUpdates'
+import {moderateProfile} from '#/lib/moderation/subjects'
 import {
   type CommonNavigatorParams,
   type NavigationProp,
diff --git a/src/screens/StarterPack/StarterPackLandingScreen.tsx b/src/screens/StarterPack/StarterPackLandingScreen.tsx
index 6184514412..a8ae9ce95f 100644
--- a/src/screens/StarterPack/StarterPackLandingScreen.tsx
+++ b/src/screens/StarterPack/StarterPackLandingScreen.tsx
@@ -1,12 +1,8 @@
 import {useEffect, useState} from 'react'
 import {Pressable, View} from 'react-native'
 import Animated, {FadeIn, FadeOut} from 'react-native-reanimated'
-import {
-  AppBskyGraphDefs,
-  AppBskyGraphStarterpack,
-  AtUri,
-  type ModerationOpts,
-} from '@atproto/api'
+import {AppBskyGraphDefs, AppBskyGraphStarterpack, AtUri} from '@atproto/api'
+import {type ModerationOpts} from '@bsky.app/sdk/moderation'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
diff --git a/src/screens/StarterPack/StarterPackScreen.tsx b/src/screens/StarterPack/StarterPackScreen.tsx
index c79e39c190..e392f395db 100644
--- a/src/screens/StarterPack/StarterPackScreen.tsx
+++ b/src/screens/StarterPack/StarterPackScreen.tsx
@@ -1,13 +1,9 @@
 import {useCallback, useEffect, useState} from 'react'
 import {View} from 'react-native'
 import {Image} from 'expo-image'
-import {
-  AppBskyGraphDefs,
-  AppBskyGraphStarterpack,
-  AtUri,
-  type ModerationOpts,
-} from '@atproto/api'
+import {AppBskyGraphDefs, AppBskyGraphStarterpack, AtUri} from '@atproto/api'
 import {type AtUriString} from '@atproto/syntax'
+import {type ModerationOpts} from '@bsky.app/sdk/moderation'
 import {RichText as RichTextAPI} from '@bsky.app/sdk/richtext'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
diff --git a/src/screens/StarterPack/Wizard/StepFeeds.tsx b/src/screens/StarterPack/Wizard/StepFeeds.tsx
index 470d5a55ee..183f9fb843 100644
--- a/src/screens/StarterPack/Wizard/StepFeeds.tsx
+++ b/src/screens/StarterPack/Wizard/StepFeeds.tsx
@@ -1,7 +1,8 @@
 import {useState} from 'react'
 import {type ListRenderItemInfo, View} from 'react-native'
 import {KeyboardAwareScrollView} from 'react-native-keyboard-controller'
-import {type AppBskyFeedDefs, type ModerationOpts} from '@atproto/api'
+import {type AppBskyFeedDefs} from '@atproto/api'
+import {type ModerationOpts} from '@bsky.app/sdk/moderation'
 import {Trans} from '@lingui/react/macro'
 
 import {DISCOVER_FEED_URI} from '#/lib/constants'
diff --git a/src/screens/StarterPack/Wizard/StepProfiles.tsx b/src/screens/StarterPack/Wizard/StepProfiles.tsx
index 9f3b7076fd..45e52fa14b 100644
--- a/src/screens/StarterPack/Wizard/StepProfiles.tsx
+++ b/src/screens/StarterPack/Wizard/StepProfiles.tsx
@@ -1,7 +1,7 @@
 import {useState} from 'react'
 import {type ListRenderItemInfo, View} from 'react-native'
 import {KeyboardAwareScrollView} from 'react-native-keyboard-controller'
-import {type ModerationOpts} from '@atproto/api'
+import {type ModerationOpts} from '@bsky.app/sdk/moderation'
 import {Trans} from '@lingui/react/macro'
 
 import {useA11y} from '#/state/a11y'
diff --git a/src/screens/StarterPack/Wizard/index.tsx b/src/screens/StarterPack/Wizard/index.tsx
index c579f09d67..4f94943729 100644
--- a/src/screens/StarterPack/Wizard/index.tsx
+++ b/src/screens/StarterPack/Wizard/index.tsx
@@ -8,8 +8,8 @@ import {
   type AppBskyFeedDefs,
   type AppBskyGraphDefs,
   AtUri,
-  type ModerationOpts,
 } from '@atproto/api'
+import {type ModerationOpts} from '@bsky.app/sdk/moderation'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Plural, Trans} from '@lingui/react/macro'
diff --git a/src/screens/VideoFeed/index.tsx b/src/screens/VideoFeed/index.tsx
index 38c2e5a89d..9f4771ddce 100644
--- a/src/screens/VideoFeed/index.tsx
+++ b/src/screens/VideoFeed/index.tsx
@@ -30,8 +30,8 @@ import {
   type AppBskyFeedDefs,
   AppBskyFeedPost,
   AtUri,
-  type ModerationDecision,
 } from '@atproto/api'
+import {type ModerationDecision} from '@bsky.app/sdk/moderation'
 import {RichText as RichTextAPI} from '@bsky.app/sdk/richtext'
 import {Trans, useLingui} from '@lingui/react/macro'
 import {
diff --git a/src/state/preferences/label-defs.tsx b/src/state/preferences/label-defs.tsx
index dd1859ecb6..8000bd231c 100644
--- a/src/state/preferences/label-defs.tsx
+++ b/src/state/preferences/label-defs.tsx
@@ -1,14 +1,12 @@
 import {createContext, useContext} from 'react'
-import {
-  type AppBskyLabelerDefs,
-  type InterpretedLabelValueDefinition,
-} from '@atproto/api'
+import {type InterpretedLabelValueDefinition} from '@bsky.app/sdk/moderation'
 
+import {type app} from '#/lexicons'
 import {useLabelDefinitionsQuery} from '../queries/preferences'
 
 interface StateContext {
   labelDefs: Record<string, InterpretedLabelValueDefinition[]>
-  labelers: AppBskyLabelerDefs.LabelerViewDetailed[]
+  labelers: app.bsky.labeler.defs.LabelerViewDetailed[]
 }
 
 const stateContext = createContext<StateContext>({
diff --git a/src/state/preferences/moderation-opts.tsx b/src/state/preferences/moderation-opts.tsx
index 119c9008db..77ef89f283 100644
--- a/src/state/preferences/moderation-opts.tsx
+++ b/src/state/preferences/moderation-opts.tsx
@@ -1,5 +1,6 @@
 import {createContext, useContext, useMemo} from 'react'
-import {AtpAgent, type ModerationOpts} from '@atproto/api'
+import {Client} from '@atproto/lex'
+import {type ModerationOpts} from '@bsky.app/sdk/moderation'
 
 import {useHiddenPosts, useLabelDefinitions} from '#/state/preferences'
 import {DEFAULT_LOGGED_OUT_LABEL_PREFERENCES} from '#/state/queries/preferences/const'
@@ -38,16 +39,21 @@ export function Provider({children}: React.PropsWithChildren<{}>) {
       return undefined
     }
     return {
-      userDid,
+      /*
+       * `did`/`hiddenPosts` come from persisted storage typed as plain
+       * `string`, so brand them to the SDK's `DidString`/`AtUriString` slots.
+       */
+      userDid: userDid as ModerationOpts['userDid'],
       prefs: {
         ...moderationPrefs,
         labelers: moderationPrefs.labelers.length
           ? moderationPrefs.labelers
-          : AtpAgent.appLabelers.map(did => ({
+          : Client.appLabelers.map(did => ({
               did,
               labels: DEFAULT_LOGGED_OUT_LABEL_PREFERENCES,
             })),
-        hiddenPosts: hiddenPosts || [],
+        hiddenPosts: (hiddenPosts ||
+          []) as ModerationOpts['prefs']['hiddenPosts'],
       },
       labelDefs,
     }
diff --git a/src/state/queries/actor-autocomplete.ts b/src/state/queries/actor-autocomplete.ts
index 14377c5347..111a8aaab4 100644
--- a/src/state/queries/actor-autocomplete.ts
+++ b/src/state/queries/actor-autocomplete.ts
@@ -1,12 +1,10 @@
 import {useCallback} from 'react'
-import {
-  type AppBskyActorDefs,
-  moderateProfile,
-  type ModerationOpts,
-} from '@atproto/api'
+import {type AppBskyActorDefs} from '@atproto/api'
+import {type ModerationOpts} from '@bsky.app/sdk/moderation'
 import {keepPreviousData, useQuery, useQueryClient} from '@tanstack/react-query'
 
 import {isJustAMute, moduiContainsHideableOffense} from '#/lib/moderation'
+import {moderateProfile} from '#/lib/moderation/subjects'
 import {logger} from '#/logger'
 import {STALE} from '#/state/queries'
 import {useAppviewClient} from '#/state/session'
diff --git a/src/state/queries/explore-feed-previews.tsx b/src/state/queries/explore-feed-previews.tsx
index c340078603..884b46d2df 100644
--- a/src/state/queries/explore-feed-previews.tsx
+++ b/src/state/queries/explore-feed-previews.tsx
@@ -1,10 +1,5 @@
 import {useMemo, useRef} from 'react'
-import {
-  type AppBskyActorDefs,
-  AppBskyFeedDefs,
-  AtUri,
-  moderatePost,
-} from '@atproto/api'
+import {type AppBskyActorDefs, AppBskyFeedDefs, AtUri} from '@atproto/api'
 import {type AtUriString} from '@atproto/syntax'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
@@ -17,6 +12,7 @@ import {
 import {CustomFeedAPI} from '#/lib/api/feed/custom'
 import {aggregateUserInterests} from '#/lib/api/feed/utils'
 import {FeedTuner} from '#/lib/api/feed-manip'
+import {moderatePost} from '#/lib/moderation/subjects'
 import {cleanError} from '#/lib/strings/errors'
 import {useModerationOpts} from '#/state/preferences/moderation-opts'
 import {
diff --git a/src/state/queries/feed.ts b/src/state/queries/feed.ts
index a3b90de32b..669ec04263 100644
--- a/src/state/queries/feed.ts
+++ b/src/state/queries/feed.ts
@@ -4,7 +4,6 @@ import {
   type AppBskyFeedDefs,
   type AppBskyGraphDefs,
   AtUri,
-  moderateFeedGenerator,
 } from '@atproto/api'
 import {type AtUriString} from '@atproto/syntax'
 import {RichText} from '@bsky.app/sdk/richtext'
@@ -20,6 +19,7 @@ import {
 } from '@tanstack/react-query'
 
 import {DISCOVER_FEED_URI, DISCOVER_SAVED_FEED} from '#/lib/constants'
+import {moderateFeedGenerator} from '#/lib/moderation/subjects'
 import {sanitizeDisplayName} from '#/lib/strings/display-names'
 import {sanitizeHandle} from '#/lib/strings/handles'
 import {asSdkFacets} from '#/lib/strings/rich-text-helpers'
diff --git a/src/state/queries/labeler.ts b/src/state/queries/labeler.ts
index b132b73ebe..3fd14cc5fc 100644
--- a/src/state/queries/labeler.ts
+++ b/src/state/queries/labeler.ts
@@ -1,4 +1,3 @@
-import {type AppBskyLabelerDefs} from '@atproto/api'
 import {type DidString} from '@atproto/syntax'
 import {addLabeler, removeLabeler} from '@bsky.app/sdk'
 import {useMutation, useQuery, useQueryClient} from '@tanstack/react-query'
@@ -11,7 +10,8 @@ import {
   usePreferencesQuery,
 } from '#/state/queries/preferences'
 import {createQueryKey} from '#/state/queries/util'
-import {useAgent, usePdsClient} from '#/state/session'
+import {useAppviewClient, usePdsClient} from '#/state/session'
+import {app} from '#/lexicons'
 
 const labelerInfoQueryKeyRoot = 'labeler-info'
 export const labelerInfoQueryKey = (did: string) => [
@@ -35,45 +35,47 @@ export function useLabelerInfoQuery({
   did?: string
   enabled?: boolean
 }) {
-  const agent = useAgent()
+  const client = useAppviewClient()
   return useQuery({
     enabled: !!did && enabled !== false,
     queryKey: labelerInfoQueryKey(did as string),
     queryFn: async () => {
-      const res = await agent.app.bsky.labeler.getServices({
-        dids: [did!],
+      const res = await client.call(app.bsky.labeler.getServices, {
+        dids: [did! as DidString],
         detailed: true,
       })
-      return res.data.views[0] as AppBskyLabelerDefs.LabelerViewDetailed
+      return res.views[0] as app.bsky.labeler.defs.LabelerViewDetailed
     },
   })
 }
 
 export function useLabelersInfoQuery({dids}: {dids: string[]}) {
-  const agent = useAgent()
+  const client = useAppviewClient()
   return useQuery({
     enabled: !!dids.length,
     queryKey: labelersInfoQueryKey(dids),
     queryFn: async () => {
-      const res = await agent.app.bsky.labeler.getServices({dids})
-      return res.data.views as AppBskyLabelerDefs.LabelerView[]
+      const res = await client.call(app.bsky.labeler.getServices, {
+        dids: dids as DidString[],
+      })
+      return res.views as app.bsky.labeler.defs.LabelerView[]
     },
   })
 }
 
 export function useLabelersDetailedInfoQuery({dids}: {dids: string[]}) {
-  const agent = useAgent()
+  const client = useAppviewClient()
   return useQuery({
     enabled: !!dids.length,
     queryKey: createLabelersDetailedInfoQueryKey(dids),
     gcTime: GCTIME.INFINITY,
     staleTime: STALE.MINUTES.ONE,
     queryFn: async () => {
-      const res = await agent.app.bsky.labeler.getServices({
-        dids,
+      const res = await client.call(app.bsky.labeler.getServices, {
+        dids: dids as DidString[],
         detailed: true,
       })
-      return res.data.views as AppBskyLabelerDefs.LabelerViewDetailed[]
+      return res.views as app.bsky.labeler.defs.LabelerViewDetailed[]
     },
   })
 }
@@ -98,7 +100,7 @@ export function useRemoveLabelersMutation() {
 
 export function useLabelerSubscriptionMutation() {
   const queryClient = useQueryClient()
-  const agent = useAgent()
+  const appviewClient = useAppviewClient()
   const pdsClient = usePdsClient()
   const preferences = usePreferencesQuery()
 
@@ -122,28 +124,30 @@ export function useLabelerSubscriptionMutation() {
       const labelerDids = (
         preferences.data?.moderationPrefs?.labelers ?? []
       ).map(l => l.did)
-      const invalidLabelers: string[] = []
+      const invalidLabelers: DidString[] = []
       if (labelerDids.length) {
-        const profiles = await agent.getProfiles({actors: labelerDids})
-        if (profiles.data) {
-          for (const did of labelerDids) {
-            const exists = profiles.data.profiles.find(p => p.did === did)
+        const profiles = await appviewClient.call(app.bsky.actor.getProfiles, {
+          actors: labelerDids,
+        })
+        if (profiles) {
+          for (const labelerDid of labelerDids) {
+            const exists = profiles.profiles.find(p => p.did === labelerDid)
             if (exists) {
               // profile came back but it's not a valid labeler
               if (exists.associated && !exists.associated.labeler) {
-                invalidLabelers.push(did)
+                invalidLabelers.push(labelerDid)
               }
             } else {
               // no response came back, might be deactivated or takendown
-              invalidLabelers.push(did)
+              invalidLabelers.push(labelerDid)
             }
           }
         }
       }
       if (invalidLabelers.length) {
         await Promise.all(
-          invalidLabelers.map(did =>
-            pdsClient.call(removeLabeler, did as DidString),
+          invalidLabelers.map(labelerDid =>
+            pdsClient.call(removeLabeler, labelerDid),
           ),
         )
       }
diff --git a/src/state/queries/notifications/feed.ts b/src/state/queries/notifications/feed.ts
index 51740e8d50..4dc23db47e 100644
--- a/src/state/queries/notifications/feed.ts
+++ b/src/state/queries/notifications/feed.ts
@@ -17,12 +17,7 @@
  */
 
 import {useCallback, useEffect, useMemo, useRef} from 'react'
-import {
-  AppBskyFeedDefs,
-  AppBskyFeedPost,
-  AtUri,
-  moderatePost,
-} from '@atproto/api'
+import {AppBskyFeedDefs, AppBskyFeedPost, AtUri} from '@atproto/api'
 import {
   type InfiniteData,
   type QueryClient,
@@ -31,6 +26,7 @@ import {
   useQueryClient,
 } from '@tanstack/react-query'
 
+import {moderatePost} from '#/lib/moderation/subjects'
 import {useModerationOpts} from '#/state/preferences/moderation-opts'
 import {STALE} from '#/state/queries'
 import {useAppviewClient} from '#/state/session'
diff --git a/src/state/queries/notifications/util.ts b/src/state/queries/notifications/util.ts
index 4606507700..929517d9fb 100644
--- a/src/state/queries/notifications/util.ts
+++ b/src/state/queries/notifications/util.ts
@@ -6,16 +6,15 @@ import {
   type AppBskyGraphDefs,
   AppBskyGraphStarterpack,
   type AppBskyNotificationListNotifications,
-  hasMutedWord,
-  moderateNotification,
-  type ModerationOpts,
 } from '@atproto/api'
 import {type Client} from '@atproto/lex'
 import {type AtUriString} from '@atproto/syntax'
+import {type ModerationOpts} from '@bsky.app/sdk/moderation'
 import {type QueryClient} from '@tanstack/react-query'
 import chunk from 'lodash.chunk'
 
 import {labelIsHideableOffense} from '#/lib/moderation'
+import {hasMutedWord, moderateNotification} from '#/lib/moderation/subjects'
 import {app} from '#/lexicons'
 import * as bsky from '#/types/bsky'
 import {precacheProfile} from '../profile'
diff --git a/src/state/queries/post-feed.ts b/src/state/queries/post-feed.ts
index 0d5b48acde..c3d5ada4d2 100644
--- a/src/state/queries/post-feed.ts
+++ b/src/state/queries/post-feed.ts
@@ -5,12 +5,13 @@ import {
   AppBskyFeedDefs,
   type AppBskyFeedPost,
   AtUri,
-  moderatePost,
-  type ModerationDecision,
-  type ModerationPrefs,
 } from '@atproto/api'
 import {type Client} from '@atproto/lex'
 import {type AtIdentifierString, type AtUriString} from '@atproto/syntax'
+import {
+  type ModerationDecision,
+  type ModerationPrefs,
+} from '@bsky.app/sdk/moderation'
 import {
   type InfiniteData,
   type QueryClient,
@@ -31,6 +32,7 @@ import {type FeedAPI, type ReasonFeedSource} from '#/lib/api/feed/types'
 import {aggregateUserInterests} from '#/lib/api/feed/utils'
 import {FeedTuner, type FeedTunerFn} from '#/lib/api/feed-manip'
 import {DISCOVER_FEED_URI} from '#/lib/constants'
+import {moderatePost} from '#/lib/moderation/subjects'
 import {logger} from '#/logger'
 import {STALE} from '#/state/queries'
 import {DEFAULT_LOGGED_OUT_PREFERENCES} from '#/state/queries/preferences/const'
diff --git a/src/state/queries/preferences/const.ts b/src/state/queries/preferences/const.ts
index 74c86d1020..81b50fffd0 100644
--- a/src/state/queries/preferences/const.ts
+++ b/src/state/queries/preferences/const.ts
@@ -1,4 +1,4 @@
-import {DEFAULT_LABEL_SETTINGS} from '@atproto/api'
+import {DEFAULT_LABEL_SETTINGS} from '@bsky.app/sdk/moderation'
 
 import {
   type ThreadViewPreferences,
diff --git a/src/state/queries/preferences/index.ts b/src/state/queries/preferences/index.ts
index 6358de738c..449458c075 100644
--- a/src/state/queries/preferences/index.ts
+++ b/src/state/queries/preferences/index.ts
@@ -40,7 +40,7 @@ import {
 } from '#/state/queries/preferences/types'
 import {createQueryKey} from '#/state/queries/util'
 import {useAgent, usePdsClient} from '#/state/session'
-import {saveLabelers} from '#/state/session/moderation'
+import {applyLabelersToClient, saveLabelers} from '#/state/session/moderation'
 import {useAgeAssurance} from '#/ageAssurance'
 import {makeAgeRestrictedModerationPrefs} from '#/ageAssurance/util'
 import {useAnalytics} from '#/analytics'
@@ -81,21 +81,23 @@ export function usePreferencesQuery() {
         /*
          * `BskyAgent.getPreferences` used to call `configureLabelers` itself,
          * so subscribing to a labeler took effect on the very next appview
-         * read. The sdk action has no such side effect, and appview reads still
-         * inherit `atproto-accept-labelers` from the agent's fetch handler, so
-         * apply the subscriptions there rather than on the wrapping client -
-         * setting them on both would emit the header twice.
+         * read. The sdk action has no such side effect, so apply the
+         * subscriptions here - without this, subscribing to or unsubscribing
+         * from a labeler would not affect server-attached labels until the
+         * session bundle was rebuilt.
+         *
+         * `applyLabelersToClient` writes to the agent, which is what stamps the
+         * header on the requests the wrapping appview client issues, and it
+         * drops the Bluesky moderation DID so the globally redacted authority is
+         * not also listed unredacted.
          */
-        agent.configureLabelers(labelerDids)
+        applyLabelersToClient(agent, labelerDids)
 
         /*
-         * The sdk's `BskyPreferences` is field-for-field identical to the
-         * legacy one that `UsePreferencesQueryResponse` is still derived from;
-         * only its strings are branded (`AtUriString`, `DidString`). Cast at
-         * this one seam so every downstream consumer of the response - notably
-         * the `moderationPrefs` readers - keeps its current types.
+         * `BskyPreferences` is now the sdk's own type, so the assembled
+         * response types structurally with no cast at this seam.
          */
-        const preferences = {
+        const preferences: UsePreferencesQueryResponse = {
           ...res,
           savedFeeds: res.savedFeeds.filter(f => f.type !== 'unknown'),
           /**
@@ -111,7 +113,7 @@ export function usePreferencesQuery() {
             ...(res.threadViewPrefs ?? {}),
           },
           userAge: res.birthDate ? getAge(res.birthDate) : undefined,
-        } as UsePreferencesQueryResponse
+        }
         return preferences
       }
     },
@@ -381,11 +383,8 @@ export function useUpsertMutedWordsMutation() {
   const client = usePdsClient()
 
   return useMutation({
-    mutationFn: async (mutedWords: AppBskyActorDefs.MutedWord[]) => {
-      await client.call(
-        upsertMutedWords,
-        mutedWords as app.bsky.actor.defs.MutedWord[],
-      )
+    mutationFn: async (mutedWords: app.bsky.actor.defs.MutedWord[]) => {
+      await client.call(upsertMutedWords, mutedWords)
       // triggers a refetch
       await queryClient.invalidateQueries({
         queryKey: preferencesQueryKey,
@@ -399,11 +398,8 @@ export function useUpdateMutedWordMutation() {
   const client = usePdsClient()
 
   return useMutation({
-    mutationFn: async (mutedWord: AppBskyActorDefs.MutedWord) => {
-      await client.call(
-        updateMutedWord,
-        mutedWord as app.bsky.actor.defs.MutedWord,
-      )
+    mutationFn: async (mutedWord: app.bsky.actor.defs.MutedWord) => {
+      await client.call(updateMutedWord, mutedWord)
       // triggers a refetch
       await queryClient.invalidateQueries({
         queryKey: preferencesQueryKey,
@@ -417,11 +413,8 @@ export function useRemoveMutedWordMutation() {
   const client = usePdsClient()
 
   return useMutation({
-    mutationFn: async (mutedWord: AppBskyActorDefs.MutedWord) => {
-      await client.call(
-        removeMutedWord,
-        mutedWord as app.bsky.actor.defs.MutedWord,
-      )
+    mutationFn: async (mutedWord: app.bsky.actor.defs.MutedWord) => {
+      await client.call(removeMutedWord, mutedWord)
       // triggers a refetch
       await queryClient.invalidateQueries({
         queryKey: preferencesQueryKey,
@@ -435,11 +428,8 @@ export function useRemoveMutedWordsMutation() {
   const client = usePdsClient()
 
   return useMutation({
-    mutationFn: async (mutedWords: AppBskyActorDefs.MutedWord[]) => {
-      await client.call(
-        removeMutedWords,
-        mutedWords as app.bsky.actor.defs.MutedWord[],
-      )
+    mutationFn: async (mutedWords: app.bsky.actor.defs.MutedWord[]) => {
+      await client.call(removeMutedWords, mutedWords)
       // triggers a refetch
       await queryClient.invalidateQueries({
         queryKey: preferencesQueryKey,
diff --git a/src/state/queries/preferences/moderation.ts b/src/state/queries/preferences/moderation.ts
index 55c155dc5b..246e7596b5 100644
--- a/src/state/queries/preferences/moderation.ts
+++ b/src/state/queries/preferences/moderation.ts
@@ -1,5 +1,6 @@
 import {useMemo} from 'react'
-import {AtpAgent, interpretLabelValueDefinitions} from '@atproto/api'
+import {AtpAgent} from '@atproto/api'
+import {interpretLabelValueDefinitions} from '@bsky.app/sdk/moderation'
 
 import {isNonConfigurableModerationAuthority} from '#/state/session/additional-moderation-authorities'
 import {useLabelersDetailedInfoQuery} from '../labeler'
diff --git a/src/state/queries/preferences/types.ts b/src/state/queries/preferences/types.ts
index ab0a957522..f93ca955a4 100644
--- a/src/state/queries/preferences/types.ts
+++ b/src/state/queries/preferences/types.ts
@@ -1,4 +1,4 @@
-import {type BskyFeedViewPreference, type BskyPreferences} from '@atproto/api'
+import {type BskyFeedViewPreference, type BskyPreferences} from '@bsky.app/sdk'
 
 export type UsePreferencesQueryResponse = Omit<
   BskyPreferences,
diff --git a/src/state/queries/profile-feedgens.ts b/src/state/queries/profile-feedgens.ts
index 7bdcd62b64..7a78c0a6c6 100644
--- a/src/state/queries/profile-feedgens.ts
+++ b/src/state/queries/profile-feedgens.ts
@@ -1,4 +1,3 @@
-import {moderateFeedGenerator} from '@atproto/api'
 import {type DidString} from '@atproto/syntax'
 import {
   type InfiniteData,
@@ -6,6 +5,7 @@ import {
   useInfiniteQuery,
 } from '@tanstack/react-query'
 
+import {moderateFeedGenerator} from '#/lib/moderation/subjects'
 import {useAppviewClient} from '#/state/session'
 import {app} from '#/lexicons'
 import {useModerationOpts} from '../preferences/moderation-opts'
diff --git a/src/state/queries/profile-lists.ts b/src/state/queries/profile-lists.ts
index 0237876513..3d795def0d 100644
--- a/src/state/queries/profile-lists.ts
+++ b/src/state/queries/profile-lists.ts
@@ -1,4 +1,3 @@
-import {moderateUserList} from '@atproto/api'
 import {type DidString} from '@atproto/syntax'
 import {
   type InfiniteData,
@@ -6,6 +5,7 @@ import {
   useInfiniteQuery,
 } from '@tanstack/react-query'
 
+import {moderateUserList} from '#/lib/moderation/subjects'
 import {useAppviewClient} from '#/state/session'
 import {app} from '#/lexicons'
 import {useModerationOpts} from '../preferences/moderation-opts'
diff --git a/src/state/queries/search-posts-v2.ts b/src/state/queries/search-posts-v2.ts
index 185212f8ef..9716383654 100644
--- a/src/state/queries/search-posts-v2.ts
+++ b/src/state/queries/search-posts-v2.ts
@@ -1,5 +1,5 @@
 import {useCallback, useMemo, useRef} from 'react'
-import {type AppBskyFeedDefs, AtUri, moderatePost} from '@atproto/api'
+import {type AppBskyFeedDefs, AtUri} from '@atproto/api'
 import {
   type InfiniteData,
   type QueryClient,
@@ -7,6 +7,7 @@ import {
   useInfiniteQuery,
 } from '@tanstack/react-query'
 
+import {moderatePost} from '#/lib/moderation/subjects'
 import {useModerationOpts} from '#/state/preferences/moderation-opts'
 import {useAppviewClient} from '#/state/session'
 import {type SearchFilters} from '#/screens/Search/searchParams'
diff --git a/src/state/queries/trending/useGetTrendsQuery.ts b/src/state/queries/trending/useGetTrendsQuery.ts
index 8fe0ad845e..5ba9b4d4b2 100644
--- a/src/state/queries/trending/useGetTrendsQuery.ts
+++ b/src/state/queries/trending/useGetTrendsQuery.ts
@@ -1,5 +1,5 @@
 import {useCallback, useMemo} from 'react'
-import {hasMutedWord} from '@atproto/api'
+import {hasMutedWord} from '@bsky.app/sdk/moderation'
 import {useQuery} from '@tanstack/react-query'
 
 import {
diff --git a/src/state/queries/usePostThread/traversal.ts b/src/state/queries/usePostThread/traversal.ts
index 81abd958fb..2aca5dfa96 100644
--- a/src/state/queries/usePostThread/traversal.ts
+++ b/src/state/queries/usePostThread/traversal.ts
@@ -1,4 +1,5 @@
-import {AppBskyUnspeccedDefs, type ModerationOpts} from '@atproto/api'
+import {AppBskyUnspeccedDefs} from '@atproto/api'
+import {type ModerationOpts} from '@bsky.app/sdk/moderation'
 
 import {
   type ApiThreadItem,
diff --git a/src/state/queries/usePostThread/types.ts b/src/state/queries/usePostThread/types.ts
index 295fd8bd3e..561490c328 100644
--- a/src/state/queries/usePostThread/types.ts
+++ b/src/state/queries/usePostThread/types.ts
@@ -5,8 +5,8 @@ import {
   type AppBskyUnspeccedDefs,
   type AppBskyUnspeccedGetPostThreadOtherV2,
   type AppBskyUnspeccedGetPostThreadV2,
-  type ModerationDecision,
 } from '@atproto/api'
+import {type ModerationDecision} from '@bsky.app/sdk/moderation'
 
 export type ApiThreadItem =
   | AppBskyUnspeccedGetPostThreadV2.ThreadItem
diff --git a/src/state/queries/usePostThread/views.ts b/src/state/queries/usePostThread/views.ts
index 4e7140eab0..af23ee2959 100644
--- a/src/state/queries/usePostThread/views.ts
+++ b/src/state/queries/usePostThread/views.ts
@@ -5,10 +5,10 @@ import {
   type AppBskyUnspeccedDefs,
   type AppBskyUnspeccedGetPostThreadV2,
   AtUri,
-  moderatePost,
-  type ModerationOpts,
 } from '@atproto/api'
+import {type ModerationOpts} from '@bsky.app/sdk/moderation'
 
+import {moderatePost} from '#/lib/moderation/subjects'
 import {makeProfileLink} from '#/lib/routes/links'
 import {
   type ApiThreadItem,
diff --git a/src/state/session/__tests__/clients-test.ts b/src/state/session/__tests__/clients-test.ts
index 452de11d9d..019281f784 100644
--- a/src/state/session/__tests__/clients-test.ts
+++ b/src/state/session/__tests__/clients-test.ts
@@ -15,6 +15,7 @@ jest.mock('jwt-decode', () => ({
 
 import {CHAT_PROXY_SERVICE} from '#/lib/constants'
 import {app, chat, com} from '#/lexicons'
+import {configureGlobalAppLabelers} from '../additional-moderation-authorities'
 import {BskyAppAgent, PasswordSessionManager} from '../bridge-agent'
 import {
   agentToAppviewClient,
@@ -163,6 +164,32 @@ describe('agentToAppviewClient', () => {
     expect(entries).toHaveLength(1)
   })
 
+  it('does not duplicate a global app labeler set on both statics', async () => {
+    /*
+     * `configureGlobalAppLabelers` populates the agent AND the lex `Client`
+     * static, because clients built without a wrapped agent read only the
+     * latter. On this path both producers are in play for the same request, and
+     * neither dedupes against the other - the agent joins its list with the
+     * existing header string while lex collects into a `Set` keyed on the
+     * `;redact`-suffixed value. The appview client suppresses its `appLabelers`
+     * so exactly one producer contributes.
+     */
+    configureGlobalAppLabelers(['did:plc:global-labeler'])
+    const {agent} = setup(fetchMock)
+
+    await agentToAppviewClient(agent).call(app.bsky.actor.getProfile, {
+      actor: HANDLE,
+    })
+
+    const init = initFor(fetchMock, 'app.bsky.actor.getProfile')
+    const labelers = new Headers(init?.headers).get('atproto-accept-labelers')
+    const entries = labelers!
+      .split(',')
+      .map(l => l.trim())
+      .filter(l => l.includes('did:plc:global-labeler'))
+    expect(entries).toEqual(['did:plc:global-labeler;redact'])
+  })
+
   it('sends the session access token', async () => {
     const {agent} = setup(fetchMock)
 
@@ -238,6 +265,8 @@ describe('agentToPdsClient', () => {
     const {agent} = setup(fetchMock)
     agent.configureProxy('did:web:api.bsky.app#bsky_appview')
     agent.configureLabelersHeader(['did:plc:labeler'])
+    /* nor the global authorities: a PDS call is not an appview read */
+    configureGlobalAppLabelers(['did:plc:global-labeler'])
 
     await agentToPdsClient(agent).call(com.atproto.server.getSession, {})
 
@@ -302,6 +331,8 @@ describe('agentToChatClient', () => {
   it('does not emit the agent labeler header', async () => {
     const {agent} = setup(fetchMock)
     agent.configureLabelersHeader(['did:plc:labeler'])
+    /* nor the global authorities: a chat call is not an appview read */
+    configureGlobalAppLabelers(['did:plc:global-labeler'])
 
     await agentToChatClient(agent)
       .call(chat.bsky.convo.listConvos, {})
diff --git a/src/state/session/__tests__/session-core-test.ts b/src/state/session/__tests__/session-core-test.ts
index 9dbc646c9f..52484dcf72 100644
--- a/src/state/session/__tests__/session-core-test.ts
+++ b/src/state/session/__tests__/session-core-test.ts
@@ -838,8 +838,8 @@ describe('factory account snapshot after preparation', () => {
      */
     let capturedAgent: BskyAppAgent | undefined
     mockConfigureModerationForAccount.mockImplementationOnce(
-      (agent: unknown) => {
-        capturedAgent = agent as BskyAppAgent
+      (bundle: unknown) => {
+        capturedAgent = (bundle as {agent: BskyAppAgent}).agent
       },
     )
     mockPrefetchAgeAssuranceServerData.mockImplementationOnce(async () => {
@@ -904,8 +904,8 @@ describe('a session destroyed or rejected during preparation', () => {
      */
     let capturedAgent: BskyAppAgent | undefined
     mockConfigureModerationForAccount.mockImplementationOnce(
-      (agent: unknown) => {
-        capturedAgent = agent as BskyAppAgent
+      (bundle: unknown) => {
+        capturedAgent = (bundle as {agent: BskyAppAgent}).agent
       },
     )
     mockPrefetchAgeAssuranceServerData.mockImplementationOnce(async () => {
@@ -934,8 +934,8 @@ describe('a session destroyed or rejected during preparation', () => {
   it('resume: a prep rejection propagates and disposes the bundle', async () => {
     let capturedAgent: BskyAppAgent | undefined
     mockConfigureModerationForAccount.mockImplementationOnce(
-      (agent: unknown) => {
-        capturedAgent = agent as BskyAppAgent
+      (bundle: unknown) => {
+        capturedAgent = (bundle as {agent: BskyAppAgent}).agent
       },
     )
     mockPrefetchAgeAssuranceServerData.mockImplementationOnce(() =>
diff --git a/src/state/session/additional-moderation-authorities.ts b/src/state/session/additional-moderation-authorities.ts
index 63ada2cdd8..3f3566c5c6 100644
--- a/src/state/session/additional-moderation-authorities.ts
+++ b/src/state/session/additional-moderation-authorities.ts
@@ -1,4 +1,5 @@
 import {AtpAgent} from '@atproto/api'
+import {Client} from '@atproto/lex'
 
 import {device} from '#/storage'
 
@@ -86,5 +87,23 @@ export function configureAdditionalModerationAuthorities() {
     new Set([...AtpAgent.appLabelers, ...additionalLabelers]),
   )
 
-  AtpAgent.configure({appLabelers})
+  configureGlobalAppLabelers(appLabelers)
+}
+
+/**
+ * Set the global app labelers on BOTH statics, so the agent-backed request path
+ * and any client built without a wrapped agent emit the same `;redact`
+ * authorities.
+ *
+ * Keeping the two in lockstep is what makes the duplicate-header hazard
+ * avoidable: the agent joins its own list with whatever the caller already put
+ * on the request, and lex appends the `Client` static on top of that, so a DID
+ * present in both would appear twice. The agent-wrapping clients therefore
+ * suppress their `appLabelers` (see `clients.ts`), which leaves exactly one
+ * producer per request while both statics stay populated for the paths that
+ * read only one of them.
+ */
+export function configureGlobalAppLabelers(dids: string[]) {
+  AtpAgent.configure({appLabelers: dids})
+  Client.configure({appLabelers: dids as `did:${string}:${string}`[]})
 }
diff --git a/src/state/session/clients.ts b/src/state/session/clients.ts
index 4daf5368b3..fab530aba2 100644
--- a/src/state/session/clients.ts
+++ b/src/state/session/clients.ts
@@ -31,18 +31,30 @@ const chatClients = new WeakMap<BskyAppAgent, Client>()
  * routing. Because the agent already emits both headers, the client is
  * deliberately built with neither a `service` option nor labelers - setting
  * either here would emit them a second time.
+ *
+ * `appLabelers: null` suppresses the class-wide `Client.appLabelers` for this
+ * instance specifically. The static is populated (see
+ * `configureGlobalAppLabelers`) so that clients built without a wrapped agent
+ * carry the global authorities, but the agent already stamped those same DIDs
+ * onto the request, and lex would append its own copy on top: the agent joins
+ * its list with the existing header value while lex collects into a `Set` keyed
+ * on the suffixed string, so neither dedupes against the other and every global
+ * authority would appear twice.
  */
 export function agentToAppviewClient(agent: BskyAppAgent): Client {
   const existing = appviewClients.get(agent)
   if (existing) {
     return existing
   }
-  const client = createLexClient({
-    get did() {
-      return agent.did
+  const client = createLexClient(
+    {
+      get did() {
+        return agent.did
+      },
+      fetchHandler: (path, init) => agent.fetchHandler(path, init),
     },
-    fetchHandler: (path, init) => agent.fetchHandler(path, init),
-  })
+    {appLabelers: null},
+  )
   appviewClients.set(agent, client)
   return client
 }
@@ -58,7 +70,10 @@ export function agentToAppviewClient(agent: BskyAppAgent): Client {
  * for `com.atproto.*` repo/server/identity calls.
  *
  * No `service` option for the same reason: adding one would reintroduce the
- * proxy header this client exists to avoid.
+ * proxy header this client exists to avoid. `appLabelers: null` is the same
+ * kind of suppression: a PDS request is not an appview read, so it must carry no
+ * moderation authorities at all - without this it would start emitting the
+ * global `Client.appLabelers`.
  *
  * The handler is wrapped in a closure rather than passed by reference because
  * `PasswordSessionManager.fetchHandler` reads `this`. Relative paths are
@@ -71,12 +86,16 @@ export function agentToPdsClient(agent: BskyAppAgent): Client {
   if (existing) {
     return existing
   }
-  const client = createLexClient({
-    get did() {
-      return agent.did
+  const client = createLexClient(
+    {
+      get did() {
+        return agent.did
+      },
+      fetchHandler: (path, init) =>
+        agent.sessionManager.fetchHandler(path, init),
     },
-    fetchHandler: (path, init) => agent.sessionManager.fetchHandler(path, init),
-  })
+    {appLabelers: null},
+  )
   pdsClients.set(agent, client)
   return client
 }
@@ -88,7 +107,8 @@ export function agentToPdsClient(agent: BskyAppAgent): Client {
  * and PDS routing, no agent-level proxy or labeler headers - but constructed
  * with {@link CHAT_PROXY_SERVICE} as its `service`, so lex-client emits
  * `atproto-proxy: <CHAT_PROXY_SERVICE>` on every request and `chat.bsky.*`
- * calls are proxied to the chat service.
+ * calls are proxied to the chat service. `appLabelers: null` for the same
+ * reason as the PDS client: the chat service takes no moderation authorities.
  */
 export function agentToChatClient(agent: BskyAppAgent): Client {
   const existing = chatClients.get(agent)
@@ -103,7 +123,7 @@ export function agentToChatClient(agent: BskyAppAgent): Client {
       fetchHandler: (path, init) =>
         agent.sessionManager.fetchHandler(path, init),
     },
-    {service: CHAT_PROXY_SERVICE},
+    {appLabelers: null, service: CHAT_PROXY_SERVICE},
   )
   chatClients.set(agent, client)
   return client
@@ -150,12 +170,14 @@ let publicLexClient: Client | undefined
  * {@link networkAwareFetch} so public reads feed the app's reachability signal
  * like authenticated ones do.
  *
- * Unlike the public agent it parallels, this client sends neither
- * `atproto-proxy` nor `atproto-accept-labelers`. `createPublicAgent` configures
- * the app labeler and the proxy header, so a logged-out appview *agent* read
- * does carry labelers while the same read through this client does not. A
- * consumer that needs moderation labels on public reads must configure labelers
- * itself before issuing the request.
+ * Unlike the agent-wrapping clients, this one does NOT suppress
+ * `Client.appLabelers`: there is no agent underneath to stamp the header, so the
+ * class-wide static is the only producer and a logged-out read carries the same
+ * `;redact` moderation authorities an authenticated one does.
+ *
+ * That makes `configureModerationForGuest()` load-bearing rather than
+ * test-only - it is what populates the static before this client's first
+ * request. `createPublicSessionBundle` runs it while building the bundle.
  */
 export function getPublicAppviewClient(): Client {
   return (publicLexClient ??= createLexClient({
diff --git a/src/state/session/create-account.ts b/src/state/session/create-account.ts
index 959df45b13..a14f50cff5 100644
--- a/src/state/session/create-account.ts
+++ b/src/state/session/create-account.ts
@@ -91,7 +91,7 @@ export async function createSessionBundleAndCreateAccount(
   accountDid = earlyAccount.did
 
   const gates = features.refresh({strategy: 'prefer-fresh-gates'})
-  configureModerationForAccount(bundle.agent, earlyAccount)
+  configureModerationForAccount(bundle, earlyAccount)
 
   const createdAt = toDatetimeString(new Date())
   const birthdate = birthDate.toISOString()
diff --git a/src/state/session/moderation.ts b/src/state/session/moderation.ts
index 2354fab4fa..b5b3a01af8 100644
--- a/src/state/session/moderation.ts
+++ b/src/state/session/moderation.ts
@@ -1,8 +1,12 @@
-import {AtpAgent, BSKY_LABELER_DID} from '@atproto/api'
+import {type AtpAgent, BSKY_LABELER_DID} from '@atproto/api'
+import {type Client} from '@atproto/lex'
 
 import {IS_TEST_USER} from '#/lib/constants'
 import {account as accountStorage} from '#/storage'
-import {configureAdditionalModerationAuthorities} from './additional-moderation-authorities'
+import {
+  configureAdditionalModerationAuthorities,
+  configureGlobalAppLabelers,
+} from './additional-moderation-authorities'
 import {type SessionAccount} from './types'
 
 /**
@@ -26,6 +30,29 @@ export function readLabelers(did: string): string[] | undefined {
   }
 }
 
+/**
+ * Apply an account's labeler subscriptions without duplicating the globally
+ * redacted Bluesky moderation authority.
+ *
+ * The Bluesky DID is filtered out because it already flows through the global
+ * `appLabelers`, which lex and the agent both emit with a `;redact` suffix.
+ * Listing it per-subscription would add a second, non-redacting entry for the
+ * same authority.
+ *
+ * Writes to the agent rather than the client: the agent-level fetch handler is
+ * what stamps `atproto-accept-labelers` on the requests the wrapping clients
+ * issue, so setting them here reaches every appview read. The bundle rework
+ * moves this to `appviewClient.setLabelers` once the agent is gone.
+ */
+export function applyLabelersToClient(
+  agent: AtpAgent,
+  subscribedDids: string[],
+) {
+  agent.configureLabelersHeader(
+    subscribedDids.filter(did => did !== BSKY_LABELER_DID),
+  )
+}
+
 export function configureModerationForGuest() {
   // This global mutation is *only* OK because this code is only relevant for testing.
   // Don't add any other global behavior here!
@@ -39,7 +66,7 @@ export function configureModerationForGuest() {
  * in the same tick, before any request goes out.
  */
 export function configureModerationForAccount(
-  agent: AtpAgent,
+  bundle: {agent: AtpAgent; appviewClient?: Client},
   account: SessionAccount,
 ) {
   // This global mutation is *only* OK because this code is only relevant for testing.
@@ -47,15 +74,13 @@ export function configureModerationForAccount(
   switchToBskyAppLabeler()
   if (IS_TEST_USER(account.handle)) {
     // Test accounts may briefly use the production authority while this resolves.
-    void trySwitchToTestAppLabeler(agent)
+    void trySwitchToTestAppLabeler(bundle.agent)
   }
 
   // The code below is actually relevant to production (and isn't global).
   const labelerDids = readLabelers(account.did)
   if (labelerDids) {
-    agent.configureLabelersHeader(
-      labelerDids.filter(did => did !== BSKY_LABELER_DID),
-    )
+    applyLabelersToClient(bundle.agent, labelerDids)
   } else {
     // If there are no headers in the storage, we'll not send them on the initial requests.
     // If we wanted to fix this, we could block on the preferences query here.
@@ -65,7 +90,7 @@ export function configureModerationForAccount(
 }
 
 function switchToBskyAppLabeler() {
-  AtpAgent.configure({appLabelers: [BSKY_LABELER_DID]})
+  configureGlobalAppLabelers([BSKY_LABELER_DID])
 }
 
 /** Resolve and install the test environment's moderation authority. */
@@ -77,6 +102,6 @@ async function trySwitchToTestAppLabeler(agent: AtpAgent) {
   )?.data.did
   if (did) {
     console.warn('USING TEST ENV MODERATION')
-    AtpAgent.configure({appLabelers: [did]})
+    configureGlobalAppLabelers([did])
   }
 }
diff --git a/src/state/session/session-core.ts b/src/state/session/session-core.ts
index 759e6afcfa..7a9d1a22cc 100644
--- a/src/state/session/session-core.ts
+++ b/src/state/session/session-core.ts
@@ -191,7 +191,9 @@ export type PublicSessionBundle = {
 
 /**
  * Build the logged-out bundle. `createPublicAgent` installs the guest
- * moderation authorities as part of building the agent.
+ * moderation authorities as part of building the agent, which is what populates
+ * the global `Client.appLabelers` that {@link getPublicAppviewClient} relies on
+ * for its labeler header.
  */
 export function createPublicSessionBundle(): PublicSessionBundle {
   return {
@@ -290,7 +292,7 @@ export async function createSessionBundleAndResume(
       storedAccount.pdsUrl,
     ) ?? storedAccount
 
-  configureModerationForAccount(bundle.agent, earlyAccount)
+  configureModerationForAccount(bundle, earlyAccount)
   const aa = prefetchAgeAssuranceServerData({
     appviewClient: agentToAppviewClient(bundle.agent),
     accountClient: agentToPdsClient(bundle.agent),
@@ -358,7 +360,7 @@ export async function createSessionBundleAndLogin(
   accountDid = earlyAccount.did
 
   const gates = features.refresh({strategy: 'prefer-fresh-gates'})
-  configureModerationForAccount(bundle.agent, earlyAccount)
+  configureModerationForAccount(bundle, earlyAccount)
   const aa = prefetchAgeAssuranceServerData({
     appviewClient: agentToAppviewClient(bundle.agent),
     accountClient: agentToPdsClient(bundle.agent),
@@ -400,7 +402,7 @@ export function createSessionBundleFromStoredAccount(
   )
   bundle = buildBundle(session, storedAccount.pdsUrl)
   registerBundleKillSwitch(bundle, hooks.kill)
-  configureModerationForAccount(bundle.agent, storedAccount)
+  configureModerationForAccount(bundle, storedAccount)
   bundle.agent.configureProxy(BLUESKY_PROXY_HEADER.get())
 
   const account = session.destroyed
diff --git a/src/state/shell/composer/index.tsx b/src/state/shell/composer/index.tsx
index 9a1e212f48..087a3b348a 100644
--- a/src/state/shell/composer/index.tsx
+++ b/src/state/shell/composer/index.tsx
@@ -3,8 +3,8 @@ import {
   type AppBskyActorDefs,
   type AppBskyFeedDefs,
   type AppBskyUnspeccedGetPostThreadV2,
-  type ModerationDecision,
 } from '@atproto/api'
+import {type ModerationDecision} from '@bsky.app/sdk/moderation'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {useQueryClient} from '@tanstack/react-query'
diff --git a/src/view/com/composer/text-input/web/Autocomplete.tsx b/src/view/com/composer/text-input/web/Autocomplete.tsx
index 8371ad993a..267d4a4829 100644
--- a/src/view/com/composer/text-input/web/Autocomplete.tsx
+++ b/src/view/com/composer/text-input/web/Autocomplete.tsx
@@ -1,6 +1,7 @@
 import {forwardRef, useEffect, useImperativeHandle, useState} from 'react'
 import {Pressable, View} from 'react-native'
-import {type AppBskyActorDefs, type ModerationOpts} from '@atproto/api'
+import {type AppBskyActorDefs} from '@atproto/api'
+import {type ModerationOpts} from '@bsky.app/sdk/moderation'
 import {Trans} from '@lingui/react/macro'
 import {ReactRenderer} from '@tiptap/react'
 import {
diff --git a/src/view/com/composer/threadgate/ThreadgateBtn.tsx b/src/view/com/composer/threadgate/ThreadgateBtn.tsx
index 2602b9bc45..9e730b48d8 100644
--- a/src/view/com/composer/threadgate/ThreadgateBtn.tsx
+++ b/src/view/com/composer/threadgate/ThreadgateBtn.tsx
@@ -90,14 +90,12 @@ export function ThreadgateBtn({
      * Preferences are still typed against the legacy client, so the stored
      * rules arrive unbranded. Wave B migrates `getPreferences`.
      */
-    allow: preferences?.postInteractionSettings
-      .threadgateAllowRules as app.bsky.feed.threadgate.Main['allow'],
+    allow: preferences?.postInteractionSettings.threadgateAllowRules,
   })
   const prefPostgate = createPostgateRecord({
     post: '',
-    embeddingRules: (preferences?.postInteractionSettings
-      ?.postgateEmbeddingRules ||
-      []) as app.bsky.feed.postgate.Main['embeddingRules'],
+    embeddingRules:
+      preferences?.postInteractionSettings?.postgateEmbeddingRules || [],
   })
 
   const isDirty = useMemo(() => {
diff --git a/src/view/com/notifications/NotificationFeedItem.tsx b/src/view/com/notifications/NotificationFeedItem.tsx
index 2afb3a0f43..a10e4b47ac 100644
--- a/src/view/com/notifications/NotificationFeedItem.tsx
+++ b/src/view/com/notifications/NotificationFeedItem.tsx
@@ -16,12 +16,13 @@ import {
   AppBskyGraphFollow,
   AppBskyGraphStarterpack,
   AtUri,
-  moderateProfile,
-  type ModerationDecision,
-  type ModerationOpts,
 } from '@atproto/api'
 import {TID} from '@atproto/common-web'
 import {type DidString} from '@atproto/syntax'
+import {
+  type ModerationDecision,
+  type ModerationOpts,
+} from '@bsky.app/sdk/moderation'
 import {plural} from '@lingui/core/macro'
 import {Plural, Trans, useLingui} from '@lingui/react/macro'
 import {useNavigation} from '@react-navigation/native'
@@ -29,6 +30,7 @@ import {useQueryClient} from '@tanstack/react-query'
 
 import {MAX_POST_LINES} from '#/lib/constants'
 import {useAnimatedValue} from '#/lib/hooks/useAnimatedValue'
+import {moderateProfile} from '#/lib/moderation/subjects'
 import {makeProfileLink} from '#/lib/routes/links'
 import {type NavigationProp} from '#/lib/routes/types'
 import {forceLTR} from '#/lib/strings/bidi'
diff --git a/src/view/com/post-thread/PostQuotes.tsx b/src/view/com/post-thread/PostQuotes.tsx
index b16281f9e0..0bad7969c0 100644
--- a/src/view/com/post-thread/PostQuotes.tsx
+++ b/src/view/com/post-thread/PostQuotes.tsx
@@ -1,15 +1,12 @@
 import {useCallback, useState} from 'react'
-import {
-  type AppBskyFeedDefs,
-  AppBskyFeedPost,
-  moderatePost,
-  type ModerationDecision,
-} from '@atproto/api'
+import {type AppBskyFeedDefs, AppBskyFeedPost} from '@atproto/api'
+import {type ModerationDecision} from '@bsky.app/sdk/moderation'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 
 import {useInitialNumToRender} from '#/lib/hooks/useInitialNumToRender'
 import {usePostViewTracking} from '#/lib/hooks/usePostViewTracking'
+import {moderatePost} from '#/lib/moderation/subjects'
 import {cleanError} from '#/lib/strings/errors'
 import {logger} from '#/logger'
 import {useModerationOpts} from '#/state/preferences/moderation-opts'
diff --git a/src/view/com/post/Post.tsx b/src/view/com/post/Post.tsx
index b67133df65..98f6cfb9a0 100644
--- a/src/view/com/post/Post.tsx
+++ b/src/view/com/post/Post.tsx
@@ -1,17 +1,13 @@
 import {useCallback, useMemo, useState} from 'react'
 import {type StyleProp, StyleSheet, View, type ViewStyle} from 'react-native'
-import {
-  type AppBskyFeedDefs,
-  AppBskyFeedPost,
-  AtUri,
-  moderatePost,
-  type ModerationDecision,
-} from '@atproto/api'
+import {type AppBskyFeedDefs, AppBskyFeedPost, AtUri} from '@atproto/api'
+import {type ModerationDecision} from '@bsky.app/sdk/moderation'
 import {RichText as RichTextAPI} from '@bsky.app/sdk/richtext'
 import {useQueryClient} from '@tanstack/react-query'
 
 import {MAX_POST_LINES} from '#/lib/constants'
 import {useOpenComposer} from '#/lib/hooks/useOpenComposer'
+import {moderatePost} from '#/lib/moderation/subjects'
 import {makeProfileLink} from '#/lib/routes/links'
 import {countLines} from '#/lib/strings/helpers'
 import {asSdkFacets} from '#/lib/strings/rich-text-helpers'
diff --git a/src/view/com/posts/PostFeedItem.tsx b/src/view/com/posts/PostFeedItem.tsx
index a95b41635b..aa3fd06976 100644
--- a/src/view/com/posts/PostFeedItem.tsx
+++ b/src/view/com/posts/PostFeedItem.tsx
@@ -6,8 +6,8 @@ import {
   AppBskyFeedPost,
   AppBskyFeedThreadgate,
   AtUri,
-  type ModerationDecision,
 } from '@atproto/api'
+import {type ModerationDecision} from '@bsky.app/sdk/moderation'
 import {RichText as RichTextAPI} from '@bsky.app/sdk/richtext'
 import {useQueryClient} from '@tanstack/react-query'
 
diff --git a/src/view/com/posts/PostFeedReason.tsx b/src/view/com/posts/PostFeedReason.tsx
index fd3ec73470..57ac3b825c 100644
--- a/src/view/com/posts/PostFeedReason.tsx
+++ b/src/view/com/posts/PostFeedReason.tsx
@@ -1,5 +1,6 @@
 import {StyleSheet, View} from 'react-native'
-import {AppBskyFeedDefs, type ModerationDecision} from '@atproto/api'
+import {AppBskyFeedDefs} from '@atproto/api'
+import {type ModerationDecision} from '@bsky.app/sdk/moderation'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
diff --git a/src/view/com/util/PostMeta.tsx b/src/view/com/util/PostMeta.tsx
index 29f3cf3fd8..f50e14b18f 100644
--- a/src/view/com/util/PostMeta.tsx
+++ b/src/view/com/util/PostMeta.tsx
@@ -1,6 +1,7 @@
 import {memo, useCallback} from 'react'
 import {type StyleProp, View, type ViewStyle} from 'react-native'
-import {type AppBskyActorDefs, type ModerationDecision} from '@atproto/api'
+import {type AppBskyActorDefs} from '@atproto/api'
+import {type ModerationDecision} from '@bsky.app/sdk/moderation'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {useQueryClient} from '@tanstack/react-query'
diff --git a/src/view/com/util/UserAvatar.tsx b/src/view/com/util/UserAvatar.tsx
index 98819bf8d6..06893524f3 100644
--- a/src/view/com/util/UserAvatar.tsx
+++ b/src/view/com/util/UserAvatar.tsx
@@ -11,7 +11,7 @@ import {
 } from 'react-native'
 import Svg, {Circle, Path, Rect} from 'react-native-svg'
 import {Image as ExpoImage} from 'expo-image'
-import {type ModerationUI} from '@atproto/api'
+import {type ModerationUI} from '@bsky.app/sdk/moderation'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
diff --git a/src/view/com/util/UserBanner.tsx b/src/view/com/util/UserBanner.tsx
index 964cc2ba57..b9d9604d64 100644
--- a/src/view/com/util/UserBanner.tsx
+++ b/src/view/com/util/UserBanner.tsx
@@ -1,7 +1,7 @@
 import {useCallback, useState} from 'react'
 import {Pressable, StyleSheet, View} from 'react-native'
 import {Image} from 'expo-image'
-import {type ModerationUI} from '@atproto/api'
+import {type ModerationUI} from '@bsky.app/sdk/moderation'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
diff --git a/src/view/screens/DebugMod.tsx b/src/view/screens/DebugMod.tsx
index d92043966c..ad0124eb49 100644
--- a/src/view/screens/DebugMod.tsx
+++ b/src/view/screens/DebugMod.tsx
@@ -6,20 +6,21 @@ import {
   type AppBskyFeedDefs,
   type AppBskyFeedPost,
   type ComAtprotoLabelDefs,
+  mock,
+} from '@atproto/api'
+import {
   interpretLabelValueDefinition,
   type LabelPreference,
   LABELS,
-  mock,
-  moderatePost,
-  moderateProfile,
   type ModerationBehavior,
   type ModerationDecision,
   type ModerationOpts,
-} from '@atproto/api'
+} from '@bsky.app/sdk/moderation'
 import {RichText} from '@bsky.app/sdk/richtext'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 
+import {moderatePost, moderateProfile} from '#/lib/moderation/subjects'
 import {useGlobalLabelStrings} from '#/lib/moderation/useGlobalLabelStrings'
 import {
   type CommonNavigatorParams,
@@ -242,9 +243,13 @@ export const DebugModScreen = ({}: NativeStackScreenProps<
     return item
   }, [profile, currentAccount])
 
-  const modOpts = useMemo(() => {
+  const modOpts = useMemo<ModerationOpts>(() => {
     return {
-      userDid: isLoggedOut ? '' : isTargetMe ? did : 'did:web:alice.test',
+      userDid: (isLoggedOut
+        ? ''
+        : isTargetMe
+          ? did
+          : 'did:web:alice.test') as ModerationOpts['userDid'],
       prefs: {
         adultContentEnabled: !noAdult,
         labels: {
diff --git a/src/view/screens/Profile.tsx b/src/view/screens/Profile.tsx
index c796bf9586..9c4db67b01 100644
--- a/src/view/screens/Profile.tsx
+++ b/src/view/screens/Profile.tsx
@@ -2,11 +2,8 @@ import {useCallback, useEffect, useMemo, useRef, useState} from 'react'
 import {StyleSheet} from 'react-native'
 import {SafeAreaView} from 'react-native-safe-area-context'
 import {ScrollForwarderView} from 'react-native-scroll-forwarder'
-import {
-  type AppBskyActorDefs,
-  moderateProfile,
-  type ModerationOpts,
-} from '@atproto/api'
+import {type AppBskyActorDefs} from '@atproto/api'
+import {type ModerationOpts} from '@bsky.app/sdk/moderation'
 import {RichText as RichTextAPI} from '@bsky.app/sdk/richtext'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
@@ -17,6 +14,7 @@ import {useQueryClient} from '@tanstack/react-query'
 import {useOpenComposer} from '#/lib/hooks/useOpenComposer'
 import {useRequireEmailVerification} from '#/lib/hooks/useRequireEmailVerification'
 import {useSetTitle} from '#/lib/hooks/useSetTitle'
+import {moderateProfile} from '#/lib/moderation/subjects'
 import {
   type CommonNavigatorParams,
   type NativeStackScreenProps,

From 54da80dfb0ef19ea5b26aa834669683843d55a16 Mon Sep 17 00:00:00 2001
From: Samuel Newman <mozzius@protonmail.com>
Date: Thu, 13 Aug 2026 22:26:22 +0300
Subject: [PATCH 25/32] [SDK] Delete the bridge agent and rework the session
 bundle onto lex clients (#11385)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
---
 src/ageAssurance/data.tsx                     |  16 +-
 src/lib/api/feed/custom.ts                    |  12 +-
 src/lib/api/index.ts                          |  64 +-
 src/lib/api/resolve.ts                        |  88 +--
 src/lib/constants.ts                          |  10 +-
 src/lib/moderation.ts                         |   8 +-
 .../Messages/components/MessagesList.tsx      |  14 +-
 .../components/ChangeHandleDialog.tsx         |   6 +-
 src/state/messages/convo/agent.ts             | 123 ++--
 src/state/messages/convo/index.tsx            |  16 +-
 src/state/messages/convo/types.ts             |   9 +-
 src/state/messages/events/agent.ts            |  37 +-
 src/state/messages/events/index.tsx           |  16 +-
 src/state/messages/events/types.ts            |   9 +-
 src/state/queries/handle.ts                   |  30 +-
 src/state/queries/post-feed.ts                |   6 +-
 src/state/queries/post.ts                     |  96 ++-
 src/state/queries/preferences/index.ts        |  14 +-
 src/state/queries/preferences/moderation.ts   |   4 +-
 src/state/queries/resolve-link.ts             |  38 +-
 .../session/__tests__/bridge-agent-test.ts    | 573 ------------------
 src/state/session/__tests__/clients-test.ts   | 371 ++++++------
 .../__tests__/provider-clients-test.tsx       |  32 +-
 .../provider-refresh-session-test.tsx         |  10 +-
 .../session/__tests__/session-core-test.ts    |  68 ++-
 .../additional-moderation-authorities.ts      |  25 +-
 src/state/session/agent.ts                    |  25 -
 src/state/session/bridge-agent.ts             | 442 --------------
 src/state/session/clients.ts                  | 211 +++----
 src/state/session/create-account.ts           |   8 +-
 src/state/session/index.tsx                   |  61 +-
 src/state/session/moderation.ts               |  46 +-
 src/state/session/session-core.ts             | 107 ++--
 src/state/session/session-data.ts             |  22 -
 src/view/com/composer/Composer.tsx            |  11 +-
 src/view/com/composer/drafts/state/api.ts     |  16 +-
 src/view/com/composer/drafts/state/queries.ts |   9 +-
 src/view/com/testing/TestCtrls.e2e.tsx        |  10 +-
 38 files changed, 812 insertions(+), 1851 deletions(-)
 delete mode 100644 src/state/session/__tests__/bridge-agent-test.ts
 delete mode 100644 src/state/session/agent.ts
 delete mode 100644 src/state/session/bridge-agent.ts

diff --git a/src/ageAssurance/data.tsx b/src/ageAssurance/data.tsx
index 2beac738c2..2540c4b1f9 100644
--- a/src/ageAssurance/data.tsx
+++ b/src/ageAssurance/data.tsx
@@ -4,7 +4,6 @@ import {
   type AppBskyAgeassuranceDefs,
   type AppBskyAgeassuranceGetConfig,
   type AppBskyAgeassuranceGetState,
-  AtpAgent,
   type ChatBskyActorDeclaration,
 } from '@atproto/api'
 import {type Client} from '@atproto/lex'
@@ -15,7 +14,6 @@ import {persistQueryClient} from '@tanstack/react-query-persist-client'
 import debounce from 'lodash.debounce'
 
 import {networkRetry} from '#/lib/async/retry'
-import {PUBLIC_BSKY_SERVICE} from '#/lib/constants'
 import {createPersistedQueryStorage} from '#/lib/persisted-query-storage'
 import {getAge} from '#/lib/strings/time'
 import {
@@ -24,6 +22,7 @@ import {
 } from '#/state/birthdate'
 import {fetchActorDeclarationRecord} from '#/state/queries/messages/actor-declaration'
 import {useAppviewClient, usePdsClient, useSession} from '#/state/session'
+import {getPublicAppviewClient} from '#/state/session/clients'
 import {DEVICE_SIGNALS_SUPPORTED} from '#/ageAssurance/const'
 import * as debug from '#/ageAssurance/debug'
 import {logger} from '#/ageAssurance/logger'
@@ -98,11 +97,14 @@ export function setBirthdateForDid({
 export const configQueryKey = ['config']
 export async function getConfig() {
   if (debug.enabled) return debug.resolve(debug.config)
-  const agent = new AtpAgent({
-    service: PUBLIC_BSKY_SERVICE,
-  })
-  const res = await agent.app.bsky.ageassurance.getConfig()
-  return res.data
+  /*
+   * An unauthenticated read against the public appview: the config is fetched
+   * before there is any session (and while logged out), so it goes through the
+   * process-wide public client rather than a bundle one.
+   */
+  return (await getPublicAppviewClient().call(
+    app.bsky.ageassurance.getConfig,
+  )) as AppBskyAgeassuranceGetConfig.OutputSchema
 }
 export function getConfigFromCache():
   | AppBskyAgeassuranceGetConfig.OutputSchema
diff --git a/src/lib/api/feed/custom.ts b/src/lib/api/feed/custom.ts
index 3b1ec3bec3..6d960813d3 100644
--- a/src/lib/api/feed/custom.ts
+++ b/src/lib/api/feed/custom.ts
@@ -1,5 +1,5 @@
-import {type AppBskyFeedDefs, AtpAgent, jsonStringToLex} from '@atproto/api'
-import {type Client, type XrpcRequestParams} from '@atproto/lex'
+import {type AppBskyFeedDefs, jsonStringToLex} from '@atproto/api'
+import {Client, type XrpcRequestParams} from '@atproto/lex'
 
 import {
   getAppLanguageAsContentLanguage,
@@ -115,12 +115,12 @@ async function loggedOutFetch({
 }): Promise<app.bsky.feed.getFeed.$OutputBody | null> {
   let contentLangs = getAppLanguageAsContentLanguage()
 
-  /**
-   * Copied from our root `Agent` class
-   * @see https://github.com/bluesky-social/atproto/blob/60df3fc652b00cdff71dd9235d98a7a4bb828f05/packages/api/src/agent.ts#L120
+  /*
+   * This request is hand-rolled rather than issued through a client, so it has
+   * to reproduce the header lex would have emitted from the global static.
    */
   const labelersHeader = {
-    'atproto-accept-labelers': AtpAgent.appLabelers
+    'atproto-accept-labelers': Client.appLabelers
       .map(l => `${l};redact`)
       .join(', '),
   }
diff --git a/src/lib/api/index.ts b/src/lib/api/index.ts
index f13c227857..e03a40c391 100644
--- a/src/lib/api/index.ts
+++ b/src/lib/api/index.ts
@@ -1,4 +1,4 @@
-import {type AtpAgent, ChatBskyGroupDefs} from '@atproto/api'
+import {ChatBskyGroupDefs} from '@atproto/api'
 import {TID} from '@atproto/common-web'
 import {type $Typed, type Client} from '@atproto/lex'
 import {
@@ -10,6 +10,7 @@ import {RichText} from '@bsky.app/sdk/richtext'
 import {t} from '@lingui/core/macro'
 import {type QueryClient} from '@tanstack/react-query'
 
+import {type LinkResolvers} from '#/lib/api/resolve'
 import {IMAGE_SIZE_CONFIG_POSTS} from '#/lib/constants'
 import {isNetworkError} from '#/lib/strings/errors'
 import {shortenLinks, stripInvalidMentions} from '#/lib/strings/rich-text-manip'
@@ -47,6 +48,11 @@ interface PostOpts {
    * fallback keeps facet detection working when logged out.
    */
   appviewClient: Client
+  /*
+   * A quoted chat invite link resolves its preview through the chat service, so
+   * the embed resolver needs the chat client alongside the appview one.
+   */
+  chatClient: Client
   /*
    * The repo write itself (applyWrites) plus every record blob (images,
    * gallery items, link thumbnails, video captions) goes to the account's own
@@ -55,15 +61,7 @@ interface PostOpts {
   pdsClient: Client
 }
 
-/**
- * The `agent` is only still here for the link/gif resolvers in `resolve.ts`,
- * which read through it; drop the parameter when those move to the clients.
- */
-export async function post(
-  agent: AtpAgent,
-  queryClient: QueryClient,
-  opts: PostOpts,
-) {
+export async function post(queryClient: QueryClient, opts: PostOpts) {
   const thread = opts.thread
   opts.onStateChange?.(t`Processing...`)
 
@@ -95,7 +93,8 @@ export async function post(
     // Not awaited to avoid waterfalls.
     const rtPromise = resolveRT(opts.appviewClient, draft.richtext)
     const embedPromise = resolveEmbed(
-      agent,
+      opts.appviewClient,
+      opts.chatClient,
       opts.pdsClient,
       queryClient,
       draft,
@@ -251,7 +250,8 @@ async function resolveReply(appviewClient: Client, replyTo: string) {
 }
 
 async function resolveEmbed(
-  agent: AtpAgent,
+  appviewClient: Client,
+  chatClient: Client,
   pdsClient: Client,
   queryClient: QueryClient,
   draft: PostDraft,
@@ -259,8 +259,19 @@ async function resolveEmbed(
 ): Promise<app.bsky.feed.post.Main['embed']> {
   if (draft.embed.quote) {
     const [resolvedMedia, resolvedQuote] = await Promise.all([
-      resolveMedia(agent, pdsClient, queryClient, draft.embed, onStateChange),
-      resolveRecord(agent, queryClient, draft.embed.quote.uri),
+      resolveMedia(
+        appviewClient,
+        chatClient,
+        pdsClient,
+        queryClient,
+        draft.embed,
+        onStateChange,
+      ),
+      resolveRecord(
+        {appviewClient, chatClient},
+        queryClient,
+        draft.embed.quote.uri,
+      ),
     ])
     if (resolvedMedia) {
       return {
@@ -278,7 +289,8 @@ async function resolveEmbed(
     }
   }
   const resolvedMedia = await resolveMedia(
-    agent,
+    appviewClient,
+    chatClient,
     pdsClient,
     queryClient,
     draft.embed,
@@ -290,7 +302,7 @@ async function resolveEmbed(
   if (draft.embed.link) {
     const resolvedLink = await fetchResolveLinkQuery(
       queryClient,
-      agent,
+      {appviewClient, chatClient},
       draft.embed.link.uri,
     )
     if (resolvedLink.type === 'record') {
@@ -309,7 +321,8 @@ async function resolveEmbed(
 }
 
 async function resolveMedia(
-  agent: AtpAgent,
+  appviewClient: Client,
+  chatClient: Client,
   pdsClient: Client,
   queryClient: QueryClient,
   embedDraft: EmbedDraft,
@@ -423,11 +436,7 @@ async function resolveMedia(
   }
   if (embedDraft.media?.type === 'gif') {
     const gifDraft = embedDraft.media
-    const resolvedGif = await fetchResolveGifQuery(
-      queryClient,
-      agent,
-      gifDraft.gif,
-    )
+    const resolvedGif = await fetchResolveGifQuery(queryClient, gifDraft.gif)
     let blob: app.bsky.embed.external.External['thumb']
     if (resolvedGif.thumb) {
       onStateChange?.(t`Uploading link thumbnail...`)
@@ -448,7 +457,7 @@ async function resolveMedia(
   if (embedDraft.link) {
     const resolvedLink = await fetchResolveLinkQuery(
       queryClient,
-      agent,
+      {appviewClient, chatClient},
       embedDraft.link.uri,
     )
     if (resolvedLink.type === 'external') {
@@ -490,15 +499,16 @@ async function resolveMedia(
 }
 
 /*
- * `resolve.ts` still resolves through the agent and returns legacy-typed refs;
- * assert at the boundary until it moves to the clients.
+ * `resolve.ts` still returns legacy-typed views, so its strong refs carry plain
+ * strings where the record write wants the branded syntax types; assert at the
+ * boundary until those views come from the generated lexicons.
  */
 async function resolveRecord(
-  agent: AtpAgent,
+  clients: LinkResolvers,
   queryClient: QueryClient,
   uri: string,
 ): Promise<com.atproto.repo.strongRef.Main> {
-  const resolvedLink = await fetchResolveLinkQuery(queryClient, agent, uri)
+  const resolvedLink = await fetchResolveLinkQuery(queryClient, clients, uri)
   if (resolvedLink.type !== 'record') {
     throw Error(t`Expected uri to resolve to a record`)
   }
diff --git a/src/lib/api/resolve.ts b/src/lib/api/resolve.ts
index 67bc46284a..297388edb0 100644
--- a/src/lib/api/resolve.ts
+++ b/src/lib/api/resolve.ts
@@ -1,12 +1,13 @@
 import {
   type AppBskyFeedDefs,
   type AppBskyGraphDefs,
-  type AtpAgent,
   type ComAtprotoRepoStrongRef,
 } from '@atproto/api'
 import {AtUri} from '@atproto/api'
+import {type Client} from '@atproto/lex'
+import {type AtUriString, type HandleString} from '@atproto/syntax'
 
-import {DM_SERVICE_HEADERS, IMAGE_SIZE_CONFIG_2K_1MB} from '#/lib/constants'
+import {IMAGE_SIZE_CONFIG_2K_1MB} from '#/lib/constants'
 import {getLinkMeta, type LinkMeta} from '#/lib/link-meta/link-meta'
 import {resolveShortLink} from '#/lib/link-meta/resolve-short-link'
 import {downloadAndResize} from '#/lib/media/manip'
@@ -29,6 +30,7 @@ import {type ComposerImage} from '#/state/gallery'
 import {createComposerImage} from '#/state/gallery'
 import {type ChatInvitePreview} from '#/state/queries/join-links'
 import {type Gif} from '#/features/gifPicker/types'
+import {app, chat, com} from '#/lexicons'
 import {createGIFDescription} from '../gif-alt-text'
 
 type ResolvedExternalLink = {
@@ -94,8 +96,21 @@ export class EmbeddingDisabledError extends Error {
   }
 }
 
+/**
+ * The clients a link resolution may need.
+ *
+ * Everything but the chat-invite branch is an appview read, and the chat invite
+ * preview goes through the chat client so it is proxied to the chat service.
+ * Both are passed together because the caller cannot know which branch a URL
+ * will take until it is parsed.
+ */
+export type LinkResolvers = {
+  appviewClient: Client
+  chatClient: Client
+}
+
 export async function resolveLink(
-  agent: AtpAgent,
+  {appviewClient, chatClient}: LinkResolvers,
   uri: string,
 ): Promise<ResolvedLink> {
   if (isShortLink(uri)) {
@@ -124,15 +139,17 @@ export async function resolveLink(
     const [_0, handleOrDid, _1, rkey] = uri.split('/').filter(Boolean)
     const did = await fetchDid(handleOrDid)
     const feed = makeRecordUri(did, 'app.bsky.feed.generator', rkey)
-    const res = await agent.app.bsky.feed.getFeedGenerator({feed})
+    const data = await appviewClient.call(app.bsky.feed.getFeedGenerator, {
+      feed: feed,
+    })
     return {
       type: 'record',
       record: {
-        uri: res.data.view.uri,
-        cid: res.data.view.cid,
+        uri: data.view.uri,
+        cid: data.view.cid,
       },
       kind: 'feed',
-      view: res.data.view,
+      view: data.view,
     }
   }
   if (isBskyListUrl(uri)) {
@@ -140,28 +157,29 @@ export async function resolveLink(
     const [_0, handleOrDid, _1, rkey] = uri.split('/').filter(Boolean)
     const did = await fetchDid(handleOrDid)
     const list = makeRecordUri(did, 'app.bsky.graph.list', rkey)
-    const res = await agent.app.bsky.graph.getList({list})
+    const data = await appviewClient.call(app.bsky.graph.getList, {
+      list: list,
+    })
     return {
       type: 'record',
       record: {
-        uri: res.data.list.uri,
-        cid: res.data.list.cid,
+        uri: data.list.uri,
+        cid: data.list.cid,
       },
       kind: 'list',
-      view: res.data.list,
+      view: data.list,
     }
   }
   const chatInviteCode = getChatInviteCodeFromUrl(uri)
   if (chatInviteCode) {
-    const res = await agent.chat.bsky.group.getJoinLinkPreviews(
-      {codes: [chatInviteCode]},
-      {headers: DM_SERVICE_HEADERS},
-    )
+    const data = await chatClient.call(chat.bsky.group.getJoinLinkPreviews, {
+      codes: [chatInviteCode],
+    })
     return {
       type: 'chat-invite',
       uri,
       code: chatInviteCode,
-      view: res.data.joinLinkPreviews[0],
+      view: data.joinLinkPreviews[0],
     }
   }
   if (isBskyStartUrl(uri) || isBskyStarterPackUrl(uri)) {
@@ -173,15 +191,17 @@ export async function resolveLink(
     }
     const did = await fetchDid(parsed.name)
     const starterPack = createStarterPackUri({did, rkey: parsed.rkey})
-    const res = await agent.app.bsky.graph.getStarterPack({starterPack})
+    const data = await appviewClient.call(app.bsky.graph.getStarterPack, {
+      starterPack: starterPack as AtUriString,
+    })
     return {
       type: 'record',
       record: {
-        uri: res.data.starterPack.uri,
-        cid: res.data.starterPack.cid,
+        uri: data.starterPack.uri,
+        cid: data.starterPack.cid,
       },
       kind: 'starter-pack',
-      view: res.data.starterPack,
+      view: data.starterPack,
     }
   }
   return resolveExternal(uri)
@@ -190,17 +210,17 @@ export async function resolveLink(
   async function getPost({uri}: {uri: string}) {
     const urip = new AtUri(uri)
     if (!urip.host.startsWith('did:')) {
-      const res = await agent.resolveHandle({
-        handle: urip.host,
-      })
-      // @ts-expect-error TODO new-sdk-migration
-      urip.host = res.data.did
+      const data = await appviewClient.call(
+        com.atproto.identity.resolveHandle,
+        {handle: urip.host as HandleString},
+      )
+      urip.host = data.did
     }
-    const res = await agent.getPosts({
+    const data = await appviewClient.call(app.bsky.feed.getPosts, {
       uris: [urip.toString()],
     })
-    if (res.success && res.data.posts[0]) {
-      return res.data.posts[0]
+    if (data.posts[0]) {
+      return data.posts[0]
     }
     throw new Error('getPost: post not found')
   }
@@ -209,17 +229,17 @@ export async function resolveLink(
   async function fetchDid(handleOrDid: string) {
     let identifier = handleOrDid
     if (!identifier.startsWith('did:')) {
-      const res = await agent.resolveHandle({handle: identifier})
-      identifier = res.data.did
+      const data = await appviewClient.call(
+        com.atproto.identity.resolveHandle,
+        {handle: identifier as HandleString},
+      )
+      identifier = data.did
     }
     return identifier
   }
 }
 
-export async function resolveGif(
-  agent: AtpAgent,
-  gif: Gif,
-): Promise<ResolvedExternalLink> {
+export async function resolveGif(gif: Gif): Promise<ResolvedExternalLink> {
   const gifUrl = gif.media_formats.gif.url
   const params = new URLSearchParams()
   params.set('hh', String(gif.media_formats.gif.dims[1]))
diff --git a/src/lib/constants.ts b/src/lib/constants.ts
index 9fd7d12b47..a490d92719 100644
--- a/src/lib/constants.ts
+++ b/src/lib/constants.ts
@@ -2,7 +2,6 @@ import {type Insets, Platform} from 'react-native'
 import {type AppBskyActorDefs, BSKY_LABELER_DID} from '@atproto/api'
 import {type Service} from '@atproto/lex'
 
-import {type ProxyHeaderValue} from '#/state/session/agent'
 import {BLUESKY_PROXY_DID, CHAT_PROXY_DID, IS_DEV} from '#/env'
 
 export const LOCAL_DEV_SERVICE =
@@ -241,7 +240,7 @@ export const DEV_ENV_APPVIEW_DID = `did:plc:dw4kbjf5mn7nhenabiqpkyh3` // always
 export const BLUESKY_PROXY_HEADER = {
   value: `${BLUESKY_PROXY_DID}#bsky_appview`,
   get() {
-    return this.value as ProxyHeaderValue
+    return this.value as Service
   },
   set(value: string) {
     this.value = value
@@ -257,9 +256,6 @@ export const BLUESKY_PROXY_HEADER = {
  * The DID comes from the env-configurable `CHAT_PROXY_DID` (via
  * `EXPO_PUBLIC_CHAT_PROXY_DID`) rather than a hard-coded constant, so the
  * target can be retargeted per environment.
- *
- * This is the client-level equivalent of {@link DM_SERVICE_HEADERS}, which
- * carries the same value as a per-call header.
  */
 export const CHAT_PROXY_SERVICE: Service = `${CHAT_PROXY_DID}#bsky_chat`
 
@@ -275,10 +271,6 @@ export const CHAT_PROXY_SERVICE: Service = `${CHAT_PROXY_DID}#bsky_chat`
  */
 export const MOD_PROXY_SERVICE: Service = `${BSKY_LABELER_DID}#atproto_labeler`
 
-export const DM_SERVICE_HEADERS = {
-  'atproto-proxy': `${CHAT_PROXY_DID}#bsky_chat`,
-}
-
 /**
  * The notification service's proxy target, in the `did#service_id` form a lex
  * client's per-call `service` option takes. Passing it emits `atproto-proxy:
diff --git a/src/lib/moderation.ts b/src/lib/moderation.ts
index 68b424347b..b2d4c194e0 100644
--- a/src/lib/moderation.ts
+++ b/src/lib/moderation.ts
@@ -1,5 +1,7 @@
 import {useMemo} from 'react'
-import {AtpAgent, type ComAtprotoLabelDefs} from '@atproto/api'
+import {type ComAtprotoLabelDefs} from '@atproto/api'
+import {Client} from '@atproto/lex'
+import {type DidString} from '@atproto/syntax'
 import {
   type InterpretedLabelValueDefinition,
   LABELS,
@@ -105,9 +107,9 @@ export function isAppLabeler(
     | app.bsky.labeler.defs.LabelerViewDetailed,
 ): boolean {
   if (typeof labeler === 'string') {
-    return AtpAgent.appLabelers.includes(labeler)
+    return Client.appLabelers.includes(labeler as DidString)
   }
-  return AtpAgent.appLabelers.includes(labeler.creator.did)
+  return Client.appLabelers.includes(labeler.creator.did)
 }
 
 export function isLabelerSubscribed(
diff --git a/src/screens/Messages/components/MessagesList.tsx b/src/screens/Messages/components/MessagesList.tsx
index e9d336a67a..eab025665c 100644
--- a/src/screens/Messages/components/MessagesList.tsx
+++ b/src/screens/Messages/components/MessagesList.tsx
@@ -70,7 +70,7 @@ import {Loader} from '#/components/Loader'
 import {Text} from '#/components/Typography'
 import {useAnalytics} from '#/analytics'
 import {IS_ANDROID, IS_NATIVE, IS_WEB} from '#/env'
-import {app} from '#/lexicons'
+import {app, type chat, type com} from '#/lexicons'
 import * as bsky from '#/types/bsky'
 import {ChatStatusInfo} from './ChatStatusInfo'
 import {groupSystemMessages, type RenderItem} from './groupSystemMessages'
@@ -537,10 +537,7 @@ export function MessagesList({
        */
       rt.detectFacetsWithoutResolution()
 
-      let embed:
-        | $Typed<AppBskyEmbedRecord.Main>
-        | $Typed<ChatBskyEmbedJoinLink.Main>
-        | undefined
+      let embed: chat.bsky.convo.defs.MessageInput['embed']
       let embedView:
         | $Typed<AppBskyEmbedRecord.View>
         | $Typed<ChatBskyEmbedJoinLink.View>
@@ -576,10 +573,15 @@ export function MessagesList({
           if (post) {
             embed = {
               $type: 'app.bsky.embed.record',
+              /*
+               * `getPost` still returns an `@atproto/api` view, whose `uri` and
+               * `cid` are plain strings rather than the branded syntax types
+               * the lexicon input declares.
+               */
               record: {
                 uri: post.uri,
                 cid: post.cid,
-              },
+              } as com.atproto.repo.strongRef.Main,
             }
 
             embedView = {
diff --git a/src/screens/Settings/components/ChangeHandleDialog.tsx b/src/screens/Settings/components/ChangeHandleDialog.tsx
index a8c9474410..8cff915390 100644
--- a/src/screens/Settings/components/ChangeHandleDialog.tsx
+++ b/src/screens/Settings/components/ChangeHandleDialog.tsx
@@ -27,7 +27,7 @@ import {useFetchDid, useUpdateHandleMutation} from '#/state/queries/handle'
 import {RQKEY as RQKEY_PROFILE} from '#/state/queries/profile'
 import {useServiceQuery} from '#/state/queries/service'
 import {useCurrentAccountProfile} from '#/state/queries/useCurrentAccountProfile'
-import {useAgent, useSession, useSessionApi} from '#/state/session'
+import {useSession, useSessionApi} from '#/state/session'
 import {ErrorScreen} from '#/view/com/util/error/ErrorScreen'
 import {atoms as a, native, useBreakpoints, useTheme} from '#/alf'
 import {Admonition} from '#/components/Admonition'
@@ -63,12 +63,12 @@ export function ChangeHandleDialog({
 function ChangeHandleDialogInner() {
   const control = Dialog.useDialogContext()
   const {_} = useLingui()
-  const agent = useAgent()
+  const {currentAccount} = useSession()
   const {
     data: serviceInfo,
     error: serviceInfoError,
     refetch,
-  } = useServiceQuery(agent.serviceUrl.toString())
+  } = useServiceQuery(currentAccount?.service ?? '')
 
   const [page, setPage] = useState<'provided-handle' | 'own-handle'>(
     'provided-handle',
diff --git a/src/state/messages/convo/agent.ts b/src/state/messages/convo/agent.ts
index b1dc348e79..521e7f77ea 100644
--- a/src/state/messages/convo/agent.ts
+++ b/src/state/messages/convo/agent.ts
@@ -1,20 +1,17 @@
 import {
   type $Typed,
   type AppBskyEmbedRecord,
-  type AtpAgent,
   type ChatBskyActorDefs,
   ChatBskyConvoDefs,
   type ChatBskyConvoGetLog,
-  type ChatBskyConvoSendMessage,
   type ChatBskyEmbedJoinLink,
   type ChatBskyGroupDefs,
 } from '@atproto/api'
-import {XRPCError} from '@atproto/api'
+import {type Client, XrpcResponseError} from '@atproto/lex'
 import {EventEmitter} from 'eventemitter3'
 import {nanoid} from 'nanoid/non-secure'
 
 import {networkRetry} from '#/lib/async/retry'
-import {DM_SERVICE_HEADERS} from '#/lib/constants'
 import {
   isErrorMaybeAppPasswordPermissions,
   isNetworkError,
@@ -52,6 +49,7 @@ import {
   parseConvoView,
 } from '#/components/dms/util'
 import {IS_NATIVE} from '#/env'
+import {chat} from '#/lexicons'
 
 const logger = Logger.create(Logger.Context.ConversationAgent)
 
@@ -105,7 +103,7 @@ function toDeletedMessageView(
 export class Convo {
   private id: string
 
-  private agent: AtpAgent
+  private chatClient: Client
   private events: MessagesEventBus
   private senderUserDid: string
 
@@ -131,7 +129,7 @@ export class Convo {
     string,
     {
       id: string
-      message: ChatBskyConvoSendMessage.InputSchema['message']
+      message: chat.bsky.convo.defs.MessageInput
       optimisticEmbedView?:
         | $Typed<AppBskyEmbedRecord.View>
         | $Typed<ChatBskyEmbedJoinLink.View>
@@ -166,9 +164,9 @@ export class Convo {
   constructor(params: ConvoParams) {
     this.id = nanoid(3)
     this.convoId = params.convoId
-    this.agent = params.agent
+    this.chatClient = params.chatClient
     this.events = params.events
-    this.senderUserDid = params.agent.assertDid
+    this.senderUserDid = params.chatClient.assertDid
 
     if (params.placeholderData) {
       this.setupPlaceholderData(params.placeholderData)
@@ -197,6 +195,15 @@ export class Convo {
     this.subscribers.forEach(subscriber => subscriber())
   }
 
+  /**
+   * Point the convo at a new chat client, for when the session bundle is
+   * replaced underneath it. Conversation state is unaffected: the same account
+   * is being served over a fresh session.
+   */
+  updateClient(chatClient: Client) {
+    this.chatClient = chatClient
+  }
+
   private subscribers: (() => void)[] = []
 
   subscribe(subscriber: () => void) {
@@ -720,13 +727,12 @@ export class Convo {
     this.pendingFetchConvo = (async () => {
       try {
         const response = await networkRetry(2, () => {
-          return this.agent.chat.bsky.convo.getConvo(
-            {convoId: this.convoId},
-            {headers: DM_SERVICE_HEADERS},
-          )
+          return this.chatClient.call(chat.bsky.convo.getConvo, {
+            convoId: this.convoId,
+          })
         })
 
-        const convo = response.data.convo
+        const convo = response.convo
 
         return {
           convo,
@@ -763,18 +769,15 @@ export class Convo {
     let cursor: string | undefined
     do {
       const result = await networkRetry(2, () => {
-        return this.agent.chat.bsky.convo.getConvoMembers(
-          {
-            convoId: this.convoId,
-            limit: 50,
-            cursor,
-          },
-          {headers: DM_SERVICE_HEADERS},
-        )
+        return this.chatClient.call(chat.bsky.convo.getConvoMembers, {
+          convoId: this.convoId,
+          limit: 50,
+          cursor,
+        })
       })
-      cursor = result.data.cursor
+      cursor = result.cursor
 
-      for (const member of result.data.members) {
+      for (const member of result.members) {
         this.relatedProfiles.set(member.did, member)
       }
     } while (cursor)
@@ -808,16 +811,13 @@ export class Convo {
 
       const nextCursor = this.oldestRev // for TS
       const response = await networkRetry(2, () => {
-        return this.agent.chat.bsky.convo.getMessages(
-          {
-            cursor: nextCursor,
-            convoId: this.convoId,
-            limit: IS_NATIVE ? 30 : 60,
-          },
-          {headers: DM_SERVICE_HEADERS},
-        )
+        return this.chatClient.call(chat.bsky.convo.getMessages, {
+          cursor: nextCursor,
+          convoId: this.convoId,
+          limit: IS_NATIVE ? 30 : 60,
+        })
       })
-      const {cursor, messages, relatedProfiles} = response.data
+      const {cursor, messages, relatedProfiles} = response
 
       // Trust the cursor for pagination. We can't infer "no more pages" from a
       // short page: the server pages by raw rows but strips deleted messages
@@ -1031,7 +1031,7 @@ export class Convo {
   private pendingMessageFailure: 'recoverable' | 'unrecoverable' | null = null
 
   sendMessage(
-    message: ChatBskyConvoSendMessage.InputSchema['message'],
+    message: chat.bsky.convo.defs.MessageInput,
     optimisticEmbedView?:
       | $Typed<AppBskyEmbedRecord.View>
       | $Typed<ChatBskyEmbedJoinLink.View>,
@@ -1165,14 +1165,10 @@ export class Convo {
 
       const {id, message} = pendingMessage
 
-      const response = await this.agent.chat.bsky.convo.sendMessage(
-        {
-          convoId: this.convoId,
-          message,
-        },
-        {encoding: 'application/json', headers: DM_SERVICE_HEADERS},
-      )
-      const res = response.data
+      const res = await this.chatClient.call(chat.bsky.convo.sendMessage, {
+        convoId: this.convoId,
+        message,
+      })
 
       // remove from queue
       this.pendingMessages.delete(id)
@@ -1197,8 +1193,15 @@ export class Convo {
     }
   }
 
-  private handleSendMessageFailure(e: Error | XRPCError) {
-    if (e instanceof XRPCError) {
+  /*
+   * The lex client throws `XrpcResponseError`, not `@atproto/api`'s
+   * `XRPCError`, so the status/message branch narrows on the lex class. Only
+   * a genuine server response carries a status: transport and internal lex
+   * failures are `XrpcInternalError`s and fall through to the generic arm,
+   * where `isNetworkError` keeps them out of the logs.
+   */
+  private handleSendMessageFailure(e: Error | XrpcResponseError) {
+    if (e instanceof XrpcResponseError) {
       if (NETWORK_FAILURE_STATUSES.includes(e.status)) {
         this.pendingMessageFailure = 'recoverable'
       } else {
@@ -1261,16 +1264,15 @@ export class Convo {
     )
 
     try {
-      const {data} = await this.agent.chat.bsky.convo.sendMessageBatch(
+      const {items} = await this.chatClient.call(
+        chat.bsky.convo.sendMessageBatch,
         {
           items: messageArray.map(({message}) => ({
             convoId: this.convoId,
             message,
           })),
         },
-        {encoding: 'application/json', headers: DM_SERVICE_HEADERS},
       )
-      const {items} = data
 
       /*
        * Insert into `newMessages` as soon as we have a real ID. That way, when
@@ -1304,13 +1306,10 @@ export class Convo {
 
     try {
       await networkRetry(2, () => {
-        return this.agent.chat.bsky.convo.deleteMessageForSelf(
-          {
-            convoId: this.convoId,
-            messageId,
-          },
-          {encoding: 'application/json', headers: DM_SERVICE_HEADERS},
-        )
+        return this.chatClient.call(chat.bsky.convo.deleteMessageForSelf, {
+          convoId: this.convoId,
+          messageId,
+        })
       })
     } catch (err) {
       const e = err as Error
@@ -1529,10 +1528,11 @@ export class Convo {
 
     try {
       logger.debug(`Adding reaction ${emoji} to message ${messageId}`)
-      const {data} = await this.agent.chat.bsky.convo.addReaction(
-        {messageId, value: emoji, convoId: this.convoId},
-        {encoding: 'application/json', headers: DM_SERVICE_HEADERS},
-      )
+      const data = await this.chatClient.call(chat.bsky.convo.addReaction, {
+        messageId,
+        value: emoji,
+        convoId: this.convoId,
+      })
       if (ChatBskyConvoDefs.isMessageView(data.message)) {
         if (this.pastMessages.has(messageId)) {
           this.pastMessages.set(messageId, data.message)
@@ -1594,10 +1594,11 @@ export class Convo {
 
     try {
       logger.debug(`Removing reaction ${emoji} from message ${messageId}`)
-      await this.agent.chat.bsky.convo.removeReaction(
-        {messageId, value: emoji, convoId: this.convoId},
-        {encoding: 'application/json', headers: DM_SERVICE_HEADERS},
-      )
+      await this.chatClient.call(chat.bsky.convo.removeReaction, {
+        messageId,
+        value: emoji,
+        convoId: this.convoId,
+      })
     } catch (error) {
       if (restore) restore()
       throw error
diff --git a/src/state/messages/convo/index.tsx b/src/state/messages/convo/index.tsx
index 69ad1e237c..b37b060701 100644
--- a/src/state/messages/convo/index.tsx
+++ b/src/state/messages/convo/index.tsx
@@ -28,7 +28,7 @@ import {
 } from '#/state/queries/messages/conversation'
 import {RQKEY_ROOT as ListConvosQueryKeyRoot} from '#/state/queries/messages/list-conversations'
 import {RQKEY as createProfileQueryKey} from '#/state/queries/profile'
-import {useAgent} from '#/state/session'
+import {useChatClient} from '#/state/session'
 import {type GroupConvoMember} from '#/components/dms/util'
 
 export * from '#/state/messages/convo/util'
@@ -80,7 +80,7 @@ export function ConvoProvider({
   convoId,
 }: Pick<ConvoParams, 'convoId'> & {children: React.ReactNode}) {
   const queryClient = useQueryClient()
-  const agent = useAgent()
+  const chatClient = useChatClient()
   const events = useMessagesEventBus()
   const [convo] = useState(() => {
     const placeholder = queryClient.getQueryData<ChatBskyConvoDefs.ConvoView>(
@@ -88,7 +88,7 @@ export function ConvoProvider({
     )
     return new Convo({
       convoId,
-      agent,
+      chatClient,
       events,
       placeholderData: placeholder ? {convo: placeholder} : undefined,
     })
@@ -96,6 +96,16 @@ export function ConvoProvider({
   const service = useSyncExternalStore(convo.subscribe, convo.getSnapshot)
   const {mutate: markAsRead} = useMarkAsReadMutation()
 
+  /*
+   * The convo outlives the client it was constructed with: replacing the
+   * session bundle builds fresh clients over the new session and disposes the
+   * old ones, so a convo still holding the previous client would send through a
+   * dead session.
+   */
+  useEffect(() => {
+    convo.updateClient(chatClient)
+  }, [convo, chatClient])
+
   const appState = useAppState()
   const isActive = appState === 'active'
   useFocusEffect(
diff --git a/src/state/messages/convo/types.ts b/src/state/messages/convo/types.ts
index e330d6eea3..5bc5777e82 100644
--- a/src/state/messages/convo/types.ts
+++ b/src/state/messages/convo/types.ts
@@ -1,19 +1,20 @@
 import {
   type $Typed,
   type AppBskyEmbedRecord,
-  type AtpAgent,
   type ChatBskyActorDefs,
   type ChatBskyConvoDefs,
-  type ChatBskyConvoSendMessage,
   type ChatBskyEmbedJoinLink,
 } from '@atproto/api'
+import {type Client} from '@atproto/lex'
 
 import {type MessagesEventBus} from '#/state/messages/events/agent'
 import {type ConvoWithDetails} from '#/components/dms/util'
+import {type chat} from '#/lexicons'
 
 export type ConvoParams = {
   convoId: string
-  agent: AtpAgent
+  /** The chat client, which proxies `chat.bsky.*` to the chat service. */
+  chatClient: Client
   events: MessagesEventBus
   placeholderData?: {
     convo: ChatBskyConvoDefs.ConvoView
@@ -108,7 +109,7 @@ export type ConvoItem =
 
 type DeleteMessage = (messageId: string) => Promise<void>
 type SendMessage = (
-  message: ChatBskyConvoSendMessage.InputSchema['message'],
+  message: chat.bsky.convo.defs.MessageInput,
   optimisticEmbedView:
     | $Typed<AppBskyEmbedRecord.View>
     | $Typed<ChatBskyEmbedJoinLink.View>
diff --git a/src/state/messages/events/agent.ts b/src/state/messages/events/agent.ts
index 56e6bed173..9bc7158187 100644
--- a/src/state/messages/events/agent.ts
+++ b/src/state/messages/events/agent.ts
@@ -1,9 +1,8 @@
-import {type AtpAgent, type ChatBskyConvoGetLog} from '@atproto/api'
+import {type Client} from '@atproto/lex'
 import {EventEmitter} from 'eventemitter3'
 import {nanoid} from 'nanoid/non-secure'
 
 import {networkRetry} from '#/lib/async/retry'
-import {DM_SERVICE_HEADERS} from '#/lib/constants'
 import {
   isErrorMaybeAppPasswordPermissions,
   isNetworkError,
@@ -21,13 +20,14 @@ import {
   type MessagesEventBusParams,
   MessagesEventBusStatus,
 } from '#/state/messages/events/types'
+import {chat} from '#/lexicons'
 
 const logger = Logger.create(Logger.Context.DMsAgent)
 
 export class MessagesEventBus {
   private id: string
 
-  private agent: AtpAgent
+  private chatClient: Client
   private emitter = new EventEmitter<{event: [MessagesEventBusEvent]}>()
 
   private status: MessagesEventBusStatus = MessagesEventBusStatus.Initializing
@@ -37,11 +37,20 @@ export class MessagesEventBus {
 
   constructor(params: MessagesEventBusParams) {
     this.id = nanoid(3)
-    this.agent = params.agent
+    this.chatClient = params.chatClient
 
     this.init()
   }
 
+  /**
+   * Point the bus at a new chat client, for when the session bundle is
+   * replaced underneath it. The poll cursor and subscribers are unaffected: the
+   * same account is being served over a fresh session.
+   */
+  updateClient(chatClient: Client) {
+    this.chatClient = chatClient
+  }
+
   requestPollInterval(interval: number) {
     const id = nanoid()
     this.requestedPollIntervals.set(id, interval)
@@ -260,14 +269,11 @@ export class MessagesEventBus {
 
     try {
       const response = await networkRetry(2, () => {
-        return this.agent.chat.bsky.convo.getLog(
-          {},
-          {headers: DM_SERVICE_HEADERS},
-        )
+        return this.chatClient.call(chat.bsky.convo.getLog, {})
       })
       // throw new Error('UNCOMMENT TO TEST INIT FAILURE')
 
-      const {cursor} = response.data
+      const {cursor} = response
 
       // should always be defined
       if (cursor) {
@@ -355,21 +361,18 @@ export class MessagesEventBus {
     // )
 
     let needsEmit = false
-    let batch: ChatBskyConvoGetLog.OutputSchema['logs'] = []
+    let batch: chat.bsky.convo.getLog.$OutputBody['logs'] = []
 
     try {
       const response = await networkRetry(2, () => {
-        return this.agent.chat.bsky.convo.getLog(
-          {
-            cursor: this.latestRev,
-          },
-          {headers: DM_SERVICE_HEADERS},
-        )
+        return this.chatClient.call(chat.bsky.convo.getLog, {
+          cursor: this.latestRev,
+        })
       })
 
       // throw new Error('UNCOMMENT TO TEST POLL FAILURE')
 
-      const {logs: events} = response.data
+      const {logs: events} = response
 
       for (const ev of events) {
         /*
diff --git a/src/state/messages/events/index.tsx b/src/state/messages/events/index.tsx
index 5d1e2ec505..d6e0abe600 100644
--- a/src/state/messages/events/index.tsx
+++ b/src/state/messages/events/index.tsx
@@ -2,7 +2,7 @@ import {createContext, useContext, useEffect, useState} from 'react'
 import {AppState} from 'react-native'
 
 import {MessagesEventBus} from '#/state/messages/events/agent'
-import {useAgent, useSession} from '#/state/session'
+import {useChatClient, useSession} from '#/state/session'
 
 const MessagesEventBusContext = createContext<MessagesEventBus | null>(null)
 MessagesEventBusContext.displayName = 'MessagesEventBusContext'
@@ -42,14 +42,24 @@ export function MessagesEventBusProviderInner({
 }: {
   children: React.ReactNode
 }) {
-  const agent = useAgent()
+  const chatClient = useChatClient()
   const [bus] = useState(
     () =>
       new MessagesEventBus({
-        agent,
+        chatClient,
       }),
   )
 
+  /*
+   * The bus outlives the client it was constructed with: replacing the session
+   * bundle (account switch, cross-tab token sync, expiry rescue) builds fresh
+   * clients over the new session and disposes the old ones, so a bus still
+   * holding the previous client would poll through a dead session.
+   */
+  useEffect(() => {
+    bus.updateClient(chatClient)
+  }, [bus, chatClient])
+
   useEffect(() => {
     bus.resume()
 
diff --git a/src/state/messages/events/types.ts b/src/state/messages/events/types.ts
index 67d6bdd452..2a743a07a2 100644
--- a/src/state/messages/events/types.ts
+++ b/src/state/messages/events/types.ts
@@ -1,7 +1,10 @@
-import {type AtpAgent, type ChatBskyConvoGetLog} from '@atproto/api'
+import {type Client} from '@atproto/lex'
+
+import {type chat} from '#/lexicons'
 
 export type MessagesEventBusParams = {
-  agent: AtpAgent
+  /** The chat client, which proxies `chat.bsky.*` to the chat service. */
+  chatClient: Client
 }
 
 export enum MessagesEventBusStatus {
@@ -64,5 +67,5 @@ export type MessagesEventBusEvent =
     }
   | {
       type: 'logs'
-      logs: ChatBskyConvoGetLog.OutputSchema['logs']
+      logs: chat.bsky.convo.getLog.$OutputBody['logs']
     }
diff --git a/src/state/queries/handle.ts b/src/state/queries/handle.ts
index c400e8bd85..0aa0160158 100644
--- a/src/state/queries/handle.ts
+++ b/src/state/queries/handle.ts
@@ -1,10 +1,10 @@
 import {useCallback} from 'react'
-import {type HandleString} from '@atproto/syntax'
+import {type DidString, type HandleString} from '@atproto/syntax'
 import {useMutation, useQueryClient} from '@tanstack/react-query'
 
 import {STALE} from '#/state/queries'
-import {useAgent, usePdsClient} from '#/state/session'
-import {com} from '#/lexicons'
+import {useAppviewClient, usePdsClient} from '#/state/session'
+import {app, com} from '#/lexicons'
 
 const handleQueryKeyRoot = 'handle'
 const fetchHandleQueryKey = (handleOrDid: string) => [
@@ -16,21 +16,24 @@ const fetchDidQueryKey = (handleOrDid: string) => [didQueryKeyRoot, handleOrDid]
 
 export function useFetchHandle() {
   const queryClient = useQueryClient()
-  const agent = useAgent()
+  const client = useAppviewClient()
 
   return useCallback(
     async (handleOrDid: string) => {
       if (handleOrDid.startsWith('did:')) {
-        const res = await queryClient.fetchQuery({
+        const data = await queryClient.fetchQuery({
           staleTime: STALE.MINUTES.FIVE,
           queryKey: fetchHandleQueryKey(handleOrDid),
-          queryFn: () => agent.getProfile({actor: handleOrDid}),
+          queryFn: () =>
+            client.call(app.bsky.actor.getProfile, {
+              actor: handleOrDid as DidString,
+            }),
         })
-        return res.data.handle
+        return data.handle
       }
       return handleOrDid
     },
-    [queryClient, agent],
+    [queryClient, client],
   )
 }
 
@@ -42,7 +45,6 @@ export function useUpdateHandleMutation(opts?: {
 
   return useMutation({
     mutationFn: async ({handle}: {handle: string}) => {
-      // `agent.updateHandle` was a pure alias for this method
       await client.call(com.atproto.identity.updateHandle, {
         // callers validate the handle before submitting
         handle: handle as HandleString,
@@ -59,7 +61,7 @@ export function useUpdateHandleMutation(opts?: {
 
 export function useFetchDid() {
   const queryClient = useQueryClient()
-  const agent = useAgent()
+  const client = useAppviewClient()
 
   return useCallback(
     async (handleOrDid: string) => {
@@ -69,13 +71,15 @@ export function useFetchDid() {
         queryFn: async () => {
           let identifier = handleOrDid
           if (!identifier.startsWith('did:')) {
-            const res = await agent.resolveHandle({handle: identifier})
-            identifier = res.data.did
+            const data = await client.call(com.atproto.identity.resolveHandle, {
+              handle: identifier as HandleString,
+            })
+            identifier = data.did
           }
           return identifier
         },
       })
     },
-    [queryClient, agent],
+    [queryClient, client],
   )
 }
diff --git a/src/state/queries/post-feed.ts b/src/state/queries/post-feed.ts
index c3d5ada4d2..44bc8adf02 100644
--- a/src/state/queries/post-feed.ts
+++ b/src/state/queries/post-feed.ts
@@ -36,7 +36,7 @@ import {moderatePost} from '#/lib/moderation/subjects'
 import {logger} from '#/logger'
 import {STALE} from '#/state/queries'
 import {DEFAULT_LOGGED_OUT_PREFERENCES} from '#/state/queries/preferences/const'
-import {useAgent, useAppviewClient} from '#/state/session'
+import {useAppviewClient, useSession} from '#/state/session'
 import * as userActionHistory from '#/state/userActionHistory'
 import {KnownError} from '#/view/com/posts/PostFeedErrorMessage'
 import {useFeedTuners} from '../preferences/feed-tuners'
@@ -151,7 +151,7 @@ export function usePostFeedQuery(
       f => f.pinned && f.value === 'following',
     ) ?? -1
   const enableFollowingToDiscoverFallback = followingPinnedIndex === 0
-  const agent = useAgent()
+  const {hasSession} = useSession()
   const client = useAppviewClient()
   const lastRun = useRef<{
     data: InfiniteData<FeedPageUnselected>
@@ -214,7 +214,7 @@ export function usePostFeedQuery(
        * moderations happen later, which results in some posts being shown and
        * some not.
        */
-      if (!agent.session) {
+      if (!hasSession) {
         assertSomePostsPassModeration(
           res.feed,
           preferences?.moderationPrefs ||
diff --git a/src/state/queries/post.ts b/src/state/queries/post.ts
index fd6ba752de..0a0664d13b 100644
--- a/src/state/queries/post.ts
+++ b/src/state/queries/post.ts
@@ -1,6 +1,7 @@
 import {useCallback} from 'react'
 import {type AppBskyActorDefs, type AppBskyFeedDefs, AtUri} from '@atproto/api'
-import {type AtUriString} from '@atproto/syntax'
+import {type Client} from '@atproto/lex'
+import {type AtUriString, type HandleString} from '@atproto/syntax'
 import {deleteLike, deletePost, deleteRepost, like, repost} from '@bsky.app/sdk'
 import {
   type QueryClient,
@@ -12,16 +13,11 @@ import {
 import {useToggleMutationQueue} from '#/lib/hooks/useToggleMutationQueue'
 import {updatePostShadow} from '#/state/cache/post-shadow'
 import {type Shadow} from '#/state/cache/types'
-import {
-  useAgent,
-  useAppviewClient,
-  usePdsClient,
-  useSession,
-} from '#/state/session'
+import {useAppviewClient, usePdsClient, useSession} from '#/state/session'
 import * as userActionHistory from '#/state/userActionHistory'
 import {useAnalytics} from '#/analytics'
 import {type Metrics, toClout} from '#/analytics/metrics'
-import {app} from '#/lexicons'
+import {app, com} from '#/lexicons'
 import {useIsThreadMuted, useSetThreadMute} from '../cache/thread-mutes'
 import {findProfileQueryData} from './profile'
 
@@ -29,25 +25,15 @@ const RQKEY_ROOT = 'post'
 export const RQKEY = (postUri: string) => [RQKEY_ROOT, postUri]
 
 export function usePostQuery(uri: string | undefined) {
-  const agent = useAgent()
+  const client = useAppviewClient()
   return useQuery<AppBskyFeedDefs.PostView>({
     queryKey: RQKEY(uri || ''),
     queryFn: async () => {
       if (!uri) throw new Error('[unreachable] No URI provided')
 
-      const urip = new AtUri(uri)
-
-      if (!urip.host.startsWith('did:')) {
-        const res = await agent.resolveHandle({
-          handle: urip.host,
-        })
-        // @ts-expect-error TODO new-sdk-migration
-        urip.host = res.data.did
-      }
-
-      const res = await agent.getPosts({uris: [urip.toString()]})
-      if (res.success && res.data.posts[0]) {
-        return res.data.posts[0]
+      const post = await fetchPost(client, uri)
+      if (post) {
+        return post
       }
 
       throw new Error('No data')
@@ -56,6 +42,33 @@ export function usePostQuery(uri: string | undefined) {
   })
 }
 
+/**
+ * Read one post by AT-URI, resolving a handle authority first when the URI
+ * carries one.
+ *
+ * The appview still answers with `@atproto/api`-shaped views for the callers of
+ * these hooks, so the generated view is asserted across at this single
+ * boundary rather than at every consumer.
+ */
+async function fetchPost(
+  client: Client,
+  uri: string,
+): Promise<AppBskyFeedDefs.PostView | undefined> {
+  const urip = new AtUri(uri)
+
+  if (!urip.host.startsWith('did:')) {
+    const data = await client.call(com.atproto.identity.resolveHandle, {
+      handle: urip.host as HandleString,
+    })
+    urip.host = data.did
+  }
+
+  const data = await client.call(app.bsky.feed.getPosts, {
+    uris: [urip.toString()],
+  })
+  return data.posts[0]
+}
+
 export function precachePost(
   queryClient: QueryClient,
   uri: string,
@@ -66,59 +79,42 @@ export function precachePost(
 
 export function useGetPost() {
   const queryClient = useQueryClient()
-  const agent = useAgent()
+  const client = useAppviewClient()
   return useCallback(
     async ({uri}: {uri: string}) => {
       return queryClient.fetchQuery({
         queryKey: RQKEY(uri || ''),
         async queryFn() {
-          const urip = new AtUri(uri)
-
-          if (!urip.host.startsWith('did:')) {
-            const res = await agent.resolveHandle({
-              handle: urip.host,
-            })
-            // @ts-expect-error TODO new-sdk-migration
-            urip.host = res.data.did
-          }
-
-          const res = await agent.getPosts({
-            uris: [urip.toString()],
-          })
-
-          if (res.success && res.data.posts[0]) {
-            return res.data.posts[0]
+          const post = await fetchPost(client, uri)
+          if (post) {
+            return post
           }
 
           throw new Error('useGetPost: post not found')
         },
       })
     },
-    [queryClient, agent],
+    [queryClient, client],
   )
 }
 
 export function useGetPosts() {
   const queryClient = useQueryClient()
-  const agent = useAgent()
+  const client = useAppviewClient()
   return useCallback(
     async ({uris}: {uris: string[]}) => {
       return queryClient.fetchQuery({
         queryKey: RQKEY(uris.join(',') || ''),
         async queryFn() {
-          const res = await agent.getPosts({
-            uris,
+          const data = await client.call(app.bsky.feed.getPosts, {
+            uris: uris as AtUriString[],
           })
-
-          if (res.success) {
-            return res.data.posts
-          } else {
-            throw new Error('useGetPosts failed')
-          }
+          // See the note on `fetchPost` about the view shapes.
+          return data.posts as AppBskyFeedDefs.PostView[]
         },
       })
     },
-    [queryClient, agent],
+    [queryClient, client],
   )
 }
 
diff --git a/src/state/queries/preferences/index.ts b/src/state/queries/preferences/index.ts
index 449458c075..33f7d2f8d1 100644
--- a/src/state/queries/preferences/index.ts
+++ b/src/state/queries/preferences/index.ts
@@ -39,7 +39,7 @@ import {
   type UsePreferencesQueryResponse,
 } from '#/state/queries/preferences/types'
 import {createQueryKey} from '#/state/queries/util'
-import {useAgent, usePdsClient} from '#/state/session'
+import {useAppviewClient, usePdsClient} from '#/state/session'
 import {applyLabelersToClient, saveLabelers} from '#/state/session/moderation'
 import {useAgeAssurance} from '#/ageAssurance'
 import {makeAgeRestrictedModerationPrefs} from '#/ageAssurance/util'
@@ -58,7 +58,7 @@ export const preferencesQueryKey = createQueryKey(
 
 export function usePreferencesQuery() {
   const client = usePdsClient()
-  const agent = useAgent()
+  const appviewClient = useAppviewClient()
   const aa = useAgeAssurance()
 
   const query = useQuery({
@@ -86,12 +86,12 @@ export function usePreferencesQuery() {
          * from a labeler would not affect server-attached labels until the
          * session bundle was rebuilt.
          *
-         * `applyLabelersToClient` writes to the agent, which is what stamps the
-         * header on the requests the wrapping appview client issues, and it
-         * drops the Bluesky moderation DID so the globally redacted authority is
-         * not also listed unredacted.
+         * The subscriptions go on the appview client, which is what stamps
+         * `atproto-accept-labelers` on its own requests. The Bluesky moderation
+         * DID is dropped so the globally redacted authority is not also listed
+         * unredacted.
          */
-        applyLabelersToClient(agent, labelerDids)
+        applyLabelersToClient(appviewClient, labelerDids)
 
         /*
          * `BskyPreferences` is now the sdk's own type, so the assembled
diff --git a/src/state/queries/preferences/moderation.ts b/src/state/queries/preferences/moderation.ts
index 246e7596b5..f7d237995e 100644
--- a/src/state/queries/preferences/moderation.ts
+++ b/src/state/queries/preferences/moderation.ts
@@ -1,5 +1,5 @@
 import {useMemo} from 'react'
-import {AtpAgent} from '@atproto/api'
+import {Client} from '@atproto/lex'
 import {interpretLabelValueDefinitions} from '@bsky.app/sdk/moderation'
 
 import {isNonConfigurableModerationAuthority} from '#/state/session/additional-moderation-authorities'
@@ -14,7 +14,7 @@ export function useMyLabelersQuery({
   const prefs = usePreferencesQuery()
   let dids = Array.from(
     new Set(
-      AtpAgent.appLabelers.concat(
+      (Client.appLabelers as readonly string[]).concat(
         prefs.data?.moderationPrefs.labelers.map(l => l.did) || [],
       ),
     ),
diff --git a/src/state/queries/resolve-link.ts b/src/state/queries/resolve-link.ts
index 2ccd0af863..aac9bacb12 100644
--- a/src/state/queries/resolve-link.ts
+++ b/src/state/queries/resolve-link.ts
@@ -1,9 +1,13 @@
-import {type AtpAgent} from '@atproto/api'
 import {type QueryClient, queryOptions, useQuery} from '@tanstack/react-query'
 
-import {type ResolvedLink, resolveGif, resolveLink} from '#/lib/api/resolve'
+import {
+  type LinkResolvers,
+  type ResolvedLink,
+  resolveGif,
+  resolveLink,
+} from '#/lib/api/resolve'
 import {STALE} from '#/state/queries/index'
-import {useAgent} from '#/state/session'
+import {useAppviewClient, useChatClient} from '#/state/session'
 import {type Gif} from '#/features/gifPicker/types'
 
 export const RQKEY_LINK_ROOT = 'resolve-link'
@@ -12,24 +16,25 @@ export const RQKEY_LINK = (url: string) => [RQKEY_LINK_ROOT, url]
 export const RQKEY_GIF_ROOT = 'resolve-gif'
 export const RQKEY_GIF = (url: string) => [RQKEY_GIF_ROOT, url]
 
-export function resolveLinkQueryOptions(agent: AtpAgent, url: string) {
+export function resolveLinkQueryOptions(clients: LinkResolvers, url: string) {
   return queryOptions({
     staleTime: STALE.HOURS.ONE,
     queryKey: RQKEY_LINK(url),
-    queryFn: () => resolveLink(agent, url),
+    queryFn: () => resolveLink(clients, url),
   })
 }
 
 export function useResolveLinkQuery(url: string) {
-  const agent = useAgent()
-  return useQuery(resolveLinkQueryOptions(agent, url))
+  const appviewClient = useAppviewClient()
+  const chatClient = useChatClient()
+  return useQuery(resolveLinkQueryOptions({appviewClient, chatClient}, url))
 }
 export function fetchResolveLinkQuery(
   queryClient: QueryClient,
-  agent: AtpAgent,
+  clients: LinkResolvers,
   url: string,
 ) {
-  return queryClient.fetchQuery(resolveLinkQueryOptions(agent, url))
+  return queryClient.fetchQuery(resolveLinkQueryOptions(clients, url))
 }
 export function precacheResolveLinkQuery(
   queryClient: QueryClient,
@@ -39,26 +44,25 @@ export function precacheResolveLinkQuery(
   queryClient.setQueryData(RQKEY_LINK(url), resolvedLink)
 }
 
+/*
+ * GIF resolution is pure metadata work on a URL the picker already returned -
+ * it makes no atproto request - so it takes no client.
+ */
 export function useResolveGifQuery(gif: Gif) {
-  const agent = useAgent()
   return useQuery({
     staleTime: STALE.HOURS.ONE,
     queryKey: RQKEY_GIF(gif.url),
     queryFn: async () => {
-      return await resolveGif(agent, gif)
+      return await resolveGif(gif)
     },
   })
 }
-export function fetchResolveGifQuery(
-  queryClient: QueryClient,
-  agent: AtpAgent,
-  gif: Gif,
-) {
+export function fetchResolveGifQuery(queryClient: QueryClient, gif: Gif) {
   return queryClient.fetchQuery({
     staleTime: STALE.HOURS.ONE,
     queryKey: RQKEY_GIF(gif.url),
     queryFn: async () => {
-      return await resolveGif(agent, gif)
+      return await resolveGif(gif)
     },
   })
 }
diff --git a/src/state/session/__tests__/bridge-agent-test.ts b/src/state/session/__tests__/bridge-agent-test.ts
deleted file mode 100644
index cbd606d12a..0000000000
--- a/src/state/session/__tests__/bridge-agent-test.ts
+++ /dev/null
@@ -1,573 +0,0 @@
-import {
-  PasswordSession,
-  type PasswordSessionOptions,
-  type SessionData,
-} from '@atproto/lex-password-session'
-import {beforeEach, describe, expect, it, jest} from '@jest/globals'
-
-jest.mock('#/state/events', () => ({
-  emitNetworkConfirmed: jest.fn(),
-  emitNetworkLost: jest.fn(),
-}))
-
-jest.mock('jwt-decode', () => ({
-  jwtDecode() {
-    return {scope: 'com.atproto.access'}
-  },
-}))
-
-import {BskyAppAgent, PasswordSessionManager} from '../bridge-agent'
-import {sessionAccountToSessionData} from '../session-data'
-import {type SessionAccount} from '../types'
-import {
-  asFetch,
-  DID,
-  DIDDOC_PDS_HOST,
-  HANDLE,
-  json,
-  makeAccount,
-  makeDidDoc,
-  makeMockFetch,
-  type MockFetch,
-  PDS_HOST,
-  SERVICE,
-  urlsOf,
-} from './mock-fetch'
-
-/**
- * Build the manager + agent pair under test.
- *
- * The mock fetch is installed in both places it can be reached from: as the
- * inner `PasswordSession`'s fetch (the authenticated path) and, via
- * `setFetch`, as the manager's own fetch (the unauthenticated bypass path,
- * which would otherwise use the real network-aware fetch).
- */
-function setup({
-  account = makeAccount(),
-  didDoc,
-  pdsUrl,
-  fetchMock = makeMockFetch(),
-  sessionOptions,
-}: {
-  account?: SessionAccount
-  didDoc?: SessionData['didDoc']
-  pdsUrl?: string
-  fetchMock?: MockFetch
-  sessionOptions?: PasswordSessionOptions
-} = {}) {
-  const data: SessionData = {
-    ...sessionAccountToSessionData(account),
-    ...(didDoc ? {didDoc} : {}),
-  }
-  const inner = new PasswordSession(data, {
-    fetch: asFetch(fetchMock),
-    ...sessionOptions,
-  })
-  const manager = new PasswordSessionManager(inner, {
-    service: account.service,
-    pdsUrl,
-  })
-  manager.setFetch(asFetch(fetchMock))
-  const agent = new BskyAppAgent(manager)
-  return {inner, manager, agent, fetchMock}
-}
-
-function setupPublic(fetchMock: MockFetch = makeMockFetch()) {
-  const manager = new PasswordSessionManager(null, {service: SERVICE})
-  manager.setFetch(asFetch(fetchMock))
-  return {manager, agent: new BskyAppAgent(manager), fetchMock}
-}
-
-describe('PasswordSessionManager getters', () => {
-  it('reads live SessionData through .session', () => {
-    const {agent} = setup()
-    expect(agent.session?.did).toBe(DID)
-    expect(agent.session?.handle).toBe(HANDLE)
-    expect(agent.session?.email).toBe('alice@example.com')
-    expect(agent.session?.emailConfirmed).toBe(true)
-    expect(agent.did).toBe(DID)
-    expect(agent.hasSession).toBe(true)
-  })
-
-  it('defaults active to true when the payload omits it', () => {
-    const {agent} = setup({account: makeAccount({active: undefined})})
-    expect(agent.session?.active).toBe(true)
-  })
-
-  it('exposes serviceUrl from the constructor service', () => {
-    const {agent} = setup()
-    expect(agent.serviceUrl.toString()).toBe('https://bsky.social/')
-  })
-
-  it('derives pdsUrl/dispatchUrl from the didDoc', () => {
-    const {agent} = setup({didDoc: makeDidDoc(PDS_HOST)})
-    expect(agent.pdsUrl?.toString()).toBe(`${PDS_HOST}/`)
-    expect(agent.dispatchUrl.toString()).toBe(`${PDS_HOST}/`)
-  })
-
-  it('falls back to the stored pdsUrl when there is no didDoc', () => {
-    const {agent} = setup({pdsUrl: PDS_HOST})
-    expect(agent.pdsUrl?.toString()).toBe(`${PDS_HOST}/`)
-    expect(agent.dispatchUrl.toString()).toBe(`${PDS_HOST}/`)
-  })
-
-  it('prefers the didDoc PDS over the stored pdsUrl', () => {
-    const {agent} = setup({
-      didDoc: makeDidDoc(DIDDOC_PDS_HOST),
-      pdsUrl: PDS_HOST,
-    })
-    expect(agent.pdsUrl?.toString()).toBe(`${DIDDOC_PDS_HOST}/`)
-  })
-
-  it('dispatchUrl falls back to serviceUrl with no PDS at all', () => {
-    const {agent} = setup()
-    expect(agent.pdsUrl).toBe(undefined)
-    expect(agent.dispatchUrl.toString()).toBe('https://bsky.social/')
-  })
-
-  it('ignores an unparseable stored pdsUrl', () => {
-    const {agent} = setup({pdsUrl: 'not a url'})
-    expect(agent.pdsUrl).toBe(undefined)
-    expect(agent.dispatchUrl.toString()).toBe('https://bsky.social/')
-  })
-
-  it('matches the inner session on didDocs a strict validator would reject', () => {
-    /*
-     * No `id` on the document and a non-canonical service `type`: enough for
-     * isValidDidDoc/getPdsEndpoint to bail, but PasswordSession still routes
-     * here, so the bridge must agree or dispatchUrl lies about where requests
-     * go (and service-auth aud gets minted for the wrong host).
-     */
-    const {agent} = setup({
-      didDoc: {
-        service: [
-          {
-            id: '#atproto_pds',
-            type: 'SomethingElse',
-            serviceEndpoint: DIDDOC_PDS_HOST,
-          },
-        ],
-      },
-      pdsUrl: PDS_HOST,
-    })
-    expect(agent.pdsUrl?.toString()).toBe(`${DIDDOC_PDS_HOST}/`)
-    expect(agent.dispatchUrl.toString()).toBe(`${DIDDOC_PDS_HOST}/`)
-  })
-
-  it('falls back to the stored pdsUrl when the didDoc has no PDS service', () => {
-    const {agent} = setup({
-      didDoc: {
-        id: DID,
-        service: [
-          {
-            id: '#bsky_notif',
-            type: 'BskyNotificationService',
-            serviceEndpoint: DIDDOC_PDS_HOST,
-          },
-        ],
-      },
-      pdsUrl: PDS_HOST,
-    })
-    expect(agent.pdsUrl?.toString()).toBe(`${PDS_HOST}/`)
-  })
-
-  it('falls back to the stored pdsUrl when the PDS endpoint does not parse', () => {
-    const {agent} = setup({
-      didDoc: {
-        id: DID,
-        service: [
-          {
-            id: '#atproto_pds',
-            type: 'AtprotoPersonalDataServer',
-            serviceEndpoint: 'not a url',
-          },
-        ],
-      },
-      pdsUrl: PDS_HOST,
-    })
-    expect(agent.pdsUrl?.toString()).toBe(`${PDS_HOST}/`)
-  })
-})
-
-describe('PasswordSessionManager.session identity', () => {
-  it('is stable across consecutive reads', () => {
-    const {agent} = setup()
-    expect(agent.session).toBe(agent.session)
-  })
-
-  it('is a new object after a refresh rotates tokens', async () => {
-    const {agent} = setup()
-    const before = agent.session
-    expect(before?.accessJwt).toBe('access-jwt')
-    await agent.sessionManager.refreshSession()
-    const after = agent.session
-    expect(after).not.toBe(before)
-    expect(after?.accessJwt).toBe('access-jwt-2')
-    expect(after).toBe(agent.session)
-  })
-
-  it('rejects writes to .session', () => {
-    const {agent} = setup()
-    expect(() => {
-      /* the whole point of the accessor: writes must not silently drift */
-      agent.sessionManager.session = agent.session
-    }).toThrow('read-only')
-  })
-
-  it('rejects writes to .pdsUrl', () => {
-    const {agent} = setup()
-    expect(() => {
-      agent.sessionManager.pdsUrl = new URL(PDS_HOST)
-    }).toThrow('read-only')
-  })
-})
-
-describe('PasswordSessionManager.fetchHandler routing', () => {
-  it('dispatches to the stored PDS before a refresh, then to the didDoc PDS', async () => {
-    const {manager, fetchMock} = setup({pdsUrl: PDS_HOST})
-
-    await manager.fetchHandler('/xrpc/app.bsky.actor.getProfile')
-    expect(urlsOf(fetchMock).at(-1)).toBe(
-      `${PDS_HOST}/xrpc/app.bsky.actor.getProfile`,
-    )
-
-    /* the refresh response carries a didDoc pointing at a different host */
-    await manager.refreshSession()
-    expect(manager.pdsUrl?.toString()).toBe(`${DIDDOC_PDS_HOST}/`)
-
-    await manager.fetchHandler('/xrpc/app.bsky.actor.getProfile')
-    expect(urlsOf(fetchMock).at(-1)).toBe(
-      `${DIDDOC_PDS_HOST}/xrpc/app.bsky.actor.getProfile`,
-    )
-  })
-
-  it('attaches the session bearer token', async () => {
-    const seen: Headers[] = []
-    const fetchMock = makeMockFetch({
-      'app.bsky.actor.getProfile': (_url, init) => {
-        seen.push(new Headers(init.headers))
-        return json({})
-      },
-    })
-    const {manager} = setup({fetchMock})
-    await manager.fetchHandler('/xrpc/app.bsky.actor.getProfile')
-    expect(seen[0].get('authorization')).toBe('Bearer access-jwt')
-  })
-
-  it('bypasses the inner session when authorization is pre-set', async () => {
-    const seen: Headers[] = []
-    const fetchMock = makeMockFetch({
-      'com.atproto.server.describeServer': (_url, init) => {
-        seen.push(new Headers(init.headers))
-        return json({})
-      },
-    })
-    const {manager} = setup({fetchMock, pdsUrl: PDS_HOST})
-
-    /*
-     * PasswordSession throws TypeError on a pre-set authorization header, so
-     * this path must never reach it.
-     */
-    await expect(
-      manager.fetchHandler('/xrpc/com.atproto.server.describeServer', {
-        headers: {authorization: 'Bearer caller-supplied'},
-      }),
-    ).resolves.toBeDefined()
-
-    expect(seen.length).toBe(1)
-    /* the caller's header survives, and there is exactly one of them */
-    expect(seen[0].get('authorization')).toBe('Bearer caller-supplied')
-    expect(urlsOf(fetchMock).at(-1)).toBe(
-      `${PDS_HOST}/xrpc/com.atproto.server.describeServer`,
-    )
-  })
-})
-
-describe('BskyAppAgent namespace requests', () => {
-  it('carries proxy, labeler and bearer headers to the dispatch host', async () => {
-    const seen: {url: string; headers: Headers}[] = []
-    const fetchMock = makeMockFetch({
-      'app.bsky.actor.getProfile': (url, init) => {
-        seen.push({url, headers: new Headers(init.headers)})
-        return json({did: DID, handle: HANDLE})
-      },
-    })
-    const {agent} = setup({fetchMock, pdsUrl: PDS_HOST})
-    agent.configureProxy('did:web:api.bsky.app#bsky_appview')
-    agent.configureLabelers(['did:plc:custom-labeler'])
-
-    /*
-     * The request headers (what we assert) are captured by the fetch mock
-     * before the agent parses the response body. Response-body lexicon
-     * validation can throw in the jest environment (a multiformats CID mock
-     * quirk unrelated to the header composition under test), so we ignore any
-     * parse error here.
-     */
-    await agent.app.bsky.actor.getProfile({actor: HANDLE}).catch(() => {})
-
-    expect(seen.length).toBe(1)
-    expect(seen[0].url.startsWith(`${PDS_HOST}/xrpc/`)).toBe(true)
-    expect(seen[0].headers.get('atproto-proxy')).toBe(
-      'did:web:api.bsky.app#bsky_appview',
-    )
-    expect(seen[0].headers.get('atproto-accept-labelers')).toContain(
-      'did:plc:custom-labeler',
-    )
-    expect(seen[0].headers.get('authorization')).toBe('Bearer access-jwt')
-  })
-})
-
-describe('PasswordSessionManager.refreshSession', () => {
-  it('returns an old-shaped XRPC envelope with fresh tokens', async () => {
-    const {manager, fetchMock} = setup()
-    const res = await manager.refreshSession()
-    expect(res.success).toBe(true)
-    expect(res.data.accessJwt).toBe('access-jwt-2')
-    expect(res.data.refreshJwt).toBe('refresh-jwt-2')
-    expect(res.data.did).toBe(DID)
-    expect(res.data.handle).toBe(HANDLE)
-    expect(
-      urlsOf(fetchMock).some(u =>
-        u.includes('com.atproto.server.refreshSession'),
-      ),
-    ).toBe(true)
-  })
-
-  it('throws when there is no live session', async () => {
-    const {manager} = setupPublic()
-    await expect(manager.refreshSession()).rejects.toThrow(
-      'No session to refresh',
-    )
-  })
-})
-
-describe('PasswordSessionManager.resumeSession', () => {
-  const staleData = {
-    accessJwt: 'stale-access',
-    refreshJwt: 'stale-refresh',
-    handle: 'stale.test',
-    did: DID,
-    active: true,
-  }
-
-  it('ignores its argument and returns fresh tokens from a refresh', async () => {
-    const {manager} = setup()
-    const res = await manager.resumeSession(staleData)
-    expect(res.data.accessJwt).toBe('access-jwt-2')
-    expect(res.data.refreshJwt).toBe('refresh-jwt-2')
-    expect(manager.session?.accessJwt).toBe('access-jwt-2')
-  })
-
-  it('is reachable through the agent and does not install the stale data', async () => {
-    const {agent} = setup()
-    await agent.resumeSession(staleData)
-    expect(agent.session?.accessJwt).toBe('access-jwt-2')
-    expect(agent.session?.handle).toBe(HANDLE)
-  })
-})
-
-describe('PasswordSessionManager unsupported methods', () => {
-  it('refuses login()', async () => {
-    const {agent} = setup()
-    await expect(
-      agent.login({identifier: HANDLE, password: 'hunter2'}),
-    ).rejects.toThrow('Not supported on PasswordSessionManager')
-  })
-
-  it('refuses createAccount()', async () => {
-    const {agent} = setup()
-    await expect(
-      agent.createAccount({handle: HANDLE, email: 'a@b.c', password: 'x'}),
-    ).rejects.toThrow('Not supported on PasswordSessionManager')
-  })
-})
-
-describe('PasswordSessionManager destroyed inner session', () => {
-  it('getters return undefined rather than throwing after logout', async () => {
-    const {agent, inner} = setup()
-    await agent.logout()
-    expect(inner.destroyed).toBe(true)
-    /* PasswordSession.did/.session throw once destroyed; the bridge must not */
-    expect(() => agent.did).not.toThrow()
-    expect(agent.did).toBe(undefined)
-    expect(agent.session).toBe(undefined)
-    expect(agent.hasSession).toBe(false)
-    expect(agent.pdsUrl).toBe(undefined)
-  })
-
-  it('logout() is idempotent', async () => {
-    const {agent} = setup()
-    await agent.logout()
-    await expect(agent.logout()).resolves.toBeUndefined()
-  })
-
-  it('fetchHandler stops attaching auth once destroyed', async () => {
-    const seen: Headers[] = []
-    const fetchMock = makeMockFetch({
-      'app.bsky.actor.getProfile': (_url, init) => {
-        seen.push(new Headers(init.headers))
-        return json({})
-      },
-    })
-    const {agent, manager} = setup({fetchMock})
-    await agent.logout()
-    await manager.fetchHandler('/xrpc/app.bsky.actor.getProfile')
-    expect(seen.length).toBe(1)
-    expect(seen[0].get('authorization')).toBe(null)
-  })
-})
-
-describe('BskyAppAgent.dispose', () => {
-  let ctx: ReturnType<typeof setup>
-
-  beforeEach(() => {
-    ctx = setup({pdsUrl: PDS_HOST})
-  })
-
-  it('makes the session read as logged out', () => {
-    expect(ctx.agent.session).toBeDefined()
-    ctx.agent.dispose()
-    expect(ctx.agent.session).toBe(undefined)
-    expect(ctx.agent.did).toBe(undefined)
-    expect(ctx.agent.pdsUrl).toBe(undefined)
-    expect(ctx.agent.hasSession).toBe(false)
-  })
-
-  it('routes requests through the plain unauthenticated fetch', async () => {
-    const seen: Headers[] = []
-    const fetchMock = makeMockFetch({
-      'app.bsky.actor.getProfile': (_url, init) => {
-        seen.push(new Headers(init.headers))
-        return json({})
-      },
-    })
-    const {agent, manager} = setup({fetchMock, pdsUrl: PDS_HOST})
-    agent.dispose()
-    await manager.fetchHandler('/xrpc/app.bsky.actor.getProfile')
-    expect(seen.length).toBe(1)
-    expect(seen[0].get('authorization')).toBe(null)
-    /* dispatch falls back to the service, since pdsUrl now reads undefined */
-    expect(urlsOf(fetchMock).at(-1)).toBe(
-      `${SERVICE}/xrpc/app.bsky.actor.getProfile`,
-    )
-  })
-
-  it('leaves refreshSession unusable', async () => {
-    ctx.agent.dispose()
-    await expect(ctx.agent.sessionManager.refreshSession()).rejects.toThrow(
-      'No session to refresh',
-    )
-  })
-})
-
-describe('public PasswordSessionManager (no inner session)', () => {
-  it('reads as logged out', () => {
-    const {agent} = setupPublic()
-    expect(agent.session).toBe(undefined)
-    expect(agent.did).toBe(undefined)
-    expect(agent.hasSession).toBe(false)
-    expect(agent.pdsUrl).toBe(undefined)
-    expect(agent.dispatchUrl.toString()).toBe('https://bsky.social/')
-  })
-
-  it('dispatches to the service unauthenticated', async () => {
-    const seen: Headers[] = []
-    const fetchMock = makeMockFetch({
-      'app.bsky.feed.getFeed': (_url, init) => {
-        seen.push(new Headers(init.headers))
-        return json({})
-      },
-    })
-    const {manager} = setupPublic(fetchMock)
-    await manager.fetchHandler('/xrpc/app.bsky.feed.getFeed')
-    expect(seen.length).toBe(1)
-    expect(seen[0].get('authorization')).toBe(null)
-    expect(urlsOf(fetchMock).at(-1)).toBe(
-      `${SERVICE}/xrpc/app.bsky.feed.getFeed`,
-    )
-  })
-})
-
-describe('PasswordSession lifecycle over mocked fetch', () => {
-  it('resume fast path: constructing does not hit the network', () => {
-    const fetchMock = makeMockFetch()
-    setup({fetchMock})
-    expect(fetchMock.mock.calls.length).toBe(0)
-  })
-
-  it('a refresh fires onUpdated with fresh tokens', async () => {
-    const onUpdated =
-      jest.fn<NonNullable<PasswordSessionOptions['onUpdated']>>()
-    const {manager} = setup({sessionOptions: {onUpdated}})
-    await manager.refreshSession()
-    expect(onUpdated).toHaveBeenCalledTimes(1)
-    expect(manager.session?.accessJwt).toBe('access-jwt-2')
-  })
-
-  it('onDeleted fires when refresh returns a declared invalid-token error', async () => {
-    const onDeleted =
-      jest.fn<NonNullable<PasswordSessionOptions['onDeleted']>>()
-    const onUpdated =
-      jest.fn<NonNullable<PasswordSessionOptions['onUpdated']>>()
-    const fetchMock = makeMockFetch({
-      'com.atproto.server.refreshSession': () =>
-        json({error: 'ExpiredToken', message: 'Token expired'}, 400),
-    })
-    const {manager} = setup({fetchMock, sessionOptions: {onDeleted, onUpdated}})
-    await expect(manager.refreshSession()).rejects.toBeDefined()
-    expect(onDeleted).toHaveBeenCalledTimes(1)
-    expect(onUpdated).not.toHaveBeenCalled()
-    /* and the bridge reads as logged out afterwards */
-    expect(manager.session).toBe(undefined)
-  })
-
-  it('onUpdateFailure fires on a transient (500) refresh error, session preserved', async () => {
-    const onDeleted =
-      jest.fn<NonNullable<PasswordSessionOptions['onDeleted']>>()
-    const onUpdateFailure =
-      jest.fn<NonNullable<PasswordSessionOptions['onUpdateFailure']>>()
-    const fetchMock = makeMockFetch({
-      'com.atproto.server.refreshSession': () =>
-        json({error: 'InternalServerError'}, 500),
-    })
-    const {manager} = setup({
-      fetchMock,
-      sessionOptions: {onDeleted, onUpdateFailure},
-    })
-    /*
-     * PasswordSession.refresh() resolves with the unchanged data here; the
-     * bridge restores the old CredentialSession contract by rejecting.
-     */
-    await expect(manager.refreshSession()).rejects.toThrow(
-      'Failed to refresh session',
-    )
-    expect(onUpdateFailure).toHaveBeenCalledTimes(1)
-    expect(onDeleted).not.toHaveBeenCalled()
-    expect(manager.session?.accessJwt).toBe('access-jwt')
-  })
-
-  it('rejects on a network error rather than reporting a no-op success', async () => {
-    const fetchMock = makeMockFetch({
-      'com.atproto.server.refreshSession': () => {
-        throw new TypeError('Network request failed')
-      },
-    })
-    const {manager} = setup({fetchMock})
-    await expect(manager.refreshSession()).rejects.toThrow(
-      'Failed to refresh session',
-    )
-    /* the session survives, exactly as the old transient-failure path did */
-    expect(manager.session?.accessJwt).toBe('access-jwt')
-  })
-
-  it('resumeSession rejects on a transient failure too', async () => {
-    const fetchMock = makeMockFetch({
-      'com.atproto.server.refreshSession': () =>
-        json({error: 'InternalServerError'}, 500),
-    })
-    const {agent} = setup({fetchMock})
-    await expect(agent.resumeSession(agent.session!)).rejects.toThrow(
-      'Failed to refresh session',
-    )
-  })
-})
diff --git a/src/state/session/__tests__/clients-test.ts b/src/state/session/__tests__/clients-test.ts
index 019281f784..50cf70fede 100644
--- a/src/state/session/__tests__/clients-test.ts
+++ b/src/state/session/__tests__/clients-test.ts
@@ -13,26 +13,29 @@ jest.mock('jwt-decode', () => ({
   },
 }))
 
-import {CHAT_PROXY_SERVICE} from '#/lib/constants'
+import {BLUESKY_PROXY_HEADER, CHAT_PROXY_SERVICE} from '#/lib/constants'
 import {app, chat, com} from '#/lexicons'
 import {configureGlobalAppLabelers} from '../additional-moderation-authorities'
-import {BskyAppAgent, PasswordSessionManager} from '../bridge-agent'
 import {
-  agentToAppviewClient,
-  agentToChatClient,
-  agentToPdsClient,
+  buildAppviewClient,
+  buildChatClient,
+  buildPdsClient,
   getUnauthenticatedThrowingClient,
   NotAuthenticatedError,
+  routeSessionToPds,
 } from '../clients'
 import {sessionAccountToSessionData} from '../session-data'
 import {
   asFetch,
   DID,
+  DIDDOC_PDS_HOST,
   HANDLE,
   json,
   makeAccount,
+  makeDidDoc,
   makeMockFetch,
   type MockFetch,
+  PDS_HOST,
   SERVICE,
   urlsOf,
 } from './mock-fetch'
@@ -49,25 +52,16 @@ function makeProfileFetch(): MockFetch {
   })
 }
 
-/** An authenticated agent whose whole network path is the mock fetch. */
-function setup(fetchMock: MockFetch = makeProfileFetch()) {
+/** A live `PasswordSession` whose whole network path is the mock fetch. */
+function makeSession(fetchMock: MockFetch, didDocPdsUrl?: string) {
   const account = makeAccount()
-  const inner = new PasswordSession(sessionAccountToSessionData(account), {
-    fetch: asFetch(fetchMock),
-  })
-  const manager = new PasswordSessionManager(inner, {
-    service: account.service,
-  })
-  manager.setFetch(asFetch(fetchMock))
-  const agent = new BskyAppAgent(manager)
-  return {agent, fetchMock}
-}
-
-/** A logged-out agent whose whole network path is the mock fetch. */
-function setupPublic(fetchMock: MockFetch = makeProfileFetch()) {
-  const manager = new PasswordSessionManager(null, {service: SERVICE})
-  manager.setFetch(asFetch(fetchMock))
-  return {agent: new BskyAppAgent(manager), fetchMock}
+  return new PasswordSession(
+    {
+      ...sessionAccountToSessionData(account),
+      ...(didDocPdsUrl ? {didDoc: makeDidDoc(didDocPdsUrl)} : {}),
+    },
+    {fetch: asFetch(fetchMock)},
+  )
 }
 
 /** The `init` a mock fetch was called with for a given nsid. */
@@ -79,84 +73,56 @@ function initFor(mock: MockFetch, nsid: string): RequestInit | undefined {
   return call?.[1]
 }
 
-describe('agentToAppviewClient', () => {
+/** The headers a mock fetch was called with for a given nsid. */
+function headersFor(mock: MockFetch, nsid: string): Headers {
+  return new Headers(initFor(mock, nsid)?.headers)
+}
+
+describe('buildAppviewClient', () => {
   let fetchMock: MockFetch
 
   beforeEach(() => {
     fetchMock = makeProfileFetch()
+    configureGlobalAppLabelers([])
   })
 
-  it('memoizes one client per agent', () => {
-    const {agent: agentA} = setup(fetchMock)
-    const {agent: agentB} = setup(fetchMock)
-
-    const clientA1 = agentToAppviewClient(agentA)
-    const clientA2 = agentToAppviewClient(agentA)
-    const clientB = agentToAppviewClient(agentB)
-
-    expect(clientA1).toBeInstanceOf(Client)
-    expect(clientA1).toBe(clientA2)
-    expect(clientA1).not.toBe(clientB)
+  it('passes through the session did', () => {
+    const client = buildAppviewClient(makeSession(fetchMock))
+    expect(client).toBeInstanceOf(Client)
+    expect(client.did).toBe(DID)
   })
 
-  it('passes through the agent did', () => {
-    const {agent} = setup(fetchMock)
-    expect(agentToAppviewClient(agent).did).toBe(DID)
-  })
+  it('routes client.call through the session to the network', async () => {
+    const client = buildAppviewClient(makeSession(fetchMock))
 
-  it('reflects an undefined did on a logged-out agent', () => {
-    const {agent} = setupPublic(fetchMock)
-    expect(agentToAppviewClient(agent).did).toBeUndefined()
-  })
-
-  it('routes client.call through the agent to the network', async () => {
-    const {agent} = setup(fetchMock)
-
-    const body = await agentToAppviewClient(agent).call(
-      app.bsky.actor.getProfile,
-      {
-        actor: HANDLE,
-      },
-    )
+    const body = await client.call(app.bsky.actor.getProfile, {actor: HANDLE})
 
     expect(body.handle).toBe(HANDLE)
-    const call = fetchMock.mock.calls.find(c => {
-      const url = c[0] instanceof URL ? c[0].href : String(c[0])
-      return url.includes('/xrpc/app.bsky.actor.getProfile')
-    })
-    expect(call).toBeDefined()
-    const url = call![0] instanceof URL ? call![0].href : String(call![0])
-    expect(url).toContain(`actor=${HANDLE}`)
+    expect(urlsOf(fetchMock).join()).toContain(`actor=${HANDLE}`)
   })
 
-  it('emits the agent proxy header', async () => {
-    const {agent} = setup(fetchMock)
-    agent.configureProxy('did:web:api.bsky.app#bsky_appview')
+  it('emits the appview proxy header', async () => {
+    const client = buildAppviewClient(makeSession(fetchMock))
 
-    await agentToAppviewClient(agent).call(app.bsky.actor.getProfile, {
-      actor: HANDLE,
-    })
+    await client.call(app.bsky.actor.getProfile, {actor: HANDLE})
 
-    const init = initFor(fetchMock, 'app.bsky.actor.getProfile')
-    expect(new Headers(init?.headers).get('atproto-proxy')).toBe(
-      'did:web:api.bsky.app#bsky_appview',
+    expect(
+      headersFor(fetchMock, 'app.bsky.actor.getProfile').get('atproto-proxy'),
+    ).toBe(BLUESKY_PROXY_HEADER.get())
+  })
+
+  it('emits an account subscription exactly once', async () => {
+    const client = buildAppviewClient(makeSession(fetchMock))
+    client.setLabelers(['did:plc:labeler'])
+
+    await client.call(app.bsky.actor.getProfile, {actor: HANDLE})
+
+    const labelers = headersFor(fetchMock, 'app.bsky.actor.getProfile').get(
+      'atproto-accept-labelers',
     )
-  })
-
-  it('emits the agent labeler header exactly once', async () => {
-    const {agent} = setup(fetchMock)
-    agent.configureLabelersHeader(['did:plc:labeler'])
-
-    await agentToAppviewClient(agent).call(app.bsky.actor.getProfile, {
-      actor: HANDLE,
-    })
-
-    const init = initFor(fetchMock, 'app.bsky.actor.getProfile')
-    const labelers = new Headers(init?.headers).get('atproto-accept-labelers')
-    expect(labelers).toContain('did:plc:labeler')
     /*
-     * The client contributes no labelers of its own, so the agent's single
-     * entry must not be duplicated.
+     * The client is the only producer of this header now, so a duplicate would
+     * mean lex itself emitted the same DID twice.
      */
     const entries = labelers!
       .split(',')
@@ -164,25 +130,21 @@ describe('agentToAppviewClient', () => {
     expect(entries).toHaveLength(1)
   })
 
-  it('does not duplicate a global app labeler set on both statics', async () => {
+  it('emits a global app labeler once, redacted', async () => {
     /*
-     * `configureGlobalAppLabelers` populates the agent AND the lex `Client`
-     * static, because clients built without a wrapped agent read only the
-     * latter. On this path both producers are in play for the same request, and
-     * neither dedupes against the other - the agent joins its list with the
-     * existing header string while lex collects into a `Set` keyed on the
-     * `;redact`-suffixed value. The appview client suppresses its `appLabelers`
-     * so exactly one producer contributes.
+     * The global static is the ONLY producer of the redacted authorities - no
+     * agent stamps them any more - and lex suffixes them with `;redact`. An
+     * account subscription that also listed the same DID would produce a second,
+     * non-redacting entry, which is what `applyLabelersToClient` filters against.
      */
     configureGlobalAppLabelers(['did:plc:global-labeler'])
-    const {agent} = setup(fetchMock)
+    const client = buildAppviewClient(makeSession(fetchMock))
 
-    await agentToAppviewClient(agent).call(app.bsky.actor.getProfile, {
-      actor: HANDLE,
-    })
+    await client.call(app.bsky.actor.getProfile, {actor: HANDLE})
 
-    const init = initFor(fetchMock, 'app.bsky.actor.getProfile')
-    const labelers = new Headers(init?.headers).get('atproto-accept-labelers')
+    const labelers = headersFor(fetchMock, 'app.bsky.actor.getProfile').get(
+      'atproto-accept-labelers',
+    )
     const entries = labelers!
       .split(',')
       .map(l => l.trim())
@@ -191,100 +153,69 @@ describe('agentToAppviewClient', () => {
   })
 
   it('sends the session access token', async () => {
-    const {agent} = setup(fetchMock)
-
-    await agentToAppviewClient(agent).call(app.bsky.actor.getProfile, {
-      actor: HANDLE,
-    })
-
-    const init = initFor(fetchMock, 'app.bsky.actor.getProfile')
-    expect(new Headers(init?.headers).get('authorization')).toBe(
-      'Bearer access-jwt',
-    )
-  })
-
-  it('falls back to unauthenticated requests once the agent is disposed', async () => {
-    const {agent} = setup(fetchMock)
-    const client = agentToAppviewClient(agent)
-    agent.dispose()
+    const client = buildAppviewClient(makeSession(fetchMock))
 
     await client.call(app.bsky.actor.getProfile, {actor: HANDLE})
 
-    const init = initFor(fetchMock, 'app.bsky.actor.getProfile')
-    expect(new Headers(init?.headers).has('authorization')).toBe(false)
-    expect(client.did).toBeUndefined()
+    expect(
+      headersFor(fetchMock, 'app.bsky.actor.getProfile').get('authorization'),
+    ).toBe('Bearer access-jwt')
   })
 })
 
-describe('agentToPdsClient', () => {
+describe('buildPdsClient', () => {
   let fetchMock: MockFetch
 
   beforeEach(() => {
     fetchMock = makeProfileFetch()
+    configureGlobalAppLabelers([])
   })
 
-  it('memoizes one client per agent', () => {
-    const {agent: agentA} = setup(fetchMock)
-    const {agent: agentB} = setup(fetchMock)
-
-    const clientA1 = agentToPdsClient(agentA)
-    const clientA2 = agentToPdsClient(agentA)
-
-    expect(clientA1).toBeInstanceOf(Client)
-    expect(clientA1).toBe(clientA2)
-    expect(clientA1).not.toBe(agentToPdsClient(agentB))
-  })
-
-  it('is a distinct client from the appview client for the same agent', () => {
-    const {agent} = setup(fetchMock)
-    expect(agentToPdsClient(agent)).not.toBe(agentToAppviewClient(agent))
-  })
-
-  it('passes through the agent did', () => {
-    const {agent} = setup(fetchMock)
-    expect(agentToPdsClient(agent).did).toBe(DID)
+  it('is a distinct client from the appview client over the same session', () => {
+    const session = makeSession(fetchMock)
+    expect(buildPdsClient(session)).not.toBe(buildAppviewClient(session))
   })
 
   it('sends the session access token', async () => {
-    const {agent} = setup(fetchMock)
-
-    await agentToPdsClient(agent).call(com.atproto.server.getSession, {})
-
-    const init = initFor(fetchMock, 'com.atproto.server.getSession')
-    expect(new Headers(init?.headers).get('authorization')).toBe(
-      'Bearer access-jwt',
+    await buildPdsClient(makeSession(fetchMock)).call(
+      com.atproto.server.getSession,
+      {},
     )
+
+    expect(
+      headersFor(fetchMock, 'com.atproto.server.getSession').get(
+        'authorization',
+      ),
+    ).toBe('Bearer access-jwt')
   })
 
-  it('emits neither the proxy nor the labeler header the agent is configured with', async () => {
+  it('emits neither the proxy nor any labeler header', async () => {
     /*
-     * The load-bearing difference from the appview client: this client wraps the
-     * session manager, below the agent layer that sets both headers, so a
-     * request reaches the account's PDS instead of being proxied onward.
+     * The load-bearing difference from the appview client: a PDS request must
+     * reach the account host itself rather than being proxied onward, and it is
+     * not an appview read, so it carries no moderation authorities either.
      */
-    const {agent} = setup(fetchMock)
-    agent.configureProxy('did:web:api.bsky.app#bsky_appview')
-    agent.configureLabelersHeader(['did:plc:labeler'])
-    /* nor the global authorities: a PDS call is not an appview read */
     configureGlobalAppLabelers(['did:plc:global-labeler'])
 
-    await agentToPdsClient(agent).call(com.atproto.server.getSession, {})
-
-    const headers = new Headers(
-      initFor(fetchMock, 'com.atproto.server.getSession')?.headers,
+    await buildPdsClient(makeSession(fetchMock)).call(
+      com.atproto.server.getSession,
+      {},
     )
+
+    const headers = headersFor(fetchMock, 'com.atproto.server.getSession')
     expect(headers.get('atproto-proxy')).toBeNull()
     expect(headers.get('atproto-accept-labelers')).toBeNull()
   })
 
   it('resolves the relative xrpc path against the account host', async () => {
     /*
-     * lex-client hands its fetchHandler an origin-less `/xrpc/<nsid>` path; the
-     * session manager absolutizes it against dispatchUrl.
+     * lex hands its fetchHandler an origin-less `/xrpc/<nsid>` path; the session
+     * absolutizes it against its didDoc endpoint or, absent one, its service.
      */
-    const {agent} = setup(fetchMock)
-
-    await agentToPdsClient(agent).call(com.atproto.server.getSession, {})
+    await buildPdsClient(makeSession(fetchMock)).call(
+      com.atproto.server.getSession,
+      {},
+    )
 
     expect(urlsOf(fetchMock)).toContain(
       `${SERVICE}/xrpc/com.atproto.server.getSession`,
@@ -292,34 +223,26 @@ describe('agentToPdsClient', () => {
   })
 })
 
-describe('agentToChatClient', () => {
+describe('buildChatClient', () => {
   let fetchMock: MockFetch
 
   beforeEach(() => {
     fetchMock = makeProfileFetch()
+    configureGlobalAppLabelers([])
   })
 
-  it('memoizes one client per agent, distinct from the pds client', () => {
-    const {agent} = setup(fetchMock)
-
-    const client = agentToChatClient(agent)
-
-    expect(client).toBeInstanceOf(Client)
-    expect(client).toBe(agentToChatClient(agent))
-    expect(client).not.toBe(agentToPdsClient(agent))
+  it('is a distinct client from the pds client over the same session', () => {
+    const session = makeSession(fetchMock)
+    expect(buildChatClient(session)).not.toBe(buildPdsClient(session))
   })
 
   it('emits the chat proxy header exactly once, with the session token', async () => {
-    const {agent} = setup(fetchMock)
-
     /* the stub body fails listConvos output validation; headers are recorded pre-parse */
-    await agentToChatClient(agent)
+    await buildChatClient(makeSession(fetchMock))
       .call(chat.bsky.convo.listConvos, {})
       .catch(() => {})
 
-    const headers = new Headers(
-      initFor(fetchMock, 'chat.bsky.convo.listConvos')?.headers,
-    )
+    const headers = headersFor(fetchMock, 'chat.bsky.convo.listConvos')
     /*
      * An exact match, not `toContain`: `Headers` comma-joins repeated entries
      * for the same name, so a second contributor would show up here.
@@ -328,20 +251,96 @@ describe('agentToChatClient', () => {
     expect(headers.get('authorization')).toBe('Bearer access-jwt')
   })
 
-  it('does not emit the agent labeler header', async () => {
-    const {agent} = setup(fetchMock)
-    agent.configureLabelersHeader(['did:plc:labeler'])
-    /* nor the global authorities: a chat call is not an appview read */
+  it('emits no labeler header', async () => {
+    /* the global authorities do not apply: a chat call is not an appview read */
     configureGlobalAppLabelers(['did:plc:global-labeler'])
 
-    await agentToChatClient(agent)
+    await buildChatClient(makeSession(fetchMock))
       .call(chat.bsky.convo.listConvos, {})
       .catch(() => {})
 
-    const headers = new Headers(
-      initFor(fetchMock, 'chat.bsky.convo.listConvos')?.headers,
-    )
-    expect(headers.get('atproto-accept-labelers')).toBeNull()
+    expect(
+      headersFor(fetchMock, 'chat.bsky.convo.listConvos').get(
+        'atproto-accept-labelers',
+      ),
+    ).toBeNull()
+  })
+})
+
+describe('routeSessionToPds', () => {
+  let fetchMock: MockFetch
+
+  beforeEach(() => {
+    fetchMock = makeProfileFetch()
+  })
+
+  it('sends a request to the pinned host rather than the login service', async () => {
+    /*
+     * The entryway case, and the reason this shim exists: an account whose
+     * service is `bsky.social` but whose PDS is elsewhere, with no didDoc yet
+     * (the synchronous resume fast path, i.e. the common cold start). Without
+     * the shim the session would resolve against its service and every request
+     * of that cold start would go to the entryway.
+     */
+    const session = makeSession(fetchMock)
+    const client = buildPdsClient(routeSessionToPds(session, PDS_HOST))
+
+    await client.call(com.atproto.server.getSession, {})
+
+    expect(urlsOf(fetchMock)).toEqual([
+      `${PDS_HOST}/xrpc/com.atproto.server.getSession`,
+    ])
+  })
+
+  it('keeps the session auth lifecycle on the pinned host', async () => {
+    const session = makeSession(fetchMock)
+    const client = buildPdsClient(routeSessionToPds(session, PDS_HOST))
+
+    await client.call(com.atproto.server.getSession, {})
+
+    expect(
+      headersFor(fetchMock, 'com.atproto.server.getSession').get(
+        'authorization',
+      ),
+    ).toBe('Bearer access-jwt')
+  })
+
+  it('passes through the session did', () => {
+    const session = makeSession(fetchMock)
+    expect(routeSessionToPds(session, PDS_HOST).did).toBe(DID)
+  })
+
+  it('pins the stored host even when the session carries a different didDoc endpoint', async () => {
+    /*
+     * The narrowing this shim accepts versus the session manager it replaces:
+     * the manager preferred a didDoc endpoint once one arrived, whereas an
+     * absolute URL handed to `session.fetchHandler` survives `new URL(path,
+     * base)` untouched, so the stored host wins for the bundle's lifetime. That
+     * only matters if the account's PDS moved, and the next cold start pins the
+     * newly persisted endpoint.
+     */
+    const session = makeSession(fetchMock, DIDDOC_PDS_HOST)
+    const client = buildPdsClient(routeSessionToPds(session, PDS_HOST))
+
+    await client.call(com.atproto.server.getSession, {})
+
+    expect(urlsOf(fetchMock)).toEqual([
+      `${PDS_HOST}/xrpc/com.atproto.server.getSession`,
+    ])
+  })
+
+  it('lets the session route by didDoc when nothing is pinned', async () => {
+    /*
+     * The counterpart: a bundle built with no stored `pdsUrl` goes straight over
+     * the session, which resolves against its own didDoc endpoint.
+     */
+    const client = buildPdsClient(makeSession(fetchMock, DIDDOC_PDS_HOST))
+
+    await client.call(com.atproto.server.getSession, {})
+
+    expect(urlsOf(fetchMock)).toEqual([
+      `${DIDDOC_PDS_HOST}/xrpc/com.atproto.server.getSession`,
+    ])
   })
 })
 
diff --git a/src/state/session/__tests__/provider-clients-test.tsx b/src/state/session/__tests__/provider-clients-test.tsx
index 58ea9ad6fe..d10af7a12b 100644
--- a/src/state/session/__tests__/provider-clients-test.tsx
+++ b/src/state/session/__tests__/provider-clients-test.tsx
@@ -72,11 +72,10 @@ import {
   useSessionApi,
 } from '#/state/session'
 import {type SessionApiContext} from '#/state/session/types'
-import {BskyAppAgent, PasswordSessionManager} from '../bridge-agent'
 import {
-  agentToAppviewClient,
-  agentToChatClient,
-  agentToPdsClient,
+  buildAppviewClient,
+  buildChatClient,
+  buildPdsClient,
   getUnauthenticatedThrowingClient,
 } from '../clients'
 import {type SessionBundle} from '../session-core'
@@ -92,22 +91,19 @@ type Clients = {
 }
 
 /**
- * Build a bundle whose agent is a real `BskyAppAgent` over a real
- * `PasswordSession`, since the client builders derive from the agent. Only the
- * fields the provider reads are populated.
+ * Build a bundle over a real `PasswordSession`, with the three clients the
+ * provider serves. Only the fields the provider reads are populated.
  */
 function makeBundle(account: SessionAccount): SessionBundle {
   const fetchMock = makeMockFetch()
   const session = new PasswordSession(sessionAccountToSessionData(account), {
     fetch: asFetch(fetchMock),
   })
-  const manager = new PasswordSessionManager(session, {
-    service: account.service,
-  })
-  manager.setFetch(asFetch(fetchMock))
   return {
     session,
-    agent: new BskyAppAgent(manager),
+    appviewClient: buildAppviewClient(session),
+    pdsClient: buildPdsClient(session),
+    chatClient: buildChatClient(session),
     service: new URL(account.service),
   }
 }
@@ -140,10 +136,10 @@ beforeEach(() => {
 })
 
 describe('client hooks while logged out', () => {
-  it('serves the public agent for appview reads', () => {
+  it('serves the public client for appview reads', () => {
     const {clients} = renderClients()
     expect(clients().appview).toBeDefined()
-    /* the logged-out bundle's agent IS the public agent, so no separate branch */
+    /* the logged-out bundle holds the public appview client itself */
     expect(clients().appview.did).toBeUndefined()
   })
 
@@ -162,7 +158,7 @@ describe('client hooks while logged out', () => {
 })
 
 describe('client hooks with a session', () => {
-  it('derives every surface from the session bundle agent', async () => {
+  it('serves every surface straight off the session bundle', async () => {
     const account = makeAccount()
     const bundle = makeBundle(account)
     const {api, clients} = renderClients()
@@ -172,9 +168,9 @@ describe('client hooks with a session', () => {
       await api.login({} as never, 'LoginForm')
     })
 
-    expect(clients().appview).toBe(agentToAppviewClient(bundle.agent))
-    expect(clients().pds).toBe(agentToPdsClient(bundle.agent))
-    expect(clients().chat).toBe(agentToChatClient(bundle.agent))
+    expect(clients().appview).toBe(bundle.appviewClient)
+    expect(clients().pds).toBe(bundle.pdsClient)
+    expect(clients().chat).toBe(bundle.chatClient)
   })
 
   it('serves the same clients from the maybe variants', async () => {
diff --git a/src/state/session/__tests__/provider-refresh-session-test.tsx b/src/state/session/__tests__/provider-refresh-session-test.tsx
index 6b1e10bdec..2b7bd1c4cb 100644
--- a/src/state/session/__tests__/provider-refresh-session-test.tsx
+++ b/src/state/session/__tests__/provider-refresh-session-test.tsx
@@ -63,7 +63,7 @@ jest.mock('../create-account', () => ({
 
 import {Provider, useSession, useSessionApi} from '#/state/session'
 import {type SessionApiContext} from '#/state/session/types'
-import {BskyAppAgent, PasswordSessionManager} from '../bridge-agent'
+import {buildAppviewClient, buildChatClient, buildPdsClient} from '../clients'
 import {type SessionBundle} from '../session-core'
 import {sessionAccountToSessionData} from '../session-data'
 import {
@@ -87,13 +87,11 @@ function makeBundle(
   const session = new PasswordSession(sessionAccountToSessionData(account), {
     fetch: asFetch(fetchMock),
   })
-  const manager = new PasswordSessionManager(session, {
-    service: account.service,
-  })
-  manager.setFetch(asFetch(fetchMock))
   return {
     session,
-    agent: new BskyAppAgent(manager),
+    appviewClient: buildAppviewClient(session),
+    pdsClient: buildPdsClient(session),
+    chatClient: buildChatClient(session),
     service: new URL(account.service),
   }
 }
diff --git a/src/state/session/__tests__/session-core-test.ts b/src/state/session/__tests__/session-core-test.ts
index 52484dcf72..3503acd08a 100644
--- a/src/state/session/__tests__/session-core-test.ts
+++ b/src/state/session/__tests__/session-core-test.ts
@@ -59,17 +59,17 @@ jest.mock('#/analytics', () => ({
 /*
  * `configureModerationForAccount` is synchronous (the labeler cache is a local
  * MMKV read), so it is not a prep await - but it still runs inside each factory
- * with the freshly built bridge agent, before the awaited prep steps. The
- * factory tests capture the agent with this mock, then inject a real refresh
- * into the awaited AA prefetch so a token rotation happens during prep, before
- * arm(). The default is a no-op so other tests are unaffected.
+ * with the freshly built bundle, before the awaited prep steps. The factory
+ * tests capture the bundle with this mock, then inject a real refresh into the
+ * awaited AA prefetch so a token rotation happens during prep, before arm().
+ * The default is a no-op so other tests are unaffected.
  * (jest requires out-of-scope factory references to be `mock`-prefixed.)
  */
 const mockConfigureModerationForAccount =
-  jest.fn<(agent: unknown, account: unknown) => void>()
+  jest.fn<(bundle: unknown, account: unknown) => void>()
 jest.mock('../moderation', () => ({
-  configureModerationForAccount: (agent: unknown, account: unknown) =>
-    mockConfigureModerationForAccount(agent, account),
+  configureModerationForAccount: (bundle: unknown, account: unknown) =>
+    mockConfigureModerationForAccount(bundle, account),
   configureModerationForGuest: () => {},
 }))
 
@@ -90,7 +90,6 @@ jest.mock('jwt-decode', () => ({
   },
 }))
 
-import {type BskyAppAgent} from '../bridge-agent'
 import {
   type AtpSessionEvent,
   buildBundle,
@@ -365,22 +364,23 @@ describe('sessionAccountToSessionData', () => {
 })
 
 describe('createSessionBundleFromStoredAccount', () => {
-  it('builds a bridge agent over one session', () => {
+  it('builds three clients over one session', async () => {
     const result = createSessionBundleFromStoredAccount(
       makeAccount(),
       jest.fn(),
     )!
 
-    /* the agent reads its identity straight through the shared session */
-    expect(result.bundle.agent.session?.accessJwt).toBe('access-jwt')
-    expect(result.bundle.agent.did).toBe(DID)
-    expect(result.bundle.agent.sessionManager.session).toBe(
-      result.bundle.agent.session,
-    )
+    /* every client reads its identity straight through the shared session */
+    expect(result.bundle.session.session.accessJwt).toBe('access-jwt')
+    expect(result.bundle.appviewClient.did).toBe(DID)
+    expect(result.bundle.pdsClient.did).toBe(DID)
+    expect(result.bundle.chatClient.did).toBe(DID)
     expect(result.bundle.service.toString()).toBe(`${SERVICE}/`)
     disposeBundle(result.bundle)
-    /* disposal detaches the agent from the session */
-    expect(result.bundle.agent.session).toBe(undefined)
+    /* disposal disables the transport every client shares */
+    await expect(
+      result.bundle.session.fetchHandler('/xrpc/test', {}),
+    ).rejects.toThrow('session disposed')
   })
 
   it('disposes a bundle rejected by the activation guard', async () => {
@@ -836,15 +836,14 @@ describe('factory account snapshot after preparation', () => {
      * captured from the (synchronous) moderation call, and the rotation is
      * injected into the awaited AA prefetch.
      */
-    let capturedAgent: BskyAppAgent | undefined
+    let capturedBundle: SessionBundle | undefined
     mockConfigureModerationForAccount.mockImplementationOnce(
       (bundle: unknown) => {
-        capturedAgent = (bundle as {agent: BskyAppAgent}).agent
+        capturedBundle = bundle as SessionBundle
       },
     )
     mockPrefetchAgeAssuranceServerData.mockImplementationOnce(async () => {
-      /* routes through the bridge into the shared PasswordSession's refresh */
-      await capturedAgent!.sessionManager.refreshSession()
+      await capturedBundle!.session.refresh()
     })
     const fetchMock = makeMockFetch()
 
@@ -902,14 +901,14 @@ describe('a session destroyed or rejected during preparation', () => {
      * way to drive a session to `destroyed` from outside, and it takes the same
      * `deleteSession` -> onDeleted -> destroyed path the real 401 rescue does.
      */
-    let capturedAgent: BskyAppAgent | undefined
+    let capturedBundle: SessionBundle | undefined
     mockConfigureModerationForAccount.mockImplementationOnce(
       (bundle: unknown) => {
-        capturedAgent = (bundle as {agent: BskyAppAgent}).agent
+        capturedBundle = bundle as SessionBundle
       },
     )
     mockPrefetchAgeAssuranceServerData.mockImplementationOnce(async () => {
-      await capturedAgent!.logout()
+      await capturedBundle!.session.logout()
     })
     const fetchMock = makeMockFetch()
 
@@ -927,15 +926,15 @@ describe('a session destroyed or rejected during preparation', () => {
       ).rejects.toThrow('Session was revoked while it was being prepared')
 
       /* the bundle the caller never received reads as logged out */
-      expect(capturedAgent!.session).toBe(undefined)
+      expect(capturedBundle!.session.destroyed).toBe(true)
     })
   })
 
   it('resume: a prep rejection propagates and disposes the bundle', async () => {
-    let capturedAgent: BskyAppAgent | undefined
+    let capturedBundle: SessionBundle | undefined
     mockConfigureModerationForAccount.mockImplementationOnce(
       (bundle: unknown) => {
-        capturedAgent = (bundle as {agent: BskyAppAgent}).agent
+        capturedBundle = bundle as SessionBundle
       },
     )
     mockPrefetchAgeAssuranceServerData.mockImplementationOnce(() =>
@@ -952,7 +951,9 @@ describe('a session destroyed or rejected during preparation', () => {
       ).rejects.toThrow('prefetch blew up')
 
       /* the still-live session was disposed rather than left refreshing */
-      expect(capturedAgent!.session).toBe(undefined)
+      await expect(
+        capturedBundle!.session.fetchHandler('/xrpc/test', {}),
+      ).rejects.toThrow('session disposed')
     })
   })
 
@@ -964,7 +965,12 @@ describe('a session destroyed or rejected during preparation', () => {
     })
     const session = new PasswordSession(
       sessionAccountToSessionData(makeAccount()),
-      {...hooks, fetch: asFetch(makeMockFetch())},
+      /*
+       * The hooks' own `fetch` is what the kill switch disables, so it must not
+       * be overridden here. Nothing in this test reaches the network: the
+       * post-disposal `fetchHandler` call throws before dispatching.
+       */
+      hooks,
     )
     const bundle = buildBundle(session)
     registerBundleKillSwitch(bundle, hooks.kill)
@@ -975,7 +981,9 @@ describe('a session destroyed or rejected during preparation', () => {
     ).rejects.toThrow('nope')
 
     expect(snapshot).not.toHaveBeenCalled()
-    expect(bundle.agent.session).toBe(undefined)
+    await expect(bundle.session.fetchHandler('/xrpc/test', {})).rejects.toThrow(
+      'session disposed',
+    )
   })
 })
 
diff --git a/src/state/session/additional-moderation-authorities.ts b/src/state/session/additional-moderation-authorities.ts
index 3f3566c5c6..76d1039610 100644
--- a/src/state/session/additional-moderation-authorities.ts
+++ b/src/state/session/additional-moderation-authorities.ts
@@ -1,4 +1,3 @@
-import {AtpAgent} from '@atproto/api'
 import {Client} from '@atproto/lex'
 
 import {device} from '#/storage'
@@ -83,27 +82,27 @@ export function configureAdditionalModerationAuthorities() {
     additionalLabelers = []
   }
 
+  /*
+   * Merge with whatever is already on the static rather than replacing it, so
+   * `switchToBskyAppLabeler`'s entry survives.
+   */
   const appLabelers = Array.from(
-    new Set([...AtpAgent.appLabelers, ...additionalLabelers]),
+    new Set<string>([...Client.appLabelers, ...additionalLabelers]),
   )
 
   configureGlobalAppLabelers(appLabelers)
 }
 
 /**
- * Set the global app labelers on BOTH statics, so the agent-backed request path
- * and any client built without a wrapped agent emit the same `;redact`
- * authorities.
+ * Set the global app labelers on the lex `Client` static, which every client
+ * reads, so a request carries the same `;redact` authorities whether or not
+ * there is a session behind it.
  *
- * Keeping the two in lockstep is what makes the duplicate-header hazard
- * avoidable: the agent joins its own list with whatever the caller already put
- * on the request, and lex appends the `Client` static on top of that, so a DID
- * present in both would appear twice. The agent-wrapping clients therefore
- * suppress their `appLabelers` (see `clients.ts`), which leaves exactly one
- * producer per request while both statics stay populated for the paths that
- * read only one of them.
+ * It is a single global producer by design. The PDS and chat clients opt out
+ * with `appLabelers: null` (see `clients.ts`) because those services take no
+ * moderation authorities, leaving exactly one producer on an appview request and
+ * none elsewhere.
  */
 export function configureGlobalAppLabelers(dids: string[]) {
-  AtpAgent.configure({appLabelers: dids})
   Client.configure({appLabelers: dids as `did:${string}:${string}`[]})
 }
diff --git a/src/state/session/agent.ts b/src/state/session/agent.ts
deleted file mode 100644
index 7246454ed2..0000000000
--- a/src/state/session/agent.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import {
-  Agent as BaseAgent,
-  type AtprotoServiceType,
-  type Did,
-} from '@atproto/api'
-
-export type ProxyHeaderValue = `${Did}#${AtprotoServiceType}`
-
-/**
- * A bare `Agent` that applies a service-proxy header on construction.
- *
- * Used for the unauthenticated, service-specific calls that cannot go through
- * the session agent (PDS detection, password reset, handle availability).
- */
-export class Agent extends BaseAgent {
-  constructor(
-    proxyHeader: ProxyHeaderValue | null,
-    ...options: ConstructorParameters<typeof BaseAgent>
-  ) {
-    super(...options)
-    if (proxyHeader) {
-      this.configureProxy(proxyHeader)
-    }
-  }
-}
diff --git a/src/state/session/bridge-agent.ts b/src/state/session/bridge-agent.ts
deleted file mode 100644
index 0c692a6c17..0000000000
--- a/src/state/session/bridge-agent.ts
+++ /dev/null
@@ -1,442 +0,0 @@
-import {
-  AtpAgent,
-  type AtpAgentLoginOpts,
-  type AtpSessionData,
-  type ComAtprotoServerCreateAccount,
-  type ComAtprotoServerCreateSession,
-  type ComAtprotoServerRefreshSession,
-  CredentialSession,
-} from '@atproto/api'
-import {
-  type PasswordSession,
-  type SessionData,
-} from '@atproto/lex-password-session'
-
-import {BLUESKY_PROXY_HEADER, PUBLIC_BSKY_SERVICE} from '#/lib/constants'
-import {configureModerationForGuest} from './moderation'
-import {networkAwareFetch} from './network'
-
-const UNSUPPORTED =
-  'Not supported on PasswordSessionManager; use the session factories in session-core'
-
-/**
- * Convert live `PasswordSession` session data into the `AtpSessionData` shape
- * that `CredentialSession.session` consumers expect.
- *
- * The only real adaptation is `active`: `AtpSessionData` requires it, while the
- * lexicon payload leaves it optional (absent means active, per the lexicon
- * docs).
- */
-function toAtpSessionData(d: SessionData): AtpSessionData {
-  return {
-    refreshJwt: d.refreshJwt,
-    accessJwt: d.accessJwt,
-    handle: d.handle,
-    did: d.did,
-    email: d.email,
-    emailConfirmed: d.emailConfirmed,
-    emailAuthFactor: d.emailAuthFactor,
-    active: d.active ?? true,
-    status: d.status,
-  }
-}
-
-/**
- * Parse a URL without throwing.
- */
-function parseUrl(input: string): URL | undefined {
-  try {
-    return new URL(input)
-  } catch {
-    return undefined
-  }
-}
-
-/**
- * Read a property off an unknown value the way JS optional chaining would,
- * without narrowing assumptions about the shape of a `LexMap`.
- */
-function prop(value: unknown, key: string): unknown {
-  return typeof value === 'object' && value !== null
-    ? (value as Record<string, unknown>)[key]
-    : undefined
-}
-
-/**
- * The PDS endpoint declared by a DID document, or `undefined`.
- *
- * This deliberately mirrors `extractPdsUrl` in `@atproto/lex-password-session`,
- * which is the predicate `PasswordSession` uses to route its own requests: the
- * first service entry whose `id` ends with `#atproto_pds`, taking its
- * `serviceEndpoint` if it parses as a URL. It is looser than the
- * `isValidDidDoc` + `getPdsEndpoint` pair from `@atproto/common-web` (no doc
- * schema validation, no `type` check), and that is the point - a stricter
- * predicate here would let `dispatchUrl` disagree with the host requests
- * actually go to, which in turn mints service-auth tokens (video upload) for
- * the wrong audience.
- */
-function extractPdsUrl(didDoc: SessionData['didDoc']): URL | undefined {
-  const services = prop(didDoc, 'service')
-  if (!Array.isArray(services)) {
-    return undefined
-  }
-  /*
-   * `find`, not a scan: the inner session stops at the first `#atproto_pds`
-   * entry and gives up if its endpoint does not parse, rather than falling
-   * through to a later entry.
-   */
-  const pds = services.find(service => {
-    const id = prop(service, 'id')
-    return typeof id === 'string' && id.endsWith('#atproto_pds')
-  })
-  const endpoint = prop(pds, 'serviceEndpoint')
-  return typeof endpoint === 'string' ? parseUrl(endpoint) : undefined
-}
-
-/**
- * A `CredentialSession` whose auth core is a `PasswordSession`.
- *
- * This is the compat shim that lets a `PasswordSession` sit under `AtpAgent`:
- * every call site that reads `agent.session`, `agent.pdsUrl`,
- * `agent.dispatchUrl`, `agent.did` or calls `agent.resumeSession()` keeps
- * working, while the actual tokens, refresh serialization and PDS routing live
- * in the `PasswordSession` underneath.
- *
- * A `null` inner session means "logged out" - the public/guest agent. In that
- * mode requests still go out (unauthenticated) through the inherited `fetch`.
- */
-export class PasswordSessionManager extends CredentialSession {
-  #inner: PasswordSession | null
-  #storedPdsUrl: URL | undefined
-  #disposed = false
-
-  /*
-   * Identity caches for the two pull-through accessors. Each holds the
-   * `SessionData` it was derived from so a repeated read returns the very same
-   * object (see the note on identity stability below). Keying on the whole
-   * `SessionData` rather than the individual field works because
-   * `PasswordSession` replaces the object wholesale on every rotation.
-   */
-  #sessionSource: SessionData | undefined
-  #sessionValue: AtpSessionData | undefined
-  #pdsSource: SessionData | undefined
-  #pdsValue: URL | undefined
-
-  constructor(
-    inner: PasswordSession | null,
-    {service, pdsUrl}: {service: string; pdsUrl?: string},
-  ) {
-    /*
-     * `persistSession` is deliberately undefined: the inner `PasswordSession`
-     * owns persistence through its own hooks, and none of the inherited methods
-     * that would call this handler survive the overrides below.
-     */
-    super(new URL(service), networkAwareFetch, undefined)
-
-    this.#inner = inner
-    this.#storedPdsUrl = pdsUrl ? parseUrl(pdsUrl) : undefined
-
-    /*
-     * `session` and `pdsUrl` are pull-through accessors over the inner session
-     * rather than mirrored values, installed here with `defineProperty` for two
-     * reasons.
-     *
-     * Why accessors at all: a mirror has to be written on every token rotation,
-     * and any missed write silently serves stale tokens. Pulling through cannot
-     * drift.
-     *
-     * Why `defineProperty` and not `get session()` in the class body: the
-     * parent declares `session` and `pdsUrl` as *properties*, and TypeScript
-     * rejects overriding a property with an accessor (TS2611). Installing them
-     * at runtime sidesteps that, and it is safe as long as
-     * `CredentialSession`'s emitted constructor does not assign either one
-     * (both are declaration-only), so there is nothing to clobber and no
-     * ordering hazard.
-     *
-     * For the same reason this class must NOT redeclare `session`/`pdsUrl` as
-     * fields: under `useDefineForClassFields` semantics (target esnext) a field
-     * declaration emits an own-property definition that would overwrite these
-     * accessors with `undefined`.
-     */
-    Object.defineProperty(this, 'session', {
-      configurable: true,
-      get: () => this.#readSession(),
-      set: () => {
-        throw new Error('PasswordSessionManager.session is read-only')
-      },
-    })
-    Object.defineProperty(this, 'pdsUrl', {
-      configurable: true,
-      get: () => this.#readPdsUrl(),
-      set: () => {
-        throw new Error('PasswordSessionManager.pdsUrl is read-only')
-      },
-    })
-  }
-
-  /**
-   * The inner session's live data, or `undefined` when there is nothing to read
-   * from.
-   *
-   * `PasswordSession`'s `session`/`did`/`handle` getters *throw* `Logged out`
-   * once the session has been destroyed. Every read in this class funnels
-   * through here so that failure mode can never escape into the app, which
-   * reads `agent.session` from render paths.
-   */
-  #liveData(): SessionData | undefined {
-    if (this.#disposed || !this.#inner || this.#inner.destroyed) {
-      return undefined
-    }
-    return this.#inner.session
-  }
-
-  /**
-   * The `session` accessor's implementation.
-   *
-   * Identity-cached on the source `SessionData`: consecutive reads with no
-   * intervening token rotation return the same object, and a rotation produces
-   * a new one. `CredentialSession` declares `session` as a plain field, so
-   * consumers are entitled to treat it as a value whose identity changes only
-   * when the session does; this class is read from render paths, and returning
-   * a freshly allocated object on every read would break that expectation for
-   * any memo, dependency array or reference comparison built on top of it.
-   */
-  #readSession(): AtpSessionData | undefined {
-    const live = this.#liveData()
-    if (!live) {
-      this.#sessionSource = undefined
-      this.#sessionValue = undefined
-      return undefined
-    }
-    if (live !== this.#sessionSource) {
-      this.#sessionSource = live
-      this.#sessionValue = toAtpSessionData(live)
-    }
-    return this.#sessionValue
-  }
-
-  /**
-   * The `pdsUrl` accessor's implementation.
-   *
-   * The DID document's PDS endpoint wins when there is one, derived with
-   * {@link extractPdsUrl} so this agrees exactly with the inner session's own
-   * routing. Before the first refresh delivers a didDoc (the non-expired resume
-   * fast path, which makes no network call) we fall back to the `pdsUrl`
-   * persisted on the account, so the very first requests still reach the right
-   * host - entryway accounts have `service: bsky.social` but live on a
-   * different PDS.
-   *
-   * Identity-cached on the didDoc for the same reason as `session`.
-   */
-  #readPdsUrl(): URL | undefined {
-    const live = this.#liveData()
-    if (!live) {
-      this.#pdsSource = undefined
-      this.#pdsValue = undefined
-      return undefined
-    }
-    if (live !== this.#pdsSource) {
-      this.#pdsSource = live
-      this.#pdsValue = extractPdsUrl(live.didDoc) ?? this.#storedPdsUrl
-    }
-    return this.#pdsValue
-  }
-
-  /*
-   * `did`, `hasSession` and `dispatchUrl` are deliberately NOT overridden: the
-   * inherited getters read `this.session` / `this.pdsUrl`, which resolve
-   * through the accessors above, so they are already live.
-   */
-
-  override async fetchHandler(
-    url: string,
-    init?: RequestInit,
-  ): Promise<Response> {
-    /*
-     * Absolutizing against `dispatchUrl` routes to the stored PDS on the resume
-     * fast path and to the didDoc PDS from the first refresh onwards, since
-     * `PasswordSession` resolves an already absolute URL against its own base
-     * as a no-op.
-     */
-    const target = new URL(url, this.dispatchUrl)
-    const inner = this.#disposed ? null : this.#inner
-
-    /*
-     * A caller that set its own `authorization` header bypasses the inner
-     * session entirely. This is mandatory: `PasswordSession.fetchHandler`
-     * throws `TypeError` on a pre-set authorization header rather than
-     * deferring to it.
-     *
-     * Bypassing also means these requests get no refresh-on-401 retry, since
-     * that lives in `PasswordSession.fetchHandler`. That is intentional: the
-     * caller supplied its own credential (a service-auth token, say), so
-     * rotating the session's tokens would not make the request any more likely
-     * to succeed on a retry.
-     */
-    if (
-      !inner ||
-      inner.destroyed ||
-      new Headers(init?.headers).has('authorization')
-    ) {
-      return (0, this.fetch)(target, init)
-    }
-
-    /*
-     * `init ?? {}` because `PasswordSession.fetchHandler` reads `init.headers`
-     * unguarded, while the inherited signature makes `init` optional.
-     */
-    return inner.fetchHandler(target.href, init ?? {})
-  }
-
-  /**
-   * Refresh the session, rejecting if nothing was refreshed.
-   *
-   * This restores the contract of the `CredentialSession.refreshSession` this
-   * class replaces, which rejected on any refresh failure.
-   * `PasswordSession.refresh()` does not: on a transient failure (a 500, a
-   * network error) it reports through `onUpdateFailure` and then *resolves*
-   * with the unchanged session data, reserving rejection for the cases where
-   * the session is definitively gone. Callers here read resolution as "tokens
-   * rotated" - `SignupQueued` refreshes and then re-checks the token scope, and
-   * the various verification dialogs refresh and then close - so a resolved
-   * no-op would silently loop or report success.
-   *
-   * The signal is the identity of the returned `SessionData`, not a field
-   * comparison: `PasswordSession` builds a brand new object on every successful
-   * rotation and returns the existing one untouched on a transient failure, so
-   * identity separates the two exactly. Comparing against the data captured
-   * immediately before the call also gets concurrent refreshes right - if
-   * another caller's refresh rotated the tokens while ours was queued behind it
-   * (`PasswordSession` serializes refreshes), the data we get back still
-   * differs from what we captured, which is a success for our caller.
-   */
-  override async refreshSession(): Promise<ComAtprotoServerRefreshSession.Response> {
-    const inner = this.#disposed ? null : this.#inner
-    if (!inner || inner.destroyed) {
-      throw new Error('No session to refresh')
-    }
-    const before = this.#liveData()
-    const data = await inner.refresh()
-    if (data === before) {
-      throw new Error('Failed to refresh session')
-    }
-    /*
-     * Re-shape the lex payload into the `@atproto/api` XRPC response envelope.
-     * `headers` is empty because the inner session does not surface response
-     * headers, and no caller in this app reads them off a refresh.
-     */
-    return {
-      success: true,
-      headers: {},
-      data: {
-        accessJwt: data.accessJwt,
-        refreshJwt: data.refreshJwt,
-        handle: data.handle,
-        did: data.did,
-        didDoc: data.didDoc,
-        email: data.email,
-        emailConfirmed: data.emailConfirmed,
-        emailAuthFactor: data.emailAuthFactor,
-        active: data.active,
-        status: data.status,
-      },
-    }
-  }
-
-  /**
-   * Force a refresh, ignoring the passed-in session data.
-   *
-   * The inner session already owns its tokens, so there is nothing to install;
-   * every call site in the app uses `resumeSession` as "refresh my session
-   * now". The returned envelope is the refresh one, which is structurally a
-   * superset of `ComAtprotoServerGetSession.Response` (the shape `AtpAgent`
-   * advertises), so both layers stay type-correct.
-   *
-   * It inherits {@link PasswordSessionManager.refreshSession}'s contract, so it
-   * rejects rather than resolving when no tokens were rotated.
-   */
-  override resumeSession(
-    _session: AtpSessionData,
-  ): Promise<ComAtprotoServerRefreshSession.Response> {
-    return this.refreshSession()
-  }
-
-  override async logout(): Promise<void> {
-    const inner = this.#inner
-    if (!inner || inner.destroyed) {
-      return
-    }
-    try {
-      await inner.logout()
-    } catch {
-      /* matches the parent, which swallows delete-session failures */
-    }
-  }
-
-  override login(
-    _opts: AtpAgentLoginOpts,
-  ): Promise<ComAtprotoServerCreateSession.Response> {
-    return Promise.reject(new Error(UNSUPPORTED))
-  }
-
-  override createAccount(
-    _data: ComAtprotoServerCreateAccount.InputSchema,
-    _opts?: ComAtprotoServerCreateAccount.CallOptions,
-  ): Promise<ComAtprotoServerCreateAccount.Response> {
-    return Promise.reject(new Error(UNSUPPORTED))
-  }
-
-  /**
-   * Detach this manager from its inner session.
-   *
-   * All reads then behave as logged out and requests fall back to the
-   * unauthenticated `fetch` path. The inner session is left alone: it may still
-   * be shared, and logging out is a separate, explicit operation.
-   */
-  dispose() {
-    this.#disposed = true
-  }
-}
-
-/*
- * Declaration merging to narrow the inherited `sessionManager` (typed as
- * `CredentialSession` by `AtpAgent`) to the manager `BskyAppAgent` actually
- * receives. A `declare` class field would be the direct way to say this, but
- * babel's TypeScript transform rejects `declare` fields in this config, and a
- * `get sessionManager()` override is forbidden because the parent declares it
- * as a property (TS2611). The merge is sound: the constructor passes the
- * manager straight to `super`, which assigns it.
- */
-// eslint-disable-next-line typescript/no-unsafe-declaration-merging
-export interface BskyAppAgent {
-  readonly sessionManager: PasswordSessionManager
-}
-
-/**
- * The app's `AtpAgent`, backed by a `PasswordSession`.
- *
- * Everything interesting lives in {@link PasswordSessionManager}; this exists
- * so `useAgent()` consumers keep getting a real `AtpAgent` (proxy headers,
- * labeler headers, the `app`/`com`/`chat` namespaces) and so the agent can be
- * disposed alongside its session.
- */
-export class BskyAppAgent extends AtpAgent {
-  constructor(manager: PasswordSessionManager) {
-    super(manager)
-  }
-
-  dispose() {
-    this.sessionManager.dispose()
-  }
-}
-
-/** Build the logged-out agent used for public/guest browsing. */
-export function createPublicAgent() {
-  configureModerationForGuest() // Side effect but only relevant for tests
-
-  const agent = new BskyAppAgent(
-    new PasswordSessionManager(null, {service: PUBLIC_BSKY_SERVICE}),
-  )
-  agent.configureProxy(BLUESKY_PROXY_HEADER.get())
-  return agent
-}
diff --git a/src/state/session/clients.ts b/src/state/session/clients.ts
index fab530aba2..026b2d8bd8 100644
--- a/src/state/session/clients.ts
+++ b/src/state/session/clients.ts
@@ -1,132 +1,102 @@
-import {type Client} from '@atproto/lex'
+import {type Agent, type Client} from '@atproto/lex'
+import {type PasswordSession} from '@atproto/lex-password-session'
 
-import {CHAT_PROXY_SERVICE, PUBLIC_BSKY_SERVICE} from '#/lib/constants'
+import {
+  BLUESKY_PROXY_HEADER,
+  CHAT_PROXY_SERVICE,
+  PUBLIC_BSKY_SERVICE,
+} from '#/lib/constants'
 import {createLexClient} from '#/lib/lexClient'
-import {type BskyAppAgent} from './bridge-agent'
 import {networkAwareFetch} from './network'
 
-/*
- * One client per agent, per surface, so that repeated reads for the same agent
- * return the same instance. Client identity is observable: a lex `Client` is
- * passed to React Query `queryFn`s and read from render paths, so a freshly
- * allocated client on every read would break any dependency array or reference
- * comparison built on top of it.
- *
- * Keying on the agent also ties client lifetime to agent lifetime. A disposed
- * agent's `fetchHandler` falls back to unauthenticated fetch, and session
- * rotation builds a new agent rather than mutating the old one, so a client
- * derived from a stale agent becomes unreachable exactly when its agent does.
- */
-const appviewClients = new WeakMap<BskyAppAgent, Client>()
-const pdsClients = new WeakMap<BskyAppAgent, Client>()
-const chatClients = new WeakMap<BskyAppAgent, Client>()
-
 /**
- * The appview {@link Client} for an agent, memoized per agent.
+ * Build the signed-in appview {@link Client}.
  *
- * The wrapped handler is `agent.fetchHandler`, NOT
- * `agent.sessionManager.fetchHandler`. The agent-level handler is where
- * `atproto-proxy` and `atproto-accept-labelers` are set before the request is
- * passed down to the session manager, which only adds authorization and PDS
- * routing. Because the agent already emits both headers, the client is
- * deliberately built with neither a `service` option nor labelers - setting
- * either here would emit them a second time.
+ * {@link BLUESKY_PROXY_HEADER} is passed as the client's `service`, so lex sets
+ * `atproto-proxy: <that value>` on every request and raw calls are proxied to
+ * the appview. Record helpers force `service: null`, so they still target the
+ * account host.
  *
- * `appLabelers: null` suppresses the class-wide `Client.appLabelers` for this
- * instance specifically. The static is populated (see
- * `configureGlobalAppLabelers`) so that clients built without a wrapped agent
- * carry the global authorities, but the agent already stamped those same DIDs
- * onto the request, and lex would append its own copy on top: the agent joins
- * its list with the existing header value while lex collects into a `Set` keyed
- * on the suffixed string, so neither dedupes against the other and every global
- * authority would appear twice.
+ * The class-wide `Client.appLabelers` static is deliberately NOT suppressed
+ * here: this client is the only producer of `atproto-accept-labelers` on an
+ * appview request now that no agent sits underneath it. The account's own
+ * subscriptions arrive separately, through `applyLabelersToClient` on the
+ * instance, and that function filters out the Bluesky moderation DID so the
+ * globally redacted authority is not also listed unredacted.
+ *
+ * No `fetch` option: a client built over a session uses that session's own
+ * fetch, which is `networkAwareFetch` wrapped in the disposal kill switch.
  */
-export function agentToAppviewClient(agent: BskyAppAgent): Client {
-  const existing = appviewClients.get(agent)
-  if (existing) {
-    return existing
-  }
-  const client = createLexClient(
-    {
-      get did() {
-        return agent.did
-      },
-      fetchHandler: (path, init) => agent.fetchHandler(path, init),
-    },
-    {appLabelers: null},
-  )
-  appviewClients.set(agent, client)
-  return client
+export function buildAppviewClient(agent: Agent): Client {
+  return createLexClient(agent, {service: BLUESKY_PROXY_HEADER.get()})
 }
 
 /**
- * The account-host {@link Client} for an agent, memoized per agent.
+ * Build the signed-in account-host {@link Client}.
  *
- * This wraps `agent.sessionManager.fetchHandler`, one layer below
- * {@link agentToAppviewClient}. That layer does authorization and refresh-on-401
- * and resolves the request against `dispatchUrl` (the account's PDS), but it
- * does NOT set `atproto-proxy` or `atproto-accept-labelers`, so requests reach
- * the PDS itself rather than being proxied onward. That is the right transport
- * for `com.atproto.*` repo/server/identity calls.
+ * No `service`, so no proxy header: `com.atproto.*` repo, server and identity
+ * calls reach the account's own PDS rather than being proxied onward.
  *
- * No `service` option for the same reason: adding one would reintroduce the
- * proxy header this client exists to avoid. `appLabelers: null` is the same
- * kind of suppression: a PDS request is not an appview read, so it must carry no
- * moderation authorities at all - without this it would start emitting the
- * global `Client.appLabelers`.
- *
- * The handler is wrapped in a closure rather than passed by reference because
- * `PasswordSessionManager.fetchHandler` reads `this`. Relative paths are
- * intentional: lex-client hands its handler an origin-less
- * `/xrpc/<nsid>[?query]` path, which the session manager absolutizes against
- * `dispatchUrl`.
+ * `appLabelers: null` suppresses the class-wide static for this instance. A PDS
+ * request is not an appview read, so it must carry no moderation authorities at
+ * all; without the suppression it would start emitting the global list.
  */
-export function agentToPdsClient(agent: BskyAppAgent): Client {
-  const existing = pdsClients.get(agent)
-  if (existing) {
-    return existing
-  }
-  const client = createLexClient(
-    {
-      get did() {
-        return agent.did
-      },
-      fetchHandler: (path, init) =>
-        agent.sessionManager.fetchHandler(path, init),
-    },
-    {appLabelers: null},
-  )
-  pdsClients.set(agent, client)
-  return client
+export function buildPdsClient(agent: Agent): Client {
+  return createLexClient(agent, {appLabelers: null})
 }
 
 /**
- * The chat {@link Client} for an agent, memoized per agent.
+ * Build the signed-in chat {@link Client}.
  *
- * Same session-manager transport as {@link agentToPdsClient} - authorization
- * and PDS routing, no agent-level proxy or labeler headers - but constructed
- * with {@link CHAT_PROXY_SERVICE} as its `service`, so lex-client emits
- * `atproto-proxy: <CHAT_PROXY_SERVICE>` on every request and `chat.bsky.*`
- * calls are proxied to the chat service. `appLabelers: null` for the same
- * reason as the PDS client: the chat service takes no moderation authorities.
+ * {@link CHAT_PROXY_SERVICE} (`${CHAT_PROXY_DID}#bsky_chat`, default
+ * `did:web:api.bsky.chat#bsky_chat`) is the client's `service`, so `chat.bsky.*`
+ * calls are proxied to the chat service. The DID is read from the
+ * env-configurable `CHAT_PROXY_DID` rather than a hard-coded constant, so it can
+ * be retargeted per environment.
+ *
+ * `appLabelers: null` for the same reason as the PDS client: the chat service
+ * takes no moderation authorities.
  */
-export function agentToChatClient(agent: BskyAppAgent): Client {
-  const existing = chatClients.get(agent)
-  if (existing) {
-    return existing
-  }
-  const client = createLexClient(
-    {
-      get did() {
-        return agent.did
-      },
-      fetchHandler: (path, init) =>
-        agent.sessionManager.fetchHandler(path, init),
+export function buildChatClient(agent: Agent): Client {
+  return createLexClient(agent, {
+    appLabelers: null,
+    service: CHAT_PROXY_SERVICE,
+  })
+}
+
+/**
+ * Wrap a session so requests resolve against a known PDS while auth and refresh
+ * stay with the session.
+ *
+ * This exists for the pre-didDoc window. `PasswordSession` resolves each request
+ * against `extractPdsUrl(didDoc) ?? service`, so before a refresh has delivered
+ * a didDoc it falls back to the login service - which for an entryway account
+ * (`service: bsky.social`, PDS elsewhere) is the wrong host. The synchronous
+ * resume fast path makes no network request at all, so that window covers every
+ * request of a cold start until something triggers a refresh.
+ *
+ * Absolutizing here is enough because `PasswordSession.fetchHandler` builds its
+ * URL with `new URL(path, base)`, which ignores the base for an already-absolute
+ * input. So an absolute URL passes through untouched, and the session's own
+ * didDoc routing still wins for any client built directly over it.
+ *
+ * The tradeoff is that this pins the STORED url for the bundle's lifetime, where
+ * the session would prefer a didDoc endpoint that arrived later. That is
+ * acceptable because the two only disagree if the account's PDS moved, and the
+ * next cold start persists (and therefore pins) the new endpoint.
+ */
+export function routeSessionToPds(
+  session: PasswordSession,
+  pdsUrl: string,
+): Agent {
+  return {
+    get did() {
+      return session.did
     },
-    {appLabelers: null, service: CHAT_PROXY_SERVICE},
-  )
-  chatClients.set(agent, client)
-  return client
+    fetchHandler(path, init) {
+      return session.fetchHandler(new URL(path, pdsUrl).href, init)
+    },
+  }
 }
 
 /** Thrown when a write/auth-only client is used with no active session. */
@@ -164,20 +134,17 @@ let publicLexClient: Client | undefined
  * The unauthenticated {@link Client} for public reads, pointed at the public
  * appview.
  *
- * A single module-level instance for the same identity-stability reason as
- * {@link agentToAppviewClient}: there is no session to scope it to, so it lives
- * for the lifetime of the process. Requests go through
- * {@link networkAwareFetch} so public reads feed the app's reachability signal
- * like authenticated ones do.
+ * A single module-level instance: there is no session to scope it to, so it
+ * lives for the lifetime of the process, and its identity is therefore stable
+ * enough for a React Query key. Requests go through {@link networkAwareFetch} so
+ * public reads feed the app's reachability signal like authenticated ones do.
  *
- * Unlike the agent-wrapping clients, this one does NOT suppress
- * `Client.appLabelers`: there is no agent underneath to stamp the header, so the
- * class-wide static is the only producer and a logged-out read carries the same
- * `;redact` moderation authorities an authenticated one does.
- *
- * That makes `configureModerationForGuest()` load-bearing rather than
- * test-only - it is what populates the static before this client's first
- * request. `createPublicSessionBundle` runs it while building the bundle.
+ * Like the session appview client, it carries the class-wide
+ * `Client.appLabelers`, so a logged-out read gets the same `;redact` moderation
+ * authorities an authenticated one does. That makes `configureModerationForGuest`
+ * load-bearing rather than test-only - it is what populates the static before
+ * this client's first request, and `createPublicSessionBundle` runs it while
+ * building the bundle.
  */
 export function getPublicAppviewClient(): Client {
   return (publicLexClient ??= createLexClient({
diff --git a/src/state/session/create-account.ts b/src/state/session/create-account.ts
index a14f50cff5..618ab1aa7a 100644
--- a/src/state/session/create-account.ts
+++ b/src/state/session/create-account.ts
@@ -10,7 +10,6 @@ import {
 
 import {networkRetry} from '#/lib/async/retry'
 import {
-  BLUESKY_PROXY_HEADER,
   DISCOVER_SAVED_FEED,
   IS_PROD_SERVICE,
   TIMELINE_SAVED_FEED,
@@ -27,7 +26,6 @@ import {
 import {unsafeGetAndComputeAgeAssurance} from '#/ageAssurance/state'
 import {features} from '#/analytics'
 import {type app} from '#/lexicons'
-import {agentToAppviewClient, agentToPdsClient} from './clients'
 import {configureModerationForAccount} from './moderation'
 import {
   buildBundle,
@@ -106,10 +104,10 @@ export async function createSessionBundleAndCreateAccount(
   setBirthdateForDid({did: earlyAccount.did, birthdate})
   snoozeBirthdateUpdateAllowedForDid(earlyAccount.did)
   // Post-signup writes all target the account's own repo and actor store.
-  const pdsClient = agentToPdsClient(bundle.agent)
+  const pdsClient = bundle.pdsClient
   // Start the prefetch after seeding its synchronous birthdate inputs.
   const aa = prefetchAgeAssuranceServerData({
-    appviewClient: agentToAppviewClient(bundle.agent),
+    appviewClient: bundle.appviewClient,
     accountClient: pdsClient,
   })
 
@@ -136,8 +134,6 @@ export async function createSessionBundleAndCreateAccount(
     })
   }
 
-  bundle.agent.configureProxy(BLUESKY_PROXY_HEADER.get())
-
   // Preparation may auto-refresh the session while hooks are still disarmed.
   const account = await finishPreparation(
     bundle,
diff --git a/src/state/session/index.tsx b/src/state/session/index.tsx
index 730cdd9808..d3045932d3 100644
--- a/src/state/session/index.tsx
+++ b/src/state/session/index.tsx
@@ -9,7 +9,6 @@ import {
   useState,
   useSyncExternalStore,
 } from 'react'
-import {type AtpAgent} from '@atproto/api'
 import {type Client} from '@atproto/lex'
 import {type SessionData} from '@atproto/lex-password-session'
 
@@ -18,14 +17,9 @@ import {useCloseAllActiveElements} from '#/state/util'
 import {useGlobalDialogsControlContext} from '#/components/dialogs/Context'
 import {AnalyticsContext, useAnalyticsBase, utils} from '#/analytics'
 import {IS_WEB} from '#/env'
+import {com} from '#/lexicons'
 import {emitSessionDropped} from '../events'
-import {
-  agentToAppviewClient,
-  agentToChatClient,
-  agentToPdsClient,
-  getPublicAppviewClient,
-  getUnauthenticatedThrowingClient,
-} from './clients'
+import {getPublicAppviewClient} from './clients'
 import {createSessionBundleAndCreateAccount} from './create-account'
 import {pickExpiryRescueCandidate} from './expiry-rescue'
 import {type Action, getInitialState, reducer, type State} from './reducer'
@@ -451,13 +445,14 @@ export function Provider({children}: React.PropsWithChildren<{}>) {
     /*
      * Read the live bundle rather than the one captured by this render: a
      * dispatch that lands before the next render would otherwise leave this
-     * holding a disposed bundle, whose agent dispatches unauthenticated.
+     * holding a disposed bundle, whose clients dispatch through a disabled
+     * fetch.
      */
     const bundle = store.getState().currentBundleState
       .bundle as unknown as SessionBundle
     const signal = cancelPendingTask()
     /* getSession targets the PDS; only the persisted account fields are patched. */
-    const {data} = await bundle.agent.com.atproto.server.getSession()
+    const data = await bundle.pdsClient.call(com.atproto.server.getSession, {})
     if (signal.aborted) return
     store.dispatch({
       type: 'partial-refresh-session',
@@ -478,9 +473,8 @@ export function Provider({children}: React.PropsWithChildren<{}>) {
    * Rotate the session's tokens and hand back the resulting account snapshot.
    *
    * Rejects when the rotation was a no-op, restoring the contract the
-   * `agent.resumeSession(agent.session!)` call sites were written against (the
-   * bridge agent's `refreshSession` override does the same, for the same
-   * reason). `PasswordSession.refresh()` resolves with the
+   * `agent.resumeSession(agent.session!)` call sites were written against.
+   * `PasswordSession.refresh()` resolves with the
    * unchanged `SessionData` on a transient failure - a 500 or a network error
    * reported through `onUpdateFailure` - and reserves rejection for a
    * definitively dead session. Callers here all read resolution as "tokens
@@ -672,15 +666,15 @@ export function Provider({children}: React.PropsWithChildren<{}>) {
 
   // @ts-expect-error window type is not declared, debug only
   // eslint-disable-next-line react-hooks/immutability
-  if (__DEV__ && IS_WEB) window.agent = bundle.agent
+  if (__DEV__ && IS_WEB) window.bundle = bundle
 
   const currentBundleRef = useRef(bundle)
   /*
    * Disposal is deferred to this post-commit effect deliberately: components may
    * still render against the outgoing bundle during the commit that swaps it, so
-   * tearing its agent down inline would pull the agent out from under them. The
-   * reducer's bundle-identity guard drops any events the not-yet-disposed session
-   * emits in that window.
+   * disabling its session inline would pull the transport out from under them.
+   * The reducer's bundle-identity guard drops any events the not-yet-disposed
+   * session emits in that window.
    */
   useEffect(() => {
     if (currentBundleRef.current !== bundle) {
@@ -753,30 +747,15 @@ export function useRequireAuth() {
 }
 
 /**
- * The active session's agent, or the public agent when logged out.
- */
-export function useAgent(): AtpAgent {
-  const bundle = useContext(BundleContext)
-  if (!bundle) {
-    throw Error('useAgent() must be below <SessionProvider>.')
-  }
-  return bundle.agent
-}
-
-/**
- * Client for appview reads.
- *
- * When logged out the bundle's agent is the public agent built by
- * `createPublicAgent`, which is configured with the appview proxy and dispatches
- * unauthenticated, so the logged-out fallback is the agent itself - there is no
- * separate public branch here.
+ * Client for appview reads. Logged out, this is the bundle's public client,
+ * which dispatches unauthenticated against the public appview.
  */
 export function useAppviewClient(): Client {
   const bundle = useContext(BundleContext)
   if (!bundle) {
     throw Error('useAppviewClient() must be below <SessionProvider>.')
   }
-  return agentToAppviewClient(bundle.agent)
+  return bundle.appviewClient
 }
 
 /**
@@ -790,9 +769,7 @@ export function usePdsClient(): Client {
   if (!bundle) {
     throw Error('usePdsClient() must be below <SessionProvider>.')
   }
-  return bundle.session
-    ? agentToPdsClient(bundle.agent)
-    : getUnauthenticatedThrowingClient()
+  return bundle.pdsClient
 }
 
 /**
@@ -804,9 +781,7 @@ export function useChatClient(): Client {
   if (!bundle) {
     throw Error('useChatClient() must be below <SessionProvider>.')
   }
-  return bundle.session
-    ? agentToChatClient(bundle.agent)
-    : getUnauthenticatedThrowingClient()
+  return bundle.chatClient
 }
 
 /**
@@ -814,7 +789,7 @@ export function useChatClient(): Client {
  */
 export function useMaybePdsClient(): Client | null {
   const bundle = useContext(BundleContext)
-  return bundle?.session ? agentToPdsClient(bundle.agent) : null
+  return bundle?.session ? bundle.pdsClient : null
 }
 
 /**
@@ -822,7 +797,7 @@ export function useMaybePdsClient(): Client | null {
  */
 export function useMaybeChatClient(): Client | null {
   const bundle = useContext(BundleContext)
-  return bundle?.session ? agentToChatClient(bundle.agent) : null
+  return bundle?.session ? bundle.chatClient : null
 }
 
 /**
diff --git a/src/state/session/moderation.ts b/src/state/session/moderation.ts
index b5b3a01af8..691aad4c81 100644
--- a/src/state/session/moderation.ts
+++ b/src/state/session/moderation.ts
@@ -1,7 +1,9 @@
-import {type AtpAgent, BSKY_LABELER_DID} from '@atproto/api'
+import {BSKY_LABELER_DID} from '@atproto/api'
 import {type Client} from '@atproto/lex'
+import {type DidString} from '@atproto/syntax'
 
 import {IS_TEST_USER} from '#/lib/constants'
+import {com} from '#/lexicons'
 import {account as accountStorage} from '#/storage'
 import {
   configureAdditionalModerationAuthorities,
@@ -9,6 +11,9 @@ import {
 } from './additional-moderation-authorities'
 import {type SessionAccount} from './types'
 
+/** The moderation surface of a session bundle. */
+type ModerationSession = {appviewClient: Client}
+
 /**
  * Cache an account's subscribed labeler DIDs. Called on every preferences
  * fetch, so the cache is eventually consistent with the server.
@@ -31,25 +36,24 @@ export function readLabelers(did: string): string[] | undefined {
 }
 
 /**
- * Apply an account's labeler subscriptions without duplicating the globally
- * redacted Bluesky moderation authority.
+ * Apply an account's labeler subscriptions to the appview client, without
+ * duplicating the globally redacted Bluesky moderation authority.
  *
  * The Bluesky DID is filtered out because it already flows through the global
- * `appLabelers`, which lex and the agent both emit with a `;redact` suffix.
- * Listing it per-subscription would add a second, non-redacting entry for the
- * same authority.
+ * `Client.appLabelers`, which lex emits with a `;redact` suffix. Listing it
+ * per-instance would add a second, non-redacting entry for the same authority:
+ * lex collects the two lists into a `Set` keyed on the suffixed string, so
+ * neither dedupes against the other.
  *
- * Writes to the agent rather than the client: the agent-level fetch handler is
- * what stamps `atproto-accept-labelers` on the requests the wrapping clients
- * issue, so setting them here reaches every appview read. The bundle rework
- * moves this to `appviewClient.setLabelers` once the agent is gone.
+ * Only the appview client takes subscriptions - the PDS and chat clients suppress
+ * labelers entirely (see clients.ts).
  */
 export function applyLabelersToClient(
-  agent: AtpAgent,
+  client: Client,
   subscribedDids: string[],
 ) {
-  agent.configureLabelersHeader(
-    subscribedDids.filter(did => did !== BSKY_LABELER_DID),
+  client.setLabelers(
+    subscribedDids.filter(did => did !== BSKY_LABELER_DID) as DidString[],
   )
 }
 
@@ -66,7 +70,7 @@ export function configureModerationForGuest() {
  * in the same tick, before any request goes out.
  */
 export function configureModerationForAccount(
-  bundle: {agent: AtpAgent; appviewClient?: Client},
+  bundle: ModerationSession,
   account: SessionAccount,
 ) {
   // This global mutation is *only* OK because this code is only relevant for testing.
@@ -74,13 +78,13 @@ export function configureModerationForAccount(
   switchToBskyAppLabeler()
   if (IS_TEST_USER(account.handle)) {
     // Test accounts may briefly use the production authority while this resolves.
-    void trySwitchToTestAppLabeler(bundle.agent)
+    void trySwitchToTestAppLabeler(bundle.appviewClient)
   }
 
   // The code below is actually relevant to production (and isn't global).
   const labelerDids = readLabelers(account.did)
   if (labelerDids) {
-    applyLabelersToClient(bundle.agent, labelerDids)
+    applyLabelersToClient(bundle.appviewClient, labelerDids)
   } else {
     // If there are no headers in the storage, we'll not send them on the initial requests.
     // If we wanted to fix this, we could block on the preferences query here.
@@ -94,12 +98,14 @@ function switchToBskyAppLabeler() {
 }
 
 /** Resolve and install the test environment's moderation authority. */
-async function trySwitchToTestAppLabeler(agent: AtpAgent) {
+async function trySwitchToTestAppLabeler(client: Client) {
   const did = (
-    await agent
-      .resolveHandle({handle: 'mod-authority.test'})
+    await client
+      .call(com.atproto.identity.resolveHandle, {
+        handle: 'mod-authority.test',
+      })
       .catch(_ => undefined)
-  )?.data.did
+  )?.did
   if (did) {
     console.warn('USING TEST ENV MODERATION')
     configureGlobalAppLabelers([did])
diff --git a/src/state/session/session-core.ts b/src/state/session/session-core.ts
index 7a9d1a22cc..6269cc7f29 100644
--- a/src/state/session/session-core.ts
+++ b/src/state/session/session-core.ts
@@ -1,21 +1,27 @@
+import {type Client} from '@atproto/lex'
 import {
   PasswordSession,
   type PasswordSessionOptions,
   type SessionData,
 } from '@atproto/lex-password-session'
 
-import {BLUESKY_PROXY_HEADER, PUBLIC_BSKY_SERVICE} from '#/lib/constants'
+import {PUBLIC_BSKY_SERVICE} from '#/lib/constants'
 import {logger} from '#/logger'
 import {prefetchAgeAssuranceServerData} from '#/ageAssurance/data'
 import {features} from '#/analytics'
 import {
-  BskyAppAgent,
-  createPublicAgent,
-  PasswordSessionManager,
-} from './bridge-agent'
-import {agentToAppviewClient, agentToPdsClient} from './clients'
+  buildAppviewClient,
+  buildChatClient,
+  buildPdsClient,
+  getPublicAppviewClient,
+  getUnauthenticatedThrowingClient,
+  routeSessionToPds,
+} from './clients'
 import {addSessionErrorLog} from './logging'
-import {configureModerationForAccount} from './moderation'
+import {
+  configureModerationForAccount,
+  configureModerationForGuest,
+} from './moderation'
 import {networkAwareFetch} from './network'
 import {
   isSessionExpired,
@@ -46,10 +52,12 @@ function deriveServiceUrl(session: PasswordSession | null): URL {
   )
 }
 
-/** An `AtpAgent` bridged over one `PasswordSession`, the bundle's sole auth core. */
+/** The three clients over one `PasswordSession`, the bundle's sole auth core. */
 export type SessionBundle = {
   session: PasswordSession
-  agent: BskyAppAgent
+  appviewClient: Client
+  pdsClient: Client
+  chatClient: Client
   readonly service: URL
 }
 
@@ -63,38 +71,38 @@ const bundleKillSwitches = new WeakMap<SessionBundle, () => void>()
 /**
  * Register the lifecycle closure used by {@link disposeBundle}.
  *
- * Disposing also detaches the bridge agent from its session, so a stale
- * bundle's `agent.session` / `agent.pdsUrl` read as `undefined` rather than
- * serving tokens the app has stopped tracking.
+ * Killing the hooks is the whole of disposal now: the clients hold no state of
+ * their own, and every request they make goes through the session's injected
+ * fetch, which the kill switch disables.
  */
 export function registerBundleKillSwitch(
   bundle: SessionBundle,
   kill: () => void,
 ) {
-  bundleKillSwitches.set(bundle, () => {
-    kill()
-    bundle.agent.dispose()
-  })
+  bundleKillSwitches.set(bundle, kill)
 }
 
 /**
- * Wrap a session in the bridge agent.
+ * Build the three clients over a session.
  *
- * `storedPdsUrl` seeds {@link PasswordSessionManager}'s PDS routing so requests
- * made before the first refresh delivers a didDoc still reach the right host.
- * Once a didDoc arrives the manager prefers its endpoint.
+ * `storedPdsUrl` pins PDS routing for requests made before a refresh has
+ * delivered a didDoc - see {@link routeSessionToPds}, which explains why the
+ * session's own routing is not sufficient in that window. With no stored url
+ * there is nothing better to pin to, so the clients go straight over the
+ * session and it resolves them against its own service.
  */
 export function buildBundle(
   session: PasswordSession,
   storedPdsUrl?: string,
 ): SessionBundle {
-  const manager = new PasswordSessionManager(session, {
-    service: deriveServiceUrl(session).toString(),
-    pdsUrl: storedPdsUrl,
-  })
+  const agent = storedPdsUrl
+    ? routeSessionToPds(session, storedPdsUrl)
+    : session
   return {
     session,
-    agent: new BskyAppAgent(manager),
+    appviewClient: buildAppviewClient(agent),
+    pdsClient: buildPdsClient(agent),
+    chatClient: buildChatClient(agent),
     get service() {
       return deriveServiceUrl(session)
     },
@@ -182,23 +190,36 @@ export function makeSessionHooks({
   })
 }
 
-/** The agent exposed while logged out. */
+/** The clients exposed while logged out. */
 export type PublicSessionBundle = {
   session: null
-  agent: BskyAppAgent
+  appviewClient: Client
+  pdsClient: Client
+  chatClient: Client
   readonly service: URL
 }
 
 /**
- * Build the logged-out bundle. `createPublicAgent` installs the guest
- * moderation authorities as part of building the agent, which is what populates
- * the global `Client.appLabelers` that {@link getPublicAppviewClient} relies on
- * for its labeler header.
+ * Build the logged-out bundle.
+ *
+ * `configureModerationForGuest` is what populates the global
+ * `Client.appLabelers` that {@link getPublicAppviewClient} reads for its labeler
+ * header, so it must run before the public client's first request. There is no
+ * agent stamping that header any more, which makes this call load-bearing rather
+ * than test-only: without it a logged-out read would carry no moderation
+ * authorities at all.
+ *
+ * The write surfaces get the throwing client rather than a public one, so an
+ * unauthenticated write fails legibly instead of 4xx-ing against public
+ * infrastructure.
  */
 export function createPublicSessionBundle(): PublicSessionBundle {
+  configureModerationForGuest()
   return {
     session: null,
-    agent: createPublicAgent(),
+    appviewClient: getPublicAppviewClient(),
+    pdsClient: getUnauthenticatedThrowingClient(),
+    chatClient: getUnauthenticatedThrowingClient(),
     service: new URL(PUBLIC_BSKY_SERVICE),
   }
 }
@@ -224,9 +245,8 @@ export function createPublicSessionBundle(): PublicSessionBundle {
  * Both failure modes dispose: the bundle is fully built by this point, and a
  * still-live session left behind would keep its refresh and dispatch paths
  * alive with nothing tracking it. (Disposal is a no-op for the destroyed case,
- * where the session already refuses to refresh and the bridge agent already
- * reads as logged out - but the two paths are indistinguishable to the caller,
- * so both go through it.)
+ * where the session already refuses to refresh - but the two paths are
+ * indistinguishable to the caller, so both go through it.)
  */
 export async function finishPreparation<T>(
   bundle: SessionBundle,
@@ -294,16 +314,10 @@ export async function createSessionBundleAndResume(
 
   configureModerationForAccount(bundle, earlyAccount)
   const aa = prefetchAgeAssuranceServerData({
-    appviewClient: agentToAppviewClient(bundle.agent),
-    accountClient: agentToPdsClient(bundle.agent),
+    appviewClient: bundle.appviewClient,
+    accountClient: bundle.pdsClient,
   })
 
-  /*
-   * The proxy header is applied after the PDS-targeting setup above, so those
-   * calls run without it.
-   */
-  bundle.agent.configureProxy(BLUESKY_PROXY_HEADER.get())
-
   // Preparation may auto-refresh the session while hooks are still disarmed.
   const account = await finishPreparation(
     bundle,
@@ -362,12 +376,10 @@ export async function createSessionBundleAndLogin(
   const gates = features.refresh({strategy: 'prefer-fresh-gates'})
   configureModerationForAccount(bundle, earlyAccount)
   const aa = prefetchAgeAssuranceServerData({
-    appviewClient: agentToAppviewClient(bundle.agent),
-    accountClient: agentToPdsClient(bundle.agent),
+    appviewClient: bundle.appviewClient,
+    accountClient: bundle.pdsClient,
   })
 
-  bundle.agent.configureProxy(BLUESKY_PROXY_HEADER.get())
-
   // Preparation may auto-refresh the session while hooks are still disarmed.
   const account = await finishPreparation(
     bundle,
@@ -403,7 +415,6 @@ export function createSessionBundleFromStoredAccount(
   bundle = buildBundle(session, storedAccount.pdsUrl)
   registerBundleKillSwitch(bundle, hooks.kill)
   configureModerationForAccount(bundle, storedAccount)
-  bundle.agent.configureProxy(BLUESKY_PROXY_HEADER.get())
 
   const account = session.destroyed
     ? storedAccount
diff --git a/src/state/session/session-data.ts b/src/state/session/session-data.ts
index 2fab1cbd99..3ead91c173 100644
--- a/src/state/session/session-data.ts
+++ b/src/state/session/session-data.ts
@@ -1,4 +1,3 @@
-import {type AtpSessionData} from '@atproto/api'
 import {getPdsEndpoint, isValidDidDoc} from '@atproto/common-web'
 import {type SessionData} from '@atproto/lex-password-session'
 import {jwtDecode} from 'jwt-decode'
@@ -81,27 +80,6 @@ export function sessionAccountToSessionData(
   }
 }
 
-/** Convert a persisted account into data suitable for `AtpAgent`. */
-export function sessionAccountToSession(
-  account: SessionAccount,
-): AtpSessionData {
-  return {
-    // Sorted in the same property order as when returned by BskyAgent (alphabetical).
-    accessJwt: account.accessJwt ?? '',
-    did: account.did,
-    email: account.email,
-    emailAuthFactor: account.emailAuthFactor,
-    emailConfirmed: account.emailConfirmed,
-    handle: account.handle,
-    refreshJwt: account.refreshJwt ?? '',
-    /**
-     * @see https://github.com/bluesky-social/atproto/blob/c5d36d5ba2a2c2a5c4f366a5621c06a5608e361e/packages/api/src/agent.ts#L188
-     */
-    active: account.active ?? true,
-    status: account.status,
-  }
-}
-
 export function isSessionExpired(account: SessionAccount) {
   return account.accessJwt ? isJwtExpired(account.accessJwt) : true
 }
diff --git a/src/view/com/composer/Composer.tsx b/src/view/com/composer/Composer.tsx
index 3f44040444..8108c41cd1 100644
--- a/src/view/com/composer/Composer.tsx
+++ b/src/view/com/composer/Composer.tsx
@@ -97,8 +97,8 @@ import {usePreferencesQuery} from '#/state/queries/preferences'
 import {useProfileQuery} from '#/state/queries/profile'
 import {resolveLinkQueryOptions} from '#/state/queries/resolve-link'
 import {
-  useAgent,
   useAppviewClient,
+  useChatClient,
   usePdsClient,
   useSession,
 } from '#/state/session'
@@ -280,8 +280,8 @@ export const ComposePost = ({
   const videoMaxDurationMs = allow10MinuteVideos
     ? VIDEO_10_MINUTE_MAX_DURATION_MS
     : VIDEO_MAX_DURATION_MS
-  const agent = useAgent()
   const client = useAppviewClient()
+  const chatClient = useChatClient()
   const pdsClient = usePdsClient()
   const queryClient = useQueryClient()
   const currentDid = currentAccount!.did
@@ -1003,7 +1003,7 @@ export const ComposePost = ({
     .map(post => post.embed.link!.uri)
   const linkQueries = useQueries({
     queries: linkUris.map(uri => ({
-      ...resolveLinkQueryOptions(agent, uri),
+      ...resolveLinkQueryOptions({appviewClient: client, chatClient}, uri),
       enabled: false,
     })),
   })
@@ -1094,12 +1094,13 @@ export const ComposePost = ({
     try {
       logger.info(`composer: posting...`)
       postUri = (
-        await apilib.post(agent, queryClient, {
+        await apilib.post(queryClient, {
           thread: filteredThread,
           replyTo: replyTo?.uri,
           onStateChange: setPublishingStage,
           langs: currentLanguages,
           appviewClient: client,
+          chatClient,
           pdsClient,
         })
       ).uris[0]
@@ -1294,8 +1295,8 @@ export const ComposePost = ({
   }, [
     l,
     ax,
-    agent,
     client,
+    chatClient,
     pdsClient,
     canPost,
     isPublishing,
diff --git a/src/view/com/composer/drafts/state/api.ts b/src/view/com/composer/drafts/state/api.ts
index 3b5ff9cdf2..34fa4f6db4 100644
--- a/src/view/com/composer/drafts/state/api.ts
+++ b/src/view/com/composer/drafts/state/api.ts
@@ -5,14 +5,13 @@ import {AppBskyDraftDefs, AtUri} from '@atproto/api'
 import {RichText} from '@bsky.app/sdk/richtext'
 import {nanoid} from 'nanoid/non-secure'
 
-import {resolveLink} from '#/lib/api/resolve'
+import {type LinkResolvers, resolveLink} from '#/lib/api/resolve'
 import {getDeviceName} from '#/lib/deviceName'
 import {getImageDim} from '#/lib/media/manip'
 import {mimeToExt} from '#/lib/media/video/util'
 import {shortenLinks} from '#/lib/strings/rich-text-manip'
 import {type ComposerImage} from '#/state/gallery'
 import {threadgateAllowUISettingToAllowRecordValue} from '#/state/queries/threadgate/util'
-import {createPublicAgent} from '#/state/session/bridge-agent'
 import {
   type ComposerState,
   type EmbedDraft,
@@ -60,7 +59,10 @@ function parseVideoMimeType(localRefPath: string): string {
  * Convert ComposerState to server Draft format for saving.
  * Returns both the draft and a map of localRef paths to their source paths.
  */
-export async function composerStateToDraft(state: ComposerState): Promise<{
+export async function composerStateToDraft(
+  clients: LinkResolvers,
+  state: ComposerState,
+): Promise<{
   draft: AppBskyDraftDefs.Draft
   localRefPaths: Map<string, string>
 }> {
@@ -68,7 +70,7 @@ export async function composerStateToDraft(state: ComposerState): Promise<{
 
   const posts: AppBskyDraftDefs.DraftPost[] = await Promise.all(
     state.thread.posts.map(post => {
-      return postDraftToServerPost(post, localRefPaths)
+      return postDraftToServerPost(clients, post, localRefPaths)
     }),
   )
 
@@ -94,6 +96,7 @@ export async function composerStateToDraft(state: ComposerState): Promise<{
  * Convert a single PostDraft to server DraftPost format.
  */
 async function postDraftToServerPost(
+  clients: LinkResolvers,
   post: PostDraft,
   localRefPaths: Map<string, string>,
 ): Promise<AppBskyDraftDefs.DraftPost> {
@@ -138,10 +141,7 @@ async function postDraftToServerPost(
 
   // Add quote record embed
   if (post.embed.quote) {
-    const resolved = await resolveLink(
-      createPublicAgent(),
-      post.embed.quote.uri,
-    )
+    const resolved = await resolveLink(clients, post.embed.quote.uri)
     if (resolved && resolved.type === 'record') {
       draftPost.embedRecords = [
         {
diff --git a/src/view/com/composer/drafts/state/queries.ts b/src/view/com/composer/drafts/state/queries.ts
index 0108dbbbff..a620f0ec0f 100644
--- a/src/view/com/composer/drafts/state/queries.ts
+++ b/src/view/com/composer/drafts/state/queries.ts
@@ -7,7 +7,7 @@ import {
 
 import {isNetworkError} from '#/lib/strings/errors'
 import {matchXrpcError} from '#/lib/xrpc-error'
-import {useAppviewClient} from '#/state/session'
+import {useAppviewClient, useChatClient} from '#/state/session'
 import {type ComposerState} from '#/view/com/composer/state/composer'
 import {useAnalytics} from '#/analytics'
 import {getDeviceId} from '#/analytics/identifiers'
@@ -121,6 +121,7 @@ export async function loadDraftMedia(draft: AppBskyDraftDefs.Draft): Promise<{
  */
 export function useSaveDraftMutation() {
   const client = useAppviewClient()
+  const chatClient = useChatClient()
   const queryClient = useQueryClient()
 
   return useMutation({
@@ -136,8 +137,10 @@ export function useSaveDraftMutation() {
       originalLocalRefs: Set<string> | undefined
     }> => {
       // Convert composer state to server draft format
-      const {draft: apiDraft, localRefPaths} =
-        await composerStateToDraft(composerState)
+      const {draft: apiDraft, localRefPaths} = await composerStateToDraft(
+        {appviewClient: client, chatClient},
+        composerState,
+      )
       /*
        * `composerStateToDraft` builds the draft against the `@atproto/api`
        * types, whose string fields are unbranded, so it is asserted once here
diff --git a/src/view/com/testing/TestCtrls.e2e.tsx b/src/view/com/testing/TestCtrls.e2e.tsx
index f3f7743b7e..e9e3436d1c 100644
--- a/src/view/com/testing/TestCtrls.e2e.tsx
+++ b/src/view/com/testing/TestCtrls.e2e.tsx
@@ -3,7 +3,7 @@ import {LogBox, Pressable, TextInput, View} from 'react-native'
 import {useQueryClient} from '@tanstack/react-query'
 
 import {BLUESKY_PROXY_HEADER} from '#/lib/constants'
-import {useAgent, useSessionApi} from '#/state/session'
+import {useSessionApi} from '#/state/session'
 import {useLoggedOutViewControls} from '#/state/shell/logged-out'
 import {useOnboardingDispatch} from '#/state/shell/onboarding'
 import {navigate} from '../../../Navigation'
@@ -31,7 +31,6 @@ const BTN = {height: 1, width: 1, backgroundColor: 'red'}
 let hasConfiguredProxy = false
 
 export function TestCtrls() {
-  const agent = useAgent()
   const queryClient = useQueryClient()
   const {logoutEveryAccount, login} = useSessionApi()
   const onboardingDispatch = useOnboardingDispatch()
@@ -74,8 +73,13 @@ export function TestCtrls() {
         autoCapitalize="none"
         onSubmitEditing={() => {
           const header = `${proxyHeader}#bsky_appview`
+          /*
+           * The appview client reads `BLUESKY_PROXY_HEADER.get()` when the
+           * bundle builds it (see clients.ts), so setting the mutable constant
+           * retargets the proxy for the sign-ins below without reconfiguring
+           * anything: the gate above means no bundle exists yet.
+           */
           BLUESKY_PROXY_HEADER.set(header)
-          agent.configureProxy(header as any)
           hasConfiguredProxy = true
           setIsProxyConfigured(true)
         }}

From 9fe00848749535401afe1751c43d4271cb86c924 Mon Sep 17 00:00:00 2001
From: Samuel Newman <mozzius@protonmail.com>
Date: Thu, 13 Aug 2026 22:26:22 +0300
Subject: [PATCH 26/32] [SDK] Remove @atproto/api (#11386)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
---
 .jscodeshift/repo/bsky-agent.js               |  62 ----
 __tests__/lib/string.test.ts                  |   2 +-
 lexicons/app/bsky/unspecced/defs.json         | 119 ++-----
 oxlint-suppressions.json                      |   2 +-
 package.json                                  |   1 -
 pnpm-lock.yaml                                |  43 ---
 src/ageAssurance/const.ts                     |  18 +-
 src/ageAssurance/data.tsx                     |  44 ++-
 src/ageAssurance/debug.ts                     | 196 +++++-------
 src/ageAssurance/state.ts                     |  10 +-
 src/ageAssurance/types.ts                     |   2 +-
 .../useComputeAgeAssuranceRegionAccess.ts     |   2 +-
 src/ageAssurance/util.test.ts                 |  60 ++--
 src/ageAssurance/util.ts                      |  59 +++-
 src/components/AccountList.tsx                |   4 +-
 .../Autocomplete/useAutocomplete/index.ts     |   3 +-
 src/components/AvatarBubbles.tsx              |   2 +-
 src/components/AvatarStack.tsx                |   2 +-
 src/components/BotBadge.tsx                   |   4 +-
 src/components/FeedCard.tsx                   |  11 +-
 src/components/FeedInterstitials.tsx          |   4 +-
 src/components/KnownFollowers.tsx             |  13 +-
 src/components/LikedByList.tsx                |  12 +-
 src/components/ListCard.tsx                   |  12 +-
 src/components/MediaPreview.tsx               |  26 +-
 src/components/NewskieDialog.tsx              |   8 +-
 src/components/Pills.tsx                      |   4 +-
 src/components/Post/Embed/ChatInviteEmbed.tsx |   6 +-
 .../Post/Embed/ExternalEmbed/ExternalGif.tsx  |   4 +-
 .../Embed/ExternalEmbed/ExternalPlayer.tsx    |   4 +-
 .../Post/Embed/ExternalEmbed/index.tsx        |   4 +-
 src/components/Post/Embed/FeedEmbed.tsx       |   2 +-
 src/components/Post/Embed/ImageEmbed.tsx      |  19 +-
 src/components/Post/Embed/ListEmbed.tsx       |   2 +-
 .../StandardSiteEmbed/StandardSiteMetaRow.tsx |   2 +-
 .../StandardSiteThemeProvider.tsx             |   5 +-
 .../Post/Embed/StandardSiteEmbed/index.tsx    |   2 +-
 .../Embed/StandardSiteEmbed/publishers.ts     |   7 +-
 .../Post/Embed/StandardSiteEmbed/types.ts     |   4 +-
 .../Embed/StandardSiteEmbed/utils.test.ts     |   5 +-
 .../Post/Embed/StandardSiteEmbed/utils.ts     |  22 +-
 .../VideoEmbedInner/VideoEmbedInnerNative.tsx |   4 +-
 .../VideoEmbedInnerWeb.shared.ts              |   4 +-
 .../Post/Embed/VideoEmbed/index.tsx           |   4 +-
 .../Post/Embed/VideoEmbed/index.web.tsx       |   6 +-
 src/components/Post/Embed/index.tsx           |  24 +-
 src/components/Post/Embed/types.ts            |   7 +-
 src/components/Post/Translated/index.tsx      |  11 +-
 .../PostControls/BookmarkButton.tsx           |   4 +-
 .../PostControls/PostMenu/PostMenuItems.tsx   |  16 +-
 .../PostControls/PostMenu/index.tsx           |  14 +-
 .../PostControls/ShareMenu/RecentChats.tsx    |   7 +-
 .../PostControls/ShareMenu/ShareMenuItems.tsx |   2 +-
 .../ShareMenu/ShareMenuItems.types.tsx        |  12 +-
 .../ShareMenu/ShareMenuItems.web.tsx          |   2 +-
 .../PostControls/ShareMenu/index.tsx          |  14 +-
 src/components/PostControls/index.tsx         |  14 +-
 src/components/ProfileCard.tsx                |   3 +-
 src/components/ProfileHoverCard/index.web.tsx |   7 +-
 src/components/StarterPack/Main/FeedsList.tsx |   8 +-
 .../StarterPack/Main/ProfilesList.tsx         |  13 +-
 .../StarterPack/ProfileStarterPacks.tsx       |   6 +-
 src/components/StarterPack/QrCode.tsx         |  11 +-
 src/components/StarterPack/QrCodeDialog.tsx   |  11 +-
 src/components/StarterPack/ShareDialog.tsx    |   4 +-
 .../StarterPack/StarterPackCard.tsx           |  22 +-
 .../Wizard/WizardEditListDialog.tsx           |   6 +-
 .../StarterPack/Wizard/WizardListCard.tsx     |  16 +-
 src/components/TrendingTopics.tsx             |   7 +-
 src/components/VideoPostCard.tsx              |  22 +-
 src/components/WhoCanReply.tsx                |  23 +-
 .../SubscribeProfileDialog.tsx                |  12 +-
 .../ageAssurance/AgeAssuranceAppealDialog.tsx |   5 +-
 src/components/contacts/contacts.ts           |   7 +-
 src/components/dialogs/Embed.tsx              |   7 +-
 .../dialogs/PostInteractionSettingsDialog.tsx |   5 +-
 .../dialogs/SearchablePeopleList.tsx          |   3 +-
 src/components/dialogs/StarterPackDialog.tsx  |  14 +-
 .../lists/CreateListFromStarterPackDialog.tsx |   5 +-
 .../dialogs/lists/CreateOrEditListDialog.tsx  |  14 +-
 .../lists/ListAddRemoveUsersDialog.tsx        |  12 +-
 src/components/dialogs/nuxs/index.tsx         |   4 +-
 src/components/dialogs/nuxs/utils.ts          |   5 +-
 src/components/dms/ActionsWrapper.tsx         |   4 +-
 src/components/dms/ActionsWrapper.web.tsx     |   4 +-
 .../dms/AfterReportConversationDialog.tsx     |   4 +-
 src/components/dms/AfterReportDialog.tsx      |   4 +-
 src/components/dms/ChatInvite/Card.tsx        |   6 +-
 src/components/dms/ChatInvite/Root.tsx        |   7 +-
 src/components/dms/ChatProfileTabs.tsx        |   2 +-
 src/components/dms/EmojiReactionPicker.tsx    |   4 +-
 .../dms/EmojiReactionPicker.web.tsx           |   6 +-
 src/components/dms/InitiateChatFlow.tsx       |   3 +-
 src/components/dms/MessageContextMenu.tsx     |   8 +-
 src/components/dms/MessageItem.tsx            | 101 +++---
 src/components/dms/MessageItemEmbed.tsx       |   5 +-
 src/components/dms/MessageItemInviteEmbed.tsx |   5 +-
 src/components/dms/MessageOverlays.tsx        |  22 +-
 src/components/dms/MessageProfileButton.tsx   |   4 +-
 src/components/dms/MessageReplies.tsx         |  14 +-
 src/components/dms/MessagesListHeader.tsx     |   3 +-
 src/components/dms/ReactionsDialog.tsx        |  16 +-
 src/components/dms/SystemMessageGroup.tsx     |   4 +-
 src/components/dms/SystemMessageItem.tsx      |   4 +-
 .../dms/components/GroupChatProfileCard.tsx   |   3 +-
 src/components/dms/getMessageInfo.ts          |  25 +-
 src/components/dms/getReactionInfo.ts         |  13 +-
 src/components/dms/getSystemMessageInfo.ts    |  62 ++--
 src/components/dms/replyPreview.ts            |  41 ++-
 src/components/dms/util.ts                    |  55 ++--
 src/components/feeds/PostFeedVideoGridRow.tsx |   5 +-
 src/components/images/AutoSizedImage.tsx      |   4 +-
 src/components/images/Gallery/index.tsx       |   6 +-
 .../Gallery/maybeApplyGalleryOffsetStyles.ts  |  50 +--
 src/components/images/ImageLayoutGrid.tsx     |   6 +-
 src/components/images/ImageLayoutGridItem.tsx |   4 +-
 .../intents/GroupChatJoinDialog.tsx           |  11 +-
 .../interstitials/FeedTrendingTopics.tsx      |   8 +-
 .../interstitials/TrendingVideos.tsx          |   6 +-
 src/components/moderation/AppealForm.tsx      |   9 +-
 src/components/moderation/BlockDialog.tsx     |   5 +-
 src/components/moderation/LabelsOnMe.tsx      |   4 +-
 .../moderation/LabelsOnMeDialog.tsx           |  10 +-
 src/components/moderation/PostAlerts.tsx      |   8 +-
 src/components/moderation/PostHider.tsx       |   4 +-
 .../moderation/ReportDialog/action.ts         |   4 +-
 .../moderation/ReportDialog/const.ts          | 198 +++++++-----
 .../moderation/ReportDialog/errors.test.ts    |  29 +-
 .../moderation/ReportDialog/errors.ts         |   4 +-
 .../moderation/ReportDialog/index.tsx         |   6 +-
 .../moderation/ReportDialog/state.test.ts     |   8 +-
 .../moderation/ReportDialog/state.ts          |   7 +-
 .../moderation/ReportDialog/types.ts          |  27 +-
 .../ReportDialog/utils/parseReportSubject.ts  |  31 +-
 .../ReportDialog/utils/useReportOptions.ts    |  84 ++---
 .../verification/VerificationRemovePrompt.tsx |   4 +-
 .../verification/VerificationsDialog.tsx      |   4 +-
 src/env/common.ts                             |  12 +-
 src/features/inviteFriends/urls.ts            |   2 +-
 .../liveNow/components/EditLiveDialog.tsx     |  14 +-
 .../components/GoLiveDisabledDialog.tsx       |  12 +-
 .../liveNow/components/LiveStatusDialog.tsx   |  16 +-
 src/features/liveNow/index.tsx                |  30 +-
 src/features/liveNow/utils.ts                 |  14 +-
 src/lib/api/__tests__/computeCid.test.ts      |  17 +-
 src/lib/api/computeCid.ts                     |  12 -
 src/lib/api/feed-manip.ts                     |  86 +++--
 src/lib/api/feed/author.ts                    |  19 +-
 src/lib/api/feed/custom.ts                    |   9 +-
 src/lib/api/feed/demo.ts                      |   4 +-
 src/lib/api/feed/following.ts                 |   3 +-
 src/lib/api/feed/home.ts                      |  15 +-
 src/lib/api/feed/likes.ts                     |   3 +-
 src/lib/api/feed/list.ts                      |   3 +-
 src/lib/api/feed/merge.ts                     |  13 +-
 src/lib/api/feed/posts.ts                     |   5 +-
 src/lib/api/feed/types.ts                     |   6 +-
 src/lib/api/feed/utils.ts                     |   2 +-
 src/lib/api/index.ts                          |  13 +-
 src/lib/api/resolve.ts                        |  24 +-
 src/lib/constants.ts                          |   7 +-
 src/lib/demo.ts                               |  14 +-
 src/lib/hooks/useNotificationHandler.ts       |   2 +-
 src/lib/hooks/usePostViewTracking.ts          |   4 +-
 src/lib/link-meta/link-meta.ts                |   7 +-
 src/lib/moderation.ts                         |  15 +-
 src/lib/moderation/subjects.ts                | 133 --------
 src/lib/moderation/useLabelInfo.ts            |  15 +-
 .../useModerationCauseDescription.ts          |   4 +-
 src/lib/routes/links.ts                       |   7 +-
 src/lib/strings/__tests__/errors.test.ts      |  16 +-
 src/lib/strings/errors.ts                     |  22 +-
 src/lib/strings/rich-text-helpers.ts          |  23 --
 src/lib/strings/starter-pack.ts               |   2 +-
 src/lib/strings/url-helpers.ts                |   2 +-
 src/lib/xrpc-error.ts                         |  32 ++
 src/locale/helpers.ts                         |  11 +-
 src/screens/Bookmarks.tsx                     |  22 +-
 .../components/CustomFeedHeader.tsx           |   2 +-
 src/screens/CustomFeed/index.tsx              |   4 +-
 src/screens/Hashtag.tsx                       |   8 +-
 src/screens/List/ListHiddenScreen.tsx         |   6 +-
 src/screens/Login/LoginForm.tsx               |   4 +-
 src/screens/Messages/ChatList.tsx             |   6 +-
 src/screens/Messages/Conversation.tsx         |   8 +-
 .../Messages/ConversationSettings/Member.tsx  |   2 +-
 .../Messages/ConversationSettings/index.tsx   |  10 +-
 src/screens/Messages/Inbox.tsx                |  19 +-
 src/screens/Messages/JoinRequest.tsx          |  15 +-
 src/screens/Messages/JoinRequests.tsx         |   3 +-
 .../Messages/components/ChatDisabled.tsx      |   5 +-
 .../Messages/components/ChatListItem.tsx      |  31 +-
 .../Messages/components/ChatStatusInfo.tsx    |   2 +-
 .../components/IncomingRequestListItem.tsx    |   4 +-
 .../Messages/components/InviteLinkDialog.tsx  |   9 +-
 .../Messages/components/MessageComposer.tsx   |   7 +-
 .../Messages/components/MessageInputEmbed.tsx |  15 +-
 .../Messages/components/MessageInputReply.tsx |   4 +-
 .../Messages/components/MessagesList.tsx      |  38 +--
 .../components/MessagesListInfoPanel.tsx      |   2 +-
 .../components/OutgoingRequestListItem.tsx    |   3 +-
 .../Messages/components/RequestButtons.tsx    |   8 +-
 .../StarterPackCard.tsx                       |  16 +-
 .../PostThread/components/LikesStat.tsx       |   9 +-
 .../components/ThreadItemAnchor.tsx           |  34 +-
 .../ThreadItemAnchorFollowButton.tsx          |   4 +-
 .../PostThread/components/ThreadItemPost.tsx  |  14 +-
 .../components/ThreadItemPostNumber.tsx       |   6 +-
 .../components/ThreadItemTreePost.tsx         |  16 +-
 src/screens/Profile/Header/DisplayName.tsx    |   4 +-
 .../Profile/Header/EditProfileDialog.tsx      |   6 +-
 src/screens/Profile/Header/Handle.tsx         |   4 +-
 src/screens/Profile/Header/Metrics.tsx        |   4 +-
 .../Profile/Header/ProfileHeaderLabeler.tsx   |  10 +-
 .../Profile/Header/ProfileHeaderStandard.tsx  |  10 +-
 src/screens/Profile/Header/Shell.tsx          |   4 +-
 src/screens/Profile/Header/index.tsx          |   8 +-
 src/screens/Profile/KnownFollowers.tsx        |   6 +-
 src/screens/Profile/components/GermButton.tsx |   5 +-
 src/screens/ProfileList/AboutSection.tsx      |   4 +-
 src/screens/ProfileList/components/Header.tsx |  11 +-
 .../components/MoreOptionsMenu.tsx            |  11 +-
 .../ProfileList/components/SubscribeMenu.tsx  |   4 +-
 src/screens/ProfileList/index.tsx             |  10 +-
 src/screens/SavedFeeds.tsx                    |  14 +-
 src/screens/Search/Explore.tsx                |  12 +-
 src/screens/Search/SearchResults.tsx          |  18 +-
 .../Search/components/ModuleHeader.tsx        |   9 +-
 .../Search/components/SearchHistory.tsx       |   3 +-
 .../Search/components/StarterPackCard.tsx     |  13 +-
 .../modules/ExploreSuggestedAccounts.tsx      |   4 +-
 .../Search/modules/ExploreTrendingTopics.tsx  |  10 +-
 .../Search/modules/ExploreTrendingVideos.tsx  |   6 +-
 .../Settings/ActivityPrivacySettings.tsx      |   4 +-
 .../Settings/AutomationLabelSettings.tsx      |  23 +-
 src/screens/Settings/FindContactsSettings.tsx |   3 +-
 .../Settings/PrivacyAndSecuritySettings.tsx   |   4 +-
 src/screens/Settings/Settings.tsx             |   8 +-
 .../components/ChangeHandleDialog.tsx         |   4 +-
 src/screens/Settings/components/PwiOptOut.tsx |  11 +-
 .../StepHandle/HandleSuggestions/index.tsx    |   4 +-
 .../StepHandle/HandleSuggestions/shared.ts    |   7 +-
 src/screens/Signup/StepInfo/Policies.tsx      |   4 +-
 src/screens/Signup/index.tsx                  |   7 +-
 src/screens/Signup/state.ts                   |   3 +-
 .../StarterPack/StarterPackLandingScreen.tsx  |  18 +-
 src/screens/StarterPack/StarterPackScreen.tsx |  28 +-
 src/screens/StarterPack/Wizard/State.tsx      |  16 +-
 src/screens/StarterPack/Wizard/StepFeeds.tsx  |   8 +-
 src/screens/StarterPack/Wizard/index.tsx      |  16 +-
 src/screens/Takendown.tsx                     |   5 +-
 src/screens/Topic.tsx                         |   8 +-
 src/screens/VideoFeed/index.tsx               |  55 ++--
 src/state/cache/post-shadow.ts                |  61 ++--
 src/state/cache/profile-shadow.ts             |  19 +-
 src/state/feed-feedback.tsx                   |  17 +-
 src/state/messages/convo/agent.ts             | 149 +++++----
 src/state/messages/convo/index.tsx            |  20 +-
 src/state/messages/convo/types.ts             |  35 +--
 src/state/queries/activity-subscriptions.ts   |   3 +-
 src/state/queries/actor-autocomplete.ts       |  12 +-
 .../queries/bookmarks/useBookmarkMutation.ts  |   5 +-
 .../queries/bookmarks/useBookmarksQuery.ts    |  23 +-
 src/state/queries/explore-feed-previews.tsx   |  39 +--
 src/state/queries/feed.ts                     |  49 ++-
 src/state/queries/join-links.ts               |  41 ++-
 src/state/queries/known-followers.ts          |   3 +-
 src/state/queries/list-members.ts             |   5 +-
 src/state/queries/list-memberships.ts         |  16 +-
 src/state/queries/list.ts                     |   3 +-
 src/state/queries/lists-with-membership.ts    |   3 +-
 .../queries/messages/accept-conversation.ts   |  10 +-
 .../queries/messages/actor-declaration.ts     |   9 +-
 .../queries/messages/add-group-members.ts     |  52 ++-
 src/state/queries/messages/conversation.ts    |  24 +-
 .../queries/messages/create-group-chat.ts     |   3 +-
 .../queries/messages/create-join-link.ts      |  19 +-
 .../queries/messages/disable-join-link.ts     |  15 +-
 .../queries/messages/edit-group-chat-name.ts  |   7 +-
 src/state/queries/messages/edit-join-link.ts  |  18 +-
 .../queries/messages/enable-join-link.ts      |  12 +-
 .../queries/messages/get-convo-for-members.ts |   3 +-
 src/state/queries/messages/join-requests.ts   |  20 +-
 .../queries/messages/leave-conversation.ts    |   8 +-
 .../messages/list-conversation-requests.tsx   |  35 ++-
 .../queries/messages/list-conversations.tsx   | 232 ++++++++------
 .../queries/messages/list-convo-members.ts    |   9 +-
 .../queries/messages/list-join-requests.ts    |   8 +-
 .../queries/messages/lock-conversation.ts     |   7 +-
 .../messages/mark-join-request-read.ts        |  16 +-
 .../queries/messages/mute-conversation.ts     |   3 +-
 .../queries/messages/remove-from-group.ts     |  30 +-
 .../messages/request-join-group-chat.ts       |   3 +-
 src/state/queries/messages/update-all-read.ts |  11 +-
 .../queries/messages/utils/convo-cache.ts     |  21 +-
 .../messages/withdraw-join-group-chat.ts      |   3 +-
 src/state/queries/my-blocked-accounts.ts      |   3 +-
 src/state/queries/my-lists.ts                 |   5 +-
 src/state/queries/my-muted-accounts.ts        |   3 +-
 .../notifications/__tests__/util.test.ts      |  12 +-
 src/state/queries/notifications/feed.ts       |  17 +-
 src/state/queries/notifications/settings.ts   |  28 +-
 src/state/queries/notifications/types.ts      |  20 +-
 src/state/queries/notifications/util.ts       |  56 ++--
 src/state/queries/nuxs/index.ts               |   6 +-
 src/state/queries/nuxs/types.ts               |   6 +-
 src/state/queries/nuxs/util.ts                |   9 +-
 src/state/queries/pinned-post.ts              |   6 +-
 src/state/queries/post-feed.ts                |  40 ++-
 src/state/queries/post-liked-by.ts            |   3 +-
 src/state/queries/post-quotes.ts              |  25 +-
 src/state/queries/post-reposted-by.ts         |   3 +-
 src/state/queries/post.ts                     |  34 +-
 src/state/queries/postgate/index.ts           |  17 +-
 src/state/queries/postgate/util.ts            |  70 +++--
 src/state/queries/preferences/index.ts        |  17 +-
 .../preferences/useThreadPreferences.ts       |   4 +-
 src/state/queries/profile-feedgens.ts         |   2 +-
 src/state/queries/profile-followers.ts        |   3 +-
 src/state/queries/profile-follows.ts          |   3 +-
 src/state/queries/profile-lists.ts            |   2 +-
 src/state/queries/profile.ts                  |  72 ++---
 src/state/queries/resolve-uri.ts              |   3 +-
 src/state/queries/search-posts-params.ts      |  29 +-
 src/state/queries/search-posts-v2.ts          |   6 +-
 src/state/queries/starter-packs.ts            |  39 +--
 src/state/queries/suggested-follows.ts        |   3 +-
 src/state/queries/threadgate/index.ts         |   5 +-
 src/state/queries/threadgate/util.ts          |   3 +-
 src/state/queries/usePostThread/const.ts      |  11 +-
 src/state/queries/usePostThread/queryCache.ts |  71 +++--
 src/state/queries/usePostThread/traversal.ts  |  61 +++-
 src/state/queries/usePostThread/types.ts      |  36 +--
 src/state/queries/usePostThread/utils.ts      |  32 +-
 src/state/queries/usePostThread/views.ts      |  32 +-
 src/state/queries/util.ts                     |  37 +--
 .../useUpdateProfileVerificationCache.ts      |   3 +-
 .../useVerificationCreateMutation.tsx         |  13 +-
 .../useVerificationsRemoveMutation.tsx        |   7 +-
 src/state/session/moderation.ts               |   6 +-
 src/state/shell/composer/index.tsx            |  14 +-
 src/state/threadgate-hidden-replies.tsx       |   7 +-
 src/state/unstable-post-source.tsx            |   5 +-
 src/types/bsky/__tests__/index.test.ts        |  41 ---
 src/types/bsky/__tests__/post.test.ts         |  28 +-
 src/types/bsky/__tests__/starterPack.test.ts  |  18 +-
 src/types/bsky/index.ts                       |  81 +----
 src/types/bsky/post.ts                        |  88 +-----
 src/types/bsky/profile.ts                     |  15 +-
 src/types/bsky/starterPack.ts                 |  33 +-
 src/view/com/composer/Composer.tsx            |  28 +-
 src/view/com/composer/ComposerReplyTo.tsx     |  39 +--
 src/view/com/composer/ExternalEmbed.tsx       |  12 +-
 src/view/com/composer/drafts/state/api.ts     |  47 +--
 src/view/com/composer/drafts/state/queries.ts |  20 +-
 src/view/com/composer/drafts/state/schema.ts  |   6 +-
 src/view/com/composer/state/composer.ts       |  36 ++-
 .../text-input/mobile/Autocomplete.tsx        |   4 +-
 .../composer/text-input/web/Autocomplete.tsx  |   4 +-
 .../composer/text-input/web/LinkDecorator.ts  |   2 +-
 .../composer/text-input/web/TagDecorator.ts   |   2 +-
 src/view/com/feeds/FeedPage.tsx               |   6 +-
 src/view/com/feeds/FeedSourceCard.tsx         |  16 +-
 src/view/com/feeds/MissingFeed.tsx            |   2 +-
 src/view/com/lists/ListMembers.tsx            |   4 +-
 src/view/com/lists/MyLists.tsx                |   7 +-
 .../notifications/NotificationFeedItem.tsx    |  49 +--
 src/view/com/post-thread/PostLikedBy.tsx      |  12 +-
 src/view/com/post-thread/PostQuotes.tsx       |  18 +-
 src/view/com/post-thread/PostRepostedBy.tsx   |   6 +-
 src/view/com/post/Post.tsx                    |  21 +-
 src/view/com/posts/PostFeed.tsx               |  38 +--
 src/view/com/posts/PostFeedErrorMessage.tsx   |  24 +-
 src/view/com/posts/PostFeedItem.tsx           |  68 ++--
 src/view/com/posts/PostFeedReason.tsx         |  11 +-
 src/view/com/posts/ViewFullThread.tsx         |   2 +-
 src/view/com/profile/ProfileFollowers.tsx     |  10 +-
 src/view/com/profile/ProfileFollows.tsx       |  10 +-
 src/view/com/profile/ProfileMenu.tsx          |   4 +-
 src/view/com/profile/ProfileSubpageHeader.tsx |   4 +-
 src/view/com/util/PostMeta.tsx                |   4 +-
 src/view/com/util/UserInfoText.tsx            |   4 +-
 src/view/screens/DebugMod.tsx                 | 295 +++++++++++++++---
 src/view/screens/Feeds.tsx                    |   4 +-
 src/view/screens/Lists.tsx                    |   2 +-
 .../screens/ModerationBlockedAccounts.tsx     |   6 +-
 src/view/screens/ModerationModlists.tsx       |   2 +-
 src/view/screens/ModerationMutedAccounts.tsx  |   4 +-
 src/view/screens/Profile.tsx                  |   7 +-
 src/view/shell/desktop/LeftNav.tsx            |   6 +-
 webpack.config.js                             |   2 +-
 391 files changed, 3130 insertions(+), 3589 deletions(-)
 delete mode 100644 .jscodeshift/repo/bsky-agent.js
 delete mode 100644 src/lib/moderation/subjects.ts

diff --git a/.jscodeshift/repo/bsky-agent.js b/.jscodeshift/repo/bsky-agent.js
deleted file mode 100644
index 57e501959d..0000000000
--- a/.jscodeshift/repo/bsky-agent.js
+++ /dev/null
@@ -1,62 +0,0 @@
-/**
- * Codemod to replace BskyAgent with AtpAgent
- *
- * Before:
- *   import {BskyAgent} from '@atproto/api`
- *   BskyAgent.appLabelers.includes(labeler)
- *
- * After:
- *   import {AtpAgent} from '@atproto/api`
- *   AtpAgent.appLabelers.includes(labeler)
- *
- * Handles import specifiers, type annotations, static member access
- * (BskyAgent.configure), `extends BskyAgent`, and `new BskyAgent()`. Whole
- * identifiers only, so names like `OpaqueBskyAgent` are left untouched.
- *
- * Usage: jscodeshift -t .jscodeshift/repo/bsky-agent.js <file-path>
- * Example: jscodeshift -t .jscodeshift/repo/bsky-agent.js src/lib/moderation.ts
- */
-
-/* eslint-disable */
-
-export const parser = 'tsx'
-
-export default function transformer(file, api) {
-  const j = api.jscodeshift
-  const root = j(file.source)
-
-  // Replace every standalone `BskyAgent` identifier with `AtpAgent`. This
-  // covers imports, type references, member expressions, `extends`, and `new`.
-  root
-    .find(j.Identifier, {name: 'BskyAgent'})
-    .replaceWith(() => j.identifier('AtpAgent'))
-
-  // Renaming can leave a duplicate `AtpAgent` specifier on the @atproto/api
-  // import if the file already imported it. Dedupe by imported name, keeping
-  // the type-only modifier only if every duplicate was type-only.
-  root
-    .find(j.ImportDeclaration, {source: {value: '@atproto/api'}})
-    .forEach(path => {
-      const seen = new Map()
-      for (const spec of path.value.specifiers) {
-        if (spec.type !== 'ImportSpecifier') {
-          seen.set(Symbol(), spec)
-          continue
-        }
-        const name = spec.imported.name
-        const existing = seen.get(name)
-        if (!existing) {
-          seen.set(name, spec)
-        } else if (
-          existing.importKind === 'type' &&
-          spec.importKind !== 'type'
-        ) {
-          // Prefer the value (non-type) import if either usage needs it.
-          seen.set(name, spec)
-        }
-      }
-      path.value.specifiers = Array.from(seen.values())
-    })
-
-  return root.toSource()
-}
diff --git a/__tests__/lib/string.test.ts b/__tests__/lib/string.test.ts
index 8a56423796..da34bd0dc6 100644
--- a/__tests__/lib/string.test.ts
+++ b/__tests__/lib/string.test.ts
@@ -1,4 +1,4 @@
-import {RichText} from '@atproto/api'
+import {RichText} from '@bsky.app/sdk/richtext'
 import {i18n} from '@lingui/core'
 
 import {parseEmbedPlayerFromUrl} from '#/lib/strings/embed-player'
diff --git a/lexicons/app/bsky/unspecced/defs.json b/lexicons/app/bsky/unspecced/defs.json
index 609de81f8f..3dd830a6d2 100644
--- a/lexicons/app/bsky/unspecced/defs.json
+++ b/lexicons/app/bsky/unspecced/defs.json
@@ -6,48 +6,31 @@
       "type": "object",
       "required": ["uri"],
       "properties": {
-        "uri": {
-          "type": "string",
-          "format": "at-uri"
-        }
+        "uri": { "type": "string", "format": "at-uri" }
       }
     },
     "skeletonSearchActor": {
       "type": "object",
       "required": ["did"],
       "properties": {
-        "did": {
-          "type": "string",
-          "format": "did"
-        }
+        "did": { "type": "string", "format": "did" }
       }
     },
     "skeletonSearchStarterPack": {
       "type": "object",
       "required": ["uri"],
       "properties": {
-        "uri": {
-          "type": "string",
-          "format": "at-uri"
-        }
+        "uri": { "type": "string", "format": "at-uri" }
       }
     },
     "trendingTopic": {
       "type": "object",
       "required": ["topic", "link"],
       "properties": {
-        "topic": {
-          "type": "string"
-        },
-        "displayName": {
-          "type": "string"
-        },
-        "description": {
-          "type": "string"
-        },
-        "link": {
-          "type": "string"
-        }
+        "topic": { "type": "string" },
+        "displayName": { "type": "string" },
+        "description": { "type": "string" },
+        "link": { "type": "string" }
       }
     },
     "skeletonTrend": {
@@ -61,32 +44,14 @@
         "dids"
       ],
       "properties": {
-        "topic": {
-          "type": "string"
-        },
-        "displayName": {
-          "type": "string"
-        },
-        "description": {
-          "type": "string"
-        },
-        "link": {
-          "type": "string"
-        },
-        "startedAt": {
-          "type": "string",
-          "format": "datetime"
-        },
-        "postCount": {
-          "type": "integer"
-        },
-        "status": {
-          "type": "string",
-          "knownValues": ["hot"]
-        },
-        "category": {
-          "type": "string"
-        },
+        "topic": { "type": "string" },
+        "displayName": { "type": "string" },
+        "description": { "type": "string" },
+        "link": { "type": "string" },
+        "startedAt": { "type": "string", "format": "datetime" },
+        "postCount": { "type": "integer" },
+        "status": { "type": "string", "knownValues": ["hot"] },
+        "category": { "type": "string" },
         "dids": {
           "type": "array",
           "items": {
@@ -107,32 +72,14 @@
         "actors"
       ],
       "properties": {
-        "topic": {
-          "type": "string"
-        },
-        "displayName": {
-          "type": "string"
-        },
-        "description": {
-          "type": "string"
-        },
-        "link": {
-          "type": "string"
-        },
-        "startedAt": {
-          "type": "string",
-          "format": "datetime"
-        },
-        "postCount": {
-          "type": "integer"
-        },
-        "status": {
-          "type": "string",
-          "knownValues": ["hot"]
-        },
-        "category": {
-          "type": "string"
-        },
+        "topic": { "type": "string" },
+        "displayName": { "type": "string" },
+        "description": { "type": "string" },
+        "link": { "type": "string" },
+        "startedAt": { "type": "string", "format": "datetime" },
+        "postCount": { "type": "integer" },
+        "status": { "type": "string", "knownValues": ["hot"] },
+        "category": { "type": "string" },
         "actors": {
           "type": "array",
           "items": {
@@ -153,10 +100,7 @@
         "mutedByViewer"
       ],
       "properties": {
-        "post": {
-          "type": "ref",
-          "ref": "app.bsky.feed.defs#postView"
-        },
+        "post": { "type": "ref", "ref": "app.bsky.feed.defs#postView" },
         "moreParents": {
           "type": "boolean",
           "description": "This post has more parents that were not present in the response. This is just a boolean, without the number of parents."
@@ -167,7 +111,15 @@
         },
         "opThread": {
           "type": "boolean",
-          "description": "This post is part of a contiguous thread by the OP from the thread root. Many different OP threads can happen in the same thread."
+          "description": "This post is part of a contiguous thread by the OP from the thread root. Sub-threads by OP deeper in the tree are not considered an OP thread."
+        },
+        "opThreadPostIndex": {
+          "type": "integer",
+          "description": "The 1-indexed position of this post within the contiguous OP thread. Only present when this post is part of the OP thread (see `opThread`)."
+        },
+        "opThreadPostCount": {
+          "type": "integer",
+          "description": "The total number of posts in the contiguous OP thread that this post belongs to. Only present when this post is part of the OP thread (see `opThread`)."
         },
         "hiddenByThreadgate": {
           "type": "boolean",
@@ -191,10 +143,7 @@
       "type": "object",
       "required": ["author"],
       "properties": {
-        "author": {
-          "type": "ref",
-          "ref": "app.bsky.feed.defs#blockedAuthor"
-        }
+        "author": { "type": "ref", "ref": "app.bsky.feed.defs#blockedAuthor" }
       }
     },
     "ageAssuranceState": {
diff --git a/oxlint-suppressions.json b/oxlint-suppressions.json
index 1d22db2747..1cb148b151 100644
--- a/oxlint-suppressions.json
+++ b/oxlint-suppressions.json
@@ -1645,7 +1645,7 @@
       "count": 8
     },
     "typescript/no-unsafe-member-access": {
-      "count": 9
+      "count": 8
     }
   },
   "src/view/com/util/EmptyState.tsx": {
diff --git a/package.json b/package.json
index 5d92bc833f..4415b0fa58 100644
--- a/package.json
+++ b/package.json
@@ -100,7 +100,6 @@
     "prettier": "prettier --check ."
   },
   "dependencies": {
-    "@atproto/api": "0.20.39",
     "@atproto/common-web": "0.5.9",
     "@atproto/lex": "0.3.6",
     "@atproto/lex-password-session": "0.2.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3b8bcb5f36..92a4d68c35 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -242,9 +242,6 @@ importers:
 
   .:
     dependencies:
-      '@atproto/api':
-        specifier: 0.20.39
-        version: 0.20.39
       '@atproto/common-web':
         specifier: 0.5.9
         version: 0.5.9
@@ -908,10 +905,6 @@ packages:
     resolution: {integrity: sha512-vfvoDhu6ds6BT3Pqe+d2/LBU1WpDRtt69y6zltlfMCoucPm82m1j50/Wb6xTvv+oZ+2j0JyZVXsmXQ12SWYQJg==}
     engines: {node: '>=22'}
 
-  '@atproto/api@0.20.39':
-    resolution: {integrity: sha512-FRjwAmYe0kKlWsAe8IvfbmAAKyjpXnl2NV67vWEEjux0FwIEIG6JbOo6YkD5tjK2xjL0Daa429R0E8phmxRrrQ==}
-    engines: {node: '>=22'}
-
   '@atproto/common-web@0.5.9':
     resolution: {integrity: sha512-2c5C6YV8352JJz9Z5fNfcsstllaKGAb3cQW9aO7unMAGh/FzTGFq+xOwNMW2lTeagO6z530uxYm8AiSRM6O+DQ==}
     engines: {node: '>=22'}
@@ -973,10 +966,6 @@ packages:
     engines: {node: '>=22'}
     hasBin: true
 
-  '@atproto/lexicon@0.7.11':
-    resolution: {integrity: sha512-ukCZMCWmiu7fAlssBbLs+IMaf2K2R9mADaTKz2jEeC/xeZ3jT77Ka0S2G+ELBB+Dc9ijBACU0iPMQLhquOkuzQ==}
-    engines: {node: '>=22'}
-
   '@atproto/repo@0.10.11':
     resolution: {integrity: sha512-QqDzEv8d6NUuqZ0xvWG+n8DfWd4Vuka04nyuD9oglKsj5avB1zbEsWx3Oit1oYtZFUf9JSVWMDqMXhu3UbB+lA==}
     engines: {node: '>=22'}
@@ -985,10 +974,6 @@ packages:
     resolution: {integrity: sha512-EHsEHtasH/DGPljBYecVDjweGMQ5eTu6Ns0GZ5z0qdqpOI8ipBvldWnMIxWkA+5HfZ9Dsu4V1MX0WP7wgL8cuA==}
     engines: {node: '>=22'}
 
-  '@atproto/xrpc@0.8.10':
-    resolution: {integrity: sha512-++FNpTVF61fF8+3Kk1RYtdTO7xyUTdIc/Cmfk2CMn29Qw9tZD8bmW+M5db1Z0okYWFWK8Wqu7bc9VmF8tUB8Jg==}
-    engines: {node: '>=22'}
-
   '@babel/code-frame@7.10.4':
     resolution: {integrity: sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==}
 
@@ -4320,9 +4305,6 @@ packages:
     resolution: {integrity: sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==}
     engines: {node: '>= 0.4'}
 
-  await-lock@3.0.0:
-    resolution: {integrity: sha512-eO6fLiSnrJrMdjWMNK8zbVRXPs2TKJg78iKZd9wDpN3na5tcoV6EoeiOlMgk2QaAQ1gIrK1YuMsJHXWqz89tSA==}
-
   babel-jest@29.7.0:
     resolution: {integrity: sha512-BrvGY3xZSwEcCzKvKsCi2GgHqDqsYkOP4/by5xCgIwGXQxIEh+8ew3gmrE1y7XRR6LHZIj6yLYnUi/mm2KXKBg==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
@@ -9754,17 +9736,6 @@ snapshots:
 
   '@atproto-labs/simple-store@0.5.1': {}
 
-  '@atproto/api@0.20.39':
-    dependencies:
-      '@atproto/common-web': 0.5.9
-      '@atproto/lexicon': 0.7.11
-      '@atproto/syntax': 0.7.4
-      '@atproto/xrpc': 0.8.10
-      await-lock: 3.0.0
-      multiformats: 13.4.2
-      tlds: 1.261.0
-      zod: 3.25.76
-
   '@atproto/common-web@0.5.9':
     dependencies:
       '@atproto/lex-data': 0.1.7
@@ -9875,13 +9846,6 @@ snapshots:
       tslib: 2.8.1
       yargs: 18.1.0
 
-  '@atproto/lexicon@0.7.11':
-    dependencies:
-      '@atproto/common-web': 0.5.9
-      '@atproto/syntax': 0.7.4
-      multiformats: 13.4.2
-      zod: 3.25.76
-
   '@atproto/repo@0.10.11':
     dependencies:
       '@atproto/common': 0.8.0
@@ -9898,11 +9862,6 @@ snapshots:
       iso-datestring-validator: 2.2.2
       tslib: 2.8.1
 
-  '@atproto/xrpc@0.8.10':
-    dependencies:
-      '@atproto/lexicon': 0.7.11
-      zod: 3.25.76
-
   '@babel/code-frame@7.10.4':
     dependencies:
       '@babel/highlight': 7.25.9
@@ -13788,8 +13747,6 @@ snapshots:
     dependencies:
       possible-typed-array-names: 1.1.0
 
-  await-lock@3.0.0: {}
-
   babel-jest@29.7.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1):
     dependencies:
       '@babel/core': 7.29.0(supports-color@8.1.1)
diff --git a/src/ageAssurance/const.ts b/src/ageAssurance/const.ts
index 326552681c..9d20a64ea6 100644
--- a/src/ageAssurance/const.ts
+++ b/src/ageAssurance/const.ts
@@ -1,8 +1,3 @@
-import {
-  ageAssuranceRuleIDs as ids,
-  type AppBskyAgeassuranceDefs,
-} from '@atproto/api'
-
 import {AgeAssuranceAccess} from '#/ageAssurance/types'
 import {
   ANDROID_API_LEVEL,
@@ -11,6 +6,7 @@ import {
   IS_IOS,
   IS_WEB,
 } from '#/env'
+import {app} from '#/lexicons'
 
 /**
  * Minimum age required to access the app at all.
@@ -44,19 +40,17 @@ export const AGE_ASSURANCE_PLATFORM: 'web' | 'ios' | 'android' = IS_WEB
 export const DEVICE_SIGNALS_SUPPORTED: boolean =
   (IS_IOS && IOS_MAJOR_VERSION >= 26) || (IS_ANDROID && ANDROID_API_LEVEL >= 23)
 
-export const FALLBACK_REGION_CONFIG: AppBskyAgeassuranceDefs.ConfigRegion = {
+export const FALLBACK_REGION_CONFIG: app.bsky.ageassurance.defs.ConfigRegion = {
   countryCode: '*',
   regionCode: undefined,
   minAccessAge: MIN_ACCESS_AGE,
   rules: [
-    {
-      $type: ids.IfDeclaredOverAge,
+    app.bsky.ageassurance.defs.configRegionRuleIfDeclaredOverAge.build({
       age: MIN_ACCESS_AGE,
       access: AgeAssuranceAccess.Full,
-    },
-    {
-      $type: ids.Default,
+    }),
+    app.bsky.ageassurance.defs.configRegionRuleDefault.build({
       access: AgeAssuranceAccess.None,
-    },
+    }),
   ],
 }
diff --git a/src/ageAssurance/data.tsx b/src/ageAssurance/data.tsx
index 2540c4b1f9..0eed2bc43f 100644
--- a/src/ageAssurance/data.tsx
+++ b/src/ageAssurance/data.tsx
@@ -1,11 +1,5 @@
 import {createContext, useCallback, useContext, useEffect, useMemo} from 'react'
 import * as AgeRange from 'expo-age-range'
-import {
-  type AppBskyAgeassuranceDefs,
-  type AppBskyAgeassuranceGetConfig,
-  type AppBskyAgeassuranceGetState,
-  type ChatBskyActorDeclaration,
-} from '@atproto/api'
 import {type Client} from '@atproto/lex'
 import {getPreferences} from '@bsky.app/sdk'
 import {createAsyncStoragePersister} from '@tanstack/query-async-storage-persister'
@@ -38,7 +32,7 @@ import {
 } from '#/ageAssurance/util'
 import {IS_DEV} from '#/env'
 import {useGeolocation} from '#/geolocation'
-import {app} from '#/lexicons'
+import {app, type chat} from '#/lexicons'
 import {device} from '#/storage'
 
 /**
@@ -102,14 +96,12 @@ export async function getConfig() {
    * before there is any session (and while logged out), so it goes through the
    * process-wide public client rather than a bundle one.
    */
-  return (await getPublicAppviewClient().call(
-    app.bsky.ageassurance.getConfig,
-  )) as AppBskyAgeassuranceGetConfig.OutputSchema
+  return await getPublicAppviewClient().call(app.bsky.ageassurance.getConfig)
 }
 export function getConfigFromCache():
-  | AppBskyAgeassuranceGetConfig.OutputSchema
+  | app.bsky.ageassurance.getConfig.$OutputBody
   | undefined {
-  return qc.getQueryData<AppBskyAgeassuranceGetConfig.OutputSchema>(
+  return qc.getQueryData<app.bsky.ageassurance.getConfig.$OutputBody>(
     configQueryKey,
   )
 }
@@ -130,7 +122,7 @@ export function prefetchConfig() {
       try {
         logger.debug(`prefetchAgeAssuranceConfig: resolving...`)
         const res = await networkRetry(3, () => getConfig())
-        qc.setQueryData<AppBskyAgeassuranceGetConfig.OutputSchema>(
+        qc.setQueryData<app.bsky.ageassurance.getConfig.$OutputBody>(
           configQueryKey,
           res,
         )
@@ -146,7 +138,7 @@ export function prefetchConfig() {
 export async function refetchConfig() {
   logger.debug(`refetchConfig: fetching...`)
   const res = await getConfig()
-  qc.setQueryData<AppBskyAgeassuranceGetConfig.OutputSchema>(
+  qc.setQueryData<app.bsky.ageassurance.getConfig.$OutputBody>(
     configQueryKey,
     res,
   )
@@ -216,8 +208,8 @@ export function getServerStateFromCache({
   did,
 }: {
   did: string
-}): AppBskyAgeassuranceGetState.OutputSchema | undefined {
-  return qc.getQueryData<AppBskyAgeassuranceGetState.OutputSchema>(
+}): app.bsky.ageassurance.getState.$OutputBody | undefined {
+  return qc.getQueryData<app.bsky.ageassurance.getState.$OutputBody>(
     createServerStateQueryKey({did}),
   )
 }
@@ -243,7 +235,7 @@ export async function prefetchServerState({
     logger.debug(`prefetchServerState: resolving...`)
     const res = await networkRetry(3, () => getServerState({appviewClient}))
     if (res) {
-      qc.setQueryData<AppBskyAgeassuranceGetState.OutputSchema>(qk, res)
+      qc.setQueryData<app.bsky.ageassurance.getState.$OutputBody>(qk, res)
     }
   } catch (err) {
     const e = err as Error
@@ -262,7 +254,7 @@ export async function refetchServerState({
   logger.debug(`refetchServerState: fetching...`)
   const res = await networkRetry(3, () => getServerState({appviewClient}))
   if (res) {
-    qc.setQueryData<AppBskyAgeassuranceGetState.OutputSchema>(
+    qc.setQueryData<app.bsky.ageassurance.getState.$OutputBody>(
       createServerStateQueryKey({did}),
       res,
     )
@@ -272,16 +264,16 @@ export async function refetchServerState({
 export function usePatchServerState() {
   const {currentAccount} = useSession()
   return useCallback(
-    (next: AppBskyAgeassuranceDefs.State) => {
+    (next: app.bsky.ageassurance.defs.State) => {
       if (!currentAccount) return
       const did = currentAccount.did
       const prev = getServerStateFromCache({did})
-      const merged: AppBskyAgeassuranceGetState.OutputSchema = {
+      const merged: app.bsky.ageassurance.getState.$OutputBody = {
         metadata: {},
         ...(prev || {}),
         state: next,
       }
-      qc.setQueryData<AppBskyAgeassuranceGetState.OutputSchema>(
+      qc.setQueryData<app.bsky.ageassurance.getState.$OutputBody>(
         createServerStateQueryKey({did}),
         merged,
       )
@@ -347,7 +339,7 @@ export function useServerStateQuery() {
 
 export type OtherRequiredData = {
   birthdate: string | undefined
-  actorDeclaration?: ChatBskyActorDeclaration.Main
+  actorDeclaration?: chat.bsky.actor.declaration.Main
 }
 export function createOtherRequiredDataQueryKey({did}: {did: string}) {
   return ['otherRequiredData', did]
@@ -422,7 +414,7 @@ export function setOtherRequiredDataActorDeclarationCache({
   actorDeclaration,
 }: {
   did: string
-  actorDeclaration: ChatBskyActorDeclaration.Main
+  actorDeclaration: chat.bsky.actor.declaration.Main
 }) {
   const prev = getOtherRequiredDataFromCache({did})
   const next: OtherRequiredData = {
@@ -564,7 +556,7 @@ export function getDeviceSignalsFromCacheForRegion({
   region,
 }: {
   did: string
-  region: AppBskyAgeassuranceDefs.ConfigRegion
+  region: app.bsky.ageassurance.defs.ConfigRegion
 }): AgeRange.AgeRangeResponse | undefined {
   const regionKey = createRegionKey(region)
   return getDeviceSignalsMapFromCache({did})?.[regionKey]
@@ -718,11 +710,11 @@ export type AgeAssuranceServerData = {
   /**
    * The raw config from the appview.
    */
-  config: AppBskyAgeassuranceDefs.Config | undefined
+  config: app.bsky.ageassurance.defs.Config | undefined
   /**
    * The raw state from the appview. Must be further processed before being useful.
    */
-  state: AppBskyAgeassuranceDefs.State | undefined
+  state: app.bsky.ageassurance.defs.State | undefined
   metadata: AgeAssuranceMetadata | undefined
   /**
    * The native on-device age signals for the region the user is currently in,
diff --git a/src/ageAssurance/debug.ts b/src/ageAssurance/debug.ts
index 74121976ca..b640c4a2de 100644
--- a/src/ageAssurance/debug.ts
+++ b/src/ageAssurance/debug.ts
@@ -1,13 +1,10 @@
 import type * as AgeRange from 'expo-age-range'
-import {
-  ageAssuranceRuleIDs as ids,
-  type AppBskyAgeassuranceDefs,
-  type AppBskyAgeassuranceGetState,
-} from '@atproto/api'
+import {toDatetimeString} from '@atproto/syntax'
 
 import {type OtherRequiredData} from '#/ageAssurance/data'
 import {IS_DEV, IS_E2E} from '#/env'
 import {type Geolocation} from '#/geolocation'
+import {app} from '#/lexicons'
 
 export const enabled = (IS_DEV && false) || IS_E2E
 
@@ -31,31 +28,31 @@ export const otherRequiredData: OtherRequiredData = {
 }
 
 const serverStateEnabled = false || IS_E2E
-export const serverState: AppBskyAgeassuranceGetState.OutputSchema | undefined =
-  serverStateEnabled
-    ? {
-        state: {
-          lastInitiatedAt: undefined, // new Date(2025, 1, 1).toISOString(),
-          status: 'unknown',
-          access: 'unknown',
-        },
-        metadata: {
-          accountCreatedAt: new Date(2023, 1, 1).toISOString(),
-        },
-      }
-    : undefined
+export const serverState:
+  | app.bsky.ageassurance.getState.$OutputBody
+  | undefined = serverStateEnabled
+  ? {
+      state: {
+        lastInitiatedAt: undefined, // new Date(2025, 1, 1).toISOString(),
+        status: 'unknown',
+        access: 'unknown',
+      },
+      metadata: {
+        accountCreatedAt: toDatetimeString(new Date(2023, 1, 1)),
+      },
+    }
+  : undefined
 
-export const config: AppBskyAgeassuranceDefs.Config = {
+export const config: app.bsky.ageassurance.defs.Config = {
   regions: [
     {
       countryCode: 'AA',
       regionCode: undefined,
       minAccessAge: 13,
       rules: [
-        {
-          $type: ids.Default,
+        app.bsky.ageassurance.defs.configRegionRuleDefault.build({
           access: 'full',
-        },
+        }),
       ],
     },
     {
@@ -68,65 +65,55 @@ export const config: AppBskyAgeassuranceDefs.Config = {
       minAccessAge: 18,
       additionalVerificationMethods: ['device'],
       rules: [
-        {
+        app.bsky.ageassurance.defs.configRegionRuleIfAssuredOverAge.build({
           age: 18,
           access: 'full',
-          $type: ids.IfAssuredOverAge,
-        },
-        {
+        }),
+        app.bsky.ageassurance.defs.configRegionRuleDefault.build({
           access: 'none',
-          $type: ids.Default,
-        },
+        }),
       ],
     },
     {
       countryCode: 'GB',
       minAccessAge: 13,
       rules: [
-        {
+        app.bsky.ageassurance.defs.configRegionRuleIfAssuredOverAge.build({
           age: 18,
           access: 'full',
-          $type: ids.IfAssuredOverAge,
-        },
-        {
+        }),
+        app.bsky.ageassurance.defs.configRegionRuleIfDeclaredOverAge.build({
           age: 13,
           access: 'safe',
-          $type: ids.IfDeclaredOverAge,
-        },
-        {
+        }),
+        app.bsky.ageassurance.defs.configRegionRuleDefault.build({
           access: 'none',
-          $type: ids.Default,
-        },
+        }),
       ],
     },
     {
       countryCode: 'AU',
       minAccessAge: 16,
       rules: [
-        {
+        app.bsky.ageassurance.defs.configRegionRuleIfAccountNewerThan.build({
           date: '2025-12-10T00:00:00Z',
           access: 'none',
-          $type: ids.IfAccountNewerThan,
-        },
-        {
+        }),
+        app.bsky.ageassurance.defs.configRegionRuleIfAssuredOverAge.build({
           age: 18,
           access: 'full',
-          $type: ids.IfAssuredOverAge,
-        },
-        {
+        }),
+        app.bsky.ageassurance.defs.configRegionRuleIfAssuredOverAge.build({
           age: 16,
           access: 'safe',
-          $type: ids.IfAssuredOverAge,
-        },
-        {
+        }),
+        app.bsky.ageassurance.defs.configRegionRuleIfDeclaredOverAge.build({
           age: 16,
           access: 'safe',
-          $type: ids.IfDeclaredOverAge,
-        },
-        {
+        }),
+        app.bsky.ageassurance.defs.configRegionRuleDefault.build({
           access: 'none',
-          $type: ids.Default,
-        },
+        }),
       ],
     },
     {
@@ -134,20 +121,17 @@ export const config: AppBskyAgeassuranceDefs.Config = {
       regionCode: 'SD',
       minAccessAge: 13,
       rules: [
-        {
+        app.bsky.ageassurance.defs.configRegionRuleIfAssuredOverAge.build({
           age: 18,
           access: 'full',
-          $type: ids.IfAssuredOverAge,
-        },
-        {
+        }),
+        app.bsky.ageassurance.defs.configRegionRuleIfDeclaredOverAge.build({
           age: 13,
           access: 'safe',
-          $type: ids.IfDeclaredOverAge,
-        },
-        {
+        }),
+        app.bsky.ageassurance.defs.configRegionRuleDefault.build({
           access: 'none',
-          $type: ids.Default,
-        },
+        }),
       ],
     },
     {
@@ -155,20 +139,17 @@ export const config: AppBskyAgeassuranceDefs.Config = {
       regionCode: 'WY',
       minAccessAge: 13,
       rules: [
-        {
+        app.bsky.ageassurance.defs.configRegionRuleIfAssuredOverAge.build({
           age: 18,
           access: 'full',
-          $type: ids.IfAssuredOverAge,
-        },
-        {
+        }),
+        app.bsky.ageassurance.defs.configRegionRuleIfDeclaredOverAge.build({
           age: 13,
           access: 'safe',
-          $type: ids.IfDeclaredOverAge,
-        },
-        {
+        }),
+        app.bsky.ageassurance.defs.configRegionRuleDefault.build({
           access: 'none',
-          $type: ids.Default,
-        },
+        }),
       ],
     },
     {
@@ -176,20 +157,17 @@ export const config: AppBskyAgeassuranceDefs.Config = {
       regionCode: 'OH',
       minAccessAge: 13,
       rules: [
-        {
+        app.bsky.ageassurance.defs.configRegionRuleIfAssuredOverAge.build({
           age: 18,
           access: 'full',
-          $type: ids.IfAssuredOverAge,
-        },
-        {
+        }),
+        app.bsky.ageassurance.defs.configRegionRuleIfDeclaredOverAge.build({
           age: 13,
           access: 'safe',
-          $type: ids.IfDeclaredOverAge,
-        },
-        {
+        }),
+        app.bsky.ageassurance.defs.configRegionRuleDefault.build({
           access: 'none',
-          $type: ids.Default,
-        },
+        }),
       ],
     },
     {
@@ -197,15 +175,13 @@ export const config: AppBskyAgeassuranceDefs.Config = {
       regionCode: 'MS',
       minAccessAge: 18,
       rules: [
-        {
+        app.bsky.ageassurance.defs.configRegionRuleIfAssuredOverAge.build({
           age: 18,
           access: 'full',
-          $type: ids.IfAssuredOverAge,
-        },
-        {
+        }),
+        app.bsky.ageassurance.defs.configRegionRuleDefault.build({
           access: 'none',
-          $type: ids.Default,
-        },
+        }),
       ],
     },
     {
@@ -213,20 +189,17 @@ export const config: AppBskyAgeassuranceDefs.Config = {
       regionCode: 'VA',
       minAccessAge: 16,
       rules: [
-        {
+        app.bsky.ageassurance.defs.configRegionRuleIfAssuredOverAge.build({
           age: 16,
           access: 'full',
-          $type: ids.IfAssuredOverAge,
-        },
-        {
+        }),
+        app.bsky.ageassurance.defs.configRegionRuleIfDeclaredOverAge.build({
           age: 16,
           access: 'full',
-          $type: ids.IfDeclaredOverAge,
-        },
-        {
+        }),
+        app.bsky.ageassurance.defs.configRegionRuleDefault.build({
           access: 'none',
-          $type: ids.Default,
-        },
+        }),
       ],
     },
     {
@@ -234,45 +207,38 @@ export const config: AppBskyAgeassuranceDefs.Config = {
       regionCode: 'TN',
       minAccessAge: 18,
       rules: [
-        {
+        app.bsky.ageassurance.defs.configRegionRuleIfAssuredOverAge.build({
           age: 18,
           access: 'full',
-          $type: ids.IfAssuredOverAge,
-        },
-        {
+        }),
+        app.bsky.ageassurance.defs.configRegionRuleIfDeclaredOverAge.build({
           age: 18,
           access: 'full',
-          $type: ids.IfDeclaredOverAge,
-        },
-        {
+        }),
+        app.bsky.ageassurance.defs.configRegionRuleDefault.build({
           access: 'none',
-          $type: ids.Default,
-        },
+        }),
       ],
     },
     {
       countryCode: 'BR',
       minAccessAge: 13,
       rules: [
-        {
+        app.bsky.ageassurance.defs.configRegionRuleIfAssuredOverAge.build({
           age: 18,
           access: 'full',
-          $type: ids.IfAssuredOverAge,
-        },
-        {
+        }),
+        app.bsky.ageassurance.defs.configRegionRuleIfDeclaredOverAge.build({
           age: 18,
           access: 'full',
-          $type: ids.IfDeclaredOverAge,
-        },
-        {
+        }),
+        app.bsky.ageassurance.defs.configRegionRuleIfDeclaredOverAge.build({
           age: 13,
           access: 'safe',
-          $type: ids.IfDeclaredOverAge,
-        },
-        {
+        }),
+        app.bsky.ageassurance.defs.configRegionRuleDefault.build({
           access: 'none',
-          $type: ids.Default,
-        },
+        }),
       ],
     },
   ],
diff --git a/src/ageAssurance/state.ts b/src/ageAssurance/state.ts
index 2a0b76446b..8ede9d13fa 100644
--- a/src/ageAssurance/state.ts
+++ b/src/ageAssurance/state.ts
@@ -1,9 +1,6 @@
 import {useEffect, useMemo, useState} from 'react'
 import type * as AgeRange from 'expo-age-range'
-import {
-  type AppBskyAgeassuranceDefs,
-  computeAgeAssuranceRegionAccess,
-} from '@atproto/api'
+import {computeAgeAssuranceRegionAccess} from '@bsky.app/sdk/utils'
 
 import {getAge} from '#/lib/strings/time'
 import {useSession} from '#/state/session'
@@ -30,6 +27,7 @@ import {
   getAgeAssuranceRegionConfigWithFallback,
 } from '#/ageAssurance/util'
 import {type Geolocation, useGeolocation} from '#/geolocation'
+import {type app} from '#/lexicons'
 import {device} from '#/storage'
 
 /**
@@ -47,8 +45,8 @@ function computeAgeAssuranceState({
 }: {
   hasSession: boolean
   geolocation: Geolocation
-  config?: AppBskyAgeassuranceDefs.Config
-  state?: AppBskyAgeassuranceDefs.State
+  config?: app.bsky.ageassurance.defs.Config
+  state?: app.bsky.ageassurance.defs.State
   metadata?: AgeAssuranceMetadata
   deviceSignals?: AgeRange.AgeRangeResponse
 }) {
diff --git a/src/ageAssurance/types.ts b/src/ageAssurance/types.ts
index 5dcabeb268..79fd5f1820 100644
--- a/src/ageAssurance/types.ts
+++ b/src/ageAssurance/types.ts
@@ -1,5 +1,5 @@
 import type * as AgeRange from 'expo-age-range'
-import {type computeAgeAssuranceRegionAccess} from '@atproto/api'
+import {type computeAgeAssuranceRegionAccess} from '@bsky.app/sdk/utils'
 
 import {logger} from '#/ageAssurance/logger'
 
diff --git a/src/ageAssurance/useComputeAgeAssuranceRegionAccess.ts b/src/ageAssurance/useComputeAgeAssuranceRegionAccess.ts
index 5ba9e1ba6d..8f88398ce6 100644
--- a/src/ageAssurance/useComputeAgeAssuranceRegionAccess.ts
+++ b/src/ageAssurance/useComputeAgeAssuranceRegionAccess.ts
@@ -1,5 +1,5 @@
 import {useCallback} from 'react'
-import {computeAgeAssuranceRegionAccess} from '@atproto/api'
+import {computeAgeAssuranceRegionAccess} from '@bsky.app/sdk/utils'
 
 import {useAgeAssuranceServerDataContext} from '#/ageAssurance/data'
 import {logger} from '#/ageAssurance/logger'
diff --git a/src/ageAssurance/util.test.ts b/src/ageAssurance/util.test.ts
index 1da131b920..59e46e785f 100644
--- a/src/ageAssurance/util.test.ts
+++ b/src/ageAssurance/util.test.ts
@@ -1,31 +1,47 @@
-import {getAgeAssuranceRegionConfig} from '@atproto/api'
-
 import {getAgeAssuranceRegionConfigForGeolocation} from '#/ageAssurance/util'
+import {type app} from '#/lexicons'
 
 jest.mock('#/ageAssurance/data')
-jest.mock('@atproto/api', () => ({
-  ...jest.requireActual('@atproto/api'),
-  getAgeAssuranceRegionConfig: jest.fn(),
-}))
 
 /*
- * Platform-based region filtering itself is implemented and tested in
- * `@atproto/api` (see `getAgeAssuranceRegionConfig`). What we own - and test
- * here - is that region resolution passes the current platform through. The
- * jest preset is `jest-expo/ios`, so `AGE_ASSURANCE_PLATFORM` resolves to
- * `ios` in these tests.
+ * Platform scoping is applied locally in `util.ts` (the SDK region matcher
+ * takes no platform filter). The jest preset is `jest-expo/ios`, so
+ * `AGE_ASSURANCE_PLATFORM` resolves to `ios` in these tests.
  */
 describe('getAgeAssuranceRegionConfigForGeolocation', () => {
-  it('passes the current platform to the SDK region matcher', () => {
-    const config = {regions: []}
-    getAgeAssuranceRegionConfigForGeolocation(config, {
-      countryCode: 'US',
-      regionCode: 'TX',
-    })
-    expect(getAgeAssuranceRegionConfig).toHaveBeenCalledWith(config, {
-      countryCode: 'US',
-      regionCode: 'TX',
-      platform: 'ios',
-    })
+  const region = (
+    countryCode: string,
+    regionCode?: string,
+    platforms?: app.bsky.ageassurance.defs.ConfigRegion['platforms'],
+  ): app.bsky.ageassurance.defs.ConfigRegion => ({
+    countryCode,
+    regionCode,
+    platforms,
+    minAccessAge: 13,
+    rules: [],
+  })
+
+  it('skips regions for other platforms and continues matching', () => {
+    const web = region('US', undefined, ['web'])
+    const ios = region('US', undefined, ['ios'])
+
+    expect(
+      getAgeAssuranceRegionConfigForGeolocation(
+        {regions: [web, ios]},
+        {countryCode: 'US', regionCode: undefined},
+      ),
+    ).toBe(ios)
+  })
+
+  it('matches a region-specific config before a later country config', () => {
+    const texas = region('US', 'TX')
+    const us = region('US')
+
+    expect(
+      getAgeAssuranceRegionConfigForGeolocation(
+        {regions: [texas, us]},
+        {countryCode: 'US', regionCode: 'TX'},
+      ),
+    ).toBe(texas)
   })
 })
diff --git a/src/ageAssurance/util.ts b/src/ageAssurance/util.ts
index fcda8056f1..39bb14ab0c 100644
--- a/src/ageAssurance/util.ts
+++ b/src/ageAssurance/util.ts
@@ -1,11 +1,10 @@
 import {useMemo} from 'react'
 import type * as AgeRange from 'expo-age-range'
+import {type ModerationPrefs} from '@bsky.app/sdk/moderation'
 import {
-  AppBskyAgeassuranceDefs,
   computeAgeAssuranceRegionAccess,
   getAgeAssuranceRegionConfig,
-} from '@atproto/api'
-import {type ModerationPrefs} from '@bsky.app/sdk/moderation'
+} from '@bsky.app/sdk/utils'
 
 import {getAge} from '#/lib/strings/time'
 import {regionName} from '#/locale/helpers'
@@ -25,6 +24,8 @@ import {
 } from '#/ageAssurance/types'
 import {type Geolocation, useGeolocation} from '#/geolocation'
 import {USRegionNameToRegionCode} from '#/geolocation/util'
+import {app} from '#/lexicons'
+import * as bsky from '#/types/bsky'
 
 /**
  * Resolves a geolocation to its matched age assurance region config, or
@@ -41,13 +42,31 @@ import {USRegionNameToRegionCode} from '#/geolocation/util'
  * risk desyncing the write and read keys and silently losing grants.
  */
 export function getAgeAssuranceRegionConfigForGeolocation(
-  config: AppBskyAgeassuranceDefs.Config,
+  config: app.bsky.ageassurance.defs.Config,
   geolocation: Geolocation,
-): AppBskyAgeassuranceDefs.ConfigRegion | undefined {
-  return getAgeAssuranceRegionConfig(config, {
+): app.bsky.ageassurance.defs.ConfigRegion | undefined {
+  /*
+   * The SDK's region matcher takes no `platform` filter, so platform scoping
+   * is applied here: regions restricted to other platforms are dropped before
+   * matching. Once the SDK accepts a platform, this whole function body
+   * collapses to:
+   *
+   *   return getAgeAssuranceRegionConfig(config, {
+   *     countryCode: geolocation.countryCode ?? '',
+   *     regionCode: geolocation.regionCode,
+   *     platform: AGE_ASSURANCE_PLATFORM,
+   *   })
+   */
+  const scoped: app.bsky.ageassurance.defs.Config = {
+    ...config,
+    regions: config.regions.filter(
+      region =>
+        !region.platforms || region.platforms.includes(AGE_ASSURANCE_PLATFORM),
+    ),
+  }
+  return getAgeAssuranceRegionConfig(scoped, {
     countryCode: geolocation.countryCode ?? '',
     regionCode: geolocation.regionCode,
-    platform: AGE_ASSURANCE_PLATFORM,
   })
 }
 
@@ -59,9 +78,9 @@ export function getAgeAssuranceRegionConfigForGeolocation(
  * which can return undefined if the geolocation does not match any AA region.
  */
 export function getAgeAssuranceRegionConfigWithFallback(
-  config: AppBskyAgeassuranceDefs.Config,
+  config: app.bsky.ageassurance.defs.Config,
   geolocation: Geolocation,
-): AppBskyAgeassuranceDefs.ConfigRegion {
+): app.bsky.ageassurance.defs.ConfigRegion {
   return (
     getAgeAssuranceRegionConfigForGeolocation(config, geolocation) ||
     FALLBACK_REGION_CONFIG
@@ -74,9 +93,9 @@ export function getAgeAssuranceRegionConfigWithFallback(
  * historical KWS-only behavior).
  */
 export function getRegionAdditionalVerificationMethods(
-  region: AppBskyAgeassuranceDefs.ConfigRegion,
+  region: app.bsky.ageassurance.defs.ConfigRegion,
 ): NonNullable<
-  AppBskyAgeassuranceDefs.ConfigRegion['additionalVerificationMethods']
+  app.bsky.ageassurance.defs.ConfigRegion['additionalVerificationMethods']
 > {
   return region.additionalVerificationMethods ?? []
 }
@@ -86,7 +105,7 @@ export function getRegionAdditionalVerificationMethods(
  * age APIs (Apple Declared Age Range / Google Play Age Signals).
  */
 export function regionAllowsDeviceVerification(
-  region: AppBskyAgeassuranceDefs.ConfigRegion,
+  region: app.bsky.ageassurance.defs.ConfigRegion,
 ): boolean {
   return getRegionAdditionalVerificationMethods(region).includes('device')
 }
@@ -122,7 +141,7 @@ export function createRegionKey(region: {
  * usable data.
  */
 export function getAgeAssuranceDataFromDeviceSignals(
-  region: AppBskyAgeassuranceDefs.ConfigRegion,
+  region: app.bsky.ageassurance.defs.ConfigRegion,
   deviceSignals: AgeRange.AgeRangeResponse | undefined,
 ): {
   assuredAge?: number
@@ -183,7 +202,7 @@ export function canBirthdateUpdateIncreaseAccess({
   metadata,
   deviceSignals,
 }: {
-  region: AppBskyAgeassuranceDefs.ConfigRegion
+  region: app.bsky.ageassurance.defs.ConfigRegion
   metadata?: AgeAssuranceMetadata
   deviceSignals?: AgeRange.AgeRangeResponse
 }): boolean {
@@ -212,8 +231,14 @@ export function canBirthdateUpdateIncreaseAccess({
   const thresholds = new Set<number>([region.minAccessAge])
   for (const rule of region.rules) {
     if (
-      AppBskyAgeassuranceDefs.isConfigRegionRuleIfDeclaredOverAge(rule) ||
-      AppBskyAgeassuranceDefs.isConfigRegionRuleIfDeclaredUnderAge(rule)
+      bsky.isType(
+        app.bsky.ageassurance.defs.configRegionRuleIfDeclaredOverAge,
+        rule,
+      ) ||
+      bsky.isType(
+        app.bsky.ageassurance.defs.configRegionRuleIfDeclaredUnderAge,
+        rule,
+      )
     ) {
       thresholds.add(rule.age)
     }
@@ -303,7 +328,7 @@ export function computeAgeAssuranceFlags({
   deviceSignals,
 }: {
   state: AgeAssuranceState
-  regionConfig: AppBskyAgeassuranceDefs.ConfigRegion
+  regionConfig: app.bsky.ageassurance.defs.ConfigRegion
   metadata?: AgeAssuranceMetadata
   deviceSignals?: AgeRange.AgeRangeResponse
 }): AgeAssuranceFlags {
diff --git a/src/components/AccountList.tsx b/src/components/AccountList.tsx
index a65eeb0722..156ba951bb 100644
--- a/src/components/AccountList.tsx
+++ b/src/components/AccountList.tsx
@@ -1,6 +1,5 @@
 import {Fragment, useCallback} from 'react'
 import {View} from 'react-native'
-import {type AppBskyActorDefs} from '@atproto/api'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
@@ -19,6 +18,7 @@ import {PlusLarge_Stroke2_Corner0_Rounded as PlusIcon} from '#/components/icons/
 import {ProfileBadges} from '#/components/ProfileBadges'
 import {Text} from '#/components/Typography'
 import {useActorStatus} from '#/features/liveNow'
+import {type app} from '#/lexicons'
 
 export function AccountList({
   onSelectAccount,
@@ -107,7 +107,7 @@ function AccountItem({
   isCurrentAccount,
   isPendingAccount,
 }: {
-  profile?: AppBskyActorDefs.ProfileViewDetailed
+  profile?: app.bsky.actor.defs.ProfileViewDetailed
   account: SessionAccount
   onSelect: (account: SessionAccount) => void
   isCurrentAccount: boolean
diff --git a/src/components/Autocomplete/useAutocomplete/index.ts b/src/components/Autocomplete/useAutocomplete/index.ts
index b310876b84..de5009a600 100644
--- a/src/components/Autocomplete/useAutocomplete/index.ts
+++ b/src/components/Autocomplete/useAutocomplete/index.ts
@@ -1,9 +1,8 @@
 import {useCallback, useMemo} from 'react'
-import {type ModerationOpts} from '@bsky.app/sdk/moderation'
+import {moderateProfile, type ModerationOpts} from '@bsky.app/sdk/moderation'
 import {keepPreviousData, useQuery} from '@tanstack/react-query'
 
 import {isJustAMute, moduiContainsHideableOffense} from '#/lib/moderation'
-import {moderateProfile} from '#/lib/moderation/subjects'
 import {useModerationOpts} from '#/state/preferences/moderation-opts'
 import {STALE} from '#/state/queries'
 import {DEFAULT_LOGGED_OUT_PREFERENCES} from '#/state/queries/preferences'
diff --git a/src/components/AvatarBubbles.tsx b/src/components/AvatarBubbles.tsx
index 9b59a2555f..6189141934 100644
--- a/src/components/AvatarBubbles.tsx
+++ b/src/components/AvatarBubbles.tsx
@@ -8,8 +8,8 @@ import Animated, {
   withDelay,
   withTiming,
 } from 'react-native-reanimated'
+import {moderateProfile} from '@bsky.app/sdk/moderation'
 
-import {moderateProfile} from '#/lib/moderation/subjects'
 import {useMaybeProfileShadow} from '#/state/cache/profile-shadow'
 import {useModerationOpts} from '#/state/preferences/moderation-opts'
 import {useSession} from '#/state/session'
diff --git a/src/components/AvatarStack.tsx b/src/components/AvatarStack.tsx
index f98148f52c..dc7a8395c3 100644
--- a/src/components/AvatarStack.tsx
+++ b/src/components/AvatarStack.tsx
@@ -1,6 +1,6 @@
 import {View} from 'react-native'
+import {moderateProfile} from '@bsky.app/sdk/moderation'
 
-import {moderateProfile} from '#/lib/moderation/subjects'
 import {logger} from '#/logger'
 import {useModerationOpts} from '#/state/preferences/moderation-opts'
 import {useProfilesQuery} from '#/state/queries/profile'
diff --git a/src/components/BotBadge.tsx b/src/components/BotBadge.tsx
index b5e6f867b6..eb19e83351 100644
--- a/src/components/BotBadge.tsx
+++ b/src/components/BotBadge.tsx
@@ -1,5 +1,4 @@
 import {type Insets, View} from 'react-native'
-import {type ComAtprotoLabelDefs} from '@atproto/api'
 import {useLingui} from '@lingui/react/macro'
 
 import {atoms as a, useTheme} from '#/alf'
@@ -8,11 +7,12 @@ import {Button} from '#/components/Button'
 import {useDialogControl} from '#/components/Dialog'
 import {Bot_Filled as RobotIcon} from '#/components/icons/Bot'
 import {useAnalytics} from '#/analytics'
+import {type com} from '#/lexicons'
 import type * as bsky from '#/types/bsky'
 
 export function isBotAccount(profile: {
   did: string
-  labels?: ComAtprotoLabelDefs.Label[]
+  labels?: com.atproto.label.defs.Label[]
 }): boolean {
   return (
     profile.labels?.some(l => l.val === 'bot' && l.src === profile.did) ?? false
diff --git a/src/components/FeedCard.tsx b/src/components/FeedCard.tsx
index 2e7b070fb1..b8e60ff286 100644
--- a/src/components/FeedCard.tsx
+++ b/src/components/FeedCard.tsx
@@ -1,6 +1,6 @@
 import {useCallback, useEffect, useMemo} from 'react'
 import {type GestureResponderEvent, View} from 'react-native'
-import {type AppBskyFeedDefs, type AppBskyGraphDefs, AtUri} from '@atproto/api'
+import {AtUri} from '@atproto/syntax'
 import {RichText as RichTextApi} from '@bsky.app/sdk/richtext'
 import {Plural, Trans, useLingui} from '@lingui/react/macro'
 import {useQueryClient} from '@tanstack/react-query'
@@ -31,11 +31,12 @@ import {RichText, type RichTextProps} from '#/components/RichText'
 import * as Toast from '#/components/Toast'
 import {Text} from '#/components/Typography'
 import {useActiveLiveEventFeedUris} from '#/features/liveEvents/context'
+import {type app} from '#/lexicons'
 import type * as bsky from '#/types/bsky'
 import {Trash_Stroke2_Corner0_Rounded as TrashIcon} from './icons/Trash'
 
 type Props = {
-  view: AppBskyFeedDefs.GeneratorView
+  view: app.bsky.feed.defs.GeneratorView
   onPress?: () => void
 }
 
@@ -254,7 +255,7 @@ export function SaveButton({
   pin,
   ...props
 }: {
-  view: AppBskyFeedDefs.GeneratorView | AppBskyGraphDefs.ListView
+  view: app.bsky.feed.defs.GeneratorView | app.bsky.graph.defs.ListView
   pin?: boolean
   text?: boolean
 } & Partial<ButtonProps>) {
@@ -269,7 +270,7 @@ function SaveButtonInner({
   text = true,
   ...buttonProps
 }: {
-  view: AppBskyFeedDefs.GeneratorView | AppBskyGraphDefs.ListView
+  view: app.bsky.feed.defs.GeneratorView | app.bsky.graph.defs.ListView
   pin?: boolean
   text?: boolean
 } & Partial<ButtonProps>) {
@@ -379,7 +380,7 @@ function SaveButtonInner({
 export function createProfileFeedHref({
   feed,
 }: {
-  feed: AppBskyFeedDefs.GeneratorView
+  feed: app.bsky.feed.defs.GeneratorView
 }) {
   const urip = new AtUri(feed.uri)
   const handleOrDid = feed.creator.handle || feed.creator.did
diff --git a/src/components/FeedInterstitials.tsx b/src/components/FeedInterstitials.tsx
index fec0447b61..aa77a7b36b 100644
--- a/src/components/FeedInterstitials.tsx
+++ b/src/components/FeedInterstitials.tsx
@@ -7,7 +7,6 @@ import Animated, {
   LayoutAnimationConfig,
   LinearTransition,
 } from 'react-native-reanimated'
-import {type AppBskyFeedDefs} from '@atproto/api'
 import {Trans, useLingui} from '@lingui/react/macro'
 import {useNavigation} from '@react-navigation/native'
 
@@ -40,6 +39,7 @@ import {ProgressGuideList} from '#/components/ProgressGuide/List'
 import {Text} from '#/components/Typography'
 import {type Metrics, useAnalytics} from '#/analytics'
 import {IS_IOS} from '#/env'
+import {type app} from '#/lexicons'
 import type * as bsky from '#/types/bsky'
 import {FollowDialogWithoutGuide} from './ProgressGuide/FollowDialog'
 
@@ -569,7 +569,7 @@ export function SuggestedFeeds() {
   const {gtMobile} = useBreakpoints()
 
   const feeds = useMemo(() => {
-    const items: AppBskyFeedDefs.GeneratorView[] = []
+    const items: app.bsky.feed.defs.GeneratorView[] = []
 
     if (!data) return items
 
diff --git a/src/components/KnownFollowers.tsx b/src/components/KnownFollowers.tsx
index bda482c1c0..b6f90fc401 100644
--- a/src/components/KnownFollowers.tsx
+++ b/src/components/KnownFollowers.tsx
@@ -1,16 +1,15 @@
 import {useRef} from 'react'
 import {View} from 'react-native'
-import {type AppBskyActorDefs} from '@atproto/api'
-import {type ModerationOpts} from '@bsky.app/sdk/moderation'
+import {moderateProfile, type ModerationOpts} from '@bsky.app/sdk/moderation'
 import {Plural, Trans, useLingui} from '@lingui/react/macro'
 
-import {moderateProfile} from '#/lib/moderation/subjects'
 import {makeProfileLink} from '#/lib/routes/links'
 import {sanitizeDisplayName} from '#/lib/strings/display-names'
 import {UserAvatar} from '#/view/com/util/UserAvatar'
 import {atoms as a, useTheme} from '#/alf'
 import {Link, type LinkProps} from '#/components/Link'
 import {Text} from '#/components/Typography'
+import {type app} from '#/lexicons'
 import type * as bsky from '#/types/bsky'
 
 const AVI_SIZE = 30
@@ -24,7 +23,7 @@ const AVI_BORDER = 1
  * `count` includes blocked users and `followers` does not.
  */
 export function shouldShowKnownFollowers(
-  knownFollowers?: AppBskyActorDefs.KnownFollowers,
+  knownFollowers?: app.bsky.actor.defs.KnownFollowers,
 ) {
   return knownFollowers && knownFollowers.followers.length > 0
 }
@@ -42,7 +41,9 @@ export function KnownFollowers({
   minimal?: boolean
   showIfEmpty?: boolean
 }) {
-  const cache = useRef<Map<string, AppBskyActorDefs.KnownFollowers>>(new Map())
+  const cache = useRef<Map<string, app.bsky.actor.defs.KnownFollowers>>(
+    new Map(),
+  )
 
   /*
    * Results for `knownFollowers` are not sorted consistently, so when
@@ -83,7 +84,7 @@ function KnownFollowersInner({
 }: {
   profile: bsky.profile.AnyProfileView
   moderationOpts: ModerationOpts
-  cachedKnownFollowers: AppBskyActorDefs.KnownFollowers
+  cachedKnownFollowers: app.bsky.actor.defs.KnownFollowers
   onLinkPress?: LinkProps['onPress']
   minimal?: boolean
   showIfEmpty?: boolean
diff --git a/src/components/LikedByList.tsx b/src/components/LikedByList.tsx
index fcaa50bbcc..28718f3d88 100644
--- a/src/components/LikedByList.tsx
+++ b/src/components/LikedByList.tsx
@@ -1,5 +1,4 @@
 import {useCallback, useMemo, useState} from 'react'
-import {type AppBskyFeedGetLikes as GetLikes} from '@atproto/api'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 
@@ -11,8 +10,15 @@ import {useResolveUriQuery} from '#/state/queries/resolve-uri'
 import {ProfileCardWithFollowBtn} from '#/view/com/profile/ProfileCard'
 import {List} from '#/view/com/util/List'
 import {ListFooter, ListMaybePlaceholder} from '#/components/Lists'
+import {type app} from '#/lexicons'
 
-function renderItem({item, index}: {item: GetLikes.Like; index: number}) {
+function renderItem({
+  item,
+  index,
+}: {
+  item: app.bsky.feed.getLikes.Like
+  index: number
+}) {
   return (
     <ProfileCardWithFollowBtn
       key={item.actor.did}
@@ -22,7 +28,7 @@ function renderItem({item, index}: {item: GetLikes.Like; index: number}) {
   )
 }
 
-function keyExtractor(item: GetLikes.Like) {
+function keyExtractor(item: app.bsky.feed.getLikes.Like) {
   return item.actor.did
 }
 
diff --git a/src/components/ListCard.tsx b/src/components/ListCard.tsx
index 021bf05240..d9e15f9108 100644
--- a/src/components/ListCard.tsx
+++ b/src/components/ListCard.tsx
@@ -1,13 +1,12 @@
 import {useEffect, useMemo} from 'react'
 import {View} from 'react-native'
-import {type AppBskyGraphDefs, AtUri} from '@atproto/api'
-import {type ModerationUI} from '@bsky.app/sdk/moderation'
+import {AtUri} from '@atproto/syntax'
+import {moderateUserList, type ModerationUI} from '@bsky.app/sdk/moderation'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
 import {useQueryClient} from '@tanstack/react-query'
 
-import {moderateUserList} from '#/lib/moderation/subjects'
 import {sanitizeHandle} from '#/lib/strings/handles'
 import {useModerationOpts} from '#/state/preferences/moderation-opts'
 import {precacheList} from '#/state/queries/feed'
@@ -23,6 +22,7 @@ import {
 import {Link as InternalLink, type LinkProps} from '#/components/Link'
 import * as Hider from '#/components/moderation/Hider'
 import {Text} from '#/components/Typography'
+import {type app} from '#/lexicons'
 import type * as bsky from '#/types/bsky'
 
 /*
@@ -44,7 +44,7 @@ const CURATELIST = 'app.bsky.graph.defs#curatelist'
 const MODLIST = 'app.bsky.graph.defs#modlist'
 
 type Props = {
-  view: AppBskyGraphDefs.ListView
+  view: app.bsky.graph.defs.ListView
   showPinButton?: boolean
 }
 
@@ -108,7 +108,7 @@ export function TitleAndByline({
 }: {
   title: string
   creator?: bsky.profile.AnyProfileView
-  purpose?: AppBskyGraphDefs.ListView['purpose']
+  purpose?: app.bsky.graph.defs.ListView['purpose']
   modUi?: ModerationUI
 }) {
   const t = useTheme()
@@ -157,7 +157,7 @@ export function TitleAndByline({
 export function createProfileListHref({
   list,
 }: {
-  list: AppBskyGraphDefs.ListView
+  list: app.bsky.graph.defs.ListView
 }) {
   const urip = new AtUri(list.uri)
   const handleOrDid = list.creator.handle || list.creator.did
diff --git a/src/components/MediaPreview.tsx b/src/components/MediaPreview.tsx
index 7b0e38e0bd..0763f8ee14 100644
--- a/src/components/MediaPreview.tsx
+++ b/src/components/MediaPreview.tsx
@@ -1,10 +1,5 @@
 import {type StyleProp, StyleSheet, View, type ViewStyle} from 'react-native'
 import {Image} from 'expo-image'
-import {
-  AppBskyEmbedGallery,
-  type AppBskyEmbedImages,
-  type AppBskyFeedDefs,
-} from '@atproto/api'
 import {Trans, useLingui} from '@lingui/react/macro'
 
 import {shareImageModal} from '#/lib/media/manip'
@@ -17,6 +12,7 @@ import {MediaInsetBorder} from '#/components/MediaInsetBorder'
 import * as PeekMenu from '#/components/PeekMenu'
 import {Text} from '#/components/Typography'
 import {PlayButtonIcon} from '#/components/video/PlayButtonIcon'
+import {app} from '#/lexicons'
 import * as bsky from '#/types/bsky'
 
 /**
@@ -27,7 +23,7 @@ export function Embed({
   style,
   peekable = false,
 }: {
-  embed: AppBskyFeedDefs.PostView['embed']
+  embed: app.bsky.feed.defs.PostView['embed']
   style?: StyleProp<ViewStyle>
   peekable?: boolean
 }) {
@@ -59,9 +55,9 @@ export function Embed({
     const tiles: React.ReactNode[] = []
     for (const item of e.view.items) {
       if (tiles.length >= 4) break
-      if (!AppBskyEmbedGallery.isViewImage(item)) continue
+      if (!bsky.isType(app.bsky.embed.gallery.viewImage, item)) continue
       if (peekable) {
-        const image: AppBskyEmbedImages.ViewImage = {
+        const image: app.bsky.embed.images.ViewImage = {
           thumb: item.thumbnail,
           fullsize: item.fullsize,
           alt: item.alt,
@@ -107,7 +103,17 @@ export function Embed({
     // ignore any unknowns
     e.media.view !== null
   ) {
-    return <Embed embed={e.media.view} style={style} />
+    /*
+     * Every media arm's view is a `$Typed<...>` of a def that `PostView.embed`
+     * also admits, but TS will not narrow the parsed union back into the raw
+     * embed union, so the arm is re-asserted here.
+     */
+    return (
+      <Embed
+        embed={e.media.view as app.bsky.feed.defs.PostView['embed']}
+        style={style}
+      />
+    )
   }
 
   return null
@@ -202,7 +208,7 @@ export function VideoItem({
   )
 }
 
-function PeekableImageItem({image}: {image: AppBskyEmbedImages.ViewImage}) {
+function PeekableImageItem({image}: {image: app.bsky.embed.images.ViewImage}) {
   const {t: l} = useLingui()
   const saveImage = useSaveImageToMediaLibrary()
 
diff --git a/src/components/NewskieDialog.tsx b/src/components/NewskieDialog.tsx
index 7df67d80dc..43025aca94 100644
--- a/src/components/NewskieDialog.tsx
+++ b/src/components/NewskieDialog.tsx
@@ -1,6 +1,6 @@
 import {useMemo, useState} from 'react'
 import {View} from 'react-native'
-import {type AppBskyActorDefs} from '@atproto/api'
+import {moderateProfile} from '@bsky.app/sdk/moderation'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
@@ -8,7 +8,6 @@ import {differenceInSeconds} from 'date-fns'
 
 import {HITSLOP_10} from '#/lib/constants'
 import {useGetTimeAgo} from '#/lib/hooks/useTimeAgo'
-import {moderateProfile} from '#/lib/moderation/subjects'
 import {sanitizeDisplayName} from '#/lib/strings/display-names'
 import {useModerationOpts} from '#/state/preferences/moderation-opts'
 import {useSession} from '#/state/session'
@@ -20,12 +19,13 @@ import {Newskie} from '#/components/icons/Newskie'
 import * as StarterPackCard from '#/components/StarterPack/StarterPackCard'
 import {Text} from '#/components/Typography'
 import {IS_NATIVE} from '#/env'
+import {type app} from '#/lexicons'
 
 export function NewskieDialog({
   profile,
   disabled,
 }: {
-  profile: AppBskyActorDefs.ProfileViewDetailed
+  profile: app.bsky.actor.defs.ProfileViewDetailed
   disabled?: boolean
 }) {
   const t = useTheme()
@@ -75,7 +75,7 @@ function DialogInner({
   createdAt,
   now,
 }: {
-  profile: AppBskyActorDefs.ProfileViewDetailed
+  profile: app.bsky.actor.defs.ProfileViewDetailed
   createdAt: string
   now: number
 }) {
diff --git a/src/components/Pills.tsx b/src/components/Pills.tsx
index 70b7c98a2c..809b197029 100644
--- a/src/components/Pills.tsx
+++ b/src/components/Pills.tsx
@@ -1,6 +1,6 @@
 import {useMemo} from 'react'
 import {View} from 'react-native'
-import {BSKY_LABELER_DID} from '@atproto/api'
+import {api} from '@bsky.app/sdk'
 import {type ModerationCause} from '@bsky.app/sdk/moderation'
 import {Trans, useLingui} from '@lingui/react/macro'
 
@@ -67,7 +67,7 @@ export function Label({
   const desc = useModerationCauseDescription(cause)
   const isLabeler = Boolean(desc.sourceType && desc.sourceDid)
   const isBlueskyLabel =
-    desc.sourceType === 'labeler' && desc.sourceDid === BSKY_LABELER_DID
+    desc.sourceType === 'labeler' && desc.sourceDid === api.moderation.did
   const avi = size === 'lg' ? 16 : 12
 
   return (
diff --git a/src/components/Post/Embed/ChatInviteEmbed.tsx b/src/components/Post/Embed/ChatInviteEmbed.tsx
index d5f69f49e9..f6a9a0e4d9 100644
--- a/src/components/Post/Embed/ChatInviteEmbed.tsx
+++ b/src/components/Post/Embed/ChatInviteEmbed.tsx
@@ -1,10 +1,10 @@
 import {type StyleProp, type ViewStyle} from 'react-native'
-import {type AppBskyEmbedExternal} from '@atproto/api'
 
 import {atoms as a} from '#/alf'
 import * as ChatInvite from '#/components/dms/ChatInvite'
 import {ExternalEmbed} from '#/components/Post/Embed/ExternalEmbed'
 import {JoinRequestEmbedBody} from '#/components/Post/Embed/JoinRequestEmbed'
+import {type app} from '#/lexicons'
 
 /**
  * Renders a chat invite link found in an `app.bsky.embed.external` embed (e.g.
@@ -18,7 +18,7 @@ export function ChatInviteEmbed({
   style,
 }: {
   code: string
-  link: AppBskyEmbedExternal.ViewExternal
+  link: app.bsky.embed.external.ViewExternal
   onOpen?: () => void
   style?: StyleProp<ViewStyle>
 }) {
@@ -34,7 +34,7 @@ function ChatInviteEmbedBody({
   onOpen,
   style,
 }: {
-  link: AppBskyEmbedExternal.ViewExternal
+  link: app.bsky.embed.external.ViewExternal
   onOpen?: () => void
   style?: StyleProp<ViewStyle>
 }) {
diff --git a/src/components/Post/Embed/ExternalEmbed/ExternalGif.tsx b/src/components/Post/Embed/ExternalEmbed/ExternalGif.tsx
index 529952f08e..9334581c5b 100644
--- a/src/components/Post/Embed/ExternalEmbed/ExternalGif.tsx
+++ b/src/components/Post/Embed/ExternalEmbed/ExternalGif.tsx
@@ -5,7 +5,6 @@ import {
   Pressable,
 } from 'react-native'
 import {Image} from 'expo-image'
-import {type AppBskyEmbedExternal} from '@atproto/api'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 
@@ -17,12 +16,13 @@ import {EmbedConsentDialog} from '#/components/dialogs/EmbedConsent'
 import {Fill} from '#/components/Fill'
 import {PlayButtonIcon} from '#/components/video/PlayButtonIcon'
 import {IS_IOS, IS_NATIVE, IS_WEB} from '#/env'
+import {type app} from '#/lexicons'
 
 export function ExternalGif({
   link,
   params,
 }: {
-  link: AppBskyEmbedExternal.ViewExternal
+  link: app.bsky.embed.external.ViewExternal
   params: EmbedPlayerParams
 }) {
   const t = useTheme()
diff --git a/src/components/Post/Embed/ExternalEmbed/ExternalPlayer.tsx b/src/components/Post/Embed/ExternalEmbed/ExternalPlayer.tsx
index 9decdea95b..63c4236aa1 100644
--- a/src/components/Post/Embed/ExternalEmbed/ExternalPlayer.tsx
+++ b/src/components/Post/Embed/ExternalEmbed/ExternalPlayer.tsx
@@ -15,7 +15,6 @@ import {useSafeAreaInsets} from 'react-native-safe-area-context'
 import {WebView} from 'react-native-webview'
 import {scheduleOnRN} from 'react-native-worklets'
 import {Image} from 'expo-image'
-import {type AppBskyEmbedExternal} from '@atproto/api'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {useNavigation} from '@react-navigation/native'
@@ -34,6 +33,7 @@ import {Fill} from '#/components/Fill'
 import {KeepAwake} from '#/components/KeepAwake'
 import {PlayButtonIcon} from '#/components/video/PlayButtonIcon'
 import {IS_NATIVE} from '#/env'
+import {type app} from '#/lexicons'
 
 interface ShouldStartLoadRequest {
   url: string
@@ -122,7 +122,7 @@ export function ExternalPlayer({
   link,
   params,
 }: {
-  link: AppBskyEmbedExternal.ViewExternal
+  link: app.bsky.embed.external.ViewExternal
   params: EmbedPlayerParams
 }) {
   const t = useTheme()
diff --git a/src/components/Post/Embed/ExternalEmbed/index.tsx b/src/components/Post/Embed/ExternalEmbed/index.tsx
index 4432eb6632..a496780524 100644
--- a/src/components/Post/Embed/ExternalEmbed/index.tsx
+++ b/src/components/Post/Embed/ExternalEmbed/index.tsx
@@ -1,7 +1,6 @@
 import {useMemo} from 'react'
 import {type StyleProp, View, type ViewStyle} from 'react-native'
 import {Image} from 'expo-image'
-import {type AppBskyEmbedExternal} from '@atproto/api'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 
@@ -20,6 +19,7 @@ import {Earth_Stroke2_Corner0_Rounded as Globe} from '#/components/icons/Globe'
 import {Link} from '#/components/Link'
 import {Text} from '#/components/Typography'
 import {IS_NATIVE} from '#/env'
+import {type app} from '#/lexicons'
 import {ExternalGif} from './ExternalGif'
 import {ExternalPlayer} from './ExternalPlayer'
 import {GifEmbed} from './Gif'
@@ -30,7 +30,7 @@ export const ExternalEmbed = ({
   style,
   hideAlt,
 }: {
-  link: AppBskyEmbedExternal.ViewExternal
+  link: app.bsky.embed.external.ViewExternal
   onOpen?: () => void
   style?: StyleProp<ViewStyle>
   hideAlt?: boolean
diff --git a/src/components/Post/Embed/FeedEmbed.tsx b/src/components/Post/Embed/FeedEmbed.tsx
index 8871a63b59..9e1e3e022d 100644
--- a/src/components/Post/Embed/FeedEmbed.tsx
+++ b/src/components/Post/Embed/FeedEmbed.tsx
@@ -1,6 +1,6 @@
 import {useMemo} from 'react'
+import {moderateFeedGenerator} from '@bsky.app/sdk/moderation'
 
-import {moderateFeedGenerator} from '#/lib/moderation/subjects'
 import {useModerationOpts} from '#/state/preferences/moderation-opts'
 import {atoms as a, useTheme} from '#/alf'
 import * as FeedCard from '#/components/FeedCard'
diff --git a/src/components/Post/Embed/ImageEmbed.tsx b/src/components/Post/Embed/ImageEmbed.tsx
index 073c47fbb1..cc3ce6c443 100644
--- a/src/components/Post/Embed/ImageEmbed.tsx
+++ b/src/components/Post/Embed/ImageEmbed.tsx
@@ -2,7 +2,6 @@ import {useRef} from 'react'
 import {InteractionManager, View} from 'react-native'
 import {type AnimatedRef} from 'react-native-reanimated'
 import {Image} from 'expo-image'
-import {AppBskyEmbedGallery, type AppBskyEmbedImages} from '@atproto/api'
 
 import {atoms as a, tokens} from '#/alf'
 import {AutoSizedImage} from '#/components/images/AutoSizedImage'
@@ -16,6 +15,8 @@ import {type Dimensions} from '#/components/Lightbox/types'
 import {ImageContextMenu} from '#/components/Post/Embed/ImageContextMenu'
 import {PostEmbedViewContext} from '#/components/Post/Embed/types'
 import {useAnalytics} from '#/analytics'
+import {app} from '#/lexicons'
+import * as bsky from '#/types/bsky'
 import {type EmbedType} from '#/types/bsky/post'
 import {type CommonProps} from './types'
 
@@ -29,14 +30,16 @@ export function ImageEmbed({
 }) {
   const ax = useAnalytics()
   const {openLightbox} = useLightboxControls()
-  const images: AppBskyEmbedImages.ViewImage[] =
+  const images: app.bsky.embed.images.ViewImage[] =
     embed.type === 'gallery'
-      ? embed.view.items.filter(AppBskyEmbedGallery.isViewImage).map(item => ({
-          thumb: item.thumbnail,
-          fullsize: item.fullsize,
-          alt: item.alt,
-          aspectRatio: item.aspectRatio,
-        }))
+      ? embed.view.items
+          .filter(item => bsky.isType(app.bsky.embed.gallery.viewImage, item))
+          .map(item => ({
+            thumb: item.thumbnail,
+            fullsize: item.fullsize,
+            alt: item.alt,
+            aspectRatio: item.aspectRatio,
+          }))
       : embed.view.images
   const useExpandedLayout =
     embed.type === 'gallery'
diff --git a/src/components/Post/Embed/ListEmbed.tsx b/src/components/Post/Embed/ListEmbed.tsx
index d6daca265c..11ed196597 100644
--- a/src/components/Post/Embed/ListEmbed.tsx
+++ b/src/components/Post/Embed/ListEmbed.tsx
@@ -1,6 +1,6 @@
 import {useMemo} from 'react'
+import {moderateUserList} from '@bsky.app/sdk/moderation'
 
-import {moderateUserList} from '#/lib/moderation/subjects'
 import {useModerationOpts} from '#/state/preferences/moderation-opts'
 import {atoms as a, useTheme} from '#/alf'
 import * as ListCard from '#/components/ListCard'
diff --git a/src/components/Post/Embed/StandardSiteEmbed/StandardSiteMetaRow.tsx b/src/components/Post/Embed/StandardSiteEmbed/StandardSiteMetaRow.tsx
index 837f1b4a05..d2ee4cf545 100644
--- a/src/components/Post/Embed/StandardSiteEmbed/StandardSiteMetaRow.tsx
+++ b/src/components/Post/Embed/StandardSiteEmbed/StandardSiteMetaRow.tsx
@@ -1,6 +1,6 @@
 import {Fragment, type ReactNode} from 'react'
 import {View} from 'react-native'
-import {AtUri} from '@atproto/api'
+import {AtUri} from '@atproto/syntax'
 import {Trans} from '@lingui/react/macro'
 
 import {toNiceDomain} from '#/lib/strings/url-helpers'
diff --git a/src/components/Post/Embed/StandardSiteEmbed/StandardSiteThemeProvider.tsx b/src/components/Post/Embed/StandardSiteEmbed/StandardSiteThemeProvider.tsx
index 00c15c4401..ff08bdd2c0 100644
--- a/src/components/Post/Embed/StandardSiteEmbed/StandardSiteThemeProvider.tsx
+++ b/src/components/Post/Embed/StandardSiteEmbed/StandardSiteThemeProvider.tsx
@@ -1,6 +1,5 @@
-import {type AppBskyEmbedExternal} from '@atproto/api'
-
 import {Context, useAlf, utils} from '#/alf'
+import {type app} from '#/lexicons'
 
 /**
  * Overrides only the values needed for `secondary_inverted` buttons atm.
@@ -12,7 +11,7 @@ export function StandardSiteThemeProvider({
   view,
   children,
 }: {
-  view: AppBskyEmbedExternal.ViewExternal
+  view: app.bsky.embed.external.ViewExternal
   children: React.ReactNode
 }) {
   const alf = useAlf()
diff --git a/src/components/Post/Embed/StandardSiteEmbed/index.tsx b/src/components/Post/Embed/StandardSiteEmbed/index.tsx
index bb4c030fcc..0c50723a15 100644
--- a/src/components/Post/Embed/StandardSiteEmbed/index.tsx
+++ b/src/components/Post/Embed/StandardSiteEmbed/index.tsx
@@ -1,6 +1,6 @@
 import {type StyleProp, View, type ViewStyle} from 'react-native'
 import {Image} from 'expo-image'
-import {AtUri} from '@atproto/api'
+import {AtUri} from '@atproto/syntax'
 import {plural} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react/macro'
 
diff --git a/src/components/Post/Embed/StandardSiteEmbed/publishers.ts b/src/components/Post/Embed/StandardSiteEmbed/publishers.ts
index aba3e28cc2..d85cea820b 100644
--- a/src/components/Post/Embed/StandardSiteEmbed/publishers.ts
+++ b/src/components/Post/Embed/StandardSiteEmbed/publishers.ts
@@ -1,8 +1,7 @@
-import {type AppBskyEmbedExternal} from '@atproto/api'
-
 import {Leaflet} from '#/components/icons/community/Leaflet'
 import {Offprint} from '#/components/icons/community/Offprint'
 import {Pckt} from '#/components/icons/community/Pckt'
+import {type app} from '#/lexicons'
 
 export type StandardSitePublisher = {
   host: string
@@ -25,7 +24,7 @@ function hostFromUri(uri: string | undefined): string | null {
 }
 
 export function getStandardSitePublisherHost(
-  view: AppBskyEmbedExternal.ViewExternal,
+  view: app.bsky.embed.external.ViewExternal,
 ): string | null {
   return hostFromUri(view.source?.uri)
 }
@@ -40,7 +39,7 @@ function matchByHost(host: string | null): StandardSitePublisher | null {
 }
 
 export function matchStandardSitePublisher(
-  view: AppBskyEmbedExternal.ViewExternal,
+  view: app.bsky.embed.external.ViewExternal,
 ): StandardSitePublisher | null {
   return matchByHost(getStandardSitePublisherHost(view))
 }
diff --git a/src/components/Post/Embed/StandardSiteEmbed/types.ts b/src/components/Post/Embed/StandardSiteEmbed/types.ts
index 208f01b7a6..129559b994 100644
--- a/src/components/Post/Embed/StandardSiteEmbed/types.ts
+++ b/src/components/Post/Embed/StandardSiteEmbed/types.ts
@@ -1,7 +1,7 @@
-import {type AppBskyEmbedExternal} from '@atproto/api'
+import {type app} from '#/lexicons'
 
 export type CommonProps = {
-  view: AppBskyEmbedExternal.ViewExternal
+  view: app.bsky.embed.external.ViewExternal
 }
 
 export type PreviewProps = {
diff --git a/src/components/Post/Embed/StandardSiteEmbed/utils.test.ts b/src/components/Post/Embed/StandardSiteEmbed/utils.test.ts
index 5f5dd23d60..cd31849516 100644
--- a/src/components/Post/Embed/StandardSiteEmbed/utils.test.ts
+++ b/src/components/Post/Embed/StandardSiteEmbed/utils.test.ts
@@ -1,10 +1,9 @@
-import {type AppBskyEmbedExternal} from '@atproto/api'
-
+import {type app} from '#/lexicons'
 import {isStandardSiteEmbed, isStandardSitePublicationEmbed} from './utils'
 
 function makeView(
   partial: Record<string, unknown>,
-): AppBskyEmbedExternal.ViewExternal {
+): app.bsky.embed.external.ViewExternal {
   return {
     uri: 'https://example.com/post',
     title: 'title',
diff --git a/src/components/Post/Embed/StandardSiteEmbed/utils.ts b/src/components/Post/Embed/StandardSiteEmbed/utils.ts
index 2338ca59a3..e43ee0fd99 100644
--- a/src/components/Post/Embed/StandardSiteEmbed/utils.ts
+++ b/src/components/Post/Embed/StandardSiteEmbed/utils.ts
@@ -1,29 +1,31 @@
-import {
-  type AppBskyEmbedExternal,
-  AtUri,
-  type ComAtprotoRepoStrongRef,
-} from '@atproto/api'
+import {AtUri} from '@atproto/syntax'
 
-export function isStandardSiteDocumentUri(ref: ComAtprotoRepoStrongRef.Main) {
+import {type app, type com} from '#/lexicons'
+
+export function isStandardSiteDocumentUri(
+  ref: com.atproto.repo.strongRef.Main,
+) {
   return new AtUri(ref.uri).collection.startsWith('site.standard.document')
 }
 
 export function isStandardSitePublicationUri(
-  ref: ComAtprotoRepoStrongRef.Main,
+  ref: com.atproto.repo.strongRef.Main,
 ) {
   return new AtUri(ref.uri).collection.startsWith('site.standard.publication')
 }
 
-export function isStandardSiteUri(ref: ComAtprotoRepoStrongRef.Main) {
+export function isStandardSiteUri(ref: com.atproto.repo.strongRef.Main) {
   return new AtUri(ref.uri).collection.startsWith('site.standard.')
 }
 
-export function isStandardSiteEmbed(view: AppBskyEmbedExternal.ViewExternal) {
+export function isStandardSiteEmbed(
+  view: app.bsky.embed.external.ViewExternal,
+) {
   return view.associatedRefs?.some(ref => isStandardSiteUri(ref))
 }
 
 export function isStandardSitePublicationEmbed(
-  view: AppBskyEmbedExternal.ViewExternal,
+  view: app.bsky.embed.external.ViewExternal,
 ) {
   return (
     view.associatedRefs?.some(
diff --git a/src/components/Post/Embed/VideoEmbed/VideoEmbedInner/VideoEmbedInnerNative.tsx b/src/components/Post/Embed/VideoEmbed/VideoEmbedInner/VideoEmbedInnerNative.tsx
index bcc33ba50b..a8ea65a43b 100644
--- a/src/components/Post/Embed/VideoEmbed/VideoEmbedInner/VideoEmbedInnerNative.tsx
+++ b/src/components/Post/Embed/VideoEmbed/VideoEmbedInner/VideoEmbedInnerNative.tsx
@@ -1,6 +1,5 @@
 import {useImperativeHandle, useRef, useState} from 'react'
 import {Pressable, type StyleProp, View, type ViewStyle} from 'react-native'
-import {type AppBskyEmbedVideo} from '@atproto/api'
 import {BlueskyVideoView} from '@bsky.app/video'
 import {useLingui} from '@lingui/react/macro'
 
@@ -17,6 +16,7 @@ import {KeepAwake} from '#/components/KeepAwake'
 import {MediaInsetBorder} from '#/components/MediaInsetBorder'
 import {useReportDialogMetadataContext} from '#/components/moderation/ReportDialog/ReportDialogMetadataContext'
 import {useVideoMuteState} from '#/components/Post/Embed/VideoEmbed/VideoVolumeContext'
+import {type app} from '#/lexicons'
 import {GifPresentationControls} from '../GifPresentationControls'
 import {TimeIndicator} from './TimeIndicator'
 
@@ -29,7 +29,7 @@ export function VideoEmbedInnerNative({
   onError,
 }: {
   ref: React.Ref<{togglePlayback: () => void}>
-  embed: AppBskyEmbedVideo.View
+  embed: app.bsky.embed.video.View
   setStatus: (status: 'playing' | 'paused') => void
   setIsLoading: (isLoading: boolean) => void
   setIsActive: (isActive: boolean) => void
diff --git a/src/components/Post/Embed/VideoEmbed/VideoEmbedInner/VideoEmbedInnerWeb.shared.ts b/src/components/Post/Embed/VideoEmbed/VideoEmbedInner/VideoEmbedInnerWeb.shared.ts
index 9184ccf37c..8c4ef57d20 100644
--- a/src/components/Post/Embed/VideoEmbed/VideoEmbedInner/VideoEmbedInnerWeb.shared.ts
+++ b/src/components/Post/Embed/VideoEmbed/VideoEmbedInner/VideoEmbedInnerWeb.shared.ts
@@ -1,7 +1,7 @@
-import {type AppBskyEmbedVideo} from '@atproto/api'
+import {type app} from '#/lexicons'
 
 export type VideoEmbedInnerWebProps = {
-  embed: AppBskyEmbedVideo.View
+  embed: app.bsky.embed.video.View
   active: boolean
   setActive: () => void
   onScreen: boolean
diff --git a/src/components/Post/Embed/VideoEmbed/index.tsx b/src/components/Post/Embed/VideoEmbed/index.tsx
index d78aad4985..dc394b8a6e 100644
--- a/src/components/Post/Embed/VideoEmbed/index.tsx
+++ b/src/components/Post/Embed/VideoEmbed/index.tsx
@@ -1,7 +1,6 @@
 import {useCallback, useEffect, useRef, useState} from 'react'
 import {ActivityIndicator, View} from 'react-native'
 import {ImageBackground} from 'expo-image'
-import {type AppBskyEmbedVideo} from '@atproto/api'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
@@ -17,12 +16,13 @@ import {useThrottledValue} from '#/components/hooks/useThrottledValue'
 import {ConstrainedImage} from '#/components/images/AutoSizedImage'
 import {PlayButtonIcon} from '#/components/video/PlayButtonIcon'
 import {useAnalytics} from '#/analytics'
+import {type app} from '#/lexicons'
 import {GifPresentationControls} from './GifPresentationControls'
 import {VideoEmbedInnerNative} from './VideoEmbedInner/VideoEmbedInnerNative'
 import * as VideoFallback from './VideoEmbedInner/VideoFallback'
 
 interface Props {
-  embed: AppBskyEmbedVideo.View
+  embed: app.bsky.embed.video.View
 }
 
 export function VideoEmbed({embed}: Props) {
diff --git a/src/components/Post/Embed/VideoEmbed/index.web.tsx b/src/components/Post/Embed/VideoEmbed/index.web.tsx
index 0eb622bad7..a02fff613a 100644
--- a/src/components/Post/Embed/VideoEmbed/index.web.tsx
+++ b/src/components/Post/Embed/VideoEmbed/index.web.tsx
@@ -7,7 +7,6 @@ import {
   useState,
 } from 'react'
 import {View} from 'react-native'
-import {type AppBskyEmbedVideo} from '@atproto/api'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 
@@ -25,6 +24,7 @@ import {
 } from '#/components/Post/Embed/VideoEmbed/VideoEmbedInner/VideoEmbedInnerWeb'
 import {useAnalytics} from '#/analytics'
 import {IS_WEB_FIREFOX} from '#/env'
+import {type app} from '#/lexicons'
 import {useActiveVideoWeb} from './ActiveVideoWebContext'
 import * as VideoFallback from './VideoEmbedInner/VideoFallback'
 
@@ -37,7 +37,7 @@ const noop = () => {}
  */
 const MIN_CARD_WIDTH = 280
 
-export function VideoEmbed({embed}: {embed: AppBskyEmbedVideo.View}) {
+export function VideoEmbed({embed}: {embed: app.bsky.embed.video.View}) {
   const t = useTheme()
   const ref = useRef<HTMLDivElement>(null)
   const {
@@ -297,7 +297,7 @@ function VideoError({
   error,
   retry,
 }: {
-  embed: AppBskyEmbedVideo.View
+  embed: app.bsky.embed.video.View
   error: unknown
   retry: () => void
 }) {
diff --git a/src/components/Post/Embed/index.tsx b/src/components/Post/Embed/index.tsx
index 3c31bd72a4..d6fde617c9 100644
--- a/src/components/Post/Embed/index.tsx
+++ b/src/components/Post/Embed/index.tsx
@@ -1,18 +1,13 @@
 import {useCallback, useMemo} from 'react'
 import {View} from 'react-native'
-import {
-  type $Typed,
-  type AppBskyFeedDefs,
-  AppBskyFeedPost,
-  AtUri,
-} from '@atproto/api'
+import {type $Typed} from '@atproto/lex'
+import {AtUri} from '@atproto/syntax'
+import {moderatePost} from '@bsky.app/sdk/moderation'
 import {RichText as RichTextAPI} from '@bsky.app/sdk/richtext'
 import {Trans} from '@lingui/react/macro'
 import {useQueryClient} from '@tanstack/react-query'
 
-import {moderatePost} from '#/lib/moderation/subjects'
 import {makeProfileLink} from '#/lib/routes/links'
-import {asSdkFacets} from '#/lib/strings/rich-text-helpers'
 import {getChatInviteCodeFromUrl} from '#/lib/strings/url-helpers'
 import {useModerationOpts} from '#/state/preferences/moderation-opts'
 import {unstableCacheProfileView} from '#/state/queries/profile'
@@ -30,6 +25,7 @@ import {isStandardSiteEmbed} from '#/components/Post/Embed/StandardSiteEmbed/uti
 import {RichText} from '#/components/RichText'
 import {Embed as StarterPackCard} from '#/components/StarterPack/StarterPackCard'
 import {SubtleHover} from '#/components/SubtleHover'
+import {app} from '#/lexicons'
 import * as bsky from '#/types/bsky'
 import {
   type Embed as TEmbed,
@@ -267,7 +263,7 @@ export function QuoteEmbed({
   linkDisabled?: boolean
 }) {
   const moderationOpts = useModerationOpts()
-  const quote = useMemo<$Typed<AppBskyFeedDefs.PostView>>(
+  const quote = useMemo<$Typed<app.bsky.feed.defs.PostView>>(
     () => ({
       ...embed.view,
       $type: 'app.bsky.feed.defs#postView',
@@ -287,16 +283,10 @@ export function QuoteEmbed({
   const itemTitle = `Post by ${quote.author.handle}`
 
   const richText = useMemo(() => {
-    if (
-      !bsky.dangerousIsType<AppBskyFeedPost.Record>(
-        quote.record,
-        AppBskyFeedPost.isRecord,
-      )
-    )
-      return undefined
+    if (!bsky.isType(app.bsky.feed.post, quote.record)) return undefined
     const {text, facets} = quote.record
     return text.trim()
-      ? new RichTextAPI({text: text, facets: asSdkFacets(facets)})
+      ? new RichTextAPI({text: text, facets: facets})
       : undefined
   }, [quote.record])
 
diff --git a/src/components/Post/Embed/types.ts b/src/components/Post/Embed/types.ts
index 41031fdf05..eb478347fd 100644
--- a/src/components/Post/Embed/types.ts
+++ b/src/components/Post/Embed/types.ts
@@ -1,7 +1,8 @@
 import {type StyleProp, type ViewStyle} from 'react-native'
-import {type AppBskyFeedDefs} from '@atproto/api'
 import {type ModerationDecision} from '@bsky.app/sdk/moderation'
 
+import {type app} from '#/lexicons'
+
 export enum PostEmbedViewContext {
   ThreadHighlighted = 'ThreadHighlighted',
   Feed = 'Feed',
@@ -20,10 +21,10 @@ export type CommonProps = {
    * events (post:photoEmbed:*). When the embed has no owning post (e.g.
    * composer previews), leave this undefined and no events will be emitted.
    */
-  post?: AppBskyFeedDefs.PostView
+  post?: app.bsky.feed.defs.PostView
   feedDescriptor?: string
 }
 
 export type EmbedProps = CommonProps & {
-  embed?: AppBskyFeedDefs.PostView['embed']
+  embed?: app.bsky.feed.defs.PostView['embed']
 }
diff --git a/src/components/Post/Translated/index.tsx b/src/components/Post/Translated/index.tsx
index 94e0ea697a..849222df03 100644
--- a/src/components/Post/Translated/index.tsx
+++ b/src/components/Post/Translated/index.tsx
@@ -1,6 +1,5 @@
 import {useCallback, useMemo} from 'react'
 import {Platform, type StyleProp, type TextStyle, View} from 'react-native'
-import {type AppBskyFeedDefs, AppBskyFeedPost} from '@atproto/api'
 import {Trans, useLingui} from '@lingui/react/macro'
 
 import {HITSLOP_30} from '#/lib/constants'
@@ -28,6 +27,7 @@ import * as Select from '#/components/Select'
 import {Text} from '#/components/Typography'
 import {useAnalytics} from '#/analytics'
 import {IS_WEB} from '#/env'
+import {app} from '#/lexicons'
 import * as bsky from '#/types/bsky'
 
 const X_ICON_OFFSET = 16
@@ -38,7 +38,7 @@ export function TranslatedPost({
   postTextStyle = a.text_md,
 }: {
   hideTranslateLink?: boolean
-  post: AppBskyFeedDefs.PostView
+  post: app.bsky.feed.defs.PostView
   postTextStyle?: StyleProp<TextStyle>
 }) {
   const langPrefs = useLanguagePrefs()
@@ -46,11 +46,8 @@ export function TranslatedPost({
     key: post.uri,
   })
 
-  const record = useMemo<AppBskyFeedPost.Record | undefined>(() => {
-    return bsky.dangerousIsType<AppBskyFeedPost.Record>(
-      post.record,
-      AppBskyFeedPost.isRecord,
-    )
+  const record = useMemo<app.bsky.feed.post.Main | undefined>(() => {
+    return bsky.isType(app.bsky.feed.post, post.record)
       ? post.record
       : undefined
   }, [post])
diff --git a/src/components/PostControls/BookmarkButton.tsx b/src/components/PostControls/BookmarkButton.tsx
index b2ed043365..8d43947823 100644
--- a/src/components/PostControls/BookmarkButton.tsx
+++ b/src/components/PostControls/BookmarkButton.tsx
@@ -1,6 +1,5 @@
 import {memo} from 'react'
 import {type Insets} from 'react-native'
-import {type AppBskyFeedDefs} from '@atproto/api'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
@@ -15,6 +14,7 @@ import {Bookmark, BookmarkFilled} from '#/components/icons/Bookmark'
 import {Trash_Stroke2_Corner0_Rounded as TrashIcon} from '#/components/icons/Trash'
 import * as toast from '#/components/Toast'
 import {useAnalytics} from '#/analytics'
+import {type app} from '#/lexicons'
 import {PostControlButton, PostControlButtonIcon} from './PostControlButton'
 
 export const BookmarkButton = memo(function BookmarkButton({
@@ -23,7 +23,7 @@ export const BookmarkButton = memo(function BookmarkButton({
   logContext,
   hitSlop,
 }: {
-  post: Shadow<AppBskyFeedDefs.PostView>
+  post: Shadow<app.bsky.feed.defs.PostView>
   big?: boolean
   logContext: 'FeedItem' | 'PostThreadItem' | 'Post' | 'ImmersiveVideo'
   hitSlop?: Insets
diff --git a/src/components/PostControls/PostMenu/PostMenuItems.tsx b/src/components/PostControls/PostMenu/PostMenuItems.tsx
index 43fdaaf1cd..8c31ad4ce4 100644
--- a/src/components/PostControls/PostMenu/PostMenuItems.tsx
+++ b/src/components/PostControls/PostMenu/PostMenuItems.tsx
@@ -6,12 +6,7 @@ import {
   type ViewStyle,
 } from 'react-native'
 import * as Clipboard from 'expo-clipboard'
-import {
-  type AppBskyFeedDefs,
-  type AppBskyFeedPost,
-  type AppBskyFeedThreadgate,
-  AtUri,
-} from '@atproto/api'
+import {AtUri} from '@atproto/syntax'
 import {type RichText as RichTextAPI} from '@bsky.app/sdk/richtext'
 import {plural} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react/macro'
@@ -97,6 +92,7 @@ import * as Prompt from '#/components/Prompt'
 import * as Toast from '#/components/Toast'
 import {useAnalytics} from '#/analytics'
 import {IS_INTERNAL} from '#/env'
+import {type app} from '#/lexicons'
 
 let PostMenuItems = ({
   post,
@@ -110,17 +106,17 @@ let PostMenuItems = ({
   forceGoogleTranslate,
 }: {
   testID: string
-  post: Shadow<AppBskyFeedDefs.PostView>
+  post: Shadow<app.bsky.feed.defs.PostView>
   postFeedContext: string | undefined
   postReqId: string | undefined
-  record: AppBskyFeedPost.Record
+  record: app.bsky.feed.post.Main
   richText: RichTextAPI
   style?: StyleProp<ViewStyle>
   hitSlop?: PressableProps['hitSlop']
   size?: 'lg' | 'md' | 'sm'
   timestamp: string
-  threadgateRecord?: AppBskyFeedThreadgate.Record
-  onShowLess?: (interaction: AppBskyFeedDefs.Interaction) => void
+  threadgateRecord?: app.bsky.feed.threadgate.Main
+  onShowLess?: (interaction: app.bsky.feed.defs.Interaction) => void
   logContext: 'FeedItem' | 'PostThreadItem' | 'Post' | 'ImmersiveVideo'
   forceGoogleTranslate: boolean
 }): React.ReactNode => {
diff --git a/src/components/PostControls/PostMenu/index.tsx b/src/components/PostControls/PostMenu/index.tsx
index c0826683b6..1c7e412065 100644
--- a/src/components/PostControls/PostMenu/index.tsx
+++ b/src/components/PostControls/PostMenu/index.tsx
@@ -1,10 +1,5 @@
 import {memo, useMemo, useState} from 'react'
 import {type Insets} from 'react-native'
-import {
-  type AppBskyFeedDefs,
-  type AppBskyFeedPost,
-  type AppBskyFeedThreadgate,
-} from '@atproto/api'
 import {type RichText as RichTextAPI} from '@bsky.app/sdk/richtext'
 import {useLingui} from '@lingui/react/macro'
 
@@ -13,6 +8,7 @@ import {EventStopper} from '#/view/com/util/EventStopper'
 import {DotGrid3x1_Stroke2_Corner0_Rounded as DotsHorizontal} from '#/components/icons/DotGrid'
 import * as Menu from '#/components/Menu'
 import {useMenuControl} from '#/components/Menu'
+import {type app} from '#/lexicons'
 import {PostControlButton, PostControlButtonIcon} from '../PostControlButton'
 import {PostMenuItems} from './PostMenuItems'
 
@@ -32,15 +28,15 @@ let PostMenuButton = ({
   forceGoogleTranslate,
 }: {
   testID: string
-  post: Shadow<AppBskyFeedDefs.PostView>
+  post: Shadow<app.bsky.feed.defs.PostView>
   postFeedContext: string | undefined
   postReqId: string | undefined
   big?: boolean
-  record: AppBskyFeedPost.Record
+  record: app.bsky.feed.post.Main
   richText: RichTextAPI
   timestamp: string
-  threadgateRecord?: AppBskyFeedThreadgate.Record
-  onShowLess?: (interaction: AppBskyFeedDefs.Interaction) => void
+  threadgateRecord?: app.bsky.feed.threadgate.Main
+  onShowLess?: (interaction: app.bsky.feed.defs.Interaction) => void
   hitSlop?: Insets
   logContext: 'FeedItem' | 'PostThreadItem' | 'Post' | 'ImmersiveVideo'
   forceGoogleTranslate: boolean
diff --git a/src/components/PostControls/ShareMenu/RecentChats.tsx b/src/components/PostControls/ShareMenu/RecentChats.tsx
index 94086c420d..33441352fc 100644
--- a/src/components/PostControls/ShareMenu/RecentChats.tsx
+++ b/src/components/PostControls/ShareMenu/RecentChats.tsx
@@ -1,6 +1,5 @@
 import {ScrollView, View} from 'react-native'
-import {type ChatBskyActorDefs} from '@atproto/api'
-import {type ModerationOpts} from '@bsky.app/sdk/moderation'
+import {moderateProfile, type ModerationOpts} from '@bsky.app/sdk/moderation'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
@@ -8,7 +7,6 @@ import {useNavigation} from '@react-navigation/native'
 
 import {isBlockedOrBlocking, isMuted} from '#/lib/moderation/blocked-and-muted'
 import {createSanitizedDisplayName} from '#/lib/moderation/create-sanitized-display-name'
-import {moderateProfile} from '#/lib/moderation/subjects'
 import {type NavigationProp} from '#/lib/routes/types'
 import {useProfileShadow} from '#/state/cache/profile-shadow'
 import {useModerationOpts} from '#/state/preferences/moderation-opts'
@@ -23,6 +21,7 @@ import {type ConvoWithDetails, parseConvoView} from '#/components/dms/util'
 import {ProfileBadges} from '#/components/ProfileBadges'
 import {Text} from '#/components/Typography'
 import {useAnalytics} from '#/analytics'
+import {type chat} from '#/lexicons'
 
 export function RecentChats({
   postUri,
@@ -114,7 +113,7 @@ function RecentChatItem({
   onPress: () => void
   moderationOpts: ModerationOpts
   convo: ConvoWithDetails
-  primaryMember: ChatBskyActorDefs.ProfileViewBasic
+  primaryMember: chat.bsky.actor.defs.ProfileViewBasic
 }) {
   const {_} = useLingui()
   const t = useTheme()
diff --git a/src/components/PostControls/ShareMenu/ShareMenuItems.tsx b/src/components/PostControls/ShareMenu/ShareMenuItems.tsx
index dc66340fd3..716e1ec851 100644
--- a/src/components/PostControls/ShareMenu/ShareMenuItems.tsx
+++ b/src/components/PostControls/ShareMenu/ShareMenuItems.tsx
@@ -1,6 +1,6 @@
 import {memo, useMemo} from 'react'
 import * as ExpoClipboard from 'expo-clipboard'
-import {AtUri} from '@atproto/api'
+import {AtUri} from '@atproto/syntax'
 import {Trans, useLingui} from '@lingui/react/macro'
 import {useNavigation} from '@react-navigation/native'
 import {useQueryClient} from '@tanstack/react-query'
diff --git a/src/components/PostControls/ShareMenu/ShareMenuItems.types.tsx b/src/components/PostControls/ShareMenu/ShareMenuItems.types.tsx
index ef93865513..c1ca0f3728 100644
--- a/src/components/PostControls/ShareMenu/ShareMenuItems.types.tsx
+++ b/src/components/PostControls/ShareMenu/ShareMenuItems.types.tsx
@@ -1,22 +1,18 @@
 import {type PressableProps, type StyleProp, type ViewStyle} from 'react-native'
-import {
-  type AppBskyFeedDefs,
-  type AppBskyFeedPost,
-  type AppBskyFeedThreadgate,
-} from '@atproto/api'
 import {type RichText as RichTextAPI} from '@bsky.app/sdk/richtext'
 
 import {type Shadow} from '#/state/cache/post-shadow'
+import {type app} from '#/lexicons'
 
 export interface ShareMenuItemsProps {
   testID: string
-  post: Shadow<AppBskyFeedDefs.PostView>
-  record: AppBskyFeedPost.Record
+  post: Shadow<app.bsky.feed.defs.PostView>
+  record: app.bsky.feed.post.Main
   richText: RichTextAPI
   style?: StyleProp<ViewStyle>
   hitSlop?: PressableProps['hitSlop']
   size?: 'lg' | 'md' | 'sm'
   timestamp: string
-  threadgateRecord?: AppBskyFeedThreadgate.Record
+  threadgateRecord?: app.bsky.feed.threadgate.Main
   onShare: () => void
 }
diff --git a/src/components/PostControls/ShareMenu/ShareMenuItems.web.tsx b/src/components/PostControls/ShareMenu/ShareMenuItems.web.tsx
index 1950be0c4b..fb2fd20988 100644
--- a/src/components/PostControls/ShareMenu/ShareMenuItems.web.tsx
+++ b/src/components/PostControls/ShareMenu/ShareMenuItems.web.tsx
@@ -1,5 +1,5 @@
 import {memo, useMemo} from 'react'
-import {AtUri} from '@atproto/api'
+import {AtUri} from '@atproto/syntax'
 import {Trans, useLingui} from '@lingui/react/macro'
 import {useNavigation} from '@react-navigation/native'
 
diff --git a/src/components/PostControls/ShareMenu/index.tsx b/src/components/PostControls/ShareMenu/index.tsx
index 121cd2a779..e47a13bc95 100644
--- a/src/components/PostControls/ShareMenu/index.tsx
+++ b/src/components/PostControls/ShareMenu/index.tsx
@@ -1,11 +1,6 @@
 import {memo, useMemo, useState} from 'react'
 import {type Insets} from 'react-native'
-import {
-  type AppBskyFeedDefs,
-  type AppBskyFeedPost,
-  type AppBskyFeedThreadgate,
-  AtUri,
-} from '@atproto/api'
+import {AtUri} from '@atproto/syntax'
 import {type RichText as RichTextAPI} from '@bsky.app/sdk/richtext'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
@@ -21,6 +16,7 @@ import {ArrowShareRight_Stroke2_Corner2_Rounded as ArrowShareRightIcon} from '#/
 import * as Menu from '#/components/Menu'
 import {useMenuControl} from '#/components/Menu'
 import {useAnalytics} from '#/analytics'
+import {type app} from '#/lexicons'
 import {PostControlButton, PostControlButtonIcon} from '../PostControlButton'
 import {ShareMenuItems} from './ShareMenuItems'
 
@@ -37,12 +33,12 @@ let ShareMenuButton = ({
   logContext,
 }: {
   testID: string
-  post: Shadow<AppBskyFeedDefs.PostView>
+  post: Shadow<app.bsky.feed.defs.PostView>
   big?: boolean
-  record: AppBskyFeedPost.Record
+  record: app.bsky.feed.post.Main
   richText: RichTextAPI
   timestamp: string
-  threadgateRecord?: AppBskyFeedThreadgate.Record
+  threadgateRecord?: app.bsky.feed.threadgate.Main
   onShare: () => void
   hitSlop?: Insets
   logContext: 'FeedItem' | 'PostThreadItem' | 'Post' | 'ImmersiveVideo'
diff --git a/src/components/PostControls/index.tsx b/src/components/PostControls/index.tsx
index 88f30b0561..66dd50cb84 100644
--- a/src/components/PostControls/index.tsx
+++ b/src/components/PostControls/index.tsx
@@ -1,10 +1,5 @@
 import {memo, useMemo, useState} from 'react'
 import {type StyleProp, View, type ViewStyle} from 'react-native'
-import {
-  type AppBskyFeedDefs,
-  type AppBskyFeedPost,
-  type AppBskyFeedThreadgate,
-} from '@atproto/api'
 import {type RichText as RichTextAPI} from '@bsky.app/sdk/richtext'
 import {plural} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react/macro'
@@ -29,6 +24,7 @@ import {useFormatPostStatCount} from '#/components/PostControls/util'
 import * as Skele from '#/components/Skeleton'
 import * as Toast from '#/components/Toast'
 import {useAnalytics} from '#/analytics'
+import {type app} from '#/lexicons'
 import {BookmarkButton} from './BookmarkButton'
 import {
   PostControlButton,
@@ -57,8 +53,8 @@ let PostControls = ({
   forceGoogleTranslate = false,
 }: {
   big?: boolean
-  post: Shadow<AppBskyFeedDefs.PostView>
-  record: AppBskyFeedPost.Record
+  post: Shadow<app.bsky.feed.defs.PostView>
+  record: app.bsky.feed.post.Main
   richText: RichTextAPI
   feedContext?: string | undefined
   reqId?: string | undefined
@@ -66,8 +62,8 @@ let PostControls = ({
   onPressReply: () => void
   onPostReply?: (postUri: string | undefined) => void
   logContext: 'FeedItem' | 'PostThreadItem' | 'Post' | 'ImmersiveVideo'
-  threadgateRecord?: AppBskyFeedThreadgate.Record
-  onShowLess?: (interaction: AppBskyFeedDefs.Interaction) => void
+  threadgateRecord?: app.bsky.feed.threadgate.Main
+  onShowLess?: (interaction: app.bsky.feed.defs.Interaction) => void
   viaRepost?: {uri: string; cid: string}
   variant?: 'compact' | 'normal' | 'large'
   forceGoogleTranslate?: boolean
diff --git a/src/components/ProfileCard.tsx b/src/components/ProfileCard.tsx
index cdc8d194a1..9db85d2749 100644
--- a/src/components/ProfileCard.tsx
+++ b/src/components/ProfileCard.tsx
@@ -6,12 +6,11 @@ import {
   View,
   type ViewStyle,
 } from 'react-native'
-import {type ModerationOpts} from '@bsky.app/sdk/moderation'
+import {moderateProfile, type ModerationOpts} from '@bsky.app/sdk/moderation'
 import {RichText as RichTextApi} from '@bsky.app/sdk/richtext'
 import {useLingui} from '@lingui/react/macro'
 
 import {getModerationCauseKey} from '#/lib/moderation'
-import {moderateProfile} from '#/lib/moderation/subjects'
 import {makeProfileLink} from '#/lib/routes/links'
 import {forceLTR} from '#/lib/strings/bidi'
 import {NON_BREAKING_SPACE} from '#/lib/strings/constants'
diff --git a/src/components/ProfileHoverCard/index.web.tsx b/src/components/ProfileHoverCard/index.web.tsx
index 74dbb33f28..4f05f8e7ae 100644
--- a/src/components/ProfileHoverCard/index.web.tsx
+++ b/src/components/ProfileHoverCard/index.web.tsx
@@ -1,14 +1,12 @@
 import {memo, useCallback, useEffect, useMemo, useReducer, useRef} from 'react'
 import {View} from 'react-native'
-import {type AppBskyActorDefs} from '@atproto/api'
-import {type ModerationOpts} from '@bsky.app/sdk/moderation'
+import {moderateProfile, type ModerationOpts} from '@bsky.app/sdk/moderation'
 import {flip, offset, shift, size, useFloating} from '@floating-ui/react-dom'
 import {msg, plural} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {useNavigation} from '@react-navigation/native'
 
 import {getModerationCauseKey} from '#/lib/moderation'
-import {moderateProfile} from '#/lib/moderation/subjects'
 import {makeProfileLink} from '#/lib/routes/links'
 import {type NavigationProp} from '#/lib/routes/types'
 import {sanitizeDisplayName} from '#/lib/strings/display-names'
@@ -40,6 +38,7 @@ import {Text} from '#/components/Typography'
 import {IS_WEB_TOUCH_DEVICE} from '#/env'
 import {useActorStatus} from '#/features/liveNow'
 import {LiveStatus} from '#/features/liveNow/components/LiveStatusDialog'
+import {type app} from '#/lexicons'
 import {type ProfileHoverCardProps} from './types'
 
 const floatingMiddlewares = [
@@ -416,7 +415,7 @@ function Inner({
   moderationOpts,
   hide,
 }: {
-  profile: AppBskyActorDefs.ProfileViewDetailed
+  profile: app.bsky.actor.defs.ProfileViewDetailed
   moderationOpts: ModerationOpts
   hide: () => void
 }) {
diff --git a/src/components/StarterPack/Main/FeedsList.tsx b/src/components/StarterPack/Main/FeedsList.tsx
index 43ceacc629..2d0c8f1bad 100644
--- a/src/components/StarterPack/Main/FeedsList.tsx
+++ b/src/components/StarterPack/Main/FeedsList.tsx
@@ -1,6 +1,5 @@
 import {forwardRef, useCallback, useImperativeHandle, useState} from 'react'
 import {type ListRenderItemInfo, View} from 'react-native'
-import {type AppBskyFeedDefs} from '@atproto/api'
 
 import {useBottomBarOffset} from '#/lib/hooks/useBottomBarOffset'
 import {List, type ListRef} from '#/view/com/util/List'
@@ -8,13 +7,14 @@ import {type SectionRef} from '#/screens/Profile/Sections/types'
 import {atoms as a, useTheme} from '#/alf'
 import * as FeedCard from '#/components/FeedCard'
 import {IS_NATIVE, IS_WEB} from '#/env'
+import {type app} from '#/lexicons'
 
-function keyExtractor(item: AppBskyFeedDefs.GeneratorView) {
+function keyExtractor(item: app.bsky.feed.defs.GeneratorView) {
   return item.uri
 }
 
 interface ProfilesListProps {
-  feeds: AppBskyFeedDefs.GeneratorView[]
+  feeds: app.bsky.feed.defs.GeneratorView[]
   headerHeight: number
   scrollElRef: ListRef
 }
@@ -39,7 +39,7 @@ export const FeedsList = forwardRef<SectionRef, ProfilesListProps>(
     const renderItem = ({
       item,
       index,
-    }: ListRenderItemInfo<AppBskyFeedDefs.GeneratorView>) => {
+    }: ListRenderItemInfo<app.bsky.feed.defs.GeneratorView>) => {
       return (
         <View
           style={[
diff --git a/src/components/StarterPack/Main/ProfilesList.tsx b/src/components/StarterPack/Main/ProfilesList.tsx
index dea87c8443..d5c29f7c0a 100644
--- a/src/components/StarterPack/Main/ProfilesList.tsx
+++ b/src/components/StarterPack/Main/ProfilesList.tsx
@@ -1,10 +1,6 @@
 import {forwardRef, useCallback, useImperativeHandle, useState} from 'react'
 import {type ListRenderItemInfo, View} from 'react-native'
-import {
-  type AppBskyActorDefs,
-  type AppBskyGraphGetList,
-  AtUri,
-} from '@atproto/api'
+import {AtUri} from '@atproto/syntax'
 import {type ModerationOpts} from '@bsky.app/sdk/moderation'
 import {
   type InfiniteData,
@@ -22,15 +18,16 @@ import {atoms as a, useTheme} from '#/alf'
 import {ListFooter, ListMaybePlaceholder} from '#/components/Lists'
 import {Default as ProfileCard} from '#/components/ProfileCard'
 import {IS_NATIVE, IS_WEB} from '#/env'
+import {type app} from '#/lexicons'
 
-function keyExtractor(item: AppBskyActorDefs.ProfileView, index: number) {
+function keyExtractor(item: app.bsky.actor.defs.ProfileView, index: number) {
   return `${item.did}-${index}`
 }
 
 interface ProfilesListProps {
   listUri: string
   listMembersQuery: UseInfiniteQueryResult<
-    InfiniteData<AppBskyGraphGetList.OutputSchema>
+    InfiniteData<app.bsky.graph.getList.$OutputBody>
   >
   moderationOpts: ModerationOpts
   headerHeight: number
@@ -87,7 +84,7 @@ export const ProfilesList = forwardRef<SectionRef, ProfilesListProps>(
     const renderItem = ({
       item,
       index,
-    }: ListRenderItemInfo<AppBskyActorDefs.ProfileView>) => {
+    }: ListRenderItemInfo<app.bsky.actor.defs.ProfileView>) => {
       return (
         <View
           style={[
diff --git a/src/components/StarterPack/ProfileStarterPacks.tsx b/src/components/StarterPack/ProfileStarterPacks.tsx
index 69d4b5130e..4555c6ec4b 100644
--- a/src/components/StarterPack/ProfileStarterPacks.tsx
+++ b/src/components/StarterPack/ProfileStarterPacks.tsx
@@ -6,7 +6,6 @@ import {
   View,
   type ViewStyle,
 } from 'react-native'
-import {type AppBskyGraphDefs} from '@atproto/api'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
@@ -37,6 +36,7 @@ import * as Prompt from '#/components/Prompt'
 import {Default as StarterPackCard} from '#/components/StarterPack/StarterPackCard'
 import {Text} from '#/components/Typography'
 import {IS_IOS} from '#/env'
+import {type app} from '#/lexicons'
 
 interface SectionRef {
   scrollToTop: () => void
@@ -57,7 +57,7 @@ interface ProfileFeedgensProps {
   emptyStateIcon?: React.ComponentType<any> | React.ReactElement
 }
 
-function keyExtractor(item: AppBskyGraphDefs.StarterPackViewBasic) {
+function keyExtractor(item: app.bsky.graph.defs.StarterPackViewBasic) {
   return item.uri
 }
 
@@ -147,7 +147,7 @@ export function ProfileStarterPacks({
     ({
       item,
       index,
-    }: ListRenderItemInfo<AppBskyGraphDefs.StarterPackViewBasic>) => {
+    }: ListRenderItemInfo<app.bsky.graph.defs.StarterPackViewBasic>) => {
       return (
         <View
           style={[
diff --git a/src/components/StarterPack/QrCode.tsx b/src/components/StarterPack/QrCode.tsx
index 4b27ff6649..8a05a767b1 100644
--- a/src/components/StarterPack/QrCode.tsx
+++ b/src/components/StarterPack/QrCode.tsx
@@ -3,7 +3,6 @@ import {View} from 'react-native'
 // @ts-expect-error missing types
 import QRCode from 'react-native-qrcode-styled'
 import type ViewShot from 'react-native-view-shot'
-import {type AppBskyGraphDefs, AppBskyGraphStarterpack} from '@atproto/api'
 import {Trans} from '@lingui/react/macro'
 
 import {Logo} from '#/view/icons/Logo'
@@ -12,6 +11,7 @@ import {atoms as a, useTheme} from '#/alf'
 import {LinearGradientBackground} from '#/components/LinearGradientBackground'
 import {Text} from '#/components/Typography'
 import {IS_WEB} from '#/env'
+import {app} from '#/lexicons'
 import * as bsky from '#/types/bsky'
 
 const LazyViewShot = lazy(
@@ -24,18 +24,13 @@ export function QrCode({
   link,
   ref,
 }: {
-  starterPack: AppBskyGraphDefs.StarterPackView
+  starterPack: app.bsky.graph.defs.StarterPackView
   link: string
   ref: React.Ref<ViewShot>
 }) {
   const {record} = starterPack
 
-  if (
-    !bsky.dangerousIsType<AppBskyGraphStarterpack.Record>(
-      record,
-      AppBskyGraphStarterpack.isRecord,
-    )
-  ) {
+  if (!bsky.isType(app.bsky.graph.starterpack, record)) {
     return null
   }
 
diff --git a/src/components/StarterPack/QrCodeDialog.tsx b/src/components/StarterPack/QrCodeDialog.tsx
index e239eee9a4..483224f9bc 100644
--- a/src/components/StarterPack/QrCodeDialog.tsx
+++ b/src/components/StarterPack/QrCodeDialog.tsx
@@ -3,7 +3,6 @@ import {View} from 'react-native'
 import type ViewShot from 'react-native-view-shot'
 import {requestPermissionsAsync, saveToLibraryAsync} from 'expo-media-library'
 import * as Sharing from 'expo-sharing'
-import {type AppBskyGraphDefs, AppBskyGraphStarterpack} from '@atproto/api'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
@@ -21,6 +20,7 @@ import {QrCode} from '#/components/StarterPack/QrCode'
 import * as Toast from '#/components/Toast'
 import {useAnalytics} from '#/analytics'
 import {IS_NATIVE, IS_WEB} from '#/env'
+import {app} from '#/lexicons'
 import * as bsky from '#/types/bsky'
 
 export function QrCodeDialog({
@@ -28,7 +28,7 @@ export function QrCodeDialog({
   link,
   control,
 }: {
-  starterPack: AppBskyGraphDefs.StarterPackView
+  starterPack: app.bsky.graph.defs.StarterPackView
   link?: string
   control: DialogControlProps
 }) {
@@ -87,12 +87,7 @@ export function QrCodeDialog({
       } else {
         setIsSaveProcessing(true)
 
-        if (
-          !bsky.validate(
-            starterPack.record,
-            AppBskyGraphStarterpack.validateRecord,
-          )
-        ) {
+        if (!bsky.matches(app.bsky.graph.starterpack, starterPack.record)) {
           return
         }
 
diff --git a/src/components/StarterPack/ShareDialog.tsx b/src/components/StarterPack/ShareDialog.tsx
index 0dd640d3c0..17c794fc1d 100644
--- a/src/components/StarterPack/ShareDialog.tsx
+++ b/src/components/StarterPack/ShareDialog.tsx
@@ -1,6 +1,5 @@
 import {View} from 'react-native'
 import {Image} from 'expo-image'
-import {type AppBskyGraphDefs} from '@atproto/api'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
@@ -19,9 +18,10 @@ import {Loader} from '#/components/Loader'
 import {Text} from '#/components/Typography'
 import {useAnalytics} from '#/analytics'
 import {IS_NATIVE, IS_WEB} from '#/env'
+import {type app} from '#/lexicons'
 
 interface Props {
-  starterPack: AppBskyGraphDefs.StarterPackView
+  starterPack: app.bsky.graph.defs.StarterPackView
   link?: string
   imageLoaded?: boolean
   qrDialogControl: DialogControlProps
diff --git a/src/components/StarterPack/StarterPackCard.tsx b/src/components/StarterPack/StarterPackCard.tsx
index 97c5c6fe82..2f99ab0651 100644
--- a/src/components/StarterPack/StarterPackCard.tsx
+++ b/src/components/StarterPack/StarterPackCard.tsx
@@ -1,7 +1,7 @@
 import {useMemo} from 'react'
 import {View} from 'react-native'
 import {Image} from 'expo-image'
-import {AppBskyGraphStarterpack, AtUri} from '@atproto/api'
+import {AtUri} from '@atproto/syntax'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Plural, Trans} from '@lingui/react/macro'
@@ -19,6 +19,7 @@ import {
   type LinkProps as BaseLinkProps,
 } from '#/components/Link'
 import {Text} from '#/components/Typography'
+import {app} from '#/lexicons'
 import * as bsky from '#/types/bsky'
 
 export function Default({
@@ -62,12 +63,7 @@ export function Card({
   const t = useTheme()
   const {currentAccount} = useSession()
 
-  if (
-    !bsky.dangerousIsType<AppBskyGraphStarterpack.Record>(
-      record,
-      AppBskyGraphStarterpack.isRecord,
-    )
-  ) {
+  if (!bsky.isType(app.bsky.graph.starterpack, record)) {
     return null
   }
 
@@ -127,10 +123,7 @@ export function useStarterPackLink({
 
   return {
     to: `/starter-pack/${handleOrDid}/${rkey}`,
-    label: bsky.dangerousIsType<AppBskyGraphStarterpack.Record>(
-      view.record,
-      AppBskyGraphStarterpack.isRecord,
-    )
+    label: bsky.isType(app.bsky.graph.starterpack, view.record)
       ? _(msg`Navigate to ${view.record.name}`)
       : _(msg`Navigate to starter pack`),
     precache,
@@ -154,12 +147,7 @@ export function Link({
     return {rkey, handleOrDid: creator.handle || creator.did}
   }, [starterPack])
 
-  if (
-    !bsky.dangerousIsType<AppBskyGraphStarterpack.Record>(
-      record,
-      AppBskyGraphStarterpack.isRecord,
-    )
-  ) {
+  if (!bsky.isType(app.bsky.graph.starterpack, record)) {
     return null
   }
 
diff --git a/src/components/StarterPack/Wizard/WizardEditListDialog.tsx b/src/components/StarterPack/Wizard/WizardEditListDialog.tsx
index 498300491d..04b1ae3df0 100644
--- a/src/components/StarterPack/Wizard/WizardEditListDialog.tsx
+++ b/src/components/StarterPack/Wizard/WizardEditListDialog.tsx
@@ -1,7 +1,6 @@
 import {useRef} from 'react'
 import {type ListRenderItemInfo} from 'react-native'
 import {View} from 'react-native'
-import {type AppBskyActorDefs, type AppBskyFeedDefs} from '@atproto/api'
 import {type ModerationOpts} from '@bsky.app/sdk/moderation'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
@@ -22,9 +21,10 @@ import {
 } from '#/components/StarterPack/Wizard/WizardListCard'
 import {Text} from '#/components/Typography'
 import {IS_WEB} from '#/env'
+import {type app} from '#/lexicons'
 
 function keyExtractor(
-  item: AppBskyActorDefs.ProfileViewBasic | AppBskyFeedDefs.GeneratorView,
+  item: app.bsky.actor.defs.ProfileViewBasic | app.bsky.feed.defs.GeneratorView,
   index: number,
 ) {
   return `${item.did}-${index}`
@@ -41,7 +41,7 @@ export function WizardEditListDialog({
   state: WizardState
   dispatch: (action: WizardAction) => void
   moderationOpts: ModerationOpts
-  profile: AppBskyActorDefs.ProfileViewDetailed
+  profile: app.bsky.actor.defs.ProfileViewDetailed
 }) {
   const {_} = useLingui()
   const t = useTheme()
diff --git a/src/components/StarterPack/Wizard/WizardListCard.tsx b/src/components/StarterPack/Wizard/WizardListCard.tsx
index 353fd77b13..1d33b27e40 100644
--- a/src/components/StarterPack/Wizard/WizardListCard.tsx
+++ b/src/components/StarterPack/Wizard/WizardListCard.tsx
@@ -1,12 +1,15 @@
 import {Keyboard, View} from 'react-native'
-import {type AppBskyActorDefs, type AppBskyFeedDefs} from '@atproto/api'
-import {type ModerationOpts, type ModerationUI} from '@bsky.app/sdk/moderation'
+import {
+  moderateFeedGenerator,
+  moderateProfile,
+  type ModerationOpts,
+  type ModerationUI,
+} from '@bsky.app/sdk/moderation'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
 
 import {DISCOVER_FEED_URI, STARTER_PACK_MAX_SIZE} from '#/lib/constants'
-import {moderateFeedGenerator, moderateProfile} from '#/lib/moderation/subjects'
 import {sanitizeDisplayName} from '#/lib/strings/display-names'
 import {sanitizeHandle} from '#/lib/strings/handles'
 import {useSession} from '#/state/session'
@@ -21,6 +24,7 @@ import * as Toggle from '#/components/forms/Toggle'
 import {Checkbox} from '#/components/forms/Toggle'
 import {Text} from '#/components/Typography'
 import {useAnalytics} from '#/analytics'
+import {type app} from '#/lexicons'
 import type * as bsky from '#/types/bsky'
 
 function WizardListCard({
@@ -36,8 +40,8 @@ function WizardListCard({
 }: {
   type: 'user' | 'algo'
   btnType: 'checkbox' | 'remove'
-  profile?: AppBskyActorDefs.ProfileViewBasic
-  feed?: AppBskyFeedDefs.GeneratorView
+  profile?: app.bsky.actor.defs.ProfileViewBasic
+  feed?: app.bsky.feed.defs.GeneratorView
   displayName: string
   subtitle: string
   onPress: () => void
@@ -178,7 +182,7 @@ export function WizardFeedCard({
   moderationOpts,
 }: {
   btnType: 'checkbox' | 'remove'
-  generator: AppBskyFeedDefs.GeneratorView
+  generator: app.bsky.feed.defs.GeneratorView
   state: WizardState
   dispatch: (action: WizardAction) => void
   moderationOpts: ModerationOpts
diff --git a/src/components/TrendingTopics.tsx b/src/components/TrendingTopics.tsx
index 56fe08ccc9..a067545369 100644
--- a/src/components/TrendingTopics.tsx
+++ b/src/components/TrendingTopics.tsx
@@ -1,5 +1,5 @@
 import {useEffect, useMemo} from 'react'
-import {type AppBskyUnspeccedDefs, type AtUri} from '@atproto/api'
+import {type AtUri} from '@atproto/syntax'
 import {useLingui} from '@lingui/react/macro'
 
 import {PressableScale} from '#/lib/custom-animations/PressableScale'
@@ -9,6 +9,7 @@ import {useCallOnce} from '#/lib/once'
 import {native} from '#/alf'
 import {Link as InternalLink, type LinkProps} from '#/components/Link'
 import {type Metrics, useAnalytics} from '#/analytics'
+import {type app} from '#/lexicons'
 
 export function TrendingTopicLink({
   topic: raw,
@@ -18,7 +19,7 @@ export function TrendingTopicLink({
   children,
   ...rest
 }: {
-  topic: AppBskyUnspeccedDefs.TrendView
+  topic: app.bsky.unspecced.defs.TrendView
   metricContext: Metrics['trendingTopic:seen']['context']
   rank: number
   recId?: string
@@ -75,7 +76,7 @@ type ParsedTrendingTopic =
     }
 
 export function useTopic(
-  raw: AppBskyUnspeccedDefs.TrendView,
+  raw: app.bsky.unspecced.defs.TrendView,
 ): ParsedTrendingTopic {
   const {t: l} = useLingui()
   return useMemo(() => {
diff --git a/src/components/VideoPostCard.tsx b/src/components/VideoPostCard.tsx
index bb79fa6a78..ee487e0520 100644
--- a/src/components/VideoPostCard.tsx
+++ b/src/components/VideoPostCard.tsx
@@ -2,12 +2,6 @@ import {useMemo} from 'react'
 import {View} from 'react-native'
 import {Image} from 'expo-image'
 import {LinearGradient} from 'expo-linear-gradient'
-import {
-  type AppBskyActorDefs,
-  AppBskyEmbedVideo,
-  type AppBskyFeedDefs,
-  AppBskyFeedPost,
-} from '@atproto/api'
 import {type ModerationDecision} from '@bsky.app/sdk/moderation'
 import {useLingui} from '@lingui/react/macro'
 
@@ -26,6 +20,7 @@ import {Link} from '#/components/Link'
 import {MediaInsetBorder} from '#/components/MediaInsetBorder'
 import * as Hider from '#/components/moderation/Hider'
 import {Text} from '#/components/Typography'
+import {app} from '#/lexicons'
 import * as bsky from '#/types/bsky'
 
 function getBlackColor(t: ReturnType<typeof useTheme>) {
@@ -42,7 +37,7 @@ export function VideoPostCard({
   moderation,
   onInteract,
 }: {
-  post: AppBskyFeedDefs.PostView
+  post: app.bsky.feed.defs.PostView
   sourceContext: VideoFeedSourceContext
   moderation: ModerationDecision
   /**
@@ -75,13 +70,10 @@ export function VideoPostCard({
    * Filtering should be done at a higher level, such as `PostFeed` or
    * `PostFeedVideoGridRow`, but we need to protect here as well.
    */
-  if (!AppBskyEmbedVideo.isView(embed)) return null
+  if (!bsky.isType(app.bsky.embed.video.view, embed)) return null
 
   const author = post.author
-  const text = bsky.dangerousIsType<AppBskyFeedPost.Record>(
-    post.record,
-    AppBskyFeedPost.isRecord,
-  )
+  const text = bsky.isType(app.bsky.feed.post, post.record)
     ? post.record?.text
     : ''
   const likeCount = post?.likeCount ?? 0
@@ -275,7 +267,7 @@ export function VideoPostCardPlaceholder() {
 export function VideoPostCardTextPlaceholder({
   author,
 }: {
-  author?: AppBskyActorDefs.ProfileViewBasic
+  author?: app.bsky.actor.defs.ProfileViewBasic
 }) {
   const t = useTheme()
 
@@ -355,7 +347,7 @@ export function CompactVideoPostCard({
   moderation,
   onInteract,
 }: {
-  post: AppBskyFeedDefs.PostView
+  post: app.bsky.feed.defs.PostView
   sourceContext: VideoFeedSourceContext
   moderation: ModerationDecision
   /**
@@ -386,7 +378,7 @@ export function CompactVideoPostCard({
    * Filtering should be done at a higher level, such as `PostFeed` or
    * `PostFeedVideoGridRow`, but we need to protect here as well.
    */
-  if (!AppBskyEmbedVideo.isView(embed)) return null
+  if (!bsky.isType(app.bsky.embed.video.view, embed)) return null
 
   const likeCount = post?.likeCount ?? 0
   const showLikeCount = false
diff --git a/src/components/WhoCanReply.tsx b/src/components/WhoCanReply.tsx
index be7636ff4b..2202ed8e33 100644
--- a/src/components/WhoCanReply.tsx
+++ b/src/components/WhoCanReply.tsx
@@ -6,12 +6,7 @@ import {
   View,
   type ViewStyle,
 } from 'react-native'
-import {
-  type AppBskyFeedDefs,
-  AppBskyFeedPost,
-  type AppBskyGraphDefs,
-  AtUri,
-} from '@atproto/api'
+import {AtUri} from '@atproto/syntax'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
@@ -38,10 +33,11 @@ import {InlineLinkText} from '#/components/Link'
 import {Text} from '#/components/Typography'
 import {useAnalytics} from '#/analytics'
 import {IS_NATIVE} from '#/env'
+import {app} from '#/lexicons'
 import * as bsky from '#/types/bsky'
 
 interface WhoCanReplyProps {
-  post: AppBskyFeedDefs.PostView
+  post: app.bsky.feed.defs.PostView
   isThreadAuthor: boolean
   style?: StyleProp<ViewStyle>
 }
@@ -58,10 +54,7 @@ export function WhoCanReply({post, isThreadAuthor, style}: WhoCanReplyProps) {
    * unexpectedly, we should check to make sure it's for sure the root URI.
    */
   const rootUri =
-    bsky.dangerousIsType<AppBskyFeedPost.Record>(
-      post.record,
-      AppBskyFeedPost.isRecord,
-    ) && post.record.reply?.root
+    bsky.isType(app.bsky.feed.post, post.record) && post.record.reply?.root
       ? post.record.reply.root.uri
       : post.uri
   const settings = useMemo(() => {
@@ -209,7 +202,7 @@ function WhoCanReplyDialog({
   embeddingDisabled,
 }: {
   control: Dialog.DialogControlProps
-  post: AppBskyFeedDefs.PostView
+  post: app.bsky.feed.defs.PostView
   settings: ThreadgateAllowUISetting[]
   embeddingDisabled: boolean
 }) {
@@ -255,7 +248,7 @@ function Rules({
   settings,
   embeddingDisabled,
 }: {
-  post: AppBskyFeedDefs.PostView
+  post: app.bsky.feed.defs.PostView
   settings: ThreadgateAllowUISetting[]
   embeddingDisabled: boolean
 }) {
@@ -313,8 +306,8 @@ function Rule({
   lists,
 }: {
   rule: ThreadgateAllowUISetting
-  post: AppBskyFeedDefs.PostView
-  lists: AppBskyGraphDefs.ListViewBasic[] | undefined
+  post: app.bsky.feed.defs.PostView
+  lists: app.bsky.graph.defs.ListViewBasic[] | undefined
 }) {
   if (rule.type === 'mention') {
     return <Trans>mentioned users</Trans>
diff --git a/src/components/activity-notifications/SubscribeProfileDialog.tsx b/src/components/activity-notifications/SubscribeProfileDialog.tsx
index 51d6622407..bbb635c390 100644
--- a/src/components/activity-notifications/SubscribeProfileDialog.tsx
+++ b/src/components/activity-notifications/SubscribeProfileDialog.tsx
@@ -1,7 +1,6 @@
 import {useMemo, useState} from 'react'
 import {View} from 'react-native'
-import {type AppBskyNotificationDefs, type Un$Typed} from '@atproto/api'
-import {type DidString} from '@atproto/syntax'
+import {type Un$Typed} from '@atproto/lex'
 import {type ModerationOpts} from '@bsky.app/sdk/moderation'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
@@ -118,11 +117,10 @@ function DialogInner({
     error,
   } = useMutation({
     mutationFn: async (
-      activitySubscription: Un$Typed<AppBskyNotificationDefs.ActivitySubscription>,
+      activitySubscription: Un$Typed<app.bsky.notification.defs.ActivitySubscription>,
     ) => {
       await client.call(app.bsky.notification.putActivitySubscription, {
-        // the profile view carries an already-resolved did
-        subject: profile.did as DidString,
+        subject: profile.did,
         activitySubscription,
       })
     },
@@ -307,8 +305,8 @@ function DialogInner({
 }
 
 function parseActivitySubscription(
-  sub?: AppBskyNotificationDefs.ActivitySubscription,
-): Un$Typed<AppBskyNotificationDefs.ActivitySubscription> {
+  sub?: app.bsky.notification.defs.ActivitySubscription,
+): Un$Typed<app.bsky.notification.defs.ActivitySubscription> {
   if (!sub) return {post: false, reply: false}
   const {post, reply} = sub
   return {post, reply}
diff --git a/src/components/ageAssurance/AgeAssuranceAppealDialog.tsx b/src/components/ageAssurance/AgeAssuranceAppealDialog.tsx
index 59df413324..e3a9dd41a7 100644
--- a/src/components/ageAssurance/AgeAssuranceAppealDialog.tsx
+++ b/src/components/ageAssurance/AgeAssuranceAppealDialog.tsx
@@ -1,6 +1,5 @@
 import {useState} from 'react'
 import {View} from 'react-native'
-import {ToolsOzoneReportDefs} from '@atproto/api'
 import {type DidString} from '@atproto/syntax'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
@@ -18,7 +17,7 @@ import * as Toast from '#/components/Toast'
 import {Text} from '#/components/Typography'
 import {logger} from '#/ageAssurance'
 import {useAnalytics} from '#/analytics'
-import {com} from '#/lexicons'
+import {com, tools} from '#/lexicons'
 
 export function AgeAssuranceAppealDialog({
   control,
@@ -60,7 +59,7 @@ function Inner({control}: {control: Dialog.DialogControlProps}) {
       await client.call(
         com.atproto.moderation.createReport,
         {
-          reasonType: ToolsOzoneReportDefs.REASONAPPEAL,
+          reasonType: tools.ozone.report.defs.reasonAppeal.value,
           subject: {
             $type: 'com.atproto.admin.defs#repoRef',
             // the persisted account did is already resolved
diff --git a/src/components/contacts/contacts.ts b/src/components/contacts/contacts.ts
index 205c2ccb49..e30736a8ea 100644
--- a/src/components/contacts/contacts.ts
+++ b/src/components/contacts/contacts.ts
@@ -1,6 +1,5 @@
-import {type AppBskyContactDefs} from '@atproto/api'
-
 import {type CountryCode} from '#/lib/international-telephone-codes'
+import {type app} from '#/lexicons'
 import {normalizePhoneNumber} from './phone-number'
 import {type Contact, type Match} from './state'
 
@@ -70,7 +69,7 @@ export function normalizeContactBook(
 
 export function filterMatchedNumbers(
   contacts: Contact[],
-  results: AppBskyContactDefs.MatchAndContactIndex[],
+  results: app.bsky.contact.defs.MatchAndContactIndex[],
   mapping: Map<number, Contact['id']>,
 ) {
   const filteredIds = new Set<Contact['id']>()
@@ -87,7 +86,7 @@ export function filterMatchedNumbers(
 
 export function getMatchedContacts(
   contacts: Contact[],
-  results: AppBskyContactDefs.MatchAndContactIndex[],
+  results: app.bsky.contact.defs.MatchAndContactIndex[],
   mapping: Map<number, Contact['id']>,
 ): Array<Match> {
   const contactsById = new Map(contacts.map(c => [c.id, c]))
diff --git a/src/components/dialogs/Embed.tsx b/src/components/dialogs/Embed.tsx
index 105895ce3d..caecc9a2a9 100644
--- a/src/components/dialogs/Embed.tsx
+++ b/src/components/dialogs/Embed.tsx
@@ -1,6 +1,6 @@
 import {memo, useEffect, useMemo, useState} from 'react'
 import {View} from 'react-native'
-import {type AppBskyActorDefs, type AppBskyFeedPost, AtUri} from '@atproto/api'
+import {AtUri} from '@atproto/syntax'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
@@ -20,15 +20,16 @@ import {
 } from '#/components/icons/Chevron'
 import {CodeBrackets_Stroke2_Corner0_Rounded as CodeBracketsIcon} from '#/components/icons/CodeBrackets'
 import {Text} from '#/components/Typography'
+import {type app} from '#/lexicons'
 
 export type ColorModeValues = 'system' | 'light' | 'dark'
 
 type EmbedDialogProps = {
   control: Dialog.DialogControlProps
-  postAuthor: AppBskyActorDefs.ProfileViewBasic
+  postAuthor: app.bsky.actor.defs.ProfileViewBasic
   postCid: string
   postUri: string
-  record: AppBskyFeedPost.Record
+  record: app.bsky.feed.post.Main
   timestamp: string
 }
 
diff --git a/src/components/dialogs/PostInteractionSettingsDialog.tsx b/src/components/dialogs/PostInteractionSettingsDialog.tsx
index 63684f4831..4b04c9fefa 100644
--- a/src/components/dialogs/PostInteractionSettingsDialog.tsx
+++ b/src/components/dialogs/PostInteractionSettingsDialog.tsx
@@ -1,6 +1,5 @@
 import {useCallback, useMemo, useState} from 'react'
 import {LayoutAnimation, Text as NestedText, View} from 'react-native'
-import {type AppBskyFeedDefs} from '@atproto/api'
 import {AtUri} from '@atproto/syntax'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
@@ -133,10 +132,10 @@ export type PostInteractionSettingsDialogProps = {
    */
   rootPostUri: string
   /**
-   * Optional initial {@link AppBskyFeedDefs.ThreadgateView} to use if we
+   * Optional initial {@link app.bsky.feed.defs.ThreadgateView} to use if we
    * happen to have one before opening the settings dialog.
    */
-  initialThreadgateView?: AppBskyFeedDefs.ThreadgateView
+  initialThreadgateView?: app.bsky.feed.defs.ThreadgateView
 }
 
 /**
diff --git a/src/components/dialogs/SearchablePeopleList.tsx b/src/components/dialogs/SearchablePeopleList.tsx
index 221beb9350..3813a3c745 100644
--- a/src/components/dialogs/SearchablePeopleList.tsx
+++ b/src/components/dialogs/SearchablePeopleList.tsx
@@ -7,11 +7,10 @@ import {
   useState,
 } from 'react'
 import {TextInput, View} from 'react-native'
-import {type ModerationOpts} from '@bsky.app/sdk/moderation'
+import {moderateProfile, type ModerationOpts} from '@bsky.app/sdk/moderation'
 import {Plural, Trans, useLingui} from '@lingui/react/macro'
 
 import {createSanitizedDisplayName} from '#/lib/moderation/create-sanitized-display-name'
-import {moderateProfile} from '#/lib/moderation/subjects'
 import {sanitizeHandle} from '#/lib/strings/handles'
 import {useModerationOpts} from '#/state/preferences/moderation-opts'
 import {useActorAutocompleteQuery} from '#/state/queries/actor-autocomplete'
diff --git a/src/components/dialogs/StarterPackDialog.tsx b/src/components/dialogs/StarterPackDialog.tsx
index ac1cb6aaef..6f9888da8c 100644
--- a/src/components/dialogs/StarterPackDialog.tsx
+++ b/src/components/dialogs/StarterPackDialog.tsx
@@ -1,9 +1,5 @@
 import {useCallback} from 'react'
 import {View} from 'react-native'
-import {
-  type AppBskyGraphGetStarterPacksWithMembership,
-  AppBskyGraphStarterpack,
-} from '@atproto/api'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Plural, Trans} from '@lingui/react/macro'
@@ -33,10 +29,11 @@ import * as Toast from '#/components/Toast'
 import {Text} from '#/components/Typography'
 import {useAnalytics} from '#/analytics'
 import {IS_WEB} from '#/env'
+import {app} from '#/lexicons'
 import * as bsky from '#/types/bsky'
 
 type StarterPackWithMembership =
-  AppBskyGraphGetStarterPacksWithMembership.StarterPackWithMembership
+  app.bsky.graph.getStarterPacksWithMembership.StarterPackWithMembership
 
 export type StarterPackDialogProps = {
   control: Dialog.DialogControlProps
@@ -324,12 +321,7 @@ function StarterPackItem({
 
   const {record} = starterPack
 
-  if (
-    !bsky.dangerousIsType<AppBskyGraphStarterpack.Record>(
-      record,
-      AppBskyGraphStarterpack.isRecord,
-    )
-  ) {
+  if (!bsky.isType(app.bsky.graph.starterpack, record)) {
     return null
   }
 
diff --git a/src/components/dialogs/lists/CreateListFromStarterPackDialog.tsx b/src/components/dialogs/lists/CreateListFromStarterPackDialog.tsx
index e6d14b2405..b9979554cd 100644
--- a/src/components/dialogs/lists/CreateListFromStarterPackDialog.tsx
+++ b/src/components/dialogs/lists/CreateListFromStarterPackDialog.tsx
@@ -1,5 +1,4 @@
 import {View} from 'react-native'
-import {type AppBskyGraphDefs, type AppBskyGraphStarterpack} from '@atproto/api'
 import {TID} from '@atproto/common-web'
 import {type $Typed} from '@atproto/lex'
 import {
@@ -37,7 +36,7 @@ export function CreateListFromStarterPackDialog({
   starterPack,
 }: {
   control: Dialog.DialogControlProps
-  starterPack: AppBskyGraphDefs.StarterPackView
+  starterPack: app.bsky.graph.defs.StarterPackView
 }) {
   const {_} = useLingui()
   const t = useTheme()
@@ -50,7 +49,7 @@ export function CreateListFromStarterPackDialog({
   const createDialogControl = Dialog.useDialogControl()
   const loadingDialogControl = Dialog.useDialogControl()
 
-  const record = starterPack.record as AppBskyGraphStarterpack.Record
+  const record = starterPack.record as app.bsky.graph.starterpack.Main
 
   const onPressCreate = () => {
     control.close(() => createDialogControl.open())
diff --git a/src/components/dialogs/lists/CreateOrEditListDialog.tsx b/src/components/dialogs/lists/CreateOrEditListDialog.tsx
index 1f3ec8b7c9..5b3a38be2b 100644
--- a/src/components/dialogs/lists/CreateOrEditListDialog.tsx
+++ b/src/components/dialogs/lists/CreateOrEditListDialog.tsx
@@ -1,6 +1,5 @@
 import {useCallback, useEffect, useMemo, useState} from 'react'
 import {View} from 'react-native'
-import {type AppBskyGraphDefs} from '@atproto/api'
 import {RichText as RichTextAPI} from '@bsky.app/sdk/richtext'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
@@ -8,7 +7,7 @@ import {Plural, Trans} from '@lingui/react/macro'
 
 import {cleanError} from '#/lib/strings/errors'
 import {isOverMaxGraphemeCount} from '#/lib/strings/helpers'
-import {asSdkFacets, richTextToString} from '#/lib/strings/rich-text-helpers'
+import {richTextToString} from '#/lib/strings/rich-text-helpers'
 import {shortenLinks, stripInvalidMentions} from '#/lib/strings/rich-text-manip'
 import {logger} from '#/logger'
 import {type ImageMeta} from '#/state/gallery'
@@ -28,6 +27,7 @@ import * as Prompt from '#/components/Prompt'
 import * as Toast from '#/components/Toast'
 import {Text} from '#/components/Typography'
 import {IS_WEB} from '#/env'
+import {type app} from '#/lexicons'
 
 const DISPLAY_NAME_MAX_GRAPHEMES = 64
 const DESCRIPTION_MAX_GRAPHEMES = 300
@@ -46,8 +46,8 @@ export function CreateOrEditListDialog({
   initialValues,
 }: {
   control: Dialog.DialogControlProps
-  list?: AppBskyGraphDefs.ListView
-  purpose?: AppBskyGraphDefs.ListPurpose
+  list?: app.bsky.graph.defs.ListView
+  purpose?: app.bsky.graph.defs.ListPurpose
   onSave?: (uri: string) => void
   initialValues?: InitialListValues
 }) {
@@ -114,8 +114,8 @@ function DialogInner({
   onPressCancel,
   initialValues,
 }: {
-  list?: AppBskyGraphDefs.ListView
-  purpose?: AppBskyGraphDefs.ListPurpose
+  list?: app.bsky.graph.defs.ListView
+  purpose?: app.bsky.graph.defs.ListPurpose
   onSave?: (uri: string) => void
   setDirty: (dirty: boolean) => void
   onPressCancel: () => void
@@ -169,7 +169,7 @@ function DialogInner({
     // We want to be working with a blank state here, so let's get the
     // serialized version and turn it back into a RichText
     const serialized = richTextToString(
-      new RichTextAPI({text, facets: asSdkFacets(facets)}),
+      new RichTextAPI({text, facets: facets}),
       false,
     )
 
diff --git a/src/components/dialogs/lists/ListAddRemoveUsersDialog.tsx b/src/components/dialogs/lists/ListAddRemoveUsersDialog.tsx
index a8f04e2857..ab63ea5677 100644
--- a/src/components/dialogs/lists/ListAddRemoveUsersDialog.tsx
+++ b/src/components/dialogs/lists/ListAddRemoveUsersDialog.tsx
@@ -1,6 +1,5 @@
 import {useCallback, useMemo} from 'react'
 import {View} from 'react-native'
-import {type AppBskyGraphDefs} from '@atproto/api'
 import {type ModerationOpts} from '@bsky.app/sdk/moderation'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
@@ -23,6 +22,7 @@ import {
 import {Loader} from '#/components/Loader'
 import * as ProfileCard from '#/components/ProfileCard'
 import * as Toast from '#/components/Toast'
+import {type app} from '#/lexicons'
 import type * as bsky from '#/types/bsky'
 
 export function ListAddRemoveUsersDialog({
@@ -31,7 +31,7 @@ export function ListAddRemoveUsersDialog({
   onChange,
 }: {
   control: Dialog.DialogControlProps
-  list: AppBskyGraphDefs.ListView
+  list: app.bsky.graph.defs.ListView
   onChange?: (
     type: 'add' | 'remove',
     profile: bsky.profile.AnyProfileView,
@@ -52,7 +52,7 @@ function DialogInner({
   list,
   onChange,
 }: {
-  list: AppBskyGraphDefs.ListView
+  list: app.bsky.graph.defs.ListView
   onChange?: (
     type: 'add' | 'remove',
     profile: bsky.profile.AnyProfileView,
@@ -89,7 +89,7 @@ function DialogInner({
  * Returns undefined for pending, false for not a member, and string for a member (the URI of the membership record)
  */
 function getMembership(
-  listMembers: AppBskyGraphDefs.ListItemView[] | undefined,
+  listMembers: app.bsky.graph.defs.ListItemView[] | undefined,
   actorDid: string,
 ): string | false | undefined {
   if (!listMembers) {
@@ -107,8 +107,8 @@ function UserResult({
   moderationOpts,
 }: {
   profile: bsky.profile.AnyProfileView
-  list: AppBskyGraphDefs.ListView
-  listMembers: AppBskyGraphDefs.ListItemView[] | undefined
+  list: app.bsky.graph.defs.ListView
+  listMembers: app.bsky.graph.defs.ListItemView[] | undefined
   onChange?: (
     type: 'add' | 'remove',
     profile: bsky.profile.AnyProfileView,
diff --git a/src/components/dialogs/nuxs/index.tsx b/src/components/dialogs/nuxs/index.tsx
index 2fa8780d95..bbd40feb52 100644
--- a/src/components/dialogs/nuxs/index.tsx
+++ b/src/components/dialogs/nuxs/index.tsx
@@ -6,7 +6,6 @@ import {
   useMemo,
   useState,
 } from 'react'
-import {type AppBskyActorDefs} from '@atproto/api'
 
 import {logger} from '#/logger'
 import {STALE} from '#/state/queries'
@@ -30,6 +29,7 @@ import {isSnoozed, snooze, unsnooze} from '#/components/dialogs/nuxs/snoozing'
 import {type EnabledCheckProps} from '#/components/dialogs/nuxs/utils'
 import {useAnalytics} from '#/analytics'
 import {useGeolocation} from '#/geolocation'
+import {type app} from '#/lexicons'
 
 type Context = {
   activeNux: Nux | undefined
@@ -93,7 +93,7 @@ function Inner({
   preferences,
 }: {
   currentAccount: SessionAccount
-  currentProfile: AppBskyActorDefs.ProfileViewDetailed
+  currentProfile: app.bsky.actor.defs.ProfileViewDetailed
   preferences: UsePreferencesQueryResponse
 }) {
   const ax = useAnalytics()
diff --git a/src/components/dialogs/nuxs/utils.ts b/src/components/dialogs/nuxs/utils.ts
index 315908cc85..812f28eb1c 100644
--- a/src/components/dialogs/nuxs/utils.ts
+++ b/src/components/dialogs/nuxs/utils.ts
@@ -1,14 +1,13 @@
-import {type AppBskyActorDefs} from '@atproto/api'
-
 import {type UsePreferencesQueryResponse} from '#/state/queries/preferences'
 import {type SessionAccount} from '#/state/session'
 import {type AnalyticsContextType} from '#/analytics'
 import {type Geolocation} from '#/geolocation'
+import {type app} from '#/lexicons'
 
 export type EnabledCheckProps = {
   features: AnalyticsContextType['features']
   currentAccount: SessionAccount
-  currentProfile: AppBskyActorDefs.ProfileViewDetailed
+  currentProfile: app.bsky.actor.defs.ProfileViewDetailed
   preferences: UsePreferencesQueryResponse
   geolocation: Geolocation
 }
diff --git a/src/components/dms/ActionsWrapper.tsx b/src/components/dms/ActionsWrapper.tsx
index b9782949b6..837214b74c 100644
--- a/src/components/dms/ActionsWrapper.tsx
+++ b/src/components/dms/ActionsWrapper.tsx
@@ -1,11 +1,11 @@
 import {View} from 'react-native'
-import {type ChatBskyConvoDefs} from '@atproto/api'
 import {type ModerationOpts} from '@bsky.app/sdk/moderation'
 import {useLingui} from '@lingui/react/macro'
 
 import {MessageContextMenu} from '#/components/dms/MessageContextMenu'
 import {useMessageReplies} from '#/components/dms/MessageReplies'
 import {SwipeToReply} from '#/components/dms/SwipeToReply'
+import {type chat} from '#/lexicons'
 import type * as bsky from '#/types/bsky'
 
 export function ActionsWrapper({
@@ -15,7 +15,7 @@ export function ActionsWrapper({
   moderationOpts,
   children,
 }: {
-  message: ChatBskyConvoDefs.MessageView
+  message: chat.bsky.convo.defs.MessageView
   isFromSelf: boolean
   senderProfile?: bsky.profile.AnyProfileView
   moderationOpts: ModerationOpts | undefined
diff --git a/src/components/dms/ActionsWrapper.web.tsx b/src/components/dms/ActionsWrapper.web.tsx
index 0ef5503370..469c339bf8 100644
--- a/src/components/dms/ActionsWrapper.web.tsx
+++ b/src/components/dms/ActionsWrapper.web.tsx
@@ -1,6 +1,5 @@
 import {useCallback, useRef, useState} from 'react'
 import {Pressable, View} from 'react-native'
-import {type ChatBskyConvoDefs} from '@atproto/api'
 import {type ModerationOpts} from '@bsky.app/sdk/moderation'
 import {plural} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react/macro'
@@ -14,6 +13,7 @@ import {MessageContextMenu} from '#/components/dms/MessageContextMenu'
 import {DotGrid3x1_Stroke2_Corner0_Rounded as DotsHorizontalIcon} from '#/components/icons/DotGrid'
 import {EmojiSmile_Stroke2_Corner0_Rounded as EmojiSmileIcon} from '#/components/icons/Emoji'
 import * as Toast from '#/components/Toast'
+import {type chat} from '#/lexicons'
 import type * as bsky from '#/types/bsky'
 import {EmojiReactionPicker} from './EmojiReactionPicker'
 import {
@@ -29,7 +29,7 @@ export function ActionsWrapper({
   moderationOpts,
   children,
 }: {
-  message: ChatBskyConvoDefs.MessageView
+  message: chat.bsky.convo.defs.MessageView
   isFromSelf: boolean
   senderProfile?: bsky.profile.AnyProfileView
   moderationOpts: ModerationOpts | undefined
diff --git a/src/components/dms/AfterReportConversationDialog.tsx b/src/components/dms/AfterReportConversationDialog.tsx
index 8e484156f4..98973ea533 100644
--- a/src/components/dms/AfterReportConversationDialog.tsx
+++ b/src/components/dms/AfterReportConversationDialog.tsx
@@ -1,6 +1,5 @@
 import {memo, useState} from 'react'
 import {View} from 'react-native'
-import {type AppBskyActorDefs} from '@atproto/api'
 import {Trans, useLingui} from '@lingui/react/macro'
 import {StackActions, useNavigation} from '@react-navigation/native'
 
@@ -19,6 +18,7 @@ import {Loader} from '#/components/Loader'
 import * as Toast from '#/components/Toast'
 import {Text} from '#/components/Typography'
 import {IS_NATIVE} from '#/env'
+import {type app} from '#/lexicons'
 
 type ReportDialogParams = {
   convoId: string
@@ -113,7 +113,7 @@ function DoneStep({
 }: {
   convoId: string
   currentScreen: 'list' | 'conversation'
-  profile: AppBskyActorDefs.ProfileViewDetailed
+  profile: app.bsky.actor.defs.ProfileViewDetailed
 }) {
   const {t: l} = useLingui()
   const navigation = useNavigation<NavigationProp>()
diff --git a/src/components/dms/AfterReportDialog.tsx b/src/components/dms/AfterReportDialog.tsx
index 060ea1fcfb..c60f1ac0b6 100644
--- a/src/components/dms/AfterReportDialog.tsx
+++ b/src/components/dms/AfterReportDialog.tsx
@@ -1,6 +1,5 @@
 import {memo, useState} from 'react'
 import {View} from 'react-native'
-import {type AppBskyActorDefs} from '@atproto/api'
 import {Trans, useLingui} from '@lingui/react/macro'
 import {StackActions, useNavigation} from '@react-navigation/native'
 
@@ -19,6 +18,7 @@ import {Loader} from '#/components/Loader'
 import * as Toast from '#/components/Toast'
 import {Text} from '#/components/Typography'
 import {IS_NATIVE} from '#/env'
+import {type app} from '#/lexicons'
 
 type ReportDialogParams = {
   convoId: string
@@ -116,7 +116,7 @@ function DoneStep({
 }: {
   convoId: string
   currentScreen: 'list' | 'conversation'
-  profile: AppBskyActorDefs.ProfileViewDetailed
+  profile: app.bsky.actor.defs.ProfileViewDetailed
 }) {
   const {t: l} = useLingui()
   const navigation = useNavigation<NavigationProp>()
diff --git a/src/components/dms/ChatInvite/Card.tsx b/src/components/dms/ChatInvite/Card.tsx
index 92e0e96814..177eb5d5ae 100644
--- a/src/components/dms/ChatInvite/Card.tsx
+++ b/src/components/dms/ChatInvite/Card.tsx
@@ -1,5 +1,4 @@
 import {View} from 'react-native'
-import {ChatBskyGroupDefs} from '@atproto/api'
 import {Plural, Trans} from '@lingui/react/macro'
 
 import {createSanitizedDisplayName} from '#/lib/moderation/create-sanitized-display-name'
@@ -10,6 +9,8 @@ import {AvatarBubbles} from '#/components/AvatarBubbles'
 import {InlineLinkText} from '#/components/Link'
 import {ProfileBadges} from '#/components/ProfileBadges'
 import {Text} from '#/components/Typography'
+import {chat} from '#/lexicons'
+import * as bsky from '#/types/bsky'
 import {useChatInvite} from './Context'
 
 /**
@@ -21,7 +22,8 @@ export function Card({size}: {size: 'large' | 'small'}) {
   const t = useTheme()
   const {preview, hasFixedHeight} = useChatInvite()
 
-  if (!ChatBskyGroupDefs.isJoinLinkPreviewView(preview)) return null
+  if (!bsky.isType(chat.bsky.group.defs.joinLinkPreviewView, preview))
+    return null
 
   const ownerDisplayName = createSanitizedDisplayName(preview.owner)
   const ownerHandle = sanitizeHandle(preview.owner.handle, '@')
diff --git a/src/components/dms/ChatInvite/Root.tsx b/src/components/dms/ChatInvite/Root.tsx
index 16f5bdfae4..83796e1e61 100644
--- a/src/components/dms/ChatInvite/Root.tsx
+++ b/src/components/dms/ChatInvite/Root.tsx
@@ -1,5 +1,4 @@
 import {setStringAsync} from 'expo-clipboard'
-import {ChatBskyGroupDefs} from '@atproto/api'
 import {useLingui} from '@lingui/react/macro'
 import {useNavigation} from '@react-navigation/native'
 
@@ -18,6 +17,8 @@ import {type Props as SVGIconProps} from '#/components/icons/common'
 import {RaisingHand4Finger_Stroke2_Corner2_Rounded as HandIcon} from '#/components/icons/RaisingHand'
 import {useIntentDialogs} from '#/components/intents/IntentDialogs'
 import * as Toast from '#/components/Toast'
+import {chat} from '#/lexicons'
+import * as bsky from '#/types/bsky'
 import {
   type ChatInviteAction,
   ChatInviteProvider,
@@ -71,7 +72,7 @@ export function Root({
     status = 'loading'
   } else if (error) {
     status = 'error'
-  } else if (ChatBskyGroupDefs.isJoinLinkPreviewView(preview)) {
+  } else if (bsky.isType(chat.bsky.group.defs.joinLinkPreviewView, preview)) {
     status = 'available'
   } else {
     // Resolved to a disabled/invalid/unrecognized preview - nothing to join.
@@ -79,7 +80,7 @@ export function Root({
   }
 
   let action: ChatInviteAction | undefined
-  if (ChatBskyGroupDefs.isJoinLinkPreviewView(preview)) {
+  if (bsky.isType(chat.bsky.group.defs.joinLinkPreviewView, preview)) {
     const convoId = preview.convo?.id
     const isFollowing = preview.owner.viewer?.followedBy ?? false
     const hasRequested = !convoId && preview.viewer?.requestedAt != null
diff --git a/src/components/dms/ChatProfileTabs.tsx b/src/components/dms/ChatProfileTabs.tsx
index 341d94392d..5a0e7a8fb3 100644
--- a/src/components/dms/ChatProfileTabs.tsx
+++ b/src/components/dms/ChatProfileTabs.tsx
@@ -1,10 +1,10 @@
 import {useCallback, useEffect} from 'react'
 import {type ScrollView, View} from 'react-native'
 import Animated, {useAnimatedRef, useSharedValue} from 'react-native-reanimated'
+import {moderateProfile} from '@bsky.app/sdk/moderation'
 import {useLingui} from '@lingui/react/macro'
 
 import {HITSLOP_10} from '#/lib/constants'
-import {moderateProfile} from '#/lib/moderation/subjects'
 import {sanitizeDisplayName} from '#/lib/strings/display-names'
 import {sanitizeHandle} from '#/lib/strings/handles'
 import {useModerationOpts} from '#/state/preferences/moderation-opts'
diff --git a/src/components/dms/EmojiReactionPicker.tsx b/src/components/dms/EmojiReactionPicker.tsx
index de2b818b96..b54881117e 100644
--- a/src/components/dms/EmojiReactionPicker.tsx
+++ b/src/components/dms/EmojiReactionPicker.tsx
@@ -1,6 +1,5 @@
 import {useMemo, useState} from 'react'
 import {useWindowDimensions, View} from 'react-native'
-import {type ChatBskyConvoDefs} from '@atproto/api'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 
@@ -14,6 +13,7 @@ import {
 import {PlusLarge_Stroke2_Corner0_Rounded as PlusIcon} from '#/components/icons/Plus'
 import {type TriggerProps} from '#/components/Menu/types'
 import {Text} from '#/components/Typography'
+import {type chat} from '#/lexicons'
 import {EmojiPopup} from './EmojiPopup'
 import {hasAlreadyReacted, hasReachedReactionLimit} from './util'
 
@@ -21,7 +21,7 @@ export function EmojiReactionPicker({
   message,
   onEmojiSelect,
 }: {
-  message: ChatBskyConvoDefs.MessageView
+  message: chat.bsky.convo.defs.MessageView
   children?: TriggerProps['children']
   onEmojiSelect: (emoji: string) => void
 }) {
diff --git a/src/components/dms/EmojiReactionPicker.web.tsx b/src/components/dms/EmojiReactionPicker.web.tsx
index 8740330575..c84151f367 100644
--- a/src/components/dms/EmojiReactionPicker.web.tsx
+++ b/src/components/dms/EmojiReactionPicker.web.tsx
@@ -1,6 +1,5 @@
 import {useState} from 'react'
 import {Pressable, View} from 'react-native'
-import {type ChatBskyConvoDefs} from '@atproto/api'
 import {useLingui} from '@lingui/react/macro'
 import {DropdownMenu} from 'radix-ui'
 
@@ -10,6 +9,7 @@ import * as EmojiPicker from '#/components/EmojiPicker'
 import {PlusLarge_Stroke2_Corner0_Rounded as PlusIcon} from '#/components/icons/Plus'
 import * as Menu from '#/components/Menu'
 import {Text} from '#/components/Typography'
+import {type chat} from '#/lexicons'
 import {hasAlreadyReacted, hasReachedReactionLimit} from './util'
 
 export function EmojiReactionPicker({
@@ -17,7 +17,7 @@ export function EmojiReactionPicker({
   children,
   onEmojiSelect,
 }: {
-  message: ChatBskyConvoDefs.MessageView
+  message: chat.bsky.convo.defs.MessageView
   children?: EmojiPicker.TriggerProps['children']
   onEmojiSelect: (emoji: string) => void
 }) {
@@ -40,7 +40,7 @@ function MenuInner({
   message,
   onEmojiSelect,
 }: {
-  message: ChatBskyConvoDefs.MessageView
+  message: chat.bsky.convo.defs.MessageView
   onEmojiSelect: (emoji: string) => void
 }) {
   const t = useTheme()
diff --git a/src/components/dms/InitiateChatFlow.tsx b/src/components/dms/InitiateChatFlow.tsx
index 3a93b966b0..271016a5d5 100644
--- a/src/components/dms/InitiateChatFlow.tsx
+++ b/src/components/dms/InitiateChatFlow.tsx
@@ -7,12 +7,11 @@ import {
   useState,
 } from 'react'
 import {LayoutAnimation, type TextInput, View} from 'react-native'
-import {type ModerationOpts} from '@bsky.app/sdk/moderation'
+import {moderateProfile, type ModerationOpts} from '@bsky.app/sdk/moderation'
 import {Plural, Trans, useLingui} from '@lingui/react/macro'
 
 import {MAX_GROUP_NAME_GRAPHEME_LENGTH} from '#/lib/constants'
 import {createSanitizedDisplayName} from '#/lib/moderation/create-sanitized-display-name'
-import {moderateProfile} from '#/lib/moderation/subjects'
 import {sanitizeDisplayName} from '#/lib/strings/display-names'
 import {sanitizeHandle} from '#/lib/strings/handles'
 import {isOverMaxGraphemeCount} from '#/lib/strings/helpers'
diff --git a/src/components/dms/MessageContextMenu.tsx b/src/components/dms/MessageContextMenu.tsx
index 0bfa156eed..1807f2888d 100644
--- a/src/components/dms/MessageContextMenu.tsx
+++ b/src/components/dms/MessageContextMenu.tsx
@@ -2,7 +2,6 @@ import {memo, useCallback} from 'react'
 import {Platform} from 'react-native'
 import {type GestureType} from 'react-native-gesture-handler'
 import * as Clipboard from 'expo-clipboard'
-import {type ChatBskyConvoDefs} from '@atproto/api'
 import {type ModerationOpts} from '@bsky.app/sdk/moderation'
 import {RichText} from '@bsky.app/sdk/richtext'
 import {plural} from '@lingui/core/macro'
@@ -10,7 +9,7 @@ import {useLingui} from '@lingui/react/macro'
 
 import {EMOJI_REACTION_LIMIT} from '#/lib/constants'
 import {useGoogleTranslate} from '#/lib/hooks/useGoogleTranslate'
-import {asSdkFacets, richTextToString} from '#/lib/strings/rich-text-helpers'
+import {richTextToString} from '#/lib/strings/rich-text-helpers'
 import {useMaybeProfileShadow} from '#/state/cache/profile-shadow'
 import {useConvoActive} from '#/state/messages/convo'
 import {useLanguagePrefs} from '#/state/preferences'
@@ -28,6 +27,7 @@ import {Trash_Stroke2_Corner0_Rounded as TrashIcon} from '#/components/icons/Tra
 import * as Toast from '#/components/Toast'
 import {useAnalytics} from '#/analytics'
 import {IS_NATIVE} from '#/env'
+import {type chat} from '#/lexicons'
 import type * as bsky from '#/types/bsky'
 import {EmojiReactionPicker} from './EmojiReactionPicker'
 import {canReact, hasReachedReactionLimit} from './util'
@@ -39,7 +39,7 @@ export let MessageContextMenu = ({
   children,
   swipeGesture,
 }: {
-  message: ChatBskyConvoDefs.MessageView
+  message: chat.bsky.convo.defs.MessageView
   senderProfile?: bsky.profile.AnyProfileView
   moderationOpts: ModerationOpts | undefined
   children: TriggerProps['children']
@@ -86,7 +86,7 @@ export let MessageContextMenu = ({
     const str = richTextToString(
       new RichText({
         text: message.text,
-        facets: asSdkFacets(message.facets),
+        facets: message.facets,
       }),
       true,
     )
diff --git a/src/components/dms/MessageItem.tsx b/src/components/dms/MessageItem.tsx
index a835230db2..2a3d895544 100644
--- a/src/components/dms/MessageItem.tsx
+++ b/src/components/dms/MessageItem.tsx
@@ -22,12 +22,7 @@ import Animated, {
   ZoomIn,
   ZoomOut,
 } from 'react-native-reanimated'
-import {
-  AppBskyEmbedRecord,
-  type ChatBskyActorDefs,
-  ChatBskyConvoDefs,
-  ChatBskyEmbedJoinLink,
-} from '@atproto/api'
+import {moderateProfile} from '@bsky.app/sdk/moderation'
 import {RichText as RichTextAPI} from '@bsky.app/sdk/richtext'
 import {plural} from '@lingui/core/macro'
 import {Trans, useLingui} from '@lingui/react/macro'
@@ -35,9 +30,7 @@ import {useQueryClient} from '@tanstack/react-query'
 
 import {isBlockedOrBlocking} from '#/lib/moderation/blocked-and-muted'
 import {createSanitizedDisplayName} from '#/lib/moderation/create-sanitized-display-name'
-import {moderateProfile} from '#/lib/moderation/subjects'
 import {sanitizeHandle} from '#/lib/strings/handles'
-import {asSdkFacets} from '#/lib/strings/rich-text-helpers'
 import {useMaybeProfileShadow} from '#/state/cache/profile-shadow'
 import {type Shadow} from '#/state/cache/types'
 import {type ConvoItem} from '#/state/messages/convo/types'
@@ -59,6 +52,8 @@ import * as ProfileCard from '#/components/ProfileCard'
 import * as Prompt from '#/components/Prompt'
 import {RichText} from '#/components/RichText'
 import {Text} from '#/components/Typography'
+import {app, chat} from '#/lexicons'
+import * as bsky from '#/types/bsky'
 import {DateDivider} from './DateDivider'
 import {MessageItemEmbed} from './MessageItemEmbed'
 import {MessageItemInviteEmbed} from './MessageItemInviteEmbed'
@@ -77,16 +72,19 @@ const SQUARED_BORDER_RADIUS = 4
 const DISPLAY_NAME_INSET = 20
 
 export type MessageItemNeighbor =
-  | ChatBskyConvoDefs.MessageView
-  | ChatBskyConvoDefs.DeletedMessageView
+  | chat.bsky.convo.defs.MessageView
+  | chat.bsky.convo.defs.DeletedMessageView
   | null
 
 function messageIsReply(message: MessageItemNeighbor): boolean {
   return (
-    ChatBskyConvoDefs.isMessageView(message) &&
-    (ChatBskyConvoDefs.isMessageView(message.replyTo) ||
-      ChatBskyConvoDefs.isDeletedMessageView(message.replyTo) ||
-      ChatBskyConvoDefs.isMessageBeforeUserJoinedGroupView(message.replyTo))
+    bsky.isType(chat.bsky.convo.defs.messageView, message) &&
+    (bsky.isType(chat.bsky.convo.defs.messageView, message.replyTo) ||
+      bsky.isType(chat.bsky.convo.defs.deletedMessageView, message.replyTo) ||
+      bsky.isType(
+        chat.bsky.convo.defs.messageBeforeUserJoinedGroupView,
+        message.replyTo,
+      ))
   )
 }
 
@@ -98,7 +96,7 @@ function isWithinClusterBoundary({
   direction,
 }: {
   isPending: boolean
-  message: ChatBskyConvoDefs.MessageView
+  message: chat.bsky.convo.defs.MessageView
   adjacentMessage: MessageItemNeighbor
   isFromSameSender: boolean
   direction: 'prev' | 'next'
@@ -110,7 +108,7 @@ function isWithinClusterBoundary({
     return true
   }
   if (!isFromSameSender) return true
-  if (ChatBskyConvoDefs.isMessageView(adjacentMessage)) {
+  if (bsky.isType(chat.bsky.convo.defs.messageView, adjacentMessage)) {
     const currentSentAt = message.sentAt
     const thisDate = new Date(currentSentAt)
     const adjDate = new Date(adjacentMessage.sentAt)
@@ -137,7 +135,7 @@ let MessageItem = ({
   isGroupChat?: boolean
   prevMessage: MessageItemNeighbor
   nextMessage: MessageItemNeighbor
-  relatedProfiles: Map<string, ChatBskyActorDefs.ProfileViewBasic>
+  relatedProfiles: Map<string, chat.bsky.actor.defs.ProfileViewBasic>
 }): React.ReactNode => {
   const t = useTheme()
   const {currentAccount} = useSession()
@@ -155,13 +153,17 @@ let MessageItem = ({
   // tombstone, or a before-joined placeholder. Narrow away the open-union
   // fallback so we only render shapes we understand.
   const replyTo =
-    ChatBskyConvoDefs.isMessageView(message.replyTo) ||
-    ChatBskyConvoDefs.isDeletedMessageView(message.replyTo) ||
-    ChatBskyConvoDefs.isMessageBeforeUserJoinedGroupView(message.replyTo)
+    bsky.isType(chat.bsky.convo.defs.messageView, message.replyTo) ||
+    bsky.isType(chat.bsky.convo.defs.deletedMessageView, message.replyTo) ||
+    bsky.isType(
+      chat.bsky.convo.defs.messageBeforeUserJoinedGroupView,
+      message.replyTo,
+    )
       ? message.replyTo
       : undefined
   const replyToMessageId =
-    replyTo && !ChatBskyConvoDefs.isMessageBeforeUserJoinedGroupView(replyTo)
+    replyTo &&
+    !bsky.isType(chat.bsky.convo.defs.messageBeforeUserJoinedGroupView, replyTo)
       ? replyTo.id
       : undefined
   const onPressReplyTo = replyToMessageId
@@ -175,8 +177,14 @@ let MessageItem = ({
   const isFromSelf =
     message.sender?.did != null && message.sender.did === currentAccount?.did
 
-  const prevIsMessage = ChatBskyConvoDefs.isMessageView(prevMessage)
-  const nextIsMessage = ChatBskyConvoDefs.isMessageView(nextMessage)
+  const prevIsMessage = bsky.isType(
+    chat.bsky.convo.defs.messageView,
+    prevMessage,
+  )
+  const nextIsMessage = bsky.isType(
+    chat.bsky.convo.defs.messageView,
+    nextMessage,
+  )
 
   const isPrevFromSameSender =
     prevIsMessage &&
@@ -204,7 +212,7 @@ let MessageItem = ({
   })
 
   const hasLargeGapFromPrev =
-    !ChatBskyConvoDefs.isMessageView(prevMessage) ||
+    !bsky.isType(chat.bsky.convo.defs.messageView, prevMessage) ||
     new Date(message.sentAt).getTime() -
       new Date(prevMessage.sentAt).getTime() >
       MESSAGE_GAP_THRESHOLD_MS
@@ -248,14 +256,14 @@ let MessageItem = ({
 
   const rt = new RichTextAPI({
     text: message.text,
-    facets: asSdkFacets(message.facets),
+    facets: message.facets,
   })
 
   const isEmojiOnly = isOnlyEmoji(message.text)
 
   const hasEmbed =
-    AppBskyEmbedRecord.isView(message.embed) ||
-    ChatBskyEmbedJoinLink.isView(message.embed)
+    bsky.isType(app.bsky.embed.record.view, message.embed) ||
+    bsky.isType(chat.bsky.embed.joinLink.view, message.embed)
   const hasEmbedAndText = hasEmbed && rt.text.length > 0
 
   const targetBottomRadius = squaredBottomCorner
@@ -516,7 +524,7 @@ let MessageItem = ({
                   message={message}
                   senderProfile={profile}
                   moderationOpts={moderationOpts}>
-                  {AppBskyEmbedRecord.isView(message.embed) && (
+                  {bsky.isType(app.bsky.embed.record.view, message.embed) && (
                     <MessageItemEmbed
                       embed={message.embed}
                       isFromSelf={isFromSelf}
@@ -528,7 +536,10 @@ let MessageItem = ({
                       highlightSV={highlightSV}
                     />
                   )}
-                  {ChatBskyEmbedJoinLink.isView(message.embed) && (
+                  {bsky.isType(
+                    chat.bsky.embed.joinLink.view,
+                    message.embed,
+                  ) && (
                     <MessageItemInviteEmbed
                       embed={message.embed}
                       isFromSelf={isFromSelf}
@@ -666,7 +677,7 @@ function BlockedPlaceholder({
   profile,
   style,
 }: {
-  profile: Shadow<ChatBskyActorDefs.ProfileViewBasic>
+  profile: Shadow<chat.bsky.actor.defs.ProfileViewBasic>
   style?: AnimatedStyle<ViewStyle>
 }) {
   const {t: l} = useLingui()
@@ -776,13 +787,13 @@ function ReplyCaption({
   onPress,
 }: {
   replyTo:
-    | ChatBskyConvoDefs.MessageView
-    | ChatBskyConvoDefs.DeletedMessageView
-    | ChatBskyConvoDefs.MessageBeforeUserJoinedGroupView
+    | chat.bsky.convo.defs.MessageView
+    | chat.bsky.convo.defs.DeletedMessageView
+    | chat.bsky.convo.defs.MessageBeforeUserJoinedGroupView
   isFromSelf: boolean
   isGroupChat: boolean
   replierDisplayName: string | null
-  relatedProfiles: Map<string, ChatBskyActorDefs.ProfileViewBasic>
+  relatedProfiles: Map<string, chat.bsky.actor.defs.ProfileViewBasic>
   onPress?: () => void
 }) {
   const t = useTheme()
@@ -791,8 +802,8 @@ function ReplyCaption({
 
   let caption: string = ''
   if (
-    ChatBskyConvoDefs.isMessageView(replyTo) ||
-    ChatBskyConvoDefs.isDeletedMessageView(replyTo)
+    bsky.isType(chat.bsky.convo.defs.messageView, replyTo) ||
+    bsky.isType(chat.bsky.convo.defs.deletedMessageView, replyTo)
   ) {
     const originalSenderIsSelf = replyTo.sender.did === currentAccount?.did
     const originalProfile = relatedProfiles.get(replyTo.sender.did)
@@ -865,11 +876,11 @@ function ReplyQuote({
   onPress,
 }: {
   replyTo:
-    | ChatBskyConvoDefs.MessageView
-    | ChatBskyConvoDefs.DeletedMessageView
-    | ChatBskyConvoDefs.MessageBeforeUserJoinedGroupView
+    | chat.bsky.convo.defs.MessageView
+    | chat.bsky.convo.defs.DeletedMessageView
+    | chat.bsky.convo.defs.MessageBeforeUserJoinedGroupView
   isFromSelf: boolean
-  relatedProfiles: Map<string, ChatBskyActorDefs.ProfileViewBasic>
+  relatedProfiles: Map<string, chat.bsky.actor.defs.ProfileViewBasic>
   onPress?: () => void
 }) {
   const t = useTheme()
@@ -877,8 +888,8 @@ function ReplyQuote({
   const getReplyPreviewText = useReplyPreviewText()
 
   const senderDid =
-    ChatBskyConvoDefs.isMessageView(replyTo) ||
-    ChatBskyConvoDefs.isDeletedMessageView(replyTo)
+    bsky.isType(chat.bsky.convo.defs.messageView, replyTo) ||
+    bsky.isType(chat.bsky.convo.defs.deletedMessageView, replyTo)
       ? replyTo.sender.did
       : undefined
   const senderProfile = useMaybeProfileShadow(
@@ -908,9 +919,11 @@ function ReplyQuote({
       comment: 'A reply summary in chat',
     })
     subtle = true
-  } else if (ChatBskyConvoDefs.isMessageView(replyTo)) {
+  } else if (bsky.isType(chat.bsky.convo.defs.messageView, replyTo)) {
     ;({text, subtle} = getReplyPreviewText(replyTo))
-  } else if (ChatBskyConvoDefs.isMessageBeforeUserJoinedGroupView(replyTo)) {
+  } else if (
+    bsky.isType(chat.bsky.convo.defs.messageBeforeUserJoinedGroupView, replyTo)
+  ) {
     text = l({
       message: `(message sent before you joined)`,
       comment: 'A reply summary in chat',
diff --git a/src/components/dms/MessageItemEmbed.tsx b/src/components/dms/MessageItemEmbed.tsx
index 5014a9ff11..22c3f7462d 100644
--- a/src/components/dms/MessageItemEmbed.tsx
+++ b/src/components/dms/MessageItemEmbed.tsx
@@ -5,10 +5,11 @@ import Animated, {
   type SharedValue,
   useAnimatedStyle,
 } from 'react-native-reanimated'
-import {type $Typed, type AppBskyEmbedRecord} from '@atproto/api'
+import {type $Typed} from '@atproto/lex'
 
 import {atoms as a, native, useTheme, web} from '#/alf'
 import {Embed, PostEmbedViewContext} from '#/components/Post/Embed'
+import {type app} from '#/lexicons'
 import {MessageContextProvider} from './MessageContext'
 
 const BORDER_RADIUS = 20
@@ -22,7 +23,7 @@ let MessageItemEmbed = ({
   squaredBottomCorner,
   highlightSV,
 }: {
-  embed: $Typed<AppBskyEmbedRecord.View>
+  embed: $Typed<app.bsky.embed.record.View>
   isFromSelf: boolean
   isGroupChat: boolean
   squaredTopCorner: boolean
diff --git a/src/components/dms/MessageItemInviteEmbed.tsx b/src/components/dms/MessageItemInviteEmbed.tsx
index 5d6acd93d1..ba6a2b0630 100644
--- a/src/components/dms/MessageItemInviteEmbed.tsx
+++ b/src/components/dms/MessageItemInviteEmbed.tsx
@@ -5,12 +5,13 @@ import Animated, {
   type SharedValue,
   useAnimatedStyle,
 } from 'react-native-reanimated'
-import {type $Typed, type ChatBskyEmbedJoinLink} from '@atproto/api'
+import {type $Typed} from '@atproto/lex'
 
 import {useConvoActive} from '#/state/messages/convo'
 import {isKnownJoinLinkPreview} from '#/state/queries/join-links'
 import {atoms as a, native, useTheme, web} from '#/alf'
 import * as ChatInvite from '#/components/dms/ChatInvite'
+import {type chat} from '#/lexicons'
 import {MessageContextProvider} from './MessageContext'
 
 const BORDER_RADIUS = 20
@@ -24,7 +25,7 @@ let MessageItemInviteEmbed = ({
   squaredBottomCorner,
   highlightSV,
 }: {
-  embed: $Typed<ChatBskyEmbedJoinLink.View>
+  embed: $Typed<chat.bsky.embed.joinLink.View>
   isFromSelf: boolean
   isGroupChat: boolean
   squaredTopCorner: boolean
diff --git a/src/components/dms/MessageOverlays.tsx b/src/components/dms/MessageOverlays.tsx
index 2384aad88d..ddb6fa9acf 100644
--- a/src/components/dms/MessageOverlays.tsx
+++ b/src/components/dms/MessageOverlays.tsx
@@ -7,7 +7,6 @@ import {
   useState,
 } from 'react'
 import {LayoutAnimation} from 'react-native'
-import {type ChatBskyConvoDefs} from '@atproto/api'
 import {useLingui} from '@lingui/react/macro'
 import {useQueryClient} from '@tanstack/react-query'
 
@@ -20,15 +19,16 @@ import {ReportDialog} from '#/components/moderation/ReportDialog'
 import * as Prompt from '#/components/Prompt'
 import {usePromptControl} from '#/components/Prompt'
 import * as Toast from '#/components/Toast'
+import {type chat} from '#/lexicons'
 import type * as bsky from '#/types/bsky'
 
 type MessageDialogsContextType = {
-  openDeleteMessage: (message: ChatBskyConvoDefs.MessageView) => void
+  openDeleteMessage: (message: chat.bsky.convo.defs.MessageView) => void
   openReportMessage: (
-    message: ChatBskyConvoDefs.MessageView,
+    message: chat.bsky.convo.defs.MessageView,
     senderProfile: bsky.profile.AnyProfileView | undefined,
   ) => void
-  openReactions: (message: ChatBskyConvoDefs.MessageView) => void
+  openReactions: (message: chat.bsky.convo.defs.MessageView) => void
 }
 
 const Context = createContext<MessageDialogsContextType | null>(null)
@@ -52,18 +52,18 @@ export function MessageOverlays({children}: {children: React.ReactNode}) {
   const reactionsControl = useDialogControl()
 
   const [deleteTarget, setDeleteTarget] =
-    useState<ChatBskyConvoDefs.MessageView | null>(null)
+    useState<chat.bsky.convo.defs.MessageView | null>(null)
   const [reportTarget, setReportTarget] = useState<{
-    message: ChatBskyConvoDefs.MessageView
+    message: chat.bsky.convo.defs.MessageView
     senderProfile: bsky.profile.AnyProfileView | undefined
   } | null>(null)
   const [afterReportTarget, setAfterReportTarget] =
-    useState<ChatBskyConvoDefs.MessageView | null>(null)
+    useState<chat.bsky.convo.defs.MessageView | null>(null)
   const [reactionsTarget, setReactionsTarget] =
-    useState<ChatBskyConvoDefs.MessageView | null>(null)
+    useState<chat.bsky.convo.defs.MessageView | null>(null)
 
   const openDeleteMessage = useCallback(
-    (message: ChatBskyConvoDefs.MessageView) => {
+    (message: chat.bsky.convo.defs.MessageView) => {
       setDeleteTarget(message)
       deleteControl.open()
     },
@@ -72,7 +72,7 @@ export function MessageOverlays({children}: {children: React.ReactNode}) {
 
   const openReportMessage = useCallback(
     (
-      message: ChatBskyConvoDefs.MessageView,
+      message: chat.bsky.convo.defs.MessageView,
       senderProfile: bsky.profile.AnyProfileView | undefined,
     ) => {
       setReportTarget({message, senderProfile})
@@ -82,7 +82,7 @@ export function MessageOverlays({children}: {children: React.ReactNode}) {
   )
 
   const openReactions = useCallback(
-    (message: ChatBskyConvoDefs.MessageView) => {
+    (message: chat.bsky.convo.defs.MessageView) => {
       setReactionsTarget(message)
     },
     [],
diff --git a/src/components/dms/MessageProfileButton.tsx b/src/components/dms/MessageProfileButton.tsx
index ede352218b..189f0da632 100644
--- a/src/components/dms/MessageProfileButton.tsx
+++ b/src/components/dms/MessageProfileButton.tsx
@@ -1,6 +1,5 @@
 import {useCallback} from 'react'
 import {View} from 'react-native'
-import {type AppBskyActorDefs} from '@atproto/api'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
@@ -16,11 +15,12 @@ import {canBeMessaged} from '#/components/dms/util'
 import {Message_Stroke2_Corner0_Rounded as Message} from '#/components/icons/Message'
 import * as Toast from '#/components/Toast'
 import {useAnalytics} from '#/analytics'
+import {type app} from '#/lexicons'
 
 export function MessageProfileButton({
   profile,
 }: {
-  profile: AppBskyActorDefs.ProfileViewDetailed
+  profile: app.bsky.actor.defs.ProfileViewDetailed
 }) {
   const {_} = useLingui()
   const t = useTheme()
diff --git a/src/components/dms/MessageReplies.tsx b/src/components/dms/MessageReplies.tsx
index 5093d8d157..e5bde7e078 100644
--- a/src/components/dms/MessageReplies.tsx
+++ b/src/components/dms/MessageReplies.tsx
@@ -7,7 +7,8 @@ import {
   useRef,
   useState,
 } from 'react'
-import {type ChatBskyConvoDefs} from '@atproto/api'
+
+import {type chat} from '#/lexicons'
 
 /**
  * How long a message stays highlighted after scrolling to it, before the flash
@@ -28,8 +29,8 @@ type MessageRepliesContextType = {
   /**
    * The message currently staged for reply in the composer, or null.
    */
-  replyTo: ChatBskyConvoDefs.MessageView | null
-  setReply: (message: ChatBskyConvoDefs.MessageView) => void
+  replyTo: chat.bsky.convo.defs.MessageView | null
+  setReply: (message: chat.bsky.convo.defs.MessageView) => void
   clearReply: () => void
   /**
    * Scroll the list to a message, if it's currently loaded, and flash it. No-op
@@ -66,9 +67,8 @@ export function MessageRepliesProvider({
    */
   scrollToMessage: (messageId: string) => boolean
 }) {
-  const [replyTo, setReplyTo] = useState<ChatBskyConvoDefs.MessageView | null>(
-    null,
-  )
+  const [replyTo, setReplyTo] =
+    useState<chat.bsky.convo.defs.MessageView | null>(null)
   const [highlightedMessage, setHighlightedMessage] =
     useState<HighlightedMessage | null>(null)
   const highlightKey = useRef(0)
@@ -76,7 +76,7 @@ export function MessageRepliesProvider({
     null,
   )
 
-  const setReply = useCallback((message: ChatBskyConvoDefs.MessageView) => {
+  const setReply = useCallback((message: chat.bsky.convo.defs.MessageView) => {
     setReplyTo(message)
   }, [])
 
diff --git a/src/components/dms/MessagesListHeader.tsx b/src/components/dms/MessagesListHeader.tsx
index 75a534b790..adf8e3b1f5 100644
--- a/src/components/dms/MessagesListHeader.tsx
+++ b/src/components/dms/MessagesListHeader.tsx
@@ -1,10 +1,9 @@
 import {useMemo} from 'react'
 import {View} from 'react-native'
-import {type ModerationOpts} from '@bsky.app/sdk/moderation'
+import {moderateProfile, type ModerationOpts} from '@bsky.app/sdk/moderation'
 import {useLingui} from '@lingui/react/macro'
 
 import {createSanitizedDisplayName} from '#/lib/moderation/create-sanitized-display-name'
-import {moderateProfile} from '#/lib/moderation/subjects'
 import {makeProfileLink} from '#/lib/routes/links'
 import {sanitizeHandle} from '#/lib/strings/handles'
 import {useProfileShadow} from '#/state/cache/profile-shadow'
diff --git a/src/components/dms/ReactionsDialog.tsx b/src/components/dms/ReactionsDialog.tsx
index 3918143d37..5a9f83c6e9 100644
--- a/src/components/dms/ReactionsDialog.tsx
+++ b/src/components/dms/ReactionsDialog.tsx
@@ -6,7 +6,6 @@ import {
   useWindowDimensions,
   View,
 } from 'react-native'
-import {type ChatBskyActorDefs, type ChatBskyConvoDefs} from '@atproto/api'
 import {Trans, useLingui} from '@lingui/react/macro'
 
 import {HITSLOP_10} from '#/lib/constants'
@@ -23,12 +22,13 @@ import {filterBlockedReactions} from '#/components/dms/util'
 import * as Toast from '#/components/Toast'
 import {Text} from '#/components/Typography'
 import {IS_NATIVE, IS_WEB} from '#/env'
+import {type chat} from '#/lexicons'
 import type * as bsky from '#/types/bsky'
 
 type Reaction = {
   key: string
   value: string
-  senders: ChatBskyConvoDefs.ReactionViewSender[]
+  senders: chat.bsky.convo.defs.ReactionViewSender[]
   count: number
 }
 
@@ -41,8 +41,8 @@ export function ReactionsDialog({
   onClose,
 }: {
   control: Dialog.DialogControlProps
-  relatedProfiles: Map<string, ChatBskyActorDefs.ProfileViewBasic>
-  message: ChatBskyConvoDefs.MessageView
+  relatedProfiles: Map<string, chat.bsky.actor.defs.ProfileViewBasic>
+  message: chat.bsky.convo.defs.MessageView
   onClose?: () => void
 }) {
   const {t: l} = useLingui()
@@ -142,10 +142,10 @@ function ReactionRow({
   control: Dialog.DialogControlProps
   convo: ActiveConvoStates
   currentAccount?: SessionAccount
-  message: ChatBskyConvoDefs.MessageView
+  message: chat.bsky.convo.defs.MessageView
   profile: bsky.profile.AnyProfileView
-  reaction: ChatBskyConvoDefs.ReactionView
-  allReactions: ChatBskyConvoDefs.ReactionView[]
+  reaction: chat.bsky.convo.defs.ReactionView
+  allReactions: chat.bsky.convo.defs.ReactionView[]
   selected: string
   setSelected: React.Dispatch<React.SetStateAction<string>>
 }) {
@@ -398,7 +398,7 @@ function ReactionTab({
 }
 
 export function groupReactions(
-  reactions: ChatBskyConvoDefs.ReactionView[] | undefined,
+  reactions: chat.bsky.convo.defs.ReactionView[] | undefined,
 ): Reaction[] {
   const grouped = new Map<string, Reaction>()
   for (const reaction of reactions ?? []) {
diff --git a/src/components/dms/SystemMessageGroup.tsx b/src/components/dms/SystemMessageGroup.tsx
index 930242ca46..5305572c57 100644
--- a/src/components/dms/SystemMessageGroup.tsx
+++ b/src/components/dms/SystemMessageGroup.tsx
@@ -7,7 +7,6 @@ import Animated, {
   useDerivedValue,
   withTiming,
 } from 'react-native-reanimated'
-import {type ChatBskyActorDefs} from '@atproto/api'
 import {plural} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react/macro'
 
@@ -17,6 +16,7 @@ import {atoms as a, useTheme} from '#/alf'
 import {SystemMessageItem} from '#/components/dms/SystemMessageItem'
 import {ChevronBottom_Stroke2_Corner0_Rounded as ChevronDown} from '#/components/icons/Chevron'
 import {Text} from '#/components/Typography'
+import {type chat} from '#/lexicons'
 
 const ANIMATION_DURATION_MS = 200
 
@@ -29,7 +29,7 @@ export function SystemMessageGroup({
   item: SystemMessageGroupItem
   expanded: boolean
   onToggle: (key: string) => void
-  relatedProfiles: Map<string, ChatBskyActorDefs.ProfileViewBasic>
+  relatedProfiles: Map<string, chat.bsky.actor.defs.ProfileViewBasic>
 }) {
   const t = useTheme()
   const {t: l} = useLingui()
diff --git a/src/components/dms/SystemMessageItem.tsx b/src/components/dms/SystemMessageItem.tsx
index 7de6a0cd91..716c26f474 100644
--- a/src/components/dms/SystemMessageItem.tsx
+++ b/src/components/dms/SystemMessageItem.tsx
@@ -1,5 +1,4 @@
 import {View} from 'react-native'
-import {type ChatBskyActorDefs} from '@atproto/api'
 import {useLingui} from '@lingui/react/macro'
 
 import {makeProfileLink} from '#/lib/routes/links'
@@ -10,13 +9,14 @@ import {Button} from '#/components/Button'
 import {getSystemMessageInfo} from '#/components/dms/getSystemMessageInfo'
 import {Link} from '#/components/Link'
 import {Text} from '#/components/Typography'
+import {type chat} from '#/lexicons'
 
 export function SystemMessageItem({
   item,
   relatedProfiles,
 }: {
   item: ConvoItem & {type: 'system-message'}
-  relatedProfiles: Map<string, ChatBskyActorDefs.ProfileViewBasic>
+  relatedProfiles: Map<string, chat.bsky.actor.defs.ProfileViewBasic>
 }) {
   const t = useTheme()
   const {i18n, t: l} = useLingui()
diff --git a/src/components/dms/components/GroupChatProfileCard.tsx b/src/components/dms/components/GroupChatProfileCard.tsx
index 63fbbbd20c..90d15c4b5f 100644
--- a/src/components/dms/components/GroupChatProfileCard.tsx
+++ b/src/components/dms/components/GroupChatProfileCard.tsx
@@ -1,8 +1,7 @@
 import {View} from 'react-native'
-import {type ModerationOpts} from '@bsky.app/sdk/moderation'
+import {moderateProfile, type ModerationOpts} from '@bsky.app/sdk/moderation'
 import {Trans} from '@lingui/react/macro'
 
-import {moderateProfile} from '#/lib/moderation/subjects'
 import {sanitizeDisplayName} from '#/lib/strings/display-names'
 import {sanitizeHandle} from '#/lib/strings/handles'
 import {atoms as a, useTheme} from '#/alf'
diff --git a/src/components/dms/getMessageInfo.ts b/src/components/dms/getMessageInfo.ts
index 5aaa3a8d7d..afe41c625e 100644
--- a/src/components/dms/getMessageInfo.ts
+++ b/src/components/dms/getMessageInfo.ts
@@ -1,9 +1,3 @@
-import {
-  AppBskyEmbedRecord,
-  type ChatBskyActorDefs,
-  ChatBskyConvoDefs,
-  ChatBskyEmbedJoinLink,
-} from '@atproto/api'
 import {type I18n} from '@lingui/core'
 import {msg} from '@lingui/core/macro'
 
@@ -14,12 +8,13 @@ import {
   toBskyAppUrl,
   toShortUrl,
 } from '#/lib/strings/url-helpers'
-import type * as bsky from '#/types/bsky'
+import {app, chat} from '#/lexicons'
+import * as bsky from '#/types/bsky'
 
 export type UserMessageInfo = {
   message: string | null
   sentAt: string
-  reportableMessage?: ChatBskyConvoDefs.MessageView
+  reportableMessage?: chat.bsky.convo.defs.MessageView
   isBlockedMessage: boolean
 }
 
@@ -36,7 +31,7 @@ export function isDidBlockedInConvo({
   primaryProfile,
 }: {
   did: string | undefined
-  members: ChatBskyActorDefs.ProfileViewBasic[]
+  members: chat.bsky.actor.defs.ProfileViewBasic[]
   primaryProfile?: bsky.profile.AnyProfileView
 }): boolean {
   if (!did) return false
@@ -53,12 +48,12 @@ export function getMessageInfo({
   primaryProfile,
   i18n,
 }: {
-  convo: ChatBskyConvoDefs.ConvoView
+  convo: chat.bsky.convo.defs.ConvoView
   currentAccountDid: string | undefined
   primaryProfile?: bsky.profile.AnyProfileView
   i18n: I18n
 }): UserMessageInfo | null {
-  if (!ChatBskyConvoDefs.isMessageView(convo.lastMessage)) {
+  if (!bsky.isType(chat.bsky.convo.defs.messageView, convo.lastMessage)) {
     return null
   }
 
@@ -67,7 +62,7 @@ export function getMessageInfo({
   const senderDid = lastMessage.sender?.did
   const sender = convo.members.find(m => m.did === senderDid)
   const name = sender ? createSanitizedDisplayName(sender) : null
-  const isGroup = ChatBskyConvoDefs.isGroupConvo(convo.kind)
+  const isGroup = bsky.isType(chat.bsky.convo.defs.groupConvo, convo.kind)
 
   const reportableMessage = isFromMe ? undefined : lastMessage
   const isBlockedMessage = isDidBlockedInConvo({
@@ -105,10 +100,10 @@ export function getMessageInfo({
       msg`(contains embedded content)`,
     )
 
-    if (AppBskyEmbedRecord.isView(lastMessage.embed)) {
+    if (bsky.isType(app.bsky.embed.record.view, lastMessage.embed)) {
       const embed = lastMessage.embed
 
-      if (AppBskyEmbedRecord.isViewRecord(embed.record)) {
+      if (bsky.isType(app.bsky.embed.record.viewRecord, embed.record)) {
         const record = embed.record
         const path = postUriToRelativePath(record.uri, {
           handle: record.author.handle,
@@ -119,7 +114,7 @@ export function getMessageInfo({
       } else {
         message = prefix(defaultEmbeddedContentMessage)
       }
-    } else if (ChatBskyEmbedJoinLink.isView(lastMessage.embed)) {
+    } else if (bsky.isType(chat.bsky.embed.joinLink.view, lastMessage.embed)) {
       message = prefix(i18n._(msg`(chat invite link)`))
     } else {
       message = prefix(defaultEmbeddedContentMessage)
diff --git a/src/components/dms/getReactionInfo.ts b/src/components/dms/getReactionInfo.ts
index 307eebdea7..477c44fbc3 100644
--- a/src/components/dms/getReactionInfo.ts
+++ b/src/components/dms/getReactionInfo.ts
@@ -1,10 +1,10 @@
-import {ChatBskyConvoDefs} from '@atproto/api'
 import {type I18n} from '@lingui/core'
 import {msg} from '@lingui/core/macro'
 
 import {createSanitizedDisplayName} from '#/lib/moderation/create-sanitized-display-name'
 import {isDidBlockedInConvo} from '#/components/dms/getMessageInfo'
-import type * as bsky from '#/types/bsky'
+import {chat} from '#/lexicons'
+import * as bsky from '#/types/bsky'
 
 export type UserReactionInfo = {
   message: string
@@ -18,12 +18,17 @@ export function getReactionInfo({
   primaryProfile,
   i18n,
 }: {
-  convo: ChatBskyConvoDefs.ConvoView
+  convo: chat.bsky.convo.defs.ConvoView
   currentAccountDid: string | undefined
   primaryProfile?: bsky.profile.AnyProfileView
   i18n: I18n
 }): UserReactionInfo | null {
-  if (!ChatBskyConvoDefs.isMessageAndReactionView(convo.lastReaction)) {
+  if (
+    !bsky.isType(
+      chat.bsky.convo.defs.messageAndReactionView,
+      convo.lastReaction,
+    )
+  ) {
     return null
   }
 
diff --git a/src/components/dms/getSystemMessageInfo.ts b/src/components/dms/getSystemMessageInfo.ts
index 756f178566..2262a3eb22 100644
--- a/src/components/dms/getSystemMessageInfo.ts
+++ b/src/components/dms/getSystemMessageInfo.ts
@@ -1,4 +1,3 @@
-import {type ChatBskyActorDefs, ChatBskyConvoDefs} from '@atproto/api'
 import {type MessageDescriptor} from '@lingui/core'
 import {msg} from '@lingui/core/macro'
 
@@ -15,11 +14,13 @@ import {
   Unlock_Stroke2_Corner2_Rounded as UnlockIcon,
 } from '#/components/icons/Lock'
 import {PencilLine_Stroke2_Corner0_Rounded as PencilIcon} from '#/components/icons/Pencil'
+import {chat} from '#/lexicons'
+import * as bsky from '#/types/bsky'
 
 export type SystemMessageAction =
   | {
       kind: 'profile'
-      profile: ChatBskyActorDefs.ProfileViewBasic
+      profile: chat.bsky.actor.defs.ProfileViewBasic
       displayName: string
     }
   | {kind: 'inviteLink'}
@@ -31,8 +32,8 @@ export type SystemMessageInfo = {
 }
 
 function getProfileAction(
-  user: ChatBskyConvoDefs.SystemMessageReferredUser,
-  relatedProfiles: Map<string, ChatBskyActorDefs.ProfileViewBasic>,
+  user: chat.bsky.convo.defs.SystemMessageReferredUser,
+  relatedProfiles: Map<string, chat.bsky.actor.defs.ProfileViewBasic>,
 ): Extract<SystemMessageAction, {kind: 'profile'}> | null {
   const profile = relatedProfiles.get(user.did)
   if (!profile) return null
@@ -44,11 +45,11 @@ function getProfileAction(
 }
 
 export function getSystemMessageInfo(
-  data: ChatBskyConvoDefs.SystemMessageView['data'],
-  relatedProfiles: Map<string, ChatBskyActorDefs.ProfileViewBasic>,
+  data: chat.bsky.convo.defs.SystemMessageView['data'],
+  relatedProfiles: Map<string, chat.bsky.actor.defs.ProfileViewBasic>,
   opts = {short: false},
 ): SystemMessageInfo | null {
-  if (ChatBskyConvoDefs.isSystemMessageDataAddMember(data)) {
+  if (bsky.isType(chat.bsky.convo.defs.systemMessageDataAddMember, data)) {
     const action = getProfileAction(data.member, relatedProfiles)
     return {
       Icon: JoinIcon,
@@ -61,7 +62,9 @@ export function getSystemMessageInfo(
           : msg`Someone was added to the group`,
       action: action ?? undefined,
     }
-  } else if (ChatBskyConvoDefs.isSystemMessageDataRemoveMember(data)) {
+  } else if (
+    bsky.isType(chat.bsky.convo.defs.systemMessageDataRemoveMember, data)
+  ) {
     const action = getProfileAction(data.member, relatedProfiles)
     return {
       Icon: LeaveIcon,
@@ -74,7 +77,9 @@ export function getSystemMessageInfo(
           : msg`Someone was removed from the group`,
       action: action ?? undefined,
     }
-  } else if (ChatBskyConvoDefs.isSystemMessageDataMemberJoin(data)) {
+  } else if (
+    bsky.isType(chat.bsky.convo.defs.systemMessageDataMemberJoin, data)
+  ) {
     const action = getProfileAction(data.member, relatedProfiles)
     return {
       Icon: JoinIcon,
@@ -87,7 +92,9 @@ export function getSystemMessageInfo(
           : msg`Someone joined the group`,
       action: action ?? undefined,
     }
-  } else if (ChatBskyConvoDefs.isSystemMessageDataMemberLeave(data)) {
+  } else if (
+    bsky.isType(chat.bsky.convo.defs.systemMessageDataMemberLeave, data)
+  ) {
     const action = getProfileAction(data.member, relatedProfiles)
     return {
       Icon: LeaveIcon,
@@ -100,13 +107,24 @@ export function getSystemMessageInfo(
           : msg`Someone left the group`,
       action: action ?? undefined,
     }
-  } else if (ChatBskyConvoDefs.isSystemMessageDataLockConvo(data)) {
+  } else if (
+    bsky.isType(chat.bsky.convo.defs.systemMessageDataLockConvo, data)
+  ) {
     return {Icon: LockIcon, message: msg`Chat locked`}
-  } else if (ChatBskyConvoDefs.isSystemMessageDataUnlockConvo(data)) {
+  } else if (
+    bsky.isType(chat.bsky.convo.defs.systemMessageDataUnlockConvo, data)
+  ) {
     return {Icon: UnlockIcon, message: msg`Chat unlocked`}
-  } else if (ChatBskyConvoDefs.isSystemMessageDataLockConvoPermanently(data)) {
+  } else if (
+    bsky.isType(
+      chat.bsky.convo.defs.systemMessageDataLockConvoPermanently,
+      data,
+    )
+  ) {
     return {Icon: LockIcon, message: msg`Chat ended`}
-  } else if (ChatBskyConvoDefs.isSystemMessageDataEditGroup(data)) {
+  } else if (
+    bsky.isType(chat.bsky.convo.defs.systemMessageDataEditGroup, data)
+  ) {
     return {
       Icon: PencilIcon,
       message:
@@ -114,25 +132,33 @@ export function getSystemMessageInfo(
           ? msg`Chat title changed to ${data.newName}`
           : msg`Chat title changed`,
     }
-  } else if (ChatBskyConvoDefs.isSystemMessageDataCreateJoinLink(data)) {
+  } else if (
+    bsky.isType(chat.bsky.convo.defs.systemMessageDataCreateJoinLink, data)
+  ) {
     return {
       Icon: ChainLinkIcon,
       message: msg`Invite link created`,
       action: {kind: 'inviteLink'},
     }
-  } else if (ChatBskyConvoDefs.isSystemMessageDataEditJoinLink(data)) {
+  } else if (
+    bsky.isType(chat.bsky.convo.defs.systemMessageDataEditJoinLink, data)
+  ) {
     return {
       Icon: ChainLinkIcon,
       message: msg`Invite link edited`,
       action: {kind: 'inviteLink'},
     }
-  } else if (ChatBskyConvoDefs.isSystemMessageDataEnableJoinLink(data)) {
+  } else if (
+    bsky.isType(chat.bsky.convo.defs.systemMessageDataEnableJoinLink, data)
+  ) {
     return {
       Icon: ChainLinkIcon,
       message: msg`Invite link enabled`,
       action: {kind: 'inviteLink'},
     }
-  } else if (ChatBskyConvoDefs.isSystemMessageDataDisableJoinLink(data)) {
+  } else if (
+    bsky.isType(chat.bsky.convo.defs.systemMessageDataDisableJoinLink, data)
+  ) {
     return {
       Icon: ChainLinkBrokenIcon,
       message: msg`Invite link disabled`,
diff --git a/src/components/dms/replyPreview.ts b/src/components/dms/replyPreview.ts
index 53c78b2c46..e33dd75bae 100644
--- a/src/components/dms/replyPreview.ts
+++ b/src/components/dms/replyPreview.ts
@@ -1,13 +1,8 @@
-import {
-  AppBskyEmbedExternal,
-  AppBskyEmbedRecord,
-  type ChatBskyConvoDefs,
-  ChatBskyEmbedJoinLink,
-  ChatBskyGroupDefs,
-} from '@atproto/api'
 import {useLingui} from '@lingui/react/macro'
 
 import {BSKY_APP_HOST, toShortUrl} from '#/lib/strings/url-helpers'
+import {app, chat} from '#/lexicons'
+import * as bsky from '#/types/bsky'
 
 /**
  * Describes the embed of a quoted message that has no text of its own, so the
@@ -21,13 +16,13 @@ type ReplyEmbedSummary =
   | {type: 'unknown'}
 
 function summarizeReplyEmbed(
-  embed: ChatBskyConvoDefs.MessageView['embed'],
+  embed: chat.bsky.convo.defs.MessageView['embed'],
 ): ReplyEmbedSummary {
-  if (!AppBskyEmbedRecord.isView(embed)) return {type: 'unknown'}
+  if (!bsky.isType(app.bsky.embed.record.view, embed)) return {type: 'unknown'}
   const {record} = embed
-  if (AppBskyEmbedRecord.isViewRecord(record)) {
+  if (bsky.isType(app.bsky.embed.record.viewRecord, record)) {
     const inner = record.embeds?.[0]
-    if (AppBskyEmbedExternal.isView(inner)) {
+    if (bsky.isType(app.bsky.embed.external.view, inner)) {
       return {type: 'external', uri: inner.external.uri}
     }
     return {type: 'post'}
@@ -45,25 +40,32 @@ function summarizeReplyEmbed(
  * callers can render it in a muted/italic style.
  */
 export function useReplyPreviewText(): (
-  message: ChatBskyConvoDefs.MessageView,
+  message: chat.bsky.convo.defs.MessageView,
 ) => {text: string; subtle: boolean} {
   const {t: l} = useLingui()
 
-  return (message: ChatBskyConvoDefs.MessageView) => {
+  return (message: chat.bsky.convo.defs.MessageView) => {
     const text = message.text
     if (text.trim()) {
       return {text, subtle: false}
     }
 
-    if (ChatBskyEmbedJoinLink.isView(message.embed)) {
+    if (bsky.isType(chat.bsky.embed.joinLink.view, message.embed)) {
       const {joinLinkPreview} = message.embed
-      if (ChatBskyGroupDefs.isJoinLinkPreviewView(joinLinkPreview)) {
+      if (
+        bsky.isType(chat.bsky.group.defs.joinLinkPreviewView, joinLinkPreview)
+      ) {
         return {
           text: `${BSKY_APP_HOST}/chat/${joinLinkPreview.code}`,
           subtle: true,
         }
       }
-      if (ChatBskyGroupDefs.isDisabledJoinLinkPreviewView(joinLinkPreview)) {
+      if (
+        bsky.isType(
+          chat.bsky.group.defs.disabledJoinLinkPreviewView,
+          joinLinkPreview,
+        )
+      ) {
         return {
           text: l({
             message: '(disabled chat invite link)',
@@ -72,7 +74,12 @@ export function useReplyPreviewText(): (
           subtle: true,
         }
       }
-      if (ChatBskyGroupDefs.isInvalidJoinLinkPreviewView(joinLinkPreview)) {
+      if (
+        bsky.isType(
+          chat.bsky.group.defs.invalidJoinLinkPreviewView,
+          joinLinkPreview,
+        )
+      ) {
         return {
           text: l({
             message: '(invalid chat invite link)',
diff --git a/src/components/dms/util.ts b/src/components/dms/util.ts
index 7347d1512d..135fb0dfaf 100644
--- a/src/components/dms/util.ts
+++ b/src/components/dms/util.ts
@@ -1,14 +1,14 @@
-import {type $Typed, ChatBskyActorDefs, ChatBskyConvoDefs} from '@atproto/api'
-import {type ModerationOpts} from '@bsky.app/sdk/moderation'
+import {type $Typed} from '@atproto/lex'
+import {moderateProfile, type ModerationOpts} from '@bsky.app/sdk/moderation'
 
 import {EMOJI_REACTION_LIMIT} from '#/lib/constants'
 import {isBlockedOrBlocking} from '#/lib/moderation/blocked-and-muted'
-import {moderateProfile} from '#/lib/moderation/subjects'
 import {logger} from '#/logger'
 import {type Shadow} from '#/state/cache/profile-shadow'
 import {type ConvoState, ConvoStatus} from '#/state/messages/convo/types'
 import {platform} from '#/alf'
 import {type ReportSubject} from '#/components/moderation/ReportDialog/types'
+import {chat} from '#/lexicons'
 import * as bsky from '#/types/bsky'
 
 export const MESSAGE_GAP_THRESHOLD_MS = 60 * 60 * 1000
@@ -77,7 +77,7 @@ export function localDateString(date: Date) {
 }
 
 export function hasAlreadyReacted(
-  message: ChatBskyConvoDefs.MessageView,
+  message: chat.bsky.convo.defs.MessageView,
   myDid: string | undefined,
   emoji: string,
 ): boolean {
@@ -98,9 +98,9 @@ export function hasAlreadyReacted(
  * already render anonymously ("Someone reacted").
  */
 export function filterBlockedReactions(
-  reactions: ChatBskyConvoDefs.ReactionView[] | undefined,
-  relatedProfiles: Map<string, ChatBskyActorDefs.ProfileViewBasic>,
-): ChatBskyConvoDefs.ReactionView[] {
+  reactions: chat.bsky.convo.defs.ReactionView[] | undefined,
+  relatedProfiles: Map<string, chat.bsky.actor.defs.ProfileViewBasic>,
+): chat.bsky.convo.defs.ReactionView[] {
   if (!reactions) return []
   return reactions.filter(reaction => {
     const profile = relatedProfiles.get(reaction.sender.did)
@@ -109,7 +109,7 @@ export function filterBlockedReactions(
 }
 
 export function hasReachedReactionLimit(
-  message: ChatBskyConvoDefs.MessageView,
+  message: chat.bsky.convo.defs.MessageView,
   myDid: string | undefined,
 ): boolean {
   if (!message.reactions) {
@@ -170,25 +170,25 @@ export function canReact({
   return true
 }
 
-export type GroupConvoMember = ChatBskyActorDefs.ProfileViewBasic & {
+export type GroupConvoMember = chat.bsky.actor.defs.ProfileViewBasic & {
   // can be missing if account deleted
-  kind?: $Typed<ChatBskyActorDefs.GroupConvoMember>
+  kind?: $Typed<chat.bsky.actor.defs.GroupConvoMember>
 }
 
-export type DirectConvoMember = ChatBskyActorDefs.ProfileViewBasic & {
-  kind: $Typed<ChatBskyActorDefs.DirectConvoMember>
+export type DirectConvoMember = chat.bsky.actor.defs.ProfileViewBasic & {
+  kind: $Typed<chat.bsky.actor.defs.DirectConvoMember>
 }
 
-export type ConvoWithDetails = {view: ChatBskyConvoDefs.ConvoView} & (
+export type ConvoWithDetails = {view: chat.bsky.convo.defs.ConvoView} & (
   | {
       kind: 'group'
-      details: $Typed<ChatBskyConvoDefs.GroupConvo>
+      details: $Typed<chat.bsky.convo.defs.GroupConvo>
       primaryMember?: GroupConvoMember // the owner - may have left, thus optional
       members: Array<GroupConvoMember>
     }
   | {
       kind: 'direct'
-      details: $Typed<ChatBskyConvoDefs.DirectConvo>
+      details: $Typed<chat.bsky.convo.defs.DirectConvo>
       primaryMember: DirectConvoMember // the other user
       members: Array<DirectConvoMember>
     }
@@ -199,24 +199,14 @@ export type ConvoWithDetails = {view: ChatBskyConvoDefs.ConvoView} & (
  * and enforces the correct type for convo members.
  */
 export function parseConvoView(
-  convoView: ChatBskyConvoDefs.ConvoView,
+  convoView: chat.bsky.convo.defs.ConvoView,
   ownDid: string | undefined,
 ): ConvoWithDetails | null {
-  if (
-    bsky.dangerousIsType<ChatBskyConvoDefs.GroupConvo>(
-      convoView.kind,
-      ChatBskyConvoDefs.isGroupConvo,
-    )
-  ) {
+  if (bsky.isType(chat.bsky.convo.defs.groupConvo, convoView.kind)) {
     let owner: GroupConvoMember | undefined = undefined
 
     for (const member of convoView.members) {
-      if (
-        bsky.dangerousIsType<ChatBskyActorDefs.GroupConvoMember>(
-          member.kind,
-          ChatBskyActorDefs.isGroupConvoMember,
-        )
-      ) {
+      if (bsky.isType(chat.bsky.actor.defs.groupConvoMember, member.kind)) {
         if (member.kind.role === 'owner') {
           // have to do a type assertion here
           // this works: {...member, kind: member.kind}
@@ -238,12 +228,7 @@ export function parseConvoView(
       primaryMember: owner,
       members: convoView.members as Array<GroupConvoMember>,
     }
-  } else if (
-    bsky.dangerousIsType<ChatBskyConvoDefs.DirectConvo>(
-      convoView.kind,
-      ChatBskyConvoDefs.isDirectConvo,
-    )
-  ) {
+  } else if (bsky.isType(chat.bsky.convo.defs.directConvo, convoView.kind)) {
     const otherUser = convoView.members.find(m => m.did !== ownDid)
 
     if (!otherUser) {
@@ -286,7 +271,7 @@ export function getConvoReportSubject(
 
   const lastMessage = convo.view.lastMessage
   const reportableMessage =
-    ChatBskyConvoDefs.isMessageView(lastMessage) &&
+    bsky.isType(chat.bsky.convo.defs.messageView, lastMessage) &&
     lastMessage.sender?.did !== ownDid
       ? lastMessage
       : null
diff --git a/src/components/feeds/PostFeedVideoGridRow.tsx b/src/components/feeds/PostFeedVideoGridRow.tsx
index 53bc99d2f0..54c79c0afe 100644
--- a/src/components/feeds/PostFeedVideoGridRow.tsx
+++ b/src/components/feeds/PostFeedVideoGridRow.tsx
@@ -1,5 +1,4 @@
 import {View} from 'react-native'
-import {AppBskyEmbedVideo} from '@atproto/api'
 
 import {type FeedPostSliceItem} from '#/state/queries/post-feed'
 import {type VideoFeedSourceContext} from '#/screens/VideoFeed/types'
@@ -10,6 +9,8 @@ import {
   VideoPostCardPlaceholder,
 } from '#/components/VideoPostCard'
 import {useAnalytics} from '#/analytics'
+import {app} from '#/lexicons'
+import * as bsky from '#/types/bsky'
 
 export function PostFeedVideoGridRow({
   items: slices,
@@ -21,7 +22,7 @@ export function PostFeedVideoGridRow({
   const ax = useAnalytics()
   const gutters = useGutters(['base', 'base', 0, 'base'])
   const posts = slices
-    .filter(slice => AppBskyEmbedVideo.isView(slice.post.embed))
+    .filter(slice => bsky.isType(app.bsky.embed.video.view, slice.post.embed))
     .map(slice => ({
       post: slice.post,
       moderation: slice.moderation,
diff --git a/src/components/images/AutoSizedImage.tsx b/src/components/images/AutoSizedImage.tsx
index fdc7d1988a..0842d2ebde 100644
--- a/src/components/images/AutoSizedImage.tsx
+++ b/src/components/images/AutoSizedImage.tsx
@@ -5,7 +5,6 @@ import Animated, {
   useAnimatedRef,
 } from 'react-native-reanimated'
 import {Image} from 'expo-image'
-import {type AppBskyEmbedImages} from '@atproto/api'
 import {utils} from '@bsky.app/alf'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
@@ -18,6 +17,7 @@ import {ArrowsDiagonalOut_Stroke2_Corner0_Rounded as Fullscreen} from '#/compone
 import {MediaInsetBorder} from '#/components/MediaInsetBorder'
 import {Text} from '#/components/Typography'
 import {IS_NATIVE} from '#/env'
+import {type app} from '#/lexicons'
 
 export function ConstrainedImage({
   aspectRatio,
@@ -71,7 +71,7 @@ export function AutoSizedImage({
   onContainerRef,
   onDimsChange,
 }: {
-  image: AppBskyEmbedImages.ViewImage
+  image: app.bsky.embed.images.ViewImage
   crop?: 'none' | 'square' | 'constrained'
   onPress?: (
     containerRef: AnimatedRef<any>,
diff --git a/src/components/images/Gallery/index.tsx b/src/components/images/Gallery/index.tsx
index c87957503f..aad2f86b29 100644
--- a/src/components/images/Gallery/index.tsx
+++ b/src/components/images/Gallery/index.tsx
@@ -14,7 +14,6 @@ import Animated, {
   useAnimatedRef,
 } from 'react-native-reanimated'
 import {Image} from 'expo-image'
-import {type AppBskyEmbedImages} from '@atproto/api'
 import {utils} from '@bsky.app/alf'
 import {Trans, useLingui} from '@lingui/react/macro'
 import debounce from 'lodash.debounce'
@@ -41,12 +40,13 @@ import {PostEmbedViewContext} from '#/components/Post/Embed/types'
 import {Text} from '#/components/Typography'
 import {useAnalytics} from '#/analytics'
 import {IS_ANDROID, IS_WEB} from '#/env'
+import {type app} from '#/lexicons'
 
 export * from './const'
 export * from './maybeApplyGalleryOffsetStyles'
 
 interface GalleryProps {
-  images: AppBskyEmbedImages.ViewImage[]
+  images: app.bsky.embed.images.ViewImage[]
   onPress?: (
     index: number,
     containerRefs: AnimatedRef<any>[],
@@ -404,7 +404,7 @@ function GalleryImage({
   onPreviewPress,
 }: {
   contentHeight: number
-  image: AppBskyEmbedImages.ViewImage
+  image: app.bsky.embed.images.ViewImage
   index: number
   imageCount: number
   onWidthChange: (index: number, width: number) => void
diff --git a/src/components/images/Gallery/maybeApplyGalleryOffsetStyles.ts b/src/components/images/Gallery/maybeApplyGalleryOffsetStyles.ts
index 5989497c12..75f5421257 100644
--- a/src/components/images/Gallery/maybeApplyGalleryOffsetStyles.ts
+++ b/src/components/images/Gallery/maybeApplyGalleryOffsetStyles.ts
@@ -1,15 +1,9 @@
-import {
-  AppBskyEmbedGallery,
-  AppBskyEmbedImages,
-  AppBskyEmbedRecordWithMedia,
-  type AppBskyFeedDefs,
-  AppBskyFeedPost,
-} from '@atproto/api'
 import {type ModerationCause, type ModerationUI} from '@bsky.app/sdk/moderation'
 
 import {unique} from '#/lib/moderation'
 import {type AppModerationCause} from '#/components/Pills'
 import {Features, features} from '#/analytics/features'
+import {app} from '#/lexicons'
 import * as bsky from '#/types/bsky'
 
 export const POST_META_NO_CONTENT_OFFSET = {paddingTop: 10}
@@ -22,17 +16,12 @@ export function maybeApplyGalleryOffsetStyles(
     modui,
     additionalCauses,
   }: {
-    post: AppBskyFeedDefs.PostView
+    post: app.bsky.feed.defs.PostView
     modui: ModerationUI
     additionalCauses?: ModerationCause[] | AppModerationCause[]
   },
 ) {
-  if (
-    !bsky.dangerousIsType<AppBskyFeedPost.Record>(
-      post.record,
-      AppBskyFeedPost.isRecord,
-    )
-  ) {
+  if (!bsky.isType(app.bsky.feed.post, post.record)) {
     return
   }
 
@@ -47,24 +36,11 @@ export function maybeApplyGalleryOffsetStyles(
    * First check if we even have images
    */
   const embed = post.record.embed
-  const isImageEmbed =
-    embed &&
-    bsky.dangerousIsType<AppBskyEmbedImages.Main>(
-      embed,
-      AppBskyEmbedImages.isMain,
-    )
+  const isImageEmbed = embed && bsky.isType(app.bsky.embed.images.main, embed)
   const isGalleryEmbed =
-    embed &&
-    bsky.dangerousIsType<AppBskyEmbedGallery.Main>(
-      embed,
-      AppBskyEmbedGallery.isMain,
-    )
+    embed && bsky.isType(app.bsky.embed.gallery.main, embed)
   const isRecordWithMedia =
-    embed &&
-    bsky.dangerousIsType<AppBskyEmbedRecordWithMedia.Main>(
-      embed,
-      AppBskyEmbedRecordWithMedia.isMain,
-    )
+    embed && bsky.isType(app.bsky.embed.recordWithMedia.main, embed)
   let hasImages = false
   if (isImageEmbed) {
     if (!isPostGalleryEmbedEnabled) return
@@ -78,23 +54,13 @@ export function maybeApplyGalleryOffsetStyles(
     hasImages = true
   }
   if (isRecordWithMedia) {
-    if (
-      bsky.dangerousIsType<AppBskyEmbedImages.Main>(
-        embed.media,
-        AppBskyEmbedImages.isMain,
-      )
-    ) {
+    if (bsky.isType(app.bsky.embed.images.main, embed.media)) {
       if (!isPostGalleryEmbedEnabled) return
       // one image, not a gallery
       if (embed.media.images.length === 1) return
       hasImages = true
     }
-    if (
-      bsky.dangerousIsType<AppBskyEmbedGallery.Main>(
-        embed.media,
-        AppBskyEmbedGallery.isMain,
-      )
-    ) {
+    if (bsky.isType(app.bsky.embed.gallery.main, embed.media)) {
       // single (or empty) gallery - no offset needed
       if (embed.media.items.length <= 1) return
       hasImages = true
diff --git a/src/components/images/ImageLayoutGrid.tsx b/src/components/images/ImageLayoutGrid.tsx
index f69de63bd1..e01e853447 100644
--- a/src/components/images/ImageLayoutGrid.tsx
+++ b/src/components/images/ImageLayoutGrid.tsx
@@ -1,15 +1,15 @@
 import {useRef} from 'react'
 import {type StyleProp, View, type ViewStyle} from 'react-native'
 import {type AnimatedRef, useAnimatedRef} from 'react-native-reanimated'
-import {type AppBskyEmbedImages} from '@atproto/api'
 
 import {atoms as a, useBreakpoints} from '#/alf'
 import {type Dimensions} from '#/components/Lightbox/types'
 import {type PostEmbedViewContext} from '#/components/Post/Embed/types'
+import {type app} from '#/lexicons'
 import {GalleryItem} from './ImageLayoutGridItem'
 
 interface ImageLayoutGridProps {
-  images: AppBskyEmbedImages.ViewImage[]
+  images: app.bsky.embed.images.ViewImage[]
   onPress?: (
     index: number,
     containerRefs: AnimatedRef<any>[],
@@ -45,7 +45,7 @@ export function ImageLayoutGrid({
 }
 
 interface ImageLayoutGridInnerProps {
-  images: AppBskyEmbedImages.ViewImage[]
+  images: app.bsky.embed.images.ViewImage[]
   onPress?: (
     index: number,
     containerRefs: AnimatedRef<any>[],
diff --git a/src/components/images/ImageLayoutGridItem.tsx b/src/components/images/ImageLayoutGridItem.tsx
index 8a3202df37..69f3c7a5bf 100644
--- a/src/components/images/ImageLayoutGridItem.tsx
+++ b/src/components/images/ImageLayoutGridItem.tsx
@@ -1,7 +1,6 @@
 import {Pressable, type StyleProp, View, type ViewStyle} from 'react-native'
 import {type AnimatedRef} from 'react-native-reanimated'
 import {Image, type ImageStyle} from 'expo-image'
-import {type AppBskyEmbedImages} from '@atproto/api'
 import {utils} from '@bsky.app/alf'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
@@ -14,11 +13,12 @@ import {MediaInsetBorder} from '#/components/MediaInsetBorder'
 import {ImageContextMenu} from '#/components/Post/Embed/ImageContextMenu'
 import {type PostEmbedViewContext} from '#/components/Post/Embed/types'
 import {Text} from '#/components/Typography'
+import {type app} from '#/lexicons'
 
 type EventFunction = (index: number) => void
 
 interface Props {
-  images: AppBskyEmbedImages.ViewImage[]
+  images: app.bsky.embed.images.ViewImage[]
   index: number
   onPress?: (
     index: number,
diff --git a/src/components/intents/GroupChatJoinDialog.tsx b/src/components/intents/GroupChatJoinDialog.tsx
index b2ec975503..c698219a43 100644
--- a/src/components/intents/GroupChatJoinDialog.tsx
+++ b/src/components/intents/GroupChatJoinDialog.tsx
@@ -1,12 +1,11 @@
 import {useEffect} from 'react'
 import {View} from 'react-native'
-import {ChatBskyGroupDefs} from '@atproto/api'
+import {moderateProfile} from '@bsky.app/sdk/moderation'
 import {Plural, Trans, useLingui} from '@lingui/react/macro'
 import {useNavigation} from '@react-navigation/native'
 import {useQueryClient} from '@tanstack/react-query'
 
 import {createSanitizedDisplayName} from '#/lib/moderation/create-sanitized-display-name'
-import {moderateProfile} from '#/lib/moderation/subjects'
 import {useCallOnce} from '#/lib/once'
 import {makeProfileLink} from '#/lib/routes/links'
 import {type NavigationProp} from '#/lib/routes/types'
@@ -47,6 +46,7 @@ import * as Toast from '#/components/Toast'
 import {Text} from '#/components/Typography'
 import {useAnalytics} from '#/analytics'
 import {chat} from '#/lexicons'
+import * as bsky from '#/types/bsky'
 import {ProfileBadges} from '../ProfileBadges'
 
 export function GroupChatJoinDialog() {
@@ -163,7 +163,10 @@ function GroupChatJoinDialogContent({code}: {code?: string}) {
               errorMessage = l`The member limit has been reached.`
               const preview = data?.joinLinkPreviews[0]
               if (
-                ChatBskyGroupDefs.isJoinLinkPreviewView(preview) &&
+                bsky.isType(
+                  chat.bsky.group.defs.joinLinkPreviewView,
+                  preview,
+                ) &&
                 preview.convo?.id
               ) {
                 ax.metric('groupchat:join:memberLimitReached', {
@@ -254,7 +257,7 @@ function GroupChatJoinDialogContent({code}: {code?: string}) {
 
   const joinLinkPreview = data.joinLinkPreviews[0]
 
-  if (!ChatBskyGroupDefs.isJoinLinkPreviewView(joinLinkPreview)) {
+  if (!bsky.isType(chat.bsky.group.defs.joinLinkPreviewView, joinLinkPreview)) {
     return (
       <>
         <View style={[a.py_lg, a.align_center]}>
diff --git a/src/components/interstitials/FeedTrendingTopics.tsx b/src/components/interstitials/FeedTrendingTopics.tsx
index a50b8652d3..a069a1b851 100644
--- a/src/components/interstitials/FeedTrendingTopics.tsx
+++ b/src/components/interstitials/FeedTrendingTopics.tsx
@@ -1,9 +1,8 @@
 import {useMemo} from 'react'
 import {Pressable, View} from 'react-native'
-import {type AppBskyUnspeccedDefs} from '@atproto/api'
+import {moderateProfile} from '@bsky.app/sdk/moderation'
 import {Plural, Trans, useLingui} from '@lingui/react/macro'
 
-import {moderateProfile} from '#/lib/moderation/subjects'
 import {useModerationOpts} from '#/state/preferences/moderation-opts'
 import {
   useTrendingSettings,
@@ -30,6 +29,7 @@ import {SubtleHover} from '#/components/SubtleHover'
 import {useTrendingTopicSeen} from '#/components/TrendingTopics'
 import {Text} from '#/components/Typography'
 import {useAnalytics} from '#/analytics'
+import {type app} from '#/lexicons'
 
 const TOPIC_COUNT = 3
 
@@ -183,7 +183,7 @@ function TrendRow({
   recId,
   onPress,
 }: ViewStyleProp & {
-  trend: AppBskyUnspeccedDefs.TrendView
+  trend: app.bsky.unspecced.defs.TrendView
   rank: number
   feedSliceIndex: number
   recId?: string
@@ -291,7 +291,7 @@ function TrendingTopicRowSkeleton({rank}: {rank: number}) {
 }
 
 function useModerateTrendingActors(
-  actors: AppBskyUnspeccedDefs.TrendView['actors'],
+  actors: app.bsky.unspecced.defs.TrendView['actors'],
 ) {
   const moderationOpts = useModerationOpts()
 
diff --git a/src/components/interstitials/TrendingVideos.tsx b/src/components/interstitials/TrendingVideos.tsx
index d3047001a4..c719f6c66c 100644
--- a/src/components/interstitials/TrendingVideos.tsx
+++ b/src/components/interstitials/TrendingVideos.tsx
@@ -1,6 +1,6 @@
 import {useCallback, useEffect, useMemo} from 'react'
 import {ScrollView, View} from 'react-native'
-import {AppBskyEmbedVideo, AtUri} from '@atproto/api'
+import {AtUri} from '@atproto/syntax'
 import {Trans, useLingui} from '@lingui/react/macro'
 import {useQueryClient} from '@tanstack/react-query'
 
@@ -21,6 +21,8 @@ import {
   CompactVideoPostCardPlaceholder,
 } from '#/components/VideoPostCard'
 import {useAnalytics} from '#/analytics'
+import {app} from '#/lexicons'
+import * as bsky from '#/types/bsky'
 
 const CARD_WIDTH = 108
 
@@ -153,7 +155,7 @@ function VideoCards({
       .flatMap(page => page.slices)
       .map(slice => slice.items[0])
       .filter(Boolean)
-      .filter(item => AppBskyEmbedVideo.isView(item.post.embed))
+      .filter(item => bsky.isType(app.bsky.embed.video.view, item.post.embed))
       .slice(0, 8)
   }, [data])
 
diff --git a/src/components/moderation/AppealForm.tsx b/src/components/moderation/AppealForm.tsx
index 606e8162ec..f40740f179 100644
--- a/src/components/moderation/AppealForm.tsx
+++ b/src/components/moderation/AppealForm.tsx
@@ -1,6 +1,5 @@
 import {useState} from 'react'
 import {View} from 'react-native'
-import {type ComAtprotoLabelDefs, ToolsOzoneReportDefs} from '@atproto/api'
 import {XrpcResponseError} from '@atproto/lex'
 import {type AtUriString, type DidString} from '@atproto/syntax'
 import {msg} from '@lingui/core/macro'
@@ -23,14 +22,14 @@ import {Loader} from '#/components/Loader'
 import * as Toast from '#/components/Toast'
 import {Text} from '#/components/Typography'
 import {IS_ANDROID} from '#/env'
-import {com} from '#/lexicons'
+import {com, tools} from '#/lexicons'
 
 export function AppealForm({
   label,
   control,
   onPressBack,
 }: {
-  label: ComAtprotoLabelDefs.Label
+  label: com.atproto.label.defs.Label
   control: Dialog.DialogOuterProps['control']
   onPressBack: () => void
 }) {
@@ -51,7 +50,7 @@ export function AppealForm({
       await client.call(
         com.atproto.moderation.createReport,
         {
-          reasonType: ToolsOzoneReportDefs.REASONAPPEAL,
+          reasonType: tools.ozone.report.defs.reasonAppeal.value,
           /*
            * `useLabelSubject` derives one shape or the other from the label's
            * `cid`: an at-uri plus cid for a record, or the label's `uri` reused
@@ -70,7 +69,7 @@ export function AppealForm({
           reason: details,
         },
         // the appeal goes to the labeler that applied the label
-        {service: `${label.src as DidString}#atproto_labeler`},
+        {service: `${label.src}#atproto_labeler`},
       )
     },
     onError: err => {
diff --git a/src/components/moderation/BlockDialog.tsx b/src/components/moderation/BlockDialog.tsx
index d576e071d7..b49f6444c6 100644
--- a/src/components/moderation/BlockDialog.tsx
+++ b/src/components/moderation/BlockDialog.tsx
@@ -1,6 +1,5 @@
 import {useState} from 'react'
 import {View} from 'react-native'
-import {type ChatBskyConvoDefs} from '@atproto/api'
 import {Trans, useLingui} from '@lingui/react/macro'
 import {useQueryClient} from '@tanstack/react-query'
 
@@ -27,7 +26,7 @@ import {Text} from '#/components/Typography'
 import {chat} from '#/lexicons'
 import {type AnyProfileView} from '#/types/bsky/profile'
 
-type Item = ChatBskyConvoDefs.ConvoView
+type Item = chat.bsky.convo.defs.ConvoView
 
 type BlockDialogProps = {
   control: DialogControlProps
@@ -252,7 +251,7 @@ function MutualGroupChat({
   onOptimisticallyRemoveConvo,
   onRestoreConvo,
 }: {
-  view: ChatBskyConvoDefs.ConvoView
+  view: chat.bsky.convo.defs.ConvoView
   profileDid: string
   currentConvoId?: string
   onOptimisticallyRemoveConvo: (convoId: string) => void
diff --git a/src/components/moderation/LabelsOnMe.tsx b/src/components/moderation/LabelsOnMe.tsx
index 85cb1e4a3a..ee56d1bae2 100644
--- a/src/components/moderation/LabelsOnMe.tsx
+++ b/src/components/moderation/LabelsOnMe.tsx
@@ -1,5 +1,4 @@
 import {type StyleProp, View, type ViewStyle} from 'react-native'
-import {type ComAtprotoLabelDefs} from '@atproto/api'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Plural} from '@lingui/react/macro'
@@ -18,13 +17,14 @@ import {
   LabelsOnMeDialog,
   useLabelsOnMeDialogControl,
 } from '#/components/moderation/LabelsOnMeDialog'
+import {type com} from '#/lexicons'
 
 export function LabelsOnMe({
   labels,
   size,
   style,
 }: {
-  labels: ComAtprotoLabelDefs.Label[] | undefined
+  labels: com.atproto.label.defs.Label[] | undefined
   size?: ButtonSize
   style?: StyleProp<ViewStyle>
 }) {
diff --git a/src/components/moderation/LabelsOnMeDialog.tsx b/src/components/moderation/LabelsOnMeDialog.tsx
index 963e4b762a..a12e129925 100644
--- a/src/components/moderation/LabelsOnMeDialog.tsx
+++ b/src/components/moderation/LabelsOnMeDialog.tsx
@@ -1,6 +1,5 @@
 import {useMemo, useState} from 'react'
 import {View} from 'react-native'
-import {type ComAtprotoLabelDefs} from '@atproto/api'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
@@ -17,13 +16,14 @@ import * as Dialog from '#/components/Dialog'
 import {InlineLinkText} from '#/components/Link'
 import {AppealForm} from '#/components/moderation/AppealForm'
 import {Text} from '#/components/Typography'
+import {type com} from '#/lexicons'
 import {Divider} from '../Divider'
 
 export {useDialogControl as useLabelsOnMeDialogControl} from '#/components/Dialog'
 
 export interface LabelsOnMeDialogProps {
   control: Dialog.DialogOuterProps['control']
-  labels: ComAtprotoLabelDefs.Label[]
+  labels: com.atproto.label.defs.Label[]
   /**
    * Whether the labels are being shown on the user's account or on a post.
    * With `content`, the list may include account-level labels, which get a
@@ -47,7 +47,7 @@ function LabelsOnMeDialogInner(props: LabelsOnMeDialogProps) {
   const {_} = useLingui()
   const {currentAccount} = useSession()
   const [appealingLabel, setAppealingLabel] = useState<
-    ComAtprotoLabelDefs.Label | undefined
+    com.atproto.label.defs.Label | undefined
   >(undefined)
   const {labels} = props
   const isAccount = props.type === 'account'
@@ -118,7 +118,7 @@ function Label({
   control,
   onPressAppeal,
 }: {
-  label: ComAtprotoLabelDefs.Label
+  label: com.atproto.label.defs.Label
   isSelfLabel: boolean
   /**
    * Call out that the label applies to the whole account, for contexts that
@@ -126,7 +126,7 @@ function Label({
    */
   showAccountCallout?: boolean
   control: Dialog.DialogOuterProps['control']
-  onPressAppeal: (label: ComAtprotoLabelDefs.Label) => void
+  onPressAppeal: (label: com.atproto.label.defs.Label) => void
 }) {
   const t = useTheme()
   const {_} = useLingui()
diff --git a/src/components/moderation/PostAlerts.tsx b/src/components/moderation/PostAlerts.tsx
index 4aa3c92a6c..95f4c0e56e 100644
--- a/src/components/moderation/PostAlerts.tsx
+++ b/src/components/moderation/PostAlerts.tsx
@@ -1,5 +1,4 @@
 import {type StyleProp, View, type ViewStyle} from 'react-native'
-import {type AppBskyFeedDefs, type ComAtprotoLabelDefs} from '@atproto/api'
 import {type ModerationCause, type ModerationUI} from '@bsky.app/sdk/moderation'
 import {plural} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react/macro'
@@ -16,6 +15,7 @@ import {
   useLabelsOnMeDialogControl,
 } from '#/components/moderation/LabelsOnMeDialog'
 import * as Pills from '#/components/Pills'
+import {type app, type com} from '#/lexicons'
 
 export function PostAlerts({
   post,
@@ -24,7 +24,7 @@ export function PostAlerts({
   style,
   additionalCauses,
 }: {
-  post?: AppBskyFeedDefs.PostView
+  post?: app.bsky.feed.defs.PostView
   modui: ModerationUI
   /**
    * Expanded views (e.g. the thread anchor post) render larger pills and
@@ -48,7 +48,7 @@ export function PostAlerts({
    * author's only entry point to appeal labels on their content.
    */
   const isOwnPost = !!post && post.author.did === currentAccount?.did
-  const allLabels: ComAtprotoLabelDefs.Label[] =
+  const allLabels: com.atproto.label.defs.Label[] =
     isOwnPost && view === 'expanded'
       ? [
           ...(post.labels ?? []),
@@ -134,7 +134,7 @@ function AdditionalLabels({
   size,
   hasPrecedingPills,
 }: {
-  labels: ComAtprotoLabelDefs.Label[]
+  labels: com.atproto.label.defs.Label[]
   size?: Pills.CommonProps['size']
   /**
    * The compact "+n" syntax only makes sense as a continuation of other
diff --git a/src/components/moderation/PostHider.tsx b/src/components/moderation/PostHider.tsx
index 54d4acf945..874345e084 100644
--- a/src/components/moderation/PostHider.tsx
+++ b/src/components/moderation/PostHider.tsx
@@ -7,7 +7,6 @@ import {
   View,
   type ViewStyle,
 } from 'react-native'
-import {type AppBskyActorDefs} from '@atproto/api'
 import {type ModerationCause, type ModerationUI} from '@bsky.app/sdk/moderation'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
@@ -25,13 +24,14 @@ import {
   useModerationDetailsDialogControl,
 } from '#/components/moderation/ModerationDetailsDialog'
 import {Text} from '#/components/Typography'
+import {type app} from '#/lexicons'
 
 interface Props extends React.ComponentProps<typeof Link> {
   disabled: boolean
   iconSize: number
   iconStyles: StyleProp<ViewStyle>
   modui: ModerationUI
-  profile: AppBskyActorDefs.ProfileViewBasic
+  profile: app.bsky.actor.defs.ProfileViewBasic
   interpretFilterAsBlur?: boolean
   hiderStyle?: StyleProp<ViewStyle>
 }
diff --git a/src/components/moderation/ReportDialog/action.ts b/src/components/moderation/ReportDialog/action.ts
index 6113a280cb..c22a93fce9 100644
--- a/src/components/moderation/ReportDialog/action.ts
+++ b/src/components/moderation/ReportDialog/action.ts
@@ -1,5 +1,5 @@
-import {BSKY_LABELER_DID} from '@atproto/api'
 import {type AtUriString, type DidString} from '@atproto/syntax'
+import {api} from '@bsky.app/sdk'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {useMutation} from '@tanstack/react-query'
@@ -121,7 +121,7 @@ export function useSubmitReportMutation() {
         state.includeVideoTimestamp &&
         videoTimestampSeconds != null &&
         subject.type === 'post' &&
-        labeler.creator.did === BSKY_LABELER_DID
+        labeler.creator.did === api.moderation.did
           ? {videoTimestampSeconds}
           : undefined
 
diff --git a/src/components/moderation/ReportDialog/const.ts b/src/components/moderation/ReportDialog/const.ts
index 727b2f90e9..34f736a86a 100644
--- a/src/components/moderation/ReportDialog/const.ts
+++ b/src/components/moderation/ReportDialog/const.ts
@@ -1,11 +1,8 @@
 import {applicationId} from 'expo-application'
-import {
-  ComAtprotoModerationDefs as RootReportDefs,
-  ToolsOzoneReportDefs as OzoneReportDefs,
-} from '@atproto/api'
 
 import {type ParsedReportSubject} from '#/components/moderation/ReportDialog/types'
 import {IS_ANDROID, IS_IOS, IS_WEB} from '#/env'
+import {com, tools} from '#/lexicons'
 
 export const DMCA_LINK = 'https://bsky.social/about/support/copyright'
 export const SUPPORT_PAGE = 'https://bsky.social/about/support'
@@ -31,59 +28,96 @@ export const NEW_TO_OLD_REASON_MAPPING: Record<string, string> = {}
  * @see https://github.com/bluesky-social/atproto/blob/4c15fb47cec26060bff2e710e95869a90c9d7fdd/packages/ozone/src/mod-service/profile.ts#L16-L64
  */
 export const NEW_TO_OLD_REASONS_MAP: Record<
-  OzoneReportDefs.ReasonType,
-  RootReportDefs.ReasonType
+  tools.ozone.report.defs.ReasonType,
+  com.atproto.moderation.defs.ReasonType
 > = {
-  [OzoneReportDefs.REASONAPPEAL]: RootReportDefs.REASONAPPEAL,
-  [OzoneReportDefs.REASONOTHER]: RootReportDefs.REASONOTHER,
+  [tools.ozone.report.defs.reasonAppeal.value]:
+    com.atproto.moderation.defs.reasonAppeal.value,
+  [tools.ozone.report.defs.reasonOther.value]:
+    com.atproto.moderation.defs.reasonOther.value,
 
-  [OzoneReportDefs.REASONVIOLENCEANIMAL]: RootReportDefs.REASONVIOLATION,
-  [OzoneReportDefs.REASONVIOLENCETHREATS]: RootReportDefs.REASONVIOLATION,
-  [OzoneReportDefs.REASONVIOLENCEGRAPHICCONTENT]:
-    RootReportDefs.REASONVIOLATION,
-  [OzoneReportDefs.REASONVIOLENCEGLORIFICATION]: RootReportDefs.REASONVIOLATION,
-  [OzoneReportDefs.REASONVIOLENCEEXTREMISTCONTENT]:
-    RootReportDefs.REASONVIOLATION,
-  [OzoneReportDefs.REASONVIOLENCETRAFFICKING]: RootReportDefs.REASONVIOLATION,
-  [OzoneReportDefs.REASONVIOLENCEOTHER]: RootReportDefs.REASONVIOLATION,
+  [tools.ozone.report.defs.reasonViolenceAnimal.value]:
+    com.atproto.moderation.defs.reasonViolation.value,
+  [tools.ozone.report.defs.reasonViolenceThreats.value]:
+    com.atproto.moderation.defs.reasonViolation.value,
+  [tools.ozone.report.defs.reasonViolenceGraphicContent.value]:
+    com.atproto.moderation.defs.reasonViolation.value,
+  [tools.ozone.report.defs.reasonViolenceGlorification.value]:
+    com.atproto.moderation.defs.reasonViolation.value,
+  [tools.ozone.report.defs.reasonViolenceExtremistContent.value]:
+    com.atproto.moderation.defs.reasonViolation.value,
+  [tools.ozone.report.defs.reasonViolenceTrafficking.value]:
+    com.atproto.moderation.defs.reasonViolation.value,
+  [tools.ozone.report.defs.reasonViolenceOther.value]:
+    com.atproto.moderation.defs.reasonViolation.value,
 
-  [OzoneReportDefs.REASONSEXUALABUSECONTENT]: RootReportDefs.REASONSEXUAL,
-  [OzoneReportDefs.REASONSEXUALNCII]: RootReportDefs.REASONSEXUAL,
-  [OzoneReportDefs.REASONSEXUALDEEPFAKE]: RootReportDefs.REASONSEXUAL,
-  [OzoneReportDefs.REASONSEXUALANIMAL]: RootReportDefs.REASONSEXUAL,
-  [OzoneReportDefs.REASONSEXUALUNLABELED]: RootReportDefs.REASONSEXUAL,
-  [OzoneReportDefs.REASONSEXUALOTHER]: RootReportDefs.REASONSEXUAL,
+  [tools.ozone.report.defs.reasonSexualAbuseContent.value]:
+    com.atproto.moderation.defs.reasonSexual.value,
+  [tools.ozone.report.defs.reasonSexualNCII.value]:
+    com.atproto.moderation.defs.reasonSexual.value,
+  [tools.ozone.report.defs.reasonSexualDeepfake.value]:
+    com.atproto.moderation.defs.reasonSexual.value,
+  [tools.ozone.report.defs.reasonSexualAnimal.value]:
+    com.atproto.moderation.defs.reasonSexual.value,
+  [tools.ozone.report.defs.reasonSexualUnlabeled.value]:
+    com.atproto.moderation.defs.reasonSexual.value,
+  [tools.ozone.report.defs.reasonSexualOther.value]:
+    com.atproto.moderation.defs.reasonSexual.value,
 
-  [OzoneReportDefs.REASONCHILDSAFETYCSAM]: RootReportDefs.REASONVIOLATION,
-  [OzoneReportDefs.REASONCHILDSAFETYGROOM]: RootReportDefs.REASONVIOLATION,
-  [OzoneReportDefs.REASONCHILDSAFETYPRIVACY]: RootReportDefs.REASONVIOLATION,
-  [OzoneReportDefs.REASONCHILDSAFETYHARASSMENT]: RootReportDefs.REASONVIOLATION,
-  [OzoneReportDefs.REASONCHILDSAFETYOTHER]: RootReportDefs.REASONVIOLATION,
+  [tools.ozone.report.defs.reasonChildSafetyCSAM.value]:
+    com.atproto.moderation.defs.reasonViolation.value,
+  [tools.ozone.report.defs.reasonChildSafetyGroom.value]:
+    com.atproto.moderation.defs.reasonViolation.value,
+  [tools.ozone.report.defs.reasonChildSafetyPrivacy.value]:
+    com.atproto.moderation.defs.reasonViolation.value,
+  [tools.ozone.report.defs.reasonChildSafetyHarassment.value]:
+    com.atproto.moderation.defs.reasonViolation.value,
+  [tools.ozone.report.defs.reasonChildSafetyOther.value]:
+    com.atproto.moderation.defs.reasonViolation.value,
 
-  [OzoneReportDefs.REASONHARASSMENTTROLL]: RootReportDefs.REASONRUDE,
-  [OzoneReportDefs.REASONHARASSMENTTARGETED]: RootReportDefs.REASONRUDE,
-  [OzoneReportDefs.REASONHARASSMENTHATESPEECH]: RootReportDefs.REASONRUDE,
-  [OzoneReportDefs.REASONHARASSMENTDOXXING]: RootReportDefs.REASONRUDE,
-  [OzoneReportDefs.REASONHARASSMENTOTHER]: RootReportDefs.REASONRUDE,
+  [tools.ozone.report.defs.reasonHarassmentTroll.value]:
+    com.atproto.moderation.defs.reasonRude.value,
+  [tools.ozone.report.defs.reasonHarassmentTargeted.value]:
+    com.atproto.moderation.defs.reasonRude.value,
+  [tools.ozone.report.defs.reasonHarassmentHateSpeech.value]:
+    com.atproto.moderation.defs.reasonRude.value,
+  [tools.ozone.report.defs.reasonHarassmentDoxxing.value]:
+    com.atproto.moderation.defs.reasonRude.value,
+  [tools.ozone.report.defs.reasonHarassmentOther.value]:
+    com.atproto.moderation.defs.reasonRude.value,
 
-  [OzoneReportDefs.REASONMISLEADINGBOT]: RootReportDefs.REASONMISLEADING,
-  [OzoneReportDefs.REASONMISLEADINGIMPERSONATION]:
-    RootReportDefs.REASONMISLEADING,
-  [OzoneReportDefs.REASONMISLEADINGSPAM]: RootReportDefs.REASONSPAM,
-  [OzoneReportDefs.REASONMISLEADINGSCAM]: RootReportDefs.REASONMISLEADING,
-  [OzoneReportDefs.REASONMISLEADINGELECTIONS]: RootReportDefs.REASONMISLEADING,
-  [OzoneReportDefs.REASONMISLEADINGOTHER]: RootReportDefs.REASONMISLEADING,
+  [tools.ozone.report.defs.reasonMisleadingBot.value]:
+    com.atproto.moderation.defs.reasonMisleading.value,
+  [tools.ozone.report.defs.reasonMisleadingImpersonation.value]:
+    com.atproto.moderation.defs.reasonMisleading.value,
+  [tools.ozone.report.defs.reasonMisleadingSpam.value]:
+    com.atproto.moderation.defs.reasonSpam.value,
+  [tools.ozone.report.defs.reasonMisleadingScam.value]:
+    com.atproto.moderation.defs.reasonMisleading.value,
+  [tools.ozone.report.defs.reasonMisleadingElections.value]:
+    com.atproto.moderation.defs.reasonMisleading.value,
+  [tools.ozone.report.defs.reasonMisleadingOther.value]:
+    com.atproto.moderation.defs.reasonMisleading.value,
 
-  [OzoneReportDefs.REASONRULESITESECURITY]: RootReportDefs.REASONVIOLATION,
-  [OzoneReportDefs.REASONRULEPROHIBITEDSALES]: RootReportDefs.REASONVIOLATION,
-  [OzoneReportDefs.REASONRULEBANEVASION]: RootReportDefs.REASONVIOLATION,
-  [OzoneReportDefs.REASONRULEOTHER]: RootReportDefs.REASONVIOLATION,
+  [tools.ozone.report.defs.reasonRuleSiteSecurity.value]:
+    com.atproto.moderation.defs.reasonViolation.value,
+  [tools.ozone.report.defs.reasonRuleProhibitedSales.value]:
+    com.atproto.moderation.defs.reasonViolation.value,
+  [tools.ozone.report.defs.reasonRuleBanEvasion.value]:
+    com.atproto.moderation.defs.reasonViolation.value,
+  [tools.ozone.report.defs.reasonRuleOther.value]:
+    com.atproto.moderation.defs.reasonViolation.value,
 
-  [OzoneReportDefs.REASONSELFHARMCONTENT]: RootReportDefs.REASONVIOLATION,
-  [OzoneReportDefs.REASONSELFHARMED]: RootReportDefs.REASONVIOLATION,
-  [OzoneReportDefs.REASONSELFHARMSTUNTS]: RootReportDefs.REASONVIOLATION,
-  [OzoneReportDefs.REASONSELFHARMSUBSTANCES]: RootReportDefs.REASONVIOLATION,
-  [OzoneReportDefs.REASONSELFHARMOTHER]: RootReportDefs.REASONVIOLATION,
+  [tools.ozone.report.defs.reasonSelfHarmContent.value]:
+    com.atproto.moderation.defs.reasonViolation.value,
+  [tools.ozone.report.defs.reasonSelfHarmED.value]:
+    com.atproto.moderation.defs.reasonViolation.value,
+  [tools.ozone.report.defs.reasonSelfHarmStunts.value]:
+    com.atproto.moderation.defs.reasonViolation.value,
+  [tools.ozone.report.defs.reasonSelfHarmSubstances.value]:
+    com.atproto.moderation.defs.reasonViolation.value,
+  [tools.ozone.report.defs.reasonSelfHarmOther.value]:
+    com.atproto.moderation.defs.reasonViolation.value,
 }
 
 /**
@@ -91,42 +125,60 @@ export const NEW_TO_OLD_REASONS_MAP: Record<
  * @see https://github.com/bluesky-social/proposals/tree/main/0009-mod-report-granularity#backwards-compatibility
  */
 export const OLD_TO_NEW_REASONS_MAP: Record<
-  Exclude<RootReportDefs.ReasonType, OzoneReportDefs.ReasonType>,
-  OzoneReportDefs.ReasonType
+  Exclude<
+    com.atproto.moderation.defs.ReasonType,
+    tools.ozone.report.defs.ReasonType
+  >,
+  tools.ozone.report.defs.ReasonType
 > = {
-  [RootReportDefs.REASONSPAM]: [OzoneReportDefs.REASONMISLEADINGSPAM],
-  [RootReportDefs.REASONVIOLATION]: [OzoneReportDefs.REASONRULEOTHER],
-  [RootReportDefs.REASONMISLEADING]: [OzoneReportDefs.REASONMISLEADINGOTHER],
-  [RootReportDefs.REASONSEXUAL]: [OzoneReportDefs.REASONSEXUALUNLABELED],
-  [RootReportDefs.REASONRUDE]: [OzoneReportDefs.REASONHARASSMENTOTHER],
-  [RootReportDefs.REASONOTHER]: [OzoneReportDefs.REASONOTHER],
-  [RootReportDefs.REASONAPPEAL]: [OzoneReportDefs.REASONAPPEAL],
+  [com.atproto.moderation.defs.reasonSpam.value]: [
+    tools.ozone.report.defs.reasonMisleadingSpam.value,
+  ],
+  [com.atproto.moderation.defs.reasonViolation.value]: [
+    tools.ozone.report.defs.reasonRuleOther.value,
+  ],
+  [com.atproto.moderation.defs.reasonMisleading.value]: [
+    tools.ozone.report.defs.reasonMisleadingOther.value,
+  ],
+  [com.atproto.moderation.defs.reasonSexual.value]: [
+    tools.ozone.report.defs.reasonSexualUnlabeled.value,
+  ],
+  [com.atproto.moderation.defs.reasonRude.value]: [
+    tools.ozone.report.defs.reasonHarassmentOther.value,
+  ],
+  [com.atproto.moderation.defs.reasonOther.value]: [
+    tools.ozone.report.defs.reasonOther.value,
+  ],
+  [com.atproto.moderation.defs.reasonAppeal.value]: [
+    tools.ozone.report.defs.reasonAppeal.value,
+  ],
 }
 
 /**
  * Set of report reasons that should optionally include additional details from
  * the reporter.
  */
-export const OTHER_REPORT_REASONS: Set<OzoneReportDefs.ReasonType> = new Set([
-  OzoneReportDefs.REASONVIOLENCEOTHER,
-  OzoneReportDefs.REASONSEXUALOTHER,
-  OzoneReportDefs.REASONCHILDSAFETYOTHER,
-  OzoneReportDefs.REASONHARASSMENTOTHER,
-  OzoneReportDefs.REASONMISLEADINGOTHER,
-  OzoneReportDefs.REASONRULEOTHER,
-  OzoneReportDefs.REASONSELFHARMOTHER,
-  OzoneReportDefs.REASONOTHER,
-])
+export const OTHER_REPORT_REASONS: Set<tools.ozone.report.defs.ReasonType> =
+  new Set([
+    tools.ozone.report.defs.reasonViolenceOther.value,
+    tools.ozone.report.defs.reasonSexualOther.value,
+    tools.ozone.report.defs.reasonChildSafetyOther.value,
+    tools.ozone.report.defs.reasonHarassmentOther.value,
+    tools.ozone.report.defs.reasonMisleadingOther.value,
+    tools.ozone.report.defs.reasonRuleOther.value,
+    tools.ozone.report.defs.reasonSelfHarmOther.value,
+    tools.ozone.report.defs.reasonOther.value,
+  ])
 
 /**
  * Set of report reasons that should only be sent to Bluesky's moderation service.
  */
-export const BSKY_LABELER_ONLY_REPORT_REASONS: Set<OzoneReportDefs.ReasonType> =
+export const BSKY_LABELER_ONLY_REPORT_REASONS: Set<tools.ozone.report.defs.ReasonType> =
   new Set([
-    OzoneReportDefs.REASONCHILDSAFETYCSAM,
-    OzoneReportDefs.REASONCHILDSAFETYGROOM,
-    OzoneReportDefs.REASONCHILDSAFETYOTHER,
-    OzoneReportDefs.REASONVIOLENCEEXTREMISTCONTENT,
+    tools.ozone.report.defs.reasonChildSafetyCSAM.value,
+    tools.ozone.report.defs.reasonChildSafetyGroom.value,
+    tools.ozone.report.defs.reasonChildSafetyOther.value,
+    tools.ozone.report.defs.reasonViolenceExtremistContent.value,
   ])
 
 /**
diff --git a/src/components/moderation/ReportDialog/errors.test.ts b/src/components/moderation/ReportDialog/errors.test.ts
index 4a469c5eb2..bef4d2a38d 100644
--- a/src/components/moderation/ReportDialog/errors.test.ts
+++ b/src/components/moderation/ReportDialog/errors.test.ts
@@ -1,11 +1,24 @@
-import {XRPCError} from '@atproto/api'
+import {XrpcResponseError} from '@atproto/lex'
 
+import {com} from '#/lexicons'
 import {classifyReportError} from './errors'
 
+/**
+ * An error as the lex client builds one from a JSON error response body. The
+ * classifier only reads `error`, `message` and `status` back off it.
+ */
+function xrpcError(status: number, error: string, message: string) {
+  return new XrpcResponseError(
+    com.atproto.moderation.createReport.main,
+    new Response(null, {status}),
+    {encoding: 'application/json', body: {error, message}},
+  )
+}
+
 describe('classifyReportError', () => {
   it('treats account takedown as an expected rejection', () => {
     const result = classifyReportError(
-      new XRPCError(
+      xrpcError(
         403,
         'AccountTakedown',
         'Report not accepted from takendown account',
@@ -27,7 +40,7 @@ describe('classifyReportError', () => {
 
   it.each([
     {
-      error: new XRPCError(
+      error: xrpcError(
         502,
         'InternalServerError',
         'Failed to perform upstream request',
@@ -35,11 +48,11 @@ describe('classifyReportError', () => {
       bucket: 'upstream-fetch',
     },
     {
-      error: new XRPCError(502, 'UpstreamFailure', 'Internal Server Error'),
+      error: xrpcError(502, 'UpstreamFailure', 'Internal Server Error'),
       bucket: 'upstream-internal',
     },
     {
-      error: new XRPCError(
+      error: xrpcError(
         502,
         'UpstreamFailure',
         'Upstream server responded with a 502 error',
@@ -47,7 +60,7 @@ describe('classifyReportError', () => {
       bucket: 'upstream-http-502',
     },
     {
-      error: new XRPCError(
+      error: xrpcError(
         504,
         'UpstreamTimeout',
         'Upstream server responded with a 504 error',
@@ -64,7 +77,7 @@ describe('classifyReportError', () => {
 
   it('classifies an invalid reason type separately', () => {
     const result = classifyReportError(
-      new XRPCError(
+      xrpcError(
         400,
         'InvalidRequest',
         'Invalid reason type: tools.ozone.report.defs#reasonOther',
@@ -82,7 +95,7 @@ describe('classifyReportError', () => {
     'separates a non-retryable upstream %i without calling it temporary',
     status => {
       const result = classifyReportError(
-        new XRPCError(
+        xrpcError(
           502,
           'UpstreamFailure',
           `Upstream server responded with a ${status} error`,
diff --git a/src/components/moderation/ReportDialog/errors.ts b/src/components/moderation/ReportDialog/errors.ts
index 2dc71c8d23..2edb2bfc95 100644
--- a/src/components/moderation/ReportDialog/errors.ts
+++ b/src/components/moderation/ReportDialog/errors.ts
@@ -1,4 +1,4 @@
-import {XRPCError} from '@atproto/api'
+import {XrpcResponseError} from '@atproto/lex'
 
 import {isRetryableHttpStatus, shouldRetryError} from '#/lib/strings/errors'
 
@@ -16,7 +16,7 @@ export type ReportErrorClassification = {
 }
 
 export function classifyReportError(error: unknown): ReportErrorClassification {
-  if (!(error instanceof XRPCError)) {
+  if (!(error instanceof XrpcResponseError)) {
     return classification('unexpected', 'unexpected', true)
   }
 
diff --git a/src/components/moderation/ReportDialog/index.tsx b/src/components/moderation/ReportDialog/index.tsx
index 79ac0be690..01014a0d75 100644
--- a/src/components/moderation/ReportDialog/index.tsx
+++ b/src/components/moderation/ReportDialog/index.tsx
@@ -7,7 +7,7 @@ import {
   useState,
 } from 'react'
 import {Pressable, type ScrollView, View} from 'react-native'
-import {BSKY_LABELER_DID} from '@atproto/api'
+import {api} from '@bsky.app/sdk'
 import {Trans, useLingui} from '@lingui/react/macro'
 
 import {wait} from '#/lib/async/wait'
@@ -223,7 +223,7 @@ function Inner(
       .filter(l => {
         if (!state.selectedOption) return false
         if (isBskyOnlyReason || isBskyOnlySubject) {
-          return l.creator.did === BSKY_LABELER_DID
+          return l.creator.did === api.moderation.did
         }
         const supportedReasonTypes: string[] | undefined = l.reasonTypes
         if (supportedReasonTypes === undefined) return true
@@ -644,7 +644,7 @@ function Inner(
               </View>
 
               {videoTimestampSeconds !== undefined &&
-                state.selectedLabeler?.creator.did === BSKY_LABELER_DID && (
+                state.selectedLabeler?.creator.did === api.moderation.did && (
                   <IncludeVideoTimestampToggle
                     seconds={videoTimestampSeconds}
                     selected={state.includeVideoTimestamp}
diff --git a/src/components/moderation/ReportDialog/state.test.ts b/src/components/moderation/ReportDialog/state.test.ts
index 4129cdc9e5..6f64c1a7c3 100644
--- a/src/components/moderation/ReportDialog/state.test.ts
+++ b/src/components/moderation/ReportDialog/state.test.ts
@@ -1,6 +1,4 @@
-import {ToolsOzoneReportDefs as OzoneReportDefs} from '@atproto/api'
-
-import {type app} from '#/lexicons'
+import {type app, tools} from '#/lexicons'
 import {
   getNciiQualificationOutcome,
   initialState,
@@ -10,12 +8,12 @@ import {
 
 const nciiOption = {
   title: 'Non-consensual intimate imagery',
-  reason: OzoneReportDefs.REASONSEXUALNCII,
+  reason: tools.ozone.report.defs.reasonSexualNCII.value,
 }
 
 const otherOption = {
   title: 'Unlabeled adult content',
-  reason: OzoneReportDefs.REASONSEXUALUNLABELED,
+  reason: tools.ozone.report.defs.reasonSexualUnlabeled.value,
 }
 
 function selectNciiOption(state: ReportState = initialState) {
diff --git a/src/components/moderation/ReportDialog/state.ts b/src/components/moderation/ReportDialog/state.ts
index 2dc55a6638..9be5145ce7 100644
--- a/src/components/moderation/ReportDialog/state.ts
+++ b/src/components/moderation/ReportDialog/state.ts
@@ -1,11 +1,9 @@
-import {ToolsOzoneReportDefs as OzoneReportDefs} from '@atproto/api'
-
 import {OTHER_REPORT_REASONS} from '#/components/moderation/ReportDialog/const'
 import {
   type ReportCategoryConfig,
   type ReportOption,
 } from '#/components/moderation/ReportDialog/utils/useReportOptions'
-import {type app} from '#/lexicons'
+import {type app, tools} from '#/lexicons'
 
 export type NciiQualification = {
   isDepicted?: boolean
@@ -125,7 +123,8 @@ export function reducer(state: ReportState, action: ReportAction): ReportState {
         includeVideoTimestamp: false,
       }
     case 'selectOption': {
-      const isNcii = action.option.reason === OzoneReportDefs.REASONSEXUALNCII
+      const isNcii =
+        action.option.reason === tools.ozone.report.defs.reasonSexualNCII.value
       return {
         ...state,
         selectedOption: action.option,
diff --git a/src/components/moderation/ReportDialog/types.ts b/src/components/moderation/ReportDialog/types.ts
index 57ed3cd279..9b66cb72ce 100644
--- a/src/components/moderation/ReportDialog/types.ts
+++ b/src/components/moderation/ReportDialog/types.ts
@@ -1,17 +1,12 @@
-import {
-  type $Typed,
-  type AppBskyActorDefs,
-  type AppBskyFeedDefs,
-  type AppBskyGraphDefs,
-  type ChatBskyConvoDefs,
-} from '@atproto/api'
+import {type $Typed} from '@atproto/lex'
 
 import type * as Dialog from '#/components/Dialog'
+import {type app, type chat} from '#/lexicons'
 
 export type ReportSubjectConvoMessage = {
   view: 'convo' | 'message'
   convoId: string
-  message: ChatBskyConvoDefs.MessageView
+  message: chat.bsky.convo.defs.MessageView
 }
 
 export type ReportSubjectConvo = {
@@ -20,14 +15,14 @@ export type ReportSubjectConvo = {
 }
 
 export type ReportSubject =
-  | $Typed<AppBskyActorDefs.ProfileViewBasic>
-  | $Typed<AppBskyActorDefs.ProfileView>
-  | $Typed<AppBskyActorDefs.ProfileViewDetailed>
-  | $Typed<AppBskyActorDefs.StatusView>
-  | $Typed<AppBskyGraphDefs.ListView>
-  | $Typed<AppBskyFeedDefs.GeneratorView>
-  | $Typed<AppBskyGraphDefs.StarterPackView>
-  | $Typed<AppBskyFeedDefs.PostView>
+  | $Typed<app.bsky.actor.defs.ProfileViewBasic>
+  | $Typed<app.bsky.actor.defs.ProfileView>
+  | $Typed<app.bsky.actor.defs.ProfileViewDetailed>
+  | $Typed<app.bsky.actor.defs.StatusView>
+  | $Typed<app.bsky.graph.defs.ListView>
+  | $Typed<app.bsky.feed.defs.GeneratorView>
+  | $Typed<app.bsky.graph.defs.StarterPackView>
+  | $Typed<app.bsky.feed.defs.PostView>
   | ReportSubjectConvoMessage
   | ReportSubjectConvo
 
diff --git a/src/components/moderation/ReportDialog/utils/parseReportSubject.ts b/src/components/moderation/ReportDialog/utils/parseReportSubject.ts
index a7d4b94c32..8b03c7b02a 100644
--- a/src/components/moderation/ReportDialog/utils/parseReportSubject.ts
+++ b/src/components/moderation/ReportDialog/utils/parseReportSubject.ts
@@ -1,14 +1,8 @@
-import {
-  AppBskyActorDefs,
-  AppBskyFeedDefs,
-  AppBskyFeedPost,
-  AppBskyGraphDefs,
-} from '@atproto/api'
-
 import {
   type ParsedReportSubject,
   type ReportSubject,
 } from '#/components/moderation/ReportDialog/types'
+import {app} from '#/lexicons'
 import * as bsky from '#/types/bsky'
 
 export function parseReportSubject(
@@ -31,16 +25,16 @@ export function parseReportSubject(
   }
 
   if (
-    AppBskyActorDefs.isProfileViewBasic(subject) ||
-    AppBskyActorDefs.isProfileView(subject) ||
-    AppBskyActorDefs.isProfileViewDetailed(subject)
+    bsky.isType(app.bsky.actor.defs.profileViewBasic, subject) ||
+    bsky.isType(app.bsky.actor.defs.profileView, subject) ||
+    bsky.isType(app.bsky.actor.defs.profileViewDetailed, subject)
   ) {
     return {
       type: 'account',
       did: subject.did,
       nsid: 'app.bsky.actor.profile',
     }
-  } else if (AppBskyActorDefs.isStatusView(subject)) {
+  } else if (bsky.isType(app.bsky.actor.defs.statusView, subject)) {
     if (!subject.uri || !subject.cid) return
     return {
       type: 'status',
@@ -48,36 +42,31 @@ export function parseReportSubject(
       cid: subject.cid,
       nsid: 'app.bsky.actor.status',
     }
-  } else if (AppBskyGraphDefs.isListView(subject)) {
+  } else if (bsky.isType(app.bsky.graph.defs.listView, subject)) {
     return {
       type: 'list',
       uri: subject.uri,
       cid: subject.cid,
       nsid: 'app.bsky.graph.list',
     }
-  } else if (AppBskyFeedDefs.isGeneratorView(subject)) {
+  } else if (bsky.isType(app.bsky.feed.defs.generatorView, subject)) {
     return {
       type: 'feed',
       uri: subject.uri,
       cid: subject.cid,
       nsid: 'app.bsky.feed.generator',
     }
-  } else if (AppBskyGraphDefs.isStarterPackView(subject)) {
+  } else if (bsky.isType(app.bsky.graph.defs.starterPackView, subject)) {
     return {
       type: 'starterPack',
       uri: subject.uri,
       cid: subject.cid,
       nsid: 'app.bsky.graph.starterPack',
     }
-  } else if (AppBskyFeedDefs.isPostView(subject)) {
+  } else if (bsky.isType(app.bsky.feed.defs.postView, subject)) {
     const record = subject.record
     const embed = bsky.post.parseEmbed(subject.embed)
-    if (
-      bsky.dangerousIsType<AppBskyFeedPost.Record>(
-        record,
-        AppBskyFeedPost.isRecord,
-      )
-    ) {
+    if (bsky.isType(app.bsky.feed.post, record)) {
       return {
         type: 'post',
         uri: subject.uri,
diff --git a/src/components/moderation/ReportDialog/utils/useReportOptions.ts b/src/components/moderation/ReportDialog/utils/useReportOptions.ts
index 87553ce6ed..b4a2033780 100644
--- a/src/components/moderation/ReportDialog/utils/useReportOptions.ts
+++ b/src/components/moderation/ReportDialog/utils/useReportOptions.ts
@@ -1,8 +1,9 @@
 import {useMemo} from 'react'
-import {ToolsOzoneReportDefs as OzoneReportDefs} from '@atproto/api'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 
+import {tools} from '#/lexicons'
+
 export type ReportCategory =
   | 'childSafety'
   | 'violencePhysicalHarm'
@@ -22,7 +23,7 @@ export type ReportCategoryConfig = {
 
 export type ReportOption = {
   title: string
-  reason: OzoneReportDefs.ReasonType
+  reason: tools.ozone.report.defs.ReasonType
 }
 
 export function useReportOptions() {
@@ -37,27 +38,27 @@ export function useReportOptions() {
         options: [
           {
             title: _(msg`Spam`),
-            reason: OzoneReportDefs.REASONMISLEADINGSPAM,
+            reason: tools.ozone.report.defs.reasonMisleadingSpam.value,
           },
           {
             title: _(msg`Scam`),
-            reason: OzoneReportDefs.REASONMISLEADINGSCAM,
+            reason: tools.ozone.report.defs.reasonMisleadingScam.value,
           },
           {
             title: _(msg`Fake account or bot`),
-            reason: OzoneReportDefs.REASONMISLEADINGBOT,
+            reason: tools.ozone.report.defs.reasonMisleadingBot.value,
           },
           {
             title: _(msg`Impersonation`),
-            reason: OzoneReportDefs.REASONMISLEADINGIMPERSONATION,
+            reason: tools.ozone.report.defs.reasonMisleadingImpersonation.value,
           },
           {
             title: _(msg`False information about elections`),
-            reason: OzoneReportDefs.REASONMISLEADINGELECTIONS,
+            reason: tools.ozone.report.defs.reasonMisleadingElections.value,
           },
           {
             title: _(msg`Other misleading content`),
-            reason: OzoneReportDefs.REASONMISLEADINGOTHER,
+            reason: tools.ozone.report.defs.reasonMisleadingOther.value,
           },
         ],
       },
@@ -70,27 +71,27 @@ export function useReportOptions() {
         options: [
           {
             title: _(msg`Unlabeled adult content`),
-            reason: OzoneReportDefs.REASONSEXUALUNLABELED,
+            reason: tools.ozone.report.defs.reasonSexualUnlabeled.value,
           },
           {
             title: _(msg`Adult sexual abuse content`),
-            reason: OzoneReportDefs.REASONSEXUALABUSECONTENT,
+            reason: tools.ozone.report.defs.reasonSexualAbuseContent.value,
           },
           {
             title: _(msg`Non-consensual intimate imagery`),
-            reason: OzoneReportDefs.REASONSEXUALNCII,
+            reason: tools.ozone.report.defs.reasonSexualNCII.value,
           },
           {
             title: _(msg`Deepfake adult content`),
-            reason: OzoneReportDefs.REASONSEXUALDEEPFAKE,
+            reason: tools.ozone.report.defs.reasonSexualDeepfake.value,
           },
           {
             title: _(msg`Animal sexual abuse`),
-            reason: OzoneReportDefs.REASONSEXUALANIMAL,
+            reason: tools.ozone.report.defs.reasonSexualAnimal.value,
           },
           {
             title: _(msg`Other sexual violence content`),
-            reason: OzoneReportDefs.REASONSEXUALOTHER,
+            reason: tools.ozone.report.defs.reasonSexualOther.value,
           },
         ],
       },
@@ -101,23 +102,23 @@ export function useReportOptions() {
         options: [
           {
             title: _(msg`Trolling`),
-            reason: OzoneReportDefs.REASONHARASSMENTTROLL,
+            reason: tools.ozone.report.defs.reasonHarassmentTroll.value,
           },
           {
             title: _(msg`Targeted harassment`),
-            reason: OzoneReportDefs.REASONHARASSMENTTARGETED,
+            reason: tools.ozone.report.defs.reasonHarassmentTargeted.value,
           },
           {
             title: _(msg`Hate speech`),
-            reason: OzoneReportDefs.REASONHARASSMENTHATESPEECH,
+            reason: tools.ozone.report.defs.reasonHarassmentHateSpeech.value,
           },
           {
             title: _(msg`Doxxing`),
-            reason: OzoneReportDefs.REASONHARASSMENTDOXXING,
+            reason: tools.ozone.report.defs.reasonHarassmentDoxxing.value,
           },
           {
             title: _(msg`Other harassing or hateful content`),
-            reason: OzoneReportDefs.REASONHARASSMENTOTHER,
+            reason: tools.ozone.report.defs.reasonHarassmentOther.value,
           },
         ],
       },
@@ -128,31 +129,32 @@ export function useReportOptions() {
         options: [
           {
             title: _(msg`Animal welfare`),
-            reason: OzoneReportDefs.REASONVIOLENCEANIMAL,
+            reason: tools.ozone.report.defs.reasonViolenceAnimal.value,
           },
           {
             title: _(msg`Threats or incitement`),
-            reason: OzoneReportDefs.REASONVIOLENCETHREATS,
+            reason: tools.ozone.report.defs.reasonViolenceThreats.value,
           },
           {
             title: _(msg`Graphic violent content`),
-            reason: OzoneReportDefs.REASONVIOLENCEGRAPHICCONTENT,
+            reason: tools.ozone.report.defs.reasonViolenceGraphicContent.value,
           },
           {
             title: _(msg`Glorification of violence`),
-            reason: OzoneReportDefs.REASONVIOLENCEGLORIFICATION,
+            reason: tools.ozone.report.defs.reasonViolenceGlorification.value,
           },
           {
             title: _(msg`Extremist content`),
-            reason: OzoneReportDefs.REASONVIOLENCEEXTREMISTCONTENT,
+            reason:
+              tools.ozone.report.defs.reasonViolenceExtremistContent.value,
           },
           {
             title: _(msg`Human trafficking`),
-            reason: OzoneReportDefs.REASONVIOLENCETRAFFICKING,
+            reason: tools.ozone.report.defs.reasonViolenceTrafficking.value,
           },
           {
             title: _(msg`Other violent content`),
-            reason: OzoneReportDefs.REASONVIOLENCEOTHER,
+            reason: tools.ozone.report.defs.reasonViolenceOther.value,
           },
         ],
       },
@@ -163,23 +165,23 @@ export function useReportOptions() {
         options: [
           {
             title: _(msg`Child Sexual Abuse Material (CSAM)`),
-            reason: OzoneReportDefs.REASONCHILDSAFETYCSAM,
+            reason: tools.ozone.report.defs.reasonChildSafetyCSAM.value,
           },
           {
             title: _(msg`Grooming or predatory behavior`),
-            reason: OzoneReportDefs.REASONCHILDSAFETYGROOM,
+            reason: tools.ozone.report.defs.reasonChildSafetyGroom.value,
           },
           {
             title: _(msg`Privacy violation of a minor`),
-            reason: OzoneReportDefs.REASONCHILDSAFETYPRIVACY,
+            reason: tools.ozone.report.defs.reasonChildSafetyPrivacy.value,
           },
           {
             title: _(msg`Minor harassment or bullying`),
-            reason: OzoneReportDefs.REASONCHILDSAFETYHARASSMENT,
+            reason: tools.ozone.report.defs.reasonChildSafetyHarassment.value,
           },
           {
             title: _(msg`Other child safety issue`),
-            reason: OzoneReportDefs.REASONCHILDSAFETYOTHER,
+            reason: tools.ozone.report.defs.reasonChildSafetyOther.value,
           },
         ],
       },
@@ -190,23 +192,23 @@ export function useReportOptions() {
         options: [
           {
             title: _(msg`Content promoting or depicting self-harm`),
-            reason: OzoneReportDefs.REASONSELFHARMCONTENT,
+            reason: tools.ozone.report.defs.reasonSelfHarmContent.value,
           },
           {
             title: _(msg`Eating disorders`),
-            reason: OzoneReportDefs.REASONSELFHARMED,
+            reason: tools.ozone.report.defs.reasonSelfHarmED.value,
           },
           {
             title: _(msg`Dangerous challenges or activities`),
-            reason: OzoneReportDefs.REASONSELFHARMSTUNTS,
+            reason: tools.ozone.report.defs.reasonSelfHarmStunts.value,
           },
           {
             title: _(msg`Dangerous substances or drug abuse`),
-            reason: OzoneReportDefs.REASONSELFHARMSUBSTANCES,
+            reason: tools.ozone.report.defs.reasonSelfHarmSubstances.value,
           },
           {
             title: _(msg`Other dangerous content`),
-            reason: OzoneReportDefs.REASONSELFHARMOTHER,
+            reason: tools.ozone.report.defs.reasonSelfHarmOther.value,
           },
         ],
       },
@@ -217,19 +219,19 @@ export function useReportOptions() {
         options: [
           {
             title: _(msg`Hacking or system attacks`),
-            reason: OzoneReportDefs.REASONRULESITESECURITY,
+            reason: tools.ozone.report.defs.reasonRuleSiteSecurity.value,
           },
           {
             title: _(msg`Promoting or selling prohibited items or services`),
-            reason: OzoneReportDefs.REASONRULEPROHIBITEDSALES,
+            reason: tools.ozone.report.defs.reasonRuleProhibitedSales.value,
           },
           {
             title: _(msg`Banned user returning`),
-            reason: OzoneReportDefs.REASONRULEBANEVASION,
+            reason: tools.ozone.report.defs.reasonRuleBanEvasion.value,
           },
           {
             title: _(msg`Other network rule-breaking`),
-            reason: OzoneReportDefs.REASONRULEOTHER,
+            reason: tools.ozone.report.defs.reasonRuleOther.value,
           },
         ],
       },
@@ -240,7 +242,7 @@ export function useReportOptions() {
         options: [
           {
             title: _(msg`Other`),
-            reason: OzoneReportDefs.REASONOTHER,
+            reason: tools.ozone.report.defs.reasonOther.value,
           },
         ],
       },
diff --git a/src/components/verification/VerificationRemovePrompt.tsx b/src/components/verification/VerificationRemovePrompt.tsx
index 96b119ceb1..5eeafecb3a 100644
--- a/src/components/verification/VerificationRemovePrompt.tsx
+++ b/src/components/verification/VerificationRemovePrompt.tsx
@@ -1,5 +1,4 @@
 import {useCallback} from 'react'
-import {type AppBskyActorDefs} from '@atproto/api'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 
@@ -8,6 +7,7 @@ import {useVerificationsRemoveMutation} from '#/state/queries/verification/useVe
 import {type DialogControlProps} from '#/components/Dialog'
 import * as Prompt from '#/components/Prompt'
 import * as Toast from '#/components/Toast'
+import {type app} from '#/lexicons'
 import type * as bsky from '#/types/bsky'
 
 export {useDialogControl as usePromptControl} from '#/components/Dialog'
@@ -20,7 +20,7 @@ export function VerificationRemovePrompt({
 }: {
   control: DialogControlProps
   profile: bsky.profile.AnyProfileView
-  verifications: AppBskyActorDefs.VerificationView[]
+  verifications: app.bsky.actor.defs.VerificationView[]
   onConfirm?: () => void
 }) {
   const {_} = useLingui()
diff --git a/src/components/verification/VerificationsDialog.tsx b/src/components/verification/VerificationsDialog.tsx
index cb24b182a5..5f3562ee6e 100644
--- a/src/components/verification/VerificationsDialog.tsx
+++ b/src/components/verification/VerificationsDialog.tsx
@@ -1,5 +1,4 @@
 import {View} from 'react-native'
-import {type AppBskyActorDefs} from '@atproto/api'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
@@ -21,6 +20,7 @@ import {Text} from '#/components/Typography'
 import {type FullVerificationState} from '#/components/verification'
 import {VerificationRemovePrompt} from '#/components/verification/VerificationRemovePrompt'
 import {useAnalytics} from '#/analytics'
+import {type app} from '#/lexicons'
 import type * as bsky from '#/types/bsky'
 
 export {useDialogControl} from '#/components/Dialog'
@@ -180,7 +180,7 @@ function VerifierCard({
   subject,
   outerDialogControl,
 }: {
-  verification: AppBskyActorDefs.VerificationView
+  verification: app.bsky.actor.defs.VerificationView
   subject: bsky.profile.AnyProfileView
   outerDialogControl: Dialog.DialogControlProps
 }) {
diff --git a/src/env/common.ts b/src/env/common.ts
index 5d8d89aace..bcda2e4982 100644
--- a/src/env/common.ts
+++ b/src/env/common.ts
@@ -1,4 +1,4 @@
-import {type Did} from '@atproto/api'
+import {type DidString} from '@atproto/syntax'
 
 import packageJson from '#/../package.json'
 
@@ -75,14 +75,16 @@ export const LOG_DEBUG: string = process.env.EXPO_PUBLIC_LOG_DEBUG || ''
 /**
  * The DID of the Bluesky appview to proxy to
  */
-export const BLUESKY_PROXY_DID: Did =
-  process.env.EXPO_PUBLIC_BLUESKY_PROXY_DID || 'did:web:api.bsky.app'
+export const BLUESKY_PROXY_DID: DidString =
+  (process.env.EXPO_PUBLIC_BLUESKY_PROXY_DID as DidString) ||
+  'did:web:api.bsky.app'
 
 /**
  * The DID of the chat service to proxy to
  */
-export const CHAT_PROXY_DID: Did =
-  process.env.EXPO_PUBLIC_CHAT_PROXY_DID || 'did:web:api.bsky.chat'
+export const CHAT_PROXY_DID: DidString =
+  (process.env.EXPO_PUBLIC_CHAT_PROXY_DID as DidString) ||
+  'did:web:api.bsky.chat'
 
 /**
  * Metrics API host
diff --git a/src/features/inviteFriends/urls.ts b/src/features/inviteFriends/urls.ts
index 7a22b8faf4..776a8bdf16 100644
--- a/src/features/inviteFriends/urls.ts
+++ b/src/features/inviteFriends/urls.ts
@@ -7,7 +7,7 @@
  * label simply drops the `https://` scheme for readability.
  *
  * Kept as a dependency-free leaf module (no #/lib/strings/url-helpers import)
- * so its unit tests stay fast and isolated from the heavy @atproto/api graph.
+ * so its unit tests stay fast and isolated from the lexicon graph.
  */
 
 function stripLeadingAt(handle: string): string {
diff --git a/src/features/liveNow/components/EditLiveDialog.tsx b/src/features/liveNow/components/EditLiveDialog.tsx
index cf913541a1..f5c5a38462 100644
--- a/src/features/liveNow/components/EditLiveDialog.tsx
+++ b/src/features/liveNow/components/EditLiveDialog.tsx
@@ -1,6 +1,5 @@
 import {useMemo, useState} from 'react'
 import {View} from 'react-native'
-import {type AppBskyActorDefs, type AppBskyEmbedExternal} from '@atproto/api'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
@@ -26,6 +25,7 @@ import {
   useUpsertLiveStatusMutation,
 } from '#/features/liveNow'
 import {LinkPreview} from '#/features/liveNow/components/LinkPreview'
+import {type app} from '#/lexicons'
 
 export function EditLiveDialog({
   control,
@@ -33,8 +33,8 @@ export function EditLiveDialog({
   embed,
 }: {
   control: Dialog.DialogControlProps
-  status: AppBskyActorDefs.StatusView
-  embed: AppBskyEmbedExternal.View
+  status: app.bsky.actor.defs.StatusView
+  embed: app.bsky.embed.external.View
 }) {
   return (
     <Dialog.Outer control={control} nativeOptions={{preventExpansion: true}}>
@@ -48,14 +48,16 @@ function DialogInner({
   status,
   embed,
 }: {
-  status: AppBskyActorDefs.StatusView
-  embed: AppBskyEmbedExternal.View
+  status: app.bsky.actor.defs.StatusView
+  embed: app.bsky.embed.external.View
 }) {
   const control = Dialog.useDialogContext()
   const {_, i18n} = useLingui()
   const t = useTheme()
 
-  const [liveLink, setLiveLink] = useState(embed.external.uri)
+  /* Holds the user-editable link text, so it is a plain string rather than
+   * the branded `uri` the view it was seeded from carries. */
+  const [liveLink, setLiveLink] = useState<string>(embed.external.uri)
   const [liveLinkError, setLiveLinkError] = useState('')
   const tick = useTickEveryMinute()
 
diff --git a/src/features/liveNow/components/GoLiveDisabledDialog.tsx b/src/features/liveNow/components/GoLiveDisabledDialog.tsx
index fda33a9067..3de918d0bd 100644
--- a/src/features/liveNow/components/GoLiveDisabledDialog.tsx
+++ b/src/features/liveNow/components/GoLiveDisabledDialog.tsx
@@ -1,7 +1,5 @@
 import {useCallback, useState} from 'react'
 import {View} from 'react-native'
-import {type AppBskyActorDefs, ToolsOzoneReportDefs} from '@atproto/api'
-import {type AtUriString} from '@atproto/syntax'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
@@ -16,14 +14,14 @@ import * as Dialog from '#/components/Dialog'
 import {Loader} from '#/components/Loader'
 import * as Toast from '#/components/Toast'
 import {Text} from '#/components/Typography'
-import {com} from '#/lexicons'
+import {type app, com, tools} from '#/lexicons'
 
 export function GoLiveDisabledDialog({
   control,
   status,
 }: {
   control: Dialog.DialogControlProps
-  status: AppBskyActorDefs.StatusView
+  status: app.bsky.actor.defs.StatusView
 }) {
   return (
     <Dialog.Outer control={control} nativeOptions={{preventExpansion: true}}>
@@ -38,7 +36,7 @@ export function DialogInner({
   status,
 }: {
   control: Dialog.DialogControlProps
-  status: AppBskyActorDefs.StatusView
+  status: app.bsky.actor.defs.StatusView
 }) {
   const {_} = useLingui()
   const client = useAppviewClient()
@@ -61,11 +59,11 @@ export function DialogInner({
         await client.call(
           com.atproto.moderation.createReport,
           {
-            reasonType: ToolsOzoneReportDefs.REASONAPPEAL,
+            reasonType: tools.ozone.report.defs.reasonAppeal.value,
             subject: {
               $type: 'com.atproto.repo.strongRef',
               // a status view's uri is an at-uri produced by the appview
-              uri: status.uri as AtUriString,
+              uri: status.uri,
               cid: status.cid,
             },
             reason: details,
diff --git a/src/features/liveNow/components/LiveStatusDialog.tsx b/src/features/liveNow/components/LiveStatusDialog.tsx
index ba69b35ff9..9559ca34fd 100644
--- a/src/features/liveNow/components/LiveStatusDialog.tsx
+++ b/src/features/liveNow/components/LiveStatusDialog.tsx
@@ -1,13 +1,12 @@
 import {useCallback, useMemo} from 'react'
 import {View} from 'react-native'
 import {Image} from 'expo-image'
-import {type AppBskyActorDefs, type AppBskyEmbedExternal} from '@atproto/api'
+import {moderateStatus} from '@bsky.app/sdk/moderation'
 import {Trans, useLingui} from '@lingui/react/macro'
 import {useNavigation} from '@react-navigation/native'
 import {useQueryClient} from '@tanstack/react-query'
 
 import {useOpenLink} from '#/lib/hooks/useOpenLink'
-import {moderateStatus} from '#/lib/moderation/subjects'
 import {type NavigationProp} from '#/lib/routes/types'
 import {sanitizeHandle} from '#/lib/strings/handles'
 import {toNiceDomain} from '#/lib/strings/url-helpers'
@@ -27,6 +26,7 @@ import * as ProfileCard from '#/components/ProfileCard'
 import {Text} from '#/components/Typography'
 import {useAnalytics} from '#/analytics'
 import {LiveIndicator} from '#/features/liveNow/components/LiveIndicator'
+import {type app} from '#/lexicons'
 import type * as bsky from '#/types/bsky'
 
 export function LiveStatusDialog({
@@ -37,8 +37,8 @@ export function LiveStatusDialog({
 }: {
   control: Dialog.DialogControlProps
   profile: bsky.profile.AnyProfileView
-  status: AppBskyActorDefs.StatusView
-  embed: AppBskyEmbedExternal.View
+  status: app.bsky.actor.defs.StatusView
+  embed: app.bsky.embed.external.View
 }) {
   const navigation = useNavigation<NavigationProp>()
   return (
@@ -61,9 +61,9 @@ function DialogInner({
   status,
 }: {
   profile: bsky.profile.AnyProfileView
-  embed: AppBskyEmbedExternal.View
+  embed: app.bsky.embed.external.View
   navigation: NavigationProp
-  status: AppBskyActorDefs.StatusView
+  status: app.bsky.actor.defs.StatusView
 }) {
   const {t: l} = useLingui()
   const control = Dialog.useDialogContext()
@@ -99,9 +99,9 @@ export function LiveStatus({
   padding = 'xl',
   onPressOpenProfile,
 }: {
-  status: AppBskyActorDefs.StatusView
+  status: app.bsky.actor.defs.StatusView
   profile: bsky.profile.AnyProfileView
-  embed: AppBskyEmbedExternal.View
+  embed: app.bsky.embed.external.View
   padding?: 'lg' | 'xl'
   onPressOpenProfile: () => void
 }) {
diff --git a/src/features/liveNow/index.tsx b/src/features/liveNow/index.tsx
index ec96777e85..88daad4df7 100644
--- a/src/features/liveNow/index.tsx
+++ b/src/features/liveNow/index.tsx
@@ -1,12 +1,8 @@
 import {useMemo} from 'react'
-import {
-  type $Typed,
-  type AppBskyActorDefs,
-  AppBskyEmbedExternal,
-} from '@atproto/api'
 import {retry} from '@atproto/common-web'
-import {type l} from '@atproto/lex'
+import {type $Typed, type l, type UriString} from '@atproto/lex'
 import {type AtIdentifierString, AtUri, toDatetimeString} from '@atproto/syntax'
+import {moderateStatus} from '@bsky.app/sdk/moderation'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {useMutation, useQuery, useQueryClient} from '@tanstack/react-query'
@@ -15,7 +11,6 @@ import {isAfter, parseISO} from 'date-fns'
 import {uploadBlob} from '#/lib/api'
 import {imageToThumb} from '#/lib/api/resolve'
 import {getLinkMeta, type LinkMeta} from '#/lib/link-meta/link-meta'
-import {moderateStatus} from '#/lib/moderation/subjects'
 import {matchXrpcError} from '#/lib/xrpc-error'
 import {useAppConfig} from '#/state/appConfig'
 import {
@@ -30,7 +25,7 @@ import * as Toast from '#/components/Toast'
 import {useAnalytics} from '#/analytics'
 import {getLiveNowHost, getLiveServiceNames} from '#/features/liveNow/utils'
 import {app, com} from '#/lexicons'
-import type * as bsky from '#/types/bsky'
+import * as bsky from '#/types/bsky'
 
 export * from '#/features/liveNow/utils'
 
@@ -48,7 +43,7 @@ const DEFAULT_STATE = {
   isDisabled: false,
   isActive: false,
   record: {},
-} satisfies AppBskyActorDefs.StatusView
+} satisfies app.bsky.actor.defs.StatusView
 
 export type LiveNowConfig = {
   canGoLive: boolean
@@ -135,10 +130,10 @@ export function useActorStatus(actor?: bsky.profile.AnyProfileView) {
           isDisabled: false,
           isActive: true,
           status: 'app.bsky.actor.status#live',
-          embed: shadowed.status.embed as $Typed<AppBskyEmbedExternal.View>, // temp_isStatusValid asserts this
+          embed: shadowed.status.embed as $Typed<app.bsky.embed.external.View>, // temp_isStatusValid asserts this
           expiresAt: shadowed.status.expiresAt!, // isStatusStillActive asserts this
           record: shadowed.status.record,
-        } satisfies AppBskyActorDefs.StatusView
+        } satisfies app.bsky.actor.defs.StatusView
       }
       return {
         uri: shadowed.status.uri,
@@ -146,10 +141,10 @@ export function useActorStatus(actor?: bsky.profile.AnyProfileView) {
         isDisabled,
         isActive: false,
         status: 'app.bsky.actor.status#live',
-        embed: shadowed.status.embed as $Typed<AppBskyEmbedExternal.View>, // temp_isStatusValid asserts this
+        embed: shadowed.status.embed as $Typed<app.bsky.embed.external.View>, // temp_isStatusValid asserts this
         expiresAt: shadowed.status.expiresAt!, // isStatusStillActive asserts this
         record: shadowed.status.record,
-      } satisfies AppBskyActorDefs.StatusView
+      } satisfies app.bsky.actor.defs.StatusView
     } else {
       return DEFAULT_STATE
     }
@@ -169,14 +164,14 @@ export function isStatusStillActive(timeStr: string | undefined) {
  * validate if the status is valid for the acting user e.g. as they go live.
  */
 export function isStatusValidForViewers(
-  status: AppBskyActorDefs.StatusView,
+  status: app.bsky.actor.defs.StatusView,
   config: LiveNowConfig,
 ) {
   if (status.status !== 'app.bsky.actor.status#live') return false
   if (!status.uri) return false // should not happen, just backwards compat
   try {
     const {host: liveDid} = new AtUri(status.uri)
-    if (AppBskyEmbedExternal.isView(status.embed)) {
+    if (bsky.isType(app.bsky.embed.external.view, status.embed)) {
       const host = getLiveNowHost(status.embed.external.uri)
       const exception = config.allowedHostsExceptionsByDid.get(liveDid)
       const isValidException = exception ? exception.has(host) : false
@@ -340,7 +335,7 @@ export function useUpsertLiveStatusMutation(
             $type: 'app.bsky.actor.defs#statusView',
             status: 'app.bsky.actor.status#live',
             isActive: true,
-            expiresAt: expiresAt.toISOString(),
+            expiresAt: toDatetimeString(expiresAt),
             embed:
               record.embed && image
                 ? {
@@ -348,7 +343,8 @@ export function useUpsertLiveStatusMutation(
                     external: {
                       ...record.embed.external,
                       $type: 'app.bsky.embed.external#viewExternal',
-                      thumb: image,
+                      // an opengraph image URL from link resolution
+                      thumb: image as UriString,
                     },
                   }
                 : undefined,
diff --git a/src/features/liveNow/utils.ts b/src/features/liveNow/utils.ts
index a7326cd8e9..a4fb0bbf62 100644
--- a/src/features/liveNow/utils.ts
+++ b/src/features/liveNow/utils.ts
@@ -1,19 +1,19 @@
-import {AppBskyActorStatus, AppBskyEmbedExternal} from '@atproto/api'
 import {type I18n} from '@lingui/core'
 import {plural} from '@lingui/core/macro'
 import psl from 'psl'
 
+import {app} from '#/lexicons'
+import * as bsky from '#/types/bsky'
+
 /**
  * Validates a raw status record and returns the typed record, or null if the
  * value is not a valid `app.bsky.actor.status` record.
  */
 export function getValidLiveStatusRecord(
   statusRecord: unknown,
-): AppBskyActorStatus.Record | null {
-  if (!AppBskyActorStatus.isRecord(statusRecord)) return null
-  const validation = AppBskyActorStatus.validateRecord(statusRecord)
-  if (!validation.success) return null
-  return validation.value
+): app.bsky.actor.status.Main | null {
+  if (!bsky.matches(app.bsky.actor.status, statusRecord)) return null
+  return statusRecord
 }
 
 /**
@@ -23,7 +23,7 @@ export function getValidLiveStatusRecord(
 export function getLiveLinkFromStatusRecord(statusRecord: unknown): string {
   const record = getValidLiveStatusRecord(statusRecord)
   if (!record) return ''
-  if (!AppBskyEmbedExternal.isMain(record.embed)) return ''
+  if (!bsky.isType(app.bsky.embed.external.main, record.embed)) return ''
   return record.embed.external.uri
 }
 
diff --git a/src/lib/api/__tests__/computeCid.test.ts b/src/lib/api/__tests__/computeCid.test.ts
index ce0adc4a85..d5f8b50726 100644
--- a/src/lib/api/__tests__/computeCid.test.ts
+++ b/src/lib/api/__tests__/computeCid.test.ts
@@ -7,7 +7,6 @@
 jest.unmock('multiformats/cid')
 jest.unmock('multiformats/hashes/hasher')
 
-import {BlobRef} from '@atproto/api'
 import {CID} from 'multiformats/cid'
 
 import {computeCid} from '#/lib/api/computeCid'
@@ -67,8 +66,8 @@ describe('computeCid', () => {
      * `{$type: 'blob', ref, mimeType, size}` with `ref` a parsed CID. The
      * structural lex-blob guard passes it through `prepareForHashing`
      * untouched and DAG-CBOR encodes its CID `ref` as a CID link. The golden
-     * CID below is the byte-identical value the pre-migration `BlobRef` class
-     * instance produced via `.ipld()`.
+     * CID below is the byte-identical value the pre-migration legacy blob
+     * class instance produced via `.ipld()`.
      */
     const blob = {
       $type: 'blob' as const,
@@ -81,18 +80,6 @@ describe('computeCid', () => {
     )
   })
 
-  it('case 2b: a legacy BlobRef instance hashes to the same CID', async () => {
-    /*
-     * The video pipeline still yields legacy `BlobRef` class instances, so
-     * `prepareForHashing` keeps its `instanceof` guard. Both branches must
-     * agree: this asserts the SAME golden CID as case 2.
-     */
-    const blob = new BlobRef(CID.parse(BLOB_CID), 'image/jpeg', 12345)
-    expect(await computeCid(postWithImageBlob(blob))).toBe(
-      'bafyreiem7g6vja66nebr7he4fshfnlyndyldbvle2n265oixscmepjcbii',
-    )
-  })
-
   it('case 3: three-post thread chains reply StrongRef CIDs', async () => {
     const did = 'did:plc:abc123'
     const base = new Date('2024-01-01T00:00:00.000Z')
diff --git a/src/lib/api/computeCid.ts b/src/lib/api/computeCid.ts
index 18821793ae..edd23e5901 100644
--- a/src/lib/api/computeCid.ts
+++ b/src/lib/api/computeCid.ts
@@ -1,4 +1,3 @@
-import {BlobRef} from '@atproto/api'
 import {sha256} from 'js-sha256'
 import {CID} from 'multiformats/cid'
 import * as Hasher from 'multiformats/hashes/hasher'
@@ -73,17 +72,6 @@ function prepareForHashing(v: any): any {
     return v
   }
 
-  /*
-   * The video pipeline still reads its blob off the legacy agent
-   * (`app.bsky.video.getJobStatus` in composer `state/video`), which yields a
-   * `BlobRef` class instance. `ipld()` gives the same IPLD shape a lex blob
-   * already has, so both branches hash identically. Drop this guard once the
-   * video client is migrated.
-   */
-  if (v instanceof BlobRef) {
-    return v.ipld()
-  }
-
   // Walk through arrays
   if (Array.isArray(v)) {
     let pure = true
diff --git a/src/lib/api/feed-manip.ts b/src/lib/api/feed-manip.ts
index 335bf28c84..cd99fc9d57 100644
--- a/src/lib/api/feed-manip.ts
+++ b/src/lib/api/feed-manip.ts
@@ -1,17 +1,10 @@
-import {
-  type AppBskyActorDefs,
-  AppBskyEmbedRecord,
-  AppBskyEmbedRecordWithMedia,
-  AppBskyFeedDefs,
-  AppBskyFeedPost,
-} from '@atproto/api'
-
+import {app} from '#/lexicons'
 import * as bsky from '#/types/bsky'
 import {isPostInLanguage} from '../../locale/helpers'
 import {FALLBACK_MARKER_POST} from './feed/home'
 import {type ReasonFeedSource} from './feed/types'
 
-type FeedViewPost = AppBskyFeedDefs.FeedViewPost
+type FeedViewPost = app.bsky.feed.defs.FeedViewPost
 
 export type FeedTunerFn = (
   tuner: FeedTuner,
@@ -20,18 +13,18 @@ export type FeedTunerFn = (
 ) => FeedViewPostsSlice[]
 
 type FeedSliceItem = {
-  post: AppBskyFeedDefs.PostView
-  record: AppBskyFeedPost.Record
-  parentAuthor: AppBskyActorDefs.ProfileViewBasic | undefined
+  post: app.bsky.feed.defs.PostView
+  record: app.bsky.feed.post.Main
+  parentAuthor: app.bsky.actor.defs.ProfileViewBasic | undefined
   isParentBlocked: boolean
   isParentNotFound: boolean
 }
 
 type AuthorContext = {
-  author: AppBskyActorDefs.ProfileViewBasic
-  parentAuthor: AppBskyActorDefs.ProfileViewBasic | undefined
-  grandparentAuthor: AppBskyActorDefs.ProfileViewBasic | undefined
-  rootAuthor: AppBskyActorDefs.ProfileViewBasic | undefined
+  author: app.bsky.actor.defs.ProfileViewBasic
+  parentAuthor: app.bsky.actor.defs.ProfileViewBasic | undefined
+  grandparentAuthor: app.bsky.actor.defs.ProfileViewBasic | undefined
+  rootAuthor: app.bsky.actor.defs.ProfileViewBasic | undefined
 }
 
 export class FeedViewPostsSlice {
@@ -53,7 +46,7 @@ export class FeedViewPostsSlice {
     this.isOrphan = false
     this.isThreadMuted = post.viewer?.threadMuted ?? false
     this.feedPostUri = post.uri
-    if (AppBskyFeedDefs.isPostView(reply?.root)) {
+    if (bsky.isType(app.bsky.feed.defs.postView, reply?.root)) {
       this.rootUri = reply.root.uri
     } else {
       this.rootUri = post.uri
@@ -69,16 +62,19 @@ export class FeedViewPostsSlice {
       return
     }
     if (
-      !AppBskyFeedPost.isRecord(post.record) ||
-      !bsky.validate(post.record, AppBskyFeedPost.validateRecord)
+      !bsky.isType(app.bsky.feed.post, post.record) ||
+      !bsky.matches(app.bsky.feed.post, post.record)
     ) {
       return
     }
     const parent = reply?.parent
-    const isParentBlocked = AppBskyFeedDefs.isBlockedPost(parent)
-    const isParentNotFound = AppBskyFeedDefs.isNotFoundPost(parent)
-    let parentAuthor: AppBskyActorDefs.ProfileViewBasic | undefined
-    if (AppBskyFeedDefs.isPostView(parent)) {
+    const isParentBlocked = bsky.isType(app.bsky.feed.defs.blockedPost, parent)
+    const isParentNotFound = bsky.isType(
+      app.bsky.feed.defs.notFoundPost,
+      parent,
+    )
+    let parentAuthor: app.bsky.actor.defs.ProfileViewBasic | undefined
+    if (bsky.isType(app.bsky.feed.defs.postView, parent)) {
       parentAuthor = parent.author
     }
     this.items.push({
@@ -100,18 +96,18 @@ export class FeedViewPostsSlice {
       return
     }
     if (
-      !AppBskyFeedDefs.isPostView(parent) ||
-      !AppBskyFeedPost.isRecord(parent.record) ||
-      !bsky.validate(parent.record, AppBskyFeedPost.validateRecord)
+      !bsky.isType(app.bsky.feed.defs.postView, parent) ||
+      !bsky.isType(app.bsky.feed.post, parent.record) ||
+      !bsky.matches(app.bsky.feed.post, parent.record)
     ) {
       this.isOrphan = true
       return
     }
     const root = reply.root
     const rootIsView =
-      AppBskyFeedDefs.isPostView(root) ||
-      AppBskyFeedDefs.isBlockedPost(root) ||
-      AppBskyFeedDefs.isNotFoundPost(root)
+      bsky.isType(app.bsky.feed.defs.postView, root) ||
+      bsky.isType(app.bsky.feed.defs.blockedPost, root) ||
+      bsky.isType(app.bsky.feed.defs.notFoundPost, root)
     /*
      * If the parent is also the root, we just so happen to have the data we
      * need to compute if the parent's parent (grandparent) is blocked. This
@@ -124,10 +120,10 @@ export class FeedViewPostsSlice {
         : undefined
     const grandparentAuthor = reply.grandparentAuthor
     const isGrandparentBlocked = Boolean(
-      grandparent && AppBskyFeedDefs.isBlockedPost(grandparent),
+      grandparent && bsky.isType(app.bsky.feed.defs.blockedPost, grandparent),
     )
     const isGrandparentNotFound = Boolean(
-      grandparent && AppBskyFeedDefs.isNotFoundPost(grandparent),
+      grandparent && bsky.isType(app.bsky.feed.defs.notFoundPost, grandparent),
     )
     this.items.unshift({
       post: parent,
@@ -142,9 +138,9 @@ export class FeedViewPostsSlice {
       // de-deduping
     }
     if (
-      !AppBskyFeedDefs.isPostView(root) ||
-      !AppBskyFeedPost.isRecord(root.record) ||
-      !bsky.validate(root.record, AppBskyFeedPost.validateRecord)
+      !bsky.isType(app.bsky.feed.defs.postView, root) ||
+      !bsky.isType(app.bsky.feed.post, root.record) ||
+      !bsky.matches(app.bsky.feed.post, root.record)
     ) {
       this.isOrphan = true
       return
@@ -167,14 +163,14 @@ export class FeedViewPostsSlice {
   get isQuotePost() {
     const embed = this._feedPost.post.embed
     return (
-      AppBskyEmbedRecord.isView(embed) ||
-      AppBskyEmbedRecordWithMedia.isView(embed)
+      bsky.isType(app.bsky.embed.record.view, embed) ||
+      bsky.isType(app.bsky.embed.recordWithMedia.view, embed)
     )
   }
 
   get isReply() {
     return (
-      AppBskyFeedPost.isRecord(this._feedPost.post.record) &&
+      bsky.isType(app.bsky.feed.post, this._feedPost.post.record) &&
       !!this._feedPost.post.record.reply
     )
   }
@@ -195,7 +191,7 @@ export class FeedViewPostsSlice {
 
   get isRepost() {
     const reason = this._feedPost.reason
-    return AppBskyFeedDefs.isReasonRepost(reason)
+    return bsky.isType(app.bsky.feed.defs.reasonRepost, reason)
   }
 
   get likeCount() {
@@ -208,18 +204,18 @@ export class FeedViewPostsSlice {
 
   getAuthors(): AuthorContext {
     const feedPost = this._feedPost
-    let author: AppBskyActorDefs.ProfileViewBasic = feedPost.post.author
-    let parentAuthor: AppBskyActorDefs.ProfileViewBasic | undefined
-    let grandparentAuthor: AppBskyActorDefs.ProfileViewBasic | undefined
-    let rootAuthor: AppBskyActorDefs.ProfileViewBasic | undefined
+    let author: app.bsky.actor.defs.ProfileViewBasic = feedPost.post.author
+    let parentAuthor: app.bsky.actor.defs.ProfileViewBasic | undefined
+    let grandparentAuthor: app.bsky.actor.defs.ProfileViewBasic | undefined
+    let rootAuthor: app.bsky.actor.defs.ProfileViewBasic | undefined
     if (feedPost.reply) {
-      if (AppBskyFeedDefs.isPostView(feedPost.reply.parent)) {
+      if (bsky.isType(app.bsky.feed.defs.postView, feedPost.reply.parent)) {
         parentAuthor = feedPost.reply.parent.author
       }
       if (feedPost.reply.grandparentAuthor) {
         grandparentAuthor = feedPost.reply.grandparentAuthor
       }
-      if (AppBskyFeedDefs.isPostView(feedPost.reply.root)) {
+      if (bsky.isType(app.bsky.feed.defs.postView, feedPost.reply.root)) {
         rootAuthor = feedPost.reply.root.author
       }
     }
@@ -514,7 +510,7 @@ function shouldDisplayReplyInFollowing(
 }
 
 function isSelfOrFollowing(
-  profile: AppBskyActorDefs.ProfileViewBasic,
+  profile: app.bsky.actor.defs.ProfileViewBasic,
   userDid: string,
 ) {
   return Boolean(profile.did === userDid || profile.viewer?.following)
diff --git a/src/lib/api/feed/author.ts b/src/lib/api/feed/author.ts
index 92f8d327b4..76e6433f69 100644
--- a/src/lib/api/feed/author.ts
+++ b/src/lib/api/feed/author.ts
@@ -1,7 +1,7 @@
-import {AppBskyFeedDefs} from '@atproto/api'
 import {type Client, type XrpcRequestParams} from '@atproto/lex'
 
 import {app} from '#/lexicons'
+import * as bsky from '#/types/bsky'
 import {type FeedAPI, type FeedAPIResponse} from './types'
 
 type GetAuthorFeedParams = XrpcRequestParams<
@@ -29,7 +29,7 @@ export class AuthorFeedAPI implements FeedAPI {
     return params
   }
 
-  async peekLatest(): Promise<AppBskyFeedDefs.FeedViewPost> {
+  async peekLatest(): Promise<app.bsky.feed.defs.FeedViewPost> {
     const data = await this.client.call(app.bsky.feed.getAuthorFeed, {
       ...this.params,
       limit: 1,
@@ -61,12 +61,15 @@ export class AuthorFeedAPI implements FeedAPI {
     }
   }
 
-  _filter(feed: AppBskyFeedDefs.FeedViewPost[]) {
+  _filter(feed: app.bsky.feed.defs.FeedViewPost[]) {
     if (this.params.filter === 'posts_and_author_threads') {
       return feed.filter(post => {
         const isReply = post.reply
-        const isRepost = AppBskyFeedDefs.isReasonRepost(post.reason)
-        const isPin = AppBskyFeedDefs.isReasonPin(post.reason)
+        const isRepost = bsky.isType(
+          app.bsky.feed.defs.reasonRepost,
+          post.reason,
+        )
+        const isPin = bsky.isType(app.bsky.feed.defs.reasonPin, post.reason)
         if (!isReply) return true
         if (isRepost || isPin) return true
         return isReply && isAuthorReplyChain(this.params.actor, post, feed)
@@ -79,15 +82,15 @@ export class AuthorFeedAPI implements FeedAPI {
 
 function isAuthorReplyChain(
   actor: string,
-  post: AppBskyFeedDefs.FeedViewPost,
-  posts: AppBskyFeedDefs.FeedViewPost[],
+  post: app.bsky.feed.defs.FeedViewPost,
+  posts: app.bsky.feed.defs.FeedViewPost[],
 ): boolean {
   // current post is by a different user (shouldn't happen)
   if (post.post.author.did !== actor) return false
 
   const replyParent = post.reply?.parent
 
-  if (AppBskyFeedDefs.isPostView(replyParent)) {
+  if (bsky.isType(app.bsky.feed.defs.postView, replyParent)) {
     // reply parent is by a different user
     if (replyParent.author.did !== actor) return false
 
diff --git a/src/lib/api/feed/custom.ts b/src/lib/api/feed/custom.ts
index 6d960813d3..6185f788df 100644
--- a/src/lib/api/feed/custom.ts
+++ b/src/lib/api/feed/custom.ts
@@ -1,5 +1,4 @@
-import {type AppBskyFeedDefs, jsonStringToLex} from '@atproto/api'
-import {Client, type XrpcRequestParams} from '@atproto/lex'
+import {Client, lexParse, type XrpcRequestParams} from '@atproto/lex'
 
 import {
   getAppLanguageAsContentLanguage,
@@ -30,7 +29,7 @@ export class CustomFeedAPI implements FeedAPI {
     this.userInterests = userInterests
   }
 
-  async peekLatest(): Promise<AppBskyFeedDefs.FeedViewPost> {
+  async peekLatest(): Promise<app.bsky.feed.defs.FeedViewPost> {
     const contentLangs = getContentLanguages().join(',')
     const data = await this.client.call(
       app.bsky.feed.getFeed,
@@ -140,7 +139,7 @@ async function loggedOutFetch({
    * is asserted here just as the old-world one was.
    */
   let data = res.ok
-    ? (jsonStringToLex(await res.text()) as app.bsky.feed.getFeed.$OutputBody)
+    ? (lexParse(await res.text()) as app.bsky.feed.getFeed.$OutputBody)
     : null
   if (data?.feed?.length) {
     return data
@@ -154,7 +153,7 @@ async function loggedOutFetch({
     {method: 'GET', headers: {'Accept-Language': '', ...labelersHeader}},
   )
   data = res.ok
-    ? (jsonStringToLex(await res.text()) as app.bsky.feed.getFeed.$OutputBody)
+    ? (lexParse(await res.text()) as app.bsky.feed.getFeed.$OutputBody)
     : null
   if (data?.feed?.length) {
     return data
diff --git a/src/lib/api/feed/demo.ts b/src/lib/api/feed/demo.ts
index a4c1c360e9..5d549c69b7 100644
--- a/src/lib/api/feed/demo.ts
+++ b/src/lib/api/feed/demo.ts
@@ -1,7 +1,7 @@
-import {type AppBskyFeedDefs} from '@atproto/api'
 import {type Client} from '@atproto/lex'
 
 import {DEMO_FEED} from '#/lib/demo'
+import {type app} from '#/lexicons'
 import {type FeedAPI, type FeedAPIResponse} from './types'
 
 export class DemoFeedAPI implements FeedAPI {
@@ -11,7 +11,7 @@ export class DemoFeedAPI implements FeedAPI {
     this.client = client
   }
 
-  async peekLatest(): Promise<AppBskyFeedDefs.FeedViewPost> {
+  async peekLatest(): Promise<app.bsky.feed.defs.FeedViewPost> {
     return DEMO_FEED.feed[0]
   }
 
diff --git a/src/lib/api/feed/following.ts b/src/lib/api/feed/following.ts
index 596483577a..27a08c6985 100644
--- a/src/lib/api/feed/following.ts
+++ b/src/lib/api/feed/following.ts
@@ -1,4 +1,3 @@
-import {type AppBskyFeedDefs} from '@atproto/api'
 import {type Client} from '@atproto/lex'
 
 import {app} from '#/lexicons'
@@ -11,7 +10,7 @@ export class FollowingFeedAPI implements FeedAPI {
     this.client = client
   }
 
-  async peekLatest(): Promise<AppBskyFeedDefs.FeedViewPost> {
+  async peekLatest(): Promise<app.bsky.feed.defs.FeedViewPost> {
     const data = await this.client.call(app.bsky.feed.getTimeline, {
       limit: 1,
     })
diff --git a/src/lib/api/feed/home.ts b/src/lib/api/feed/home.ts
index a5ff0f3b93..9c90b213aa 100644
--- a/src/lib/api/feed/home.ts
+++ b/src/lib/api/feed/home.ts
@@ -1,8 +1,8 @@
-import {type AppBskyFeedDefs} from '@atproto/api'
 import {type Client} from '@atproto/lex'
 import {type AtUriString} from '@atproto/syntax'
 
 import {PROD_DEFAULT_FEED} from '#/lib/constants'
+import {type app} from '#/lexicons'
 import {CustomFeedAPI} from './custom'
 import {FollowingFeedAPI} from './following'
 import {type FeedAPI, type FeedAPIResponse} from './types'
@@ -15,7 +15,12 @@ import {type FeedAPI, type FeedAPIResponse} from './types'
 // we use this fallback marker post to drive this instead. see Feed.tsx
 // for the usage.
 // -prf
-export const FALLBACK_MARKER_POST: AppBskyFeedDefs.FeedViewPost = {
+/*
+ * A synthetic marker, not a real view: its `uri`/`did`/`indexedAt` are
+ * deliberately not well-formed, so the literal is asserted rather than branded.
+ * Only `post.uri` is ever read (see Feed.tsx).
+ */
+export const FALLBACK_MARKER_POST = {
   post: {
     uri: 'fallback-marker-post',
     cid: 'fake',
@@ -26,7 +31,7 @@ export const FALLBACK_MARKER_POST: AppBskyFeedDefs.FeedViewPost = {
     },
     indexedAt: new Date().toISOString(),
   },
-}
+} as unknown as app.bsky.feed.defs.FeedViewPost
 
 export class HomeFeedAPI implements FeedAPI {
   client: Client
@@ -63,7 +68,7 @@ export class HomeFeedAPI implements FeedAPI {
     this.itemCursor = 0
   }
 
-  async peekLatest(): Promise<AppBskyFeedDefs.FeedViewPost> {
+  async peekLatest(): Promise<app.bsky.feed.defs.FeedViewPost> {
     if (this.usingDiscover) {
       return this.discover.peekLatest()
     }
@@ -82,7 +87,7 @@ export class HomeFeedAPI implements FeedAPI {
     }
 
     let returnCursor
-    let posts: AppBskyFeedDefs.FeedViewPost[] = []
+    let posts: app.bsky.feed.defs.FeedViewPost[] = []
 
     if (!this.usingDiscover) {
       const res = await this.following.fetch({cursor, limit})
diff --git a/src/lib/api/feed/likes.ts b/src/lib/api/feed/likes.ts
index d7d63fc4db..d8bba416ac 100644
--- a/src/lib/api/feed/likes.ts
+++ b/src/lib/api/feed/likes.ts
@@ -1,4 +1,3 @@
-import {type AppBskyFeedDefs} from '@atproto/api'
 import {type Client, type XrpcRequestParams} from '@atproto/lex'
 
 import {app} from '#/lexicons'
@@ -23,7 +22,7 @@ export class LikesFeedAPI implements FeedAPI {
     this.params = feedParams
   }
 
-  async peekLatest(): Promise<AppBskyFeedDefs.FeedViewPost> {
+  async peekLatest(): Promise<app.bsky.feed.defs.FeedViewPost> {
     const data = await this.client.call(app.bsky.feed.getActorLikes, {
       ...this.params,
       limit: 1,
diff --git a/src/lib/api/feed/list.ts b/src/lib/api/feed/list.ts
index e4d07d73d7..51e67bb4e8 100644
--- a/src/lib/api/feed/list.ts
+++ b/src/lib/api/feed/list.ts
@@ -1,4 +1,3 @@
-import {type AppBskyFeedDefs} from '@atproto/api'
 import {type Client, type XrpcRequestParams} from '@atproto/lex'
 
 import {app} from '#/lexicons'
@@ -23,7 +22,7 @@ export class ListFeedAPI implements FeedAPI {
     this.params = feedParams
   }
 
-  async peekLatest(): Promise<AppBskyFeedDefs.FeedViewPost> {
+  async peekLatest(): Promise<app.bsky.feed.defs.FeedViewPost> {
     const data = await this.client.call(app.bsky.feed.getListFeed, {
       ...this.params,
       limit: 1,
diff --git a/src/lib/api/feed/merge.ts b/src/lib/api/feed/merge.ts
index 2e3abcb8e3..91d300afb8 100644
--- a/src/lib/api/feed/merge.ts
+++ b/src/lib/api/feed/merge.ts
@@ -1,4 +1,3 @@
-import {type AppBskyFeedDefs} from '@atproto/api'
 import {type Client} from '@atproto/lex'
 import {type AtUriString} from '@atproto/syntax'
 import shuffle from 'lodash.shuffle'
@@ -28,7 +27,7 @@ const POST_AGE_CUTOFF = 60e3 * 60 * 24 // 24hours
  */
 type MergeFeedPage = {
   cursor?: string
-  feed: AppBskyFeedDefs.FeedViewPost[]
+  feed: app.bsky.feed.defs.FeedViewPost[]
 } | null
 
 export class MergeFeedAPI implements FeedAPI {
@@ -89,7 +88,7 @@ export class MergeFeedAPI implements FeedAPI {
     }
   }
 
-  async peekLatest(): Promise<AppBskyFeedDefs.FeedViewPost> {
+  async peekLatest(): Promise<app.bsky.feed.defs.FeedViewPost> {
     const data = await this.client.call(app.bsky.feed.getTimeline, {
       limit: 1,
     })
@@ -136,7 +135,7 @@ export class MergeFeedAPI implements FeedAPI {
     await Promise.all(promises)
 
     // assemble a response by sampling from feeds with content
-    const posts: AppBskyFeedDefs.FeedViewPost[] = []
+    const posts: app.bsky.feed.defs.FeedViewPost[] = []
     while (posts.length < limit) {
       let slice = this.sampleItem()
       if (slice[0]) {
@@ -188,7 +187,7 @@ class MergeFeedSource {
   feedTuners: FeedTunerFn[]
   sourceInfo: ReasonFeedSource | undefined
   cursor: string | undefined = undefined
-  queue: AppBskyFeedDefs.FeedViewPost[] = []
+  queue: app.bsky.feed.defs.FeedViewPost[] = []
   hasMore = true
 
   constructor({
@@ -210,7 +209,7 @@ class MergeFeedSource {
     return this.hasMore && this.queue.length === 0
   }
 
-  take(n: number): AppBskyFeedDefs.FeedViewPost[] {
+  take(n: number): app.bsky.feed.defs.FeedViewPost[] {
     return this.queue.splice(0, n)
   }
 
@@ -327,7 +326,7 @@ class MergeFeedSource_Custom extends MergeFeedSource {
       // some custom feeds fail to enforce the pagination limit
       // so we manually truncate here
       // -prf
-      let feed: AppBskyFeedDefs.FeedViewPost[] =
+      let feed: app.bsky.feed.defs.FeedViewPost[] =
         limit && data.feed.length > limit
           ? data.feed.slice(0, limit)
           : data.feed
diff --git a/src/lib/api/feed/posts.ts b/src/lib/api/feed/posts.ts
index d2bcfc4317..18835ecbd2 100644
--- a/src/lib/api/feed/posts.ts
+++ b/src/lib/api/feed/posts.ts
@@ -1,4 +1,3 @@
-import {type AppBskyFeedDefs} from '@atproto/api'
 import {type Client, type XrpcRequestParams} from '@atproto/lex'
 
 import {logger} from '#/logger'
@@ -10,7 +9,7 @@ type GetPostsParams = XrpcRequestParams<typeof app.bsky.feed.getPosts.main>
 export class PostListFeedAPI implements FeedAPI {
   client: Client
   params: GetPostsParams
-  peek: AppBskyFeedDefs.FeedViewPost | null = null
+  peek: app.bsky.feed.defs.FeedViewPost | null = null
 
   constructor({
     client,
@@ -30,7 +29,7 @@ export class PostListFeedAPI implements FeedAPI {
     }
   }
 
-  async peekLatest(): Promise<AppBskyFeedDefs.FeedViewPost> {
+  async peekLatest(): Promise<app.bsky.feed.defs.FeedViewPost> {
     if (this.peek) return this.peek
     throw new Error('Has not fetched yet')
   }
diff --git a/src/lib/api/feed/types.ts b/src/lib/api/feed/types.ts
index 27fa066fbd..59803a992a 100644
--- a/src/lib/api/feed/types.ts
+++ b/src/lib/api/feed/types.ts
@@ -1,12 +1,12 @@
-import {type AppBskyFeedDefs} from '@atproto/api'
+import {type app} from '#/lexicons'
 
 export interface FeedAPIResponse {
   cursor?: string
-  feed: AppBskyFeedDefs.FeedViewPost[]
+  feed: app.bsky.feed.defs.FeedViewPost[]
 }
 
 export interface FeedAPI {
-  peekLatest(): Promise<AppBskyFeedDefs.FeedViewPost>
+  peekLatest(): Promise<app.bsky.feed.defs.FeedViewPost>
   fetch({
     cursor,
     limit,
diff --git a/src/lib/api/feed/utils.ts b/src/lib/api/feed/utils.ts
index c52f402326..b6ef738fcc 100644
--- a/src/lib/api/feed/utils.ts
+++ b/src/lib/api/feed/utils.ts
@@ -1,4 +1,4 @@
-import {AtUri} from '@atproto/api'
+import {AtUri} from '@atproto/syntax'
 
 import {BSKY_FEED_OWNER_DIDS} from '#/lib/constants'
 import {type UsePreferencesQueryResponse} from '#/state/queries/preferences'
diff --git a/src/lib/api/index.ts b/src/lib/api/index.ts
index e03a40c391..af2d54e65a 100644
--- a/src/lib/api/index.ts
+++ b/src/lib/api/index.ts
@@ -1,4 +1,3 @@
-import {ChatBskyGroupDefs} from '@atproto/api'
 import {TID} from '@atproto/common-web'
 import {type $Typed, type Client} from '@atproto/lex'
 import {
@@ -29,7 +28,7 @@ import {
   type PostDraft,
   type ThreadDraft,
 } from '#/view/com/composer/state/composer'
-import {app, com} from '#/lexicons'
+import {app, chat, com} from '#/lexicons'
 import * as bsky from '#/types/bsky'
 import {createGIFDescription} from '../gif-alt-text'
 import {computeCid} from './computeCid'
@@ -313,7 +312,7 @@ async function resolveEmbed(
          * unbranded strings. Assert at the boundary until it moves to the
          * clients.
          */
-        record: resolvedLink.record as com.atproto.repo.strongRef.Main,
+        record: resolvedLink.record,
       }
     }
   }
@@ -475,15 +474,13 @@ async function resolveMedia(
           title: resolvedLink.title,
           description: resolvedLink.description,
           thumb: blob,
-          associatedRefs: resolvedLink.associatedRefs as
-            | com.atproto.repo.strongRef.Main[]
-            | undefined,
+          associatedRefs: resolvedLink.associatedRefs,
         },
       }
     }
     if (
       resolvedLink.type === 'chat-invite' &&
-      ChatBskyGroupDefs.isJoinLinkPreviewView(resolvedLink.view)
+      bsky.isType(chat.bsky.group.defs.joinLinkPreviewView, resolvedLink.view)
     ) {
       return {
         $type: 'app.bsky.embed.external',
@@ -512,5 +509,5 @@ async function resolveRecord(
   if (resolvedLink.type !== 'record') {
     throw Error(t`Expected uri to resolve to a record`)
   }
-  return resolvedLink.record as com.atproto.repo.strongRef.Main
+  return resolvedLink.record
 }
diff --git a/src/lib/api/resolve.ts b/src/lib/api/resolve.ts
index 297388edb0..4d9ec3e457 100644
--- a/src/lib/api/resolve.ts
+++ b/src/lib/api/resolve.ts
@@ -1,11 +1,5 @@
-import {
-  type AppBskyFeedDefs,
-  type AppBskyGraphDefs,
-  type ComAtprotoRepoStrongRef,
-} from '@atproto/api'
-import {AtUri} from '@atproto/api'
 import {type Client} from '@atproto/lex'
-import {type AtUriString, type HandleString} from '@atproto/syntax'
+import {AtUri, type AtUriString, type HandleString} from '@atproto/syntax'
 
 import {IMAGE_SIZE_CONFIG_2K_1MB} from '#/lib/constants'
 import {getLinkMeta, type LinkMeta} from '#/lib/link-meta/link-meta'
@@ -49,30 +43,30 @@ type ResolvedExternalLink = {
 
 type ResolvedPostRecord = {
   type: 'record'
-  record: ComAtprotoRepoStrongRef.Main
+  record: com.atproto.repo.strongRef.Main
   kind: 'post'
-  view: AppBskyFeedDefs.PostView
+  view: app.bsky.feed.defs.PostView
 }
 
 type ResolvedFeedRecord = {
   type: 'record'
-  record: ComAtprotoRepoStrongRef.Main
+  record: com.atproto.repo.strongRef.Main
   kind: 'feed'
-  view: AppBskyFeedDefs.GeneratorView
+  view: app.bsky.feed.defs.GeneratorView
 }
 
 type ResolvedListRecord = {
   type: 'record'
-  record: ComAtprotoRepoStrongRef.Main
+  record: com.atproto.repo.strongRef.Main
   kind: 'list'
-  view: AppBskyGraphDefs.ListView
+  view: app.bsky.graph.defs.ListView
 }
 
 type ResolvedStarterPackRecord = {
   type: 'record'
-  record: ComAtprotoRepoStrongRef.Main
+  record: com.atproto.repo.strongRef.Main
   kind: 'starter-pack'
-  view: AppBskyGraphDefs.StarterPackView
+  view: app.bsky.graph.defs.StarterPackView
 }
 
 type ResolvedChatInvite = {
diff --git a/src/lib/constants.ts b/src/lib/constants.ts
index a490d92719..a25f42f6bc 100644
--- a/src/lib/constants.ts
+++ b/src/lib/constants.ts
@@ -1,8 +1,9 @@
 import {type Insets, Platform} from 'react-native'
-import {type AppBskyActorDefs, BSKY_LABELER_DID} from '@atproto/api'
 import {type Service} from '@atproto/lex'
+import {api} from '@bsky.app/sdk'
 
 import {BLUESKY_PROXY_DID, CHAT_PROXY_DID, IS_DEV} from '#/env'
+import {type app} from '#/lexicons'
 
 export const LOCAL_DEV_SERVICE =
   Platform.OS === 'android' ? 'http://10.0.2.2:2583' : 'http://localhost:2583'
@@ -173,7 +174,7 @@ export const VIDEO_SAVED_FEED = {
 }
 
 export const RECOMMENDED_SAVED_FEEDS: Pick<
-  AppBskyActorDefs.SavedFeed,
+  app.bsky.actor.defs.SavedFeed,
   'type' | 'value' | 'pinned'
 >[] = [DISCOVER_SAVED_FEED, TIMELINE_SAVED_FEED]
 
@@ -269,7 +270,7 @@ export const CHAT_PROXY_SERVICE: Service = `${CHAT_PROXY_DID}#bsky_chat`
  * that labeler's creator did instead, so this is a per-call option rather than a
  * client-level one like {@link CHAT_PROXY_SERVICE}.
  */
-export const MOD_PROXY_SERVICE: Service = `${BSKY_LABELER_DID}#atproto_labeler`
+export const MOD_PROXY_SERVICE: Service = `${api.moderation.did}#atproto_labeler`
 
 /**
  * The notification service's proxy target, in the `did#service_id` form a lex
diff --git a/src/lib/demo.ts b/src/lib/demo.ts
index 5ead62c9d3..826049045a 100644
--- a/src/lib/demo.ts
+++ b/src/lib/demo.ts
@@ -1,11 +1,13 @@
-import {type AppBskyFeedGetFeed} from '@atproto/api'
+import {toDatetimeString} from '@atproto/syntax'
 import {subDays, subMinutes} from 'date-fns'
 
+import {type app} from '#/lexicons'
+
 const DID = `did:plc:z72i7hdynmk6r22z27h6tvur`
 const NOW = new Date()
-const POST_1_DATE = subMinutes(NOW, 2).toISOString()
-const POST_2_DATE = subMinutes(NOW, 4).toISOString()
-const POST_3_DATE = subMinutes(NOW, 5).toISOString()
+const POST_1_DATE = toDatetimeString(subMinutes(NOW, 2))
+const POST_2_DATE = toDatetimeString(subMinutes(NOW, 4))
+const POST_3_DATE = toDatetimeString(subMinutes(NOW, 5))
 
 export const DEMO_FEED = {
   feed: [
@@ -31,7 +33,7 @@ export const DEMO_FEED = {
                 issuer: DID,
                 uri: `at://${DID}/app.bsky.graph.verification/post1`,
                 isValid: true,
-                createdAt: subDays(NOW, 11).toISOString(),
+                createdAt: toDatetimeString(subDays(NOW, 11)),
               },
             ],
             verifiedStatus: 'valid',
@@ -197,6 +199,6 @@ export const DEMO_FEED = {
       },
     },
   ],
-} satisfies AppBskyFeedGetFeed.OutputSchema
+} satisfies app.bsky.feed.getFeed.$OutputBody
 
 export const BOTTOM_BAR_AVI = 'https://bsky.social/about/adi/user_avi.jpg'
diff --git a/src/lib/hooks/useNotificationHandler.ts b/src/lib/hooks/useNotificationHandler.ts
index e705f0ce95..3689d608e0 100644
--- a/src/lib/hooks/useNotificationHandler.ts
+++ b/src/lib/hooks/useNotificationHandler.ts
@@ -1,6 +1,6 @@
 import {useEffect} from 'react'
 import * as Notifications from 'expo-notifications'
-import {AtUri} from '@atproto/api'
+import {AtUri} from '@atproto/syntax'
 import {useLingui} from '@lingui/react/macro'
 import {CommonActions, useNavigation} from '@react-navigation/native'
 import {useQueryClient} from '@tanstack/react-query'
diff --git a/src/lib/hooks/usePostViewTracking.ts b/src/lib/hooks/usePostViewTracking.ts
index bbe8bb9f24..28fe8ba448 100644
--- a/src/lib/hooks/usePostViewTracking.ts
+++ b/src/lib/hooks/usePostViewTracking.ts
@@ -1,7 +1,7 @@
 import {useCallback, useRef} from 'react'
-import {type AppBskyFeedDefs} from '@atproto/api'
 
 import {type Metrics, useAnalytics} from '#/analytics'
+import {type app} from '#/lexicons'
 
 /**
  * Hook that returns a callback to track post:view events.
@@ -17,7 +17,7 @@ export function usePostViewTracking(
   const seenUrisRef = useRef(new Set<string>())
 
   const trackPostView = useCallback(
-    (post: AppBskyFeedDefs.PostView) => {
+    (post: app.bsky.feed.defs.PostView) => {
       if (seenUrisRef.current.has(post.uri)) return
       seenUrisRef.current.add(post.uri)
 
diff --git a/src/lib/link-meta/link-meta.ts b/src/lib/link-meta/link-meta.ts
index ee96d6db43..72c43593cf 100644
--- a/src/lib/link-meta/link-meta.ts
+++ b/src/lib/link-meta/link-meta.ts
@@ -1,8 +1,7 @@
-import {type AppBskyEmbedExternal} from '@atproto/api'
-
 import {LINK_META_PROXY} from '#/lib/constants'
 import {getGiphyMetaUri} from '#/lib/strings/embed-player'
 import {parseStarterPackUri} from '#/lib/strings/starter-pack'
+import {type app} from '#/lexicons'
 import {isBskyAppUrl} from '../strings/url-helpers'
 
 export enum LikelyType {
@@ -26,8 +25,8 @@ export interface LinkMeta {
    * The AT-URI of the Atmosphere record representing this external content, if
    * it exists. Example: a site.standard.document record.
    */
-  associatedRefs?: AppBskyEmbedExternal.External['associatedRefs']
-  view?: AppBskyEmbedExternal.View
+  associatedRefs?: app.bsky.embed.external.External['associatedRefs']
+  view?: app.bsky.embed.external.View
 }
 
 export async function getLinkMeta(
diff --git a/src/lib/moderation.ts b/src/lib/moderation.ts
index b2d4c194e0..9bfbf5423b 100644
--- a/src/lib/moderation.ts
+++ b/src/lib/moderation.ts
@@ -1,5 +1,4 @@
 import {useMemo} from 'react'
-import {type ComAtprotoLabelDefs} from '@atproto/api'
 import {Client} from '@atproto/lex'
 import {type DidString} from '@atproto/syntax'
 import {
@@ -13,7 +12,7 @@ import {
 import {sanitizeDisplayName} from '#/lib/strings/display-names'
 import {sanitizeHandle} from '#/lib/strings/handles'
 import {type AppModerationCause} from '#/components/Pills'
-import {type app} from '#/lexicons'
+import {type app, type com} from '#/lexicons'
 
 export const ADULT_CONTENT_LABELS = ['sexual', 'nudity', 'porn'] as const
 export const OTHER_SELF_LABELS = ['graphic-media'] as const
@@ -54,7 +53,7 @@ export function moduiContainsHideableOffense(modui: ModerationUI): boolean {
 }
 
 export function labelIsHideableOffense(
-  label: ComAtprotoLabelDefs.Label,
+  label: com.atproto.label.defs.Label,
 ): boolean {
   return ['!hide', '!takedown'].includes(label.val)
 }
@@ -64,9 +63,9 @@ export function labelIsHideableOffense(
  * with `!`) and the user's own "bot" self-label.
  */
 export function filterUserFacingLabels(
-  labels: ComAtprotoLabelDefs.Label[],
+  labels: com.atproto.label.defs.Label[],
   currentAccountDid: string | undefined,
-): ComAtprotoLabelDefs.Label[] {
+): com.atproto.label.defs.Label[] {
   return labels.filter(
     label =>
       !label.val.startsWith('!') &&
@@ -135,7 +134,11 @@ export type Subject =
       did: string
     }
 
-export function useLabelSubject({label}: {label: ComAtprotoLabelDefs.Label}): {
+export function useLabelSubject({
+  label,
+}: {
+  label: com.atproto.label.defs.Label
+}): {
   subject: Subject
 } {
   return useMemo(() => {
diff --git a/src/lib/moderation/subjects.ts b/src/lib/moderation/subjects.ts
deleted file mode 100644
index c1621b300c..0000000000
--- a/src/lib/moderation/subjects.ts
+++ /dev/null
@@ -1,133 +0,0 @@
-import {
-  type AppBskyActorDefs,
-  type AppBskyFeedDefs,
-  type AppBskyGraphDefs,
-  type AppBskyNotificationListNotifications,
-  type AppBskyRichtextFacet,
-  type ChatBskyActorDefs,
-} from '@atproto/api'
-import {
-  hasMutedWord as sdkHasMutedWord,
-  moderateFeedGenerator as sdkModerateFeedGenerator,
-  moderateNotification as sdkModerateNotification,
-  moderatePost as sdkModeratePost,
-  moderateProfile as sdkModerateProfile,
-  moderateStatus as sdkModerateStatus,
-  moderateUserList as sdkModerateUserList,
-  type ModerationDecision,
-  type ModerationOpts,
-} from '@bsky.app/sdk/moderation'
-
-import {type app, type chat} from '#/lexicons'
-
-/*
- * TRANSITIONAL. The moderation implementation now comes from
- * `@bsky.app/sdk/moderation`, whose subject types are the generated
- * `#/lexicons` views - so their `did`/`uri`/`cid` fields are branded
- * (`DidString`, `AtUriString`). Many read paths still emit the identically
- * shaped `@atproto/api` views, whose same fields are plain `string`.
- *
- * A plain `string` is not assignable to a branded template-literal type, so
- * every `moderate*` call taking an unmigrated view fails to typecheck even
- * though the value is byte-identical - the runtime only ever reads `.did`,
- * `.labels` and `.viewer`, none of which the brand affects.
- *
- * These wrappers widen each subject parameter to accept a view from either
- * world and drop the brand on the way in. Delete this module once every
- * producer emits `#/lexicons` views (the `@atproto/api` removal pass) and point
- * callers back at `@bsky.app/sdk/moderation` directly.
- */
-
-type AnyProfileSubject =
-  | app.bsky.actor.defs.ProfileViewBasic
-  | app.bsky.actor.defs.ProfileView
-  | app.bsky.actor.defs.ProfileViewDetailed
-  | chat.bsky.actor.defs.ProfileViewBasic
-  | AppBskyActorDefs.ProfileViewBasic
-  | AppBskyActorDefs.ProfileView
-  | AppBskyActorDefs.ProfileViewDetailed
-  | ChatBskyActorDefs.ProfileViewBasic
-
-type AnyPostSubject = app.bsky.feed.defs.PostView | AppBskyFeedDefs.PostView
-
-type AnyUserListSubject =
-  | app.bsky.graph.defs.ListViewBasic
-  | app.bsky.graph.defs.ListView
-  | AppBskyGraphDefs.ListViewBasic
-  | AppBskyGraphDefs.ListView
-
-type AnyFeedGeneratorSubject =
-  | app.bsky.feed.defs.GeneratorView
-  | AppBskyFeedDefs.GeneratorView
-
-type AnyNotificationSubject =
-  | app.bsky.notification.listNotifications.Notification
-  | AppBskyNotificationListNotifications.Notification
-
-export function moderateProfile(
-  subject: AnyProfileSubject,
-  opts: ModerationOpts,
-): ModerationDecision {
-  return sdkModerateProfile(subject as app.bsky.actor.defs.ProfileView, opts)
-}
-
-export function moderateStatus(
-  subject: AnyProfileSubject,
-  opts: ModerationOpts,
-): ModerationDecision {
-  return sdkModerateStatus(subject as app.bsky.actor.defs.ProfileView, opts)
-}
-
-export function moderatePost(
-  subject: AnyPostSubject,
-  opts: ModerationOpts,
-): ModerationDecision {
-  return sdkModeratePost(subject as app.bsky.feed.defs.PostView, opts)
-}
-
-export function moderateUserList(
-  subject: AnyUserListSubject,
-  opts: ModerationOpts,
-): ModerationDecision {
-  return sdkModerateUserList(subject as app.bsky.graph.defs.ListView, opts)
-}
-
-export function moderateFeedGenerator(
-  subject: AnyFeedGeneratorSubject,
-  opts: ModerationOpts,
-): ModerationDecision {
-  return sdkModerateFeedGenerator(
-    subject as app.bsky.feed.defs.GeneratorView,
-    opts,
-  )
-}
-
-export function moderateNotification(
-  subject: AnyNotificationSubject,
-  opts: ModerationOpts,
-): ModerationDecision {
-  return sdkModerateNotification(
-    subject as app.bsky.notification.listNotifications.Notification,
-    opts,
-  )
-}
-
-/**
- * Widens `facets`/`actor` for the same reason the `moderate*` wrappers widen
- * their subjects: mute-word matching reads only `text`/`features`/`langs`, none
- * of which the brand affects.
- */
-export function hasMutedWord(params: {
-  mutedWords: app.bsky.actor.defs.MutedWord[]
-  text: string
-  facets?: app.bsky.richtext.facet.Main[] | AppBskyRichtextFacet.Main[]
-  outlineTags?: string[]
-  languages?: string[]
-  actor?: AnyProfileSubject
-}): boolean {
-  return sdkHasMutedWord({
-    ...params,
-    facets: params.facets as app.bsky.richtext.facet.Main[] | undefined,
-    actor: params.actor as app.bsky.actor.defs.ProfileView | undefined,
-  })
-}
diff --git a/src/lib/moderation/useLabelInfo.ts b/src/lib/moderation/useLabelInfo.ts
index fc565c3d45..27ecf0ff83 100644
--- a/src/lib/moderation/useLabelInfo.ts
+++ b/src/lib/moderation/useLabelInfo.ts
@@ -1,4 +1,3 @@
-import {type ComAtprotoLabelDefs} from '@atproto/api'
 import {
   type InterpretedLabelValueDefinition,
   interpretLabelValueDefinition,
@@ -12,16 +11,16 @@ import {
   useGlobalLabelStrings,
 } from '#/lib/moderation/useGlobalLabelStrings'
 import {useLabelDefinitions} from '#/state/preferences'
-import {type app} from '#/lexicons'
+import {type app, type com} from '#/lexicons'
 
 export interface LabelInfo {
-  label: ComAtprotoLabelDefs.Label
+  label: com.atproto.label.defs.Label
   def: InterpretedLabelValueDefinition
-  strings: ComAtprotoLabelDefs.LabelValueDefinitionStrings
+  strings: com.atproto.label.defs.LabelValueDefinitionStrings
   labeler: app.bsky.labeler.defs.LabelerViewDetailed | undefined
 }
 
-export function useLabelInfo(label: ComAtprotoLabelDefs.Label): LabelInfo {
+export function useLabelInfo(label: com.atproto.label.defs.Label): LabelInfo {
   const {i18n} = useLingui()
   const {labelDefs, labelers} = useLabelDefinitions()
   const globalLabelStrings = useGlobalLabelStrings()
@@ -36,7 +35,7 @@ export function useLabelInfo(label: ComAtprotoLabelDefs.Label): LabelInfo {
 
 export function getDefinition(
   labelDefs: Record<string, InterpretedLabelValueDefinition[]>,
-  label: ComAtprotoLabelDefs.Label,
+  label: com.atproto.label.defs.Label,
 ): InterpretedLabelValueDefinition {
   // check local definitions
   const customDef =
@@ -71,13 +70,13 @@ export function getLabelStrings(
   locale: string,
   globalLabelStrings: GlobalLabelStrings,
   def: InterpretedLabelValueDefinition,
-): ComAtprotoLabelDefs.LabelValueDefinitionStrings {
+): com.atproto.label.defs.LabelValueDefinitionStrings {
   if (!def.definedBy) {
     // global definition, look up strings
     if (def.identifier in globalLabelStrings) {
       return globalLabelStrings[
         def.identifier
-      ] as ComAtprotoLabelDefs.LabelValueDefinitionStrings
+      ] as com.atproto.label.defs.LabelValueDefinitionStrings
     }
   } else {
     // try to find locale match in the definition's strings
diff --git a/src/lib/moderation/useModerationCauseDescription.ts b/src/lib/moderation/useModerationCauseDescription.ts
index 3cdbb30961..c3e7d19640 100644
--- a/src/lib/moderation/useModerationCauseDescription.ts
+++ b/src/lib/moderation/useModerationCauseDescription.ts
@@ -1,5 +1,5 @@
 import {useMemo} from 'react'
-import {BSKY_LABELER_DID} from '@atproto/api'
+import {api} from '@bsky.app/sdk'
 import {type ModerationCause} from '@bsky.app/sdk/moderation'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
@@ -135,7 +135,7 @@ export function useModerationCauseDescription(
         : undefined
       let sourceDisplayName = labeler?.creator.displayName
       if (!source) {
-        if (cause.label.src === BSKY_LABELER_DID) {
+        if (cause.label.src === api.moderation.did) {
           source = 'moderation.bsky.app'
           sourceDisplayName = 'Bluesky Moderation Service'
         } else {
diff --git a/src/lib/routes/links.ts b/src/lib/routes/links.ts
index c87ccb5a39..e568c66ff6 100644
--- a/src/lib/routes/links.ts
+++ b/src/lib/routes/links.ts
@@ -1,6 +1,7 @@
-import {type AppBskyGraphDefs, AtUri} from '@atproto/api'
+import {AtUri} from '@atproto/syntax'
 
 import {isInvalidHandle} from '#/lib/strings/handles'
+import {type app} from '#/lexicons'
 
 export function makeProfileLink(
   info: {
@@ -44,8 +45,8 @@ export function makeSearchLink(props: {query: string; from?: 'me' | string}) {
 
 export function makeStarterPackLink(
   starterPackOrName:
-    | AppBskyGraphDefs.StarterPackViewBasic
-    | AppBskyGraphDefs.StarterPackView
+    | app.bsky.graph.defs.StarterPackViewBasic
+    | app.bsky.graph.defs.StarterPackView
     | string,
   rkey?: string,
 ) {
diff --git a/src/lib/strings/__tests__/errors.test.ts b/src/lib/strings/__tests__/errors.test.ts
index 1d9ccd8a3d..703cc955fb 100644
--- a/src/lib/strings/__tests__/errors.test.ts
+++ b/src/lib/strings/__tests__/errors.test.ts
@@ -1,4 +1,3 @@
-import {XRPCError} from '@atproto/api'
 import {LexError, XrpcResponseError} from '@atproto/lex'
 import {beforeAll, describe, expect, it} from '@jest/globals'
 import {i18n} from '@lingui/core'
@@ -72,20 +71,10 @@ describe('cleanError', () => {
     )
   })
 
-  it('matches the upstream-failure branch on a legacy XRPC error', () => {
-    const e = new XRPCError(502)
-    expect(cleanError(e)).toBe(
-      'The server appears to be experiencing issues. Please try again in a few moments.',
-    )
-  })
-
-  it('matches NotEnoughResources on both error shapes', () => {
+  it('matches NotEnoughResources', () => {
     expect(cleanError(xrpcStatusError(503))).toBe(
       'The server appears to be experiencing issues. Please try again in a few moments.',
     )
-    expect(cleanError(new XRPCError(503))).toBe(
-      'The server appears to be experiencing issues. Please try again in a few moments.',
-    )
   })
 
   it('matches the app-password branch on a lex error message', () => {
@@ -105,7 +94,8 @@ describe('cleanError', () => {
   it('surfaces the authentication-required code of a lex error', () => {
     /*
      * The lex client derives `AuthenticationRequired` from a 401 with no XRPC
-     * payload, where `@atproto/api` used the spaced "Authentication Required".
+     * payload, where the pre-migration client used the spaced
+     * "Authentication Required".
      * Neither is special-cased in `cleanError`, so what matters is that the
      * class- and code-prefixed stringification does not reach the user.
      */
diff --git a/src/lib/strings/errors.ts b/src/lib/strings/errors.ts
index fb2b0c5b9d..365a069e2d 100644
--- a/src/lib/strings/errors.ts
+++ b/src/lib/strings/errors.ts
@@ -1,7 +1,8 @@
-import {XRPCError} from '@atproto/api'
 import {LexError} from '@atproto/lex'
 import {t} from '@lingui/core/macro'
 
+import {isXrpcError} from '#/lib/xrpc-error'
+
 /**
  * The text to show the user when no special case applies.
  *
@@ -39,7 +40,7 @@ export function cleanError(e: unknown): string {
     return t`Unable to connect. Please check your internet connection and try again.`
   }
   /*
-   * `@atproto/api` names these with spaces ("Upstream Failure"); lexicon error
+   * The legacy client named these with spaces ("Upstream Failure"); lexicon error
    * codes are space-free ("UpstreamFailure"). Match both while the app throws
    * both shapes.
    */
@@ -97,9 +98,20 @@ export function isNetworkError(e: unknown) {
   return false
 }
 
+/**
+ * The PDS answers an app-password-scope rejection with the lexicon code
+ * `InvalidToken` and a message of 'Bad token scope' or 'Bad token method'
+ * (pipethrough), so the typed path matches the code AND the message. The
+ * pre-migration check compared against 'TokenInvalid', which the PDS never
+ * sends - the string fallback was doing all the work.
+ */
 export function isErrorMaybeAppPasswordPermissions(e: unknown) {
-  if (e instanceof XRPCError && e.error === 'TokenInvalid') {
-    return true
+  if (isXrpcError(e)) {
+    return (
+      e.error === 'InvalidToken' &&
+      (e.message.includes('Bad token scope') ||
+        e.message.includes('Bad token method'))
+    )
   }
   const str = String(e)
   return str.includes('Bad token scope') || str.includes('Bad token method')
@@ -124,5 +136,5 @@ export function isRetryableHttpStatus(status: number) {
 }
 
 export function shouldRetryError(e: unknown) {
-  return e instanceof XRPCError && isRetryableHttpStatus(e.status)
+  return isXrpcError(e) && e.shouldRetry()
 }
diff --git a/src/lib/strings/rich-text-helpers.ts b/src/lib/strings/rich-text-helpers.ts
index a6341025ff..078b91e400 100644
--- a/src/lib/strings/rich-text-helpers.ts
+++ b/src/lib/strings/rich-text-helpers.ts
@@ -30,26 +30,3 @@ export function richTextToString(rt: RichText, loose: boolean): string {
 
   return result
 }
-
-/**
- * Widens facets typed by the legacy `@atproto/api` codegen into the shape the
- * SDK's `RichText` accepts.
- *
- * The two are the same lexicon and identical at runtime; they differ only in
- * that the SDK brands `did`/`uri` as template literal types, which makes the
- * legacy `string` versions unassignable. Call this where facets read off an
- * `@atproto/api` view type are handed to `new RichText(...)`.
- *
- * Transitional: it goes away once the view types come from the SDK too.
- */
-export function asSdkFacets(
-  facets: {index: {byteStart: number; byteEnd: number}; features: unknown[]}[],
-): app.bsky.richtext.facet.Main[]
-export function asSdkFacets(
-  facets:
-    | {index: {byteStart: number; byteEnd: number}; features: unknown[]}[]
-    | undefined,
-): app.bsky.richtext.facet.Main[] | undefined
-export function asSdkFacets(facets: unknown) {
-  return facets as app.bsky.richtext.facet.Main[] | undefined
-}
diff --git a/src/lib/strings/starter-pack.ts b/src/lib/strings/starter-pack.ts
index 475b000336..0dc6218114 100644
--- a/src/lib/strings/starter-pack.ts
+++ b/src/lib/strings/starter-pack.ts
@@ -1,4 +1,4 @@
-import {AtUri} from '@atproto/api'
+import {AtUri} from '@atproto/syntax'
 
 import type * as bsky from '#/types/bsky'
 
diff --git a/src/lib/strings/url-helpers.ts b/src/lib/strings/url-helpers.ts
index 4fb8034a51..c90f1a6fb9 100644
--- a/src/lib/strings/url-helpers.ts
+++ b/src/lib/strings/url-helpers.ts
@@ -1,4 +1,4 @@
-import {AtUri} from '@atproto/api'
+import {AtUri} from '@atproto/syntax'
 import {parse} from 'psl'
 import TLDs from 'tlds'
 
diff --git a/src/lib/xrpc-error.ts b/src/lib/xrpc-error.ts
index 855aaf803e..ec4fd7e872 100644
--- a/src/lib/xrpc-error.ts
+++ b/src/lib/xrpc-error.ts
@@ -1,14 +1,46 @@
 import {
   getMain,
   type InferMethodError,
+  LexError,
   type Main,
   type Procedure,
   type Query,
+  XrpcError,
   XrpcResponseError,
 } from '@atproto/lex'
 
 import {com} from '#/lexicons'
 
+/**
+ * True for an XRPC error from a lex `Client` (`XrpcError` is the abstract base
+ * of `XrpcResponseError`/`XrpcInvalidResponseError`/`XrpcInternalError`).
+ */
+export function isXrpcError(e: unknown): e is XrpcError {
+  return e instanceof XrpcError
+}
+
+/**
+ * HTTP status, or undefined when `e` is not an XRPC error carrying a response.
+ * Only `XrpcResponseError` (a genuine server response) has a status; the
+ * internal/fetch lex errors do not.
+ */
+export function getErrorStatus(e: unknown): number | undefined {
+  return e instanceof XrpcResponseError ? e.status : undefined
+}
+
+/**
+ * The lexicon error code (`err.error`), or undefined when `e` carries none.
+ * Gated on `LexError` (the base of every `XrpcError`) rather than `XrpcError`,
+ * so the non-XRPC lex errors are covered too.
+ *
+ * Prefer {@link matchXrpcError} where the method that threw is known: it
+ * constrains the compared name to that method's declared errors. Use this only
+ * where the source method is genuinely ambiguous.
+ */
+export function getErrorName(e: unknown): string | undefined {
+  return e instanceof LexError ? e.error : undefined
+}
+
 /**
  * Same nsid means `e` was thrown for this method schema, so `e` can be
  * treated as an `XrpcResponseError<M>` - which is what lets the SDK's
diff --git a/src/locale/helpers.ts b/src/locale/helpers.ts
index 63b09b3141..e91c540e83 100644
--- a/src/locale/helpers.ts
+++ b/src/locale/helpers.ts
@@ -1,8 +1,9 @@
-import {type AppBskyFeedDefs, AppBskyFeedPost} from '@atproto/api'
 import * as bcp47Match from 'bcp-47-match'
 import lande from 'lande'
 
 import {hasProp} from '#/lib/type-guards'
+import {app} from '#/lexicons'
+import * as bsky from '#/types/bsky'
 import {
   AppLanguage,
   type Language,
@@ -61,8 +62,8 @@ function getLocalizedLanguage(
   }
 }
 
-export function getPostLanguageTags(post: AppBskyFeedDefs.PostView) {
-  return AppBskyFeedPost.isRecord(post.record) &&
+export function getPostLanguageTags(post: app.bsky.feed.defs.PostView) {
+  return bsky.isType(app.bsky.feed.post, post.record) &&
     hasProp(post.record, 'langs') &&
     Array.isArray(post.record.langs)
     ? post.record.langs
@@ -86,7 +87,7 @@ export function codeToLanguageName(lang2or3: string, appLang: string): string {
 }
 
 export function getPostLanguage(
-  post: AppBskyFeedDefs.PostView,
+  post: app.bsky.feed.defs.PostView,
 ): string | undefined {
   let candidates: string[] = getPostLanguageTags(post)
   let postText: string = ''
@@ -121,7 +122,7 @@ export function getPostLanguage(
 }
 
 export function isPostInLanguage(
-  post: AppBskyFeedDefs.PostView,
+  post: app.bsky.feed.defs.PostView,
   targetLangs: string[],
 ): boolean {
   const lang = getPostLanguage(post)
diff --git a/src/screens/Bookmarks.tsx b/src/screens/Bookmarks.tsx
index fdeb91777c..c36cb0c0a5 100644
--- a/src/screens/Bookmarks.tsx
+++ b/src/screens/Bookmarks.tsx
@@ -1,10 +1,6 @@
 import {useCallback, useMemo, useState} from 'react'
 import {View} from 'react-native'
-import {
-  type $Typed,
-  type AppBskyBookmarkDefs,
-  AppBskyFeedDefs,
-} from '@atproto/api'
+import {type $Typed} from '@atproto/lex'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
@@ -38,6 +34,8 @@ import * as toast from '#/components/Toast'
 import {Text} from '#/components/Typography'
 import {useAnalytics} from '#/analytics'
 import {IS_IOS} from '#/env'
+import {app} from '#/lexicons'
+import * as bsky from '#/types/bsky'
 
 type Props = NativeStackScreenProps<CommonNavigatorParams, 'Bookmarks'>
 
@@ -78,15 +76,15 @@ type ListItem =
   | {
       type: 'bookmark'
       key: string
-      bookmark: Omit<AppBskyBookmarkDefs.BookmarkView, 'item'> & {
-        item: $Typed<AppBskyFeedDefs.PostView>
+      bookmark: Omit<app.bsky.bookmark.defs.BookmarkView, 'item'> & {
+        item: $Typed<app.bsky.feed.defs.PostView>
       }
     }
   | {
       type: 'bookmarkNotFound'
       key: string
-      bookmark: Omit<AppBskyBookmarkDefs.BookmarkView, 'item'> & {
-        item: $Typed<AppBskyFeedDefs.NotFoundPost>
+      bookmark: Omit<app.bsky.bookmark.defs.BookmarkView, 'item'> & {
+        item: $Typed<app.bsky.feed.defs.NotFoundPost>
       }
     }
 
@@ -132,7 +130,7 @@ function BookmarksInner() {
 
       if (bookmarks.length > 0) {
         for (const bookmark of bookmarks) {
-          if (AppBskyFeedDefs.isNotFoundPost(bookmark.item)) {
+          if (bsky.isType(app.bsky.feed.defs.notFoundPost, bookmark.item)) {
             i.push({
               type: 'bookmarkNotFound',
               key: bookmark.item.uri,
@@ -142,7 +140,7 @@ function BookmarksInner() {
               },
             })
           }
-          if (AppBskyFeedDefs.isPostView(bookmark.item)) {
+          if (bsky.isType(app.bsky.feed.defs.postView, bookmark.item)) {
             i.push({
               type: 'bookmark',
               key: bookmark.item.uri,
@@ -199,7 +197,7 @@ function BookmarkNotFound({
   post,
 }: {
   hideTopBorder: boolean
-  post: $Typed<AppBskyFeedDefs.NotFoundPost>
+  post: $Typed<app.bsky.feed.defs.NotFoundPost>
 }) {
   const t = useTheme()
   const {_} = useLingui()
diff --git a/src/screens/CustomFeed/components/CustomFeedHeader.tsx b/src/screens/CustomFeed/components/CustomFeedHeader.tsx
index 7d6b7da7de..a2d4dc56dd 100644
--- a/src/screens/CustomFeed/components/CustomFeedHeader.tsx
+++ b/src/screens/CustomFeed/components/CustomFeedHeader.tsx
@@ -1,6 +1,6 @@
 import {useCallback, useMemo, useState} from 'react'
 import {View} from 'react-native'
-import {AtUri} from '@atproto/api'
+import {AtUri} from '@atproto/syntax'
 import {Plural, Trans, useLingui} from '@lingui/react/macro'
 
 import {TRENDING_HANDLE} from '#/lib/constants'
diff --git a/src/screens/CustomFeed/index.tsx b/src/screens/CustomFeed/index.tsx
index 4f2a6e0903..112ea1b5ff 100644
--- a/src/screens/CustomFeed/index.tsx
+++ b/src/screens/CustomFeed/index.tsx
@@ -1,6 +1,5 @@
 import {useCallback, useEffect, useMemo, useState} from 'react'
 import {useAnimatedRef} from 'react-native-reanimated'
-import {AppBskyFeedDefs} from '@atproto/api'
 import {useLingui} from '@lingui/react/macro'
 import {useIsFocused} from '@react-navigation/native'
 import {type NativeStackScreenProps} from '@react-navigation/native-stack'
@@ -39,6 +38,7 @@ import {EditBig_Stroke2_Corner2_Rounded as EditBigIcon} from '#/components/icons
 import {HashtagWide_Stroke1_Corner0_Rounded as HashtagWideIcon} from '#/components/icons/Hashtag'
 import * as Layout from '#/components/Layout'
 import {IS_NATIVE} from '#/env'
+import {app} from '#/lexicons'
 import {
   CustomFeedHeader,
   CustomFeedHeaderSkeleton,
@@ -175,7 +175,7 @@ export function CustomFeedScreenInner({
   const isVideoFeed = useMemo(() => {
     const isBskyVideoFeed = VIDEO_FEED_URIS.includes(feedInfo.uri)
     const feedIsVideoMode =
-      feedInfo.contentMode === AppBskyFeedDefs.CONTENTMODEVIDEO
+      feedInfo.contentMode === app.bsky.feed.defs.contentModeVideo.value
     const _isVideoFeed = isBskyVideoFeed || feedIsVideoMode
     return IS_NATIVE && _isVideoFeed
   }, [feedInfo])
diff --git a/src/screens/Hashtag.tsx b/src/screens/Hashtag.tsx
index 39c2341f88..10d0c91884 100644
--- a/src/screens/Hashtag.tsx
+++ b/src/screens/Hashtag.tsx
@@ -1,6 +1,5 @@
 import {useCallback, useMemo, useState} from 'react'
 import {type ListRenderItemInfo, View} from 'react-native'
-import {type AppBskyFeedDefs} from '@atproto/api'
 import {Trans, useLingui} from '@lingui/react/macro'
 import {type NativeStackScreenProps} from '@react-navigation/native-stack'
 
@@ -28,12 +27,15 @@ import {InlineLinkText} from '#/components/Link'
 import {ListFooter, ListMaybePlaceholder} from '#/components/Lists'
 import {SearchError} from '#/components/SearchError'
 import {Text} from '#/components/Typography'
+import {type app} from '#/lexicons'
 
-const renderItem = ({item}: ListRenderItemInfo<AppBskyFeedDefs.PostView>) => {
+const renderItem = ({
+  item,
+}: ListRenderItemInfo<app.bsky.feed.defs.PostView>) => {
   return <Post post={item} />
 }
 
-const keyExtractor = (item: AppBskyFeedDefs.PostView, index: number) => {
+const keyExtractor = (item: app.bsky.feed.defs.PostView, index: number) => {
   return `${item.uri}-${index}`
 }
 
diff --git a/src/screens/List/ListHiddenScreen.tsx b/src/screens/List/ListHiddenScreen.tsx
index aea2465d7f..f562ad1d96 100644
--- a/src/screens/List/ListHiddenScreen.tsx
+++ b/src/screens/List/ListHiddenScreen.tsx
@@ -1,6 +1,5 @@
 import {useState} from 'react'
 import {View} from 'react-native'
-import {AppBskyGraphDefs} from '@atproto/api'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
@@ -27,12 +26,13 @@ import {Loader} from '#/components/Loader'
 import {useHider} from '#/components/moderation/Hider'
 import * as Toast from '#/components/Toast'
 import {Text} from '#/components/Typography'
+import {app} from '#/lexicons'
 
 export function ListHiddenScreen({
   list,
   preferences,
 }: {
-  list: AppBskyGraphDefs.ListView
+  list: app.bsky.graph.defs.ListView
   preferences: UsePreferencesQueryResponse
 }) {
   const {_} = useLingui()
@@ -43,7 +43,7 @@ export function ListHiddenScreen({
   const goBack = useGoBack()
   const queryClient = useQueryClient()
 
-  const isModList = list.purpose === AppBskyGraphDefs.MODLIST
+  const isModList = list.purpose === app.bsky.graph.defs.modlist.value
 
   const [isProcessing, setIsProcessing] = useState(false)
   const listBlockMutation = useListBlockMutation()
diff --git a/src/screens/Login/LoginForm.tsx b/src/screens/Login/LoginForm.tsx
index ad50179bee..dfd6ccc227 100644
--- a/src/screens/Login/LoginForm.tsx
+++ b/src/screens/Login/LoginForm.tsx
@@ -1,6 +1,5 @@
 import {useRef, useState} from 'react'
 import {Keyboard, type TextInput, View} from 'react-native'
-import {type ComAtprotoServerDescribeServer} from '@atproto/api'
 import {LexAuthFactorError} from '@atproto/lex-password-session'
 import {Trans, useLingui} from '@lingui/react/macro'
 
@@ -33,11 +32,12 @@ import {createStaticClick, InlineLinkText} from '#/components/Link'
 import {Loader} from '#/components/Loader'
 import {Text} from '#/components/Typography'
 import {IS_IOS, IS_NATIVE} from '#/env'
+import {type com} from '#/lexicons'
 import {ConfirmHostingProviderDialog} from './components/ConfirmHostingProviderDialog'
 import {HostingProviderDialog} from './components/HostingProviderDialog'
 import {FormContainer} from './FormContainer'
 
-type ServiceDescription = ComAtprotoServerDescribeServer.OutputSchema
+type ServiceDescription = com.atproto.server.describeServer.$OutputBody
 
 export const LoginForm = ({
   error,
diff --git a/src/screens/Messages/ChatList.tsx b/src/screens/Messages/ChatList.tsx
index b7eb113a49..c0bfa156db 100644
--- a/src/screens/Messages/ChatList.tsx
+++ b/src/screens/Messages/ChatList.tsx
@@ -1,6 +1,5 @@
 import {useCallback, useEffect, useMemo, useRef, useState} from 'react'
 import {View} from 'react-native'
-import {type ChatBskyActorGetStatus, type ChatBskyConvoDefs} from '@atproto/api'
 import {Trans, useLingui} from '@lingui/react/macro'
 import {
   useFocusEffect,
@@ -57,17 +56,18 @@ import * as Toast from '#/components/Toast'
 import {Text} from '#/components/Typography'
 import {useAgeAssurance} from '#/ageAssurance'
 import {IS_NATIVE, IS_WEB} from '#/env'
+import {type chat} from '#/lexicons'
 import {ChatDisabled} from './components/ChatDisabled'
 import {ChatListItem} from './components/ChatListItem'
 import {InboxRequests} from './components/InboxRequests'
 import {useIsWithinSplitView} from './components/splitView/context'
 import {splitViewLeftScroll} from './components/splitView/leftColumnScroll'
 
-type ChatStatus = ChatBskyActorGetStatus.OutputSchema
+type ChatStatus = chat.bsky.actor.getStatus.$OutputBody
 
 type ListItem = {
   type: 'CONVERSATION'
-  conversation: ChatBskyConvoDefs.ConvoView
+  conversation: chat.bsky.convo.defs.ConvoView
   selected: boolean
 }
 
diff --git a/src/screens/Messages/Conversation.tsx b/src/screens/Messages/Conversation.tsx
index 503248754c..a846817f50 100644
--- a/src/screens/Messages/Conversation.tsx
+++ b/src/screens/Messages/Conversation.tsx
@@ -1,11 +1,11 @@
 import {useCallback, useEffect, useMemo, useState} from 'react'
 import {type LayoutChangeEvent, View} from 'react-native'
 import {useSafeAreaInsets} from 'react-native-safe-area-context'
-import {ChatBskyConvoDefs} from '@atproto/api'
 import {
   ScrollEdgeEffect,
   ScrollEdgeEffectProvider,
 } from '@bsky.app/expo-scroll-edge-effect'
+import {moderateProfile} from '@bsky.app/sdk/moderation'
 import {Trans, useLingui} from '@lingui/react/macro'
 import {
   type RouteProp,
@@ -18,7 +18,6 @@ import {type NativeStackScreenProps} from '@react-navigation/native-stack'
 
 import {useNonReactiveCallback} from '#/lib/hooks/useNonReactiveCallback'
 import {useViewportZoomLock} from '#/lib/hooks/useViewportZoomLock'
-import {moderateProfile} from '#/lib/moderation/subjects'
 import {
   type CommonNavigatorParams,
   type NavigationProp,
@@ -46,6 +45,8 @@ import {type ConvoWithDetails, parseConvoView} from '#/components/dms/util'
 import {Error} from '#/components/Error'
 import * as Layout from '#/components/Layout'
 import {IS_LIQUID_GLASS} from '#/env'
+import {chat} from '#/lexicons'
+import * as bsky from '#/types/bsky'
 import {ChatDisabled} from './components/ChatDisabled'
 import {ChatEnded} from './components/ChatEnded'
 import {ChatLocked} from './components/ChatLocked'
@@ -179,7 +180,8 @@ function InnerReady({
   const emailDialogControl = useEmailDialogControl()
 
   const unreadRequestCount =
-    convo?.kind === 'group' && ChatBskyConvoDefs.isGroupConvo(convo.view.kind)
+    convo?.kind === 'group' &&
+    bsky.isType(chat.bsky.convo.defs.groupConvo, convo.view.kind)
       ? (convo.view.kind.unreadJoinRequestCount ?? 0)
       : 0
   const {mutate: markJoinRequestsRead} = useMarkJoinRequestsRead(convo?.view.id)
diff --git a/src/screens/Messages/ConversationSettings/Member.tsx b/src/screens/Messages/ConversationSettings/Member.tsx
index 8fe07978e8..ad6fdc6136 100644
--- a/src/screens/Messages/ConversationSettings/Member.tsx
+++ b/src/screens/Messages/ConversationSettings/Member.tsx
@@ -1,9 +1,9 @@
 import {View} from 'react-native'
+import {moderateProfile} from '@bsky.app/sdk/moderation'
 import {Trans, useLingui} from '@lingui/react/macro'
 
 import {isBlockedOrBlocking} from '#/lib/moderation/blocked-and-muted'
 import {createSanitizedDisplayName} from '#/lib/moderation/create-sanitized-display-name'
-import {moderateProfile} from '#/lib/moderation/subjects'
 import {logger} from '#/logger'
 import {useProfileShadow} from '#/state/cache/profile-shadow'
 import {useModerationOpts} from '#/state/preferences/moderation-opts'
diff --git a/src/screens/Messages/ConversationSettings/index.tsx b/src/screens/Messages/ConversationSettings/index.tsx
index 80806ae534..335affc9ff 100644
--- a/src/screens/Messages/ConversationSettings/index.tsx
+++ b/src/screens/Messages/ConversationSettings/index.tsx
@@ -1,6 +1,5 @@
 import {useEffect, useState} from 'react'
 import {Pressable, View} from 'react-native'
-import {ChatBskyActorDefs, ChatBskyConvoDefs} from '@atproto/api'
 import {type ModerationOpts} from '@bsky.app/sdk/moderation'
 import {Trans, useLingui} from '@lingui/react/macro'
 import {useNavigation} from '@react-navigation/native'
@@ -171,15 +170,12 @@ function keyExtractor(item: Item) {
 }
 
 function isGroupMember(
-  member: ChatBskyActorDefs.ProfileViewBasic,
+  member: chat.bsky.actor.defs.ProfileViewBasic,
 ): member is GroupConvoMember {
   // Kind is missing when the account has been deleted.
   return (
     member.kind === undefined ||
-    bsky.dangerousIsType<ChatBskyActorDefs.GroupConvoMember>(
-      member.kind,
-      ChatBskyActorDefs.isGroupConvoMember,
-    )
+    bsky.isType(chat.bsky.actor.defs.groupConvoMember, member.kind)
   )
 }
 
@@ -415,7 +411,7 @@ function SettingsHeader({
     isPending: isLocking,
   } = useLockConvo(convoId, {
     onSuccess: (data, {silent}) => {
-      if (!ChatBskyConvoDefs.isGroupConvo(data.convo.kind)) return
+      if (!bsky.isType(chat.bsky.convo.defs.groupConvo, data.convo.kind)) return
       if (silent) return
       if (data.convo.kind.lockStatus === 'locked') {
         ax.metric('groupchat:owner:lock', {convoId})
diff --git a/src/screens/Messages/Inbox.tsx b/src/screens/Messages/Inbox.tsx
index f6b4216b2c..30e06e3ab2 100644
--- a/src/screens/Messages/Inbox.tsx
+++ b/src/screens/Messages/Inbox.tsx
@@ -1,10 +1,5 @@
 import {useCallback, useMemo, useState} from 'react'
 import {View} from 'react-native'
-import {
-  ChatBskyConvoDefs,
-  type ChatBskyConvoListConvoRequests,
-  ChatBskyGroupDefs,
-} from '@atproto/api'
 import {Trans, useLingui} from '@lingui/react/macro'
 import {useFocusEffect, useNavigation} from '@react-navigation/native'
 import {
@@ -44,6 +39,8 @@ import {ListFooter} from '#/components/Lists'
 import * as Toast from '#/components/Toast'
 import {Text} from '#/components/Typography'
 import {IS_NATIVE} from '#/env'
+import {chat} from '#/lexicons'
+import * as bsky from '#/types/bsky'
 import {IncomingRequestListItem} from './components/IncomingRequestListItem'
 import {OutgoingRequestListItem} from './components/OutgoingRequestListItem'
 import {useIsWithinSplitView} from './components/splitView/context'
@@ -51,8 +48,8 @@ import {useIsWithinSplitView} from './components/splitView/context'
 type Props = NativeStackScreenProps<CommonNavigatorParams, 'MessagesInbox'>
 
 type RequestItem =
-  | {type: 'incoming'; view: ChatBskyConvoDefs.ConvoView}
-  | {type: 'outgoing'; view: ChatBskyGroupDefs.JoinRequestConvoView}
+  | {type: 'incoming'; view: chat.bsky.convo.defs.ConvoView}
+  | {type: 'outgoing'; view: chat.bsky.group.defs.JoinRequestConvoView}
 
 export function MessagesInboxScreen(props: Props) {
   const {t: l} = useLingui()
@@ -75,9 +72,11 @@ export function MessagesInboxScreenInner({}: Props) {
     const items: RequestItem[] = []
     for (const page of data.pages) {
       for (const item of page.requests) {
-        if (ChatBskyConvoDefs.isConvoView(item)) {
+        if (bsky.isType(chat.bsky.convo.defs.convoView, item)) {
           items.push({type: 'incoming', view: item})
-        } else if (ChatBskyGroupDefs.isJoinRequestConvoView(item)) {
+        } else if (
+          bsky.isType(chat.bsky.group.defs.joinRequestConvoView, item)
+        ) {
           items.push({type: 'outgoing', view: item})
         }
       }
@@ -112,7 +111,7 @@ function RequestList({
   conversations,
 }: {
   listConvosQuery: UseInfiniteQueryResult<
-    InfiniteData<ChatBskyConvoListConvoRequests.OutputSchema>,
+    InfiniteData<chat.bsky.convo.listConvoRequests.$OutputBody>,
     Error
   >
   conversations: RequestItem[]
diff --git a/src/screens/Messages/JoinRequest.tsx b/src/screens/Messages/JoinRequest.tsx
index 06faecaffe..f2cb6b67dc 100644
--- a/src/screens/Messages/JoinRequest.tsx
+++ b/src/screens/Messages/JoinRequest.tsx
@@ -1,12 +1,11 @@
 import {useEffect} from 'react'
 import {View} from 'react-native'
 import {ImageBackground} from 'expo-image'
-import {ChatBskyGroupDefs} from '@atproto/api'
 import {type ThemeName} from '@bsky.app/alf'
+import {moderateProfile} from '@bsky.app/sdk/moderation'
 import {Trans, useLingui} from '@lingui/react/macro'
 
 import {createSanitizedDisplayName} from '#/lib/moderation/create-sanitized-display-name'
-import {moderateProfile} from '#/lib/moderation/subjects'
 import {sanitizeHandle} from '#/lib/strings/handles'
 import {useModerationOpts} from '#/state/preferences/moderation-opts'
 import {useJoinLinkPreviewsQuery} from '#/state/queries/join-links'
@@ -21,6 +20,8 @@ import {PersonGroup_Stroke2_Corner2_Rounded as PersonGroupIcon} from '#/componen
 import {ProfileBadges} from '#/components/ProfileBadges'
 import {Text} from '#/components/Typography'
 import {useAnalytics} from '#/analytics'
+import {chat} from '#/lexicons'
+import * as bsky from '#/types/bsky'
 
 const desktopDarkBg = require('../../../assets/images/chat-desktop-bg-dark.webp')
 const desktopDimBg = require('../../../assets/images/chat-desktop-bg-dim.webp')
@@ -84,7 +85,10 @@ export function JoinRequest({setScreenState}: Props) {
           ]}>
           {error ||
           (data &&
-            !ChatBskyGroupDefs.isJoinLinkPreviewView(joinLinkPreview)) ? (
+            !bsky.isType(
+              chat.bsky.group.defs.joinLinkPreviewView,
+              joinLinkPreview,
+            )) ? (
             <Wrapper>
               <ChainLinkBrokenIcon fill={t.palette.primary_500} size="3xl" />
               <Text
@@ -101,7 +105,10 @@ export function JoinRequest({setScreenState}: Props) {
             </Wrapper>
           ) : data &&
             moderationOpts &&
-            ChatBskyGroupDefs.isJoinLinkPreviewView(joinLinkPreview) ? (
+            bsky.isType(
+              chat.bsky.group.defs.joinLinkPreviewView,
+              joinLinkPreview,
+            ) ? (
             <Wrapper>
               <AvatarBubbles
                 profiles={[joinLinkPreview.owner]}
diff --git a/src/screens/Messages/JoinRequests.tsx b/src/screens/Messages/JoinRequests.tsx
index d8d6ff9b06..baf2d84f81 100644
--- a/src/screens/Messages/JoinRequests.tsx
+++ b/src/screens/Messages/JoinRequests.tsx
@@ -1,6 +1,5 @@
 import {useState} from 'react'
 import {View} from 'react-native'
-import {type ChatBskyGroupListJoinRequests} from '@atproto/api'
 import {Plural, Trans, useLingui} from '@lingui/react/macro'
 import {useNavigation} from '@react-navigation/native'
 import {type InfiniteData, useQueryClient} from '@tanstack/react-query'
@@ -140,7 +139,7 @@ function JoinRequestsList({
 
   const getRemainingRequestCount = () => {
     const data = queryClient.getQueryData<
-      InfiniteData<ChatBskyGroupListJoinRequests.OutputSchema>
+      InfiniteData<chat.bsky.group.listJoinRequests.$OutputBody>
     >(createListJoinRequestsQueryKey({convoId}))
     return data?.pages.reduce((sum, page) => sum + page.requests.length, 0) ?? 0
   }
diff --git a/src/screens/Messages/components/ChatDisabled.tsx b/src/screens/Messages/components/ChatDisabled.tsx
index 62f353d1a8..31bdebc4d2 100644
--- a/src/screens/Messages/components/ChatDisabled.tsx
+++ b/src/screens/Messages/components/ChatDisabled.tsx
@@ -1,6 +1,5 @@
 import {useCallback, useState} from 'react'
 import {type StyleProp, View, type ViewStyle} from 'react-native'
-import {ToolsOzoneReportDefs} from '@atproto/api'
 import {type DidString} from '@atproto/syntax'
 import {Trans, useLingui} from '@lingui/react/macro'
 import {useMutation} from '@tanstack/react-query'
@@ -15,7 +14,7 @@ import {Warning_Stroke2_Corner0_Rounded as WarningIcon} from '#/components/icons
 import {Loader} from '#/components/Loader'
 import * as Toast from '#/components/Toast'
 import {Text} from '#/components/Typography'
-import {com} from '#/lexicons'
+import {com, tools} from '#/lexicons'
 
 export function ChatDisabled({
   shape = 'pill',
@@ -104,7 +103,7 @@ function DialogInner() {
       await client.call(
         com.atproto.moderation.createReport,
         {
-          reasonType: ToolsOzoneReportDefs.REASONAPPEAL,
+          reasonType: tools.ozone.report.defs.reasonAppeal.value,
           subject: {
             $type: 'com.atproto.admin.defs#repoRef',
             // the persisted account did is already resolved
diff --git a/src/screens/Messages/components/ChatListItem.tsx b/src/screens/Messages/components/ChatListItem.tsx
index ad2a1d731c..657fa8bae3 100644
--- a/src/screens/Messages/components/ChatListItem.tsx
+++ b/src/screens/Messages/components/ChatListItem.tsx
@@ -1,7 +1,7 @@
 import {useCallback, useMemo, useState} from 'react'
 import {type GestureResponderEvent, View} from 'react-native'
-import {ChatBskyConvoDefs} from '@atproto/api'
 import {
+  moderateProfile,
   type ModerationDecision,
   type ModerationOpts,
 } from '@bsky.app/sdk/moderation'
@@ -12,7 +12,6 @@ import {useQueryClient} from '@tanstack/react-query'
 import {GestureActionView} from '#/lib/custom-animations/GestureActionView'
 import {useHaptics} from '#/lib/haptics'
 import {createSanitizedDisplayName} from '#/lib/moderation/create-sanitized-display-name'
-import {moderateProfile} from '#/lib/moderation/subjects'
 import {decrementBadgeCount} from '#/lib/notifications/notifications'
 import {sanitizeHandle} from '#/lib/strings/handles'
 import {
@@ -53,7 +52,8 @@ import {ProfileBadges} from '#/components/ProfileBadges'
 import {Text} from '#/components/Typography'
 import {useAnalytics} from '#/analytics'
 import {IS_NATIVE} from '#/env'
-import type * as bsky from '#/types/bsky'
+import {chat} from '#/lexicons'
+import * as bsky from '#/types/bsky'
 import {useIsWithinSplitView} from './splitView/context'
 
 export const ChatListItemPortal = createPortalGroup()
@@ -64,7 +64,7 @@ export function ChatListItem({
   selected = false,
   children,
 }: {
-  convo: ChatBskyConvoDefs.ConvoView
+  convo: chat.bsky.convo.defs.ConvoView
   showMenu?: boolean
   selected?: boolean
   children?: React.ReactNode
@@ -314,7 +314,12 @@ function BaseChatItem({
     let lastMessageSentAt: string | null = null
 
     // Deleted message
-    if (ChatBskyConvoDefs.isDeletedMessageView(convo.view.lastMessage)) {
+    if (
+      bsky.isType(
+        chat.bsky.convo.defs.deletedMessageView,
+        convo.view.lastMessage,
+      )
+    ) {
       lastMessageSentAt = convo.view.lastMessage.sentAt
 
       lastMessage = isDeletedAccount
@@ -323,7 +328,7 @@ function BaseChatItem({
     }
 
     // Message
-    if (ChatBskyConvoDefs.isMessageView(convo.view.lastMessage)) {
+    if (bsky.isType(chat.bsky.convo.defs.messageView, convo.view.lastMessage)) {
       const info = getMessageInfo({
         convo: convo.view,
         currentAccountDid: currentAccount?.did,
@@ -339,7 +344,12 @@ function BaseChatItem({
     }
 
     // Reaction
-    if (ChatBskyConvoDefs.isMessageAndReactionView(convo.view.lastReaction)) {
+    if (
+      bsky.isType(
+        chat.bsky.convo.defs.messageAndReactionView,
+        convo.view.lastReaction,
+      )
+    ) {
       const info = getReactionInfo({
         convo: convo.view,
         currentAccountDid: currentAccount?.did,
@@ -358,7 +368,12 @@ function BaseChatItem({
     }
 
     // System message
-    if (ChatBskyConvoDefs.isSystemMessageView(convo.view.lastMessage)) {
+    if (
+      bsky.isType(
+        chat.bsky.convo.defs.systemMessageView,
+        convo.view.lastMessage,
+      )
+    ) {
       const info = getSystemMessageInfo(
         convo.view.lastMessage.data,
         new Map(convo.view.members.map(m => [m.did, m])),
diff --git a/src/screens/Messages/components/ChatStatusInfo.tsx b/src/screens/Messages/components/ChatStatusInfo.tsx
index 4d3ebe2ab8..1910159a49 100644
--- a/src/screens/Messages/components/ChatStatusInfo.tsx
+++ b/src/screens/Messages/components/ChatStatusInfo.tsx
@@ -1,10 +1,10 @@
 import {useCallback, useMemo} from 'react'
 import {View} from 'react-native'
 import {LinearGradient} from 'expo-linear-gradient'
+import {moderateProfile} from '@bsky.app/sdk/moderation'
 import {Trans, useLingui} from '@lingui/react/macro'
 
 import {createSanitizedDisplayName} from '#/lib/moderation/create-sanitized-display-name'
-import {moderateProfile} from '#/lib/moderation/subjects'
 import {sanitizeHandle} from '#/lib/strings/handles'
 import {useProfileShadow} from '#/state/cache/profile-shadow'
 import {type ActiveConvoStates} from '#/state/messages/convo'
diff --git a/src/screens/Messages/components/IncomingRequestListItem.tsx b/src/screens/Messages/components/IncomingRequestListItem.tsx
index aa4618188a..4753b92aea 100644
--- a/src/screens/Messages/components/IncomingRequestListItem.tsx
+++ b/src/screens/Messages/components/IncomingRequestListItem.tsx
@@ -1,5 +1,4 @@
 import {View} from 'react-native'
-import {type ChatBskyConvoDefs} from '@atproto/api'
 import {Trans} from '@lingui/react/macro'
 
 import {useModerationOpts} from '#/state/preferences/moderation-opts'
@@ -8,13 +7,14 @@ import {atoms as a, tokens} from '#/alf'
 import {parseConvoView} from '#/components/dms/util'
 import {KnownFollowers} from '#/components/KnownFollowers'
 import {Text} from '#/components/Typography'
+import {type chat} from '#/lexicons'
 import {ChatListItem, ChatListItemPortal} from './ChatListItem'
 import {AcceptChatButton, DeleteChatButton, RejectMenu} from './RequestButtons'
 
 export function IncomingRequestListItem({
   convo: convoView,
 }: {
-  convo: ChatBskyConvoDefs.ConvoView
+  convo: chat.bsky.convo.defs.ConvoView
 }) {
   const {currentAccount} = useSession()
   const moderationOpts = useModerationOpts()
diff --git a/src/screens/Messages/components/InviteLinkDialog.tsx b/src/screens/Messages/components/InviteLinkDialog.tsx
index a2a32a41c5..c30f5dac55 100644
--- a/src/screens/Messages/components/InviteLinkDialog.tsx
+++ b/src/screens/Messages/components/InviteLinkDialog.tsx
@@ -1,13 +1,11 @@
 import {useState} from 'react'
 import {View} from 'react-native'
 import {Image} from 'expo-image'
-import {type ChatBskyGroupDefs} from '@atproto/api'
-import {type ModerationOpts} from '@bsky.app/sdk/moderation'
+import {moderateProfile, type ModerationOpts} from '@bsky.app/sdk/moderation'
 import {Plural, Trans, useLingui} from '@lingui/react/macro'
 
 import {useOpenComposer} from '#/lib/hooks/useOpenComposer'
 import {createSanitizedDisplayName} from '#/lib/moderation/create-sanitized-display-name'
-import {moderateProfile} from '#/lib/moderation/subjects'
 import {shareUrl} from '#/lib/sharing'
 import {useCreateJoinLink} from '#/state/queries/messages/create-join-link'
 import {useDisableJoinLink} from '#/state/queries/messages/disable-join-link'
@@ -35,6 +33,7 @@ import * as Toast from '#/components/Toast'
 import {Text} from '#/components/Typography'
 import {useAnalytics} from '#/analytics'
 import {IS_WEB} from '#/env'
+import {type chat} from '#/lexicons'
 import {CopyTextButton} from './CopyTextButton'
 import {EditTextButton} from './EditTextButton'
 
@@ -560,13 +559,13 @@ export function InviteLinkDialog({
   )
 }
 
-function joinLinkToKey(joinLink: ChatBskyGroupDefs.JoinLinkView): string {
+function joinLinkToKey(joinLink: chat.bsky.group.defs.JoinLinkView): string {
   return `${joinLink.joinRule}${joinLink.requireApproval ? ':requireApproval' : ''}`
 }
 
 function keyToJoinLink(
   key: string,
-): Pick<ChatBskyGroupDefs.JoinLinkView, 'joinRule' | 'requireApproval'> {
+): Pick<chat.bsky.group.defs.JoinLinkView, 'joinRule' | 'requireApproval'> {
   const [joinRule, requireApproval] = key.split(':')
   return {
     joinRule,
diff --git a/src/screens/Messages/components/MessageComposer.tsx b/src/screens/Messages/components/MessageComposer.tsx
index 1bc5e20e1e..b2f3a1d4e3 100644
--- a/src/screens/Messages/components/MessageComposer.tsx
+++ b/src/screens/Messages/components/MessageComposer.tsx
@@ -13,7 +13,7 @@ import {useSafeAreaInsets} from 'react-native-safe-area-context'
 import {scheduleOnRN} from 'react-native-worklets'
 import {GlassContainer} from 'expo-glass-effect'
 import {LinearGradient} from 'expo-linear-gradient'
-import {type $Typed, type ChatBskyConvoDefs} from '@atproto/api'
+import {type $Typed} from '@atproto/lex'
 import {ScrollEdgeEffect} from '@bsky.app/expo-scroll-edge-effect'
 import {useLingui} from '@lingui/react/macro'
 import {countGraphemes} from 'unicode-segmenter/grapheme'
@@ -37,6 +37,7 @@ import {PaperPlaneVertical_Filled_Stroke2_Corner1_Rounded as PaperPlaneIcon} fro
 import {Loader} from '#/components/Loader'
 import * as Toast from '#/components/Toast'
 import {IS_ANDROID, IS_IOS, IS_LIQUID_GLASS, IS_NATIVE, IS_WEB} from '#/env'
+import {type chat} from '#/lexicons'
 import {type MessageEmbedState} from './MessageInputEmbed'
 
 const MIN_HEIGHT = 40
@@ -53,7 +54,7 @@ export function MessageComposer({
   onSendMessage: (
     message: string,
     embed?: MessageEmbedState,
-    replyTo?: $Typed<ChatBskyConvoDefs.MessageView>,
+    replyTo?: $Typed<chat.bsky.convo.defs.MessageView>,
   ) => void
   messageEmbed: MessageEmbedState | undefined
   setEmbed: (embedUrl: string | undefined) => void
@@ -106,7 +107,7 @@ export function MessageComposer({
   const onSubmit = (
     message: string,
     embed: MessageEmbedState | undefined,
-    replyTo: ChatBskyConvoDefs.MessageView | null,
+    replyTo: chat.bsky.convo.defs.MessageView | null,
   ) => {
     if (!editable) return
     if (!embed && message.trim() === '') return
diff --git a/src/screens/Messages/components/MessageInputEmbed.tsx b/src/screens/Messages/components/MessageInputEmbed.tsx
index 7740c7ea50..e47373af48 100644
--- a/src/screens/Messages/components/MessageInputEmbed.tsx
+++ b/src/screens/Messages/components/MessageInputEmbed.tsx
@@ -1,18 +1,17 @@
 import {useCallback, useEffect, useMemo, useState} from 'react'
 import {LayoutAnimation, View} from 'react-native'
-import {AppBskyFeedPost, AtUri} from '@atproto/api'
+import {AtUri} from '@atproto/syntax'
+import {moderatePost} from '@bsky.app/sdk/moderation'
 import {RichText as RichTextAPI} from '@bsky.app/sdk/richtext'
 import {Trans, useLingui} from '@lingui/react/macro'
 import {type RouteProp, useNavigation, useRoute} from '@react-navigation/native'
 
 import {HITSLOP_20} from '#/lib/constants'
-import {moderatePost} from '#/lib/moderation/subjects'
 import {makeProfileLink} from '#/lib/routes/links'
 import {
   type CommonNavigatorParams,
   type NavigationProp,
 } from '#/lib/routes/types'
-import {asSdkFacets} from '#/lib/strings/rich-text-helpers'
 import {
   convertBskyAppUrlIfNeeded,
   getChatInviteCodeFromUrl,
@@ -164,17 +163,11 @@ function MessageInputPostEmbed({
   )
 
   const {rt, record} = useMemo(() => {
-    if (
-      post &&
-      bsky.dangerousIsType<AppBskyFeedPost.Record>(
-        post.record,
-        AppBskyFeedPost.isRecord,
-      )
-    ) {
+    if (post && bsky.isType(app.bsky.feed.post, post.record)) {
       return {
         rt: new RichTextAPI({
           text: post.record.text,
-          facets: asSdkFacets(post.record.facets),
+          facets: post.record.facets,
         }),
         record: post.record,
       }
diff --git a/src/screens/Messages/components/MessageInputReply.tsx b/src/screens/Messages/components/MessageInputReply.tsx
index 6b28b2f7b1..ff0f2d0b23 100644
--- a/src/screens/Messages/components/MessageInputReply.tsx
+++ b/src/screens/Messages/components/MessageInputReply.tsx
@@ -1,5 +1,4 @@
 import {LayoutAnimation, View} from 'react-native'
-import {type ChatBskyConvoDefs} from '@atproto/api'
 import {useLingui} from '@lingui/react/macro'
 
 import {HITSLOP_20} from '#/lib/constants'
@@ -11,6 +10,7 @@ import {useMessageReplies} from '#/components/dms/MessageReplies'
 import {useReplyPreviewText} from '#/components/dms/replyPreview'
 import {TimesLarge_Stroke2_Corner0_Rounded as XIcon} from '#/components/icons/Times'
 import {Text} from '#/components/Typography'
+import {type chat} from '#/lexicons'
 
 /**
  * The reply staged in the message composer. Renders a preview of the message
@@ -29,7 +29,7 @@ export function MessageInputReply() {
 function MessageInputReplyInner({
   replyTo,
 }: {
-  replyTo: ChatBskyConvoDefs.MessageView
+  replyTo: chat.bsky.convo.defs.MessageView
 }) {
   const t = useTheme()
   const {t: l} = useLingui()
diff --git a/src/screens/Messages/components/MessagesList.tsx b/src/screens/Messages/components/MessagesList.tsx
index eab025665c..1ef81f006d 100644
--- a/src/screens/Messages/components/MessagesList.tsx
+++ b/src/screens/Messages/components/MessagesList.tsx
@@ -22,13 +22,7 @@ import Animated, {
 } from 'react-native-reanimated'
 import {useSafeAreaInsets} from 'react-native-safe-area-context'
 import {scheduleOnRN} from 'react-native-worklets'
-import {
-  type $Typed,
-  type AppBskyEmbedRecord,
-  ChatBskyConvoDefs,
-  type ChatBskyEmbedJoinLink,
-  ChatBskyGroupDefs,
-} from '@atproto/api'
+import {type $Typed} from '@atproto/lex'
 import {useScrollEdgeEffectRef} from '@bsky.app/expo-scroll-edge-effect'
 import {RichText} from '@bsky.app/sdk/richtext'
 
@@ -70,7 +64,7 @@ import {Loader} from '#/components/Loader'
 import {Text} from '#/components/Typography'
 import {useAnalytics} from '#/analytics'
 import {IS_ANDROID, IS_NATIVE, IS_WEB} from '#/env'
-import {app, type chat, type com} from '#/lexicons'
+import {app, chat} from '#/lexicons'
 import * as bsky from '#/types/bsky'
 import {ChatStatusInfo} from './ChatStatusInfo'
 import {groupSystemMessages, type RenderItem} from './groupSystemMessages'
@@ -117,8 +111,8 @@ function getNeighborMessage(
     neighbor.type === 'deleted-message'
   ) {
     if (
-      ChatBskyConvoDefs.isMessageView(neighbor.message) ||
-      ChatBskyConvoDefs.isDeletedMessageView(neighbor.message)
+      bsky.isType(chat.bsky.convo.defs.messageView, neighbor.message) ||
+      bsky.isType(chat.bsky.convo.defs.deletedMessageView, neighbor.message)
     ) {
       return neighbor.message
     }
@@ -525,7 +519,7 @@ export function MessagesList({
     async (
       text: string,
       embedState?: MessageEmbedState,
-      reply?: $Typed<ChatBskyConvoDefs.MessageView>,
+      reply?: $Typed<chat.bsky.convo.defs.MessageView>,
     ) => {
       let rt = new RichText({text: text.trimEnd()}, {cleanNewlines: true})
 
@@ -539,10 +533,10 @@ export function MessagesList({
 
       let embed: chat.bsky.convo.defs.MessageInput['embed']
       let embedView:
-        | $Typed<AppBskyEmbedRecord.View>
-        | $Typed<ChatBskyEmbedJoinLink.View>
+        | $Typed<app.bsky.embed.record.View>
+        | $Typed<chat.bsky.embed.joinLink.View>
         | undefined
-      let replyTo: ChatBskyConvoDefs.ReplyRef | undefined
+      let replyTo: chat.bsky.convo.defs.ReplyRef | undefined
 
       /**
        * Find the embedded link facet and, if it's at the start or end of the
@@ -574,14 +568,13 @@ export function MessagesList({
             embed = {
               $type: 'app.bsky.embed.record',
               /*
-               * `getPost` still returns an `@atproto/api` view, whose `uri` and
-               * `cid` are plain strings rather than the branded syntax types
-               * the lexicon input declares.
+               * `getPost` hands back `uri` and `cid` as plain strings rather
+               * than the branded syntax types the lexicon input declares.
                */
               record: {
                 uri: post.uri,
                 cid: post.cid,
-              } as com.atproto.repo.strongRef.Main,
+              },
             }
 
             embedView = {
@@ -666,7 +659,10 @@ export function MessagesList({
       }
       if (
         embedView?.$type === 'chat.bsky.embed.joinLink#view' &&
-        ChatBskyGroupDefs.isJoinLinkPreviewView(embedView.joinLinkPreview)
+        bsky.isType(
+          chat.bsky.group.defs.joinLinkPreviewView,
+          embedView.joinLinkPreview,
+        )
       ) {
         ax.metric('groupchat:inviteLink:shared', {
           convoId: embedView.joinLinkPreview.convoId,
@@ -904,7 +900,7 @@ function Composer({
   onSendMessage: (
     message: string,
     embed?: MessageEmbedState,
-    replyTo?: $Typed<ChatBskyConvoDefs.MessageView>,
+    replyTo?: $Typed<chat.bsky.convo.defs.MessageView>,
   ) => Promise<void>
   messageEmbed: MessageEmbedState | undefined
   setEmbed: (embedUrl: string | undefined) => void
@@ -914,7 +910,7 @@ function Composer({
     (
       message: string,
       embed?: MessageEmbedState,
-      replyTo?: $Typed<ChatBskyConvoDefs.MessageView>,
+      replyTo?: $Typed<chat.bsky.convo.defs.MessageView>,
     ) => {
       void onSendMessage(message, embed, replyTo)
     },
diff --git a/src/screens/Messages/components/MessagesListInfoPanel.tsx b/src/screens/Messages/components/MessagesListInfoPanel.tsx
index 297ef8632f..e0e5545336 100644
--- a/src/screens/Messages/components/MessagesListInfoPanel.tsx
+++ b/src/screens/Messages/components/MessagesListInfoPanel.tsx
@@ -1,9 +1,9 @@
 import {View} from 'react-native'
+import {moderateProfile} from '@bsky.app/sdk/moderation'
 import {Trans, useLingui} from '@lingui/react/macro'
 import {useNavigation} from '@react-navigation/native'
 
 import {createSanitizedDisplayName} from '#/lib/moderation/create-sanitized-display-name'
-import {moderateProfile} from '#/lib/moderation/subjects'
 import {type NavigationProp} from '#/lib/routes/types'
 import {isInvalidHandle, sanitizeHandle} from '#/lib/strings/handles'
 import {useModerationOpts} from '#/state/preferences/moderation-opts'
diff --git a/src/screens/Messages/components/OutgoingRequestListItem.tsx b/src/screens/Messages/components/OutgoingRequestListItem.tsx
index eb62f24b81..9aa08fd0cf 100644
--- a/src/screens/Messages/components/OutgoingRequestListItem.tsx
+++ b/src/screens/Messages/components/OutgoingRequestListItem.tsx
@@ -1,5 +1,4 @@
 import {View} from 'react-native'
-import {type ChatBskyGroupDefs} from '@atproto/api'
 import {Trans, useLingui} from '@lingui/react/macro'
 
 import {isNetworkError} from '#/lib/strings/errors'
@@ -17,7 +16,7 @@ import {chat} from '#/lexicons'
 export function OutgoingRequestListItem({
   convo: convoView,
 }: {
-  convo: ChatBskyGroupDefs.JoinRequestConvoView
+  convo: chat.bsky.group.defs.JoinRequestConvoView
 }) {
   const t = useTheme()
   const {t: l} = useLingui()
diff --git a/src/screens/Messages/components/RequestButtons.tsx b/src/screens/Messages/components/RequestButtons.tsx
index c5e0e82ece..d0a5cb486f 100644
--- a/src/screens/Messages/components/RequestButtons.tsx
+++ b/src/screens/Messages/components/RequestButtons.tsx
@@ -1,5 +1,4 @@
 import {useCallback} from 'react'
-import {type ChatBskyActorDefs, type ChatBskyConvoDefs} from '@atproto/api'
 import {Trans, useLingui} from '@lingui/react/macro'
 import {StackActions, useNavigation} from '@react-navigation/native'
 import {useQueryClient} from '@tanstack/react-query'
@@ -41,6 +40,7 @@ import {Loader} from '#/components/Loader'
 import * as Menu from '#/components/Menu'
 import {ReportDialog} from '#/components/moderation/ReportDialog'
 import * as Toast from '#/components/Toast'
+import {type chat} from '#/lexicons'
 
 export function RejectMenu({
   convo,
@@ -56,7 +56,7 @@ export function RejectMenu({
   label?: string
   icon?: boolean
   convo: ConvoWithDetails
-  profile: ChatBskyActorDefs.ProfileViewBasic
+  profile: chat.bsky.actor.defs.ProfileViewBasic
   showDeleteConvo?: boolean
   currentScreen: 'list' | 'conversation'
 }) {
@@ -214,7 +214,7 @@ export function AcceptChatButton({
 }: Omit<ButtonProps, 'onPress' | 'children' | 'label'> & {
   label?: string
   icon?: boolean
-  convo: ChatBskyConvoDefs.ConvoView
+  convo: chat.bsky.convo.defs.ConvoView
   onAcceptConvo?: () => void
   currentScreen: 'list' | 'conversation'
 }) {
@@ -301,7 +301,7 @@ export function DeleteChatButton({
 }: Omit<ButtonProps, 'children' | 'label'> & {
   label?: string
   icon?: boolean
-  convo: ChatBskyConvoDefs.ConvoView
+  convo: chat.bsky.convo.defs.ConvoView
   currentScreen: 'list' | 'conversation'
 }) {
   const {t: l} = useLingui()
diff --git a/src/screens/Onboarding/StepSuggestedStarterpacks/StarterPackCard.tsx b/src/screens/Onboarding/StepSuggestedStarterpacks/StarterPackCard.tsx
index dc208917f5..450bf6da15 100644
--- a/src/screens/Onboarding/StepSuggestedStarterpacks/StarterPackCard.tsx
+++ b/src/screens/Onboarding/StepSuggestedStarterpacks/StarterPackCard.tsx
@@ -1,7 +1,5 @@
 import {useState} from 'react'
 import {View} from 'react-native'
-import {type AppBskyGraphDefs, AppBskyGraphStarterpack} from '@atproto/api'
-import {type AtUriString} from '@atproto/syntax'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
@@ -22,6 +20,7 @@ import {Loader} from '#/components/Loader'
 import * as Toast from '#/components/Toast'
 import {Text} from '#/components/Typography'
 import {useAnalytics} from '#/analytics'
+import {app} from '#/lexicons'
 import * as bsky from '#/types/bsky'
 
 const IGNORED_ACCOUNT = 'did:plc:pifkcjimdcfwaxkanzhwxufp'
@@ -29,7 +28,7 @@ const IGNORED_ACCOUNT = 'did:plc:pifkcjimdcfwaxkanzhwxufp'
 export function StarterPackCard({
   view,
 }: {
-  view: AppBskyGraphDefs.StarterPackView
+  view: app.bsky.graph.defs.StarterPackView
 }) {
   const t = useTheme()
   const {_} = useLingui()
@@ -48,7 +47,7 @@ export function StarterPackCard({
 
     setIsProcessing(true)
 
-    let listItems: AppBskyGraphDefs.ListItemView[] = []
+    let listItems: app.bsky.graph.defs.ListItemView[] = []
     try {
       listItems = await getAllListMembers(appviewClient, view.list.uri)
     } catch (e) {
@@ -77,7 +76,7 @@ export function StarterPackCard({
     try {
       followUris = await bulkWriteFollows(pdsClient, appviewClient, dids, {
         // the starter pack view is still legacy-typed
-        uri: view.uri as AtUriString,
+        uri: view.uri,
         cid: view.cid,
       })
     } catch (e) {
@@ -105,12 +104,7 @@ export function StarterPackCard({
     })
   }
 
-  if (
-    !bsky.dangerousIsType<AppBskyGraphStarterpack.Record>(
-      record,
-      AppBskyGraphStarterpack.isRecord,
-    )
-  ) {
+  if (!bsky.isType(app.bsky.graph.starterpack, record)) {
     return null
   }
 
diff --git a/src/screens/PostThread/components/LikesStat.tsx b/src/screens/PostThread/components/LikesStat.tsx
index de219f4743..afc4a79cad 100644
--- a/src/screens/PostThread/components/LikesStat.tsx
+++ b/src/screens/PostThread/components/LikesStat.tsx
@@ -1,8 +1,8 @@
 import {View} from 'react-native'
-import {type AppBskyFeedDefs, AtUri} from '@atproto/api'
+import {AtUri} from '@atproto/syntax'
+import {moderateProfile} from '@bsky.app/sdk/moderation'
 import {Plural, Trans, useLingui} from '@lingui/react/macro'
 
-import {moderateProfile} from '#/lib/moderation/subjects'
 import {makeProfileLink} from '#/lib/routes/links'
 import {sanitizeDisplayName} from '#/lib/strings/display-names'
 import {useModerationOpts} from '#/state/preferences/moderation-opts'
@@ -15,6 +15,7 @@ import {useFormatPostStatCount} from '#/components/PostControls/util'
 import {ProfileHoverCard} from '#/components/ProfileHoverCard'
 import {Text} from '#/components/Typography'
 import {useAnalytics} from '#/analytics'
+import {type app} from '#/lexicons'
 
 const AVI_SIZE = 20
 
@@ -22,7 +23,7 @@ const AVI_SIZE = 20
  * The plain "N likes" stat for the expanded anchor post, linking to the likes
  * list. Renders nothing when the post has no likes.
  */
-export function LikesStat({post}: {post: AppBskyFeedDefs.PostView}) {
+export function LikesStat({post}: {post: app.bsky.feed.defs.PostView}) {
   const t = useTheme()
   const {t: l} = useLingui()
   const formatPostStatCount = useFormatPostStatCount()
@@ -62,7 +63,7 @@ export function LikesStat({post}: {post: AppBskyFeedDefs.PostView}) {
  * likes, the API max per page), so they are a sample of the most recent
  * likers, not an exhaustive list.
  */
-export function KnownLikers({post}: {post: AppBskyFeedDefs.PostView}) {
+export function KnownLikers({post}: {post: app.bsky.feed.defs.PostView}) {
   const t = useTheme()
   const {t: l} = useLingui()
   const {hasSession, currentAccount} = useSession()
diff --git a/src/screens/PostThread/components/ThreadItemAnchor.tsx b/src/screens/PostThread/components/ThreadItemAnchor.tsx
index 4a2f6513e5..40894999ca 100644
--- a/src/screens/PostThread/components/ThreadItemAnchor.tsx
+++ b/src/screens/PostThread/components/ThreadItemAnchor.tsx
@@ -1,11 +1,6 @@
 import {memo, useMemo} from 'react'
 import {Text as RNText, View} from 'react-native'
-import {
-  AppBskyFeedDefs,
-  AppBskyFeedPost,
-  type AppBskyFeedThreadgate,
-  AtUri,
-} from '@atproto/api'
+import {AtUri} from '@atproto/syntax'
 import {RichText as RichTextAPI} from '@bsky.app/sdk/richtext'
 import {Plural, Trans, useLingui} from '@lingui/react/macro'
 
@@ -14,7 +9,6 @@ import {useOpenComposer} from '#/lib/hooks/useOpenComposer'
 import {makeProfileLink} from '#/lib/routes/links'
 import {sanitizeDisplayName} from '#/lib/strings/display-names'
 import {sanitizeHandle} from '#/lib/strings/handles'
-import {asSdkFacets} from '#/lib/strings/rich-text-helpers'
 import {niceDate} from '#/lib/strings/time'
 import {
   POST_TOMBSTONE,
@@ -65,6 +59,7 @@ import {Text} from '#/components/Typography'
 import {WhoCanReply} from '#/components/WhoCanReply'
 import {useAnalytics} from '#/analytics'
 import {useActorStatus} from '#/features/liveNow'
+import {app} from '#/lexicons'
 import * as bsky from '#/types/bsky'
 
 export function ThreadItemAnchor({
@@ -75,7 +70,7 @@ export function ThreadItemAnchor({
 }: {
   item: Extract<ThreadItem, {type: 'threadPost'}>
   onPostSuccess?: (data: OnPostSuccessData) => void
-  threadgateRecord?: AppBskyFeedThreadgate.Record
+  threadgateRecord?: app.bsky.feed.threadgate.Main
   postSource?: PostSource
 }) {
   const postShadow = usePostShadow(item.value.post)
@@ -176,9 +171,9 @@ const ThreadItemAnchorInner = memo(function ThreadItemAnchorInner({
 }: {
   item: Extract<ThreadItem, {type: 'threadPost'}>
   isRoot: boolean
-  postShadow: Shadow<AppBskyFeedDefs.PostView>
+  postShadow: Shadow<app.bsky.feed.defs.PostView>
   onPostSuccess?: (data: OnPostSuccessData) => void
-  threadgateRecord?: AppBskyFeedThreadgate.Record
+  threadgateRecord?: app.bsky.feed.threadgate.Main
   postSource?: PostSource
 }) {
   const t = useTheme()
@@ -200,7 +195,7 @@ const ThreadItemAnchorInner = memo(function ThreadItemAnchorInner({
     () =>
       new RichTextAPI({
         text: record.text,
-        facets: asSdkFacets(record.facets),
+        facets: record.facets,
       }),
     [record],
   )
@@ -244,7 +239,11 @@ const ThreadItemAnchorInner = memo(function ThreadItemAnchorInner({
   const viaRepost = useMemo(() => {
     const reason = postSource?.post.reason
 
-    if (AppBskyFeedDefs.isReasonRepost(reason) && reason.uri && reason.cid) {
+    if (
+      bsky.isType(app.bsky.feed.defs.reasonRepost, reason) &&
+      reason.uri &&
+      reason.cid
+    ) {
       return {
         uri: reason.uri,
         cid: reason.cid,
@@ -574,16 +573,13 @@ function ExpandedPostDetails({
   )
 }
 
-function BackdatedPostIndicator({post}: {post: AppBskyFeedDefs.PostView}) {
+function BackdatedPostIndicator({post}: {post: app.bsky.feed.defs.PostView}) {
   const t = useTheme()
   const {t: l, i18n} = useLingui()
   const control = Prompt.usePromptControl()
 
   const indexedAt = new Date(post.indexedAt)
-  const createdAt = bsky.dangerousIsType<AppBskyFeedPost.Record>(
-    post.record,
-    AppBskyFeedPost.isRecord,
-  )
+  const createdAt = bsky.isType(app.bsky.feed.post, post.record)
     ? new Date(post.record.createdAt)
     : new Date(post.indexedAt)
 
@@ -664,8 +660,8 @@ function BackdatedPostIndicator({post}: {post: AppBskyFeedDefs.PostView}) {
 }
 
 function getThreadAuthor(
-  post: AppBskyFeedDefs.PostView,
-  record: AppBskyFeedPost.Record,
+  post: app.bsky.feed.defs.PostView,
+  record: app.bsky.feed.post.Main,
 ): string {
   if (!record.reply) {
     return post.author.did
diff --git a/src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx b/src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx
index f7ea1c53fb..fcf873f97c 100644
--- a/src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx
+++ b/src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx
@@ -1,5 +1,4 @@
 import {useCallback, useEffect, useMemo, useState} from 'react'
-import {type AppBskyActorDefs} from '@atproto/api'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
@@ -18,6 +17,7 @@ import {Check_Stroke2_Corner0_Rounded as CheckIcon} from '#/components/icons/Che
 import {PlusLarge_Stroke2_Corner0_Rounded as PlusIcon} from '#/components/icons/Plus'
 import * as Toast from '#/components/Toast'
 import {IS_IOS} from '#/env'
+import {type app} from '#/lexicons'
 import {GrowthHack} from './GrowthHack'
 
 export function ThreadItemAnchorFollowButton({
@@ -57,7 +57,7 @@ export function ThreadItemAnchorFollowButtonInner({
 function PostThreadFollowBtnLoaded({
   profile: profileUnshadowed,
 }: {
-  profile: AppBskyActorDefs.ProfileViewDetailed
+  profile: app.bsky.actor.defs.ProfileViewDetailed
 }) {
   const navigation = useNavigation()
   const {_} = useLingui()
diff --git a/src/screens/PostThread/components/ThreadItemPost.tsx b/src/screens/PostThread/components/ThreadItemPost.tsx
index bd256e43b0..a3ee448ed9 100644
--- a/src/screens/PostThread/components/ThreadItemPost.tsx
+++ b/src/screens/PostThread/components/ThreadItemPost.tsx
@@ -1,10 +1,6 @@
 import {memo, type ReactNode, useCallback, useMemo, useState} from 'react'
 import {View} from 'react-native'
-import {
-  type AppBskyFeedDefs,
-  type AppBskyFeedThreadgate,
-  AtUri,
-} from '@atproto/api'
+import {AtUri} from '@atproto/syntax'
 import {RichText as RichTextAPI} from '@bsky.app/sdk/richtext'
 import {Trans} from '@lingui/react/macro'
 
@@ -12,7 +8,6 @@ import {MAX_POST_LINES} from '#/lib/constants'
 import {useOpenComposer} from '#/lib/hooks/useOpenComposer'
 import {makeProfileLink} from '#/lib/routes/links'
 import {countLines} from '#/lib/strings/helpers'
-import {asSdkFacets} from '#/lib/strings/rich-text-helpers'
 import {
   POST_TOMBSTONE,
   type Shadow,
@@ -55,6 +50,7 @@ import * as Skele from '#/components/Skeleton'
 import {SubtleHover} from '#/components/SubtleHover'
 import {Text} from '#/components/Typography'
 import {useActorStatus} from '#/features/liveNow'
+import {type app} from '#/lexicons'
 
 export type ThreadItemPostProps = {
   item: Extract<ThreadItem, {type: 'threadPost'}>
@@ -63,7 +59,7 @@ export type ThreadItemPostProps = {
     topBorder?: boolean
   }
   onPostSuccess?: (data: OnPostSuccessData) => void
-  threadgateRecord?: AppBskyFeedThreadgate.Record
+  threadgateRecord?: app.bsky.feed.threadgate.Main
 }
 
 export function ThreadItemPost({
@@ -197,7 +193,7 @@ const ThreadItemPostInner = memo(function ThreadItemPostInner({
   onPostSuccess,
   threadgateRecord,
 }: ThreadItemPostProps & {
-  postShadow: Shadow<AppBskyFeedDefs.PostView>
+  postShadow: Shadow<app.bsky.feed.defs.PostView>
 }) {
   const t = useTheme()
   const {openComposer} = useOpenComposer()
@@ -212,7 +208,7 @@ const ThreadItemPostInner = memo(function ThreadItemPostInner({
     () =>
       new RichTextAPI({
         text: record.text,
-        facets: asSdkFacets(record.facets),
+        facets: record.facets,
       }),
     [record],
   )
diff --git a/src/screens/PostThread/components/ThreadItemPostNumber.tsx b/src/screens/PostThread/components/ThreadItemPostNumber.tsx
index 12be469598..7d55adf50b 100644
--- a/src/screens/PostThread/components/ThreadItemPostNumber.tsx
+++ b/src/screens/PostThread/components/ThreadItemPostNumber.tsx
@@ -1,9 +1,9 @@
 import {Text, View} from 'react-native'
-import {type AppBskyUnspeccedDefs} from '@atproto/api'
 import {Trans, useLingui} from '@lingui/react/macro'
 
 import {atoms as a, ios, platform, useTheme} from '#/alf'
 import {useAnalytics} from '#/analytics'
+import {type app} from '#/lexicons'
 
 /**
  * How far the inline badge is nudged below the text baseline. Android's
@@ -12,7 +12,7 @@ import {useAnalytics} from '#/analytics'
 export const POST_NUMBER_INLINE_OFFSET = 6
 
 export function useHasThreadItemPostNumber(
-  value: AppBskyUnspeccedDefs.ThreadItemPost,
+  value: app.bsky.unspecced.defs.ThreadItemPost,
 ) {
   const ax = useAnalytics()
   const index = value.opThreadPostIndex
@@ -32,7 +32,7 @@ export function ThreadItemPostNumber({
   value,
   inline = true,
 }: {
-  value: AppBskyUnspeccedDefs.ThreadItemPost
+  value: app.bsky.unspecced.defs.ThreadItemPost
   inline?: boolean
 }) {
   const t = useTheme()
diff --git a/src/screens/PostThread/components/ThreadItemTreePost.tsx b/src/screens/PostThread/components/ThreadItemTreePost.tsx
index 3f4ae03741..1e20eb5841 100644
--- a/src/screens/PostThread/components/ThreadItemTreePost.tsx
+++ b/src/screens/PostThread/components/ThreadItemTreePost.tsx
@@ -1,10 +1,6 @@
 import {memo, useCallback, useMemo, useState} from 'react'
 import {View} from 'react-native'
-import {
-  type AppBskyFeedDefs,
-  type AppBskyFeedThreadgate,
-  AtUri,
-} from '@atproto/api'
+import {AtUri} from '@atproto/syntax'
 import {RichText as RichTextAPI} from '@bsky.app/sdk/richtext'
 import {Trans} from '@lingui/react/macro'
 
@@ -12,7 +8,6 @@ import {MAX_POST_LINES} from '#/lib/constants'
 import {useOpenComposer} from '#/lib/hooks/useOpenComposer'
 import {makeProfileLink} from '#/lib/routes/links'
 import {countLines} from '#/lib/strings/helpers'
-import {asSdkFacets} from '#/lib/strings/rich-text-helpers'
 import {
   POST_TOMBSTONE,
   type Shadow,
@@ -51,6 +46,7 @@ import {RichText} from '#/components/RichText'
 import * as Skele from '#/components/Skeleton'
 import {SubtleHover} from '#/components/SubtleHover'
 import {Text} from '#/components/Typography'
+import {type app} from '#/lexicons'
 
 /**
  * Mimic the space in PostMeta
@@ -69,7 +65,7 @@ export function ThreadItemTreePost({
     topBorder?: boolean
   }
   onPostSuccess?: (data: OnPostSuccessData) => void
-  threadgateRecord?: AppBskyFeedThreadgate.Record
+  threadgateRecord?: app.bsky.feed.threadgate.Main
 }) {
   const postShadow = usePostShadow(item.value.post)
 
@@ -252,13 +248,13 @@ const ThreadItemTreePostInner = memo(function ThreadItemTreePostInner({
   threadgateRecord,
 }: {
   item: Extract<ThreadItem, {type: 'threadPost'}>
-  postShadow: Shadow<AppBskyFeedDefs.PostView>
+  postShadow: Shadow<app.bsky.feed.defs.PostView>
   overrides?: {
     moderation?: boolean
     topBorder?: boolean
   }
   onPostSuccess?: (data: OnPostSuccessData) => void
-  threadgateRecord?: AppBskyFeedThreadgate.Record
+  threadgateRecord?: app.bsky.feed.threadgate.Main
 }): React.ReactNode {
   const {openComposer} = useOpenComposer()
   const {currentAccount} = useSession()
@@ -272,7 +268,7 @@ const ThreadItemTreePostInner = memo(function ThreadItemTreePostInner({
     () =>
       new RichTextAPI({
         text: record.text,
-        facets: asSdkFacets(record.facets),
+        facets: record.facets,
       }),
     [record],
   )
diff --git a/src/screens/Profile/Header/DisplayName.tsx b/src/screens/Profile/Header/DisplayName.tsx
index ac99ba82b4..b9a0fca221 100644
--- a/src/screens/Profile/Header/DisplayName.tsx
+++ b/src/screens/Profile/Header/DisplayName.tsx
@@ -1,5 +1,4 @@
 import {View} from 'react-native'
-import {type AppBskyActorDefs} from '@atproto/api'
 import {type ModerationDecision} from '@bsky.app/sdk/moderation'
 
 import {sanitizeDisplayName} from '#/lib/strings/display-names'
@@ -8,12 +7,13 @@ import {type Shadow} from '#/state/cache/types'
 import {atoms as a, platform, useBreakpoints, useTheme} from '#/alf'
 import {ProfileBadges} from '#/components/ProfileBadges'
 import {Text} from '#/components/Typography'
+import {type app} from '#/lexicons'
 
 export function ProfileHeaderDisplayName({
   profile,
   moderation,
 }: {
-  profile: Shadow<AppBskyActorDefs.ProfileViewDetailed>
+  profile: Shadow<app.bsky.actor.defs.ProfileViewDetailed>
   moderation: ModerationDecision
 }) {
   const t = useTheme()
diff --git a/src/screens/Profile/Header/EditProfileDialog.tsx b/src/screens/Profile/Header/EditProfileDialog.tsx
index 1715328f54..d110753143 100644
--- a/src/screens/Profile/Header/EditProfileDialog.tsx
+++ b/src/screens/Profile/Header/EditProfileDialog.tsx
@@ -1,6 +1,5 @@
 import {useCallback, useEffect, useState} from 'react'
 import {View} from 'react-native'
-import {type AppBskyActorDefs} from '@atproto/api'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Plural, Trans} from '@lingui/react/macro'
@@ -25,13 +24,14 @@ import * as Prompt from '#/components/Prompt'
 import * as Toast from '#/components/Toast'
 import {Text} from '#/components/Typography'
 import {useSimpleVerificationState} from '#/components/verification'
+import {type app} from '#/lexicons'
 
 export function EditProfileDialog({
   profile,
   control,
   onUpdate,
 }: {
-  profile: AppBskyActorDefs.ProfileViewDetailed
+  profile: app.bsky.actor.defs.ProfileViewDetailed
   control: Dialog.DialogControlProps
   onUpdate?: () => void
 }) {
@@ -89,7 +89,7 @@ function DialogInner({
   setDirty,
   onPressCancel,
 }: {
-  profile: AppBskyActorDefs.ProfileViewDetailed
+  profile: app.bsky.actor.defs.ProfileViewDetailed
   onUpdate?: () => void
   setDirty: (dirty: boolean) => void
   onPressCancel: () => void
diff --git a/src/screens/Profile/Header/Handle.tsx b/src/screens/Profile/Header/Handle.tsx
index f659b923cd..33e7cbcb8b 100644
--- a/src/screens/Profile/Header/Handle.tsx
+++ b/src/screens/Profile/Header/Handle.tsx
@@ -1,5 +1,4 @@
 import {View} from 'react-native'
-import {type AppBskyActorDefs} from '@atproto/api'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
@@ -10,12 +9,13 @@ import {atoms as a, useTheme, web} from '#/alf'
 import {NewskieDialog} from '#/components/NewskieDialog'
 import {Text} from '#/components/Typography'
 import {IS_IOS, IS_NATIVE} from '#/env'
+import {type app} from '#/lexicons'
 
 export function ProfileHeaderHandle({
   profile,
   disableTaps,
 }: {
-  profile: Shadow<AppBskyActorDefs.ProfileViewDetailed>
+  profile: Shadow<app.bsky.actor.defs.ProfileViewDetailed>
   disableTaps?: boolean
 }) {
   const t = useTheme()
diff --git a/src/screens/Profile/Header/Metrics.tsx b/src/screens/Profile/Header/Metrics.tsx
index 45f09597bc..84d25f761e 100644
--- a/src/screens/Profile/Header/Metrics.tsx
+++ b/src/screens/Profile/Header/Metrics.tsx
@@ -1,5 +1,4 @@
 import {View} from 'react-native'
-import {type AppBskyActorDefs} from '@atproto/api'
 import {msg, plural} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 
@@ -9,11 +8,12 @@ import {formatCount} from '#/view/com/util/numeric/format'
 import {atoms as a, useTheme} from '#/alf'
 import {InlineLinkText} from '#/components/Link'
 import {Text} from '#/components/Typography'
+import {type app} from '#/lexicons'
 
 export function ProfileHeaderMetrics({
   profile,
 }: {
-  profile: Shadow<AppBskyActorDefs.ProfileViewDetailed>
+  profile: Shadow<app.bsky.actor.defs.ProfileViewDetailed>
 }) {
   const t = useTheme()
   const {_, i18n} = useLingui()
diff --git a/src/screens/Profile/Header/ProfileHeaderLabeler.tsx b/src/screens/Profile/Header/ProfileHeaderLabeler.tsx
index a7979f17ae..d5341e2ad7 100644
--- a/src/screens/Profile/Header/ProfileHeaderLabeler.tsx
+++ b/src/screens/Profile/Header/ProfileHeaderLabeler.tsx
@@ -1,7 +1,6 @@
 import {memo, useCallback, useMemo, useState} from 'react'
 import {View} from 'react-native'
-import {type AppBskyActorDefs} from '@atproto/api'
-import {type ModerationOpts} from '@bsky.app/sdk/moderation'
+import {moderateProfile, type ModerationOpts} from '@bsky.app/sdk/moderation'
 import {type RichText as RichTextAPI} from '@bsky.app/sdk/richtext'
 import {msg, plural} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
@@ -11,7 +10,6 @@ import {Plural, Trans} from '@lingui/react/macro'
 import {MAX_LABELERS} from '#/lib/constants'
 import {useHaptics} from '#/lib/haptics'
 import {isAppLabeler} from '#/lib/moderation'
-import {moderateProfile} from '#/lib/moderation/subjects'
 import {useProfileShadow} from '#/state/cache/profile-shadow'
 import {type Shadow} from '#/state/cache/types'
 import {useLabelerSubscriptionMutation} from '#/state/queries/labeler'
@@ -42,7 +40,7 @@ import {ProfileHeaderMetrics} from './Metrics'
 import {ProfileHeaderShell} from './Shell'
 
 interface Props {
-  profile: AppBskyActorDefs.ProfileViewDetailed
+  profile: app.bsky.actor.defs.ProfileViewDetailed
   labeler: app.bsky.labeler.defs.LabelerViewDetailed
   descriptionRT: RichTextAPI | null
   moderationOpts: ModerationOpts
@@ -58,7 +56,7 @@ let ProfileHeaderLabeler = ({
   hideBackButton = false,
   isPlaceholderProfile,
 }: Props): React.ReactNode => {
-  const profile: Shadow<AppBskyActorDefs.ProfileViewDetailed> =
+  const profile: Shadow<app.bsky.actor.defs.ProfileViewDetailed> =
     useProfileShadow(profileUnshadowed)
   const t = useTheme()
   const ax = useAnalytics()
@@ -232,7 +230,7 @@ export function HeaderLabelerButtons({
   profile,
   minimal = false,
 }: {
-  profile: Shadow<AppBskyActorDefs.ProfileViewDetailed>
+  profile: Shadow<app.bsky.actor.defs.ProfileViewDetailed>
   /** disable the subscribe button */
   minimal?: boolean
 }) {
diff --git a/src/screens/Profile/Header/ProfileHeaderStandard.tsx b/src/screens/Profile/Header/ProfileHeaderStandard.tsx
index b7cfff7ab9..b8cba7c4ce 100644
--- a/src/screens/Profile/Header/ProfileHeaderStandard.tsx
+++ b/src/screens/Profile/Header/ProfileHeaderStandard.tsx
@@ -1,7 +1,7 @@
 import {memo, useMemo, useState} from 'react'
 import {View} from 'react-native'
-import {type AppBskyActorDefs} from '@atproto/api'
 import {
+  moderateProfile,
   type ModerationDecision,
   type ModerationOpts,
 } from '@bsky.app/sdk/moderation'
@@ -11,7 +11,6 @@ import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
 
 import {useHaptics} from '#/lib/haptics'
-import {moderateProfile} from '#/lib/moderation/subjects'
 import {sanitizeDisplayName} from '#/lib/strings/display-names'
 import {logger} from '#/logger'
 import {type Shadow, useProfileShadow} from '#/state/cache/profile-shadow'
@@ -40,6 +39,7 @@ import {useAnalytics} from '#/analytics'
 import {IS_IOS, IS_NATIVE} from '#/env'
 import {InviteFriendsDialog} from '#/features/inviteFriends'
 import {useActorStatus} from '#/features/liveNow'
+import {type app} from '#/lexicons'
 import {GermButton} from '../components/GermButton'
 import {ProfileHeaderDisplayName} from './DisplayName'
 import {EditProfileDialog} from './EditProfileDialog'
@@ -49,7 +49,7 @@ import {ProfileHeaderShell} from './Shell'
 import {ProfileHeaderSuggestedFollows} from './SuggestedFollows'
 
 interface Props {
-  profile: AppBskyActorDefs.ProfileViewDetailed
+  profile: app.bsky.actor.defs.ProfileViewDetailed
   descriptionRT: RichTextAPI | null
   moderationOpts: ModerationOpts
   hideBackButton?: boolean
@@ -64,7 +64,7 @@ let ProfileHeaderStandard = ({
   isPlaceholderProfile,
 }: Props): React.ReactNode => {
   const profile =
-    useProfileShadow<AppBskyActorDefs.ProfileViewDetailed>(profileUnshadowed)
+    useProfileShadow<app.bsky.actor.defs.ProfileViewDetailed>(profileUnshadowed)
   const {currentAccount} = useSession()
   const {_} = useLingui()
   const moderation = useMemo(
@@ -213,7 +213,7 @@ export function HeaderStandardButtons({
   onUnfollow,
   minimal,
 }: {
-  profile: Shadow<AppBskyActorDefs.ProfileViewDetailed>
+  profile: Shadow<app.bsky.actor.defs.ProfileViewDetailed>
   moderation: ModerationDecision
   moderationOpts: ModerationOpts
   onFollow?: () => void
diff --git a/src/screens/Profile/Header/Shell.tsx b/src/screens/Profile/Header/Shell.tsx
index 4521ba9edf..46ea78c9a0 100644
--- a/src/screens/Profile/Header/Shell.tsx
+++ b/src/screens/Profile/Header/Shell.tsx
@@ -5,7 +5,6 @@ import Animated, {
   useAnimatedRef,
 } from 'react-native-reanimated'
 import {useSafeAreaInsets} from 'react-native-safe-area-context'
-import {type AppBskyActorDefs} from '@atproto/api'
 import {utils} from '@bsky.app/alf'
 import {type ModerationDecision} from '@bsky.app/sdk/moderation'
 import {useLingui} from '@lingui/react/macro'
@@ -32,12 +31,13 @@ import {useActorStatus} from '#/features/liveNow'
 import {EditLiveDialog} from '#/features/liveNow/components/EditLiveDialog'
 import {LiveIndicator} from '#/features/liveNow/components/LiveIndicator'
 import {LiveStatusDialog} from '#/features/liveNow/components/LiveStatusDialog'
+import {type app} from '#/lexicons'
 import {GrowableAvatar} from './GrowableAvatar'
 import {GrowableBanner} from './GrowableBanner'
 import {StatusBarShadow} from './StatusBarShadow'
 
 interface Props {
-  profile: Shadow<AppBskyActorDefs.ProfileViewDetailed>
+  profile: Shadow<app.bsky.actor.defs.ProfileViewDetailed>
   moderation: ModerationDecision
   hideBackButton?: boolean
   isPlaceholderProfile?: boolean
diff --git a/src/screens/Profile/Header/index.tsx b/src/screens/Profile/Header/index.tsx
index eff65c854d..dfd84b3530 100644
--- a/src/screens/Profile/Header/index.tsx
+++ b/src/screens/Profile/Header/index.tsx
@@ -7,12 +7,10 @@ import Animated, {
 } from 'react-native-reanimated'
 import {useSafeAreaInsets} from 'react-native-safe-area-context'
 import {scheduleOnRN} from 'react-native-worklets'
-import {type AppBskyActorDefs} from '@atproto/api'
-import {type ModerationOpts} from '@bsky.app/sdk/moderation'
+import {moderateProfile, type ModerationOpts} from '@bsky.app/sdk/moderation'
 import {type RichText as RichTextAPI} from '@bsky.app/sdk/richtext'
 import {useIsFocused} from '@react-navigation/native'
 
-import {moderateProfile} from '#/lib/moderation/subjects'
 import {sanitizeHandle} from '#/lib/strings/handles'
 import {useProfileShadow} from '#/state/cache/profile-shadow'
 import {useModerationOpts} from '#/state/preferences/moderation-opts'
@@ -58,7 +56,7 @@ ProfileHeaderLoading = memo(ProfileHeaderLoading)
 export {ProfileHeaderLoading}
 
 interface Props {
-  profile: AppBskyActorDefs.ProfileViewDetailed
+  profile: app.bsky.actor.defs.ProfileViewDetailed
   labeler: app.bsky.labeler.defs.LabelerViewDetailed | undefined
   descriptionRT: RichTextAPI | null
   moderationOpts: ModerationOpts
@@ -103,7 +101,7 @@ const MinimalHeader = memo(function MinimalHeader({
   hideBackButton = false,
 }: {
   onLayout: (e: LayoutChangeEvent) => void
-  profile: AppBskyActorDefs.ProfileViewDetailed
+  profile: app.bsky.actor.defs.ProfileViewDetailed
   labeler?: app.bsky.labeler.defs.LabelerViewDetailed
   hideBackButton?: boolean
 }) {
diff --git a/src/screens/Profile/KnownFollowers.tsx b/src/screens/Profile/KnownFollowers.tsx
index 09c1034b07..5ccc70c16f 100644
--- a/src/screens/Profile/KnownFollowers.tsx
+++ b/src/screens/Profile/KnownFollowers.tsx
@@ -1,5 +1,4 @@
 import {useMemo, useState} from 'react'
-import {type AppBskyActorDefs} from '@atproto/api'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 
@@ -17,12 +16,13 @@ import {List} from '#/view/com/util/List'
 import {ViewHeader} from '#/view/com/util/ViewHeader'
 import * as Layout from '#/components/Layout'
 import {ListFooter, ListMaybePlaceholder} from '#/components/Lists'
+import {type app} from '#/lexicons'
 
 function renderItem({
   item,
   index,
 }: {
-  item: AppBskyActorDefs.ProfileView
+  item: app.bsky.actor.defs.ProfileView
   index: number
 }) {
   return (
@@ -34,7 +34,7 @@ function renderItem({
   )
 }
 
-function keyExtractor(item: AppBskyActorDefs.ProfileView) {
+function keyExtractor(item: app.bsky.actor.defs.ProfileView) {
   return item.did
 }
 
diff --git a/src/screens/Profile/components/GermButton.tsx b/src/screens/Profile/components/GermButton.tsx
index 5a69ec42c9..f79c503251 100644
--- a/src/screens/Profile/components/GermButton.tsx
+++ b/src/screens/Profile/components/GermButton.tsx
@@ -1,6 +1,5 @@
 import {Platform, View} from 'react-native'
 import {Image} from 'expo-image'
-import {type AppBskyActorDefs} from '@atproto/api'
 import {type Client} from '@atproto/lex'
 import {type DidString} from '@atproto/syntax'
 import {msg} from '@lingui/core/macro'
@@ -29,7 +28,7 @@ export function GermButton({
   germ,
   profile,
 }: {
-  germ: AppBskyActorDefs.ProfileAssociatedGerm
+  germ: app.bsky.actor.defs.ProfileAssociatedGerm
   profile: bsky.profile.AnyProfileView
 }) {
   const t = useTheme()
@@ -279,7 +278,7 @@ function GermSelfButton({did}: {did: string}) {
 }
 
 function constructGermUrl(
-  declaration: AppBskyActorDefs.ProfileAssociatedGerm,
+  declaration: app.bsky.actor.defs.ProfileAssociatedGerm,
   profile: bsky.profile.AnyProfileView,
   viewerDid?: string,
 ) {
diff --git a/src/screens/ProfileList/AboutSection.tsx b/src/screens/ProfileList/AboutSection.tsx
index d7f6be5c33..6ec615c4c0 100644
--- a/src/screens/ProfileList/AboutSection.tsx
+++ b/src/screens/ProfileList/AboutSection.tsx
@@ -1,6 +1,5 @@
 import {useCallback, useImperativeHandle, useState} from 'react'
 import {View} from 'react-native'
-import {type AppBskyGraphDefs} from '@atproto/api'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
@@ -15,6 +14,7 @@ import {Button, ButtonIcon, ButtonText} from '#/components/Button'
 import {BulletList_Stroke1_Corner0_Rounded as ListIcon} from '#/components/icons/BulletList'
 import {PersonPlus_Stroke2_Corner0_Rounded as PersonPlusIcon} from '#/components/icons/Person'
 import {IS_NATIVE} from '#/env'
+import {type app} from '#/lexicons'
 
 interface SectionRef {
   scrollToTop: () => void
@@ -22,7 +22,7 @@ interface SectionRef {
 
 interface AboutSectionProps {
   ref?: React.Ref<SectionRef>
-  list: AppBskyGraphDefs.ListView
+  list: app.bsky.graph.defs.ListView
   onPressAddUser: () => void
   headerHeight: number
   scrollElRef: ListRef
diff --git a/src/screens/ProfileList/components/Header.tsx b/src/screens/ProfileList/components/Header.tsx
index 55f572c554..8335cf4851 100644
--- a/src/screens/ProfileList/components/Header.tsx
+++ b/src/screens/ProfileList/components/Header.tsx
@@ -1,6 +1,5 @@
 import {useMemo} from 'react'
 import {View} from 'react-native'
-import {AppBskyGraphDefs} from '@atproto/api'
 import {RichText as RichTextAPI} from '@bsky.app/sdk/richtext'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
@@ -8,7 +7,6 @@ import {Trans} from '@lingui/react/macro'
 
 import {useHaptics} from '#/lib/haptics'
 import {makeListLink} from '#/lib/routes/links'
-import {asSdkFacets} from '#/lib/strings/rich-text-helpers'
 import {logger} from '#/logger'
 import {useListBlockMutation, useListMuteMutation} from '#/state/queries/list'
 import {
@@ -25,6 +23,7 @@ import {Loader} from '#/components/Loader'
 import {RichText} from '#/components/RichText'
 import * as Toast from '#/components/Toast'
 import {useAnalytics} from '#/analytics'
+import {app} from '#/lexicons'
 import {MoreOptionsMenu} from './MoreOptionsMenu'
 import {SubscribeMenu} from './SubscribeMenu'
 
@@ -34,14 +33,14 @@ export function Header({
   preferences,
 }: {
   rkey: string
-  list: AppBskyGraphDefs.ListView
+  list: app.bsky.graph.defs.ListView
   preferences: UsePreferencesQueryResponse
 }) {
   const {_} = useLingui()
   const ax = useAnalytics()
   const {currentAccount} = useSession()
-  const isCurateList = list.purpose === AppBskyGraphDefs.CURATELIST
-  const isModList = list.purpose === AppBskyGraphDefs.MODLIST
+  const isCurateList = list.purpose === app.bsky.graph.defs.curatelist.value
+  const isModList = list.purpose === app.bsky.graph.defs.modlist.value
   const isBlocking = !!list.viewer?.blocked
   const isMuting = !!list.viewer?.muted
   const playHaptic = useHaptics()
@@ -130,7 +129,7 @@ export function Header({
       list.description
         ? new RichTextAPI({
             text: list.description,
-            facets: asSdkFacets(list.descriptionFacets),
+            facets: list.descriptionFacets,
           })
         : undefined,
     [list],
diff --git a/src/screens/ProfileList/components/MoreOptionsMenu.tsx b/src/screens/ProfileList/components/MoreOptionsMenu.tsx
index 8bc40682d1..02d9cc7212 100644
--- a/src/screens/ProfileList/components/MoreOptionsMenu.tsx
+++ b/src/screens/ProfileList/components/MoreOptionsMenu.tsx
@@ -1,4 +1,4 @@
-import {type AppBskyActorDefs, AppBskyGraphDefs, AtUri} from '@atproto/api'
+import {AtUri} from '@atproto/syntax'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
@@ -36,13 +36,14 @@ import * as Prompt from '#/components/Prompt'
 import * as Toast from '#/components/Toast'
 import {useAnalytics} from '#/analytics'
 import {IS_WEB} from '#/env'
+import {app} from '#/lexicons'
 
 export function MoreOptionsMenu({
   list,
   savedFeedConfig,
 }: {
-  list: AppBskyGraphDefs.ListView
-  savedFeedConfig?: AppBskyActorDefs.SavedFeed
+  list: app.bsky.graph.defs.ListView
+  savedFeedConfig?: app.bsky.actor.defs.SavedFeed
 }) {
   const {_} = useLingui()
   const ax = useAnalytics()
@@ -57,8 +58,8 @@ export function MoreOptionsMenu({
   const {mutateAsync: muteList} = useListMuteMutation()
   const {mutateAsync: blockList} = useListBlockMutation()
 
-  const isCurateList = list.purpose === AppBskyGraphDefs.CURATELIST
-  const isModList = list.purpose === AppBskyGraphDefs.MODLIST
+  const isCurateList = list.purpose === app.bsky.graph.defs.curatelist.value
+  const isModList = list.purpose === app.bsky.graph.defs.modlist.value
   const isBlocking = !!list.viewer?.blocked
   const isMuting = !!list.viewer?.muted
   const isPinned = Boolean(savedFeedConfig?.pinned)
diff --git a/src/screens/ProfileList/components/SubscribeMenu.tsx b/src/screens/ProfileList/components/SubscribeMenu.tsx
index af16e0de0b..1553e2bc1e 100644
--- a/src/screens/ProfileList/components/SubscribeMenu.tsx
+++ b/src/screens/ProfileList/components/SubscribeMenu.tsx
@@ -1,4 +1,3 @@
-import {type AppBskyGraphDefs} from '@atproto/api'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
@@ -13,8 +12,9 @@ import * as Menu from '#/components/Menu'
 import * as Prompt from '#/components/Prompt'
 import * as Toast from '#/components/Toast'
 import {useAnalytics} from '#/analytics'
+import {type app} from '#/lexicons'
 
-export function SubscribeMenu({list}: {list: AppBskyGraphDefs.ListView}) {
+export function SubscribeMenu({list}: {list: app.bsky.graph.defs.ListView}) {
   const {_} = useLingui()
   const ax = useAnalytics()
   const subscribeMutePromptControl = Prompt.usePromptControl()
diff --git a/src/screens/ProfileList/index.tsx b/src/screens/ProfileList/index.tsx
index ef0221631d..f91e2fe896 100644
--- a/src/screens/ProfileList/index.tsx
+++ b/src/screens/ProfileList/index.tsx
@@ -1,8 +1,8 @@
 import {useCallback, useMemo, useRef, useState} from 'react'
 import {View} from 'react-native'
 import {useAnimatedRef} from 'react-native-reanimated'
-import {AppBskyGraphDefs, AtUri} from '@atproto/api'
-import {type ModerationOpts} from '@bsky.app/sdk/moderation'
+import {AtUri} from '@atproto/syntax'
+import {moderateUserList, type ModerationOpts} from '@bsky.app/sdk/moderation'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
@@ -11,7 +11,6 @@ import {useQueryClient} from '@tanstack/react-query'
 
 import {useOpenComposer} from '#/lib/hooks/useOpenComposer'
 import {useSetTitle} from '#/lib/hooks/useSetTitle'
-import {moderateUserList} from '#/lib/moderation/subjects'
 import {
   type CommonNavigatorParams,
   type NativeStackScreenProps,
@@ -39,6 +38,7 @@ import * as Layout from '#/components/Layout'
 import {Loader} from '#/components/Loader'
 import * as Hider from '#/components/moderation/Hider'
 import {IS_WEB} from '#/env'
+import {app} from '#/lexicons'
 import {AboutSection} from './AboutSection'
 import {ErrorScreen} from './components/ErrorScreen'
 import {Header} from './components/Header'
@@ -143,7 +143,7 @@ function ProfileListScreenLoaded({
   preferences,
 }: Props & {
   uri: string
-  list: AppBskyGraphDefs.ListView
+  list: app.bsky.graph.defs.ListView
   moderationOpts: ModerationOpts
   preferences: UsePreferencesQueryResponse
 }) {
@@ -155,7 +155,7 @@ function ProfileListScreenLoaded({
   const {rkey} = route.params
   const feedSectionRef = useRef<SectionRef>(null)
   const aboutSectionRef = useRef<SectionRef>(null)
-  const isCurateList = list.purpose === AppBskyGraphDefs.CURATELIST
+  const isCurateList = list.purpose === app.bsky.graph.defs.curatelist.value
   const isScreenFocused = useIsFocused()
   const isHidden = list.labels?.findIndex(l => l.val === '!hide') !== -1
   const isOwner = currentAccount?.did === list.creator.did
diff --git a/src/screens/SavedFeeds.tsx b/src/screens/SavedFeeds.tsx
index db574318f3..26ea5c5e18 100644
--- a/src/screens/SavedFeeds.tsx
+++ b/src/screens/SavedFeeds.tsx
@@ -2,7 +2,6 @@ import {useState} from 'react'
 import {View} from 'react-native'
 import type Animated from 'react-native-reanimated'
 import {useAnimatedRef, useScrollOffset} from 'react-native-reanimated'
-import {type AppBskyActorDefs} from '@atproto/api'
 import {TID} from '@atproto/common-web'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
@@ -43,6 +42,7 @@ import {InlineLinkText} from '#/components/Link'
 import {Loader} from '#/components/Loader'
 import * as Toast from '#/components/Toast'
 import {Text} from '#/components/Typography'
+import {type app} from '#/lexicons'
 
 type Props = NativeStackScreenProps<CommonNavigatorParams, 'SavedFeeds'>
 export function SavedFeeds({}: Props) {
@@ -424,10 +424,10 @@ function PinnedFeedItem({
   onMoveUp,
   onMoveDown,
 }: {
-  feed: AppBskyActorDefs.SavedFeed
-  currentFeeds: AppBskyActorDefs.SavedFeed[]
+  feed: app.bsky.actor.defs.SavedFeed
+  currentFeeds: app.bsky.actor.defs.SavedFeed[]
   setCurrentFeeds: React.Dispatch<
-    React.SetStateAction<AppBskyActorDefs.SavedFeed[]>
+    React.SetStateAction<app.bsky.actor.defs.SavedFeed[]>
   >
   dragHandle?: React.ReactNode
   index?: number
@@ -507,10 +507,10 @@ function UnpinnedFeedItem({
   currentFeeds,
   setCurrentFeeds,
 }: {
-  feed: AppBskyActorDefs.SavedFeed
-  currentFeeds: AppBskyActorDefs.SavedFeed[]
+  feed: app.bsky.actor.defs.SavedFeed
+  currentFeeds: app.bsky.actor.defs.SavedFeed[]
   setCurrentFeeds: React.Dispatch<
-    React.SetStateAction<AppBskyActorDefs.SavedFeed[]>
+    React.SetStateAction<app.bsky.actor.defs.SavedFeed[]>
   >
 }) {
   const {_} = useLingui()
diff --git a/src/screens/Search/Explore.tsx b/src/screens/Search/Explore.tsx
index 4540da35a7..144b9343a7 100644
--- a/src/screens/Search/Explore.tsx
+++ b/src/screens/Search/Explore.tsx
@@ -1,10 +1,5 @@
 import {useCallback, useMemo, useRef, useState} from 'react'
 import {View, type ViewabilityConfig} from 'react-native'
-import {
-  type AppBskyActorDefs,
-  type AppBskyFeedDefs,
-  type AppBskyGraphDefs,
-} from '@atproto/api'
 import {Trans, useLingui} from '@lingui/react/macro'
 import {useQueryClient} from '@tanstack/react-query'
 import * as bcp47Match from 'bcp-47-match'
@@ -68,6 +63,7 @@ import {SubtleHover} from '#/components/SubtleHover'
 import {Text} from '#/components/Typography'
 import {type Metrics, useAnalytics} from '#/analytics'
 import {ExploreScreenLiveEventFeedsBanner} from '#/features/liveEvents/components/ExploreScreenLiveEventFeedsBanner'
+import {type app} from '#/lexicons'
 import * as ModuleHeader from './components/ModuleHeader'
 import {
   SuggestedAccountsTabBar,
@@ -155,7 +151,7 @@ type ExploreScreenItems =
   | {
       type: 'profile'
       key: string
-      profile: AppBskyActorDefs.ProfileView
+      profile: app.bsky.actor.defs.ProfileView
       recId?: string
     }
   | {
@@ -165,7 +161,7 @@ type ExploreScreenItems =
   | {
       type: 'feed'
       key: string
-      feed: AppBskyFeedDefs.GeneratorView
+      feed: app.bsky.feed.defs.GeneratorView
     }
   | {
       type: 'loadMore'
@@ -191,7 +187,7 @@ type ExploreScreenItems =
   | {
       type: 'starterPack'
       key: string
-      view: AppBskyGraphDefs.StarterPackView
+      view: app.bsky.graph.defs.StarterPackView
     }
   | {
       type: 'starterPackSkeleton'
diff --git a/src/screens/Search/SearchResults.tsx b/src/screens/Search/SearchResults.tsx
index cb7ac53d09..300c36fd65 100644
--- a/src/screens/Search/SearchResults.tsx
+++ b/src/screens/Search/SearchResults.tsx
@@ -1,6 +1,5 @@
 import {memo, useCallback, useMemo, useState} from 'react'
 import {ActivityIndicator, View} from 'react-native'
-import {type AppBskyFeedDefs, type AppBskyGraphDefs} from '@atproto/api'
 import {Trans, useLingui} from '@lingui/react/macro'
 
 import {urls} from '#/lib/constants'
@@ -37,6 +36,7 @@ import {ListFooter} from '#/components/Lists'
 import {SearchError} from '#/components/SearchError'
 import {Text} from '#/components/Typography'
 import {type Metrics, useAnalytics} from '#/analytics'
+import {type app} from '#/lexicons'
 import type * as bsky from '#/types/bsky'
 
 let SearchResults = ({
@@ -292,7 +292,7 @@ type SearchResultSlice =
   | {
       type: 'post'
       key: string
-      post: AppBskyFeedDefs.PostView
+      post: app.bsky.feed.defs.PostView
     }
   | {
       type: 'loadingMore'
@@ -504,7 +504,7 @@ function SearchPost({
 }: {
   from: Metrics['search:result:press']['tab']
   position: Metrics['search:result:press']['position']
-  post: AppBskyFeedDefs.PostView
+  post: app.bsky.feed.defs.PostView
 }) {
   const ax = useAnalytics()
 
@@ -672,7 +672,7 @@ let SearchScreenFeedsResults = ({
             item,
             index,
           }: {
-            item: AppBskyFeedDefs.GeneratorView
+            item: app.bsky.feed.defs.GeneratorView
             index: number
           }) => (
             <View
@@ -685,7 +685,7 @@ let SearchScreenFeedsResults = ({
               <SearchFeedCard position={index} view={item} />
             </View>
           )}
-          keyExtractor={(item: AppBskyFeedDefs.GeneratorView) => item.uri}
+          keyExtractor={(item: app.bsky.feed.defs.GeneratorView) => item.uri}
           desktopFixedHeight
           ListFooterComponent={<ListFooter />}
         />
@@ -704,7 +704,7 @@ function SearchFeedCard({
   view,
 }: {
   position: number
-  view: AppBskyFeedDefs.GeneratorView
+  view: app.bsky.feed.defs.GeneratorView
 }) {
   const ax = useAnalytics()
 
@@ -790,14 +790,14 @@ let SearchScreenStarterPackResults = ({
             item,
             index,
           }: {
-            item: AppBskyGraphDefs.StarterPackView
+            item: app.bsky.graph.defs.StarterPackView
             index: number
           }) => (
             <View style={[a.px_lg, a.pb_lg, index === 0 && a.pt_lg]}>
               <SearchStarterPack position={index} view={item} />
             </View>
           )}
-          keyExtractor={(item: AppBskyGraphDefs.StarterPackView) => item.uri}
+          keyExtractor={(item: app.bsky.graph.defs.StarterPackView) => item.uri}
           refreshing={isPTR}
           onRefresh={() => void onPullToRefresh()}
           onEndReached={onEndReached}
@@ -824,7 +824,7 @@ function SearchStarterPack({
   view,
 }: {
   position: number
-  view: AppBskyGraphDefs.StarterPackView
+  view: app.bsky.graph.defs.StarterPackView
 }) {
   const ax = useAnalytics()
 
diff --git a/src/screens/Search/components/ModuleHeader.tsx b/src/screens/Search/components/ModuleHeader.tsx
index ce40af98b8..a0e02f6b3a 100644
--- a/src/screens/Search/components/ModuleHeader.tsx
+++ b/src/screens/Search/components/ModuleHeader.tsx
@@ -1,6 +1,6 @@
 import {useMemo} from 'react'
 import {View} from 'react-native'
-import {type AppBskyFeedDefs, AtUri} from '@atproto/api'
+import {AtUri} from '@atproto/syntax'
 
 import {PressableScale} from '#/lib/custom-animations/PressableScale'
 import {makeCustomFeedLink} from '#/lib/routes/links'
@@ -14,6 +14,7 @@ import {MagnifyingGlass_Stroke2_Corner0_Rounded as SearchIcon} from '#/component
 import {Link} from '#/components/Link'
 import {Text, type TextProps} from '#/components/Typography'
 import {useAnalytics} from '#/analytics'
+import {type app} from '#/lexicons'
 
 export function Container({
   style,
@@ -46,7 +47,7 @@ export function FeedLink({
   feed,
   children,
 }: {
-  feed: AppBskyFeedDefs.GeneratorView
+  feed: app.bsky.feed.defs.GeneratorView
   children?: React.ReactNode
 }) {
   const t = useTheme()
@@ -75,7 +76,7 @@ export function FeedLink({
   )
 }
 
-export function FeedAvatar({feed}: {feed: AppBskyFeedDefs.GeneratorView}) {
+export function FeedAvatar({feed}: {feed: app.bsky.feed.defs.GeneratorView}) {
   return <UserAvatar type="algo" size={38} avatar={feed.avatar} />
 }
 
@@ -178,7 +179,7 @@ export function EllipsisButton({
   )
 }
 
-export function PinButton({feed}: {feed: AppBskyFeedDefs.GeneratorView}) {
+export function PinButton({feed}: {feed: app.bsky.feed.defs.GeneratorView}) {
   return (
     <View style={[a.z_20, {marginRight: -6}]}>
       <FeedCard.SaveButton
diff --git a/src/screens/Search/components/SearchHistory.tsx b/src/screens/Search/components/SearchHistory.tsx
index b71f5ef312..4a23cf4956 100644
--- a/src/screens/Search/components/SearchHistory.tsx
+++ b/src/screens/Search/components/SearchHistory.tsx
@@ -1,9 +1,8 @@
 import {ScrollView, View} from 'react-native'
-import {type ModerationOpts} from '@bsky.app/sdk/moderation'
+import {moderateProfile, type ModerationOpts} from '@bsky.app/sdk/moderation'
 import {Plural, Trans, useLingui} from '@lingui/react/macro'
 
 import {createHitslop} from '#/lib/constants'
-import {moderateProfile} from '#/lib/moderation/subjects'
 import {makeProfileLink} from '#/lib/routes/links'
 import {sanitizeDisplayName} from '#/lib/strings/display-names'
 import {sanitizeHandle} from '#/lib/strings/handles'
diff --git a/src/screens/Search/components/StarterPackCard.tsx b/src/screens/Search/components/StarterPackCard.tsx
index 949bdd6ebf..eff60a02a4 100644
--- a/src/screens/Search/components/StarterPackCard.tsx
+++ b/src/screens/Search/components/StarterPackCard.tsx
@@ -1,11 +1,10 @@
 import {useState} from 'react'
 import {View} from 'react-native'
-import {type AppBskyGraphDefs, AppBskyGraphStarterpack} from '@atproto/api'
+import {moderateProfile} from '@bsky.app/sdk/moderation'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
 
-import {moderateProfile} from '#/lib/moderation/subjects'
 import {sanitizeHandle} from '#/lib/strings/handles'
 import {useModerationOpts} from '#/state/preferences/moderation-opts'
 import {useSession} from '#/state/session'
@@ -19,13 +18,14 @@ import {MediaInsetBorder} from '#/components/MediaInsetBorder'
 import {useStarterPackLink} from '#/components/StarterPack/StarterPackCard'
 import {SubtleHover} from '#/components/SubtleHover'
 import {Text} from '#/components/Typography'
+import {app} from '#/lexicons'
 import * as bsky from '#/types/bsky'
 
 export function StarterPackCard({
   view,
   onPress,
 }: {
-  view: AppBskyGraphDefs.StarterPackView
+  view: app.bsky.graph.defs.StarterPackView
   onPress?: () => void
 }) {
   const t = useTheme()
@@ -35,12 +35,7 @@ export function StarterPackCard({
   const link = useStarterPackLink({view})
   const record = view.record
 
-  if (
-    !bsky.dangerousIsType<AppBskyGraphStarterpack.Record>(
-      record,
-      AppBskyGraphStarterpack.isRecord,
-    )
-  ) {
+  if (!bsky.isType(app.bsky.graph.starterpack, record)) {
     return null
   }
 
diff --git a/src/screens/Search/modules/ExploreSuggestedAccounts.tsx b/src/screens/Search/modules/ExploreSuggestedAccounts.tsx
index ef6dc0cba9..ad8a8b8a72 100644
--- a/src/screens/Search/modules/ExploreSuggestedAccounts.tsx
+++ b/src/screens/Search/modules/ExploreSuggestedAccounts.tsx
@@ -1,6 +1,5 @@
 import {memo, useEffect} from 'react'
 import {View} from 'react-native'
-import {type AppBskyActorSearchActors} from '@atproto/api'
 import {type ModerationOpts} from '@bsky.app/sdk/moderation'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
@@ -14,6 +13,7 @@ import {boostInterests, InterestTabs} from '#/components/InterestTabs'
 import * as ProfileCard from '#/components/ProfileCard'
 import {SubtleHover} from '#/components/SubtleHover'
 import {useAnalytics} from '#/analytics'
+import {type app} from '#/lexicons'
 import type * as bsky from '#/types/bsky'
 
 export function useLoadEnoughProfiles({
@@ -25,7 +25,7 @@ export function useLoadEnoughProfiles({
   fetchNextPage,
 }: {
   interest: string | null
-  data?: InfiniteData<AppBskyActorSearchActors.OutputSchema>
+  data?: InfiniteData<app.bsky.actor.searchActors.$OutputBody>
   isLoading: boolean
   isFetchingNextPage: boolean
   hasNextPage: boolean
diff --git a/src/screens/Search/modules/ExploreTrendingTopics.tsx b/src/screens/Search/modules/ExploreTrendingTopics.tsx
index 27356efff9..c8e0ee20ec 100644
--- a/src/screens/Search/modules/ExploreTrendingTopics.tsx
+++ b/src/screens/Search/modules/ExploreTrendingTopics.tsx
@@ -1,11 +1,10 @@
 import {useMemo} from 'react'
 import {Pressable, View} from 'react-native'
 import {Image} from 'expo-image'
-import {type AppBskyUnspeccedDefs} from '@atproto/api'
+import {moderateProfile} from '@bsky.app/sdk/moderation'
 import {RichText as RichTextApi} from '@bsky.app/sdk/richtext'
 import {Plural, Trans, useLingui} from '@lingui/react/macro'
 
-import {moderateProfile} from '#/lib/moderation/subjects'
 import {useModerationOpts} from '#/state/preferences/moderation-opts'
 import {
   useTrendingSettings,
@@ -28,6 +27,7 @@ import {SubtleHover} from '#/components/SubtleHover'
 import {useTrendingTopicSeen} from '#/components/TrendingTopics'
 import {Text} from '#/components/Typography'
 import {useAnalytics} from '#/analytics'
+import {type app} from '#/lexicons'
 import * as ModuleHeader from '../components/ModuleHeader'
 
 const IMAGE_SIZE = 56
@@ -118,7 +118,7 @@ export function TrendRow({
   children,
   onPress,
 }: ViewStyleProp & {
-  trend: AppBskyUnspeccedDefs.TrendView
+  trend: app.bsky.unspecced.defs.TrendView
   rank: number
   recId?: string
   children?: React.ReactNode
@@ -229,7 +229,7 @@ export function TrendRow({
 
 // Unused atm, but leaving here so we don't lose localization. -dsb
 export function useCategoryDisplayName(
-  category: AppBskyUnspeccedDefs.TrendView['category'],
+  category: app.bsky.unspecced.defs.TrendView['category'],
 ) {
   const {t: l} = useLingui()
 
@@ -297,7 +297,7 @@ export function TrendingTopicRowSkeleton() {
 }
 
 function useModerateTrendingActors(
-  actors: AppBskyUnspeccedDefs.TrendView['actors'],
+  actors: app.bsky.unspecced.defs.TrendView['actors'],
 ) {
   const moderationOpts = useModerationOpts()
 
diff --git a/src/screens/Search/modules/ExploreTrendingVideos.tsx b/src/screens/Search/modules/ExploreTrendingVideos.tsx
index 6f173a7825..86eafbc54c 100644
--- a/src/screens/Search/modules/ExploreTrendingVideos.tsx
+++ b/src/screens/Search/modules/ExploreTrendingVideos.tsx
@@ -1,6 +1,6 @@
 import {useMemo} from 'react'
 import {ScrollView, View} from 'react-native'
-import {AppBskyEmbedVideo, AtUri} from '@atproto/api'
+import {AtUri} from '@atproto/syntax'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
@@ -21,6 +21,8 @@ import {
   CompactVideoPostCardPlaceholder,
 } from '#/components/VideoPostCard'
 import {useAnalytics} from '#/analytics'
+import {app} from '#/lexicons'
+import * as bsky from '#/types/bsky'
 
 const CARD_WIDTH = 100
 
@@ -158,7 +160,7 @@ function VideoCards({
       .flatMap(page => page.slices)
       .map(slice => slice.items[0])
       .filter(Boolean)
-      .filter(item => AppBskyEmbedVideo.isView(item.post.embed))
+      .filter(item => bsky.isType(app.bsky.embed.video.view, item.post.embed))
       .slice(0, 8)
   }, [data])
   const href = useMemo(() => {
diff --git a/src/screens/Settings/ActivityPrivacySettings.tsx b/src/screens/Settings/ActivityPrivacySettings.tsx
index b1d90cf9c1..06515b6efc 100644
--- a/src/screens/Settings/ActivityPrivacySettings.tsx
+++ b/src/screens/Settings/ActivityPrivacySettings.tsx
@@ -1,5 +1,4 @@
 import {View} from 'react-native'
-import {type AppBskyNotificationDeclaration} from '@atproto/api'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
@@ -18,6 +17,7 @@ import * as Toggle from '#/components/forms/Toggle'
 import {BellRinging_Stroke2_Corner0_Rounded as BellRingingIcon} from '#/components/icons/BellRinging'
 import * as Layout from '#/components/Layout'
 import {Loader} from '#/components/Loader'
+import {type app} from '#/lexicons'
 import * as SettingsList from './components/SettingsList'
 import {ItemTextWithSubtitle} from './NotificationSettings/components/ItemTextWithSubtitle'
 
@@ -85,7 +85,7 @@ export function Inner({
   notificationDeclaration: {
     uri?: string
     cid?: string
-    value: AppBskyNotificationDeclaration.Record
+    value: app.bsky.notification.declaration.Main
   }
 }) {
   const t = useTheme()
diff --git a/src/screens/Settings/AutomationLabelSettings.tsx b/src/screens/Settings/AutomationLabelSettings.tsx
index 423bc0073a..480f35a972 100644
--- a/src/screens/Settings/AutomationLabelSettings.tsx
+++ b/src/screens/Settings/AutomationLabelSettings.tsx
@@ -1,5 +1,5 @@
 import {View} from 'react-native'
-import {type $Typed, ComAtprotoLabelDefs} from '@atproto/api'
+import {type $Typed} from '@atproto/lex'
 import {Trans, useLingui} from '@lingui/react/macro'
 import {type NativeStackScreenProps} from '@react-navigation/native-stack'
 import {useQueryClient} from '@tanstack/react-query'
@@ -22,6 +22,7 @@ import {Text} from '#/components/Typography'
 import {useSimpleVerificationState} from '#/components/verification'
 import {VerificationCheck} from '#/components/verification/VerificationCheck'
 import {useAnalytics} from '#/analytics'
+import {com} from '#/lexicons'
 import * as bsky from '#/types/bsky'
 
 type Props = NativeStackScreenProps<
@@ -53,15 +54,13 @@ export function AutomationLabelSettingsScreen({}: Props) {
       {
         profile,
         updates: existing => {
-          const labels: $Typed<ComAtprotoLabelDefs.SelfLabels> = bsky.validate(
-            existing.labels,
-            ComAtprotoLabelDefs.validateSelfLabels,
-          )
-            ? existing.labels
-            : {
-                $type: 'com.atproto.label.defs#selfLabels',
-                values: [],
-              }
+          const labels: $Typed<com.atproto.label.defs.SelfLabels> =
+            bsky.matches(com.atproto.label.defs.selfLabels, existing.labels)
+              ? existing.labels
+              : {
+                  $type: 'com.atproto.label.defs#selfLabels',
+                  values: [],
+                }
 
           const hasLabel = labels.values.some(l => l.val === 'bot')
           if (hasLabel) {
@@ -80,8 +79,8 @@ export function AutomationLabelSettingsScreen({}: Props) {
 
           return existing
         },
-        checkCommitted: res => {
-          const exists = !!res.data.labels?.some(l => l.val === 'bot')
+        checkCommitted: profile => {
+          const exists = !!profile.labels?.some(l => l.val === 'bot')
           return exists === wasAdded
         },
       },
diff --git a/src/screens/Settings/FindContactsSettings.tsx b/src/screens/Settings/FindContactsSettings.tsx
index 1fb0f3b2a8..9574c3a759 100644
--- a/src/screens/Settings/FindContactsSettings.tsx
+++ b/src/screens/Settings/FindContactsSettings.tsx
@@ -1,7 +1,6 @@
 import {useCallback, useEffect, useState} from 'react'
 import {type ListRenderItemInfo, View} from 'react-native'
 import * as Contacts from 'expo-contacts'
-import {type AppBskyContactDefs} from '@atproto/api'
 import {type DidString} from '@atproto/syntax'
 import {type ModerationOpts} from '@bsky.app/sdk/moderation'
 import {msg} from '@lingui/core/macro'
@@ -189,7 +188,7 @@ function SyncStatus({
   info,
   refetchStatus,
 }: {
-  info: AppBskyContactDefs.SyncStatus
+  info: app.bsky.contact.defs.SyncStatus
   refetchStatus: () => Promise<any>
 }) {
   const ax = useAnalytics()
diff --git a/src/screens/Settings/PrivacyAndSecuritySettings.tsx b/src/screens/Settings/PrivacyAndSecuritySettings.tsx
index 2979ace213..9d2a7c8a11 100644
--- a/src/screens/Settings/PrivacyAndSecuritySettings.tsx
+++ b/src/screens/Settings/PrivacyAndSecuritySettings.tsx
@@ -1,4 +1,3 @@
-import {type AppBskyNotificationDeclaration} from '@atproto/api'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
@@ -17,6 +16,7 @@ import {Key_Stroke2_Corner2_Rounded as KeyIcon} from '#/components/icons/Key'
 import {ShieldCheck_Stroke2_Corner0_Rounded as ShieldIcon} from '#/components/icons/Shield'
 import * as Layout from '#/components/Layout'
 import {InlineLinkText} from '#/components/Link'
+import {type app} from '#/lexicons'
 import {Email2FAToggle} from './components/Email2FAToggle'
 import {PwiOptOut} from './components/PwiOptOut'
 import {ItemTextWithSubtitle} from './NotificationSettings/components/ItemTextWithSubtitle'
@@ -146,7 +146,7 @@ function NotificationDeclaration({
   isError,
 }: {
   data?: {
-    value: AppBskyNotificationDeclaration.Record
+    value: app.bsky.notification.declaration.Main
   }
   isError?: boolean
 }) {
diff --git a/src/screens/Settings/Settings.tsx b/src/screens/Settings/Settings.tsx
index 0fff031f87..fdb77c9908 100644
--- a/src/screens/Settings/Settings.tsx
+++ b/src/screens/Settings/Settings.tsx
@@ -1,8 +1,8 @@
 import {useState} from 'react'
 import {Alert, LayoutAnimation, Linking, Pressable, View} from 'react-native'
 import {useReducedMotion} from 'react-native-reanimated'
-import {type AppBskyActorDefs} from '@atproto/api'
 import {removeNuxs} from '@bsky.app/sdk'
+import {moderateProfile} from '@bsky.app/sdk/moderation'
 import {Trans, useLingui} from '@lingui/react/macro'
 import {useNavigation} from '@react-navigation/native'
 import {type NativeStackScreenProps} from '@react-navigation/native-stack'
@@ -10,7 +10,6 @@ import {type NativeStackScreenProps} from '@react-navigation/native-stack'
 import {HELP_DESK_URL, HITSLOP_10} from '#/lib/constants'
 import {useAccountSwitcher} from '#/lib/hooks/useAccountSwitcher'
 import {useApplyPullRequestOTAUpdate} from '#/lib/hooks/useOTAUpdates'
-import {moderateProfile} from '#/lib/moderation/subjects'
 import {
   type CommonNavigatorParams,
   type NavigationProp,
@@ -69,6 +68,7 @@ import {Text} from '#/components/Typography'
 import {useAnalytics} from '#/analytics'
 import {IS_INTERNAL, IS_IOS, IS_NATIVE} from '#/env'
 import {useActorStatus} from '#/features/liveNow'
+import {type app} from '#/lexicons'
 import {device, useStorage} from '#/storage'
 import {useActivitySubscriptionsNudged} from '#/storage/hooks/activity-subscriptions-nudged'
 
@@ -321,7 +321,7 @@ export function SettingsScreen({}: Props) {
 function ProfilePreview({
   profile,
 }: {
-  profile: AppBskyActorDefs.ProfileViewDetailed
+  profile: app.bsky.actor.defs.ProfileViewDetailed
 }) {
   const t = useTheme()
   const {gtMobile} = useBreakpoints()
@@ -608,7 +608,7 @@ function AccountRow({
   pendingDid,
   onPressSwitchAccount,
 }: {
-  profile?: AppBskyActorDefs.ProfileViewDetailed
+  profile?: app.bsky.actor.defs.ProfileViewDetailed
   account: SessionAccount
   pendingDid: string | null
   onPressSwitchAccount: (
diff --git a/src/screens/Settings/components/ChangeHandleDialog.tsx b/src/screens/Settings/components/ChangeHandleDialog.tsx
index 8cff915390..b519d0322a 100644
--- a/src/screens/Settings/components/ChangeHandleDialog.tsx
+++ b/src/screens/Settings/components/ChangeHandleDialog.tsx
@@ -10,7 +10,6 @@ import Animated, {
   SlideOutLeft,
   SlideOutRight,
 } from 'react-native-reanimated'
-import {type ComAtprotoServerDescribeServer} from '@atproto/api'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
@@ -46,6 +45,7 @@ import {InlineLinkText} from '#/components/Link'
 import {Loader} from '#/components/Loader'
 import {Text} from '#/components/Typography'
 import {useSimpleVerificationState} from '#/components/verification'
+import {type com} from '#/lexicons'
 import {CopyButton} from './CopyButton'
 
 export function ChangeHandleDialog({
@@ -147,7 +147,7 @@ function ProvidedHandlePage({
   serviceInfo,
   goToOwnHandle,
 }: {
-  serviceInfo: ComAtprotoServerDescribeServer.OutputSchema
+  serviceInfo: com.atproto.server.describeServer.$OutputBody
   goToOwnHandle: () => void
 }) {
   const {_} = useLingui()
diff --git a/src/screens/Settings/components/PwiOptOut.tsx b/src/screens/Settings/components/PwiOptOut.tsx
index 193f26994e..826b427e31 100644
--- a/src/screens/Settings/components/PwiOptOut.tsx
+++ b/src/screens/Settings/components/PwiOptOut.tsx
@@ -1,6 +1,6 @@
 import {useCallback} from 'react'
 import {View} from 'react-native'
-import {type $Typed, ComAtprotoLabelDefs} from '@atproto/api'
+import {type $Typed} from '@atproto/lex'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
@@ -13,6 +13,7 @@ import {useSession} from '#/state/session'
 import {atoms as a, useTheme} from '#/alf'
 import * as Toggle from '#/components/forms/Toggle'
 import {Text} from '#/components/Typography'
+import {com} from '#/lexicons'
 import * as bsky from '#/types/bsky'
 
 export function PwiOptOut() {
@@ -35,9 +36,9 @@ export function PwiOptOut() {
       profile,
       updates: existing => {
         // create labels attr if needed
-        const labels: $Typed<ComAtprotoLabelDefs.SelfLabels> = bsky.validate(
+        const labels: $Typed<com.atproto.label.defs.SelfLabels> = bsky.matches(
+          com.atproto.label.defs.selfLabels,
           existing.labels,
-          ComAtprotoLabelDefs.validateSelfLabels,
         )
           ? existing.labels
           : {
@@ -68,8 +69,8 @@ export function PwiOptOut() {
 
         return existing
       },
-      checkCommitted: res => {
-        const exists = !!res.data.labels?.some(
+      checkCommitted: profile => {
+        const exists = !!profile.labels?.some(
           l => l.val === '!no-unauthenticated',
         )
         return exists === wasAdded
diff --git a/src/screens/Signup/StepHandle/HandleSuggestions/index.tsx b/src/screens/Signup/StepHandle/HandleSuggestions/index.tsx
index 0efe113d09..0e9da8a306 100644
--- a/src/screens/Signup/StepHandle/HandleSuggestions/index.tsx
+++ b/src/screens/Signup/StepHandle/HandleSuggestions/index.tsx
@@ -1,13 +1,13 @@
-import {type ComAtprotoTempCheckHandleAvailability} from '@atproto/api'
 import {Sift, SiftItem} from '@bsky.app/sift'
 import {Trans, useLingui} from '@lingui/react/macro'
 
 import {atoms as a, useTheme} from '#/alf'
 import {Portal} from '#/components/Portal'
 import {Text} from '#/components/Typography'
+import {type com} from '#/lexicons'
 import {type HandleSuggestionsProps} from './shared'
 
-type Suggestion = ComAtprotoTempCheckHandleAvailability.Suggestion & {
+type Suggestion = com.atproto.temp.checkHandleAvailability.Suggestion & {
   key: string
 }
 
diff --git a/src/screens/Signup/StepHandle/HandleSuggestions/shared.ts b/src/screens/Signup/StepHandle/HandleSuggestions/shared.ts
index 38644bdb93..a1a5e168e0 100644
--- a/src/screens/Signup/StepHandle/HandleSuggestions/shared.ts
+++ b/src/screens/Signup/StepHandle/HandleSuggestions/shared.ts
@@ -1,10 +1,11 @@
-import {type ComAtprotoTempCheckHandleAvailability} from '@atproto/api'
 import {type UseSiftReturn} from '@bsky.app/sift'
 
+import {type com} from '#/lexicons'
+
 export type HandleSuggestionsProps = {
-  suggestions: ComAtprotoTempCheckHandleAvailability.Suggestion[]
+  suggestions: com.atproto.temp.checkHandleAvailability.Suggestion[]
   onSelect: (
-    suggestion: ComAtprotoTempCheckHandleAvailability.Suggestion,
+    suggestion: com.atproto.temp.checkHandleAvailability.Suggestion,
   ) => void
   /**
    * Web only: the Sift instance shared with the handle input. It carries the
diff --git a/src/screens/Signup/StepInfo/Policies.tsx b/src/screens/Signup/StepInfo/Policies.tsx
index 9d7b7e9ff1..c84e0d0404 100644
--- a/src/screens/Signup/StepInfo/Policies.tsx
+++ b/src/screens/Signup/StepInfo/Policies.tsx
@@ -1,6 +1,5 @@
 import {type ReactElement} from 'react'
 import {View} from 'react-native'
-import {type ComAtprotoServerDescribeServer} from '@atproto/api'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
@@ -9,11 +8,12 @@ import {atoms as a, useTheme} from '#/alf'
 import {Admonition} from '#/components/Admonition'
 import {InlineLinkText} from '#/components/Link'
 import {Text} from '#/components/Typography'
+import {type com} from '#/lexicons'
 
 export const Policies = ({
   serviceDescription,
 }: {
-  serviceDescription: ComAtprotoServerDescribeServer.OutputSchema
+  serviceDescription: com.atproto.server.describeServer.$OutputBody
 }) => {
   const t = useTheme()
   const {_} = useLingui()
diff --git a/src/screens/Signup/index.tsx b/src/screens/Signup/index.tsx
index bcdca45814..644af956a2 100644
--- a/src/screens/Signup/index.tsx
+++ b/src/screens/Signup/index.tsx
@@ -3,7 +3,6 @@ import {AppState, type AppStateStatus, View} from 'react-native'
 import ReactNativeDeviceAttest from 'react-native-device-attest'
 import {KeyboardAvoidingView} from 'react-native-keyboard-controller'
 import Animated, {FadeIn, LayoutAnimationConfig} from 'react-native-reanimated'
-import {AppBskyGraphStarterpack} from '@atproto/api'
 import {tokens} from '@bsky.app/alf'
 import {Trans, useLingui} from '@lingui/react/macro'
 
@@ -32,6 +31,7 @@ import {ScreenTransition} from '#/components/ScreenTransition'
 import {Text} from '#/components/Typography'
 import {useAnalytics} from '#/analytics'
 import {GCP_PROJECT_ID, IS_ANDROID} from '#/env'
+import {app} from '#/lexicons'
 import * as bsky from '#/types/bsky'
 
 export function Signup({onPressBack}: {onPressBack: () => void}) {
@@ -141,10 +141,7 @@ export function Signup({onPressBack}: {onPressBack: () => void}) {
             scrollable>
             <View testID="createAccount" style={a.flex_1}>
               {showStarterPackCard &&
-              bsky.dangerousIsType<AppBskyGraphStarterpack.Record>(
-                starterPack.record,
-                AppBskyGraphStarterpack.isRecord,
-              ) ? (
+              bsky.isType(app.bsky.graph.starterpack, starterPack.record) ? (
                 <Animated.View
                   entering={!isFetchedAtMount ? FadeIn : undefined}>
                   <LinearGradientBackground
diff --git a/src/screens/Signup/state.ts b/src/screens/Signup/state.ts
index 9f0ce29bcf..b012f34427 100644
--- a/src/screens/Signup/state.ts
+++ b/src/screens/Signup/state.ts
@@ -1,6 +1,5 @@
 import {createContext, useCallback, useContext} from 'react'
 import {LayoutAnimation} from 'react-native'
-import {type ComAtprotoServerDescribeServer} from '@atproto/api'
 import {useLingui} from '@lingui/react/macro'
 import * as EmailValidator from 'email-validator'
 
@@ -14,7 +13,7 @@ import {useOnboardingDispatch} from '#/state/shell'
 import {type AnalyticsContextType, useAnalytics} from '#/analytics'
 import {com} from '#/lexicons'
 
-export type ServiceDescription = ComAtprotoServerDescribeServer.OutputSchema
+export type ServiceDescription = com.atproto.server.describeServer.$OutputBody
 
 const date = new Date()
 date.setFullYear(date.getFullYear() - 20) // default to 20 years ago
diff --git a/src/screens/StarterPack/StarterPackLandingScreen.tsx b/src/screens/StarterPack/StarterPackLandingScreen.tsx
index a8ae9ce95f..a5a7c3c9f6 100644
--- a/src/screens/StarterPack/StarterPackLandingScreen.tsx
+++ b/src/screens/StarterPack/StarterPackLandingScreen.tsx
@@ -1,7 +1,7 @@
 import {useEffect, useState} from 'react'
 import {Pressable, View} from 'react-native'
 import Animated, {FadeIn, FadeOut} from 'react-native-reanimated'
-import {AppBskyGraphDefs, AppBskyGraphStarterpack, AtUri} from '@atproto/api'
+import {AtUri} from '@atproto/syntax'
 import {type ModerationOpts} from '@bsky.app/sdk/moderation'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
@@ -34,6 +34,7 @@ import {RichText} from '#/components/RichText'
 import {Text} from '#/components/Typography'
 import {useAnalytics} from '#/analytics'
 import {IS_WEB, IS_WEB_MOBILE_ANDROID} from '#/env'
+import {app} from '#/lexicons'
 import * as bsky from '#/types/bsky'
 
 const AnimatedPressable = Animated.createAnimatedComponent(Pressable)
@@ -68,8 +69,8 @@ export function LandingScreen({
   const isValid =
     starterPack &&
     starterPack.list &&
-    AppBskyGraphDefs.validateStarterPackView(starterPack) &&
-    AppBskyGraphStarterpack.validateRecord(starterPack.record)
+    bsky.matches(app.bsky.graph.defs.starterPackView, starterPack) &&
+    bsky.matches(app.bsky.graph.starterpack, starterPack.record)
 
   useEffect(() => {
     if (isErrorStarterPack || (starterPack && !isValid)) {
@@ -82,12 +83,7 @@ export function LandingScreen({
   }
 
   // Just for types, this cannot be hit
-  if (
-    !bsky.dangerousIsType<AppBskyGraphStarterpack.Record>(
-      starterPack.record,
-      AppBskyGraphStarterpack.isRecord,
-    )
-  ) {
+  if (!bsky.isType(app.bsky.graph.starterpack, starterPack.record)) {
     return null
   }
 
@@ -109,8 +105,8 @@ function LandingScreenLoaded({
 
   moderationOpts,
 }: {
-  starterPack: AppBskyGraphDefs.StarterPackView
-  starterPackRecord: AppBskyGraphStarterpack.Record
+  starterPack: app.bsky.graph.defs.StarterPackView
+  starterPackRecord: app.bsky.graph.starterpack.Main
   setScreenState: (state: LoggedOutScreenState) => void
   moderationOpts: ModerationOpts
 }) {
diff --git a/src/screens/StarterPack/StarterPackScreen.tsx b/src/screens/StarterPack/StarterPackScreen.tsx
index e392f395db..658241c660 100644
--- a/src/screens/StarterPack/StarterPackScreen.tsx
+++ b/src/screens/StarterPack/StarterPackScreen.tsx
@@ -1,8 +1,7 @@
 import {useCallback, useEffect, useState} from 'react'
 import {View} from 'react-native'
 import {Image} from 'expo-image'
-import {AppBskyGraphDefs, AppBskyGraphStarterpack, AtUri} from '@atproto/api'
-import {type AtUriString} from '@atproto/syntax'
+import {AtUri} from '@atproto/syntax'
 import {type ModerationOpts} from '@bsky.app/sdk/moderation'
 import {RichText as RichTextAPI} from '@bsky.app/sdk/richtext'
 import {msg} from '@lingui/core/macro'
@@ -21,7 +20,6 @@ import {
   type NavigationProp,
 } from '#/lib/routes/types'
 import {cleanError} from '#/lib/strings/errors'
-import {asSdkFacets} from '#/lib/strings/rich-text-helpers'
 import {getStarterPackOgCard} from '#/lib/strings/starter-pack'
 import {logger} from '#/logger'
 import {updateProfileShadow} from '#/state/cache/profile-shadow'
@@ -75,6 +73,7 @@ import * as Toast from '#/components/Toast'
 import {Text} from '#/components/Typography'
 import {useAnalytics} from '#/analytics'
 import {IS_WEB} from '#/env'
+import {app} from '#/lexicons'
 import * as bsky from '#/types/bsky'
 
 type StarterPackScreeProps = NativeStackScreenProps<
@@ -147,8 +146,8 @@ export function StarterPackScreenInner({
   const isValid =
     starterPack &&
     (starterPack.list || starterPack?.creator?.did === currentAccount?.did) &&
-    AppBskyGraphDefs.validateStarterPackView(starterPack) &&
-    AppBskyGraphStarterpack.validateRecord(starterPack.record)
+    bsky.matches(app.bsky.graph.defs.starterPackView, starterPack) &&
+    bsky.matches(app.bsky.graph.starterpack, starterPack.record)
 
   if (!did || !starterPack || !isValid || !moderationOpts) {
     return (
@@ -179,7 +178,7 @@ function StarterPackScreenLoaded({
   routeParams,
   moderationOpts,
 }: {
-  starterPack: AppBskyGraphDefs.StarterPackView
+  starterPack: app.bsky.graph.defs.StarterPackView
   routeParams: StarterPackScreeProps['route']['params']
   moderationOpts: ModerationOpts
 }) {
@@ -301,7 +300,7 @@ function Header({
   routeParams,
   onOpenShareDialog,
 }: {
-  starterPack: AppBskyGraphDefs.StarterPackView
+  starterPack: app.bsky.graph.defs.StarterPackView
   routeParams: StarterPackScreeProps['route']['params']
   onOpenShareDialog: () => void
 }) {
@@ -350,7 +349,7 @@ function Header({
 
     setIsProcessing(true)
 
-    let listItems: AppBskyGraphDefs.ListItemView[] = []
+    let listItems: app.bsky.graph.defs.ListItemView[] = []
     try {
       listItems = await getAllListMembers(appviewClient, starterPack.list.uri)
     } catch (e) {
@@ -378,7 +377,7 @@ function Header({
     try {
       followUris = await bulkWriteFollows(pdsClient, appviewClient, dids, {
         // the starter pack view is still legacy-typed
-        uri: starterPack.uri as AtUriString,
+        uri: starterPack.uri,
         cid: starterPack.cid,
       })
     } catch (e) {
@@ -406,19 +405,14 @@ function Header({
     })
   }
 
-  if (
-    !bsky.dangerousIsType<AppBskyGraphStarterpack.Record>(
-      record,
-      AppBskyGraphStarterpack.isRecord,
-    )
-  ) {
+  if (!bsky.isType(app.bsky.graph.starterpack, record)) {
     return null
   }
 
   const richText = record.description
     ? new RichTextAPI({
         text: record.description,
-        facets: asSdkFacets(record.descriptionFacets),
+        facets: record.descriptionFacets,
       })
     : undefined
 
@@ -522,7 +516,7 @@ function OverflowMenu({
   routeParams,
   onOpenShareDialog,
 }: {
-  starterPack: AppBskyGraphDefs.StarterPackView
+  starterPack: app.bsky.graph.defs.StarterPackView
   routeParams: StarterPackScreeProps['route']['params']
   onOpenShareDialog: () => void
 }) {
diff --git a/src/screens/StarterPack/Wizard/State.tsx b/src/screens/StarterPack/Wizard/State.tsx
index 0ec8700057..b28a0bd728 100644
--- a/src/screens/StarterPack/Wizard/State.tsx
+++ b/src/screens/StarterPack/Wizard/State.tsx
@@ -1,13 +1,9 @@
 import {createContext, useContext, useReducer} from 'react'
-import {
-  type AppBskyFeedDefs,
-  type AppBskyGraphDefs,
-  AppBskyGraphStarterpack,
-} from '@atproto/api'
 import {msg, plural} from '@lingui/core/macro'
 
 import {STARTER_PACK_MAX_SIZE} from '#/lib/constants'
 import * as Toast from '#/components/Toast'
+import {app} from '#/lexicons'
 import * as bsky from '#/types/bsky'
 
 const steps = ['Details', 'Profiles', 'Feeds'] as const
@@ -21,7 +17,7 @@ type Action =
   | {type: 'SetDescription'; description: string}
   | {type: 'AddProfile'; profile: bsky.profile.AnyProfileView}
   | {type: 'RemoveProfile'; profileDid: string}
-  | {type: 'AddFeed'; feed: AppBskyFeedDefs.GeneratorView}
+  | {type: 'AddFeed'; feed: app.bsky.feed.defs.GeneratorView}
   | {type: 'RemoveFeed'; feedUri: string}
   | {type: 'SetProcessing'; processing: boolean}
   | {type: 'SetError'; error: string}
@@ -32,7 +28,7 @@ interface State {
   name?: string
   description?: string
   profiles: bsky.profile.AnyProfileView[]
-  feeds: AppBskyFeedDefs.GeneratorView[]
+  feeds: app.bsky.feed.defs.GeneratorView[]
   processing: boolean
   error?: string
   transitionDirection: 'Backward' | 'Forward'
@@ -125,8 +121,8 @@ export function Provider({
   targetProfile,
   children,
 }: {
-  starterPack?: AppBskyGraphDefs.StarterPackView
-  listItems?: AppBskyGraphDefs.ListItemView[]
+  starterPack?: app.bsky.graph.defs.StarterPackView
+  listItems?: app.bsky.graph.defs.ListItemView[]
   targetProfile: bsky.profile.AnyProfileView
   children: React.ReactNode
 }) {
@@ -135,7 +131,7 @@ export function Provider({
 
     if (
       starterPack &&
-      bsky.validate(starterPack.record, AppBskyGraphStarterpack.validateRecord)
+      bsky.matches(app.bsky.graph.starterpack, starterPack.record)
     ) {
       return {
         canNext: true,
diff --git a/src/screens/StarterPack/Wizard/StepFeeds.tsx b/src/screens/StarterPack/Wizard/StepFeeds.tsx
index 183f9fb843..788f740765 100644
--- a/src/screens/StarterPack/Wizard/StepFeeds.tsx
+++ b/src/screens/StarterPack/Wizard/StepFeeds.tsx
@@ -1,7 +1,6 @@
 import {useState} from 'react'
 import {type ListRenderItemInfo, View} from 'react-native'
 import {KeyboardAwareScrollView} from 'react-native-keyboard-controller'
-import {type AppBskyFeedDefs} from '@atproto/api'
 import {type ModerationOpts} from '@bsky.app/sdk/moderation'
 import {Trans} from '@lingui/react/macro'
 
@@ -21,8 +20,9 @@ import {Loader} from '#/components/Loader'
 import {ScreenTransition} from '#/components/ScreenTransition'
 import {WizardFeedCard} from '#/components/StarterPack/Wizard/WizardListCard'
 import {Text} from '#/components/Typography'
+import {type app} from '#/lexicons'
 
-function keyExtractor(item: AppBskyFeedDefs.GeneratorView) {
+function keyExtractor(item: app.bsky.feed.defs.GeneratorView) {
   return item.uri
 }
 
@@ -37,7 +37,7 @@ export function StepFeeds({moderationOpts}: {moderationOpts: ModerationOpts}) {
     useSavedFeeds()
   const savedFeeds = savedFeedsAndLists?.feeds
     .filter(f => f.type === 'feed' && f.view.uri !== DISCOVER_FEED_URI)
-    .map(f => f.view) as AppBskyFeedDefs.GeneratorView[]
+    .map(f => f.view) as app.bsky.feed.defs.GeneratorView[]
 
   const {
     data: popularFeedsPages,
@@ -67,7 +67,7 @@ export function StepFeeds({moderationOpts}: {moderationOpts: ModerationOpts}) {
 
   const renderItem = ({
     item,
-  }: ListRenderItemInfo<AppBskyFeedDefs.GeneratorView>) => {
+  }: ListRenderItemInfo<app.bsky.feed.defs.GeneratorView>) => {
     return (
       <WizardFeedCard
         generator={item}
diff --git a/src/screens/StarterPack/Wizard/index.tsx b/src/screens/StarterPack/Wizard/index.tsx
index 4f94943729..fd6c499584 100644
--- a/src/screens/StarterPack/Wizard/index.tsx
+++ b/src/screens/StarterPack/Wizard/index.tsx
@@ -3,12 +3,7 @@ import {Keyboard, View} from 'react-native'
 import {KeyboardAwareScrollView} from 'react-native-keyboard-controller'
 import {useSafeAreaInsets} from 'react-native-safe-area-context'
 import {Image} from 'expo-image'
-import {
-  type AppBskyActorDefs,
-  type AppBskyFeedDefs,
-  type AppBskyGraphDefs,
-  AtUri,
-} from '@atproto/api'
+import {AtUri} from '@atproto/syntax'
 import {type ModerationOpts} from '@bsky.app/sdk/moderation'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
@@ -58,6 +53,7 @@ import * as Toast from '#/components/Toast'
 import {Text} from '#/components/Typography'
 import {useAnalytics} from '#/analytics'
 import {IS_NATIVE} from '#/env'
+import {type app} from '#/lexicons'
 import type * as bsky from '#/types/bsky'
 import {Provider} from './State'
 
@@ -159,9 +155,9 @@ function WizardInner({
   fromDialog,
   onSuccess,
 }: {
-  currentStarterPack?: AppBskyGraphDefs.StarterPackView
-  currentListItems?: AppBskyGraphDefs.ListItemView[]
-  profile: AppBskyActorDefs.ProfileViewDetailed
+  currentStarterPack?: app.bsky.graph.defs.StarterPackView
+  currentListItems?: app.bsky.graph.defs.ListItemView[]
+  profile: app.bsky.actor.defs.ProfileViewDetailed
   moderationOpts: ModerationOpts
   fromDialog?: boolean
   onSuccess?: () => void
@@ -625,7 +621,7 @@ function Footer({
 }
 
 function getName(
-  item: bsky.profile.AnyProfileView | AppBskyFeedDefs.GeneratorView,
+  item: bsky.profile.AnyProfileView | app.bsky.feed.defs.GeneratorView,
 ) {
   if (typeof item.displayName === 'string') {
     return enforceLen(sanitizeDisplayName(item.displayName), 28, true)
diff --git a/src/screens/Takendown.tsx b/src/screens/Takendown.tsx
index 5873b00473..9843e9337d 100644
--- a/src/screens/Takendown.tsx
+++ b/src/screens/Takendown.tsx
@@ -2,7 +2,6 @@ import {useState} from 'react'
 import {View} from 'react-native'
 import {KeyboardAwareScrollView} from 'react-native-keyboard-controller'
 import {useSafeAreaInsets} from 'react-native-safe-area-context'
-import {ToolsOzoneReportDefs} from '@atproto/api'
 import {type DidString} from '@atproto/syntax'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
@@ -25,7 +24,7 @@ import {SimpleInlineLinkText} from '#/components/Link'
 import {Loader} from '#/components/Loader'
 import {P, Text} from '#/components/Typography'
 import {IS_WEB} from '#/env'
-import {com} from '#/lexicons'
+import {com, tools} from '#/lexicons'
 
 const COL_WIDTH = 400
 
@@ -55,7 +54,7 @@ export function Takendown() {
       await client.call(
         com.atproto.moderation.createReport,
         {
-          reasonType: ToolsOzoneReportDefs.REASONAPPEAL,
+          reasonType: tools.ozone.report.defs.reasonAppeal.value,
           subject: {
             $type: 'com.atproto.admin.defs#repoRef',
             // the persisted account did is already resolved
diff --git a/src/screens/Topic.tsx b/src/screens/Topic.tsx
index 8336cb1356..6e3be7c2a7 100644
--- a/src/screens/Topic.tsx
+++ b/src/screens/Topic.tsx
@@ -1,6 +1,5 @@
 import {useCallback, useMemo, useState} from 'react'
 import {type ListRenderItemInfo, View} from 'react-native'
-import {type AppBskyFeedDefs} from '@atproto/api'
 import {useLingui} from '@lingui/react/macro'
 import {type NativeStackScreenProps} from '@react-navigation/native-stack'
 
@@ -21,12 +20,15 @@ import {Button, ButtonIcon} from '#/components/Button'
 import {ArrowOutOfBoxModified_Stroke2_Corner2_Rounded as Share} from '#/components/icons/ArrowOutOfBox'
 import * as Layout from '#/components/Layout'
 import {ListFooter, ListMaybePlaceholder} from '#/components/Lists'
+import {type app} from '#/lexicons'
 
-const renderItem = ({item}: ListRenderItemInfo<AppBskyFeedDefs.PostView>) => {
+const renderItem = ({
+  item,
+}: ListRenderItemInfo<app.bsky.feed.defs.PostView>) => {
   return <Post post={item} />
 }
 
-const keyExtractor = (item: AppBskyFeedDefs.PostView, index: number) => {
+const keyExtractor = (item: app.bsky.feed.defs.PostView, index: number) => {
   return `${item.uri}-${index}`
 }
 
diff --git a/src/screens/VideoFeed/index.tsx b/src/screens/VideoFeed/index.tsx
index 9f4771ddce..0f8f8d1a39 100644
--- a/src/screens/VideoFeed/index.tsx
+++ b/src/screens/VideoFeed/index.tsx
@@ -25,12 +25,7 @@ import {useEvent, useEventListener} from 'expo'
 import {Image, type ImageStyle} from 'expo-image'
 import {LinearGradient} from 'expo-linear-gradient'
 import {createVideoPlayer, type VideoPlayer, VideoView} from 'expo-video'
-import {
-  AppBskyEmbedVideo,
-  type AppBskyFeedDefs,
-  AppBskyFeedPost,
-  AtUri,
-} from '@atproto/api'
+import {AtUri} from '@atproto/syntax'
 import {type ModerationDecision} from '@bsky.app/sdk/moderation'
 import {RichText as RichTextAPI} from '@bsky.app/sdk/richtext'
 import {Trans, useLingui} from '@lingui/react/macro'
@@ -58,7 +53,6 @@ import {
 import {sanitizeDisplayName} from '#/lib/strings/display-names'
 import {cleanError} from '#/lib/strings/errors'
 import {sanitizeHandle} from '#/lib/strings/handles'
-import {asSdkFacets} from '#/lib/strings/rich-text-helpers'
 import {logger} from '#/logger'
 import {useA11y} from '#/state/a11y'
 import {
@@ -104,6 +98,7 @@ import {RichText} from '#/components/RichText'
 import {Text} from '#/components/Typography'
 import {useAnalytics} from '#/analytics'
 import {IS_ANDROID} from '#/env'
+import {app} from '#/lexicons'
 import * as bsky from '#/types/bsky'
 import {Scrubber, VIDEO_PLAYER_BOTTOM_INSET} from './components/Scrubber'
 
@@ -177,8 +172,8 @@ type CurrentSource = {
 
 type VideoItem = {
   moderation: ModerationDecision
-  post: AppBskyFeedDefs.PostView
-  video: AppBskyEmbedVideo.View
+  post: app.bsky.feed.defs.PostView
+  video: app.bsky.embed.video.View
   feedContext: string | undefined
   reqId: string | undefined
 }
@@ -216,8 +211,8 @@ function Feed() {
         const items: {
           _reactKey: string
           moderation: ModerationDecision
-          post: AppBskyFeedDefs.PostView
-          video: AppBskyEmbedVideo.View
+          post: app.bsky.feed.defs.PostView
+          video: app.bsky.embed.video.View
           feedContext: string | undefined
           reqId: string | undefined
         }[] = []
@@ -225,7 +220,10 @@ function Feed() {
           const feedPost = slice.items.find(
             item => item.uri === slice.feedPostUri,
           )
-          if (feedPost && AppBskyEmbedVideo.isView(feedPost.post.embed)) {
+          if (
+            feedPost &&
+            bsky.isType(app.bsky.embed.video.view, feedPost.post.embed)
+          ) {
             items.push({
               _reactKey: feedPost._reactKey,
               moderation: feedPost.moderation,
@@ -294,14 +292,14 @@ function Feed() {
       const prevPost = prevSlice?.post
       const prevEmbed = prevPost?.embed
       const prevVideo =
-        prevEmbed && AppBskyEmbedVideo.isView(prevEmbed)
+        prevEmbed && bsky.isType(app.bsky.embed.video.view, prevEmbed)
           ? prevEmbed.playlist
           : null
       const currSlice = videos.at(index)
       const currPost = currSlice?.post
       const currEmbed = currPost?.embed
       const currVideo =
-        currEmbed && AppBskyEmbedVideo.isView(currEmbed)
+        currEmbed && bsky.isType(app.bsky.embed.video.view, currEmbed)
           ? currEmbed.playlist
           : null
       const currVideoModeration = currSlice?.moderation
@@ -309,7 +307,7 @@ function Feed() {
       const nextPost = nextSlice?.post
       const nextEmbed = nextPost?.embed
       const nextVideo =
-        nextEmbed && AppBskyEmbedVideo.isView(nextEmbed)
+        nextEmbed && bsky.isType(app.bsky.embed.video.view, nextEmbed)
           ? nextEmbed.playlist
           : null
 
@@ -479,8 +477,8 @@ let VideoItem = ({
   reqId,
 }: {
   player?: VideoPlayer
-  post: AppBskyFeedDefs.PostView
-  embed: AppBskyEmbedVideo.View
+  post: app.bsky.feed.defs.PostView
+  embed: app.bsky.embed.video.View
   active: boolean
   adjacent: boolean
   scrollGesture: NativeGesture
@@ -590,7 +588,7 @@ function VideoItemInner({
   active,
 }: {
   player: VideoPlayer
-  embed: AppBskyEmbedVideo.View
+  embed: app.bsky.embed.video.View
   active: boolean
 }) {
   const {bottom} = useSafeAreaInsets()
@@ -707,7 +705,7 @@ function ModerationOverlay({
   embed,
   onPressShow,
 }: {
-  embed: AppBskyEmbedVideo.View
+  embed: app.bsky.embed.video.View
   onPressShow: () => void
 }) {
   const {t: l} = useLingui()
@@ -805,8 +803,8 @@ function Overlay({
   reqId,
 }: {
   player?: VideoPlayer
-  post: Shadow<AppBskyFeedDefs.PostView>
-  embed: AppBskyEmbedVideo.View
+  post: Shadow<app.bsky.feed.defs.PostView>
+  embed: app.bsky.embed.video.View
   active: boolean
   scrollGesture: NativeGesture
   moderation: ModerationDecision
@@ -827,15 +825,12 @@ function Overlay({
   )
 
   const rkey = new AtUri(post.uri).rkey
-  const record = bsky.dangerousIsType<AppBskyFeedPost.Record>(
-    post.record,
-    AppBskyFeedPost.isRecord,
-  )
+  const record = bsky.isType(app.bsky.feed.post, post.record)
     ? post.record
     : undefined
   const richText = new RichTextAPI({
     text: record?.text || '',
-    facets: asSdkFacets(record?.facets),
+    facets: record?.facets,
   })
   const handle = sanitizeHandle(post.author.handle, '@')
 
@@ -1090,7 +1085,7 @@ function VideoItemPlaceholder({
   style,
   blur,
 }: {
-  embed: AppBskyEmbedVideo.View
+  embed: app.bsky.embed.video.View
   style?: ImageStyle
   blur?: boolean
 }) {
@@ -1131,7 +1126,7 @@ function PlayPauseTapArea({
   reqId,
 }: {
   player: VideoPlayer
-  post: Shadow<AppBskyFeedDefs.PostView>
+  post: Shadow<app.bsky.feed.defs.PostView>
   feedContext: string | undefined
   reqId: string | undefined
 }) {
@@ -1273,7 +1268,9 @@ function EndMessage() {
 /*
  * If the video is taller than 9:16
  */
-function isTallAspectRatio(aspectRatio: AppBskyEmbedVideo.View['aspectRatio']) {
+function isTallAspectRatio(
+  aspectRatio: app.bsky.embed.video.View['aspectRatio'],
+) {
   const videoAspectRatio =
     (aspectRatio?.width ?? 1) / (aspectRatio?.height ?? 1)
   return videoAspectRatio <= 9 / 16
diff --git a/src/state/cache/post-shadow.ts b/src/state/cache/post-shadow.ts
index 99b913f7de..72d9571486 100644
--- a/src/state/cache/post-shadow.ts
+++ b/src/state/cache/post-shadow.ts
@@ -1,9 +1,5 @@
 import {useEffect, useMemo, useState} from 'react'
-import {
-  AppBskyEmbedRecord,
-  AppBskyEmbedRecordWithMedia,
-  type AppBskyFeedDefs,
-} from '@atproto/api'
+import {type AtUriString} from '@atproto/syntax'
 import {type QueryClient} from '@tanstack/react-query'
 import {EventEmitter} from 'eventemitter3'
 
@@ -15,14 +11,23 @@ import {findAllPostsInQueryData as findAllPostsInFeedQueryData} from '#/state/qu
 import {findAllPostsInQueryData as findAllPostsInQuoteQueryData} from '#/state/queries/post-quotes'
 import {findAllPostsInQueryData as findAllPostsInSearchQueryData} from '#/state/queries/search-posts-v2'
 import {findAllPostsInQueryData as findAllPostsInThreadV2QueryData} from '#/state/queries/usePostThread/queryCache'
+import {app} from '#/lexicons'
+import * as bsky from '#/types/bsky'
 import {castAsShadow, type Shadow} from './types'
 export type {Shadow} from './types'
 
+/**
+ * `'pending'` is the optimistic sentinel written before the real record uri
+ * comes back, so the two uri slots admit it alongside a real at-uri.
+ */
 export interface PostShadow {
-  likeUri: string | undefined
-  repostUri: string | undefined
+  likeUri: AtUriString | 'pending' | undefined
+  repostUri: AtUriString | 'pending' | undefined
   isDeleted: boolean
-  embed: AppBskyEmbedRecord.View | AppBskyEmbedRecordWithMedia.View | undefined
+  embed:
+    | app.bsky.embed.record.View
+    | app.bsky.embed.recordWithMedia.View
+    | undefined
   pinned: boolean
   optimisticReplyCount: number | undefined
   bookmarked: boolean | undefined
@@ -32,7 +37,7 @@ export const POST_TOMBSTONE = Symbol('PostTombstone')
 
 const emitter = new EventEmitter()
 const shadows: WeakMap<
-  AppBskyFeedDefs.PostView,
+  app.bsky.feed.defs.PostView,
   Partial<PostShadow>
 > = new WeakMap()
 
@@ -40,13 +45,13 @@ const shadows: WeakMap<
  * Use with caution! This function returns the raw shadow data for a post.
  * Prefer using `usePostShadow`.
  */
-export function dangerousGetPostShadow(post: AppBskyFeedDefs.PostView) {
+export function dangerousGetPostShadow(post: app.bsky.feed.defs.PostView) {
   return shadows.get(post)
 }
 
 export function usePostShadow(
-  post: AppBskyFeedDefs.PostView,
-): Shadow<AppBskyFeedDefs.PostView> | typeof POST_TOMBSTONE {
+  post: app.bsky.feed.defs.PostView,
+): Shadow<app.bsky.feed.defs.PostView> | typeof POST_TOMBSTONE {
   const [shadow, setShadow] = useState(() => shadows.get(post))
   const [prevPost, setPrevPost] = useState(post)
   if (post !== prevPost) {
@@ -74,9 +79,9 @@ export function usePostShadow(
 }
 
 function mergeShadow(
-  post: AppBskyFeedDefs.PostView,
+  post: app.bsky.feed.defs.PostView,
   shadow: Partial<PostShadow>,
-): Shadow<AppBskyFeedDefs.PostView> | typeof POST_TOMBSTONE {
+): Shadow<app.bsky.feed.defs.PostView> | typeof POST_TOMBSTONE {
   if (shadow.isDeleted) {
     return POST_TOMBSTONE
   }
@@ -125,12 +130,17 @@ function mergeShadow(
   let embed: typeof post.embed
   if ('embed' in shadow) {
     if (
-      (AppBskyEmbedRecord.isView(post.embed) &&
-        AppBskyEmbedRecord.isView(shadow.embed)) ||
-      (AppBskyEmbedRecordWithMedia.isView(post.embed) &&
-        AppBskyEmbedRecordWithMedia.isView(shadow.embed))
+      (bsky.isType(app.bsky.embed.record.view, post.embed) &&
+        bsky.isType(app.bsky.embed.record.view, shadow.embed)) ||
+      (bsky.isType(app.bsky.embed.recordWithMedia.view, post.embed) &&
+        bsky.isType(app.bsky.embed.recordWithMedia.view, shadow.embed))
     ) {
-      embed = shadow.embed
+      /*
+       * `isType` asserts a present, matching `$type` at runtime but narrows to
+       * the schema's input type, whose `$type` is optional - so the value does
+       * not satisfy the `$Typed` arm of `PostView['embed']` without this cast.
+       */
+      embed = shadow.embed as typeof post.embed
     }
   }
 
@@ -143,8 +153,15 @@ function mergeShadow(
     bookmarkCount: bookmarkCount,
     viewer: {
       ...(post.viewer || {}),
-      like: 'likeUri' in shadow ? shadow.likeUri : post.viewer?.like,
-      repost: 'repostUri' in shadow ? shadow.repostUri : post.viewer?.repost,
+      /*
+       * The optimistic `'pending'` sentinel is not a real at-uri; consumers only
+       * test these for presence while the write is in flight.
+       */
+      like: (('likeUri' in shadow ? shadow.likeUri : post.viewer?.like) ??
+        undefined) as AtUriString | undefined,
+      repost: (('repostUri' in shadow
+        ? shadow.repostUri
+        : post.viewer?.repost) ?? undefined) as AtUriString | undefined,
       pinned: 'pinned' in shadow ? shadow.pinned : post.viewer?.pinned,
       bookmarked:
         'bookmarked' in shadow ? shadow.bookmarked : post.viewer?.bookmarked,
@@ -169,7 +186,7 @@ export function updatePostShadow(
 function* findPostsInCache(
   queryClient: QueryClient,
   uri: string,
-): Generator<AppBskyFeedDefs.PostView, void> {
+): Generator<app.bsky.feed.defs.PostView, void> {
   for (let post of findAllPostsInFeedQueryData(queryClient, uri)) {
     yield post
   }
diff --git a/src/state/cache/profile-shadow.ts b/src/state/cache/profile-shadow.ts
index cb3b4eb7bd..ca516024d7 100644
--- a/src/state/cache/profile-shadow.ts
+++ b/src/state/cache/profile-shadow.ts
@@ -1,5 +1,5 @@
 import {useEffect, useMemo, useState} from 'react'
-import {type AppBskyActorDefs, type AppBskyNotificationDefs} from '@atproto/api'
+import {type AtUriString} from '@atproto/lex'
 import {type QueryClient} from '@tanstack/react-query'
 import {EventEmitter} from 'eventemitter3'
 
@@ -33,6 +33,7 @@ import {findAllProfilesInQueryData as findAllProfilesInSuggestedUsersForDiscover
 import {findAllProfilesInQueryData as findAllProfilesInSuggestedUsersForExploreQueryData} from '#/state/queries/trending/useGetSuggestedUsersForExploreQuery'
 import {findAllProfilesInQueryData as findAllProfilesInSuggestedUsersForSeeMoreQueryData} from '#/state/queries/trending/useGetSuggestedUsersForSeeMoreQuery'
 import {findAllProfilesInQueryData as findAllProfilesInPostThreadV2QueryData} from '#/state/queries/usePostThread/queryCache'
+import {type app} from '#/lexicons'
 import type * as bsky from '#/types/bsky'
 import {castAsShadow, type Shadow} from './types'
 
@@ -43,9 +44,11 @@ export interface ProfileShadow {
   muted: boolean | undefined
   mutedOnlyReposts: boolean | undefined
   blockingUri: string | undefined
-  verification: AppBskyActorDefs.VerificationState
-  status: AppBskyActorDefs.StatusView | undefined
-  activitySubscription: AppBskyNotificationDefs.ActivitySubscription | undefined
+  verification: app.bsky.actor.defs.VerificationState
+  status: app.bsky.actor.defs.StatusView | undefined
+  activitySubscription:
+    | app.bsky.notification.defs.ActivitySubscription
+    | undefined
 }
 
 const shadows: WeakMap<
@@ -277,7 +280,7 @@ export function mergeShadow<TProfileView extends bsky.profile.AnyProfileView>(
       ...(profile.viewer || {}),
       following:
         'followingUri' in shadow
-          ? shadow.followingUri
+          ? (shadow.followingUri as AtUriString)
           : profile.viewer?.following,
       muted: 'muted' in shadow ? shadow.muted : profile.viewer?.muted,
       mutedOnlyReposts:
@@ -285,12 +288,14 @@ export function mergeShadow<TProfileView extends bsky.profile.AnyProfileView>(
           ? shadow.mutedOnlyReposts
           : profile.viewer?.mutedOnlyReposts,
       blocking:
-        'blockingUri' in shadow ? shadow.blockingUri : profile.viewer?.blocking,
+        'blockingUri' in shadow
+          ? (shadow.blockingUri as AtUriString)
+          : profile.viewer?.blocking,
       activitySubscription:
         'activitySubscription' in shadow
           ? shadow.activitySubscription
           : profile.viewer?.activitySubscription,
-    } satisfies AppBskyActorDefs.ViewerState,
+    } satisfies app.bsky.actor.defs.ViewerState,
     verification:
       'verification' in shadow ? shadow.verification : profile.verification,
     status:
diff --git a/src/state/feed-feedback.tsx b/src/state/feed-feedback.tsx
index dbd10b3c9d..bcaa8d03c5 100644
--- a/src/state/feed-feedback.tsx
+++ b/src/state/feed-feedback.tsx
@@ -7,7 +7,6 @@ import {
   useRef,
 } from 'react'
 import {AppState, type AppStateStatus} from 'react-native'
-import {type AppBskyFeedDefs} from '@atproto/api'
 import {type AtUriString, type DidString} from '@atproto/syntax'
 import throttle from 'lodash.throttle'
 
@@ -29,7 +28,7 @@ import {useAppviewClient} from './session'
 export const FEEDBACK_FEEDS = [...PROD_FEEDS, ...STAGING_FEEDS]
 
 export const THIRD_PARTY_ALLOWED_INTERACTIONS = new Set<
-  AppBskyFeedDefs.Interaction['event']
+  app.bsky.feed.defs.Interaction['event']
 >([
   // These are explicit actions and are therefore fine to send.
   'app.bsky.feed.defs#requestLess',
@@ -47,7 +46,7 @@ export const THIRD_PARTY_ALLOWED_INTERACTIONS = new Set<
 export type StateContext = {
   enabled: boolean
   onItemSeen: (item: any) => void
-  sendInteraction: (interaction: AppBskyFeedDefs.Interaction) => void
+  sendInteraction: (interaction: app.bsky.feed.defs.Interaction) => void
   feedDescriptor: FeedDescriptor | undefined
   feedSourceInfo: FeedSourceInfo | undefined
 }
@@ -55,7 +54,7 @@ export type StateContext = {
 const stateContext = createContext<StateContext>({
   enabled: false,
   onItemSeen: (_item: any) => {},
-  sendInteraction: (_interaction: AppBskyFeedDefs.Interaction) => {},
+  sendInteraction: (_interaction: app.bsky.feed.defs.Interaction) => {},
   feedDescriptor: undefined,
   feedSourceInfo: undefined,
 })
@@ -84,7 +83,7 @@ export function useFeedFeedback(
   const history = useRef<
     // Use a WeakSet so that we don't need to clear it.
     // This assumes that referential identity of slice items maps 1:1 to feed (re)fetches.
-    WeakSet<FeedPostSliceItem | AppBskyFeedDefs.Interaction>
+    WeakSet<FeedPostSliceItem | app.bsky.feed.defs.Interaction>
   >(new WeakSet())
 
   const flushEvents = useCallback(
@@ -225,7 +224,7 @@ export function useFeedFeedback(
   )
 
   const sendInteraction = useCallback(
-    (interaction: AppBskyFeedDefs.Interaction) => {
+    (interaction: app.bsky.feed.defs.Interaction) => {
       if (!enabled) {
         return
       }
@@ -273,7 +272,7 @@ export function isDiscoverFeed(feed?: FeedDescriptor) {
 function isInteractionAllowed(
   enabled: boolean,
   feed: FeedSourceFeedInfo | undefined,
-  interaction: AppBskyFeedDefs.Interaction['event'],
+  interaction: app.bsky.feed.defs.Interaction['event'],
 ) {
   if (!enabled || !feed) {
     return false
@@ -282,7 +281,7 @@ function isInteractionAllowed(
   return isDiscover ? true : THIRD_PARTY_ALLOWED_INTERACTIONS.has(interaction)
 }
 
-function toString(interaction: AppBskyFeedDefs.Interaction): string {
+function toString(interaction: app.bsky.feed.defs.Interaction): string {
   return `${interaction.item}|${interaction.event}|${
     interaction.feedContext || ''
   }|${interaction.reqId || ''}`
@@ -313,7 +312,7 @@ function createAggregatedStats(): AggregatedStats {
 
 function sendOrAggregateInteractionsForStats(
   stats: AggregatedStats,
-  interactions: AppBskyFeedDefs.Interaction[],
+  interactions: app.bsky.feed.defs.Interaction[],
 ) {
   for (let interaction of interactions) {
     switch (interaction.event) {
diff --git a/src/state/messages/convo/agent.ts b/src/state/messages/convo/agent.ts
index 521e7f77ea..83ca5ecf64 100644
--- a/src/state/messages/convo/agent.ts
+++ b/src/state/messages/convo/agent.ts
@@ -1,13 +1,5 @@
-import {
-  type $Typed,
-  type AppBskyEmbedRecord,
-  type ChatBskyActorDefs,
-  ChatBskyConvoDefs,
-  type ChatBskyConvoGetLog,
-  type ChatBskyEmbedJoinLink,
-  type ChatBskyGroupDefs,
-} from '@atproto/api'
-import {type Client, XrpcResponseError} from '@atproto/lex'
+import {type $Typed, type Client, XrpcResponseError} from '@atproto/lex'
+import {type DidString, toDatetimeString} from '@atproto/syntax'
 import {EventEmitter} from 'eventemitter3'
 import {nanoid} from 'nanoid/non-secure'
 
@@ -49,7 +41,8 @@ import {
   parseConvoView,
 } from '#/components/dms/util'
 import {IS_NATIVE} from '#/env'
-import {chat} from '#/lexicons'
+import {type app, chat} from '#/lexicons'
+import * as bsky from '#/types/bsky'
 
 const logger = Logger.create(Logger.Context.ConversationAgent)
 
@@ -65,21 +58,21 @@ export function isConvoItemMessage(
 }
 
 function toSystemMessageView(
-  ev: ChatBskyConvoGetLog.OutputSchema['logs'][number],
-): ChatBskyConvoDefs.SystemMessageView | null {
+  ev: chat.bsky.convo.getLog.$OutputBody['logs'][number],
+): chat.bsky.convo.defs.SystemMessageView | null {
   const isSystem =
-    ChatBskyConvoDefs.isLogAddMember(ev) ||
-    ChatBskyConvoDefs.isLogRemoveMember(ev) ||
-    ChatBskyConvoDefs.isLogMemberJoin(ev) ||
-    ChatBskyConvoDefs.isLogMemberLeave(ev) ||
-    ChatBskyConvoDefs.isLogLockConvo(ev) ||
-    ChatBskyConvoDefs.isLogUnlockConvo(ev) ||
-    ChatBskyConvoDefs.isLogLockConvoPermanently(ev) ||
-    ChatBskyConvoDefs.isLogEditGroup(ev) ||
-    ChatBskyConvoDefs.isLogCreateJoinLink(ev) ||
-    ChatBskyConvoDefs.isLogEditJoinLink(ev) ||
-    ChatBskyConvoDefs.isLogEnableJoinLink(ev) ||
-    ChatBskyConvoDefs.isLogDisableJoinLink(ev)
+    bsky.isType(chat.bsky.convo.defs.logAddMember, ev) ||
+    bsky.isType(chat.bsky.convo.defs.logRemoveMember, ev) ||
+    bsky.isType(chat.bsky.convo.defs.logMemberJoin, ev) ||
+    bsky.isType(chat.bsky.convo.defs.logMemberLeave, ev) ||
+    bsky.isType(chat.bsky.convo.defs.logLockConvo, ev) ||
+    bsky.isType(chat.bsky.convo.defs.logUnlockConvo, ev) ||
+    bsky.isType(chat.bsky.convo.defs.logLockConvoPermanently, ev) ||
+    bsky.isType(chat.bsky.convo.defs.logEditGroup, ev) ||
+    bsky.isType(chat.bsky.convo.defs.logCreateJoinLink, ev) ||
+    bsky.isType(chat.bsky.convo.defs.logEditJoinLink, ev) ||
+    bsky.isType(chat.bsky.convo.defs.logEnableJoinLink, ev) ||
+    bsky.isType(chat.bsky.convo.defs.logDisableJoinLink, ev)
   if (!isSystem) return null
   return ev.message
 }
@@ -89,8 +82,8 @@ function toSystemMessageView(
  * the fields the deleted view carries so a reply can render it as deleted.
  */
 function toDeletedMessageView(
-  m: ChatBskyConvoDefs.MessageView,
-): $Typed<ChatBskyConvoDefs.DeletedMessageView> {
+  m: chat.bsky.convo.defs.MessageView,
+): $Typed<chat.bsky.convo.defs.DeletedMessageView> {
   return {
     $type: 'chat.bsky.convo.defs#deletedMessageView',
     id: m.id,
@@ -105,7 +98,7 @@ export class Convo {
 
   private chatClient: Client
   private events: MessagesEventBus
-  private senderUserDid: string
+  private senderUserDid: DidString
 
   private status: ConvoStatus = ConvoStatus.Uninitialized
   private error: ConvoError | undefined
@@ -115,15 +108,15 @@ export class Convo {
 
   private pastMessages: Map<
     string,
-    | ChatBskyConvoDefs.MessageView
-    | ChatBskyConvoDefs.DeletedMessageView
-    | ChatBskyConvoDefs.SystemMessageView
+    | chat.bsky.convo.defs.MessageView
+    | chat.bsky.convo.defs.DeletedMessageView
+    | chat.bsky.convo.defs.SystemMessageView
   > = new Map()
   private newMessages: Map<
     string,
-    | ChatBskyConvoDefs.MessageView
-    | ChatBskyConvoDefs.DeletedMessageView
-    | ChatBskyConvoDefs.SystemMessageView
+    | chat.bsky.convo.defs.MessageView
+    | chat.bsky.convo.defs.DeletedMessageView
+    | chat.bsky.convo.defs.SystemMessageView
   > = new Map()
   private pendingMessages: Map<
     string,
@@ -131,13 +124,13 @@ export class Convo {
       id: string
       message: chat.bsky.convo.defs.MessageInput
       optimisticEmbedView?:
-        | $Typed<AppBskyEmbedRecord.View>
-        | $Typed<ChatBskyEmbedJoinLink.View>
-      optimisticReplyTo?: $Typed<ChatBskyConvoDefs.MessageView>
+        | $Typed<app.bsky.embed.record.View>
+        | $Typed<chat.bsky.embed.joinLink.View>
+      optimisticReplyTo?: $Typed<chat.bsky.convo.defs.MessageView>
     }
   > = new Map()
   private deletedMessages: Set<string> = new Set()
-  private relatedProfiles: Map<string, ChatBskyActorDefs.ProfileViewBasic> =
+  private relatedProfiles: Map<string, chat.bsky.actor.defs.ProfileViewBasic> =
     new Map()
   /**
    * Accumulated profile shadow state, keyed by did. The profiles this agent
@@ -157,8 +150,8 @@ export class Convo {
 
   convoId: string
   convo: ConvoWithDetails | undefined
-  sender: ChatBskyActorDefs.ProfileViewBasic | undefined
-  recipients: ChatBskyActorDefs.ProfileViewBasic[] | undefined
+  sender: chat.bsky.actor.defs.ProfileViewBasic | undefined
+  recipients: chat.bsky.actor.defs.ProfileViewBasic[] | undefined
   snapshot: ConvoState | undefined
 
   constructor(params: ConvoParams) {
@@ -596,7 +589,7 @@ export class Convo {
     }
   }
 
-  private setConvo(convo: ChatBskyConvoDefs.ConvoView) {
+  private setConvo(convo: chat.bsky.convo.defs.ConvoView) {
     this.convo = parseConvoView(convo, this.senderUserDid) ?? this.convo
     if (this.convo) {
       for (const member of this.convo.members) {
@@ -606,7 +599,7 @@ export class Convo {
     this.applyProfileShadows()
   }
 
-  private updateConvo(convo: Partial<ChatBskyConvoDefs.ConvoView>) {
+  private updateConvo(convo: Partial<chat.bsky.convo.defs.ConvoView>) {
     if (this.convo) {
       this.convo =
         parseConvoView({...this.convo.view, ...convo}, this.senderUserDid) ??
@@ -716,7 +709,7 @@ export class Convo {
   }
 
   private pendingFetchConvo:
-    | Promise<{convo: ChatBskyConvoDefs.ConvoView}>
+    | Promise<{convo: chat.bsky.convo.defs.ConvoView}>
     | undefined
   async fetchConvo() {
     if (this.pendingFetchConvo) return this.pendingFetchConvo
@@ -836,9 +829,9 @@ export class Convo {
 
       for (const message of messages) {
         if (
-          ChatBskyConvoDefs.isMessageView(message) ||
-          ChatBskyConvoDefs.isDeletedMessageView(message) ||
-          ChatBskyConvoDefs.isSystemMessageView(message)
+          bsky.isType(chat.bsky.convo.defs.messageView, message) ||
+          bsky.isType(chat.bsky.convo.defs.deletedMessageView, message) ||
+          bsky.isType(chat.bsky.convo.defs.systemMessageView, message)
         ) {
           /*
            * If this message is already in new messages, it was added by the
@@ -913,7 +906,7 @@ export class Convo {
     this.commit()
   }
 
-  ingestFirehose(events: ChatBskyConvoGetLog.OutputSchema['logs']) {
+  ingestFirehose(events: chat.bsky.convo.getLog.$OutputBody['logs']) {
     let needsCommit = false
 
     for (const ev of events) {
@@ -950,8 +943,8 @@ export class Convo {
           }
 
           if (
-            ChatBskyConvoDefs.isLogCreateMessage(ev) &&
-            ChatBskyConvoDefs.isMessageView(ev.message)
+            bsky.isType(chat.bsky.convo.defs.logCreateMessage, ev) &&
+            bsky.isType(chat.bsky.convo.defs.messageView, ev.message)
           ) {
             /*
              * If this message is already in past messages, the initial
@@ -976,8 +969,8 @@ export class Convo {
             }
             needsCommit = true
           } else if (
-            ChatBskyConvoDefs.isLogDeleteMessage(ev) &&
-            ChatBskyConvoDefs.isDeletedMessageView(ev.message)
+            bsky.isType(chat.bsky.convo.defs.logDeleteMessage, ev) &&
+            bsky.isType(chat.bsky.convo.defs.deletedMessageView, ev.message)
           ) {
             /*
              * Remove the message itself, and keep its id in `deletedMessages`
@@ -992,9 +985,9 @@ export class Convo {
             this.deletedMessages.add(ev.message.id)
             needsCommit = true
           } else if (
-            (ChatBskyConvoDefs.isLogAddReaction(ev) ||
-              ChatBskyConvoDefs.isLogRemoveReaction(ev)) &&
-            ChatBskyConvoDefs.isMessageView(ev.message)
+            (bsky.isType(chat.bsky.convo.defs.logAddReaction, ev) ||
+              bsky.isType(chat.bsky.convo.defs.logRemoveReaction, ev)) &&
+            bsky.isType(chat.bsky.convo.defs.messageView, ev.message)
           ) {
             /*
              * Update if we have this in state - replace message wholesale. If we don't, don't worry about it.
@@ -1033,9 +1026,9 @@ export class Convo {
   sendMessage(
     message: chat.bsky.convo.defs.MessageInput,
     optimisticEmbedView?:
-      | $Typed<AppBskyEmbedRecord.View>
-      | $Typed<ChatBskyEmbedJoinLink.View>,
-    optimisticReplyTo?: $Typed<ChatBskyConvoDefs.MessageView>,
+      | $Typed<app.bsky.embed.record.View>
+      | $Typed<chat.bsky.embed.joinLink.View>,
+    optimisticReplyTo?: $Typed<chat.bsky.convo.defs.MessageView>,
   ) {
     // Ignore empty messages for now since they have no other purpose atm
     if (!message.text.trim() && !message.embed) return
@@ -1110,7 +1103,7 @@ export class Convo {
     this.commit()
   }
 
-  updateJoinLink(joinLink: ChatBskyGroupDefs.JoinLinkView | undefined) {
+  updateJoinLink(joinLink: chat.bsky.group.defs.JoinLinkView | undefined) {
     if (this.convo?.kind !== 'group') {
       throw new Error('updateJoinLink can only be called on group convo')
     }
@@ -1126,7 +1119,7 @@ export class Convo {
   }
 
   updateLockStatus(
-    lockStatus: ChatBskyConvoDefs.ConvoLockStatus,
+    lockStatus: chat.bsky.convo.defs.ConvoLockStatus,
     lockStatusModerationOverride: boolean,
   ) {
     if (this.convo?.kind !== 'group') {
@@ -1194,8 +1187,8 @@ export class Convo {
   }
 
   /*
-   * The lex client throws `XrpcResponseError`, not `@atproto/api`'s
-   * `XRPCError`, so the status/message branch narrows on the lex class. Only
+   * The lex client throws `XrpcResponseError`, so the status/message branch
+   * narrows on that class. Only
    * a genuine server response carries a status: transport and internal lex
    * failures are `XrpcInternalError`s and fall through to the generic arm,
    * where `isNetworkError` keeps them out of the logs.
@@ -1340,11 +1333,11 @@ export class Convo {
    * matching what the server returns on refresh.
    */
   private tombstoneDeletedReplyTo(
-    m: ChatBskyConvoDefs.MessageView,
-  ): ChatBskyConvoDefs.MessageView {
+    m: chat.bsky.convo.defs.MessageView,
+  ): chat.bsky.convo.defs.MessageView {
     const {replyTo} = m
     if (
-      !ChatBskyConvoDefs.isMessageView(replyTo) ||
+      !bsky.isType(chat.bsky.convo.defs.messageView, replyTo) ||
       !this.deletedMessages.has(replyTo.id)
     ) {
       return m
@@ -1359,19 +1352,19 @@ export class Convo {
     const items: ConvoItem[] = []
 
     this.pastMessages.forEach(m => {
-      if (ChatBskyConvoDefs.isMessageView(m)) {
+      if (bsky.isType(chat.bsky.convo.defs.messageView, m)) {
         items.unshift({
           type: 'message',
           key: m.id,
           message: this.tombstoneDeletedReplyTo(m),
         })
-      } else if (ChatBskyConvoDefs.isDeletedMessageView(m)) {
+      } else if (bsky.isType(chat.bsky.convo.defs.deletedMessageView, m)) {
         items.unshift({
           type: 'deleted-message',
           key: m.id,
           message: m,
         })
-      } else if (ChatBskyConvoDefs.isSystemMessageView(m)) {
+      } else if (bsky.isType(chat.bsky.convo.defs.systemMessageView, m)) {
         items.unshift({
           type: 'system-message',
           key: m.id,
@@ -1392,19 +1385,19 @@ export class Convo {
     }
 
     this.newMessages.forEach(m => {
-      if (ChatBskyConvoDefs.isMessageView(m)) {
+      if (bsky.isType(chat.bsky.convo.defs.messageView, m)) {
         items.push({
           type: 'message',
           key: m.id,
           message: this.tombstoneDeletedReplyTo(m),
         })
-      } else if (ChatBskyConvoDefs.isDeletedMessageView(m)) {
+      } else if (bsky.isType(chat.bsky.convo.defs.deletedMessageView, m)) {
         items.push({
           type: 'deleted-message',
           key: m.id,
           message: m,
         })
-      } else if (ChatBskyConvoDefs.isSystemMessageView(m)) {
+      } else if (bsky.isType(chat.bsky.convo.defs.systemMessageView, m)) {
         items.push({
           type: 'system-message',
           key: m.id,
@@ -1428,7 +1421,7 @@ export class Convo {
           $type: 'chat.bsky.convo.defs#messageView',
           id: nanoid(),
           rev: '__fake__',
-          sentAt: new Date().toISOString(),
+          sentAt: toDatetimeString(new Date()),
           sender: {
             $type: 'chat.bsky.convo.defs#messageViewSender',
             did: this.senderUserDid,
@@ -1470,16 +1463,16 @@ export class Convo {
    * @param emoji - must be one grapheme
    */
   async addReaction(messageId: string, emoji: string) {
-    const optimisticReaction = {
+    const optimisticReaction: chat.bsky.convo.defs.ReactionView = {
       value: emoji,
       sender: {did: this.senderUserDid},
-      createdAt: new Date().toISOString(),
+      createdAt: toDatetimeString(new Date()),
     }
     let restore: null | (() => void) = null
     if (this.pastMessages.has(messageId)) {
       const prevMessage = this.pastMessages.get(messageId)
       if (
-        ChatBskyConvoDefs.isMessageView(prevMessage) &&
+        bsky.isType(chat.bsky.convo.defs.messageView, prevMessage) &&
         // skip optimistic update if reaction already exists
         !prevMessage.reactions?.find(
           reaction =>
@@ -1509,7 +1502,7 @@ export class Convo {
     } else if (this.newMessages.has(messageId)) {
       const prevMessage = this.newMessages.get(messageId)
       if (
-        ChatBskyConvoDefs.isMessageView(prevMessage) &&
+        bsky.isType(chat.bsky.convo.defs.messageView, prevMessage) &&
         !prevMessage.reactions?.find(reaction => reaction.value === emoji)
       ) {
         if (prevMessage.reactions && prevMessage.reactions.length >= 5)
@@ -1533,7 +1526,7 @@ export class Convo {
         value: emoji,
         convoId: this.convoId,
       })
-      if (ChatBskyConvoDefs.isMessageView(data.message)) {
+      if (bsky.isType(chat.bsky.convo.defs.messageView, data.message)) {
         if (this.pastMessages.has(messageId)) {
           this.pastMessages.set(messageId, data.message)
           this.commit()
@@ -1558,7 +1551,7 @@ export class Convo {
     let restore: null | (() => void) = null
     if (this.pastMessages.has(messageId)) {
       const prevMessage = this.pastMessages.get(messageId)
-      if (ChatBskyConvoDefs.isMessageView(prevMessage)) {
+      if (bsky.isType(chat.bsky.convo.defs.messageView, prevMessage)) {
         this.pastMessages.set(messageId, {
           ...prevMessage,
           reactions: prevMessage.reactions?.filter(
@@ -1575,7 +1568,7 @@ export class Convo {
       }
     } else if (this.newMessages.has(messageId)) {
       const prevMessage = this.newMessages.get(messageId)
-      if (ChatBskyConvoDefs.isMessageView(prevMessage)) {
+      if (bsky.isType(chat.bsky.convo.defs.messageView, prevMessage)) {
         this.newMessages.set(messageId, {
           ...prevMessage,
           reactions: prevMessage.reactions?.filter(
diff --git a/src/state/messages/convo/index.tsx b/src/state/messages/convo/index.tsx
index b37b060701..58a465dc13 100644
--- a/src/state/messages/convo/index.tsx
+++ b/src/state/messages/convo/index.tsx
@@ -6,7 +6,6 @@ import {
   useState,
   useSyncExternalStore,
 } from 'react'
-import {ChatBskyConvoDefs} from '@atproto/api'
 import {useFocusEffect} from '@react-navigation/native'
 import {useQueryClient} from '@tanstack/react-query'
 
@@ -30,12 +29,14 @@ import {RQKEY_ROOT as ListConvosQueryKeyRoot} from '#/state/queries/messages/lis
 import {RQKEY as createProfileQueryKey} from '#/state/queries/profile'
 import {useChatClient} from '#/state/session'
 import {type GroupConvoMember} from '#/components/dms/util'
+import {chat} from '#/lexicons'
+import * as bsky from '#/types/bsky'
 
 export * from '#/state/messages/convo/util'
 
 function membersChanged(
-  a: ChatBskyConvoDefs.ConvoView['members'],
-  b: ChatBskyConvoDefs.ConvoView['members'],
+  a: chat.bsky.convo.defs.ConvoView['members'],
+  b: chat.bsky.convo.defs.ConvoView['members'],
 ) {
   if (a.length !== b.length) return true
   const aDids = new Set(a.map(m => m.did))
@@ -83,9 +84,10 @@ export function ConvoProvider({
   const chatClient = useChatClient()
   const events = useMessagesEventBus()
   const [convo] = useState(() => {
-    const placeholder = queryClient.getQueryData<ChatBskyConvoDefs.ConvoView>(
-      getConvoKey(convoId),
-    )
+    const placeholder =
+      queryClient.getQueryData<chat.bsky.convo.defs.ConvoView>(
+        getConvoKey(convoId),
+      )
     return new Convo({
       convoId,
       chatClient,
@@ -151,14 +153,14 @@ export function ConvoProvider({
       const queryKey = event.query.queryKey as string[]
       if (queryKey[0] === root && queryKey[1] === id) {
         const data = event.query.state.data as
-          | ChatBskyConvoDefs.ConvoView
+          | chat.bsky.convo.defs.ConvoView
           | undefined
         if (data && convo.convo && data.muted !== convo.convo.view.muted) {
           convo.updateMuted(data.muted)
         }
         if (
           data &&
-          ChatBskyConvoDefs.isGroupConvo(data.kind) &&
+          bsky.isType(chat.bsky.convo.defs.groupConvo, data.kind) &&
           convo.convo?.kind === 'group'
         ) {
           if (data.kind.name !== convo.convo.details.name) {
@@ -180,7 +182,7 @@ export function ConvoProvider({
         }
         if (
           data &&
-          ChatBskyConvoDefs.isGroupConvo(data.kind) &&
+          bsky.isType(chat.bsky.convo.defs.groupConvo, data.kind) &&
           convo.convo?.kind === 'group' &&
           (membersChanged(data.members, convo.convo.members) ||
             data.kind.memberCount !== convo.convo.details.memberCount)
diff --git a/src/state/messages/convo/types.ts b/src/state/messages/convo/types.ts
index 5bc5777e82..464cc83b4a 100644
--- a/src/state/messages/convo/types.ts
+++ b/src/state/messages/convo/types.ts
@@ -1,15 +1,8 @@
-import {
-  type $Typed,
-  type AppBskyEmbedRecord,
-  type ChatBskyActorDefs,
-  type ChatBskyConvoDefs,
-  type ChatBskyEmbedJoinLink,
-} from '@atproto/api'
-import {type Client} from '@atproto/lex'
+import {type $Typed, type Client} from '@atproto/lex'
 
 import {type MessagesEventBus} from '#/state/messages/events/agent'
 import {type ConvoWithDetails} from '#/components/dms/util'
-import {type chat} from '#/lexicons'
+import {type app, type chat} from '#/lexicons'
 
 export type ConvoParams = {
   convoId: string
@@ -17,7 +10,7 @@ export type ConvoParams = {
   chatClient: Client
   events: MessagesEventBus
   placeholderData?: {
-    convo: ChatBskyConvoDefs.ConvoView
+    convo: chat.bsky.convo.defs.ConvoView
   }
 }
 
@@ -75,12 +68,12 @@ export type ConvoItem =
   | {
       type: 'message'
       key: string
-      message: ChatBskyConvoDefs.MessageView
+      message: chat.bsky.convo.defs.MessageView
     }
   | {
       type: 'pending-message'
       key: string
-      message: ChatBskyConvoDefs.MessageView
+      message: chat.bsky.convo.defs.MessageView
       failed: boolean
       /**
        * Retry sending the message. If present, the message is in a failed state.
@@ -90,12 +83,12 @@ export type ConvoItem =
   | {
       type: 'deleted-message'
       key: string
-      message: ChatBskyConvoDefs.DeletedMessageView
+      message: chat.bsky.convo.defs.DeletedMessageView
     }
   | {
       type: 'system-message'
       key: string
-      message: ChatBskyConvoDefs.SystemMessageView
+      message: chat.bsky.convo.defs.SystemMessageView
     }
   | {
       type: 'error'
@@ -111,10 +104,10 @@ type DeleteMessage = (messageId: string) => Promise<void>
 type SendMessage = (
   message: chat.bsky.convo.defs.MessageInput,
   optimisticEmbedView:
-    | $Typed<AppBskyEmbedRecord.View>
-    | $Typed<ChatBskyEmbedJoinLink.View>
+    | $Typed<app.bsky.embed.record.View>
+    | $Typed<chat.bsky.embed.joinLink.View>
     | undefined,
-  optimisticReplyTo?: $Typed<ChatBskyConvoDefs.MessageView>,
+  optimisticReplyTo?: $Typed<chat.bsky.convo.defs.MessageView>,
 ) => void
 type FetchMessageHistory = () => Promise<void>
 type MarkConvoAccepted = () => void
@@ -153,7 +146,7 @@ export type ConvoStateReady = {
   status: ConvoStatus.Ready
   items: ConvoItem[]
   convo: ConvoWithDetails
-  relatedProfiles: Map<string, ChatBskyActorDefs.ProfileViewBasic>
+  relatedProfiles: Map<string, chat.bsky.actor.defs.ProfileViewBasic>
   error: undefined
   isFetchingHistory: boolean
   hasAllHistory: boolean
@@ -168,7 +161,7 @@ export type ConvoStateBackgrounded = {
   status: ConvoStatus.Backgrounded
   items: ConvoItem[]
   convo: ConvoWithDetails
-  relatedProfiles: Map<string, ChatBskyActorDefs.ProfileViewBasic>
+  relatedProfiles: Map<string, chat.bsky.actor.defs.ProfileViewBasic>
   error: undefined
   isFetchingHistory: boolean
   hasAllHistory: boolean
@@ -183,7 +176,7 @@ export type ConvoStateSuspended = {
   status: ConvoStatus.Suspended
   items: ConvoItem[]
   convo: ConvoWithDetails
-  relatedProfiles: Map<string, ChatBskyActorDefs.ProfileViewBasic>
+  relatedProfiles: Map<string, chat.bsky.actor.defs.ProfileViewBasic>
   error: undefined
   isFetchingHistory: boolean
   hasAllHistory: boolean
@@ -212,7 +205,7 @@ export type ConvoStateDisabled = {
   status: ConvoStatus.Disabled
   items: ConvoItem[]
   convo: ConvoWithDetails
-  relatedProfiles: Map<string, ChatBskyActorDefs.ProfileViewBasic>
+  relatedProfiles: Map<string, chat.bsky.actor.defs.ProfileViewBasic>
   error: undefined
   isFetchingHistory: boolean
   hasAllHistory: boolean
diff --git a/src/state/queries/activity-subscriptions.ts b/src/state/queries/activity-subscriptions.ts
index f77d1001cb..31f542bda8 100644
--- a/src/state/queries/activity-subscriptions.ts
+++ b/src/state/queries/activity-subscriptions.ts
@@ -1,4 +1,3 @@
-import {type AppBskyActorDefs} from '@atproto/api'
 import {type AtIdentifierString} from '@atproto/syntax'
 import {t} from '@lingui/core/macro'
 import {
@@ -106,7 +105,7 @@ export function useNotificationDeclarationMutation() {
 export function* findAllProfilesInQueryData(
   queryClient: QueryClient,
   did: string,
-): Generator<AppBskyActorDefs.ProfileView, void> {
+): Generator<app.bsky.actor.defs.ProfileView, void> {
   const queryDatas = queryClient.getQueriesData<
     InfiniteData<app.bsky.notification.listActivitySubscriptions.$OutputBody>
   >({
diff --git a/src/state/queries/actor-autocomplete.ts b/src/state/queries/actor-autocomplete.ts
index 111a8aaab4..cdb2584803 100644
--- a/src/state/queries/actor-autocomplete.ts
+++ b/src/state/queries/actor-autocomplete.ts
@@ -1,10 +1,8 @@
 import {useCallback} from 'react'
-import {type AppBskyActorDefs} from '@atproto/api'
-import {type ModerationOpts} from '@bsky.app/sdk/moderation'
+import {moderateProfile, type ModerationOpts} from '@bsky.app/sdk/moderation'
 import {keepPreviousData, useQuery, useQueryClient} from '@tanstack/react-query'
 
 import {isJustAMute, moduiContainsHideableOffense} from '#/lib/moderation'
-import {moderateProfile} from '#/lib/moderation/subjects'
 import {logger} from '#/logger'
 import {STALE} from '#/state/queries'
 import {useAppviewClient} from '#/state/session'
@@ -34,7 +32,7 @@ export function useActorAutocompleteQuery(
     prefix = prefix.slice(0, -1)
   }
 
-  return useQuery<AppBskyActorDefs.ProfileViewBasic[]>({
+  return useQuery<app.bsky.actor.defs.ProfileViewBasic[]>({
     staleTime: STALE.MINUTES.ONE,
     queryKey: RQKEY(prefix || ''),
     async queryFn() {
@@ -47,7 +45,7 @@ export function useActorAutocompleteQuery(
       return data?.actors || []
     },
     select: useCallback(
-      (data: AppBskyActorDefs.ProfileViewBasic[]) => {
+      (data: app.bsky.actor.defs.ProfileViewBasic[]) => {
         return computeSuggestions({
           q: prefix,
           searched: data,
@@ -104,10 +102,10 @@ function computeSuggestions({
   moderationOpts,
 }: {
   q?: string
-  searched?: AppBskyActorDefs.ProfileViewBasic[]
+  searched?: app.bsky.actor.defs.ProfileViewBasic[]
   moderationOpts: ModerationOpts
 }) {
-  let items: AppBskyActorDefs.ProfileViewBasic[] = []
+  let items: app.bsky.actor.defs.ProfileViewBasic[] = []
   for (const item of searched) {
     if (!items.find(item2 => item2.handle === item.handle)) {
       items.push(item)
diff --git a/src/state/queries/bookmarks/useBookmarkMutation.ts b/src/state/queries/bookmarks/useBookmarkMutation.ts
index af5a4a2d8d..4ba0d1d7f5 100644
--- a/src/state/queries/bookmarks/useBookmarkMutation.ts
+++ b/src/state/queries/bookmarks/useBookmarkMutation.ts
@@ -1,4 +1,3 @@
-import {type AppBskyFeedDefs} from '@atproto/api'
 import {type AtUriString} from '@atproto/syntax'
 import {useMutation, useQueryClient} from '@tanstack/react-query'
 
@@ -13,7 +12,7 @@ import {useAppviewClient} from '#/state/session'
 import {app} from '#/lexicons'
 
 type MutationArgs =
-  | {action: 'create'; post: AppBskyFeedDefs.PostView}
+  | {action: 'create'; post: app.bsky.feed.defs.PostView}
   | {
       action: 'delete'
       /**
@@ -32,7 +31,7 @@ export function useBookmarkMutation() {
       if (args.action === 'create') {
         updatePostShadow(qc, args.post.uri, {bookmarked: true})
         await client.call(app.bsky.bookmark.createBookmark, {
-          uri: args.post.uri as AtUriString,
+          uri: args.post.uri,
           cid: args.post.cid,
         })
       } else if (args.action === 'delete') {
diff --git a/src/state/queries/bookmarks/useBookmarksQuery.ts b/src/state/queries/bookmarks/useBookmarksQuery.ts
index 14323625f9..adb12a47ce 100644
--- a/src/state/queries/bookmarks/useBookmarksQuery.ts
+++ b/src/state/queries/bookmarks/useBookmarksQuery.ts
@@ -1,4 +1,5 @@
-import {type $Typed, AppBskyFeedDefs, AtUri} from '@atproto/api'
+import {type $Typed} from '@atproto/lex'
+import {AtUri} from '@atproto/syntax'
 import {
   type InfiniteData,
   type QueryClient,
@@ -57,7 +58,7 @@ export async function truncateAndInvalidate(qc: QueryClient) {
 
 export async function optimisticallySaveBookmark(
   qc: QueryClient,
-  post: AppBskyFeedDefs.PostView,
+  post: app.bsky.feed.defs.PostView,
 ) {
   qc.setQueriesData<InfiniteData<app.bsky.bookmark.getBookmarks.$OutputBody>>(
     {
@@ -71,9 +72,9 @@ export async function optimisticallySaveBookmark(
           if (index === 0) {
             post.$type = 'app.bsky.feed.defs#postView'
             /*
-             * The optimistic entry is synthesized from an `@atproto/api`
-             * `PostView`, whose string fields are unbranded, so it is asserted
-             * to the vendored view type the query data is now keyed on.
+             * The optimistic entry is synthesized with unbranded string
+             * fields, so it is asserted to the generated view type the query
+             * data is keyed on.
              */
             const bookmark = {
               createdAt: new Date().toISOString(),
@@ -81,7 +82,7 @@ export async function optimisticallySaveBookmark(
                 uri: post.uri,
                 cid: post.cid,
               },
-              item: post as $Typed<AppBskyFeedDefs.PostView>,
+              item: post as $Typed<app.bsky.feed.defs.PostView>,
             } as unknown as app.bsky.bookmark.defs.BookmarkView
             return {
               ...page,
@@ -121,7 +122,7 @@ export async function optimisticallyDeleteBookmark(
 export function* findAllPostsInQueryData(
   queryClient: QueryClient,
   uri: string,
-): Generator<AppBskyFeedDefs.PostView, undefined> {
+): Generator<app.bsky.feed.defs.PostView, undefined> {
   const queryDatas = queryClient.getQueriesData<
     InfiniteData<app.bsky.bookmark.getBookmarks.$OutputBody>
   >({
@@ -135,13 +136,7 @@ export function* findAllPostsInQueryData(
     }
     for (const page of queryData?.pages) {
       for (const bookmark of page.bookmarks) {
-        if (
-          !bsky.dangerousIsType<AppBskyFeedDefs.PostView>(
-            bookmark.item,
-            AppBskyFeedDefs.isPostView,
-          )
-        )
-          continue
+        if (!bsky.isType(app.bsky.feed.defs.postView, bookmark.item)) continue
 
         if (didOrHandleUriMatches(atUri, bookmark.item)) {
           yield bookmark.item
diff --git a/src/state/queries/explore-feed-previews.tsx b/src/state/queries/explore-feed-previews.tsx
index 884b46d2df..0977fdcbdc 100644
--- a/src/state/queries/explore-feed-previews.tsx
+++ b/src/state/queries/explore-feed-previews.tsx
@@ -1,6 +1,6 @@
 import {useMemo, useRef} from 'react'
-import {type AppBskyActorDefs, AppBskyFeedDefs, AtUri} from '@atproto/api'
-import {type AtUriString} from '@atproto/syntax'
+import {AtUri} from '@atproto/syntax'
+import {moderatePost} from '@bsky.app/sdk/moderation'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {
@@ -12,7 +12,6 @@ import {
 import {CustomFeedAPI} from '#/lib/api/feed/custom'
 import {aggregateUserInterests} from '#/lib/api/feed/utils'
 import {FeedTuner} from '#/lib/api/feed-manip'
-import {moderatePost} from '#/lib/moderation/subjects'
 import {cleanError} from '#/lib/strings/errors'
 import {useModerationOpts} from '#/state/preferences/moderation-opts'
 import {
@@ -26,6 +25,8 @@ import {
   getEmbeddedPost,
 } from '#/state/queries/util'
 import {useAppviewClient} from '#/state/session'
+import {app} from '#/lexicons'
+import * as bsky from '#/types/bsky'
 
 const RQKEY_ROOT = 'feed-previews'
 const RQKEY = (feeds: string[]) => [RQKEY_ROOT, feeds]
@@ -82,7 +83,7 @@ export type FeedPreviewItem =
   | {
       type: 'preview:header'
       key: string
-      feed: AppBskyFeedDefs.GeneratorView
+      feed: app.bsky.feed.defs.GeneratorView
     }
   | {
       type: 'preview:footer'
@@ -94,7 +95,7 @@ export type FeedPreviewItem =
       key: string
       slice: FeedPostSlice
       indexInSlice: number
-      feed: AppBskyFeedDefs.GeneratorView
+      feed: app.bsky.feed.defs.GeneratorView
       showReplyTo: boolean
       hideTopBorder: boolean
     }
@@ -105,7 +106,7 @@ export type FeedPreviewItem =
     }
 
 export function useFeedPreviews(
-  feedsMaybeWithDuplicates: AppBskyFeedDefs.GeneratorView[],
+  feedsMaybeWithDuplicates: app.bsky.feed.defs.GeneratorView[],
   isEnabled: boolean = true,
 ) {
   const feeds = useMemo(
@@ -127,8 +128,8 @@ export function useFeedPreviews(
   const processedPageCache = useRef(
     new Map<
       {
-        feed: AppBskyFeedDefs.GeneratorView
-        posts: AppBskyFeedDefs.FeedViewPost[]
+        feed: app.bsky.feed.defs.GeneratorView
+        posts: app.bsky.feed.defs.FeedViewPost[]
       },
       FeedPreviewItem[]
     >(),
@@ -141,7 +142,7 @@ export function useFeedPreviews(
       const feed = feeds[pageParam]
       const api = new CustomFeedAPI({
         client,
-        feedParams: {feed: feed.uri as AtUriString},
+        feedParams: {feed: feed.uri},
         userInterests,
       })
       const data = await api.fetch({cursor: undefined, limit: LIMIT})
@@ -346,13 +347,13 @@ export function useFeedPreviews(
 export function* findAllPostsInQueryData(
   queryClient: QueryClient,
   uri: string,
-): Generator<AppBskyFeedDefs.PostView, undefined> {
+): Generator<app.bsky.feed.defs.PostView, undefined> {
   const atUri = new AtUri(uri)
 
   const queryDatas = queryClient.getQueriesData<
     InfiniteData<{
-      feed: AppBskyFeedDefs.GeneratorView
-      posts: AppBskyFeedDefs.FeedViewPost[]
+      feed: app.bsky.feed.defs.GeneratorView
+      posts: app.bsky.feed.defs.FeedViewPost[]
     }>
   >({
     queryKey: [RQKEY_ROOT],
@@ -372,7 +373,7 @@ export function* findAllPostsInQueryData(
           yield embedViewRecordToPostView(quotedPost)
         }
 
-        if (AppBskyFeedDefs.isPostView(item.reply?.parent)) {
+        if (bsky.isType(app.bsky.feed.defs.postView, item.reply?.parent)) {
           if (didOrHandleUriMatches(atUri, item.reply.parent)) {
             yield item.reply.parent
           }
@@ -386,7 +387,7 @@ export function* findAllPostsInQueryData(
           }
         }
 
-        if (AppBskyFeedDefs.isPostView(item.reply?.root)) {
+        if (bsky.isType(app.bsky.feed.defs.postView, item.reply?.root)) {
           if (didOrHandleUriMatches(atUri, item.reply.root)) {
             yield item.reply.root
           }
@@ -404,11 +405,11 @@ export function* findAllPostsInQueryData(
 export function* findAllProfilesInQueryData(
   queryClient: QueryClient,
   did: string,
-): Generator<AppBskyActorDefs.ProfileViewBasic, undefined> {
+): Generator<app.bsky.actor.defs.ProfileViewBasic, undefined> {
   const queryDatas = queryClient.getQueriesData<
     InfiniteData<{
-      feed: AppBskyFeedDefs.GeneratorView
-      posts: AppBskyFeedDefs.FeedViewPost[]
+      feed: app.bsky.feed.defs.GeneratorView
+      posts: app.bsky.feed.defs.FeedViewPost[]
     }>
   >({
     queryKey: [RQKEY_ROOT],
@@ -427,13 +428,13 @@ export function* findAllProfilesInQueryData(
           yield quotedPost.author
         }
         if (
-          AppBskyFeedDefs.isPostView(item.reply?.parent) &&
+          bsky.isType(app.bsky.feed.defs.postView, item.reply?.parent) &&
           item.reply?.parent?.author.did === did
         ) {
           yield item.reply.parent.author
         }
         if (
-          AppBskyFeedDefs.isPostView(item.reply?.root) &&
+          bsky.isType(app.bsky.feed.defs.postView, item.reply?.root) &&
           item.reply?.root?.author.did === did
         ) {
           yield item.reply.root.author
diff --git a/src/state/queries/feed.ts b/src/state/queries/feed.ts
index 669ec04263..c0ace8f911 100644
--- a/src/state/queries/feed.ts
+++ b/src/state/queries/feed.ts
@@ -1,11 +1,6 @@
 import {useCallback, useEffect, useMemo, useRef} from 'react'
-import {
-  type AppBskyActorDefs,
-  type AppBskyFeedDefs,
-  type AppBskyGraphDefs,
-  AtUri,
-} from '@atproto/api'
-import {type AtUriString} from '@atproto/syntax'
+import {AtUri, type AtUriString} from '@atproto/syntax'
+import {moderateFeedGenerator} from '@bsky.app/sdk/moderation'
 import {RichText} from '@bsky.app/sdk/richtext'
 import {t} from '@lingui/core/macro'
 import {
@@ -19,10 +14,8 @@ import {
 } from '@tanstack/react-query'
 
 import {DISCOVER_FEED_URI, DISCOVER_SAVED_FEED} from '#/lib/constants'
-import {moderateFeedGenerator} from '#/lib/moderation/subjects'
 import {sanitizeDisplayName} from '#/lib/strings/display-names'
 import {sanitizeHandle} from '#/lib/strings/handles'
-import {asSdkFacets} from '#/lib/strings/rich-text-helpers'
 import {GCTIME, STALE} from '#/state/queries'
 import {RQKEY as listQueryKey} from '#/state/queries/list'
 import {usePreferencesQuery} from '#/state/queries/preferences'
@@ -36,7 +29,7 @@ import {precacheResolvedUri} from './resolve-uri'
 
 export type FeedSourceFeedInfo = {
   type: 'feed'
-  view?: AppBskyFeedDefs.GeneratorView
+  view?: app.bsky.feed.defs.GeneratorView
   uri: string
   feedDescriptor: FeedDescriptor
   route: {
@@ -53,12 +46,12 @@ export type FeedSourceFeedInfo = {
   likeCount: number | undefined
   acceptsInteractions?: boolean
   likeUri: string | undefined
-  contentMode: AppBskyFeedDefs.GeneratorView['contentMode']
+  contentMode: app.bsky.feed.defs.GeneratorView['contentMode']
 }
 
 export type FeedSourceListInfo = {
   type: 'list'
-  view?: AppBskyGraphDefs.ListView
+  view?: app.bsky.graph.defs.ListView
   uri: string
   feedDescriptor: FeedDescriptor
   route: {
@@ -95,7 +88,7 @@ const feedSourceNSIDs = {
 }
 
 export function hydrateFeedGenerator(
-  view: AppBskyFeedDefs.GeneratorView,
+  view: app.bsky.feed.defs.GeneratorView,
 ): FeedSourceInfo {
   const urip = new AtUri(view.uri)
   const collection =
@@ -105,7 +98,7 @@ export function hydrateFeedGenerator(
 
   const description = new RichText({
     text: view.description || '',
-    facets: asSdkFacets((view.descriptionFacets || [])?.slice()),
+    facets: (view.descriptionFacets || [])?.slice(),
   })
 
   if (!view.descriptionFacets) {
@@ -137,7 +130,9 @@ export function hydrateFeedGenerator(
   }
 }
 
-export function hydrateList(view: AppBskyGraphDefs.ListView): FeedSourceInfo {
+export function hydrateList(
+  view: app.bsky.graph.defs.ListView,
+): FeedSourceInfo {
   const urip = new AtUri(view.uri)
   const collection =
     urip.collection === 'app.bsky.feed.generator' ? 'feed' : 'lists'
@@ -146,7 +141,7 @@ export function hydrateList(view: AppBskyGraphDefs.ListView): FeedSourceInfo {
 
   const description = new RichText({
     text: view.description || '',
-    facets: asSdkFacets((view.descriptionFacets || [])?.slice()),
+    facets: (view.descriptionFacets || [])?.slice(),
   })
 
   if (!view.descriptionFacets) {
@@ -410,7 +405,7 @@ export function usePopularFeedsSearch({
 }
 
 export type SavedFeedSourceInfo = FeedSourceInfo & {
-  savedFeed: AppBskyActorDefs.SavedFeed
+  savedFeed: app.bsky.actor.defs.SavedFeed
 }
 
 const PWI_DISCOVER_FEED_STUB: SavedFeedSourceInfo = {
@@ -549,17 +544,17 @@ export function usePinnedFeedsInfos() {
 export type SavedFeedItem =
   | {
       type: 'feed'
-      config: AppBskyActorDefs.SavedFeed
-      view: AppBskyFeedDefs.GeneratorView
+      config: app.bsky.actor.defs.SavedFeed
+      view: app.bsky.feed.defs.GeneratorView
     }
   | {
       type: 'list'
-      config: AppBskyActorDefs.SavedFeed
-      view: AppBskyGraphDefs.ListView
+      config: app.bsky.actor.defs.SavedFeed
+      view: app.bsky.graph.defs.ListView
     }
   | {
       type: 'timeline'
-      config: AppBskyActorDefs.SavedFeed
+      config: app.bsky.actor.defs.SavedFeed
       view: undefined
     }
 
@@ -587,8 +582,8 @@ export function useSavedFeeds() {
       )
     },
     queryFn: async () => {
-      const resolvedFeeds = new Map<string, AppBskyFeedDefs.GeneratorView>()
-      const resolvedLists = new Map<string, AppBskyGraphDefs.ListView>()
+      const resolvedFeeds = new Map<string, app.bsky.feed.defs.GeneratorView>()
+      const resolvedLists = new Map<string, app.bsky.graph.defs.ListView>()
 
       const savedFeeds = savedItems.filter(feed => feed.type === 'feed')
       const savedLists = savedItems.filter(feed => feed.type === 'list')
@@ -703,10 +698,10 @@ function precacheFeed(queryClient: QueryClient, hydratedFeed: FeedSourceInfo) {
 
 export function precacheList(
   queryClient: QueryClient,
-  list: AppBskyGraphDefs.ListView,
+  list: app.bsky.graph.defs.ListView,
 ) {
   precacheResolvedUri(queryClient, list.creator.handle, list.creator.did)
-  queryClient.setQueryData<AppBskyGraphDefs.ListView>(
+  queryClient.setQueryData<app.bsky.graph.defs.ListView>(
     listQueryKey(list.uri),
     list,
   )
@@ -714,7 +709,7 @@ export function precacheList(
 
 export function precacheFeedFromGeneratorView(
   queryClient: QueryClient,
-  view: AppBskyFeedDefs.GeneratorView,
+  view: app.bsky.feed.defs.GeneratorView,
 ) {
   const hydratedFeed = hydrateFeedGenerator(view)
   precacheFeed(queryClient, hydratedFeed)
diff --git a/src/state/queries/join-links.ts b/src/state/queries/join-links.ts
index e5dbbc9bed..91ae82fb6c 100644
--- a/src/state/queries/join-links.ts
+++ b/src/state/queries/join-links.ts
@@ -1,10 +1,6 @@
 import {useCallback} from 'react'
-import {
-  type $Typed,
-  ChatBskyGroupDefs,
-  type ChatBskyGroupGetJoinLinkPreviews,
-} from '@atproto/api'
-import {type Client} from '@atproto/lex'
+import {type $Typed, type Client, type Unknown$TypedObject} from '@atproto/lex'
+import {toDatetimeString} from '@atproto/syntax'
 import {type QueryClient, useQuery, useQueryClient} from '@tanstack/react-query'
 
 import {CHAT_SERVICE} from '#/lib/constants'
@@ -14,6 +10,7 @@ import {STALE} from '#/state/queries/index'
 import {createQueryKey, type StructuredQueryKey} from '#/state/queries/util'
 import {useChatClient} from '#/state/session'
 import {chat} from '#/lexicons'
+import * as bsky from '#/types/bsky'
 
 /**
  * The three preview shapes we currently support. Excludes the `{$type: string}`
@@ -21,15 +18,15 @@ import {chat} from '#/lexicons'
  * `ChatInvitePreview` for that.
  */
 export type KnownChatInvitePreview =
-  | $Typed<ChatBskyGroupDefs.JoinLinkPreviewView>
-  | $Typed<ChatBskyGroupDefs.DisabledJoinLinkPreviewView>
-  | $Typed<ChatBskyGroupDefs.InvalidJoinLinkPreviewView>
+  | $Typed<chat.bsky.group.defs.JoinLinkPreviewView>
+  | $Typed<chat.bsky.group.defs.DisabledJoinLinkPreviewView>
+  | $Typed<chat.bsky.group.defs.InvalidJoinLinkPreviewView>
 
 /**
- * The full open-union shape, including the `{$type: string}` fallback for
- * future variants.
+ * The full open-union shape, including lex's `Unknown$TypedObject` fallback for
+ * unrecognized future variants.
  */
-export type ChatInvitePreview = KnownChatInvitePreview | {$type: string}
+export type ChatInvitePreview = KnownChatInvitePreview | Unknown$TypedObject
 
 /**
  * Narrows a preview to one of the three known variants, filtering out the
@@ -39,9 +36,9 @@ export function isKnownJoinLinkPreview(
   preview: unknown,
 ): preview is KnownChatInvitePreview {
   return (
-    ChatBskyGroupDefs.isJoinLinkPreviewView(preview) ||
-    ChatBskyGroupDefs.isDisabledJoinLinkPreviewView(preview) ||
-    ChatBskyGroupDefs.isInvalidJoinLinkPreviewView(preview)
+    bsky.isType(chat.bsky.group.defs.joinLinkPreviewView, preview) ||
+    bsky.isType(chat.bsky.group.defs.disabledJoinLinkPreviewView, preview) ||
+    bsky.isType(chat.bsky.group.defs.invalidJoinLinkPreviewView, preview)
   )
 }
 
@@ -90,7 +87,7 @@ export function setJoinLinkPreviewRequestedForCode(
   code: string,
   requested: boolean,
 ) {
-  queryClient.setQueriesData<ChatBskyGroupGetJoinLinkPreviews.OutputSchema>(
+  queryClient.setQueriesData<chat.bsky.group.getJoinLinkPreviews.$OutputBody>(
     {
       predicate: query => {
         const [root, args] = query.queryKey as Partial<
@@ -109,14 +106,16 @@ export function setJoinLinkPreviewRequestedForCode(
         ...old,
         joinLinkPreviews: old.joinLinkPreviews.map(preview => {
           if (
-            ChatBskyGroupDefs.isJoinLinkPreviewView(preview) &&
+            bsky.isType(chat.bsky.group.defs.joinLinkPreviewView, preview) &&
             preview.code === code
           ) {
             return {
               ...preview,
               viewer: {
                 ...preview.viewer,
-                requestedAt: requested ? new Date().toISOString() : undefined,
+                requestedAt: requested
+                  ? toDatetimeString(new Date())
+                  : undefined,
               },
             }
           }
@@ -143,12 +142,12 @@ export function invalidateJoinLinkPreviewsForConvo(
       const [root] = query.queryKey
       if (root !== joinLinkPreviewQueryKeyRoot) return false
       const data = query.state.data as
-        | ChatBskyGroupGetJoinLinkPreviews.OutputSchema
+        | chat.bsky.group.getJoinLinkPreviews.$OutputBody
         | undefined
       return (
         data?.joinLinkPreviews.some(
           preview =>
-            ChatBskyGroupDefs.isJoinLinkPreviewView(preview) &&
+            bsky.isType(chat.bsky.group.defs.joinLinkPreviewView, preview) &&
             preview.convoId === convoId,
         ) ?? false
       )
@@ -204,7 +203,7 @@ export function useJoinLinkPreviewsQuery({
    * Seed the query with an already-known preview (e.g. a DM message embed
    * already carries the resolved view), avoiding a duplicate fetch.
    */
-  initialData?: ChatBskyGroupGetJoinLinkPreviews.OutputSchema
+  initialData?: chat.bsky.group.getJoinLinkPreviews.$OutputBody
 }) {
   const client = useChatClient()
 
diff --git a/src/state/queries/known-followers.ts b/src/state/queries/known-followers.ts
index 3106456f9d..d7e1fdb1ba 100644
--- a/src/state/queries/known-followers.ts
+++ b/src/state/queries/known-followers.ts
@@ -1,4 +1,3 @@
-import {type AppBskyActorDefs} from '@atproto/api'
 import {type DidString} from '@atproto/syntax'
 import {
   type InfiniteData,
@@ -43,7 +42,7 @@ export function useProfileKnownFollowersQuery(did: string | undefined) {
 export function* findAllProfilesInQueryData(
   queryClient: QueryClient,
   did: string,
-): Generator<AppBskyActorDefs.ProfileView, void> {
+): Generator<app.bsky.actor.defs.ProfileView, void> {
   const queryDatas = queryClient.getQueriesData<
     InfiniteData<app.bsky.graph.getKnownFollowers.$OutputBody>
   >({
diff --git a/src/state/queries/list-members.ts b/src/state/queries/list-members.ts
index d466b92484..1d76296623 100644
--- a/src/state/queries/list-members.ts
+++ b/src/state/queries/list-members.ts
@@ -1,4 +1,3 @@
-import {type AppBskyActorDefs, type AppBskyGraphDefs} from '@atproto/api'
 import {type Client} from '@atproto/lex'
 import {type AtUriString} from '@atproto/syntax'
 import {
@@ -91,7 +90,7 @@ export async function invalidateListMembersQuery({
 export function* findAllProfilesInQueryData(
   queryClient: QueryClient,
   did: string,
-): Generator<AppBskyActorDefs.ProfileView, void> {
+): Generator<app.bsky.actor.defs.ProfileView, void> {
   const queryDatas = queryClient.getQueriesData<
     InfiniteData<app.bsky.graph.getList.$OutputBody>
   >({
@@ -114,7 +113,7 @@ export function* findAllProfilesInQueryData(
   }
 
   const allQueryData = queryClient.getQueriesData<
-    AppBskyGraphDefs.ListItemView[]
+    app.bsky.graph.defs.ListItemView[]
   >({
     queryKey: [RQKEY_ROOT_ALL],
   })
diff --git a/src/state/queries/list-memberships.ts b/src/state/queries/list-memberships.ts
index 68a02fd051..2bc62f3712 100644
--- a/src/state/queries/list-memberships.ts
+++ b/src/state/queries/list-memberships.ts
@@ -1,7 +1,3 @@
-import {
-  type AppBskyActorDefs,
-  type AppBskyGraphGetStarterPacksWithMembership,
-} from '@atproto/api'
 import {
   AtUri,
   type AtUriString,
@@ -32,14 +28,14 @@ export function useListMembershipAddMutation({
    * Needed for optimistic update of starter pack query
    */
   subject?: bsky.profile.AnyProfileView
-  onSuccess?: (data: {uri: string; cid: string}) => void
+  onSuccess?: (data: {uri: AtUriString; cid: string}) => void
   onError?: (error: Error) => void
 } = {}) {
   const {currentAccount} = useSession()
   const pdsClient = usePdsClient()
   const queryClient = useQueryClient()
   return useMutation<
-    {uri: string; cid: string},
+    {uri: AtUriString; cid: string},
     Error,
     {listUri: string; actorDid: string}
   >({
@@ -73,7 +69,7 @@ export function useListMembershipAddMutation({
       // update WITH_MEMBERSHIPS query for starter packs
       if (subject) {
         queryClient.setQueryData<
-          InfiniteData<AppBskyGraphGetStarterPacksWithMembership.OutputSchema>
+          InfiniteData<app.bsky.graph.getStarterPacksWithMembership.$OutputBody>
         >(STARTER_PACKS_WITH_MEMBERSHIPS_RKEY(variables.actorDid), old => {
           if (!old) return old
 
@@ -94,7 +90,7 @@ export function useListMembershipAddMutation({
                         listItemsSample: [
                           {
                             uri: data.uri,
-                            subject: subject as AppBskyActorDefs.ProfileView,
+                            subject: subject as app.bsky.actor.defs.ProfileView,
                           },
                           ...(spWithMembership.starterPack.listItemsSample?.filter(
                             item => item.subject.did !== variables.actorDid,
@@ -109,7 +105,7 @@ export function useListMembershipAddMutation({
                       },
                       listItem: {
                         uri: data.uri,
-                        subject: subject as AppBskyActorDefs.ProfileView,
+                        subject: subject as app.bsky.actor.defs.ProfileView,
                       },
                     }
                   }
@@ -167,7 +163,7 @@ export function useListMembershipRemoveMutation({
 
       // update WITH_MEMBERSHIPS query for starter packs
       queryClient.setQueryData<
-        InfiniteData<AppBskyGraphGetStarterPacksWithMembership.OutputSchema>
+        InfiniteData<app.bsky.graph.getStarterPacksWithMembership.$OutputBody>
       >(STARTER_PACKS_WITH_MEMBERSHIPS_RKEY(variables.actorDid), old => {
         if (!old) return old
 
diff --git a/src/state/queries/list.ts b/src/state/queries/list.ts
index 8c9829d0aa..4a9499117c 100644
--- a/src/state/queries/list.ts
+++ b/src/state/queries/list.ts
@@ -1,4 +1,3 @@
-import {type AppBskyGraphDefs} from '@atproto/api'
 import {type $Typed, type Client} from '@atproto/lex'
 import {
   type AtIdentifierString,
@@ -30,7 +29,7 @@ export const RQKEY = (uri: string) => [RQKEY_ROOT, uri]
 
 export function useListQuery(uri?: string) {
   const client = useAppviewClient()
-  return useQuery<AppBskyGraphDefs.ListView, Error>({
+  return useQuery<app.bsky.graph.defs.ListView, Error>({
     staleTime: STALE.MINUTES.ONE,
     queryKey: RQKEY(uri || ''),
     async queryFn() {
diff --git a/src/state/queries/lists-with-membership.ts b/src/state/queries/lists-with-membership.ts
index 1bd09704b9..9aac39197c 100644
--- a/src/state/queries/lists-with-membership.ts
+++ b/src/state/queries/lists-with-membership.ts
@@ -1,4 +1,3 @@
-import {type AppBskyActorDefs} from '@atproto/api'
 import {type AtIdentifierString} from '@atproto/syntax'
 import {
   type InfiniteData,
@@ -60,7 +59,7 @@ export function updateListMembershipOptimistically({
   actor: string
   listUri: string
   membershipUri: string
-  subject: AppBskyActorDefs.ProfileView
+  subject: app.bsky.actor.defs.ProfileView
 }) {
   queryClient.setQueryData<
     InfiniteData<app.bsky.graph.getListsWithMembership.$OutputBody>
diff --git a/src/state/queries/messages/accept-conversation.ts b/src/state/queries/messages/accept-conversation.ts
index 391f3e49f5..f059322f7c 100644
--- a/src/state/queries/messages/accept-conversation.ts
+++ b/src/state/queries/messages/accept-conversation.ts
@@ -1,7 +1,3 @@
-import {
-  type ChatBskyConvoAcceptConvo,
-  type ChatBskyConvoDefs,
-} from '@atproto/api'
 import {useMutation, useQueryClient} from '@tanstack/react-query'
 
 import {logger} from '#/logger'
@@ -29,7 +25,7 @@ export function useAcceptConversation(
     onError,
   }: {
     onMutate?: () => void
-    onSuccess?: (data: ChatBskyConvoAcceptConvo.OutputSchema) => void
+    onSuccess?: (data: chat.bsky.convo.acceptConvo.$OutputBody) => void
     onError?: (error: Error) => void
   },
 ) {
@@ -47,7 +43,7 @@ export function useAcceptConversation(
         queryClient.getQueriesData<ConvoListQueryData>({
           queryKey: [CONVO_LIST_ROOT_KEY],
         })
-      let convoBeingAccepted: ChatBskyConvoDefs.ConvoView | null = null
+      let convoBeingAccepted: chat.bsky.convo.defs.ConvoView | null = null
       for (const [_key, data] of queryClient.getQueriesData<ConvoListQueryData>(
         {queryKey: CONVO_LIST_PARTIAL_KEY('request')},
       )) {
@@ -60,7 +56,7 @@ export function useAcceptConversation(
         (old?: ConvoListQueryData) => optimisticDelete(convoId, old),
       )
       if (convoBeingAccepted) {
-        const acceptedConvo: ChatBskyConvoDefs.ConvoView = {
+        const acceptedConvo: chat.bsky.convo.defs.ConvoView = {
           ...convoBeingAccepted,
           status: 'accepted',
         }
diff --git a/src/state/queries/messages/actor-declaration.ts b/src/state/queries/messages/actor-declaration.ts
index 0824e52aae..7f0f363c82 100644
--- a/src/state/queries/messages/actor-declaration.ts
+++ b/src/state/queries/messages/actor-declaration.ts
@@ -1,4 +1,3 @@
-import {type AppBskyActorDefs} from '@atproto/api'
 import {type Client} from '@atproto/lex'
 import {type DidString} from '@atproto/syntax'
 import {useMutation, useQueryClient} from '@tanstack/react-query'
@@ -6,7 +5,7 @@ import {useMutation, useQueryClient} from '@tanstack/react-query'
 import {logger} from '#/logger'
 import {usePdsClient, useSession} from '#/state/session'
 import {resolveAllowGroupInvites} from '#/components/dms/util'
-import {chat, com} from '#/lexicons'
+import {type app, chat, com} from '#/lexicons'
 import {RQKEY as PROFILE_RKEY} from '../profile'
 
 export function useUpdateActorDeclaration({
@@ -27,7 +26,7 @@ export function useUpdateActorDeclaration({
     }) => {
       if (!currentAccount) throw new Error('Not signed in')
       const current =
-        queryClient.getQueryData<AppBskyActorDefs.ProfileViewDetailed>(
+        queryClient.getQueryData<app.bsky.actor.defs.ProfileViewDetailed>(
           PROFILE_RKEY(currentAccount.did),
         )
       const allowIncoming =
@@ -57,7 +56,7 @@ export function useUpdateActorDeclaration({
       if (!currentAccount) return
       queryClient.setQueryData(
         PROFILE_RKEY(currentAccount?.did),
-        (old?: AppBskyActorDefs.ProfileViewDetailed) => {
+        (old?: app.bsky.actor.defs.ProfileViewDetailed) => {
           if (!old) return old
           const allowIncoming =
             update.allowIncoming ??
@@ -81,7 +80,7 @@ export function useUpdateActorDeclaration({
                 allowGroupInvites,
               },
             },
-          } satisfies AppBskyActorDefs.ProfileViewDetailed
+          } satisfies app.bsky.actor.defs.ProfileViewDetailed
         },
       )
     },
diff --git a/src/state/queries/messages/add-group-members.ts b/src/state/queries/messages/add-group-members.ts
index bf4f8a8f4e..2b7610be16 100644
--- a/src/state/queries/messages/add-group-members.ts
+++ b/src/state/queries/messages/add-group-members.ts
@@ -1,9 +1,3 @@
-import {
-  type ChatBskyActorDefs,
-  ChatBskyConvoDefs,
-  type ChatBskyConvoListConvos,
-  type ChatBskyGroupAddMembers,
-} from '@atproto/api'
 import {type DidString} from '@atproto/syntax'
 import {
   type InfiniteData,
@@ -15,7 +9,7 @@ import {logger} from '#/logger'
 import {useProfileQuery} from '#/state/queries/profile'
 import {useChatClient, useSession} from '#/state/session'
 import {chat} from '#/lexicons'
-import type * as bsky from '#/types/bsky'
+import * as bsky from '#/types/bsky'
 import {RQKEY as CONVO_KEY} from './conversation'
 import {RQKEY_ROOT as CONVO_LIST_KEY} from './list-conversations'
 import {listConvoMembersQueryKey} from './list-convo-members'
@@ -26,7 +20,7 @@ export function useAddGroupMembers(
     onSuccess,
     onError,
   }: {
-    onSuccess?: (data: ChatBskyGroupAddMembers.OutputSchema) => void
+    onSuccess?: (data: chat.bsky.group.addMembers.$OutputBody) => void
     onError?: (error: Error) => void
   },
 ) {
@@ -52,24 +46,26 @@ export function useAddGroupMembers(
     onMutate: ({profiles}) => {
       if (!convoId) return
 
-      const prevConvo = queryClient.getQueryData<ChatBskyConvoDefs.ConvoView>(
-        CONVO_KEY(convoId),
-      )
+      const prevConvo =
+        queryClient.getQueryData<chat.bsky.convo.defs.ConvoView>(
+          CONVO_KEY(convoId),
+        )
       const prevListEntries = queryClient.getQueriesData<
-        InfiniteData<ChatBskyConvoListConvos.OutputSchema>
+        InfiniteData<chat.bsky.convo.listConvos.$OutputBody>
       >({queryKey: [CONVO_LIST_KEY]})
       const prevMemberList = queryClient.getQueryData<
-        ChatBskyActorDefs.ProfileViewBasic[]
+        chat.bsky.actor.defs.ProfileViewBasic[]
       >(listConvoMembersQueryKey(convoId))
 
-      const addedBy: ChatBskyActorDefs.ProfileViewBasic | undefined = myProfile
-        ? {
-            ...myProfile,
-            $type: 'chat.bsky.actor.defs#profileViewBasic',
-          }
-        : undefined
+      const addedBy: chat.bsky.actor.defs.ProfileViewBasic | undefined =
+        myProfile
+          ? {
+              ...myProfile,
+              $type: 'chat.bsky.actor.defs#profileViewBasic',
+            }
+          : undefined
 
-      const optimisticMembers: ChatBskyActorDefs.ProfileViewBasic[] =
+      const optimisticMembers: chat.bsky.actor.defs.ProfileViewBasic[] =
         profiles.map(profile => ({
           ...profile,
           $type: 'chat.bsky.actor.defs#profileViewBasic',
@@ -80,11 +76,12 @@ export function useAddGroupMembers(
           },
         }))
 
-      queryClient.setQueryData<ChatBskyConvoDefs.ConvoView>(
+      queryClient.setQueryData<chat.bsky.convo.defs.ConvoView>(
         CONVO_KEY(convoId),
         prev => {
           if (!prev) return
-          if (!ChatBskyConvoDefs.isGroupConvo(prev.kind)) return prev
+          if (!bsky.isType(chat.bsky.convo.defs.groupConvo, prev.kind))
+            return prev
           return {
             ...prev,
             members: [...prev.members, ...optimisticMembers],
@@ -97,7 +94,7 @@ export function useAddGroupMembers(
       )
 
       queryClient.setQueriesData<
-        InfiniteData<ChatBskyConvoListConvos.OutputSchema>
+        InfiniteData<chat.bsky.convo.listConvos.$OutputBody>
       >({queryKey: [CONVO_LIST_KEY]}, prev => {
         if (!prev?.pages) return
         return {
@@ -106,7 +103,8 @@ export function useAddGroupMembers(
             ...page,
             convos: page.convos.map(convo => {
               if (convo.id !== convoId) return convo
-              if (!ChatBskyConvoDefs.isGroupConvo(convo.kind)) return convo
+              if (!bsky.isType(chat.bsky.convo.defs.groupConvo, convo.kind))
+                return convo
               return {
                 ...convo,
                 members: [...convo.members, ...optimisticMembers],
@@ -121,7 +119,7 @@ export function useAddGroupMembers(
         }
       })
 
-      queryClient.setQueryData<ChatBskyActorDefs.ProfileViewBasic[]>(
+      queryClient.setQueryData<chat.bsky.actor.defs.ProfileViewBasic[]>(
         listConvoMembersQueryKey(convoId),
         prev => {
           if (!prev) return
@@ -133,13 +131,13 @@ export function useAddGroupMembers(
     },
     onSuccess: data => {
       if (convoId) {
-        queryClient.setQueryData<ChatBskyConvoDefs.ConvoView>(
+        queryClient.setQueryData<chat.bsky.convo.defs.ConvoView>(
           CONVO_KEY(convoId),
           data.convo,
         )
 
         queryClient.setQueriesData<
-          InfiniteData<ChatBskyConvoListConvos.OutputSchema>
+          InfiniteData<chat.bsky.convo.listConvos.$OutputBody>
         >({queryKey: [CONVO_LIST_KEY]}, prev => {
           if (!prev?.pages) return
           return {
diff --git a/src/state/queries/messages/conversation.ts b/src/state/queries/messages/conversation.ts
index c0bf8f3551..04e3a7129b 100644
--- a/src/state/queries/messages/conversation.ts
+++ b/src/state/queries/messages/conversation.ts
@@ -1,9 +1,3 @@
-import {
-  type ChatBskyActorDefs,
-  type ChatBskyConvoDefs,
-  type ChatBskyConvoGetConvo,
-  type ChatBskyConvoGetUnreadCounts,
-} from '@atproto/api'
 import {
   type QueryClient,
   useMutation,
@@ -44,7 +38,7 @@ export function useConvoQuery({convoId}: {convoId: string}) {
 
 export function precacheConvoQuery(
   queryClient: QueryClient,
-  convo: ChatBskyConvoDefs.ConvoView,
+  convo: chat.bsky.convo.defs.ConvoView,
 ) {
   queryClient.setQueryData(RQKEY(convo.id), convo)
 }
@@ -81,7 +75,7 @@ export function useMarkAsReadMutation() {
       // find the convo so we know which badge counter (if any) to decrement.
       // keep scanning past a stale unreadCount === 0 cache so another cache
       // holding the true unread state still drives the decrement
-      let unreadStatus: ChatBskyConvoDefs.ConvoView['status'] | undefined
+      let unreadStatus: chat.bsky.convo.defs.ConvoView['status'] | undefined
       for (const [, data] of prevListQueries) {
         if (!data) continue
         const convo = getConvoFromQueryData(convoId, data)
@@ -96,11 +90,13 @@ export function useMarkAsReadMutation() {
       // the badge count query is a separate server query that the list caches
       // don't feed, so decrement it here to keep the badge in sync
       const prevUnreadCountsQueries =
-        queryClient.getQueriesData<ChatBskyConvoGetUnreadCounts.OutputSchema>({
-          queryKey: UNREAD_COUNTS_PARTIAL_KEY,
-        })
+        queryClient.getQueriesData<chat.bsky.convo.getUnreadCounts.$OutputBody>(
+          {
+            queryKey: UNREAD_COUNTS_PARTIAL_KEY,
+          },
+        )
       if (unreadStatus) {
-        queryClient.setQueriesData<ChatBskyConvoGetUnreadCounts.OutputSchema>(
+        queryClient.setQueriesData<chat.bsky.convo.getUnreadCounts.$OutputBody>(
           {queryKey: UNREAD_COUNTS_PARTIAL_KEY},
           old => {
             if (!old) return old
@@ -184,9 +180,9 @@ export function useMarkAsReadMutation() {
 export function* findAllProfilesInQueryData(
   queryClient: QueryClient,
   did: string,
-): Generator<ChatBskyActorDefs.ProfileViewBasic, void> {
+): Generator<chat.bsky.actor.defs.ProfileViewBasic, void> {
   const queryDatas = queryClient.getQueriesData<
-    ChatBskyConvoGetConvo.OutputSchema['convo']
+    chat.bsky.convo.getConvo.$OutputBody['convo']
   >({
     queryKey: [RQKEY_ROOT],
   })
diff --git a/src/state/queries/messages/create-group-chat.ts b/src/state/queries/messages/create-group-chat.ts
index 4a78a2be6a..3a12a976e6 100644
--- a/src/state/queries/messages/create-group-chat.ts
+++ b/src/state/queries/messages/create-group-chat.ts
@@ -1,4 +1,3 @@
-import {type ChatBskyGroupCreateGroup} from '@atproto/api'
 import {type DidString} from '@atproto/syntax'
 import {useMutation, useQueryClient} from '@tanstack/react-query'
 
@@ -11,7 +10,7 @@ export function useCreateGroupChat({
   onSuccess,
   onError,
 }: {
-  onSuccess?: (data: ChatBskyGroupCreateGroup.OutputSchema) => void
+  onSuccess?: (data: chat.bsky.group.createGroup.$OutputBody) => void
   onError?: (error: Error) => void
 }) {
   const queryClient = useQueryClient()
diff --git a/src/state/queries/messages/create-join-link.ts b/src/state/queries/messages/create-join-link.ts
index 57269b93e3..5f52cadf8f 100644
--- a/src/state/queries/messages/create-join-link.ts
+++ b/src/state/queries/messages/create-join-link.ts
@@ -1,13 +1,10 @@
-import {
-  ChatBskyConvoDefs,
-  type ChatBskyGroupCreateJoinLink,
-  type ChatBskyGroupDefs,
-} from '@atproto/api'
+import {toDatetimeString} from '@atproto/syntax'
 import {useMutation, useQueryClient} from '@tanstack/react-query'
 
 import {logger} from '#/logger'
 import {useChatClient} from '#/state/session'
 import {chat} from '#/lexicons'
+import * as bsky from '#/types/bsky'
 import {
   rollbackConvoOptimistic,
   updateConvoOptimistic,
@@ -19,7 +16,7 @@ export function useCreateJoinLink(
     onSuccess,
     onError,
   }: {
-    onSuccess?: (data: ChatBskyGroupCreateJoinLink.OutputSchema) => void
+    onSuccess?: (data: chat.bsky.group.createJoinLink.$OutputBody) => void
     onError?: (error: Error) => void
   },
 ) {
@@ -31,7 +28,7 @@ export function useCreateJoinLink(
       joinRule,
       requireApproval,
     }: {
-      joinRule: ChatBskyGroupDefs.JoinRule
+      joinRule: chat.bsky.group.defs.JoinRule
       requireApproval: boolean
     }) => {
       if (!convoId) throw new Error('No convoId provided')
@@ -44,7 +41,8 @@ export function useCreateJoinLink(
     onMutate: ({joinRule, requireApproval}) => {
       if (!convoId) return
       return updateConvoOptimistic(queryClient, convoId, prev => {
-        if (!ChatBskyConvoDefs.isGroupConvo(prev.kind)) return undefined
+        if (!bsky.isType(chat.bsky.convo.defs.groupConvo, prev.kind))
+          return undefined
         return {
           ...prev,
           kind: {
@@ -55,7 +53,7 @@ export function useCreateJoinLink(
               enabledStatus: 'enabled',
               joinRule,
               requireApproval,
-              createdAt: new Date().toISOString(),
+              createdAt: toDatetimeString(new Date()),
             },
           },
         }
@@ -64,7 +62,8 @@ export function useCreateJoinLink(
     onSuccess: data => {
       if (convoId) {
         updateConvoOptimistic(queryClient, convoId, prev => {
-          if (!ChatBskyConvoDefs.isGroupConvo(prev.kind)) return undefined
+          if (!bsky.isType(chat.bsky.convo.defs.groupConvo, prev.kind))
+            return undefined
           return {
             ...prev,
             kind: {...prev.kind, joinLink: data.joinLink},
diff --git a/src/state/queries/messages/disable-join-link.ts b/src/state/queries/messages/disable-join-link.ts
index b995dbcc6f..d58edca37b 100644
--- a/src/state/queries/messages/disable-join-link.ts
+++ b/src/state/queries/messages/disable-join-link.ts
@@ -1,13 +1,10 @@
-import {
-  ChatBskyConvoDefs,
-  type ChatBskyGroupDisableJoinLink,
-} from '@atproto/api'
 import {useMutation, useQueryClient} from '@tanstack/react-query'
 
 import {logger} from '#/logger'
 import {invalidateJoinLinkPreviewsForCode} from '#/state/queries/join-links'
 import {useChatClient} from '#/state/session'
 import {chat} from '#/lexicons'
+import * as bsky from '#/types/bsky'
 import {
   rollbackConvoOptimistic,
   updateConvoOptimistic,
@@ -19,7 +16,7 @@ export function useDisableJoinLink(
     onSuccess,
     onError,
   }: {
-    onSuccess?: (data: ChatBskyGroupDisableJoinLink.OutputSchema) => void
+    onSuccess?: (data: chat.bsky.group.disableJoinLink.$OutputBody) => void
     onError?: (error: Error) => void
   },
 ) {
@@ -34,7 +31,10 @@ export function useDisableJoinLink(
     onMutate: () => {
       if (!convoId) return
       return updateConvoOptimistic(queryClient, convoId, prev => {
-        if (!ChatBskyConvoDefs.isGroupConvo(prev.kind) || !prev.kind.joinLink) {
+        if (
+          !bsky.isType(chat.bsky.convo.defs.groupConvo, prev.kind) ||
+          !prev.kind.joinLink
+        ) {
           return undefined
         }
         return {
@@ -49,7 +49,8 @@ export function useDisableJoinLink(
     onSuccess: data => {
       if (convoId) {
         updateConvoOptimistic(queryClient, convoId, prev => {
-          if (!ChatBskyConvoDefs.isGroupConvo(prev.kind)) return undefined
+          if (!bsky.isType(chat.bsky.convo.defs.groupConvo, prev.kind))
+            return undefined
           return {
             ...prev,
             kind: {...prev.kind, joinLink: data.joinLink},
diff --git a/src/state/queries/messages/edit-group-chat-name.ts b/src/state/queries/messages/edit-group-chat-name.ts
index ecc73fd3d3..88c950c7ee 100644
--- a/src/state/queries/messages/edit-group-chat-name.ts
+++ b/src/state/queries/messages/edit-group-chat-name.ts
@@ -1,9 +1,9 @@
-import {ChatBskyConvoDefs, type ChatBskyGroupEditGroup} from '@atproto/api'
 import {useMutation, useQueryClient} from '@tanstack/react-query'
 
 import {logger} from '#/logger'
 import {useChatClient} from '#/state/session'
 import {chat} from '#/lexicons'
+import * as bsky from '#/types/bsky'
 import {
   rollbackConvoOptimistic,
   updateConvoOptimistic,
@@ -15,7 +15,7 @@ export function useEditGroupChatName(
     onSuccess,
     onError,
   }: {
-    onSuccess?: (data: ChatBskyGroupEditGroup.OutputSchema) => void
+    onSuccess?: (data: chat.bsky.group.editGroup.$OutputBody) => void
     onError?: (error: Error) => void
   },
 ) {
@@ -33,7 +33,8 @@ export function useEditGroupChatName(
     onMutate: ({name: groupName}) => {
       if (!convoId) return
       return updateConvoOptimistic(queryClient, convoId, prev => {
-        if (!ChatBskyConvoDefs.isGroupConvo(prev.kind)) return undefined
+        if (!bsky.isType(chat.bsky.convo.defs.groupConvo, prev.kind))
+          return undefined
         return {
           ...prev,
           kind: {...prev.kind, name: groupName},
diff --git a/src/state/queries/messages/edit-join-link.ts b/src/state/queries/messages/edit-join-link.ts
index 7870c1f7e3..f921b3062b 100644
--- a/src/state/queries/messages/edit-join-link.ts
+++ b/src/state/queries/messages/edit-join-link.ts
@@ -1,13 +1,9 @@
-import {
-  ChatBskyConvoDefs,
-  type ChatBskyGroupDefs,
-  type ChatBskyGroupEditJoinLink,
-} from '@atproto/api'
 import {useMutation, useQueryClient} from '@tanstack/react-query'
 
 import {logger} from '#/logger'
 import {useChatClient} from '#/state/session'
 import {chat} from '#/lexicons'
+import * as bsky from '#/types/bsky'
 import {
   rollbackConvoOptimistic,
   updateConvoOptimistic,
@@ -19,7 +15,7 @@ export function useEditJoinLink(
     onSuccess,
     onError,
   }: {
-    onSuccess?: (data: ChatBskyGroupEditJoinLink.OutputSchema) => void
+    onSuccess?: (data: chat.bsky.group.editJoinLink.$OutputBody) => void
     onError?: (error: Error) => void
   },
 ) {
@@ -31,7 +27,7 @@ export function useEditJoinLink(
       joinRule,
       requireApproval,
     }: {
-      joinRule: ChatBskyGroupDefs.JoinRule
+      joinRule: chat.bsky.group.defs.JoinRule
       requireApproval: boolean
     }) => {
       if (!convoId) throw new Error('No convoId provided')
@@ -44,7 +40,10 @@ export function useEditJoinLink(
     onMutate: ({joinRule, requireApproval}) => {
       if (!convoId) return
       return updateConvoOptimistic(queryClient, convoId, prev => {
-        if (!ChatBskyConvoDefs.isGroupConvo(prev.kind) || !prev.kind.joinLink) {
+        if (
+          !bsky.isType(chat.bsky.convo.defs.groupConvo, prev.kind) ||
+          !prev.kind.joinLink
+        ) {
           return undefined
         }
         return {
@@ -59,7 +58,8 @@ export function useEditJoinLink(
     onSuccess: data => {
       if (convoId) {
         updateConvoOptimistic(queryClient, convoId, prev => {
-          if (!ChatBskyConvoDefs.isGroupConvo(prev.kind)) return undefined
+          if (!bsky.isType(chat.bsky.convo.defs.groupConvo, prev.kind))
+            return undefined
           return {
             ...prev,
             kind: {...prev.kind, joinLink: data.joinLink},
diff --git a/src/state/queries/messages/enable-join-link.ts b/src/state/queries/messages/enable-join-link.ts
index ef3b168068..d426adf5d7 100644
--- a/src/state/queries/messages/enable-join-link.ts
+++ b/src/state/queries/messages/enable-join-link.ts
@@ -1,10 +1,10 @@
-import {ChatBskyConvoDefs, type ChatBskyGroupEnableJoinLink} from '@atproto/api'
 import {useMutation, useQueryClient} from '@tanstack/react-query'
 
 import {logger} from '#/logger'
 import {invalidateJoinLinkPreviewsForCode} from '#/state/queries/join-links'
 import {useChatClient} from '#/state/session'
 import {chat} from '#/lexicons'
+import * as bsky from '#/types/bsky'
 import {
   rollbackConvoOptimistic,
   updateConvoOptimistic,
@@ -16,7 +16,7 @@ export function useEnableJoinLink(
     onSuccess,
     onError,
   }: {
-    onSuccess?: (data: ChatBskyGroupEnableJoinLink.OutputSchema) => void
+    onSuccess?: (data: chat.bsky.group.enableJoinLink.$OutputBody) => void
     onError?: (error: Error) => void
   },
 ) {
@@ -31,7 +31,10 @@ export function useEnableJoinLink(
     onMutate: () => {
       if (!convoId) return
       return updateConvoOptimistic(queryClient, convoId, prev => {
-        if (!ChatBskyConvoDefs.isGroupConvo(prev.kind) || !prev.kind.joinLink) {
+        if (
+          !bsky.isType(chat.bsky.convo.defs.groupConvo, prev.kind) ||
+          !prev.kind.joinLink
+        ) {
           return undefined
         }
         return {
@@ -46,7 +49,8 @@ export function useEnableJoinLink(
     onSuccess: data => {
       if (convoId) {
         updateConvoOptimistic(queryClient, convoId, prev => {
-          if (!ChatBskyConvoDefs.isGroupConvo(prev.kind)) return undefined
+          if (!bsky.isType(chat.bsky.convo.defs.groupConvo, prev.kind))
+            return undefined
           return {
             ...prev,
             kind: {...prev.kind, joinLink: data.joinLink},
diff --git a/src/state/queries/messages/get-convo-for-members.ts b/src/state/queries/messages/get-convo-for-members.ts
index 20f5380126..803fb3e04f 100644
--- a/src/state/queries/messages/get-convo-for-members.ts
+++ b/src/state/queries/messages/get-convo-for-members.ts
@@ -1,4 +1,3 @@
-import {type ChatBskyConvoGetConvoForMembers} from '@atproto/api'
 import {type DidString} from '@atproto/syntax'
 import {useMutation, useQueryClient} from '@tanstack/react-query'
 
@@ -11,7 +10,7 @@ export function useGetConvoForMembers({
   onSuccess,
   onError,
 }: {
-  onSuccess?: (data: ChatBskyConvoGetConvoForMembers.OutputSchema) => void
+  onSuccess?: (data: chat.bsky.convo.getConvoForMembers.$OutputBody) => void
   onError?: (error: Error) => void
 }) {
   const queryClient = useQueryClient()
diff --git a/src/state/queries/messages/join-requests.ts b/src/state/queries/messages/join-requests.ts
index d36ebd60ae..03be537426 100644
--- a/src/state/queries/messages/join-requests.ts
+++ b/src/state/queries/messages/join-requests.ts
@@ -1,9 +1,3 @@
-import {
-  type ChatBskyActorDefs,
-  type ChatBskyGroupApproveJoinRequest,
-  type ChatBskyGroupListJoinRequests,
-  type ChatBskyGroupRejectJoinRequest,
-} from '@atproto/api'
 import {type DidString} from '@atproto/syntax'
 import {
   type InfiniteData,
@@ -20,8 +14,8 @@ import {createListJoinRequestsQueryKey} from './list-join-requests'
 type JoinRequestAction = 'approve' | 'reject'
 
 type JoinRequestOutput<A extends JoinRequestAction> = A extends 'approve'
-  ? ChatBskyGroupApproveJoinRequest.OutputSchema
-  : ChatBskyGroupRejectJoinRequest.OutputSchema
+  ? chat.bsky.group.approveJoinRequest.$OutputBody
+  : chat.bsky.group.rejectJoinRequest.$OutputBody
 
 export function useJoinRequestMutation<A extends JoinRequestAction>(
   action: A,
@@ -65,7 +59,7 @@ export function useJoinRequestMutation<A extends JoinRequestAction>(
       const requestsKey = createListJoinRequestsQueryKey({convoId})
       const prevRequests =
         queryClient.getQueryData<
-          InfiniteData<ChatBskyGroupListJoinRequests.OutputSchema>
+          InfiniteData<chat.bsky.group.listJoinRequests.$OutputBody>
         >(requestsKey)
 
       const requestedByProfile = prevRequests?.pages
@@ -73,7 +67,7 @@ export function useJoinRequestMutation<A extends JoinRequestAction>(
         .find(request => request.requestedBy.did === member)?.requestedBy
 
       queryClient.setQueryData<
-        InfiniteData<ChatBskyGroupListJoinRequests.OutputSchema>
+        InfiniteData<chat.bsky.group.listJoinRequests.$OutputBody>
       >(requestsKey, prev => {
         if (!prev?.pages) return prev
         return {
@@ -87,14 +81,14 @@ export function useJoinRequestMutation<A extends JoinRequestAction>(
         }
       })
 
-      let prevMembers: ChatBskyActorDefs.ProfileViewBasic[] | undefined
+      let prevMembers: chat.bsky.actor.defs.ProfileViewBasic[] | undefined
       if (action === 'approve' && requestedByProfile) {
         const membersKey = listConvoMembersQueryKey(convoId)
         prevMembers =
-          queryClient.getQueryData<ChatBskyActorDefs.ProfileViewBasic[]>(
+          queryClient.getQueryData<chat.bsky.actor.defs.ProfileViewBasic[]>(
             membersKey,
           )
-        queryClient.setQueryData<ChatBskyActorDefs.ProfileViewBasic[]>(
+        queryClient.setQueryData<chat.bsky.actor.defs.ProfileViewBasic[]>(
           membersKey,
           prev => {
             if (!prev) return prev
diff --git a/src/state/queries/messages/leave-conversation.ts b/src/state/queries/messages/leave-conversation.ts
index 72379d8b30..a0c5f2118d 100644
--- a/src/state/queries/messages/leave-conversation.ts
+++ b/src/state/queries/messages/leave-conversation.ts
@@ -1,7 +1,3 @@
-import {
-  type ChatBskyConvoLeaveConvo,
-  type ChatBskyConvoListConvos,
-} from '@atproto/api'
 import {useMutation, useQueryClient} from '@tanstack/react-query'
 
 import {logger} from '#/logger'
@@ -22,7 +18,7 @@ export function RQKEY(convoId: string | undefined) {
 
 type ConvoListQueryData = {
   pageParams: Array<string | undefined>
-  pages: Array<ChatBskyConvoListConvos.OutputSchema>
+  pages: Array<chat.bsky.convo.listConvos.$OutputBody>
 }
 
 export function useLeaveConvo(
@@ -33,7 +29,7 @@ export function useLeaveConvo(
     onError,
   }: {
     onMutate?: () => void
-    onSuccess?: (data: ChatBskyConvoLeaveConvo.OutputSchema) => void
+    onSuccess?: (data: chat.bsky.convo.leaveConvo.$OutputBody) => void
     onError?: (error: Error) => void
   },
 ) {
diff --git a/src/state/queries/messages/list-conversation-requests.tsx b/src/state/queries/messages/list-conversation-requests.tsx
index 38ae8e6c3d..4c8d5d5caa 100644
--- a/src/state/queries/messages/list-conversation-requests.tsx
+++ b/src/state/queries/messages/list-conversation-requests.tsx
@@ -1,8 +1,3 @@
-import {
-  ChatBskyConvoDefs,
-  type ChatBskyConvoListConvoRequests,
-  ChatBskyGroupDefs,
-} from '@atproto/api'
 import {
   type InfiniteData,
   type QueryClient,
@@ -11,6 +6,7 @@ import {
 
 import {useChatClient} from '#/state/session'
 import {chat} from '#/lexicons'
+import * as bsky from '#/types/bsky'
 
 const DEFAULT_LIMIT = 10
 
@@ -44,16 +40,18 @@ export function useListConvoRequests({
 
 export type ConvoRequestListQueryData = {
   pageParams: Array<string | undefined>
-  pages: Array<ChatBskyConvoListConvoRequests.OutputSchema>
+  pages: Array<chat.bsky.convo.listConvoRequests.$OutputBody>
 }
 
 export type ConvoRequestItem =
-  ChatBskyConvoListConvoRequests.OutputSchema['requests'][number]
+  chat.bsky.convo.listConvoRequests.$OutputBody['requests'][number]
 
 export function optimisticUpdate(
   chatId: string,
   old: ConvoRequestListQueryData | undefined,
-  updateFn: (convo: ChatBskyConvoDefs.ConvoView) => ChatBskyConvoDefs.ConvoView,
+  updateFn: (
+    convo: chat.bsky.convo.defs.ConvoView,
+  ) => chat.bsky.convo.defs.ConvoView,
 ): ConvoRequestListQueryData | undefined {
   if (!old) return old
 
@@ -62,7 +60,10 @@ export function optimisticUpdate(
     pages: old.pages.map(page => ({
       ...page,
       requests: page.requests.map((item): ConvoRequestItem => {
-        if (ChatBskyConvoDefs.isConvoView(item) && item.id === chatId) {
+        if (
+          bsky.isType(chat.bsky.convo.defs.convoView, item) &&
+          item.id === chatId
+        ) {
           return {
             ...updateFn(item),
             $type: 'chat.bsky.convo.defs#convoView',
@@ -85,7 +86,9 @@ export function optimisticDelete(
     pages: old.pages.map(page => ({
       ...page,
       requests: page.requests.filter(
-        item => !ChatBskyConvoDefs.isConvoView(item) || item.id !== chatId,
+        item =>
+          !bsky.isType(chat.bsky.convo.defs.convoView, item) ||
+          item.id !== chatId,
       ),
     })),
   }
@@ -101,7 +104,7 @@ export function markAllRead(
     pages: old.pages.map(page => ({
       ...page,
       requests: page.requests.map((item): ConvoRequestItem => {
-        if (ChatBskyConvoDefs.isConvoView(item)) {
+        if (bsky.isType(chat.bsky.convo.defs.convoView, item)) {
           return {
             ...item,
             $type: 'chat.bsky.convo.defs#convoView',
@@ -126,7 +129,7 @@ export function optimisticDeleteJoinRequest(
       ...page,
       requests: page.requests.filter(
         item =>
-          !ChatBskyGroupDefs.isJoinRequestConvoView(item) ||
+          !bsky.isType(chat.bsky.group.defs.joinRequestConvoView, item) ||
           item.convoId !== convoId,
       ),
     })),
@@ -138,7 +141,7 @@ export function* findAllProfilesInQueryData(
   did: string,
 ) {
   const queryDatas = queryClient.getQueriesData<
-    InfiniteData<ChatBskyConvoListConvoRequests.OutputSchema>
+    InfiniteData<chat.bsky.convo.listConvoRequests.$OutputBody>
   >({
     queryKey: [RQKEY_ROOT],
   })
@@ -147,13 +150,15 @@ export function* findAllProfilesInQueryData(
 
     for (const page of queryData.pages) {
       for (const item of page.requests) {
-        if (ChatBskyConvoDefs.isConvoView(item)) {
+        if (bsky.isType(chat.bsky.convo.defs.convoView, item)) {
           for (const member of item.members) {
             if (member.did === did) {
               yield member
             }
           }
-        } else if (ChatBskyGroupDefs.isJoinRequestConvoView(item)) {
+        } else if (
+          bsky.isType(chat.bsky.group.defs.joinRequestConvoView, item)
+        ) {
           if (item.owner.did === did) {
             yield item.owner
           }
diff --git a/src/state/queries/messages/list-conversations.tsx b/src/state/queries/messages/list-conversations.tsx
index 6d81a96ecc..82e9a37c09 100644
--- a/src/state/queries/messages/list-conversations.tsx
+++ b/src/state/queries/messages/list-conversations.tsx
@@ -1,9 +1,4 @@
 import {useCallback, useEffect, useMemo} from 'react'
-import {
-  type ChatBskyActorDefs,
-  ChatBskyConvoDefs,
-  type ChatBskyConvoListConvos,
-} from '@atproto/api'
 import {
   type InfiniteData,
   type Query,
@@ -68,7 +63,7 @@ export const RQKEY_PARTIAL = (
  * filters client-side or convos leak into lists that should exclude them.
  */
 export function convoMatchesQueryKey(
-  convo: ChatBskyConvoDefs.ConvoView,
+  convo: chat.bsky.convo.defs.ConvoView,
   queryKey: QueryKey,
 ): boolean {
   const [, status, readState, kind, lockStatus] = queryKey as ReturnType<
@@ -76,7 +71,7 @@ export function convoMatchesQueryKey(
   >
   if (status !== 'all' && status !== convo.status) return false
   if (readState === 'unread' && convo.unreadCount === 0) return false
-  if (ChatBskyConvoDefs.isGroupConvo(convo.kind)) {
+  if (bsky.isType(chat.bsky.convo.defs.groupConvo, convo.kind)) {
     if (kind === 'direct') return false
     if (lockStatus && convo.kind.lockStatus !== lockStatus) return false
   } else {
@@ -94,7 +89,7 @@ export function convoMatchesQueryKey(
  * longer matches (e.g. unreadCount dropped to 0), mirroring how read/mute
  * log events update convos in place everywhere.
  */
-export function convoListQueryPredicate(convo: ChatBskyConvoDefs.ConvoView) {
+export function convoListQueryPredicate(convo: chat.bsky.convo.defs.ConvoView) {
   return (query: Query): boolean => {
     const data = query.state.data as ConvoListQueryData | undefined
     if (data && getConvoFromQueryData(convo.id, data)) return true
@@ -196,10 +191,10 @@ export function ListConvosProviderInner({
         function mutateMembers(
           convoId: string,
           fn: (
-            members: ChatBskyActorDefs.ProfileViewBasic[],
-          ) => ChatBskyActorDefs.ProfileViewBasic[],
+            members: chat.bsky.actor.defs.ProfileViewBasic[],
+          ) => chat.bsky.actor.defs.ProfileViewBasic[],
         ) {
-          queryClient.setQueryData<ChatBskyActorDefs.ProfileViewBasic[]>(
+          queryClient.setQueryData<chat.bsky.actor.defs.ProfileViewBasic[]>(
             listConvoMembersQueryKey(convoId),
             old => {
               if (!old) return // query doesn't exist yet, skip
@@ -211,8 +206,8 @@ export function ListConvosProviderInner({
         function updateConvoInAllLists(
           convoId: string,
           fn: (
-            convo: ChatBskyConvoDefs.ConvoView,
-          ) => ChatBskyConvoDefs.ConvoView,
+            convo: chat.bsky.convo.defs.ConvoView,
+          ) => chat.bsky.convo.defs.ConvoView,
         ) {
           queryClient.setQueriesData<ConvoListQueryData>(
             {queryKey: [RQKEY_ROOT]},
@@ -227,10 +222,10 @@ export function ListConvosProviderInner({
         function mutateConvoView(
           convoId: string,
           fn: (
-            convo: ChatBskyConvoDefs.ConvoView,
-          ) => ChatBskyConvoDefs.ConvoView,
+            convo: chat.bsky.convo.defs.ConvoView,
+          ) => chat.bsky.convo.defs.ConvoView,
         ) {
-          queryClient.setQueryData<ChatBskyConvoDefs.ConvoView>(
+          queryClient.setQueryData<chat.bsky.convo.defs.ConvoView>(
             CONVO_KEY(convoId),
             old => (old ? fn(old) : old),
           )
@@ -251,7 +246,7 @@ export function ListConvosProviderInner({
         function handleMemberAdded(
           convoId: string,
           did: string,
-          relatedProfiles: ChatBskyActorDefs.ProfileViewBasic[],
+          relatedProfiles: chat.bsky.actor.defs.ProfileViewBasic[],
           rev: string,
         ) {
           const newMember = relatedProfiles.find(r => r.did === did)
@@ -261,7 +256,7 @@ export function ListConvosProviderInner({
           const alreadyKnownMember =
             queryClient
               .getQueryData<
-                ChatBskyActorDefs.ProfileViewBasic[]
+                chat.bsky.actor.defs.ProfileViewBasic[]
               >(listConvoMembersQueryKey(convoId))
               ?.some(m => m.did === did) ?? false
           mutateMembers(convoId, list =>
@@ -285,7 +280,7 @@ export function ListConvosProviderInner({
           const alreadyRemovedMember =
             queryClient
               .getQueryData<
-                ChatBskyActorDefs.ProfileViewBasic[]
+                chat.bsky.actor.defs.ProfileViewBasic[]
               >(listConvoMembersQueryKey(convoId))
               ?.some(m => m.did === did) === false
           mutateMembers(convoId, list => list.filter(m => m.did !== did))
@@ -298,24 +293,36 @@ export function ListConvosProviderInner({
         }
 
         for (const log of events.logs) {
-          if (ChatBskyConvoDefs.isLogBeginConvo(log)) {
+          if (bsky.isType(chat.bsky.convo.defs.logBeginConvo, log)) {
             debouncedRefetch()
-          } else if (ChatBskyConvoDefs.isLogLeaveConvo(log)) {
+          } else if (bsky.isType(chat.bsky.convo.defs.logLeaveConvo, log)) {
             deleteConvoFromAllLists(log.convoId)
             // The viewer is no longer in this convo (they left on another
             // device, or were removed - removed members receive a
             // logLeaveConvo, not a logRemoveMember). Refetch any cached join
             // link preview so its viewer state reflects the lost membership.
             void invalidateJoinLinkPreviewsForConvo(queryClient, log.convoId)
-          } else if (ChatBskyConvoDefs.isLogDeleteMessage(log)) {
+          } else if (bsky.isType(chat.bsky.convo.defs.logDeleteMessage, log)) {
             updateConvoInAllLists(
               log.convoId,
               withRevGuard(log.rev, convo => {
                 if (
-                  (ChatBskyConvoDefs.isDeletedMessageView(log.message) ||
-                    ChatBskyConvoDefs.isMessageView(log.message)) &&
-                  (ChatBskyConvoDefs.isDeletedMessageView(convo.lastMessage) ||
-                    ChatBskyConvoDefs.isMessageView(convo.lastMessage))
+                  (bsky.isType(
+                    chat.bsky.convo.defs.deletedMessageView,
+                    log.message,
+                  ) ||
+                    bsky.isType(
+                      chat.bsky.convo.defs.messageView,
+                      log.message,
+                    )) &&
+                  (bsky.isType(
+                    chat.bsky.convo.defs.deletedMessageView,
+                    convo.lastMessage,
+                  ) ||
+                    bsky.isType(
+                      chat.bsky.convo.defs.messageView,
+                      convo.lastMessage,
+                    ))
                 ) {
                   return log.message.id === convo.lastMessage.id
                     ? {
@@ -329,9 +336,9 @@ export function ListConvosProviderInner({
                 }
               }),
             )
-          } else if (ChatBskyConvoDefs.isLogCreateMessage(log)) {
+          } else if (bsky.isType(chat.bsky.convo.defs.logCreateMessage, log)) {
             // Store in a new var to avoid TS errors due to closures.
-            const logRef: ChatBskyConvoDefs.LogCreateMessage = log
+            const logRef: chat.bsky.convo.defs.LogCreateMessage = log
 
             // Get all matching queries
             const queries = queryClient.getQueriesData<ConvoListQueryData>({
@@ -339,7 +346,7 @@ export function ListConvosProviderInner({
             })
 
             // Check if convo exists in any query
-            let foundConvo: ChatBskyConvoDefs.ConvoView | null = null
+            let foundConvo: chat.bsky.convo.defs.ConvoView | null = null
             for (const [_key, query] of queries) {
               if (!query) continue
               const convo = getConvoFromQueryData(logRef.convoId, query)
@@ -382,15 +389,23 @@ export function ListConvosProviderInner({
               lastMessage: logRef.message,
               unreadCount:
                 foundConvo.id !== currentConvoId
-                  ? (ChatBskyConvoDefs.isMessageView(logRef.message) ||
-                      ChatBskyConvoDefs.isDeletedMessageView(logRef.message)) &&
+                  ? (bsky.isType(
+                      chat.bsky.convo.defs.messageView,
+                      logRef.message,
+                    ) ||
+                      bsky.isType(
+                        chat.bsky.convo.defs.deletedMessageView,
+                        logRef.message,
+                      )) &&
                     logRef.message.sender.did !== currentAccount?.did
                     ? foundConvo.unreadCount + 1
                     : foundConvo.unreadCount
                   : 0,
             }
 
-            function filterConvoFromPage(convo: ChatBskyConvoDefs.ConvoView[]) {
+            function filterConvoFromPage(
+              convo: chat.bsky.convo.defs.ConvoView[],
+            ) {
               return convo.filter(c => c.id !== logRef.convoId)
             }
 
@@ -453,7 +468,7 @@ export function ListConvosProviderInner({
                 old => moveConvoToTopInRequests(updatedConvo, old),
               )
             }
-          } else if (ChatBskyConvoDefs.isLogReadMessage(log)) {
+          } else if (bsky.isType(chat.bsky.convo.defs.logReadMessage, log)) {
             updateConvoInAllLists(
               log.convoId,
               withRevGuard(log.rev, convo => ({
@@ -462,7 +477,7 @@ export function ListConvosProviderInner({
                 rev: log.rev,
               })),
             )
-          } else if (ChatBskyConvoDefs.isLogReadConvo(log)) {
+          } else if (bsky.isType(chat.bsky.convo.defs.logReadConvo, log)) {
             updateConvoInAllLists(
               log.convoId,
               withRevGuard(log.rev, convo => ({
@@ -471,12 +486,12 @@ export function ListConvosProviderInner({
                 rev: log.rev,
               })),
             )
-          } else if (ChatBskyConvoDefs.isLogAcceptConvo(log)) {
+          } else if (bsky.isType(chat.bsky.convo.defs.logAcceptConvo, log)) {
             const requestQueries =
               queryClient.getQueriesData<ConvoListQueryData>({
                 queryKey: RQKEY_PARTIAL('request'),
               })
-            let foundConvo: ChatBskyConvoDefs.ConvoView | null = null
+            let foundConvo: chat.bsky.convo.defs.ConvoView | null = null
             for (const [_key, data] of requestQueries) {
               if (!data) continue
               foundConvo = getConvoFromQueryData(log.convoId, data)
@@ -492,7 +507,7 @@ export function ListConvosProviderInner({
             if (log.rev <= foundConvo.rev) {
               continue
             }
-            const acceptedConvo: ChatBskyConvoDefs.ConvoView = {
+            const acceptedConvo: chat.bsky.convo.defs.ConvoView = {
               ...foundConvo,
               status: 'accepted',
               rev: log.rev,
@@ -553,7 +568,7 @@ export function ListConvosProviderInner({
                 }
               },
             )
-          } else if (ChatBskyConvoDefs.isLogMuteConvo(log)) {
+          } else if (bsky.isType(chat.bsky.convo.defs.logMuteConvo, log)) {
             mutateConvoView(
               log.convoId,
               withRevGuard(log.rev, convo => ({
@@ -562,7 +577,7 @@ export function ListConvosProviderInner({
                 rev: log.rev,
               })),
             )
-          } else if (ChatBskyConvoDefs.isLogUnmuteConvo(log)) {
+          } else if (bsky.isType(chat.bsky.convo.defs.logUnmuteConvo, log)) {
             mutateConvoView(
               log.convoId,
               withRevGuard(log.rev, convo => ({
@@ -571,11 +586,11 @@ export function ListConvosProviderInner({
                 rev: log.rev,
               })),
             )
-          } else if (ChatBskyConvoDefs.isLogLockConvo(log)) {
+          } else if (bsky.isType(chat.bsky.convo.defs.logLockConvo, log)) {
             mutateConvoView(
               log.convoId,
               withRevGuard(log.rev, convo => {
-                if (ChatBskyConvoDefs.isGroupConvo(convo.kind)) {
+                if (bsky.isType(chat.bsky.convo.defs.groupConvo, convo.kind)) {
                   return {
                     ...convo,
                     kind: {...convo.kind, lockStatus: 'locked'},
@@ -590,11 +605,11 @@ export function ListConvosProviderInner({
             void queryClient.invalidateQueries({
               queryKey: CONVO_KEY(log.convoId),
             })
-          } else if (ChatBskyConvoDefs.isLogUnlockConvo(log)) {
+          } else if (bsky.isType(chat.bsky.convo.defs.logUnlockConvo, log)) {
             mutateConvoView(
               log.convoId,
               withRevGuard(log.rev, convo => {
-                if (ChatBskyConvoDefs.isGroupConvo(convo.kind)) {
+                if (bsky.isType(chat.bsky.convo.defs.groupConvo, convo.kind)) {
                   return {
                     ...convo,
                     kind: {
@@ -609,11 +624,13 @@ export function ListConvosProviderInner({
                 return {...convo, rev: log.rev}
               }),
             )
-          } else if (ChatBskyConvoDefs.isLogLockConvoPermanently(log)) {
+          } else if (
+            bsky.isType(chat.bsky.convo.defs.logLockConvoPermanently, log)
+          ) {
             mutateConvoView(
               log.convoId,
               withRevGuard(log.rev, convo => {
-                if (ChatBskyConvoDefs.isGroupConvo(convo.kind)) {
+                if (bsky.isType(chat.bsky.convo.defs.groupConvo, convo.kind)) {
                   return {
                     ...convo,
                     kind: {...convo.kind, lockStatus: 'locked-permanently'},
@@ -624,20 +641,20 @@ export function ListConvosProviderInner({
               }),
             )
           } else if (
-            ChatBskyConvoDefs.isLogCreateJoinLink(log) ||
-            ChatBskyConvoDefs.isLogEditJoinLink(log) ||
-            ChatBskyConvoDefs.isLogEnableJoinLink(log) ||
-            ChatBskyConvoDefs.isLogDisableJoinLink(log)
+            bsky.isType(chat.bsky.convo.defs.logCreateJoinLink, log) ||
+            bsky.isType(chat.bsky.convo.defs.logEditJoinLink, log) ||
+            bsky.isType(chat.bsky.convo.defs.logEnableJoinLink, log) ||
+            bsky.isType(chat.bsky.convo.defs.logDisableJoinLink, log)
           ) {
             // Join link data not included in the log event, trigger refetch to get it
             debouncedRefetch()
-          } else if (ChatBskyConvoDefs.isLogEditGroup(log)) {
+          } else if (bsky.isType(chat.bsky.convo.defs.logEditGroup, log)) {
             // Updated group details (name etc.) aren't included in the log
             // event, so refetch to pick them up.
             debouncedRefetch()
           } else if (
-            ChatBskyConvoDefs.isLogApproveJoinRequest(log) ||
-            ChatBskyConvoDefs.isLogRejectJoinRequest(log)
+            bsky.isType(chat.bsky.convo.defs.logApproveJoinRequest, log) ||
+            bsky.isType(chat.bsky.convo.defs.logRejectJoinRequest, log)
           ) {
             // Route through mutateConvoView (not updateConvoInAllLists) so the
             // single-convo cache updates too, keeping the in-convo requests
@@ -648,7 +665,9 @@ export function ListConvosProviderInner({
                 applyJoinRequestCountDelta(convo, log.rev, -1),
               ),
             )
-          } else if (ChatBskyConvoDefs.isLogIncomingJoinRequest(log)) {
+          } else if (
+            bsky.isType(chat.bsky.convo.defs.logIncomingJoinRequest, log)
+          ) {
             // Route through mutateConvoView (not updateConvoInAllLists) so the
             // single-convo cache updates too, letting the in-convo requests
             // banner appear live.
@@ -658,14 +677,16 @@ export function ListConvosProviderInner({
                 applyJoinRequestCountDelta(convo, log.rev, 1),
               ),
             )
-          } else if (ChatBskyConvoDefs.isLogReadJoinRequests(log)) {
+          } else if (
+            bsky.isType(chat.bsky.convo.defs.logReadJoinRequests, log)
+          ) {
             // The owner marked join requests as read (possibly on another
             // device). Zero the unread count but keep the total, mirroring the
             // useMarkJoinRequestsRead mutation.
             mutateConvoView(
               log.convoId,
               withRevGuard(log.rev, convo => {
-                if (!ChatBskyConvoDefs.isGroupConvo(convo.kind)) {
+                if (!bsky.isType(chat.bsky.convo.defs.groupConvo, convo.kind)) {
                   return {...convo, rev: log.rev}
                 }
                 return {
@@ -675,11 +696,18 @@ export function ListConvosProviderInner({
                 }
               }),
             )
-          } else if (ChatBskyConvoDefs.isLogOutgoingJoinRequest(log)) {
+          } else if (
+            bsky.isType(chat.bsky.convo.defs.logOutgoingJoinRequest, log)
+          ) {
             // Viewer isn't in the chat yet, but the inbox surfaces outgoing
             // requests, so refetch to pick up the new entry.
             debouncedRefetch()
-          } else if (ChatBskyConvoDefs.isLogWithdrawIncomingJoinRequest(log)) {
+          } else if (
+            bsky.isType(
+              chat.bsky.convo.defs.logWithdrawIncomingJoinRequest,
+              log,
+            )
+          ) {
             // A requester rescinded their request to a group the viewer owns.
             // Mirror of isLogIncomingJoinRequest: decrement the counts.
             mutateConvoView(
@@ -688,14 +716,19 @@ export function ListConvosProviderInner({
                 applyJoinRequestCountDelta(convo, log.rev, -1),
               ),
             )
-          } else if (ChatBskyConvoDefs.isLogWithdrawOutgoingJoinRequest(log)) {
+          } else if (
+            bsky.isType(
+              chat.bsky.convo.defs.logWithdrawOutgoingJoinRequest,
+              log,
+            )
+          ) {
             // The viewer rescinded their own outgoing join request (possibly on
             // another device). Remove it from the requests inbox cache.
             queryClient.setQueriesData<ConvoRequestListQueryData>(
               {queryKey: [REQUESTS_RQKEY_ROOT]},
               old => optimisticDeleteJoinRequest(log.convoId, old),
             )
-          } else if (ChatBskyConvoDefs.isLogAddReaction(log)) {
+          } else if (bsky.isType(chat.bsky.convo.defs.logAddReaction, log)) {
             updateConvoInAllLists(
               log.convoId,
               withRevGuard(log.rev, convo => {
@@ -709,22 +742,26 @@ export function ListConvosProviderInner({
                 return {
                   ...convo,
                   members: [...convo.members, ...relatedProfilesSansMembers],
+                  /*
+                   * `logAddReaction.message` is the wider message union (it can
+                   * carry a deleted message too), while the reaction view's
+                   * `message` slot is only the live `messageView` - the server
+                   * never pairs a reaction with a deleted message, so the arm is
+                   * asserted rather than re-narrowed.
+                   */
                   lastReaction: {
                     $type: 'chat.bsky.convo.defs#messageAndReactionView',
                     reaction: log.reaction,
                     message: log.message,
-                  },
+                  } as chat.bsky.convo.defs.ConvoView['lastReaction'],
                   rev: log.rev,
                 }
               }),
             )
-          } else if (ChatBskyConvoDefs.isLogAddMember(log)) {
+          } else if (bsky.isType(chat.bsky.convo.defs.logAddMember, log)) {
             const data = log.message.data
             if (
-              bsky.dangerousIsType<ChatBskyConvoDefs.SystemMessageDataAddMember>(
-                data,
-                ChatBskyConvoDefs.isSystemMessageDataAddMember,
-              )
+              bsky.isType(chat.bsky.convo.defs.systemMessageDataAddMember, data)
             ) {
               handleMemberAdded(
                 log.convoId,
@@ -738,12 +775,12 @@ export function ListConvosProviderInner({
               queryKey: CONVO_KEY(log.convoId),
             })
             debouncedRefetch()
-          } else if (ChatBskyConvoDefs.isLogRemoveMember(log)) {
+          } else if (bsky.isType(chat.bsky.convo.defs.logRemoveMember, log)) {
             const data = log.message.data
             if (
-              bsky.dangerousIsType<ChatBskyConvoDefs.SystemMessageDataRemoveMember>(
+              bsky.isType(
+                chat.bsky.convo.defs.systemMessageDataRemoveMember,
                 data,
-                ChatBskyConvoDefs.isSystemMessageDataRemoveMember,
               )
             ) {
               handleMemberRemoved(log.convoId, data.member.did, log.rev)
@@ -753,12 +790,12 @@ export function ListConvosProviderInner({
               queryKey: CONVO_KEY(log.convoId),
             })
             debouncedRefetch()
-          } else if (ChatBskyConvoDefs.isLogMemberJoin(log)) {
+          } else if (bsky.isType(chat.bsky.convo.defs.logMemberJoin, log)) {
             const data = log.message.data
             if (
-              bsky.dangerousIsType<ChatBskyConvoDefs.SystemMessageDataMemberJoin>(
+              bsky.isType(
+                chat.bsky.convo.defs.systemMessageDataMemberJoin,
                 data,
-                ChatBskyConvoDefs.isSystemMessageDataMemberJoin,
               )
             ) {
               handleMemberAdded(
@@ -772,12 +809,12 @@ export function ListConvosProviderInner({
               queryKey: CONVO_KEY(log.convoId),
             })
             debouncedRefetch()
-          } else if (ChatBskyConvoDefs.isLogMemberLeave(log)) {
+          } else if (bsky.isType(chat.bsky.convo.defs.logMemberLeave, log)) {
             const data = log.message.data
             if (
-              bsky.dangerousIsType<ChatBskyConvoDefs.SystemMessageDataMemberLeave>(
+              bsky.isType(
+                chat.bsky.convo.defs.systemMessageDataMemberLeave,
                 data,
-                ChatBskyConvoDefs.isSystemMessageDataMemberLeave,
               )
             ) {
               handleMemberRemoved(log.convoId, data.member.did, log.rev)
@@ -786,7 +823,7 @@ export function ListConvosProviderInner({
               queryKey: CONVO_KEY(log.convoId),
             })
             debouncedRefetch()
-          } else if (ChatBskyConvoDefs.isLogRemoveReaction(log)) {
+          } else if (bsky.isType(chat.bsky.convo.defs.logRemoveReaction, log)) {
             queryClient.setQueriesData(
               {queryKey: [RQKEY_ROOT]},
               (old?: ConvoListQueryData) =>
@@ -797,10 +834,14 @@ export function ListConvosProviderInner({
                     if (
                       // if the convo is the same
                       log.convoId === convo.id &&
-                      ChatBskyConvoDefs.isMessageAndReactionView(
+                      bsky.isType(
+                        chat.bsky.convo.defs.messageAndReactionView,
                         convo.lastReaction,
                       ) &&
-                      ChatBskyConvoDefs.isMessageView(log.message) &&
+                      bsky.isType(
+                        chat.bsky.convo.defs.messageView,
+                        log.message,
+                      ) &&
                       // ...and the message is the same
                       convo.lastReaction.message.id === log.message.id &&
                       // ...and the reaction is the same
@@ -882,7 +923,7 @@ export function useUnreadMessageCount(): {
 
 export type ConvoListQueryData = {
   pageParams: Array<string | undefined>
-  pages: Array<ChatBskyConvoListConvos.OutputSchema>
+  pages: Array<chat.bsky.convo.listConvos.$OutputBody>
 }
 
 export function useOnMarkAsRead() {
@@ -919,8 +960,8 @@ export function useOnMarkAsRead() {
  */
 function withRevGuard(
   rev: string,
-  fn: (convo: ChatBskyConvoDefs.ConvoView) => ChatBskyConvoDefs.ConvoView,
-): (convo: ChatBskyConvoDefs.ConvoView) => ChatBskyConvoDefs.ConvoView {
+  fn: (convo: chat.bsky.convo.defs.ConvoView) => chat.bsky.convo.defs.ConvoView,
+): (convo: chat.bsky.convo.defs.ConvoView) => chat.bsky.convo.defs.ConvoView {
   return convo => (rev <= convo.rev ? convo : fn(convo))
 }
 
@@ -928,8 +969,8 @@ function optimisticUpdate(
   chatId: string,
   old?: ConvoListQueryData,
   updateFn?: (
-    convo: ChatBskyConvoDefs.ConvoView,
-  ) => ChatBskyConvoDefs.ConvoView,
+    convo: chat.bsky.convo.defs.ConvoView,
+  ) => chat.bsky.convo.defs.ConvoView,
 ) {
   if (!old || !updateFn) return old
 
@@ -945,12 +986,12 @@ function optimisticUpdate(
 }
 
 function applyJoinRequestCountDelta(
-  convo: ChatBskyConvoDefs.ConvoView,
+  convo: chat.bsky.convo.defs.ConvoView,
   rev: string,
   delta: 1 | -1,
-): ChatBskyConvoDefs.ConvoView {
+): chat.bsky.convo.defs.ConvoView {
   // Join requests are only meaningful for group convos.
-  if (!ChatBskyConvoDefs.isGroupConvo(convo.kind)) {
+  if (!bsky.isType(chat.bsky.convo.defs.groupConvo, convo.kind)) {
     return {...convo, rev}
   }
   // Bump the total and unread counts together. Both are clamped at 0 and
@@ -971,7 +1012,7 @@ function applyJoinRequestCountDelta(
 }
 
 function moveConvoToTopInRequests(
-  updatedConvo: ChatBskyConvoDefs.ConvoView,
+  updatedConvo: chat.bsky.convo.defs.ConvoView,
   old: ConvoRequestListQueryData | undefined,
 ): ConvoRequestListQueryData | undefined {
   if (!old) return old
@@ -985,7 +1026,8 @@ function moveConvoToTopInRequests(
     pages: old.pages.map((page, i) => {
       const filtered = page.requests.filter(
         item =>
-          !ChatBskyConvoDefs.isConvoView(item) || item.id !== updatedConvo.id,
+          !bsky.isType(chat.bsky.convo.defs.convoView, item) ||
+          item.id !== updatedConvo.id,
       )
       if (i === 0) {
         return {
@@ -999,13 +1041,13 @@ function moveConvoToTopInRequests(
 }
 
 function removeMemberFromConvoView(
-  convo: ChatBskyConvoDefs.ConvoView,
+  convo: chat.bsky.convo.defs.ConvoView,
   did: string,
   rev: string,
   alreadyRemovedMember: boolean,
-): ChatBskyConvoDefs.ConvoView {
+): chat.bsky.convo.defs.ConvoView {
   // Member add/remove/join/leave events are only meaningful for group convos.
-  if (!ChatBskyConvoDefs.isGroupConvo(convo.kind)) return convo
+  if (!bsky.isType(chat.bsky.convo.defs.groupConvo, convo.kind)) return convo
   const nextMembers = convo.members.filter(m => m.did !== did)
   return {
     ...convo,
@@ -1021,13 +1063,13 @@ function removeMemberFromConvoView(
 }
 
 function addMemberToConvoView(
-  convo: ChatBskyConvoDefs.ConvoView,
-  member: ChatBskyActorDefs.ProfileViewBasic,
+  convo: chat.bsky.convo.defs.ConvoView,
+  member: chat.bsky.actor.defs.ProfileViewBasic,
   rev: string,
   alreadyKnownMember: boolean,
-): ChatBskyConvoDefs.ConvoView {
+): chat.bsky.convo.defs.ConvoView {
   // Member add/remove/join/leave events are only meaningful for group convos.
-  if (!ChatBskyConvoDefs.isGroupConvo(convo.kind)) return convo
+  if (!bsky.isType(chat.bsky.convo.defs.groupConvo, convo.kind)) return convo
   const alreadyInCuratedList = convo.members.some(m => m.did === member.did)
   const nextMembers = alreadyInCuratedList
     ? convo.members
@@ -1073,7 +1115,7 @@ export function* findAllProfilesInQueryData(
   did: string,
 ) {
   const queryDatas = queryClient.getQueriesData<
-    InfiniteData<ChatBskyConvoListConvos.OutputSchema>
+    InfiniteData<chat.bsky.convo.listConvos.$OutputBody>
   >({
     queryKey: [RQKEY_ROOT],
   })
diff --git a/src/state/queries/messages/list-convo-members.ts b/src/state/queries/messages/list-convo-members.ts
index 386d82ca82..007650eb00 100644
--- a/src/state/queries/messages/list-convo-members.ts
+++ b/src/state/queries/messages/list-convo-members.ts
@@ -1,4 +1,3 @@
-import {type ChatBskyActorDefs} from '@atproto/api'
 import {type QueryClient, useQuery} from '@tanstack/react-query'
 
 import {STALE} from '#/state/queries'
@@ -18,7 +17,7 @@ export function useListConvoMembersQuery({
   placeholderData,
 }: {
   convoId: string
-  placeholderData?: ChatBskyActorDefs.ProfileViewBasic[]
+  placeholderData?: chat.bsky.actor.defs.ProfileViewBasic[]
 }) {
   const client = useChatClient()
 
@@ -32,7 +31,7 @@ export function useListConvoMembersQuery({
        * `members` with the exported profile type also keeps the hook's result
        * type unchanged for consumers.
        */
-      const members: ChatBskyActorDefs.ProfileViewBasic[] = []
+      const members: chat.bsky.actor.defs.ProfileViewBasic[] = []
       let cursor: string | undefined
 
       do {
@@ -55,9 +54,9 @@ export function useListConvoMembersQuery({
 export function* findAllProfilesInQueryData(
   queryClient: QueryClient,
   did: string,
-): Generator<ChatBskyActorDefs.ProfileViewBasic, void> {
+): Generator<chat.bsky.actor.defs.ProfileViewBasic, void> {
   const queryDatas = queryClient.getQueriesData<
-    ChatBskyActorDefs.ProfileViewBasic[]
+    chat.bsky.actor.defs.ProfileViewBasic[]
   >({
     queryKey: [RQKEY_ROOT],
   })
diff --git a/src/state/queries/messages/list-join-requests.ts b/src/state/queries/messages/list-join-requests.ts
index bbb82eeca5..b722fa06f7 100644
--- a/src/state/queries/messages/list-join-requests.ts
+++ b/src/state/queries/messages/list-join-requests.ts
@@ -1,11 +1,11 @@
 import {useEffect} from 'react'
-import {ChatBskyConvoDefs} from '@atproto/api'
 import {useInfiniteQuery, useQueryClient} from '@tanstack/react-query'
 
 import {useMessagesEventBus} from '#/state/messages/events'
 import {createQueryKey} from '#/state/queries/util'
 import {useChatClient} from '#/state/session'
 import {chat} from '#/lexicons'
+import * as bsky from '#/types/bsky'
 import {STALE} from '..'
 
 export const JOIN_REQUESTS_THRESHOLD = 20
@@ -35,9 +35,9 @@ export function useListJoinRequestsQuery({
         if (event.type !== 'logs') return
         for (const log of event.logs) {
           if (
-            ChatBskyConvoDefs.isLogIncomingJoinRequest(log) ||
-            ChatBskyConvoDefs.isLogApproveJoinRequest(log) ||
-            ChatBskyConvoDefs.isLogRejectJoinRequest(log)
+            bsky.isType(chat.bsky.convo.defs.logIncomingJoinRequest, log) ||
+            bsky.isType(chat.bsky.convo.defs.logApproveJoinRequest, log) ||
+            bsky.isType(chat.bsky.convo.defs.logRejectJoinRequest, log)
           ) {
             void queryClient.invalidateQueries({
               queryKey: createListJoinRequestsQueryKey({convoId}),
diff --git a/src/state/queries/messages/lock-conversation.ts b/src/state/queries/messages/lock-conversation.ts
index 13242d59db..2057317fab 100644
--- a/src/state/queries/messages/lock-conversation.ts
+++ b/src/state/queries/messages/lock-conversation.ts
@@ -1,8 +1,8 @@
-import {ChatBskyConvoDefs, type ChatBskyConvoLockConvo} from '@atproto/api'
 import {useMutation, useQueryClient} from '@tanstack/react-query'
 
 import {useChatClient} from '#/state/session'
 import {chat} from '#/lexicons'
+import * as bsky from '#/types/bsky'
 import {
   rollbackConvoOptimistic,
   updateConvoOptimistic,
@@ -15,7 +15,7 @@ export function useLockConvo(
     onError,
   }: {
     onSuccess?: (
-      data: ChatBskyConvoLockConvo.OutputSchema,
+      data: chat.bsky.convo.lockConvo.$OutputBody,
       variables: {lock: boolean; silent?: boolean},
     ) => void
     onError?: (
@@ -39,7 +39,8 @@ export function useLockConvo(
     onMutate: ({lock}) => {
       if (!convoId) return
       return updateConvoOptimistic(queryClient, convoId, prev => {
-        if (!ChatBskyConvoDefs.isGroupConvo(prev.kind)) return undefined
+        if (!bsky.isType(chat.bsky.convo.defs.groupConvo, prev.kind))
+          return undefined
         return {
           ...prev,
           kind: {
diff --git a/src/state/queries/messages/mark-join-request-read.ts b/src/state/queries/messages/mark-join-request-read.ts
index 3dfd995af0..ecc928074b 100644
--- a/src/state/queries/messages/mark-join-request-read.ts
+++ b/src/state/queries/messages/mark-join-request-read.ts
@@ -1,9 +1,9 @@
-import {ChatBskyConvoDefs} from '@atproto/api'
 import {useMutation, useQueryClient} from '@tanstack/react-query'
 
 import {logger} from '#/logger'
 import {useChatClient} from '#/state/session'
 import {chat} from '#/lexicons'
+import * as bsky from '#/types/bsky'
 import {RQKEY as CONVO_KEY} from './conversation'
 import {
   type ConvoListQueryData,
@@ -22,13 +22,15 @@ export function useMarkJoinRequestsRead(convoId: string | undefined) {
     onMutate: () => {
       if (!convoId) return
 
-      const prevConvo = queryClient.getQueryData<ChatBskyConvoDefs.ConvoView>(
-        CONVO_KEY(convoId),
-      )
-      queryClient.setQueryData<ChatBskyConvoDefs.ConvoView | undefined>(
+      const prevConvo =
+        queryClient.getQueryData<chat.bsky.convo.defs.ConvoView>(
+          CONVO_KEY(convoId),
+        )
+      queryClient.setQueryData<chat.bsky.convo.defs.ConvoView | undefined>(
         CONVO_KEY(convoId),
         old => {
-          if (!old || !ChatBskyConvoDefs.isGroupConvo(old.kind)) return old
+          if (!old || !bsky.isType(chat.bsky.convo.defs.groupConvo, old.kind))
+            return old
           return {
             ...old,
             kind: {...old.kind, unreadJoinRequestCount: 0},
@@ -50,7 +52,7 @@ export function useMarkJoinRequestsRead(convoId: string | undefined) {
               convos: page.convos.map(convo => {
                 if (
                   convo.id !== convoId ||
-                  !ChatBskyConvoDefs.isGroupConvo(convo.kind)
+                  !bsky.isType(chat.bsky.convo.defs.groupConvo, convo.kind)
                 ) {
                   return convo
                 }
diff --git a/src/state/queries/messages/mute-conversation.ts b/src/state/queries/messages/mute-conversation.ts
index 2e9e911b5e..26cfa2e3b0 100644
--- a/src/state/queries/messages/mute-conversation.ts
+++ b/src/state/queries/messages/mute-conversation.ts
@@ -1,4 +1,3 @@
-import {type ChatBskyConvoMuteConvo} from '@atproto/api'
 import {useMutation, useQueryClient} from '@tanstack/react-query'
 
 import {useChatClient} from '#/state/session'
@@ -14,7 +13,7 @@ export function useMuteConvo(
     onSuccess,
     onError,
   }: {
-    onSuccess?: (data: ChatBskyConvoMuteConvo.OutputSchema) => void
+    onSuccess?: (data: chat.bsky.convo.muteConvo.$OutputBody) => void
     onError?: (error: Error) => void
   },
 ) {
diff --git a/src/state/queries/messages/remove-from-group.ts b/src/state/queries/messages/remove-from-group.ts
index 10437ad7e9..6abbd4ebc3 100644
--- a/src/state/queries/messages/remove-from-group.ts
+++ b/src/state/queries/messages/remove-from-group.ts
@@ -1,9 +1,3 @@
-import {
-  type ChatBskyActorDefs,
-  ChatBskyConvoDefs,
-  type ChatBskyConvoListConvos,
-  type ChatBskyGroupRemoveMembers,
-} from '@atproto/api'
 import {type DidString} from '@atproto/syntax'
 import {
   type InfiniteData,
@@ -14,6 +8,7 @@ import {
 import {logger} from '#/logger'
 import {useChatClient} from '#/state/session'
 import {chat} from '#/lexicons'
+import * as bsky from '#/types/bsky'
 import {RQKEY as CONVO_KEY} from './conversation'
 import {RQKEY_ROOT as CONVO_LIST_KEY} from './list-conversations'
 import {listConvoMembersQueryKey} from './list-convo-members'
@@ -24,7 +19,7 @@ export function useRemoveFromGroupChat(
     onSuccess,
     onError,
   }: {
-    onSuccess?: (data: ChatBskyGroupRemoveMembers.OutputSchema) => void
+    onSuccess?: (data: chat.bsky.group.removeMembers.$OutputBody) => void
     onError?: (error: Error) => void
   },
 ) {
@@ -43,23 +38,24 @@ export function useRemoveFromGroupChat(
     onMutate: ({members}) => {
       if (!convoId) return
 
-      const prevConvo = queryClient.getQueryData<ChatBskyConvoDefs.ConvoView>(
-        CONVO_KEY(convoId),
-      )
+      const prevConvo =
+        queryClient.getQueryData<chat.bsky.convo.defs.ConvoView>(
+          CONVO_KEY(convoId),
+        )
       const prevListEntries = queryClient.getQueriesData<
-        InfiniteData<ChatBskyConvoListConvos.OutputSchema>
+        InfiniteData<chat.bsky.convo.listConvos.$OutputBody>
       >({queryKey: [CONVO_LIST_KEY]})
       const prevMemberList = queryClient.getQueryData<
-        ChatBskyActorDefs.ProfileViewBasic[]
+        chat.bsky.actor.defs.ProfileViewBasic[]
       >(listConvoMembersQueryKey(convoId))
 
-      queryClient.setQueryData<ChatBskyConvoDefs.ConvoView>(
+      queryClient.setQueryData<chat.bsky.convo.defs.ConvoView>(
         CONVO_KEY(convoId),
         prev => {
           if (!prev) return
           const nextMembers = prev.members.filter(m => !members.includes(m.did))
           const removed = prev.members.length - nextMembers.length
-          if (!ChatBskyConvoDefs.isGroupConvo(prev.kind)) {
+          if (!bsky.isType(chat.bsky.convo.defs.groupConvo, prev.kind)) {
             return {...prev, members: nextMembers}
           }
           return {
@@ -74,7 +70,7 @@ export function useRemoveFromGroupChat(
       )
 
       queryClient.setQueriesData<
-        InfiniteData<ChatBskyConvoListConvos.OutputSchema>
+        InfiniteData<chat.bsky.convo.listConvos.$OutputBody>
       >({queryKey: [CONVO_LIST_KEY]}, prev => {
         if (!prev?.pages) return
         return {
@@ -87,7 +83,7 @@ export function useRemoveFromGroupChat(
                 m => !members.includes(m.did),
               )
               const removed = convo.members.length - nextMembers.length
-              if (!ChatBskyConvoDefs.isGroupConvo(convo.kind)) {
+              if (!bsky.isType(chat.bsky.convo.defs.groupConvo, convo.kind)) {
                 return {...convo, members: nextMembers}
               }
               return {
@@ -103,7 +99,7 @@ export function useRemoveFromGroupChat(
         }
       })
 
-      queryClient.setQueryData<ChatBskyActorDefs.ProfileViewBasic[]>(
+      queryClient.setQueryData<chat.bsky.actor.defs.ProfileViewBasic[]>(
         listConvoMembersQueryKey(convoId),
         prev => {
           if (!prev) return
diff --git a/src/state/queries/messages/request-join-group-chat.ts b/src/state/queries/messages/request-join-group-chat.ts
index b0a1922007..32b8043b8f 100644
--- a/src/state/queries/messages/request-join-group-chat.ts
+++ b/src/state/queries/messages/request-join-group-chat.ts
@@ -1,4 +1,3 @@
-import {type ChatBskyGroupRequestJoin} from '@atproto/api'
 import {useMutation, useQueryClient} from '@tanstack/react-query'
 
 import {logger} from '#/logger'
@@ -10,7 +9,7 @@ export function useRequestJoinGroupChat({
   onSuccess,
   onError,
 }: {
-  onSuccess?: (data: ChatBskyGroupRequestJoin.OutputSchema) => void
+  onSuccess?: (data: chat.bsky.group.requestJoin.$OutputBody) => void
   onError?: (error: Error) => void
 } = {}) {
   const client = useChatClient()
diff --git a/src/state/queries/messages/update-all-read.ts b/src/state/queries/messages/update-all-read.ts
index afcb062d16..55d8dfc417 100644
--- a/src/state/queries/messages/update-all-read.ts
+++ b/src/state/queries/messages/update-all-read.ts
@@ -1,4 +1,3 @@
-import {type ChatBskyConvoGetUnreadCounts} from '@atproto/api'
 import {useMutation, useQueryClient} from '@tanstack/react-query'
 
 import {logger} from '#/logger'
@@ -94,10 +93,12 @@ export function useUpdateAllRead(
       // zero out the badge count query that actually drives the unread badge,
       // since it's a separate server query that the list caches don't feed
       const prevUnreadCountsQueries =
-        queryClient.getQueriesData<ChatBskyConvoGetUnreadCounts.OutputSchema>({
-          queryKey: UNREAD_COUNTS_PARTIAL_KEY,
-        })
-      queryClient.setQueriesData<ChatBskyConvoGetUnreadCounts.OutputSchema>(
+        queryClient.getQueriesData<chat.bsky.convo.getUnreadCounts.$OutputBody>(
+          {
+            queryKey: UNREAD_COUNTS_PARTIAL_KEY,
+          },
+        )
+      queryClient.setQueriesData<chat.bsky.convo.getUnreadCounts.$OutputBody>(
         {queryKey: UNREAD_COUNTS_PARTIAL_KEY},
         old => {
           if (!old) return old
diff --git a/src/state/queries/messages/utils/convo-cache.ts b/src/state/queries/messages/utils/convo-cache.ts
index 2c9e2b3f96..1157aee79c 100644
--- a/src/state/queries/messages/utils/convo-cache.ts
+++ b/src/state/queries/messages/utils/convo-cache.ts
@@ -1,24 +1,21 @@
-import {
-  type ChatBskyConvoDefs,
-  type ChatBskyConvoListConvos,
-} from '@atproto/api'
 import {
   type InfiniteData,
   type QueryClient,
   type QueryKey,
 } from '@tanstack/react-query'
 
+import {type chat} from '#/lexicons'
 import {RQKEY as CONVO_KEY} from '../conversation'
 import {RQKEY_ROOT as CONVO_LIST_KEY} from '../list-conversations'
 
 type ConvoUpdater = (
-  prev: ChatBskyConvoDefs.ConvoView,
-) => ChatBskyConvoDefs.ConvoView | undefined
+  prev: chat.bsky.convo.defs.ConvoView,
+) => chat.bsky.convo.defs.ConvoView | undefined
 
 export type ConvoCacheSnapshot = {
-  prevConvo: ChatBskyConvoDefs.ConvoView | undefined
+  prevConvo: chat.bsky.convo.defs.ConvoView | undefined
   prevListEntries: Array<
-    [QueryKey, InfiniteData<ChatBskyConvoListConvos.OutputSchema> | undefined]
+    [QueryKey, InfiniteData<chat.bsky.convo.listConvos.$OutputBody> | undefined]
   >
 }
 
@@ -34,14 +31,14 @@ export function updateConvoOptimistic(
   convoId: string,
   updater: ConvoUpdater,
 ): ConvoCacheSnapshot {
-  const prevConvo = queryClient.getQueryData<ChatBskyConvoDefs.ConvoView>(
+  const prevConvo = queryClient.getQueryData<chat.bsky.convo.defs.ConvoView>(
     CONVO_KEY(convoId),
   )
   const prevListEntries = queryClient.getQueriesData<
-    InfiniteData<ChatBskyConvoListConvos.OutputSchema>
+    InfiniteData<chat.bsky.convo.listConvos.$OutputBody>
   >({queryKey: [CONVO_LIST_KEY]})
 
-  queryClient.setQueryData<ChatBskyConvoDefs.ConvoView>(
+  queryClient.setQueryData<chat.bsky.convo.defs.ConvoView>(
     CONVO_KEY(convoId),
     prev => {
       if (!prev) return
@@ -51,7 +48,7 @@ export function updateConvoOptimistic(
   )
 
   queryClient.setQueriesData<
-    InfiniteData<ChatBskyConvoListConvos.OutputSchema>
+    InfiniteData<chat.bsky.convo.listConvos.$OutputBody>
   >({queryKey: [CONVO_LIST_KEY]}, prev => {
     if (!prev?.pages) return
     return {
diff --git a/src/state/queries/messages/withdraw-join-group-chat.ts b/src/state/queries/messages/withdraw-join-group-chat.ts
index 736128ee25..10de51a1d1 100644
--- a/src/state/queries/messages/withdraw-join-group-chat.ts
+++ b/src/state/queries/messages/withdraw-join-group-chat.ts
@@ -1,4 +1,3 @@
-import {type ChatBskyGroupWithdrawJoinRequest} from '@atproto/api'
 import {useMutation, useQueryClient} from '@tanstack/react-query'
 
 import {logger} from '#/logger'
@@ -14,7 +13,7 @@ export function useWithdrawJoinGroupChatRequest({
   onSuccess,
   onError,
 }: {
-  onSuccess?: (data: ChatBskyGroupWithdrawJoinRequest.OutputSchema) => void
+  onSuccess?: (data: chat.bsky.group.withdrawJoinRequest.$OutputBody) => void
   onError?: (error: Error) => void
 } = {}) {
   const client = useChatClient()
diff --git a/src/state/queries/my-blocked-accounts.ts b/src/state/queries/my-blocked-accounts.ts
index 2cbe1dea29..32f9d27833 100644
--- a/src/state/queries/my-blocked-accounts.ts
+++ b/src/state/queries/my-blocked-accounts.ts
@@ -1,4 +1,3 @@
-import {type AppBskyActorDefs} from '@atproto/api'
 import {
   type InfiniteData,
   type QueryClient,
@@ -37,7 +36,7 @@ export function useMyBlockedAccountsQuery() {
 export function* findAllProfilesInQueryData(
   queryClient: QueryClient,
   did: string,
-): Generator<AppBskyActorDefs.ProfileView, void> {
+): Generator<app.bsky.actor.defs.ProfileView, void> {
   const queryDatas = queryClient.getQueriesData<
     InfiniteData<app.bsky.graph.getBlocks.$OutputBody>
   >({
diff --git a/src/state/queries/my-lists.ts b/src/state/queries/my-lists.ts
index d4538104dd..d529b1e2ad 100644
--- a/src/state/queries/my-lists.ts
+++ b/src/state/queries/my-lists.ts
@@ -1,4 +1,3 @@
-import {type AppBskyGraphDefs} from '@atproto/api'
 import {type DidString} from '@atproto/syntax'
 import {type QueryClient, useQuery} from '@tanstack/react-query'
 
@@ -19,11 +18,11 @@ export const RQKEY = (filter: MyListsFilter) => [RQKEY_ROOT, filter]
 export function useMyListsQuery(filter: MyListsFilter) {
   const {currentAccount} = useSession()
   const client = useAppviewClient()
-  return useQuery<AppBskyGraphDefs.ListView[]>({
+  return useQuery<app.bsky.graph.defs.ListView[]>({
     staleTime: STALE.MINUTES.ONE,
     queryKey: RQKEY(filter),
     async queryFn() {
-      let lists: AppBskyGraphDefs.ListView[] = []
+      let lists: app.bsky.graph.defs.ListView[] = []
       const promises = [
         accumulate(cursor =>
           client
diff --git a/src/state/queries/my-muted-accounts.ts b/src/state/queries/my-muted-accounts.ts
index cd1c6bc6ba..06f1ec1a85 100644
--- a/src/state/queries/my-muted-accounts.ts
+++ b/src/state/queries/my-muted-accounts.ts
@@ -1,4 +1,3 @@
-import {type AppBskyActorDefs} from '@atproto/api'
 import {
   type InfiniteData,
   type QueryClient,
@@ -37,7 +36,7 @@ export function useMyMutedAccountsQuery() {
 export function* findAllProfilesInQueryData(
   queryClient: QueryClient,
   did: string,
-): Generator<AppBskyActorDefs.ProfileView, void> {
+): Generator<app.bsky.actor.defs.ProfileView, void> {
   const queryDatas = queryClient.getQueriesData<
     InfiniteData<app.bsky.graph.getMutes.$OutputBody>
   >({
diff --git a/src/state/queries/notifications/__tests__/util.test.ts b/src/state/queries/notifications/__tests__/util.test.ts
index 3122770a40..37940a46da 100644
--- a/src/state/queries/notifications/__tests__/util.test.ts
+++ b/src/state/queries/notifications/__tests__/util.test.ts
@@ -1,14 +1,18 @@
-import {type AppBskyNotificationListNotifications} from '@atproto/api'
+import {type DidString} from '@atproto/syntax'
 import {describe, expect, it, jest} from '@jest/globals'
 
+import {type Notification} from '../types'
 import {groupNotifications} from '../util'
 
 jest.mock('#/state/queries/profile', () => ({precacheProfile: jest.fn()}))
 
-type Notification = AppBskyNotificationListNotifications.Notification
-
+/*
+ * Fixture builder. The generated view brands `did`/`uri`/`cid`/`indexedAt`, and
+ * these are plain test strings, so the whole literal is asserted once - the
+ * grouping logic under test only compares them as strings.
+ */
 function makeFollowNotification(
-  did: string,
+  did: DidString,
   starterPackUri?: string,
 ): Notification {
   return {
diff --git a/src/state/queries/notifications/feed.ts b/src/state/queries/notifications/feed.ts
index 4dc23db47e..b44abe44a2 100644
--- a/src/state/queries/notifications/feed.ts
+++ b/src/state/queries/notifications/feed.ts
@@ -17,7 +17,8 @@
  */
 
 import {useCallback, useEffect, useMemo, useRef} from 'react'
-import {AppBskyFeedDefs, AppBskyFeedPost, AtUri} from '@atproto/api'
+import {AtUri} from '@atproto/syntax'
+import {moderatePost} from '@bsky.app/sdk/moderation'
 import {
   type InfiniteData,
   type QueryClient,
@@ -26,12 +27,12 @@ import {
   useQueryClient,
 } from '@tanstack/react-query'
 
-import {moderatePost} from '#/lib/moderation/subjects'
 import {useModerationOpts} from '#/state/preferences/moderation-opts'
 import {STALE} from '#/state/queries'
 import {useAppviewClient} from '#/state/session'
 import {useThreadgateHiddenReplyUris} from '#/state/threadgate-hidden-replies'
-import type * as bsky from '#/types/bsky'
+import {app} from '#/lexicons'
+import * as bsky from '#/types/bsky'
 import {
   didOrHandleUriMatches,
   embedViewRecordToPostView,
@@ -195,7 +196,9 @@ export function useNotificationFeedQuery(opts: {
                        * a `$type` field on the `subject`. But if the nested
                        * `record` is a post, we know it's a post view.
                        */
-                      if (AppBskyFeedPost.isRecord(item.subject?.record)) {
+                      if (
+                        bsky.isType(app.bsky.feed.post, item.subject?.record)
+                      ) {
                         const mod = moderatePost(item.subject, moderationOpts!)
                         if (mod.ui('contentList').filter) {
                           return false
@@ -272,7 +275,7 @@ export function useNotificationFeedQuery(opts: {
 export function* findAllPostsInQueryData(
   queryClient: QueryClient,
   uri: string,
-): Generator<AppBskyFeedDefs.PostView, void> {
+): Generator<app.bsky.feed.defs.PostView, void> {
   const atUri = new AtUri(uri)
 
   const queryDatas = queryClient.getQueriesData<InfiniteData<FeedPage>>({
@@ -291,7 +294,7 @@ export function* findAllPostsInQueryData(
           }
         }
 
-        if (AppBskyFeedDefs.isPostView(item.subject)) {
+        if (bsky.isType(app.bsky.feed.defs.postView, item.subject)) {
           const quotedPost = getEmbeddedPost(item.subject?.embed)
           if (quotedPost && didOrHandleUriMatches(atUri, quotedPost)) {
             yield embedViewRecordToPostView(quotedPost)
@@ -329,7 +332,7 @@ export function* findAllProfilesInQueryData(
         ) {
           yield item.subject.author
         }
-        if (AppBskyFeedDefs.isPostView(item.subject)) {
+        if (bsky.isType(app.bsky.feed.defs.postView, item.subject)) {
           const quotedPost = getEmbeddedPost(item.subject?.embed)
           if (quotedPost?.author.did === did) {
             yield quotedPost.author
diff --git a/src/state/queries/notifications/settings.ts b/src/state/queries/notifications/settings.ts
index 2cadb519dc..8628d508e0 100644
--- a/src/state/queries/notifications/settings.ts
+++ b/src/state/queries/notifications/settings.ts
@@ -1,7 +1,3 @@
-import {
-  type AppBskyNotificationDefs,
-  type ChatBskyNotificationDefs,
-} from '@atproto/api'
 import {t} from '@lingui/core/macro'
 import {
   type QueryClient,
@@ -24,18 +20,18 @@ const RQKEY_CHAT = [RQKEY_ROOT, 'chat']
 // fetched and cached separately. This combined type names every preference for
 // the generic settings dialog, but it is never the shape of a query response.
 export type NotificationSettingsPreferences = Omit<
-  AppBskyNotificationDefs.Preferences,
+  app.bsky.notification.defs.Preferences,
   'chat'
 > &
-  Partial<Pick<ChatBskyNotificationDefs.Preferences, 'chat' | 'chatRequest'>>
+  Partial<Pick<chat.bsky.notification.defs.Preferences, 'chat' | 'chatRequest'>>
 
 export type AppNotificationSettingsPreferences = Omit<
-  AppBskyNotificationDefs.Preferences,
+  app.bsky.notification.defs.Preferences,
   'chat'
 >
 
 export type ChatNotificationSettingsPreferences = Pick<
-  ChatBskyNotificationDefs.Preferences,
+  chat.bsky.notification.defs.Preferences,
   'chat' | 'chatRequest'
 >
 
@@ -45,9 +41,9 @@ export type NotificationSettingsPreferenceName = Exclude<
 >
 
 export type NotificationSettingsPreference =
-  | AppBskyNotificationDefs.Preference
-  | AppBskyNotificationDefs.FilterablePreference
-  | ChatBskyNotificationDefs.ChatPreference
+  | app.bsky.notification.defs.Preference
+  | app.bsky.notification.defs.FilterablePreference
+  | chat.bsky.notification.defs.ChatPreference
 
 export function isChatPreferenceName(
   name: NotificationSettingsPreferenceName,
@@ -58,7 +54,7 @@ export function isChatPreferenceName(
 type NotificationSettingsUpdate = Partial<NotificationSettingsPreferences>
 
 type AppNotificationSettingsUpdate = Partial<
-  Omit<AppBskyNotificationDefs.Preferences, '$type' | 'chat'>
+  Omit<app.bsky.notification.defs.Preferences, '$type' | 'chat'>
 >
 
 type ChatNotificationSettingsUpdate =
@@ -159,15 +155,15 @@ function optimisticUpdateNotificationSettings(
 }
 
 function appPreferencesWithoutChat(
-  preferences: AppBskyNotificationDefs.Preferences,
-): Omit<AppBskyNotificationDefs.Preferences, 'chat'> {
+  preferences: app.bsky.notification.defs.Preferences,
+): Omit<app.bsky.notification.defs.Preferences, 'chat'> {
   const {chat: _ignoredChat, ...appPreferences} = preferences
   return appPreferences
 }
 
 function chatPreferencesForSettings(
-  preferences: ChatBskyNotificationDefs.Preferences,
-): Pick<ChatBskyNotificationDefs.Preferences, 'chat' | 'chatRequest'> {
+  preferences: chat.bsky.notification.defs.Preferences,
+): Pick<chat.bsky.notification.defs.Preferences, 'chat' | 'chatRequest'> {
   return {
     chat: preferences.chat,
     chatRequest: preferences.chatRequest,
diff --git a/src/state/queries/notifications/types.ts b/src/state/queries/notifications/types.ts
index 1b66dd1759..a08e8bdd35 100644
--- a/src/state/queries/notifications/types.ts
+++ b/src/state/queries/notifications/types.ts
@@ -1,8 +1,6 @@
-import {
-  type AppBskyFeedDefs,
-  type AppBskyGraphDefs,
-  type AppBskyNotificationListNotifications,
-} from '@atproto/api'
+import {type app} from '#/lexicons'
+
+export type Notification = app.bsky.notification.listNotifications.Notification
 
 export type NotificationType =
   | StarterPackNotificationType
@@ -11,11 +9,11 @@ export type NotificationType =
 export type FeedNotification =
   | (FeedNotificationBase & {
       type: StarterPackNotificationType
-      subject?: AppBskyGraphDefs.StarterPackViewBasic
+      subject?: app.bsky.graph.defs.StarterPackViewBasic
     })
   | (FeedNotificationBase & {
       type: OtherNotificationType
-      subject?: AppBskyFeedDefs.PostView
+      subject?: app.bsky.feed.defs.PostView
     })
 
 export interface FeedPage {
@@ -54,8 +52,10 @@ type OtherNotificationType =
 
 type FeedNotificationBase = {
   _reactKey: string
-  notification: AppBskyNotificationListNotifications.Notification
-  additional?: AppBskyNotificationListNotifications.Notification[]
+  notification: Notification
+  additional?: Notification[]
   subjectUri?: string
-  subject?: AppBskyFeedDefs.PostView | AppBskyGraphDefs.StarterPackViewBasic
+  subject?:
+    | app.bsky.feed.defs.PostView
+    | app.bsky.graph.defs.StarterPackViewBasic
 }
diff --git a/src/state/queries/notifications/util.ts b/src/state/queries/notifications/util.ts
index 929517d9fb..83a028423b 100644
--- a/src/state/queries/notifications/util.ts
+++ b/src/state/queries/notifications/util.ts
@@ -1,26 +1,21 @@
-import {
-  type AppBskyFeedDefs,
-  AppBskyFeedLike,
-  AppBskyFeedPost,
-  AppBskyFeedRepost,
-  type AppBskyGraphDefs,
-  AppBskyGraphStarterpack,
-  type AppBskyNotificationListNotifications,
-} from '@atproto/api'
 import {type Client} from '@atproto/lex'
 import {type AtUriString} from '@atproto/syntax'
-import {type ModerationOpts} from '@bsky.app/sdk/moderation'
+import {
+  hasMutedWord,
+  moderateNotification,
+  type ModerationOpts,
+} from '@bsky.app/sdk/moderation'
 import {type QueryClient} from '@tanstack/react-query'
 import chunk from 'lodash.chunk'
 
 import {labelIsHideableOffense} from '#/lib/moderation'
-import {hasMutedWord, moderateNotification} from '#/lib/moderation/subjects'
 import {app} from '#/lexicons'
 import * as bsky from '#/types/bsky'
 import {precacheProfile} from '../profile'
 import {
   type FeedNotification,
   type FeedPage,
+  type Notification,
   type NotificationType,
 } from './types'
 
@@ -117,7 +112,7 @@ export async function fetchPage({
 // =
 
 export function shouldFilterNotif(
-  notif: AppBskyNotificationListNotifications.Notification,
+  notif: Notification,
   moderationOpts: ModerationOpts | undefined,
 ): boolean {
   const containsImperative = !!notif.author.labels?.some(labelIsHideableOffense)
@@ -129,10 +124,7 @@ export function shouldFilterNotif(
   }
   if (
     notif.reason === 'subscribed-post' &&
-    bsky.dangerousIsType<AppBskyFeedPost.Record>(
-      notif.record,
-      AppBskyFeedPost.isRecord,
-    ) &&
+    bsky.isType(app.bsky.feed.post, notif.record) &&
     hasMutedWord({
       mutedWords: moderationOpts.prefs.mutedWords,
       text: notif.record.text,
@@ -150,9 +142,7 @@ export function shouldFilterNotif(
   return moderateNotification(notif, moderationOpts).ui('contentList').filter
 }
 
-export function groupNotifications(
-  notifs: AppBskyNotificationListNotifications.Notification[],
-): FeedNotification[] {
+export function groupNotifications(notifs: Notification[]): FeedNotification[] {
   const groupedNotifs: FeedNotification[] = []
   for (const notif of notifs) {
     const ts = +new Date(notif.indexedAt)
@@ -211,8 +201,8 @@ async function fetchSubjects(
   client: Client,
   groupedNotifs: FeedNotification[],
 ): Promise<{
-  posts: Map<string, AppBskyFeedDefs.PostView>
-  starterPacks: Map<string, AppBskyGraphDefs.StarterPackViewBasic>
+  posts: Map<string, app.bsky.feed.defs.PostView>
+  starterPacks: Map<string, app.bsky.graph.defs.StarterPackViewBasic>
 }> {
   const postUris = new Set<string>()
   const packUris = new Set<string>()
@@ -243,15 +233,15 @@ async function fetchSubjects(
         .then(data => data.starterPacks),
     ),
   )
-  const postsMap = new Map<string, AppBskyFeedDefs.PostView>()
-  const packsMap = new Map<string, AppBskyGraphDefs.StarterPackViewBasic>()
+  const postsMap = new Map<string, app.bsky.feed.defs.PostView>()
+  const packsMap = new Map<string, app.bsky.graph.defs.StarterPackViewBasic>()
   for (const post of postsChunks.flat()) {
-    if (AppBskyFeedPost.isRecord(post.record)) {
+    if (bsky.isType(app.bsky.feed.post, post.record)) {
       postsMap.set(post.uri, post)
     }
   }
   for (const pack of packsChunks.flat()) {
-    if (AppBskyGraphStarterpack.isRecord(pack.record)) {
+    if (bsky.isType(app.bsky.graph.starterpack, pack.record)) {
       packsMap.set(pack.uri, pack)
     }
   }
@@ -261,9 +251,7 @@ async function fetchSubjects(
   }
 }
 
-function toKnownType(
-  notif: AppBskyNotificationListNotifications.Notification,
-): NotificationType {
+function toKnownType(notif: Notification): NotificationType {
   if (notif.reason === 'like') {
     if (notif.reasonSubject?.includes('feed.generator')) {
       return 'feedgen-like'
@@ -291,7 +279,7 @@ function toKnownType(
 
 function getSubjectUri(
   type: NotificationType,
-  notif: AppBskyNotificationListNotifications.Notification,
+  notif: Notification,
 ): string | undefined {
   if (
     type === 'reply' ||
@@ -307,14 +295,8 @@ function getSubjectUri(
     type === 'repost-via-repost'
   ) {
     if (
-      bsky.dangerousIsType<AppBskyFeedRepost.Record>(
-        notif.record,
-        AppBskyFeedRepost.isRecord,
-      ) ||
-      bsky.dangerousIsType<AppBskyFeedLike.Record>(
-        notif.record,
-        AppBskyFeedLike.isRecord,
-      )
+      bsky.isType(app.bsky.feed.repost, notif.record) ||
+      bsky.isType(app.bsky.feed.like, notif.record)
     ) {
       return typeof notif.record.subject?.uri === 'string'
         ? notif.record.subject?.uri
diff --git a/src/state/queries/nuxs/index.ts b/src/state/queries/nuxs/index.ts
index f2802f0406..dc69b1fcde 100644
--- a/src/state/queries/nuxs/index.ts
+++ b/src/state/queries/nuxs/index.ts
@@ -8,7 +8,6 @@ import {
   usePreferencesQuery,
 } from '#/state/queries/preferences'
 import {usePdsClient} from '#/state/session'
-import {type app} from '#/lexicons'
 
 export {Nux} from '#/state/queries/nuxs/definitions'
 
@@ -108,10 +107,7 @@ export function useSaveNux() {
        * `serializeAppNux` still returns the legacy `Nux`, whose strings are
        * unbranded; it is validated against the same schema the action expects.
        */
-      await pdsClient.call(
-        upsertNux,
-        serializeAppNux(nux) as app.bsky.actor.defs.Nux,
-      )
+      await pdsClient.call(upsertNux, serializeAppNux(nux))
       // triggers a refetch
       await queryClient.invalidateQueries({
         queryKey: preferencesQueryKey,
diff --git a/src/state/queries/nuxs/types.ts b/src/state/queries/nuxs/types.ts
index 475bdd9429..db4bf5a7ae 100644
--- a/src/state/queries/nuxs/types.ts
+++ b/src/state/queries/nuxs/types.ts
@@ -1,7 +1,7 @@
-import {type AppBskyActorDefs} from '@atproto/api'
+import {type app} from '#/lexicons'
 
 export type Data = Record<string, unknown> | undefined
 
 export type BaseNux<
-  T extends Pick<AppBskyActorDefs.Nux, 'id' | 'expiresAt'> & {data: Data},
-> = Pick<AppBskyActorDefs.Nux, 'id' | 'completed' | 'expiresAt'> & T
+  T extends Pick<app.bsky.actor.defs.Nux, 'id' | 'expiresAt'> & {data: Data},
+> = Pick<app.bsky.actor.defs.Nux, 'id' | 'completed' | 'expiresAt'> & T
diff --git a/src/state/queries/nuxs/util.ts b/src/state/queries/nuxs/util.ts
index dea35a9166..973b46f0dc 100644
--- a/src/state/queries/nuxs/util.ts
+++ b/src/state/queries/nuxs/util.ts
@@ -1,4 +1,4 @@
-import {type AppBskyActorDefs, nuxSchema} from '@atproto/api'
+import {nuxSchema} from '@bsky.app/sdk/utils'
 
 import {
   type AppNux,
@@ -6,8 +6,9 @@ import {
   nuxNames,
   NuxSchemas,
 } from '#/state/queries/nuxs/definitions'
+import {type app} from '#/lexicons'
 
-export function parseAppNux(nux: AppBskyActorDefs.Nux): AppNux | undefined {
+export function parseAppNux(nux: app.bsky.actor.defs.Nux): AppNux | undefined {
   if (!nuxNames.has(nux.id as Nux)) return
   if (!nuxSchema.safeParse(nux).success) return
 
@@ -32,11 +33,11 @@ export function parseAppNux(nux: AppBskyActorDefs.Nux): AppNux | undefined {
   } as AppNux
 }
 
-export function serializeAppNux(nux: AppNux): AppBskyActorDefs.Nux {
+export function serializeAppNux(nux: AppNux): app.bsky.actor.defs.Nux {
   const {data, ...rest} = nux
   const schema = NuxSchemas[nux.id]
 
-  const result: AppBskyActorDefs.Nux = {
+  const result: app.bsky.actor.defs.Nux = {
     ...rest,
     data: undefined,
   }
diff --git a/src/state/queries/pinned-post.ts b/src/state/queries/pinned-post.ts
index cd3d0cb4a3..e53cefcbfe 100644
--- a/src/state/queries/pinned-post.ts
+++ b/src/state/queries/pinned-post.ts
@@ -55,10 +55,10 @@ export function usePinnedPostMutation() {
               : undefined
             return existing
           },
-          checkCommitted: res =>
+          checkCommitted: profile =>
             pinCurrentPost
-              ? res.data.pinnedPost?.uri === postUri
-              : !res.data.pinnedPost,
+              ? profile.pinnedPost?.uri === postUri
+              : !profile.pinnedPost,
         })
 
         if (pinCurrentPost) {
diff --git a/src/state/queries/post-feed.ts b/src/state/queries/post-feed.ts
index 44bc8adf02..e8f5b5ee4a 100644
--- a/src/state/queries/post-feed.ts
+++ b/src/state/queries/post-feed.ts
@@ -1,14 +1,9 @@
 import {useCallback, useEffect, useMemo, useRef} from 'react'
 import {AppState} from 'react-native'
-import {
-  type AppBskyActorDefs,
-  AppBskyFeedDefs,
-  type AppBskyFeedPost,
-  AtUri,
-} from '@atproto/api'
 import {type Client} from '@atproto/lex'
-import {type AtIdentifierString, type AtUriString} from '@atproto/syntax'
+import {type AtIdentifierString, AtUri, type AtUriString} from '@atproto/syntax'
 import {
+  moderatePost,
   type ModerationDecision,
   type ModerationPrefs,
 } from '@bsky.app/sdk/moderation'
@@ -32,13 +27,14 @@ import {type FeedAPI, type ReasonFeedSource} from '#/lib/api/feed/types'
 import {aggregateUserInterests} from '#/lib/api/feed/utils'
 import {FeedTuner, type FeedTunerFn} from '#/lib/api/feed-manip'
 import {DISCOVER_FEED_URI} from '#/lib/constants'
-import {moderatePost} from '#/lib/moderation/subjects'
 import {logger} from '#/logger'
 import {STALE} from '#/state/queries'
 import {DEFAULT_LOGGED_OUT_PREFERENCES} from '#/state/queries/preferences/const'
 import {useAppviewClient, useSession} from '#/state/session'
 import * as userActionHistory from '#/state/userActionHistory'
 import {KnownError} from '#/view/com/posts/PostFeedErrorMessage'
+import {app} from '#/lexicons'
+import * as bsky from '#/types/bsky'
 import {useFeedTuners} from '../preferences/feed-tuners'
 import {useModerationOpts} from '../preferences/moderation-opts'
 import {usePreferencesQuery} from './preferences'
@@ -82,11 +78,11 @@ export function RQKEY(feedDesc: FeedDescriptor, params?: FeedParams) {
 
 export interface FeedPostSliceItem {
   _reactKey: string
-  uri: string
-  post: AppBskyFeedDefs.PostView
-  record: AppBskyFeedPost.Record
+  uri: AtUriString
+  post: app.bsky.feed.defs.PostView
+  record: app.bsky.feed.post.Main
   moderation: ModerationDecision
-  parentAuthor?: AppBskyActorDefs.ProfileViewBasic
+  parentAuthor?: app.bsky.actor.defs.ProfileViewBasic
   isParentBlocked?: boolean
   isParentNotFound?: boolean
 }
@@ -101,8 +97,8 @@ export interface FeedPostSlice {
   reqId: string | undefined
   feedPostUri: string
   reason?:
-    | AppBskyFeedDefs.ReasonRepost
-    | AppBskyFeedDefs.ReasonPin
+    | app.bsky.feed.defs.ReasonRepost
+    | app.bsky.feed.defs.ReasonPin
     | ReasonFeedSource
     | {[k: string]: unknown; $type: string}
 }
@@ -110,7 +106,7 @@ export interface FeedPostSlice {
 export interface FeedPageUnselected {
   api: FeedAPI
   cursor: string | undefined
-  feed: AppBskyFeedDefs.FeedViewPost[]
+  feed: app.bsky.feed.defs.FeedViewPost[]
   fetchedAt: number
 }
 
@@ -515,7 +511,7 @@ function createApi({
 export function* findAllPostsInQueryData(
   queryClient: QueryClient,
   uri: string,
-): Generator<AppBskyFeedDefs.PostView, undefined> {
+): Generator<app.bsky.feed.defs.PostView, undefined> {
   const atUri = new AtUri(uri)
 
   const queryDatas = queryClient.getQueriesData<
@@ -538,7 +534,7 @@ export function* findAllPostsInQueryData(
           yield embedViewRecordToPostView(quotedPost)
         }
 
-        if (AppBskyFeedDefs.isPostView(item.reply?.parent)) {
+        if (bsky.isType(app.bsky.feed.defs.postView, item.reply?.parent)) {
           if (didOrHandleUriMatches(atUri, item.reply.parent)) {
             yield item.reply.parent
           }
@@ -552,7 +548,7 @@ export function* findAllPostsInQueryData(
           }
         }
 
-        if (AppBskyFeedDefs.isPostView(item.reply?.root)) {
+        if (bsky.isType(app.bsky.feed.defs.postView, item.reply?.root)) {
           if (didOrHandleUriMatches(atUri, item.reply.root)) {
             yield item.reply.root
           }
@@ -570,7 +566,7 @@ export function* findAllPostsInQueryData(
 export function* findAllProfilesInQueryData(
   queryClient: QueryClient,
   did: string,
-): Generator<AppBskyActorDefs.ProfileViewBasic, undefined> {
+): Generator<app.bsky.actor.defs.ProfileViewBasic, undefined> {
   const queryDatas = queryClient.getQueriesData<
     InfiniteData<FeedPageUnselected>
   >({
@@ -590,13 +586,13 @@ export function* findAllProfilesInQueryData(
           yield quotedPost.author
         }
         if (
-          AppBskyFeedDefs.isPostView(item.reply?.parent) &&
+          bsky.isType(app.bsky.feed.defs.postView, item.reply?.parent) &&
           item.reply?.parent?.author.did === did
         ) {
           yield item.reply.parent.author
         }
         if (
-          AppBskyFeedDefs.isPostView(item.reply?.root) &&
+          bsky.isType(app.bsky.feed.defs.postView, item.reply?.root) &&
           item.reply?.root?.author.did === did
         ) {
           yield item.reply.root.author
@@ -607,7 +603,7 @@ export function* findAllProfilesInQueryData(
 }
 
 function assertSomePostsPassModeration(
-  feed: AppBskyFeedDefs.FeedViewPost[],
+  feed: app.bsky.feed.defs.FeedViewPost[],
   moderationPrefs: ModerationPrefs,
 ) {
   // no posts in this feed
diff --git a/src/state/queries/post-liked-by.ts b/src/state/queries/post-liked-by.ts
index cc18a46426..0964d0be24 100644
--- a/src/state/queries/post-liked-by.ts
+++ b/src/state/queries/post-liked-by.ts
@@ -1,4 +1,3 @@
-import {type AppBskyActorDefs} from '@atproto/api'
 import {type AtUriString} from '@atproto/syntax'
 import {
   type InfiniteData,
@@ -83,7 +82,7 @@ export function useLikedBySampleQuery({uri}: {uri: string | undefined}) {
 export function* findAllProfilesInQueryData(
   queryClient: QueryClient,
   did: string,
-): Generator<AppBskyActorDefs.ProfileView, void> {
+): Generator<app.bsky.actor.defs.ProfileView, void> {
   const queryDatas = queryClient.getQueriesData<
     InfiniteData<app.bsky.feed.getLikes.$OutputBody>
   >({
diff --git a/src/state/queries/post-quotes.ts b/src/state/queries/post-quotes.ts
index 77b5dabcf8..c0bdb70ef9 100644
--- a/src/state/queries/post-quotes.ts
+++ b/src/state/queries/post-quotes.ts
@@ -1,10 +1,4 @@
-import {
-  type AppBskyActorDefs,
-  AppBskyEmbedRecord,
-  type AppBskyFeedDefs,
-  AtUri,
-} from '@atproto/api'
-import {type AtUriString} from '@atproto/syntax'
+import {AtUri, type AtUriString} from '@atproto/syntax'
 import {
   type InfiniteData,
   type QueryClient,
@@ -14,6 +8,7 @@ import {
 
 import {useAppviewClient} from '#/state/session'
 import {app} from '#/lexicons'
+import * as bsky from '#/types/bsky'
 import {
   didOrHandleUriMatches,
   embedViewRecordToPostView,
@@ -54,8 +49,16 @@ export function usePostQuotesQuery(resolvedUri: string | undefined) {
           return {
             ...page,
             posts: page.posts.filter(post => {
-              if (post.embed && AppBskyEmbedRecord.isView(post.embed)) {
-                if (AppBskyEmbedRecord.isViewDetached(post.embed.record)) {
+              if (
+                post.embed &&
+                bsky.isType(app.bsky.embed.record.view, post.embed)
+              ) {
+                if (
+                  bsky.isType(
+                    app.bsky.embed.record.viewDetached,
+                    post.embed.record,
+                  )
+                ) {
                   return false
                 }
               }
@@ -71,7 +74,7 @@ export function usePostQuotesQuery(resolvedUri: string | undefined) {
 export function* findAllProfilesInQueryData(
   queryClient: QueryClient,
   did: string,
-): Generator<AppBskyActorDefs.ProfileViewBasic, void> {
+): Generator<app.bsky.actor.defs.ProfileViewBasic, void> {
   const queryDatas = queryClient.getQueriesData<
     InfiniteData<app.bsky.feed.getQuotes.$OutputBody>
   >({
@@ -98,7 +101,7 @@ export function* findAllProfilesInQueryData(
 export function* findAllPostsInQueryData(
   queryClient: QueryClient,
   uri: string,
-): Generator<AppBskyFeedDefs.PostView, undefined> {
+): Generator<app.bsky.feed.defs.PostView, undefined> {
   const queryDatas = queryClient.getQueriesData<
     InfiniteData<app.bsky.feed.getQuotes.$OutputBody>
   >({
diff --git a/src/state/queries/post-reposted-by.ts b/src/state/queries/post-reposted-by.ts
index d2c5e62385..03a0f65126 100644
--- a/src/state/queries/post-reposted-by.ts
+++ b/src/state/queries/post-reposted-by.ts
@@ -1,4 +1,3 @@
-import {type AppBskyActorDefs} from '@atproto/api'
 import {type AtUriString} from '@atproto/syntax'
 import {
   type InfiniteData,
@@ -44,7 +43,7 @@ export function usePostRepostedByQuery(resolvedUri: string | undefined) {
 export function* findAllProfilesInQueryData(
   queryClient: QueryClient,
   did: string,
-): Generator<AppBskyActorDefs.ProfileView, void> {
+): Generator<app.bsky.actor.defs.ProfileView, void> {
   const queryDatas = queryClient.getQueriesData<
     InfiniteData<app.bsky.feed.getRepostedBy.$OutputBody>
   >({
diff --git a/src/state/queries/post.ts b/src/state/queries/post.ts
index 0a0664d13b..73191c83ee 100644
--- a/src/state/queries/post.ts
+++ b/src/state/queries/post.ts
@@ -1,7 +1,6 @@
 import {useCallback} from 'react'
-import {type AppBskyActorDefs, type AppBskyFeedDefs, AtUri} from '@atproto/api'
 import {type Client} from '@atproto/lex'
-import {type AtUriString, type HandleString} from '@atproto/syntax'
+import {AtUri, type AtUriString, type HandleString} from '@atproto/syntax'
 import {deleteLike, deletePost, deleteRepost, like, repost} from '@bsky.app/sdk'
 import {
   type QueryClient,
@@ -26,7 +25,7 @@ export const RQKEY = (postUri: string) => [RQKEY_ROOT, postUri]
 
 export function usePostQuery(uri: string | undefined) {
   const client = useAppviewClient()
-  return useQuery<AppBskyFeedDefs.PostView>({
+  return useQuery<app.bsky.feed.defs.PostView>({
     queryKey: RQKEY(uri || ''),
     queryFn: async () => {
       if (!uri) throw new Error('[unreachable] No URI provided')
@@ -46,14 +45,13 @@ export function usePostQuery(uri: string | undefined) {
  * Read one post by AT-URI, resolving a handle authority first when the URI
  * carries one.
  *
- * The appview still answers with `@atproto/api`-shaped views for the callers of
- * these hooks, so the generated view is asserted across at this single
+ * The appview response is asserted to the generated view at this single
  * boundary rather than at every consumer.
  */
 async function fetchPost(
   client: Client,
   uri: string,
-): Promise<AppBskyFeedDefs.PostView | undefined> {
+): Promise<app.bsky.feed.defs.PostView | undefined> {
   const urip = new AtUri(uri)
 
   if (!urip.host.startsWith('did:')) {
@@ -72,7 +70,7 @@ async function fetchPost(
 export function precachePost(
   queryClient: QueryClient,
   uri: string,
-  post: AppBskyFeedDefs.PostView,
+  post: app.bsky.feed.defs.PostView,
 ) {
   queryClient.setQueryData(RQKEY(uri), post)
 }
@@ -110,7 +108,7 @@ export function useGetPosts() {
             uris: uris as AtUriString[],
           })
           // See the note on `fetchPost` about the view shapes.
-          return data.posts as AppBskyFeedDefs.PostView[]
+          return data.posts
         },
       })
     },
@@ -119,7 +117,7 @@ export function useGetPosts() {
 }
 
 export function usePostLikeMutationQueue(
-  post: Shadow<AppBskyFeedDefs.PostView>,
+  post: Shadow<app.bsky.feed.defs.PostView>,
   viaRepost: {uri: string; cid: string} | undefined,
   feedDescriptor: string | undefined,
   logContext: Metrics['post:like']['logContext'],
@@ -183,7 +181,7 @@ export function usePostLikeMutationQueue(
 function usePostLikeMutation(
   feedDescriptor: string | undefined,
   logContext: Metrics['post:like']['logContext'],
-  post: Shadow<AppBskyFeedDefs.PostView>,
+  post: Shadow<app.bsky.feed.defs.PostView>,
 ) {
   const {currentAccount} = useSession()
   const queryClient = useQueryClient()
@@ -191,12 +189,12 @@ function usePostLikeMutation(
   const pdsClient = usePdsClient()
   const ax = useAnalytics()
   return useMutation<
-    {uri: string}, // responds with the uri of the like
+    {uri: AtUriString}, // responds with the uri of the like
     Error,
     {uri: string; cid: string; via?: {uri: string; cid: string}} // the post's uri and cid, and the repost uri/cid if present
   >({
     mutationFn: ({uri, cid, via}) => {
-      let ownProfile: AppBskyActorDefs.ProfileViewDetailed | undefined
+      let ownProfile: app.bsky.actor.defs.ProfileViewDetailed | undefined
       if (currentAccount) {
         ownProfile = findProfileQueryData(queryClient, currentAccount.did)
       }
@@ -231,7 +229,7 @@ function usePostLikeMutation(
 function usePostUnlikeMutation(
   feedDescriptor: string | undefined,
   logContext: Metrics['post:unlike']['logContext'],
-  post: Shadow<AppBskyFeedDefs.PostView>,
+  post: Shadow<app.bsky.feed.defs.PostView>,
 ) {
   const pdsClient = usePdsClient()
   const ax = useAnalytics()
@@ -249,7 +247,7 @@ function usePostUnlikeMutation(
 }
 
 export function usePostRepostMutationQueue(
-  post: Shadow<AppBskyFeedDefs.PostView>,
+  post: Shadow<app.bsky.feed.defs.PostView>,
   viaRepost: {uri: string; cid: string} | undefined,
   feedDescriptor: string | undefined,
   logContext: Metrics['post:repost']['logContext'],
@@ -315,12 +313,12 @@ export function usePostRepostMutationQueue(
 function usePostRepostMutation(
   feedDescriptor: string | undefined,
   logContext: Metrics['post:repost']['logContext'],
-  post: Shadow<AppBskyFeedDefs.PostView>,
+  post: Shadow<app.bsky.feed.defs.PostView>,
 ) {
   const pdsClient = usePdsClient()
   const ax = useAnalytics()
   return useMutation<
-    {uri: string}, // responds with the uri of the repost
+    {uri: AtUriString}, // responds with the uri of the repost
     Error,
     {uri: string; cid: string; via?: {uri: string; cid: string}} // the post's uri and cid, and the repost uri/cid if present
   >({
@@ -343,7 +341,7 @@ function usePostRepostMutation(
 function usePostUnrepostMutation(
   feedDescriptor: string | undefined,
   logContext: Metrics['post:unrepost']['logContext'],
-  post: Shadow<AppBskyFeedDefs.PostView>,
+  post: Shadow<app.bsky.feed.defs.PostView>,
 ) {
   const pdsClient = usePdsClient()
   const ax = useAnalytics()
@@ -374,7 +372,7 @@ export function usePostDeleteMutation() {
 }
 
 export function useThreadMuteMutationQueue(
-  post: Shadow<AppBskyFeedDefs.PostView>,
+  post: Shadow<app.bsky.feed.defs.PostView>,
   rootUri: string,
 ) {
   const threadMuteMutation = useThreadMuteMutation()
diff --git a/src/state/queries/postgate/index.ts b/src/state/queries/postgate/index.ts
index e213fa73d5..08dff1a45c 100644
--- a/src/state/queries/postgate/index.ts
+++ b/src/state/queries/postgate/index.ts
@@ -1,11 +1,6 @@
 import {useRef} from 'react'
-import {
-  AppBskyEmbedRecord,
-  AppBskyEmbedRecordWithMedia,
-  type AppBskyFeedDefs,
-} from '@atproto/api'
 import {type Client} from '@atproto/lex'
-import {AtUri, type HandleString} from '@atproto/syntax'
+import {AtUri, type AtUriString, type HandleString} from '@atproto/syntax'
 import {useMutation, useQuery, useQueryClient} from '@tanstack/react-query'
 
 import {networkRetry, retry} from '#/lib/async/retry'
@@ -173,7 +168,7 @@ export function useToggleQuoteDetachmentMutation() {
   const pdsClient = usePdsClient()
   const queryClient = useQueryClient()
   const getPosts = useGetPosts()
-  const prevEmbed = useRef<AppBskyFeedDefs.PostView['embed']>(undefined)
+  const prevEmbed = useRef<app.bsky.feed.defs.PostView['embed']>(undefined)
 
   return useMutation({
     mutationFn: async ({
@@ -181,8 +176,8 @@ export function useToggleQuoteDetachmentMutation() {
       quoteUri,
       action,
     }: {
-      post: AppBskyFeedDefs.PostView
-      quoteUri: string
+      post: app.bsky.feed.defs.PostView
+      quoteUri: AtUriString
       action: 'detach' | 'reattach'
     }) => {
       // cache here since post shadow mutates original object
@@ -247,8 +242,8 @@ export function useToggleQuoteDetachmentMutation() {
       if (action === 'detach' && prevEmbed.current) {
         // detach failed, add the embed back
         if (
-          AppBskyEmbedRecord.isView(prevEmbed.current) ||
-          AppBskyEmbedRecordWithMedia.isView(prevEmbed.current)
+          bsky.isType(app.bsky.embed.record.view, prevEmbed.current) ||
+          bsky.isType(app.bsky.embed.recordWithMedia.view, prevEmbed.current)
         ) {
           updatePostShadow(queryClient, post.uri, {
             embed: prevEmbed.current,
diff --git a/src/state/queries/postgate/util.ts b/src/state/queries/postgate/util.ts
index 51c84419d0..b9a3218b2c 100644
--- a/src/state/queries/postgate/util.ts
+++ b/src/state/queries/postgate/util.ts
@@ -1,13 +1,8 @@
-import {
-  type $Typed,
-  AppBskyEmbedRecord,
-  AppBskyEmbedRecordWithMedia,
-  type AppBskyFeedDefs,
-  AtUri,
-} from '@atproto/api'
-import {type AtUriString, toDatetimeString} from '@atproto/syntax'
+import {type $Typed} from '@atproto/lex'
+import {AtUri, type AtUriString, toDatetimeString} from '@atproto/syntax'
 
-import {type app} from '#/lexicons'
+import {app} from '#/lexicons'
+import * as bsky from '#/types/bsky'
 
 export const POSTGATE_COLLECTION = 'app.bsky.feed.postgate'
 
@@ -63,9 +58,9 @@ export function mergePostgateRecords(
 export function createEmbedViewDetachedRecord({
   uri,
 }: {
-  uri: string
-}): $Typed<AppBskyEmbedRecord.View> {
-  const record: $Typed<AppBskyEmbedRecord.ViewDetached> = {
+  uri: AtUriString
+}): $Typed<app.bsky.embed.record.View> {
+  const record: $Typed<app.bsky.embed.record.ViewDetached> = {
     $type: 'app.bsky.embed.record#viewDetached',
     uri,
     detached: true,
@@ -83,24 +78,27 @@ export function createMaybeDetachedQuoteEmbed({
   detached,
 }:
   | {
-      post: AppBskyFeedDefs.PostView
-      quote: AppBskyFeedDefs.PostView
+      post: app.bsky.feed.defs.PostView
+      quote: app.bsky.feed.defs.PostView
       quoteUri: undefined
       detached: false
     }
   | {
-      post: AppBskyFeedDefs.PostView
+      post: app.bsky.feed.defs.PostView
       quote: undefined
-      quoteUri: string
+      quoteUri: AtUriString
       detached: true
-    }): AppBskyEmbedRecord.View | AppBskyEmbedRecordWithMedia.View | undefined {
-  if (AppBskyEmbedRecord.isView(post.embed)) {
+    }):
+  | app.bsky.embed.record.View
+  | app.bsky.embed.recordWithMedia.View
+  | undefined {
+  if (bsky.isType(app.bsky.embed.record.view, post.embed)) {
     if (detached) {
       return createEmbedViewDetachedRecord({uri: quoteUri})
     } else {
       return createEmbedRecordView({post: quote})
     }
-  } else if (AppBskyEmbedRecordWithMedia.isView(post.embed)) {
+  } else if (bsky.isType(app.bsky.embed.recordWithMedia.view, post.embed)) {
     if (detached) {
       return {
         ...post.embed,
@@ -113,8 +111,8 @@ export function createMaybeDetachedQuoteEmbed({
 }
 
 export function createEmbedViewRecordFromPost(
-  post: AppBskyFeedDefs.PostView,
-): $Typed<AppBskyEmbedRecord.ViewRecord> {
+  post: app.bsky.feed.defs.PostView,
+): $Typed<app.bsky.embed.record.ViewRecord> {
   return {
     $type: 'app.bsky.embed.record#viewRecord',
     uri: post.uri,
@@ -134,8 +132,8 @@ export function createEmbedViewRecordFromPost(
 export function createEmbedRecordView({
   post,
 }: {
-  post: AppBskyFeedDefs.PostView
-}): AppBskyEmbedRecord.View {
+  post: app.bsky.feed.defs.PostView
+}): app.bsky.embed.record.View {
   return {
     $type: 'app.bsky.embed.record#view',
     record: createEmbedViewRecordFromPost(post),
@@ -146,10 +144,10 @@ export function createEmbedRecordWithMediaView({
   post,
   quote,
 }: {
-  post: AppBskyFeedDefs.PostView
-  quote: AppBskyFeedDefs.PostView
-}): AppBskyEmbedRecordWithMedia.View | undefined {
-  if (!AppBskyEmbedRecordWithMedia.isView(post.embed)) return
+  post: app.bsky.feed.defs.PostView
+  quote: app.bsky.feed.defs.PostView
+}): app.bsky.embed.recordWithMedia.View | undefined {
+  if (!bsky.isType(app.bsky.embed.recordWithMedia.view, post.embed)) return
   return {
     ...(post.embed || {}),
     record: {
@@ -163,11 +161,11 @@ export function getMaybeDetachedQuoteEmbed({
   post,
 }: {
   viewerDid: string
-  post: AppBskyFeedDefs.PostView
+  post: app.bsky.feed.defs.PostView
 }) {
-  if (AppBskyEmbedRecord.isView(post.embed)) {
+  if (bsky.isType(app.bsky.embed.record.view, post.embed)) {
     // detached
-    if (AppBskyEmbedRecord.isViewDetached(post.embed.record)) {
+    if (bsky.isType(app.bsky.embed.record.viewDetached, post.embed.record)) {
       const urip = new AtUri(post.embed.record.uri)
       return {
         embed: post.embed,
@@ -178,7 +176,7 @@ export function getMaybeDetachedQuoteEmbed({
     }
 
     // post
-    if (AppBskyEmbedRecord.isViewRecord(post.embed.record)) {
+    if (bsky.isType(app.bsky.embed.record.viewRecord, post.embed.record)) {
       const urip = new AtUri(post.embed.record.uri)
       return {
         embed: post.embed,
@@ -187,9 +185,11 @@ export function getMaybeDetachedQuoteEmbed({
         isDetached: false,
       }
     }
-  } else if (AppBskyEmbedRecordWithMedia.isView(post.embed)) {
+  } else if (bsky.isType(app.bsky.embed.recordWithMedia.view, post.embed)) {
     // detached
-    if (AppBskyEmbedRecord.isViewDetached(post.embed.record.record)) {
+    if (
+      bsky.isType(app.bsky.embed.record.viewDetached, post.embed.record.record)
+    ) {
       const urip = new AtUri(post.embed.record.record.uri)
       return {
         embed: post.embed,
@@ -200,7 +200,9 @@ export function getMaybeDetachedQuoteEmbed({
     }
 
     // post
-    if (AppBskyEmbedRecord.isViewRecord(post.embed.record.record)) {
+    if (
+      bsky.isType(app.bsky.embed.record.viewRecord, post.embed.record.record)
+    ) {
       const urip = new AtUri(post.embed.record.record.uri)
       return {
         embed: post.embed,
diff --git a/src/state/queries/preferences/index.ts b/src/state/queries/preferences/index.ts
index 33f7d2f8d1..f3bb37d1a0 100644
--- a/src/state/queries/preferences/index.ts
+++ b/src/state/queries/preferences/index.ts
@@ -1,5 +1,4 @@
 import {useCallback} from 'react'
-import {type AppBskyActorDefs} from '@atproto/api'
 import {type DidString} from '@atproto/syntax'
 import {
   addSavedFeeds,
@@ -278,7 +277,7 @@ export function useOverwriteSavedFeedsMutation() {
   const queryClient = useQueryClient()
   const client = usePdsClient()
 
-  return useMutation<void, unknown, AppBskyActorDefs.SavedFeed[]>({
+  return useMutation<void, unknown, app.bsky.actor.defs.SavedFeed[]>({
     mutationFn: async savedFeeds => {
       await client.call(overwriteSavedFeeds, savedFeeds)
       // triggers a refetch
@@ -296,7 +295,7 @@ export function useAddSavedFeedsMutation() {
   return useMutation<
     void,
     unknown,
-    Pick<AppBskyActorDefs.SavedFeed, 'type' | 'value' | 'pinned'>[]
+    Pick<app.bsky.actor.defs.SavedFeed, 'type' | 'value' | 'pinned'>[]
   >({
     mutationFn: async savedFeeds => {
       await client.call(addSavedFeeds, savedFeeds)
@@ -312,7 +311,7 @@ export function useRemoveFeedMutation() {
   const queryClient = useQueryClient()
   const client = usePdsClient()
 
-  return useMutation<void, unknown, Pick<AppBskyActorDefs.SavedFeed, 'id'>>({
+  return useMutation<void, unknown, Pick<app.bsky.actor.defs.SavedFeed, 'id'>>({
     mutationFn: async savedFeed => {
       await client.call(removeSavedFeeds, [savedFeed.id])
       // triggers a refetch
@@ -332,8 +331,8 @@ export function useReplaceForYouWithDiscoverFeedMutation() {
       forYouFeedConfig,
       discoverFeedConfig,
     }: {
-      forYouFeedConfig: AppBskyActorDefs.SavedFeed | undefined
-      discoverFeedConfig: AppBskyActorDefs.SavedFeed | undefined
+      forYouFeedConfig: app.bsky.actor.defs.SavedFeed | undefined
+      discoverFeedConfig: app.bsky.actor.defs.SavedFeed | undefined
     }) => {
       if (forYouFeedConfig) {
         await client.call(removeSavedFeeds, [forYouFeedConfig.id])
@@ -366,7 +365,7 @@ export function useUpdateSavedFeedsMutation() {
   const queryClient = useQueryClient()
   const client = usePdsClient()
 
-  return useMutation<void, unknown, AppBskyActorDefs.SavedFeed[]>({
+  return useMutation<void, unknown, app.bsky.actor.defs.SavedFeed[]>({
     mutationFn: async feeds => {
       await client.call(updateSavedFeeds, feeds)
 
@@ -477,7 +476,7 @@ export function useSetActiveProgressGuideMutation() {
 
   return useMutation({
     mutationFn: async (
-      guide: AppBskyActorDefs.BskyAppProgressGuide | undefined,
+      guide: app.bsky.actor.defs.BskyAppProgressGuide | undefined,
     ) => {
       await client.call(setActiveProgressGuide, guide)
       // triggers a refetch
@@ -508,7 +507,7 @@ export function useSetVerificationPrefsMutation() {
   const queryClient = useQueryClient()
   const client = usePdsClient()
 
-  return useMutation<void, unknown, AppBskyActorDefs.VerificationPrefs>({
+  return useMutation<void, unknown, app.bsky.actor.defs.VerificationPrefs>({
     mutationFn: async prefs => {
       await client.call(setVerificationPrefs, prefs)
       if (prefs.hideBadges) {
diff --git a/src/state/queries/preferences/useThreadPreferences.ts b/src/state/queries/preferences/useThreadPreferences.ts
index 629d1c61b8..2c3c850ffe 100644
--- a/src/state/queries/preferences/useThreadPreferences.ts
+++ b/src/state/queries/preferences/useThreadPreferences.ts
@@ -1,5 +1,4 @@
 import {useCallback, useMemo, useRef, useState} from 'react'
-import {type AppBskyUnspeccedGetPostThreadV2} from '@atproto/api'
 import {useFocusEffect} from '@react-navigation/native'
 import debounce from 'lodash.debounce'
 
@@ -10,10 +9,11 @@ import {
 } from '#/state/queries/preferences'
 import {type ThreadViewPreferences} from '#/state/queries/preferences/types'
 import {useAnalytics} from '#/analytics'
+import {type app} from '#/lexicons'
 import {type Literal} from '#/types/utils'
 
 export type ThreadSortOption = Literal<
-  AppBskyUnspeccedGetPostThreadV2.QueryParams['sort'],
+  app.bsky.unspecced.getPostThreadV2.$Params['sort'],
   string
 >
 export type ThreadViewOption = 'linear' | 'tree'
diff --git a/src/state/queries/profile-feedgens.ts b/src/state/queries/profile-feedgens.ts
index 7a78c0a6c6..79309b1328 100644
--- a/src/state/queries/profile-feedgens.ts
+++ b/src/state/queries/profile-feedgens.ts
@@ -1,11 +1,11 @@
 import {type DidString} from '@atproto/syntax'
+import {moderateFeedGenerator} from '@bsky.app/sdk/moderation'
 import {
   type InfiniteData,
   type QueryKey,
   useInfiniteQuery,
 } from '@tanstack/react-query'
 
-import {moderateFeedGenerator} from '#/lib/moderation/subjects'
 import {useAppviewClient} from '#/state/session'
 import {app} from '#/lexicons'
 import {useModerationOpts} from '../preferences/moderation-opts'
diff --git a/src/state/queries/profile-followers.ts b/src/state/queries/profile-followers.ts
index 5022ae9576..5e79b5719c 100644
--- a/src/state/queries/profile-followers.ts
+++ b/src/state/queries/profile-followers.ts
@@ -1,4 +1,3 @@
-import {type AppBskyActorDefs} from '@atproto/api'
 import {type DidString} from '@atproto/syntax'
 import {
   type InfiniteData,
@@ -67,7 +66,7 @@ export function useProfileFollowersQuery(
 export function* findAllProfilesInQueryData(
   queryClient: QueryClient,
   did: string,
-): Generator<AppBskyActorDefs.ProfileView, void> {
+): Generator<app.bsky.actor.defs.ProfileView, void> {
   const queryDatas = queryClient.getQueriesData<
     InfiniteData<app.bsky.graph.getFollowers.$OutputBody>
   >({
diff --git a/src/state/queries/profile-follows.ts b/src/state/queries/profile-follows.ts
index 1cd857af16..340184ef2c 100644
--- a/src/state/queries/profile-follows.ts
+++ b/src/state/queries/profile-follows.ts
@@ -1,4 +1,3 @@
-import {type AppBskyActorDefs} from '@atproto/api'
 import {type DidString} from '@atproto/syntax'
 import {
   type InfiniteData,
@@ -72,7 +71,7 @@ export function useProfileFollowsQuery(
 export function* findAllProfilesInQueryData(
   queryClient: QueryClient,
   did: string,
-): Generator<AppBskyActorDefs.ProfileView, void> {
+): Generator<app.bsky.actor.defs.ProfileView, void> {
   const queryDatas = queryClient.getQueriesData<
     InfiniteData<app.bsky.graph.getFollows.$OutputBody>
   >({
diff --git a/src/state/queries/profile-lists.ts b/src/state/queries/profile-lists.ts
index 3d795def0d..8f1087c245 100644
--- a/src/state/queries/profile-lists.ts
+++ b/src/state/queries/profile-lists.ts
@@ -1,11 +1,11 @@
 import {type DidString} from '@atproto/syntax'
+import {moderateUserList} from '@bsky.app/sdk/moderation'
 import {
   type InfiniteData,
   type QueryKey,
   useInfiniteQuery,
 } from '@tanstack/react-query'
 
-import {moderateUserList} from '#/lib/moderation/subjects'
 import {useAppviewClient} from '#/state/session'
 import {app} from '#/lexicons'
 import {useModerationOpts} from '../preferences/moderation-opts'
diff --git a/src/state/queries/profile.ts b/src/state/queries/profile.ts
index d673ba3230..faf4dbc3fe 100644
--- a/src/state/queries/profile.ts
+++ b/src/state/queries/profile.ts
@@ -1,15 +1,8 @@
 import {useCallback} from 'react'
-import {
-  type AppBskyActorDefs,
-  type AppBskyActorGetProfile,
-  type AppBskyActorGetProfiles,
-  type AppBskyGraphGetFollows,
-  AtUri,
-  type Un$Typed,
-} from '@atproto/api'
-import {type Client} from '@atproto/lex'
+import {type Client, type Un$Typed} from '@atproto/lex'
 import {
   type AtIdentifierString,
+  AtUri,
   type AtUriString,
   type DidString,
   toDatetimeString,
@@ -82,7 +75,7 @@ export function useProfileQuery({
 }) {
   const client = useAppviewClient()
   const {getUnstableProfile} = useUnstableProfileViewCache()
-  return useQuery<AppBskyActorDefs.ProfileViewDetailed>({
+  return useQuery<app.bsky.actor.defs.ProfileViewDetailed>({
     // WARNING
     // this staleTime is load-bearing
     // if you remove it, the UI infinite-loops
@@ -97,7 +90,7 @@ export function useProfileQuery({
     },
     placeholderData: () => {
       if (!did) return
-      return getUnstableProfile(did) as AppBskyActorDefs.ProfileViewDetailed
+      return getUnstableProfile(did) as app.bsky.actor.defs.ProfileViewDetailed
     },
     enabled: !!did,
   })
@@ -145,7 +138,7 @@ export function usePrefetchProfileQuery() {
 }
 
 interface ProfileUpdateParams {
-  profile: AppBskyActorDefs.ProfileViewDetailed
+  profile: app.bsky.actor.defs.ProfileViewDetailed
   updates:
     | Un$Typed<app.bsky.actor.profile.Main>
     | ((
@@ -153,7 +146,7 @@ interface ProfileUpdateParams {
       ) => Un$Typed<app.bsky.actor.profile.Main>)
   newUserAvatar?: ImageMeta | undefined | null
   newUserBanner?: ImageMeta | undefined | null
-  checkCommitted?: (res: AppBskyActorGetProfile.Response) => boolean
+  checkCommitted?: (profile: app.bsky.actor.getProfile.$OutputBody) => boolean
 }
 export function useProfileUpdateMutation() {
   const queryClient = useQueryClient()
@@ -213,21 +206,21 @@ export function useProfileUpdateMutation() {
         appviewClient,
         profile.did,
         checkCommitted ||
-          (res => {
+          (profile => {
             if (typeof newUserAvatar !== 'undefined') {
-              if (newUserAvatar === null && res.data.avatar) {
+              if (newUserAvatar === null && profile.avatar) {
                 // url hasn't cleared yet
                 return false
-              } else if (res.data.avatar === profile.avatar) {
+              } else if (profile.avatar === profile.avatar) {
                 // url hasn't changed yet
                 return false
               }
             }
             if (typeof newUserBanner !== 'undefined') {
-              if (newUserBanner === null && res.data.banner) {
+              if (newUserBanner === null && profile.banner) {
                 // url hasn't cleared yet
                 return false
-              } else if (res.data.banner === profile.banner) {
+              } else if (profile.banner === profile.banner) {
                 // url hasn't changed yet
                 return false
               }
@@ -236,8 +229,8 @@ export function useProfileUpdateMutation() {
               return true
             }
             return (
-              res.data.displayName === updates.displayName &&
-              res.data.description === updates.description
+              profile.displayName === updates.displayName &&
+              profile.description === updates.description
             )
           }),
       )
@@ -303,7 +296,7 @@ export function useProfileFollowMutationQueue(
       // Optimistically update profile follows cache for avatar displays
       if (currentAccount?.did) {
         type FollowsQueryData =
-          InfiniteData<AppBskyGraphGetFollows.OutputSchema>
+          InfiniteData<app.bsky.graph.getFollows.$OutputBody>
         queryClient.setQueryData<FollowsQueryData>(
           PROFILE_FOLLOWS_RQKEY(currentAccount.did),
           old => {
@@ -320,7 +313,7 @@ export function useProfileFollowMutationQueue(
                   {
                     ...old.pages[0],
                     follows: [
-                      profile as AppBskyActorDefs.ProfileView,
+                      profile as app.bsky.actor.defs.ProfileView,
                       ...old.pages[0].follows,
                     ],
                   },
@@ -344,7 +337,7 @@ export function useProfileFollowMutationQueue(
       if (finalFollowingUri) {
         void client
           .call(app.bsky.graph.getSuggestedFollowsByActor, {
-            actor: did as AtIdentifierString,
+            actor: did,
           })
           .then(res => {
             const dids = res.suggestions
@@ -388,9 +381,9 @@ function useProfileFollowMutation(
   const queryClient = useQueryClient()
   const {captureAction} = useProgressGuideControls()
 
-  return useMutation<{uri: string; cid: string}, Error, {did: string}>({
+  return useMutation<{uri: AtUriString; cid: string}, Error, {did: string}>({
     mutationFn: async ({did}) => {
-      let ownProfile: AppBskyActorDefs.ProfileViewDetailed | undefined
+      let ownProfile: app.bsky.actor.defs.ProfileViewDetailed | undefined
       if (currentAccount) {
         ownProfile = findProfileQueryData(queryClient, currentAccount.did)
       }
@@ -432,7 +425,7 @@ export function useProfileMuteMutationQueue(
 ) {
   const ax = useAnalytics()
   const queryClient = useQueryClient()
-  const did = profile.did as DidString
+  const did = profile.did
   const initialMuted = profile.viewer?.muted
   const muteMutation = useProfileMuteMutation()
   const unmuteMutation = useProfileUnmuteMutation()
@@ -490,7 +483,7 @@ export function useProfileMuteRepostsMutationQueue(
 ) {
   const ax = useAnalytics()
   const queryClient = useQueryClient()
-  const did = profile.did as DidString
+  const did = profile.did
   const initialMutedOnlyReposts = !!profile.viewer?.mutedOnlyReposts
   const muteRepostsMutation = useProfileMuteRepostsMutation()
   const unmuteMutation = useProfileUnmuteMutation()
@@ -644,7 +637,7 @@ function useProfileBlockMutation() {
   const {currentAccount} = useSession()
   const pdsClient = usePdsClient()
   const queryClient = useQueryClient()
-  return useMutation<{uri: string; cid: string}, Error, {did: string}>({
+  return useMutation<{uri: AtUriString; cid: string}, Error, {did: string}>({
     mutationFn: async ({did}) => {
       if (!currentAccount) {
         throw new Error('Not signed in')
@@ -686,32 +679,25 @@ function useProfileUnblockMutation() {
 async function whenAppViewReady(
   client: Client,
   actor: string,
-  fn: (res: AppBskyActorGetProfile.Response) => boolean,
+  fn: (profile: app.bsky.actor.getProfile.$OutputBody) => boolean,
 ) {
   await until(
     5, // 5 tries
     1e3, // 1s delay between tries
     fn,
-    /*
-     * `checkCommitted` callbacks are still written against the legacy
-     * `Response` envelope, so wrap the lex output until those consumers move.
-     */
-    async () => ({
-      success: true,
-      headers: {},
-      data: await client.call(app.bsky.actor.getProfile, {
+    async () =>
+      await client.call(app.bsky.actor.getProfile, {
         actor: actor as AtIdentifierString,
       }),
-    }),
   )
 }
 
 export function* findAllProfilesInQueryData(
   queryClient: QueryClient,
   did: string,
-): Generator<AppBskyActorDefs.ProfileViewDetailed, void> {
+): Generator<app.bsky.actor.defs.ProfileViewDetailed, void> {
   const profileQueryDatas =
-    queryClient.getQueriesData<AppBskyActorDefs.ProfileViewDetailed>({
+    queryClient.getQueriesData<app.bsky.actor.defs.ProfileViewDetailed>({
       queryKey: [RQKEY_ROOT],
     })
   for (const [_queryKey, queryData] of profileQueryDatas) {
@@ -723,7 +709,7 @@ export function* findAllProfilesInQueryData(
     }
   }
   const profilesQueryDatas =
-    queryClient.getQueriesData<AppBskyActorGetProfiles.OutputSchema>({
+    queryClient.getQueriesData<app.bsky.actor.getProfiles.$OutputBody>({
       queryKey: [profilesQueryKeyRoot],
     })
   for (const [_queryKey, queryData] of profilesQueryDatas) {
@@ -741,8 +727,8 @@ export function* findAllProfilesInQueryData(
 export function findProfileQueryData(
   queryClient: QueryClient,
   did: string,
-): AppBskyActorDefs.ProfileViewDetailed | undefined {
-  return queryClient.getQueryData<AppBskyActorDefs.ProfileViewDetailed>(
+): app.bsky.actor.defs.ProfileViewDetailed | undefined {
+  return queryClient.getQueryData<app.bsky.actor.defs.ProfileViewDetailed>(
     RQKEY(did),
   )
 }
diff --git a/src/state/queries/resolve-uri.ts b/src/state/queries/resolve-uri.ts
index 9ca0aab36d..ba2e9f933c 100644
--- a/src/state/queries/resolve-uri.ts
+++ b/src/state/queries/resolve-uri.ts
@@ -1,6 +1,5 @@
-import {AtUri} from '@atproto/api'
 import {type Client} from '@atproto/lex'
-import {type HandleString} from '@atproto/syntax'
+import {AtUri, type HandleString} from '@atproto/syntax'
 import {type QueryClient, queryOptions, useQuery} from '@tanstack/react-query'
 
 import {STALE} from '#/state/queries'
diff --git a/src/state/queries/search-posts-params.ts b/src/state/queries/search-posts-params.ts
index c2769b2295..6ed9ffea46 100644
--- a/src/state/queries/search-posts-params.ts
+++ b/src/state/queries/search-posts-params.ts
@@ -3,13 +3,11 @@
  * a free-text query. Kept free of React Native imports so it can be unit
  * tested in isolation (the search-posts query hook re-exports these).
  */
-
-import {type AppBskyFeedSearchPostsV2} from '@atproto/api'
-
 import {
   filtersToApiParams,
   type SearchFilters,
 } from '#/screens/Search/searchParams'
+import {type app} from '#/lexicons'
 
 const DATE_RE = /^\d{4}-\d{2}-\d{2}/
 
@@ -201,12 +199,31 @@ function mergeList(a?: string[], b?: string[]): string[] | undefined {
  * operator. v2 renames v1's singular operators to plural arrays, and `lang` to
  * `language`.
  */
+/**
+ * The filter subset of the `searchPostsV2` params, with the format-constrained
+ * strings (uri, at-identifier, language, datetime) left unbranded: every value
+ * here is parsed from user input, so the brand is asserted by the caller rather
+ * than re-validated here. `q`, `limit`, `cursor` and `sort` are the caller's.
+ */
+type SearchPostsV2FilterParams = {
+  [K in Exclude<
+    keyof app.bsky.feed.searchPostsV2.$Params,
+    'query' | 'limit' | 'cursor' | 'sort'
+  >]?: app.bsky.feed.searchPostsV2.$Params[K] extends
+    | readonly (infer _E)[]
+    | undefined
+    ? string[]
+    : app.bsky.feed.searchPostsV2.$Params[K] extends string | undefined
+      ? string
+      : app.bsky.feed.searchPostsV2.$Params[K]
+}
+
 export function buildSearchPostsV2Filters(
   embedded: Omit<ExtractedSearchParams, 'q'>,
   filters?: SearchFilters,
-): AppBskyFeedSearchPostsV2.QueryParams {
+): SearchPostsV2FilterParams {
   const apiFilters = filters ? filtersToApiParams(filters) : {}
-  const params: AppBskyFeedSearchPostsV2.QueryParams = {}
+  const params: SearchPostsV2FilterParams = {}
 
   const authors = mergeList(
     embedded.author ? [embedded.author] : undefined,
@@ -269,7 +286,7 @@ export function buildSearchPostsV2Filters(
 }
 
 /**
- * Consistent with timestamp parsing in @atproto/api. Only the date is used; the
+ * Only the date is used; the
  * time is appended here since the lexicon expects a datetime value.
  */
 const parseTimestamp = (value: string | undefined): string | undefined => {
diff --git a/src/state/queries/search-posts-v2.ts b/src/state/queries/search-posts-v2.ts
index 9716383654..e9a1178009 100644
--- a/src/state/queries/search-posts-v2.ts
+++ b/src/state/queries/search-posts-v2.ts
@@ -1,5 +1,6 @@
 import {useCallback, useMemo, useRef} from 'react'
-import {type AppBskyFeedDefs, AtUri} from '@atproto/api'
+import {AtUri} from '@atproto/syntax'
+import {moderatePost} from '@bsky.app/sdk/moderation'
 import {
   type InfiniteData,
   type QueryClient,
@@ -7,7 +8,6 @@ import {
   useInfiniteQuery,
 } from '@tanstack/react-query'
 
-import {moderatePost} from '#/lib/moderation/subjects'
 import {useModerationOpts} from '#/state/preferences/moderation-opts'
 import {useAppviewClient} from '#/state/session'
 import {type SearchFilters} from '#/screens/Search/searchParams'
@@ -180,7 +180,7 @@ export function useSearchPostsV2Query({
 export function* findAllPostsInQueryData(
   queryClient: QueryClient,
   uri: string,
-): Generator<AppBskyFeedDefs.PostView, undefined> {
+): Generator<app.bsky.feed.defs.PostView, undefined> {
   const queryDatas = queryClient.getQueriesData<
     InfiniteData<app.bsky.feed.searchPostsV2.$OutputBody>
   >({
diff --git a/src/state/queries/starter-packs.ts b/src/state/queries/starter-packs.ts
index 0c781bcfea..3a30b30caa 100644
--- a/src/state/queries/starter-packs.ts
+++ b/src/state/queries/starter-packs.ts
@@ -1,9 +1,4 @@
-import {
-  AppBskyFeedDefs,
-  AppBskyGraphDefs,
-  AppBskyGraphStarterpack,
-} from '@atproto/api'
-import {type Client, type LexValue} from '@atproto/lex'
+import {type Client} from '@atproto/lex'
 import {AtUri, type AtUriString, toDatetimeString} from '@atproto/syntax'
 import {RichText} from '@bsky.app/sdk/richtext'
 import {
@@ -57,7 +52,7 @@ export function useStarterPackQuery({
 }) {
   const client = useAppviewClient()
 
-  return useQuery<AppBskyGraphDefs.StarterPackView>({
+  return useQuery<app.bsky.graph.defs.StarterPackView>({
     queryKey: RQKEY(uri ? {uri} : {did, rkey}),
     queryFn: async () => {
       if (!uri) {
@@ -92,7 +87,7 @@ interface UseCreateStarterPackMutationParams {
   name: string
   description?: string
   profiles: bsky.profile.AnyProfileView[]
-  feeds?: AppBskyFeedDefs.GeneratorView[]
+  feeds?: app.bsky.feed.defs.GeneratorView[]
 }
 
 export function useCreateStarterPackMutation({
@@ -138,7 +133,7 @@ export function useCreateStarterPackMutation({
         descriptionFacets,
         // `createStarterPackList` returns a plain string uri
         list: listRes?.uri as AtUriString,
-        feeds: feeds?.map(f => ({uri: f.uri as AtUriString})),
+        feeds: feeds?.map(f => ({uri: f.uri})),
         createdAt: toDatetimeString(new Date()),
       })
     },
@@ -173,8 +168,8 @@ export function useEditStarterPackMutation({
     void,
     Error,
     UseCreateStarterPackMutationParams & {
-      currentStarterPack: AppBskyGraphDefs.StarterPackView
-      currentListItems: AppBskyGraphDefs.ListItemView[]
+      currentStarterPack: app.bsky.graph.defs.StarterPackView
+      currentListItems: app.bsky.graph.defs.ListItemView[]
     }
   >({
     mutationFn: async ({
@@ -262,7 +257,7 @@ export function useEditStarterPackMutation({
            * types the raw `putRecord` body as a `LexValue`, which the legacy
            * view interface does not structurally satisfy, hence the cast.
            */
-          feeds: feeds as unknown as LexValue,
+          feeds: feeds,
           createdAt: currentStarterPack.record.createdAt,
           updatedAt: new Date().toISOString(),
         },
@@ -373,33 +368,33 @@ async function whenAppViewReady(
 export function precacheStarterPack(
   queryClient: QueryClient,
   starterPack:
-    | AppBskyGraphDefs.StarterPackViewBasic
-    | AppBskyGraphDefs.StarterPackView,
+    | app.bsky.graph.defs.StarterPackViewBasic
+    | app.bsky.graph.defs.StarterPackView,
 ) {
-  if (!AppBskyGraphStarterpack.isRecord(starterPack.record)) {
+  if (!bsky.isType(app.bsky.graph.starterpack, starterPack.record)) {
     return
   }
 
-  let starterPackView: AppBskyGraphDefs.StarterPackView | undefined
-  if (AppBskyGraphDefs.isStarterPackView(starterPack)) {
+  let starterPackView: app.bsky.graph.defs.StarterPackView | undefined
+  if (bsky.isType(app.bsky.graph.defs.starterPackView, starterPack)) {
     starterPackView = starterPack
   } else if (
-    AppBskyGraphDefs.isStarterPackViewBasic(starterPack) &&
-    bsky.validate(starterPack.record, AppBskyGraphStarterpack.validateRecord)
+    bsky.isType(app.bsky.graph.defs.starterPackViewBasic, starterPack) &&
+    bsky.matches(app.bsky.graph.starterpack, starterPack.record)
   ) {
-    let feeds: AppBskyFeedDefs.GeneratorView[] | undefined
+    let feeds: app.bsky.feed.defs.GeneratorView[] | undefined
     if (starterPack.record.feeds) {
       feeds = []
       for (const feed of starterPack.record.feeds) {
         // note: types are wrong? claims to be `FeedItem`, but we actually
         // get un$typed `GeneratorView` objects here -sfn
-        if (bsky.validate(feed, AppBskyFeedDefs.validateGeneratorView)) {
+        if (bsky.matches(app.bsky.feed.defs.generatorView, feed)) {
           feeds.push(feed)
         }
       }
     }
 
-    const listView: AppBskyGraphDefs.ListViewBasic = {
+    const listView: app.bsky.graph.defs.ListViewBasic = {
       uri: starterPack.record.list,
       // This will be populated once the data from server is fetched
       cid: '',
diff --git a/src/state/queries/suggested-follows.ts b/src/state/queries/suggested-follows.ts
index 12f726baea..19f8cc11c4 100644
--- a/src/state/queries/suggested-follows.ts
+++ b/src/state/queries/suggested-follows.ts
@@ -1,5 +1,4 @@
 import {useCallback, useMemo} from 'react'
-import {type AppBskyActorDefs} from '@atproto/api'
 import {type DidString} from '@atproto/syntax'
 import {
   type InfiniteData,
@@ -103,7 +102,7 @@ export function useSuggestedFollowsByActorWithDismiss({
 export function* findAllProfilesInQueryData(
   queryClient: QueryClient,
   did: string,
-): Generator<AppBskyActorDefs.ProfileView, void> {
+): Generator<app.bsky.actor.defs.ProfileView, void> {
   yield* findAllProfilesInSuggestedFollowsQueryData(queryClient, did)
   yield* findAllProfilesInSuggestedFollowsByActorQueryData(queryClient, did)
 }
diff --git a/src/state/queries/threadgate/index.ts b/src/state/queries/threadgate/index.ts
index bd1a0f6b8c..c9b1740c0b 100644
--- a/src/state/queries/threadgate/index.ts
+++ b/src/state/queries/threadgate/index.ts
@@ -1,4 +1,3 @@
-import {type AppBskyFeedDefs} from '@atproto/api'
 import {type Client} from '@atproto/lex'
 import {AtUri, type HandleString} from '@atproto/syntax'
 import {useMutation, useQuery, useQueryClient} from '@tanstack/react-query'
@@ -67,7 +66,7 @@ export function useThreadgateViewQuery({
   initialData,
 }: {
   postUri?: string
-  initialData?: AppBskyFeedDefs.ThreadgateView
+  initialData?: app.bsky.feed.defs.ThreadgateView
 } = {}) {
   const getPost = useGetPost()
 
@@ -248,7 +247,7 @@ export function useSetThreadgateAllowMutation() {
       })
     },
     async onSuccess(_, {postUri, allow}) {
-      const data = await retry<AppBskyFeedDefs.ThreadgateView | undefined>(
+      const data = await retry<app.bsky.feed.defs.ThreadgateView | undefined>(
         5, // 5 tries
         _e => true,
         async () => {
diff --git a/src/state/queries/threadgate/util.ts b/src/state/queries/threadgate/util.ts
index 275611df1c..4e64835f4d 100644
--- a/src/state/queries/threadgate/util.ts
+++ b/src/state/queries/threadgate/util.ts
@@ -1,4 +1,3 @@
-import {type AppBskyFeedDefs} from '@atproto/api'
 import {type AtUriString, toDatetimeString} from '@atproto/syntax'
 
 import {type ThreadgateAllowUISetting} from '#/state/queries/threadgate/types'
@@ -12,7 +11,7 @@ import * as bsky from '#/types/bsky'
  * through `com.atproto.repo.putRecord`, whose body is typed as a lex `LexMap`.
  */
 export function threadgateViewToAllowUISetting(
-  threadgateView: AppBskyFeedDefs.ThreadgateView | undefined,
+  threadgateView: app.bsky.feed.defs.ThreadgateView | undefined,
 ): ThreadgateAllowUISetting[] {
   // Validate the record for clarity, since backwards compat code is a little confusing
   const threadgate =
diff --git a/src/state/queries/usePostThread/const.ts b/src/state/queries/usePostThread/const.ts
index 9b74361307..df7332cf25 100644
--- a/src/state/queries/usePostThread/const.ts
+++ b/src/state/queries/usePostThread/const.ts
@@ -1,27 +1,26 @@
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
-import {type AppBskyUnspeccedGetPostThreadV2} from '@atproto/api'
 
 /**
- * See the `below` param on {@link AppBskyUnspeccedGetPostThreadV2.QueryParams}
+ * See the `below` param on {@link app.bsky.unspecced.getPostThreadV2.$Params}
  */
 export const LINEAR_VIEW_BELOW = 10
 
 /**
- * See the `branchingFactor` param on {@link AppBskyUnspeccedGetPostThreadV2.QueryParams}
+ * See the `branchingFactor` param on {@link app.bsky.unspecced.getPostThreadV2.$Params}
  */
 export const LINEAR_VIEW_BF = 1
 
 /**
- * See the `below` param on {@link AppBskyUnspeccedGetPostThreadV2.QueryParams}
+ * See the `below` param on {@link app.bsky.unspecced.getPostThreadV2.$Params}
  */
 export const TREE_VIEW_BELOW = 4
 
 /**
- * See the `branchingFactor` param on {@link AppBskyUnspeccedGetPostThreadV2.QueryParams}
+ * See the `branchingFactor` param on {@link app.bsky.unspecced.getPostThreadV2.$Params}
  */
 export const TREE_VIEW_BF = undefined
 
 /**
- * See the `below` param on {@link AppBskyUnspeccedGetPostThreadV2.QueryParams}
+ * See the `below` param on {@link app.bsky.unspecced.getPostThreadV2.$Params}
  */
 export const TREE_VIEW_BELOW_DESKTOP = 6
diff --git a/src/state/queries/usePostThread/queryCache.ts b/src/state/queries/usePostThread/queryCache.ts
index 73a8575c6e..afc7465ceb 100644
--- a/src/state/queries/usePostThread/queryCache.ts
+++ b/src/state/queries/usePostThread/queryCache.ts
@@ -1,13 +1,6 @@
 import {useCallback} from 'react'
-import {
-  type $Typed,
-  type AppBskyActorDefs,
-  type AppBskyFeedDefs,
-  AppBskyUnspeccedDefs,
-  type AppBskyUnspeccedGetPostThreadOtherV2,
-  type AppBskyUnspeccedGetPostThreadV2,
-  AtUri,
-} from '@atproto/api'
+import {type $Typed} from '@atproto/lex'
+import {AtUri} from '@atproto/syntax'
 import {type QueryClient, useQueryClient} from '@tanstack/react-query'
 
 import {
@@ -36,6 +29,8 @@ import {
   embedViewRecordToPostView,
   getEmbeddedPost,
 } from '#/state/queries/util'
+import {app} from '#/lexicons'
+import * as bsky from '#/types/bsky'
 
 export function createCacheMutator({
   queryClient,
@@ -51,18 +46,18 @@ export function createCacheMutator({
   return {
     insertReplies(
       parentUri: string,
-      replies: AppBskyUnspeccedGetPostThreadV2.ThreadItem[],
+      replies: app.bsky.unspecced.getPostThreadV2.ThreadItem[],
     ) {
       /*
        * Main thread query mutator.
        */
-      queryClient.setQueryData<AppBskyUnspeccedGetPostThreadV2.OutputSchema>(
+      queryClient.setQueryData<app.bsky.unspecced.getPostThreadV2.$OutputBody>(
         postThreadQueryKey,
         data => {
           if (!data) return
           return {
             ...data,
-            thread: mutator<AppBskyUnspeccedGetPostThreadV2.ThreadItem>([
+            thread: mutator<app.bsky.unspecced.getPostThreadV2.ThreadItem>([
               ...data.thread,
             ]),
           }
@@ -72,15 +67,15 @@ export function createCacheMutator({
       /*
        * Additional replies query mutator.
        */
-      queryClient.setQueryData<AppBskyUnspeccedGetPostThreadOtherV2.OutputSchema>(
+      queryClient.setQueryData<app.bsky.unspecced.getPostThreadOtherV2.$OutputBody>(
         postThreadOtherQueryKey,
         data => {
           if (!data) return
           return {
             ...data,
-            thread: mutator<AppBskyUnspeccedGetPostThreadOtherV2.ThreadItem>([
-              ...data.thread,
-            ]),
+            thread: mutator<app.bsky.unspecced.getPostThreadOtherV2.ThreadItem>(
+              [...data.thread],
+            ),
           }
         },
       )
@@ -89,7 +84,10 @@ export function createCacheMutator({
         for (let i = 0; i < thread.length; i++) {
           const parent = thread[i]
 
-          if (!AppBskyUnspeccedDefs.isThreadItemPost(parent.value)) continue
+          if (
+            !bsky.isType(app.bsky.unspecced.defs.threadItemPost, parent.value)
+          )
+            continue
           if (parent.uri !== parentUri) continue
 
           /*
@@ -124,7 +122,8 @@ export function createCacheMutator({
           const isParentRoot = parent.depth === 0
           const isParentBelowRoot = parent.depth > 0
           const optimisticReply = replies.at(0)
-          const opIsReplier = AppBskyUnspeccedDefs.isThreadItemPost(
+          const opIsReplier = bsky.isType(
+            app.bsky.unspecced.defs.threadItemPost,
             optimisticReply?.value,
           )
             ? opDid === optimisticReply.value.post.author.did
@@ -172,8 +171,8 @@ export function createCacheMutator({
      * Unused atm, post shadow does the trick, but it would be nice to clean up
      * the whole sub-tree on deletes.
      */
-    deletePost(post: AppBskyUnspeccedGetPostThreadV2.ThreadItem) {
-      queryClient.setQueryData<AppBskyUnspeccedGetPostThreadV2.OutputSchema>(
+    deletePost(post: app.bsky.unspecced.getPostThreadV2.ThreadItem) {
+      queryClient.setQueryData<app.bsky.unspecced.getPostThreadV2.$OutputBody>(
         postThreadQueryKey,
         queryData => {
           if (!queryData) return
@@ -182,7 +181,10 @@ export function createCacheMutator({
 
           for (let i = 0; i < thread.length; i++) {
             const existingPost = thread[i]
-            if (!AppBskyUnspeccedDefs.isThreadItemPost(post.value)) continue
+            if (
+              !bsky.isType(app.bsky.unspecced.defs.threadItemPost, post.value)
+            )
+              continue
 
             if (existingPost.uri === post.uri) {
               const branch = getBranch(thread, i, existingPost.depth)
@@ -204,7 +206,7 @@ export function createCacheMutator({
 export function getThreadPlaceholder(
   queryClient: QueryClient,
   uri: string,
-): $Typed<AppBskyUnspeccedGetPostThreadV2.ThreadItem> | void {
+): $Typed<app.bsky.unspecced.getPostThreadV2.ThreadItem> | void {
   let partial
   for (let item of getThreadPlaceholderCandidates(queryClient, uri)) {
     /*
@@ -231,8 +233,8 @@ export function* getThreadPlaceholderCandidates(
   uri: string,
 ): Generator<
   $Typed<
-    Omit<AppBskyUnspeccedGetPostThreadV2.ThreadItem, 'value'> & {
-      value: $Typed<AppBskyUnspeccedDefs.ThreadItemPost>
+    Omit<app.bsky.unspecced.getPostThreadV2.ThreadItem, 'value'> & {
+      value: $Typed<app.bsky.unspecced.defs.ThreadItemPost>
     }
   >,
   void
@@ -276,10 +278,10 @@ export function* getThreadPlaceholderCandidates(
 export function* findAllPostsInQueryData(
   queryClient: QueryClient,
   uri: string,
-): Generator<AppBskyFeedDefs.PostView, void> {
+): Generator<app.bsky.feed.defs.PostView, void> {
   const atUri = new AtUri(uri)
   const queryDatas =
-    queryClient.getQueriesData<AppBskyUnspeccedGetPostThreadV2.OutputSchema>({
+    queryClient.getQueriesData<app.bsky.unspecced.getPostThreadV2.$OutputBody>({
       queryKey: [postThreadQueryKeyRoot],
     })
 
@@ -289,7 +291,7 @@ export function* findAllPostsInQueryData(
     const {thread} = queryData
 
     for (const item of thread) {
-      if (AppBskyUnspeccedDefs.isThreadItemPost(item.value)) {
+      if (bsky.isType(app.bsky.unspecced.defs.threadItemPost, item.value)) {
         if (didOrHandleUriMatches(atUri, item.value.post)) {
           yield item.value.post
         }
@@ -306,9 +308,9 @@ export function* findAllPostsInQueryData(
 export function* findAllProfilesInQueryData(
   queryClient: QueryClient,
   did: string,
-): Generator<AppBskyActorDefs.ProfileViewBasic, void> {
+): Generator<app.bsky.actor.defs.ProfileViewBasic, void> {
   const queryDatas =
-    queryClient.getQueriesData<AppBskyUnspeccedGetPostThreadV2.OutputSchema>({
+    queryClient.getQueriesData<app.bsky.unspecced.getPostThreadV2.$OutputBody>({
       queryKey: [postThreadQueryKeyRoot],
     })
 
@@ -318,7 +320,7 @@ export function* findAllProfilesInQueryData(
     const {thread} = queryData
 
     for (const item of thread) {
-      if (AppBskyUnspeccedDefs.isThreadItemPost(item.value)) {
+      if (bsky.isType(app.bsky.unspecced.defs.threadItemPost, item.value)) {
         if (item.value.post.author.did === did) {
           yield item.value.post.author
         }
@@ -337,14 +339,15 @@ export function useUpdatePostThreadThreadgateQueryCache() {
   const context = usePostThreadContext()
 
   return useCallback(
-    (threadgate: AppBskyFeedDefs.ThreadgateView) => {
+    (threadgate: app.bsky.feed.defs.ThreadgateView) => {
       if (!context) return
 
       function mutator<T>(thread: ApiThreadItem[]): T[] {
         for (let i = 0; i < thread.length; i++) {
           const item = thread[i]
 
-          if (!AppBskyUnspeccedDefs.isThreadItemPost(item.value)) continue
+          if (!bsky.isType(app.bsky.unspecced.defs.threadItemPost, item.value))
+            continue
 
           if (item.depth === 0) {
             thread.splice(i, 1, {
@@ -363,13 +366,13 @@ export function useUpdatePostThreadThreadgateQueryCache() {
         return thread as T[]
       }
 
-      qc.setQueryData<AppBskyUnspeccedGetPostThreadV2.OutputSchema>(
+      qc.setQueryData<app.bsky.unspecced.getPostThreadV2.$OutputBody>(
         context.postThreadQueryKey,
         data => {
           if (!data) return
           return {
             ...data,
-            thread: mutator<AppBskyUnspeccedGetPostThreadV2.ThreadItem>([
+            thread: mutator<app.bsky.unspecced.getPostThreadV2.ThreadItem>([
               ...data.thread,
             ]),
           }
diff --git a/src/state/queries/usePostThread/traversal.ts b/src/state/queries/usePostThread/traversal.ts
index 2aca5dfa96..107697f76f 100644
--- a/src/state/queries/usePostThread/traversal.ts
+++ b/src/state/queries/usePostThread/traversal.ts
@@ -1,4 +1,3 @@
-import {AppBskyUnspeccedDefs} from '@atproto/api'
 import {type ModerationOpts} from '@bsky.app/sdk/moderation'
 
 import {
@@ -15,6 +14,8 @@ import {
   storeTraversalMetadata,
 } from '#/state/queries/usePostThread/utils'
 import * as views from '#/state/queries/usePostThread/views'
+import {app} from '#/lexicons'
+import * as bsky from '#/types/bsky'
 
 export function sortAndAnnotateThreadItems(
   thread: ApiThreadItem[],
@@ -46,7 +47,7 @@ export function sortAndAnnotateThreadItems(
     let parentMetadata: TraversalMetadata | undefined
     let metadata: TraversalMetadata | undefined
 
-    if (AppBskyUnspeccedDefs.isThreadItemPost(item.value)) {
+    if (bsky.isType(app.bsky.unspecced.defs.threadItemPost, item.value)) {
       parentMetadata = metadatas.get(
         getPostRecord(item.value.post).reply?.parent?.uri || '',
       )
@@ -65,13 +66,24 @@ export function sortAndAnnotateThreadItems(
        * _up_ from there.
        */
     } else if (item.depth === 0) {
-      if (AppBskyUnspeccedDefs.isThreadItemNoUnauthenticated(item.value)) {
+      if (
+        bsky.isType(
+          app.bsky.unspecced.defs.threadItemNoUnauthenticated,
+          item.value,
+        )
+      ) {
         threadItems.push(views.threadPostNoUnauthenticated(item))
-      } else if (AppBskyUnspeccedDefs.isThreadItemNotFound(item.value)) {
+      } else if (
+        bsky.isType(app.bsky.unspecced.defs.threadItemNotFound, item.value)
+      ) {
         threadItems.push(views.threadPostNotFound(item))
-      } else if (AppBskyUnspeccedDefs.isThreadItemBlocked(item.value)) {
+      } else if (
+        bsky.isType(app.bsky.unspecced.defs.threadItemBlocked, item.value)
+      ) {
         threadItems.push(views.threadPostBlocked(item))
-      } else if (AppBskyUnspeccedDefs.isThreadItemPost(item.value)) {
+      } else if (
+        bsky.isType(app.bsky.unspecced.defs.threadItemPost, item.value)
+      ) {
         const post = views.threadPost({
           uri: item.uri,
           depth: item.depth,
@@ -85,7 +97,10 @@ export function sortAndAnnotateThreadItems(
           const parent = thread[pi]
 
           if (
-            AppBskyUnspeccedDefs.isThreadItemNoUnauthenticated(parent.value)
+            bsky.isType(
+              app.bsky.unspecced.defs.threadItemNoUnauthenticated,
+              parent.value,
+            )
           ) {
             const post = views.threadPostNoUnauthenticated(parent)
             post.ui = getThreadPostNoUnauthenticatedUI({
@@ -97,13 +112,22 @@ export function sortAndAnnotateThreadItems(
             threadItems.unshift(post)
             // for now, break parent traversal at first no-unauthed
             break parentTraversal
-          } else if (AppBskyUnspeccedDefs.isThreadItemNotFound(parent.value)) {
+          } else if (
+            bsky.isType(
+              app.bsky.unspecced.defs.threadItemNotFound,
+              parent.value,
+            )
+          ) {
             threadItems.unshift(views.threadPostNotFound(parent))
             break parentTraversal
-          } else if (AppBskyUnspeccedDefs.isThreadItemBlocked(parent.value)) {
+          } else if (
+            bsky.isType(app.bsky.unspecced.defs.threadItemBlocked, parent.value)
+          ) {
             threadItems.unshift(views.threadPostBlocked(parent))
             break parentTraversal
-          } else if (AppBskyUnspeccedDefs.isThreadItemPost(parent.value)) {
+          } else if (
+            bsky.isType(app.bsky.unspecced.defs.threadItemPost, parent.value)
+          ) {
             threadItems.unshift(
               views.threadPost({
                 uri: parent.uri,
@@ -123,16 +147,21 @@ export function sortAndAnnotateThreadItems(
        * we could.
        */
       const shouldBreak =
-        AppBskyUnspeccedDefs.isThreadItemNoUnauthenticated(item.value) ||
-        AppBskyUnspeccedDefs.isThreadItemNotFound(item.value) ||
-        AppBskyUnspeccedDefs.isThreadItemBlocked(item.value)
+        bsky.isType(
+          app.bsky.unspecced.defs.threadItemNoUnauthenticated,
+          item.value,
+        ) ||
+        bsky.isType(app.bsky.unspecced.defs.threadItemNotFound, item.value) ||
+        bsky.isType(app.bsky.unspecced.defs.threadItemBlocked, item.value)
 
       if (shouldBreak) {
         const branch = getBranch(thread, i, item.depth)
         // could insert tombstone
         i = branch.end
         continue traversal
-      } else if (AppBskyUnspeccedDefs.isThreadItemPost(item.value)) {
+      } else if (
+        bsky.isType(app.bsky.unspecced.defs.threadItemPost, item.value)
+      ) {
         if (parentMetadata) {
           /*
            * Set this value before incrementing the `repliesSeenCounter` later
@@ -180,7 +209,9 @@ export function sortAndAnnotateThreadItems(
             for (let ci = startIndex; ci <= branch.end; ci++) {
               const child = thread[ci]
 
-              if (AppBskyUnspeccedDefs.isThreadItemPost(child.value)) {
+              if (
+                bsky.isType(app.bsky.unspecced.defs.threadItemPost, child.value)
+              ) {
                 const childParentMetadata = metadatas.get(
                   getPostRecord(child.value.post).reply?.parent?.uri || '',
                 )
diff --git a/src/state/queries/usePostThread/types.ts b/src/state/queries/usePostThread/types.ts
index 561490c328..2c2548ff50 100644
--- a/src/state/queries/usePostThread/types.ts
+++ b/src/state/queries/usePostThread/types.ts
@@ -1,16 +1,10 @@
-import {
-  type AppBskyFeedDefs,
-  type AppBskyFeedPost,
-  type AppBskyFeedThreadgate,
-  type AppBskyUnspeccedDefs,
-  type AppBskyUnspeccedGetPostThreadOtherV2,
-  type AppBskyUnspeccedGetPostThreadV2,
-} from '@atproto/api'
 import {type ModerationDecision} from '@bsky.app/sdk/moderation'
 
+import {type app} from '#/lexicons'
+
 export type ApiThreadItem =
-  | AppBskyUnspeccedGetPostThreadV2.ThreadItem
-  | AppBskyUnspeccedGetPostThreadOtherV2.ThreadItem
+  | app.bsky.unspecced.getPostThreadV2.ThreadItem
+  | app.bsky.unspecced.getPostThreadOtherV2.ThreadItem
 
 export const postThreadQueryKeyRoot = 'post-thread-v2' as const
 
@@ -18,13 +12,13 @@ export const createPostThreadQueryKey = (props: PostThreadParams) =>
   [postThreadQueryKeyRoot, props] as const
 
 export const createPostThreadOtherQueryKey = (
-  props: Omit<AppBskyUnspeccedGetPostThreadOtherV2.QueryParams, 'anchor'> & {
+  props: Omit<app.bsky.unspecced.getPostThreadOtherV2.$Params, 'anchor'> & {
     anchor?: string
   },
 ) => [postThreadQueryKeyRoot, 'other', props] as const
 
 export type PostThreadParams = Pick<
-  AppBskyUnspeccedGetPostThreadV2.QueryParams,
+  app.bsky.unspecced.getPostThreadV2.$Params,
   'sort'
 > & {
   anchor?: string
@@ -33,9 +27,9 @@ export type PostThreadParams = Pick<
 
 export type UsePostThreadQueryResult = {
   hasOtherReplies: boolean
-  thread: AppBskyUnspeccedGetPostThreadV2.ThreadItem[]
-  threadgate?: Omit<AppBskyFeedDefs.ThreadgateView, 'record'> & {
-    record: AppBskyFeedThreadgate.Record
+  thread: app.bsky.unspecced.getPostThreadV2.ThreadItem[]
+  threadgate?: Omit<app.bsky.feed.defs.ThreadgateView, 'record'> & {
+    record: app.bsky.feed.threadgate.Main
   }
 }
 
@@ -45,9 +39,9 @@ export type ThreadItem =
       key: string
       uri: string
       depth: number
-      value: Omit<AppBskyUnspeccedDefs.ThreadItemPost, 'post'> & {
-        post: Omit<AppBskyFeedDefs.PostView, 'record'> & {
-          record: AppBskyFeedPost.Record
+      value: Omit<app.bsky.unspecced.defs.ThreadItemPost, 'post'> & {
+        post: Omit<app.bsky.feed.defs.PostView, 'record'> & {
+          record: app.bsky.feed.post.Main
         }
       }
       isBlurred: boolean
@@ -67,7 +61,7 @@ export type ThreadItem =
       key: string
       uri: string
       depth: number
-      value: AppBskyUnspeccedDefs.ThreadItemNoUnauthenticated
+      value: app.bsky.unspecced.defs.ThreadItemNoUnauthenticated
       ui: {
         showParentReplyLine: boolean
         showChildReplyLine: boolean
@@ -78,14 +72,14 @@ export type ThreadItem =
       key: string
       uri: string
       depth: number
-      value: AppBskyUnspeccedDefs.ThreadItemNotFound
+      value: app.bsky.unspecced.defs.ThreadItemNotFound
     }
   | {
       type: 'threadPostBlocked'
       key: string
       uri: string
       depth: number
-      value: AppBskyUnspeccedDefs.ThreadItemBlocked
+      value: app.bsky.unspecced.defs.ThreadItemBlocked
     }
   | {
       type: 'replyComposer'
diff --git a/src/state/queries/usePostThread/utils.ts b/src/state/queries/usePostThread/utils.ts
index be3be36b85..dde80db181 100644
--- a/src/state/queries/usePostThread/utils.ts
+++ b/src/state/queries/usePostThread/utils.ts
@@ -1,38 +1,24 @@
-import {
-  type AppBskyFeedDefs,
-  AppBskyFeedPost,
-  AppBskyFeedThreadgate,
-  AppBskyUnspeccedDefs,
-  type AppBskyUnspeccedGetPostThreadV2,
-  AtUri,
-} from '@atproto/api'
+import {AtUri} from '@atproto/syntax'
 
 import {
   type ApiThreadItem,
   type ThreadItem,
   type TraversalMetadata,
 } from '#/state/queries/usePostThread/types'
+import {app} from '#/lexicons'
 import {isDevMode} from '#/storage/hooks/dev-mode'
 import * as bsky from '#/types/bsky'
 
 export function getThreadgateRecord(
-  view: AppBskyUnspeccedGetPostThreadV2.OutputSchema['threadgate'],
+  view: app.bsky.unspecced.getPostThreadV2.$OutputBody['threadgate'],
 ) {
-  return bsky.dangerousIsType<AppBskyFeedThreadgate.Record>(
-    view?.record,
-    AppBskyFeedThreadgate.isRecord,
-  )
+  return bsky.isType(app.bsky.feed.threadgate, view?.record)
     ? view?.record
     : undefined
 }
 
-export function getRootPostAtUri(post: AppBskyFeedDefs.PostView) {
-  if (
-    bsky.dangerousIsType<AppBskyFeedPost.Record>(
-      post.record,
-      AppBskyFeedPost.isRecord,
-    )
-  ) {
+export function getRootPostAtUri(post: app.bsky.feed.defs.PostView) {
+  if (bsky.isType(app.bsky.feed.post, post.record)) {
     /**
      * If the record has no `reply` field, it is a root post.
      */
@@ -45,8 +31,8 @@ export function getRootPostAtUri(post: AppBskyFeedDefs.PostView) {
   }
 }
 
-export function getPostRecord(post: AppBskyFeedDefs.PostView) {
-  return post.record as AppBskyFeedPost.Record
+export function getPostRecord(post: app.bsky.feed.defs.PostView) {
+  return post.record as app.bsky.feed.post.Main
 }
 
 export function getTraversalMetadata({
@@ -60,7 +46,7 @@ export function getTraversalMetadata({
   nextItem?: ApiThreadItem
   parentMetadata?: TraversalMetadata
 }): TraversalMetadata {
-  if (!AppBskyUnspeccedDefs.isThreadItemPost(item.value)) {
+  if (!bsky.isType(app.bsky.unspecced.defs.threadItemPost, item.value)) {
     throw new Error(`Expected thread item to be a post`)
   }
   const repliesCount = item.value.post.replyCount || 0
diff --git a/src/state/queries/usePostThread/views.ts b/src/state/queries/usePostThread/views.ts
index af23ee2959..d03f49219c 100644
--- a/src/state/queries/usePostThread/views.ts
+++ b/src/state/queries/usePostThread/views.ts
@@ -1,20 +1,14 @@
-import {
-  type $Typed,
-  type AppBskyFeedDefs,
-  type AppBskyFeedPost,
-  type AppBskyUnspeccedDefs,
-  type AppBskyUnspeccedGetPostThreadV2,
-  AtUri,
-} from '@atproto/api'
-import {type ModerationOpts} from '@bsky.app/sdk/moderation'
+import {type $Typed} from '@atproto/lex'
+import {AtUri} from '@atproto/syntax'
+import {moderatePost, type ModerationOpts} from '@bsky.app/sdk/moderation'
 
-import {moderatePost} from '#/lib/moderation/subjects'
 import {makeProfileLink} from '#/lib/routes/links'
 import {
   type ApiThreadItem,
   type ThreadItem,
   type TraversalMetadata,
 } from '#/state/queries/usePostThread/types'
+import {type app} from '#/lexicons'
 
 export function threadPostNoUnauthenticated({
   uri,
@@ -26,7 +20,7 @@ export function threadPostNoUnauthenticated({
     key: uri,
     uri,
     depth,
-    value: value as AppBskyUnspeccedDefs.ThreadItemNoUnauthenticated,
+    value: value as app.bsky.unspecced.defs.ThreadItemNoUnauthenticated,
     // @ts-ignore populated by the traversal
     ui: {},
   }
@@ -42,7 +36,7 @@ export function threadPostNotFound({
     key: uri,
     uri,
     depth,
-    value: value as AppBskyUnspeccedDefs.ThreadItemNotFound,
+    value: value as app.bsky.unspecced.defs.ThreadItemNotFound,
   }
 }
 
@@ -56,7 +50,7 @@ export function threadPostBlocked({
     key: uri,
     uri,
     depth,
-    value: value as AppBskyUnspeccedDefs.ThreadItemBlocked,
+    value: value as app.bsky.unspecced.defs.ThreadItemBlocked,
   }
 }
 
@@ -69,7 +63,7 @@ export function threadPost({
 }: {
   uri: string
   depth: number
-  value: $Typed<AppBskyUnspeccedDefs.ThreadItemPost>
+  value: $Typed<app.bsky.unspecced.defs.ThreadItemPost>
   moderationOpts: ModerationOpts
   threadgateHiddenReplies: Set<string>
 }): Extract<ThreadItem, {type: 'threadPost'}> {
@@ -91,8 +85,8 @@ export function threadPost({
        * Do not spread anything here, load bearing for post shadow strict
        * equality reference checks.
        */
-      post: value.post as Omit<AppBskyFeedDefs.PostView, 'record'> & {
-        record: AppBskyFeedPost.Record
+      post: value.post as Omit<app.bsky.feed.defs.PostView, 'record'> & {
+        record: app.bsky.feed.post.Main
       },
     },
     isBlurred,
@@ -161,10 +155,10 @@ export function skeleton({
 }
 
 export function postViewToThreadPlaceholder(
-  post: AppBskyFeedDefs.PostView,
+  post: app.bsky.feed.defs.PostView,
 ): $Typed<
-  Omit<AppBskyUnspeccedGetPostThreadV2.ThreadItem, 'value'> & {
-    value: $Typed<AppBskyUnspeccedDefs.ThreadItemPost>
+  Omit<app.bsky.unspecced.getPostThreadV2.ThreadItem, 'value'> & {
+    value: $Typed<app.bsky.unspecced.defs.ThreadItemPost>
   }
 > {
   return {
diff --git a/src/state/queries/util.ts b/src/state/queries/util.ts
index 7ea54745c0..a3fe12aec7 100644
--- a/src/state/queries/util.ts
+++ b/src/state/queries/util.ts
@@ -1,17 +1,11 @@
-import {
-  type AppBskyActorDefs,
-  AppBskyEmbedRecord,
-  AppBskyEmbedRecordWithMedia,
-  type AppBskyFeedDefs,
-  AppBskyFeedPost,
-  type AtUri,
-} from '@atproto/api'
+import {type AtUri} from '@atproto/syntax'
 import {
   type InfiniteData,
   type QueryClient,
   type QueryKey,
 } from '@tanstack/react-query'
 
+import {app} from '#/lexicons'
 import * as bsky from '#/types/bsky'
 
 export type StructuredQueryKey<T extends Record<string, unknown>> = readonly [
@@ -93,7 +87,7 @@ export async function truncateAndInvalidate<T = any>(
 // of the currentUri that is being checked.
 export function didOrHandleUriMatches(
   atUri: AtUri,
-  record: {uri: string; author: AppBskyActorDefs.ProfileViewBasic},
+  record: {uri: string; author: app.bsky.actor.defs.ProfileViewBasic},
 ) {
   if (atUri.host.startsWith('did:')) {
     return atUri.href === record.uri
@@ -104,26 +98,19 @@ export function didOrHandleUriMatches(
 
 export function getEmbeddedPost(
   v: unknown,
-): AppBskyEmbedRecord.ViewRecord | undefined {
-  if (
-    bsky.dangerousIsType<AppBskyEmbedRecord.View>(v, AppBskyEmbedRecord.isView)
-  ) {
+): app.bsky.embed.record.ViewRecord | undefined {
+  if (bsky.isType(app.bsky.embed.record.view, v)) {
     if (
-      AppBskyEmbedRecord.isViewRecord(v.record) &&
-      AppBskyFeedPost.isRecord(v.record.value)
+      bsky.isType(app.bsky.embed.record.viewRecord, v.record) &&
+      bsky.isType(app.bsky.feed.post, v.record.value)
     ) {
       return v.record
     }
   }
-  if (
-    bsky.dangerousIsType<AppBskyEmbedRecordWithMedia.View>(
-      v,
-      AppBskyEmbedRecordWithMedia.isView,
-    )
-  ) {
+  if (bsky.isType(app.bsky.embed.recordWithMedia.view, v)) {
     if (
-      AppBskyEmbedRecord.isViewRecord(v.record.record) &&
-      AppBskyFeedPost.isRecord(v.record.record.value)
+      bsky.isType(app.bsky.embed.record.viewRecord, v.record.record) &&
+      bsky.isType(app.bsky.feed.post, v.record.record.value)
     ) {
       return v.record.record
     }
@@ -131,8 +118,8 @@ export function getEmbeddedPost(
 }
 
 export function embedViewRecordToPostView(
-  v: AppBskyEmbedRecord.ViewRecord,
-): AppBskyFeedDefs.PostView {
+  v: app.bsky.embed.record.ViewRecord,
+): app.bsky.feed.defs.PostView {
   return {
     uri: v.uri,
     cid: v.cid,
diff --git a/src/state/queries/verification/useUpdateProfileVerificationCache.ts b/src/state/queries/verification/useUpdateProfileVerificationCache.ts
index 08da1244c5..6079457e2e 100644
--- a/src/state/queries/verification/useUpdateProfileVerificationCache.ts
+++ b/src/state/queries/verification/useUpdateProfileVerificationCache.ts
@@ -1,5 +1,4 @@
 import {useCallback} from 'react'
-import {type DidString} from '@atproto/syntax'
 import {useQueryClient} from '@tanstack/react-query'
 
 import {logger} from '#/logger'
@@ -25,7 +24,7 @@ export function useUpdateProfileVerificationCache() {
           return
         }
         const updated = await client.call(app.bsky.actor.getProfile, {
-          actor: profile.did as DidString,
+          actor: profile.did,
         })
         updateProfileShadow(qc, profile.did, {
           verification: updated.verification,
diff --git a/src/state/queries/verification/useVerificationCreateMutation.tsx b/src/state/queries/verification/useVerificationCreateMutation.tsx
index 4f1a318f48..cd52a62a1f 100644
--- a/src/state/queries/verification/useVerificationCreateMutation.tsx
+++ b/src/state/queries/verification/useVerificationCreateMutation.tsx
@@ -1,9 +1,4 @@
-import {
-  type AtIdentifierString,
-  type DidString,
-  type HandleString,
-  toDatetimeString,
-} from '@atproto/syntax'
+import {toDatetimeString} from '@atproto/syntax'
 import {useMutation} from '@tanstack/react-query'
 
 import {until} from '#/lib/async/until'
@@ -28,9 +23,9 @@ export function useVerificationCreateMutation() {
 
       const {uri} = await pdsClient.create(app.bsky.graph.verification, {
         // the profile view is still legacy-typed, so its strings are unbranded
-        subject: profile.did as DidString,
+        subject: profile.did,
         createdAt: toDatetimeString(new Date()),
-        handle: profile.handle as HandleString,
+        handle: profile.handle,
         displayName: profile.displayName || '',
       })
 
@@ -48,7 +43,7 @@ export function useVerificationCreateMutation() {
         },
         () => {
           return appviewClient.call(app.bsky.actor.getProfile, {
-            actor: (profile.did ?? '') as AtIdentifierString,
+            actor: profile.did ?? '',
           })
         },
       )
diff --git a/src/state/queries/verification/useVerificationsRemoveMutation.tsx b/src/state/queries/verification/useVerificationsRemoveMutation.tsx
index 657c50c909..0de675f0d2 100644
--- a/src/state/queries/verification/useVerificationsRemoveMutation.tsx
+++ b/src/state/queries/verification/useVerificationsRemoveMutation.tsx
@@ -1,5 +1,4 @@
-import {type AppBskyActorDefs} from '@atproto/api'
-import {type AtIdentifierString, AtUri} from '@atproto/syntax'
+import {AtUri} from '@atproto/syntax'
 import {useMutation} from '@tanstack/react-query'
 
 import {until} from '#/lib/async/until'
@@ -22,7 +21,7 @@ export function useVerificationsRemoveMutation() {
       verifications,
     }: {
       profile: bsky.profile.AnyProfileView
-      verifications: AppBskyActorDefs.VerificationView[]
+      verifications: app.bsky.actor.defs.VerificationView[]
     }) {
       if (!currentAccount) {
         throw new Error('User not logged in')
@@ -52,7 +51,7 @@ export function useVerificationsRemoveMutation() {
         () => {
           return appviewClient.call(app.bsky.actor.getProfile, {
             // the profile view is still legacy-typed, so its did is unbranded
-            actor: (profile.did ?? '') as AtIdentifierString,
+            actor: profile.did ?? '',
           })
         },
       )
diff --git a/src/state/session/moderation.ts b/src/state/session/moderation.ts
index 691aad4c81..c54da1be46 100644
--- a/src/state/session/moderation.ts
+++ b/src/state/session/moderation.ts
@@ -1,6 +1,6 @@
-import {BSKY_LABELER_DID} from '@atproto/api'
 import {type Client} from '@atproto/lex'
 import {type DidString} from '@atproto/syntax'
+import {api} from '@bsky.app/sdk'
 
 import {IS_TEST_USER} from '#/lib/constants'
 import {com} from '#/lexicons'
@@ -53,7 +53,7 @@ export function applyLabelersToClient(
   subscribedDids: string[],
 ) {
   client.setLabelers(
-    subscribedDids.filter(did => did !== BSKY_LABELER_DID) as DidString[],
+    subscribedDids.filter(did => did !== api.moderation.did) as DidString[],
   )
 }
 
@@ -94,7 +94,7 @@ export function configureModerationForAccount(
 }
 
 function switchToBskyAppLabeler() {
-  configureGlobalAppLabelers([BSKY_LABELER_DID])
+  configureGlobalAppLabelers([api.moderation.did])
 }
 
 /** Resolve and install the test environment's moderation authority. */
diff --git a/src/state/shell/composer/index.tsx b/src/state/shell/composer/index.tsx
index 087a3b348a..12e734bf6c 100644
--- a/src/state/shell/composer/index.tsx
+++ b/src/state/shell/composer/index.tsx
@@ -1,9 +1,4 @@
 import {createContext, useContext, useMemo, useState} from 'react'
-import {
-  type AppBskyActorDefs,
-  type AppBskyFeedDefs,
-  type AppBskyUnspeccedGetPostThreadV2,
-} from '@atproto/api'
 import {type ModerationDecision} from '@bsky.app/sdk/moderation'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
@@ -18,21 +13,22 @@ import {
   RQKEY_LINK_ROOT,
 } from '#/state/queries/resolve-link'
 import * as Toast from '#/components/Toast'
+import {type app} from '#/lexicons'
 
 export interface ComposerOptsPostRef {
   uri: string
   cid: string
   text: string
   langs?: string[]
-  author: AppBskyActorDefs.ProfileViewBasic
-  embed?: AppBskyFeedDefs.PostView['embed']
+  author: app.bsky.actor.defs.ProfileViewBasic
+  embed?: app.bsky.feed.defs.PostView['embed']
   moderation?: ModerationDecision
 }
 
 export type OnPostSuccessData =
   | {
       replyToUri?: string
-      posts: AppBskyUnspeccedGetPostThreadV2.ThreadItem[]
+      posts: app.bsky.unspecced.getPostThreadV2.ThreadItem[]
     }
   | undefined
 
@@ -48,7 +44,7 @@ export interface ComposerOpts {
   replyTo?: ComposerOptsPostRef
   onPost?: (postUri: string | undefined) => void
   onPostSuccess?: (data: OnPostSuccessData) => void
-  quote?: AppBskyFeedDefs.PostView
+  quote?: app.bsky.feed.defs.PostView
   mention?: string // handle of user to mention
   text?: string
   imageUris?: {uri: string; width: number; height: number; altText?: string}[]
diff --git a/src/state/threadgate-hidden-replies.tsx b/src/state/threadgate-hidden-replies.tsx
index 698b450ef2..8bdc462e2e 100644
--- a/src/state/threadgate-hidden-replies.tsx
+++ b/src/state/threadgate-hidden-replies.tsx
@@ -1,5 +1,6 @@
 import {createContext, useCallback, useContext, useMemo, useState} from 'react'
-import {type AppBskyFeedThreadgate} from '@atproto/api'
+
+import {type app} from '#/lexicons'
 
 type StateContext = {
   uris: Set<string>
@@ -74,7 +75,7 @@ export function useThreadgateHiddenReplyUrisAPI() {
 export function useMergedThreadgateHiddenReplies({
   threadgateRecord,
 }: {
-  threadgateRecord?: AppBskyFeedThreadgate.Record
+  threadgateRecord?: app.bsky.feed.threadgate.Main
 }) {
   const {uris, recentlyUnhiddenUris} = useThreadgateHiddenReplyUris()
   return useMemo(() => {
@@ -89,7 +90,7 @@ export function useMergedThreadgateHiddenReplies({
 export function useMergeThreadgateHiddenReplies() {
   const {uris, recentlyUnhiddenUris} = useThreadgateHiddenReplyUris()
   return useCallback(
-    (threadgate?: AppBskyFeedThreadgate.Record) => {
+    (threadgate?: app.bsky.feed.threadgate.Main) => {
       const set = new Set([...(threadgate?.hiddenReplies || []), ...uris])
       for (const uri of recentlyUnhiddenUris) {
         set.delete(uri)
diff --git a/src/state/unstable-post-source.tsx b/src/state/unstable-post-source.tsx
index c5b7d1c2bf..e374cbbeae 100644
--- a/src/state/unstable-post-source.tsx
+++ b/src/state/unstable-post-source.tsx
@@ -1,8 +1,9 @@
 import {useEffect, useId, useState} from 'react'
-import {type AppBskyFeedDefs, AtUri} from '@atproto/api'
+import {AtUri} from '@atproto/syntax'
 
 import {Logger} from '#/logger'
 import {type FeedSourceInfo} from '#/state/queries/feed'
+import {type app} from '#/lexicons'
 
 /**
  * Separate logger for better debugging
@@ -10,7 +11,7 @@ import {type FeedSourceInfo} from '#/state/queries/feed'
 const logger = Logger.create(Logger.Context.PostSource)
 
 export type PostSource = {
-  post: AppBskyFeedDefs.FeedViewPost
+  post: app.bsky.feed.defs.FeedViewPost
   feedSourceInfo?: FeedSourceInfo
 }
 
diff --git a/src/types/bsky/__tests__/index.test.ts b/src/types/bsky/__tests__/index.test.ts
index b0b4466b2c..ce7c98acab 100644
--- a/src/types/bsky/__tests__/index.test.ts
+++ b/src/types/bsky/__tests__/index.test.ts
@@ -1,5 +1,3 @@
-import {AppBskyFeedPost} from '@atproto/api'
-
 import {app} from '#/lexicons'
 import * as bsky from '#/types/bsky'
 
@@ -167,42 +165,3 @@ describe('types/bsky lexicon schema helpers (#/lexicons)', () => {
     })
   })
 })
-
-describe('types/bsky validator helpers (@atproto/api)', () => {
-  it('dangerousIsType accepts the right $type without validating the body', () => {
-    expect(
-      bsky.dangerousIsType<AppBskyFeedPost.Record>(
-        validPost,
-        AppBskyFeedPost.isRecord,
-      ),
-    ).toBe(true)
-    // Right $type, invalid body - still passes the fast guard.
-    expect(
-      bsky.dangerousIsType<AppBskyFeedPost.Record>(
-        invalidPost,
-        AppBskyFeedPost.isRecord,
-      ),
-    ).toBe(true)
-    expect(
-      bsky.dangerousIsType<AppBskyFeedPost.Record>(
-        wrongType,
-        AppBskyFeedPost.isRecord,
-      ),
-    ).toBe(false)
-  })
-
-  it('validate fully validates the body', () => {
-    expect(
-      bsky.validate<AppBskyFeedPost.Record>(
-        validPost,
-        AppBskyFeedPost.validateRecord,
-      ),
-    ).toBe(true)
-    expect(
-      bsky.validate<AppBskyFeedPost.Record>(
-        invalidPost,
-        AppBskyFeedPost.validateRecord,
-      ),
-    ).toBe(false)
-  })
-})
diff --git a/src/types/bsky/__tests__/post.test.ts b/src/types/bsky/__tests__/post.test.ts
index 6db1d23878..a19d9dda27 100644
--- a/src/types/bsky/__tests__/post.test.ts
+++ b/src/types/bsky/__tests__/post.test.ts
@@ -1,8 +1,3 @@
-import {
-  type $Typed as $TypedApi,
-  type AppBskyEmbedRecord,
-  type AppBskyFeedDefs,
-} from '@atproto/api'
 import {type $Typed} from '@atproto/lex'
 
 import {type app} from '#/lexicons'
@@ -109,38 +104,25 @@ const starterPackViewBasic = {
 const asEmbed = (v: unknown) => v as app.bsky.feed.defs.PostView['embed']
 
 /*
- * Type-level assertions for the dual-world widening. These are compile-time
- * only: each widened arm must accept both the `#/lexicons` view and the
- * `@atproto/api` view, and `parseEmbed` must accept a `PostView.embed` from
- * either world, because both worlds have live producers.
+ * Type-level assertions for the embed union. Compile-time only: each arm must
+ * accept the `#/lexicons` view of its def, and `parseEmbed` must accept a
+ * `PostView.embed`.
  */
 type Assignable<From, To> = From extends To ? true : false
 type Expect<T extends true> = T
 
-type _PostArmAcceptsNewWorld = Expect<
+type _PostArmAcceptsView = Expect<
   Assignable<
     {type: 'post'; view: $Typed<app.bsky.embed.record.ViewRecord>},
     EmbedType<'post'>
   >
 >
-type _PostArmAcceptsOldWorld = Expect<
-  Assignable<
-    {type: 'post'; view: $TypedApi<AppBskyEmbedRecord.ViewRecord>},
-    EmbedType<'post'>
-  >
->
-type _ParseEmbedAcceptsNewWorld = Expect<
+type _ParseEmbedAcceptsPostViewEmbed = Expect<
   Assignable<
     app.bsky.feed.defs.PostView['embed'],
     Parameters<typeof parseEmbed>[0]
   >
 >
-type _ParseEmbedAcceptsOldWorld = Expect<
-  Assignable<
-    AppBskyFeedDefs.PostView['embed'],
-    Parameters<typeof parseEmbed>[0]
-  >
->
 type _ParseEmbedReturnsEmbed = Expect<
   Assignable<ReturnType<typeof parseEmbed>, Embed>
 >
diff --git a/src/types/bsky/__tests__/starterPack.test.ts b/src/types/bsky/__tests__/starterPack.test.ts
index b973766f2e..161de2a867 100644
--- a/src/types/bsky/__tests__/starterPack.test.ts
+++ b/src/types/bsky/__tests__/starterPack.test.ts
@@ -1,5 +1,3 @@
-import {type AppBskyGraphDefs} from '@atproto/api'
-
 import {type app} from '#/lexicons'
 import {
   type AnyStarterPackView,
@@ -30,25 +28,19 @@ const fullView = {
 }
 
 /*
- * Type-level assertions for the dual-world widening: the alias must accept a
- * starter pack view from either world, because both have live producers. These
- * are compile-time only - a failure surfaces as a typecheck error.
+ * Type-level assertions for the view alias: it must accept both the basic and
+ * the full starter pack view. Compile-time only - a failure surfaces as a
+ * typecheck error.
  */
 type Assignable<From, To> = From extends To ? true : false
 type Expect<T extends true> = T
 
-type _AcceptsNewBasicView = Expect<
+type _AcceptsBasicView = Expect<
   Assignable<app.bsky.graph.defs.StarterPackViewBasic, AnyStarterPackView>
 >
-type _AcceptsNewFullView = Expect<
+type _AcceptsFullView = Expect<
   Assignable<app.bsky.graph.defs.StarterPackView, AnyStarterPackView>
 >
-type _AcceptsOldBasicView = Expect<
-  Assignable<AppBskyGraphDefs.StarterPackViewBasic, AnyStarterPackView>
->
-type _AcceptsOldFullView = Expect<
-  Assignable<AppBskyGraphDefs.StarterPackView, AnyStarterPackView>
->
 
 describe('types/bsky/starterPack guards', () => {
   describe('isBasicView', () => {
diff --git a/src/types/bsky/index.ts b/src/types/bsky/index.ts
index 1d498bc130..278c1c1079 100644
--- a/src/types/bsky/index.ts
+++ b/src/types/bsky/index.ts
@@ -10,71 +10,15 @@ import {
   type ValidateOptions,
   type ValidationResult,
 } from '@atproto/lex'
-import {type ValidationResult as LegacyValidationResult} from '@atproto/lexicon'
 
 export * as post from '#/types/bsky/post'
 export * as profile from '#/types/bsky/profile'
 export * as starterPack from '#/types/bsky/starterPack'
 
-/**
- * Fast type checking without full schema validation, for use with data we
- * trust, or for non-critical path use cases. Why? Our SDK's `is*` identity
- * utils do not assert the type of the entire object, only the `$type` string.
- *
- * For full validation of the object schema, use the `validate` export from
- * this file.
- *
- * Usage:
- * ```ts
- * import * as bsky from '#/types/bsky'
- *
- * if (bsky.dangerousIsType<AppBskyFeedPost.Record>(item, AppBskyFeedPost.isRecord)) {
- *   // `item` has type `$Typed<AppBskyFeedPost.Record>` here
- * }
- * ```
- */
-export function dangerousIsType<R extends {$type?: string}>(
-  record: unknown,
-  identity: <V>(v: V) => v is V & {$type: NonNullable<R['$type']>},
-): record is R {
-  return identity(record)
-}
-
-/**
- * Fully validates the object schema, which has a performance cost.
- *
- * For faster checks with data we trust, like that from our app view, use the
- * `dangerousIsType` export from this same file.
- *
- * Usage:
- * ```ts
- * import * as bsky from '#/types/bsky'
- *
- * if (bsky.validate(item, AppBskyFeedPost.validateRecord)) {
- *   // `item` has type `$Typed<AppBskyFeedPost.Record>` here
- * }
- * ```
- */
-export function validate<R extends {$type?: string}>(
-  record: unknown,
-  validator: (v: unknown) => LegacyValidationResult<R>,
-): record is R {
-  return validator(record).success
-}
-
 /*
- * Two families of helpers live in this file, distinguished by the validation
- * surface they consume.
- *
- * `dangerousIsType` and `validate` (above) operate on the standalone
- * `is*`/`validate*` functions exported by '@atproto/api' - the record and the
- * validator are passed separately, e.g.
- * `dangerousIsType(v, AppBskyFeedPost.isRecord)`.
- *
- * `isType`, `matches`, `parse`, and `safeParse` (below) operate on the
- * generated lexicon schema objects from '#/lexicons'. That codegen attaches
- * the validation surface directly to each schema, so these helpers take the
- * schema object itself:
+ * These helpers operate on the generated lexicon schema objects from
+ * '#/lexicons'. The codegen attaches the validation surface directly to each
+ * schema, so these helpers take the schema object itself:
  *
  * ```ts
  * import {app} from '#/lexicons'
@@ -104,9 +48,8 @@ type TypedSchema = RecordSchema | TypedObjectSchema
  * string; it does NOT assert the rest of the object matches the schema. An
  * invalid record with the right `$type` will pass.
  *
- * This is the '#/lexicons' equivalent of {@link dangerousIsType}. For full
- * validation of the object schema, use {@link matches}, {@link parse}, or
- * {@link safeParse} from this same file.
+ * For full validation of the object schema, use {@link matches}, {@link parse},
+ * or {@link safeParse} from this same file.
  *
  * Usage:
  * ```ts
@@ -126,10 +69,9 @@ export function isType<S extends TypedSchema>(
    * Deliberately NOT delegating to the schema's `isTypeOf`: the generated
    * `TypedObjectSchema.isTypeOf` treats a MISSING `$type` as a match
    * (maybe-typed semantics), which would let any plain object satisfy any
-   * def-schema check and break `$type`-discriminated unions. The old
-   * `dangerousIsType` required a present, matching `$type`, and so do we.
-   * The nullish/object guard also mirrors the old `is$typed` behavior of
-   * returning false (not throwing) for null/undefined input.
+   * def-schema check and break `$type`-discriminated unions. We require a
+   * present, matching `$type`. The nullish/object guard also returns false
+   * (not throws) for null/undefined input.
    */
   return (
     value != null &&
@@ -142,9 +84,8 @@ export function isType<S extends TypedSchema>(
  * Fully validates the object against the schema (strict, no coercion), which
  * has a performance cost, and narrows the value on success.
  *
- * This is the '#/lexicons' equivalent of {@link validate}. For faster checks
- * with data we trust, like that from our app view, use {@link isType} from this
- * same file.
+ * For faster checks with data we trust, like that from our app view, use
+ * {@link isType} from this same file.
  *
  * Usage:
  * ```ts
@@ -166,7 +107,7 @@ export function matches<S extends Schema>(
 
 /**
  * Fully validates and parses the value against the schema, returning the typed
- * value or throwing a `LexValidationError` on failure. Parsing may apply
+ * value or throwing an `LexValidationError` on failure. Parsing may apply
  * schema transformations such as default values.
  *
  * Prefer {@link safeParse} where you want to branch on failure without a
diff --git a/src/types/bsky/post.ts b/src/types/bsky/post.ts
index 2c8e3f4d87..ed0d8a9d83 100644
--- a/src/types/bsky/post.ts
+++ b/src/types/bsky/post.ts
@@ -1,110 +1,56 @@
-import {
-  type $Typed as $TypedApi,
-  type AppBskyEmbedExternal,
-  type AppBskyEmbedGallery,
-  type AppBskyEmbedImages,
-  type AppBskyEmbedRecord,
-  type AppBskyEmbedVideo,
-  type AppBskyFeedDefs,
-  type AppBskyGraphDefs,
-  type AppBskyLabelerDefs,
-} from '@atproto/api'
 import {type $Typed} from '@atproto/lex'
 
 import {app} from '#/lexicons'
 import {isType} from '#/types/bsky'
 
-/*
- * Each `view` slot below accepts both the generated `#/lexicons` view and the
- * `@atproto/api` view of the same def, because both worlds have live producers:
- * `parseEmbed` narrows with the `#/lexicons` schemas and so returns new-world
- * views, while call sites that build an `Embed` by hand still pass views
- * produced through the `@atproto/api` agent.
- *
- * The two worlds share the same `$type` strings, so the guards in this file
- * narrow a value from either producer; only the static type differs.
- *
- * TODO: remove the @atproto/api arms once all producers emit #/lexicons views
- */
 export type Embed =
   | {
       type: 'post'
-      view:
-        | $Typed<app.bsky.embed.record.ViewRecord>
-        | $TypedApi<AppBskyEmbedRecord.ViewRecord>
+      view: $Typed<app.bsky.embed.record.ViewRecord>
     }
   | {
       type: 'post_not_found'
-      view:
-        | $Typed<app.bsky.embed.record.ViewNotFound>
-        | $TypedApi<AppBskyEmbedRecord.ViewNotFound>
+      view: $Typed<app.bsky.embed.record.ViewNotFound>
     }
   | {
       type: 'post_blocked'
-      view:
-        | $Typed<app.bsky.embed.record.ViewBlocked>
-        | $TypedApi<AppBskyEmbedRecord.ViewBlocked>
+      view: $Typed<app.bsky.embed.record.ViewBlocked>
     }
   | {
       type: 'post_detached'
-      view:
-        | $Typed<app.bsky.embed.record.ViewDetached>
-        | $TypedApi<AppBskyEmbedRecord.ViewDetached>
+      view: $Typed<app.bsky.embed.record.ViewDetached>
     }
   | {
       type: 'feed'
-      view:
-        | $Typed<app.bsky.feed.defs.GeneratorView>
-        | $TypedApi<AppBskyFeedDefs.GeneratorView>
+      view: $Typed<app.bsky.feed.defs.GeneratorView>
     }
   | {
       type: 'list'
-      view:
-        | $Typed<app.bsky.graph.defs.ListView>
-        | $TypedApi<AppBskyGraphDefs.ListView>
+      view: $Typed<app.bsky.graph.defs.ListView>
     }
   | {
       type: 'labeler'
-      view:
-        | $Typed<app.bsky.labeler.defs.LabelerView>
-        | $TypedApi<AppBskyLabelerDefs.LabelerView>
+      view: $Typed<app.bsky.labeler.defs.LabelerView>
     }
   | {
       type: 'starter_pack'
-      view:
-        | $Typed<app.bsky.graph.defs.StarterPackViewBasic>
-        | $TypedApi<AppBskyGraphDefs.StarterPackViewBasic>
+      view: $Typed<app.bsky.graph.defs.StarterPackViewBasic>
     }
   | {
       type: 'images'
-      /*
-       * Only the `@atproto/api` view, unlike the other arms: the ImageEmbed
-       * consumer reads `view.images` directly, and the `#/lexicons` view is
-       * assignable to this slot, so `parseEmbed`'s new-world value flows in
-       * while the consumer keeps a single structural shape to read from.
-       */
-      view: $TypedApi<AppBskyEmbedImages.View>
+      view: $Typed<app.bsky.embed.images.View>
     }
   | {
       type: 'gallery'
-      /*
-       * Old-world only for the same reason as the `images` arm above: the
-       * consumer narrows `view.items` with `AppBskyEmbedGallery.isViewImage`,
-       * which cannot narrow the new view's `Unknown$TypedObject` arm.
-       */
-      view: $TypedApi<AppBskyEmbedGallery.View>
+      view: $Typed<app.bsky.embed.gallery.View>
     }
   | {
       type: 'link'
-      view:
-        | $Typed<app.bsky.embed.external.View>
-        | $TypedApi<AppBskyEmbedExternal.View>
+      view: $Typed<app.bsky.embed.external.View>
     }
   | {
       type: 'video'
-      view:
-        | $Typed<app.bsky.embed.video.View>
-        | $TypedApi<AppBskyEmbedVideo.View>
+      view: $Typed<app.bsky.embed.video.View>
     }
   | {
       type: 'post_with_media'
@@ -169,15 +115,7 @@ export function parseEmbedRecordView({
   }
 }
 
-export function parseEmbed(
-  /*
-   * Accepts a `PostView.embed` from either world; the `#/lexicons` guards below
-   * narrow on `$type`, which is world-independent.
-   */
-  embed:
-    | app.bsky.feed.defs.PostView['embed']
-    | AppBskyFeedDefs.PostView['embed'],
-): Embed {
+export function parseEmbed(embed: app.bsky.feed.defs.PostView['embed']): Embed {
   if (isType(app.bsky.embed.images.view, embed)) {
     return {
       type: 'images',
diff --git a/src/types/bsky/profile.ts b/src/types/bsky/profile.ts
index 4231a6d0fe..edf1aa1c08 100644
--- a/src/types/bsky/profile.ts
+++ b/src/types/bsky/profile.ts
@@ -1,23 +1,10 @@
-import {type AppBskyActorDefs, type ChatBskyActorDefs} from '@atproto/api'
-
 import {type app, type chat} from '#/lexicons'
 
 /**
- * Matches any profile view exported by our SDK, in either world.
- *
- * Both the generated `#/lexicons` views and the `@atproto/api` views are
- * accepted because both are live producers: queries migrated to the lexicon
- * client emit the former, unmigrated ones emit the latter, and consumers of
- * this alias take profiles from both.
- *
- * TODO: remove the @atproto/api arms once all producers emit #/lexicons views
+ * Matches any profile view exported by our SDK.
  */
 export type AnyProfileView =
   | app.bsky.actor.defs.ProfileViewBasic
   | app.bsky.actor.defs.ProfileView
   | app.bsky.actor.defs.ProfileViewDetailed
   | chat.bsky.actor.defs.ProfileViewBasic
-  | AppBskyActorDefs.ProfileViewBasic
-  | AppBskyActorDefs.ProfileView
-  | AppBskyActorDefs.ProfileViewDetailed
-  | ChatBskyActorDefs.ProfileViewBasic
diff --git a/src/types/bsky/starterPack.ts b/src/types/bsky/starterPack.ts
index 23df0e4631..21cb4634df 100644
--- a/src/types/bsky/starterPack.ts
+++ b/src/types/bsky/starterPack.ts
@@ -1,23 +1,14 @@
-import {type AppBskyGraphDefs} from '@atproto/api'
-
 import {app} from '#/lexicons'
 
 /*
- * `$type`-only guards for starter pack views. They compare against the
- * `#/lexicons` schema's `$type` string rather than delegating to the schema's
- * `isTypeOf` (which treats a missing `$type` as a match), matching the
- * present-and-equal semantics of the old `@atproto/api`
- * `AppBskyGraphDefs.isStarterPackView*` helpers.
- *
- * The `$type` string is identical in both worlds, so a single check narrows a
- * value from either producer; the narrowed type is the union of both worlds'
- * views for the same reason {@link AnyStarterPackView} is.
+ * The generated `$type`-only guards. These match on a present, matching
+ * `$type` against the `#/lexicons` schema's `$type` string rather than
+ * delegating to the schema's `isTypeOf` (which treats a missing `$type` as a
+ * match).
  */
 export function isBasicView(
   v: unknown,
-): v is
-  | app.bsky.graph.defs.StarterPackViewBasic
-  | AppBskyGraphDefs.StarterPackViewBasic {
+): v is app.bsky.graph.defs.StarterPackViewBasic {
   return (
     v != null &&
     typeof v === 'object' &&
@@ -26,9 +17,7 @@ export function isBasicView(
   )
 }
 
-export function isView(
-  v: unknown,
-): v is app.bsky.graph.defs.StarterPackView | AppBskyGraphDefs.StarterPackView {
+export function isView(v: unknown): v is app.bsky.graph.defs.StarterPackView {
   return (
     v != null &&
     typeof v === 'object' &&
@@ -37,16 +26,8 @@ export function isView(
 }
 
 /**
- * Matches any starter pack view exported by our SDK, in either world.
- *
- * Both the generated `#/lexicons` views and the `@atproto/api` views are
- * accepted because both are live producers: queries migrated to the lexicon
- * client emit the former, unmigrated ones emit the latter.
- *
- * TODO: remove the @atproto/api arms once all producers emit #/lexicons views
+ * Matches any starter pack view exported by our SDK.
  */
 export type AnyStarterPackView =
   | app.bsky.graph.defs.StarterPackViewBasic
   | app.bsky.graph.defs.StarterPackView
-  | AppBskyGraphDefs.StarterPackViewBasic
-  | AppBskyGraphDefs.StarterPackView
diff --git a/src/view/com/composer/Composer.tsx b/src/view/com/composer/Composer.tsx
index 8108c41cd1..7a2a2f5484 100644
--- a/src/view/com/composer/Composer.tsx
+++ b/src/view/com/composer/Composer.tsx
@@ -44,14 +44,8 @@ import {useSafeAreaInsets} from 'react-native-safe-area-context'
 import {scheduleOnUI} from 'react-native-worklets'
 import * as FileSystem from 'expo-file-system'
 import {type ImagePickerAsset} from 'expo-image-picker'
-import {
-  AppBskyDraftCreateDraft,
-  AppBskyUnspeccedDefs,
-  AtUri,
-  ChatBskyGroupDefs,
-} from '@atproto/api'
-import {type Client} from '@atproto/lex'
-import {type AtUriString} from '@atproto/syntax'
+import {type Client, type UriString} from '@atproto/lex'
+import {AtUri, type AtUriString} from '@atproto/syntax'
 import {type RichText} from '@bsky.app/sdk/richtext'
 import {plural} from '@lingui/core/macro'
 import {Trans, useLingui} from '@lingui/react/macro'
@@ -78,6 +72,7 @@ import {useCallOnce} from '#/lib/once'
 import {type NavigationProp} from '#/lib/routes/types'
 import {cleanError} from '#/lib/strings/errors'
 import {colors} from '#/lib/styles'
+import {matchXrpcError} from '#/lib/xrpc-error'
 import {logger} from '#/logger'
 import {useDialogStateControlContext} from '#/state/dialogs'
 import {emitPostCreated} from '#/state/events'
@@ -149,7 +144,8 @@ import {
   IS_WEB_SAFARI,
 } from '#/env'
 import {type Gif} from '#/features/gifPicker/types'
-import {app} from '#/lexicons'
+import {app, chat} from '#/lexicons'
+import * as bsky from '#/types/bsky'
 import {BottomSheetPortalProvider} from '../../../../modules/bottom-sheet'
 import {
   draftToComposerPosts,
@@ -771,7 +767,9 @@ export const ComposePost = ({
 
   const getDraftSaveError = useCallback(
     (e: unknown): string => {
-      if (e instanceof AppBskyDraftCreateDraft.DraftLimitReachedError) {
+      if (
+        matchXrpcError(e, app.bsky.draft.createDraft) === 'DraftLimitReached'
+      ) {
         return l`You've reached the maximum number of drafts`
       }
       return l`Failed to save draft`
@@ -1010,7 +1008,7 @@ export const ComposePost = ({
   const hasUnavailableChatInvite = linkQueries.some(
     q =>
       q.data?.type === 'chat-invite' &&
-      !ChatBskyGroupDefs.isJoinLinkPreviewView(q.data.view),
+      !bsky.isType(chat.bsky.group.defs.joinLinkPreviewView, q.data.view),
   )
 
   const canPost =
@@ -1140,7 +1138,7 @@ export const ComposePost = ({
               }
               if (
                 !res.thread.every(p =>
-                  AppBskyUnspeccedDefs.isThreadItemPost(p.value),
+                  bsky.isType(app.bsky.unspecced.defs.threadItemPost, p.value),
                 )
               ) {
                 throw new Error(`composer: app view returned non-post items`)
@@ -1212,7 +1210,7 @@ export const ComposePost = ({
           const resolved = q.data
           if (
             resolved?.type === 'chat-invite' &&
-            ChatBskyGroupDefs.isJoinLinkPreviewView(resolved.view)
+            bsky.isType(chat.bsky.group.defs.joinLinkPreviewView, resolved.view)
           ) {
             ax.metric('groupchat:inviteLink:shared', {
               convoId: resolved.view.convoId,
@@ -1251,7 +1249,7 @@ export const ComposePost = ({
       void whenAppViewReady(client, initQuote.uri, res => {
         const anchor = res.thread.at(0)
         if (
-          AppBskyUnspeccedDefs.isThreadItemPost(anchor?.value) &&
+          bsky.isType(app.bsky.unspecced.defs.threadItemPost, anchor?.value) &&
           anchor.value.post.quoteCount !== initQuote.quoteCount
         ) {
           onPost?.(postUri)
@@ -1681,7 +1679,7 @@ let ComposerPost = memo(function ComposerPost({
 
   const onNewLink = useCallback(
     (uri: string) => {
-      dispatchPost({type: 'embed_add_uri', uri})
+      dispatchPost({type: 'embed_add_uri', uri: uri as UriString})
     },
     [dispatchPost],
   )
diff --git a/src/view/com/composer/ComposerReplyTo.tsx b/src/view/com/composer/ComposerReplyTo.tsx
index 00a108bb54..175cda7d30 100644
--- a/src/view/com/composer/ComposerReplyTo.tsx
+++ b/src/view/com/composer/ComposerReplyTo.tsx
@@ -1,13 +1,6 @@
 import {useCallback, useMemo, useState} from 'react'
 import {LayoutAnimation, Pressable, View} from 'react-native'
 import {Image} from 'expo-image'
-import {
-  AppBskyEmbedGallery,
-  AppBskyEmbedImages,
-  AppBskyEmbedRecord,
-  AppBskyEmbedRecordWithMedia,
-  AppBskyFeedPost,
-} from '@atproto/api'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
@@ -20,6 +13,8 @@ import {atoms as a, useTheme, utils, web} from '#/alf'
 import {QuoteEmbed} from '#/components/Post/Embed'
 import {ProfileBadges} from '#/components/ProfileBadges'
 import {Text} from '#/components/Typography'
+import {app} from '#/lexicons'
+import * as bsky from '#/types/bsky'
 import {parseEmbed} from '#/types/bsky/post'
 
 export function ComposerReplyTo({replyTo}: {replyTo: ComposerOptsPostRef}) {
@@ -39,15 +34,15 @@ export function ComposerReplyTo({replyTo}: {replyTo: ComposerOptsPostRef}) {
 
   const quoteEmbed = useMemo(() => {
     if (
-      AppBskyEmbedRecord.isView(embed) &&
-      AppBskyEmbedRecord.isViewRecord(embed.record) &&
-      AppBskyFeedPost.isRecord(embed.record.value)
+      bsky.isType(app.bsky.embed.record.view, embed) &&
+      bsky.isType(app.bsky.embed.record.viewRecord, embed.record) &&
+      bsky.isType(app.bsky.feed.post, embed.record.value)
     ) {
       return embed
     } else if (
-      AppBskyEmbedRecordWithMedia.isView(embed) &&
-      AppBskyEmbedRecord.isViewRecord(embed.record.record) &&
-      AppBskyFeedPost.isRecord(embed.record.record.value)
+      bsky.isType(app.bsky.embed.recordWithMedia.view, embed) &&
+      bsky.isType(app.bsky.embed.record.viewRecord, embed.record.record) &&
+      bsky.isType(app.bsky.feed.post, embed.record.record.value)
     ) {
       return embed.record
     }
@@ -61,20 +56,20 @@ export function ComposerReplyTo({replyTo}: {replyTo: ComposerOptsPostRef}) {
     : null
 
   const {images, totalNumber} = useMemo(() => {
-    if (AppBskyEmbedImages.isView(embed)) {
+    if (bsky.isType(app.bsky.embed.images.view, embed)) {
       return {images: embed.images, totalNumber: embed.images.length}
-    } else if (AppBskyEmbedGallery.isView(embed)) {
+    } else if (bsky.isType(app.bsky.embed.gallery.view, embed)) {
       return {
         images: galleryItemsToImages(embed.items),
         totalNumber: embed.items.length,
       }
-    } else if (AppBskyEmbedRecordWithMedia.isView(embed)) {
-      if (AppBskyEmbedImages.isView(embed.media)) {
+    } else if (bsky.isType(app.bsky.embed.recordWithMedia.view, embed)) {
+      if (bsky.isType(app.bsky.embed.images.view, embed.media)) {
         return {
           images: embed.media.images,
           totalNumber: embed.media.images.length,
         }
-      } else if (AppBskyEmbedGallery.isView(embed.media)) {
+      } else if (bsky.isType(app.bsky.embed.gallery.view, embed.media)) {
         return {
           images: galleryItemsToImages(embed.media.items),
           totalNumber: embed.media.items.length,
@@ -145,12 +140,12 @@ export function ComposerReplyTo({replyTo}: {replyTo: ComposerOptsPostRef}) {
 }
 
 function galleryItemsToImages(
-  items: AppBskyEmbedGallery.View['items'],
-): AppBskyEmbedImages.ViewImage[] {
+  items: app.bsky.embed.gallery.View['items'],
+): app.bsky.embed.images.ViewImage[] {
   // The reply-to thumbnail only renders up to 4 tiles; slicing here keeps
   // the existing layout switch valid for galleries up to 10 items.
   return items
-    .filter(AppBskyEmbedGallery.isViewImage)
+    .filter(item => bsky.isType(app.bsky.embed.gallery.viewImage, item))
     .slice(0, 4)
     .map(item => ({
       thumb: item.thumbnail,
@@ -164,7 +159,7 @@ function ComposerReplyToImages({
   images,
   totalNumber,
 }: {
-  images: AppBskyEmbedImages.ViewImage[]
+  images: app.bsky.embed.images.ViewImage[]
   totalNumber: number
 }) {
   const t = useTheme()
diff --git a/src/view/com/composer/ExternalEmbed.tsx b/src/view/com/composer/ExternalEmbed.tsx
index 0b14f16ed3..b39e1393f3 100644
--- a/src/view/com/composer/ExternalEmbed.tsx
+++ b/src/view/com/composer/ExternalEmbed.tsx
@@ -1,5 +1,6 @@
 import {useMemo} from 'react'
 import {type StyleProp, View, type ViewStyle} from 'react-native'
+import {type UriString} from '@atproto/lex'
 
 import {cleanError} from '#/lib/strings/errors'
 import {
@@ -32,9 +33,9 @@ export const ExternalEmbedGif = ({
     () =>
       data && {
         title: data.title ?? data.uri,
-        uri: data.uri,
+        uri: data.uri as UriString,
         description: data.description ?? '',
-        thumb: data.thumb?.source.path,
+        thumb: data.thumb?.source.path as UriString | undefined,
       },
     [data],
   )
@@ -80,7 +81,7 @@ export const ExternalEmbedLink = ({
   hasQuote,
   onRemove,
 }: {
-  uri: string
+  uri: UriString
   hasQuote: boolean
   onRemove: () => void
 }) => {
@@ -100,7 +101,8 @@ export const ExternalEmbedLink = ({
                 description:
                   data.view?.external?.description || data.description,
                 // prefer opengraph data to atproto record-derived image
-                thumb: data.thumb?.source.path || data.view?.external?.thumb,
+                thumb: (data.thumb?.source.path ||
+                  data.view?.external?.thumb) as UriString | undefined,
               }}
             />
           )
@@ -111,7 +113,7 @@ export const ExternalEmbedLink = ({
               title: data.title || uri,
               uri,
               description: data.description,
-              thumb: data.thumb?.source.path,
+              thumb: data.thumb?.source.path as UriString | undefined,
             }}
             hideAlt
           />
diff --git a/src/view/com/composer/drafts/state/api.ts b/src/view/com/composer/drafts/state/api.ts
index 34fa4f6db4..2260e04bd0 100644
--- a/src/view/com/composer/drafts/state/api.ts
+++ b/src/view/com/composer/drafts/state/api.ts
@@ -1,7 +1,8 @@
 /**
  * Type converters for Draft API - convert between ComposerState and server Draft types.
  */
-import {AppBskyDraftDefs, AtUri} from '@atproto/api'
+import {type UriString} from '@atproto/lex'
+import {AtUri} from '@atproto/syntax'
 import {RichText} from '@bsky.app/sdk/richtext'
 import {nanoid} from 'nanoid/non-secure'
 
@@ -22,6 +23,8 @@ import {type VideoState} from '#/view/com/composer/state/video'
 import {type AnalyticsContextType} from '#/analytics'
 import {getDeviceId} from '#/analytics/identifiers'
 import {type Gif} from '#/features/gifPicker/types'
+import {app} from '#/lexicons'
+import * as bsky from '#/types/bsky'
 import {logger} from './logger'
 import {type DraftPostDisplay, type DraftSummary} from './schema'
 import * as storage from './storage'
@@ -63,18 +66,18 @@ export async function composerStateToDraft(
   clients: LinkResolvers,
   state: ComposerState,
 ): Promise<{
-  draft: AppBskyDraftDefs.Draft
+  draft: app.bsky.draft.defs.Draft
   localRefPaths: Map<string, string>
 }> {
   const localRefPaths = new Map<string, string>()
 
-  const posts: AppBskyDraftDefs.DraftPost[] = await Promise.all(
+  const posts: app.bsky.draft.defs.DraftPost[] = await Promise.all(
     state.thread.posts.map(post => {
       return postDraftToServerPost(clients, post, localRefPaths)
     }),
   )
 
-  const draft: AppBskyDraftDefs.Draft = {
+  const draft: app.bsky.draft.defs.Draft = {
     $type: 'app.bsky.draft.defs#draft',
     deviceId: getDeviceId(),
     deviceName: getDeviceName().slice(0, 100), // max length of 100 in lex
@@ -99,8 +102,8 @@ async function postDraftToServerPost(
   clients: LinkResolvers,
   post: PostDraft,
   localRefPaths: Map<string, string>,
-): Promise<AppBskyDraftDefs.DraftPost> {
-  const draftPost: AppBskyDraftDefs.DraftPost = {
+): Promise<app.bsky.draft.defs.DraftPost> {
+  const draftPost: app.bsky.draft.defs.DraftPost = {
     $type: 'app.bsky.draft.defs#draftPost',
     text: post.richtext.text,
   }
@@ -176,7 +179,7 @@ async function postDraftToServerPost(
 function serializeImages(
   images: ComposerImage[],
   localRefPaths: Map<string, string>,
-): AppBskyDraftDefs.DraftEmbedGalleryItems {
+): app.bsky.draft.defs.DraftEmbedGalleryItems {
   return images.map(image => {
     const sourcePath = image.transformed?.path || image.source.path
     // Reuse existing localRefPath if present (editing draft), otherwise generate new
@@ -208,7 +211,7 @@ function serializeImages(
 async function serializeVideo(
   videoState: VideoState,
   localRefPaths: Map<string, string>,
-): Promise<AppBskyDraftDefs.DraftEmbedVideo | undefined> {
+): Promise<app.bsky.draft.defs.DraftEmbedVideo | undefined> {
   // Only save videos that have been compressed (have a video file)
   if (!videoState.video) {
     return undefined
@@ -221,7 +224,7 @@ async function serializeVideo(
   localRefPaths.set(localRefPath, videoState.video.uri)
 
   // Read caption file contents as text
-  const captions: AppBskyDraftDefs.DraftEmbedCaption[] = []
+  const captions: app.bsky.draft.defs.DraftEmbedCaption[] = []
   for (const caption of videoState.captions) {
     if (caption.lang) {
       const content = await caption.file.text()
@@ -252,7 +255,7 @@ function serializeGif(gifMedia: {
   type: 'gif'
   gif: Gif
   alt: string
-}): AppBskyDraftDefs.DraftEmbedExternal | undefined {
+}): app.bsky.draft.defs.DraftEmbedExternal | undefined {
   const gif = gifMedia.gif
   const gifFormat = gif.media_formats.gif || gif.media_formats.tinygif
 
@@ -273,7 +276,7 @@ function serializeGif(gifMedia: {
 
   return {
     $type: 'app.bsky.draft.defs#draftEmbedExternal',
-    uri: url.toString(),
+    uri: url.toString() as UriString,
   }
 }
 
@@ -282,7 +285,7 @@ function serializeGif(gifMedia: {
  * both the `embedImages` and `embedGallery` paths in draftToComposerPosts.
  */
 async function restoreDraftImages(
-  draftImages: AppBskyDraftDefs.DraftEmbedImage[],
+  draftImages: app.bsky.draft.defs.DraftEmbedImage[],
   loadedMedia: Map<string, string>,
 ): Promise<ComposerImage[]> {
   const imagePromises = draftImages.map(async img => {
@@ -338,7 +341,7 @@ export function draftViewToSummary({
   view,
   analytics,
 }: {
-  view: AppBskyDraftDefs.DraftView
+  view: app.bsky.draft.defs.DraftView
   analytics: AnalyticsContextType
 }): DraftSummary {
   const meta = {
@@ -378,7 +381,7 @@ export function draftViewToSummary({
     // Process gallery
     if (post.embedGallery) {
       for (const item of post.embedGallery.items) {
-        if (!AppBskyDraftDefs.isDraftEmbedImage(item)) continue
+        if (!bsky.isType(app.bsky.draft.defs.draftEmbedImage, item)) continue
         meta.mediaCount++
         meta.hasMedia = true
         const exists = storage.mediaExists(item.localRef.path)
@@ -494,7 +497,7 @@ function parseGifFromUrl(
  * by initiating video processing for each entry.
  */
 export async function draftToComposerPosts(
-  draft: AppBskyDraftDefs.Draft,
+  draft: app.bsky.draft.defs.Draft,
   loadedMedia: Map<string, string>,
 ): Promise<{posts: PostDraft[]; restoredVideos: Map<number, RestoredVideo>}> {
   const restoredVideos = new Map<number, RestoredVideo>()
@@ -523,8 +526,8 @@ export async function draftToComposerPosts(
         )
       }
       if (post.embedGallery && post.embedGallery.items.length > 0) {
-        const galleryImages = post.embedGallery.items.filter(
-          AppBskyDraftDefs.isDraftEmbedImage,
+        const galleryImages = post.embedGallery.items.filter(item =>
+          bsky.isType(app.bsky.draft.defs.draftEmbedImage, item),
         )
         restoredImages.push(
           ...(await restoreDraftImages(galleryImages, loadedMedia)),
@@ -605,7 +608,7 @@ export async function draftToComposerPosts(
         const record = post.embedRecords[0]
         const urip = new AtUri(record.record.uri)
         const url = `https://bsky.app/profile/${urip.host}/post/${urip.rkey}`
-        embed.quote = {type: 'link', uri: url}
+        embed.quote = {type: 'link', uri: url as UriString}
       }
 
       // Restore link embed (only if not a GIF)
@@ -644,7 +647,7 @@ export async function draftToComposerPosts(
  * Convert server threadgate rules back to UI settings.
  */
 export function threadgateToUISettings(
-  threadgateAllow?: AppBskyDraftDefs.Draft['threadgateAllow'],
+  threadgateAllow?: app.bsky.draft.defs.Draft['threadgateAllow'],
 ): Array<{type: string; list?: string}> {
   if (!threadgateAllow) {
     return []
@@ -678,7 +681,9 @@ export function threadgateToUISettings(
  * Extract all localRef paths from a draft.
  * Used to identify which media files belong to a draft for cleanup.
  */
-export function extractLocalRefs(draft: AppBskyDraftDefs.Draft): Set<string> {
+export function extractLocalRefs(
+  draft: app.bsky.draft.defs.Draft,
+): Set<string> {
   const refs = new Set<string>()
   for (const post of draft.posts) {
     if (post.embedImages) {
@@ -688,7 +693,7 @@ export function extractLocalRefs(draft: AppBskyDraftDefs.Draft): Set<string> {
     }
     if (post.embedGallery) {
       for (const item of post.embedGallery.items) {
-        if (!AppBskyDraftDefs.isDraftEmbedImage(item)) continue
+        if (!bsky.isType(app.bsky.draft.defs.draftEmbedImage, item)) continue
         refs.add(item.localRef.path)
       }
     }
diff --git a/src/view/com/composer/drafts/state/queries.ts b/src/view/com/composer/drafts/state/queries.ts
index a620f0ec0f..7f4840c7bf 100644
--- a/src/view/com/composer/drafts/state/queries.ts
+++ b/src/view/com/composer/drafts/state/queries.ts
@@ -1,4 +1,3 @@
-import {AppBskyDraftDefs} from '@atproto/api'
 import {
   useInfiniteQuery,
   useMutation,
@@ -12,6 +11,7 @@ import {type ComposerState} from '#/view/com/composer/state/composer'
 import {useAnalytics} from '#/analytics'
 import {getDeviceId} from '#/analytics/identifiers'
 import {app} from '#/lexicons'
+import * as bsky from '#/types/bsky'
 import {composerStateToDraft, draftViewToSummary} from './api'
 import {logger} from './logger'
 import * as storage from './storage'
@@ -52,7 +52,9 @@ export function useDraftsQuery() {
  * Load a draft's local media for editing.
  * Takes the full Draft object (from DraftSummary) to avoid re-fetching.
  */
-export async function loadDraftMedia(draft: AppBskyDraftDefs.Draft): Promise<{
+export async function loadDraftMedia(
+  draft: app.bsky.draft.defs.Draft,
+): Promise<{
   loadedMedia: Map<string, string>
 }> {
   // Load local media files
@@ -81,7 +83,7 @@ export async function loadDraftMedia(draft: AppBskyDraftDefs.Draft): Promise<{
     // Load gallery
     if (post.embedGallery) {
       for (const item of post.embedGallery.items) {
-        if (!AppBskyDraftDefs.isDraftEmbedImage(item)) continue
+        if (!bsky.isType(app.bsky.draft.defs.draftEmbedImage, item)) continue
         try {
           const url = await storage.loadMediaFromLocal(item.localRef.path)
           loadedMedia.set(item.localRef.path, url)
@@ -142,11 +144,10 @@ export function useSaveDraftMutation() {
         composerState,
       )
       /*
-       * `composerStateToDraft` builds the draft against the `@atproto/api`
-       * types, whose string fields are unbranded, so it is asserted once here
-       * to the vendored input type.
+       * `composerStateToDraft` builds the draft with unbranded string fields,
+       * so it is asserted once here to the generated input type.
        */
-      const draft = apiDraft as unknown as app.bsky.draft.defs.Draft
+      const draft = apiDraft
 
       logger.debug('saving draft', {
         existingDraftId,
@@ -242,7 +243,7 @@ export function useDeleteDraftMutation() {
       draftId,
     }: {
       draftId: string
-      draft: AppBskyDraftDefs.Draft
+      draft: app.bsky.draft.defs.Draft
     }) => {
       // Delete from server first - if this fails, we keep local media for retry
       await client.call(app.bsky.draft.deleteDraft, {id: draftId})
@@ -257,7 +258,8 @@ export function useDeleteDraftMutation() {
         }
         if (post.embedGallery) {
           for (const item of post.embedGallery.items) {
-            if (!AppBskyDraftDefs.isDraftEmbedImage(item)) continue
+            if (!bsky.isType(app.bsky.draft.defs.draftEmbedImage, item))
+              continue
             await storage.deleteMediaFromLocal(item.localRef.path)
           }
         }
diff --git a/src/view/com/composer/drafts/state/schema.ts b/src/view/com/composer/drafts/state/schema.ts
index 9f88aa07da..25bba23152 100644
--- a/src/view/com/composer/drafts/state/schema.ts
+++ b/src/view/com/composer/drafts/state/schema.ts
@@ -1,8 +1,8 @@
+import {type app} from '#/lexicons'
 /**
  * Types for draft display and local media tracking.
- * Server draft types come from @atproto/api.
+ * Server draft types come from the generated `#/lexicons` modules.
  */
-import {type AppBskyDraftDefs} from '@atproto/api'
 
 /**
  * Reference to locally cached media file for display
@@ -55,7 +55,7 @@ export type DraftSummary = {
   /** ISO timestamp of last update */
   updatedAt: string
   /** The full draft data from the server */
-  draft: AppBskyDraftDefs.Draft
+  draft: app.bsky.draft.defs.Draft
   /** All posts in the draft for full display */
   posts: DraftPostDisplay[]
   /** Metadata about the draft for display purposes */
diff --git a/src/view/com/composer/state/composer.ts b/src/view/com/composer/state/composer.ts
index 34e6b69508..228f9a62ce 100644
--- a/src/view/com/composer/state/composer.ts
+++ b/src/view/com/composer/state/composer.ts
@@ -1,5 +1,5 @@
 import {type ImagePickerAsset} from 'expo-image-picker'
-import {type AppBskyActorDefs, type AppBskyDraftDefs} from '@atproto/api'
+import {type UriString} from '@atproto/lex'
 import {type AtUriString, toDatetimeString} from '@atproto/syntax'
 import {RichText} from '@bsky.app/sdk/richtext'
 import {nanoid} from 'nanoid/non-secure'
@@ -56,7 +56,12 @@ type GifMedia = {
 
 type Link = {
   type: 'link'
-  uri: string
+  /*
+   * A URL the user typed or pasted, validated by the link resolver rather than
+   * at construction, so it carries lex's `uri` brand for the record and view
+   * slots it flows into.
+   */
+  uri: UriString
 }
 
 // This structure doesn't exactly correspond to the data model.
@@ -91,7 +96,7 @@ export type PostAction =
     }
   | {type: 'embed_remove_video'}
   | {type: 'embed_update_video'; videoAction: VideoAction}
-  | {type: 'embed_add_uri'; uri: string}
+  | {type: 'embed_add_uri'; uri: UriString}
   | {type: 'embed_remove_quote'}
   | {type: 'embed_remove_link'}
   | {type: 'embed_add_gif'; gif: Gif}
@@ -141,8 +146,8 @@ export type ComposerAction =
       type: 'restore_from_draft'
       draftId: string
       posts: PostDraft[]
-      threadgateAllow: AppBskyDraftDefs.Draft['threadgateAllow']
-      postgateEmbeddingRules: AppBskyDraftDefs.Draft['postgateEmbeddingRules']
+      threadgateAllow: app.bsky.draft.defs.Draft['threadgateAllow']
+      postgateEmbeddingRules: app.bsky.draft.defs.Draft['postgateEmbeddingRules']
 
       /** Map of localRefPath -> loaded media path/URL */
       loadedMedia: Map<string, string>
@@ -152,7 +157,7 @@ export type ComposerAction =
   | {
       type: 'clear'
       initInteractionSettings:
-        | AppBskyActorDefs.PostInteractionSettingsPref
+        | app.bsky.actor.defs.PostInteractionSettingsPref
         | undefined
     }
   | {
@@ -320,14 +325,13 @@ export function composerReducer(
              * Draft records are still typed against the legacy client, so the
              * stored rules arrive unbranded. Wave B migrates the draft types.
              */
-            embeddingRules:
-              postgateEmbeddingRules as app.bsky.feed.postgate.Main['embeddingRules'],
+            embeddingRules: postgateEmbeddingRules,
           }),
           threadgate: threadgateRecordToAllowUISetting({
             $type: 'app.bsky.feed.threadgate',
             post: '' as AtUriString,
             createdAt: toDatetimeString(new Date()),
-            allow: threadgateAllow as app.bsky.feed.threadgate.Main['allow'],
+            allow: threadgateAllow,
           }),
         },
       }
@@ -632,7 +636,7 @@ export function createComposerState({
   initImageUris: ComposerOpts['imageUris']
   initQuoteUri: string | undefined
   initInteractionSettings:
-    | AppBskyActorDefs.PostInteractionSettingsPref
+    | app.bsky.actor.defs.PostInteractionSettingsPref
     | undefined
 }): ComposerState {
   let media: ImagesMedia | GalleryMedia | undefined
@@ -646,7 +650,7 @@ export function createComposerState({
     if (path) {
       quote = {
         type: 'link',
-        uri: toBskyAppUrl(path),
+        uri: toBskyAppUrl(path) as UriString,
       }
     }
   }
@@ -700,7 +704,7 @@ export function createComposerState({
     if (suggestedExtUri) {
       link = {
         type: 'link',
-        uri: suggestedExtUri,
+        uri: suggestedExtUri as UriString,
       }
     }
     const suggestedPostUri = suggestLinkCardUri(
@@ -717,7 +721,7 @@ export function createComposerState({
       if (!quote) {
         quote = {
           type: 'link',
-          uri: suggestedPostUri,
+          uri: suggestedPostUri as UriString,
         }
       }
     }
@@ -750,15 +754,13 @@ export function createComposerState({
          * Preferences are still typed against the legacy client, so the stored
          * rules arrive unbranded. Wave B migrates `getPreferences`.
          */
-        embeddingRules: (initInteractionSettings?.postgateEmbeddingRules ||
-          []) as app.bsky.feed.postgate.Main['embeddingRules'],
+        embeddingRules: initInteractionSettings?.postgateEmbeddingRules || [],
       }),
       threadgate: threadgateRecordToAllowUISetting({
         $type: 'app.bsky.feed.threadgate',
         post: '' as AtUriString,
         createdAt: toDatetimeString(new Date()),
-        allow:
-          initInteractionSettings?.threadgateAllowRules as app.bsky.feed.threadgate.Main['allow'],
+        allow: initInteractionSettings?.threadgateAllowRules,
       }),
     },
   }
diff --git a/src/view/com/composer/text-input/mobile/Autocomplete.tsx b/src/view/com/composer/text-input/mobile/Autocomplete.tsx
index 9621ebd82c..c2f80165a1 100644
--- a/src/view/com/composer/text-input/mobile/Autocomplete.tsx
+++ b/src/view/com/composer/text-input/mobile/Autocomplete.tsx
@@ -1,6 +1,5 @@
 import {View} from 'react-native'
 import Animated, {FadeInDown, FadeOut} from 'react-native-reanimated'
-import {type AppBskyActorDefs} from '@atproto/api'
 import {Trans} from '@lingui/react/macro'
 
 import {PressableScale} from '#/lib/custom-animations/PressableScale'
@@ -11,6 +10,7 @@ import {UserAvatar} from '#/view/com/util/UserAvatar'
 import {atoms as a, platform, useTheme} from '#/alf'
 import {ProfileBadges} from '#/components/ProfileBadges'
 import {Text} from '#/components/Typography'
+import {type app} from '#/lexicons'
 
 export function Autocomplete({
   prefix,
@@ -70,7 +70,7 @@ function AutocompleteProfileCard({
   totalItems,
   onPress,
 }: {
-  profile: AppBskyActorDefs.ProfileViewBasic
+  profile: app.bsky.actor.defs.ProfileViewBasic
   itemIndex: number
   totalItems: number
   onPress: () => void
diff --git a/src/view/com/composer/text-input/web/Autocomplete.tsx b/src/view/com/composer/text-input/web/Autocomplete.tsx
index 267d4a4829..945ce59adc 100644
--- a/src/view/com/composer/text-input/web/Autocomplete.tsx
+++ b/src/view/com/composer/text-input/web/Autocomplete.tsx
@@ -1,6 +1,5 @@
 import {forwardRef, useEffect, useImperativeHandle, useState} from 'react'
 import {Pressable, View} from 'react-native'
-import {type AppBskyActorDefs} from '@atproto/api'
 import {type ModerationOpts} from '@bsky.app/sdk/moderation'
 import {Trans} from '@lingui/react/macro'
 import {ReactRenderer} from '@tiptap/react'
@@ -16,6 +15,7 @@ import {type ActorAutocompleteFn} from '#/state/queries/actor-autocomplete'
 import {atoms as a, useTheme} from '#/alf'
 import * as ProfileCard from '#/components/ProfileCard'
 import {Text} from '#/components/Typography'
+import {type app} from '#/lexicons'
 
 interface MentionListRef {
   onKeyDown: (props: SuggestionKeyDownProps) => boolean
@@ -205,7 +205,7 @@ function AutocompleteProfileCard({
   onHover,
   moderationOpts,
 }: {
-  profile: AppBskyActorDefs.ProfileViewBasic
+  profile: app.bsky.actor.defs.ProfileViewBasic
   isSelected: boolean
   onPress: () => void
   onHover: () => void
diff --git a/src/view/com/composer/text-input/web/LinkDecorator.ts b/src/view/com/composer/text-input/web/LinkDecorator.ts
index 4843f0ddfc..bcb81b2cf5 100644
--- a/src/view/com/composer/text-input/web/LinkDecorator.ts
+++ b/src/view/com/composer/text-input/web/LinkDecorator.ts
@@ -14,7 +14,7 @@
  * the facet-set.
  */
 
-import {URL_REGEX} from '@atproto/api'
+import {URL_REGEX} from '@bsky.app/sdk/richtext'
 import {Mark} from '@tiptap/core'
 import {type Node as ProsemirrorNode} from '@tiptap/pm/model'
 import {Plugin, PluginKey} from '@tiptap/pm/state'
diff --git a/src/view/com/composer/text-input/web/TagDecorator.ts b/src/view/com/composer/text-input/web/TagDecorator.ts
index 8f1142b86c..34f6396abb 100644
--- a/src/view/com/composer/text-input/web/TagDecorator.ts
+++ b/src/view/com/composer/text-input/web/TagDecorator.ts
@@ -18,7 +18,7 @@ import {
   CASHTAG_REGEX,
   TAG_REGEX,
   TRAILING_PUNCTUATION_REGEX,
-} from '@atproto/api'
+} from '@bsky.app/sdk/richtext'
 import {Mark} from '@tiptap/core'
 import {type Node as ProsemirrorNode} from '@tiptap/pm/model'
 import {Plugin, PluginKey} from '@tiptap/pm/state'
diff --git a/src/view/com/feeds/FeedPage.tsx b/src/view/com/feeds/FeedPage.tsx
index 331c62e0d1..10572f9cba 100644
--- a/src/view/com/feeds/FeedPage.tsx
+++ b/src/view/com/feeds/FeedPage.tsx
@@ -7,7 +7,6 @@ import {
   useState,
 } from 'react'
 import {View} from 'react-native'
-import {type AppBskyActorDefs, AppBskyFeedDefs} from '@atproto/api'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {type NavigationProp, useNavigation} from '@react-navigation/native'
@@ -38,6 +37,7 @@ import {useHeaderOffset} from '#/components/hooks/useHeaderOffset'
 import {EditBig_Stroke2_Corner2_Rounded as EditBigIcon} from '#/components/icons/EditBig'
 import {useAnalytics} from '#/analytics'
 import {IS_NATIVE} from '#/env'
+import {app} from '#/lexicons'
 
 const POLL_FREQ = 60e3 // 60sec
 
@@ -59,7 +59,7 @@ export function FeedPage({
   isPageAdjacent: boolean
   renderEmptyState: () => JSX.Element
   renderEndOfFeed?: () => JSX.Element
-  savedFeedConfig?: AppBskyActorDefs.SavedFeed
+  savedFeedConfig?: app.bsky.actor.defs.SavedFeed
   feedInfo: FeedSourceInfo
 }) {
   const ax = useAnalytics()
@@ -77,7 +77,7 @@ export function FeedPage({
   const isVideoFeed = useMemo(() => {
     const isBskyVideoFeed = VIDEO_FEED_URIS.includes(feedInfo.uri)
     const feedIsVideoMode =
-      feedInfo.contentMode === AppBskyFeedDefs.CONTENTMODEVIDEO
+      feedInfo.contentMode === app.bsky.feed.defs.contentModeVideo.value
     const _isVideoFeed = isBskyVideoFeed || feedIsVideoMode
     return IS_NATIVE && _isVideoFeed
   }, [feedInfo])
diff --git a/src/view/com/feeds/FeedSourceCard.tsx b/src/view/com/feeds/FeedSourceCard.tsx
index ee62392556..ecc11c5864 100644
--- a/src/view/com/feeds/FeedSourceCard.tsx
+++ b/src/view/com/feeds/FeedSourceCard.tsx
@@ -1,10 +1,6 @@
 import {type StyleProp, View, type ViewStyle} from 'react-native'
-import {
-  type $Typed,
-  AppBskyFeedDefs,
-  type AppBskyGraphDefs,
-  AtUri,
-} from '@atproto/api'
+import {type $Typed} from '@atproto/lex'
+import {AtUri} from '@atproto/syntax'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Plural, Trans} from '@lingui/react/macro'
@@ -22,13 +18,15 @@ import {atoms as a, useTheme} from '#/alf'
 import {Link} from '#/components/Link'
 import {RichText} from '#/components/RichText'
 import {Text} from '#/components/Typography'
+import {app} from '#/lexicons'
+import * as bsky from '#/types/bsky'
 import {MissingFeed} from './MissingFeed'
 
 type FeedSourceCardProps = {
   feedUri: string
   feedData?:
-    | $Typed<AppBskyFeedDefs.GeneratorView>
-    | $Typed<AppBskyGraphDefs.ListView>
+    | $Typed<app.bsky.feed.defs.GeneratorView>
+    | $Typed<app.bsky.graph.defs.ListView>
   style?: StyleProp<ViewStyle>
   showSaveBtn?: boolean
   showDescription?: boolean
@@ -46,7 +44,7 @@ export function FeedSourceCard({
 }: FeedSourceCardProps) {
   if (feedData) {
     let feed: FeedSourceInfo
-    if (AppBskyFeedDefs.isGeneratorView(feedData)) {
+    if (bsky.isType(app.bsky.feed.defs.generatorView, feedData)) {
       feed = hydrateFeedGenerator(feedData)
     } else {
       feed = hydrateList(feedData)
diff --git a/src/view/com/feeds/MissingFeed.tsx b/src/view/com/feeds/MissingFeed.tsx
index bc2af31077..bd0f4f5948 100644
--- a/src/view/com/feeds/MissingFeed.tsx
+++ b/src/view/com/feeds/MissingFeed.tsx
@@ -1,5 +1,5 @@
 import {type StyleProp, View, type ViewStyle} from 'react-native'
-import {AtUri} from '@atproto/api'
+import {AtUri} from '@atproto/syntax'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
diff --git a/src/view/com/lists/ListMembers.tsx b/src/view/com/lists/ListMembers.tsx
index 04876eefb2..2f24dfec09 100644
--- a/src/view/com/lists/ListMembers.tsx
+++ b/src/view/com/lists/ListMembers.tsx
@@ -6,7 +6,6 @@ import {
   View,
   type ViewStyle,
 } from 'react-native'
-import {type AppBskyGraphDefs} from '@atproto/api'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
@@ -26,6 +25,7 @@ import {useDialogControl} from '#/components/Dialog'
 import {UserAddRemoveListsDialog} from '#/components/dialogs/lists/UserAddRemoveListsDialog'
 import {ListFooter} from '#/components/Lists'
 import * as ProfileCard from '#/components/ProfileCard'
+import {type app} from '#/lexicons'
 import type * as bsky from '#/types/bsky'
 
 const LOADING_ITEM = {kind: 'loading', _reactKey: '__loading__'} as const
@@ -43,7 +43,7 @@ type Item =
   | typeof LOAD_MORE_ERROR_ITEM
   | {
       kind: 'list_item'
-      listItem: AppBskyGraphDefs.ListItemView
+      listItem: app.bsky.graph.defs.ListItemView
     }
 
 export function ListMembers({
diff --git a/src/view/com/lists/MyLists.tsx b/src/view/com/lists/MyLists.tsx
index 0ec9828102..e1f5a607fd 100644
--- a/src/view/com/lists/MyLists.tsx
+++ b/src/view/com/lists/MyLists.tsx
@@ -7,7 +7,6 @@ import {
   View,
   type ViewStyle,
 } from 'react-native'
-import {type AppBskyGraphDefs as GraphDefs} from '@atproto/api'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 
@@ -21,6 +20,7 @@ import {atoms as a, useTheme} from '#/alf'
 import {BulletList_Stroke1_Corner0_Rounded as ListIcon} from '#/components/icons/BulletList'
 import * as ListCard from '#/components/ListCard'
 import {Text} from '#/components/Typography'
+import {type app} from '#/lexicons'
 import {ErrorMessage} from '../util/error/ErrorMessage'
 import {List} from '../util/List'
 
@@ -38,7 +38,10 @@ export function MyLists({
   filter: MyListsFilter
   inline?: boolean
   style?: StyleProp<ViewStyle>
-  renderItem?: (list: GraphDefs.ListView, index: number) => JSX.Element
+  renderItem?: (
+    list: app.bsky.graph.defs.ListView,
+    index: number,
+  ) => JSX.Element
   testID?: string
 }) {
   const pal = usePalette('default')
diff --git a/src/view/com/notifications/NotificationFeedItem.tsx b/src/view/com/notifications/NotificationFeedItem.tsx
index a10e4b47ac..e60640c9d6 100644
--- a/src/view/com/notifications/NotificationFeedItem.tsx
+++ b/src/view/com/notifications/NotificationFeedItem.tsx
@@ -8,18 +8,10 @@ import {
   TouchableOpacity,
   View,
 } from 'react-native'
-import {
-  type AppBskyActorDefs,
-  type AppBskyFeedDefs,
-  AppBskyFeedPost,
-  type AppBskyGraphDefs,
-  AppBskyGraphFollow,
-  AppBskyGraphStarterpack,
-  AtUri,
-} from '@atproto/api'
 import {TID} from '@atproto/common-web'
-import {type DidString} from '@atproto/syntax'
+import {AtUri, type DidString} from '@atproto/syntax'
 import {
+  moderateProfile,
   type ModerationDecision,
   type ModerationOpts,
 } from '@bsky.app/sdk/moderation'
@@ -30,7 +22,6 @@ import {useQueryClient} from '@tanstack/react-query'
 
 import {MAX_POST_LINES} from '#/lib/constants'
 import {useAnimatedValue} from '#/lib/hooks/useAnimatedValue'
-import {moderateProfile} from '#/lib/moderation/subjects'
 import {makeProfileLink} from '#/lib/routes/links'
 import {type NavigationProp} from '#/lib/routes/types'
 import {forceLTR} from '#/lib/strings/bidi'
@@ -76,13 +67,13 @@ import * as Toast from '#/components/Toast'
 import {Text} from '#/components/Typography'
 import {useAnalytics} from '#/analytics'
 import {IS_WEB} from '#/env'
-import {chat} from '#/lexicons'
+import {app, chat} from '#/lexicons'
 import * as bsky from '#/types/bsky'
 
 const MAX_AUTHORS = 5
 
 interface Author {
-  profile: AppBskyActorDefs.ProfileView
+  profile: app.bsky.actor.defs.ProfileView
   href: string
   moderation: ModerationDecision
 }
@@ -195,10 +186,7 @@ let NotificationFeedItem = ({
     if (item.type !== 'follow') return false
     if (
       item.notification.author.viewer?.following &&
-      bsky.dangerousIsType<AppBskyGraphFollow.Record>(
-        item.notification.record,
-        AppBskyGraphFollow.isRecord,
-      )
+      bsky.isType(app.bsky.graph.follow, item.notification.record)
     ) {
       let followingTimestamp
       try {
@@ -734,7 +722,7 @@ export {NotificationFeedItem}
 function FollowedViaStarterPack({
   starterPack,
 }: {
-  starterPack: AppBskyGraphDefs.StarterPackViewBasic
+  starterPack: app.bsky.graph.defs.StarterPackViewBasic
 }) {
   const t = useTheme()
   const link = useStarterPackLink({view: starterPack})
@@ -768,12 +756,9 @@ function FollowedViaStarterPack({
 }
 
 function getStarterPackName(
-  starterPack: AppBskyGraphDefs.StarterPackViewBasic,
+  starterPack: app.bsky.graph.defs.StarterPackViewBasic,
 ) {
-  return bsky.dangerousIsType<AppBskyGraphStarterpack.Record>(
-    starterPack.record,
-    AppBskyGraphStarterpack.isRecord,
-  )
+  return bsky.isType(app.bsky.graph.starterpack, starterPack.record)
     ? starterPack.record.name
     : undefined
 }
@@ -807,7 +792,11 @@ function ExpandListPressable({
   }
 }
 
-function FollowBackButton({profile}: {profile: AppBskyActorDefs.ProfileView}) {
+function FollowBackButton({
+  profile,
+}: {
+  profile: app.bsky.actor.defs.ProfileView
+}) {
   const {t: l} = useLingui()
   const {currentAccount, hasSession} = useSession()
   const profileShadow = useProfileShadow(profile)
@@ -913,7 +902,7 @@ function FollowBackButton({profile}: {profile: AppBskyActorDefs.ProfileView}) {
   )
 }
 
-function SayHelloBtn({profile}: {profile: AppBskyActorDefs.ProfileView}) {
+function SayHelloBtn({profile}: {profile: app.bsky.actor.defs.ProfileView}) {
   const {t: l} = useLingui()
   const client = useChatClient()
   const {currentAccount} = useSession()
@@ -1147,15 +1136,9 @@ function ExpandedAuthorProfileCard({
   )
 }
 
-function AdditionalPostText({post}: {post?: AppBskyFeedDefs.PostView}) {
+function AdditionalPostText({post}: {post?: app.bsky.feed.defs.PostView}) {
   const t = useTheme()
-  if (
-    post &&
-    bsky.dangerousIsType<AppBskyFeedPost.Record>(
-      post?.record,
-      AppBskyFeedPost.isRecord,
-    )
-  ) {
+  if (post && bsky.isType(app.bsky.feed.post, post?.record)) {
     const text = post.record.text
 
     return (
diff --git a/src/view/com/post-thread/PostLikedBy.tsx b/src/view/com/post-thread/PostLikedBy.tsx
index 48669d99ce..8f297d0428 100644
--- a/src/view/com/post-thread/PostLikedBy.tsx
+++ b/src/view/com/post-thread/PostLikedBy.tsx
@@ -1,5 +1,4 @@
 import {useCallback, useMemo, useState} from 'react'
-import {type AppBskyFeedGetLikes as GetLikes} from '@atproto/api'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 
@@ -11,8 +10,15 @@ import {useResolveUriQuery} from '#/state/queries/resolve-uri'
 import {ProfileCardWithFollowBtn} from '#/view/com/profile/ProfileCard'
 import {List} from '#/view/com/util/List'
 import {ListFooter, ListMaybePlaceholder} from '#/components/Lists'
+import {type app} from '#/lexicons'
 
-function renderItem({item, index}: {item: GetLikes.Like; index: number}) {
+function renderItem({
+  item,
+  index,
+}: {
+  item: app.bsky.feed.getLikes.Like
+  index: number
+}) {
   return (
     <ProfileCardWithFollowBtn
       key={item.actor.did}
@@ -22,7 +28,7 @@ function renderItem({item, index}: {item: GetLikes.Like; index: number}) {
   )
 }
 
-function keyExtractor(item: GetLikes.Like) {
+function keyExtractor(item: app.bsky.feed.getLikes.Like) {
   return item.actor.did
 }
 
diff --git a/src/view/com/post-thread/PostQuotes.tsx b/src/view/com/post-thread/PostQuotes.tsx
index 0bad7969c0..459bbc525e 100644
--- a/src/view/com/post-thread/PostQuotes.tsx
+++ b/src/view/com/post-thread/PostQuotes.tsx
@@ -1,12 +1,10 @@
 import {useCallback, useState} from 'react'
-import {type AppBskyFeedDefs, AppBskyFeedPost} from '@atproto/api'
-import {type ModerationDecision} from '@bsky.app/sdk/moderation'
+import {moderatePost, type ModerationDecision} from '@bsky.app/sdk/moderation'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 
 import {useInitialNumToRender} from '#/lib/hooks/useInitialNumToRender'
 import {usePostViewTracking} from '#/lib/hooks/usePostViewTracking'
-import {moderatePost} from '#/lib/moderation/subjects'
 import {cleanError} from '#/lib/strings/errors'
 import {logger} from '#/logger'
 import {useModerationOpts} from '#/state/preferences/moderation-opts'
@@ -14,6 +12,7 @@ import {usePostQuotesQuery} from '#/state/queries/post-quotes'
 import {useResolveUriQuery} from '#/state/queries/resolve-uri'
 import {Post} from '#/view/com/post/Post'
 import {ListFooter, ListMaybePlaceholder} from '#/components/Lists'
+import {app} from '#/lexicons'
 import * as bsky from '#/types/bsky'
 import {List} from '../util/List'
 
@@ -22,9 +21,9 @@ function renderItem({
   index,
 }: {
   item: {
-    post: AppBskyFeedDefs.PostView
+    post: app.bsky.feed.defs.PostView
     moderation: ModerationDecision
-    record: AppBskyFeedPost.Record
+    record: app.bsky.feed.post.Main
   }
   index: number
 }) {
@@ -32,9 +31,9 @@ function renderItem({
 }
 
 function keyExtractor(item: {
-  post: AppBskyFeedDefs.PostView
+  post: app.bsky.feed.defs.PostView
   moderation: ModerationDecision
-  record: AppBskyFeedPost.Record
+  record: app.bsky.feed.post.Main
 }) {
   return item.post.uri
 }
@@ -69,10 +68,7 @@ export function PostQuotes({uri}: {uri: string}) {
       .flatMap(page =>
         page.posts.map(post => {
           if (
-            !bsky.dangerousIsType<AppBskyFeedPost.Record>(
-              post.record,
-              AppBskyFeedPost.isRecord,
-            ) ||
+            !bsky.isType(app.bsky.feed.post, post.record) ||
             !moderationOpts
           ) {
             return null
diff --git a/src/view/com/post-thread/PostRepostedBy.tsx b/src/view/com/post-thread/PostRepostedBy.tsx
index 4c2db9eda0..06bdda13df 100644
--- a/src/view/com/post-thread/PostRepostedBy.tsx
+++ b/src/view/com/post-thread/PostRepostedBy.tsx
@@ -1,5 +1,4 @@
 import {useCallback, useMemo, useState} from 'react'
-import {type AppBskyActorDefs as ActorDefs} from '@atproto/api'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 
@@ -11,12 +10,13 @@ import {useResolveUriQuery} from '#/state/queries/resolve-uri'
 import {ProfileCardWithFollowBtn} from '#/view/com/profile/ProfileCard'
 import {List} from '#/view/com/util/List'
 import {ListFooter, ListMaybePlaceholder} from '#/components/Lists'
+import {type app} from '#/lexicons'
 
 function renderItem({
   item,
   index,
 }: {
-  item: ActorDefs.ProfileView
+  item: app.bsky.actor.defs.ProfileView
   index: number
 }) {
   return (
@@ -28,7 +28,7 @@ function renderItem({
   )
 }
 
-function keyExtractor(item: ActorDefs.ProfileView) {
+function keyExtractor(item: app.bsky.actor.defs.ProfileView) {
   return item.did
 }
 
diff --git a/src/view/com/post/Post.tsx b/src/view/com/post/Post.tsx
index 98f6cfb9a0..f9369ce0d4 100644
--- a/src/view/com/post/Post.tsx
+++ b/src/view/com/post/Post.tsx
@@ -1,16 +1,14 @@
 import {useCallback, useMemo, useState} from 'react'
 import {type StyleProp, StyleSheet, View, type ViewStyle} from 'react-native'
-import {type AppBskyFeedDefs, AppBskyFeedPost, AtUri} from '@atproto/api'
-import {type ModerationDecision} from '@bsky.app/sdk/moderation'
+import {AtUri} from '@atproto/syntax'
+import {moderatePost, type ModerationDecision} from '@bsky.app/sdk/moderation'
 import {RichText as RichTextAPI} from '@bsky.app/sdk/richtext'
 import {useQueryClient} from '@tanstack/react-query'
 
 import {MAX_POST_LINES} from '#/lib/constants'
 import {useOpenComposer} from '#/lib/hooks/useOpenComposer'
-import {moderatePost} from '#/lib/moderation/subjects'
 import {makeProfileLink} from '#/lib/routes/links'
 import {countLines} from '#/lib/strings/helpers'
-import {asSdkFacets} from '#/lib/strings/rich-text-helpers'
 import {
   POST_TOMBSTONE,
   type Shadow,
@@ -36,6 +34,7 @@ import {TranslatedPost} from '#/components/Post/Translated'
 import {PostControls} from '#/components/PostControls'
 import {RichText} from '#/components/RichText'
 import {SubtleHover} from '#/components/SubtleHover'
+import {app} from '#/lexicons'
 import * as bsky from '#/types/bsky'
 
 export function Post({
@@ -45,18 +44,16 @@ export function Post({
   style,
   onBeforePress,
 }: {
-  post: AppBskyFeedDefs.PostView
+  post: app.bsky.feed.defs.PostView
   showReplyLine?: boolean
   hideTopBorder?: boolean
   style?: StyleProp<ViewStyle>
   onBeforePress?: () => void
 }) {
   const moderationOpts = useModerationOpts()
-  const record = useMemo<AppBskyFeedPost.Record | undefined>(
+  const record = useMemo<app.bsky.feed.post.Main | undefined>(
     () =>
-      bsky.validate(post.record, AppBskyFeedPost.validateRecord)
-        ? post.record
-        : undefined,
+      bsky.matches(app.bsky.feed.post, post.record) ? post.record : undefined,
     [post],
   )
   const postShadowed = usePostShadow(post)
@@ -65,7 +62,7 @@ export function Post({
       record
         ? new RichTextAPI({
             text: record.text,
-            facets: asSdkFacets(record.facets),
+            facets: record.facets,
           })
         : undefined,
     [record],
@@ -106,8 +103,8 @@ function PostInner({
   style,
   onBeforePress: outerOnBeforePress,
 }: {
-  post: Shadow<AppBskyFeedDefs.PostView>
-  record: AppBskyFeedPost.Record
+  post: Shadow<app.bsky.feed.defs.PostView>
+  record: app.bsky.feed.post.Main
   richText: RichTextAPI
   moderation: ModerationDecision
   showReplyLine?: boolean
diff --git a/src/view/com/posts/PostFeed.tsx b/src/view/com/posts/PostFeed.tsx
index 2ccf3872dc..dbda8d0c41 100644
--- a/src/view/com/posts/PostFeed.tsx
+++ b/src/view/com/posts/PostFeed.tsx
@@ -18,14 +18,6 @@ import {
   View,
   type ViewStyle,
 } from 'react-native'
-import {
-  type AppBskyActorDefs,
-  AppBskyEmbedExternal,
-  AppBskyEmbedGallery,
-  AppBskyEmbedImages,
-  AppBskyEmbedVideo,
-  type AppBskyFeedDefs,
-} from '@atproto/api'
 import {type RichText as RichTextType} from '@bsky.app/sdk/richtext'
 import {useLingui} from '@lingui/react/macro'
 import {useQueryClient} from '@tanstack/react-query'
@@ -82,6 +74,8 @@ import {
   isStatusValidForViewers,
   useLiveNowConfig,
 } from '#/features/liveNow'
+import {app} from '#/lexicons'
+import * as bsky from '#/types/bsky'
 import {ComposerPrompt} from '../feeds/ComposerPrompt'
 import {DiscoverFallbackHeader} from './DiscoverFallbackHeader'
 import {FeedShutdownMsg} from './FeedShutdownMsg'
@@ -256,7 +250,7 @@ let PostFeed = ({
   desktopFixedHeightOffset?: number
   ListHeaderComponent?: () => React.ReactElement
   extraData?: Record<string, unknown>
-  savedFeedConfig?: AppBskyActorDefs.SavedFeed
+  savedFeedConfig?: app.bsky.actor.defs.SavedFeed
   initialNumToRender?: number
   isVideoFeed?: boolean
   lastFetchDate?: () => number
@@ -290,7 +284,7 @@ let PostFeed = ({
     () => new Set<string>(),
   )
   const onPressShowLess = useCallback(
-    (interaction: AppBskyFeedDefs.Interaction) => {
+    (interaction: app.bsky.feed.defs.Interaction) => {
       if (interaction.item) {
         const uri = interaction.item
         setHasPressedShowLessUris(prev => new Set([...prev, uri]))
@@ -492,7 +486,7 @@ let PostFeed = ({
               )
               if (
                 item &&
-                AppBskyEmbedVideo.isView(item.post.embed) &&
+                bsky.isType(app.bsky.embed.video.view, item.post.embed) &&
                 !blockedOrMutedAuthors.includes(item.post.author.did)
               ) {
                 videos.push({
@@ -1030,13 +1024,13 @@ let PostFeed = ({
 
       // Events that should fire exactly once for every new post, regardless of
       // its position within a slice or video grid row.
-      const onPostSeen = (post: AppBskyFeedDefs.PostView) => {
+      const onPostSeen = (post: app.bsky.feed.defs.PostView) => {
         if (seenPerPostUrisRef.current.has(post.uri)) return
         seenPerPostUrisRef.current.add(post.uri)
 
         // Standard site embed view tracking
         if (
-          AppBskyEmbedExternal.isView(post.embed) &&
+          bsky.isType(app.bsky.embed.external.view, post.embed) &&
           isStandardSiteEmbed(post.embed.external)
         ) {
           ax.metric('embed:standardSite:view', {url: post.embed.external.uri})
@@ -1044,13 +1038,21 @@ let PostFeed = ({
 
         // Photo embed impression tracking
         if (
-          AppBskyEmbedImages.isView(post.embed) ||
-          AppBskyEmbedGallery.isView(post.embed)
+          bsky.isType(app.bsky.embed.images.view, post.embed) ||
+          bsky.isType(app.bsky.embed.gallery.view, post.embed)
         ) {
-          const totalImages = AppBskyEmbedGallery.isView(post.embed)
-            ? post.embed.items.filter(AppBskyEmbedGallery.isViewImage).length
+          const totalImages = bsky.isType(
+            app.bsky.embed.gallery.view,
+            post.embed,
+          )
+            ? post.embed.items.filter(item =>
+                bsky.isType(app.bsky.embed.gallery.viewImage, item),
+              ).length
             : post.embed.images.length
-          const useExpandedLayout = AppBskyEmbedGallery.isView(post.embed)
+          const useExpandedLayout = bsky.isType(
+            app.bsky.embed.gallery.view,
+            post.embed,
+          )
             ? totalImages > 4
             : ax.features.enabled(ax.features.PostGalleryEmbedEnable)
           const layout =
diff --git a/src/view/com/posts/PostFeedErrorMessage.tsx b/src/view/com/posts/PostFeedErrorMessage.tsx
index 0298ce228b..12aea32a81 100644
--- a/src/view/com/posts/PostFeedErrorMessage.tsx
+++ b/src/view/com/posts/PostFeedErrorMessage.tsx
@@ -1,10 +1,6 @@
 import {useCallback, useMemo} from 'react'
 import {View} from 'react-native'
-import {
-  type AppBskyActorDefs,
-  AppBskyFeedGetAuthorFeed,
-  AtUri,
-} from '@atproto/api'
+import {AtUri} from '@atproto/syntax'
 import {msg as msgLingui} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
@@ -13,11 +9,13 @@ import {useNavigation} from '@react-navigation/native'
 import {usePalette} from '#/lib/hooks/usePalette'
 import {type NavigationProp} from '#/lib/routes/types'
 import {cleanError} from '#/lib/strings/errors'
+import {getErrorName, getErrorStatus} from '#/lib/xrpc-error'
 import {logger} from '#/logger'
 import {type FeedDescriptor} from '#/state/queries/post-feed'
 import {useRemoveFeedMutation} from '#/state/queries/preferences'
 import {Warning_Stroke2_Corner0_Rounded as WarningIcon} from '#/components/icons/Warning'
 import * as Prompt from '#/components/Prompt'
+import {type app} from '#/lexicons'
 import {EmptyState} from '../util/EmptyState'
 import {ErrorMessage} from '../util/error/ErrorMessage'
 import {Button} from '../util/forms/Button'
@@ -45,7 +43,7 @@ export function PostFeedErrorMessage({
   feedDesc: FeedDescriptor
   error?: Error
   onPressTryAgain: () => void
-  savedFeedConfig?: AppBskyActorDefs.SavedFeed
+  savedFeedConfig?: app.bsky.actor.defs.SavedFeed
 }) {
   const {_: _l} = useLingui()
   const knownError = useMemo(
@@ -96,7 +94,7 @@ function FeedgenErrorMessage({
   feedDesc: FeedDescriptor
   knownError: KnownError
   rawError?: Error
-  savedFeedConfig?: AppBskyActorDefs.SavedFeed
+  savedFeedConfig?: app.bsky.actor.defs.SavedFeed
 }) {
   const pal = usePalette('default')
   const {_: _l} = useLingui()
@@ -241,15 +239,21 @@ function detectKnownError(
   if (!error) {
     return undefined
   }
+  /*
+   * Both names are declared by `app.bsky.feed.getAuthorFeed` AND
+   * `.getActorLikes`, and this helper takes an error from an arbitrary feed
+   * descriptor, so the source method is ambiguous - hence the untyped
+   * `getErrorName` check rather than `matchXrpcError`.
+   */
   if (
-    error instanceof AppBskyFeedGetAuthorFeed.BlockedActorError ||
-    error instanceof AppBskyFeedGetAuthorFeed.BlockedByActorError
+    getErrorName(error) === 'BlockedActor' ||
+    getErrorName(error) === 'BlockedByActor'
   ) {
     return KnownError.Block
   }
 
   // check status codes
-  if (error?.status === 429) {
+  if (getErrorStatus(error) === 429) {
     return KnownError.FeedTooManyRequests
   }
 
diff --git a/src/view/com/posts/PostFeedItem.tsx b/src/view/com/posts/PostFeedItem.tsx
index aa3fd06976..cb43274741 100644
--- a/src/view/com/posts/PostFeedItem.tsx
+++ b/src/view/com/posts/PostFeedItem.tsx
@@ -1,12 +1,6 @@
 import {memo, useCallback, useMemo, useState} from 'react'
 import {StyleSheet, View} from 'react-native'
-import {
-  type AppBskyActorDefs,
-  AppBskyFeedDefs,
-  AppBskyFeedPost,
-  AppBskyFeedThreadgate,
-  AtUri,
-} from '@atproto/api'
+import {AtUri} from '@atproto/syntax'
 import {type ModerationDecision} from '@bsky.app/sdk/moderation'
 import {RichText as RichTextAPI} from '@bsky.app/sdk/richtext'
 import {useQueryClient} from '@tanstack/react-query'
@@ -17,7 +11,6 @@ import {useOpenComposer} from '#/lib/hooks/useOpenComposer'
 import {usePalette} from '#/lib/hooks/usePalette'
 import {makeProfileLink} from '#/lib/routes/links'
 import {countLines} from '#/lib/strings/helpers'
-import {asSdkFacets} from '#/lib/strings/rich-text-helpers'
 import {
   POST_TOMBSTONE,
   type Shadow,
@@ -54,19 +47,20 @@ import {RichText} from '#/components/RichText'
 import {SubtleHover} from '#/components/SubtleHover'
 import {useAnalytics} from '#/analytics'
 import {useActorStatus} from '#/features/liveNow'
+import {app} from '#/lexicons'
 import * as bsky from '#/types/bsky'
 import {PostFeedReason} from './PostFeedReason'
 
 interface FeedItemProps {
-  record: AppBskyFeedPost.Record
+  record: app.bsky.feed.post.Main
   reason:
-    | AppBskyFeedDefs.ReasonRepost
-    | AppBskyFeedDefs.ReasonPin
+    | app.bsky.feed.defs.ReasonRepost
+    | app.bsky.feed.defs.ReasonPin
     | ReasonFeedSource
     | {[k: string]: unknown; $type: string}
     | undefined
   moderation: ModerationDecision
-  parentAuthor: AppBskyActorDefs.ProfileViewBasic | undefined
+  parentAuthor: app.bsky.actor.defs.ProfileViewBasic | undefined
   showReplyTo: boolean
   isThreadChild?: boolean
   isThreadLastChild?: boolean
@@ -96,16 +90,16 @@ export function PostFeedItem({
   rootPost,
   onShowLess,
 }: FeedItemProps & {
-  post: AppBskyFeedDefs.PostView
-  rootPost: AppBskyFeedDefs.PostView
-  onShowLess?: (interaction: AppBskyFeedDefs.Interaction) => void
+  post: app.bsky.feed.defs.PostView
+  rootPost: app.bsky.feed.defs.PostView
+  onShowLess?: (interaction: app.bsky.feed.defs.Interaction) => void
 }): React.ReactNode {
   const postShadowed = usePostShadow(post)
   const richText = useMemo(
     () =>
       new RichTextAPI({
         text: record.text,
-        facets: asSdkFacets(record.facets),
+        facets: record.facets,
       }),
     [record],
   )
@@ -160,9 +154,9 @@ let FeedItemInner = ({
   onShowLess,
 }: FeedItemProps & {
   richText: RichTextAPI
-  post: Shadow<AppBskyFeedDefs.PostView>
-  rootPost: AppBskyFeedDefs.PostView
-  onShowLess?: (interaction: AppBskyFeedDefs.Interaction) => void
+  post: Shadow<app.bsky.feed.defs.PostView>
+  rootPost: app.bsky.feed.defs.PostView
+  onShowLess?: (interaction: app.bsky.feed.defs.Interaction) => void
 }): React.ReactNode => {
   const ax = useAnalytics()
   const queryClient = useQueryClient()
@@ -258,7 +252,14 @@ let FeedItemInner = ({
       feedSourceInfo,
       post: {
         post,
-        reason: AppBskyFeedDefs.isReasonRepost(reason) ? reason : undefined,
+        /*
+         * `isType` requires a present `$type` at runtime but narrows to the
+         * schema's input type, whose `$type` is optional, so the `$Typed` arm
+         * of `FeedViewPost['reason']` needs the assertion back.
+         */
+        reason: bsky.isType(app.bsky.feed.defs.reasonRepost, reason)
+          ? (reason as app.bsky.feed.defs.FeedViewPost['reason'])
+          : undefined,
         feedContext,
         reqId,
       },
@@ -282,9 +283,9 @@ let FeedItemInner = ({
    * If `post[0]` in this slice is the actual root post (not an orphan thread),
    * then we may have a threadgate record to reference
    */
-  const threadgateRecord = bsky.dangerousIsType<AppBskyFeedThreadgate.Record>(
+  const threadgateRecord = bsky.isType(
+    app.bsky.feed.threadgate,
     rootPost.threadgate?.record,
-    AppBskyFeedThreadgate.isRecord,
   )
     ? rootPost.threadgate.record
     : undefined
@@ -292,7 +293,11 @@ let FeedItemInner = ({
   const {isActive: live} = useActorStatus(post.author)
 
   const viaRepost = useMemo(() => {
-    if (AppBskyFeedDefs.isReasonRepost(reason) && reason.uri && reason.cid) {
+    if (
+      bsky.isType(app.bsky.feed.defs.reasonRepost, reason) &&
+      reason.uri &&
+      reason.cid
+    ) {
       return {
         uri: reason.uri,
         cid: reason.cid,
@@ -305,10 +310,7 @@ let FeedItemInner = ({
   })
   const additionalPostAlerts: AppModerationCause[] = useMemo(() => {
     const isPostHiddenByThreadgate = threadgateHiddenReplies.has(post.uri)
-    const rootPostUri = bsky.dangerousIsType<AppBskyFeedPost.Record>(
-      post.record,
-      AppBskyFeedPost.isRecord,
-    )
+    const rootPostUri = bsky.isType(app.bsky.feed.post, post.record)
       ? post.record?.reply?.root?.uri || post.uri
       : undefined
     const isControlledByViewer =
@@ -465,10 +467,10 @@ let PostContent = ({
 }: {
   moderation: ModerationDecision
   richText: RichTextAPI
-  postEmbed: AppBskyFeedDefs.PostView['embed']
-  postAuthor: AppBskyFeedDefs.PostView['author']
+  postEmbed: app.bsky.feed.defs.PostView['embed']
+  postAuthor: app.bsky.feed.defs.PostView['author']
   onOpenEmbed: () => void
-  post: AppBskyFeedDefs.PostView
+  post: app.bsky.feed.defs.PostView
   additionalPostAlerts?: AppModerationCause[]
   feedDescriptor?: string
 }): React.ReactNode => {
@@ -476,11 +478,9 @@ let PostContent = ({
     () => countLines(richText.text) >= MAX_POST_LINES,
   )
 
-  const record = useMemo<AppBskyFeedPost.Record | undefined>(
+  const record = useMemo<app.bsky.feed.post.Main | undefined>(
     () =>
-      bsky.validate(post.record, AppBskyFeedPost.validateRecord)
-        ? post.record
-        : undefined,
+      bsky.matches(app.bsky.feed.post, post.record) ? post.record : undefined,
     [post],
   )
 
diff --git a/src/view/com/posts/PostFeedReason.tsx b/src/view/com/posts/PostFeedReason.tsx
index 57ac3b825c..9e1a043946 100644
--- a/src/view/com/posts/PostFeedReason.tsx
+++ b/src/view/com/posts/PostFeedReason.tsx
@@ -1,5 +1,4 @@
 import {StyleSheet, View} from 'react-native'
-import {AppBskyFeedDefs} from '@atproto/api'
 import {type ModerationDecision} from '@bsky.app/sdk/moderation'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
@@ -15,6 +14,8 @@ import {Repost_Stroke2_Corner3_Rounded as RepostIcon} from '#/components/icons/R
 import {Link} from '#/components/Link'
 import {ProfileHoverCard} from '#/components/ProfileHoverCard'
 import {Text} from '#/components/Typography'
+import {app} from '#/lexicons'
+import * as bsky from '#/types/bsky'
 import {FeedNameText} from '../util/FeedInfoText'
 
 export function PostFeedReason({
@@ -24,8 +25,8 @@ export function PostFeedReason({
 }: {
   reason:
     | ReasonFeedSource
-    | AppBskyFeedDefs.ReasonRepost
-    | AppBskyFeedDefs.ReasonPin
+    | app.bsky.feed.defs.ReasonRepost
+    | app.bsky.feed.defs.ReasonPin
     | {[k: string]: unknown; $type: string}
   moderation?: ModerationDecision
   onOpenReposter?: () => void
@@ -64,7 +65,7 @@ export function PostFeedReason({
     )
   }
 
-  if (AppBskyFeedDefs.isReasonRepost(reason)) {
+  if (bsky.isType(app.bsky.feed.defs.reasonRepost, reason)) {
     const isOwner = reason.by.did === currentAccount?.did
     const reposter = createSanitizedDisplayName(
       reason.by,
@@ -103,7 +104,7 @@ export function PostFeedReason({
     )
   }
 
-  if (AppBskyFeedDefs.isReasonPin(reason)) {
+  if (bsky.isType(app.bsky.feed.defs.reasonPin, reason)) {
     return (
       <View style={styles.includeReason}>
         <PinIcon
diff --git a/src/view/com/posts/ViewFullThread.tsx b/src/view/com/posts/ViewFullThread.tsx
index f346a34396..0a4f033ef6 100644
--- a/src/view/com/posts/ViewFullThread.tsx
+++ b/src/view/com/posts/ViewFullThread.tsx
@@ -1,7 +1,7 @@
 import {useMemo} from 'react'
 import {View} from 'react-native'
 import Svg, {Circle, Line} from 'react-native-svg'
-import {AtUri} from '@atproto/api'
+import {AtUri} from '@atproto/syntax'
 import {useLingui} from '@lingui/react/macro'
 
 import {makeProfileLink} from '#/lib/routes/links'
diff --git a/src/view/com/profile/ProfileFollowers.tsx b/src/view/com/profile/ProfileFollowers.tsx
index b5040aae9d..ded4eed990 100644
--- a/src/view/com/profile/ProfileFollowers.tsx
+++ b/src/view/com/profile/ProfileFollowers.tsx
@@ -1,5 +1,4 @@
 import {useCallback, useEffect, useMemo, useRef, useState} from 'react'
-import {type AppBskyActorDefs as ActorDefs} from '@atproto/api'
 import {useLingui} from '@lingui/react/macro'
 import {useNavigation} from '@react-navigation/native'
 
@@ -19,6 +18,7 @@ import {
   FollowersPromoBanner,
   useFollowersPromoDismissed,
 } from '#/features/inviteFriends'
+import {type app} from '#/lexicons'
 import {List} from '../util/List'
 import {ProfileCardWithFollowBtn} from './ProfileCard'
 
@@ -27,7 +27,7 @@ function renderItem({
   index,
   contextProfileDid,
 }: {
-  item: ActorDefs.ProfileView
+  item: app.bsky.actor.defs.ProfileView
   index: number
   contextProfileDid: string | undefined
 }) {
@@ -42,7 +42,7 @@ function renderItem({
   )
 }
 
-function keyExtractor(item: ActorDefs.ProfileView) {
+function keyExtractor(item: app.bsky.actor.defs.ProfileView) {
   return item.did
 }
 
@@ -138,7 +138,7 @@ export function ProfileFollowers({name}: {name: string}) {
   }, [isFetchingNextPage, hasNextPage, error, fetchNextPage])
 
   const renderItemWithContext = useCallback(
-    ({item, index}: {item: ActorDefs.ProfileView; index: number}) =>
+    ({item, index}: {item: app.bsky.actor.defs.ProfileView; index: number}) =>
       renderItem({item, index, contextProfileDid: resolvedDid}),
     [resolvedDid],
   )
@@ -160,7 +160,7 @@ export function ProfileFollowers({name}: {name: string}) {
     seenItemsRef.current.clear()
   }, [resolvedDid])
   const onItemSeen = useCallback(
-    (item: ActorDefs.ProfileView) => {
+    (item: app.bsky.actor.defs.ProfileView) => {
       if (seenItemsRef.current.has(item.did)) {
         return
       }
diff --git a/src/view/com/profile/ProfileFollows.tsx b/src/view/com/profile/ProfileFollows.tsx
index b72161187c..86755904db 100644
--- a/src/view/com/profile/ProfileFollows.tsx
+++ b/src/view/com/profile/ProfileFollows.tsx
@@ -1,5 +1,4 @@
 import {useCallback, useEffect, useMemo, useRef, useState} from 'react'
-import {type AppBskyActorDefs as ActorDefs} from '@atproto/api'
 import {useLingui} from '@lingui/react/macro'
 import {useNavigation} from '@react-navigation/native'
 
@@ -15,6 +14,7 @@ import {PeopleRemove2_Stroke1_Corner0_Rounded as PeopleRemoveIcon} from '#/compo
 import {ListFooter, ListMaybePlaceholder} from '#/components/Lists'
 import {useAnalytics} from '#/analytics'
 import {IS_WEB} from '#/env'
+import {type app} from '#/lexicons'
 import {List} from '../util/List'
 import {ProfileCardWithFollowBtn} from './ProfileCard'
 
@@ -23,7 +23,7 @@ function renderItem({
   index,
   contextProfileDid,
 }: {
-  item: ActorDefs.ProfileView
+  item: app.bsky.actor.defs.ProfileView
   index: number
   contextProfileDid: string | undefined
 }) {
@@ -38,7 +38,7 @@ function renderItem({
   )
 }
 
-function keyExtractor(item: ActorDefs.ProfileView) {
+function keyExtractor(item: app.bsky.actor.defs.ProfileView) {
   return item.did
 }
 
@@ -143,7 +143,7 @@ export function ProfileFollows({name}: {name: string}) {
   }, [isFetchingNextPage, hasNextPage, error, fetchNextPage])
 
   const renderItemWithContext = useCallback(
-    ({item, index}: {item: ActorDefs.ProfileView; index: number}) =>
+    ({item, index}: {item: app.bsky.actor.defs.ProfileView; index: number}) =>
       renderItem({item, index, contextProfileDid: resolvedDid}),
     [resolvedDid],
   )
@@ -165,7 +165,7 @@ export function ProfileFollows({name}: {name: string}) {
     seenItemsRef.current.clear()
   }, [resolvedDid])
   const onItemSeen = useCallback(
-    (item: ActorDefs.ProfileView) => {
+    (item: app.bsky.actor.defs.ProfileView) => {
       if (seenItemsRef.current.has(item.did)) {
         return
       }
diff --git a/src/view/com/profile/ProfileMenu.tsx b/src/view/com/profile/ProfileMenu.tsx
index 20446dd30c..11d69f2277 100644
--- a/src/view/com/profile/ProfileMenu.tsx
+++ b/src/view/com/profile/ProfileMenu.tsx
@@ -1,5 +1,4 @@
 import {memo, useCallback, useMemo} from 'react'
-import {type AppBskyActorDefs} from '@atproto/api'
 import {Trans, useLingui} from '@lingui/react/macro'
 import {useNavigation} from '@react-navigation/native'
 import {useQueryClient} from '@tanstack/react-query'
@@ -66,12 +65,13 @@ import {GoLiveDialog} from '#/features/liveNow/components/GoLiveDialog'
 import {GoLiveDisabledDialog} from '#/features/liveNow/components/GoLiveDisabledDialog'
 import {Dot} from '#/features/nuxs/components/Dot'
 import {Gradient} from '#/features/nuxs/components/Gradient'
+import {type app} from '#/lexicons'
 import {useDevMode} from '#/storage/hooks/dev-mode'
 
 let ProfileMenu = ({
   profile,
 }: {
-  profile: Shadow<AppBskyActorDefs.ProfileViewDetailed>
+  profile: Shadow<app.bsky.actor.defs.ProfileViewDetailed>
 }): React.ReactNode => {
   const t = useTheme()
   const ax = useAnalytics()
diff --git a/src/view/com/profile/ProfileSubpageHeader.tsx b/src/view/com/profile/ProfileSubpageHeader.tsx
index 24ec5aa2b3..70b4791230 100644
--- a/src/view/com/profile/ProfileSubpageHeader.tsx
+++ b/src/view/com/profile/ProfileSubpageHeader.tsx
@@ -1,7 +1,6 @@
 import {useCallback} from 'react'
 import {Pressable, View} from 'react-native'
 import Animated, {useAnimatedRef} from 'react-native-reanimated'
-import {type AppBskyGraphDefs} from '@atproto/api'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
@@ -20,6 +19,7 @@ import {UserAvatar, type UserAvatarType} from '#/view/com/util/UserAvatar'
 import {StarterPackMultiPathLarge as StarterPackIcon} from '#/components/icons/StarterPack'
 import * as Layout from '#/components/Layout'
 import {useLightboxControls} from '#/components/Lightbox/state'
+import {type app} from '#/lexicons'
 
 export function ProfileSubpageHeader({
   isLoading,
@@ -37,7 +37,7 @@ export function ProfileSubpageHeader({
   title: string | undefined
   avatar: string | undefined
   isOwner: boolean | undefined
-  purpose: AppBskyGraphDefs.ListPurpose | undefined
+  purpose: app.bsky.graph.defs.ListPurpose | undefined
   creator:
     | {
         did: string
diff --git a/src/view/com/util/PostMeta.tsx b/src/view/com/util/PostMeta.tsx
index f50e14b18f..2c83017c96 100644
--- a/src/view/com/util/PostMeta.tsx
+++ b/src/view/com/util/PostMeta.tsx
@@ -1,6 +1,5 @@
 import {memo, useCallback} from 'react'
 import {type StyleProp, View, type ViewStyle} from 'react-native'
-import {type AppBskyActorDefs} from '@atproto/api'
 import {type ModerationDecision} from '@bsky.app/sdk/moderation'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
@@ -21,11 +20,12 @@ import {ProfileHoverCard} from '#/components/ProfileHoverCard'
 import {Text} from '#/components/Typography'
 import {IS_ANDROID} from '#/env'
 import {useActorStatus} from '#/features/liveNow'
+import {type app} from '#/lexicons'
 import {TimeElapsed} from './TimeElapsed'
 import {PreviewableUserAvatar} from './UserAvatar'
 
 interface PostMetaOpts {
-  author: AppBskyActorDefs.ProfileViewBasic
+  author: app.bsky.actor.defs.ProfileViewBasic
   moderation: ModerationDecision | undefined
   postHref: string
   timestamp: string
diff --git a/src/view/com/util/UserInfoText.tsx b/src/view/com/util/UserInfoText.tsx
index 028b85d38c..e70c512881 100644
--- a/src/view/com/util/UserInfoText.tsx
+++ b/src/view/com/util/UserInfoText.tsx
@@ -1,5 +1,4 @@
 import {type StyleProp, type TextStyle} from 'react-native'
-import {type AppBskyActorGetProfile} from '@atproto/api'
 
 import {makeProfileLink} from '#/lib/routes/links'
 import {sanitizeDisplayName} from '#/lib/strings/display-names'
@@ -9,6 +8,7 @@ import {useProfileQuery} from '#/state/queries/profile'
 import {atoms as a} from '#/alf'
 import {InlineLinkText} from '#/components/Link'
 import {Text} from '#/components/Typography'
+import {type app} from '#/lexicons'
 import {LoadingPlaceholder} from './LoadingPlaceholder'
 
 export function UserInfoText({
@@ -19,7 +19,7 @@ export function UserInfoText({
   style,
 }: {
   did: string
-  attr?: keyof AppBskyActorGetProfile.OutputSchema
+  attr?: keyof app.bsky.actor.getProfile.$OutputBody
   loading?: string
   failed?: string
   prefix?: string
diff --git a/src/view/screens/DebugMod.tsx b/src/view/screens/DebugMod.tsx
index ad0124eb49..c58edac3c9 100644
--- a/src/view/screens/DebugMod.tsx
+++ b/src/view/screens/DebugMod.tsx
@@ -1,17 +1,12 @@
 import {useMemo, useState} from 'react'
 import {View} from 'react-native'
 import {useSharedValue} from 'react-native-reanimated'
-import {
-  type AppBskyActorDefs,
-  type AppBskyFeedDefs,
-  type AppBskyFeedPost,
-  type ComAtprotoLabelDefs,
-  mock,
-} from '@atproto/api'
 import {
   interpretLabelValueDefinition,
   type LabelPreference,
   LABELS,
+  moderatePost,
+  moderateProfile,
   type ModerationBehavior,
   type ModerationDecision,
   type ModerationOpts,
@@ -20,7 +15,6 @@ import {RichText} from '@bsky.app/sdk/richtext'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 
-import {moderatePost, moderateProfile} from '#/lib/moderation/subjects'
 import {useGlobalLabelStrings} from '#/lib/moderation/useGlobalLabelStrings'
 import {
   type CommonNavigatorParams,
@@ -54,6 +48,7 @@ import {
 import * as Layout from '#/components/Layout'
 import * as ProfileCard from '#/components/ProfileCard'
 import {H1, H3, P, Text} from '#/components/Typography'
+import {type app, type com} from '#/lexicons'
 import {ScreenHider} from '../../components/moderation/ScreenHider'
 import {NotificationFeedItem} from '../com/notifications/NotificationFeedItem'
 import {PagerHeaderProvider} from '../com/pager/PagerHeaderContext'
@@ -63,6 +58,211 @@ const LABEL_VALUES: (keyof typeof LABELS)[] = Object.keys(
   LABELS,
 ) as (keyof typeof LABELS)[]
 
+const FAKE_CID = 'bafyreiclp443lavogvhj3d2ob2cxbfuscni2k5jk7bebjzg7khl3esabwq'
+
+/*
+ * Local test-data builders for this dev-only moderation debug screen. These
+ * replace the `mock` object the old api package used to export (the SDK does
+ * not ship one). Each builder returns a plain `#/lexicons` object literal with
+ * the same field values the old `mock` builders produced. Branded string slots
+ * (`did`/`at-uri`/`cid`/`lang`) are cast, since this is trusted mock data.
+ */
+const mock = {
+  post({
+    text,
+    facets,
+    reply,
+    embed,
+  }: {
+    text: string
+    facets?: app.bsky.feed.post.Main['facets']
+    reply?: app.bsky.feed.post.Main['reply']
+    embed?: app.bsky.feed.post.Main['embed']
+  }): app.bsky.feed.post.Main {
+    return {
+      $type: 'app.bsky.feed.post',
+      text,
+      facets,
+      reply,
+      embed,
+      langs: ['en'],
+      createdAt:
+        new Date().toISOString() as app.bsky.feed.post.Main['createdAt'],
+    }
+  },
+  postView({
+    record,
+    author,
+    embed,
+    replyCount,
+    repostCount,
+    likeCount,
+    viewer,
+    labels,
+  }: {
+    record: app.bsky.feed.post.Main
+    author: app.bsky.actor.defs.ProfileViewBasic
+    embed?: app.bsky.feed.defs.PostView['embed']
+    replyCount?: number
+    repostCount?: number
+    likeCount?: number
+    viewer?: app.bsky.feed.defs.ViewerState
+    labels?: com.atproto.label.defs.Label[]
+  }): app.bsky.feed.defs.PostView {
+    return {
+      $type: 'app.bsky.feed.defs#postView',
+      uri: `at://${author.did}/app.bsky.feed.post/fake`,
+      cid: FAKE_CID,
+      author,
+      record,
+      embed,
+      replyCount,
+      repostCount,
+      likeCount,
+      indexedAt:
+        new Date().toISOString() as app.bsky.feed.defs.PostView['indexedAt'],
+      viewer,
+      labels,
+    }
+  },
+  embedRecordView({
+    record,
+    author,
+    labels,
+  }: {
+    record: app.bsky.feed.post.Main
+    author: app.bsky.actor.defs.ProfileViewBasic
+    labels?: com.atproto.label.defs.Label[]
+  }): app.bsky.embed.record.View {
+    return {
+      $type: 'app.bsky.embed.record#view',
+      record: {
+        $type: 'app.bsky.embed.record#viewRecord',
+        uri: `at://${author.did}/app.bsky.feed.post/fake`,
+        cid: FAKE_CID,
+        author,
+        value: record,
+        labels,
+        indexedAt:
+          new Date().toISOString() as app.bsky.embed.record.ViewRecord['indexedAt'],
+      },
+    }
+  },
+  profileViewBasic({
+    handle,
+    displayName,
+    description,
+    viewer,
+    labels,
+  }: {
+    handle: string
+    displayName?: string
+    description?: string
+    viewer?: app.bsky.actor.defs.ViewerState
+    labels?: com.atproto.label.defs.Label[]
+  }): app.bsky.actor.defs.ProfileViewBasic & {description?: string} {
+    return {
+      did: `did:web:${handle}`,
+      handle: handle as app.bsky.actor.defs.ProfileViewBasic['handle'],
+      displayName,
+      description,
+      viewer,
+      labels,
+    }
+  },
+  actorViewerState({
+    muted,
+    mutedByList,
+    blockedBy,
+    blocking,
+    blockingByList,
+    following,
+    followedBy,
+  }: {
+    muted?: boolean
+    mutedByList?: app.bsky.graph.defs.ListViewBasic
+    blockedBy?: boolean
+    blocking?: string
+    blockingByList?: app.bsky.graph.defs.ListViewBasic
+    following?: string
+    followedBy?: string
+  }): app.bsky.actor.defs.ViewerState {
+    return {
+      muted,
+      mutedByList,
+      blockedBy,
+      blocking: blocking as app.bsky.actor.defs.ViewerState['blocking'],
+      blockingByList,
+      following: following as app.bsky.actor.defs.ViewerState['following'],
+      followedBy: followedBy as app.bsky.actor.defs.ViewerState['followedBy'],
+    }
+  },
+  replyNotification({
+    author,
+    record,
+    labels,
+  }: {
+    record: app.bsky.feed.post.Main
+    author: app.bsky.actor.defs.ProfileViewBasic
+    labels?: com.atproto.label.defs.Label[]
+  }): app.bsky.notification.listNotifications.Notification {
+    return {
+      uri: `at://${author.did}/app.bsky.feed.post/fake`,
+      cid: FAKE_CID,
+      author: author as app.bsky.actor.defs.ProfileView,
+      reason: 'reply',
+      reasonSubject: `at://${author.did}/app.bsky.feed.post/fake-parent`,
+      record,
+      isRead: false,
+      indexedAt:
+        new Date().toISOString() as app.bsky.notification.listNotifications.Notification['indexedAt'],
+      labels,
+    }
+  },
+  followNotification({
+    author,
+    subjectDid,
+    labels,
+  }: {
+    author: app.bsky.actor.defs.ProfileViewBasic
+    subjectDid: string
+    labels?: com.atproto.label.defs.Label[]
+  }): app.bsky.notification.listNotifications.Notification {
+    return {
+      uri: `at://${author.did}/app.bsky.graph.follow/fake`,
+      cid: FAKE_CID,
+      author: author as app.bsky.actor.defs.ProfileView,
+      reason: 'follow',
+      record: {
+        $type: 'app.bsky.graph.follow',
+        createdAt: new Date().toISOString(),
+        subject: subjectDid,
+      },
+      isRead: false,
+      indexedAt:
+        new Date().toISOString() as app.bsky.notification.listNotifications.Notification['indexedAt'],
+      labels,
+    }
+  },
+  label({
+    val,
+    uri,
+    src,
+  }: {
+    val: string
+    uri: string
+    src?: string
+  }): com.atproto.label.defs.Label {
+    return {
+      src: (src ||
+        'did:plc:fake-labeler') as com.atproto.label.defs.Label['src'],
+      uri: uri as com.atproto.label.defs.Label['uri'],
+      val,
+      cts: new Date().toISOString() as com.atproto.label.defs.Label['cts'],
+    }
+  },
+}
+
 export const DebugModScreen = ({}: NativeStackScreenProps<
   CommonNavigatorParams,
   'DebugMod'
@@ -74,7 +274,7 @@ export const DebugModScreen = ({}: NativeStackScreenProps<
   const [target, setTarget] = useState<string[]>(['account'])
   const [visibility, setVisiblity] = useState<string[]>(['warn'])
   const [customLabelDef, setCustomLabelDef] =
-    useState<ComAtprotoLabelDefs.LabelValueDefinition>({
+    useState<com.atproto.label.defs.LabelValueDefinition>({
       identifier: 'custom',
       blurs: 'content',
       severity: 'alert',
@@ -141,7 +341,7 @@ export const DebugModScreen = ({}: NativeStackScreenProps<
         blockingByList: undefined,
       }),
     })
-    mockedProfile.did = did
+    mockedProfile.did = did as app.bsky.actor.defs.ProfileViewBasic['did']
     mockedProfile.avatar = 'https://bsky.social/about/images/favicon-32x32.png'
     // @ts-expect-error ProfileViewBasic is close enough -esb
     mockedProfile.banner =
@@ -165,36 +365,35 @@ export const DebugModScreen = ({}: NativeStackScreenProps<
               }),
             ]
           : undefined,
-      embed:
-        target[0] === 'embed'
-          ? mock.embedRecordView({
-              record: mock.post({
-                text: 'Embed',
-              }),
-              labels:
-                scenario[0] === 'label' && target[0] === 'embed'
-                  ? [
-                      mock.label({
-                        src: isSelfLabel ? did : undefined,
-                        val: label[0],
-                        uri: `at://${did}/app.bsky.feed.post/fake`,
-                      }),
-                    ]
-                  : undefined,
-              author: profile,
-            })
-          : {
-              $type: 'app.bsky.embed.images#view',
-              images: [
-                {
-                  thumb:
-                    'https://bsky.social/about/images/social-card-default-gradient.png',
-                  fullsize:
-                    'https://bsky.social/about/images/social-card-default-gradient.png',
-                  alt: '',
-                },
-              ],
-            },
+      embed: (target[0] === 'embed'
+        ? mock.embedRecordView({
+            record: mock.post({
+              text: 'Embed',
+            }),
+            labels:
+              scenario[0] === 'label' && target[0] === 'embed'
+                ? [
+                    mock.label({
+                      src: isSelfLabel ? did : undefined,
+                      val: label[0],
+                      uri: `at://${did}/app.bsky.feed.post/fake`,
+                    }),
+                  ]
+                : undefined,
+            author: profile,
+          })
+        : {
+            $type: 'app.bsky.embed.images#view',
+            images: [
+              {
+                thumb:
+                  'https://bsky.social/about/images/social-card-default-gradient.png',
+                fullsize:
+                  'https://bsky.social/about/images/social-card-default-gradient.png',
+                alt: '',
+              },
+            ],
+          }) as app.bsky.feed.defs.PostView['embed'],
     })
   }, [scenario, label, target, profile, isSelfLabel, did])
 
@@ -227,7 +426,7 @@ export const DebugModScreen = ({}: NativeStackScreenProps<
     })
     const [item] = groupNotifications([notif])
     item.subject = mock.postView({
-      record: notif.record as AppBskyFeedPost.Record,
+      record: notif.record as app.bsky.feed.post.Main,
       author: profile,
       labels: notif.labels,
     })
@@ -634,9 +833,9 @@ function CustomLabelForm({
   def,
   setDef,
 }: {
-  def: ComAtprotoLabelDefs.LabelValueDefinition
+  def: com.atproto.label.defs.LabelValueDefinition
   setDef: React.Dispatch<
-    React.SetStateAction<ComAtprotoLabelDefs.LabelValueDefinition>
+    React.SetStateAction<com.atproto.label.defs.LabelValueDefinition>
   >
 }) {
   const t = useTheme()
@@ -838,7 +1037,7 @@ function MockPostFeedItem({
   post,
   moderation,
 }: {
-  post: AppBskyFeedDefs.PostView
+  post: app.bsky.feed.defs.PostView
   moderation: ModerationDecision
 }) {
   const t = useTheme()
@@ -852,7 +1051,7 @@ function MockPostFeedItem({
   return (
     <PostFeedItem
       post={post}
-      record={post.record as AppBskyFeedPost.Record}
+      record={post.record as app.bsky.feed.post.Main}
       moderation={moderation}
       parentAuthor={undefined}
       showReplyTo={false}
@@ -869,7 +1068,7 @@ function MockPostThreadItem({
   moderationOpts,
   isReply,
 }: {
-  post: AppBskyFeedDefs.PostView
+  post: app.bsky.feed.defs.PostView
   moderationOpts: ModerationOpts
   isReply?: boolean
 }) {
@@ -924,7 +1123,7 @@ function MockAccountCard({
   profile,
   moderation,
 }: {
-  profile: AppBskyActorDefs.ProfileViewBasic
+  profile: app.bsky.actor.defs.ProfileViewBasic
   moderation: ModerationDecision
 }) {
   const t = useTheme()
@@ -948,7 +1147,7 @@ function MockAccountScreen({
   moderation,
   moderationOpts,
 }: {
-  profile: AppBskyActorDefs.ProfileViewBasic
+  profile: app.bsky.actor.defs.ProfileViewBasic
   moderation: ModerationDecision
   moderationOpts: ModerationOpts
 }) {
diff --git a/src/view/screens/Feeds.tsx b/src/view/screens/Feeds.tsx
index 971c63734d..449f11785b 100644
--- a/src/view/screens/Feeds.tsx
+++ b/src/view/screens/Feeds.tsx
@@ -1,6 +1,5 @@
 import {useCallback, useMemo, useRef, useState} from 'react'
 import {ActivityIndicator, StyleSheet, View} from 'react-native'
-import {type AppBskyFeedDefs} from '@atproto/api'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
@@ -45,6 +44,7 @@ import * as Layout from '#/components/Layout'
 import {Link} from '#/components/Link'
 import * as ListCard from '#/components/ListCard'
 import {IS_NATIVE, IS_WEB} from '#/env'
+import {type app} from '#/lexicons'
 
 type Props = NativeStackScreenProps<CommonNavigatorParams, 'Feeds'>
 
@@ -91,7 +91,7 @@ type FlatlistSlice =
       type: 'popularFeed'
       key: string
       feedUri: string
-      feed: AppBskyFeedDefs.GeneratorView
+      feed: app.bsky.feed.defs.GeneratorView
     }
   | {
       type: 'popularFeedsLoadingMore'
diff --git a/src/view/screens/Lists.tsx b/src/view/screens/Lists.tsx
index 54f3568fc0..fe9827ac88 100644
--- a/src/view/screens/Lists.tsx
+++ b/src/view/screens/Lists.tsx
@@ -1,5 +1,5 @@
 import {useCallback} from 'react'
-import {AtUri} from '@atproto/api'
+import {AtUri} from '@atproto/syntax'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
diff --git a/src/view/screens/ModerationBlockedAccounts.tsx b/src/view/screens/ModerationBlockedAccounts.tsx
index 258a3c9b5f..da3463233c 100644
--- a/src/view/screens/ModerationBlockedAccounts.tsx
+++ b/src/view/screens/ModerationBlockedAccounts.tsx
@@ -1,6 +1,5 @@
 import {useCallback, useMemo, useState} from 'react'
 import {type StyleProp, View, type ViewStyle} from 'react-native'
-import {type AppBskyActorDefs as ActorDefs} from '@atproto/api'
 import {Trans} from '@lingui/react/macro'
 import {type NativeStackScreenProps} from '@react-navigation/native-stack'
 
@@ -16,6 +15,7 @@ import * as Layout from '#/components/Layout'
 import {ListFooter} from '#/components/Lists'
 import * as ProfileCard from '#/components/ProfileCard'
 import {Text} from '#/components/Typography'
+import {type app} from '#/lexicons'
 
 type Props = NativeStackScreenProps<
   CommonNavigatorParams,
@@ -68,7 +68,7 @@ export function ModerationBlockedAccounts({}: Props) {
     item,
     index,
   }: {
-    item: ActorDefs.ProfileView
+    item: app.bsky.actor.defs.ProfileView
     index: number
   }) => {
     if (!moderationOpts) return null
@@ -113,7 +113,7 @@ export function ModerationBlockedAccounts({}: Props) {
         ) : (
           <List
             data={profiles}
-            keyExtractor={(item: ActorDefs.ProfileView) => item.did}
+            keyExtractor={(item: app.bsky.actor.defs.ProfileView) => item.did}
             refreshing={isPTRing}
             onRefresh={onRefresh}
             onEndReached={onEndReached}
diff --git a/src/view/screens/ModerationModlists.tsx b/src/view/screens/ModerationModlists.tsx
index 4ef555a6c2..aa8adbacc6 100644
--- a/src/view/screens/ModerationModlists.tsx
+++ b/src/view/screens/ModerationModlists.tsx
@@ -1,5 +1,5 @@
 import {useCallback} from 'react'
-import {AtUri} from '@atproto/api'
+import {AtUri} from '@atproto/syntax'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
diff --git a/src/view/screens/ModerationMutedAccounts.tsx b/src/view/screens/ModerationMutedAccounts.tsx
index 122464d301..cfdc4a7a80 100644
--- a/src/view/screens/ModerationMutedAccounts.tsx
+++ b/src/view/screens/ModerationMutedAccounts.tsx
@@ -1,6 +1,5 @@
 import {useCallback, useMemo, useState} from 'react'
 import {type StyleProp, View, type ViewStyle} from 'react-native'
-import {type AppBskyActorDefs as ActorDefs} from '@atproto/api'
 import {Trans} from '@lingui/react/macro'
 import {type NativeStackScreenProps} from '@react-navigation/native-stack'
 
@@ -16,6 +15,7 @@ import * as Layout from '#/components/Layout'
 import {ListFooter} from '#/components/Lists'
 import * as ProfileCard from '#/components/ProfileCard'
 import {Text} from '#/components/Typography'
+import {type app} from '#/lexicons'
 
 type Props = NativeStackScreenProps<
   CommonNavigatorParams,
@@ -68,7 +68,7 @@ export function ModerationMutedAccounts({}: Props) {
     item,
     index,
   }: {
-    item: ActorDefs.ProfileView
+    item: app.bsky.actor.defs.ProfileView
     index: number
   }) => {
     if (!moderationOpts) return null
diff --git a/src/view/screens/Profile.tsx b/src/view/screens/Profile.tsx
index 9c4db67b01..09eafda0f7 100644
--- a/src/view/screens/Profile.tsx
+++ b/src/view/screens/Profile.tsx
@@ -2,8 +2,7 @@ import {useCallback, useEffect, useMemo, useRef, useState} from 'react'
 import {StyleSheet} from 'react-native'
 import {SafeAreaView} from 'react-native-safe-area-context'
 import {ScrollForwarderView} from 'react-native-scroll-forwarder'
-import {type AppBskyActorDefs} from '@atproto/api'
-import {type ModerationOpts} from '@bsky.app/sdk/moderation'
+import {moderateProfile, type ModerationOpts} from '@bsky.app/sdk/moderation'
 import {RichText as RichTextAPI} from '@bsky.app/sdk/richtext'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
@@ -14,7 +13,6 @@ import {useQueryClient} from '@tanstack/react-query'
 import {useOpenComposer} from '#/lib/hooks/useOpenComposer'
 import {useRequireEmailVerification} from '#/lib/hooks/useRequireEmailVerification'
 import {useSetTitle} from '#/lib/hooks/useSetTitle'
-import {moderateProfile} from '#/lib/moderation/subjects'
 import {
   type CommonNavigatorParams,
   type NativeStackScreenProps,
@@ -52,6 +50,7 @@ import {VideoClip_Stroke1_Corner0_Rounded as VideoIcon} from '#/components/icons
 import * as Layout from '#/components/Layout'
 import {ScreenHider} from '#/components/moderation/ScreenHider'
 import {ProfileStarterPacks} from '#/components/StarterPack/ProfileStarterPacks'
+import {type app} from '#/lexicons'
 import {navigate} from '#/Navigation'
 
 interface SectionRef {
@@ -166,7 +165,7 @@ function ProfileScreenLoaded({
   moderationOpts,
   hideBackButton,
 }: {
-  profile: AppBskyActorDefs.ProfileViewDetailed
+  profile: app.bsky.actor.defs.ProfileViewDetailed
   moderationOpts: ModerationOpts
   hideBackButton: boolean
   isPlaceholderProfile: boolean
diff --git a/src/view/shell/desktop/LeftNav.tsx b/src/view/shell/desktop/LeftNav.tsx
index d777b09e86..a7ce796865 100644
--- a/src/view/shell/desktop/LeftNav.tsx
+++ b/src/view/shell/desktop/LeftNav.tsx
@@ -1,6 +1,5 @@
 import {useCallback, useMemo, useState} from 'react'
 import {StyleSheet, View} from 'react-native'
-import {type AppBskyActorDefs} from '@atproto/api'
 import {plural} from '@lingui/core/macro'
 import {Trans, useLingui} from '@lingui/react/macro'
 import {useNavigation, useNavigationState} from '@react-navigation/native'
@@ -86,6 +85,7 @@ import {useAgeAssurance} from '#/ageAssurance'
 import {useAnalytics} from '#/analytics'
 import {type Events} from '#/analytics/metrics/types'
 import {useActorStatus} from '#/features/liveNow'
+import {type app} from '#/lexicons'
 import {router} from '#/routes'
 import {PlatformInfo} from '../../../../modules/expo-bluesky-swiss-army'
 
@@ -239,7 +239,7 @@ function SwitchMenuItems({
   accounts:
     | {
         account: SessionAccount
-        profile?: AppBskyActorDefs.ProfileViewDetailed
+        profile?: app.bsky.actor.defs.ProfileViewDetailed
       }[]
     | undefined
   signOutPromptControl: DialogControlProps
@@ -350,7 +350,7 @@ function SwitchMenuItem({
   profile,
 }: {
   account: SessionAccount
-  profile: AppBskyActorDefs.ProfileViewDetailed | undefined
+  profile: app.bsky.actor.defs.ProfileViewDetailed | undefined
 }) {
   const {t: l} = useLingui()
   const {onPressSwitchAccount, pendingDid} = useAccountSwitcher()
diff --git a/webpack.config.js b/webpack.config.js
index 889a2cb83f..dace4e8fe5 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -45,7 +45,7 @@ function patchSourceMapFilter(rules, pathPattern) {
 
 module.exports = async function (env, argv) {
   env.babel = {
-    dangerouslyAddModulePathsToTranspile: ['@bsky.app/expo', '@atproto/api'],
+    dangerouslyAddModulePathsToTranspile: ['@bsky.app/expo'],
   }
   let config = await createExpoWebpackConfigAsync(env, argv)
   /*

From 3677c9887360bb06f4d5652a7b654c3ef498231f Mon Sep 17 00:00:00 2001
From: Samuel Newman <mozzius@protonmail.com>
Date: Thu, 13 Aug 2026 22:26:22 +0300
Subject: [PATCH 27/32] [SDK] Validate and brand the persisted account did
 (#11387)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
---
 .../ageAssurance/AgeAssuranceAppealDialog.tsx |   4 +-
 .../lists/CreateListFromStarterPackDialog.tsx |   9 +-
 .../moderation/ReportDialog/action.ts         |   2 +-
 src/env/common.ts                             |   6 +-
 src/features/liveNow/index.tsx                |   7 +-
 src/lib/api/feed/custom.ts                    | 131 +++++++++++-------
 src/lib/api/index.ts                          |  10 --
 src/lib/strings/url-helpers.ts                |   6 +-
 .../Messages/components/ChatDisabled.tsx      |   4 +-
 .../Messages/components/MessagesList.tsx      |   4 -
 .../ModerationInteractionSettings/index.tsx   |   4 -
 .../StarterPackCard.tsx                       |   1 -
 src/screens/Onboarding/util.ts                |   2 +-
 src/screens/Profile/components/GermButton.tsx |   2 +-
 .../components/DeleteAccountDialog.tsx        |   4 +-
 .../Settings/components/ExportCarDialog.tsx   |   3 +-
 src/screens/StarterPack/StarterPackScreen.tsx |   1 -
 src/screens/Takendown.tsx                     |   4 +-
 src/state/persisted/schema.ts                 |  13 +-
 src/state/preferences/moderation-opts.tsx     |  10 +-
 src/state/queries/activity-subscriptions.ts   |   6 +-
 .../queries/bookmarks/useBookmarksQuery.ts    |  13 +-
 src/state/queries/list-memberships.ts         |   6 +-
 src/state/queries/list.ts                     |  12 +-
 src/state/queries/lists-with-membership.ts    |  13 +-
 .../queries/messages/actor-declaration.ts     |   5 +-
 src/state/queries/my-lists.ts                 |   3 +-
 src/state/queries/nuxs/index.ts               |   4 -
 src/state/queries/pinned-post.ts              |   5 +-
 src/state/queries/postgate/util.ts            |   4 +-
 src/state/queries/profile-followers.ts        |   3 +-
 src/state/queries/profile-follows.ts          |   3 +-
 src/state/queries/profile.ts                  |   4 +-
 src/state/queries/starter-packs.ts            |   6 +-
 src/state/queries/threadgate/util.ts          |   6 +-
 .../useVerificationCreateMutation.tsx         |   1 -
 .../useVerificationsRemoveMutation.tsx        |   1 -
 .../provider-session-events-test.tsx          |   2 +-
 src/state/session/session-data.ts             |   2 +-
 src/state/unstable-post-source.tsx            |   6 +-
 src/view/com/auth/LoggedOut.tsx               |   3 +-
 src/view/com/composer/drafts/state/queries.ts |   4 -
 src/view/com/composer/state/composer.ts       |   8 --
 .../com/composer/threadgate/ThreadgateBtn.tsx |   4 -
 .../notifications/NotificationFeedItem.tsx    |   6 +-
 src/view/screens/DebugMod.tsx                 |   2 +-
 46 files changed, 154 insertions(+), 205 deletions(-)

diff --git a/src/components/ageAssurance/AgeAssuranceAppealDialog.tsx b/src/components/ageAssurance/AgeAssuranceAppealDialog.tsx
index e3a9dd41a7..10426d0ca6 100644
--- a/src/components/ageAssurance/AgeAssuranceAppealDialog.tsx
+++ b/src/components/ageAssurance/AgeAssuranceAppealDialog.tsx
@@ -1,6 +1,5 @@
 import {useState} from 'react'
 import {View} from 'react-native'
-import {type DidString} from '@atproto/syntax'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
@@ -62,8 +61,7 @@ function Inner({control}: {control: Dialog.DialogControlProps}) {
           reasonType: tools.ozone.report.defs.reasonAppeal.value,
           subject: {
             $type: 'com.atproto.admin.defs#repoRef',
-            // the persisted account did is already resolved
-            did: currentAccount.did as DidString,
+            did: currentAccount.did,
           },
           reason: `AGE_ASSURANCE_INQUIRY: ` + details,
         },
diff --git a/src/components/dialogs/lists/CreateListFromStarterPackDialog.tsx b/src/components/dialogs/lists/CreateListFromStarterPackDialog.tsx
index b9979554cd..0a528adedb 100644
--- a/src/components/dialogs/lists/CreateListFromStarterPackDialog.tsx
+++ b/src/components/dialogs/lists/CreateListFromStarterPackDialog.tsx
@@ -1,12 +1,7 @@
 import {View} from 'react-native'
 import {TID} from '@atproto/common-web'
 import {type $Typed} from '@atproto/lex'
-import {
-  type AtIdentifierString,
-  AtUri,
-  type AtUriString,
-  toDatetimeString,
-} from '@atproto/syntax'
+import {AtUri, type AtUriString, toDatetimeString} from '@atproto/syntax'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
@@ -99,7 +94,7 @@ export function CreateListFromStarterPackDialog({
             const chunks = chunk(listitemWrites, 50)
             for (const c of chunks) {
               await pdsClient.call(com.atproto.repo.applyWrites, {
-                repo: currentAccount.did as AtIdentifierString,
+                repo: currentAccount.did,
                 writes: c,
               })
             }
diff --git a/src/components/moderation/ReportDialog/action.ts b/src/components/moderation/ReportDialog/action.ts
index c22a93fce9..86a0c8cca6 100644
--- a/src/components/moderation/ReportDialog/action.ts
+++ b/src/components/moderation/ReportDialog/action.ts
@@ -67,7 +67,7 @@ export function useSubmitReportMutation() {
             reason: state.details,
             subject: {
               $type: 'com.atproto.admin.defs#repoRef',
-              // the parsed subject carries an already-resolved did
+              // the parsed subject holds the did as a plain string
               did: subject.did as DidString,
             },
           }
diff --git a/src/env/common.ts b/src/env/common.ts
index bcda2e4982..0490859898 100644
--- a/src/env/common.ts
+++ b/src/env/common.ts
@@ -76,15 +76,13 @@ export const LOG_DEBUG: string = process.env.EXPO_PUBLIC_LOG_DEBUG || ''
  * The DID of the Bluesky appview to proxy to
  */
 export const BLUESKY_PROXY_DID: DidString =
-  (process.env.EXPO_PUBLIC_BLUESKY_PROXY_DID as DidString) ||
-  'did:web:api.bsky.app'
+  process.env.EXPO_PUBLIC_BLUESKY_PROXY_DID || 'did:web:api.bsky.app'
 
 /**
  * The DID of the chat service to proxy to
  */
 export const CHAT_PROXY_DID: DidString =
-  (process.env.EXPO_PUBLIC_CHAT_PROXY_DID as DidString) ||
-  'did:web:api.bsky.chat'
+  process.env.EXPO_PUBLIC_CHAT_PROXY_DID || 'did:web:api.bsky.chat'
 
 /**
  * Metrics API host
diff --git a/src/features/liveNow/index.tsx b/src/features/liveNow/index.tsx
index 88daad4df7..cc9dd21fbb 100644
--- a/src/features/liveNow/index.tsx
+++ b/src/features/liveNow/index.tsx
@@ -1,7 +1,7 @@
 import {useMemo} from 'react'
 import {retry} from '@atproto/common-web'
 import {type $Typed, type l, type UriString} from '@atproto/lex'
-import {type AtIdentifierString, AtUri, toDatetimeString} from '@atproto/syntax'
+import {AtUri, toDatetimeString} from '@atproto/syntax'
 import {moderateStatus} from '@bsky.app/sdk/moderation'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
@@ -276,8 +276,7 @@ export function useUpsertLiveStatusMutation(
       } satisfies app.bsky.actor.status.Main
 
       const upsert = async () => {
-        // the session account is still legacy-typed, so its did is unbranded
-        const repo = currentAccount.did as AtIdentifierString
+        const repo = currentAccount.did
         const collection = 'app.bsky.actor.status'
 
         const existing = await pdsClient
@@ -369,7 +368,7 @@ export function useRemoveLiveStatusMutation() {
       if (!currentAccount) throw new Error('Not logged in')
 
       await pdsClient.delete(app.bsky.actor.status, {
-        repo: currentAccount.did as AtIdentifierString,
+        repo: currentAccount.did,
         rkey: 'self',
       })
     },
diff --git a/src/lib/api/feed/custom.ts b/src/lib/api/feed/custom.ts
index 6185f788df..f4a5d4862f 100644
--- a/src/lib/api/feed/custom.ts
+++ b/src/lib/api/feed/custom.ts
@@ -1,5 +1,11 @@
-import {Client, lexParse, type XrpcRequestParams} from '@atproto/lex'
+import {
+  type Client,
+  type XrpcRequestParams,
+  XrpcResponseError,
+} from '@atproto/lex'
 
+import {PUBLIC_APPVIEW} from '#/lib/constants'
+import {createLexClient} from '#/lib/lexClient'
 import {
   getAppLanguageAsContentLanguage,
   getContentLanguages,
@@ -96,68 +102,87 @@ export class CustomFeedAPI implements FeedAPI {
   }
 }
 
-// HACK
-// we want feeds to give language-specific results immediately when a
-// logged-out user changes their language. this comes with two problems:
-// 1. not all languages have content, and
-// 2. our public caching layer isnt correctly busting against the accept-language header
-// for now we handle both of these with a manual workaround
-// -prf
-async function loggedOutFetch({
-  feed,
-  limit,
-  cursor,
-}: {
-  feed: string
-  limit: number
-  cursor?: string
-}): Promise<app.bsky.feed.getFeed.$OutputBody | null> {
-  let contentLangs = getAppLanguageAsContentLanguage()
+let loggedOutAppviewClient: Client | undefined
 
-  /*
-   * This request is hand-rolled rather than issued through a client, so it has
-   * to reproduce the header lex would have emitted from the global static.
-   */
-  const labelersHeader = {
-    'atproto-accept-labelers': Client.appLabelers
-      .map(l => `${l};redact`)
-      .join(', '),
-  }
+/**
+ * The unauthenticated {@link Client} for logged-out feed reads, pointed at the
+ * direct appview ({@link PUBLIC_APPVIEW}, `api.bsky.app`).
+ *
+ * Deliberately NOT the public appview client (`public.api.bsky.app`): that host
+ * fronts a cache which does not vary on `Accept-Language`, so it would answer a
+ * language-filtered read from another language's cached body. The direct
+ * appview respects the header (verified 2026-08-04), at the cost of not being
+ * cached. See {@link loggedOutFetch}.
+ *
+ * A single module-level instance, because there is no session to scope it to.
+ * Like the public chat client, it uses plain `fetch` rather than
+ * `networkAwareFetch`, matching the ad-hoc fetch it replaces: this read has its
+ * own failure handling and should not move the app-wide network signal.
+ */
+function getLoggedOutAppviewClient(): Client {
+  return (loggedOutAppviewClient ??= createLexClient({
+    service: PUBLIC_APPVIEW,
+  }))
+}
 
-  // manually construct fetch call so we can add the `lang` cache-busting param
-  let res = await fetch(
-    `https://api.bsky.app/xrpc/app.bsky.feed.getFeed?feed=${feed}${
-      cursor ? `&cursor=${cursor}` : ''
-    }&limit=${limit}&lang=${contentLangs}`,
-    {
-      method: 'GET',
-      headers: {'Accept-Language': contentLangs, ...labelersHeader},
-    },
-  )
-  /*
-   * The response is hand-decoded rather than validated, so the lex output shape
-   * is asserted here just as the old-world one was.
-   */
-  let data = res.ok
-    ? (lexParse(await res.text()) as app.bsky.feed.getFeed.$OutputBody)
-    : null
+/*
+ * HACK
+ * We want feeds to give language-specific results immediately when a logged-out
+ * user changes their language. That comes with two problems:
+ * 1. not all languages have content, and
+ * 2. our public caching layer does not bust against the `Accept-Language`
+ *    header.
+ * -prf
+ *
+ * Problem 2 is why this uses its own client rather than the app's public
+ * appview one: it talks to the direct appview, which honors the header, instead
+ * of the cached `public.api.bsky.app`, which does not vary on it. That trades
+ * CDN caching for language correctness on logged-out feed traffic.
+ *
+ * Problem 1 is host-independent, so it is still handled here: an empty
+ * language-filtered feed is retried once with the language constraint removed.
+ */
+async function loggedOutFetch(
+  params: GetCustomFeedParams,
+): Promise<app.bsky.feed.getFeed.$OutputBody | null> {
+  const contentLangs = getAppLanguageAsContentLanguage()
+
+  let data = await getFeedOrNull(params, contentLangs)
   if (data?.feed?.length) {
     return data
   }
 
   // no data, try again with language headers removed
-  res = await fetch(
-    `https://api.bsky.app/xrpc/app.bsky.feed.getFeed?feed=${feed}${
-      cursor ? `&cursor=${cursor}` : ''
-    }&limit=${limit}`,
-    {method: 'GET', headers: {'Accept-Language': '', ...labelersHeader}},
-  )
-  data = res.ok
-    ? (lexParse(await res.text()) as app.bsky.feed.getFeed.$OutputBody)
-    : null
+  data = await getFeedOrNull(params, '')
   if (data?.feed?.length) {
     return data
   }
 
   return null
 }
+
+/**
+ * A logged-out `getFeed` read that resolves to null on a response error.
+ *
+ * The pre-client code only guarded `res.ok`, so a failed RESPONSE fell through
+ * to the next attempt while a failed REQUEST rejected. Catching
+ * `XrpcResponseError` preserves that split: every other lex error - the fetch
+ * and validation ones - still propagates.
+ */
+async function getFeedOrNull(
+  params: GetCustomFeedParams,
+  contentLangs: string,
+): Promise<app.bsky.feed.getFeed.$OutputBody | null> {
+  try {
+    return await getLoggedOutAppviewClient().call(
+      app.bsky.feed.getFeed,
+      params,
+      {headers: {'Accept-Language': contentLangs}},
+    )
+  } catch (e) {
+    if (e instanceof XrpcResponseError) {
+      return null
+    }
+    throw e
+  }
+}
diff --git a/src/lib/api/index.ts b/src/lib/api/index.ts
index af2d54e65a..990d41c8d1 100644
--- a/src/lib/api/index.ts
+++ b/src/lib/api/index.ts
@@ -307,11 +307,6 @@ async function resolveEmbed(
     if (resolvedLink.type === 'record') {
       return {
         $type: 'app.bsky.embed.record',
-        /*
-         * `resolve.ts` is still legacy-typed - its strong refs and URIs carry
-         * unbranded strings. Assert at the boundary until it moves to the
-         * clients.
-         */
         record: resolvedLink.record,
       }
     }
@@ -495,11 +490,6 @@ async function resolveMedia(
   return undefined
 }
 
-/*
- * `resolve.ts` still returns legacy-typed views, so its strong refs carry plain
- * strings where the record write wants the branded syntax types; assert at the
- * boundary until those views come from the generated lexicons.
- */
 async function resolveRecord(
   clients: LinkResolvers,
   queryClient: QueryClient,
diff --git a/src/lib/strings/url-helpers.ts b/src/lib/strings/url-helpers.ts
index c90f1a6fb9..08ecf4b566 100644
--- a/src/lib/strings/url-helpers.ts
+++ b/src/lib/strings/url-helpers.ts
@@ -1,4 +1,4 @@
-import {AtUri} from '@atproto/syntax'
+import {type AtIdentifierString, AtUri} from '@atproto/syntax'
 import {parse} from 'psl'
 import TLDs from 'tlds'
 
@@ -43,8 +43,8 @@ export function makeRecordUri(
   rkey: string,
 ) {
   const urip = new AtUri('at://placeholder.placeholder/')
-  // @ts-expect-error TODO new-sdk-migration
-  urip.host = didOrName
+  // the helper takes the did or handle as a plain string
+  urip.host = didOrName as AtIdentifierString
   urip.collection = collection
   urip.rkey = rkey
   return urip.toString()
diff --git a/src/screens/Messages/components/ChatDisabled.tsx b/src/screens/Messages/components/ChatDisabled.tsx
index 31bdebc4d2..b330113d19 100644
--- a/src/screens/Messages/components/ChatDisabled.tsx
+++ b/src/screens/Messages/components/ChatDisabled.tsx
@@ -1,6 +1,5 @@
 import {useCallback, useState} from 'react'
 import {type StyleProp, View, type ViewStyle} from 'react-native'
-import {type DidString} from '@atproto/syntax'
 import {Trans, useLingui} from '@lingui/react/macro'
 import {useMutation} from '@tanstack/react-query'
 
@@ -106,8 +105,7 @@ function DialogInner() {
           reasonType: tools.ozone.report.defs.reasonAppeal.value,
           subject: {
             $type: 'com.atproto.admin.defs#repoRef',
-            // the persisted account did is already resolved
-            did: currentAccount.did as DidString,
+            did: currentAccount.did,
           },
           reason: details,
         },
diff --git a/src/screens/Messages/components/MessagesList.tsx b/src/screens/Messages/components/MessagesList.tsx
index 1ef81f006d..586809c7a2 100644
--- a/src/screens/Messages/components/MessagesList.tsx
+++ b/src/screens/Messages/components/MessagesList.tsx
@@ -567,10 +567,6 @@ export function MessagesList({
           if (post) {
             embed = {
               $type: 'app.bsky.embed.record',
-              /*
-               * `getPost` hands back `uri` and `cid` as plain strings rather
-               * than the branded syntax types the lexicon input declares.
-               */
               record: {
                 uri: post.uri,
                 cid: post.cid,
diff --git a/src/screens/ModerationInteractionSettings/index.tsx b/src/screens/ModerationInteractionSettings/index.tsx
index 9ce833a8e5..c6ea9db622 100644
--- a/src/screens/ModerationInteractionSettings/index.tsx
+++ b/src/screens/ModerationInteractionSettings/index.tsx
@@ -71,10 +71,6 @@ function Inner({preferences}: {preferences: UsePreferencesQueryResponse}) {
       $type: 'app.bsky.feed.threadgate',
       post: '' as AtUriString,
       createdAt: toDatetimeString(new Date()),
-      /*
-       * Preferences are still typed against the legacy client, so the stored
-       * rules arrive unbranded. Wave B migrates `getPreferences`.
-       */
       allow: preferences.postInteractionSettings.threadgateAllowRules,
     })
   }, [preferences.postInteractionSettings.threadgateAllowRules])
diff --git a/src/screens/Onboarding/StepSuggestedStarterpacks/StarterPackCard.tsx b/src/screens/Onboarding/StepSuggestedStarterpacks/StarterPackCard.tsx
index 450bf6da15..ecbc7a9c4d 100644
--- a/src/screens/Onboarding/StepSuggestedStarterpacks/StarterPackCard.tsx
+++ b/src/screens/Onboarding/StepSuggestedStarterpacks/StarterPackCard.tsx
@@ -75,7 +75,6 @@ export function StarterPackCard({
     let followUris: Map<string, string>
     try {
       followUris = await bulkWriteFollows(pdsClient, appviewClient, dids, {
-        // the starter pack view is still legacy-typed
         uri: view.uri,
         cid: view.cid,
       })
diff --git a/src/screens/Onboarding/util.ts b/src/screens/Onboarding/util.ts
index af8a40f092..07ccc2f17a 100644
--- a/src/screens/Onboarding/util.ts
+++ b/src/screens/Onboarding/util.ts
@@ -21,7 +21,7 @@ export async function bulkWriteFollows(
   const followRecords: $Typed<app.bsky.graph.follow.Main>[] = dids.map(did => {
     return {
       $type: 'app.bsky.graph.follow',
-      // callers hold plain dids read off legacy-typed views
+      // the helper takes the dids as plain strings
       subject: did as DidString,
       createdAt: toDatetimeString(new Date()),
       via,
diff --git a/src/screens/Profile/components/GermButton.tsx b/src/screens/Profile/components/GermButton.tsx
index f79c503251..59d3d5d6bb 100644
--- a/src/screens/Profile/components/GermButton.tsx
+++ b/src/screens/Profile/components/GermButton.tsx
@@ -124,7 +124,7 @@ function GermSelfButton({did}: {did: string}) {
   const {mutate: deleteDeclaration, isPending} = useMutation({
     mutationFn: async () => {
       const previousRecord = await pdsClient
-        // the profile view is still legacy-typed, so its did is unbranded
+        // the component takes the did as a plain string prop
         .get(com.germnetwork.declaration, {
           repo: did as DidString,
           rkey: 'self',
diff --git a/src/screens/Settings/components/DeleteAccountDialog.tsx b/src/screens/Settings/components/DeleteAccountDialog.tsx
index 0df008280b..d2d687bc79 100644
--- a/src/screens/Settings/components/DeleteAccountDialog.tsx
+++ b/src/screens/Settings/components/DeleteAccountDialog.tsx
@@ -1,6 +1,5 @@
 import {useCallback, useRef, useState} from 'react'
 import {type TextInput, View} from 'react-native'
-import {type DidString} from '@atproto/syntax'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
@@ -126,8 +125,7 @@ function DeleteAccountDialogInner({
        */
       await chatClient.call(chat.bsky.actor.deleteAccount)
       await client.call(com.atproto.server.deleteAccount, {
-        // the persisted account did is already resolved
-        did: currentAccount.did as DidString,
+        did: currentAccount.did,
         password,
         token,
       })
diff --git a/src/screens/Settings/components/ExportCarDialog.tsx b/src/screens/Settings/components/ExportCarDialog.tsx
index 6f28aa340f..290f380157 100644
--- a/src/screens/Settings/components/ExportCarDialog.tsx
+++ b/src/screens/Settings/components/ExportCarDialog.tsx
@@ -1,6 +1,5 @@
 import {useCallback, useState} from 'react'
 import {View} from 'react-native'
-import {type DidString} from '@atproto/syntax'
 import {Trans, useLingui} from '@lingui/react/macro'
 
 import {saveBytesToDisk} from '#/lib/media/manip'
@@ -34,7 +33,7 @@ export function ExportCarDialog({
     }
     try {
       setLoading('repo')
-      const did = currentAccount.did as DidString
+      const did = currentAccount.did
       const data = await pdsClient.call(com.atproto.sync.getRepo, {did})
       /*
        * getRepo declares `application/vnd.ipld.car`, so lex-client hands back
diff --git a/src/screens/StarterPack/StarterPackScreen.tsx b/src/screens/StarterPack/StarterPackScreen.tsx
index 658241c660..b023889300 100644
--- a/src/screens/StarterPack/StarterPackScreen.tsx
+++ b/src/screens/StarterPack/StarterPackScreen.tsx
@@ -376,7 +376,6 @@ function Header({
     let followUris: Map<string, string>
     try {
       followUris = await bulkWriteFollows(pdsClient, appviewClient, dids, {
-        // the starter pack view is still legacy-typed
         uri: starterPack.uri,
         cid: starterPack.cid,
       })
diff --git a/src/screens/Takendown.tsx b/src/screens/Takendown.tsx
index 9843e9337d..60517295f5 100644
--- a/src/screens/Takendown.tsx
+++ b/src/screens/Takendown.tsx
@@ -2,7 +2,6 @@ import {useState} from 'react'
 import {View} from 'react-native'
 import {KeyboardAwareScrollView} from 'react-native-keyboard-controller'
 import {useSafeAreaInsets} from 'react-native-safe-area-context'
-import {type DidString} from '@atproto/syntax'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
@@ -57,8 +56,7 @@ export function Takendown() {
           reasonType: tools.ozone.report.defs.reasonAppeal.value,
           subject: {
             $type: 'com.atproto.admin.defs#repoRef',
-            // the persisted account did is already resolved
-            did: currentAccount.did as DidString,
+            did: currentAccount.did,
           },
           reason: appealText,
         },
diff --git a/src/state/persisted/schema.ts b/src/state/persisted/schema.ts
index 9b86360765..58229b3deb 100644
--- a/src/state/persisted/schema.ts
+++ b/src/state/persisted/schema.ts
@@ -1,3 +1,4 @@
+import {isDidString} from '@atproto/lex'
 import {z} from 'zod'
 
 import {deviceLanguageCodes, deviceLocales} from '#/locale/deviceLocales'
@@ -13,7 +14,17 @@ const externalEmbedOptions = ['show', 'hide'] as const
  */
 const accountSchema = z.object({
   service: z.string(),
-  did: z.string(),
+  /**
+   * Genuinely validated, not just branded: the refinement rejects malformed
+   * values at runtime and narrows the inferred type to `DidString`.
+   *
+   * Weigh any further tightening of this field carefully. One failing field
+   * fails the whole root schema, and {@link tryParse} then discards the ENTIRE
+   * persisted state - every account and every preference - so the app boots
+   * logged out with defaults. Persisted dids come from com.atproto.server
+   * responses and are always canonical, so this particular check is safe.
+   */
+  did: z.string().refine(isDidString),
   handle: z.string(),
   email: z.string().optional(),
   emailConfirmed: z.boolean().optional(),
diff --git a/src/state/preferences/moderation-opts.tsx b/src/state/preferences/moderation-opts.tsx
index 77ef89f283..a2575c9a50 100644
--- a/src/state/preferences/moderation-opts.tsx
+++ b/src/state/preferences/moderation-opts.tsx
@@ -39,11 +39,7 @@ export function Provider({children}: React.PropsWithChildren<{}>) {
       return undefined
     }
     return {
-      /*
-       * `did`/`hiddenPosts` come from persisted storage typed as plain
-       * `string`, so brand them to the SDK's `DidString`/`AtUriString` slots.
-       */
-      userDid: userDid as ModerationOpts['userDid'],
+      userDid,
       prefs: {
         ...moderationPrefs,
         labelers: moderationPrefs.labelers.length
@@ -52,6 +48,10 @@ export function Provider({children}: React.PropsWithChildren<{}>) {
               did,
               labels: DEFAULT_LOGGED_OUT_LABEL_PREFERENCES,
             })),
+        /*
+         * `hiddenPosts` comes from persisted storage typed as plain `string`,
+         * so brand it to the SDK's `AtUriString` slot.
+         */
         hiddenPosts: (hiddenPosts ||
           []) as ModerationOpts['prefs']['hiddenPosts'],
       },
diff --git a/src/state/queries/activity-subscriptions.ts b/src/state/queries/activity-subscriptions.ts
index 31f542bda8..5b52fc7e16 100644
--- a/src/state/queries/activity-subscriptions.ts
+++ b/src/state/queries/activity-subscriptions.ts
@@ -1,4 +1,3 @@
-import {type AtIdentifierString} from '@atproto/syntax'
 import {t} from '@lingui/core/macro'
 import {
   type InfiniteData,
@@ -41,8 +40,7 @@ export function useNotificationDeclarationQuery() {
     queryFn: async () => {
       try {
         const response = await client.get(app.bsky.notification.declaration, {
-          // the session account is still legacy-typed, so its did is unbranded
-          repo: currentAccount!.did as AtIdentifierString,
+          repo: currentAccount!.did,
           rkey: 'self',
         })
         return response
@@ -72,7 +70,7 @@ export function useNotificationDeclarationMutation() {
         app.bsky.notification.declaration,
         record,
         {
-          repo: currentAccount!.did as AtIdentifierString,
+          repo: currentAccount!.did,
           rkey: 'self',
         },
       )
diff --git a/src/state/queries/bookmarks/useBookmarksQuery.ts b/src/state/queries/bookmarks/useBookmarksQuery.ts
index adb12a47ce..2eeab4c213 100644
--- a/src/state/queries/bookmarks/useBookmarksQuery.ts
+++ b/src/state/queries/bookmarks/useBookmarksQuery.ts
@@ -1,5 +1,5 @@
 import {type $Typed} from '@atproto/lex'
-import {AtUri} from '@atproto/syntax'
+import {AtUri, toDatetimeString} from '@atproto/syntax'
 import {
   type InfiniteData,
   type QueryClient,
@@ -71,19 +71,14 @@ export async function optimisticallySaveBookmark(
         pages: data.pages.map((page, index) => {
           if (index === 0) {
             post.$type = 'app.bsky.feed.defs#postView'
-            /*
-             * The optimistic entry is synthesized with unbranded string
-             * fields, so it is asserted to the generated view type the query
-             * data is keyed on.
-             */
-            const bookmark = {
-              createdAt: new Date().toISOString(),
+            const bookmark: app.bsky.bookmark.defs.BookmarkView = {
+              createdAt: toDatetimeString(new Date()),
               subject: {
                 uri: post.uri,
                 cid: post.cid,
               },
               item: post as $Typed<app.bsky.feed.defs.PostView>,
-            } as unknown as app.bsky.bookmark.defs.BookmarkView
+            }
             return {
               ...page,
               bookmarks: [bookmark, ...page.bookmarks],
diff --git a/src/state/queries/list-memberships.ts b/src/state/queries/list-memberships.ts
index 2bc62f3712..01bc795a31 100644
--- a/src/state/queries/list-memberships.ts
+++ b/src/state/queries/list-memberships.ts
@@ -44,8 +44,8 @@ export function useListMembershipAddMutation({
         throw new Error('Not signed in')
       }
       /*
-       * The mutation's inputs are plain strings held by legacy-typed views, so
-       * they are asserted to their branded forms here.
+       * The mutation takes the list uri and actor did as plain strings, so they
+       * are asserted to their branded forms here.
        */
       const res = await pdsClient.create(app.bsky.graph.listitem, {
         subject: actorDid as DidString,
@@ -145,7 +145,7 @@ export function useListMembershipRemoveMutation({
       }
       const membershipUrip = new AtUri(membershipUri)
       await pdsClient.delete(app.bsky.graph.listitem, {
-        repo: currentAccount.did as DidString,
+        repo: currentAccount.did,
         rkey: membershipUrip.rkeySafe,
       })
     },
diff --git a/src/state/queries/list.ts b/src/state/queries/list.ts
index 4a9499117c..85efd85b15 100644
--- a/src/state/queries/list.ts
+++ b/src/state/queries/list.ts
@@ -1,10 +1,5 @@
 import {type $Typed, type Client} from '@atproto/lex'
-import {
-  type AtIdentifierString,
-  AtUri,
-  type AtUriString,
-  toDatetimeString,
-} from '@atproto/syntax'
+import {AtUri, type AtUriString, toDatetimeString} from '@atproto/syntax'
 import {
   blockActorList,
   muteActorList,
@@ -194,8 +189,7 @@ export function useListDeleteMutation() {
       let listitemRecordUris: string[] = []
       for (let i = 0; i < 100; i++) {
         const res = await pdsClient.list(app.bsky.graph.listitem, {
-          // the session account is still legacy-typed, so its did is unbranded
-          repo: currentAccount.did as AtIdentifierString,
+          repo: currentAccount.did,
           cursor,
           limit: 100,
         })
@@ -228,7 +222,7 @@ export function useListDeleteMutation() {
       // apply in chunks
       for (const writesChunk of chunk(writes, 10)) {
         await pdsClient.call(com.atproto.repo.applyWrites, {
-          repo: currentAccount.did as AtIdentifierString,
+          repo: currentAccount.did,
           writes: writesChunk,
         })
       }
diff --git a/src/state/queries/lists-with-membership.ts b/src/state/queries/lists-with-membership.ts
index 9aac39197c..1ef035c24a 100644
--- a/src/state/queries/lists-with-membership.ts
+++ b/src/state/queries/lists-with-membership.ts
@@ -1,4 +1,4 @@
-import {type AtIdentifierString} from '@atproto/syntax'
+import {type AtIdentifierString, type AtUriString} from '@atproto/syntax'
 import {
   type InfiniteData,
   type QueryClient,
@@ -72,18 +72,13 @@ export function updateListMembershipOptimistically({
         ...page,
         listsWithMembership: page.listsWithMembership.map(lwm => {
           if (lwm.list.uri === listUri) {
-            /*
-             * Callers hand over a plain at-uri and an old-world ProfileView,
-             * whose `uri`/`did` are unbranded strings. They are runtime
-             * identical to the generated branded forms, so the synthesised
-             * listItem is asserted rather than re-validated.
-             */
             return {
               ...lwm,
               listItem: {
-                uri: membershipUri,
+                // callers hand over the membership uri as a plain string
+                uri: membershipUri as AtUriString,
                 subject,
-              } as app.bsky.graph.defs.ListItemView,
+              },
             }
           }
           return lwm
diff --git a/src/state/queries/messages/actor-declaration.ts b/src/state/queries/messages/actor-declaration.ts
index 7f0f363c82..e581040ce9 100644
--- a/src/state/queries/messages/actor-declaration.ts
+++ b/src/state/queries/messages/actor-declaration.ts
@@ -40,8 +40,7 @@ export function useUpdateActorDeclaration({
           current?.associated?.chat?.allowGroupInvites,
       })
       const result = await pdsClient.call(com.atproto.repo.putRecord, {
-        // the session account is still legacy-typed, so its did is unbranded
-        repo: currentAccount.did as DidString,
+        repo: currentAccount.did,
         collection: 'chat.bsky.actor.declaration',
         rkey: 'self',
         record: {
@@ -106,7 +105,7 @@ export function useDeleteActorDeclaration() {
     mutationFn: async () => {
       if (!currentAccount) throw new Error('Not signed in')
       const result = await pdsClient.call(com.atproto.repo.deleteRecord, {
-        repo: currentAccount.did as DidString,
+        repo: currentAccount.did,
         collection: 'chat.bsky.actor.declaration',
         rkey: 'self',
       })
diff --git a/src/state/queries/my-lists.ts b/src/state/queries/my-lists.ts
index d529b1e2ad..1150fa74ec 100644
--- a/src/state/queries/my-lists.ts
+++ b/src/state/queries/my-lists.ts
@@ -1,4 +1,3 @@
-import {type DidString} from '@atproto/syntax'
 import {type QueryClient, useQuery} from '@tanstack/react-query'
 
 import {accumulate} from '#/lib/async/accumulate'
@@ -27,7 +26,7 @@ export function useMyListsQuery(filter: MyListsFilter) {
         accumulate(cursor =>
           client
             .call(app.bsky.graph.getLists, {
-              actor: currentAccount!.did as DidString,
+              actor: currentAccount!.did,
               cursor,
               limit: 50,
             })
diff --git a/src/state/queries/nuxs/index.ts b/src/state/queries/nuxs/index.ts
index dc69b1fcde..d8c9e71924 100644
--- a/src/state/queries/nuxs/index.ts
+++ b/src/state/queries/nuxs/index.ts
@@ -103,10 +103,6 @@ export function useSaveNux() {
   return useMutation({
     retry: 3,
     mutationFn: async (nux: AppNux) => {
-      /*
-       * `serializeAppNux` still returns the legacy `Nux`, whose strings are
-       * unbranded; it is validated against the same schema the action expects.
-       */
       await pdsClient.call(upsertNux, serializeAppNux(nux))
       // triggers a refetch
       await queryClient.invalidateQueries({
diff --git a/src/state/queries/pinned-post.ts b/src/state/queries/pinned-post.ts
index e53cefcbfe..b1364725ca 100644
--- a/src/state/queries/pinned-post.ts
+++ b/src/state/queries/pinned-post.ts
@@ -1,4 +1,3 @@
-import {type DidString} from '@atproto/syntax'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {useMutation, useQueryClient} from '@tanstack/react-query'
@@ -36,7 +35,7 @@ export function usePinnedPostMutation() {
         // get the currently pinned post so we can optimistically remove the pin from it
         if (!currentAccount) throw new Error('Not signed in')
         const profile = await client.call(app.bsky.actor.getProfile, {
-          actor: currentAccount.did as DidString,
+          actor: currentAccount.did,
         })
         prevPinnedPost = profile.pinnedPost?.uri
         if (prevPinnedPost && prevPinnedPost !== postUri) {
@@ -47,7 +46,7 @@ export function usePinnedPostMutation() {
           profile,
           updates: existing => {
             existing.pinnedPost = pinCurrentPost
-              ? // the caller's uri/cid are unbranded strings
+              ? // the mutation takes the uri/cid as plain strings
                 ({
                   uri: postUri,
                   cid: postCid,
diff --git a/src/state/queries/postgate/util.ts b/src/state/queries/postgate/util.ts
index b9a3218b2c..f57fe0479d 100644
--- a/src/state/queries/postgate/util.ts
+++ b/src/state/queries/postgate/util.ts
@@ -8,8 +8,8 @@ export const POSTGATE_COLLECTION = 'app.bsky.feed.postgate'
 
 /**
  * Create a new {@link app.bsky.feed.postgate.Main}. URIs are accepted as plain
- * strings (callers hold raw AT-URIs, often from legacy-typed views) and
- * asserted to the branded `AtUriString` here.
+ * strings (callers hold raw AT-URIs) and asserted to the branded `AtUriString`
+ * here.
  */
 export function createPostgateRecord(
   postgate: Omit<
diff --git a/src/state/queries/profile-followers.ts b/src/state/queries/profile-followers.ts
index 5e79b5719c..59f3c4e842 100644
--- a/src/state/queries/profile-followers.ts
+++ b/src/state/queries/profile-followers.ts
@@ -1,4 +1,3 @@
-import {type DidString} from '@atproto/syntax'
 import {
   type InfiniteData,
   type QueryClient,
@@ -51,7 +50,7 @@ export function useProfileFollowersQuery(
        * is `undefined`, hence the conditional spread.
        */
       return await client.call(app.bsky.graph.getFollowers, {
-        actor: (did || '') as DidString,
+        actor: did || '',
         limit: PAGE_SIZE,
         cursor: pageParam,
         ...(sortParam ? {sort: sortParam} : {}),
diff --git a/src/state/queries/profile-follows.ts b/src/state/queries/profile-follows.ts
index 340184ef2c..0f684054b9 100644
--- a/src/state/queries/profile-follows.ts
+++ b/src/state/queries/profile-follows.ts
@@ -1,4 +1,3 @@
-import {type DidString} from '@atproto/syntax'
 import {
   type InfiniteData,
   type QueryClient,
@@ -56,7 +55,7 @@ export function useProfileFollowsQuery(
        * is `undefined`, hence the conditional spread.
        */
       return await client.call(app.bsky.graph.getFollows, {
-        actor: (did || '') as DidString,
+        actor: did || '',
         limit: limit || PAGE_SIZE,
         cursor: pageParam,
         ...(sortParam ? {sort: sortParam} : {}),
diff --git a/src/state/queries/profile.ts b/src/state/queries/profile.ts
index faf4dbc3fe..190f4a3998 100644
--- a/src/state/queries/profile.ts
+++ b/src/state/queries/profile.ts
@@ -643,7 +643,7 @@ function useProfileBlockMutation() {
         throw new Error('Not signed in')
       }
       return await pdsClient.create(app.bsky.graph.block, {
-        // the profile view is still legacy-typed, so its did is unbranded
+        // the mutation takes the did as a plain string
         subject: did as DidString,
         createdAt: toDatetimeString(new Date()),
       })
@@ -666,7 +666,7 @@ function useProfileUnblockMutation() {
       }
       const {rkeySafe: rkey} = new AtUri(blockUri)
       await pdsClient.delete(app.bsky.graph.block, {
-        repo: currentAccount.did as AtIdentifierString,
+        repo: currentAccount.did,
         rkey,
       })
     },
diff --git a/src/state/queries/starter-packs.ts b/src/state/queries/starter-packs.ts
index 3a30b30caa..dd3ff1a9fe 100644
--- a/src/state/queries/starter-packs.ts
+++ b/src/state/queries/starter-packs.ts
@@ -253,9 +253,9 @@ export function useEditStarterPackMutation({
           list: currentStarterPack.list?.uri,
           /*
            * Pre-existing quirk preserved verbatim: the edit path writes whole
-           * `GeneratorView`s where the lexicon declares `feedItem` refs. lex
-           * types the raw `putRecord` body as a `LexValue`, which the legacy
-           * view interface does not structurally satisfy, hence the cast.
+           * `GeneratorView`s where the lexicon declares `feedItem` refs. The
+           * raw `putRecord` body is typed as a lex `LexValue`, which the view
+           * structurally satisfies, so this passes through unchanged.
            */
           feeds: feeds,
           createdAt: currentStarterPack.record.createdAt,
diff --git a/src/state/queries/threadgate/util.ts b/src/state/queries/threadgate/util.ts
index 4e64835f4d..5a9fa4aea9 100644
--- a/src/state/queries/threadgate/util.ts
+++ b/src/state/queries/threadgate/util.ts
@@ -5,10 +5,8 @@ import {app} from '#/lexicons'
 import * as bsky from '#/types/bsky'
 
 /*
- * Threadgate VIEWS stay on the legacy client types: they are read-only inputs
- * from the appview, and branding them here would ripple through every post
- * component. Only the threadgate RECORD is migrated, because it is written
- * through `com.atproto.repo.putRecord`, whose body is typed as a lex `LexMap`.
+ * The view's `record` is typed as an opaque lex `LexMap`, so it is validated
+ * against the threadgate record schema before its `allow` rules are read.
  */
 export function threadgateViewToAllowUISetting(
   threadgateView: app.bsky.feed.defs.ThreadgateView | undefined,
diff --git a/src/state/queries/verification/useVerificationCreateMutation.tsx b/src/state/queries/verification/useVerificationCreateMutation.tsx
index cd52a62a1f..50510bac9e 100644
--- a/src/state/queries/verification/useVerificationCreateMutation.tsx
+++ b/src/state/queries/verification/useVerificationCreateMutation.tsx
@@ -22,7 +22,6 @@ export function useVerificationCreateMutation() {
       }
 
       const {uri} = await pdsClient.create(app.bsky.graph.verification, {
-        // the profile view is still legacy-typed, so its strings are unbranded
         subject: profile.did,
         createdAt: toDatetimeString(new Date()),
         handle: profile.handle,
diff --git a/src/state/queries/verification/useVerificationsRemoveMutation.tsx b/src/state/queries/verification/useVerificationsRemoveMutation.tsx
index 0de675f0d2..e0e0fe5e5a 100644
--- a/src/state/queries/verification/useVerificationsRemoveMutation.tsx
+++ b/src/state/queries/verification/useVerificationsRemoveMutation.tsx
@@ -50,7 +50,6 @@ export function useVerificationsRemoveMutation() {
         },
         () => {
           return appviewClient.call(app.bsky.actor.getProfile, {
-            // the profile view is still legacy-typed, so its did is unbranded
             actor: profile.did ?? '',
           })
         },
diff --git a/src/state/session/__tests__/provider-session-events-test.tsx b/src/state/session/__tests__/provider-session-events-test.tsx
index e6a51a5414..cd7873b1ba 100644
--- a/src/state/session/__tests__/provider-session-events-test.tsx
+++ b/src/state/session/__tests__/provider-session-events-test.tsx
@@ -173,7 +173,7 @@ function makeBundle(account: SessionAccount): FakeBundle {
         refreshJwt: account.refreshJwt ?? '',
         /* SessionData types these as branded strings; the values are fixtures */
         handle: account.handle as `${string}.${string}`,
-        did: account.did as `did:${string}:${string}`,
+        did: account.did,
         active: true,
         service: account.service,
       },
diff --git a/src/state/session/session-data.ts b/src/state/session/session-data.ts
index 3ead91c173..711f6ffe9b 100644
--- a/src/state/session/session-data.ts
+++ b/src/state/session/session-data.ts
@@ -69,7 +69,7 @@ export function sessionAccountToSessionData(
   return {
     accessJwt: account.accessJwt ?? '',
     active: account.active ?? true,
-    did: account.did as SessionData['did'],
+    did: account.did,
     email: account.email,
     emailAuthFactor: account.emailAuthFactor,
     emailConfirmed: account.emailConfirmed,
diff --git a/src/state/unstable-post-source.tsx b/src/state/unstable-post-source.tsx
index e374cbbeae..4386dec5e7 100644
--- a/src/state/unstable-post-source.tsx
+++ b/src/state/unstable-post-source.tsx
@@ -1,5 +1,5 @@
 import {useEffect, useId, useState} from 'react'
-import {AtUri} from '@atproto/syntax'
+import {type AtIdentifierString, AtUri} from '@atproto/syntax'
 
 import {Logger} from '#/logger'
 import {type FeedSourceInfo} from '#/state/queries/feed'
@@ -82,8 +82,8 @@ export function useUnstablePostSource(key: string) {
  */
 export function buildPostSourceKey(key: string, handle: string) {
   const urip = new AtUri(key)
-  // @ts-expect-error TODO new-sdk-migration
-  urip.host = handle
+  // the handle arrives as a plain string
+  urip.host = handle as AtIdentifierString
   return urip.toString()
 }
 
diff --git a/src/view/com/auth/LoggedOut.tsx b/src/view/com/auth/LoggedOut.tsx
index 5becdd45d3..b9d0f722c8 100644
--- a/src/view/com/auth/LoggedOut.tsx
+++ b/src/view/com/auth/LoggedOut.tsx
@@ -1,7 +1,6 @@
 import {useCallback, useEffect, useState} from 'react'
 import {View} from 'react-native'
 import {useSafeAreaInsets} from 'react-native-safe-area-context'
-import {type DidString} from '@atproto/syntax'
 import {useLingui} from '@lingui/react/macro'
 import {useQueryClient} from '@tanstack/react-query'
 
@@ -69,7 +68,7 @@ export function LoggedOut({onDismiss}: {onDismiss?: () => void}) {
   const {accounts} = useSession()
   const client = useAppviewClient()
   useEffect(() => {
-    const actors = accounts.map(acc => acc.did as DidString)
+    const actors = accounts.map(acc => acc.did)
     if (actors.length === 0) return
     void queryClient.prefetchQuery({
       queryKey: profilesQueryKey(actors),
diff --git a/src/view/com/composer/drafts/state/queries.ts b/src/view/com/composer/drafts/state/queries.ts
index 7f4840c7bf..ec786239a4 100644
--- a/src/view/com/composer/drafts/state/queries.ts
+++ b/src/view/com/composer/drafts/state/queries.ts
@@ -143,10 +143,6 @@ export function useSaveDraftMutation() {
         {appviewClient: client, chatClient},
         composerState,
       )
-      /*
-       * `composerStateToDraft` builds the draft with unbranded string fields,
-       * so it is asserted once here to the generated input type.
-       */
       const draft = apiDraft
 
       logger.debug('saving draft', {
diff --git a/src/view/com/composer/state/composer.ts b/src/view/com/composer/state/composer.ts
index 228f9a62ce..ad3e5f4df6 100644
--- a/src/view/com/composer/state/composer.ts
+++ b/src/view/com/composer/state/composer.ts
@@ -321,10 +321,6 @@ export function composerReducer(
           posts,
           postgate: createPostgateRecord({
             post: '',
-            /*
-             * Draft records are still typed against the legacy client, so the
-             * stored rules arrive unbranded. Wave B migrates the draft types.
-             */
             embeddingRules: postgateEmbeddingRules,
           }),
           threadgate: threadgateRecordToAllowUISetting({
@@ -750,10 +746,6 @@ export function createComposerState({
       ],
       postgate: createPostgateRecord({
         post: '',
-        /*
-         * Preferences are still typed against the legacy client, so the stored
-         * rules arrive unbranded. Wave B migrates `getPreferences`.
-         */
         embeddingRules: initInteractionSettings?.postgateEmbeddingRules || [],
       }),
       threadgate: threadgateRecordToAllowUISetting({
diff --git a/src/view/com/composer/threadgate/ThreadgateBtn.tsx b/src/view/com/composer/threadgate/ThreadgateBtn.tsx
index 9e730b48d8..388c5e2be0 100644
--- a/src/view/com/composer/threadgate/ThreadgateBtn.tsx
+++ b/src/view/com/composer/threadgate/ThreadgateBtn.tsx
@@ -86,10 +86,6 @@ export function ThreadgateBtn({
     $type: 'app.bsky.feed.threadgate',
     post: '' as AtUriString,
     createdAt: toDatetimeString(new Date()),
-    /*
-     * Preferences are still typed against the legacy client, so the stored
-     * rules arrive unbranded. Wave B migrates `getPreferences`.
-     */
     allow: preferences?.postInteractionSettings.threadgateAllowRules,
   })
   const prefPostgate = createPostgateRecord({
diff --git a/src/view/com/notifications/NotificationFeedItem.tsx b/src/view/com/notifications/NotificationFeedItem.tsx
index e60640c9d6..d4d4fe52b3 100644
--- a/src/view/com/notifications/NotificationFeedItem.tsx
+++ b/src/view/com/notifications/NotificationFeedItem.tsx
@@ -9,7 +9,7 @@ import {
   View,
 } from 'react-native'
 import {TID} from '@atproto/common-web'
-import {AtUri, type DidString} from '@atproto/syntax'
+import {AtUri} from '@atproto/syntax'
 import {
   moderateProfile,
   type ModerationDecision,
@@ -913,9 +913,7 @@ function SayHelloBtn({profile}: {profile: app.bsky.actor.defs.ProfileView}) {
     try {
       setIsLoading(true)
       const data = await client.call(chat.bsky.convo.getConvoForMembers, {
-        // both dids are already resolved - one from the profile view, one from
-        // the active session
-        members: [profile.did, currentAccount!.did] as DidString[],
+        members: [profile.did, currentAccount!.did],
       })
       navigation.navigate('MessagesConversation', {
         conversation: data.convo.id,
diff --git a/src/view/screens/DebugMod.tsx b/src/view/screens/DebugMod.tsx
index c58edac3c9..359d61ef85 100644
--- a/src/view/screens/DebugMod.tsx
+++ b/src/view/screens/DebugMod.tsx
@@ -341,7 +341,7 @@ export const DebugModScreen = ({}: NativeStackScreenProps<
         blockingByList: undefined,
       }),
     })
-    mockedProfile.did = did as app.bsky.actor.defs.ProfileViewBasic['did']
+    mockedProfile.did = did
     mockedProfile.avatar = 'https://bsky.social/about/images/favicon-32x32.png'
     // @ts-expect-error ProfileViewBasic is close enough -esb
     mockedProfile.banner =

From b89167f07c73b1fd7b2c3ddaad839b4970d500d9 Mon Sep 17 00:00:00 2001
From: Samuel Newman <mozzius@protonmail.com>
Date: Thu, 13 Aug 2026 22:26:23 +0300
Subject: [PATCH 28/32] [SDK] Address stack review feedback (#11389)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
---
 src/lib/lexClient.ts              |  7 ++++++-
 src/lib/strings/url-helpers.ts    |  9 +++++++++
 src/screens/Login/LoginForm.tsx   |  4 +++-
 src/screens/Signup/state.ts       |  5 +++--
 src/state/queries/profile.ts      | 14 +++++++-------
 src/state/session/index.tsx       | 26 +++++++++++++++++++++++++-
 src/state/session/session-core.ts | 14 +++++++++++---
 src/state/session/session-data.ts | 12 +++++-------
 8 files changed, 69 insertions(+), 22 deletions(-)

diff --git a/src/lib/lexClient.ts b/src/lib/lexClient.ts
index 2a865d763c..568f9c142f 100644
--- a/src/lib/lexClient.ts
+++ b/src/lib/lexClient.ts
@@ -40,7 +40,12 @@ export function createLexClient(
  * Requests use PLAIN `fetch`, not `networkAwareFetch`: the host is untrusted
  * input, and a typo'd or dead service must not be reported as the app losing
  * network reachability.
+ *
+ * `appLabelers: null` suppresses the global `Client.appLabelers` static: these
+ * are `com.atproto.server` calls to a host the user typed, which have no use
+ * for moderation labels, and the header would disclose the app's configured
+ * moderation authorities to an arbitrary third-party server.
  */
 export function createServiceClient(service: string): Client {
-  return createLexClient({service})
+  return createLexClient({service}, {appLabelers: null})
 }
diff --git a/src/lib/strings/url-helpers.ts b/src/lib/strings/url-helpers.ts
index 08ecf4b566..6a4e3335f8 100644
--- a/src/lib/strings/url-helpers.ts
+++ b/src/lib/strings/url-helpers.ts
@@ -27,6 +27,15 @@ const TRUSTED_REGEX = new RegExp(
   )})|/|#)`,
 )
 
+export function canParseUrl(url: string | URL, base?: string | URL): boolean {
+  try {
+    new URL(url, base)
+    return true
+  } catch {
+    return false
+  }
+}
+
 export function isValidDomain(str: string): boolean {
   return !!TLDs.find(tld => {
     let i = str.lastIndexOf(tld)
diff --git a/src/screens/Login/LoginForm.tsx b/src/screens/Login/LoginForm.tsx
index dfd6ccc227..4f34d3afaf 100644
--- a/src/screens/Login/LoginForm.tsx
+++ b/src/screens/Login/LoginForm.tsx
@@ -169,7 +169,9 @@ export const LoginForm = ({
           )
         } else {
           logger.warn('Failed to login', {error: errMsg})
-          setError(cleanError(errMsg))
+          /* the error object, not its stringification: cleanError only
+           * extracts the clean server message from a live LexError */
+          setError(cleanError(err))
         }
       }
     }
diff --git a/src/screens/Signup/state.ts b/src/screens/Signup/state.ts
index b012f34427..c2d8684d42 100644
--- a/src/screens/Signup/state.ts
+++ b/src/screens/Signup/state.ts
@@ -354,7 +354,6 @@ export function useSubmitSignup() {
         onboardingDispatch({type: 'start'})
       } catch (err) {
         const e = err as Error
-        let errMsg = e.toString()
         if (
           matchXrpcError(e, com.atproto.server.createAccount) ===
           'InvalidInviteCode'
@@ -368,7 +367,9 @@ export function useSubmitSignup() {
           return
         }
 
-        const error = cleanError(errMsg)
+        /* the error object, not its stringification: cleanError only extracts
+         * the clean server message from a live LexError */
+        const error = cleanError(e)
         const isHandleError = error.toLowerCase().includes('handle')
 
         dispatch({type: 'setIsLoading', value: false})
diff --git a/src/state/queries/profile.ts b/src/state/queries/profile.ts
index 190f4a3998..fb3f467743 100644
--- a/src/state/queries/profile.ts
+++ b/src/state/queries/profile.ts
@@ -206,21 +206,21 @@ export function useProfileUpdateMutation() {
         appviewClient,
         profile.did,
         checkCommitted ||
-          (profile => {
+          (fresh => {
             if (typeof newUserAvatar !== 'undefined') {
-              if (newUserAvatar === null && profile.avatar) {
+              if (newUserAvatar === null && fresh.avatar) {
                 // url hasn't cleared yet
                 return false
-              } else if (profile.avatar === profile.avatar) {
+              } else if (fresh.avatar === profile.avatar) {
                 // url hasn't changed yet
                 return false
               }
             }
             if (typeof newUserBanner !== 'undefined') {
-              if (newUserBanner === null && profile.banner) {
+              if (newUserBanner === null && fresh.banner) {
                 // url hasn't cleared yet
                 return false
-              } else if (profile.banner === profile.banner) {
+              } else if (fresh.banner === profile.banner) {
                 // url hasn't changed yet
                 return false
               }
@@ -229,8 +229,8 @@ export function useProfileUpdateMutation() {
               return true
             }
             return (
-              profile.displayName === updates.displayName &&
-              profile.description === updates.description
+              fresh.displayName === updates.displayName &&
+              fresh.description === updates.description
             )
           }),
       )
diff --git a/src/state/session/index.tsx b/src/state/session/index.tsx
index d3045932d3..7cce22fff7 100644
--- a/src/state/session/index.tsx
+++ b/src/state/session/index.tsx
@@ -157,7 +157,19 @@ export function Provider({children}: React.PropsWithChildren<{}>) {
       sessionEvent: AtpSessionEvent,
       sessionData?: SessionData,
     ) => {
-      if (sessionEvent === 'update' && sessionData) {
+      /*
+       * Only the live bundle may reset the expiry-rescue bookkeeping: a stale
+       * bundle's late update would otherwise clear the failed-generation set
+       * that bounds the rescue loop. (Its dispatch below is separately dropped
+       * by the reducer's identity guard.)
+       */
+      if (
+        sessionEvent === 'update' &&
+        sessionData &&
+        (store.getState().currentBundleState.bundle as unknown as
+          | SessionBundle
+          | PublicSessionBundle) === bundle
+      ) {
         failedExpiryTokensRef.current.get(accountDid)?.clear()
       }
 
@@ -505,6 +517,18 @@ export function Provider({children}: React.PropsWithChildren<{}>) {
     if (after === before) {
       throw new Error('Failed to refresh session')
     }
+    /*
+     * The user may have logged out or switched accounts while the refresh was
+     * in flight. Reporting success then would run the caller's success path
+     * (dialogs closing, success toasts, SignupQueued advancing) against an
+     * account that is no longer active, so a stale bundle rejects instead.
+     */
+    if (
+      (store.getState().currentBundleState.bundle as unknown) !==
+      (bundle as unknown)
+    ) {
+      throw new Error('The session changed while it was being refreshed')
+    }
     /*
      * The session's `onUpdated` hook dispatches the new tokens into the store,
      * but that lands a render away; this snapshot exposes them immediately.
diff --git a/src/state/session/session-core.ts b/src/state/session/session-core.ts
index 6269cc7f29..dbed9bfa2f 100644
--- a/src/state/session/session-core.ts
+++ b/src/state/session/session-core.ts
@@ -6,6 +6,7 @@ import {
 } from '@atproto/lex-password-session'
 
 import {PUBLIC_BSKY_SERVICE} from '#/lib/constants'
+import {canParseUrl} from '#/lib/strings/url-helpers'
 import {logger} from '#/logger'
 import {prefetchAgeAssuranceServerData} from '#/ageAssurance/data'
 import {features} from '#/analytics'
@@ -95,9 +96,16 @@ export function buildBundle(
   session: PasswordSession,
   storedPdsUrl?: string,
 ): SessionBundle {
-  const agent = storedPdsUrl
-    ? routeSessionToPds(session, storedPdsUrl)
-    : session
+  /*
+   * The stored url is persisted data and may be malformed (legacy writes,
+   * corruption). `routeSessionToPds` feeds it to `new URL()` on every request,
+   * so an invalid value would throw from every client call; discard it here
+   * and let the session route against its own service instead.
+   */
+  const agent =
+    storedPdsUrl && canParseUrl(storedPdsUrl)
+      ? routeSessionToPds(session, storedPdsUrl)
+      : session
   return {
     session,
     appviewClient: buildAppviewClient(agent),
diff --git a/src/state/session/session-data.ts b/src/state/session/session-data.ts
index 711f6ffe9b..bbc81f2875 100644
--- a/src/state/session/session-data.ts
+++ b/src/state/session/session-data.ts
@@ -1,5 +1,7 @@
-import {getPdsEndpoint, isValidDidDoc} from '@atproto/common-web'
-import {type SessionData} from '@atproto/lex-password-session'
+import {
+  extractPdsEndpoint,
+  type SessionData,
+} from '@atproto/lex-password-session'
 import {jwtDecode} from 'jwt-decode'
 
 import {BSKY_SERVICE} from '#/lib/constants'
@@ -40,11 +42,7 @@ export function sessionDataToSessionAccount(
     return undefined
   }
   const normalizedService = new URL(service).toString()
-  const didDocPdsUrl =
-    session.didDoc && isValidDidDoc(session.didDoc)
-      ? getPdsEndpoint(session.didDoc)
-      : undefined
-  const pdsUrl = didDocPdsUrl ?? storedPdsUrl
+  const pdsUrl = extractPdsEndpoint(session.didDoc) ?? storedPdsUrl
   return {
     service: normalizedService,
     did: session.did,

From bb33eb91cb7d23659ae0c3e6df447f4c2c551ce8 Mon Sep 17 00:00:00 2001
From: Samuel Newman <mozzius@protonmail.com>
Date: Thu, 13 Aug 2026 22:26:23 +0300
Subject: [PATCH 29/32] [SDK] Use finalised package (#11398)

---
 __tests__/lib/string.test.ts                  |  2 +-
 lexicons.json                                 |  2 +-
 lexicons/app/bsky/unspecced/getConfig.json    | 14 ++---
 ...boardingSuggestedStarterPacksSkeleton.json | 42 +++++++++++++++
 .../getOnboardingSuggestedUsersSkeleton.json  | 54 +++++++++++++++++++
 .../unspecced/getPopularFeedGenerators.json   | 12 ++---
 .../getSuggestedUsersForDiscoverSkeleton.json | 46 ++++++++++++++++
 .../getSuggestedUsersForExploreSkeleton.json  | 50 +++++++++++++++++
 .../getSuggestedUsersForSeeMoreSkeleton.json  | 50 +++++++++++++++++
 .../unspecced/getSuggestionsSkeleton.json     |  8 +--
 .../bsky/unspecced/getTaggedSuggestions.json  |  9 +---
 .../app/bsky/unspecced/getTrendsSkeleton.json |  4 ++
 .../app/bsky/unspecced/initAgeAssurance.json  | 12 ++---
 .../bsky/unspecced/searchActorsSkeleton.json  | 10 +---
 .../bsky/unspecced/searchPostsSkeleton.json   | 10 +---
 lexicons/app/bsky/video/defs.json             |  7 +++
 package.json                                  |  4 +-
 pnpm-lock.yaml                                | 32 +++++------
 pnpm-workspace.yaml                           | 10 +---
 src/ageAssurance/data.tsx                     |  2 +-
 src/ageAssurance/state.ts                     |  2 +-
 src/ageAssurance/types.ts                     |  2 +-
 .../useComputeAgeAssuranceRegionAccess.ts     |  2 +-
 src/ageAssurance/util.ts                      | 26 ++-------
 .../Autocomplete/useAutocomplete/index.ts     |  2 +-
 src/components/AvatarBubbles.tsx              |  2 +-
 src/components/AvatarStack.tsx                |  2 +-
 src/components/FeedCard.tsx                   |  2 +-
 src/components/KnownFollowers.tsx             |  2 +-
 src/components/ListCard.tsx                   |  2 +-
 src/components/NewskieDialog.tsx              |  2 +-
 src/components/Pills.tsx                      |  4 +-
 src/components/Post/Embed/FeedEmbed.tsx       |  2 +-
 src/components/Post/Embed/ListEmbed.tsx       |  2 +-
 src/components/Post/Embed/index.tsx           |  4 +-
 src/components/Post/Embed/types.ts            |  2 +-
 .../PostControls/PostMenu/PostMenuItems.tsx   |  2 +-
 .../PostControls/PostMenu/index.tsx           |  2 +-
 .../PostControls/ShareMenu/RecentChats.tsx    |  2 +-
 .../ShareMenu/ShareMenuItems.types.tsx        |  2 +-
 .../PostControls/ShareMenu/index.tsx          |  2 +-
 src/components/PostControls/index.tsx         |  2 +-
 src/components/ProfileCard.tsx                |  4 +-
 src/components/ProfileHoverCard/index.web.tsx |  2 +-
 src/components/ProgressGuide/FollowDialog.tsx |  2 +-
 src/components/RichText.tsx                   |  2 +-
 .../StarterPack/Main/ProfilesList.tsx         |  2 +-
 .../Wizard/WizardEditListDialog.tsx           |  2 +-
 .../StarterPack/Wizard/WizardListCard.tsx     |  2 +-
 src/components/VideoPostCard.tsx              |  2 +-
 .../SubscribeProfileButton.tsx                |  2 +-
 .../SubscribeProfileDialog.tsx                |  2 +-
 .../contacts/screens/GetContacts.tsx          |  2 +-
 .../contacts/screens/ViewMatches.tsx          |  2 +-
 src/components/dialogs/MutedWords.tsx         |  2 +-
 .../dialogs/SearchablePeopleList.tsx          |  2 +-
 .../dialogs/lists/CreateOrEditListDialog.tsx  |  2 +-
 .../lists/ListAddRemoveUsersDialog.tsx        |  2 +-
 src/components/dms/ActionsWrapper.tsx         |  2 +-
 src/components/dms/ActionsWrapper.web.tsx     |  2 +-
 src/components/dms/BlockedByListDialog.tsx    |  2 +-
 src/components/dms/ChatProfileTabs.tsx        |  2 +-
 src/components/dms/ConvoMenu.tsx              |  2 +-
 src/components/dms/InitiateChatFlow.tsx       |  2 +-
 src/components/dms/MessageContextMenu.tsx     |  4 +-
 src/components/dms/MessageItem.tsx            |  4 +-
 .../dms/MessagesListBlockedFooter.tsx         |  2 +-
 src/components/dms/MessagesListHeader.tsx     |  2 +-
 .../dms/components/GroupChatProfileCard.tsx   |  2 +-
 src/components/dms/util.ts                    |  2 +-
 src/components/hooks/useRichText.ts           |  2 +-
 .../Gallery/maybeApplyGalleryOffsetStyles.ts  |  2 +-
 .../intents/GroupChatJoinDialog.tsx           |  2 +-
 .../interstitials/FeedTrendingTopics.tsx      |  2 +-
 src/components/moderation/ContentHider.tsx    |  2 +-
 src/components/moderation/Hider.tsx           |  2 +-
 src/components/moderation/LabelPreference.tsx |  2 +-
 .../moderation/ModerationDetailsDialog.tsx    |  2 +-
 src/components/moderation/PostAlerts.tsx      |  2 +-
 src/components/moderation/PostHider.tsx       |  2 +-
 .../moderation/ProfileHeaderAlerts.tsx        |  2 +-
 .../moderation/ReportDialog/action.ts         |  2 +-
 .../moderation/ReportDialog/index.tsx         |  2 +-
 src/components/moderation/ScreenHider.tsx     |  2 +-
 src/features/liveEvents/context.tsx           |  2 +-
 src/features/liveEvents/preferences.ts        |  2 +-
 .../liveNow/components/LiveStatusDialog.tsx   |  2 +-
 src/features/liveNow/index.tsx                |  2 +-
 src/lib/api/index.ts                          |  2 +-
 src/lib/constants.ts                          |  2 +-
 src/lib/moderation.ts                         |  2 +-
 .../create-sanitized-display-name.ts          |  2 +-
 .../moderation/useLabelBehaviorDescription.ts |  2 +-
 src/lib/moderation/useLabelInfo.ts            |  2 +-
 .../useModerationCauseDescription.ts          |  4 +-
 src/lib/strings/display-names.ts              |  2 +-
 src/lib/strings/helpers.ts                    |  2 +-
 src/lib/strings/rich-text-helpers.ts          |  2 +-
 src/lib/strings/rich-text-manip.ts            |  2 +-
 src/screens/Messages/Conversation.tsx         |  2 +-
 .../Messages/ConversationSettings/Member.tsx  |  2 +-
 .../Messages/ConversationSettings/index.tsx   |  2 +-
 src/screens/Messages/JoinRequest.tsx          |  2 +-
 .../Messages/components/ChatListItem.tsx      |  2 +-
 .../Messages/components/ChatStatusInfo.tsx    |  2 +-
 .../Messages/components/InviteLinkDialog.tsx  |  2 +-
 .../Messages/components/MessageInputEmbed.tsx |  4 +-
 .../Messages/components/MessagesList.tsx      |  2 +-
 .../components/MessagesListInfoPanel.tsx      |  2 +-
 src/screens/Moderation/index.tsx              |  2 +-
 src/screens/Onboarding/StepFinished/index.tsx |  6 +--
 .../StepSuggestedAccounts/index.tsx           |  2 +-
 .../PostThread/components/LikesStat.tsx       |  2 +-
 .../components/ThreadItemAnchor.tsx           |  2 +-
 .../PostThread/components/ThreadItemPost.tsx  |  2 +-
 .../components/ThreadItemTreePost.tsx         |  2 +-
 src/screens/Profile/Header/DisplayName.tsx    |  2 +-
 .../Profile/Header/ProfileHeaderLabeler.tsx   |  4 +-
 .../Profile/Header/ProfileHeaderStandard.tsx  |  4 +-
 src/screens/Profile/Header/Shell.tsx          |  2 +-
 src/screens/Profile/Header/index.tsx          |  4 +-
 src/screens/Profile/Sections/Labels.tsx       |  2 +-
 src/screens/ProfileList/components/Header.tsx |  2 +-
 src/screens/ProfileList/index.tsx             |  2 +-
 .../Search/components/SearchHistory.tsx       |  2 +-
 .../Search/components/SearchProfileCard.tsx   |  2 +-
 .../Search/components/StarterPackCard.tsx     |  2 +-
 .../modules/ExploreSuggestedAccounts.tsx      |  2 +-
 .../Search/modules/ExploreTrendingTopics.tsx  |  4 +-
 src/screens/Settings/FindContactsSettings.tsx |  2 +-
 src/screens/Settings/InterestsSettings.tsx    |  2 +-
 .../ActivityNotificationSettings.tsx          |  2 +-
 src/screens/Settings/Settings.tsx             |  4 +-
 .../StarterPack/StarterPackLandingScreen.tsx  |  2 +-
 src/screens/StarterPack/StarterPackScreen.tsx |  4 +-
 src/screens/StarterPack/Wizard/StepFeeds.tsx  |  2 +-
 .../StarterPack/Wizard/StepProfiles.tsx       |  2 +-
 src/screens/StarterPack/Wizard/index.tsx      |  2 +-
 src/screens/VideoFeed/index.tsx               |  4 +-
 src/state/birthdate.ts                        |  2 +-
 src/state/preferences/label-defs.tsx          |  2 +-
 src/state/preferences/moderation-opts.tsx     |  2 +-
 src/state/queries/actor-autocomplete.ts       |  2 +-
 src/state/queries/explore-feed-previews.tsx   |  2 +-
 src/state/queries/feed.ts                     |  4 +-
 src/state/queries/labeler.ts                  |  2 +-
 src/state/queries/like.ts                     |  2 +-
 src/state/queries/list.ts                     |  2 +-
 src/state/queries/notifications/feed.ts       |  2 +-
 src/state/queries/notifications/util.ts       |  2 +-
 src/state/queries/nuxs/index.ts               |  2 +-
 src/state/queries/nuxs/util.ts                |  2 +-
 src/state/queries/post-feed.ts                |  2 +-
 .../queries/post-interaction-settings.ts      |  2 +-
 src/state/queries/post.ts                     |  2 +-
 src/state/queries/preferences/const.ts        |  2 +-
 src/state/queries/preferences/index.ts        |  4 +-
 src/state/queries/preferences/moderation.ts   |  2 +-
 src/state/queries/preferences/types.ts        |  2 +-
 src/state/queries/profile-feedgens.ts         |  2 +-
 src/state/queries/profile-lists.ts            |  2 +-
 src/state/queries/profile.ts                  |  3 +-
 src/state/queries/search-posts-v2.ts          |  2 +-
 src/state/queries/starter-packs.ts            |  2 +-
 .../queries/trending/useGetTrendsQuery.ts     |  2 +-
 src/state/queries/usePostThread/traversal.ts  |  2 +-
 src/state/queries/usePostThread/types.ts      |  2 +-
 src/state/queries/usePostThread/views.ts      |  2 +-
 src/state/session/create-account.ts           |  6 +--
 src/state/session/moderation.ts               |  2 +-
 src/state/shell/composer/index.tsx            |  2 +-
 src/view/com/composer/Composer.tsx            |  2 +-
 src/view/com/composer/drafts/state/api.ts     |  2 +-
 .../select-language/SuggestedLanguage.tsx     |  2 +-
 src/view/com/composer/state/composer.ts       |  2 +-
 .../com/composer/text-input/TextInput.tsx     |  2 +-
 .../composer/text-input/TextInput.types.ts    |  2 +-
 .../com/composer/text-input/TextInput.web.tsx |  2 +-
 .../composer/text-input/text-input-util.ts    |  2 +-
 .../composer/text-input/web/Autocomplete.tsx  |  2 +-
 .../composer/text-input/web/LinkDecorator.ts  |  2 +-
 .../composer/text-input/web/TagDecorator.ts   |  2 +-
 .../notifications/NotificationFeedItem.tsx    |  2 +-
 src/view/com/post-thread/PostQuotes.tsx       |  2 +-
 src/view/com/post/Post.tsx                    |  4 +-
 src/view/com/posts/PostFeed.tsx               |  2 +-
 src/view/com/posts/PostFeedItem.tsx           |  4 +-
 src/view/com/posts/PostFeedReason.tsx         |  2 +-
 src/view/com/util/PostMeta.tsx                |  2 +-
 src/view/com/util/UserAvatar.tsx              |  2 +-
 src/view/com/util/UserBanner.tsx              |  2 +-
 src/view/screens/DebugMod.tsx                 |  4 +-
 src/view/screens/Profile.tsx                  |  4 +-
 193 files changed, 488 insertions(+), 311 deletions(-)
 create mode 100644 lexicons/app/bsky/unspecced/getOnboardingSuggestedStarterPacksSkeleton.json
 create mode 100644 lexicons/app/bsky/unspecced/getOnboardingSuggestedUsersSkeleton.json
 create mode 100644 lexicons/app/bsky/unspecced/getSuggestedUsersForDiscoverSkeleton.json
 create mode 100644 lexicons/app/bsky/unspecced/getSuggestedUsersForExploreSkeleton.json
 create mode 100644 lexicons/app/bsky/unspecced/getSuggestedUsersForSeeMoreSkeleton.json

diff --git a/__tests__/lib/string.test.ts b/__tests__/lib/string.test.ts
index da34bd0dc6..cbe0d889de 100644
--- a/__tests__/lib/string.test.ts
+++ b/__tests__/lib/string.test.ts
@@ -1,4 +1,4 @@
-import {RichText} from '@bsky.app/sdk/richtext'
+import {RichText} from '@bsky/sdk/richtext'
 import {i18n} from '@lingui/core'
 
 import {parseEmbedPlayerFromUrl} from '#/lib/strings/embed-player'
diff --git a/lexicons.json b/lexicons.json
index 614e09e817..5fa2fdb0bb 100644
--- a/lexicons.json
+++ b/lexicons.json
@@ -726,7 +726,7 @@
     },
     "app.bsky.video.defs": {
       "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.video.defs",
-      "cid": "bafyreibxabe2aejhtnjbwsnt7va4bvge35p7lzcjt2nwmf2c4taww46yyq"
+      "cid": "bafyreicorzkcw5zp4zjsiepyakpfn3vvtpwsbqwzsy43d2y6i3t5rp3meu"
     },
     "app.bsky.video.getJobStatus": {
       "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.video.getJobStatus",
diff --git a/lexicons/app/bsky/unspecced/getConfig.json b/lexicons/app/bsky/unspecced/getConfig.json
index 1e40f80dc2..286bc48058 100644
--- a/lexicons/app/bsky/unspecced/getConfig.json
+++ b/lexicons/app/bsky/unspecced/getConfig.json
@@ -11,15 +11,10 @@
           "type": "object",
           "required": [],
           "properties": {
-            "checkEmailConfirmed": {
-              "type": "boolean"
-            },
+            "checkEmailConfirmed": { "type": "boolean" },
             "liveNow": {
               "type": "array",
-              "items": {
-                "type": "ref",
-                "ref": "#liveNowConfig"
-              }
+              "items": { "type": "ref", "ref": "#liveNowConfig" }
             }
           }
         }
@@ -29,10 +24,7 @@
       "type": "object",
       "required": ["did", "domains"],
       "properties": {
-        "did": {
-          "type": "string",
-          "format": "did"
-        },
+        "did": { "type": "string", "format": "did" },
         "domains": {
           "type": "array",
           "items": {
diff --git a/lexicons/app/bsky/unspecced/getOnboardingSuggestedStarterPacksSkeleton.json b/lexicons/app/bsky/unspecced/getOnboardingSuggestedStarterPacksSkeleton.json
new file mode 100644
index 0000000000..40f3a76264
--- /dev/null
+++ b/lexicons/app/bsky/unspecced/getOnboardingSuggestedStarterPacksSkeleton.json
@@ -0,0 +1,42 @@
+{
+  "lexicon": 1,
+  "id": "app.bsky.unspecced.getOnboardingSuggestedStarterPacksSkeleton",
+  "defs": {
+    "main": {
+      "type": "query",
+      "description": "Get a skeleton of suggested starterpacks for onboarding. Intended to be called and hydrated by app.bsky.unspecced.getOnboardingSuggestedStarterPacks",
+      "parameters": {
+        "type": "params",
+        "properties": {
+          "viewer": {
+            "type": "string",
+            "format": "did",
+            "description": "DID of the account making the request (not included for public/unauthenticated queries)."
+          },
+          "limit": {
+            "type": "integer",
+            "minimum": 1,
+            "maximum": 25,
+            "default": 10
+          }
+        }
+      },
+      "output": {
+        "encoding": "application/json",
+        "schema": {
+          "type": "object",
+          "required": ["starterPacks"],
+          "properties": {
+            "starterPacks": {
+              "type": "array",
+              "items": {
+                "type": "string",
+                "format": "at-uri"
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/lexicons/app/bsky/unspecced/getOnboardingSuggestedUsersSkeleton.json b/lexicons/app/bsky/unspecced/getOnboardingSuggestedUsersSkeleton.json
new file mode 100644
index 0000000000..1303ac174d
--- /dev/null
+++ b/lexicons/app/bsky/unspecced/getOnboardingSuggestedUsersSkeleton.json
@@ -0,0 +1,54 @@
+{
+  "lexicon": 1,
+  "id": "app.bsky.unspecced.getOnboardingSuggestedUsersSkeleton",
+  "defs": {
+    "main": {
+      "type": "query",
+      "description": "Get a skeleton of suggested users for onboarding. Intended to be called and hydrated by app.bsky.unspecced.getSuggestedOnboardingUsers",
+      "parameters": {
+        "type": "params",
+        "properties": {
+          "viewer": {
+            "type": "string",
+            "format": "did",
+            "description": "DID of the account making the request (not included for public/unauthenticated queries)."
+          },
+          "category": {
+            "type": "string",
+            "description": "Category of users to get suggestions for."
+          },
+          "limit": {
+            "type": "integer",
+            "minimum": 1,
+            "maximum": 50,
+            "default": 25
+          }
+        }
+      },
+      "output": {
+        "encoding": "application/json",
+        "schema": {
+          "type": "object",
+          "required": ["dids"],
+          "properties": {
+            "dids": {
+              "type": "array",
+              "items": {
+                "type": "string",
+                "format": "did"
+              }
+            },
+            "recId": {
+              "type": "string",
+              "description": "DEPRECATED: use recIdStr instead."
+            },
+            "recIdStr": {
+              "type": "string",
+              "description": "Snowflake for this recommendation, use when submitting recommendation events."
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/lexicons/app/bsky/unspecced/getPopularFeedGenerators.json b/lexicons/app/bsky/unspecced/getPopularFeedGenerators.json
index 407ff66e3a..ee05c16a1c 100644
--- a/lexicons/app/bsky/unspecced/getPopularFeedGenerators.json
+++ b/lexicons/app/bsky/unspecced/getPopularFeedGenerators.json
@@ -14,12 +14,8 @@
             "maximum": 100,
             "default": 50
           },
-          "cursor": {
-            "type": "string"
-          },
-          "query": {
-            "type": "string"
-          }
+          "cursor": { "type": "string" },
+          "query": { "type": "string" }
         }
       },
       "output": {
@@ -28,9 +24,7 @@
           "type": "object",
           "required": ["feeds"],
           "properties": {
-            "cursor": {
-              "type": "string"
-            },
+            "cursor": { "type": "string" },
             "feeds": {
               "type": "array",
               "items": {
diff --git a/lexicons/app/bsky/unspecced/getSuggestedUsersForDiscoverSkeleton.json b/lexicons/app/bsky/unspecced/getSuggestedUsersForDiscoverSkeleton.json
new file mode 100644
index 0000000000..7f017ca5e6
--- /dev/null
+++ b/lexicons/app/bsky/unspecced/getSuggestedUsersForDiscoverSkeleton.json
@@ -0,0 +1,46 @@
+{
+  "lexicon": 1,
+  "id": "app.bsky.unspecced.getSuggestedUsersForDiscoverSkeleton",
+  "defs": {
+    "main": {
+      "type": "query",
+      "description": "Get a skeleton of suggested users for the Discover page. Intended to be called and hydrated by app.bsky.unspecced.getSuggestedUsersForDiscover",
+      "parameters": {
+        "type": "params",
+        "properties": {
+          "viewer": {
+            "type": "string",
+            "format": "did",
+            "description": "DID of the account making the request (not included for public/unauthenticated queries)."
+          },
+          "limit": {
+            "type": "integer",
+            "minimum": 1,
+            "maximum": 50,
+            "default": 25
+          }
+        }
+      },
+      "output": {
+        "encoding": "application/json",
+        "schema": {
+          "type": "object",
+          "required": ["dids"],
+          "properties": {
+            "dids": {
+              "type": "array",
+              "items": {
+                "type": "string",
+                "format": "did"
+              }
+            },
+            "recIdStr": {
+              "type": "string",
+              "description": "Snowflake for this recommendation, use when submitting recommendation events."
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/lexicons/app/bsky/unspecced/getSuggestedUsersForExploreSkeleton.json b/lexicons/app/bsky/unspecced/getSuggestedUsersForExploreSkeleton.json
new file mode 100644
index 0000000000..b3f3186e84
--- /dev/null
+++ b/lexicons/app/bsky/unspecced/getSuggestedUsersForExploreSkeleton.json
@@ -0,0 +1,50 @@
+{
+  "lexicon": 1,
+  "id": "app.bsky.unspecced.getSuggestedUsersForExploreSkeleton",
+  "defs": {
+    "main": {
+      "type": "query",
+      "description": "Get a skeleton of suggested users for the Explore page. Intended to be called and hydrated by app.bsky.unspecced.getSuggestedUsersForExplore",
+      "parameters": {
+        "type": "params",
+        "properties": {
+          "viewer": {
+            "type": "string",
+            "format": "did",
+            "description": "DID of the account making the request (not included for public/unauthenticated queries)."
+          },
+          "category": {
+            "type": "string",
+            "description": "Category of users to get suggestions for."
+          },
+          "limit": {
+            "type": "integer",
+            "minimum": 1,
+            "maximum": 50,
+            "default": 25
+          }
+        }
+      },
+      "output": {
+        "encoding": "application/json",
+        "schema": {
+          "type": "object",
+          "required": ["dids"],
+          "properties": {
+            "dids": {
+              "type": "array",
+              "items": {
+                "type": "string",
+                "format": "did"
+              }
+            },
+            "recIdStr": {
+              "type": "string",
+              "description": "Snowflake for this recommendation, use when submitting recommendation events."
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/lexicons/app/bsky/unspecced/getSuggestedUsersForSeeMoreSkeleton.json b/lexicons/app/bsky/unspecced/getSuggestedUsersForSeeMoreSkeleton.json
new file mode 100644
index 0000000000..954b518d77
--- /dev/null
+++ b/lexicons/app/bsky/unspecced/getSuggestedUsersForSeeMoreSkeleton.json
@@ -0,0 +1,50 @@
+{
+  "lexicon": 1,
+  "id": "app.bsky.unspecced.getSuggestedUsersForSeeMoreSkeleton",
+  "defs": {
+    "main": {
+      "type": "query",
+      "description": "Get a skeleton of suggested users for the See More page. Intended to be called and hydrated by app.bsky.unspecced.getSuggestedUsersForSeeMore",
+      "parameters": {
+        "type": "params",
+        "properties": {
+          "viewer": {
+            "type": "string",
+            "format": "did",
+            "description": "DID of the account making the request (not included for public/unauthenticated queries)."
+          },
+          "category": {
+            "type": "string",
+            "description": "Category of users to get suggestions for."
+          },
+          "limit": {
+            "type": "integer",
+            "minimum": 1,
+            "maximum": 50,
+            "default": 25
+          }
+        }
+      },
+      "output": {
+        "encoding": "application/json",
+        "schema": {
+          "type": "object",
+          "required": ["dids"],
+          "properties": {
+            "dids": {
+              "type": "array",
+              "items": {
+                "type": "string",
+                "format": "did"
+              }
+            },
+            "recIdStr": {
+              "type": "string",
+              "description": "Snowflake for this recommendation, use when submitting recommendation events."
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/lexicons/app/bsky/unspecced/getSuggestionsSkeleton.json b/lexicons/app/bsky/unspecced/getSuggestionsSkeleton.json
index 466815ed47..f97504c31d 100644
--- a/lexicons/app/bsky/unspecced/getSuggestionsSkeleton.json
+++ b/lexicons/app/bsky/unspecced/getSuggestionsSkeleton.json
@@ -19,9 +19,7 @@
             "maximum": 100,
             "default": 50
           },
-          "cursor": {
-            "type": "string"
-          },
+          "cursor": { "type": "string" },
           "relativeToDid": {
             "type": "string",
             "format": "did",
@@ -35,9 +33,7 @@
           "type": "object",
           "required": ["actors"],
           "properties": {
-            "cursor": {
-              "type": "string"
-            },
+            "cursor": { "type": "string" },
             "actors": {
               "type": "array",
               "items": {
diff --git a/lexicons/app/bsky/unspecced/getTaggedSuggestions.json b/lexicons/app/bsky/unspecced/getTaggedSuggestions.json
index f81459098d..9fd98ffefb 100644
--- a/lexicons/app/bsky/unspecced/getTaggedSuggestions.json
+++ b/lexicons/app/bsky/unspecced/getTaggedSuggestions.json
@@ -30,17 +30,12 @@
       "type": "object",
       "required": ["tag", "subjectType", "subject"],
       "properties": {
-        "tag": {
-          "type": "string"
-        },
+        "tag": { "type": "string" },
         "subjectType": {
           "type": "string",
           "knownValues": ["actor", "feed"]
         },
-        "subject": {
-          "type": "string",
-          "format": "uri"
-        }
+        "subject": { "type": "string", "format": "uri" }
       }
     }
   }
diff --git a/lexicons/app/bsky/unspecced/getTrendsSkeleton.json b/lexicons/app/bsky/unspecced/getTrendsSkeleton.json
index d0b6272bb6..3cb5a15b77 100644
--- a/lexicons/app/bsky/unspecced/getTrendsSkeleton.json
+++ b/lexicons/app/bsky/unspecced/getTrendsSkeleton.json
@@ -33,6 +33,10 @@
                 "type": "ref",
                 "ref": "app.bsky.unspecced.defs#skeletonTrend"
               }
+            },
+            "recIdStr": {
+              "type": "string",
+              "description": "Snowflake for this recommendation, use when submitting recommendation events."
             }
           }
         }
diff --git a/lexicons/app/bsky/unspecced/initAgeAssurance.json b/lexicons/app/bsky/unspecced/initAgeAssurance.json
index 236c07cf36..43c4d3cf5e 100644
--- a/lexicons/app/bsky/unspecced/initAgeAssurance.json
+++ b/lexicons/app/bsky/unspecced/initAgeAssurance.json
@@ -34,15 +34,9 @@
         }
       },
       "errors": [
-        {
-          "name": "InvalidEmail"
-        },
-        {
-          "name": "DidTooLong"
-        },
-        {
-          "name": "InvalidInitiation"
-        }
+        { "name": "InvalidEmail" },
+        { "name": "DidTooLong" },
+        { "name": "InvalidInitiation" }
       ]
     }
   }
diff --git a/lexicons/app/bsky/unspecced/searchActorsSkeleton.json b/lexicons/app/bsky/unspecced/searchActorsSkeleton.json
index 71784336a3..f6489140b9 100644
--- a/lexicons/app/bsky/unspecced/searchActorsSkeleton.json
+++ b/lexicons/app/bsky/unspecced/searchActorsSkeleton.json
@@ -40,9 +40,7 @@
           "type": "object",
           "required": ["actors"],
           "properties": {
-            "cursor": {
-              "type": "string"
-            },
+            "cursor": { "type": "string" },
             "hitsTotal": {
               "type": "integer",
               "description": "Count of search hits. Optional, may be rounded/truncated, and may not be possible to paginate through all hits."
@@ -57,11 +55,7 @@
           }
         }
       },
-      "errors": [
-        {
-          "name": "BadQueryString"
-        }
-      ]
+      "errors": [{ "name": "BadQueryString" }]
     }
   }
 }
diff --git a/lexicons/app/bsky/unspecced/searchPostsSkeleton.json b/lexicons/app/bsky/unspecced/searchPostsSkeleton.json
index 63c3cf4858..3be2c1b757 100644
--- a/lexicons/app/bsky/unspecced/searchPostsSkeleton.json
+++ b/lexicons/app/bsky/unspecced/searchPostsSkeleton.json
@@ -83,9 +83,7 @@
           "type": "object",
           "required": ["posts"],
           "properties": {
-            "cursor": {
-              "type": "string"
-            },
+            "cursor": { "type": "string" },
             "hitsTotal": {
               "type": "integer",
               "description": "Count of search hits. Optional, may be rounded/truncated, and may not be possible to paginate through all hits."
@@ -100,11 +98,7 @@
           }
         }
       },
-      "errors": [
-        {
-          "name": "BadQueryString"
-        }
-      ]
+      "errors": [{ "name": "BadQueryString" }]
     }
   }
 }
diff --git a/lexicons/app/bsky/video/defs.json b/lexicons/app/bsky/video/defs.json
index a5bcb22bcd..278c17b35e 100644
--- a/lexicons/app/bsky/video/defs.json
+++ b/lexicons/app/bsky/video/defs.json
@@ -26,6 +26,13 @@
           "type": "string",
           "description": "The state of the video processing job. All values not listed as a known value indicate that the job is in process.",
           "knownValues": [
+            "JOB_STATE_CREATED",
+            "JOB_STATE_ENCODING",
+            "JOB_STATE_ENCODED",
+            "JOB_STATE_SCANNING",
+            "JOB_STATE_SCANNED",
+            "JOB_STATE_UPLOADING",
+            "JOB_STATE_UPLOADED",
             "JOB_STATE_COMPLETED",
             "JOB_STATE_FAILED"
           ]
diff --git a/package.json b/package.json
index 4415b0fa58..a7114fba73 100644
--- a/package.json
+++ b/package.json
@@ -114,11 +114,11 @@
     "@bsky.app/expo-translate-text": "^0.2.9",
     "@bsky.app/peek-menu": "^0.3.2",
     "@bsky.app/react-native-uitextview": "^2.7.0",
-    "@bsky.app/sdk": "npm:bsky-sdk-preview@0.0.1-preview.2",
     "@bsky.app/sift": "^0.3.9",
     "@bsky.app/tapper": "^0.6.1",
     "@bsky.app/video": "0.3.6",
     "@bsky.app/video-compressor": "0.2.0",
+    "@bsky/sdk": "1.0.0",
     "@emoji-mart/data": "^1.2.1",
     "@emoji-mart/react": "^1.1.1",
     "@expo/html-elements": "^0.12.5",
@@ -342,7 +342,7 @@
       "^cborg$": "<rootDir>/node_modules/cborg/cborg.js"
     },
     "transformIgnorePatterns": [
-      "node_modules/(?!((jest-)?react-native|@react-native(-community)?)|expo(nent)?|@expo(nent)?/.*|@expo-google-fonts/.*|react-navigation|nanoid|@react-navigation/.*|@unimodules/.*|unimodules|sentry-expo|native-base|normalize-url|react-native-svg|@sentry/.*|sentry-expo|bcp-47-match|@atproto/.*|@bsky.app/sdk|tlds|multiformats|uint8arrays|@ipld/.*|cborg|await-lock)"
+      "node_modules/(?!((jest-)?react-native|@react-native(-community)?)|expo(nent)?|@expo(nent)?/.*|@expo-google-fonts/.*|react-navigation|nanoid|@react-navigation/.*|@unimodules/.*|unimodules|sentry-expo|native-base|normalize-url|react-native-svg|@sentry/.*|sentry-expo|bcp-47-match|@atproto/.*|@bsky/sdk|tlds|multiformats|uint8arrays|@ipld/.*|cborg|await-lock)"
     ],
     "modulePathIgnorePatterns": [
       "__tests__/.*/__mocks__",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 92a4d68c35..6cd00fba0a 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -284,9 +284,6 @@ importers:
       '@bsky.app/react-native-uitextview':
         specifier: ^2.7.0
         version: 2.7.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)
-      '@bsky.app/sdk':
-        specifier: npm:bsky-sdk-preview@0.0.1-preview.2
-        version: bsky-sdk-preview@0.0.1-preview.2(@atproto/lex@0.3.6)
       '@bsky.app/sift':
         specifier: ^0.3.9
         version: 0.3.9(2d5c14016450c7e55c8cd0dffcca6f69)
@@ -299,6 +296,9 @@ importers:
       '@bsky.app/video-compressor':
         specifier: 0.2.0
         version: 0.2.0(83e0f64f4281e4798012214ad5b2d72d)
+      '@bsky/sdk':
+        specifier: 1.0.0
+        version: 1.0.0(@atproto/lex@0.3.6)
       '@emoji-mart/data':
         specifier: ^1.2.1
         version: 1.2.1
@@ -1771,6 +1771,12 @@ packages:
       react: '*'
       react-native: '*'
 
+  '@bsky/sdk@1.0.0':
+    resolution: {integrity: sha512-nnVYpbESETN5R/dyBLWE+5u52HkJO0+EWMv+bLDRZUkHEQtHV2RX3kLMqXaEWVJgijagziLPXb6179mkml8WZA==}
+    engines: {node: '>=22.12.0'}
+    peerDependencies:
+      '@atproto/lex': ^0.3.0
+
   '@crowdin/cli@4.14.2':
     resolution: {integrity: sha512-JRrHvitc0w+r/h6XXSOq917HxsjRoxPEtyNYSmylKirjiPNrRx84VKtqFlOIWIFCOZI5BoXg6hNpE0Zq7CwVBA==}
     hasBin: true
@@ -4494,12 +4500,6 @@ packages:
   bser@2.1.1:
     resolution: {integrity: sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==}
 
-  bsky-sdk-preview@0.0.1-preview.2:
-    resolution: {integrity: sha512-LOcuvzc6UASiI5os1BUIo9dxAeVPIFiplcVSYbaDCgpH+tkpv2mqSqqsCRTP0g2CaVCwozqaTVy+jnsTO6/9BQ==}
-    engines: {node: '>=22.12.0'}
-    peerDependencies:
-      '@atproto/lex': ^0.3.0
-
   buffer-crc32@0.2.13:
     resolution: {integrity: sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==}
 
@@ -10840,6 +10840,13 @@ snapshots:
       react: 19.1.0
       react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1)
 
+  '@bsky/sdk@1.0.0(@atproto/lex@0.3.6)':
+    dependencies:
+      '@atproto-labs/handle-resolver': 0.4.8
+      '@atproto/lex': 0.3.6
+      '@atproto/syntax': 0.7.4
+      tlds: 1.261.0
+
   '@crowdin/cli@4.14.2':
     dependencies:
       command-exists-promise: 2.0.2
@@ -14040,13 +14047,6 @@ snapshots:
     dependencies:
       node-int64: 0.4.0
 
-  bsky-sdk-preview@0.0.1-preview.2(@atproto/lex@0.3.6):
-    dependencies:
-      '@atproto-labs/handle-resolver': 0.4.8
-      '@atproto/lex': 0.3.6
-      '@atproto/syntax': 0.7.4
-      tlds: 1.261.0
-
   buffer-crc32@0.2.13: {}
 
   buffer-from@1.1.2: {}
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index cbb815b851..06aef9e617 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -46,12 +46,4 @@ minimumReleaseAgeExclude:
   - '@atproto/*'
   - '@atproto-labs/*'
   - '@bsky.app/*'
-  # todo: remove when old enough
-  - '@oxlint-tsgolint/darwin-arm64@7.0.2001'
-  - '@oxlint-tsgolint/darwin-x64@7.0.2001'
-  - '@oxlint-tsgolint/linux-arm64@7.0.2001'
-  - '@oxlint-tsgolint/linux-x64@7.0.2001'
-  - '@oxlint-tsgolint/win32-arm64@7.0.2001'
-  - '@oxlint-tsgolint/win32-x64@7.0.2001'
-  - oxlint-tsgolint@7.0.2001
-  - bsky-sdk-preview@0.0.1-preview.2
+  - '@bsky/*'
diff --git a/src/ageAssurance/data.tsx b/src/ageAssurance/data.tsx
index 0eed2bc43f..e5cedf81ae 100644
--- a/src/ageAssurance/data.tsx
+++ b/src/ageAssurance/data.tsx
@@ -1,7 +1,7 @@
 import {createContext, useCallback, useContext, useEffect, useMemo} from 'react'
 import * as AgeRange from 'expo-age-range'
 import {type Client} from '@atproto/lex'
-import {getPreferences} from '@bsky.app/sdk'
+import {getPreferences} from '@bsky/sdk'
 import {createAsyncStoragePersister} from '@tanstack/query-async-storage-persister'
 import {focusManager, QueryClient, useQuery} from '@tanstack/react-query'
 import {persistQueryClient} from '@tanstack/react-query-persist-client'
diff --git a/src/ageAssurance/state.ts b/src/ageAssurance/state.ts
index 8ede9d13fa..fb799f934e 100644
--- a/src/ageAssurance/state.ts
+++ b/src/ageAssurance/state.ts
@@ -1,6 +1,6 @@
 import {useEffect, useMemo, useState} from 'react'
 import type * as AgeRange from 'expo-age-range'
-import {computeAgeAssuranceRegionAccess} from '@bsky.app/sdk/utils'
+import {computeAgeAssuranceRegionAccess} from '@bsky/sdk/utils'
 
 import {getAge} from '#/lib/strings/time'
 import {useSession} from '#/state/session'
diff --git a/src/ageAssurance/types.ts b/src/ageAssurance/types.ts
index 79fd5f1820..b9b775396a 100644
--- a/src/ageAssurance/types.ts
+++ b/src/ageAssurance/types.ts
@@ -1,5 +1,5 @@
 import type * as AgeRange from 'expo-age-range'
-import {type computeAgeAssuranceRegionAccess} from '@bsky.app/sdk/utils'
+import {type computeAgeAssuranceRegionAccess} from '@bsky/sdk/utils'
 
 import {logger} from '#/ageAssurance/logger'
 
diff --git a/src/ageAssurance/useComputeAgeAssuranceRegionAccess.ts b/src/ageAssurance/useComputeAgeAssuranceRegionAccess.ts
index 8f88398ce6..5cda2ea7c3 100644
--- a/src/ageAssurance/useComputeAgeAssuranceRegionAccess.ts
+++ b/src/ageAssurance/useComputeAgeAssuranceRegionAccess.ts
@@ -1,5 +1,5 @@
 import {useCallback} from 'react'
-import {computeAgeAssuranceRegionAccess} from '@bsky.app/sdk/utils'
+import {computeAgeAssuranceRegionAccess} from '@bsky/sdk/utils'
 
 import {useAgeAssuranceServerDataContext} from '#/ageAssurance/data'
 import {logger} from '#/ageAssurance/logger'
diff --git a/src/ageAssurance/util.ts b/src/ageAssurance/util.ts
index 39bb14ab0c..d8657c157a 100644
--- a/src/ageAssurance/util.ts
+++ b/src/ageAssurance/util.ts
@@ -1,10 +1,10 @@
 import {useMemo} from 'react'
 import type * as AgeRange from 'expo-age-range'
-import {type ModerationPrefs} from '@bsky.app/sdk/moderation'
+import {type ModerationPrefs} from '@bsky/sdk/moderation'
 import {
   computeAgeAssuranceRegionAccess,
   getAgeAssuranceRegionConfig,
-} from '@bsky.app/sdk/utils'
+} from '@bsky/sdk/utils'
 
 import {getAge} from '#/lib/strings/time'
 import {regionName} from '#/locale/helpers'
@@ -45,28 +45,10 @@ export function getAgeAssuranceRegionConfigForGeolocation(
   config: app.bsky.ageassurance.defs.Config,
   geolocation: Geolocation,
 ): app.bsky.ageassurance.defs.ConfigRegion | undefined {
-  /*
-   * The SDK's region matcher takes no `platform` filter, so platform scoping
-   * is applied here: regions restricted to other platforms are dropped before
-   * matching. Once the SDK accepts a platform, this whole function body
-   * collapses to:
-   *
-   *   return getAgeAssuranceRegionConfig(config, {
-   *     countryCode: geolocation.countryCode ?? '',
-   *     regionCode: geolocation.regionCode,
-   *     platform: AGE_ASSURANCE_PLATFORM,
-   *   })
-   */
-  const scoped: app.bsky.ageassurance.defs.Config = {
-    ...config,
-    regions: config.regions.filter(
-      region =>
-        !region.platforms || region.platforms.includes(AGE_ASSURANCE_PLATFORM),
-    ),
-  }
-  return getAgeAssuranceRegionConfig(scoped, {
+  return getAgeAssuranceRegionConfig(config, {
     countryCode: geolocation.countryCode ?? '',
     regionCode: geolocation.regionCode,
+    platform: AGE_ASSURANCE_PLATFORM,
   })
 }
 
diff --git a/src/components/Autocomplete/useAutocomplete/index.ts b/src/components/Autocomplete/useAutocomplete/index.ts
index de5009a600..1834bfca67 100644
--- a/src/components/Autocomplete/useAutocomplete/index.ts
+++ b/src/components/Autocomplete/useAutocomplete/index.ts
@@ -1,5 +1,5 @@
 import {useCallback, useMemo} from 'react'
-import {moderateProfile, type ModerationOpts} from '@bsky.app/sdk/moderation'
+import {moderateProfile, type ModerationOpts} from '@bsky/sdk/moderation'
 import {keepPreviousData, useQuery} from '@tanstack/react-query'
 
 import {isJustAMute, moduiContainsHideableOffense} from '#/lib/moderation'
diff --git a/src/components/AvatarBubbles.tsx b/src/components/AvatarBubbles.tsx
index 6189141934..685b96c57d 100644
--- a/src/components/AvatarBubbles.tsx
+++ b/src/components/AvatarBubbles.tsx
@@ -8,7 +8,7 @@ import Animated, {
   withDelay,
   withTiming,
 } from 'react-native-reanimated'
-import {moderateProfile} from '@bsky.app/sdk/moderation'
+import {moderateProfile} from '@bsky/sdk/moderation'
 
 import {useMaybeProfileShadow} from '#/state/cache/profile-shadow'
 import {useModerationOpts} from '#/state/preferences/moderation-opts'
diff --git a/src/components/AvatarStack.tsx b/src/components/AvatarStack.tsx
index dc7a8395c3..8c5893ed76 100644
--- a/src/components/AvatarStack.tsx
+++ b/src/components/AvatarStack.tsx
@@ -1,5 +1,5 @@
 import {View} from 'react-native'
-import {moderateProfile} from '@bsky.app/sdk/moderation'
+import {moderateProfile} from '@bsky/sdk/moderation'
 
 import {logger} from '#/logger'
 import {useModerationOpts} from '#/state/preferences/moderation-opts'
diff --git a/src/components/FeedCard.tsx b/src/components/FeedCard.tsx
index b8e60ff286..bf55f218d6 100644
--- a/src/components/FeedCard.tsx
+++ b/src/components/FeedCard.tsx
@@ -1,7 +1,7 @@
 import {useCallback, useEffect, useMemo} from 'react'
 import {type GestureResponderEvent, View} from 'react-native'
 import {AtUri} from '@atproto/syntax'
-import {RichText as RichTextApi} from '@bsky.app/sdk/richtext'
+import {RichText as RichTextApi} from '@bsky/sdk/richtext'
 import {Plural, Trans, useLingui} from '@lingui/react/macro'
 import {useQueryClient} from '@tanstack/react-query'
 
diff --git a/src/components/KnownFollowers.tsx b/src/components/KnownFollowers.tsx
index b6f90fc401..2f1c115e64 100644
--- a/src/components/KnownFollowers.tsx
+++ b/src/components/KnownFollowers.tsx
@@ -1,6 +1,6 @@
 import {useRef} from 'react'
 import {View} from 'react-native'
-import {moderateProfile, type ModerationOpts} from '@bsky.app/sdk/moderation'
+import {moderateProfile, type ModerationOpts} from '@bsky/sdk/moderation'
 import {Plural, Trans, useLingui} from '@lingui/react/macro'
 
 import {makeProfileLink} from '#/lib/routes/links'
diff --git a/src/components/ListCard.tsx b/src/components/ListCard.tsx
index d9e15f9108..bf8e26a7f0 100644
--- a/src/components/ListCard.tsx
+++ b/src/components/ListCard.tsx
@@ -1,7 +1,7 @@
 import {useEffect, useMemo} from 'react'
 import {View} from 'react-native'
 import {AtUri} from '@atproto/syntax'
-import {moderateUserList, type ModerationUI} from '@bsky.app/sdk/moderation'
+import {moderateUserList, type ModerationUI} from '@bsky/sdk/moderation'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
diff --git a/src/components/NewskieDialog.tsx b/src/components/NewskieDialog.tsx
index 43025aca94..fc499a7fa0 100644
--- a/src/components/NewskieDialog.tsx
+++ b/src/components/NewskieDialog.tsx
@@ -1,6 +1,6 @@
 import {useMemo, useState} from 'react'
 import {View} from 'react-native'
-import {moderateProfile} from '@bsky.app/sdk/moderation'
+import {moderateProfile} from '@bsky/sdk/moderation'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
diff --git a/src/components/Pills.tsx b/src/components/Pills.tsx
index 809b197029..60d6d98557 100644
--- a/src/components/Pills.tsx
+++ b/src/components/Pills.tsx
@@ -1,7 +1,7 @@
 import {useMemo} from 'react'
 import {View} from 'react-native'
-import {api} from '@bsky.app/sdk'
-import {type ModerationCause} from '@bsky.app/sdk/moderation'
+import {api} from '@bsky/sdk'
+import {type ModerationCause} from '@bsky/sdk/moderation'
 import {Trans, useLingui} from '@lingui/react/macro'
 
 import {useModerationCauseDescription} from '#/lib/moderation/useModerationCauseDescription'
diff --git a/src/components/Post/Embed/FeedEmbed.tsx b/src/components/Post/Embed/FeedEmbed.tsx
index 9e1e3e022d..48bf58e938 100644
--- a/src/components/Post/Embed/FeedEmbed.tsx
+++ b/src/components/Post/Embed/FeedEmbed.tsx
@@ -1,5 +1,5 @@
 import {useMemo} from 'react'
-import {moderateFeedGenerator} from '@bsky.app/sdk/moderation'
+import {moderateFeedGenerator} from '@bsky/sdk/moderation'
 
 import {useModerationOpts} from '#/state/preferences/moderation-opts'
 import {atoms as a, useTheme} from '#/alf'
diff --git a/src/components/Post/Embed/ListEmbed.tsx b/src/components/Post/Embed/ListEmbed.tsx
index 11ed196597..0678f389de 100644
--- a/src/components/Post/Embed/ListEmbed.tsx
+++ b/src/components/Post/Embed/ListEmbed.tsx
@@ -1,5 +1,5 @@
 import {useMemo} from 'react'
-import {moderateUserList} from '@bsky.app/sdk/moderation'
+import {moderateUserList} from '@bsky/sdk/moderation'
 
 import {useModerationOpts} from '#/state/preferences/moderation-opts'
 import {atoms as a, useTheme} from '#/alf'
diff --git a/src/components/Post/Embed/index.tsx b/src/components/Post/Embed/index.tsx
index d6fde617c9..5e195ac2f9 100644
--- a/src/components/Post/Embed/index.tsx
+++ b/src/components/Post/Embed/index.tsx
@@ -2,8 +2,8 @@ import {useCallback, useMemo} from 'react'
 import {View} from 'react-native'
 import {type $Typed} from '@atproto/lex'
 import {AtUri} from '@atproto/syntax'
-import {moderatePost} from '@bsky.app/sdk/moderation'
-import {RichText as RichTextAPI} from '@bsky.app/sdk/richtext'
+import {moderatePost} from '@bsky/sdk/moderation'
+import {RichText as RichTextAPI} from '@bsky/sdk/richtext'
 import {Trans} from '@lingui/react/macro'
 import {useQueryClient} from '@tanstack/react-query'
 
diff --git a/src/components/Post/Embed/types.ts b/src/components/Post/Embed/types.ts
index eb478347fd..3cf2f5ff03 100644
--- a/src/components/Post/Embed/types.ts
+++ b/src/components/Post/Embed/types.ts
@@ -1,5 +1,5 @@
 import {type StyleProp, type ViewStyle} from 'react-native'
-import {type ModerationDecision} from '@bsky.app/sdk/moderation'
+import {type ModerationDecision} from '@bsky/sdk/moderation'
 
 import {type app} from '#/lexicons'
 
diff --git a/src/components/PostControls/PostMenu/PostMenuItems.tsx b/src/components/PostControls/PostMenu/PostMenuItems.tsx
index 8c31ad4ce4..5cf9b0b5a4 100644
--- a/src/components/PostControls/PostMenu/PostMenuItems.tsx
+++ b/src/components/PostControls/PostMenu/PostMenuItems.tsx
@@ -7,7 +7,7 @@ import {
 } from 'react-native'
 import * as Clipboard from 'expo-clipboard'
 import {AtUri} from '@atproto/syntax'
-import {type RichText as RichTextAPI} from '@bsky.app/sdk/richtext'
+import {type RichText as RichTextAPI} from '@bsky/sdk/richtext'
 import {plural} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react/macro'
 import {useNavigation} from '@react-navigation/native'
diff --git a/src/components/PostControls/PostMenu/index.tsx b/src/components/PostControls/PostMenu/index.tsx
index 1c7e412065..23a3e52401 100644
--- a/src/components/PostControls/PostMenu/index.tsx
+++ b/src/components/PostControls/PostMenu/index.tsx
@@ -1,6 +1,6 @@
 import {memo, useMemo, useState} from 'react'
 import {type Insets} from 'react-native'
-import {type RichText as RichTextAPI} from '@bsky.app/sdk/richtext'
+import {type RichText as RichTextAPI} from '@bsky/sdk/richtext'
 import {useLingui} from '@lingui/react/macro'
 
 import {type Shadow} from '#/state/cache/post-shadow'
diff --git a/src/components/PostControls/ShareMenu/RecentChats.tsx b/src/components/PostControls/ShareMenu/RecentChats.tsx
index 33441352fc..783a0b800a 100644
--- a/src/components/PostControls/ShareMenu/RecentChats.tsx
+++ b/src/components/PostControls/ShareMenu/RecentChats.tsx
@@ -1,5 +1,5 @@
 import {ScrollView, View} from 'react-native'
-import {moderateProfile, type ModerationOpts} from '@bsky.app/sdk/moderation'
+import {moderateProfile, type ModerationOpts} from '@bsky/sdk/moderation'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
diff --git a/src/components/PostControls/ShareMenu/ShareMenuItems.types.tsx b/src/components/PostControls/ShareMenu/ShareMenuItems.types.tsx
index c1ca0f3728..00ce8efe86 100644
--- a/src/components/PostControls/ShareMenu/ShareMenuItems.types.tsx
+++ b/src/components/PostControls/ShareMenu/ShareMenuItems.types.tsx
@@ -1,5 +1,5 @@
 import {type PressableProps, type StyleProp, type ViewStyle} from 'react-native'
-import {type RichText as RichTextAPI} from '@bsky.app/sdk/richtext'
+import {type RichText as RichTextAPI} from '@bsky/sdk/richtext'
 
 import {type Shadow} from '#/state/cache/post-shadow'
 import {type app} from '#/lexicons'
diff --git a/src/components/PostControls/ShareMenu/index.tsx b/src/components/PostControls/ShareMenu/index.tsx
index e47a13bc95..6c2188b612 100644
--- a/src/components/PostControls/ShareMenu/index.tsx
+++ b/src/components/PostControls/ShareMenu/index.tsx
@@ -1,7 +1,7 @@
 import {memo, useMemo, useState} from 'react'
 import {type Insets} from 'react-native'
 import {AtUri} from '@atproto/syntax'
-import {type RichText as RichTextAPI} from '@bsky.app/sdk/richtext'
+import {type RichText as RichTextAPI} from '@bsky/sdk/richtext'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 
diff --git a/src/components/PostControls/index.tsx b/src/components/PostControls/index.tsx
index 66dd50cb84..6457267780 100644
--- a/src/components/PostControls/index.tsx
+++ b/src/components/PostControls/index.tsx
@@ -1,6 +1,6 @@
 import {memo, useMemo, useState} from 'react'
 import {type StyleProp, View, type ViewStyle} from 'react-native'
-import {type RichText as RichTextAPI} from '@bsky.app/sdk/richtext'
+import {type RichText as RichTextAPI} from '@bsky/sdk/richtext'
 import {plural} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react/macro'
 
diff --git a/src/components/ProfileCard.tsx b/src/components/ProfileCard.tsx
index 9db85d2749..d827e0010b 100644
--- a/src/components/ProfileCard.tsx
+++ b/src/components/ProfileCard.tsx
@@ -6,8 +6,8 @@ import {
   View,
   type ViewStyle,
 } from 'react-native'
-import {moderateProfile, type ModerationOpts} from '@bsky.app/sdk/moderation'
-import {RichText as RichTextApi} from '@bsky.app/sdk/richtext'
+import {moderateProfile, type ModerationOpts} from '@bsky/sdk/moderation'
+import {RichText as RichTextApi} from '@bsky/sdk/richtext'
 import {useLingui} from '@lingui/react/macro'
 
 import {getModerationCauseKey} from '#/lib/moderation'
diff --git a/src/components/ProfileHoverCard/index.web.tsx b/src/components/ProfileHoverCard/index.web.tsx
index 4f05f8e7ae..ccc48b8951 100644
--- a/src/components/ProfileHoverCard/index.web.tsx
+++ b/src/components/ProfileHoverCard/index.web.tsx
@@ -1,6 +1,6 @@
 import {memo, useCallback, useEffect, useMemo, useReducer, useRef} from 'react'
 import {View} from 'react-native'
-import {moderateProfile, type ModerationOpts} from '@bsky.app/sdk/moderation'
+import {moderateProfile, type ModerationOpts} from '@bsky/sdk/moderation'
 import {flip, offset, shift, size, useFloating} from '@floating-ui/react-dom'
 import {msg, plural} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
diff --git a/src/components/ProgressGuide/FollowDialog.tsx b/src/components/ProgressGuide/FollowDialog.tsx
index 3ff4569964..d7fa9c1fab 100644
--- a/src/components/ProgressGuide/FollowDialog.tsx
+++ b/src/components/ProgressGuide/FollowDialog.tsx
@@ -1,6 +1,6 @@
 import {memo, useCallback, useEffect, useMemo, useRef, useState} from 'react'
 import {TextInput, View, type ViewToken} from 'react-native'
-import {type ModerationOpts} from '@bsky.app/sdk/moderation'
+import {type ModerationOpts} from '@bsky/sdk/moderation'
 import {Trans, useLingui} from '@lingui/react/macro'
 
 import {useNonReactiveCallback} from '#/lib/hooks/useNonReactiveCallback'
diff --git a/src/components/RichText.tsx b/src/components/RichText.tsx
index ce73990570..0266dae0ce 100644
--- a/src/components/RichText.tsx
+++ b/src/components/RichText.tsx
@@ -1,6 +1,6 @@
 import {useMemo} from 'react'
 import {type StyleProp, type TextStyle} from 'react-native'
-import {RichText as RichTextAPI} from '@bsky.app/sdk/richtext'
+import {RichText as RichTextAPI} from '@bsky/sdk/richtext'
 
 import {toShortUrl} from '#/lib/strings/url-helpers'
 import {android, atoms as a, flatten, type TextStyleProp} from '#/alf'
diff --git a/src/components/StarterPack/Main/ProfilesList.tsx b/src/components/StarterPack/Main/ProfilesList.tsx
index d5c29f7c0a..46ad1aac05 100644
--- a/src/components/StarterPack/Main/ProfilesList.tsx
+++ b/src/components/StarterPack/Main/ProfilesList.tsx
@@ -1,7 +1,7 @@
 import {forwardRef, useCallback, useImperativeHandle, useState} from 'react'
 import {type ListRenderItemInfo, View} from 'react-native'
 import {AtUri} from '@atproto/syntax'
-import {type ModerationOpts} from '@bsky.app/sdk/moderation'
+import {type ModerationOpts} from '@bsky/sdk/moderation'
 import {
   type InfiniteData,
   type UseInfiniteQueryResult,
diff --git a/src/components/StarterPack/Wizard/WizardEditListDialog.tsx b/src/components/StarterPack/Wizard/WizardEditListDialog.tsx
index 04b1ae3df0..30e4218094 100644
--- a/src/components/StarterPack/Wizard/WizardEditListDialog.tsx
+++ b/src/components/StarterPack/Wizard/WizardEditListDialog.tsx
@@ -1,7 +1,7 @@
 import {useRef} from 'react'
 import {type ListRenderItemInfo} from 'react-native'
 import {View} from 'react-native'
-import {type ModerationOpts} from '@bsky.app/sdk/moderation'
+import {type ModerationOpts} from '@bsky/sdk/moderation'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
diff --git a/src/components/StarterPack/Wizard/WizardListCard.tsx b/src/components/StarterPack/Wizard/WizardListCard.tsx
index 1d33b27e40..39397f38e3 100644
--- a/src/components/StarterPack/Wizard/WizardListCard.tsx
+++ b/src/components/StarterPack/Wizard/WizardListCard.tsx
@@ -4,7 +4,7 @@ import {
   moderateProfile,
   type ModerationOpts,
   type ModerationUI,
-} from '@bsky.app/sdk/moderation'
+} from '@bsky/sdk/moderation'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
diff --git a/src/components/VideoPostCard.tsx b/src/components/VideoPostCard.tsx
index ee487e0520..1005b0f49e 100644
--- a/src/components/VideoPostCard.tsx
+++ b/src/components/VideoPostCard.tsx
@@ -2,7 +2,7 @@ import {useMemo} from 'react'
 import {View} from 'react-native'
 import {Image} from 'expo-image'
 import {LinearGradient} from 'expo-linear-gradient'
-import {type ModerationDecision} from '@bsky.app/sdk/moderation'
+import {type ModerationDecision} from '@bsky/sdk/moderation'
 import {useLingui} from '@lingui/react/macro'
 
 import {sanitizeHandle} from '#/lib/strings/handles'
diff --git a/src/components/activity-notifications/SubscribeProfileButton.tsx b/src/components/activity-notifications/SubscribeProfileButton.tsx
index ed05f8cba0..2749210e43 100644
--- a/src/components/activity-notifications/SubscribeProfileButton.tsx
+++ b/src/components/activity-notifications/SubscribeProfileButton.tsx
@@ -1,5 +1,5 @@
 import {useCallback, useEffect, useState} from 'react'
-import {type ModerationOpts} from '@bsky.app/sdk/moderation'
+import {type ModerationOpts} from '@bsky/sdk/moderation'
 import {Trans, useLingui} from '@lingui/react/macro'
 
 import {useRequireEmailVerification} from '#/lib/hooks/useRequireEmailVerification'
diff --git a/src/components/activity-notifications/SubscribeProfileDialog.tsx b/src/components/activity-notifications/SubscribeProfileDialog.tsx
index bbb635c390..0f4b9a9ee5 100644
--- a/src/components/activity-notifications/SubscribeProfileDialog.tsx
+++ b/src/components/activity-notifications/SubscribeProfileDialog.tsx
@@ -1,7 +1,7 @@
 import {useMemo, useState} from 'react'
 import {View} from 'react-native'
 import {type Un$Typed} from '@atproto/lex'
-import {type ModerationOpts} from '@bsky.app/sdk/moderation'
+import {type ModerationOpts} from '@bsky/sdk/moderation'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
diff --git a/src/components/contacts/screens/GetContacts.tsx b/src/components/contacts/screens/GetContacts.tsx
index de5d6cf98b..534a9a708b 100644
--- a/src/components/contacts/screens/GetContacts.tsx
+++ b/src/components/contacts/screens/GetContacts.tsx
@@ -5,7 +5,7 @@ import * as Contacts from 'expo-contacts'
 import {type Un$Typed} from '@atproto/lex'
 import {type Client} from '@atproto/lex'
 import {toDatetimeString} from '@atproto/syntax'
-import {upsertProfile} from '@bsky.app/sdk'
+import {upsertProfile} from '@bsky/sdk'
 import {msg, t} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
diff --git a/src/components/contacts/screens/ViewMatches.tsx b/src/components/contacts/screens/ViewMatches.tsx
index a659d8ae87..0d50bfdeeb 100644
--- a/src/components/contacts/screens/ViewMatches.tsx
+++ b/src/components/contacts/screens/ViewMatches.tsx
@@ -3,7 +3,7 @@ import {View} from 'react-native'
 import {useSafeAreaInsets} from 'react-native-safe-area-context'
 import * as SMS from 'expo-sms'
 import {type DidString} from '@atproto/syntax'
-import {type ModerationOpts} from '@bsky.app/sdk/moderation'
+import {type ModerationOpts} from '@bsky/sdk/moderation'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Plural, Trans} from '@lingui/react/macro'
diff --git a/src/components/dialogs/MutedWords.tsx b/src/components/dialogs/MutedWords.tsx
index 3263113a73..21f9a8728e 100644
--- a/src/components/dialogs/MutedWords.tsx
+++ b/src/components/dialogs/MutedWords.tsx
@@ -1,7 +1,7 @@
 import {useCallback, useState} from 'react'
 import {View} from 'react-native'
 import {type DatetimeString, toDatetimeString} from '@atproto/syntax'
-import {sanitizeMutedWordValue} from '@bsky.app/sdk/utils'
+import {sanitizeMutedWordValue} from '@bsky/sdk/utils'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
diff --git a/src/components/dialogs/SearchablePeopleList.tsx b/src/components/dialogs/SearchablePeopleList.tsx
index 3813a3c745..d368d25558 100644
--- a/src/components/dialogs/SearchablePeopleList.tsx
+++ b/src/components/dialogs/SearchablePeopleList.tsx
@@ -7,7 +7,7 @@ import {
   useState,
 } from 'react'
 import {TextInput, View} from 'react-native'
-import {moderateProfile, type ModerationOpts} from '@bsky.app/sdk/moderation'
+import {moderateProfile, type ModerationOpts} from '@bsky/sdk/moderation'
 import {Plural, Trans, useLingui} from '@lingui/react/macro'
 
 import {createSanitizedDisplayName} from '#/lib/moderation/create-sanitized-display-name'
diff --git a/src/components/dialogs/lists/CreateOrEditListDialog.tsx b/src/components/dialogs/lists/CreateOrEditListDialog.tsx
index 5b3a38be2b..c146d489f5 100644
--- a/src/components/dialogs/lists/CreateOrEditListDialog.tsx
+++ b/src/components/dialogs/lists/CreateOrEditListDialog.tsx
@@ -1,6 +1,6 @@
 import {useCallback, useEffect, useMemo, useState} from 'react'
 import {View} from 'react-native'
-import {RichText as RichTextAPI} from '@bsky.app/sdk/richtext'
+import {RichText as RichTextAPI} from '@bsky/sdk/richtext'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Plural, Trans} from '@lingui/react/macro'
diff --git a/src/components/dialogs/lists/ListAddRemoveUsersDialog.tsx b/src/components/dialogs/lists/ListAddRemoveUsersDialog.tsx
index ab63ea5677..78771fe413 100644
--- a/src/components/dialogs/lists/ListAddRemoveUsersDialog.tsx
+++ b/src/components/dialogs/lists/ListAddRemoveUsersDialog.tsx
@@ -1,6 +1,6 @@
 import {useCallback, useMemo} from 'react'
 import {View} from 'react-native'
-import {type ModerationOpts} from '@bsky.app/sdk/moderation'
+import {type ModerationOpts} from '@bsky/sdk/moderation'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
diff --git a/src/components/dms/ActionsWrapper.tsx b/src/components/dms/ActionsWrapper.tsx
index 837214b74c..f95d891104 100644
--- a/src/components/dms/ActionsWrapper.tsx
+++ b/src/components/dms/ActionsWrapper.tsx
@@ -1,5 +1,5 @@
 import {View} from 'react-native'
-import {type ModerationOpts} from '@bsky.app/sdk/moderation'
+import {type ModerationOpts} from '@bsky/sdk/moderation'
 import {useLingui} from '@lingui/react/macro'
 
 import {MessageContextMenu} from '#/components/dms/MessageContextMenu'
diff --git a/src/components/dms/ActionsWrapper.web.tsx b/src/components/dms/ActionsWrapper.web.tsx
index 469c339bf8..d71befbeee 100644
--- a/src/components/dms/ActionsWrapper.web.tsx
+++ b/src/components/dms/ActionsWrapper.web.tsx
@@ -1,6 +1,6 @@
 import {useCallback, useRef, useState} from 'react'
 import {Pressable, View} from 'react-native'
-import {type ModerationOpts} from '@bsky.app/sdk/moderation'
+import {type ModerationOpts} from '@bsky/sdk/moderation'
 import {plural} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react/macro'
 
diff --git a/src/components/dms/BlockedByListDialog.tsx b/src/components/dms/BlockedByListDialog.tsx
index 2521168d79..3fabf12ecf 100644
--- a/src/components/dms/BlockedByListDialog.tsx
+++ b/src/components/dms/BlockedByListDialog.tsx
@@ -1,6 +1,6 @@
 import {Fragment} from 'react'
 import {View} from 'react-native'
-import {type ModerationCause} from '@bsky.app/sdk/moderation'
+import {type ModerationCause} from '@bsky/sdk/moderation'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 
diff --git a/src/components/dms/ChatProfileTabs.tsx b/src/components/dms/ChatProfileTabs.tsx
index 5a0e7a8fb3..d5ae8698ee 100644
--- a/src/components/dms/ChatProfileTabs.tsx
+++ b/src/components/dms/ChatProfileTabs.tsx
@@ -1,7 +1,7 @@
 import {useCallback, useEffect} from 'react'
 import {type ScrollView, View} from 'react-native'
 import Animated, {useAnimatedRef, useSharedValue} from 'react-native-reanimated'
-import {moderateProfile} from '@bsky.app/sdk/moderation'
+import {moderateProfile} from '@bsky/sdk/moderation'
 import {useLingui} from '@lingui/react/macro'
 
 import {HITSLOP_10} from '#/lib/constants'
diff --git a/src/components/dms/ConvoMenu.tsx b/src/components/dms/ConvoMenu.tsx
index 9aab1da8c9..e3414fd070 100644
--- a/src/components/dms/ConvoMenu.tsx
+++ b/src/components/dms/ConvoMenu.tsx
@@ -1,6 +1,6 @@
 import {memo, useCallback} from 'react'
 import {Keyboard, View} from 'react-native'
-import {type ModerationCause} from '@bsky.app/sdk/moderation'
+import {type ModerationCause} from '@bsky/sdk/moderation'
 import {Trans, useLingui} from '@lingui/react/macro'
 import {useNavigation} from '@react-navigation/native'
 import {useQueryClient} from '@tanstack/react-query'
diff --git a/src/components/dms/InitiateChatFlow.tsx b/src/components/dms/InitiateChatFlow.tsx
index 271016a5d5..4b86eb5f0e 100644
--- a/src/components/dms/InitiateChatFlow.tsx
+++ b/src/components/dms/InitiateChatFlow.tsx
@@ -7,7 +7,7 @@ import {
   useState,
 } from 'react'
 import {LayoutAnimation, type TextInput, View} from 'react-native'
-import {moderateProfile, type ModerationOpts} from '@bsky.app/sdk/moderation'
+import {moderateProfile, type ModerationOpts} from '@bsky/sdk/moderation'
 import {Plural, Trans, useLingui} from '@lingui/react/macro'
 
 import {MAX_GROUP_NAME_GRAPHEME_LENGTH} from '#/lib/constants'
diff --git a/src/components/dms/MessageContextMenu.tsx b/src/components/dms/MessageContextMenu.tsx
index 1807f2888d..e16af86cf6 100644
--- a/src/components/dms/MessageContextMenu.tsx
+++ b/src/components/dms/MessageContextMenu.tsx
@@ -2,8 +2,8 @@ import {memo, useCallback} from 'react'
 import {Platform} from 'react-native'
 import {type GestureType} from 'react-native-gesture-handler'
 import * as Clipboard from 'expo-clipboard'
-import {type ModerationOpts} from '@bsky.app/sdk/moderation'
-import {RichText} from '@bsky.app/sdk/richtext'
+import {type ModerationOpts} from '@bsky/sdk/moderation'
+import {RichText} from '@bsky/sdk/richtext'
 import {plural} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react/macro'
 
diff --git a/src/components/dms/MessageItem.tsx b/src/components/dms/MessageItem.tsx
index 2a3d895544..ceebea16a6 100644
--- a/src/components/dms/MessageItem.tsx
+++ b/src/components/dms/MessageItem.tsx
@@ -22,8 +22,8 @@ import Animated, {
   ZoomIn,
   ZoomOut,
 } from 'react-native-reanimated'
-import {moderateProfile} from '@bsky.app/sdk/moderation'
-import {RichText as RichTextAPI} from '@bsky.app/sdk/richtext'
+import {moderateProfile} from '@bsky/sdk/moderation'
+import {RichText as RichTextAPI} from '@bsky/sdk/richtext'
 import {plural} from '@lingui/core/macro'
 import {Trans, useLingui} from '@lingui/react/macro'
 import {useQueryClient} from '@tanstack/react-query'
diff --git a/src/components/dms/MessagesListBlockedFooter.tsx b/src/components/dms/MessagesListBlockedFooter.tsx
index f239a66aa4..6c3b447d4c 100644
--- a/src/components/dms/MessagesListBlockedFooter.tsx
+++ b/src/components/dms/MessagesListBlockedFooter.tsx
@@ -1,6 +1,6 @@
 import {useCallback, useMemo} from 'react'
 import {View} from 'react-native'
-import {type ModerationDecision} from '@bsky.app/sdk/moderation'
+import {type ModerationDecision} from '@bsky/sdk/moderation'
 import {Trans, useLingui} from '@lingui/react/macro'
 
 import {useProfileShadow} from '#/state/cache/profile-shadow'
diff --git a/src/components/dms/MessagesListHeader.tsx b/src/components/dms/MessagesListHeader.tsx
index adf8e3b1f5..e691486554 100644
--- a/src/components/dms/MessagesListHeader.tsx
+++ b/src/components/dms/MessagesListHeader.tsx
@@ -1,6 +1,6 @@
 import {useMemo} from 'react'
 import {View} from 'react-native'
-import {moderateProfile, type ModerationOpts} from '@bsky.app/sdk/moderation'
+import {moderateProfile, type ModerationOpts} from '@bsky/sdk/moderation'
 import {useLingui} from '@lingui/react/macro'
 
 import {createSanitizedDisplayName} from '#/lib/moderation/create-sanitized-display-name'
diff --git a/src/components/dms/components/GroupChatProfileCard.tsx b/src/components/dms/components/GroupChatProfileCard.tsx
index 90d15c4b5f..a4e94c668d 100644
--- a/src/components/dms/components/GroupChatProfileCard.tsx
+++ b/src/components/dms/components/GroupChatProfileCard.tsx
@@ -1,5 +1,5 @@
 import {View} from 'react-native'
-import {moderateProfile, type ModerationOpts} from '@bsky.app/sdk/moderation'
+import {moderateProfile, type ModerationOpts} from '@bsky/sdk/moderation'
 import {Trans} from '@lingui/react/macro'
 
 import {sanitizeDisplayName} from '#/lib/strings/display-names'
diff --git a/src/components/dms/util.ts b/src/components/dms/util.ts
index 135fb0dfaf..f44398f6f0 100644
--- a/src/components/dms/util.ts
+++ b/src/components/dms/util.ts
@@ -1,5 +1,5 @@
 import {type $Typed} from '@atproto/lex'
-import {moderateProfile, type ModerationOpts} from '@bsky.app/sdk/moderation'
+import {moderateProfile, type ModerationOpts} from '@bsky/sdk/moderation'
 
 import {EMOJI_REACTION_LIMIT} from '#/lib/constants'
 import {isBlockedOrBlocking} from '#/lib/moderation/blocked-and-muted'
diff --git a/src/components/hooks/useRichText.ts b/src/components/hooks/useRichText.ts
index 5664d9b6fd..a2d25055b5 100644
--- a/src/components/hooks/useRichText.ts
+++ b/src/components/hooks/useRichText.ts
@@ -1,5 +1,5 @@
 import {useEffect, useState} from 'react'
-import {RichText as RichTextAPI} from '@bsky.app/sdk/richtext'
+import {RichText as RichTextAPI} from '@bsky/sdk/richtext'
 
 import {useAppviewClient} from '#/state/session'
 
diff --git a/src/components/images/Gallery/maybeApplyGalleryOffsetStyles.ts b/src/components/images/Gallery/maybeApplyGalleryOffsetStyles.ts
index 75f5421257..8634c2eb6d 100644
--- a/src/components/images/Gallery/maybeApplyGalleryOffsetStyles.ts
+++ b/src/components/images/Gallery/maybeApplyGalleryOffsetStyles.ts
@@ -1,4 +1,4 @@
-import {type ModerationCause, type ModerationUI} from '@bsky.app/sdk/moderation'
+import {type ModerationCause, type ModerationUI} from '@bsky/sdk/moderation'
 
 import {unique} from '#/lib/moderation'
 import {type AppModerationCause} from '#/components/Pills'
diff --git a/src/components/intents/GroupChatJoinDialog.tsx b/src/components/intents/GroupChatJoinDialog.tsx
index c698219a43..9266eb7a91 100644
--- a/src/components/intents/GroupChatJoinDialog.tsx
+++ b/src/components/intents/GroupChatJoinDialog.tsx
@@ -1,6 +1,6 @@
 import {useEffect} from 'react'
 import {View} from 'react-native'
-import {moderateProfile} from '@bsky.app/sdk/moderation'
+import {moderateProfile} from '@bsky/sdk/moderation'
 import {Plural, Trans, useLingui} from '@lingui/react/macro'
 import {useNavigation} from '@react-navigation/native'
 import {useQueryClient} from '@tanstack/react-query'
diff --git a/src/components/interstitials/FeedTrendingTopics.tsx b/src/components/interstitials/FeedTrendingTopics.tsx
index a069a1b851..4d3d9fb0fa 100644
--- a/src/components/interstitials/FeedTrendingTopics.tsx
+++ b/src/components/interstitials/FeedTrendingTopics.tsx
@@ -1,6 +1,6 @@
 import {useMemo} from 'react'
 import {Pressable, View} from 'react-native'
-import {moderateProfile} from '@bsky.app/sdk/moderation'
+import {moderateProfile} from '@bsky/sdk/moderation'
 import {Plural, Trans, useLingui} from '@lingui/react/macro'
 
 import {useModerationOpts} from '#/state/preferences/moderation-opts'
diff --git a/src/components/moderation/ContentHider.tsx b/src/components/moderation/ContentHider.tsx
index b0f8dddf01..c33c17a881 100644
--- a/src/components/moderation/ContentHider.tsx
+++ b/src/components/moderation/ContentHider.tsx
@@ -5,7 +5,7 @@ import {
   View,
   type ViewStyle,
 } from 'react-native'
-import {type ModerationUI} from '@bsky.app/sdk/moderation'
+import {type ModerationUI} from '@bsky/sdk/moderation'
 import {Trans, useLingui} from '@lingui/react/macro'
 
 import {
diff --git a/src/components/moderation/Hider.tsx b/src/components/moderation/Hider.tsx
index 85d063f088..afe43e7000 100644
--- a/src/components/moderation/Hider.tsx
+++ b/src/components/moderation/Hider.tsx
@@ -1,5 +1,5 @@
 import {createContext, useContext, useState} from 'react'
-import {type ModerationUI} from '@bsky.app/sdk/moderation'
+import {type ModerationUI} from '@bsky/sdk/moderation'
 
 import {
   type ModerationCauseDescription,
diff --git a/src/components/moderation/LabelPreference.tsx b/src/components/moderation/LabelPreference.tsx
index 80a83c5e6c..227ccae36e 100644
--- a/src/components/moderation/LabelPreference.tsx
+++ b/src/components/moderation/LabelPreference.tsx
@@ -2,7 +2,7 @@ import {View} from 'react-native'
 import {
   type InterpretedLabelValueDefinition,
   type LabelPreference,
-} from '@bsky.app/sdk/moderation'
+} from '@bsky/sdk/moderation'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
diff --git a/src/components/moderation/ModerationDetailsDialog.tsx b/src/components/moderation/ModerationDetailsDialog.tsx
index 1b2351432e..d4b816e5cd 100644
--- a/src/components/moderation/ModerationDetailsDialog.tsx
+++ b/src/components/moderation/ModerationDetailsDialog.tsx
@@ -1,6 +1,6 @@
 import {useState} from 'react'
 import {View} from 'react-native'
-import {type ModerationCause} from '@bsky.app/sdk/moderation'
+import {type ModerationCause} from '@bsky/sdk/moderation'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
diff --git a/src/components/moderation/PostAlerts.tsx b/src/components/moderation/PostAlerts.tsx
index 95f4c0e56e..c7a00e76eb 100644
--- a/src/components/moderation/PostAlerts.tsx
+++ b/src/components/moderation/PostAlerts.tsx
@@ -1,5 +1,5 @@
 import {type StyleProp, View, type ViewStyle} from 'react-native'
-import {type ModerationCause, type ModerationUI} from '@bsky.app/sdk/moderation'
+import {type ModerationCause, type ModerationUI} from '@bsky/sdk/moderation'
 import {plural} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react/macro'
 
diff --git a/src/components/moderation/PostHider.tsx b/src/components/moderation/PostHider.tsx
index 874345e084..178abd8e18 100644
--- a/src/components/moderation/PostHider.tsx
+++ b/src/components/moderation/PostHider.tsx
@@ -7,7 +7,7 @@ import {
   View,
   type ViewStyle,
 } from 'react-native'
-import {type ModerationCause, type ModerationUI} from '@bsky.app/sdk/moderation'
+import {type ModerationCause, type ModerationUI} from '@bsky/sdk/moderation'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
diff --git a/src/components/moderation/ProfileHeaderAlerts.tsx b/src/components/moderation/ProfileHeaderAlerts.tsx
index ee8d472b79..8b335fa73c 100644
--- a/src/components/moderation/ProfileHeaderAlerts.tsx
+++ b/src/components/moderation/ProfileHeaderAlerts.tsx
@@ -1,5 +1,5 @@
 import {type StyleProp, type ViewStyle} from 'react-native'
-import {type ModerationDecision} from '@bsky.app/sdk/moderation'
+import {type ModerationDecision} from '@bsky/sdk/moderation'
 
 import {getModerationCauseKey, unique} from '#/lib/moderation'
 import * as Pills from '#/components/Pills'
diff --git a/src/components/moderation/ReportDialog/action.ts b/src/components/moderation/ReportDialog/action.ts
index 86a0c8cca6..da94e5dde2 100644
--- a/src/components/moderation/ReportDialog/action.ts
+++ b/src/components/moderation/ReportDialog/action.ts
@@ -1,5 +1,5 @@
 import {type AtUriString, type DidString} from '@atproto/syntax'
-import {api} from '@bsky.app/sdk'
+import {api} from '@bsky/sdk'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {useMutation} from '@tanstack/react-query'
diff --git a/src/components/moderation/ReportDialog/index.tsx b/src/components/moderation/ReportDialog/index.tsx
index 01014a0d75..c5c60ccba4 100644
--- a/src/components/moderation/ReportDialog/index.tsx
+++ b/src/components/moderation/ReportDialog/index.tsx
@@ -7,7 +7,7 @@ import {
   useState,
 } from 'react'
 import {Pressable, type ScrollView, View} from 'react-native'
-import {api} from '@bsky.app/sdk'
+import {api} from '@bsky/sdk'
 import {Trans, useLingui} from '@lingui/react/macro'
 
 import {wait} from '#/lib/async/wait'
diff --git a/src/components/moderation/ScreenHider.tsx b/src/components/moderation/ScreenHider.tsx
index 9557121a05..e023b03c48 100644
--- a/src/components/moderation/ScreenHider.tsx
+++ b/src/components/moderation/ScreenHider.tsx
@@ -5,7 +5,7 @@ import {
   View,
   type ViewStyle,
 } from 'react-native'
-import {type ModerationUI} from '@bsky.app/sdk/moderation'
+import {type ModerationUI} from '@bsky/sdk/moderation'
 import {Trans, useLingui} from '@lingui/react/macro'
 import {useNavigation} from '@react-navigation/native'
 
diff --git a/src/features/liveEvents/context.tsx b/src/features/liveEvents/context.tsx
index 0d333ba3a1..b7bdfedb90 100644
--- a/src/features/liveEvents/context.tsx
+++ b/src/features/liveEvents/context.tsx
@@ -1,5 +1,5 @@
 import {createContext, useContext, useMemo} from 'react'
-import {hasMutedWord} from '@bsky.app/sdk/moderation'
+import {hasMutedWord} from '@bsky/sdk/moderation'
 import {QueryClient, useQuery} from '@tanstack/react-query'
 
 import {useOnAppStateChange} from '#/lib/appState'
diff --git a/src/features/liveEvents/preferences.ts b/src/features/liveEvents/preferences.ts
index bd8cbbd645..22265ac36c 100644
--- a/src/features/liveEvents/preferences.ts
+++ b/src/features/liveEvents/preferences.ts
@@ -1,5 +1,5 @@
 import {useEffect} from 'react'
-import {getPreferences, updateLiveEventPreferences} from '@bsky.app/sdk'
+import {getPreferences, updateLiveEventPreferences} from '@bsky/sdk'
 import {useMutation, useQueryClient} from '@tanstack/react-query'
 
 import {
diff --git a/src/features/liveNow/components/LiveStatusDialog.tsx b/src/features/liveNow/components/LiveStatusDialog.tsx
index 9559ca34fd..18b6982692 100644
--- a/src/features/liveNow/components/LiveStatusDialog.tsx
+++ b/src/features/liveNow/components/LiveStatusDialog.tsx
@@ -1,7 +1,7 @@
 import {useCallback, useMemo} from 'react'
 import {View} from 'react-native'
 import {Image} from 'expo-image'
-import {moderateStatus} from '@bsky.app/sdk/moderation'
+import {moderateStatus} from '@bsky/sdk/moderation'
 import {Trans, useLingui} from '@lingui/react/macro'
 import {useNavigation} from '@react-navigation/native'
 import {useQueryClient} from '@tanstack/react-query'
diff --git a/src/features/liveNow/index.tsx b/src/features/liveNow/index.tsx
index cc9dd21fbb..0959b068bd 100644
--- a/src/features/liveNow/index.tsx
+++ b/src/features/liveNow/index.tsx
@@ -2,7 +2,7 @@ import {useMemo} from 'react'
 import {retry} from '@atproto/common-web'
 import {type $Typed, type l, type UriString} from '@atproto/lex'
 import {AtUri, toDatetimeString} from '@atproto/syntax'
-import {moderateStatus} from '@bsky.app/sdk/moderation'
+import {moderateStatus} from '@bsky/sdk/moderation'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {useMutation, useQuery, useQueryClient} from '@tanstack/react-query'
diff --git a/src/lib/api/index.ts b/src/lib/api/index.ts
index 990d41c8d1..55b0fdecb6 100644
--- a/src/lib/api/index.ts
+++ b/src/lib/api/index.ts
@@ -5,7 +5,7 @@ import {
   toDatetimeString,
   type UriString,
 } from '@atproto/syntax'
-import {RichText} from '@bsky.app/sdk/richtext'
+import {RichText} from '@bsky/sdk/richtext'
 import {t} from '@lingui/core/macro'
 import {type QueryClient} from '@tanstack/react-query'
 
diff --git a/src/lib/constants.ts b/src/lib/constants.ts
index a25f42f6bc..514312aeb9 100644
--- a/src/lib/constants.ts
+++ b/src/lib/constants.ts
@@ -1,6 +1,6 @@
 import {type Insets, Platform} from 'react-native'
 import {type Service} from '@atproto/lex'
-import {api} from '@bsky.app/sdk'
+import {api} from '@bsky/sdk'
 
 import {BLUESKY_PROXY_DID, CHAT_PROXY_DID, IS_DEV} from '#/env'
 import {type app} from '#/lexicons'
diff --git a/src/lib/moderation.ts b/src/lib/moderation.ts
index 9bfbf5423b..c6cd336875 100644
--- a/src/lib/moderation.ts
+++ b/src/lib/moderation.ts
@@ -7,7 +7,7 @@ import {
   type ModerationCause,
   type ModerationOpts,
   type ModerationUI,
-} from '@bsky.app/sdk/moderation'
+} from '@bsky/sdk/moderation'
 
 import {sanitizeDisplayName} from '#/lib/strings/display-names'
 import {sanitizeHandle} from '#/lib/strings/handles'
diff --git a/src/lib/moderation/create-sanitized-display-name.ts b/src/lib/moderation/create-sanitized-display-name.ts
index 1298afd7ef..538f180777 100644
--- a/src/lib/moderation/create-sanitized-display-name.ts
+++ b/src/lib/moderation/create-sanitized-display-name.ts
@@ -1,4 +1,4 @@
-import {type ModerationUI} from '@bsky.app/sdk/moderation'
+import {type ModerationUI} from '@bsky/sdk/moderation'
 
 import {sanitizeDisplayName} from '#/lib/strings/display-names'
 import {sanitizeHandle} from '#/lib/strings/handles'
diff --git a/src/lib/moderation/useLabelBehaviorDescription.ts b/src/lib/moderation/useLabelBehaviorDescription.ts
index e97ecef33c..d1939e20fd 100644
--- a/src/lib/moderation/useLabelBehaviorDescription.ts
+++ b/src/lib/moderation/useLabelBehaviorDescription.ts
@@ -1,7 +1,7 @@
 import {
   type InterpretedLabelValueDefinition,
   type LabelPreference,
-} from '@bsky.app/sdk/moderation'
+} from '@bsky/sdk/moderation'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 
diff --git a/src/lib/moderation/useLabelInfo.ts b/src/lib/moderation/useLabelInfo.ts
index 27ecf0ff83..80df2b1cf0 100644
--- a/src/lib/moderation/useLabelInfo.ts
+++ b/src/lib/moderation/useLabelInfo.ts
@@ -2,7 +2,7 @@ import {
   type InterpretedLabelValueDefinition,
   interpretLabelValueDefinition,
   LABELS,
-} from '@bsky.app/sdk/moderation'
+} from '@bsky/sdk/moderation'
 import {useLingui} from '@lingui/react'
 import * as bcp47Match from 'bcp-47-match'
 
diff --git a/src/lib/moderation/useModerationCauseDescription.ts b/src/lib/moderation/useModerationCauseDescription.ts
index c3e7d19640..2f57e38bca 100644
--- a/src/lib/moderation/useModerationCauseDescription.ts
+++ b/src/lib/moderation/useModerationCauseDescription.ts
@@ -1,6 +1,6 @@
 import {useMemo} from 'react'
-import {api} from '@bsky.app/sdk'
-import {type ModerationCause} from '@bsky.app/sdk/moderation'
+import {api} from '@bsky/sdk'
+import {type ModerationCause} from '@bsky/sdk/moderation'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 
diff --git a/src/lib/strings/display-names.ts b/src/lib/strings/display-names.ts
index 8ba2e1d215..27d90f2e39 100644
--- a/src/lib/strings/display-names.ts
+++ b/src/lib/strings/display-names.ts
@@ -1,4 +1,4 @@
-import {type ModerationUI} from '@bsky.app/sdk/moderation'
+import {type ModerationUI} from '@bsky/sdk/moderation'
 
 // \u2705 = ✅
 // \u2713 = ✓
diff --git a/src/lib/strings/helpers.ts b/src/lib/strings/helpers.ts
index 402807f50f..001e059209 100644
--- a/src/lib/strings/helpers.ts
+++ b/src/lib/strings/helpers.ts
@@ -1,4 +1,4 @@
-import {type RichText} from '@bsky.app/sdk/richtext'
+import {type RichText} from '@bsky/sdk/richtext'
 import {countGraphemes} from 'unicode-segmenter/grapheme'
 
 import {shortenLinks} from './rich-text-manip'
diff --git a/src/lib/strings/rich-text-helpers.ts b/src/lib/strings/rich-text-helpers.ts
index 078b91e400..6d201b7664 100644
--- a/src/lib/strings/rich-text-helpers.ts
+++ b/src/lib/strings/rich-text-helpers.ts
@@ -1,4 +1,4 @@
-import {type RichText} from '@bsky.app/sdk/richtext'
+import {type RichText} from '@bsky/sdk/richtext'
 
 import {app} from '#/lexicons'
 import * as bsky from '#/types/bsky'
diff --git a/src/lib/strings/rich-text-manip.ts b/src/lib/strings/rich-text-manip.ts
index fa7a9b4a82..067b2f8cd7 100644
--- a/src/lib/strings/rich-text-manip.ts
+++ b/src/lib/strings/rich-text-manip.ts
@@ -1,4 +1,4 @@
-import {type RichText, UnicodeString} from '@bsky.app/sdk/richtext'
+import {type RichText, UnicodeString} from '@bsky/sdk/richtext'
 
 import {app} from '#/lexicons'
 import * as bsky from '#/types/bsky'
diff --git a/src/screens/Messages/Conversation.tsx b/src/screens/Messages/Conversation.tsx
index a846817f50..5666e2cdb1 100644
--- a/src/screens/Messages/Conversation.tsx
+++ b/src/screens/Messages/Conversation.tsx
@@ -5,7 +5,7 @@ import {
   ScrollEdgeEffect,
   ScrollEdgeEffectProvider,
 } from '@bsky.app/expo-scroll-edge-effect'
-import {moderateProfile} from '@bsky.app/sdk/moderation'
+import {moderateProfile} from '@bsky/sdk/moderation'
 import {Trans, useLingui} from '@lingui/react/macro'
 import {
   type RouteProp,
diff --git a/src/screens/Messages/ConversationSettings/Member.tsx b/src/screens/Messages/ConversationSettings/Member.tsx
index ad6fdc6136..4c48a1bd50 100644
--- a/src/screens/Messages/ConversationSettings/Member.tsx
+++ b/src/screens/Messages/ConversationSettings/Member.tsx
@@ -1,5 +1,5 @@
 import {View} from 'react-native'
-import {moderateProfile} from '@bsky.app/sdk/moderation'
+import {moderateProfile} from '@bsky/sdk/moderation'
 import {Trans, useLingui} from '@lingui/react/macro'
 
 import {isBlockedOrBlocking} from '#/lib/moderation/blocked-and-muted'
diff --git a/src/screens/Messages/ConversationSettings/index.tsx b/src/screens/Messages/ConversationSettings/index.tsx
index 335affc9ff..ed5d74b198 100644
--- a/src/screens/Messages/ConversationSettings/index.tsx
+++ b/src/screens/Messages/ConversationSettings/index.tsx
@@ -1,6 +1,6 @@
 import {useEffect, useState} from 'react'
 import {Pressable, View} from 'react-native'
-import {type ModerationOpts} from '@bsky.app/sdk/moderation'
+import {type ModerationOpts} from '@bsky/sdk/moderation'
 import {Trans, useLingui} from '@lingui/react/macro'
 import {useNavigation} from '@react-navigation/native'
 
diff --git a/src/screens/Messages/JoinRequest.tsx b/src/screens/Messages/JoinRequest.tsx
index f2cb6b67dc..bd7a73dade 100644
--- a/src/screens/Messages/JoinRequest.tsx
+++ b/src/screens/Messages/JoinRequest.tsx
@@ -2,7 +2,7 @@ import {useEffect} from 'react'
 import {View} from 'react-native'
 import {ImageBackground} from 'expo-image'
 import {type ThemeName} from '@bsky.app/alf'
-import {moderateProfile} from '@bsky.app/sdk/moderation'
+import {moderateProfile} from '@bsky/sdk/moderation'
 import {Trans, useLingui} from '@lingui/react/macro'
 
 import {createSanitizedDisplayName} from '#/lib/moderation/create-sanitized-display-name'
diff --git a/src/screens/Messages/components/ChatListItem.tsx b/src/screens/Messages/components/ChatListItem.tsx
index 657fa8bae3..f783abc7a0 100644
--- a/src/screens/Messages/components/ChatListItem.tsx
+++ b/src/screens/Messages/components/ChatListItem.tsx
@@ -4,7 +4,7 @@ import {
   moderateProfile,
   type ModerationDecision,
   type ModerationOpts,
-} from '@bsky.app/sdk/moderation'
+} from '@bsky/sdk/moderation'
 import {plural} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react/macro'
 import {useQueryClient} from '@tanstack/react-query'
diff --git a/src/screens/Messages/components/ChatStatusInfo.tsx b/src/screens/Messages/components/ChatStatusInfo.tsx
index 1910159a49..afb0e3e299 100644
--- a/src/screens/Messages/components/ChatStatusInfo.tsx
+++ b/src/screens/Messages/components/ChatStatusInfo.tsx
@@ -1,7 +1,7 @@
 import {useCallback, useMemo} from 'react'
 import {View} from 'react-native'
 import {LinearGradient} from 'expo-linear-gradient'
-import {moderateProfile} from '@bsky.app/sdk/moderation'
+import {moderateProfile} from '@bsky/sdk/moderation'
 import {Trans, useLingui} from '@lingui/react/macro'
 
 import {createSanitizedDisplayName} from '#/lib/moderation/create-sanitized-display-name'
diff --git a/src/screens/Messages/components/InviteLinkDialog.tsx b/src/screens/Messages/components/InviteLinkDialog.tsx
index c30f5dac55..5ac7c1e53a 100644
--- a/src/screens/Messages/components/InviteLinkDialog.tsx
+++ b/src/screens/Messages/components/InviteLinkDialog.tsx
@@ -1,7 +1,7 @@
 import {useState} from 'react'
 import {View} from 'react-native'
 import {Image} from 'expo-image'
-import {moderateProfile, type ModerationOpts} from '@bsky.app/sdk/moderation'
+import {moderateProfile, type ModerationOpts} from '@bsky/sdk/moderation'
 import {Plural, Trans, useLingui} from '@lingui/react/macro'
 
 import {useOpenComposer} from '#/lib/hooks/useOpenComposer'
diff --git a/src/screens/Messages/components/MessageInputEmbed.tsx b/src/screens/Messages/components/MessageInputEmbed.tsx
index e47373af48..0883dfa85e 100644
--- a/src/screens/Messages/components/MessageInputEmbed.tsx
+++ b/src/screens/Messages/components/MessageInputEmbed.tsx
@@ -1,8 +1,8 @@
 import {useCallback, useEffect, useMemo, useState} from 'react'
 import {LayoutAnimation, View} from 'react-native'
 import {AtUri} from '@atproto/syntax'
-import {moderatePost} from '@bsky.app/sdk/moderation'
-import {RichText as RichTextAPI} from '@bsky.app/sdk/richtext'
+import {moderatePost} from '@bsky/sdk/moderation'
+import {RichText as RichTextAPI} from '@bsky/sdk/richtext'
 import {Trans, useLingui} from '@lingui/react/macro'
 import {type RouteProp, useNavigation, useRoute} from '@react-navigation/native'
 
diff --git a/src/screens/Messages/components/MessagesList.tsx b/src/screens/Messages/components/MessagesList.tsx
index 586809c7a2..056ff2f76c 100644
--- a/src/screens/Messages/components/MessagesList.tsx
+++ b/src/screens/Messages/components/MessagesList.tsx
@@ -24,7 +24,7 @@ import {useSafeAreaInsets} from 'react-native-safe-area-context'
 import {scheduleOnRN} from 'react-native-worklets'
 import {type $Typed} from '@atproto/lex'
 import {useScrollEdgeEffectRef} from '@bsky.app/expo-scroll-edge-effect'
-import {RichText} from '@bsky.app/sdk/richtext'
+import {RichText} from '@bsky/sdk/richtext'
 
 import {useNonReactiveCallback} from '#/lib/hooks/useNonReactiveCallback'
 import {mergeRefs} from '#/lib/merge-refs'
diff --git a/src/screens/Messages/components/MessagesListInfoPanel.tsx b/src/screens/Messages/components/MessagesListInfoPanel.tsx
index e0e5545336..4e7eb43a2d 100644
--- a/src/screens/Messages/components/MessagesListInfoPanel.tsx
+++ b/src/screens/Messages/components/MessagesListInfoPanel.tsx
@@ -1,5 +1,5 @@
 import {View} from 'react-native'
-import {moderateProfile} from '@bsky.app/sdk/moderation'
+import {moderateProfile} from '@bsky/sdk/moderation'
 import {Trans, useLingui} from '@lingui/react/macro'
 import {useNavigation} from '@react-navigation/native'
 
diff --git a/src/screens/Moderation/index.tsx b/src/screens/Moderation/index.tsx
index 416390f075..1f612d95a8 100644
--- a/src/screens/Moderation/index.tsx
+++ b/src/screens/Moderation/index.tsx
@@ -1,6 +1,6 @@
 import {Fragment, useCallback} from 'react'
 import {Linking, View} from 'react-native'
-import {LABELS} from '@bsky.app/sdk/moderation'
+import {LABELS} from '@bsky/sdk/moderation'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
diff --git a/src/screens/Onboarding/StepFinished/index.tsx b/src/screens/Onboarding/StepFinished/index.tsx
index 9eb22efc70..f90e7ddcd4 100644
--- a/src/screens/Onboarding/StepFinished/index.tsx
+++ b/src/screens/Onboarding/StepFinished/index.tsx
@@ -3,11 +3,7 @@ import {View} from 'react-native'
 import {TID} from '@atproto/common-web'
 import {type Un$Typed} from '@atproto/lex'
 import {type AtUriString, toDatetimeString} from '@atproto/syntax'
-import {
-  overwriteSavedFeeds,
-  setInterestsPref,
-  upsertProfile,
-} from '@bsky.app/sdk'
+import {overwriteSavedFeeds, setInterestsPref, upsertProfile} from '@bsky/sdk'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
diff --git a/src/screens/Onboarding/StepSuggestedAccounts/index.tsx b/src/screens/Onboarding/StepSuggestedAccounts/index.tsx
index 982ee15611..dc1a89c182 100644
--- a/src/screens/Onboarding/StepSuggestedAccounts/index.tsx
+++ b/src/screens/Onboarding/StepSuggestedAccounts/index.tsx
@@ -1,6 +1,6 @@
 import {useCallback, useEffect, useMemo, useRef, useState} from 'react'
 import {View} from 'react-native'
-import {type ModerationOpts} from '@bsky.app/sdk/moderation'
+import {type ModerationOpts} from '@bsky/sdk/moderation'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
diff --git a/src/screens/PostThread/components/LikesStat.tsx b/src/screens/PostThread/components/LikesStat.tsx
index afc4a79cad..fab45ab155 100644
--- a/src/screens/PostThread/components/LikesStat.tsx
+++ b/src/screens/PostThread/components/LikesStat.tsx
@@ -1,6 +1,6 @@
 import {View} from 'react-native'
 import {AtUri} from '@atproto/syntax'
-import {moderateProfile} from '@bsky.app/sdk/moderation'
+import {moderateProfile} from '@bsky/sdk/moderation'
 import {Plural, Trans, useLingui} from '@lingui/react/macro'
 
 import {makeProfileLink} from '#/lib/routes/links'
diff --git a/src/screens/PostThread/components/ThreadItemAnchor.tsx b/src/screens/PostThread/components/ThreadItemAnchor.tsx
index 40894999ca..6a1ee4bb55 100644
--- a/src/screens/PostThread/components/ThreadItemAnchor.tsx
+++ b/src/screens/PostThread/components/ThreadItemAnchor.tsx
@@ -1,7 +1,7 @@
 import {memo, useMemo} from 'react'
 import {Text as RNText, View} from 'react-native'
 import {AtUri} from '@atproto/syntax'
-import {RichText as RichTextAPI} from '@bsky.app/sdk/richtext'
+import {RichText as RichTextAPI} from '@bsky/sdk/richtext'
 import {Plural, Trans, useLingui} from '@lingui/react/macro'
 
 import {useNonReactiveCallback} from '#/lib/hooks/useNonReactiveCallback'
diff --git a/src/screens/PostThread/components/ThreadItemPost.tsx b/src/screens/PostThread/components/ThreadItemPost.tsx
index a3ee448ed9..12fff63012 100644
--- a/src/screens/PostThread/components/ThreadItemPost.tsx
+++ b/src/screens/PostThread/components/ThreadItemPost.tsx
@@ -1,7 +1,7 @@
 import {memo, type ReactNode, useCallback, useMemo, useState} from 'react'
 import {View} from 'react-native'
 import {AtUri} from '@atproto/syntax'
-import {RichText as RichTextAPI} from '@bsky.app/sdk/richtext'
+import {RichText as RichTextAPI} from '@bsky/sdk/richtext'
 import {Trans} from '@lingui/react/macro'
 
 import {MAX_POST_LINES} from '#/lib/constants'
diff --git a/src/screens/PostThread/components/ThreadItemTreePost.tsx b/src/screens/PostThread/components/ThreadItemTreePost.tsx
index 1e20eb5841..6155ae1081 100644
--- a/src/screens/PostThread/components/ThreadItemTreePost.tsx
+++ b/src/screens/PostThread/components/ThreadItemTreePost.tsx
@@ -1,7 +1,7 @@
 import {memo, useCallback, useMemo, useState} from 'react'
 import {View} from 'react-native'
 import {AtUri} from '@atproto/syntax'
-import {RichText as RichTextAPI} from '@bsky.app/sdk/richtext'
+import {RichText as RichTextAPI} from '@bsky/sdk/richtext'
 import {Trans} from '@lingui/react/macro'
 
 import {MAX_POST_LINES} from '#/lib/constants'
diff --git a/src/screens/Profile/Header/DisplayName.tsx b/src/screens/Profile/Header/DisplayName.tsx
index b9a0fca221..a0f3e7960c 100644
--- a/src/screens/Profile/Header/DisplayName.tsx
+++ b/src/screens/Profile/Header/DisplayName.tsx
@@ -1,5 +1,5 @@
 import {View} from 'react-native'
-import {type ModerationDecision} from '@bsky.app/sdk/moderation'
+import {type ModerationDecision} from '@bsky/sdk/moderation'
 
 import {sanitizeDisplayName} from '#/lib/strings/display-names'
 import {sanitizeHandle} from '#/lib/strings/handles'
diff --git a/src/screens/Profile/Header/ProfileHeaderLabeler.tsx b/src/screens/Profile/Header/ProfileHeaderLabeler.tsx
index d5341e2ad7..c800d0ace3 100644
--- a/src/screens/Profile/Header/ProfileHeaderLabeler.tsx
+++ b/src/screens/Profile/Header/ProfileHeaderLabeler.tsx
@@ -1,7 +1,7 @@
 import {memo, useCallback, useMemo, useState} from 'react'
 import {View} from 'react-native'
-import {moderateProfile, type ModerationOpts} from '@bsky.app/sdk/moderation'
-import {type RichText as RichTextAPI} from '@bsky.app/sdk/richtext'
+import {moderateProfile, type ModerationOpts} from '@bsky/sdk/moderation'
+import {type RichText as RichTextAPI} from '@bsky/sdk/richtext'
 import {msg, plural} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Plural, Trans} from '@lingui/react/macro'
diff --git a/src/screens/Profile/Header/ProfileHeaderStandard.tsx b/src/screens/Profile/Header/ProfileHeaderStandard.tsx
index b8cba7c4ce..f66587c947 100644
--- a/src/screens/Profile/Header/ProfileHeaderStandard.tsx
+++ b/src/screens/Profile/Header/ProfileHeaderStandard.tsx
@@ -4,8 +4,8 @@ import {
   moderateProfile,
   type ModerationDecision,
   type ModerationOpts,
-} from '@bsky.app/sdk/moderation'
-import {type RichText as RichTextAPI} from '@bsky.app/sdk/richtext'
+} from '@bsky/sdk/moderation'
+import {type RichText as RichTextAPI} from '@bsky/sdk/richtext'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
diff --git a/src/screens/Profile/Header/Shell.tsx b/src/screens/Profile/Header/Shell.tsx
index 46ea78c9a0..bc1efdbb91 100644
--- a/src/screens/Profile/Header/Shell.tsx
+++ b/src/screens/Profile/Header/Shell.tsx
@@ -6,7 +6,7 @@ import Animated, {
 } from 'react-native-reanimated'
 import {useSafeAreaInsets} from 'react-native-safe-area-context'
 import {utils} from '@bsky.app/alf'
-import {type ModerationDecision} from '@bsky.app/sdk/moderation'
+import {type ModerationDecision} from '@bsky/sdk/moderation'
 import {useLingui} from '@lingui/react/macro'
 import {useNavigation} from '@react-navigation/native'
 
diff --git a/src/screens/Profile/Header/index.tsx b/src/screens/Profile/Header/index.tsx
index dfd84b3530..c8ebd3c780 100644
--- a/src/screens/Profile/Header/index.tsx
+++ b/src/screens/Profile/Header/index.tsx
@@ -7,8 +7,8 @@ import Animated, {
 } from 'react-native-reanimated'
 import {useSafeAreaInsets} from 'react-native-safe-area-context'
 import {scheduleOnRN} from 'react-native-worklets'
-import {moderateProfile, type ModerationOpts} from '@bsky.app/sdk/moderation'
-import {type RichText as RichTextAPI} from '@bsky.app/sdk/richtext'
+import {moderateProfile, type ModerationOpts} from '@bsky/sdk/moderation'
+import {type RichText as RichTextAPI} from '@bsky/sdk/richtext'
 import {useIsFocused} from '@react-navigation/native'
 
 import {sanitizeHandle} from '#/lib/strings/handles'
diff --git a/src/screens/Profile/Sections/Labels.tsx b/src/screens/Profile/Sections/Labels.tsx
index 649c214acb..6d73429f35 100644
--- a/src/screens/Profile/Sections/Labels.tsx
+++ b/src/screens/Profile/Sections/Labels.tsx
@@ -4,7 +4,7 @@ import {
   type InterpretedLabelValueDefinition,
   interpretLabelValueDefinitions,
   type ModerationOpts,
-} from '@bsky.app/sdk/moderation'
+} from '@bsky/sdk/moderation'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
diff --git a/src/screens/ProfileList/components/Header.tsx b/src/screens/ProfileList/components/Header.tsx
index 8335cf4851..98059c37de 100644
--- a/src/screens/ProfileList/components/Header.tsx
+++ b/src/screens/ProfileList/components/Header.tsx
@@ -1,6 +1,6 @@
 import {useMemo} from 'react'
 import {View} from 'react-native'
-import {RichText as RichTextAPI} from '@bsky.app/sdk/richtext'
+import {RichText as RichTextAPI} from '@bsky/sdk/richtext'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
diff --git a/src/screens/ProfileList/index.tsx b/src/screens/ProfileList/index.tsx
index f91e2fe896..c898663c8f 100644
--- a/src/screens/ProfileList/index.tsx
+++ b/src/screens/ProfileList/index.tsx
@@ -2,7 +2,7 @@ import {useCallback, useMemo, useRef, useState} from 'react'
 import {View} from 'react-native'
 import {useAnimatedRef} from 'react-native-reanimated'
 import {AtUri} from '@atproto/syntax'
-import {moderateUserList, type ModerationOpts} from '@bsky.app/sdk/moderation'
+import {moderateUserList, type ModerationOpts} from '@bsky/sdk/moderation'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
diff --git a/src/screens/Search/components/SearchHistory.tsx b/src/screens/Search/components/SearchHistory.tsx
index 4a23cf4956..b2b24b58a9 100644
--- a/src/screens/Search/components/SearchHistory.tsx
+++ b/src/screens/Search/components/SearchHistory.tsx
@@ -1,5 +1,5 @@
 import {ScrollView, View} from 'react-native'
-import {moderateProfile, type ModerationOpts} from '@bsky.app/sdk/moderation'
+import {moderateProfile, type ModerationOpts} from '@bsky/sdk/moderation'
 import {Plural, Trans, useLingui} from '@lingui/react/macro'
 
 import {createHitslop} from '#/lib/constants'
diff --git a/src/screens/Search/components/SearchProfileCard.tsx b/src/screens/Search/components/SearchProfileCard.tsx
index b848739ed3..bd39dc9b4e 100644
--- a/src/screens/Search/components/SearchProfileCard.tsx
+++ b/src/screens/Search/components/SearchProfileCard.tsx
@@ -1,6 +1,6 @@
 import {useCallback} from 'react'
 import {View} from 'react-native'
-import {type ModerationOpts} from '@bsky.app/sdk/moderation'
+import {type ModerationOpts} from '@bsky/sdk/moderation'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {useQueryClient} from '@tanstack/react-query'
diff --git a/src/screens/Search/components/StarterPackCard.tsx b/src/screens/Search/components/StarterPackCard.tsx
index eff60a02a4..246100c13d 100644
--- a/src/screens/Search/components/StarterPackCard.tsx
+++ b/src/screens/Search/components/StarterPackCard.tsx
@@ -1,6 +1,6 @@
 import {useState} from 'react'
 import {View} from 'react-native'
-import {moderateProfile} from '@bsky.app/sdk/moderation'
+import {moderateProfile} from '@bsky/sdk/moderation'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
diff --git a/src/screens/Search/modules/ExploreSuggestedAccounts.tsx b/src/screens/Search/modules/ExploreSuggestedAccounts.tsx
index ad8a8b8a72..545cc0d231 100644
--- a/src/screens/Search/modules/ExploreSuggestedAccounts.tsx
+++ b/src/screens/Search/modules/ExploreSuggestedAccounts.tsx
@@ -1,6 +1,6 @@
 import {memo, useEffect} from 'react'
 import {View} from 'react-native'
-import {type ModerationOpts} from '@bsky.app/sdk/moderation'
+import {type ModerationOpts} from '@bsky/sdk/moderation'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {type InfiniteData} from '@tanstack/react-query'
diff --git a/src/screens/Search/modules/ExploreTrendingTopics.tsx b/src/screens/Search/modules/ExploreTrendingTopics.tsx
index c8e0ee20ec..6bbb6e1e54 100644
--- a/src/screens/Search/modules/ExploreTrendingTopics.tsx
+++ b/src/screens/Search/modules/ExploreTrendingTopics.tsx
@@ -1,8 +1,8 @@
 import {useMemo} from 'react'
 import {Pressable, View} from 'react-native'
 import {Image} from 'expo-image'
-import {moderateProfile} from '@bsky.app/sdk/moderation'
-import {RichText as RichTextApi} from '@bsky.app/sdk/richtext'
+import {moderateProfile} from '@bsky/sdk/moderation'
+import {RichText as RichTextApi} from '@bsky/sdk/richtext'
 import {Plural, Trans, useLingui} from '@lingui/react/macro'
 
 import {useModerationOpts} from '#/state/preferences/moderation-opts'
diff --git a/src/screens/Settings/FindContactsSettings.tsx b/src/screens/Settings/FindContactsSettings.tsx
index 9574c3a759..bc7ef48f8e 100644
--- a/src/screens/Settings/FindContactsSettings.tsx
+++ b/src/screens/Settings/FindContactsSettings.tsx
@@ -2,7 +2,7 @@ import {useCallback, useEffect, useState} from 'react'
 import {type ListRenderItemInfo, View} from 'react-native'
 import * as Contacts from 'expo-contacts'
 import {type DidString} from '@atproto/syntax'
-import {type ModerationOpts} from '@bsky.app/sdk/moderation'
+import {type ModerationOpts} from '@bsky/sdk/moderation'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Plural, Trans} from '@lingui/react/macro'
diff --git a/src/screens/Settings/InterestsSettings.tsx b/src/screens/Settings/InterestsSettings.tsx
index 351ee60ffc..84589d7481 100644
--- a/src/screens/Settings/InterestsSettings.tsx
+++ b/src/screens/Settings/InterestsSettings.tsx
@@ -1,6 +1,6 @@
 import {useMemo, useState} from 'react'
 import {type TextStyle, View, type ViewStyle} from 'react-native'
-import {setInterestsPref} from '@bsky.app/sdk'
+import {setInterestsPref} from '@bsky/sdk'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
diff --git a/src/screens/Settings/NotificationSettings/ActivityNotificationSettings.tsx b/src/screens/Settings/NotificationSettings/ActivityNotificationSettings.tsx
index 0da3356f5e..c91bcf4acc 100644
--- a/src/screens/Settings/NotificationSettings/ActivityNotificationSettings.tsx
+++ b/src/screens/Settings/NotificationSettings/ActivityNotificationSettings.tsx
@@ -1,6 +1,6 @@
 import {useCallback, useMemo} from 'react'
 import {type ListRenderItemInfo, Text as RNText, View} from 'react-native'
-import {type ModerationOpts} from '@bsky.app/sdk/moderation'
+import {type ModerationOpts} from '@bsky/sdk/moderation'
 import {Trans, useLingui} from '@lingui/react/macro'
 
 import {createSanitizedDisplayName} from '#/lib/moderation/create-sanitized-display-name'
diff --git a/src/screens/Settings/Settings.tsx b/src/screens/Settings/Settings.tsx
index fdb77c9908..61af150a99 100644
--- a/src/screens/Settings/Settings.tsx
+++ b/src/screens/Settings/Settings.tsx
@@ -1,8 +1,8 @@
 import {useState} from 'react'
 import {Alert, LayoutAnimation, Linking, Pressable, View} from 'react-native'
 import {useReducedMotion} from 'react-native-reanimated'
-import {removeNuxs} from '@bsky.app/sdk'
-import {moderateProfile} from '@bsky.app/sdk/moderation'
+import {removeNuxs} from '@bsky/sdk'
+import {moderateProfile} from '@bsky/sdk/moderation'
 import {Trans, useLingui} from '@lingui/react/macro'
 import {useNavigation} from '@react-navigation/native'
 import {type NativeStackScreenProps} from '@react-navigation/native-stack'
diff --git a/src/screens/StarterPack/StarterPackLandingScreen.tsx b/src/screens/StarterPack/StarterPackLandingScreen.tsx
index a5a7c3c9f6..4e4cf915dd 100644
--- a/src/screens/StarterPack/StarterPackLandingScreen.tsx
+++ b/src/screens/StarterPack/StarterPackLandingScreen.tsx
@@ -2,7 +2,7 @@ import {useEffect, useState} from 'react'
 import {Pressable, View} from 'react-native'
 import Animated, {FadeIn, FadeOut} from 'react-native-reanimated'
 import {AtUri} from '@atproto/syntax'
-import {type ModerationOpts} from '@bsky.app/sdk/moderation'
+import {type ModerationOpts} from '@bsky/sdk/moderation'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
diff --git a/src/screens/StarterPack/StarterPackScreen.tsx b/src/screens/StarterPack/StarterPackScreen.tsx
index b023889300..8115f15287 100644
--- a/src/screens/StarterPack/StarterPackScreen.tsx
+++ b/src/screens/StarterPack/StarterPackScreen.tsx
@@ -2,8 +2,8 @@ import {useCallback, useEffect, useState} from 'react'
 import {View} from 'react-native'
 import {Image} from 'expo-image'
 import {AtUri} from '@atproto/syntax'
-import {type ModerationOpts} from '@bsky.app/sdk/moderation'
-import {RichText as RichTextAPI} from '@bsky.app/sdk/richtext'
+import {type ModerationOpts} from '@bsky/sdk/moderation'
+import {RichText as RichTextAPI} from '@bsky/sdk/richtext'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Plural, Trans} from '@lingui/react/macro'
diff --git a/src/screens/StarterPack/Wizard/StepFeeds.tsx b/src/screens/StarterPack/Wizard/StepFeeds.tsx
index 788f740765..741c8622c6 100644
--- a/src/screens/StarterPack/Wizard/StepFeeds.tsx
+++ b/src/screens/StarterPack/Wizard/StepFeeds.tsx
@@ -1,7 +1,7 @@
 import {useState} from 'react'
 import {type ListRenderItemInfo, View} from 'react-native'
 import {KeyboardAwareScrollView} from 'react-native-keyboard-controller'
-import {type ModerationOpts} from '@bsky.app/sdk/moderation'
+import {type ModerationOpts} from '@bsky/sdk/moderation'
 import {Trans} from '@lingui/react/macro'
 
 import {DISCOVER_FEED_URI} from '#/lib/constants'
diff --git a/src/screens/StarterPack/Wizard/StepProfiles.tsx b/src/screens/StarterPack/Wizard/StepProfiles.tsx
index 45e52fa14b..3ba167e856 100644
--- a/src/screens/StarterPack/Wizard/StepProfiles.tsx
+++ b/src/screens/StarterPack/Wizard/StepProfiles.tsx
@@ -1,7 +1,7 @@
 import {useState} from 'react'
 import {type ListRenderItemInfo, View} from 'react-native'
 import {KeyboardAwareScrollView} from 'react-native-keyboard-controller'
-import {type ModerationOpts} from '@bsky.app/sdk/moderation'
+import {type ModerationOpts} from '@bsky/sdk/moderation'
 import {Trans} from '@lingui/react/macro'
 
 import {useA11y} from '#/state/a11y'
diff --git a/src/screens/StarterPack/Wizard/index.tsx b/src/screens/StarterPack/Wizard/index.tsx
index fd6c499584..d1abb10900 100644
--- a/src/screens/StarterPack/Wizard/index.tsx
+++ b/src/screens/StarterPack/Wizard/index.tsx
@@ -4,7 +4,7 @@ import {KeyboardAwareScrollView} from 'react-native-keyboard-controller'
 import {useSafeAreaInsets} from 'react-native-safe-area-context'
 import {Image} from 'expo-image'
 import {AtUri} from '@atproto/syntax'
-import {type ModerationOpts} from '@bsky.app/sdk/moderation'
+import {type ModerationOpts} from '@bsky/sdk/moderation'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Plural, Trans} from '@lingui/react/macro'
diff --git a/src/screens/VideoFeed/index.tsx b/src/screens/VideoFeed/index.tsx
index 0f8f8d1a39..0b6fd3aba0 100644
--- a/src/screens/VideoFeed/index.tsx
+++ b/src/screens/VideoFeed/index.tsx
@@ -26,8 +26,8 @@ import {Image, type ImageStyle} from 'expo-image'
 import {LinearGradient} from 'expo-linear-gradient'
 import {createVideoPlayer, type VideoPlayer, VideoView} from 'expo-video'
 import {AtUri} from '@atproto/syntax'
-import {type ModerationDecision} from '@bsky.app/sdk/moderation'
-import {RichText as RichTextAPI} from '@bsky.app/sdk/richtext'
+import {type ModerationDecision} from '@bsky/sdk/moderation'
+import {RichText as RichTextAPI} from '@bsky/sdk/richtext'
 import {Trans, useLingui} from '@lingui/react/macro'
 import {
   type RouteProp,
diff --git a/src/state/birthdate.ts b/src/state/birthdate.ts
index 8146836190..6dec3afb1c 100644
--- a/src/state/birthdate.ts
+++ b/src/state/birthdate.ts
@@ -1,5 +1,5 @@
 import {useMemo} from 'react'
-import {setPersonalDetails} from '@bsky.app/sdk'
+import {setPersonalDetails} from '@bsky/sdk'
 import {useMutation, useQueryClient} from '@tanstack/react-query'
 
 import {restrictChatSettings} from '#/state/queries/messages/restrictChatSettings'
diff --git a/src/state/preferences/label-defs.tsx b/src/state/preferences/label-defs.tsx
index 8000bd231c..f60c485656 100644
--- a/src/state/preferences/label-defs.tsx
+++ b/src/state/preferences/label-defs.tsx
@@ -1,5 +1,5 @@
 import {createContext, useContext} from 'react'
-import {type InterpretedLabelValueDefinition} from '@bsky.app/sdk/moderation'
+import {type InterpretedLabelValueDefinition} from '@bsky/sdk/moderation'
 
 import {type app} from '#/lexicons'
 import {useLabelDefinitionsQuery} from '../queries/preferences'
diff --git a/src/state/preferences/moderation-opts.tsx b/src/state/preferences/moderation-opts.tsx
index a2575c9a50..72006e1bf2 100644
--- a/src/state/preferences/moderation-opts.tsx
+++ b/src/state/preferences/moderation-opts.tsx
@@ -1,6 +1,6 @@
 import {createContext, useContext, useMemo} from 'react'
 import {Client} from '@atproto/lex'
-import {type ModerationOpts} from '@bsky.app/sdk/moderation'
+import {type ModerationOpts} from '@bsky/sdk/moderation'
 
 import {useHiddenPosts, useLabelDefinitions} from '#/state/preferences'
 import {DEFAULT_LOGGED_OUT_LABEL_PREFERENCES} from '#/state/queries/preferences/const'
diff --git a/src/state/queries/actor-autocomplete.ts b/src/state/queries/actor-autocomplete.ts
index cdb2584803..b84b5fabdd 100644
--- a/src/state/queries/actor-autocomplete.ts
+++ b/src/state/queries/actor-autocomplete.ts
@@ -1,5 +1,5 @@
 import {useCallback} from 'react'
-import {moderateProfile, type ModerationOpts} from '@bsky.app/sdk/moderation'
+import {moderateProfile, type ModerationOpts} from '@bsky/sdk/moderation'
 import {keepPreviousData, useQuery, useQueryClient} from '@tanstack/react-query'
 
 import {isJustAMute, moduiContainsHideableOffense} from '#/lib/moderation'
diff --git a/src/state/queries/explore-feed-previews.tsx b/src/state/queries/explore-feed-previews.tsx
index 0977fdcbdc..efe331af18 100644
--- a/src/state/queries/explore-feed-previews.tsx
+++ b/src/state/queries/explore-feed-previews.tsx
@@ -1,6 +1,6 @@
 import {useMemo, useRef} from 'react'
 import {AtUri} from '@atproto/syntax'
-import {moderatePost} from '@bsky.app/sdk/moderation'
+import {moderatePost} from '@bsky/sdk/moderation'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {
diff --git a/src/state/queries/feed.ts b/src/state/queries/feed.ts
index c0ace8f911..850f9dbaa6 100644
--- a/src/state/queries/feed.ts
+++ b/src/state/queries/feed.ts
@@ -1,7 +1,7 @@
 import {useCallback, useEffect, useMemo, useRef} from 'react'
 import {AtUri, type AtUriString} from '@atproto/syntax'
-import {moderateFeedGenerator} from '@bsky.app/sdk/moderation'
-import {RichText} from '@bsky.app/sdk/richtext'
+import {moderateFeedGenerator} from '@bsky/sdk/moderation'
+import {RichText} from '@bsky/sdk/richtext'
 import {t} from '@lingui/core/macro'
 import {
   type InfiniteData,
diff --git a/src/state/queries/labeler.ts b/src/state/queries/labeler.ts
index 3fd14cc5fc..6d26c92c57 100644
--- a/src/state/queries/labeler.ts
+++ b/src/state/queries/labeler.ts
@@ -1,5 +1,5 @@
 import {type DidString} from '@atproto/syntax'
-import {addLabeler, removeLabeler} from '@bsky.app/sdk'
+import {addLabeler, removeLabeler} from '@bsky/sdk'
 import {useMutation, useQuery, useQueryClient} from '@tanstack/react-query'
 import {z} from 'zod'
 
diff --git a/src/state/queries/like.ts b/src/state/queries/like.ts
index 2f626cc428..b8642a45a1 100644
--- a/src/state/queries/like.ts
+++ b/src/state/queries/like.ts
@@ -1,5 +1,5 @@
 import {type AtUriString} from '@atproto/syntax'
-import {deleteLike, like} from '@bsky.app/sdk'
+import {deleteLike, like} from '@bsky/sdk'
 import {useMutation} from '@tanstack/react-query'
 
 import {usePdsClient} from '#/state/session'
diff --git a/src/state/queries/list.ts b/src/state/queries/list.ts
index 85efd85b15..bd29d578dc 100644
--- a/src/state/queries/list.ts
+++ b/src/state/queries/list.ts
@@ -5,7 +5,7 @@ import {
   muteActorList,
   unblockActorList,
   unmuteActorList,
-} from '@bsky.app/sdk'
+} from '@bsky/sdk'
 import {useMutation, useQuery, useQueryClient} from '@tanstack/react-query'
 import chunk from 'lodash.chunk'
 
diff --git a/src/state/queries/notifications/feed.ts b/src/state/queries/notifications/feed.ts
index b44abe44a2..978c363df5 100644
--- a/src/state/queries/notifications/feed.ts
+++ b/src/state/queries/notifications/feed.ts
@@ -18,7 +18,7 @@
 
 import {useCallback, useEffect, useMemo, useRef} from 'react'
 import {AtUri} from '@atproto/syntax'
-import {moderatePost} from '@bsky.app/sdk/moderation'
+import {moderatePost} from '@bsky/sdk/moderation'
 import {
   type InfiniteData,
   type QueryClient,
diff --git a/src/state/queries/notifications/util.ts b/src/state/queries/notifications/util.ts
index 83a028423b..fad64582da 100644
--- a/src/state/queries/notifications/util.ts
+++ b/src/state/queries/notifications/util.ts
@@ -4,7 +4,7 @@ import {
   hasMutedWord,
   moderateNotification,
   type ModerationOpts,
-} from '@bsky.app/sdk/moderation'
+} from '@bsky/sdk/moderation'
 import {type QueryClient} from '@tanstack/react-query'
 import chunk from 'lodash.chunk'
 
diff --git a/src/state/queries/nuxs/index.ts b/src/state/queries/nuxs/index.ts
index d8c9e71924..69ab7691a4 100644
--- a/src/state/queries/nuxs/index.ts
+++ b/src/state/queries/nuxs/index.ts
@@ -1,4 +1,4 @@
-import {removeNuxs, upsertNux} from '@bsky.app/sdk'
+import {removeNuxs, upsertNux} from '@bsky/sdk'
 import {useMutation, useQueryClient} from '@tanstack/react-query'
 
 import {type AppNux, type Nux} from '#/state/queries/nuxs/definitions'
diff --git a/src/state/queries/nuxs/util.ts b/src/state/queries/nuxs/util.ts
index 973b46f0dc..8482f47638 100644
--- a/src/state/queries/nuxs/util.ts
+++ b/src/state/queries/nuxs/util.ts
@@ -1,4 +1,4 @@
-import {nuxSchema} from '@bsky.app/sdk/utils'
+import {nuxSchema} from '@bsky/sdk/utils'
 
 import {
   type AppNux,
diff --git a/src/state/queries/post-feed.ts b/src/state/queries/post-feed.ts
index e8f5b5ee4a..95af63b185 100644
--- a/src/state/queries/post-feed.ts
+++ b/src/state/queries/post-feed.ts
@@ -6,7 +6,7 @@ import {
   moderatePost,
   type ModerationDecision,
   type ModerationPrefs,
-} from '@bsky.app/sdk/moderation'
+} from '@bsky/sdk/moderation'
 import {
   type InfiniteData,
   type QueryClient,
diff --git a/src/state/queries/post-interaction-settings.ts b/src/state/queries/post-interaction-settings.ts
index 45d964f435..6eae5c7afa 100644
--- a/src/state/queries/post-interaction-settings.ts
+++ b/src/state/queries/post-interaction-settings.ts
@@ -1,4 +1,4 @@
-import {setPostInteractionSettings} from '@bsky.app/sdk'
+import {setPostInteractionSettings} from '@bsky/sdk'
 import {useMutation, useQueryClient} from '@tanstack/react-query'
 
 import {preferencesQueryKey} from '#/state/queries/preferences'
diff --git a/src/state/queries/post.ts b/src/state/queries/post.ts
index 73191c83ee..49dfdf0998 100644
--- a/src/state/queries/post.ts
+++ b/src/state/queries/post.ts
@@ -1,7 +1,7 @@
 import {useCallback} from 'react'
 import {type Client} from '@atproto/lex'
 import {AtUri, type AtUriString, type HandleString} from '@atproto/syntax'
-import {deleteLike, deletePost, deleteRepost, like, repost} from '@bsky.app/sdk'
+import {deleteLike, deletePost, deleteRepost, like, repost} from '@bsky/sdk'
 import {
   type QueryClient,
   useMutation,
diff --git a/src/state/queries/preferences/const.ts b/src/state/queries/preferences/const.ts
index 81b50fffd0..6ec2418e18 100644
--- a/src/state/queries/preferences/const.ts
+++ b/src/state/queries/preferences/const.ts
@@ -1,4 +1,4 @@
-import {DEFAULT_LABEL_SETTINGS} from '@bsky.app/sdk/moderation'
+import {DEFAULT_LABEL_SETTINGS} from '@bsky/sdk/moderation'
 
 import {
   type ThreadViewPreferences,
diff --git a/src/state/queries/preferences/index.ts b/src/state/queries/preferences/index.ts
index f3bb37d1a0..912a87a1ba 100644
--- a/src/state/queries/preferences/index.ts
+++ b/src/state/queries/preferences/index.ts
@@ -20,8 +20,8 @@ import {
   updateMutedWord,
   updateSavedFeeds,
   upsertMutedWords,
-} from '@bsky.app/sdk'
-import {type LabelPreference} from '@bsky.app/sdk/moderation'
+} from '@bsky/sdk'
+import {type LabelPreference} from '@bsky/sdk/moderation'
 import {useMutation, useQuery, useQueryClient} from '@tanstack/react-query'
 
 import {PROD_DEFAULT_FEED} from '#/lib/constants'
diff --git a/src/state/queries/preferences/moderation.ts b/src/state/queries/preferences/moderation.ts
index f7d237995e..36f17a4f31 100644
--- a/src/state/queries/preferences/moderation.ts
+++ b/src/state/queries/preferences/moderation.ts
@@ -1,6 +1,6 @@
 import {useMemo} from 'react'
 import {Client} from '@atproto/lex'
-import {interpretLabelValueDefinitions} from '@bsky.app/sdk/moderation'
+import {interpretLabelValueDefinitions} from '@bsky/sdk/moderation'
 
 import {isNonConfigurableModerationAuthority} from '#/state/session/additional-moderation-authorities'
 import {useLabelersDetailedInfoQuery} from '../labeler'
diff --git a/src/state/queries/preferences/types.ts b/src/state/queries/preferences/types.ts
index f93ca955a4..7ade79b834 100644
--- a/src/state/queries/preferences/types.ts
+++ b/src/state/queries/preferences/types.ts
@@ -1,4 +1,4 @@
-import {type BskyFeedViewPreference, type BskyPreferences} from '@bsky.app/sdk'
+import {type BskyFeedViewPreference, type BskyPreferences} from '@bsky/sdk'
 
 export type UsePreferencesQueryResponse = Omit<
   BskyPreferences,
diff --git a/src/state/queries/profile-feedgens.ts b/src/state/queries/profile-feedgens.ts
index 79309b1328..dffc869512 100644
--- a/src/state/queries/profile-feedgens.ts
+++ b/src/state/queries/profile-feedgens.ts
@@ -1,5 +1,5 @@
 import {type DidString} from '@atproto/syntax'
-import {moderateFeedGenerator} from '@bsky.app/sdk/moderation'
+import {moderateFeedGenerator} from '@bsky/sdk/moderation'
 import {
   type InfiniteData,
   type QueryKey,
diff --git a/src/state/queries/profile-lists.ts b/src/state/queries/profile-lists.ts
index 8f1087c245..0d466aff29 100644
--- a/src/state/queries/profile-lists.ts
+++ b/src/state/queries/profile-lists.ts
@@ -1,5 +1,5 @@
 import {type DidString} from '@atproto/syntax'
-import {moderateUserList} from '@bsky.app/sdk/moderation'
+import {moderateUserList} from '@bsky/sdk/moderation'
 import {
   type InfiniteData,
   type QueryKey,
diff --git a/src/state/queries/profile.ts b/src/state/queries/profile.ts
index fb3f467743..dcfcba82bb 100644
--- a/src/state/queries/profile.ts
+++ b/src/state/queries/profile.ts
@@ -13,7 +13,7 @@ import {
   muteActor,
   unmuteActor,
   upsertProfile,
-} from '@bsky.app/sdk'
+} from '@bsky/sdk'
 import {
   type InfiniteData,
   keepPreviousData,
@@ -548,7 +548,6 @@ function useProfileMuteRepostsMutation() {
     mutationFn: async ({did}: {did: DidString}) => {
       await appviewClient.call(muteActor, {
         actor: did,
-        // @ts-expect-error missing from this SDK version, remove this
         onlyReposts: true,
       })
     },
diff --git a/src/state/queries/search-posts-v2.ts b/src/state/queries/search-posts-v2.ts
index e9a1178009..acb69f57d4 100644
--- a/src/state/queries/search-posts-v2.ts
+++ b/src/state/queries/search-posts-v2.ts
@@ -1,6 +1,6 @@
 import {useCallback, useMemo, useRef} from 'react'
 import {AtUri} from '@atproto/syntax'
-import {moderatePost} from '@bsky.app/sdk/moderation'
+import {moderatePost} from '@bsky/sdk/moderation'
 import {
   type InfiniteData,
   type QueryClient,
diff --git a/src/state/queries/starter-packs.ts b/src/state/queries/starter-packs.ts
index dd3ff1a9fe..7dcb76e706 100644
--- a/src/state/queries/starter-packs.ts
+++ b/src/state/queries/starter-packs.ts
@@ -1,6 +1,6 @@
 import {type Client} from '@atproto/lex'
 import {AtUri, type AtUriString, toDatetimeString} from '@atproto/syntax'
-import {RichText} from '@bsky.app/sdk/richtext'
+import {RichText} from '@bsky/sdk/richtext'
 import {
   type QueryClient,
   useMutation,
diff --git a/src/state/queries/trending/useGetTrendsQuery.ts b/src/state/queries/trending/useGetTrendsQuery.ts
index 5ba9b4d4b2..fabeccd478 100644
--- a/src/state/queries/trending/useGetTrendsQuery.ts
+++ b/src/state/queries/trending/useGetTrendsQuery.ts
@@ -1,5 +1,5 @@
 import {useCallback, useMemo} from 'react'
-import {hasMutedWord} from '@bsky.app/sdk/moderation'
+import {hasMutedWord} from '@bsky/sdk/moderation'
 import {useQuery} from '@tanstack/react-query'
 
 import {
diff --git a/src/state/queries/usePostThread/traversal.ts b/src/state/queries/usePostThread/traversal.ts
index 107697f76f..c7df88a0e4 100644
--- a/src/state/queries/usePostThread/traversal.ts
+++ b/src/state/queries/usePostThread/traversal.ts
@@ -1,4 +1,4 @@
-import {type ModerationOpts} from '@bsky.app/sdk/moderation'
+import {type ModerationOpts} from '@bsky/sdk/moderation'
 
 import {
   type ApiThreadItem,
diff --git a/src/state/queries/usePostThread/types.ts b/src/state/queries/usePostThread/types.ts
index 2c2548ff50..e5ead90051 100644
--- a/src/state/queries/usePostThread/types.ts
+++ b/src/state/queries/usePostThread/types.ts
@@ -1,4 +1,4 @@
-import {type ModerationDecision} from '@bsky.app/sdk/moderation'
+import {type ModerationDecision} from '@bsky/sdk/moderation'
 
 import {type app} from '#/lexicons'
 
diff --git a/src/state/queries/usePostThread/views.ts b/src/state/queries/usePostThread/views.ts
index d03f49219c..a5661ae835 100644
--- a/src/state/queries/usePostThread/views.ts
+++ b/src/state/queries/usePostThread/views.ts
@@ -1,6 +1,6 @@
 import {type $Typed} from '@atproto/lex'
 import {AtUri} from '@atproto/syntax'
-import {moderatePost, type ModerationOpts} from '@bsky.app/sdk/moderation'
+import {moderatePost, type ModerationOpts} from '@bsky/sdk/moderation'
 
 import {makeProfileLink} from '#/lib/routes/links'
 import {
diff --git a/src/state/session/create-account.ts b/src/state/session/create-account.ts
index 618ab1aa7a..e2337b30c3 100644
--- a/src/state/session/create-account.ts
+++ b/src/state/session/create-account.ts
@@ -2,11 +2,7 @@ import {TID} from '@atproto/common-web'
 import {type Client} from '@atproto/lex'
 import {PasswordSession} from '@atproto/lex-password-session'
 import {toDatetimeString} from '@atproto/syntax'
-import {
-  overwriteSavedFeeds,
-  setPersonalDetails,
-  upsertProfile,
-} from '@bsky.app/sdk'
+import {overwriteSavedFeeds, setPersonalDetails, upsertProfile} from '@bsky/sdk'
 
 import {networkRetry} from '#/lib/async/retry'
 import {
diff --git a/src/state/session/moderation.ts b/src/state/session/moderation.ts
index c54da1be46..72afe204c2 100644
--- a/src/state/session/moderation.ts
+++ b/src/state/session/moderation.ts
@@ -1,6 +1,6 @@
 import {type Client} from '@atproto/lex'
 import {type DidString} from '@atproto/syntax'
-import {api} from '@bsky.app/sdk'
+import {api} from '@bsky/sdk'
 
 import {IS_TEST_USER} from '#/lib/constants'
 import {com} from '#/lexicons'
diff --git a/src/state/shell/composer/index.tsx b/src/state/shell/composer/index.tsx
index 12e734bf6c..fddf0421e9 100644
--- a/src/state/shell/composer/index.tsx
+++ b/src/state/shell/composer/index.tsx
@@ -1,5 +1,5 @@
 import {createContext, useContext, useMemo, useState} from 'react'
-import {type ModerationDecision} from '@bsky.app/sdk/moderation'
+import {type ModerationDecision} from '@bsky/sdk/moderation'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {useQueryClient} from '@tanstack/react-query'
diff --git a/src/view/com/composer/Composer.tsx b/src/view/com/composer/Composer.tsx
index 7a2a2f5484..08efc5c696 100644
--- a/src/view/com/composer/Composer.tsx
+++ b/src/view/com/composer/Composer.tsx
@@ -46,7 +46,7 @@ import * as FileSystem from 'expo-file-system'
 import {type ImagePickerAsset} from 'expo-image-picker'
 import {type Client, type UriString} from '@atproto/lex'
 import {AtUri, type AtUriString} from '@atproto/syntax'
-import {type RichText} from '@bsky.app/sdk/richtext'
+import {type RichText} from '@bsky/sdk/richtext'
 import {plural} from '@lingui/core/macro'
 import {Trans, useLingui} from '@lingui/react/macro'
 import {useNavigation} from '@react-navigation/native'
diff --git a/src/view/com/composer/drafts/state/api.ts b/src/view/com/composer/drafts/state/api.ts
index 2260e04bd0..5507460be0 100644
--- a/src/view/com/composer/drafts/state/api.ts
+++ b/src/view/com/composer/drafts/state/api.ts
@@ -3,7 +3,7 @@
  */
 import {type UriString} from '@atproto/lex'
 import {AtUri} from '@atproto/syntax'
-import {RichText} from '@bsky.app/sdk/richtext'
+import {RichText} from '@bsky/sdk/richtext'
 import {nanoid} from 'nanoid/non-secure'
 
 import {type LinkResolvers, resolveLink} from '#/lib/api/resolve'
diff --git a/src/view/com/composer/select-language/SuggestedLanguage.tsx b/src/view/com/composer/select-language/SuggestedLanguage.tsx
index 71a45ec796..56bca076e1 100644
--- a/src/view/com/composer/select-language/SuggestedLanguage.tsx
+++ b/src/view/com/composer/select-language/SuggestedLanguage.tsx
@@ -5,7 +5,7 @@ import {
   guessLanguageAsync,
   type LanguageResult,
 } from '@bsky.app/expo-guess-language'
-import {RichText} from '@bsky.app/sdk/richtext'
+import {RichText} from '@bsky/sdk/richtext'
 import {Trans, useLingui} from '@lingui/react/macro'
 import debounce from 'lodash.debounce'
 
diff --git a/src/view/com/composer/state/composer.ts b/src/view/com/composer/state/composer.ts
index ad3e5f4df6..a7fd4f1e1b 100644
--- a/src/view/com/composer/state/composer.ts
+++ b/src/view/com/composer/state/composer.ts
@@ -1,7 +1,7 @@
 import {type ImagePickerAsset} from 'expo-image-picker'
 import {type UriString} from '@atproto/lex'
 import {type AtUriString, toDatetimeString} from '@atproto/syntax'
-import {RichText} from '@bsky.app/sdk/richtext'
+import {RichText} from '@bsky/sdk/richtext'
 import {nanoid} from 'nanoid/non-secure'
 
 import {type VideoTelemetry} from '#/lib/media/video/telemetry'
diff --git a/src/view/com/composer/text-input/TextInput.tsx b/src/view/com/composer/text-input/TextInput.tsx
index d230b01545..d2d108b570 100644
--- a/src/view/com/composer/text-input/TextInput.tsx
+++ b/src/view/com/composer/text-input/TextInput.tsx
@@ -12,7 +12,7 @@ import {
   View,
 } from 'react-native'
 import {type PasteEventPayload, TextInputWrapper} from 'expo-paste-input'
-import {RichText} from '@bsky.app/sdk/richtext'
+import {RichText} from '@bsky/sdk/richtext'
 import {useLingui} from '@lingui/react/macro'
 
 import {IMAGE_SIZE_CONFIG_POSTS} from '#/lib/constants'
diff --git a/src/view/com/composer/text-input/TextInput.types.ts b/src/view/com/composer/text-input/TextInput.types.ts
index e60432b41e..490472f0a4 100644
--- a/src/view/com/composer/text-input/TextInput.types.ts
+++ b/src/view/com/composer/text-input/TextInput.types.ts
@@ -1,5 +1,5 @@
 import {type TextInput} from 'react-native'
-import {type RichText} from '@bsky.app/sdk/richtext'
+import {type RichText} from '@bsky/sdk/richtext'
 
 export type TextInputRef = {
   focus: () => void
diff --git a/src/view/com/composer/text-input/TextInput.web.tsx b/src/view/com/composer/text-input/TextInput.web.tsx
index f75d60f4bd..79f0c2db46 100644
--- a/src/view/com/composer/text-input/TextInput.web.tsx
+++ b/src/view/com/composer/text-input/TextInput.web.tsx
@@ -8,7 +8,7 @@ import {
 } from 'react'
 import {StyleSheet, View} from 'react-native'
 import Animated, {FadeIn, FadeOut} from 'react-native-reanimated'
-import {RichText} from '@bsky.app/sdk/richtext'
+import {RichText} from '@bsky/sdk/richtext'
 import {Trans} from '@lingui/react/macro'
 import {getSchema} from '@tiptap/core'
 import {Document} from '@tiptap/extension-document'
diff --git a/src/view/com/composer/text-input/text-input-util.ts b/src/view/com/composer/text-input/text-input-util.ts
index 998d7074d9..6f6d2e46d3 100644
--- a/src/view/com/composer/text-input/text-input-util.ts
+++ b/src/view/com/composer/text-input/text-input-util.ts
@@ -1,4 +1,4 @@
-import {type RichText} from '@bsky.app/sdk/richtext'
+import {type RichText} from '@bsky/sdk/richtext'
 
 import {type app} from '#/lexicons'
 
diff --git a/src/view/com/composer/text-input/web/Autocomplete.tsx b/src/view/com/composer/text-input/web/Autocomplete.tsx
index 945ce59adc..21d8e37b59 100644
--- a/src/view/com/composer/text-input/web/Autocomplete.tsx
+++ b/src/view/com/composer/text-input/web/Autocomplete.tsx
@@ -1,6 +1,6 @@
 import {forwardRef, useEffect, useImperativeHandle, useState} from 'react'
 import {Pressable, View} from 'react-native'
-import {type ModerationOpts} from '@bsky.app/sdk/moderation'
+import {type ModerationOpts} from '@bsky/sdk/moderation'
 import {Trans} from '@lingui/react/macro'
 import {ReactRenderer} from '@tiptap/react'
 import {
diff --git a/src/view/com/composer/text-input/web/LinkDecorator.ts b/src/view/com/composer/text-input/web/LinkDecorator.ts
index bcb81b2cf5..d9a4c51ca3 100644
--- a/src/view/com/composer/text-input/web/LinkDecorator.ts
+++ b/src/view/com/composer/text-input/web/LinkDecorator.ts
@@ -14,7 +14,7 @@
  * the facet-set.
  */
 
-import {URL_REGEX} from '@bsky.app/sdk/richtext'
+import {URL_REGEX} from '@bsky/sdk/richtext'
 import {Mark} from '@tiptap/core'
 import {type Node as ProsemirrorNode} from '@tiptap/pm/model'
 import {Plugin, PluginKey} from '@tiptap/pm/state'
diff --git a/src/view/com/composer/text-input/web/TagDecorator.ts b/src/view/com/composer/text-input/web/TagDecorator.ts
index 34f6396abb..eca041f06b 100644
--- a/src/view/com/composer/text-input/web/TagDecorator.ts
+++ b/src/view/com/composer/text-input/web/TagDecorator.ts
@@ -18,7 +18,7 @@ import {
   CASHTAG_REGEX,
   TAG_REGEX,
   TRAILING_PUNCTUATION_REGEX,
-} from '@bsky.app/sdk/richtext'
+} from '@bsky/sdk/richtext'
 import {Mark} from '@tiptap/core'
 import {type Node as ProsemirrorNode} from '@tiptap/pm/model'
 import {Plugin, PluginKey} from '@tiptap/pm/state'
diff --git a/src/view/com/notifications/NotificationFeedItem.tsx b/src/view/com/notifications/NotificationFeedItem.tsx
index d4d4fe52b3..0d56dfb873 100644
--- a/src/view/com/notifications/NotificationFeedItem.tsx
+++ b/src/view/com/notifications/NotificationFeedItem.tsx
@@ -14,7 +14,7 @@ import {
   moderateProfile,
   type ModerationDecision,
   type ModerationOpts,
-} from '@bsky.app/sdk/moderation'
+} from '@bsky/sdk/moderation'
 import {plural} from '@lingui/core/macro'
 import {Plural, Trans, useLingui} from '@lingui/react/macro'
 import {useNavigation} from '@react-navigation/native'
diff --git a/src/view/com/post-thread/PostQuotes.tsx b/src/view/com/post-thread/PostQuotes.tsx
index 459bbc525e..7bd63d1992 100644
--- a/src/view/com/post-thread/PostQuotes.tsx
+++ b/src/view/com/post-thread/PostQuotes.tsx
@@ -1,5 +1,5 @@
 import {useCallback, useState} from 'react'
-import {moderatePost, type ModerationDecision} from '@bsky.app/sdk/moderation'
+import {moderatePost, type ModerationDecision} from '@bsky/sdk/moderation'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 
diff --git a/src/view/com/post/Post.tsx b/src/view/com/post/Post.tsx
index f9369ce0d4..94398778e8 100644
--- a/src/view/com/post/Post.tsx
+++ b/src/view/com/post/Post.tsx
@@ -1,8 +1,8 @@
 import {useCallback, useMemo, useState} from 'react'
 import {type StyleProp, StyleSheet, View, type ViewStyle} from 'react-native'
 import {AtUri} from '@atproto/syntax'
-import {moderatePost, type ModerationDecision} from '@bsky.app/sdk/moderation'
-import {RichText as RichTextAPI} from '@bsky.app/sdk/richtext'
+import {moderatePost, type ModerationDecision} from '@bsky/sdk/moderation'
+import {RichText as RichTextAPI} from '@bsky/sdk/richtext'
 import {useQueryClient} from '@tanstack/react-query'
 
 import {MAX_POST_LINES} from '#/lib/constants'
diff --git a/src/view/com/posts/PostFeed.tsx b/src/view/com/posts/PostFeed.tsx
index dbda8d0c41..1126ff8a6c 100644
--- a/src/view/com/posts/PostFeed.tsx
+++ b/src/view/com/posts/PostFeed.tsx
@@ -18,7 +18,7 @@ import {
   View,
   type ViewStyle,
 } from 'react-native'
-import {type RichText as RichTextType} from '@bsky.app/sdk/richtext'
+import {type RichText as RichTextType} from '@bsky/sdk/richtext'
 import {useLingui} from '@lingui/react/macro'
 import {useQueryClient} from '@tanstack/react-query'
 
diff --git a/src/view/com/posts/PostFeedItem.tsx b/src/view/com/posts/PostFeedItem.tsx
index cb43274741..c9ed6b603b 100644
--- a/src/view/com/posts/PostFeedItem.tsx
+++ b/src/view/com/posts/PostFeedItem.tsx
@@ -1,8 +1,8 @@
 import {memo, useCallback, useMemo, useState} from 'react'
 import {StyleSheet, View} from 'react-native'
 import {AtUri} from '@atproto/syntax'
-import {type ModerationDecision} from '@bsky.app/sdk/moderation'
-import {RichText as RichTextAPI} from '@bsky.app/sdk/richtext'
+import {type ModerationDecision} from '@bsky/sdk/moderation'
+import {RichText as RichTextAPI} from '@bsky/sdk/richtext'
 import {useQueryClient} from '@tanstack/react-query'
 
 import {type ReasonFeedSource} from '#/lib/api/feed/types'
diff --git a/src/view/com/posts/PostFeedReason.tsx b/src/view/com/posts/PostFeedReason.tsx
index 9e1a043946..54fdbfe465 100644
--- a/src/view/com/posts/PostFeedReason.tsx
+++ b/src/view/com/posts/PostFeedReason.tsx
@@ -1,5 +1,5 @@
 import {StyleSheet, View} from 'react-native'
-import {type ModerationDecision} from '@bsky.app/sdk/moderation'
+import {type ModerationDecision} from '@bsky/sdk/moderation'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
diff --git a/src/view/com/util/PostMeta.tsx b/src/view/com/util/PostMeta.tsx
index 2c83017c96..d750cc408d 100644
--- a/src/view/com/util/PostMeta.tsx
+++ b/src/view/com/util/PostMeta.tsx
@@ -1,6 +1,6 @@
 import {memo, useCallback} from 'react'
 import {type StyleProp, View, type ViewStyle} from 'react-native'
-import {type ModerationDecision} from '@bsky.app/sdk/moderation'
+import {type ModerationDecision} from '@bsky/sdk/moderation'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {useQueryClient} from '@tanstack/react-query'
diff --git a/src/view/com/util/UserAvatar.tsx b/src/view/com/util/UserAvatar.tsx
index 06893524f3..be607d1630 100644
--- a/src/view/com/util/UserAvatar.tsx
+++ b/src/view/com/util/UserAvatar.tsx
@@ -11,7 +11,7 @@ import {
 } from 'react-native'
 import Svg, {Circle, Path, Rect} from 'react-native-svg'
 import {Image as ExpoImage} from 'expo-image'
-import {type ModerationUI} from '@bsky.app/sdk/moderation'
+import {type ModerationUI} from '@bsky/sdk/moderation'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
diff --git a/src/view/com/util/UserBanner.tsx b/src/view/com/util/UserBanner.tsx
index b9d9604d64..5c7cfa4c7c 100644
--- a/src/view/com/util/UserBanner.tsx
+++ b/src/view/com/util/UserBanner.tsx
@@ -1,7 +1,7 @@
 import {useCallback, useState} from 'react'
 import {Pressable, StyleSheet, View} from 'react-native'
 import {Image} from 'expo-image'
-import {type ModerationUI} from '@bsky.app/sdk/moderation'
+import {type ModerationUI} from '@bsky/sdk/moderation'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
diff --git a/src/view/screens/DebugMod.tsx b/src/view/screens/DebugMod.tsx
index 359d61ef85..68eaa95359 100644
--- a/src/view/screens/DebugMod.tsx
+++ b/src/view/screens/DebugMod.tsx
@@ -10,8 +10,8 @@ import {
   type ModerationBehavior,
   type ModerationDecision,
   type ModerationOpts,
-} from '@bsky.app/sdk/moderation'
-import {RichText} from '@bsky.app/sdk/richtext'
+} from '@bsky/sdk/moderation'
+import {RichText} from '@bsky/sdk/richtext'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 
diff --git a/src/view/screens/Profile.tsx b/src/view/screens/Profile.tsx
index 09eafda0f7..d01ef2cb7b 100644
--- a/src/view/screens/Profile.tsx
+++ b/src/view/screens/Profile.tsx
@@ -2,8 +2,8 @@ import {useCallback, useEffect, useMemo, useRef, useState} from 'react'
 import {StyleSheet} from 'react-native'
 import {SafeAreaView} from 'react-native-safe-area-context'
 import {ScrollForwarderView} from 'react-native-scroll-forwarder'
-import {moderateProfile, type ModerationOpts} from '@bsky.app/sdk/moderation'
-import {RichText as RichTextAPI} from '@bsky.app/sdk/richtext'
+import {moderateProfile, type ModerationOpts} from '@bsky/sdk/moderation'
+import {RichText as RichTextAPI} from '@bsky/sdk/richtext'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'

From afb3cdc26fc5e6db6e2442cbedacc71ccc1fd545 Mon Sep 17 00:00:00 2001
From: pfrazee <1270099+pfrazee@users.noreply.github.com>
Date: Fri, 14 Aug 2026 03:00:15 +0000
Subject: [PATCH 30/32] Nightly source-language update

---
 src/locale/locales/en/messages.po | 4040 ++++++++++++++---------------
 1 file changed, 2020 insertions(+), 2020 deletions(-)

diff --git a/src/locale/locales/en/messages.po b/src/locale/locales/en/messages.po
index 9bf8887a63..1c7b7ceff6 100644
--- a/src/locale/locales/en/messages.po
+++ b/src/locale/locales/en/messages.po
@@ -19,37 +19,37 @@ msgid "\"{interestsDisplayName}\" category (active)"
 msgstr ""
 
 #. A reply summary in chat
-#: src/components/dms/MessageItem.tsx:902
+#: src/components/dms/MessageItem.tsx:917
 msgid "(blocked message hidden)"
 msgstr "(blocked message hidden)"
 
 #. A reply summary in chat
-#: src/components/dms/getMessageInfo.ts:123
-#: src/components/dms/replyPreview.ts:85
+#: src/components/dms/getMessageInfo.ts:118
+#: src/components/dms/replyPreview.ts:92
 msgid "(chat invite link)"
 msgstr "(chat invite link)"
 
-#: src/components/dms/getMessageInfo.ts:105
+#: src/components/dms/getMessageInfo.ts:100
 msgid "(contains embedded content)"
 msgstr ""
 
 #. A reply summary in chat
-#: src/components/dms/MessageItem.tsx:916
+#: src/components/dms/MessageItem.tsx:933
 msgid "(deleted message)"
 msgstr "(deleted message)"
 
 #. A reply summary in chat
-#: src/components/dms/replyPreview.ts:68
+#: src/components/dms/replyPreview.ts:70
 msgid "(disabled chat invite link)"
 msgstr "(disabled chat invite link)"
 
 #. A reply summary in chat
-#: src/components/dms/replyPreview.ts:77
+#: src/components/dms/replyPreview.ts:84
 msgid "(invalid chat invite link)"
 msgstr "(invalid chat invite link)"
 
 #. A reply summary in chat
-#: src/components/dms/MessageItem.tsx:910
+#: src/components/dms/MessageItem.tsx:927
 msgid "(message sent before you joined)"
 msgstr "(message sent before you joined)"
 
@@ -58,12 +58,12 @@ msgid "(no email)"
 msgstr ""
 
 #. A reply summary in chat
-#: src/components/dms/replyPreview.ts:107
+#: src/components/dms/replyPreview.ts:114
 msgid "(no text)"
 msgstr "(no text)"
 
 #. A reply summary in chat
-#: src/components/dms/replyPreview.ts:99
+#: src/components/dms/replyPreview.ts:106
 msgid "(quoted post)"
 msgstr "(quoted post)"
 
@@ -88,7 +88,7 @@ msgid "{0, plural, one {# following} other {# following}}"
 msgstr ""
 
 #. placeholder {0}: item.count
-#: src/components/contacts/screens/ViewMatches.tsx:268
+#: src/components/contacts/screens/ViewMatches.tsx:276
 msgid "{0, plural, one {# friend found!} other {# friends found!}}"
 msgstr ""
 
@@ -98,12 +98,12 @@ msgid "{0, plural, one {# hour} other {# hours}}"
 msgstr ""
 
 #. placeholder {0}: labels.length
-#: src/components/moderation/PostAlerts.tsx:157
+#: src/components/moderation/PostAlerts.tsx:153
 msgid "{0, plural, one {# label applied to your post} other {# labels applied to your post}}"
 msgstr "{0, plural, one {# label applied to your post} other {# labels applied to your post}}"
 
 #. placeholder {0}: labels.length
-#: src/components/moderation/PostAlerts.tsx:164
+#: src/components/moderation/PostAlerts.tsx:160
 msgid "{0, plural, one {# label applied} other {# labels applied}}"
 msgstr "{0, plural, one {# label applied} other {# labels applied}}"
 
@@ -135,7 +135,7 @@ msgstr "{0, plural, one {# new join request} other {# new join requests}}"
 
 #. placeholder {0}: reactions.length
 #. placeholder {1}: groupedReactions.map(g => g.value).join(' ')
-#: src/components/dms/MessageItem.tsx:371
+#: src/components/dms/MessageItem.tsx:383
 msgid "{0, plural, one {# person} other {# people}} reacted – {1}"
 msgstr "{0, plural, one {# person} other {# people}} reacted – {1}"
 
@@ -164,7 +164,7 @@ msgstr ""
 
 #. How long it takes to read an article, in minutes. Displayed in a short form, e.g. "5m" for 5 minutes.
 #. placeholder {0}: view.readingTime
-#: src/components/Post/Embed/StandardSiteEmbed/index.tsx:251
+#: src/components/Post/Embed/StandardSiteEmbed/index.tsx:250
 msgid "{0, plural, one {#m} other {#m}}"
 msgstr "{0, plural, one {#m} other {#m}}"
 
@@ -180,13 +180,13 @@ msgid "{0, plural, one {1 more post} other {# more posts}}"
 msgstr ""
 
 #. placeholder {0}: profile.followersCount || 0
-#: src/components/ProfileHoverCard/index.web.tsx:444
+#: src/components/ProfileHoverCard/index.web.tsx:441
 #: src/screens/Profile/Header/Metrics.tsx:22
 msgid "{0, plural, one {follower} other {followers}}"
 msgstr ""
 
 #. placeholder {0}: profile.followsCount || 0
-#: src/components/ProfileHoverCard/index.web.tsx:448
+#: src/components/ProfileHoverCard/index.web.tsx:445
 #: src/screens/Profile/Header/Metrics.tsx:26
 msgid "{0, plural, one {following} other {following}}"
 msgstr ""
@@ -198,12 +198,12 @@ msgstr ""
 
 #. Number of users (always at least 25) who have joined Bluesky using a specific starter pack
 #. placeholder {0}: starterPack.joinedAllTimeCount || 0
-#: src/screens/StarterPack/StarterPackScreen.tsx:504
+#: src/screens/StarterPack/StarterPackScreen.tsx:497
 msgid "{0, plural, other {# people have}} joined Bluesky via this starter pack!"
 msgstr ""
 
 #. placeholder {0}: starterPack.list.listItemCount - 4
-#: src/components/dialogs/StarterPackDialog.tsx:362
+#: src/components/dialogs/StarterPackDialog.tsx:354
 msgid "{0, plural, other {+# more}}"
 msgstr ""
 
@@ -226,13 +226,13 @@ msgstr ""
 
 #. Pattern: {wordValue} in tags
 #. placeholder {0}: word.value
-#: src/components/dialogs/MutedWords.tsx:495
+#: src/components/dialogs/MutedWords.tsx:497
 msgid "{0} <0>in <1>tags</1></0>"
 msgstr ""
 
 #. Pattern: {wordValue} in text, tags
 #. placeholder {0}: word.value
-#: src/components/dialogs/MutedWords.tsx:484
+#: src/components/dialogs/MutedWords.tsx:486
 msgid "{0} <0>in <1>text & tags</1></0>"
 msgstr ""
 
@@ -253,12 +253,12 @@ msgid "{0} following"
 msgstr ""
 
 #. placeholder {0}: sanitizeHandle(profile.handle, '@')
-#: src/components/dms/MessageItem.tsx:724
+#: src/components/dms/MessageItem.tsx:739
 msgid "{0} is blocking you"
 msgstr "{0} is blocking you"
 
 #. placeholder {0}: sanitizeHandle(profile.handle)
-#: src/features/liveNow/components/LiveStatusDialog.tsx:84
+#: src/features/liveNow/components/LiveStatusDialog.tsx:81
 msgid "{0} is live"
 msgstr ""
 
@@ -273,27 +273,27 @@ msgid "{0} is not supported by your device."
 msgstr "{0} is not supported by your device."
 
 #. placeholder {0}: action.displayName
-#: src/components/dms/getSystemMessageInfo.ts:83
+#: src/components/dms/getSystemMessageInfo.ts:88
 msgid "{0} joined"
 msgstr "{0} joined"
 
 #. placeholder {0}: action.displayName
-#: src/components/dms/getSystemMessageInfo.ts:84
+#: src/components/dms/getSystemMessageInfo.ts:89
 msgid "{0} joined the group"
 msgstr "{0} joined the group"
 
 #. placeholder {0}: formatCount(i18n, JOINED_THIS_WEEK)
-#: src/screens/StarterPack/StarterPackLandingScreen.tsx:230
+#: src/screens/StarterPack/StarterPackLandingScreen.tsx:222
 msgid "{0} joined this week"
 msgstr ""
 
 #. placeholder {0}: action.displayName
-#: src/components/dms/getSystemMessageInfo.ts:96
+#: src/components/dms/getSystemMessageInfo.ts:103
 msgid "{0} left"
 msgstr "{0} left"
 
 #. placeholder {0}: action.displayName
-#: src/components/dms/getSystemMessageInfo.ts:97
+#: src/components/dms/getSystemMessageInfo.ts:104
 msgid "{0} left the group"
 msgstr "{0} left the group"
 
@@ -311,7 +311,7 @@ msgstr ""
 
 #. placeholder {0}: createSanitizedDisplayName(memberSender)
 #. placeholder {1}: reaction.value
-#: src/components/dms/MessageItem.tsx:366
+#: src/components/dms/MessageItem.tsx:378
 msgid "{0} reacted {1}"
 msgstr ""
 
@@ -322,22 +322,22 @@ msgid "{0} unread items"
 msgstr "{0} unread items"
 
 #. placeholder {0}: action.displayName
-#: src/components/dms/getSystemMessageInfo.ts:57
+#: src/components/dms/getSystemMessageInfo.ts:58
 msgid "{0} was added"
 msgstr "{0} was added"
 
 #. placeholder {0}: action.displayName
-#: src/components/dms/getSystemMessageInfo.ts:58
+#: src/components/dms/getSystemMessageInfo.ts:59
 msgid "{0} was added to the group"
 msgstr "{0} was added to the group"
 
 #. placeholder {0}: action.displayName
-#: src/components/dms/getSystemMessageInfo.ts:70
+#: src/components/dms/getSystemMessageInfo.ts:73
 msgid "{0} was removed"
 msgstr "{0} was removed"
 
 #. placeholder {0}: action.displayName
-#: src/components/dms/getSystemMessageInfo.ts:71
+#: src/components/dms/getSystemMessageInfo.ts:74
 msgid "{0} was removed from the group"
 msgstr "{0} was removed from the group"
 
@@ -356,13 +356,13 @@ msgstr "{0}, {1} and {memberCount, plural, one {# other} other {# others}} added
 #. placeholder {0}: feed.displayName
 #. placeholder {1}: sanitizeHandle(feed.creatorHandle, '@')
 #. placeholder {2}: feed.likeCount || 0
-#: src/view/com/feeds/FeedSourceCard.tsx:189
+#: src/view/com/feeds/FeedSourceCard.tsx:187
 msgid "{0}, a feed by {1}, liked by {2}"
 msgstr ""
 
 #. placeholder {0}: feed.displayName
 #. placeholder {1}: sanitizeHandle(feed.creatorHandle, '@')
-#: src/view/com/feeds/FeedSourceCard.tsx:192
+#: src/view/com/feeds/FeedSourceCard.tsx:190
 msgid "{0}, a list by {1}"
 msgstr ""
 
@@ -376,7 +376,7 @@ msgstr ""
 #. The number of active group chat members out of the total number allowed.
 #. placeholder {0}: joinLinkPreview.memberCount
 #. placeholder {1}: joinLinkPreview.memberLimit
-#: src/screens/Messages/JoinRequest.tsx:139
+#: src/screens/Messages/JoinRequest.tsx:147
 msgctxt "group-chat-member-count"
 msgid "{0}/{1}"
 msgstr "{0}/{1}"
@@ -389,8 +389,8 @@ msgstr "{0}/{1}"
 #. placeholder {1}: preview.memberLimit
 #. placeholder {2}: joinLinkPreview.memberLimit
 #. placeholder {2}: preview.memberLimit
-#: src/components/dms/ChatInvite/Card.tsx:62
-#: src/components/intents/GroupChatJoinDialog.tsx:341
+#: src/components/dms/ChatInvite/Card.tsx:64
+#: src/components/intents/GroupChatJoinDialog.tsx:346
 msgid "{0}/{1} {2, plural, one {member} other {members}}"
 msgstr "{0}/{1} {2, plural, one {member} other {members}}"
 
@@ -437,7 +437,7 @@ msgstr ""
 msgid "{0}s"
 msgstr ""
 
-#: src/screens/Messages/JoinRequests.tsx:433
+#: src/screens/Messages/JoinRequests.tsx:430
 msgid "{count, plural, =0 {No requests to join} one {# request to join} other {# requests to join}}"
 msgstr "{count, plural, =0 {No requests to join} one {# request to join} other {# requests to join}}"
 
@@ -458,7 +458,7 @@ msgid "{count, plural, one {# unread item} other {# unread items}}"
 msgstr ""
 
 #. Displayed when there are more requests to join a group chat than have been loaded
-#: src/screens/Messages/JoinRequests.tsx:427
+#: src/screens/Messages/JoinRequests.tsx:424
 msgid "{count, plural, other {#+ requests to join}}"
 msgstr "{count, plural, other {#+ requests to join}}"
 
@@ -466,16 +466,16 @@ msgstr "{count, plural, other {#+ requests to join}}"
 msgid "{date} at {time}"
 msgstr "{date} at {time}"
 
-#: src/lib/generate-starterpack.ts:104
-#: src/screens/StarterPack/Wizard/index.tsx:189
+#: src/lib/generate-starterpack.ts:95
+#: src/screens/StarterPack/Wizard/index.tsx:185
 msgid "{displayName}'s Starter Pack"
 msgstr ""
 
-#: src/screens/SignupQueued.tsx:219
+#: src/screens/SignupQueued.tsx:226
 msgid "{estimatedTimeHrs, plural, one {hour} other {hours}}"
 msgstr ""
 
-#: src/screens/SignupQueued.tsx:225
+#: src/screens/SignupQueued.tsx:232
 msgid "{estimatedTimeMins, plural, one {minute} other {minutes}}"
 msgstr ""
 
@@ -483,178 +483,178 @@ msgstr ""
 msgid "{filterCount, plural, one {+# filter} other {+# filters}}"
 msgstr "{filterCount, plural, one {+# filter} other {+# filters}}"
 
-#: src/view/com/notifications/NotificationFeedItem.tsx:367
+#: src/view/com/notifications/NotificationFeedItem.tsx:359
 msgid "{firstAuthorLink} and <0>{additionalAuthorsCount, plural, one {{formattedAuthorsCount} other} other {{formattedAuthorsCount} others}}</0> followed you"
 msgstr ""
 
-#: src/view/com/notifications/NotificationFeedItem.tsx:399
+#: src/view/com/notifications/NotificationFeedItem.tsx:391
 msgid "{firstAuthorLink} and <0>{additionalAuthorsCount, plural, one {{formattedAuthorsCount} other} other {{formattedAuthorsCount} others}}</0> liked your custom feed"
 msgstr ""
 
-#: src/view/com/notifications/NotificationFeedItem.tsx:305
+#: src/view/com/notifications/NotificationFeedItem.tsx:297
 msgid "{firstAuthorLink} and <0>{additionalAuthorsCount, plural, one {{formattedAuthorsCount} other} other {{formattedAuthorsCount} others}}</0> liked your post"
 msgstr ""
 
-#: src/view/com/notifications/NotificationFeedItem.tsx:496
+#: src/view/com/notifications/NotificationFeedItem.tsx:488
 msgid "{firstAuthorLink} and <0>{additionalAuthorsCount, plural, one {{formattedAuthorsCount} other} other {{formattedAuthorsCount} others}}</0> liked your repost"
 msgstr ""
 
-#: src/view/com/notifications/NotificationFeedItem.tsx:471
+#: src/view/com/notifications/NotificationFeedItem.tsx:463
 msgid "{firstAuthorLink} and <0>{additionalAuthorsCount, plural, one {{formattedAuthorsCount} other} other {{formattedAuthorsCount} others}}</0> removed their verifications from your account"
 msgstr ""
 
-#: src/view/com/notifications/NotificationFeedItem.tsx:327
+#: src/view/com/notifications/NotificationFeedItem.tsx:319
 msgid "{firstAuthorLink} and <0>{additionalAuthorsCount, plural, one {{formattedAuthorsCount} other} other {{formattedAuthorsCount} others}}</0> reposted your post"
 msgstr ""
 
-#: src/view/com/notifications/NotificationFeedItem.tsx:518
+#: src/view/com/notifications/NotificationFeedItem.tsx:510
 msgid "{firstAuthorLink} and <0>{additionalAuthorsCount, plural, one {{formattedAuthorsCount} other} other {{formattedAuthorsCount} others}}</0> reposted your repost"
 msgstr ""
 
-#: src/view/com/notifications/NotificationFeedItem.tsx:421
+#: src/view/com/notifications/NotificationFeedItem.tsx:413
 msgid "{firstAuthorLink} and <0>{additionalAuthorsCount, plural, one {{formattedAuthorsCount} other} other {{formattedAuthorsCount} others}}</0> signed up with your starter pack"
 msgstr ""
 
-#: src/view/com/notifications/NotificationFeedItem.tsx:448
+#: src/view/com/notifications/NotificationFeedItem.tsx:440
 msgid "{firstAuthorLink} and <0>{additionalAuthorsCount, plural, one {{formattedAuthorsCount} other} other {{formattedAuthorsCount} others}}</0> verified you"
 msgstr ""
 
-#: src/view/com/notifications/NotificationFeedItem.tsx:379
+#: src/view/com/notifications/NotificationFeedItem.tsx:371
 msgid "{firstAuthorLink} followed you"
 msgstr ""
 
-#: src/view/com/notifications/NotificationFeedItem.tsx:351
+#: src/view/com/notifications/NotificationFeedItem.tsx:343
 msgid "{firstAuthorLink} followed you back"
 msgstr ""
 
-#: src/view/com/notifications/NotificationFeedItem.tsx:411
+#: src/view/com/notifications/NotificationFeedItem.tsx:403
 msgid "{firstAuthorLink} liked your custom feed"
 msgstr ""
 
-#: src/view/com/notifications/NotificationFeedItem.tsx:317
+#: src/view/com/notifications/NotificationFeedItem.tsx:309
 msgid "{firstAuthorLink} liked your post"
 msgstr ""
 
-#: src/view/com/notifications/NotificationFeedItem.tsx:508
+#: src/view/com/notifications/NotificationFeedItem.tsx:500
 msgid "{firstAuthorLink} liked your repost"
 msgstr ""
 
-#: src/view/com/notifications/NotificationFeedItem.tsx:483
+#: src/view/com/notifications/NotificationFeedItem.tsx:475
 msgid "{firstAuthorLink} removed their verification from your account"
 msgstr ""
 
-#: src/view/com/notifications/NotificationFeedItem.tsx:339
+#: src/view/com/notifications/NotificationFeedItem.tsx:331
 msgid "{firstAuthorLink} reposted your post"
 msgstr ""
 
-#: src/view/com/notifications/NotificationFeedItem.tsx:530
+#: src/view/com/notifications/NotificationFeedItem.tsx:522
 msgid "{firstAuthorLink} reposted your repost"
 msgstr ""
 
-#: src/view/com/notifications/NotificationFeedItem.tsx:433
+#: src/view/com/notifications/NotificationFeedItem.tsx:425
 msgid "{firstAuthorLink} signed up with your starter pack"
 msgstr ""
 
-#: src/view/com/notifications/NotificationFeedItem.tsx:460
+#: src/view/com/notifications/NotificationFeedItem.tsx:452
 msgid "{firstAuthorLink} verified you"
 msgstr ""
 
-#: src/view/com/notifications/NotificationFeedItem.tsx:361
+#: src/view/com/notifications/NotificationFeedItem.tsx:353
 msgid "{firstAuthorName} and {additionalAuthorsCount, plural, one {{formattedAuthorsCount} other} other {{formattedAuthorsCount} others}} followed you"
 msgstr ""
 
-#: src/view/com/notifications/NotificationFeedItem.tsx:355
+#: src/view/com/notifications/NotificationFeedItem.tsx:347
 msgid "{firstAuthorName} and {additionalAuthorsCount, plural, one {{formattedAuthorsCount} other} other {{formattedAuthorsCount} others}} followed you via starter pack {starterPackName}"
 msgstr "{firstAuthorName} and {additionalAuthorsCount, plural, one {{formattedAuthorsCount} other} other {{formattedAuthorsCount} others}} followed you via starter pack {starterPackName}"
 
-#: src/view/com/notifications/NotificationFeedItem.tsx:393
+#: src/view/com/notifications/NotificationFeedItem.tsx:385
 msgid "{firstAuthorName} and {additionalAuthorsCount, plural, one {{formattedAuthorsCount} other} other {{formattedAuthorsCount} others}} liked your custom feed"
 msgstr ""
 
-#: src/view/com/notifications/NotificationFeedItem.tsx:299
+#: src/view/com/notifications/NotificationFeedItem.tsx:291
 msgid "{firstAuthorName} and {additionalAuthorsCount, plural, one {{formattedAuthorsCount} other} other {{formattedAuthorsCount} others}} liked your post"
 msgstr ""
 
-#: src/view/com/notifications/NotificationFeedItem.tsx:490
+#: src/view/com/notifications/NotificationFeedItem.tsx:482
 msgid "{firstAuthorName} and {additionalAuthorsCount, plural, one {{formattedAuthorsCount} other} other {{formattedAuthorsCount} others}} liked your repost"
 msgstr ""
 
-#: src/view/com/notifications/NotificationFeedItem.tsx:465
+#: src/view/com/notifications/NotificationFeedItem.tsx:457
 msgid "{firstAuthorName} and {additionalAuthorsCount, plural, one {{formattedAuthorsCount} other} other {{formattedAuthorsCount} others}} removed their verifications from your account"
 msgstr ""
 
-#: src/view/com/notifications/NotificationFeedItem.tsx:321
+#: src/view/com/notifications/NotificationFeedItem.tsx:313
 msgid "{firstAuthorName} and {additionalAuthorsCount, plural, one {{formattedAuthorsCount} other} other {{formattedAuthorsCount} others}} reposted your post"
 msgstr ""
 
-#: src/view/com/notifications/NotificationFeedItem.tsx:512
+#: src/view/com/notifications/NotificationFeedItem.tsx:504
 msgid "{firstAuthorName} and {additionalAuthorsCount, plural, one {{formattedAuthorsCount} other} other {{formattedAuthorsCount} others}} reposted your repost"
 msgstr ""
 
-#: src/view/com/notifications/NotificationFeedItem.tsx:415
+#: src/view/com/notifications/NotificationFeedItem.tsx:407
 msgid "{firstAuthorName} and {additionalAuthorsCount, plural, one {{formattedAuthorsCount} other} other {{formattedAuthorsCount} others}} signed up with your starter pack"
 msgstr ""
 
-#: src/view/com/notifications/NotificationFeedItem.tsx:442
+#: src/view/com/notifications/NotificationFeedItem.tsx:434
 msgid "{firstAuthorName} and {additionalAuthorsCount, plural, one {{formattedAuthorsCount} other} other {{formattedAuthorsCount} others}} verified you"
 msgstr ""
 
-#: src/view/com/notifications/NotificationFeedItem.tsx:365
+#: src/view/com/notifications/NotificationFeedItem.tsx:357
 msgid "{firstAuthorName} followed you"
 msgstr ""
 
-#: src/view/com/notifications/NotificationFeedItem.tsx:350
+#: src/view/com/notifications/NotificationFeedItem.tsx:342
 msgid "{firstAuthorName} followed you back"
 msgstr ""
 
-#: src/view/com/notifications/NotificationFeedItem.tsx:349
+#: src/view/com/notifications/NotificationFeedItem.tsx:341
 msgid "{firstAuthorName} followed you back via starter pack {starterPackName}"
 msgstr "{firstAuthorName} followed you back via starter pack {starterPackName}"
 
-#: src/view/com/notifications/NotificationFeedItem.tsx:359
+#: src/view/com/notifications/NotificationFeedItem.tsx:351
 msgid "{firstAuthorName} followed you via starter pack {starterPackName}"
 msgstr "{firstAuthorName} followed you via starter pack {starterPackName}"
 
-#: src/view/com/notifications/NotificationFeedItem.tsx:397
+#: src/view/com/notifications/NotificationFeedItem.tsx:389
 msgid "{firstAuthorName} liked your custom feed"
 msgstr ""
 
-#: src/view/com/notifications/NotificationFeedItem.tsx:303
+#: src/view/com/notifications/NotificationFeedItem.tsx:295
 msgid "{firstAuthorName} liked your post"
 msgstr ""
 
-#: src/view/com/notifications/NotificationFeedItem.tsx:494
+#: src/view/com/notifications/NotificationFeedItem.tsx:486
 msgid "{firstAuthorName} liked your repost"
 msgstr ""
 
-#: src/view/com/notifications/NotificationFeedItem.tsx:469
+#: src/view/com/notifications/NotificationFeedItem.tsx:461
 msgid "{firstAuthorName} removed their verification from your account"
 msgstr ""
 
-#: src/view/com/notifications/NotificationFeedItem.tsx:325
+#: src/view/com/notifications/NotificationFeedItem.tsx:317
 msgid "{firstAuthorName} reposted your post"
 msgstr ""
 
-#: src/view/com/notifications/NotificationFeedItem.tsx:516
+#: src/view/com/notifications/NotificationFeedItem.tsx:508
 msgid "{firstAuthorName} reposted your repost"
 msgstr ""
 
-#: src/view/com/notifications/NotificationFeedItem.tsx:419
+#: src/view/com/notifications/NotificationFeedItem.tsx:411
 msgid "{firstAuthorName} signed up with your starter pack"
 msgstr ""
 
-#: src/view/com/notifications/NotificationFeedItem.tsx:446
+#: src/view/com/notifications/NotificationFeedItem.tsx:438
 msgid "{firstAuthorName} verified you"
 msgstr ""
 
-#: src/components/ProfileHoverCard/index.web.tsx:572
+#: src/components/ProfileHoverCard/index.web.tsx:569
 msgid "{following} following"
 msgstr ""
 
 #. '{postCount} {posts}', e.g., '1.2K posts'
 #. '{postCount} {posts}', e.g., '1.2K posts'
-#: src/components/interstitials/FeedTrendingTopics.tsx:245
-#: src/screens/Search/modules/ExploreTrendingTopics.tsx:192
+#: src/components/interstitials/FeedTrendingTopics.tsx:246
+#: src/screens/Search/modules/ExploreTrendingTopics.tsx:190
 msgid "{formattedPostCount} {postCount, plural, one {post} other {posts}}"
 msgstr "{formattedPostCount} {postCount, plural, one {post} other {posts}}"
 
@@ -696,7 +696,7 @@ msgid "{JOIN_REQUESTS_THRESHOLD}+ new join requests"
 msgstr "{JOIN_REQUESTS_THRESHOLD}+ new join requests"
 
 #. Number of users (always at least 50) who have joined Bluesky using a specific starter pack
-#: src/components/StarterPack/StarterPackCard.tsx:102
+#: src/components/StarterPack/StarterPackCard.tsx:98
 msgid "{joinedAllTimeCount, plural, other {# users have}} joined!"
 msgstr ""
 
@@ -712,7 +712,7 @@ msgstr "{MAX_DESCRIPTION, plural, other {Description is too long. The maximum nu
 msgid "{MAX_DISPLAY_NAME, plural, other {Display name is too long. The maximum number of characters is #.}}"
 msgstr "{MAX_DISPLAY_NAME, plural, other {Display name is too long. The maximum number of characters is #.}}"
 
-#: src/components/PostControls/PostMenu/PostMenuItems.tsx:395
+#: src/components/PostControls/PostMenu/PostMenuItems.tsx:391
 msgid "{MAX_HIDDEN_REPLIES, plural, other {You can hide a maximum of # replies.}}"
 msgstr ""
 
@@ -726,12 +726,12 @@ msgid "{minutes, plural, one {# minute} other {# minutes}}"
 msgstr ""
 
 #. placeholder {0}: reaction.value
-#: src/components/dms/getReactionInfo.ts:65
+#: src/components/dms/getReactionInfo.ts:70
 msgid "{name} reacted {0} to {target}"
 msgstr "{name} reacted {0} to {target}"
 
 #. When the last message in a group chat came from someone other than you.
-#: src/components/dms/getMessageInfo.ts:89
+#: src/components/dms/getMessageInfo.ts:84
 msgid "{name}: {message}"
 msgstr "{name}: {message}"
 
@@ -747,22 +747,22 @@ msgstr "{name}'s starter pack"
 msgid "{notificationCount, plural, one {# unread item} other {# unread items}}"
 msgstr ""
 
-#: src/screens/Settings/FindContactsSettings.tsx:457
+#: src/screens/Settings/FindContactsSettings.tsx:461
 msgid "{numMatches, plural, one {# contact found} other {# contacts found}}"
 msgstr ""
 
-#: src/components/NewskieDialog.tsx:115
+#: src/components/NewskieDialog.tsx:116
 msgid "{profileName} joined Bluesky {timeAgoString} ago"
 msgstr ""
 
-#: src/components/NewskieDialog.tsx:112
+#: src/components/NewskieDialog.tsx:113
 msgid "{profileName} joined Bluesky using a starter pack {timeAgoString} ago"
 msgstr ""
 
 #. The trending topic rank, i.e. "1. March Madness", "2. The Bachelor"
 #. The trending topic rank, i.e. "1. March Madness", "2. The Bachelor"
-#: src/components/interstitials/FeedTrendingTopics.tsx:230
-#: src/screens/Search/modules/ExploreTrendingTopics.tsx:167
+#: src/components/interstitials/FeedTrendingTopics.tsx:231
+#: src/screens/Search/modules/ExploreTrendingTopics.tsx:165
 msgid "{rank}."
 msgstr ""
 
@@ -770,15 +770,15 @@ msgstr ""
 msgid "{remaining, plural, one {# character remaining} other {# characters remaining}}"
 msgstr "{remaining, plural, one {# character remaining} other {# characters remaining}}"
 
-#: src/components/dms/MessageItem.tsx:811
+#: src/components/dms/MessageItem.tsx:826
 msgid "{replierDisplayName} replied"
 msgstr "{replierDisplayName} replied"
 
-#: src/components/dms/MessageItem.tsx:810
+#: src/components/dms/MessageItem.tsx:825
 msgid "{replierDisplayName} replied to {originalName}"
 msgstr "{replierDisplayName} replied to {originalName}"
 
-#: src/components/dms/MessageItem.tsx:808
+#: src/components/dms/MessageItem.tsx:823
 msgid "{replierDisplayName} replied to you"
 msgstr "{replierDisplayName} replied to you"
 
@@ -808,20 +808,20 @@ msgstr ""
 #. Number of images beyond the first 3
 #. placeholder {0}: labels.length
 #. placeholder {0}: totalNumber - 3
-#: src/components/moderation/PostAlerts.tsx:163
-#: src/view/com/composer/ComposerReplyTo.tsx:278
+#: src/components/moderation/PostAlerts.tsx:159
+#: src/view/com/composer/ComposerReplyTo.tsx:273
 msgid "+{0}"
 msgstr "+{0}"
 
 #. Indicates the number of additional profiles are in the Starter Pack e.g. +12
-#: src/screens/Search/components/StarterPackCard.tsx:258
+#: src/screens/Search/components/StarterPackCard.tsx:250
 msgid "+{computedTotal}"
 msgstr ""
 
 #. placeholder {0}: getName(items[0])
 #. placeholder {1}: getName(items[1])
 #. placeholder {2}: items.length - 2
-#: src/screens/StarterPack/Wizard/index.tsx:569
+#: src/screens/StarterPack/Wizard/index.tsx:565
 msgctxt "feeds"
 msgid "<0>{0}, </0><1>{1}, </1>and {2, plural, one {# other} other {# others}} are included in your starter pack"
 msgstr ""
@@ -829,7 +829,7 @@ msgstr ""
 #. placeholder {0}: getName(items[1] /* [0] is self, skip it */)
 #. placeholder {1}: getName(items[2])
 #. placeholder {2}: items.length - 2
-#: src/screens/StarterPack/Wizard/index.tsx:516
+#: src/screens/StarterPack/Wizard/index.tsx:512
 msgctxt "profiles"
 msgid "<0>{0}, </0><1>{1}, </1>and {2, plural, one {# other} other {# others}} are included in your starter pack"
 msgstr ""
@@ -869,25 +869,25 @@ msgstr ""
 
 #. Like count display, the <0> tags enclose the number of likes in bold (will never be 0)
 #. placeholder {0}: formatPostStatCount(likeCount)
-#: src/screens/PostThread/components/LikesStat.tsx:44
+#: src/screens/PostThread/components/LikesStat.tsx:46
 msgid "<0>{0}</0> {likeCount, plural, one {like} other {likes}}"
 msgstr "<0>{0}</0> {likeCount, plural, one {like} other {likes}}"
 
 #. placeholder {0}: getName(items[0])
 #. placeholder {1}: getName(items[1] /* [0] is self, skip it */)
 #. placeholder {1}: getName(items[1])
-#: src/screens/StarterPack/Wizard/index.tsx:503
-#: src/screens/StarterPack/Wizard/index.tsx:557
+#: src/screens/StarterPack/Wizard/index.tsx:499
+#: src/screens/StarterPack/Wizard/index.tsx:553
 msgid "<0>{0}</0> and<1> </1><2>{1} </2>are included in your starter pack"
 msgstr ""
 
 #. placeholder {0}: getName(items[0])
-#: src/screens/StarterPack/Wizard/index.tsx:550
+#: src/screens/StarterPack/Wizard/index.tsx:546
 msgid "<0>{0}</0> is included in your starter pack"
 msgstr ""
 
 #. placeholder {0}: list.name
-#: src/components/WhoCanReply.tsx:353
+#: src/components/WhoCanReply.tsx:346
 msgid "<0>{0}</0> members"
 msgstr ""
 
@@ -896,7 +896,7 @@ msgstr ""
 msgid "<0>{displayName}</0><1/><2> added you</2>"
 msgstr "<0>{displayName}</0><1/><2> added you</2>"
 
-#: src/screens/Hashtag.tsx:230
+#: src/screens/Hashtag.tsx:232
 #: src/screens/Search/SearchResults.tsx:412
 msgid "<0>Sign in</0><1> or </1><2>create an account</2><3> </3><4>to search for news, sports, politics, and everything else happening on Bluesky.</4>"
 msgstr ""
@@ -906,7 +906,7 @@ msgid "<0>Tap here to update your location with GPS.</0>"
 msgstr "<0>Tap here to update your location with GPS.</0>"
 
 #. placeholder {0}: getName(items[1] /* [0] is self, skip it */)
-#: src/screens/StarterPack/Wizard/index.tsx:494
+#: src/screens/StarterPack/Wizard/index.tsx:490
 msgid "<0>You</0> and<1> </1><2>{0} </2>are included in your starter pack"
 msgstr ""
 
@@ -915,25 +915,25 @@ msgstr ""
 msgid "⚠Invalid Handle"
 msgstr ""
 
-#: src/components/dialogs/MutedWords.tsx:202
-#: src/components/dialogs/MutedWords.tsx:551
-#: src/components/dialogs/MutedWords.tsx:554
+#: src/components/dialogs/MutedWords.tsx:204
+#: src/components/dialogs/MutedWords.tsx:553
+#: src/components/dialogs/MutedWords.tsx:556
 msgid "24 hours"
 msgstr ""
 
-#: src/screens/Login/LoginForm.tsx:436
+#: src/screens/Login/LoginForm.tsx:437
 msgid "2FA Confirmation"
 msgstr ""
 
-#: src/components/dialogs/MutedWords.tsx:241
-#: src/components/dialogs/MutedWords.tsx:565
-#: src/components/dialogs/MutedWords.tsx:568
+#: src/components/dialogs/MutedWords.tsx:243
+#: src/components/dialogs/MutedWords.tsx:567
+#: src/components/dialogs/MutedWords.tsx:570
 msgid "30 days"
 msgstr ""
 
-#: src/components/dialogs/MutedWords.tsx:226
-#: src/components/dialogs/MutedWords.tsx:558
-#: src/components/dialogs/MutedWords.tsx:561
+#: src/components/dialogs/MutedWords.tsx:228
+#: src/components/dialogs/MutedWords.tsx:560
+#: src/components/dialogs/MutedWords.tsx:563
 msgid "7 days"
 msgstr ""
 
@@ -942,29 +942,29 @@ msgid "A collection of popular feeds you can find on Bluesky, including News, Bo
 msgstr ""
 
 #. If last message does not contain text, fall back to "{user} reacted to {a message}"
-#: src/components/dms/getReactionInfo.ts:53
+#: src/components/dms/getReactionInfo.ts:58
 msgid "a message"
 msgstr ""
 
-#: src/components/contacts/screens/PhoneInput.tsx:102
+#: src/components/contacts/screens/PhoneInput.tsx:103
 msgid "A network error occurred. Please check your internet connection"
 msgstr ""
 
-#: src/components/contacts/screens/VerifyNumber.tsx:99
-#: src/components/contacts/screens/VerifyNumber.tsx:155
-#: src/components/dms/dialogs/NewChatDialog.tsx:56
-#: src/components/dms/dialogs/NewChatDialog.tsx:94
-#: src/components/dms/dialogs/ShareViaChatDialog.tsx:71
-#: src/components/dms/dialogs/ShareViaChatDialog.tsx:110
-#: src/components/dms/LeaveConvoPrompt.tsx:38
-#: src/components/moderation/BlockDialog.tsx:284
+#: src/components/contacts/screens/VerifyNumber.tsx:100
+#: src/components/contacts/screens/VerifyNumber.tsx:159
+#: src/components/dms/dialogs/NewChatDialog.tsx:54
+#: src/components/dms/dialogs/NewChatDialog.tsx:89
+#: src/components/dms/dialogs/ShareViaChatDialog.tsx:69
+#: src/components/dms/dialogs/ShareViaChatDialog.tsx:105
+#: src/components/dms/LeaveConvoPrompt.tsx:39
+#: src/components/moderation/BlockDialog.tsx:281
 #: src/components/moderation/BlockDialog.tsx:310
-#: src/screens/Messages/JoinRequests.tsx:192
-#: src/screens/Messages/JoinRequests.tsx:225
+#: src/screens/Messages/JoinRequests.tsx:189
+#: src/screens/Messages/JoinRequests.tsx:221
 msgid "A network error occurred. Please check your internet connection."
 msgstr ""
 
-#: src/components/contacts/screens/VerifyNumber.tsx:143
+#: src/components/contacts/screens/VerifyNumber.tsx:147
 msgid "A new code has been sent"
 msgstr ""
 
@@ -972,7 +972,7 @@ msgstr ""
 msgid "A new form of verification"
 msgstr ""
 
-#: src/components/dms/MessageItem.tsx:821
+#: src/components/dms/MessageItem.tsx:836
 msgid "A reply to a message sent before you joined"
 msgstr "A reply to a message sent before you joined"
 
@@ -995,19 +995,19 @@ msgstr ""
 msgid "A screenshot of the post composer with a new button next to the post button that says \"Drafts\", with a rainbow firework effect. Below, the text in the composer reads \"Hey, did you hear the news? Bluesky has drafts now!!!\"."
 msgstr ""
 
-#: src/components/dms/dialogs/NewChatDialog.tsx:109
-#: src/components/dms/dialogs/ShareViaChatDialog.tsx:125
+#: src/components/dms/dialogs/NewChatDialog.tsx:102
+#: src/components/dms/dialogs/ShareViaChatDialog.tsx:118
 msgid "A selected recipient is not followed by the sender."
 msgstr "A selected recipient is not followed by the sender."
 
 #: src/Navigation.tsx:483
 #: src/screens/Settings/AboutSettings.tsx:85
-#: src/screens/Settings/Settings.tsx:265
-#: src/screens/Settings/Settings.tsx:268
+#: src/screens/Settings/Settings.tsx:267
+#: src/screens/Settings/Settings.tsx:270
 msgid "About"
 msgstr ""
 
-#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:100
+#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:101
 msgid "Abusive or discriminatory behavior"
 msgstr ""
 
@@ -1017,7 +1017,7 @@ msgid "Accept"
 msgstr ""
 
 #. Accept a request to join a chat
-#: src/screens/Messages/JoinRequests.tsx:464
+#: src/screens/Messages/JoinRequests.tsx:461
 msgctxt "button"
 msgid "Accept"
 msgstr "Accept"
@@ -1026,7 +1026,7 @@ msgstr "Accept"
 msgid "Accept chat request"
 msgstr ""
 
-#: src/screens/Messages/JoinRequests.tsx:458
+#: src/screens/Messages/JoinRequests.tsx:455
 msgid "Accept join request"
 msgstr "Accept join request"
 
@@ -1039,13 +1039,13 @@ msgstr ""
 msgid "Accept this language suggestion"
 msgstr ""
 
-#: src/components/intents/GroupChatJoinDialog.tsx:119
+#: src/components/intents/GroupChatJoinDialog.tsx:117
 msgid "Access requested! The group owner will review your request."
 msgstr "Access requested! The group owner will review your request."
 
 #: src/screens/Settings/AccessibilitySettings.tsx:45
-#: src/screens/Settings/Settings.tsx:235
-#: src/screens/Settings/Settings.tsx:238
+#: src/screens/Settings/Settings.tsx:237
+#: src/screens/Settings/Settings.tsx:240
 msgid "Accessibility"
 msgstr ""
 
@@ -1055,12 +1055,12 @@ msgstr ""
 
 #: src/Navigation.tsx:406
 #: src/screens/Settings/AccountSettings.tsx:54
-#: src/screens/Settings/Settings.tsx:175
-#: src/screens/Settings/Settings.tsx:178
+#: src/screens/Settings/Settings.tsx:177
+#: src/screens/Settings/Settings.tsx:180
 msgid "Account"
 msgstr ""
 
-#: src/components/PostControls/PostMenu/PostMenuItems.tsx:427
+#: src/components/PostControls/PostMenu/PostMenuItems.tsx:423
 #: src/screens/Messages/components/RequestButtons.tsx:104
 #: src/screens/Messages/ConversationSettings/MemberMenu.tsx:122
 #: src/view/com/profile/ProfileMenu.tsx:223
@@ -1073,22 +1073,22 @@ msgctxt "toast"
 msgid "Account followed"
 msgstr ""
 
-#: src/lib/strings/errors.ts:33
+#: src/lib/strings/errors.ts:68
 msgid "Account has been suspended"
 msgstr ""
 
-#: src/lib/strings/errors.ts:36
+#: src/lib/strings/errors.ts:71
 msgid "Account is deactivated"
 msgstr ""
 
-#: src/components/PostControls/PostMenu/PostMenuItems.tsx:470
+#: src/components/PostControls/PostMenu/PostMenuItems.tsx:466
 #: src/view/com/profile/ProfileMenu.tsx:159
 msgctxt "toast"
 msgid "Account muted"
 msgstr ""
 
 #: src/components/moderation/ModerationDetailsDialog.tsx:123
-#: src/lib/moderation/useModerationCauseDescription.ts:99
+#: src/lib/moderation/useModerationCauseDescription.ts:96
 msgid "Account Muted"
 msgstr ""
 
@@ -1096,11 +1096,11 @@ msgstr ""
 msgid "Account Muted by List"
 msgstr ""
 
-#: src/screens/Settings/Settings.tsx:656
+#: src/screens/Settings/Settings.tsx:658
 msgid "Account options"
 msgstr ""
 
-#: src/screens/Settings/Settings.tsx:691
+#: src/screens/Settings/Settings.tsx:693
 msgid "Account removed from quick access"
 msgstr ""
 
@@ -1117,7 +1117,7 @@ msgctxt "toast"
 msgid "Account unfollowed"
 msgstr ""
 
-#: src/components/PostControls/PostMenu/PostMenuItems.tsx:450
+#: src/components/PostControls/PostMenu/PostMenuItems.tsx:446
 #: src/view/com/profile/ProfileMenu.tsx:146
 msgctxt "toast"
 msgid "Account unmuted"
@@ -1137,22 +1137,22 @@ msgstr ""
 msgid "Activity notifications"
 msgstr "Activity notifications"
 
-#: src/components/dialogs/lists/ListAddRemoveUsersDialog.tsx:191
+#: src/components/dialogs/lists/ListAddRemoveUsersDialog.tsx:192
 #: src/components/dialogs/lists/UserAddRemoveListsDialog.tsx:319
 #: src/components/dialogs/lists/UserAddRemoveListsDialog.tsx:326
-#: src/components/dialogs/MutedWords.tsx:337
-#: src/components/dialogs/StarterPackDialog.tsx:376
-#: src/components/dialogs/StarterPackDialog.tsx:388
+#: src/components/dialogs/MutedWords.tsx:339
+#: src/components/dialogs/StarterPackDialog.tsx:368
+#: src/components/dialogs/StarterPackDialog.tsx:380
 #: src/components/dms/AddMembersFlow.tsx:410
 msgid "Add"
 msgstr ""
 
 #. placeholder {0}: 8 - items.length
-#: src/screens/StarterPack/Wizard/index.tsx:605
+#: src/screens/StarterPack/Wizard/index.tsx:601
 msgid "Add {0} more to continue"
 msgstr ""
 
-#: src/components/StarterPack/Wizard/WizardListCard.tsx:63
+#: src/components/StarterPack/Wizard/WizardListCard.tsx:62
 msgid "Add {displayName} to starter pack"
 msgstr ""
 
@@ -1171,7 +1171,7 @@ msgid "Add a user to this list"
 msgstr ""
 
 #: src/components/dialogs/SwitchAccount.tsx:56
-#: src/screens/Deactivated.tsx:184
+#: src/screens/Deactivated.tsx:189
 msgid "Add account"
 msgstr ""
 
@@ -1189,18 +1189,18 @@ msgstr ""
 msgid "Add alt text (optional)"
 msgstr ""
 
-#: src/screens/Settings/Settings.tsx:594
-#: src/screens/Settings/Settings.tsx:597
+#: src/screens/Settings/Settings.tsx:596
+#: src/screens/Settings/Settings.tsx:599
 #: src/view/shell/desktop/LeftNav.tsx:276
 #: src/view/shell/desktop/LeftNav.tsx:279
 msgid "Add another account"
 msgstr ""
 
-#: src/view/com/composer/Composer.tsx:1635
+#: src/view/com/composer/Composer.tsx:1659
 msgid "Add another post"
 msgstr ""
 
-#: src/view/com/composer/Composer.tsx:2304
+#: src/view/com/composer/Composer.tsx:2328
 msgid "Add another post to thread"
 msgstr ""
 
@@ -1218,7 +1218,7 @@ msgstr ""
 msgid "Add App Password"
 msgstr ""
 
-#: src/screens/Settings/AutomationLabelSettings.tsx:170
+#: src/screens/Settings/AutomationLabelSettings.tsx:169
 msgid "Add automation label to account"
 msgstr "Add automation label to account"
 
@@ -1249,8 +1249,8 @@ msgstr ""
 msgid "Add members"
 msgstr "Add members"
 
-#: src/components/moderation/ReportDialog/index.tsx:605
-#: src/components/moderation/ReportDialog/index.tsx:609
+#: src/components/moderation/ReportDialog/index.tsx:606
+#: src/components/moderation/ReportDialog/index.tsx:610
 msgid "Add more details (optional)"
 msgstr ""
 
@@ -1259,11 +1259,11 @@ msgstr ""
 msgid "Add more languages…"
 msgstr "Add more languages…"
 
-#: src/components/dialogs/MutedWords.tsx:330
+#: src/components/dialogs/MutedWords.tsx:332
 msgid "Add mute word with chosen settings"
 msgstr ""
 
-#: src/components/dialogs/MutedWords.tsx:120
+#: src/components/dialogs/MutedWords.tsx:122
 msgid "Add muted words and tags"
 msgstr ""
 
@@ -1274,7 +1274,7 @@ msgstr ""
 msgid "Add people"
 msgstr ""
 
-#: src/components/dialogs/lists/ListAddRemoveUsersDialog.tsx:81
+#: src/components/dialogs/lists/ListAddRemoveUsersDialog.tsx:82
 msgid "Add people to list"
 msgstr ""
 
@@ -1290,7 +1290,7 @@ msgstr ""
 msgid "Add recommended feeds"
 msgstr ""
 
-#: src/screens/StarterPack/Wizard/index.tsx:538
+#: src/screens/StarterPack/Wizard/index.tsx:534
 msgid "Add some feeds to your starter pack!"
 msgstr ""
 
@@ -1302,7 +1302,7 @@ msgstr ""
 msgid "Add the following DNS record to your domain:"
 msgstr ""
 
-#: src/components/FeedCard.tsx:338
+#: src/components/FeedCard.tsx:335
 msgid "Add this feed to your feeds"
 msgstr ""
 
@@ -1315,13 +1315,13 @@ msgstr ""
 msgid "Add to saved posts"
 msgstr ""
 
-#: src/components/dialogs/StarterPackDialog.tsx:184
+#: src/components/dialogs/StarterPackDialog.tsx:181
 #: src/view/com/profile/ProfileMenu.tsx:384
 #: src/view/com/profile/ProfileMenu.tsx:387
 msgid "Add to starter packs"
 msgstr ""
 
-#: src/components/dialogs/lists/ListAddRemoveUsersDialog.tsx:178
+#: src/components/dialogs/lists/ListAddRemoveUsersDialog.tsx:179
 msgid "Add user to list"
 msgstr ""
 
@@ -1338,25 +1338,25 @@ msgstr "Added by {0}"
 msgid "Added by invite link"
 msgstr "Added by invite link"
 
-#: src/components/dialogs/lists/ListAddRemoveUsersDialog.tsx:125
+#: src/components/dialogs/lists/ListAddRemoveUsersDialog.tsx:126
 #: src/components/dialogs/lists/UserAddRemoveListsDialog.tsx:221
 msgid "Added to list"
 msgstr ""
 
-#: src/components/dialogs/StarterPackDialog.tsx:274
+#: src/components/dialogs/StarterPackDialog.tsx:271
 msgid "Added to starter pack"
 msgstr ""
 
-#: src/components/dialogs/lists/CreateListFromStarterPackDialog.tsx:225
-#: src/components/dialogs/lists/CreateListFromStarterPackDialog.tsx:230
+#: src/components/dialogs/lists/CreateListFromStarterPackDialog.tsx:224
+#: src/components/dialogs/lists/CreateListFromStarterPackDialog.tsx:229
 msgid "Adding members to list..."
 msgstr ""
 
-#: src/components/ageAssurance/AgeAssuranceAppealDialog.tsx:116
+#: src/components/ageAssurance/AgeAssuranceAppealDialog.tsx:118
 msgid "Additional details (limit 1000 characters)"
 msgstr ""
 
-#: src/components/moderation/ReportDialog/index.tsx:623
+#: src/components/moderation/ReportDialog/index.tsx:624
 msgid "Additional details (limit 300 characters)"
 msgstr ""
 
@@ -1369,13 +1369,13 @@ msgstr "Admin"
 msgid "Adult"
 msgstr ""
 
-#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:66
+#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:67
 msgid "Adult content"
 msgstr ""
 
 #: src/components/moderation/ContentHider.tsx:129
 #: src/lib/moderation/useGlobalLabelStrings.ts:34
-#: src/lib/moderation/useModerationCauseDescription.ts:149
+#: src/lib/moderation/useModerationCauseDescription.ts:146
 #: src/view/com/composer/labels/LabelsBtn.tsx:123
 msgid "Adult Content"
 msgstr ""
@@ -1393,7 +1393,7 @@ msgstr ""
 msgid "Adult Content labels"
 msgstr ""
 
-#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:76
+#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:77
 msgid "Adult sexual abuse content"
 msgstr ""
 
@@ -1405,11 +1405,11 @@ msgstr ""
 msgid "Age Assurance"
 msgstr ""
 
-#: src/components/ageAssurance/AgeAssuranceAppealDialog.tsx:72
+#: src/components/ageAssurance/AgeAssuranceAppealDialog.tsx:74
 msgid "Age assurance inquiry failed to send, please try again."
 msgstr ""
 
-#: src/components/ageAssurance/AgeAssuranceAppealDialog.tsx:82
+#: src/components/ageAssurance/AgeAssuranceAppealDialog.tsx:84
 msgctxt "toast"
 msgid "Age assurance inquiry was submitted"
 msgstr ""
@@ -1428,7 +1428,7 @@ msgstr ""
 
 #. the default tab in the interests tab bar
 #: src/components/dms/ReactionsDialog.tsx:292
-#: src/screens/Onboarding/StepSuggestedAccounts/index.tsx:201
+#: src/screens/Onboarding/StepSuggestedAccounts/index.tsx:205
 #: src/view/screens/Notifications.tsx:86
 msgid "All"
 msgstr ""
@@ -1439,12 +1439,12 @@ msgstr ""
 msgid "All {0}"
 msgstr "All {0}"
 
-#: src/screens/Onboarding/StepSuggestedStarterpacks/StarterPackCard.tsx:97
-#: src/screens/StarterPack/StarterPackScreen.tsx:400
+#: src/screens/Onboarding/StepSuggestedStarterpacks/StarterPackCard.tsx:98
+#: src/screens/StarterPack/StarterPackScreen.tsx:398
 msgid "All accounts have been followed!"
 msgstr ""
 
-#: src/components/contacts/screens/ViewMatches.tsx:144
+#: src/components/contacts/screens/ViewMatches.tsx:150
 msgid "All friends followed!"
 msgstr ""
 
@@ -1469,7 +1469,7 @@ msgstr ""
 msgid "Allow access to your direct messages"
 msgstr ""
 
-#: src/components/dialogs/PostInteractionSettingsDialog.tsx:451
+#: src/components/dialogs/PostInteractionSettingsDialog.tsx:448
 msgid "Allow anyone to reply"
 msgstr ""
 
@@ -1493,24 +1493,24 @@ msgstr ""
 msgid "Allow others to be notified of your posts"
 msgstr ""
 
-#: src/components/dialogs/PostInteractionSettingsDialog.tsx:504
+#: src/components/dialogs/PostInteractionSettingsDialog.tsx:501
 msgid "Allow people you follow to reply"
 msgstr ""
 
-#: src/components/dialogs/PostInteractionSettingsDialog.tsx:518
+#: src/components/dialogs/PostInteractionSettingsDialog.tsx:515
 msgid "Allow people you mention to reply"
 msgstr ""
 
-#: src/components/dialogs/PostInteractionSettingsDialog.tsx:636
+#: src/components/dialogs/PostInteractionSettingsDialog.tsx:633
 msgid "Allow quote posts"
 msgstr ""
 
 #. placeholder {0}: list.name
-#: src/components/dialogs/PostInteractionSettingsDialog.tsx:598
+#: src/components/dialogs/PostInteractionSettingsDialog.tsx:595
 msgid "Allow users in {0} to reply"
 msgstr ""
 
-#: src/components/dialogs/PostInteractionSettingsDialog.tsx:490
+#: src/components/dialogs/PostInteractionSettingsDialog.tsx:487
 msgid "Allow your followers to reply"
 msgstr ""
 
@@ -1518,9 +1518,9 @@ msgstr ""
 msgid "Allows access to direct messages"
 msgstr ""
 
-#: src/screens/Login/ForgotPasswordForm.tsx:174
-#: src/screens/Settings/components/ChangePasswordDialog.tsx:237
-#: src/screens/Settings/components/ChangePasswordDialog.tsx:243
+#: src/screens/Login/ForgotPasswordForm.tsx:178
+#: src/screens/Settings/components/ChangePasswordDialog.tsx:241
+#: src/screens/Settings/components/ChangePasswordDialog.tsx:247
 msgid "Already have a code?"
 msgstr ""
 
@@ -1568,7 +1568,7 @@ msgid "Alt text will be truncated. {MAX_ALT_TEXT, plural, other {Limit: {0} char
 msgstr ""
 
 #. placeholder {0}: currentAccount?.email || '(no email)'
-#: src/screens/Settings/components/DisableEmail2FADialog.tsx:94
+#: src/screens/Settings/components/DisableEmail2FADialog.tsx:102
 msgid "An email has been sent to {0}. It includes a confirmation code which you can enter below."
 msgstr ""
 
@@ -1582,16 +1582,16 @@ msgstr ""
 msgid "An error occurred"
 msgstr ""
 
-#: src/view/com/composer/state/video.ts:508
+#: src/view/com/composer/state/video.ts:513
 msgid "An error occurred while compressing the video."
 msgstr ""
 
-#: src/screens/Onboarding/StepSuggestedAccounts/index.tsx:223
+#: src/screens/Onboarding/StepSuggestedAccounts/index.tsx:227
 #: src/screens/Onboarding/StepSuggestedStarterpacks/index.tsx:69
 msgid "An error occurred while fetching suggested accounts."
 msgstr ""
 
-#: src/state/queries/explore-feed-previews.tsx:183
+#: src/state/queries/explore-feed-previews.tsx:181
 msgid "An error occurred while fetching the feed."
 msgstr ""
 
@@ -1600,7 +1600,7 @@ msgid "An error occurred while generating your starter pack. Want to try again?"
 msgstr ""
 
 #. placeholder {0}: cleanError(err)
-#: src/components/contacts/screens/ViewMatches.tsx:243
+#: src/components/contacts/screens/ViewMatches.tsx:251
 msgid "An error occurred while hiding suggestion. {0}"
 msgstr ""
 
@@ -1612,7 +1612,7 @@ msgstr ""
 msgid "An error occurred while loading the video. Please try again."
 msgstr ""
 
-#: src/components/dialogs/PostInteractionSettingsDialog.tsx:581
+#: src/components/dialogs/PostInteractionSettingsDialog.tsx:578
 msgid "An error occurred while loading your lists :/"
 msgstr ""
 
@@ -1621,25 +1621,25 @@ msgstr ""
 msgid "An error occurred while saving the QR code!"
 msgstr ""
 
-#: src/screens/Onboarding/StepSuggestedStarterpacks/StarterPackCard.tsx:54
-#: src/screens/Onboarding/StepSuggestedStarterpacks/StarterPackCard.tsx:82
-#: src/screens/StarterPack/StarterPackScreen.tsx:359
-#: src/screens/StarterPack/StarterPackScreen.tsx:386
+#: src/screens/Onboarding/StepSuggestedStarterpacks/StarterPackCard.tsx:55
+#: src/screens/Onboarding/StepSuggestedStarterpacks/StarterPackCard.tsx:83
+#: src/screens/StarterPack/StarterPackScreen.tsx:357
+#: src/screens/StarterPack/StarterPackScreen.tsx:384
 msgid "An error occurred while trying to follow all"
 msgstr ""
 
-#: src/view/com/composer/state/video.ts:560
+#: src/view/com/composer/state/video.ts:565
 msgid "An error occurred while uploading the video. {message}"
 msgstr ""
 
-#: src/view/com/composer/state/video.ts:552
+#: src/view/com/composer/state/video.ts:557
 msgid "An error occurred while uploading the video. Please check your internet connection and try again."
 msgstr ""
 
 #. placeholder {0}: cleanError(err)
-#: src/components/contacts/screens/PhoneInput.tsx:120
-#: src/components/contacts/screens/VerifyNumber.tsx:131
-#: src/components/contacts/screens/VerifyNumber.tsx:184
+#: src/components/contacts/screens/PhoneInput.tsx:121
+#: src/components/contacts/screens/VerifyNumber.tsx:136
+#: src/components/contacts/screens/VerifyNumber.tsx:188
 msgid "An error occurred. {0}"
 msgstr ""
 
@@ -1661,30 +1661,30 @@ msgstr "An illustration of the Bluesky app with a paper airplane flying out of i
 msgid "An illustration showing that Bluesky selects trusted verifiers, and trusted verifiers in turn verify individual user accounts."
 msgstr ""
 
-#: src/screens/Messages/components/InviteLinkDialog.tsx:198
+#: src/screens/Messages/components/InviteLinkDialog.tsx:195
 msgid "An invite link lets people join this group chat without being added directly. You control who can join the chat. You can disable the link at any time."
 msgstr "An invite link lets people join this group chat without being added directly. You control who can join the chat. You can disable the link at any time."
 
-#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:239
+#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:241
 msgid "An issue not included in these options"
 msgstr ""
 
-#: src/components/dms/dialogs/NewChatDialog.tsx:54
-#: src/components/dms/dialogs/ShareViaChatDialog.tsx:69
+#: src/components/dms/dialogs/NewChatDialog.tsx:52
+#: src/components/dms/dialogs/ShareViaChatDialog.tsx:67
 msgid "An issue occurred starting the chat, please try again."
 msgstr "An issue occurred starting the chat, please try again."
 
-#: src/components/dms/dialogs/NewChatDialog.tsx:92
-#: src/components/dms/dialogs/ShareViaChatDialog.tsx:108
+#: src/components/dms/dialogs/NewChatDialog.tsx:87
+#: src/components/dms/dialogs/ShareViaChatDialog.tsx:103
 msgid "An issue occurred starting the group chat, please try again."
 msgstr "An issue occurred starting the group chat, please try again."
 
 #: src/components/hooks/useFollowMethods.ts:35
 #: src/components/hooks/useFollowMethods.ts:52
-#: src/components/ProfileCard.tsx:510
-#: src/components/ProfileCard.tsx:532
-#: src/view/com/notifications/NotificationFeedItem.tsx:834
-#: src/view/com/notifications/NotificationFeedItem.tsx:855
+#: src/components/ProfileCard.tsx:507
+#: src/components/ProfileCard.tsx:529
+#: src/view/com/notifications/NotificationFeedItem.tsx:827
+#: src/view/com/notifications/NotificationFeedItem.tsx:848
 msgid "An issue occurred, please try again."
 msgstr ""
 
@@ -1693,19 +1693,19 @@ msgid "An mockup of a iPhone showing the Bluesky app open to the profile of a ve
 msgstr ""
 
 #: src/components/moderation/ModerationDetailsDialog.tsx:154
-#: src/lib/moderation/useModerationCauseDescription.ts:145
+#: src/lib/moderation/useModerationCauseDescription.ts:142
 msgid "an unknown labeler"
 msgstr ""
 
-#: src/components/WhoCanReply.tsx:374
+#: src/components/WhoCanReply.tsx:367
 msgid "and"
 msgstr ""
 
-#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:88
+#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:89
 msgid "Animal sexual abuse"
 msgstr ""
 
-#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:130
+#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:131
 msgid "Animal welfare"
 msgstr ""
 
@@ -1730,25 +1730,25 @@ msgstr ""
 msgid "Any date"
 msgstr "Any date"
 
-#: src/components/dialogs/PostInteractionSettingsDialog.tsx:457
+#: src/components/dialogs/PostInteractionSettingsDialog.tsx:454
 msgid "Anyone"
 msgstr ""
 
-#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:135
+#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:136
 msgid "Anyone can interact"
 msgstr ""
 
-#: src/components/intents/GroupChatJoinDialog.tsx:356
+#: src/components/intents/GroupChatJoinDialog.tsx:361
 msgid "Anyone can join"
 msgstr "Anyone can join"
 
-#: src/screens/Messages/components/InviteLinkDialog.tsx:153
-#: src/screens/Messages/components/InviteLinkDialog.tsx:154
+#: src/screens/Messages/components/InviteLinkDialog.tsx:150
+#: src/screens/Messages/components/InviteLinkDialog.tsx:151
 msgid "Anyone can join instantly"
 msgstr "Anyone can join instantly"
 
-#: src/screens/Messages/components/InviteLinkDialog.tsx:158
-#: src/screens/Messages/components/InviteLinkDialog.tsx:159
+#: src/screens/Messages/components/InviteLinkDialog.tsx:155
+#: src/screens/Messages/components/InviteLinkDialog.tsx:156
 msgid "Anyone can request to join"
 msgstr "Anyone can request to join"
 
@@ -1758,7 +1758,7 @@ msgstr "Anyone can request to join"
 msgid "Anyone who follows me"
 msgstr ""
 
-#: src/screens/Messages/components/InviteLinkDialog.tsx:478
+#: src/screens/Messages/components/InviteLinkDialog.tsx:475
 msgid "Anyone who has it will no longer be able to join or request to join. You can always create a new one."
 msgstr "Anyone who has it will no longer be able to join or request to join. You can always create a new one."
 
@@ -1812,7 +1812,7 @@ msgid "Appeal"
 msgstr ""
 
 #. placeholder {0}: strings.name
-#: src/components/moderation/AppealForm.tsx:93
+#: src/components/moderation/AppealForm.tsx:104
 msgid "Appeal \"{0}\" label"
 msgstr ""
 
@@ -1820,30 +1820,30 @@ msgstr ""
 msgid "Appeal label"
 msgstr "Appeal label"
 
-#: src/features/liveNow/components/GoLiveDisabledDialog.tsx:93
+#: src/features/liveNow/components/GoLiveDisabledDialog.tsx:92
 msgid "Appeal livestream suspension"
 msgstr ""
 
-#: src/components/moderation/AppealForm.tsx:83
-#: src/features/liveNow/components/GoLiveDisabledDialog.tsx:83
-#: src/screens/Messages/components/ChatDisabled.tsx:125
+#: src/components/moderation/AppealForm.tsx:94
+#: src/features/liveNow/components/GoLiveDisabledDialog.tsx:82
+#: src/screens/Messages/components/ChatDisabled.tsx:123
 msgctxt "toast"
 msgid "Appeal submitted"
 msgstr ""
 
-#: src/screens/Takendown.tsx:114
-#: src/screens/Takendown.tsx:140
+#: src/screens/Takendown.tsx:112
+#: src/screens/Takendown.tsx:138
 msgid "Appeal suspension"
 msgstr ""
 
-#: src/screens/Takendown.tsx:117
+#: src/screens/Takendown.tsx:115
 msgid "Appeal Suspension"
 msgstr ""
 
 #: src/screens/Messages/components/ChatDisabled.tsx:76
 #: src/screens/Messages/components/ChatDisabled.tsx:79
+#: src/screens/Messages/components/ChatDisabled.tsx:131
 #: src/screens/Messages/components/ChatDisabled.tsx:133
-#: src/screens/Messages/components/ChatDisabled.tsx:135
 msgid "Appeal this decision"
 msgstr ""
 
@@ -1853,8 +1853,8 @@ msgstr "Appeal this label"
 
 #: src/Navigation.tsx:398
 #: src/screens/Settings/AppearanceSettings.tsx:71
-#: src/screens/Settings/Settings.tsx:227
-#: src/screens/Settings/Settings.tsx:230
+#: src/screens/Settings/Settings.tsx:229
+#: src/screens/Settings/Settings.tsx:232
 msgid "Appearance"
 msgstr ""
 
@@ -1863,22 +1863,22 @@ msgstr ""
 msgid "Apply default recommended feeds"
 msgstr ""
 
-#: src/screens/Settings/Settings.tsx:525
 #: src/screens/Settings/Settings.tsx:527
+#: src/screens/Settings/Settings.tsx:529
 msgid "Apply Pull Request"
 msgstr ""
 
 #. placeholder {0}: niceDate(i18n, createdAt, 'medium')
-#: src/screens/PostThread/components/ThreadItemAnchor.tsx:627
+#: src/screens/PostThread/components/ThreadItemAnchor.tsx:624
 msgid "Archived from {0}"
 msgstr ""
 
-#: src/screens/PostThread/components/ThreadItemAnchor.tsx:598
-#: src/screens/PostThread/components/ThreadItemAnchor.tsx:636
+#: src/screens/PostThread/components/ThreadItemAnchor.tsx:595
+#: src/screens/PostThread/components/ThreadItemAnchor.tsx:633
 msgid "Archived post"
 msgstr ""
 
-#: src/screens/Settings/components/DeleteAccountDialog.tsx:327
+#: src/screens/Settings/components/DeleteAccountDialog.tsx:333
 msgid "Are you really, really sure?"
 msgstr ""
 
@@ -1909,11 +1909,11 @@ msgstr ""
 msgid "Are you sure you want to delete this message? The message will be deleted for you, but not for the other participants."
 msgstr "Are you sure you want to delete this message? The message will be deleted for you, but not for the other participants."
 
-#: src/screens/StarterPack/StarterPackScreen.tsx:684
+#: src/screens/StarterPack/StarterPackScreen.tsx:677
 msgid "Are you sure you want to delete this starter pack?"
 msgstr ""
 
-#: src/components/dialogs/lists/CreateOrEditListDialog.tsx:99
+#: src/components/dialogs/lists/CreateOrEditListDialog.tsx:100
 #: src/screens/Profile/Header/EditProfileDialog.tsx:77
 msgid "Are you sure you want to discard your changes?"
 msgstr ""
@@ -1923,32 +1923,32 @@ msgstr ""
 msgid "Are you sure you want to leave {groupName}?"
 msgstr "Are you sure you want to leave {groupName}?"
 
-#: src/components/dms/LeaveConvoPrompt.tsx:57
+#: src/components/dms/LeaveConvoPrompt.tsx:61
 msgid "Are you sure you want to leave this conversation?"
 msgstr ""
 
-#: src/components/dms/LeaveConvoPrompt.tsx:56
+#: src/components/dms/LeaveConvoPrompt.tsx:60
 msgid "Are you sure you want to leave this conversation? Your messages will be deleted for you, but not for the other participants."
 msgstr "Are you sure you want to leave this conversation? Your messages will be deleted for you, but not for the other participants."
 
-#: src/components/FeedCard.tsx:374
+#: src/components/FeedCard.tsx:371
 msgid "Are you sure you want to remove this from your feeds?"
 msgstr ""
 
 #. placeholder {0}: convoView.name
-#: src/screens/Messages/components/OutgoingRequestListItem.tsx:116
+#: src/screens/Messages/components/OutgoingRequestListItem.tsx:114
 msgid "Are you sure you want to rescind your request to join {0}?"
 msgstr "Are you sure you want to rescind your request to join {0}?"
 
-#: src/view/com/composer/Composer.tsx:1771
+#: src/view/com/composer/Composer.tsx:1795
 msgid "Are you sure you'd like to discard this post?"
 msgstr ""
 
-#: src/components/dialogs/MutedWords.tsx:452
+#: src/components/dialogs/MutedWords.tsx:454
 msgid "Are you sure?"
 msgstr ""
 
-#: src/components/moderation/ReportDialog/index.tsx:928
+#: src/components/moderation/ReportDialog/index.tsx:929
 msgid "Are you the person depicted, or an authorized representative acting on behalf of the person depicted?"
 msgstr "Are you the person depicted, or an authorized representative acting on behalf of the person depicted?"
 
@@ -1964,16 +1964,16 @@ msgstr ""
 msgid "Artistic or non-erotic nudity."
 msgstr ""
 
-#: src/components/PostControls/PostMenu/PostMenuItems.tsx:623
-#: src/components/PostControls/PostMenu/PostMenuItems.tsx:625
+#: src/components/PostControls/PostMenu/PostMenuItems.tsx:619
+#: src/components/PostControls/PostMenu/PostMenuItems.tsx:621
 msgid "Assign topic for algo"
 msgstr ""
 
-#: src/screens/Settings/components/ChangePasswordDialog.tsx:209
+#: src/screens/Settings/components/ChangePasswordDialog.tsx:213
 msgid "At least 8 characters"
 msgstr ""
 
-#: src/screens/Settings/components/DeleteAccountDialog.tsx:338
+#: src/screens/Settings/components/DeleteAccountDialog.tsx:344
 msgid "AT Protocol FAQ"
 msgstr "AT Protocol FAQ"
 
@@ -2003,7 +2003,7 @@ msgid "Automation label"
 msgstr "Automation label"
 
 #: src/Navigation.tsx:422
-#: src/screens/Settings/AutomationLabelSettings.tsx:103
+#: src/screens/Settings/AutomationLabelSettings.tsx:102
 msgid "Automation Label"
 msgstr "Automation Label"
 
@@ -2029,40 +2029,40 @@ msgstr "Avatar creator"
 #: src/components/dms/InitiateChatFlow.tsx:645
 #: src/components/dms/InitiateChatFlow.tsx:863
 #: src/components/dms/InitiateChatFlow.tsx:870
-#: src/components/moderation/AppealForm.tsx:145
-#: src/components/moderation/AppealForm.tsx:146
+#: src/components/moderation/AppealForm.tsx:156
+#: src/components/moderation/AppealForm.tsx:157
 #: src/screens/Login/ChooseAccountForm.tsx:96
 #: src/screens/Login/ChooseAccountForm.tsx:100
-#: src/screens/Login/ForgotPasswordForm.tsx:119
-#: src/screens/Login/ForgotPasswordForm.tsx:124
-#: src/screens/Login/LoginForm.tsx:511
-#: src/screens/Login/LoginForm.tsx:516
-#: src/screens/Login/SetNewPasswordForm.tsx:157
-#: src/screens/Login/SetNewPasswordForm.tsx:163
+#: src/screens/Login/ForgotPasswordForm.tsx:123
+#: src/screens/Login/ForgotPasswordForm.tsx:128
+#: src/screens/Login/LoginForm.tsx:512
+#: src/screens/Login/LoginForm.tsx:517
+#: src/screens/Login/SetNewPasswordForm.tsx:162
+#: src/screens/Login/SetNewPasswordForm.tsx:168
+#: src/screens/Messages/components/ChatDisabled.tsx:162
 #: src/screens/Messages/components/ChatDisabled.tsx:164
-#: src/screens/Messages/components/ChatDisabled.tsx:166
-#: src/screens/Messages/components/InviteLinkDialog.tsx:276
-#: src/screens/Messages/components/InviteLinkDialog.tsx:304
-#: src/screens/Messages/Inbox.tsx:233
-#: src/screens/Profile/Header/Shell.tsx:174
-#: src/screens/Settings/components/ChangePasswordDialog.tsx:273
-#: src/screens/Settings/components/ChangePasswordDialog.tsx:282
+#: src/screens/Messages/components/InviteLinkDialog.tsx:273
+#: src/screens/Messages/components/InviteLinkDialog.tsx:301
+#: src/screens/Messages/Inbox.tsx:232
+#: src/screens/Profile/Header/Shell.tsx:175
+#: src/screens/Settings/components/ChangePasswordDialog.tsx:277
+#: src/screens/Settings/components/ChangePasswordDialog.tsx:286
 #: src/screens/Signup/BackNextButtons.tsx:42
-#: src/screens/StarterPack/Wizard/index.tsx:315
+#: src/screens/StarterPack/Wizard/index.tsx:311
 #: src/view/com/composer/drafts/DraftsListDialog.tsx:87
 #: src/view/com/composer/drafts/DraftsListDialog.tsx:93
 msgid "Back"
 msgstr ""
 
-#: src/screens/Messages/Inbox.tsx:232
+#: src/screens/Messages/Inbox.tsx:231
 msgid "Back to Chats"
 msgstr ""
 
-#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:216
+#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:218
 msgid "Banned activities or security violations"
 msgstr ""
 
-#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:227
+#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:229
 msgid "Banned user returning"
 msgstr ""
 
@@ -2091,10 +2091,10 @@ msgstr ""
 msgid "Before creating a post or replying, you must first verify your email."
 msgstr ""
 
-#: src/components/dialogs/StarterPackDialog.tsx:72
+#: src/components/dialogs/StarterPackDialog.tsx:69
 #: src/components/StarterPack/ProfileStarterPacks.tsx:267
 #: src/components/StarterPack/ProfileStarterPacks.tsx:277
-#: src/view/screens/Profile.tsx:352
+#: src/view/screens/Profile.tsx:349
 msgid "Before creating a starter pack, you must first verify your email."
 msgstr ""
 
@@ -2106,26 +2106,26 @@ msgstr ""
 msgid "Before you can get notifications for {name}'s posts, you must first verify your email."
 msgstr ""
 
-#: src/components/dms/dialogs/NewChatDialog.tsx:155
+#: src/components/dms/dialogs/NewChatDialog.tsx:148
 #: src/components/dms/MessageProfileButton.tsx:60
 #: src/screens/Messages/ChatList.tsx:168
 #: src/screens/Messages/ChatList.tsx:186
 #: src/screens/Messages/ChatList.tsx:287
 #: src/screens/Messages/ChatList.tsx:543
-#: src/screens/Messages/Conversation.tsx:203
+#: src/screens/Messages/Conversation.tsx:206
 #: src/screens/Messages/ConversationSettings/MemberMenu.tsx:99
 msgid "Before you can message another user, you must first verify your email."
 msgstr ""
 
-#: src/components/ageAssurance/AgeAssuranceInitDialog.tsx:319
+#: src/components/ageAssurance/AgeAssuranceInitDialog.tsx:328
 msgid "Begin"
 msgstr ""
 
-#: src/components/ageAssurance/AgeAssuranceInitDialog.tsx:313
+#: src/components/ageAssurance/AgeAssuranceInitDialog.tsx:322
 msgid "Begin age assurance process"
 msgstr ""
 
-#: src/components/ageAssurance/AgeAssuranceInitDialog.tsx:51
+#: src/components/ageAssurance/AgeAssuranceInitDialog.tsx:53
 msgid "Begin the age assurance process by completing the fields below."
 msgstr ""
 
@@ -2135,8 +2135,8 @@ msgstr ""
 
 #: src/Navigation.tsx:414
 #: src/screens/Settings/BetaFeaturesSettings.tsx:116
-#: src/screens/Settings/Settings.tsx:249
-#: src/screens/Settings/Settings.tsx:252
+#: src/screens/Settings/Settings.tsx:251
+#: src/screens/Settings/Settings.tsx:254
 msgid "Beta features"
 msgstr "Beta features"
 
@@ -2164,9 +2164,9 @@ msgstr ""
 msgid "Birthday"
 msgstr ""
 
-#: src/components/moderation/BlockDialog.tsx:187
-#: src/components/moderation/BlockDialog.tsx:193
-#: src/components/moderation/BlockDialog.tsx:213
+#: src/components/moderation/BlockDialog.tsx:184
+#: src/components/moderation/BlockDialog.tsx:190
+#: src/components/moderation/BlockDialog.tsx:210
 #: src/screens/Messages/ConversationSettings/MemberMenu.tsx:227
 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:190
 msgid "Block"
@@ -2178,8 +2178,8 @@ msgstr "Block {displayName}"
 
 #: src/components/dms/ConvoMenu.tsx:284
 #: src/components/dms/ConvoMenu.tsx:288
-#: src/components/PostControls/PostMenu/PostMenuItems.tsx:772
-#: src/components/PostControls/PostMenu/PostMenuItems.tsx:774
+#: src/components/PostControls/PostMenu/PostMenuItems.tsx:768
+#: src/components/PostControls/PostMenu/PostMenuItems.tsx:770
 #: src/screens/Messages/components/RequestButtons.tsx:154
 #: src/screens/Messages/components/RequestButtons.tsx:156
 #: src/view/com/profile/ProfileMenu.tsx:536
@@ -2187,7 +2187,7 @@ msgstr "Block {displayName}"
 msgid "Block account"
 msgstr ""
 
-#: src/components/moderation/BlockDialog.tsx:148
+#: src/components/moderation/BlockDialog.tsx:145
 msgid "Block account?"
 msgstr "Block account?"
 
@@ -2240,7 +2240,7 @@ msgstr ""
 msgid "Block user and/or leave this conversation"
 msgstr "Block user and/or leave this conversation"
 
-#: src/components/Post/Embed/index.tsx:213
+#: src/components/Post/Embed/index.tsx:214
 msgid "Blocked"
 msgstr ""
 
@@ -2253,7 +2253,7 @@ msgstr ""
 msgid "Blocked Accounts"
 msgstr ""
 
-#: src/components/moderation/BlockDialog.tsx:163
+#: src/components/moderation/BlockDialog.tsx:160
 msgid "Blocked accounts cannot reply in your threads, mention you, or otherwise interact with you."
 msgstr ""
 
@@ -2269,7 +2269,7 @@ msgstr ""
 msgid "Blocking is public. Blocked accounts cannot reply in your threads, mention you, or otherwise interact with you."
 msgstr ""
 
-#: src/components/moderation/BlockDialog.tsx:157
+#: src/components/moderation/BlockDialog.tsx:154
 msgid "Blocking will not prevent labels from being applied on your account, but it will stop this account from replying in your threads or interacting with you."
 msgstr ""
 
@@ -2288,7 +2288,7 @@ msgstr "bloomscrolling booksky"
 msgid "Bluesky"
 msgstr ""
 
-#: src/screens/PostThread/components/ThreadItemAnchor.tsx:652
+#: src/screens/PostThread/components/ThreadItemAnchor.tsx:649
 msgid "Bluesky cannot confirm the authenticity of the claimed date."
 msgstr ""
 
@@ -2297,7 +2297,7 @@ msgctxt "Name of app icon variant"
 msgid "Bluesky Classic™"
 msgstr ""
 
-#: src/components/contacts/screens/GetContacts.tsx:235
+#: src/components/contacts/screens/GetContacts.tsx:237
 msgid "Bluesky helps friends find each other by creating an encoded digital fingerprint, called a \"hash\", and then looking for matching hashes."
 msgstr ""
 
@@ -2322,7 +2322,7 @@ msgstr ""
 msgid "Bluesky is more fun with friends! Import your contacts to see who’s already here."
 msgstr ""
 
-#: src/components/contacts/screens/ViewMatches.tsx:315
+#: src/components/contacts/screens/ViewMatches.tsx:323
 msgid "Bluesky is more fun with friends. Do you want to invite some of yours? <0/>"
 msgstr ""
 
@@ -2330,11 +2330,11 @@ msgstr ""
 msgid "Bluesky needs camera access to scan QR codes from other profiles."
 msgstr "Bluesky needs camera access to scan QR codes from other profiles."
 
-#: src/screens/Takendown.tsx:213
+#: src/screens/Takendown.tsx:211
 msgid "Bluesky Social Terms of Service"
 msgstr ""
 
-#: src/screens/Settings/FindContactsSettings.tsx:570
+#: src/screens/Settings/FindContactsSettings.tsx:574
 msgid "Bluesky stores your contacts as encoded data. Removing your contacts will immediately delete this data."
 msgstr ""
 
@@ -2342,7 +2342,7 @@ msgstr ""
 msgid "Bluesky will choose a set of recommended accounts from people in your network."
 msgstr ""
 
-#: src/screens/Settings/components/PwiOptOut.tsx:100
+#: src/screens/Settings/components/PwiOptOut.tsx:101
 msgid "Bluesky will not show your profile and posts to logged-out users. Other apps may not honor this request. This does not make your account private."
 msgstr ""
 
@@ -2370,7 +2370,7 @@ msgstr ""
 msgid "Books"
 msgstr ""
 
-#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:215
+#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:217
 msgid "Breaking site rules"
 msgstr ""
 
@@ -2405,25 +2405,25 @@ msgstr ""
 msgid "Browse other feeds"
 msgstr ""
 
-#: src/components/TrendingTopics.tsx:87
+#: src/components/TrendingTopics.tsx:88
 msgid "Browse posts about {displayName}"
 msgstr ""
 
-#: src/components/TrendingTopics.tsx:95
+#: src/components/TrendingTopics.tsx:96
 msgid "Browse posts tagged with {displayName}"
 msgstr ""
 
-#: src/components/TrendingTopics.tsx:104
+#: src/components/TrendingTopics.tsx:105
 msgid "Browse starter pack {displayName}"
 msgstr ""
 
 #. placeholder {0}: trend.displayName
-#: src/components/interstitials/FeedTrendingTopics.tsx:202
-#: src/screens/Search/modules/ExploreTrendingTopics.tsx:149
+#: src/components/interstitials/FeedTrendingTopics.tsx:203
+#: src/screens/Search/modules/ExploreTrendingTopics.tsx:147
 msgid "Browse topic {0}"
 msgstr ""
 
-#: src/components/TrendingTopics.tsx:141
+#: src/components/TrendingTopics.tsx:142
 msgid "Browse topic {displayName}"
 msgstr ""
 
@@ -2431,7 +2431,7 @@ msgstr ""
 msgid "Business"
 msgstr ""
 
-#: src/screens/Bookmarks.tsx:295
+#: src/screens/Bookmarks.tsx:293
 msgid "Button to go back to the home timeline"
 msgstr ""
 
@@ -2440,10 +2440,10 @@ msgstr ""
 #. placeholder {0}: sanitizeHandle(handle, '@')
 #. placeholder {0}: sanitizeHandle(item.feed.creator.handle, '@')
 #: src/components/LabelingServiceCard/index.tsx:62
-#: src/components/moderation/ReportDialog/index.tsx:1092
-#: src/screens/Messages/JoinRequest.tsx:177
-#: src/screens/Search/components/StarterPackCard.tsx:112
-#: src/screens/Search/Explore.tsx:960
+#: src/components/moderation/ReportDialog/index.tsx:1093
+#: src/screens/Messages/JoinRequest.tsx:185
+#: src/screens/Search/components/StarterPackCard.tsx:104
+#: src/screens/Search/Explore.tsx:956
 msgid "By {0}"
 msgstr ""
 
@@ -2455,13 +2455,13 @@ msgstr "by @{0}"
 #. The group chat creator, in the format 'By {displayName}'.
 #. placeholder {0}: createSanitizedDisplayName( joinLinkPreview.owner, true, moderateProfile(joinLinkPreview.owner, moderationOpts).ui( 'displayName', ), )
 #. placeholder {0}: info.creatorHandle === TRENDING_HANDLE ? l`Bluesky` : sanitizeHandle(info.creatorHandle, '@')
-#: src/components/intents/GroupChatJoinDialog.tsx:379
+#: src/components/intents/GroupChatJoinDialog.tsx:384
 #: src/screens/CustomFeed/components/CustomFeedHeader.tsx:502
 msgid "By <0>{0}</0>"
 msgstr ""
 
 #. The group chat creator, in the format 'By {displayName}'.
-#: src/components/dms/ChatInvite/Card.tsx:84
+#: src/components/dms/ChatInvite/Card.tsx:86
 msgid "By <0>{ownerDisplayName}</0>"
 msgstr "By <0>{ownerDisplayName}</0>"
 
@@ -2485,7 +2485,7 @@ msgstr ""
 msgid "By creating an account you agree to the <0>Terms of Service</0>."
 msgstr ""
 
-#: src/screens/Search/components/StarterPackCard.tsx:111
+#: src/screens/Search/components/StarterPackCard.tsx:103
 msgid "By you"
 msgstr ""
 
@@ -2497,25 +2497,25 @@ msgstr ""
 msgid "Camera access needed"
 msgstr "Camera access needed"
 
-#: src/components/activity-notifications/SubscribeProfileDialog.tsx:213
-#: src/components/ageAssurance/AgeAssuranceAppealDialog.tsx:133
-#: src/components/ageAssurance/AgeAssuranceAppealDialog.tsx:139
-#: src/components/contacts/screens/GetContacts.tsx:292
-#: src/components/contacts/screens/GetContacts.tsx:297
+#: src/components/activity-notifications/SubscribeProfileDialog.tsx:210
+#: src/components/ageAssurance/AgeAssuranceAppealDialog.tsx:135
+#: src/components/ageAssurance/AgeAssuranceAppealDialog.tsx:141
+#: src/components/contacts/screens/GetContacts.tsx:294
+#: src/components/contacts/screens/GetContacts.tsx:299
 #: src/components/dialogs/DeviceLocationRequestDialog.tsx:141
 #: src/components/dialogs/DeviceLocationRequestDialog.tsx:146
 #: src/components/dialogs/EmailDialog/screens/Manage2FA/Enable.tsx:122
 #: src/components/dialogs/EmailDialog/screens/Manage2FA/Enable.tsx:128
 #: src/components/dialogs/InAppBrowserConsent.tsx:99
 #: src/components/dialogs/InAppBrowserConsent.tsx:105
-#: src/components/dialogs/lists/CreateListFromStarterPackDialog.tsx:192
-#: src/components/dialogs/lists/CreateListFromStarterPackDialog.tsx:200
-#: src/components/dialogs/lists/CreateOrEditListDialog.tsx:291
+#: src/components/dialogs/lists/CreateListFromStarterPackDialog.tsx:191
+#: src/components/dialogs/lists/CreateListFromStarterPackDialog.tsx:199
 #: src/components/dialogs/lists/CreateOrEditListDialog.tsx:299
+#: src/components/dialogs/lists/CreateOrEditListDialog.tsx:307
 #: src/components/dialogs/nuxs/InviteFriendsAnnouncement.tsx:175
 #: src/components/dialogs/nuxs/InviteFriendsAnnouncement.tsx:181
 #: src/components/Menu/index.tsx:373
-#: src/components/moderation/BlockDialog.tsx:204
+#: src/components/moderation/BlockDialog.tsx:201
 #: src/components/PostControls/RepostButton.tsx:210
 #: src/components/Prompt.tsx:152
 #: src/components/Prompt.tsx:154
@@ -2524,9 +2524,9 @@ msgstr "Camera access needed"
 #: src/features/liveNow/components/GoLiveDialog.tsx:254
 #: src/features/liveNow/components/GoLiveDialog.tsx:260
 #: src/lib/media/picker.tsx:38
-#: src/screens/Deactivated.tsx:150
-#: src/screens/Messages/components/InviteLinkDialog.tsx:500
-#: src/screens/Messages/components/InviteLinkDialog.tsx:504
+#: src/screens/Deactivated.tsx:155
+#: src/screens/Messages/components/InviteLinkDialog.tsx:497
+#: src/screens/Messages/components/InviteLinkDialog.tsx:501
 #: src/screens/Messages/ConversationSettings/prompts.tsx:108
 #: src/screens/Messages/ConversationSettings/prompts.tsx:132
 #: src/screens/Messages/ConversationSettings/prompts.tsx:156
@@ -2541,13 +2541,13 @@ msgstr "Camera access needed"
 #: src/screens/Settings/components/BetaFeaturesFeedbackDialog.tsx:152
 #: src/screens/Settings/components/ChangeHandleDialog.tsx:80
 #: src/screens/Settings/components/ChangeHandleDialog.tsx:87
-#: src/screens/Settings/components/ChangePasswordDialog.tsx:248
-#: src/screens/Settings/components/ChangePasswordDialog.tsx:254
-#: src/screens/Settings/Settings.tsx:310
-#: src/screens/Takendown.tsx:102
-#: src/screens/Takendown.tsx:105
-#: src/view/com/composer/Composer.tsx:1849
-#: src/view/com/composer/Composer.tsx:1859
+#: src/screens/Settings/components/ChangePasswordDialog.tsx:252
+#: src/screens/Settings/components/ChangePasswordDialog.tsx:258
+#: src/screens/Settings/Settings.tsx:312
+#: src/screens/Takendown.tsx:100
+#: src/screens/Takendown.tsx:103
+#: src/view/com/composer/Composer.tsx:1873
+#: src/view/com/composer/Composer.tsx:1883
 #: src/view/com/composer/photos/EditImageDialog.web.tsx:44
 #: src/view/com/composer/photos/EditImageDialog.web.tsx:53
 #: src/view/shell/desktop/LeftNav.tsx:228
@@ -2558,7 +2558,7 @@ msgstr ""
 msgid "Cancel quote post"
 msgstr ""
 
-#: src/screens/Deactivated.tsx:144
+#: src/screens/Deactivated.tsx:149
 msgid "Cancel reactivation and sign out"
 msgstr ""
 
@@ -2574,10 +2574,10 @@ msgstr ""
 msgid "Cancels signing in so you can check your username"
 msgstr "Cancels signing in so you can check your username"
 
-#: src/components/PostControls/index.tsx:108
-#: src/components/PostControls/index.tsx:138
-#: src/components/PostControls/index.tsx:166
-#: src/state/shell/composer/index.tsx:105
+#: src/components/PostControls/index.tsx:104
+#: src/components/PostControls/index.tsx:134
+#: src/components/PostControls/index.tsx:162
+#: src/state/shell/composer/index.tsx:101
 msgid "Cannot interact with a blocked user"
 msgstr ""
 
@@ -2603,7 +2603,7 @@ msgstr ""
 msgid "cats dogs"
 msgstr "cats dogs"
 
-#: src/components/Post/Translated/index.tsx:439
+#: src/components/Post/Translated/index.tsx:436
 #: src/screens/Settings/components/Email2FAToggle.tsx:31
 msgid "Change"
 msgstr ""
@@ -2628,36 +2628,36 @@ msgstr ""
 msgid "Change Handle"
 msgstr ""
 
-#: src/screens/Login/LoginForm.tsx:644
+#: src/screens/Login/LoginForm.tsx:645
 msgid "Change hosting provider"
 msgstr "Change hosting provider"
 
-#: src/components/moderation/ReportDialog/index.tsx:522
+#: src/components/moderation/ReportDialog/index.tsx:523
 msgid "Change moderation service"
 msgstr ""
 
-#: src/screens/Settings/components/ChangePasswordDialog.tsx:262
-#: src/screens/Settings/components/ChangePasswordDialog.tsx:268
+#: src/screens/Settings/components/ChangePasswordDialog.tsx:266
+#: src/screens/Settings/components/ChangePasswordDialog.tsx:272
 msgid "Change password"
 msgstr ""
 
-#: src/screens/Settings/components/ChangePasswordDialog.tsx:165
+#: src/screens/Settings/components/ChangePasswordDialog.tsx:169
 msgid "Change password dialog"
 msgstr ""
 
-#: src/components/moderation/ReportDialog/index.tsx:384
+#: src/components/moderation/ReportDialog/index.tsx:385
 msgid "Change report category"
 msgstr ""
 
-#: src/components/moderation/ReportDialog/index.tsx:463
+#: src/components/moderation/ReportDialog/index.tsx:464
 msgid "Change report reason"
 msgstr ""
 
-#: src/components/Post/Translated/index.tsx:424
+#: src/components/Post/Translated/index.tsx:421
 msgid "Change the source language"
 msgstr "Change the source language"
 
-#: src/screens/Settings/components/ChangePasswordDialog.tsx:58
+#: src/screens/Settings/components/ChangePasswordDialog.tsx:60
 msgid "Change your password"
 msgstr ""
 
@@ -2670,11 +2670,11 @@ msgstr ""
 msgid "Changes hosting provider"
 msgstr ""
 
-#: src/components/activity-notifications/SubscribeProfileDialog.tsx:179
+#: src/components/activity-notifications/SubscribeProfileDialog.tsx:176
 msgid "Changes saved"
 msgstr ""
 
-#: src/components/dialogs/lists/CreateListFromStarterPackDialog.tsx:164
+#: src/components/dialogs/lists/CreateListFromStarterPackDialog.tsx:163
 msgid "Changes to the starter pack will not be reflected in the list after creation. The list will be an independent copy."
 msgstr ""
 
@@ -2692,17 +2692,17 @@ msgctxt "toast"
 msgid "Chat deleted"
 msgstr ""
 
-#: src/components/dms/getSystemMessageInfo.ts:108
+#: src/components/dms/getSystemMessageInfo.ts:124
 msgid "Chat ended"
 msgstr "Chat ended"
 
 #: src/components/dms/ChatInvite/Unavailable.tsx:25
-#: src/components/intents/GroupChatJoinDialog.tsx:269
-#: src/screens/Messages/JoinRequest.tsx:97
+#: src/components/intents/GroupChatJoinDialog.tsx:274
+#: src/screens/Messages/JoinRequest.tsx:102
 msgid "Chat invite link no longer available"
 msgstr "Chat invite link no longer available"
 
-#: src/components/dms/getSystemMessageInfo.ts:104
+#: src/components/dms/getSystemMessageInfo.ts:113
 msgid "Chat locked"
 msgstr "Chat locked"
 
@@ -2719,7 +2719,7 @@ msgctxt "toast"
 msgid "Chat muted"
 msgstr ""
 
-#: src/components/moderation/BlockDialog.tsx:286
+#: src/components/moderation/BlockDialog.tsx:285
 #: src/components/moderation/BlockDialog.tsx:314
 msgid "Chat not found."
 msgstr "Chat not found."
@@ -2730,12 +2730,12 @@ msgstr "Chat not found."
 msgid "Chat options"
 msgstr "Chat options"
 
-#: src/components/moderation/BlockDialog.tsx:290
+#: src/components/moderation/BlockDialog.tsx:288
 msgid "Chat owners cannot leave a group chat."
 msgstr "Chat owners cannot leave a group chat."
 
-#: src/components/dms/dialogs/NewChatDialog.tsx:73
-#: src/components/dms/dialogs/ShareViaChatDialog.tsx:88
+#: src/components/dms/dialogs/NewChatDialog.tsx:67
+#: src/components/dms/dialogs/ShareViaChatDialog.tsx:82
 msgid "Chat recipient is not followed by the sender."
 msgstr "Chat recipient is not followed by the sender."
 
@@ -2743,8 +2743,8 @@ msgstr "Chat recipient is not followed by the sender."
 msgid "Chat request inbox"
 msgstr ""
 
-#: src/screens/Messages/Inbox.tsx:62
-#: src/screens/Messages/Inbox.tsx:97
+#: src/screens/Messages/Inbox.tsx:59
+#: src/screens/Messages/Inbox.tsx:96
 msgid "Chat requests"
 msgstr ""
 
@@ -2762,16 +2762,16 @@ msgstr ""
 msgid "Chat Settings"
 msgstr ""
 
-#: src/components/dms/getSystemMessageInfo.ts:115
+#: src/components/dms/getSystemMessageInfo.ts:133
 msgid "Chat title changed"
 msgstr "Chat title changed"
 
 #. placeholder {0}: data.newName
-#: src/components/dms/getSystemMessageInfo.ts:114
+#: src/components/dms/getSystemMessageInfo.ts:132
 msgid "Chat title changed to {0}"
 msgstr "Chat title changed to {0}"
 
-#: src/components/dms/getSystemMessageInfo.ts:106
+#: src/components/dms/getSystemMessageInfo.ts:117
 msgid "Chat unlocked"
 msgstr "Chat unlocked"
 
@@ -2786,7 +2786,7 @@ msgstr ""
 msgid "Chats"
 msgstr ""
 
-#: src/screens/Settings/components/DeleteAccountDialog.tsx:233
+#: src/screens/Settings/components/DeleteAccountDialog.tsx:239
 msgid "Check <0>{currentEmail}</0> for an email with the confirmation code to enter below:"
 msgstr ""
 
@@ -2794,20 +2794,20 @@ msgstr ""
 msgid "Check back later!"
 msgstr "Check back later!"
 
-#: src/screens/SignupQueued.tsx:79
-#: src/screens/SignupQueued.tsx:83
+#: src/screens/SignupQueued.tsx:86
+#: src/screens/SignupQueued.tsx:90
 msgid "Check my status"
 msgstr ""
 
-#: src/screens/Login/LoginForm.tsx:463
+#: src/screens/Login/LoginForm.tsx:464
 msgid "Check your email for a sign in code and enter it here."
 msgstr ""
 
-#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:161
+#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:163
 msgid "Child safety"
 msgstr ""
 
-#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:165
+#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:167
 msgid "Child Sexual Abuse Material (CSAM)"
 msgstr ""
 
@@ -2834,7 +2834,7 @@ msgstr "Choose at least one. We'll use this to customize your experience. You ca
 msgid "Choose domain verification method"
 msgstr ""
 
-#: src/screens/StarterPack/Wizard/index.tsx:205
+#: src/screens/StarterPack/Wizard/index.tsx:201
 msgid "Choose Feeds"
 msgstr ""
 
@@ -2846,7 +2846,7 @@ msgstr ""
 msgid "Choose languages"
 msgstr ""
 
-#: src/screens/StarterPack/Wizard/index.tsx:201
+#: src/screens/StarterPack/Wizard/index.tsx:197
 msgid "Choose People"
 msgstr ""
 
@@ -2859,7 +2859,7 @@ msgstr ""
 msgid "Choose this color as your avatar"
 msgstr ""
 
-#: src/screens/Messages/components/InviteLinkDialog.tsx:243
+#: src/screens/Messages/components/InviteLinkDialog.tsx:240
 msgid "Choose who can join this group chat and how."
 msgstr "Choose who can join this group chat and how."
 
@@ -2880,7 +2880,7 @@ msgstr ""
 msgid "Choose your password"
 msgstr ""
 
-#: src/screens/Signup/index.tsx:196
+#: src/screens/Signup/index.tsx:193
 msgid "Choose your username"
 msgstr ""
 
@@ -2890,11 +2890,11 @@ msgstr ""
 msgid "Clear"
 msgstr "Clear"
 
-#: src/screens/Settings/Settings.tsx:517
+#: src/screens/Settings/Settings.tsx:519
 msgid "Clear all storage data"
 msgstr ""
 
-#: src/screens/Settings/Settings.tsx:519
+#: src/screens/Settings/Settings.tsx:521
 msgid "Clear all storage data (restart after this)"
 msgstr ""
 
@@ -2940,8 +2940,8 @@ msgstr "Click here to delete your account"
 msgid "Click here to log out"
 msgstr ""
 
-#: src/screens/Settings/components/DeleteAccountDialog.tsx:263
-#: src/screens/Settings/components/DeleteAccountDialog.tsx:272
+#: src/screens/Settings/components/DeleteAccountDialog.tsx:269
+#: src/screens/Settings/components/DeleteAccountDialog.tsx:278
 msgid "Click here to resend the email"
 msgstr "Click here to resend the email"
 
@@ -2967,7 +2967,7 @@ msgstr "Click here to view the invite link for this group chat"
 msgid "Click to open tag menu for {0}"
 msgstr ""
 
-#: src/components/dms/MessageItem.tsx:643
+#: src/components/dms/MessageItem.tsx:658
 msgid "Click to retry failed message"
 msgstr ""
 
@@ -2993,7 +2993,7 @@ msgstr ""
 #: src/components/dialogs/nuxs/LiveNowBetaDialog.tsx:192
 #: src/components/dialogs/nuxs/LiveNowBetaDialog.tsx:200
 #: src/components/dialogs/SearchablePeopleList.tsx:340
-#: src/components/dialogs/StarterPackDialog.tsx:187
+#: src/components/dialogs/StarterPackDialog.tsx:184
 #: src/components/dms/AddMembersFlow.tsx:384
 #: src/components/dms/AfterReportConversationDialog.tsx:91
 #: src/components/dms/AfterReportConversationDialog.tsx:96
@@ -3005,24 +3005,24 @@ msgstr ""
 #: src/components/dms/AfterReportDialog.tsx:217
 #: src/components/dms/EmojiPopup.android.tsx:59
 #: src/components/dms/InitiateChatFlow.tsx:670
-#: src/components/intents/GroupChatJoinDialog.tsx:246
-#: src/components/intents/GroupChatJoinDialog.tsx:281
-#: src/components/NewskieDialog.tsx:169
-#: src/components/NewskieDialog.tsx:175
+#: src/components/intents/GroupChatJoinDialog.tsx:251
+#: src/components/intents/GroupChatJoinDialog.tsx:286
+#: src/components/NewskieDialog.tsx:170
+#: src/components/NewskieDialog.tsx:176
 #: src/components/ProgressGuide/FollowDialog.tsx:462
-#: src/components/StarterPack/Wizard/WizardEditListDialog.tsx:122
-#: src/components/StarterPack/Wizard/WizardEditListDialog.tsx:128
+#: src/components/StarterPack/Wizard/WizardEditListDialog.tsx:119
+#: src/components/StarterPack/Wizard/WizardEditListDialog.tsx:125
 #: src/components/verification/VerificationsDialog.tsx:146
 #: src/components/verification/VerifierDialog.tsx:147
+#: src/components/WhoCanReply.tsx:229
 #: src/components/WhoCanReply.tsx:236
-#: src/components/WhoCanReply.tsx:243
 #: src/features/gifPicker/components/GifPickerErrorBoundary.tsx:45
-#: src/features/liveNow/components/EditLiveDialog.tsx:210
-#: src/features/liveNow/components/EditLiveDialog.tsx:216
-#: src/screens/Messages/components/InviteLinkDialog.tsx:524
-#: src/screens/Messages/components/InviteLinkDialog.tsx:529
-#: src/screens/Settings/components/ChangePasswordDialog.tsx:288
-#: src/screens/Settings/components/ChangePasswordDialog.tsx:293
+#: src/features/liveNow/components/EditLiveDialog.tsx:212
+#: src/features/liveNow/components/EditLiveDialog.tsx:218
+#: src/screens/Messages/components/InviteLinkDialog.tsx:521
+#: src/screens/Messages/components/InviteLinkDialog.tsx:526
+#: src/screens/Settings/components/ChangePasswordDialog.tsx:292
+#: src/screens/Settings/components/ChangePasswordDialog.tsx:297
 #: src/view/com/feeds/MissingFeed.tsx:211
 #: src/view/com/feeds/MissingFeed.tsx:218
 msgid "Close"
@@ -3042,13 +3042,13 @@ msgid "Close banner"
 msgstr "Close banner"
 
 #. Accessibility label for the button that dismisses the GIF picker error dialog.
-#: src/components/ageAssurance/AgeAssuranceInitDialog.tsx:223
-#: src/components/ageAssurance/AgeAssuranceInitDialog.tsx:229
+#: src/components/ageAssurance/AgeAssuranceInitDialog.tsx:232
+#: src/components/ageAssurance/AgeAssuranceInitDialog.tsx:238
 #: src/components/dialogs/LanguageSelectDialog.tsx:221
 #: src/components/dialogs/LanguageSelectDialog.tsx:322
 #: src/components/dialogs/LanguageSelectDialog.tsx:354
 #: src/components/dialogs/NotificationSettingsDialog.tsx:102
-#: src/components/moderation/BlockDialog.tsx:201
+#: src/components/moderation/BlockDialog.tsx:198
 #: src/components/verification/VerificationsDialog.tsx:138
 #: src/components/verification/VerifierDialog.tsx:140
 #: src/features/gifPicker/components/GifPickerErrorBoundary.tsx:36
@@ -3083,10 +3083,10 @@ msgstr "Close scanner"
 msgid "Close the incoming requests banner"
 msgstr "Close the incoming requests banner"
 
-#: src/components/intents/GroupChatJoinDialog.tsx:239
-#: src/components/intents/GroupChatJoinDialog.tsx:240
-#: src/components/intents/GroupChatJoinDialog.tsx:276
-#: src/components/intents/GroupChatJoinDialog.tsx:277
+#: src/components/intents/GroupChatJoinDialog.tsx:244
+#: src/components/intents/GroupChatJoinDialog.tsx:245
+#: src/components/intents/GroupChatJoinDialog.tsx:281
+#: src/components/intents/GroupChatJoinDialog.tsx:282
 #: src/components/Menu/index.tsx:367
 msgid "Close this dialog"
 msgstr ""
@@ -3099,15 +3099,15 @@ msgstr ""
 msgid "Closes password update alert"
 msgstr ""
 
-#: src/view/com/composer/Composer.tsx:1857
+#: src/view/com/composer/Composer.tsx:1881
 msgid "Closes post composer and discards post draft"
 msgstr ""
 
-#: src/view/com/notifications/NotificationFeedItem.tsx:601
+#: src/view/com/notifications/NotificationFeedItem.tsx:593
 msgid "Collapse list of users"
 msgstr ""
 
-#: src/view/com/notifications/NotificationFeedItem.tsx:983
+#: src/view/com/notifications/NotificationFeedItem.tsx:974
 msgid "Collapses list of users for a given notification"
 msgstr ""
 
@@ -3115,12 +3115,12 @@ msgstr ""
 msgid "Color"
 msgstr "Color"
 
-#: src/components/dialogs/Embed.tsx:150
+#: src/components/dialogs/Embed.tsx:151
 #: src/screens/Settings/AppearanceSettings.tsx:79
 msgid "Color mode"
 msgstr ""
 
-#: src/components/dialogs/Embed.tsx:147
+#: src/components/dialogs/Embed.tsx:148
 msgid "Color theme"
 msgstr ""
 
@@ -3142,7 +3142,7 @@ msgstr ""
 msgid "Complete onboarding and start using your account"
 msgstr ""
 
-#: src/screens/Signup/index.tsx:198
+#: src/screens/Signup/index.tsx:195
 msgid "Complete the challenge"
 msgstr ""
 
@@ -3153,7 +3153,7 @@ msgid "Compose new post"
 msgstr ""
 
 #. placeholder {0}: MAX_GRAPHEME_LENGTH || 0
-#: src/view/com/composer/Composer.tsx:1733
+#: src/view/com/composer/Composer.tsx:1757
 msgid "Compose posts up to {0, plural, other {# characters}} in length"
 msgstr ""
 
@@ -3161,11 +3161,11 @@ msgstr ""
 msgid "Compose reply"
 msgstr ""
 
-#: src/view/com/composer/Composer.tsx:2687
+#: src/view/com/composer/Composer.tsx:2711
 msgid "Compressing GIF..."
 msgstr ""
 
-#: src/view/com/composer/Composer.tsx:2689
+#: src/view/com/composer/Composer.tsx:2713
 msgid "Compressing video..."
 msgstr ""
 
@@ -3179,31 +3179,31 @@ msgstr ""
 
 #: src/components/Prompt.tsx:211
 #: src/components/Prompt.tsx:214
-#: src/screens/Settings/components/DisableEmail2FADialog.tsx:186
-#: src/screens/Settings/components/DisableEmail2FADialog.tsx:189
+#: src/screens/Settings/components/DisableEmail2FADialog.tsx:194
+#: src/screens/Settings/components/DisableEmail2FADialog.tsx:197
 msgid "Confirm"
 msgstr ""
 
 #: src/components/dialogs/EmailDialog/components/TokenField.tsx:37
-#: src/screens/Login/LoginForm.tsx:442
-#: src/screens/Settings/components/ChangePasswordDialog.tsx:187
+#: src/screens/Login/LoginForm.tsx:443
 #: src/screens/Settings/components/ChangePasswordDialog.tsx:191
-#: src/screens/Settings/components/DeleteAccountDialog.tsx:244
-#: src/screens/Settings/components/DisableEmail2FADialog.tsx:145
-#: src/screens/Settings/components/DisableEmail2FADialog.tsx:151
+#: src/screens/Settings/components/ChangePasswordDialog.tsx:195
+#: src/screens/Settings/components/DeleteAccountDialog.tsx:250
+#: src/screens/Settings/components/DisableEmail2FADialog.tsx:153
+#: src/screens/Settings/components/DisableEmail2FADialog.tsx:159
 msgid "Confirmation code"
 msgstr ""
 
-#: src/screens/Login/ForgotPasswordForm.tsx:132
+#: src/screens/Login/ForgotPasswordForm.tsx:136
 msgid "Connecting to service..."
 msgstr ""
 
-#: src/screens/Login/LoginForm.tsx:542
+#: src/screens/Login/LoginForm.tsx:543
 msgid "Connecting to service…"
 msgstr "Connecting to service…"
 
-#: src/screens/Login/ForgotPasswordForm.tsx:138
-#: src/screens/Login/LoginForm.tsx:548
+#: src/screens/Login/ForgotPasswordForm.tsx:142
+#: src/screens/Login/LoginForm.tsx:549
 msgid "Connecting…"
 msgstr "Connecting…"
 
@@ -3222,26 +3222,26 @@ msgstr ""
 msgid "Contact our support team"
 msgstr ""
 
-#: src/components/ageAssurance/AgeAssuranceInitDialog.tsx:156
+#: src/components/ageAssurance/AgeAssuranceInitDialog.tsx:160
+#: src/screens/Signup/index.tsx:240
 #: src/screens/Signup/index.tsx:243
-#: src/screens/Signup/index.tsx:246
 msgid "Contact support"
 msgstr ""
 
 #: src/screens/Onboarding/StepFindContactsIntro/index.tsx:65
-#: src/screens/Settings/FindContactsSettings.tsx:164
+#: src/screens/Settings/FindContactsSettings.tsx:162
 msgid "Contact sync is not available on this device, as the app is unable to access your contacts."
 msgstr ""
 
-#: src/components/ageAssurance/AgeAssuranceAppealDialog.tsx:98
+#: src/components/ageAssurance/AgeAssuranceAppealDialog.tsx:100
 msgid "Contact us"
 msgstr ""
 
-#: src/screens/Settings/FindContactsSettings.tsx:526
+#: src/screens/Settings/FindContactsSettings.tsx:530
 msgid "Contacts imported"
 msgstr ""
 
-#: src/screens/Settings/FindContactsSettings.tsx:499
+#: src/screens/Settings/FindContactsSettings.tsx:503
 msgid "Contacts removed"
 msgstr ""
 
@@ -3249,8 +3249,8 @@ msgstr ""
 msgid "Content & Media"
 msgstr ""
 
-#: src/screens/Settings/Settings.tsx:207
-#: src/screens/Settings/Settings.tsx:210
+#: src/screens/Settings/Settings.tsx:209
+#: src/screens/Settings/Settings.tsx:212
 msgid "Content and media"
 msgstr ""
 
@@ -3271,18 +3271,18 @@ msgid "Content languages"
 msgstr ""
 
 #: src/components/moderation/ModerationDetailsDialog.tsx:102
-#: src/lib/moderation/useModerationCauseDescription.ts:83
+#: src/lib/moderation/useModerationCauseDescription.ts:80
 msgid "Content Not Available"
 msgstr ""
 
-#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:192
+#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:194
 msgid "Content promoting or depicting self-harm"
 msgstr ""
 
 #: src/components/moderation/ModerationDetailsDialog.tsx:70
 #: src/components/moderation/ScreenHider.tsx:98
 #: src/lib/moderation/useGlobalLabelStrings.ts:22
-#: src/lib/moderation/useModerationCauseDescription.ts:46
+#: src/lib/moderation/useModerationCauseDescription.ts:43
 msgid "Content Warning"
 msgstr ""
 
@@ -3300,7 +3300,7 @@ msgstr ""
 #: src/screens/Login/components/ConfirmHostingProviderDialog.tsx:152
 #: src/screens/Onboarding/StepInterests/index.tsx:87
 #: src/screens/Onboarding/StepProfile/index.tsx:301
-#: src/screens/Onboarding/StepSuggestedAccounts/index.tsx:305
+#: src/screens/Onboarding/StepSuggestedAccounts/index.tsx:309
 #: src/screens/Onboarding/StepSuggestedStarterpacks/index.tsx:117
 msgid "Continue"
 msgstr ""
@@ -3329,17 +3329,17 @@ msgstr "Continue to group name"
 
 #: src/screens/Onboarding/StepInterests/index.tsx:80
 #: src/screens/Onboarding/StepProfile/index.tsx:298
-#: src/screens/Onboarding/StepSuggestedAccounts/index.tsx:302
+#: src/screens/Onboarding/StepSuggestedAccounts/index.tsx:306
 #: src/screens/Onboarding/StepSuggestedStarterpacks/index.tsx:114
 #: src/screens/Signup/BackNextButtons.tsx:61
 msgid "Continue to next step"
 msgstr ""
 
-#: src/screens/Messages/Conversation.tsx:63
+#: src/screens/Messages/Conversation.tsx:65
 msgid "Conversation"
 msgstr ""
 
-#: src/screens/Messages/components/ChatListItem.tsx:321
+#: src/screens/Messages/components/ChatListItem.tsx:326
 msgid "Conversation deleted"
 msgstr ""
 
@@ -3355,9 +3355,9 @@ msgctxt "toast"
 msgid "Conversation left"
 msgstr "Conversation left"
 
-#: src/components/dms/LeaveConvoPrompt.tsx:40
-#: src/screens/Messages/JoinRequests.tsx:196
-#: src/screens/Messages/JoinRequests.tsx:229
+#: src/components/dms/LeaveConvoPrompt.tsx:43
+#: src/screens/Messages/JoinRequests.tsx:193
+#: src/screens/Messages/JoinRequests.tsx:225
 msgid "Conversation not found."
 msgstr "Conversation not found."
 
@@ -3369,17 +3369,17 @@ msgstr ""
 msgid "Copied link to clipboard"
 msgstr "Copied link to clipboard"
 
-#: src/components/dms/ChatInvite/Root.tsx:99
-#: src/components/dms/MessageContextMenu.tsx:97
+#: src/components/dms/ChatInvite/Root.tsx:100
+#: src/components/dms/MessageContextMenu.tsx:95
 #: src/components/PostControls/DiscoverDebug.tsx:36
-#: src/components/PostControls/PostMenu/PostMenuItems.tsx:273
+#: src/components/PostControls/PostMenu/PostMenuItems.tsx:269
 #: src/components/PostControls/ShareMenu/ShareMenuItems.tsx:75
 #: src/lib/sharing.ts:24
 #: src/lib/sharing.ts:42
 msgid "Copied to clipboard"
 msgstr ""
 
-#: src/components/dialogs/Embed.tsx:197
+#: src/components/dialogs/Embed.tsx:198
 #: src/screens/Messages/components/CopyTextButton.tsx:71
 #: src/screens/Settings/components/CopyButton.tsx:66
 msgid "Copied!"
@@ -3393,7 +3393,7 @@ msgstr ""
 msgid "Copies the canonical profile URL to the clipboard"
 msgstr "Copies the canonical profile URL to the clipboard"
 
-#: src/components/StarterPack/QrCodeDialog.tsx:198
+#: src/components/StarterPack/QrCodeDialog.tsx:193
 #: src/features/inviteFriends/InviteFriendsDialogInner.tsx:266
 msgid "Copy"
 msgstr ""
@@ -3412,8 +3412,8 @@ msgstr ""
 msgid "Copy author DID"
 msgstr ""
 
-#: src/components/dialogs/Embed.tsx:186
-#: src/components/dialogs/Embed.tsx:202
+#: src/components/dialogs/Embed.tsx:187
+#: src/components/dialogs/Embed.tsx:203
 msgid "Copy code"
 msgstr ""
 
@@ -3431,9 +3431,9 @@ msgstr ""
 msgid "Copy invite link"
 msgstr "Copy invite link"
 
-#: src/components/dms/ChatInvite/Root.tsx:91
+#: src/components/dms/ChatInvite/Root.tsx:92
 #: src/components/StarterPack/ShareDialog.tsx:115
-#: src/screens/StarterPack/StarterPackScreen.tsx:644
+#: src/screens/StarterPack/StarterPackScreen.tsx:637
 msgid "Copy link"
 msgstr ""
 
@@ -3441,8 +3441,8 @@ msgstr ""
 msgid "Copy Link"
 msgstr ""
 
-#: src/screens/ProfileList/components/MoreOptionsMenu.tsx:160
-#: src/screens/ProfileList/components/MoreOptionsMenu.tsx:164
+#: src/screens/ProfileList/components/MoreOptionsMenu.tsx:161
+#: src/screens/ProfileList/components/MoreOptionsMenu.tsx:165
 msgid "Copy link to list"
 msgstr ""
 
@@ -3458,12 +3458,12 @@ msgstr ""
 msgid "Copy link to profile"
 msgstr ""
 
-#: src/screens/StarterPack/StarterPackScreen.tsx:637
+#: src/screens/StarterPack/StarterPackScreen.tsx:630
 msgid "Copy link to starter pack"
 msgstr ""
 
-#: src/components/dms/MessageContextMenu.tsx:198
-#: src/components/dms/MessageContextMenu.tsx:202
+#: src/components/dms/MessageContextMenu.tsx:196
+#: src/components/dms/MessageContextMenu.tsx:200
 msgid "Copy message text"
 msgstr ""
 
@@ -3472,12 +3472,12 @@ msgstr ""
 msgid "Copy post at:// URI"
 msgstr ""
 
-#: src/components/PostControls/PostMenu/PostMenuItems.tsx:578
-#: src/components/PostControls/PostMenu/PostMenuItems.tsx:580
+#: src/components/PostControls/PostMenu/PostMenuItems.tsx:574
+#: src/components/PostControls/PostMenu/PostMenuItems.tsx:576
 msgid "Copy post text"
 msgstr ""
 
-#: src/components/StarterPack/QrCodeDialog.tsx:184
+#: src/components/StarterPack/QrCodeDialog.tsx:179
 msgid "Copy QR code"
 msgstr ""
 
@@ -3512,7 +3512,7 @@ msgstr "Could not copy – please try again"
 msgid "Could not download – please try again"
 msgstr "Could not download – please try again"
 
-#: src/screens/Messages/components/MessageInputEmbed.tsx:200
+#: src/screens/Messages/components/MessageInputEmbed.tsx:191
 msgid "Could not fetch post"
 msgstr "Could not fetch post"
 
@@ -3521,23 +3521,23 @@ msgid "Could not find profile"
 msgstr ""
 
 #: src/screens/Settings/FindContactsSettings.tsx:233
-#: src/screens/Settings/FindContactsSettings.tsx:424
+#: src/screens/Settings/FindContactsSettings.tsx:428
 msgid "Could not follow all matches - please check your network connection."
 msgstr ""
 
 #. placeholder {0}: cleanError(err)
 #: src/screens/Settings/FindContactsSettings.tsx:239
-#: src/screens/Settings/FindContactsSettings.tsx:430
+#: src/screens/Settings/FindContactsSettings.tsx:434
 msgid "Could not follow all matches. {0}"
 msgstr ""
 
 #: src/components/dms/AfterReportConversationDialog.tsx:158
 #: src/components/dms/AfterReportDialog.tsx:139
-#: src/components/dms/LeaveConvoPrompt.tsx:36
+#: src/components/dms/LeaveConvoPrompt.tsx:37
 msgid "Could not leave chat"
 msgstr ""
 
-#: src/components/moderation/BlockDialog.tsx:282
+#: src/components/moderation/BlockDialog.tsx:279
 msgid "Could not leave chat."
 msgstr "Could not leave chat."
 
@@ -3546,8 +3546,8 @@ msgid "Could not load feed"
 msgstr ""
 
 #: src/screens/ProfileList/components/ErrorScreen.tsx:27
-#: src/screens/ProfileList/index.tsx:80
-#: src/screens/ProfileList/index.tsx:102
+#: src/screens/ProfileList/index.tsx:77
+#: src/screens/ProfileList/index.tsx:99
 msgid "Could not load list"
 msgstr ""
 
@@ -3564,7 +3564,7 @@ msgid "Could not remove member."
 msgstr "Could not remove member."
 
 #. placeholder {0}: cleanError(error)
-#: src/components/activity-notifications/SubscribeProfileDialog.tsx:295
+#: src/components/activity-notifications/SubscribeProfileDialog.tsx:292
 msgid "Could not save changes: {0}"
 msgstr ""
 
@@ -3572,16 +3572,16 @@ msgstr ""
 msgid "Could not share – please try again"
 msgstr "Could not share – please try again"
 
-#: src/state/queries/notifications/settings.ts:124
+#: src/state/queries/notifications/settings.ts:123
 msgid "Could not update notification settings"
 msgstr ""
 
 #. placeholder {0}: cleanError(err)
-#: src/components/contacts/screens/GetContacts.tsx:171
+#: src/components/contacts/screens/GetContacts.tsx:173
 msgid "Could not upload contacts. {0}"
 msgstr ""
 
-#: src/components/contacts/screens/GetContacts.tsx:165
+#: src/components/contacts/screens/GetContacts.tsx:166
 msgid "Could not upload contacts. You need to re-verify your phone number to proceed"
 msgstr ""
 
@@ -3601,8 +3601,8 @@ msgstr "cows pigs"
 
 #. Text on button to create a new starter pack
 #. Text on button to create a new starter pack
-#: src/components/dialogs/StarterPackDialog.tsx:113
-#: src/components/dialogs/StarterPackDialog.tsx:210
+#: src/components/dialogs/StarterPackDialog.tsx:110
+#: src/components/dialogs/StarterPackDialog.tsx:207
 #: src/components/dms/InitiateChatFlow.tsx:607
 #: src/components/StarterPack/ProfileStarterPacks.tsx:332
 msgid "Create"
@@ -3613,11 +3613,11 @@ msgstr ""
 msgid "Create a list"
 msgstr ""
 
-#: src/screens/StarterPack/StarterPackScreen.tsx:620
+#: src/screens/StarterPack/StarterPackScreen.tsx:613
 msgid "Create a list from this starter pack"
 msgstr ""
 
-#: src/components/StarterPack/QrCodeDialog.tsx:169
+#: src/components/StarterPack/QrCodeDialog.tsx:164
 msgid "Create a QR code for a starter pack"
 msgstr ""
 
@@ -3627,8 +3627,8 @@ msgstr ""
 msgid "Create a starter pack"
 msgstr ""
 
-#: src/view/screens/Profile.tsx:576
-#: src/view/screens/Profile.tsx:577
+#: src/view/screens/Profile.tsx:573
+#: src/view/screens/Profile.tsx:574
 msgid "Create a Starter Pack"
 msgstr ""
 
@@ -3638,7 +3638,7 @@ msgstr ""
 
 #: src/components/WelcomeModal.tsx:153
 #: src/components/WelcomeModal.tsx:161
-#: src/screens/Messages/JoinRequest.tsx:310
+#: src/screens/Messages/JoinRequest.tsx:318
 #: src/screens/Signup/index.tsx:139
 #: src/view/com/auth/SplashScreen.tsx:108
 #: src/view/com/auth/SplashScreen.web.tsx:118
@@ -3653,13 +3653,13 @@ msgstr ""
 
 #: src/components/dialogs/Signin.tsx:87
 #: src/components/dialogs/Signin.tsx:89
-#: src/screens/Hashtag.tsx:236
+#: src/screens/Hashtag.tsx:238
 #: src/screens/Search/SearchResults.tsx:418
 msgid "Create an account"
 msgstr ""
 
-#: src/screens/StarterPack/StarterPackLandingScreen.tsx:310
-#: src/screens/StarterPack/StarterPackLandingScreen.tsx:317
+#: src/screens/StarterPack/StarterPackLandingScreen.tsx:302
+#: src/screens/StarterPack/StarterPackLandingScreen.tsx:309
 msgid "Create an account without using this starter pack"
 msgstr ""
 
@@ -3675,55 +3675,55 @@ msgstr ""
 msgid "Create group chat"
 msgstr "Create group chat"
 
-#: src/components/dialogs/lists/CreateListFromStarterPackDialog.tsx:180
-#: src/components/dialogs/lists/CreateListFromStarterPackDialog.tsx:188
+#: src/components/dialogs/lists/CreateListFromStarterPackDialog.tsx:179
+#: src/components/dialogs/lists/CreateListFromStarterPackDialog.tsx:187
 msgid "Create list"
 msgstr ""
 
-#: src/screens/StarterPack/StarterPackScreen.tsx:626
+#: src/screens/StarterPack/StarterPackScreen.tsx:619
 msgid "Create list from members"
 msgstr ""
 
-#: src/components/dialogs/lists/CreateListFromStarterPackDialog.tsx:148
-#: src/components/dialogs/lists/CreateListFromStarterPackDialog.tsx:152
+#: src/components/dialogs/lists/CreateListFromStarterPackDialog.tsx:147
+#: src/components/dialogs/lists/CreateListFromStarterPackDialog.tsx:151
 msgid "Create list from starter pack"
 msgstr ""
 
-#: src/components/dialogs/lists/CreateOrEditListDialog.tsx:367
+#: src/components/dialogs/lists/CreateOrEditListDialog.tsx:375
 msgid "Create moderation list"
 msgstr ""
 
-#: src/screens/Messages/JoinRequest.tsx:304
+#: src/screens/Messages/JoinRequest.tsx:312
 #: src/view/com/auth/SplashScreen.tsx:89
 #: src/view/com/auth/SplashScreen.web.tsx:110
 msgid "Create new account"
 msgstr ""
 
-#: src/screens/Messages/ConversationSettings/index.tsx:554
+#: src/screens/Messages/ConversationSettings/index.tsx:549
 msgid "Create or modify an invite link for this group chat"
 msgstr "Create or modify an invite link for this group chat"
 
 #. Accessibility label for button to create a moderation report for the selected option
 #. placeholder {0}: option.title
-#: src/components/moderation/ReportDialog/index.tsx:834
-#: src/components/moderation/ReportDialog/index.tsx:879
+#: src/components/moderation/ReportDialog/index.tsx:835
+#: src/components/moderation/ReportDialog/index.tsx:880
 msgid "Create report for {0}"
 msgstr ""
 
-#: src/components/dialogs/StarterPackDialog.tsx:108
-#: src/components/dialogs/StarterPackDialog.tsx:205
+#: src/components/dialogs/StarterPackDialog.tsx:105
+#: src/components/dialogs/StarterPackDialog.tsx:202
 msgid "Create starter pack"
 msgstr ""
 
-#: src/components/dialogs/lists/CreateOrEditListDialog.tsx:366
+#: src/components/dialogs/lists/CreateOrEditListDialog.tsx:374
 msgid "Create user list"
 msgstr ""
 
 #. placeholder {0}: i18n.date(appPassword.createdAt, { year: 'numeric', month: 'numeric', day: 'numeric', hour: '2-digit', minute: '2-digit', })
 #. placeholder {0}: i18n.date(createdAt, { dateStyle: 'long', timeStyle: 'short', })
 #. placeholder {0}: i18n.date(createdAt, { month: 'long', day: 'numeric', year: 'numeric', })
-#: src/screens/Messages/components/InviteLinkDialog.tsx:355
-#: src/screens/Messages/ConversationSettings/index.tsx:509
+#: src/screens/Messages/components/InviteLinkDialog.tsx:352
+#: src/screens/Messages/ConversationSettings/index.tsx:504
 #: src/screens/Settings/AppPasswords.tsx:174
 msgid "Created {0}"
 msgstr ""
@@ -3740,7 +3740,7 @@ msgstr ""
 msgid "Current beta features"
 msgstr "Current beta features"
 
-#: src/components/moderation/BlockDialog.tsx:375
+#: src/components/moderation/BlockDialog.tsx:376
 msgid "Current chat"
 msgstr "Current chat"
 
@@ -3749,7 +3749,7 @@ msgstr "Current chat"
 msgid "Custom"
 msgstr ""
 
-#: src/components/dialogs/Embed.tsx:140
+#: src/components/dialogs/Embed.tsx:141
 msgid "Customization options"
 msgstr ""
 
@@ -3757,16 +3757,16 @@ msgstr ""
 msgid "Customizes your Bluesky experience"
 msgstr ""
 
-#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:200
+#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:202
 msgid "Dangerous challenges or activities"
 msgstr ""
 
-#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:204
+#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:206
 msgid "Dangerous substances or drug abuse"
 msgstr ""
 
-#: src/components/dialogs/Embed.tsx:164
-#: src/components/dialogs/Embed.tsx:166
+#: src/components/dialogs/Embed.tsx:165
+#: src/components/dialogs/Embed.tsx:167
 #: src/screens/Settings/AppearanceSettings.tsx:91
 #: src/screens/Settings/AppearanceSettings.tsx:112
 msgid "Dark"
@@ -3795,11 +3795,11 @@ msgstr "Day"
 
 #: src/screens/Settings/AccountSettings.tsx:177
 #: src/screens/Settings/AccountSettings.tsx:182
-#: src/screens/Settings/components/DeactivateAccountDialog.tsx:73
+#: src/screens/Settings/components/DeactivateAccountDialog.tsx:74
 msgid "Deactivate account"
 msgstr ""
 
-#: src/screens/Settings/Settings.tsx:482
+#: src/screens/Settings/Settings.tsx:484
 msgid "Debug Moderation"
 msgstr ""
 
@@ -3807,7 +3807,7 @@ msgstr ""
 msgid "Decline this language suggestion"
 msgstr "Decline this language suggestion"
 
-#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:84
+#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:85
 msgid "Deepfake adult content"
 msgstr ""
 
@@ -3820,12 +3820,12 @@ msgid "Default icons"
 msgstr ""
 
 #: src/components/dms/MessageOverlays.tsx:184
-#: src/components/PostControls/PostMenu/PostMenuItems.tsx:828
-#: src/screens/ProfileList/components/MoreOptionsMenu.tsx:275
+#: src/components/PostControls/PostMenu/PostMenuItems.tsx:824
+#: src/screens/ProfileList/components/MoreOptionsMenu.tsx:276
 #: src/screens/Settings/AppPasswords.tsx:213
-#: src/screens/StarterPack/StarterPackScreen.tsx:615
-#: src/screens/StarterPack/StarterPackScreen.tsx:715
-#: src/screens/StarterPack/StarterPackScreen.tsx:794
+#: src/screens/StarterPack/StarterPackScreen.tsx:608
+#: src/screens/StarterPack/StarterPackScreen.tsx:708
+#: src/screens/StarterPack/StarterPackScreen.tsx:787
 msgid "Delete"
 msgstr ""
 
@@ -3834,8 +3834,8 @@ msgstr ""
 msgid "Delete account"
 msgstr ""
 
-#: src/screens/Settings/components/DeleteAccountDialog.tsx:183
-#: src/screens/Settings/components/DeleteAccountDialog.tsx:230
+#: src/screens/Settings/components/DeleteAccountDialog.tsx:189
+#: src/screens/Settings/components/DeleteAccountDialog.tsx:236
 msgid "Delete account “{currentHandle}”"
 msgstr ""
 
@@ -3852,12 +3852,12 @@ msgstr ""
 msgid "Delete chat"
 msgstr ""
 
-#: src/screens/Settings/Settings.tsx:487
 #: src/screens/Settings/Settings.tsx:489
+#: src/screens/Settings/Settings.tsx:491
 msgid "Delete chat declaration record"
 msgstr ""
 
-#: src/screens/Settings/FindContactsSettings.tsx:567
+#: src/screens/Settings/FindContactsSettings.tsx:571
 msgid "Delete contacts"
 msgstr ""
 
@@ -3869,12 +3869,12 @@ msgstr ""
 msgid "Delete conversation"
 msgstr ""
 
-#: src/components/dms/MessageContextMenu.tsx:212
+#: src/components/dms/MessageContextMenu.tsx:210
 msgid "Delete for me"
 msgstr ""
 
-#: src/screens/ProfileList/components/MoreOptionsMenu.tsx:199
-#: src/screens/ProfileList/components/MoreOptionsMenu.tsx:202
+#: src/screens/ProfileList/components/MoreOptionsMenu.tsx:200
+#: src/screens/ProfileList/components/MoreOptionsMenu.tsx:203
 msgid "Delete list"
 msgstr ""
 
@@ -3882,38 +3882,38 @@ msgstr ""
 msgid "Delete message"
 msgstr ""
 
-#: src/components/dms/MessageContextMenu.tsx:209
+#: src/components/dms/MessageContextMenu.tsx:207
 msgid "Delete message for me"
 msgstr ""
 
-#: src/screens/Settings/components/DeleteAccountDialog.tsx:309
+#: src/screens/Settings/components/DeleteAccountDialog.tsx:315
 msgid "Delete my account"
 msgstr ""
 
-#: src/components/PostControls/PostMenu/PostMenuItems.tsx:812
-#: src/components/PostControls/PostMenu/PostMenuItems.tsx:814
-#: src/view/com/composer/Composer.tsx:1745
+#: src/components/PostControls/PostMenu/PostMenuItems.tsx:808
+#: src/components/PostControls/PostMenu/PostMenuItems.tsx:810
+#: src/view/com/composer/Composer.tsx:1769
 msgid "Delete post"
 msgstr ""
 
-#: src/screens/StarterPack/StarterPackScreen.tsx:609
-#: src/screens/StarterPack/StarterPackScreen.tsx:785
+#: src/screens/StarterPack/StarterPackScreen.tsx:602
+#: src/screens/StarterPack/StarterPackScreen.tsx:778
 msgid "Delete starter pack"
 msgstr ""
 
-#: src/screens/StarterPack/StarterPackScreen.tsx:681
+#: src/screens/StarterPack/StarterPackScreen.tsx:674
 msgid "Delete starter pack?"
 msgstr ""
 
-#: src/screens/ProfileList/components/MoreOptionsMenu.tsx:270
+#: src/screens/ProfileList/components/MoreOptionsMenu.tsx:271
 msgid "Delete this list?"
 msgstr ""
 
-#: src/components/PostControls/PostMenu/PostMenuItems.tsx:825
+#: src/components/PostControls/PostMenu/PostMenuItems.tsx:821
 msgid "Delete this post?"
 msgstr ""
 
-#: src/components/Post/Embed/index.tsx:206
+#: src/components/Post/Embed/index.tsx:207
 msgid "Deleted"
 msgstr ""
 
@@ -3934,7 +3934,7 @@ msgstr ""
 msgid "Deleted list"
 msgstr ""
 
-#: src/components/dialogs/lists/CreateOrEditListDialog.tsx:453
+#: src/components/dialogs/lists/CreateOrEditListDialog.tsx:461
 #: src/components/SendErrorReportDialog.tsx:78
 #: src/screens/Profile/Header/EditProfileDialog.tsx:360
 #: src/screens/Profile/Header/EditProfileDialog.tsx:367
@@ -3950,12 +3950,12 @@ msgstr "Description (1000 characters max)"
 msgid "Descriptive alt text"
 msgstr ""
 
-#: src/components/PostControls/PostMenu/PostMenuItems.tsx:716
-#: src/components/PostControls/PostMenu/PostMenuItems.tsx:726
+#: src/components/PostControls/PostMenu/PostMenuItems.tsx:712
+#: src/components/PostControls/PostMenu/PostMenuItems.tsx:722
 msgid "Detach quote"
 msgstr ""
 
-#: src/components/PostControls/PostMenu/PostMenuItems.tsx:861
+#: src/components/PostControls/PostMenu/PostMenuItems.tsx:857
 msgid "Detach quote post?"
 msgstr ""
 
@@ -3969,8 +3969,8 @@ msgctxt "toast"
 msgid "Developer mode enabled"
 msgstr ""
 
-#: src/screens/Settings/Settings.tsx:292
-#: src/screens/Settings/Settings.tsx:295
+#: src/screens/Settings/Settings.tsx:294
+#: src/screens/Settings/Settings.tsx:297
 msgid "Developer options"
 msgstr ""
 
@@ -3978,7 +3978,7 @@ msgstr ""
 msgid "Device failed to translate :("
 msgstr "Device failed to translate :("
 
-#: src/components/WhoCanReply.tsx:222
+#: src/components/WhoCanReply.tsx:215
 msgid "Dialog: adjust who can interact with this post"
 msgstr ""
 
@@ -3990,8 +3990,8 @@ msgstr "Dialog: Set search filters"
 msgid "Dim"
 msgstr ""
 
-#: src/screens/Messages/components/InviteLinkDialog.tsx:385
-#: src/screens/Messages/components/InviteLinkDialog.tsx:390
+#: src/screens/Messages/components/InviteLinkDialog.tsx:382
+#: src/screens/Messages/components/InviteLinkDialog.tsx:387
 msgid "Disable"
 msgstr "Disable"
 
@@ -4008,7 +4008,7 @@ msgstr "Disable captions"
 msgid "Disable email 2FA"
 msgstr ""
 
-#: src/screens/Settings/components/DisableEmail2FADialog.tsx:90
+#: src/screens/Settings/components/DisableEmail2FADialog.tsx:98
 msgid "Disable Email 2FA"
 msgstr ""
 
@@ -4017,20 +4017,20 @@ msgstr ""
 msgid "Disable haptic feedback"
 msgstr ""
 
-#: src/screens/Messages/components/InviteLinkDialog.tsx:488
-#: src/screens/Messages/components/InviteLinkDialog.tsx:494
+#: src/screens/Messages/components/InviteLinkDialog.tsx:485
+#: src/screens/Messages/components/InviteLinkDialog.tsx:491
 msgid "Disable link"
 msgstr "Disable link"
 
-#: src/components/dialogs/PostInteractionSettingsDialog.tsx:628
+#: src/components/dialogs/PostInteractionSettingsDialog.tsx:625
 msgid "Disable quote posts of this post"
 msgstr ""
 
-#: src/components/dialogs/PostInteractionSettingsDialog.tsx:465
+#: src/components/dialogs/PostInteractionSettingsDialog.tsx:462
 msgid "Disable replies entirely"
 msgstr ""
 
-#: src/screens/Messages/components/InviteLinkDialog.tsx:475
+#: src/screens/Messages/components/InviteLinkDialog.tsx:472
 msgid "Disable this invite link?"
 msgstr "Disable this invite link?"
 
@@ -4041,43 +4041,43 @@ msgstr "Disable this invite link?"
 msgid "Disabled"
 msgstr ""
 
-#: src/components/dialogs/lists/CreateOrEditListDialog.tsx:101
+#: src/components/dialogs/lists/CreateOrEditListDialog.tsx:102
 #: src/screens/Profile/Header/EditProfileDialog.tsx:79
-#: src/view/com/composer/Composer.tsx:1525
-#: src/view/com/composer/Composer.tsx:1569
-#: src/view/com/composer/Composer.tsx:1778
+#: src/view/com/composer/Composer.tsx:1549
+#: src/view/com/composer/Composer.tsx:1593
+#: src/view/com/composer/Composer.tsx:1802
 #: src/view/com/composer/drafts/DraftItem.tsx:242
 #: src/view/com/composer/drafts/DraftsButton.tsx:131
 msgid "Discard"
 msgstr ""
 
-#: src/components/dialogs/lists/CreateOrEditListDialog.tsx:98
+#: src/components/dialogs/lists/CreateOrEditListDialog.tsx:99
 #: src/screens/Profile/Header/EditProfileDialog.tsx:76
 msgid "Discard changes?"
 msgstr ""
 
-#: src/view/com/composer/Composer.tsx:1523
+#: src/view/com/composer/Composer.tsx:1547
 #: src/view/com/composer/drafts/DraftItem.tsx:239
 #: src/view/com/composer/drafts/DraftsButton.tsx:98
 msgid "Discard draft?"
 msgstr ""
 
-#: src/view/com/composer/Composer.tsx:1540
-#: src/view/com/composer/Composer.tsx:1770
+#: src/view/com/composer/Composer.tsx:1564
+#: src/view/com/composer/Composer.tsx:1794
 msgid "Discard post?"
 msgstr ""
 
-#: src/screens/Profile/components/GermButton.tsx:262
-#: src/screens/Profile/components/GermButton.tsx:269
+#: src/screens/Profile/components/GermButton.tsx:263
+#: src/screens/Profile/components/GermButton.tsx:270
 msgid "Disconnect Germ DM"
 msgstr ""
 
-#: src/screens/Settings/components/PwiOptOut.tsx:88
-#: src/screens/Settings/components/PwiOptOut.tsx:92
+#: src/screens/Settings/components/PwiOptOut.tsx:89
+#: src/screens/Settings/components/PwiOptOut.tsx:93
 msgid "Discourage apps from showing my account to logged-out users"
 msgstr ""
 
-#: src/screens/Search/Explore.tsx:448
+#: src/screens/Search/Explore.tsx:444
 msgid "Discover feeds"
 msgstr "Discover feeds"
 
@@ -4101,7 +4101,7 @@ msgstr ""
 msgid "Dismiss banner"
 msgstr ""
 
-#: src/view/com/composer/Composer.tsx:2629
+#: src/view/com/composer/Composer.tsx:2653
 msgid "Dismiss error"
 msgstr ""
 
@@ -4118,7 +4118,7 @@ msgstr ""
 msgid "Dismiss live event banner"
 msgstr ""
 
-#: src/components/interstitials/TrendingVideos.tsx:89
+#: src/components/interstitials/TrendingVideos.tsx:91
 msgid "Dismiss this section"
 msgstr ""
 
@@ -4149,7 +4149,7 @@ msgstr ""
 msgid "DNS Panel"
 msgstr ""
 
-#: src/components/dialogs/MutedWords.tsx:311
+#: src/components/dialogs/MutedWords.tsx:313
 msgid "Do not apply this mute word to users you follow"
 msgstr ""
 
@@ -4165,7 +4165,7 @@ msgstr ""
 msgid "Don't have a code or need a new one? <0>Click here.</0>"
 msgstr ""
 
-#: src/screens/Settings/components/DeleteAccountDialog.tsx:269
+#: src/screens/Settings/components/DeleteAccountDialog.tsx:275
 msgid "Don’t see a code? <0>Click here to resend.</0>"
 msgstr ""
 
@@ -4184,8 +4184,8 @@ msgstr ""
 
 #: src/components/contacts/components/InviteInfo.tsx:73
 #: src/components/contacts/components/InviteInfo.tsx:79
-#: src/components/contacts/screens/ViewMatches.tsx:395
-#: src/components/contacts/screens/ViewMatches.tsx:412
+#: src/components/contacts/screens/ViewMatches.tsx:403
+#: src/components/contacts/screens/ViewMatches.tsx:420
 #: src/components/dialogs/BirthDateSettings.tsx:193
 #: src/components/dialogs/BirthDateSettings.tsx:200
 #: src/components/dialogs/EmailDialog/screens/Verify.tsx:195
@@ -4214,7 +4214,7 @@ msgstr ""
 msgid "Done"
 msgstr ""
 
-#: src/components/dms/MessageItem.tsx:541
+#: src/components/dms/MessageItem.tsx:556
 msgid "Double tap or long press the message to add a reaction"
 msgstr ""
 
@@ -4222,7 +4222,7 @@ msgstr ""
 msgid "Double tap to close the dialog"
 msgstr ""
 
-#: src/screens/VideoFeed/index.tsx:1200
+#: src/screens/VideoFeed/index.tsx:1196
 msgid "Double tap to like"
 msgstr ""
 
@@ -4230,15 +4230,15 @@ msgstr ""
 msgid "Download"
 msgstr "Download"
 
-#: src/screens/StarterPack/StarterPackLandingScreen.tsx:329
+#: src/screens/StarterPack/StarterPackLandingScreen.tsx:321
 msgid "Download Bluesky"
 msgstr ""
 
-#: src/screens/Settings/components/ExportCarDialog.tsx:149
+#: src/screens/Settings/components/ExportCarDialog.tsx:155
 msgid "Download chat data"
 msgstr ""
 
-#: src/screens/Settings/components/ExportCarDialog.tsx:154
+#: src/screens/Settings/components/ExportCarDialog.tsx:160
 msgctxt "button"
 msgid "Download chat data"
 msgstr "Download chat data"
@@ -4252,16 +4252,16 @@ msgstr "Download image"
 msgid "Download invite QR code"
 msgstr "Download invite QR code"
 
-#: src/screens/Settings/components/ExportCarDialog.tsx:118
+#: src/screens/Settings/components/ExportCarDialog.tsx:124
 msgid "Download profile data"
 msgstr "Download profile data"
 
-#: src/screens/Settings/components/ExportCarDialog.tsx:123
+#: src/screens/Settings/components/ExportCarDialog.tsx:129
 msgctxt "button"
 msgid "Download profile data"
 msgstr "Download profile data"
 
-#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:115
+#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:116
 msgid "Doxxing"
 msgstr ""
 
@@ -4272,7 +4272,7 @@ msgstr ""
 msgid "Drafts"
 msgstr ""
 
-#: src/view/com/composer/text-input/TextInput.web.tsx:369
+#: src/view/com/composer/text-input/TextInput.web.tsx:371
 msgid "Drop to add images"
 msgstr ""
 
@@ -4280,7 +4280,7 @@ msgstr ""
 msgid "Due to laws in your region, certain features on Bluesky are currently restricted until you're able to verify you're an adult."
 msgstr ""
 
-#: src/components/dialogs/MutedWords.tsx:162
+#: src/components/dialogs/MutedWords.tsx:164
 msgid "Duration:"
 msgstr ""
 
@@ -4304,32 +4304,32 @@ msgstr ""
 msgid "E.g. artistic nudes."
 msgstr ""
 
-#: src/components/dialogs/lists/CreateOrEditListDialog.tsx:370
+#: src/components/dialogs/lists/CreateOrEditListDialog.tsx:378
 msgid "e.g. Great Posters"
 msgstr ""
 
-#: src/components/dialogs/lists/CreateOrEditListDialog.tsx:371
+#: src/components/dialogs/lists/CreateOrEditListDialog.tsx:379
 msgid "e.g. Spammers"
 msgstr ""
 
-#: src/components/dialogs/lists/CreateOrEditListDialog.tsx:374
+#: src/components/dialogs/lists/CreateOrEditListDialog.tsx:382
 msgid "e.g. The posters who never miss."
 msgstr ""
 
-#: src/components/dialogs/lists/CreateOrEditListDialog.tsx:375
+#: src/components/dialogs/lists/CreateOrEditListDialog.tsx:383
 msgid "e.g. Users that repeatedly reply with ads."
 msgstr ""
 
-#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:196
+#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:198
 msgid "Eating disorders"
 msgstr ""
 
 #: src/screens/Messages/components/EditTextButton.tsx:52
 #: src/screens/Settings/AccountSettings.tsx:148
 #: src/screens/Settings/NotificationSettings/ActivityNotificationSettings.tsx:250
-#: src/screens/StarterPack/StarterPackScreen.tsx:604
-#: src/screens/StarterPack/Wizard/index.tsx:331
-#: src/screens/StarterPack/Wizard/index.tsx:336
+#: src/screens/StarterPack/StarterPackScreen.tsx:597
+#: src/screens/StarterPack/Wizard/index.tsx:327
+#: src/screens/StarterPack/Wizard/index.tsx:332
 msgid "Edit"
 msgstr ""
 
@@ -4344,7 +4344,7 @@ msgstr ""
 msgid "Edit avatar"
 msgstr ""
 
-#: src/components/StarterPack/Wizard/WizardEditListDialog.tsx:116
+#: src/components/StarterPack/Wizard/WizardEditListDialog.tsx:113
 msgid "Edit Feeds"
 msgstr ""
 
@@ -4359,8 +4359,8 @@ msgstr "Edit group name"
 msgid "Edit image"
 msgstr ""
 
-#: src/components/PostControls/PostMenu/PostMenuItems.tsx:793
-#: src/components/PostControls/PostMenu/PostMenuItems.tsx:806
+#: src/components/PostControls/PostMenu/PostMenuItems.tsx:789
+#: src/components/PostControls/PostMenu/PostMenuItems.tsx:802
 msgid "Edit interaction settings"
 msgstr ""
 
@@ -4369,21 +4369,21 @@ msgstr ""
 msgid "Edit interests"
 msgstr ""
 
-#: src/screens/Messages/JoinRequests.tsx:299
+#: src/screens/Messages/JoinRequests.tsx:296
 msgid "Edit invite link"
 msgstr "Edit invite link"
 
-#: src/screens/Messages/JoinRequests.tsx:305
+#: src/screens/Messages/JoinRequests.tsx:302
 msgctxt "button"
 msgid "Edit invite link"
 msgstr "Edit invite link"
 
-#: src/screens/Messages/components/InviteLinkDialog.tsx:369
+#: src/screens/Messages/components/InviteLinkDialog.tsx:366
 msgid "Edit link settings"
 msgstr "Edit link settings"
 
-#: src/screens/ProfileList/components/MoreOptionsMenu.tsx:191
-#: src/screens/ProfileList/components/MoreOptionsMenu.tsx:194
+#: src/screens/ProfileList/components/MoreOptionsMenu.tsx:192
+#: src/screens/ProfileList/components/MoreOptionsMenu.tsx:195
 msgid "Edit list details"
 msgstr ""
 
@@ -4392,7 +4392,7 @@ msgstr ""
 msgid "Edit live status"
 msgstr ""
 
-#: src/components/dialogs/lists/CreateOrEditListDialog.tsx:364
+#: src/components/dialogs/lists/CreateOrEditListDialog.tsx:372
 msgid "Edit moderation list"
 msgstr ""
 
@@ -4401,7 +4401,7 @@ msgstr ""
 msgid "Edit My Feeds"
 msgstr ""
 
-#: src/screens/Messages/ConversationSettings/index.tsx:544
+#: src/screens/Messages/ConversationSettings/index.tsx:539
 msgid "Edit name"
 msgstr "Edit name"
 
@@ -4410,41 +4410,41 @@ msgstr "Edit name"
 msgid "Edit notifications from {0}"
 msgstr "Edit notifications from {0}"
 
-#: src/components/StarterPack/Wizard/WizardEditListDialog.tsx:114
+#: src/components/StarterPack/Wizard/WizardEditListDialog.tsx:111
 msgid "Edit People"
 msgstr ""
 
-#: src/components/dialogs/PostInteractionSettingsDialog.tsx:116
-#: src/components/dialogs/PostInteractionSettingsDialog.tsx:266
+#: src/components/dialogs/PostInteractionSettingsDialog.tsx:113
+#: src/components/dialogs/PostInteractionSettingsDialog.tsx:263
 msgid "Edit post interaction settings"
 msgstr ""
 
 #: src/screens/Profile/Header/EditProfileDialog.tsx:265
 #: src/screens/Profile/Header/EditProfileDialog.tsx:271
-#: src/screens/Profile/Header/ProfileHeaderLabeler.tsx:305
+#: src/screens/Profile/Header/ProfileHeaderLabeler.tsx:301
 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:330
 msgid "Edit profile"
 msgstr ""
 
-#: src/screens/Profile/Header/ProfileHeaderLabeler.tsx:308
+#: src/screens/Profile/Header/ProfileHeaderLabeler.tsx:304
 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:332
 msgid "Edit Profile"
 msgstr ""
 
-#: src/screens/StarterPack/StarterPackScreen.tsx:596
+#: src/screens/StarterPack/StarterPackScreen.tsx:589
 msgid "Edit starter pack"
 msgstr ""
 
-#: src/screens/Messages/ConversationSettings/index.tsx:493
-#: src/screens/Messages/ConversationSettings/index.tsx:543
+#: src/screens/Messages/ConversationSettings/index.tsx:488
+#: src/screens/Messages/ConversationSettings/index.tsx:538
 msgid "Edit this group chat’s name"
 msgstr "Edit this group chat’s name"
 
-#: src/components/dialogs/lists/CreateOrEditListDialog.tsx:363
+#: src/components/dialogs/lists/CreateOrEditListDialog.tsx:371
 msgid "Edit user list"
 msgstr ""
 
-#: src/components/WhoCanReply.tsx:116
+#: src/components/WhoCanReply.tsx:109
 msgid "Edit who can reply"
 msgstr ""
 
@@ -4465,7 +4465,7 @@ msgstr ""
 msgid "Email"
 msgstr ""
 
-#: src/screens/Settings/components/DisableEmail2FADialog.tsx:65
+#: src/screens/Settings/components/DisableEmail2FADialog.tsx:68
 msgctxt "toast"
 msgid "Email 2FA disabled"
 msgstr ""
@@ -4474,11 +4474,11 @@ msgstr ""
 msgid "Email 2FA enabled"
 msgstr ""
 
-#: src/screens/Login/ForgotPasswordForm.tsx:90
+#: src/screens/Login/ForgotPasswordForm.tsx:94
 msgid "Email address"
 msgstr ""
 
-#: src/components/intents/VerifyEmailIntentDialog.tsx:99
+#: src/components/intents/VerifyEmailIntentDialog.tsx:100
 msgid "Email Resent"
 msgstr ""
 
@@ -4486,7 +4486,7 @@ msgstr ""
 msgid "Email sent!"
 msgstr ""
 
-#: src/screens/Settings/components/DeleteAccountDialog.tsx:260
+#: src/screens/Settings/components/DeleteAccountDialog.tsx:266
 msgid "Email sent! <0>Click here to resend.</0>"
 msgstr ""
 
@@ -4494,22 +4494,22 @@ msgstr ""
 msgid "Email verification complete!"
 msgstr ""
 
-#: src/components/intents/VerifyEmailIntentDialog.tsx:74
+#: src/components/intents/VerifyEmailIntentDialog.tsx:75
 msgid "Email Verified"
 msgstr ""
 
-#: src/components/dialogs/Embed.tsx:178
+#: src/components/dialogs/Embed.tsx:179
 msgid "Embed HTML code"
 msgstr ""
 
-#: src/components/dialogs/Embed.tsx:105
-#: src/components/dialogs/Embed.tsx:109
+#: src/components/dialogs/Embed.tsx:106
+#: src/components/dialogs/Embed.tsx:110
 #: src/components/PostControls/ShareMenu/ShareMenuItems.web.tsx:118
 #: src/components/PostControls/ShareMenu/ShareMenuItems.web.tsx:123
 msgid "Embed post"
 msgstr ""
 
-#: src/components/dialogs/Embed.tsx:113
+#: src/components/dialogs/Embed.tsx:114
 msgid "Embed this post in your website. Simply copy the following snippet and paste it into the HTML code of your website."
 msgstr ""
 
@@ -4569,7 +4569,7 @@ msgstr ""
 msgid "Enable push notifications"
 msgstr ""
 
-#: src/components/dialogs/PostInteractionSettingsDialog.tsx:629
+#: src/components/dialogs/PostInteractionSettingsDialog.tsx:626
 msgid "Enable quote posts of this post"
 msgstr ""
 
@@ -4599,22 +4599,22 @@ msgstr ""
 msgid "Ensure you have selected a language for each caption file."
 msgstr "Ensure you have selected a language for each caption file."
 
-#: src/components/contacts/screens/VerifyNumber.tsx:231
+#: src/components/contacts/screens/VerifyNumber.tsx:234
 msgid "Enter 6-digit code that was sent to your phone number"
 msgstr ""
 
-#: src/screens/Login/SetNewPasswordForm.tsx:136
+#: src/screens/Login/SetNewPasswordForm.tsx:141
 msgid "Enter a password"
 msgstr ""
 
-#: src/components/dialogs/MutedWords.tsx:136
-#: src/components/dialogs/MutedWords.tsx:137
+#: src/components/dialogs/MutedWords.tsx:138
+#: src/components/dialogs/MutedWords.tsx:139
 msgid "Enter a word or tag"
 msgstr ""
 
 #: src/components/dialogs/EmailDialog/screens/Manage2FA/Disable.tsx:199
 #: src/components/dialogs/EmailDialog/screens/Verify.tsx:328
-#: src/screens/Settings/components/ChangePasswordDialog.tsx:64
+#: src/screens/Settings/components/ChangePasswordDialog.tsx:66
 msgid "Enter code"
 msgstr ""
 
@@ -4622,7 +4622,7 @@ msgstr ""
 msgid "Enter fullscreen"
 msgstr ""
 
-#: src/components/contacts/screens/VerifyNumber.tsx:226
+#: src/components/contacts/screens/VerifyNumber.tsx:229
 msgid "Enter the 6-digit code sent to {prettyNumber}"
 msgstr ""
 
@@ -4630,11 +4630,11 @@ msgstr ""
 msgid "Enter the domain you want to use"
 msgstr ""
 
-#: src/screens/Login/ForgotPasswordForm.tsx:109
+#: src/screens/Login/ForgotPasswordForm.tsx:113
 msgid "Enter the email you used to create your account. We'll send you a \"reset code\" so you can set a new password."
 msgstr ""
 
-#: src/screens/Login/LoginForm.tsx:337
+#: src/screens/Login/LoginForm.tsx:338
 msgid "Enter the username or email address you used when you created your account"
 msgstr ""
 
@@ -4642,13 +4642,13 @@ msgstr ""
 msgid "Enter your birthdate"
 msgstr ""
 
-#: src/screens/Login/ForgotPasswordForm.tsx:96
+#: src/screens/Login/ForgotPasswordForm.tsx:100
 #: src/screens/Signup/StepInfo/index.tsx:243
 msgid "Enter your email address"
 msgstr ""
 
-#: src/screens/Login/LoginForm.tsx:389
-#: src/screens/Settings/components/DeleteAccountDialog.tsx:291
+#: src/screens/Login/LoginForm.tsx:390
+#: src/screens/Settings/components/DeleteAccountDialog.tsx:297
 msgid "Enter your password"
 msgstr ""
 
@@ -4660,16 +4660,16 @@ msgstr ""
 msgid "Enters full screen"
 msgstr ""
 
-#: src/screens/Search/modules/ExploreTrendingTopics.tsx:246
+#: src/screens/Search/modules/ExploreTrendingTopics.tsx:244
 msgid "Entertainment"
 msgstr ""
 
-#: src/view/com/composer/Composer.tsx:2707
+#: src/view/com/composer/Composer.tsx:2731
 #: src/view/com/util/error/ErrorScreen.tsx:40
 msgid "Error"
 msgstr ""
 
-#: src/screens/Settings/FindContactsSettings.tsx:95
+#: src/screens/Settings/FindContactsSettings.tsx:93
 msgid "Error getting the latest data."
 msgstr ""
 
@@ -4685,8 +4685,8 @@ msgstr ""
 msgid "Error message"
 msgstr ""
 
-#: src/screens/Settings/components/ExportCarDialog.tsx:47
-#: src/screens/Settings/components/ExportCarDialog.tsx:80
+#: src/screens/Settings/components/ExportCarDialog.tsx:55
+#: src/screens/Settings/components/ExportCarDialog.tsx:86
 msgid "Error occurred while saving file"
 msgstr ""
 
@@ -4698,11 +4698,11 @@ msgstr ""
 msgid "Error: {error}"
 msgstr ""
 
-#: src/components/WhoCanReply.tsx:85
+#: src/components/WhoCanReply.tsx:78
 msgid "Everybody can reply"
 msgstr ""
 
-#: src/components/WhoCanReply.tsx:279
+#: src/components/WhoCanReply.tsx:272
 msgid "Everybody can reply to this post."
 msgstr ""
 
@@ -4740,11 +4740,11 @@ msgstr "Everything look right?"
 msgid "Exclude"
 msgstr "Exclude"
 
-#: src/components/dialogs/MutedWords.tsx:320
+#: src/components/dialogs/MutedWords.tsx:322
 msgid "Exclude users you follow"
 msgstr ""
 
-#: src/components/dialogs/MutedWords.tsx:605
+#: src/components/dialogs/MutedWords.tsx:607
 msgid "Excludes users you follow"
 msgstr ""
 
@@ -4757,11 +4757,11 @@ msgstr ""
 msgid "Expand alt text"
 msgstr ""
 
-#: src/view/com/notifications/NotificationFeedItem.tsx:602
+#: src/view/com/notifications/NotificationFeedItem.tsx:594
 msgid "Expand list of users"
 msgstr ""
 
-#: src/view/com/composer/ComposerReplyTo.tsx:103
+#: src/view/com/composer/ComposerReplyTo.tsx:98
 msgid "Expand or collapse the full post you are replying to"
 msgstr ""
 
@@ -4769,11 +4769,11 @@ msgstr ""
 msgid "Expand post text"
 msgstr ""
 
-#: src/screens/VideoFeed/index.tsx:1076
+#: src/screens/VideoFeed/index.tsx:1072
 msgid "Expands or collapses post text"
 msgstr ""
 
-#: src/lib/api/index.ts:490
+#: src/lib/api/index.ts:500
 msgid "Expected uri to resolve to a record"
 msgstr ""
 
@@ -4781,12 +4781,12 @@ msgstr ""
 msgid "Experimental"
 msgstr ""
 
-#: src/components/dialogs/MutedWords.tsx:520
+#: src/components/dialogs/MutedWords.tsx:522
 msgid "Expired"
 msgstr ""
 
 #. placeholder {0}: formatDistance(expiryDate, new Date(), { addSuffix: true, })
-#: src/components/dialogs/MutedWords.tsx:589
+#: src/components/dialogs/MutedWords.tsx:591
 msgid "Expires {0}"
 msgstr ""
 
@@ -4799,7 +4799,7 @@ msgstr ""
 
 #. placeholder {0}: displayDuration(i18n, minutesUntilExpiry)
 #. placeholder {1}: i18n.date(expiryDateTime, { hour: 'numeric', minute: '2-digit', hour12: true, })
-#: src/features/liveNow/components/EditLiveDialog.tsx:125
+#: src/features/liveNow/components/EditLiveDialog.tsx:127
 msgid "Expires in {0} at {1}"
 msgstr ""
 
@@ -4826,7 +4826,7 @@ msgstr ""
 
 #: src/screens/Messages/Settings.tsx:329
 #: src/screens/Messages/Settings.tsx:338
-#: src/screens/Settings/components/ExportCarDialog.tsx:130
+#: src/screens/Settings/components/ExportCarDialog.tsx:136
 msgid "Export my chat data"
 msgstr "Export my chat data"
 
@@ -4835,7 +4835,7 @@ msgstr "Export my chat data"
 msgid "Export my data"
 msgstr ""
 
-#: src/screens/Settings/components/ExportCarDialog.tsx:97
+#: src/screens/Settings/components/ExportCarDialog.tsx:103
 msgid "Export my profile data"
 msgstr "Export my profile data"
 
@@ -4859,7 +4859,7 @@ msgstr ""
 msgid "External Media Preferences"
 msgstr ""
 
-#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:146
+#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:147
 msgid "Extremist content"
 msgstr ""
 
@@ -4868,12 +4868,12 @@ msgctxt "toast"
 msgid "Failed to accept chat"
 msgstr ""
 
-#: src/screens/Messages/JoinRequests.tsx:190
+#: src/screens/Messages/JoinRequests.tsx:187
 msgid "Failed to accept join request"
 msgstr "Failed to accept join request"
 
-#: src/components/dms/ActionsWrapper.web.tsx:92
-#: src/components/dms/MessageContextMenu.tsx:140
+#: src/components/dms/ActionsWrapper.web.tsx:93
+#: src/components/dms/MessageContextMenu.tsx:138
 msgid "Failed to add emoji reaction"
 msgstr ""
 
@@ -4886,7 +4886,7 @@ msgstr "Failed to add members"
 msgid "Failed to add to list"
 msgstr "Failed to add to list"
 
-#: src/components/dialogs/StarterPackDialog.tsx:280
+#: src/components/dialogs/StarterPackDialog.tsx:277
 msgid "Failed to add to starter pack"
 msgstr ""
 
@@ -4909,12 +4909,12 @@ msgstr ""
 msgid "Failed to create conversation"
 msgstr ""
 
-#: src/screens/Messages/components/InviteLinkDialog.tsx:106
+#: src/screens/Messages/components/InviteLinkDialog.tsx:103
 msgid "Failed to create invite link"
 msgstr "Failed to create invite link"
 
-#: src/screens/StarterPack/Wizard/index.tsx:250
-#: src/screens/StarterPack/Wizard/index.tsx:260
+#: src/screens/StarterPack/Wizard/index.tsx:246
+#: src/screens/StarterPack/Wizard/index.tsx:256
 msgid "Failed to create starter pack"
 msgstr ""
 
@@ -4928,77 +4928,77 @@ msgstr ""
 msgid "Failed to delete message"
 msgstr ""
 
-#: src/components/PostControls/PostMenu/PostMenuItems.tsx:220
+#: src/components/PostControls/PostMenu/PostMenuItems.tsx:216
 msgid "Failed to delete post, please try again"
 msgstr ""
 
-#: src/screens/StarterPack/StarterPackScreen.tsx:754
+#: src/screens/StarterPack/StarterPackScreen.tsx:747
 msgid "Failed to delete starter pack"
 msgstr ""
 
-#: src/screens/Messages/components/InviteLinkDialog.tsx:132
+#: src/screens/Messages/components/InviteLinkDialog.tsx:129
 msgid "Failed to disable invite link"
 msgstr "Failed to disable invite link"
 
 #. placeholder {0}: error?.message
-#: src/screens/Profile/components/GermButton.tsx:196
+#: src/screens/Profile/components/GermButton.tsx:197
 msgid "Failed to disconnect Germ DM. Error: {0}"
 msgstr ""
 
-#: src/screens/Messages/ConversationSettings/index.tsx:381
+#: src/screens/Messages/ConversationSettings/index.tsx:375
 msgid "Failed to edit group chat name"
 msgstr "Failed to edit group chat name"
 
-#: src/screens/Messages/components/InviteLinkDialog.tsx:119
+#: src/screens/Messages/components/InviteLinkDialog.tsx:116
 msgid "Failed to edit invite link"
 msgstr "Failed to edit invite link"
 
-#: src/screens/Messages/components/InviteLinkDialog.tsx:142
+#: src/screens/Messages/components/InviteLinkDialog.tsx:139
 msgid "Failed to enable invite link"
 msgstr "Failed to enable invite link"
 
-#: src/screens/Onboarding/StepSuggestedAccounts/index.tsx:143
+#: src/screens/Onboarding/StepSuggestedAccounts/index.tsx:147
 msgid "Failed to follow all suggested accounts, please try again"
 msgstr ""
 
-#: src/components/contacts/screens/ViewMatches.tsx:148
+#: src/components/contacts/screens/ViewMatches.tsx:154
 msgid "Failed to follow all your friends, please try again"
 msgstr ""
 
-#: src/components/contacts/screens/ViewMatches.tsx:236
+#: src/components/contacts/screens/ViewMatches.tsx:244
 msgid "Failed to hide suggestion, please check your internet connection"
 msgstr ""
 
-#: src/components/intents/GroupChatJoinDialog.tsx:147
+#: src/components/intents/GroupChatJoinDialog.tsx:145
 msgid "Failed to join the group chat. Please try again."
 msgstr "Failed to join the group chat. Please try again."
 
-#: src/components/contacts/screens/ViewMatches.tsx:582
+#: src/components/contacts/screens/ViewMatches.tsx:590
 msgid "Failed to launch SMS app"
 msgstr ""
 
 #: src/screens/Messages/components/ChatEnded.tsx:41
-#: src/screens/Messages/components/ChatLocked.tsx:61
-#: src/screens/Messages/ConversationSettings/index.tsx:408
+#: src/screens/Messages/components/ChatLocked.tsx:65
+#: src/screens/Messages/ConversationSettings/index.tsx:402
 msgctxt "toast"
 msgid "Failed to leave group chat"
 msgstr "Failed to leave group chat"
 
 #: src/screens/Messages/ChatList.tsx:420
-#: src/screens/Messages/Inbox.tsx:202
+#: src/screens/Messages/Inbox.tsx:201
 msgid "Failed to load conversations"
 msgstr ""
 
-#: src/screens/Search/Explore.tsx:526
-#: src/screens/Search/Explore.tsx:571
-#: src/screens/Search/Explore.tsx:617
+#: src/screens/Search/Explore.tsx:522
+#: src/screens/Search/Explore.tsx:567
+#: src/screens/Search/Explore.tsx:613
 msgid "Failed to load feeds"
 msgstr ""
 
-#: src/screens/Search/Explore.tsx:485
-#: src/screens/Search/Explore.tsx:540
-#: src/screens/Search/Explore.tsx:585
-#: src/screens/Search/Explore.tsx:631
+#: src/screens/Search/Explore.tsx:481
+#: src/screens/Search/Explore.tsx:536
+#: src/screens/Search/Explore.tsx:581
+#: src/screens/Search/Explore.tsx:627
 msgid "Failed to load feeds preferences"
 msgstr ""
 
@@ -5023,18 +5023,18 @@ msgstr ""
 msgid "Failed to load profiles"
 msgstr "Failed to load profiles"
 
-#: src/screens/Search/Explore.tsx:478
-#: src/screens/Search/Explore.tsx:533
-#: src/screens/Search/Explore.tsx:578
-#: src/screens/Search/Explore.tsx:624
+#: src/screens/Search/Explore.tsx:474
+#: src/screens/Search/Explore.tsx:529
+#: src/screens/Search/Explore.tsx:574
+#: src/screens/Search/Explore.tsx:620
 msgid "Failed to load suggested feeds"
 msgstr ""
 
-#: src/screens/Search/Explore.tsx:386
+#: src/screens/Search/Explore.tsx:382
 msgid "Failed to load suggested follows"
 msgstr ""
 
-#: src/screens/Messages/ConversationSettings/index.tsx:433
+#: src/screens/Messages/ConversationSettings/index.tsx:427
 msgid "Failed to lock group chat"
 msgstr "Failed to lock group chat"
 
@@ -5044,39 +5044,39 @@ msgid "Failed to mark all chats as read"
 msgstr "Failed to mark all chats as read"
 
 #: src/screens/Messages/ChatList.tsx:645
-#: src/screens/Messages/Inbox.tsx:304
+#: src/screens/Messages/Inbox.tsx:303
 #: src/view/shell/bottom-bar/BottomBar.tsx:456
 msgid "Failed to mark all requests as read"
 msgstr ""
 
-#: src/screens/Messages/ConversationSettings/index.tsx:397
+#: src/screens/Messages/ConversationSettings/index.tsx:391
 msgid "Failed to mute group chat"
 msgstr "Failed to mute group chat"
 
-#: src/state/queries/pinned-post.ts:75
+#: src/state/queries/pinned-post.ts:80
 msgid "Failed to pin post"
 msgstr ""
 
 #. placeholder {0}: e?.message
-#: src/screens/Profile/components/GermButton.tsx:164
+#: src/screens/Profile/components/GermButton.tsx:165
 msgid "Failed to reconnect Germ DM. Error: {0}"
 msgstr ""
 
-#: src/screens/Messages/JoinRequests.tsx:223
+#: src/screens/Messages/JoinRequests.tsx:219
 msgid "Failed to reject join request"
 msgstr "Failed to reject join request"
 
-#: src/screens/Settings/FindContactsSettings.tsx:509
+#: src/screens/Settings/FindContactsSettings.tsx:513
 msgid "Failed to remove data due to a network error, please check your internet connection."
 msgstr ""
 
 #. placeholder {0}: cleanError(err)
-#: src/screens/Settings/FindContactsSettings.tsx:515
+#: src/screens/Settings/FindContactsSettings.tsx:519
 msgid "Failed to remove data. {0}"
 msgstr ""
 
-#: src/components/dms/ActionsWrapper.web.tsx:77
-#: src/components/dms/MessageContextMenu.tsx:125
+#: src/components/dms/ActionsWrapper.web.tsx:78
+#: src/components/dms/MessageContextMenu.tsx:123
 #: src/components/dms/ReactionsDialog.tsx:179
 msgid "Failed to remove emoji reaction"
 msgstr ""
@@ -5085,7 +5085,7 @@ msgstr ""
 msgid "Failed to remove from list"
 msgstr "Failed to remove from list"
 
-#: src/components/dialogs/StarterPackDialog.tsx:293
+#: src/components/dialogs/StarterPackDialog.tsx:290
 msgid "Failed to remove from starter pack"
 msgstr ""
 
@@ -5098,8 +5098,8 @@ msgstr "Failed to remove group chat member"
 msgid "Failed to remove verification"
 msgstr ""
 
-#: src/components/intents/GroupChatJoinDialog.tsx:193
-#: src/screens/Messages/components/OutgoingRequestListItem.tsx:34
+#: src/components/intents/GroupChatJoinDialog.tsx:198
+#: src/screens/Messages/components/OutgoingRequestListItem.tsx:32
 msgid "Failed to rescind your request. Please try again."
 msgstr "Failed to rescind your request. Please try again."
 
@@ -5107,7 +5107,7 @@ msgstr "Failed to rescind your request. Please try again."
 msgid "Failed to resolve location. Please try again."
 msgstr ""
 
-#: src/view/com/composer/Composer.tsx:759
+#: src/view/com/composer/Composer.tsx:775
 msgid "Failed to save draft"
 msgstr ""
 
@@ -5121,11 +5121,11 @@ msgstr "Failed to save image"
 msgid "Failed to save image: {0}"
 msgstr ""
 
-#: src/screens/ModerationInteractionSettings/index.tsx:109
+#: src/screens/ModerationInteractionSettings/index.tsx:110
 msgid "Failed to save settings. Please try again."
 msgstr ""
 
-#: src/screens/Settings/InterestsSettings.tsx:147
+#: src/screens/Settings/InterestsSettings.tsx:148
 msgctxt "toast"
 msgid "Failed to save your interests."
 msgstr ""
@@ -5139,22 +5139,22 @@ msgstr ""
 msgid "Failed to send report"
 msgstr "Failed to send report"
 
-#: src/components/moderation/AppealForm.tsx:77
-#: src/features/liveNow/components/GoLiveDisabledDialog.tsx:77
-#: src/screens/Messages/components/ChatDisabled.tsx:119
+#: src/components/moderation/AppealForm.tsx:88
+#: src/features/liveNow/components/GoLiveDisabledDialog.tsx:76
+#: src/screens/Messages/components/ChatDisabled.tsx:117
 msgid "Failed to submit appeal, please try again."
 msgstr ""
 
-#: src/components/PostControls/PostMenu/PostMenuItems.tsx:252
+#: src/components/PostControls/PostMenu/PostMenuItems.tsx:248
 msgid "Failed to toggle thread mute, please try again"
 msgstr ""
 
-#: src/screens/Messages/components/ChatLocked.tsx:51
-#: src/screens/Messages/ConversationSettings/index.tsx:442
+#: src/screens/Messages/components/ChatLocked.tsx:55
+#: src/screens/Messages/ConversationSettings/index.tsx:437
 msgid "Failed to unlock group chat"
 msgstr "Failed to unlock group chat"
 
-#: src/screens/ProfileList/components/MoreOptionsMenu.tsx:107
+#: src/screens/ProfileList/components/MoreOptionsMenu.tsx:108
 msgid "Failed to unpin list"
 msgstr ""
 
@@ -5167,11 +5167,11 @@ msgstr ""
 msgid "Failed to update email, please try again."
 msgstr ""
 
-#: src/components/FeedCard.tsx:316
+#: src/components/FeedCard.tsx:313
 msgid "Failed to update feeds"
 msgstr ""
 
-#: src/state/queries/activity-subscriptions.ts:101
+#: src/state/queries/activity-subscriptions.ts:95
 msgid "Failed to update notification declaration"
 msgstr ""
 
@@ -5179,10 +5179,10 @@ msgstr ""
 msgid "Failed to update settings"
 msgstr ""
 
-#: src/lib/media/video/upload.ts:98
-#: src/lib/media/video/upload.web.ts:98
-#: src/lib/media/video/upload.web.ts:102
-#: src/lib/media/video/upload.web.ts:112
+#: src/lib/media/video/upload.ts:104
+#: src/lib/media/video/upload.web.ts:104
+#: src/lib/media/video/upload.web.ts:108
+#: src/lib/media/video/upload.web.ts:118
 msgid "Failed to upload video"
 msgstr ""
 
@@ -5194,11 +5194,11 @@ msgstr ""
 msgid "Failed to verify handle. Please try again."
 msgstr ""
 
-#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:47
+#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:48
 msgid "Fake account or bot"
 msgstr ""
 
-#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:55
+#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:56
 msgid "False information about elections"
 msgstr ""
 
@@ -5209,9 +5209,9 @@ msgstr ""
 #. placeholder {0}: sanitizeHandle(creator.handle, '@')
 #. placeholder {0}: sanitizeHandle(feed.creatorHandle, '@')
 #. placeholder {0}: sanitizeHandle(view.creator.handle, '@')
-#: src/components/FeedCard.tsx:170
-#: src/state/queries/feed.ts:127
-#: src/view/com/feeds/FeedSourceCard.tsx:151
+#: src/components/FeedCard.tsx:167
+#: src/state/queries/feed.ts:122
+#: src/view/com/feeds/FeedSourceCard.tsx:149
 msgid "Feed by {0}"
 msgstr ""
 
@@ -5227,7 +5227,7 @@ msgstr ""
 msgid "Feed menu"
 msgstr ""
 
-#: src/components/StarterPack/Wizard/WizardListCard.tsx:59
+#: src/components/StarterPack/Wizard/WizardListCard.tsx:58
 msgid "Feed toggle"
 msgstr ""
 
@@ -5241,8 +5241,8 @@ msgstr ""
 msgid "Feedback"
 msgstr ""
 
-#: src/components/PostControls/PostMenu/PostMenuItems.tsx:308
-#: src/components/PostControls/PostMenu/PostMenuItems.tsx:331
+#: src/components/PostControls/PostMenu/PostMenuItems.tsx:304
+#: src/components/PostControls/PostMenu/PostMenuItems.tsx:327
 msgctxt "toast"
 msgid "Feedback sent to feed operator"
 msgstr ""
@@ -5251,9 +5251,9 @@ msgstr ""
 #: src/screens/SavedFeeds.tsx:112
 #: src/screens/SavedFeeds.tsx:303
 #: src/screens/Search/SearchResults.tsx:113
-#: src/screens/StarterPack/StarterPackScreen.tsx:196
+#: src/screens/StarterPack/StarterPackScreen.tsx:193
 #: src/view/screens/Feeds.tsx:504
-#: src/view/screens/Profile.tsx:241
+#: src/view/screens/Profile.tsx:238
 #: src/view/shell/desktop/LeftNav.tsx:712
 #: src/view/shell/Drawer.tsx:592
 msgid "Feeds"
@@ -5264,7 +5264,7 @@ msgstr ""
 msgid "Feeds are custom algorithms that users build with a little coding expertise. <0>See this guide</0> for more information."
 msgstr ""
 
-#: src/components/FeedCard.tsx:313
+#: src/components/FeedCard.tsx:310
 #: src/screens/SavedFeeds.tsx:92
 #: src/screens/SavedFeeds.tsx:271
 msgctxt "toast"
@@ -5275,8 +5275,8 @@ msgstr ""
 msgid "Fetch update"
 msgstr ""
 
-#: src/screens/Settings/components/ExportCarDialog.tsx:43
-#: src/screens/Settings/components/ExportCarDialog.tsx:76
+#: src/screens/Settings/components/ExportCarDialog.tsx:51
+#: src/screens/Settings/components/ExportCarDialog.tsx:82
 msgid "File saved successfully!"
 msgstr ""
 
@@ -5341,9 +5341,9 @@ msgid "Find accounts to follow"
 msgstr ""
 
 #: src/features/inviteFriends/components/FollowersPromoBanner.tsx:49
-#: src/screens/Settings/FindContactsSettings.tsx:81
-#: src/screens/Settings/Settings.tsx:218
-#: src/screens/Settings/Settings.tsx:221
+#: src/screens/Settings/FindContactsSettings.tsx:79
+#: src/screens/Settings/Settings.tsx:220
+#: src/screens/Settings/Settings.tsx:223
 msgid "Find and invite friends"
 msgstr "Find and invite friends"
 
@@ -5352,8 +5352,8 @@ msgstr "Find and invite friends"
 msgid "Find Contacts"
 msgstr ""
 
-#: src/components/contacts/screens/GetContacts.tsx:273
-#: src/components/contacts/screens/GetContacts.tsx:287
+#: src/components/contacts/screens/GetContacts.tsx:275
+#: src/components/contacts/screens/GetContacts.tsx:289
 msgid "Find my friends"
 msgstr ""
 
@@ -5365,7 +5365,7 @@ msgstr ""
 msgid "Find people to follow"
 msgstr ""
 
-#: src/screens/Settings/FindContactsSettings.tsx:130
+#: src/screens/Settings/FindContactsSettings.tsx:128
 msgid "Find people you know"
 msgstr "Find people you know"
 
@@ -5378,7 +5378,7 @@ msgid "Find your friends"
 msgstr ""
 
 #: src/screens/Onboarding/StepFindContactsIntro/index.tsx:46
-#: src/screens/Settings/FindContactsSettings.tsx:133
+#: src/screens/Settings/FindContactsSettings.tsx:131
 msgid "Find your friends on Bluesky by verifying your phone number and matching with your contacts. We protect your information and you control what happens next. <0>Learn more</0>"
 msgstr ""
 
@@ -5386,11 +5386,11 @@ msgstr ""
 msgid "Find your people"
 msgstr ""
 
-#: src/components/contacts/screens/GetContacts.tsx:281
+#: src/components/contacts/screens/GetContacts.tsx:283
 msgid "Finding friends..."
 msgstr ""
 
-#: src/screens/StarterPack/Wizard/index.tsx:206
+#: src/screens/StarterPack/Wizard/index.tsx:202
 msgid "Finish"
 msgstr ""
 
@@ -5418,15 +5418,15 @@ msgid "Focus the search field"
 msgstr "Focus the search field"
 
 #. User is not following this account, click to follow
-#: src/components/ProfileCard.tsx:548
-#: src/components/ProfileHoverCard/index.web.tsx:495
-#: src/components/ProfileHoverCard/index.web.tsx:506
+#: src/components/ProfileCard.tsx:545
+#: src/components/ProfileHoverCard/index.web.tsx:492
+#: src/components/ProfileHoverCard/index.web.tsx:503
 #: src/screens/Messages/ConversationSettings/Member.tsx:170
 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:157
 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:409
-#: src/screens/VideoFeed/index.tsx:959
+#: src/screens/VideoFeed/index.tsx:955
+#: src/view/com/notifications/NotificationFeedItem.tsx:890
 #: src/view/com/notifications/NotificationFeedItem.tsx:897
-#: src/view/com/notifications/NotificationFeedItem.tsx:904
 msgid "Follow"
 msgstr ""
 
@@ -5440,7 +5440,7 @@ msgstr ""
 msgid "Follow {displayName}"
 msgstr "Follow {displayName}"
 
-#: src/screens/VideoFeed/index.tsx:938
+#: src/screens/VideoFeed/index.tsx:934
 msgid "Follow {handle}"
 msgstr ""
 
@@ -5461,64 +5461,64 @@ msgstr ""
 msgid "Follow account"
 msgstr ""
 
-#: src/components/contacts/screens/ViewMatches.tsx:276
-#: src/components/contacts/screens/ViewMatches.tsx:291
-#: src/screens/Onboarding/StepSuggestedAccounts/index.tsx:294
-#: src/screens/Onboarding/StepSuggestedStarterpacks/StarterPackCard.tsx:162
-#: src/screens/Onboarding/StepSuggestedStarterpacks/StarterPackCard.tsx:169
-#: src/screens/Settings/FindContactsSettings.tsx:465
-#: src/screens/Settings/FindContactsSettings.tsx:475
-#: src/screens/StarterPack/StarterPackScreen.tsx:452
-#: src/screens/StarterPack/StarterPackScreen.tsx:460
+#: src/components/contacts/screens/ViewMatches.tsx:284
+#: src/components/contacts/screens/ViewMatches.tsx:299
+#: src/screens/Onboarding/StepSuggestedAccounts/index.tsx:298
+#: src/screens/Onboarding/StepSuggestedStarterpacks/StarterPackCard.tsx:158
+#: src/screens/Onboarding/StepSuggestedStarterpacks/StarterPackCard.tsx:165
+#: src/screens/Settings/FindContactsSettings.tsx:469
+#: src/screens/Settings/FindContactsSettings.tsx:479
+#: src/screens/StarterPack/StarterPackScreen.tsx:445
+#: src/screens/StarterPack/StarterPackScreen.tsx:453
 msgid "Follow all"
 msgstr ""
 
-#: src/screens/Onboarding/StepSuggestedAccounts/index.tsx:291
+#: src/screens/Onboarding/StepSuggestedAccounts/index.tsx:295
 msgid "Follow all accounts"
 msgstr ""
 
 #. User is not following this account, click to follow back
-#: src/components/ProfileCard.tsx:544
+#: src/components/ProfileCard.tsx:541
 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:155
 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:407
+#: src/view/com/notifications/NotificationFeedItem.tsx:890
 #: src/view/com/notifications/NotificationFeedItem.tsx:897
-#: src/view/com/notifications/NotificationFeedItem.tsx:904
 msgid "Follow back"
 msgstr ""
 
-#: src/screens/Onboarding/StepSuggestedAccounts/index.tsx:132
+#: src/screens/Onboarding/StepSuggestedAccounts/index.tsx:136
 msgid "Followed all accounts!"
 msgstr ""
 
-#: src/screens/Settings/FindContactsSettings.tsx:418
+#: src/screens/Settings/FindContactsSettings.tsx:422
 msgid "Followed all matches"
 msgstr ""
 
 #. placeholder {0}: slice[0].profile.displayName
-#: src/components/KnownFollowers.tsx:233
+#: src/components/KnownFollowers.tsx:232
 msgid "Followed by <0>{0}</0>"
 msgstr ""
 
 #. placeholder {0}: slice[0].profile.displayName
 #. placeholder {1}: serverCount - 1
-#: src/components/KnownFollowers.tsx:219
+#: src/components/KnownFollowers.tsx:218
 msgid "Followed by <0>{0}</0> and {1, plural, one {# other} other {# others}}"
 msgstr ""
 
 #. placeholder {0}: slice[0].profile.displayName
 #. placeholder {1}: slice[1].profile.displayName
-#: src/components/KnownFollowers.tsx:206
+#: src/components/KnownFollowers.tsx:205
 msgid "Followed by <0>{0}</0> and <1>{1}</1>"
 msgstr ""
 
 #. placeholder {0}: slice[0].profile.displayName
 #. placeholder {1}: slice[1].profile.displayName
 #. placeholder {2}: serverCount - 2
-#: src/components/KnownFollowers.tsx:189
+#: src/components/KnownFollowers.tsx:188
 msgid "Followed by <0>{0}</0>, <1>{1}</1>, and {2, plural, one {# other} other {# others}}"
 msgstr ""
 
-#: src/components/intents/GroupChatJoinDialog.tsx:355
+#: src/components/intents/GroupChatJoinDialog.tsx:360
 msgid "Followers can join"
 msgstr "Followers can join"
 
@@ -5534,14 +5534,14 @@ msgstr ""
 
 #. User is following this account, click to unfollow
 #. User is following this account, click to unfollow
-#: src/components/ProfileCard.tsx:539
-#: src/components/ProfileHoverCard/index.web.tsx:494
-#: src/components/ProfileHoverCard/index.web.tsx:505
+#: src/components/ProfileCard.tsx:536
+#: src/components/ProfileHoverCard/index.web.tsx:491
+#: src/components/ProfileHoverCard/index.web.tsx:502
 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:160
 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:405
-#: src/screens/VideoFeed/index.tsx:957
-#: src/view/com/notifications/NotificationFeedItem.tsx:876
-#: src/view/com/notifications/NotificationFeedItem.tsx:892
+#: src/screens/VideoFeed/index.tsx:953
+#: src/view/com/notifications/NotificationFeedItem.tsx:869
+#: src/view/com/notifications/NotificationFeedItem.tsx:885
 msgid "Following"
 msgstr ""
 
@@ -5554,9 +5554,9 @@ msgstr ""
 #. placeholder {0}: sanitizeDisplayName( profile.displayName || profile.handle, moderation.ui('displayName'), )
 #. placeholder {0}: sanitizeDisplayName( profile.displayName || profile.handle, moderation.ui('displayName'), )
 #. placeholder {0}: sanitizeDisplayName( profile.displayName || profile.handle, )
-#: src/components/ProfileCard.tsx:500
+#: src/components/ProfileCard.tsx:497
 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:247
-#: src/view/com/notifications/NotificationFeedItem.tsx:827
+#: src/view/com/notifications/NotificationFeedItem.tsx:820
 msgid "Following {0}"
 msgstr ""
 
@@ -5564,7 +5564,7 @@ msgstr ""
 msgid "Following {displayName}"
 msgstr "Following {displayName}"
 
-#: src/screens/VideoFeed/index.tsx:937
+#: src/screens/VideoFeed/index.tsx:933
 msgid "Following {handle}"
 msgstr ""
 
@@ -5578,7 +5578,7 @@ msgstr ""
 msgid "Following Feed Preferences"
 msgstr ""
 
-#: src/components/Pills.tsx:214
+#: src/components/Pills.tsx:215
 #: src/screens/Profile/Header/Handle.tsx:33
 msgid "Follows you"
 msgstr ""
@@ -5599,7 +5599,7 @@ msgstr ""
 msgid "For organizational accounts, use the birthdate of the person who is responsible for the account."
 msgstr ""
 
-#: src/screens/Settings/components/DeleteAccountDialog.tsx:186
+#: src/screens/Settings/components/DeleteAccountDialog.tsx:192
 msgid "For security reasons, we’ll need to send a confirmation code to your email address <0>{currentEmail}</0>."
 msgstr ""
 
@@ -5612,14 +5612,14 @@ msgid "For the best experience, we recommend using the theme font."
 msgstr ""
 
 #: src/components/ProgressGuide/FollowDialog.tsx:131
-#: src/screens/Onboarding/StepSuggestedAccounts/index.tsx:349
-#: src/screens/Search/modules/ExploreSuggestedAccounts.tsx:86
+#: src/screens/Onboarding/StepSuggestedAccounts/index.tsx:353
+#: src/screens/Search/modules/ExploreSuggestedAccounts.tsx:87
 msgid "For You"
 msgstr ""
 
-#: src/components/dialogs/MutedWords.tsx:187
-#: src/components/dialogs/MutedWords.tsx:572
-#: src/components/dialogs/MutedWords.tsx:575
+#: src/components/dialogs/MutedWords.tsx:189
+#: src/components/dialogs/MutedWords.tsx:574
+#: src/components/dialogs/MutedWords.tsx:577
 msgid "Forever"
 msgstr ""
 
@@ -5632,8 +5632,8 @@ msgstr ""
 msgid "Forgot Password"
 msgstr ""
 
-#: src/screens/Login/LoginForm.tsx:421
-#: src/screens/Login/LoginForm.tsx:428
+#: src/screens/Login/LoginForm.tsx:422
+#: src/screens/Login/LoginForm.tsx:429
 msgid "Forgot password?"
 msgstr ""
 
@@ -5651,15 +5651,15 @@ msgstr ""
 msgid "From"
 msgstr ""
 
-#: src/screens/Hashtag.tsx:123
+#: src/screens/Hashtag.tsx:125
 msgid "From {sanitizedAuthor}"
 msgstr "From {sanitizedAuthor}"
 
-#: src/screens/Hashtag.tsx:124
+#: src/screens/Hashtag.tsx:126
 msgid "From @{sanitizedAuthor}"
 msgstr ""
 
-#: src/view/com/posts/PostFeedReason.tsx:48
+#: src/view/com/posts/PostFeedReason.tsx:50
 msgctxt "from-feed"
 msgid "From <0/>"
 msgstr ""
@@ -5673,35 +5673,35 @@ msgstr "From these people"
 msgid "Generate a starter pack"
 msgstr ""
 
-#: src/screens/Messages/components/InviteLinkDialog.tsx:239
-#: src/screens/Messages/components/InviteLinkDialog.tsx:277
-#: src/screens/Messages/components/InviteLinkDialog.tsx:305
+#: src/screens/Messages/components/InviteLinkDialog.tsx:236
+#: src/screens/Messages/components/InviteLinkDialog.tsx:274
+#: src/screens/Messages/components/InviteLinkDialog.tsx:302
 msgid "Generate invite link"
 msgstr "Generate invite link"
 
-#: src/screens/Messages/components/InviteLinkDialog.tsx:446
+#: src/screens/Messages/components/InviteLinkDialog.tsx:443
 msgid "Generate new invite link"
 msgstr "Generate new invite link"
 
-#: src/screens/Messages/components/InviteLinkDialog.tsx:451
+#: src/screens/Messages/components/InviteLinkDialog.tsx:448
 msgid "Generate new link"
 msgstr "Generate new link"
 
-#: src/screens/Profile/components/GermButton.tsx:86
-#: src/screens/Profile/components/GermButton.tsx:225
+#: src/screens/Profile/components/GermButton.tsx:84
+#: src/screens/Profile/components/GermButton.tsx:226
 msgid "Germ DM"
 msgstr ""
 
-#: src/screens/Profile/components/GermButton.tsx:183
+#: src/screens/Profile/components/GermButton.tsx:184
 msgid "Germ DM disconnected"
 msgstr ""
 
-#: src/screens/Profile/components/GermButton.tsx:234
-#: src/screens/Profile/components/GermButton.tsx:239
+#: src/screens/Profile/components/GermButton.tsx:235
+#: src/screens/Profile/components/GermButton.tsx:240
 msgid "Germ DM Link"
 msgstr ""
 
-#: src/screens/Profile/components/GermButton.tsx:160
+#: src/screens/Profile/components/GermButton.tsx:161
 msgid "Germ DM reconnected"
 msgstr ""
 
@@ -5766,11 +5766,11 @@ msgstr ""
 msgid "Get notified about posts and replies from accounts you choose."
 msgstr "Get notified about posts and replies from accounts you choose."
 
-#: src/components/activity-notifications/SubscribeProfileDialog.tsx:226
+#: src/components/activity-notifications/SubscribeProfileDialog.tsx:223
 msgid "Get notified of new posts from {name}"
 msgstr ""
 
-#: src/components/activity-notifications/SubscribeProfileDialog.tsx:233
+#: src/components/activity-notifications/SubscribeProfileDialog.tsx:230
 msgid "Get notified of this account’s activity"
 msgstr ""
 
@@ -5784,17 +5784,17 @@ msgstr ""
 
 #: src/components/dialogs/EmailDialog/screens/VerificationReminder.tsx:71
 #: src/components/dialogs/EmailDialog/screens/VerificationReminder.tsx:81
-#: src/screens/Messages/components/InviteLinkDialog.tsx:219
-#: src/screens/Messages/components/InviteLinkDialog.tsx:226
+#: src/screens/Messages/components/InviteLinkDialog.tsx:216
+#: src/screens/Messages/components/InviteLinkDialog.tsx:223
 msgid "Get started"
 msgstr ""
 
-#: src/components/MediaPreview.tsx:182
+#: src/components/MediaPreview.tsx:188
 #: src/components/Post/Embed/VideoEmbed/GifPresentationControls.tsx:93
 msgid "GIF"
 msgstr ""
 
-#: src/view/com/composer/Composer.tsx:2712
+#: src/view/com/composer/Composer.tsx:2736
 msgid "GIF uploaded"
 msgstr ""
 
@@ -5802,7 +5802,7 @@ msgstr ""
 msgid "Give your profile a face"
 msgstr ""
 
-#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142
+#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:143
 msgid "Glorification of violence"
 msgstr ""
 
@@ -5817,8 +5817,8 @@ msgstr ""
 #: src/screens/ProfileList/components/ErrorScreen.tsx:35
 #: src/screens/ProfileList/components/ErrorScreen.tsx:41
 #: src/screens/VideoFeed/components/Header.tsx:163
+#: src/screens/VideoFeed/index.tsx:1257
 #: src/screens/VideoFeed/index.tsx:1261
-#: src/screens/VideoFeed/index.tsx:1265
 #: src/view/com/auth/LoggedOut.tsx:127
 #: src/view/com/profile/ProfileFollowers.tsx:225
 #: src/view/com/profile/ProfileFollowers.tsx:226
@@ -5832,7 +5832,7 @@ msgstr ""
 #: src/screens/List/ListHiddenScreen.tsx:228
 #: src/screens/Profile/ErrorState.tsx:63
 #: src/screens/Profile/ErrorState.tsx:67
-#: src/screens/StarterPack/StarterPackScreen.tsx:807
+#: src/screens/StarterPack/StarterPackScreen.tsx:800
 msgid "Go Back"
 msgstr ""
 
@@ -5842,7 +5842,7 @@ msgstr ""
 msgid "Go back to previous step"
 msgstr ""
 
-#: src/screens/Bookmarks.tsx:296
+#: src/screens/Bookmarks.tsx:294
 #: src/view/screens/NotFound.tsx:51
 #: src/view/screens/NotFound.tsx:52
 #: src/view/screens/NotFound.tsx:57
@@ -5871,11 +5871,11 @@ msgid "Go live for"
 msgstr ""
 
 #. placeholder {0}: name.displayName
-#: src/screens/PostThread/components/LikesStat.tsx:146
+#: src/screens/PostThread/components/LikesStat.tsx:148
 msgid "Go to {0}'s profile"
 msgstr "Go to {0}'s profile"
 
-#: src/view/com/notifications/NotificationFeedItem.tsx:258
+#: src/view/com/notifications/NotificationFeedItem.tsx:250
 msgid "Go to {firstAuthorName}'s profile"
 msgstr ""
 
@@ -5891,11 +5891,11 @@ msgstr ""
 msgid "Go to conversation with {0}"
 msgstr ""
 
-#: src/view/com/posts/PostFeedReason.tsx:39
+#: src/view/com/posts/PostFeedReason.tsx:41
 msgid "Go to feed"
 msgstr ""
 
-#: src/screens/Login/ForgotPasswordForm.tsx:168
+#: src/screens/Login/ForgotPasswordForm.tsx:172
 msgid "Go to next"
 msgstr ""
 
@@ -5919,14 +5919,14 @@ msgstr ""
 msgid "Go to user’s profile"
 msgstr "Go to user’s profile"
 
-#: src/features/liveNow/components/GoLiveDisabledDialog.tsx:105
+#: src/features/liveNow/components/GoLiveDisabledDialog.tsx:104
 msgid "Going live is currently disabled for your account"
 msgstr ""
 
 #: src/components/dialogs/nuxs/GroupChatsAnnouncement.tsx:121
 #: src/components/dialogs/nuxs/GroupChatsAnnouncement.tsx:126
-#: src/screens/Profile/components/GermButton.tsx:253
-#: src/screens/Profile/components/GermButton.tsx:258
+#: src/screens/Profile/components/GermButton.tsx:254
+#: src/screens/Profile/components/GermButton.tsx:259
 msgid "Got it"
 msgstr ""
 
@@ -5942,51 +5942,51 @@ msgstr "Grant access"
 msgid "Graphic Media"
 msgstr ""
 
-#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:138
+#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:139
 msgid "Graphic violent content"
 msgstr ""
 
-#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:169
+#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:171
 msgid "Grooming or predatory behavior"
 msgstr ""
 
-#: src/components/dms/ChatInvite/Card.tsx:51
-#: src/components/intents/GroupChatJoinDialog.tsx:333
-#: src/screens/Messages/JoinRequest.tsx:125
+#: src/components/dms/ChatInvite/Card.tsx:53
+#: src/components/intents/GroupChatJoinDialog.tsx:338
+#: src/screens/Messages/JoinRequest.tsx:133
 msgid "Group chat"
 msgstr "Group chat"
 
-#: src/screens/Messages/components/InviteLinkDialog.tsx:556
+#: src/screens/Messages/components/InviteLinkDialog.tsx:553
 msgid "Group chat invite link dialog"
 msgstr "Group chat invite link dialog"
 
-#: src/screens/Messages/ConversationSettings/index.tsx:424
+#: src/screens/Messages/ConversationSettings/index.tsx:418
 msgctxt "toast"
 msgid "Group chat locked"
 msgstr "Group chat locked"
 
-#: src/screens/Messages/ConversationSettings/index.tsx:389
+#: src/screens/Messages/ConversationSettings/index.tsx:383
 msgctxt "toast"
 msgid "Group chat muted"
 msgstr "Group chat muted"
 
-#: src/screens/Messages/ConversationSettings/index.tsx:376
+#: src/screens/Messages/ConversationSettings/index.tsx:370
 msgctxt "toast"
 msgid "Group chat name updated"
 msgstr "Group chat name updated"
 
 #: src/Navigation.tsx:514
-#: src/screens/Messages/ConversationSettings/index.tsx:113
+#: src/screens/Messages/ConversationSettings/index.tsx:110
 msgid "Group chat settings"
 msgstr "Group chat settings"
 
-#: src/screens/Messages/components/ChatLocked.tsx:41
-#: src/screens/Messages/ConversationSettings/index.tsx:427
+#: src/screens/Messages/components/ChatLocked.tsx:42
+#: src/screens/Messages/ConversationSettings/index.tsx:421
 msgctxt "toast"
 msgid "Group chat unlocked"
 msgstr "Group chat unlocked"
 
-#: src/screens/Messages/ConversationSettings/index.tsx:392
+#: src/screens/Messages/ConversationSettings/index.tsx:386
 msgctxt "toast"
 msgid "Group chat unmuted"
 msgstr "Group chat unmuted"
@@ -6000,7 +6000,7 @@ msgid "Group chats are only available to users 18 and over."
 msgstr "Group chats are only available to users 18 and over."
 
 #. placeholder {0}: convo.details.memberLimit
-#: src/screens/Messages/components/InviteLinkDialog.tsx:205
+#: src/screens/Messages/components/InviteLinkDialog.tsx:202
 msgid "Group chats can only have a maximum of {0, plural, other {# people}}."
 msgstr "Group chats can only have a maximum of {0, plural, other {# people}}."
 
@@ -6020,11 +6020,11 @@ msgstr "Group name"
 msgid "Group name is too long. {MAX_GROUP_NAME_GRAPHEME_LENGTH, plural, other {The maximum number of characters is #.}}"
 msgstr "Group name is too long. {MAX_GROUP_NAME_GRAPHEME_LENGTH, plural, other {The maximum number of characters is #.}}"
 
-#: src/screens/Settings/Settings.tsx:467
+#: src/screens/Settings/Settings.tsx:469
 msgid "GrowthBook"
 msgstr "GrowthBook"
 
-#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:219
+#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:221
 msgid "Hacking or system attacks"
 msgstr ""
 
@@ -6051,7 +6051,7 @@ msgstr ""
 msgid "Handle too long. Please try a shorter one."
 msgstr ""
 
-#: src/components/FeedCard.tsx:156
+#: src/components/FeedCard.tsx:153
 #: src/features/liveEvents/components/LiveEventFeedCardWide.tsx:123
 msgid "Happening now"
 msgstr ""
@@ -6065,15 +6065,15 @@ msgstr "Happy GIFs"
 msgid "Haptics"
 msgstr ""
 
-#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:99
+#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:100
 msgid "Harassment or hate"
 msgstr ""
 
-#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189
+#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:191
 msgid "Harmful or high-risk activities"
 msgstr ""
 
-#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:162
+#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:164
 msgid "Harming or endangering minors"
 msgstr ""
 
@@ -6085,7 +6085,7 @@ msgstr ""
 msgid "Hashtag {tag}"
 msgstr ""
 
-#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:111
+#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:112
 msgid "Hate speech"
 msgstr ""
 
@@ -6098,7 +6098,7 @@ msgstr ""
 msgid "Have we got your location wrong? <0>Tap here to update your location with GPS.</0>"
 msgstr "Have we got your location wrong? <0>Tap here to update your location with GPS.</0>"
 
-#: src/screens/Signup/index.tsx:241
+#: src/screens/Signup/index.tsx:238
 msgid "Having trouble?"
 msgstr ""
 
@@ -6106,8 +6106,8 @@ msgstr ""
 msgid "Held by Bluesky for 7 days to prevent abuse, then deleted"
 msgstr ""
 
-#: src/screens/Settings/Settings.tsx:257
-#: src/screens/Settings/Settings.tsx:261
+#: src/screens/Settings/Settings.tsx:259
+#: src/screens/Settings/Settings.tsx:263
 #: src/view/shell/desktop/RightNav.tsx:130
 #: src/view/shell/desktop/RightNav.tsx:133
 #: src/view/shell/Drawer.tsx:443
@@ -6135,41 +6135,41 @@ msgstr ""
 msgid "Hi there!"
 msgstr ""
 
-#: src/components/VideoPostCard.tsx:176
-#: src/components/VideoPostCard.tsx:459
+#: src/components/VideoPostCard.tsx:168
+#: src/components/VideoPostCard.tsx:451
 msgid "Hidden"
 msgstr ""
 
-#: src/screens/VideoFeed/index.tsx:736
+#: src/screens/VideoFeed/index.tsx:735
 msgid "Hidden by your moderation settings."
 msgstr ""
 
-#: src/components/ListCard.tsx:133
+#: src/components/ListCard.tsx:130
 msgid "Hidden list"
 msgstr ""
 
-#: src/components/interstitials/FeedTrendingTopics.tsx:168
+#: src/components/interstitials/FeedTrendingTopics.tsx:169
 #: src/components/interstitials/Trending.tsx:149
-#: src/components/interstitials/TrendingVideos.tsx:138
+#: src/components/interstitials/TrendingVideos.tsx:140
 #: src/components/moderation/ContentHider.tsx:217
 #: src/components/moderation/LabelPreference.tsx:141
-#: src/components/moderation/PostHider.tsx:140
-#: src/components/PostControls/PostMenu/PostMenuItems.tsx:836
+#: src/components/moderation/PostHider.tsx:137
+#: src/components/PostControls/PostMenu/PostMenuItems.tsx:832
 #: src/lib/moderation/useLabelBehaviorDescription.ts:18
 #: src/lib/moderation/useLabelBehaviorDescription.ts:23
 #: src/lib/moderation/useLabelBehaviorDescription.ts:28
 #: src/lib/moderation/useLabelBehaviorDescription.ts:33
-#: src/screens/Search/modules/ExploreTrendingTopics.tsx:106
+#: src/screens/Search/modules/ExploreTrendingTopics.tsx:104
 #: src/view/shell/desktop/SidebarTrendingTopics.tsx:173
 msgid "Hide"
 msgstr ""
 
-#: src/view/com/notifications/NotificationFeedItem.tsx:989
+#: src/view/com/notifications/NotificationFeedItem.tsx:980
 msgctxt "action"
 msgid "Hide"
 msgstr ""
 
-#: src/components/dialogs/Embed.tsx:124
+#: src/components/dialogs/Embed.tsx:125
 msgid "Hide customization options"
 msgstr ""
 
@@ -6177,26 +6177,26 @@ msgstr ""
 msgid "Hide group chat updates"
 msgstr "Hide group chat updates"
 
-#: src/components/dialogs/PostInteractionSettingsDialog.tsx:533
+#: src/components/dialogs/PostInteractionSettingsDialog.tsx:530
 msgid "Hide lists"
 msgstr ""
 
-#: src/screens/Login/LoginForm.tsx:613
+#: src/screens/Login/LoginForm.tsx:614
 msgid "Hide password"
 msgstr "Hide password"
 
-#: src/components/PostControls/PostMenu/PostMenuItems.tsx:676
-#: src/components/PostControls/PostMenu/PostMenuItems.tsx:679
+#: src/components/PostControls/PostMenu/PostMenuItems.tsx:672
+#: src/components/PostControls/PostMenu/PostMenuItems.tsx:675
 msgid "Hide post for me"
 msgstr ""
 
-#: src/components/PostControls/PostMenu/PostMenuItems.tsx:690
-#: src/components/PostControls/PostMenu/PostMenuItems.tsx:700
+#: src/components/PostControls/PostMenu/PostMenuItems.tsx:686
+#: src/components/PostControls/PostMenu/PostMenuItems.tsx:696
 msgid "Hide reply for everyone"
 msgstr ""
 
-#: src/components/PostControls/PostMenu/PostMenuItems.tsx:676
-#: src/components/PostControls/PostMenu/PostMenuItems.tsx:679
+#: src/components/PostControls/PostMenu/PostMenuItems.tsx:672
+#: src/components/PostControls/PostMenu/PostMenuItems.tsx:675
 msgid "Hide reply for me"
 msgstr ""
 
@@ -6209,19 +6209,19 @@ msgstr "Hide reposts in feeds"
 msgid "Hide this card"
 msgstr ""
 
-#: src/components/PostControls/PostMenu/PostMenuItems.tsx:833
+#: src/components/PostControls/PostMenu/PostMenuItems.tsx:829
 msgid "Hide this post?"
 msgstr ""
 
-#: src/components/PostControls/PostMenu/PostMenuItems.tsx:833
-#: src/components/PostControls/PostMenu/PostMenuItems.tsx:868
+#: src/components/PostControls/PostMenu/PostMenuItems.tsx:829
+#: src/components/PostControls/PostMenu/PostMenuItems.tsx:864
 msgid "Hide this reply?"
 msgstr ""
 
-#: src/components/Post/Translated/index.tsx:216
-#: src/components/Post/Translated/index.tsx:350
-#: src/components/PostControls/PostMenu/PostMenuItems.tsx:553
-#: src/components/PostControls/PostMenu/PostMenuItems.tsx:555
+#: src/components/Post/Translated/index.tsx:213
+#: src/components/Post/Translated/index.tsx:347
+#: src/components/PostControls/PostMenu/PostMenuItems.tsx:549
+#: src/components/PostControls/PostMenu/PostMenuItems.tsx:551
 msgid "Hide translation"
 msgstr "Hide translation"
 
@@ -6229,18 +6229,18 @@ msgstr "Hide translation"
 msgid "Hide trending topics"
 msgstr ""
 
-#: src/components/interstitials/FeedTrendingTopics.tsx:166
+#: src/components/interstitials/FeedTrendingTopics.tsx:167
 #: src/components/interstitials/Trending.tsx:147
-#: src/screens/Search/modules/ExploreTrendingTopics.tsx:104
+#: src/screens/Search/modules/ExploreTrendingTopics.tsx:102
 #: src/view/shell/desktop/SidebarTrendingTopics.tsx:171
 msgid "Hide trending topics?"
 msgstr ""
 
-#: src/components/interstitials/TrendingVideos.tsx:136
+#: src/components/interstitials/TrendingVideos.tsx:138
 msgid "Hide trending videos?"
 msgstr ""
 
-#: src/view/com/notifications/NotificationFeedItem.tsx:982
+#: src/view/com/notifications/NotificationFeedItem.tsx:973
 msgid "Hide user list"
 msgstr ""
 
@@ -6250,7 +6250,7 @@ msgid "Hide verification badges"
 msgstr ""
 
 #: src/components/moderation/ContentHider.tsx:168
-#: src/components/moderation/PostHider.tsx:94
+#: src/components/moderation/PostHider.tsx:91
 msgid "Hides the content"
 msgstr ""
 
@@ -6270,23 +6270,23 @@ msgstr "Hmm, it seems we weren't able to compute your level of access. Please tr
 msgid "Hmm, it seems your device was unable to share age information with us."
 msgstr "Hmm, it seems your device was unable to share age information with us."
 
-#: src/view/com/posts/PostFeedErrorMessage.tsx:125
+#: src/view/com/posts/PostFeedErrorMessage.tsx:123
 msgid "Hmm, some kind of issue occurred when contacting the feed server. Please let the feed owner know about this issue."
 msgstr ""
 
-#: src/view/com/posts/PostFeedErrorMessage.tsx:113
+#: src/view/com/posts/PostFeedErrorMessage.tsx:111
 msgid "Hmm, the feed server appears to be misconfigured. Please let the feed owner know about this issue."
 msgstr ""
 
-#: src/view/com/posts/PostFeedErrorMessage.tsx:119
+#: src/view/com/posts/PostFeedErrorMessage.tsx:117
 msgid "Hmm, the feed server appears to be offline. Please let the feed owner know about this issue."
 msgstr ""
 
-#: src/view/com/posts/PostFeedErrorMessage.tsx:116
+#: src/view/com/posts/PostFeedErrorMessage.tsx:114
 msgid "Hmm, the feed server gave a bad response. Please let the feed owner know about this issue."
 msgstr ""
 
-#: src/view/com/posts/PostFeedErrorMessage.tsx:110
+#: src/view/com/posts/PostFeedErrorMessage.tsx:108
 msgid "Hmm, we're having trouble finding this feed. It may have been deleted."
 msgstr ""
 
@@ -6298,7 +6298,7 @@ msgstr ""
 msgid "Hmmmm, we couldn't load that moderation service."
 msgstr ""
 
-#: src/view/com/composer/state/video.ts:522
+#: src/view/com/composer/state/video.ts:527
 msgid "Hold up! We’re gradually giving access to video, and you’re still waiting in line. Check back soon!"
 msgstr ""
 
@@ -6316,17 +6316,17 @@ msgstr ""
 
 #: src/components/dialogs/ServerInput.tsx:138
 #: src/screens/Login/components/HostingProviderDialog.tsx:159
-#: src/screens/Login/ForgotPasswordForm.tsx:80
-#: src/screens/Login/LoginForm.tsx:659
+#: src/screens/Login/ForgotPasswordForm.tsx:84
+#: src/screens/Login/LoginForm.tsx:660
 msgid "Hosting provider"
 msgstr ""
 
 #. placeholder {0}: toNiceHostingUrl(state.pdsUrl)
-#: src/screens/Login/LoginForm.tsx:655
+#: src/screens/Login/LoginForm.tsx:656
 msgid "Hosting provider: {0}"
 msgstr "Hosting provider: {0}"
 
-#: src/screens/Login/LoginForm.tsx:657
+#: src/screens/Login/LoginForm.tsx:658
 msgid "Hosting provider: Bluesky"
 msgstr "Hosting provider: Bluesky"
 
@@ -6343,16 +6343,16 @@ msgstr ""
 msgid "How we use your number:"
 msgstr ""
 
-#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:150
+#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:152
 msgid "Human trafficking"
 msgstr ""
 
-#: src/components/contacts/screens/GetContacts.tsx:267
+#: src/components/contacts/screens/GetContacts.tsx:269
 msgid "I consent to Bluesky using my contacts for mutual friend discovery and to retain hashed data for matching until I opt out."
 msgstr ""
 
-#: src/screens/Settings/components/DisableEmail2FADialog.tsx:134
-#: src/screens/Settings/components/DisableEmail2FADialog.tsx:137
+#: src/screens/Settings/components/DisableEmail2FADialog.tsx:142
+#: src/screens/Settings/components/DisableEmail2FADialog.tsx:145
 msgid "I have a code"
 msgstr ""
 
@@ -6366,7 +6366,7 @@ msgid "I understand"
 msgstr ""
 
 #. placeholder {0}: currentAccount.handle
-#: src/components/contacts/screens/ViewMatches.tsx:578
+#: src/components/contacts/screens/ViewMatches.tsx:586
 msgid "I'm on Bluesky as {0} - come find me! https://bsky.app/download"
 msgstr ""
 
@@ -6390,7 +6390,7 @@ msgstr ""
 msgid "If you believe your birthdate is incorrect, you can update it by <0>clicking here</0>."
 msgstr ""
 
-#: src/screens/ProfileList/components/MoreOptionsMenu.tsx:272
+#: src/screens/ProfileList/components/MoreOptionsMenu.tsx:273
 msgid "If you delete this list, you won't be able to recover it."
 msgstr ""
 
@@ -6402,7 +6402,7 @@ msgstr ""
 msgid "If you need to update your email, <0>click here</0>."
 msgstr ""
 
-#: src/components/PostControls/PostMenu/PostMenuItems.tsx:826
+#: src/components/PostControls/PostMenu/PostMenuItems.tsx:822
 msgid "If you remove this post, you won't be able to recover it."
 msgstr ""
 
@@ -6410,7 +6410,7 @@ msgstr ""
 msgid "If you update your email address, email 2FA will be disabled."
 msgstr ""
 
-#: src/screens/Settings/components/ChangePasswordDialog.tsx:60
+#: src/screens/Settings/components/ChangePasswordDialog.tsx:62
 msgid "If you want to change your password, we will send you a code to verify that this is your account."
 msgstr ""
 
@@ -6423,7 +6423,7 @@ msgstr ""
 msgid "If you're a developer, you can host your own server."
 msgstr ""
 
-#: src/screens/Settings/components/DeactivateAccountDialog.tsx:92
+#: src/screens/Settings/components/DeactivateAccountDialog.tsx:93
 msgid "If you're trying to change your handle or email, do so before you deactivate."
 msgstr ""
 
@@ -6463,12 +6463,12 @@ msgid "Image gallery, {0} images"
 msgstr "Image gallery, {0} images"
 
 #. Image has been moderated and user has the option of showing it temporarily
-#: src/features/liveNow/components/LiveStatusDialog.tsx:300
+#: src/features/liveNow/components/LiveStatusDialog.tsx:297
 msgid "Image is hidden due to your moderation settings."
 msgstr "Image is hidden due to your moderation settings."
 
 #. Image has been moderated and is not visible to the user
-#: src/features/liveNow/components/LiveStatusDialog.tsx:310
+#: src/features/liveNow/components/LiveStatusDialog.tsx:307
 msgid "Image is unavailable."
 msgstr "Image is unavailable."
 
@@ -6492,14 +6492,14 @@ msgstr ""
 msgid "Images cannot be saved unless permission is granted to access your photo library."
 msgstr ""
 
-#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51
+#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:52
 msgid "Impersonation"
 msgstr ""
 
 #: src/screens/Onboarding/StepFindContactsIntro/index.tsx:76
 #: src/screens/Onboarding/StepFindContactsIntro/index.tsx:81
-#: src/screens/Settings/FindContactsSettings.tsx:153
-#: src/screens/Settings/FindContactsSettings.tsx:158
+#: src/screens/Settings/FindContactsSettings.tsx:151
+#: src/screens/Settings/FindContactsSettings.tsx:156
 msgid "Import contacts"
 msgstr ""
 
@@ -6518,7 +6518,7 @@ msgid "Import contacts to find your friends"
 msgstr ""
 
 #. placeholder {0}: i18n.date(new Date(syncedAt), { dateStyle: 'long', })
-#: src/screens/Settings/FindContactsSettings.tsx:535
+#: src/screens/Settings/FindContactsSettings.tsx:539
 msgid "Imported on {0}"
 msgstr ""
 
@@ -6559,7 +6559,7 @@ msgid "Inbox empty"
 msgstr "Inbox empty"
 
 #. Title message shown in chat requests inbox when it's empty
-#: src/screens/Messages/Inbox.tsx:219
+#: src/screens/Messages/Inbox.tsx:218
 msgid "Inbox zero!"
 msgstr ""
 
@@ -6593,27 +6593,27 @@ msgid "Include posts made until this date"
 msgstr "Include posts made until this date"
 
 #. Checkbox shown when reporting a video. The value is the current playback position, formatted as minutes:seconds.
-#: src/components/moderation/ReportDialog/index.tsx:701
+#: src/components/moderation/ReportDialog/index.tsx:702
 msgid "Include video timestamp ({videoTimestamp})"
 msgstr "Include video timestamp ({videoTimestamp})"
 
-#: src/screens/Login/LoginForm.tsx:165
+#: src/screens/Login/LoginForm.tsx:164
 msgid "Incorrect username or password"
 msgstr ""
 
-#: src/screens/Login/SetNewPasswordForm.tsx:124
+#: src/screens/Login/SetNewPasswordForm.tsx:129
 msgid "Input code sent to your email for password reset"
 msgstr ""
 
-#: src/screens/Login/SetNewPasswordForm.tsx:148
+#: src/screens/Login/SetNewPasswordForm.tsx:153
 msgid "Input new password"
 msgstr ""
 
-#: src/screens/Login/LoginForm.tsx:456
+#: src/screens/Login/LoginForm.tsx:457
 msgid "Input the code which has been emailed to you"
 msgstr ""
 
-#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:136
+#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:137
 msgid "Interaction limited"
 msgstr ""
 
@@ -6641,8 +6641,8 @@ msgstr "Introducing group chats"
 msgid "Introducing saved posts AKA bookmarks"
 msgstr ""
 
-#: src/screens/Login/LoginForm.tsx:156
-#: src/screens/Settings/components/DisableEmail2FADialog.tsx:71
+#: src/screens/Login/LoginForm.tsx:155
+#: src/screens/Settings/components/DisableEmail2FADialog.tsx:79
 msgid "Invalid 2FA confirmation code."
 msgstr ""
 
@@ -6654,7 +6654,7 @@ msgstr "Invalid group chat code."
 msgid "Invalid handle. Please try a different one."
 msgstr ""
 
-#: src/components/PostControls/PostMenu/PostMenuItems.tsx:401
+#: src/components/PostControls/PostMenu/PostMenuItems.tsx:397
 msgctxt "toast"
 msgid "Invalid interaction settings."
 msgstr ""
@@ -6664,24 +6664,24 @@ msgstr ""
 msgid "Invalid phone number"
 msgstr ""
 
-#: src/components/moderation/ReportDialog/index.tsx:139
+#: src/components/moderation/ReportDialog/index.tsx:140
 msgid "Invalid report subject"
 msgstr ""
 
-#: src/components/intents/GroupChatJoinDialog.tsx:200
-#: src/screens/Messages/components/OutgoingRequestListItem.tsx:41
+#: src/components/intents/GroupChatJoinDialog.tsx:205
+#: src/screens/Messages/components/OutgoingRequestListItem.tsx:39
 msgid "Invalid rescind request."
 msgstr "Invalid rescind request."
 
-#: src/components/intents/VerifyEmailIntentDialog.tsx:86
+#: src/components/intents/VerifyEmailIntentDialog.tsx:87
 msgid "Invalid Verification Code"
 msgstr ""
 
-#: src/components/contacts/screens/ViewMatches.tsx:587
+#: src/components/contacts/screens/ViewMatches.tsx:595
 msgid "Invite"
 msgstr ""
 
-#: src/components/contacts/screens/ViewMatches.tsx:567
+#: src/components/contacts/screens/ViewMatches.tsx:575
 msgid "Invite {name} to join Bluesky"
 msgstr ""
 
@@ -6703,16 +6703,16 @@ msgstr "Invite friends"
 msgid "Invite Friends"
 msgstr ""
 
-#: src/components/contacts/screens/ViewMatches.tsx:301
+#: src/components/contacts/screens/ViewMatches.tsx:309
 msgid "Invite friends <0/>"
 msgstr ""
 
-#: src/screens/Messages/components/InviteLinkDialog.tsx:193
-#: src/screens/Messages/components/InviteLinkDialog.tsx:329
-#: src/screens/Messages/components/InviteLinkDialog.tsx:335
-#: src/screens/Messages/components/InviteLinkDialog.tsx:514
+#: src/screens/Messages/components/InviteLinkDialog.tsx:190
+#: src/screens/Messages/components/InviteLinkDialog.tsx:326
+#: src/screens/Messages/components/InviteLinkDialog.tsx:332
+#: src/screens/Messages/components/InviteLinkDialog.tsx:511
 #: src/screens/Messages/components/MessagesListGroupInfoPanel.tsx:149
-#: src/screens/Messages/ConversationSettings/index.tsx:557
+#: src/screens/Messages/ConversationSettings/index.tsx:552
 msgid "Invite link"
 msgstr "Invite link"
 
@@ -6726,20 +6726,20 @@ msgstr "Invite link"
 msgid "Invite link copied"
 msgstr "Invite link copied"
 
-#: src/components/dms/getSystemMessageInfo.ts:120
+#: src/components/dms/getSystemMessageInfo.ts:140
 msgid "Invite link created"
 msgstr "Invite link created"
 
-#: src/components/dms/getSystemMessageInfo.ts:138
-#: src/screens/Messages/components/InviteLinkDialog.tsx:329
+#: src/components/dms/getSystemMessageInfo.ts:164
+#: src/screens/Messages/components/InviteLinkDialog.tsx:326
 msgid "Invite link disabled"
 msgstr "Invite link disabled"
 
-#: src/components/dms/getSystemMessageInfo.ts:126
+#: src/components/dms/getSystemMessageInfo.ts:148
 msgid "Invite link edited"
 msgstr "Invite link edited"
 
-#: src/components/dms/getSystemMessageInfo.ts:132
+#: src/components/dms/getSystemMessageInfo.ts:156
 msgid "Invite link enabled"
 msgstr "Invite link enabled"
 
@@ -6773,16 +6773,16 @@ msgid "It's correct"
 msgstr ""
 
 #. placeholder {0}: getName(items[0])
-#: src/screens/StarterPack/Wizard/index.tsx:483
+#: src/screens/StarterPack/Wizard/index.tsx:479
 msgid "It's just <0>{0} </0>right now! Add more people to your starter pack by searching above."
 msgstr ""
 
-#: src/screens/StarterPack/Wizard/index.tsx:478
+#: src/screens/StarterPack/Wizard/index.tsx:474
 msgid "It's just you right now! Add more people to your starter pack by searching above."
 msgstr ""
 
 #. placeholder {0}: videoState.jobId
-#: src/view/com/composer/Composer.tsx:2648
+#: src/view/com/composer/Composer.tsx:2672
 msgid "Job ID: {0}"
 msgstr ""
 
@@ -6791,29 +6791,29 @@ msgstr ""
 msgid "Jobs"
 msgstr ""
 
-#: src/components/dms/ChatInvite/Root.tsx:117
-#: src/components/intents/GroupChatJoinDialog.tsx:296
+#: src/components/dms/ChatInvite/Root.tsx:118
+#: src/components/intents/GroupChatJoinDialog.tsx:301
 msgid "Join"
 msgstr "Join"
 
-#: src/screens/StarterPack/StarterPackLandingScreen.tsx:210
-#: src/screens/StarterPack/StarterPackLandingScreen.tsx:215
-#: src/screens/StarterPack/StarterPackScreen.tsx:478
-#: src/screens/StarterPack/StarterPackScreen.tsx:488
+#: src/screens/StarterPack/StarterPackLandingScreen.tsx:202
+#: src/screens/StarterPack/StarterPackLandingScreen.tsx:207
+#: src/screens/StarterPack/StarterPackScreen.tsx:471
+#: src/screens/StarterPack/StarterPackScreen.tsx:481
 msgid "Join Bluesky"
 msgstr ""
 
-#: src/components/intents/GroupChatJoinDialog.tsx:72
-#: src/components/intents/GroupChatJoinDialog.tsx:464
+#: src/components/intents/GroupChatJoinDialog.tsx:70
+#: src/components/intents/GroupChatJoinDialog.tsx:469
 msgid "Join group chat"
 msgstr "Join group chat"
 
-#: src/components/intents/GroupChatJoinDialog.tsx:189
-#: src/screens/Messages/components/OutgoingRequestListItem.tsx:31
+#: src/components/intents/GroupChatJoinDialog.tsx:194
+#: src/screens/Messages/components/OutgoingRequestListItem.tsx:29
 msgid "Join request rescinded."
 msgstr "Join request rescinded."
 
-#: src/components/StarterPack/QrCode.tsx:72
+#: src/components/StarterPack/QrCode.tsx:67
 #: src/view/shell/NavSignupCard.tsx:41
 msgid "Join the conversation"
 msgstr ""
@@ -6822,22 +6822,22 @@ msgstr ""
 msgid "Journalism"
 msgstr ""
 
-#: src/view/com/composer/Composer.tsx:1573
-#: src/view/com/composer/Composer.tsx:1583
+#: src/view/com/composer/Composer.tsx:1597
+#: src/view/com/composer/Composer.tsx:1607
 #: src/view/com/composer/drafts/DraftsButton.tsx:135
 msgid "Keep editing"
 msgstr ""
 
-#: src/components/activity-notifications/SubscribeProfileDialog.tsx:230
+#: src/components/activity-notifications/SubscribeProfileDialog.tsx:227
 msgid "Keep me posted"
 msgstr ""
 
-#: src/components/ageAssurance/AgeAssuranceInitDialog.tsx:200
+#: src/components/ageAssurance/AgeAssuranceInitDialog.tsx:209
 msgid "KWS website"
 msgstr ""
 
-#: src/components/PostControls/PostMenu/PostMenuItems.tsx:631
-#: src/components/PostControls/PostMenu/PostMenuItems.tsx:633
+#: src/components/PostControls/PostMenu/PostMenuItems.tsx:627
+#: src/components/PostControls/PostMenu/PostMenuItems.tsx:629
 msgid "Label reply for algo"
 msgstr "Label reply for algo"
 
@@ -6851,7 +6851,7 @@ msgid "Labeled by the author."
 msgstr ""
 
 #: src/view/com/composer/labels/LabelsBtn.tsx:70
-#: src/view/screens/Profile.tsx:234
+#: src/view/screens/Profile.tsx:231
 msgid "Labels"
 msgstr ""
 
@@ -6880,8 +6880,8 @@ msgid "Language Settings"
 msgstr ""
 
 #: src/screens/Settings/LanguageSettings.tsx:98
-#: src/screens/Settings/Settings.tsx:241
-#: src/screens/Settings/Settings.tsx:244
+#: src/screens/Settings/Settings.tsx:243
+#: src/screens/Settings/Settings.tsx:246
 msgid "Languages"
 msgstr ""
 
@@ -6899,9 +6899,9 @@ msgstr ""
 msgid "Last initiated just now"
 msgstr ""
 
-#: src/screens/Hashtag.tsx:97
+#: src/screens/Hashtag.tsx:99
 #: src/screens/Search/SearchResults.tsx:95
-#: src/screens/Topic.tsx:64
+#: src/screens/Topic.tsx:66
 msgid "Latest"
 msgstr ""
 
@@ -6938,7 +6938,7 @@ msgstr ""
 
 #: src/components/contacts/screens/PhoneInput.tsx:303
 #: src/screens/Onboarding/StepFindContactsIntro/index.tsx:53
-#: src/screens/Settings/FindContactsSettings.tsx:140
+#: src/screens/Settings/FindContactsSettings.tsx:138
 msgctxt "english-only-resource"
 msgid "Learn more about importing contacts"
 msgstr ""
@@ -6961,7 +6961,7 @@ msgstr ""
 msgid "Learn more about these changes and how to share your thoughts with us by reading our blog post."
 msgstr ""
 
-#: src/components/moderation/PostHider.tsx:116
+#: src/components/moderation/PostHider.tsx:113
 #: src/components/moderation/ScreenHider.tsx:132
 msgid "Learn more about this warning"
 msgstr ""
@@ -6977,7 +6977,7 @@ msgstr ""
 msgid "Learn more about what is public on Bluesky."
 msgstr ""
 
-#: src/screens/Profile/components/GermButton.tsx:212
+#: src/screens/Profile/components/GermButton.tsx:213
 msgid "Learn more about your Germ DM link"
 msgstr ""
 
@@ -6991,8 +6991,8 @@ msgstr ""
 msgid "Learn more."
 msgstr ""
 
-#: src/components/dms/LeaveConvoPrompt.tsx:59
-#: src/screens/Messages/ConversationSettings/index.tsx:591
+#: src/components/dms/LeaveConvoPrompt.tsx:63
+#: src/screens/Messages/ConversationSettings/index.tsx:586
 msgid "Leave"
 msgstr ""
 
@@ -7004,10 +7004,10 @@ msgstr "Leave"
 
 #: src/components/dms/MessagesListBlockedFooter.tsx:109
 #: src/components/dms/MessagesListBlockedFooter.tsx:116
-#: src/components/moderation/BlockDialog.tsx:381
-#: src/components/moderation/BlockDialog.tsx:388
+#: src/components/moderation/BlockDialog.tsx:382
+#: src/components/moderation/BlockDialog.tsx:389
 #: src/screens/Messages/components/ChatEnded.tsx:66
-#: src/screens/Messages/components/ChatLocked.tsx:112
+#: src/screens/Messages/components/ChatLocked.tsx:116
 msgid "Leave chat"
 msgstr ""
 
@@ -7017,7 +7017,7 @@ msgstr ""
 #: src/components/dms/ConvoMenu.tsx:240
 #: src/components/dms/ConvoMenu.tsx:308
 #: src/components/dms/ConvoMenu.tsx:312
-#: src/components/dms/LeaveConvoPrompt.tsx:53
+#: src/components/dms/LeaveConvoPrompt.tsx:57
 msgid "Leave conversation"
 msgstr ""
 
@@ -7032,7 +7032,7 @@ msgstr "Leave conversation"
 msgid "Leave group chat"
 msgstr "Leave group chat"
 
-#: src/screens/Messages/ConversationSettings/index.tsx:590
+#: src/screens/Messages/ConversationSettings/index.tsx:585
 msgid "Leave this group chat"
 msgstr "Leave this group chat"
 
@@ -7045,11 +7045,11 @@ msgstr ""
 msgid "Leaving this chat will lock it permanently and you won’t be able to rejoin."
 msgstr "Leaving this chat will lock it permanently and you won’t be able to rejoin."
 
-#: src/components/moderation/BlockDialog.tsx:274
+#: src/components/moderation/BlockDialog.tsx:271
 msgid "Left group chat."
 msgstr "Left group chat."
 
-#: src/screens/SignupQueued.tsx:158
+#: src/screens/SignupQueued.tsx:165
 msgid "left to go."
 msgstr ""
 
@@ -7066,8 +7066,8 @@ msgstr ""
 msgid "Let's go!"
 msgstr ""
 
-#: src/components/dialogs/Embed.tsx:159
-#: src/components/dialogs/Embed.tsx:161
+#: src/components/dialogs/Embed.tsx:160
+#: src/components/dialogs/Embed.tsx:162
 #: src/screens/Settings/AppearanceSettings.tsx:87
 msgid "Light"
 msgstr ""
@@ -7083,7 +7083,7 @@ msgstr ""
 
 #. Accessibility label for the like button when the post has not been liked, verb form followed by number of likes and noun form
 #. placeholder {0}: post.likeCount || 0
-#: src/components/PostControls/index.tsx:284
+#: src/components/PostControls/index.tsx:280
 msgid "Like ({0, plural, one {# like} other {# likes}})"
 msgstr ""
 
@@ -7100,7 +7100,7 @@ msgstr ""
 msgid "Like this feed"
 msgstr ""
 
-#: src/screens/Profile/Header/ProfileHeaderLabeler.tsx:149
+#: src/screens/Profile/Header/ProfileHeaderLabeler.tsx:145
 msgid "Like this labeler"
 msgstr ""
 
@@ -7117,16 +7117,16 @@ msgstr ""
 
 #. placeholder {0}: count || 0
 #. placeholder {0}: feed.likeCount || 0
-#: src/components/FeedCard.tsx:249
-#: src/view/com/feeds/FeedSourceCard.tsx:173
+#: src/components/FeedCard.tsx:246
+#: src/view/com/feeds/FeedSourceCard.tsx:171
 msgid "Liked by {0, plural, one {# user} other {# users}}"
 msgstr ""
 
 #. Social proof below the post stats; the bolded name is a person the viewer follows who liked the post
 #. placeholder {0}: nameLink(names[0])
 #. placeholder {0}: names[0].displayName
-#: src/screens/PostThread/components/LikesStat.tsx:132
-#: src/screens/PostThread/components/LikesStat.tsx:173
+#: src/screens/PostThread/components/LikesStat.tsx:134
+#: src/screens/PostThread/components/LikesStat.tsx:175
 msgid "Liked by {0}"
 msgstr "Liked by {0}"
 
@@ -7135,22 +7135,22 @@ msgstr "Liked by {0}"
 #. placeholder {0}: names[0].displayName
 #. placeholder {1}: nameLink(names[1])
 #. placeholder {1}: names[1].displayName
-#: src/screens/PostThread/components/LikesStat.tsx:131
-#: src/screens/PostThread/components/LikesStat.tsx:169
+#: src/screens/PostThread/components/LikesStat.tsx:133
+#: src/screens/PostThread/components/LikesStat.tsx:171
 msgid "Liked by {0} and {1}"
 msgstr "Liked by {0} and {1}"
 
 #: src/components/LabelingServiceCard/index.tsx:96
 #: src/screens/CustomFeed/components/CustomFeedHeader.tsx:540
-#: src/screens/Profile/Header/ProfileHeaderLabeler.tsx:169
-#: src/screens/Profile/Header/ProfileHeaderLabeler.tsx:183
+#: src/screens/Profile/Header/ProfileHeaderLabeler.tsx:165
+#: src/screens/Profile/Header/ProfileHeaderLabeler.tsx:179
 msgid "Liked by {likeCount, plural, one {# user} other {# users}}"
 msgstr ""
 
 #: src/lib/hooks/useNotificationHandler.ts:158
 #: src/screens/Settings/NotificationSettings/index.tsx:159
 #: src/screens/Settings/NotificationSettings/index.tsx:314
-#: src/view/screens/Profile.tsx:240
+#: src/view/screens/Profile.tsx:237
 msgid "Likes"
 msgstr ""
 
@@ -7160,7 +7160,7 @@ msgstr ""
 msgid "Likes of your reposts"
 msgstr ""
 
-#: src/screens/PostThread/components/LikesStat.tsx:39
+#: src/screens/PostThread/components/LikesStat.tsx:41
 msgid "Likes on this post"
 msgstr ""
 
@@ -7177,7 +7177,7 @@ msgstr "Link copied to clipboard"
 msgid "List"
 msgstr ""
 
-#: src/components/dialogs/lists/CreateOrEditListDialog.tsx:397
+#: src/components/dialogs/lists/CreateOrEditListDialog.tsx:405
 msgid "List avatar"
 msgstr ""
 
@@ -7188,8 +7188,8 @@ msgstr ""
 
 #. placeholder {0}: sanitizeHandle(creator.handle, '@')
 #. placeholder {0}: sanitizeHandle(feed.creatorHandle, '@')
-#: src/components/ListCard.tsx:153
-#: src/view/com/feeds/FeedSourceCard.tsx:153
+#: src/components/ListCard.tsx:150
+#: src/view/com/feeds/FeedSourceCard.tsx:151
 msgid "List by {0}"
 msgstr ""
 
@@ -7201,7 +7201,7 @@ msgstr ""
 msgid "List by you"
 msgstr ""
 
-#: src/components/dialogs/lists/CreateListFromStarterPackDialog.tsx:127
+#: src/components/dialogs/lists/CreateListFromStarterPackDialog.tsx:126
 msgid "List created, but failed to add some members"
 msgstr ""
 
@@ -7209,16 +7209,16 @@ msgstr ""
 msgid "List creator"
 msgstr ""
 
-#: src/screens/ProfileList/components/MoreOptionsMenu.tsx:93
+#: src/screens/ProfileList/components/MoreOptionsMenu.tsx:94
 msgctxt "toast"
 msgid "List deleted"
 msgstr ""
 
-#: src/components/dialogs/lists/CreateOrEditListDialog.tsx:446
+#: src/components/dialogs/lists/CreateOrEditListDialog.tsx:454
 msgid "List description"
 msgstr ""
 
-#: src/components/dialogs/lists/CreateOrEditListDialog.tsx:466
+#: src/components/dialogs/lists/CreateOrEditListDialog.tsx:474
 msgid "List description is too long. {DESCRIPTION_MAX_GRAPHEMES, plural, other {The maximum number of characters is #.}}"
 msgstr ""
 
@@ -7226,11 +7226,11 @@ msgstr ""
 msgid "List has been hidden"
 msgstr ""
 
-#: src/screens/ProfileList/index.tsx:175
+#: src/screens/ProfileList/index.tsx:172
 msgid "List Hidden"
 msgstr ""
 
-#: src/components/dialogs/lists/CreateOrEditListDialog.tsx:438
+#: src/components/dialogs/lists/CreateOrEditListDialog.tsx:446
 msgid "List must have a name."
 msgstr ""
 
@@ -7239,36 +7239,36 @@ msgctxt "toast"
 msgid "List muted"
 msgstr ""
 
-#: src/components/dialogs/lists/CreateOrEditListDialog.tsx:410
+#: src/components/dialogs/lists/CreateOrEditListDialog.tsx:418
 msgid "List name"
 msgstr ""
 
-#: src/components/dialogs/lists/CreateOrEditListDialog.tsx:430
+#: src/components/dialogs/lists/CreateOrEditListDialog.tsx:438
 msgid "List name is too long. {DISPLAY_NAME_MAX_GRAPHEMES, plural, other {The maximum number of characters is #.}}"
 msgstr ""
 
-#: src/screens/ProfileList/components/Header.tsx:115
-#: src/screens/ProfileList/components/MoreOptionsMenu.tsx:130
+#: src/screens/ProfileList/components/Header.tsx:116
+#: src/screens/ProfileList/components/MoreOptionsMenu.tsx:131
 msgctxt "toast"
 msgid "List unblocked"
 msgstr ""
 
-#: src/screens/ProfileList/components/Header.tsx:101
-#: src/screens/ProfileList/components/MoreOptionsMenu.tsx:116
+#: src/screens/ProfileList/components/Header.tsx:102
+#: src/screens/ProfileList/components/MoreOptionsMenu.tsx:117
 msgctxt "toast"
 msgid "List unmuted"
 msgstr ""
 
 #: src/Navigation.tsx:174
 #: src/view/screens/Lists.tsx:60
-#: src/view/screens/Profile.tsx:235
-#: src/view/screens/Profile.tsx:243
+#: src/view/screens/Profile.tsx:232
+#: src/view/screens/Profile.tsx:240
 #: src/view/shell/desktop/LeftNav.tsx:722
 #: src/view/shell/Drawer.tsx:607
 msgid "Lists"
 msgstr ""
 
-#: src/view/com/lists/MyLists.tsx:72
+#: src/view/com/lists/MyLists.tsx:75
 msgid "Lists allow you to see content from your favorite people."
 msgstr ""
 
@@ -7297,23 +7297,23 @@ msgstr ""
 msgid "Live event unhidden"
 msgstr ""
 
-#: src/features/liveNow/components/LiveStatusDialog.tsx:245
+#: src/features/liveNow/components/LiveStatusDialog.tsx:242
 msgid "Live feature is in beta"
 msgstr ""
 
-#: src/features/liveNow/components/EditLiveDialog.tsx:142
-#: src/features/liveNow/components/EditLiveDialog.tsx:146
+#: src/features/liveNow/components/EditLiveDialog.tsx:144
+#: src/features/liveNow/components/EditLiveDialog.tsx:148
 #: src/features/liveNow/components/GoLiveDialog.tsx:137
 #: src/features/liveNow/components/GoLiveDialog.tsx:141
 msgid "Live link"
 msgstr ""
 
-#: src/screens/Search/Explore.tsx:87
+#: src/screens/Search/Explore.tsx:83
 msgid "Load more"
 msgstr ""
 
-#: src/screens/Search/Explore.tsx:515
-#: src/screens/Search/Explore.tsx:606
+#: src/screens/Search/Explore.tsx:511
+#: src/screens/Search/Explore.tsx:602
 msgid "Load more suggested feeds"
 msgstr ""
 
@@ -7328,16 +7328,16 @@ msgstr ""
 msgid "Load new posts"
 msgstr ""
 
-#: src/screens/Messages/components/MessageComposer.tsx:254
+#: src/screens/Messages/components/MessageComposer.tsx:255
 msgctxt "placeholder"
 msgid "Loading chat…"
 msgstr "Loading chat…"
 
-#: src/components/dialogs/PostInteractionSettingsDialog.tsx:575
+#: src/components/dialogs/PostInteractionSettingsDialog.tsx:572
 msgid "Loading lists..."
 msgstr ""
 
-#: src/components/dialogs/PostInteractionSettingsDialog.tsx:279
+#: src/components/dialogs/PostInteractionSettingsDialog.tsx:276
 msgid "Loading post interaction settings..."
 msgstr ""
 
@@ -7345,7 +7345,7 @@ msgstr ""
 msgid "Loading..."
 msgstr ""
 
-#: src/screens/Messages/ConversationSettings/index.tsx:571
+#: src/screens/Messages/ConversationSettings/index.tsx:566
 msgid "Lock"
 msgstr "Lock"
 
@@ -7357,11 +7357,11 @@ msgstr "Lock group chat"
 msgid "Lock group chat?"
 msgstr "Lock group chat?"
 
-#: src/screens/Messages/ConversationSettings/index.tsx:569
+#: src/screens/Messages/ConversationSettings/index.tsx:564
 msgid "Lock this group chat"
 msgstr "Lock this group chat"
 
-#: src/screens/Messages/ConversationSettings/index.tsx:571
+#: src/screens/Messages/ConversationSettings/index.tsx:566
 msgid "Locked"
 msgstr "Locked"
 
@@ -7396,7 +7396,7 @@ msgstr ""
 msgid "Longer videos"
 msgstr "Longer videos"
 
-#: src/screens/Login/SetNewPasswordForm.tsx:114
+#: src/screens/Login/SetNewPasswordForm.tsx:119
 msgid "Looks like XXXXX-XXXXX"
 msgstr ""
 
@@ -7438,7 +7438,7 @@ msgstr ""
 msgid "Manage verification settings"
 msgstr ""
 
-#: src/components/dialogs/MutedWords.tsx:111
+#: src/components/dialogs/MutedWords.tsx:113
 msgid "Manage your muted words and tags"
 msgstr ""
 
@@ -7447,8 +7447,8 @@ msgstr ""
 msgid "Manual"
 msgstr "Manual"
 
-#: src/screens/Messages/Inbox.tsx:312
-#: src/screens/Messages/Inbox.tsx:318
+#: src/screens/Messages/Inbox.tsx:311
+#: src/screens/Messages/Inbox.tsx:317
 msgid "Mark all as read"
 msgstr ""
 
@@ -7471,7 +7471,7 @@ msgstr "Mark all requests as read"
 msgid "Mark as read"
 msgstr ""
 
-#: src/screens/Messages/Inbox.tsx:299
+#: src/screens/Messages/Inbox.tsx:298
 msgid "Marked all as read"
 msgstr ""
 
@@ -7495,7 +7495,7 @@ msgid "Me"
 msgstr "Me"
 
 #: src/screens/Search/components/AdvancedSearchDialog/index.tsx:375
-#: src/view/screens/Profile.tsx:238
+#: src/view/screens/Profile.tsx:235
 msgid "Media"
 msgstr ""
 
@@ -7526,7 +7526,7 @@ msgstr "Members"
 msgid "Members can still read chat history but can’t send new messages."
 msgstr "Members can still read chat history but can’t send new messages."
 
-#: src/components/WhoCanReply.tsx:320
+#: src/components/WhoCanReply.tsx:313
 msgid "mentioned users"
 msgstr ""
 
@@ -7551,7 +7551,7 @@ msgctxt "action"
 msgid "Message"
 msgstr "Message"
 
-#: src/screens/Messages/components/MessageComposer.tsx:255
+#: src/screens/Messages/components/MessageComposer.tsx:256
 msgctxt "description"
 msgid "Message"
 msgstr "Message"
@@ -7565,7 +7565,7 @@ msgstr ""
 msgid "Message {displayName}"
 msgstr "Message {displayName}"
 
-#: src/screens/Messages/components/ChatListItem.tsx:322
+#: src/screens/Messages/components/ChatListItem.tsx:327
 msgid "Message deleted"
 msgstr ""
 
@@ -7574,30 +7574,30 @@ msgctxt "toast"
 msgid "Message deleted"
 msgstr ""
 
-#: src/components/dms/MessageItem.tsx:637
+#: src/components/dms/MessageItem.tsx:652
 msgid "Message failed to send."
 msgstr "Message failed to send."
 
 #. placeholder {0}: sender?.handle ?? 'unknown'
 #. placeholder {1}: message.text
-#: src/components/dms/MessageContextMenu.tsx:166
+#: src/components/dms/MessageContextMenu.tsx:164
 msgid "Message from @{0}: {1}"
 msgstr ""
 
 #. placeholder {0}: rawError.message
-#: src/view/com/posts/PostFeedErrorMessage.tsx:209
+#: src/view/com/posts/PostFeedErrorMessage.tsx:207
 msgid "Message from server: {0}"
 msgstr ""
 
-#: src/screens/Messages/components/MessageComposer.tsx:251
+#: src/screens/Messages/components/MessageComposer.tsx:252
 msgid "Message input field"
 msgstr ""
 
-#: src/screens/Messages/components/MessageComposer.tsx:116
+#: src/screens/Messages/components/MessageComposer.tsx:117
 msgid "Message is too long ({graphemeCount}/{MAX_DM_GRAPHEME_LENGTH})"
 msgstr "Message is too long ({graphemeCount}/{MAX_DM_GRAPHEME_LENGTH})"
 
-#: src/components/dms/MessageContextMenu.tsx:165
+#: src/components/dms/MessageContextMenu.tsx:163
 msgid "Message options"
 msgstr ""
 
@@ -7605,11 +7605,11 @@ msgstr ""
 msgid "Messages"
 msgstr ""
 
-#: src/components/dms/MessageItem.tsx:736
+#: src/components/dms/MessageItem.tsx:751
 msgid "Messages from this person are hidden while they are blocking you."
 msgstr "Messages from this person are hidden while they are blocking you."
 
-#: src/components/dms/MessageItem.tsx:731
+#: src/components/dms/MessageItem.tsx:746
 msgid "Messages from this person are hidden while you are blocking them."
 msgstr "Messages from this person are hidden while you are blocking them."
 
@@ -7618,11 +7618,11 @@ msgctxt "Name of app icon variant"
 msgid "Midnight"
 msgstr ""
 
-#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:177
+#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:179
 msgid "Minor harassment or bullying"
 msgstr ""
 
-#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:35
+#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:36
 msgid "Misleading"
 msgstr ""
 
@@ -7635,8 +7635,8 @@ msgstr ""
 msgid "Moderation"
 msgstr ""
 
-#: src/screens/Settings/Settings.tsx:191
-#: src/screens/Settings/Settings.tsx:194
+#: src/screens/Settings/Settings.tsx:193
+#: src/screens/Settings/Settings.tsx:196
 msgid "Moderation and content filters"
 msgstr "Moderation and content filters"
 
@@ -7647,7 +7647,7 @@ msgstr ""
 #. placeholder {0}: sanitizeHandle(creator.handle, '@')
 #. placeholder {0}: sanitizeHandle(list.creator.handle, '@')
 #: src/components/dialogs/lists/UserAddRemoveListsDialog.tsx:311
-#: src/components/ListCard.tsx:152
+#: src/components/ListCard.tsx:149
 msgid "Moderation list by {0}"
 msgstr ""
 
@@ -7660,12 +7660,12 @@ msgstr ""
 msgid "Moderation list by you"
 msgstr ""
 
-#: src/components/dialogs/lists/CreateOrEditListDialog.tsx:256
+#: src/components/dialogs/lists/CreateOrEditListDialog.tsx:264
 msgctxt "toast"
 msgid "Moderation list created"
 msgstr ""
 
-#: src/components/dialogs/lists/CreateOrEditListDialog.tsx:242
+#: src/components/dialogs/lists/CreateOrEditListDialog.tsx:250
 msgctxt "toast"
 msgid "Moderation list updated"
 msgstr ""
@@ -7692,7 +7692,7 @@ msgid "Moderation tools"
 msgstr ""
 
 #: src/components/moderation/ModerationDetailsDialog.tsx:72
-#: src/lib/moderation/useModerationCauseDescription.ts:48
+#: src/lib/moderation/useModerationCauseDescription.ts:45
 msgid "Moderator has chosen to set a general warning on the content."
 msgstr ""
 
@@ -7706,7 +7706,7 @@ msgstr ""
 msgid "More languages..."
 msgstr ""
 
-#: src/screens/ProfileList/components/MoreOptionsMenu.tsx:144
+#: src/screens/ProfileList/components/MoreOptionsMenu.tsx:145
 #: src/view/com/composer/drafts/DraftItem.tsx:190
 #: src/view/com/profile/ProfileMenu.tsx:292
 #: src/view/com/profile/ProfileMenu.tsx:299
@@ -7729,7 +7729,7 @@ msgstr ""
 msgid "Music"
 msgstr ""
 
-#: src/screens/Messages/ConversationSettings/index.tsx:536
+#: src/screens/Messages/ConversationSettings/index.tsx:531
 msgid "Mute"
 msgstr "Mute"
 
@@ -7745,8 +7745,8 @@ msgstr ""
 msgid "Mute {0}"
 msgstr "Mute {0}"
 
-#: src/components/PostControls/PostMenu/PostMenuItems.tsx:755
-#: src/components/PostControls/PostMenu/PostMenuItems.tsx:761
+#: src/components/PostControls/PostMenu/PostMenuItems.tsx:751
+#: src/components/PostControls/PostMenu/PostMenuItems.tsx:757
 #: src/view/com/profile/ProfileMenu.tsx:512
 #: src/view/com/profile/ProfileMenu.tsx:519
 msgid "Mute account"
@@ -7762,7 +7762,7 @@ msgstr ""
 msgid "Mute conversation"
 msgstr ""
 
-#: src/components/dialogs/MutedWords.tsx:262
+#: src/components/dialogs/MutedWords.tsx:264
 msgid "Mute in:"
 msgstr ""
 
@@ -7774,41 +7774,41 @@ msgstr ""
 msgid "Mute these accounts?"
 msgstr ""
 
-#: src/screens/Messages/ConversationSettings/index.tsx:534
+#: src/screens/Messages/ConversationSettings/index.tsx:529
 msgid "Mute this group chat"
 msgstr "Mute this group chat"
 
-#: src/components/dialogs/MutedWords.tsx:194
+#: src/components/dialogs/MutedWords.tsx:196
 msgid "Mute this word for 24 hours"
 msgstr ""
 
-#: src/components/dialogs/MutedWords.tsx:233
+#: src/components/dialogs/MutedWords.tsx:235
 msgid "Mute this word for 30 days"
 msgstr ""
 
-#: src/components/dialogs/MutedWords.tsx:218
+#: src/components/dialogs/MutedWords.tsx:220
 msgid "Mute this word for 7 days"
 msgstr ""
 
-#: src/components/dialogs/MutedWords.tsx:267
+#: src/components/dialogs/MutedWords.tsx:269
 msgid "Mute this word in post text and tags"
 msgstr ""
 
-#: src/components/dialogs/MutedWords.tsx:283
+#: src/components/dialogs/MutedWords.tsx:285
 msgid "Mute this word in tags only"
 msgstr ""
 
-#: src/components/dialogs/MutedWords.tsx:179
+#: src/components/dialogs/MutedWords.tsx:181
 msgid "Mute this word until you unmute it"
 msgstr ""
 
-#: src/components/PostControls/PostMenu/PostMenuItems.tsx:646
-#: src/components/PostControls/PostMenu/PostMenuItems.tsx:649
+#: src/components/PostControls/PostMenu/PostMenuItems.tsx:642
+#: src/components/PostControls/PostMenu/PostMenuItems.tsx:645
 msgid "Mute thread"
 msgstr ""
 
-#: src/components/PostControls/PostMenu/PostMenuItems.tsx:659
-#: src/components/PostControls/PostMenu/PostMenuItems.tsx:661
+#: src/components/PostControls/PostMenu/PostMenuItems.tsx:655
+#: src/components/PostControls/PostMenu/PostMenuItems.tsx:657
 msgid "Mute words & tags"
 msgstr ""
 
@@ -7816,7 +7816,7 @@ msgstr ""
 msgid "Mute, leave, or remove people anytime. It’s your chat."
 msgstr "Mute, leave, or remove people anytime. It’s your chat."
 
-#: src/screens/Messages/ConversationSettings/index.tsx:536
+#: src/screens/Messages/ConversationSettings/index.tsx:531
 msgid "Muted"
 msgstr "Muted"
 
@@ -7834,7 +7834,7 @@ msgid "Muted accounts have their posts removed from your feed and from your noti
 msgstr ""
 
 #. placeholder {0}: cause.source.list.name
-#: src/lib/moderation/useModerationCauseDescription.ts:93
+#: src/lib/moderation/useModerationCauseDescription.ts:90
 msgid "Muted by \"{0}\""
 msgstr ""
 
@@ -7846,7 +7846,7 @@ msgstr ""
 msgid "Muting is private. Muted accounts can interact with you, but you will not see their posts or receive notifications from them."
 msgstr ""
 
-#: src/components/moderation/BlockDialog.tsx:174
+#: src/components/moderation/BlockDialog.tsx:171
 msgid "Mutual group chats"
 msgstr "Mutual group chats"
 
@@ -7867,7 +7867,7 @@ msgstr ""
 msgid "My starter pack"
 msgstr "My starter pack"
 
-#: src/components/dialogs/lists/CreateOrEditListDialog.tsx:416
+#: src/components/dialogs/lists/CreateOrEditListDialog.tsx:424
 msgid "Name"
 msgstr ""
 
@@ -7877,18 +7877,18 @@ msgstr ""
 
 #. placeholder {0}: record.name
 #. placeholder {0}: view.record.name
-#: src/components/StarterPack/StarterPackCard.tsx:134
-#: src/components/StarterPack/StarterPackCard.tsx:169
+#: src/components/StarterPack/StarterPackCard.tsx:127
+#: src/components/StarterPack/StarterPackCard.tsx:157
 msgid "Navigate to {0}"
 msgstr ""
 
-#: src/components/StarterPack/StarterPackCard.tsx:135
+#: src/components/StarterPack/StarterPackCard.tsx:128
 msgid "Navigate to starter pack"
 msgstr ""
 
-#: src/screens/Login/ForgotPasswordForm.tsx:144
-#: src/screens/Login/ForgotPasswordForm.tsx:169
-#: src/screens/Login/LoginForm.tsx:555
+#: src/screens/Login/ForgotPasswordForm.tsx:148
+#: src/screens/Login/ForgotPasswordForm.tsx:173
+#: src/screens/Login/LoginForm.tsx:556
 msgid "Navigates to the next screen"
 msgstr ""
 
@@ -7896,8 +7896,8 @@ msgstr ""
 msgid "Navigates to your profile"
 msgstr ""
 
-#: src/components/moderation/ReportDialog/index.tsx:414
-#: src/components/moderation/ReportDialog/index.tsx:430
+#: src/components/moderation/ReportDialog/index.tsx:415
+#: src/components/moderation/ReportDialog/index.tsx:431
 msgid "Need to report a copyright violation, legal request, or regulatory compliance issue?"
 msgstr ""
 
@@ -7920,16 +7920,16 @@ msgctxt "nux-description"
 msgid "New"
 msgstr "New"
 
-#: src/view/com/notifications/NotificationFeedItem.tsx:559
+#: src/view/com/notifications/NotificationFeedItem.tsx:551
 msgid "New {postsCount, plural, one {post} other {posts}} from {firstAuthorLink}"
 msgstr ""
 
-#: src/view/com/notifications/NotificationFeedItem.tsx:543
+#: src/view/com/notifications/NotificationFeedItem.tsx:535
 msgid "New {postsCount, plural, one {post} other {posts}} from {firstAuthorName}"
 msgstr ""
 
-#: src/components/dms/dialogs/NewChatDialog.tsx:169
-#: src/components/dms/dialogs/NewChatDialog.tsx:184
+#: src/components/dms/dialogs/NewChatDialog.tsx:162
+#: src/components/dms/dialogs/NewChatDialog.tsx:177
 #: src/screens/Messages/ChatList.tsx:231
 #: src/screens/Messages/ChatList.tsx:232
 #: src/screens/Messages/ChatList.tsx:455
@@ -8013,18 +8013,18 @@ msgstr "New message requests"
 msgid "New messages"
 msgstr "New messages"
 
-#: src/screens/Login/SetNewPasswordForm.tsx:130
-#: src/screens/Settings/components/ChangePasswordDialog.tsx:204
+#: src/screens/Login/SetNewPasswordForm.tsx:135
 #: src/screens/Settings/components/ChangePasswordDialog.tsx:208
+#: src/screens/Settings/components/ChangePasswordDialog.tsx:212
 msgid "New password"
 msgstr ""
 
 #: src/screens/CustomFeed/index.tsx:218
-#: src/screens/ProfileList/index.tsx:237
-#: src/screens/ProfileList/index.tsx:280
+#: src/screens/ProfileList/index.tsx:234
+#: src/screens/ProfileList/index.tsx:277
 #: src/view/screens/Feeds.tsx:545
 #: src/view/screens/Notifications.tsx:165
-#: src/view/screens/Profile.tsx:607
+#: src/view/screens/Profile.tsx:604
 msgid "New post"
 msgstr ""
 
@@ -8034,23 +8034,23 @@ msgctxt "action"
 msgid "New post"
 msgstr ""
 
-#: src/view/com/notifications/NotificationFeedItem.tsx:548
+#: src/view/com/notifications/NotificationFeedItem.tsx:540
 msgid "New posts from {firstAuthorLink} and <0>{additionalAuthorsCount, plural, one {{formattedAuthorsCount} other} other {{formattedAuthorsCount} others}}</0> "
 msgstr "New posts from {firstAuthorLink} and <0>{additionalAuthorsCount, plural, one {{formattedAuthorsCount} other} other {{formattedAuthorsCount} others}}</0> "
 
-#: src/view/com/notifications/NotificationFeedItem.tsx:536
+#: src/view/com/notifications/NotificationFeedItem.tsx:528
 msgid "New posts from {firstAuthorName} and {additionalAuthorsCount, plural, one {{formattedAuthorsCount} other} other {{formattedAuthorsCount} others}}"
 msgstr ""
 
-#: src/components/dialogs/StarterPackDialog.tsx:202
+#: src/components/dialogs/StarterPackDialog.tsx:199
 msgid "New starter pack"
 msgstr ""
 
-#: src/screens/Login/LoginForm.tsx:569
+#: src/screens/Login/LoginForm.tsx:570
 msgid "New to Bluesky? <0>Sign up</0>"
 msgstr "New to Bluesky? <0>Sign up</0>"
 
-#: src/components/NewskieDialog.tsx:122
+#: src/components/NewskieDialog.tsx:123
 msgid "New user info dialog"
 msgstr ""
 
@@ -8062,27 +8062,27 @@ msgid "Newest replies first"
 msgstr ""
 
 #: src/lib/interests.ts:67
-#: src/screens/Search/modules/ExploreTrendingTopics.tsx:248
+#: src/screens/Search/modules/ExploreTrendingTopics.tsx:246
 msgid "News"
 msgstr ""
 
-#: src/components/contacts/screens/ViewMatches.tsx:395
-#: src/components/contacts/screens/ViewMatches.tsx:410
+#: src/components/contacts/screens/ViewMatches.tsx:403
+#: src/components/contacts/screens/ViewMatches.tsx:418
 #: src/components/dms/AddMembersFlow.tsx:325
 #: src/components/dms/InitiateChatFlow.tsx:599
-#: src/screens/Login/ForgotPasswordForm.tsx:143
-#: src/screens/Login/ForgotPasswordForm.tsx:150
-#: src/screens/Login/SetNewPasswordForm.tsx:171
-#: src/screens/Login/SetNewPasswordForm.tsx:177
+#: src/screens/Login/ForgotPasswordForm.tsx:147
+#: src/screens/Login/ForgotPasswordForm.tsx:154
+#: src/screens/Login/SetNewPasswordForm.tsx:176
+#: src/screens/Login/SetNewPasswordForm.tsx:182
 #: src/screens/Onboarding/StepFinished/index.tsx:330
 #: src/screens/Onboarding/StepFinished/index.tsx:339
 #: src/screens/Settings/components/AddAppPasswordDialog.tsx:157
 #: src/screens/Settings/components/AddAppPasswordDialog.tsx:165
 #: src/screens/Signup/BackNextButtons.tsx:68
+#: src/screens/StarterPack/Wizard/index.tsx:194
 #: src/screens/StarterPack/Wizard/index.tsx:198
-#: src/screens/StarterPack/Wizard/index.tsx:202
-#: src/screens/StarterPack/Wizard/index.tsx:384
-#: src/screens/StarterPack/Wizard/index.tsx:391
+#: src/screens/StarterPack/Wizard/index.tsx:380
+#: src/screens/StarterPack/Wizard/index.tsx:387
 msgid "Next"
 msgstr ""
 
@@ -8094,8 +8094,8 @@ msgstr ""
 msgid "Night"
 msgstr "Night"
 
-#: src/components/moderation/ReportDialog/index.tsx:1010
-#: src/components/moderation/ReportDialog/index.tsx:1019
+#: src/components/moderation/ReportDialog/index.tsx:1011
+#: src/components/moderation/ReportDialog/index.tsx:1020
 msgctxt "Answer to a yes/no question"
 msgid "No"
 msgstr "No"
@@ -8117,11 +8117,11 @@ msgstr "No author filter"
 msgid "No beta features at the moment."
 msgstr "No beta features at the moment."
 
-#: src/components/contacts/screens/ViewMatches.tsx:681
+#: src/components/contacts/screens/ViewMatches.tsx:689
 msgid "No contacts found"
 msgstr ""
 
-#: src/components/contacts/screens/ViewMatches.tsx:659
+#: src/components/contacts/screens/ViewMatches.tsx:667
 msgid "No contacts with the name “{query}” found"
 msgstr ""
 
@@ -8138,11 +8138,11 @@ msgstr ""
 msgid "No drafts yet"
 msgstr ""
 
-#: src/features/liveNow/components/EditLiveDialog.tsx:134
+#: src/features/liveNow/components/EditLiveDialog.tsx:136
 msgid "No expiry set"
 msgstr ""
 
-#: src/screens/StarterPack/Wizard/StepFeeds.tsx:122
+#: src/screens/StarterPack/Wizard/StepFeeds.tsx:123
 msgid "No feeds found. Try searching for something else."
 msgstr ""
 
@@ -8170,9 +8170,9 @@ msgstr ""
 msgid "No language filter"
 msgstr "No language filter"
 
-#: src/components/LikedByList.tsx:84
-#: src/view/com/post-thread/PostLikedBy.tsx:84
-#: src/view/screens/Profile.tsx:539
+#: src/components/LikedByList.tsx:90
+#: src/view/com/post-thread/PostLikedBy.tsx:90
+#: src/view/screens/Profile.tsx:536
 msgid "No likes yet"
 msgstr ""
 
@@ -8183,9 +8183,9 @@ msgstr ""
 #. placeholder {0}: sanitizeDisplayName( profile.displayName || profile.handle, moderation.ui('displayName'), )
 #. placeholder {0}: sanitizeDisplayName( profile.displayName || profile.handle, moderation.ui('displayName'), )
 #. placeholder {0}: sanitizeDisplayName( profile.displayName || profile.handle, )
-#: src/components/ProfileCard.tsx:523
+#: src/components/ProfileCard.tsx:520
 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:273
-#: src/view/com/notifications/NotificationFeedItem.tsx:848
+#: src/view/com/notifications/NotificationFeedItem.tsx:841
 msgid "No longer following {0}"
 msgstr ""
 
@@ -8194,7 +8194,7 @@ msgstr ""
 msgid "No media filter"
 msgstr "No media filter"
 
-#: src/view/screens/Profile.tsx:485
+#: src/view/screens/Profile.tsx:482
 msgid "No media yet"
 msgstr ""
 
@@ -8206,7 +8206,7 @@ msgstr ""
 msgid "No more doomscrolling junk-filled algorithms. Find feeds that work for you, not against you."
 msgstr ""
 
-#: src/components/contacts/screens/ViewMatches.tsx:563
+#: src/components/contacts/screens/ViewMatches.tsx:571
 msgid "No name"
 msgstr ""
 
@@ -8231,11 +8231,11 @@ msgctxt "enable for"
 msgid "No one"
 msgstr ""
 
-#: src/components/WhoCanReply.tsx:303
+#: src/components/WhoCanReply.tsx:296
 msgid "No one but the author can quote this post."
 msgstr ""
 
-#: src/screens/Messages/components/ChatLocked.tsx:73
+#: src/screens/Messages/components/ChatLocked.tsx:77
 msgid "No one can send messages"
 msgstr "No one can send messages"
 
@@ -8249,11 +8249,11 @@ msgid "No posts here"
 msgstr ""
 
 #: src/screens/Profile/Sections/Feed.tsx:84
-#: src/view/screens/Profile.tsx:443
+#: src/view/screens/Profile.tsx:440
 msgid "No posts yet"
 msgstr ""
 
-#: src/view/com/post-thread/PostQuotes.tsx:114
+#: src/view/com/post-thread/PostQuotes.tsx:107
 msgid "No quotes yet"
 msgstr ""
 
@@ -8262,7 +8262,7 @@ msgstr ""
 msgid "No recent GIFs yet. Pick one to see it here."
 msgstr "No recent GIFs yet. Pick one to see it here."
 
-#: src/view/screens/Profile.tsx:470
+#: src/view/screens/Profile.tsx:467
 msgid "No replies yet"
 msgstr ""
 
@@ -8271,7 +8271,7 @@ msgid "No reposts yet"
 msgstr ""
 
 #: src/view/com/composer/text-input/mobile/Autocomplete.tsx:60
-#: src/view/com/composer/text-input/web/Autocomplete.tsx:192
+#: src/view/com/composer/text-input/web/Autocomplete.tsx:193
 msgid "No result"
 msgstr ""
 
@@ -8283,7 +8283,7 @@ msgid "No results"
 msgstr ""
 
 #. placeholder {0}: interestsDisplayNames[selectedInterest]
-#: src/screens/Search/Explore.tsx:817
+#: src/screens/Search/Explore.tsx:813
 msgid "No results for \"{0}\"."
 msgstr ""
 
@@ -8308,11 +8308,11 @@ msgstr "No results found for “<0>{query}</0>”."
 msgid "No results found for your query with advanced search filters applied."
 msgstr "No results found for your query with advanced search filters applied."
 
-#: src/screens/Search/Explore.tsx:821
+#: src/screens/Search/Explore.tsx:817
 msgid "No results."
 msgstr ""
 
-#: src/view/screens/Profile.tsx:571
+#: src/view/screens/Profile.tsx:568
 msgid "No Starter Packs yet"
 msgstr ""
 
@@ -8325,20 +8325,20 @@ msgstr ""
 msgid "No translation received from your device."
 msgstr "No translation received from your device."
 
-#: src/view/screens/Profile.tsx:512
+#: src/view/screens/Profile.tsx:509
 msgid "No video posts yet"
 msgstr ""
 
-#: src/components/dialogs/PostInteractionSettingsDialog.tsx:471
+#: src/components/dialogs/PostInteractionSettingsDialog.tsx:468
 msgid "Nobody"
 msgstr ""
 
-#: src/components/LikedByList.tsx:86
-#: src/view/com/post-thread/PostLikedBy.tsx:86
+#: src/components/LikedByList.tsx:92
+#: src/view/com/post-thread/PostLikedBy.tsx:92
 msgid "Nobody has liked this yet. Maybe you should be the first!"
 msgstr ""
 
-#: src/view/com/post-thread/PostQuotes.tsx:116
+#: src/view/com/post-thread/PostQuotes.tsx:109
 msgid "Nobody has quoted this yet. Maybe you should be the first!"
 msgstr ""
 
@@ -8350,7 +8350,7 @@ msgstr ""
 msgid "Nobody was found. Try searching for someone else."
 msgstr ""
 
-#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:80
+#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:81
 msgid "Non-consensual intimate imagery"
 msgstr ""
 
@@ -8376,16 +8376,16 @@ msgid "Not available on this platform"
 msgstr "Not available on this platform"
 
 #: src/screens/FindContactsFlowScreen.tsx:62
-#: src/screens/Settings/FindContactsSettings.tsx:106
+#: src/screens/Settings/FindContactsSettings.tsx:104
 msgid "Not available on this platform."
 msgstr ""
 
-#: src/components/KnownFollowers.tsx:254
+#: src/components/KnownFollowers.tsx:253
 msgid "Not followed by anyone you’re following"
 msgstr "Not followed by anyone you’re following"
 
 #: src/Navigation.tsx:169
-#: src/view/screens/Profile.tsx:133
+#: src/view/screens/Profile.tsx:130
 msgid "Not Found"
 msgstr ""
 
@@ -8405,7 +8405,7 @@ msgstr ""
 msgid "Note: This post is only visible to logged-in users."
 msgstr ""
 
-#: src/screens/Bookmarks.tsx:292
+#: src/screens/Bookmarks.tsx:290
 msgid "Nothing saved yet"
 msgstr ""
 
@@ -8427,8 +8427,8 @@ msgstr ""
 #: src/screens/Notifications/ActivityList.tsx:31
 #: src/screens/Settings/NotificationSettings/ActivityNotificationSettings.tsx:93
 #: src/screens/Settings/NotificationSettings/index.tsx:125
-#: src/screens/Settings/Settings.tsx:199
-#: src/screens/Settings/Settings.tsx:202
+#: src/screens/Settings/Settings.tsx:201
+#: src/screens/Settings/Settings.tsx:204
 #: src/view/screens/Notifications.tsx:128
 #: src/view/shell/bottom-bar/BottomBar.tsx:279
 #: src/view/shell/desktop/LeftNav.tsx:687
@@ -8463,8 +8463,8 @@ msgid "Oh no!"
 msgstr ""
 
 #. Confirm button text.
-#: src/components/contacts/screens/GetContacts.tsx:317
-#: src/screens/Profile/Header/ProfileHeaderLabeler.tsx:227
+#: src/components/contacts/screens/GetContacts.tsx:319
+#: src/screens/Profile/Header/ProfileHeaderLabeler.tsx:223
 #: src/screens/Search/modules/ExploreInterestsCard.tsx:44
 #: src/screens/Settings/AppIconSettings/index.tsx:46
 #: src/screens/Settings/AppIconSettings/index.tsx:232
@@ -8474,9 +8474,9 @@ msgstr ""
 #: src/components/BotAccountAlert.tsx:52
 #: src/components/BotAccountAlert.tsx:57
 #: src/components/dms/InitiateChatFlow.tsx:838
-#: src/components/dms/MessageItem.tsx:743
+#: src/components/dms/MessageItem.tsx:758
 #: src/screens/Login/PasswordUpdatedForm.tsx:35
-#: src/screens/PostThread/components/ThreadItemAnchor.tsx:658
+#: src/screens/PostThread/components/ThreadItemAnchor.tsx:655
 msgid "Okay"
 msgstr ""
 
@@ -8491,29 +8491,29 @@ msgstr ""
 msgid "On"
 msgstr "On"
 
-#: src/components/StarterPack/QrCode.tsx:86
+#: src/components/StarterPack/QrCode.tsx:81
 msgid "on<0><1/><2><3/></2></0>"
 msgstr ""
 
-#: src/screens/Settings/Settings.tsx:407
+#: src/screens/Settings/Settings.tsx:409
 msgid "Onboarding reset"
 msgstr ""
 
-#: src/components/dms/dialogs/NewChatDialog.tsx:117
-#: src/components/dms/dialogs/ShareViaChatDialog.tsx:133
+#: src/components/dms/dialogs/NewChatDialog.tsx:108
+#: src/components/dms/dialogs/ShareViaChatDialog.tsx:124
 msgid "One of the selected recipients does not allow group chats."
 msgstr "One of the selected recipients does not allow group chats."
 
-#: src/components/dms/dialogs/NewChatDialog.tsx:100
-#: src/components/dms/dialogs/ShareViaChatDialog.tsx:116
+#: src/components/dms/dialogs/NewChatDialog.tsx:96
+#: src/components/dms/dialogs/ShareViaChatDialog.tsx:112
 msgid "One of the selected recipients has blocked you and cannot be messaged."
 msgstr "One of the selected recipients has blocked you and cannot be messaged."
 
-#: src/view/com/composer/Composer.tsx:967
+#: src/view/com/composer/Composer.tsx:983
 msgid "One or more GIFs is missing alt text."
 msgstr ""
 
-#: src/view/com/composer/Composer.tsx:964
+#: src/view/com/composer/Composer.tsx:980
 msgid "One or more images is missing alt text."
 msgstr ""
 
@@ -8525,16 +8525,16 @@ msgstr ""
 msgid "One or more of your selected files are too large. Maximum size is {VIDEO_MAX_SIZE_MB} MB."
 msgstr "One or more of your selected files are too large. Maximum size is {VIDEO_MAX_SIZE_MB} MB."
 
-#: src/view/com/composer/Composer.tsx:770
+#: src/view/com/composer/Composer.tsx:786
 msgid "One or more posts are too long to save as a draft. {MAX_DRAFT_GRAPHEME_LENGTH, plural, one {The maximum number of characters is # character.} other {The maximum number of characters is # characters.}}"
 msgstr ""
 
-#: src/view/com/composer/Composer.tsx:974
+#: src/view/com/composer/Composer.tsx:990
 msgid "One or more videos is missing alt text."
 msgstr ""
 
 #. placeholder {0}: settings.map((rule, i) => ( <Fragment key={`rule-${i}`}> <Rule rule={rule} post={post} lists={post.threadgate!.lists} /> <Separator i={i} length={settings.length} /> </Fragment> ))
-#: src/components/WhoCanReply.tsx:283
+#: src/components/WhoCanReply.tsx:276
 msgid "Only {0} can reply."
 msgstr ""
 
@@ -8542,19 +8542,19 @@ msgstr ""
 #. placeholder {0}: result.accepted.length
 #. placeholder {1}: next.length
 #. placeholder {2}: next.length
-#: src/view/com/composer/Composer.tsx:235
+#: src/view/com/composer/Composer.tsx:237
 msgid "Only {0} of {1} {2, plural, one {image} other {images}} added; limit is {MAX_GALLERY_IMAGES}"
 msgstr "Only {0} of {1} {2, plural, one {image} other {images}} added; limit is {MAX_GALLERY_IMAGES}"
 
-#: src/screens/Messages/JoinRequests.tsx:200
+#: src/screens/Messages/JoinRequests.tsx:196
 msgid "Only admins can accept join requests."
 msgstr "Only admins can accept join requests."
 
-#: src/screens/Messages/JoinRequests.tsx:233
+#: src/screens/Messages/JoinRequests.tsx:228
 msgid "Only admins can reject join requests."
 msgstr "Only admins can reject join requests."
 
-#: src/components/intents/GroupChatJoinDialog.tsx:155
+#: src/components/intents/GroupChatJoinDialog.tsx:154
 msgid "Only followers can join this group chat."
 msgstr "Only followers can join this group chat."
 
@@ -8569,12 +8569,12 @@ msgid "Only image files are supported"
 msgstr ""
 
 #. placeholder {0}: createSanitizedDisplayName( joinLinkPreview.owner, true, moderateProfile(joinLinkPreview.owner, moderationOpts).ui( 'displayName', ), )
-#: src/screens/Messages/JoinRequest.tsx:218
+#: src/screens/Messages/JoinRequest.tsx:226
 msgid "Only people {0} follows can join."
 msgstr "Only people {0} follows can join."
 
-#: src/components/dms/ChatInvite/Root.tsx:127
-#: src/components/intents/GroupChatJoinDialog.tsx:306
+#: src/components/dms/ChatInvite/Root.tsx:128
+#: src/components/intents/GroupChatJoinDialog.tsx:311
 msgid "Only people the chat owner follows can join"
 msgstr "Only people the chat owner follows can join"
 
@@ -8611,7 +8611,7 @@ msgstr "Oops, this profile doesn't exist. Try scanning another one."
 #: src/components/StarterPack/ProfileStarterPacks.tsx:375
 #: src/screens/Settings/AppPasswords.tsx:59
 #: src/screens/Settings/components/ChangeHandleDialog.tsx:108
-#: src/view/screens/Profile.tsx:133
+#: src/view/screens/Profile.tsx:130
 msgid "Oops!"
 msgstr ""
 
@@ -8627,8 +8627,8 @@ msgstr ""
 msgid "Open camera"
 msgstr ""
 
-#: src/components/dms/ChatInvite/Root.tsx:104
-#: src/components/intents/GroupChatJoinDialog.tsx:453
+#: src/components/dms/ChatInvite/Root.tsx:105
+#: src/components/intents/GroupChatJoinDialog.tsx:458
 msgid "Open chat"
 msgstr "Open chat"
 
@@ -8636,8 +8636,8 @@ msgstr "Open chat"
 msgid "Open chat member options for {displayName}"
 msgstr "Open chat member options for {displayName}"
 
-#: src/screens/Messages/components/ChatListItem.tsx:490
-#: src/screens/Messages/components/ChatListItem.tsx:494
+#: src/screens/Messages/components/ChatListItem.tsx:505
+#: src/screens/Messages/components/ChatListItem.tsx:509
 msgid "Open conversation options"
 msgstr ""
 
@@ -8649,8 +8649,8 @@ msgstr ""
 msgid "Open drawer menu"
 msgstr ""
 
-#: src/screens/Messages/components/MessageComposer.tsx:213
-#: src/view/com/composer/Composer.tsx:2281
+#: src/screens/Messages/components/MessageComposer.tsx:214
+#: src/view/com/composer/Composer.tsx:2305
 msgid "Open emoji picker"
 msgstr ""
 
@@ -8668,11 +8668,11 @@ msgstr ""
 msgid "Open full emoji list"
 msgstr ""
 
-#: src/screens/Profile/components/GermButton.tsx:75
+#: src/screens/Profile/components/GermButton.tsx:73
 msgid "Open Germ DM"
 msgstr ""
 
-#: src/components/intents/GroupChatJoinDialog.tsx:446
+#: src/components/intents/GroupChatJoinDialog.tsx:451
 msgid "Open group chat"
 msgstr "Open group chat"
 
@@ -8681,21 +8681,21 @@ msgstr "Open group chat"
 msgid "Open group chat settings"
 msgstr "Open group chat settings"
 
-#: src/components/PostControls/PostMenu/PostMenuItems.tsx:563
-#: src/components/PostControls/PostMenu/PostMenuItems.tsx:569
+#: src/components/PostControls/PostMenu/PostMenuItems.tsx:559
+#: src/components/PostControls/PostMenu/PostMenuItems.tsx:565
 msgid "Open in Google Translate"
 msgstr "Open in Google Translate"
 
 #: src/components/Post/Embed/ExternalEmbed/index.tsx:88
-#: src/components/Post/Embed/StandardSiteEmbed/index.tsx:147
+#: src/components/Post/Embed/StandardSiteEmbed/index.tsx:146
 msgid "Open link to {niceUrl}"
 msgstr ""
 
-#: src/components/dms/ActionsWrapper.tsx:40
+#: src/components/dms/ActionsWrapper.tsx:41
 msgid "Open message options"
 msgstr ""
 
-#: src/screens/Settings/Settings.tsx:480
+#: src/screens/Settings/Settings.tsx:482
 msgid "Open moderation debug page"
 msgstr ""
 
@@ -8703,16 +8703,16 @@ msgstr ""
 msgid "Open muted words and tags settings"
 msgstr ""
 
-#: src/screens/Search/components/StarterPackCard.tsx:128
+#: src/screens/Search/components/StarterPackCard.tsx:120
 msgid "Open pack"
 msgstr ""
 
-#: src/components/PostControls/PostMenu/index.tsx:67
+#: src/components/PostControls/PostMenu/index.tsx:63
 msgid "Open post options menu"
 msgstr ""
 
-#: src/features/liveNow/components/LiveStatusDialog.tsx:219
-#: src/features/liveNow/components/LiveStatusDialog.tsx:229
+#: src/features/liveNow/components/LiveStatusDialog.tsx:216
+#: src/features/liveNow/components/LiveStatusDialog.tsx:226
 msgid "Open profile"
 msgstr ""
 
@@ -8725,23 +8725,23 @@ msgstr "Open QR code scanner"
 msgid "Open settings"
 msgstr "Open settings"
 
-#: src/components/PostControls/ShareMenu/index.tsx:98
+#: src/components/PostControls/ShareMenu/index.tsx:94
 msgid "Open share menu"
 msgstr ""
 
-#: src/screens/StarterPack/StarterPackScreen.tsx:582
+#: src/screens/StarterPack/StarterPackScreen.tsx:575
 msgid "Open starter pack menu"
 msgstr ""
 
-#: src/screens/Settings/Settings.tsx:473
+#: src/screens/Settings/Settings.tsx:475
 msgid "Open storybook page"
 msgstr ""
 
-#: src/screens/Settings/Settings.tsx:458
+#: src/screens/Settings/Settings.tsx:460
 msgid "Open system log"
 msgstr ""
 
-#: src/components/intents/GroupChatJoinDialog.tsx:447
+#: src/components/intents/GroupChatJoinDialog.tsx:452
 msgid "Open this group chat"
 msgstr "Open this group chat"
 
@@ -8754,11 +8754,11 @@ msgstr ""
 msgid "Opens a dialog to add a content warning to your post"
 msgstr ""
 
-#: src/screens/Login/LoginForm.tsx:645
+#: src/screens/Login/LoginForm.tsx:646
 msgid "Opens a dialog to change the hosting provider you sign in to"
 msgstr "Opens a dialog to change the hosting provider you sign in to"
 
-#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:151
+#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:152
 msgid "Opens a dialog to choose who can interact with this post"
 msgstr ""
 
@@ -8799,13 +8799,13 @@ msgstr ""
 msgid "Opens device gallery to select up to {MAX_GALLERY_IMAGES, plural, other {# images}}, or a single video or GIF."
 msgstr "Opens device gallery to select up to {MAX_GALLERY_IMAGES, plural, other {# images}}, or a single video or GIF."
 
-#: src/screens/Messages/JoinRequest.tsx:305
+#: src/screens/Messages/JoinRequest.tsx:313
 #: src/view/com/auth/SplashScreen.tsx:91
 #: src/view/com/auth/SplashScreen.web.tsx:112
 msgid "Opens flow to create a new Bluesky account"
 msgstr ""
 
-#: src/screens/Messages/JoinRequest.tsx:291
+#: src/screens/Messages/JoinRequest.tsx:299
 #: src/view/com/auth/SplashScreen.tsx:120
 #: src/view/com/auth/SplashScreen.web.tsx:126
 msgid "Opens flow to sign in to your existing Bluesky account"
@@ -8815,7 +8815,7 @@ msgstr ""
 msgid "Opens full image"
 msgstr "Opens full image"
 
-#: src/screens/Settings/Settings.tsx:258
+#: src/screens/Settings/Settings.tsx:260
 msgid "Opens helpdesk in browser"
 msgstr ""
 
@@ -8865,15 +8865,15 @@ msgstr ""
 msgid "Opens this profile"
 msgstr ""
 
-#: src/components/dialogs/MutedWords.tsx:308
+#: src/components/dialogs/MutedWords.tsx:310
 msgid "Options:"
 msgstr ""
 
-#: src/screens/Deactivated.tsx:192
+#: src/screens/Deactivated.tsx:197
 msgid "Or, continue with another account."
 msgstr ""
 
-#: src/screens/Deactivated.tsx:179
+#: src/screens/Deactivated.tsx:184
 msgid "Or, sign in to one of your other accounts."
 msgstr ""
 
@@ -8893,8 +8893,8 @@ msgstr ""
 msgid "OTA status: None available"
 msgstr ""
 
-#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:238
-#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:242
+#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:240
+#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:244
 #: src/view/com/composer/labels/LabelsBtn.tsx:181
 msgid "Other"
 msgstr ""
@@ -8903,31 +8903,31 @@ msgstr ""
 msgid "Other account"
 msgstr ""
 
-#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:181
+#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:183
 msgid "Other child safety issue"
 msgstr ""
 
-#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:208
+#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:210
 msgid "Other dangerous content"
 msgstr ""
 
-#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:119
+#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:120
 msgid "Other harassing or hateful content"
 msgstr ""
 
-#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:59
+#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:60
 msgid "Other misleading content"
 msgstr ""
 
-#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:231
+#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:233
 msgid "Other network rule-breaking"
 msgstr ""
 
-#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:92
+#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:93
 msgid "Other sexual violence content"
 msgstr ""
 
-#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:154
+#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:156
 msgid "Other violent content"
 msgstr ""
 
@@ -8946,11 +8946,11 @@ msgstr ""
 msgid "Our moderators have reviewed reports and decided to disable your access to chats on Bluesky."
 msgstr ""
 
-#: src/components/dialogs/StarterPackDialog.tsx:384
+#: src/components/dialogs/StarterPackDialog.tsx:376
 msgid "Owner"
 msgstr "Owner"
 
-#: src/components/dms/LeaveConvoPrompt.tsx:44
+#: src/components/dms/LeaveConvoPrompt.tsx:46
 msgid "Owner must lock the group before leaving."
 msgstr "Owner must lock the group before leaving."
 
@@ -8966,20 +8966,20 @@ msgstr ""
 msgid "Party GIFs"
 msgstr "Party GIFs"
 
-#: src/screens/Login/LoginForm.tsx:365
-#: src/screens/Login/LoginForm.tsx:372
+#: src/screens/Login/LoginForm.tsx:366
+#: src/screens/Login/LoginForm.tsx:373
 #: src/screens/Settings/AccountSettings.tsx:124
 #: src/screens/Settings/AccountSettings.tsx:128
-#: src/screens/Settings/components/DeleteAccountDialog.tsx:284
+#: src/screens/Settings/components/DeleteAccountDialog.tsx:290
 #: src/screens/Signup/StepInfo/index.tsx:258
 msgid "Password"
 msgstr ""
 
-#: src/screens/Settings/components/ChangePasswordDialog.tsx:70
+#: src/screens/Settings/components/ChangePasswordDialog.tsx:72
 msgid "Password changed"
 msgstr ""
 
-#: src/screens/Settings/components/ChangePasswordDialog.tsx:125
+#: src/screens/Settings/components/ChangePasswordDialog.tsx:127
 msgid "Password must be at least 8 characters long."
 msgstr ""
 
@@ -9004,17 +9004,17 @@ msgstr ""
 msgid "Pause video"
 msgstr ""
 
-#: src/screens/ProfileList/index.tsx:167
+#: src/screens/ProfileList/index.tsx:164
 #: src/screens/Search/SearchResults.tsx:107
-#: src/screens/StarterPack/StarterPackScreen.tsx:195
+#: src/screens/StarterPack/StarterPackScreen.tsx:192
 msgid "People"
 msgstr ""
 
-#: src/screens/Messages/components/InviteLinkDialog.tsx:164
+#: src/screens/Messages/components/InviteLinkDialog.tsx:161
 msgid "People {ownerName} follows can join instantly"
 msgstr "People {ownerName} follows can join instantly"
 
-#: src/screens/Messages/components/InviteLinkDialog.tsx:169
+#: src/screens/Messages/components/InviteLinkDialog.tsx:166
 msgid "People {ownerName} follows can request to join"
 msgstr "People {ownerName} follows can request to join"
 
@@ -9048,19 +9048,19 @@ msgctxt "display posts made by"
 msgid "People I follow"
 msgstr "People I follow"
 
-#: src/screens/Messages/components/InviteLinkDialog.tsx:163
+#: src/screens/Messages/components/InviteLinkDialog.tsx:160
 msgid "People I follow can join instantly"
 msgstr "People I follow can join instantly"
 
-#: src/screens/Messages/components/InviteLinkDialog.tsx:168
+#: src/screens/Messages/components/InviteLinkDialog.tsx:165
 msgid "People I follow can request to join"
 msgstr "People I follow can request to join"
 
-#: src/components/dialogs/PostInteractionSettingsDialog.tsx:510
+#: src/components/dialogs/PostInteractionSettingsDialog.tsx:507
 msgid "People you follow"
 msgstr ""
 
-#: src/components/dialogs/PostInteractionSettingsDialog.tsx:524
+#: src/components/dialogs/PostInteractionSettingsDialog.tsx:521
 msgid "People you mention"
 msgstr ""
 
@@ -9068,7 +9068,7 @@ msgstr ""
 msgid "Permission to access your photo library was denied. Please enable it in your system settings."
 msgstr ""
 
-#: src/components/StarterPack/Wizard/WizardListCard.tsx:59
+#: src/components/StarterPack/Wizard/WizardListCard.tsx:58
 msgid "Person toggle"
 msgstr ""
 
@@ -9085,7 +9085,7 @@ msgstr ""
 msgid "Phone number"
 msgstr ""
 
-#: src/components/contacts/screens/VerifyNumber.tsx:304
+#: src/components/contacts/screens/VerifyNumber.tsx:307
 msgid "Phone number verified"
 msgstr ""
 
@@ -9101,15 +9101,15 @@ msgstr "Pick a color theme"
 msgid "Pictures meant for adults."
 msgstr ""
 
-#: src/components/FeedCard.tsx:364
+#: src/components/FeedCard.tsx:361
 #: src/screens/CustomFeed/components/CustomFeedHeader.tsx:569
 #: src/screens/CustomFeed/components/CustomFeedHeader.tsx:578
 #: src/screens/SavedFeeds.tsx:559
 msgid "Pin feed"
 msgstr ""
 
-#: src/screens/ProfileList/components/Header.tsx:151
-#: src/screens/ProfileList/components/Header.tsx:158
+#: src/screens/ProfileList/components/Header.tsx:152
+#: src/screens/ProfileList/components/Header.tsx:159
 msgid "Pin to home"
 msgstr ""
 
@@ -9117,12 +9117,12 @@ msgstr ""
 msgid "Pin to Home"
 msgstr ""
 
-#: src/components/PostControls/PostMenu/PostMenuItems.tsx:522
-#: src/components/PostControls/PostMenu/PostMenuItems.tsx:527
+#: src/components/PostControls/PostMenu/PostMenuItems.tsx:518
+#: src/components/PostControls/PostMenu/PostMenuItems.tsx:523
 msgid "Pin to your profile"
 msgstr ""
 
-#: src/view/com/posts/PostFeedReason.tsx:116
+#: src/view/com/posts/PostFeedReason.tsx:118
 msgid "Pinned"
 msgstr ""
 
@@ -9137,7 +9137,7 @@ msgstr ""
 msgid "Pinned Feeds"
 msgstr ""
 
-#: src/screens/ProfileList/components/Header.tsx:77
+#: src/screens/ProfileList/components/Header.tsx:78
 msgid "Pinned to your feeds"
 msgstr ""
 
@@ -9184,15 +9184,15 @@ msgstr ""
 msgid "Please add any content warning labels that are applicable for the media you are posting."
 msgstr ""
 
-#: src/components/ageAssurance/AgeAssuranceInitDialog.tsx:189
+#: src/components/ageAssurance/AgeAssuranceInitDialog.tsx:198
 msgid "Please check your email inbox for further instructions. It may take a minute or two to arrive."
 msgstr ""
 
-#: src/screens/Signup/state.ts:313
+#: src/screens/Signup/state.ts:311
 msgid "Please choose your handle."
 msgstr ""
 
-#: src/screens/Signup/state.ts:305
+#: src/screens/Signup/state.ts:303
 #: src/screens/Signup/StepInfo/index.tsx:149
 msgid "Please choose your password."
 msgstr ""
@@ -9201,24 +9201,24 @@ msgstr ""
 msgid "Please click on the link in the email we just sent you to verify your new email address. This is an important step to allow you to continue enjoying all the features of Bluesky."
 msgstr ""
 
-#: src/screens/Signup/state.ts:325
+#: src/screens/Signup/state.ts:323
 msgid "Please complete the verification captcha."
 msgstr ""
 
-#: src/view/com/composer/state/video.ts:546
+#: src/view/com/composer/state/video.ts:551
 msgid "Please confirm your email address to upload videos."
 msgstr ""
 
-#: src/components/ageAssurance/AgeAssuranceInitDialog.tsx:102
+#: src/components/ageAssurance/AgeAssuranceInitDialog.tsx:104
 #: src/screens/Signup/StepInfo/index.tsx:139
 msgid "Please double-check that you have entered your email address correctly."
 msgstr ""
 
-#: src/screens/Login/SetNewPasswordForm.tsx:56
+#: src/screens/Login/SetNewPasswordForm.tsx:57
 msgid "Please enter a password."
 msgstr ""
 
-#: src/screens/Settings/components/ChangePasswordDialog.tsx:120
+#: src/screens/Settings/components/ChangePasswordDialog.tsx:122
 msgid "Please enter a password. It must be at least 8 characters long."
 msgstr ""
 
@@ -9232,16 +9232,16 @@ msgstr ""
 msgid "Please enter a valid code."
 msgstr ""
 
-#: src/components/ageAssurance/AgeAssuranceInitDialog.tsx:111
+#: src/components/ageAssurance/AgeAssuranceInitDialog.tsx:113
 #: src/components/dialogs/EmailDialog/screens/Update.tsx:147
 msgid "Please enter a valid email address."
 msgstr ""
 
-#: src/components/dialogs/MutedWords.tsx:89
+#: src/components/dialogs/MutedWords.tsx:91
 msgid "Please enter a valid word, tag, or phrase to mute"
 msgstr ""
 
-#: src/components/ageAssurance/AgeAssuranceInitDialog.tsx:145
+#: src/components/ageAssurance/AgeAssuranceInitDialog.tsx:148
 msgid "Please enter a valid, non-temporary email address. You may need to access this email in the future."
 msgstr ""
 
@@ -9250,7 +9250,7 @@ msgstr ""
 msgid "Please enter the code we sent to <0>{0}</0> below."
 msgstr ""
 
-#: src/screens/Settings/components/ChangePasswordDialog.tsx:66
+#: src/screens/Settings/components/ChangePasswordDialog.tsx:68
 msgid "Please enter the code you received and the new password you would like to use."
 msgstr ""
 
@@ -9258,7 +9258,7 @@ msgstr ""
 msgid "Please enter the security code we sent to your previous email address."
 msgstr ""
 
-#: src/screens/Signup/state.ts:289
+#: src/screens/Signup/state.ts:287
 #: src/screens/Signup/StepInfo/index.tsx:122
 msgid "Please enter your email."
 msgstr ""
@@ -9271,24 +9271,24 @@ msgstr ""
 msgid "Please enter your new email address."
 msgstr ""
 
-#: src/screens/Login/LoginForm.tsx:196
+#: src/screens/Login/LoginForm.tsx:197
 msgid "Please enter your password"
 msgstr ""
 
-#: src/screens/Login/LoginForm.tsx:190
+#: src/screens/Login/LoginForm.tsx:191
 msgid "Please enter your username"
 msgstr ""
 
 #. placeholder {0}: labeler ? sanitizeHandle(labeler.creator.handle, '@') : label.src
-#: src/components/moderation/AppealForm.tsx:120
+#: src/components/moderation/AppealForm.tsx:131
 msgid "Please explain why you think this label was incorrectly applied by {0}"
 msgstr ""
 
-#: src/screens/Messages/components/ChatDisabled.tsx:143
+#: src/screens/Messages/components/ChatDisabled.tsx:141
 msgid "Please explain why you think your chats were incorrectly disabled"
 msgstr ""
 
-#: src/features/liveNow/components/GoLiveDisabledDialog.tsx:124
+#: src/features/liveNow/components/GoLiveDisabledDialog.tsx:123
 msgid "Please explain why you think your Go Live access was incorrectly disabled."
 msgstr ""
 
@@ -9297,19 +9297,19 @@ msgstr ""
 msgid "Please go back, or activate this element to return to the start of the active content."
 msgstr ""
 
-#: src/components/ageAssurance/AgeAssuranceAppealDialog.tsx:102
+#: src/components/ageAssurance/AgeAssuranceAppealDialog.tsx:104
 msgid "Please provide any additional details you feel moderators may need in order to properly assess your Age Assurance status."
 msgstr ""
 
-#: src/components/ageAssurance/AgeAssuranceInitDialog.tsx:304
+#: src/components/ageAssurance/AgeAssuranceInitDialog.tsx:313
 msgid "Please select a language"
 msgstr ""
 
-#: src/components/moderation/ReportDialog/action.ts:39
+#: src/components/moderation/ReportDialog/action.ts:38
 msgid "Please select a moderation service"
 msgstr ""
 
-#: src/components/moderation/ReportDialog/action.ts:36
+#: src/components/moderation/ReportDialog/action.ts:35
 msgid "Please select a reason for this report"
 msgstr ""
 
@@ -9319,7 +9319,7 @@ msgstr ""
 msgid "Please sign in as @{0}"
 msgstr ""
 
-#: src/components/moderation/ReportDialog/index.tsx:961
+#: src/components/moderation/ReportDialog/index.tsx:962
 msgctxt "english-only-resource"
 msgid "Please submit your report through the Report non-consensual intimate imagery (NCII) form."
 msgstr "Please submit your report through the Report non-consensual intimate imagery (NCII) form."
@@ -9328,7 +9328,7 @@ msgstr "Please submit your report through the Report non-consensual intimate ima
 msgid "Please use the Bluesky mobile app to scan a QR code."
 msgstr "Please use the Bluesky mobile app to scan a QR code."
 
-#: src/screens/Settings/FindContactsSettings.tsx:107
+#: src/screens/Settings/FindContactsSettings.tsx:105
 msgid "Please use the native app to import your contacts."
 msgstr ""
 
@@ -9345,7 +9345,7 @@ msgid "Please write your message below:"
 msgstr ""
 
 #: src/lib/interests.ts:70
-#: src/screens/Search/modules/ExploreTrendingTopics.tsx:242
+#: src/screens/Search/modules/ExploreTrendingTopics.tsx:240
 msgid "Politics"
 msgstr ""
 
@@ -9353,7 +9353,7 @@ msgstr ""
 msgid "Porn"
 msgstr ""
 
-#: src/view/com/composer/Composer.tsx:1923
+#: src/view/com/composer/Composer.tsx:1947
 msgctxt "action"
 msgid "Post"
 msgstr ""
@@ -9369,22 +9369,22 @@ msgctxt "post-number-in-thread"
 msgid "Post {index} of {count}"
 msgstr "Post {index} of {count}"
 
-#: src/view/screens/Profile.tsx:489
-#: src/view/screens/Profile.tsx:490
+#: src/view/screens/Profile.tsx:486
+#: src/view/screens/Profile.tsx:487
 msgid "Post a photo"
 msgstr ""
 
-#: src/view/screens/Profile.tsx:516
-#: src/view/screens/Profile.tsx:517
+#: src/view/screens/Profile.tsx:513
+#: src/view/screens/Profile.tsx:514
 msgid "Post a video"
 msgstr ""
 
-#: src/view/com/composer/Composer.tsx:1921
+#: src/view/com/composer/Composer.tsx:1945
 msgctxt "action"
 msgid "Post All"
 msgstr ""
 
-#: src/view/com/composer/Composer.tsx:1582
+#: src/view/com/composer/Composer.tsx:1606
 msgid "Post anyway"
 msgstr "Post anyway"
 
@@ -9400,38 +9400,38 @@ msgstr ""
 msgid "Post by @{0}"
 msgstr ""
 
-#: src/components/PostControls/PostMenu/PostMenuItems.tsx:200
+#: src/components/PostControls/PostMenu/PostMenuItems.tsx:196
 msgctxt "toast"
 msgid "Post deleted"
 msgstr ""
 
-#: src/lib/api/index.ts:189
+#: src/lib/api/index.ts:194
 msgid "Post failed to upload. Please check your Internet connection and try again."
 msgstr ""
 
-#: src/screens/PostThread/components/ThreadItemAnchor.tsx:138
-#: src/screens/PostThread/components/ThreadItemPost.tsx:124
-#: src/screens/PostThread/components/ThreadItemTreePost.tsx:115
-#: src/screens/VideoFeed/index.tsx:552
+#: src/screens/PostThread/components/ThreadItemAnchor.tsx:134
+#: src/screens/PostThread/components/ThreadItemPost.tsx:121
+#: src/screens/PostThread/components/ThreadItemTreePost.tsx:112
+#: src/screens/VideoFeed/index.tsx:551
 msgid "Post has been deleted"
 msgstr ""
 
 #: src/components/moderation/ModerationDetailsDialog.tsx:127
-#: src/lib/moderation/useModerationCauseDescription.ts:107
+#: src/lib/moderation/useModerationCauseDescription.ts:104
 msgid "Post Hidden by Muted Word"
 msgstr ""
 
 #: src/components/moderation/ModerationDetailsDialog.tsx:130
-#: src/lib/moderation/useModerationCauseDescription.ts:116
+#: src/lib/moderation/useModerationCauseDescription.ts:113
 msgid "Post Hidden by You"
 msgstr ""
 
-#: src/components/dialogs/PostInteractionSettingsDialog.tsx:685
+#: src/components/dialogs/PostInteractionSettingsDialog.tsx:682
 msgid "Post interaction settings"
 msgstr ""
 
 #: src/Navigation.tsx:200
-#: src/screens/ModerationInteractionSettings/index.tsx:35
+#: src/screens/ModerationInteractionSettings/index.tsx:36
 msgid "Post Interaction Settings"
 msgstr ""
 
@@ -9444,8 +9444,8 @@ msgstr "Post it to Bluesky or share anywhere."
 msgid "Post language selection"
 msgstr ""
 
-#: src/screens/Messages/components/InviteLinkDialog.tsx:395
-#: src/screens/Messages/components/InviteLinkDialog.tsx:411
+#: src/screens/Messages/components/InviteLinkDialog.tsx:392
+#: src/screens/Messages/components/InviteLinkDialog.tsx:408
 msgid "Post link"
 msgstr "Post link"
 
@@ -9454,7 +9454,7 @@ msgstr "Post link"
 msgid "Post not found"
 msgstr ""
 
-#: src/state/queries/pinned-post.ts:59
+#: src/state/queries/pinned-post.ts:64
 msgctxt "toast"
 msgid "Post pinned"
 msgstr ""
@@ -9464,25 +9464,25 @@ msgstr ""
 msgid "Post type"
 msgstr "Post type"
 
-#: src/state/queries/pinned-post.ts:61
+#: src/state/queries/pinned-post.ts:66
 msgctxt "toast"
 msgid "Post unpinned"
 msgstr ""
 
-#: src/components/activity-notifications/SubscribeProfileDialog.tsx:257
-#: src/components/activity-notifications/SubscribeProfileDialog.tsx:269
-#: src/screens/ProfileList/index.tsx:167
+#: src/components/activity-notifications/SubscribeProfileDialog.tsx:254
+#: src/components/activity-notifications/SubscribeProfileDialog.tsx:266
+#: src/screens/ProfileList/index.tsx:164
 #: src/screens/Settings/NotificationSettings/ActivityNotificationSettings.tsx:216
-#: src/screens/StarterPack/StarterPackScreen.tsx:197
-#: src/view/screens/Profile.tsx:236
+#: src/screens/StarterPack/StarterPackScreen.tsx:194
+#: src/view/screens/Profile.tsx:233
 msgid "Posts"
 msgstr ""
 
-#: src/components/dialogs/MutedWords.tsx:123
+#: src/components/dialogs/MutedWords.tsx:125
 msgid "Posts can be muted based on their text, their tags, or both. We recommend avoiding common words that appear in many posts, since it can result in no posts being shown."
 msgstr ""
 
-#: src/view/com/posts/PostFeedErrorMessage.tsx:76
+#: src/view/com/posts/PostFeedErrorMessage.tsx:74
 msgid "Posts hidden"
 msgstr ""
 
@@ -9498,7 +9498,7 @@ msgstr ""
 msgid "Potentially misleading link warning"
 msgstr ""
 
-#: src/components/ageAssurance/AgeAssuranceInitDialog.tsx:292
+#: src/components/ageAssurance/AgeAssuranceInitDialog.tsx:301
 msgid "Preferred language"
 msgstr ""
 
@@ -9509,12 +9509,12 @@ msgstr ""
 #: src/components/Error.tsx:56
 #: src/components/Lists.tsx:104
 #: src/screens/Messages/components/MessageListError.tsx:23
-#: src/screens/Messages/JoinRequests.tsx:355
+#: src/screens/Messages/JoinRequests.tsx:352
 #: src/screens/Signup/BackNextButtons.tsx:48
 msgid "Press to retry"
 msgstr ""
 
-#: src/components/KnownFollowers.tsx:125
+#: src/components/KnownFollowers.tsx:124
 msgid "Press to view followers of this account that you also follow"
 msgstr ""
 
@@ -9536,8 +9536,8 @@ msgstr ""
 msgid "Privacy"
 msgstr ""
 
-#: src/screens/Settings/Settings.tsx:183
-#: src/screens/Settings/Settings.tsx:186
+#: src/screens/Settings/Settings.tsx:185
+#: src/screens/Settings/Settings.tsx:188
 msgid "Privacy and security"
 msgstr ""
 
@@ -9564,23 +9564,23 @@ msgstr ""
 msgid "Privacy Policy"
 msgstr ""
 
-#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:173
+#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:175
 msgid "Privacy violation of a minor"
 msgstr ""
 
-#: src/view/com/composer/Composer.tsx:2701
+#: src/view/com/composer/Composer.tsx:2725
 msgid "Processing GIF..."
 msgstr ""
 
-#: src/view/com/composer/Composer.tsx:2703
+#: src/view/com/composer/Composer.tsx:2727
 msgid "Processing video..."
 msgstr ""
 
-#: src/lib/api/index.ts:62
+#: src/lib/api/index.ts:65
 msgid "Processing..."
 msgstr ""
 
-#: src/view/screens/DebugMod.tsx:956
+#: src/view/screens/DebugMod.tsx:1160
 msgid "profile"
 msgstr ""
 
@@ -9591,12 +9591,12 @@ msgstr ""
 msgid "Profile"
 msgstr ""
 
-#: src/screens/Profile/Header/Shell.tsx:164
+#: src/screens/Profile/Header/Shell.tsx:165
 msgid "Profile banner placeholder"
 msgstr "Profile banner placeholder"
 
 #: src/features/inviteFriends/InviteScannerScreen.tsx:210
-#: src/lib/strings/errors.ts:39
+#: src/lib/strings/errors.ts:74
 msgid "Profile not found"
 msgstr ""
 
@@ -9605,36 +9605,36 @@ msgctxt "toast"
 msgid "Profile updated"
 msgstr ""
 
-#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:223
+#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:225
 msgid "Promoting or selling prohibited items or services"
 msgstr ""
 
-#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:160
 #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:161
+#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:162
 msgid "Psst! You can edit who can interact with this post."
 msgstr ""
 
-#: src/view/com/lists/MyLists.tsx:77
+#: src/view/com/lists/MyLists.tsx:80
 msgid "Public, sharable lists of users to mute or block in bulk."
 msgstr ""
 
 #. Accessibility label for button to publish a single post
-#: src/view/com/composer/Composer.tsx:1907
+#: src/view/com/composer/Composer.tsx:1931
 msgid "Publish post"
 msgstr ""
 
 #. Accessibility label for button to publish multiple posts in a thread
-#: src/view/com/composer/Composer.tsx:1902
+#: src/view/com/composer/Composer.tsx:1926
 msgid "Publish posts"
 msgstr ""
 
 #. Accessibility label for button to publish multiple replies in a thread
-#: src/view/com/composer/Composer.tsx:1891
+#: src/view/com/composer/Composer.tsx:1915
 msgid "Publish replies"
 msgstr ""
 
 #. Accessibility label for button to publish a single reply
-#: src/view/com/composer/Composer.tsx:1896
+#: src/view/com/composer/Composer.tsx:1920
 msgid "Publish reply"
 msgstr ""
 
@@ -9654,15 +9654,15 @@ msgstr "Push, everyone"
 msgid "Push, people you follow"
 msgstr "Push, people you follow"
 
-#: src/components/StarterPack/QrCodeDialog.tsx:143
+#: src/components/StarterPack/QrCodeDialog.tsx:138
 msgid "QR code copied to your clipboard!"
 msgstr ""
 
-#: src/components/StarterPack/QrCodeDialog.tsx:121
+#: src/components/StarterPack/QrCodeDialog.tsx:116
 msgid "QR code has been downloaded!"
 msgstr ""
 
-#: src/components/StarterPack/QrCodeDialog.tsx:122
+#: src/components/StarterPack/QrCodeDialog.tsx:117
 #: src/features/inviteFriends/InviteFriendsDialogInner.tsx:101
 msgid "QR code saved to your camera roll!"
 msgstr ""
@@ -9675,11 +9675,11 @@ msgstr ""
 msgid "Quote post"
 msgstr ""
 
-#: src/components/PostControls/PostMenu/PostMenuItems.tsx:351
+#: src/components/PostControls/PostMenu/PostMenuItems.tsx:347
 msgid "Quote post was re-attached"
 msgstr ""
 
-#: src/components/PostControls/PostMenu/PostMenuItems.tsx:350
+#: src/components/PostControls/PostMenu/PostMenuItems.tsx:346
 msgid "Quote post was successfully detached"
 msgstr ""
 
@@ -9705,20 +9705,20 @@ msgstr ""
 msgid "Rate limit exceeded – you've tried to change your handle too many times in a short period. Please wait a minute before trying again."
 msgstr ""
 
-#: src/components/contacts/screens/PhoneInput.tsx:109
+#: src/components/contacts/screens/PhoneInput.tsx:110
 msgid "Rate limit exceeded. Please try again later."
 msgstr ""
 
-#: src/components/PostControls/PostMenu/PostMenuItems.tsx:715
-#: src/components/PostControls/PostMenu/PostMenuItems.tsx:725
+#: src/components/PostControls/PostMenu/PostMenuItems.tsx:711
+#: src/components/PostControls/PostMenu/PostMenuItems.tsx:721
 msgid "Re-attach quote"
 msgstr ""
 
-#: src/screens/Messages/components/InviteLinkDialog.tsx:433
+#: src/screens/Messages/components/InviteLinkDialog.tsx:430
 msgid "Re-enable invite link"
 msgstr "Re-enable invite link"
 
-#: src/screens/Messages/components/InviteLinkDialog.tsx:440
+#: src/screens/Messages/components/InviteLinkDialog.tsx:437
 msgid "Re-enable link"
 msgstr "Re-enable link"
 
@@ -9731,7 +9731,7 @@ msgstr ""
 msgid "Reactions"
 msgstr "Reactions"
 
-#: src/screens/Deactivated.tsx:133
+#: src/screens/Deactivated.tsx:138
 msgid "Reactivate your account"
 msgstr ""
 
@@ -9750,11 +9750,11 @@ msgstr "Read about how to use advanced search filters"
 msgid "Read blog post"
 msgstr ""
 
-#: src/screens/VideoFeed/index.tsx:1077
+#: src/screens/VideoFeed/index.tsx:1073
 msgid "Read less"
 msgstr ""
 
-#: src/screens/VideoFeed/index.tsx:1077
+#: src/screens/VideoFeed/index.tsx:1073
 msgid "Read more"
 msgstr ""
 
@@ -9788,8 +9788,8 @@ msgstr ""
 msgid "Real people."
 msgstr ""
 
-#: src/screens/Takendown.tsx:158
-#: src/screens/Takendown.tsx:166
+#: src/screens/Takendown.tsx:156
+#: src/screens/Takendown.tsx:164
 msgid "Reason for appeal"
 msgstr ""
 
@@ -9824,7 +9824,7 @@ msgid "Reject"
 msgstr ""
 
 #. Reject a request to join a chat
-#: src/screens/Messages/JoinRequests.tsx:489
+#: src/screens/Messages/JoinRequests.tsx:486
 msgctxt "button"
 msgid "Reject"
 msgstr "Reject"
@@ -9833,30 +9833,30 @@ msgstr "Reject"
 msgid "Reject chat request"
 msgstr ""
 
-#: src/screens/Messages/JoinRequests.tsx:483
+#: src/screens/Messages/JoinRequests.tsx:480
 msgid "Reject join request"
 msgstr "Reject join request"
 
 #: src/screens/Messages/ChatList.tsx:424
-#: src/screens/Messages/Inbox.tsx:206
+#: src/screens/Messages/Inbox.tsx:205
 msgid "Reload conversations"
 msgstr ""
 
-#: src/components/dialogs/lists/ListAddRemoveUsersDialog.tsx:193
+#: src/components/dialogs/lists/ListAddRemoveUsersDialog.tsx:194
 #: src/components/dialogs/lists/UserAddRemoveListsDialog.tsx:319
 #: src/components/dialogs/lists/UserAddRemoveListsDialog.tsx:326
-#: src/components/dialogs/MutedWords.tsx:457
-#: src/components/dialogs/StarterPackDialog.tsx:376
-#: src/components/dialogs/StarterPackDialog.tsx:386
-#: src/components/FeedCard.tsx:376
-#: src/components/StarterPack/Wizard/WizardListCard.tsx:106
-#: src/components/StarterPack/Wizard/WizardListCard.tsx:113
-#: src/screens/Bookmarks.tsx:258
+#: src/components/dialogs/MutedWords.tsx:459
+#: src/components/dialogs/StarterPackDialog.tsx:368
+#: src/components/dialogs/StarterPackDialog.tsx:378
+#: src/components/FeedCard.tsx:373
+#: src/components/StarterPack/Wizard/WizardListCard.tsx:105
+#: src/components/StarterPack/Wizard/WizardListCard.tsx:112
+#: src/screens/Bookmarks.tsx:256
 #: src/screens/Messages/ConversationSettings/Member.tsx:162
 #: src/screens/Messages/ConversationSettings/prompts.tsx:178
 #: src/screens/Moderation/index.tsx:477
-#: src/screens/Settings/Settings.tsx:693
-#: src/view/com/posts/PostFeedErrorMessage.tsx:221
+#: src/screens/Settings/Settings.tsx:695
+#: src/view/com/posts/PostFeedErrorMessage.tsx:219
 msgid "Remove"
 msgstr ""
 
@@ -9864,7 +9864,7 @@ msgstr ""
 msgid "Remove {displayName} from group chat"
 msgstr "Remove {displayName} from group chat"
 
-#: src/components/StarterPack/Wizard/WizardListCard.tsx:62
+#: src/components/StarterPack/Wizard/WizardListCard.tsx:61
 msgid "Remove {displayName} from starter pack"
 msgstr ""
 
@@ -9881,13 +9881,13 @@ msgstr "Remove {displayName}?"
 msgid "Remove {q}"
 msgstr "Remove {q}"
 
-#: src/screens/Settings/Settings.tsx:674
-#: src/screens/Settings/Settings.tsx:677
+#: src/screens/Settings/Settings.tsx:676
+#: src/screens/Settings/Settings.tsx:679
 msgid "Remove account"
 msgstr ""
 
-#: src/screens/Settings/FindContactsSettings.tsx:576
-#: src/screens/Settings/FindContactsSettings.tsx:584
+#: src/screens/Settings/FindContactsSettings.tsx:580
+#: src/screens/Settings/FindContactsSettings.tsx:588
 msgid "Remove all contacts"
 msgstr ""
 
@@ -9909,19 +9909,19 @@ msgstr ""
 msgid "Remove caption file"
 msgstr "Remove caption file"
 
-#: src/screens/Messages/components/MessageInputEmbed.tsx:234
-#: src/screens/Messages/components/MessageInputEmbed.tsx:289
-#: src/screens/Messages/components/MessageInputEmbed.tsx:344
+#: src/screens/Messages/components/MessageInputEmbed.tsx:225
+#: src/screens/Messages/components/MessageInputEmbed.tsx:280
+#: src/screens/Messages/components/MessageInputEmbed.tsx:335
 msgid "Remove embed"
 msgstr ""
 
 #: src/view/com/posts/FeedShutdownMsg.tsx:121
 #: src/view/com/posts/FeedShutdownMsg.tsx:125
-#: src/view/com/posts/PostFeedErrorMessage.tsx:177
+#: src/view/com/posts/PostFeedErrorMessage.tsx:175
 msgid "Remove feed"
 msgstr ""
 
-#: src/view/com/posts/PostFeedErrorMessage.tsx:218
+#: src/view/com/posts/PostFeedErrorMessage.tsx:216
 msgid "Remove feed?"
 msgstr ""
 
@@ -9936,13 +9936,13 @@ msgstr "Remove from chat"
 
 #: src/screens/CustomFeed/components/CustomFeedHeader.tsx:368
 #: src/screens/CustomFeed/components/CustomFeedHeader.tsx:373
-#: src/screens/ProfileList/components/MoreOptionsMenu.tsx:176
-#: src/screens/ProfileList/components/MoreOptionsMenu.tsx:179
+#: src/screens/ProfileList/components/MoreOptionsMenu.tsx:177
+#: src/screens/ProfileList/components/MoreOptionsMenu.tsx:180
 #: src/screens/SavedFeeds.tsx:549
 msgid "Remove from my feeds"
 msgstr ""
 
-#: src/screens/Settings/Settings.tsx:687
+#: src/screens/Settings/Settings.tsx:689
 msgid "Remove from quick access?"
 msgstr ""
 
@@ -9952,11 +9952,11 @@ msgid "Remove from saved feeds"
 msgstr ""
 
 #: src/components/PostControls/BookmarkButton.tsx:120
-#: src/screens/Bookmarks.tsx:252
+#: src/screens/Bookmarks.tsx:250
 msgid "Remove from saved posts"
 msgstr ""
 
-#: src/components/FeedCard.tsx:373
+#: src/components/FeedCard.tsx:370
 msgid "Remove from your feeds?"
 msgstr ""
 
@@ -9964,17 +9964,17 @@ msgstr ""
 msgid "Remove image"
 msgstr ""
 
-#: src/features/liveNow/components/EditLiveDialog.tsx:221
-#: src/features/liveNow/components/EditLiveDialog.tsx:228
+#: src/features/liveNow/components/EditLiveDialog.tsx:223
+#: src/features/liveNow/components/EditLiveDialog.tsx:230
 msgid "Remove live status"
 msgstr ""
 
-#: src/components/moderation/BlockDialog.tsx:362
-#: src/components/moderation/BlockDialog.tsx:369
+#: src/components/moderation/BlockDialog.tsx:363
+#: src/components/moderation/BlockDialog.tsx:370
 msgid "Remove member"
 msgstr "Remove member"
 
-#: src/components/dialogs/MutedWords.tsx:613
+#: src/components/dialogs/MutedWords.tsx:615
 msgid "Remove mute word from your list"
 msgstr ""
 
@@ -9987,12 +9987,12 @@ msgstr ""
 msgid "Remove repost"
 msgstr ""
 
-#: src/components/contacts/screens/ViewMatches.tsx:500
+#: src/components/contacts/screens/ViewMatches.tsx:508
 #: src/screens/Settings/FindContactsSettings.tsx:349
 msgid "Remove suggestion"
 msgstr ""
 
-#: src/view/com/posts/PostFeedErrorMessage.tsx:219
+#: src/view/com/posts/PostFeedErrorMessage.tsx:217
 msgid "Remove this feed from your saved feeds"
 msgstr ""
 
@@ -10000,7 +10000,7 @@ msgstr ""
 msgid "Remove unavailable moderation services"
 msgstr ""
 
-#: src/components/dialogs/lists/ListAddRemoveUsersDialog.tsx:179
+#: src/components/dialogs/lists/ListAddRemoveUsersDialog.tsx:180
 msgid "Remove user from list"
 msgstr ""
 
@@ -10015,15 +10015,15 @@ msgstr ""
 msgid "Remove your verification for this account?"
 msgstr ""
 
-#: src/components/Post/Embed/index.tsx:241
+#: src/components/Post/Embed/index.tsx:242
 msgid "Removed by author"
 msgstr ""
 
-#: src/components/Post/Embed/index.tsx:239
+#: src/components/Post/Embed/index.tsx:240
 msgid "Removed by you"
 msgstr ""
 
-#: src/components/dialogs/lists/ListAddRemoveUsersDialog.tsx:136
+#: src/components/dialogs/lists/ListAddRemoveUsersDialog.tsx:137
 #: src/components/dialogs/lists/UserAddRemoveListsDialog.tsx:246
 msgid "Removed from list"
 msgstr ""
@@ -10033,16 +10033,16 @@ msgid "Removed from saved feeds"
 msgstr ""
 
 #: src/components/PostControls/BookmarkButton.tsx:88
-#: src/screens/Bookmarks.tsx:211
+#: src/screens/Bookmarks.tsx:209
 msgid "Removed from saved posts"
 msgstr ""
 
-#: src/components/dialogs/StarterPackDialog.tsx:287
+#: src/components/dialogs/StarterPackDialog.tsx:284
 msgid "Removed from starter pack"
 msgstr ""
 
 #: src/screens/CustomFeed/components/CustomFeedHeader.tsx:128
-#: src/screens/ProfileList/components/MoreOptionsMenu.tsx:77
+#: src/screens/ProfileList/components/MoreOptionsMenu.tsx:78
 #: src/view/com/posts/FeedShutdownMsg.tsx:45
 msgid "Removed from your feeds"
 msgstr ""
@@ -10055,15 +10055,15 @@ msgstr ""
 msgid "Removed verification"
 msgstr ""
 
-#: src/components/dialogs/MutedWords.tsx:541
+#: src/components/dialogs/MutedWords.tsx:543
 msgid "Renew"
 msgstr ""
 
-#: src/components/dialogs/MutedWords.tsx:547
+#: src/components/dialogs/MutedWords.tsx:549
 msgid "Renew duration"
 msgstr ""
 
-#: src/components/dialogs/MutedWords.tsx:531
+#: src/components/dialogs/MutedWords.tsx:533
 msgid "Renew mute word"
 msgstr ""
 
@@ -10092,63 +10092,63 @@ msgctxt "description"
 msgid "Replied to you"
 msgstr ""
 
-#: src/components/dms/MessageItem.tsx:926
+#: src/components/dms/MessageItem.tsx:943
 msgid "Replied-to message from {senderName}, tap to scroll to it"
 msgstr "Replied-to message from {senderName}, tap to scroll to it"
 
-#: src/components/dms/MessageItem.tsx:924
+#: src/components/dms/MessageItem.tsx:941
 msgid "Replied-to message was sent before you joined"
 msgstr "Replied-to message was sent before you joined"
 
-#: src/components/dms/MessageItem.tsx:927
+#: src/components/dms/MessageItem.tsx:944
 msgid "Replied-to message, tap to scroll to it"
 msgstr "Replied-to message, tap to scroll to it"
 
-#: src/components/activity-notifications/SubscribeProfileDialog.tsx:274
-#: src/components/activity-notifications/SubscribeProfileDialog.tsx:286
+#: src/components/activity-notifications/SubscribeProfileDialog.tsx:271
+#: src/components/activity-notifications/SubscribeProfileDialog.tsx:283
 #: src/lib/hooks/useNotificationHandler.ts:172
 #: src/screens/Settings/NotificationSettings/ActivityNotificationSettings.tsx:218
 #: src/screens/Settings/NotificationSettings/index.tsx:181
 #: src/screens/Settings/NotificationSettings/index.tsx:330
-#: src/view/screens/Profile.tsx:237
+#: src/view/screens/Profile.tsx:234
 msgid "Replies"
 msgstr ""
 
-#: src/components/WhoCanReply.tsx:87
+#: src/components/WhoCanReply.tsx:80
 msgid "Replies disabled"
 msgstr ""
 
-#: src/components/WhoCanReply.tsx:281
+#: src/components/WhoCanReply.tsx:274
 msgid "Replies to this post are disabled."
 msgstr ""
 
-#: src/components/dms/MessageContextMenu.tsx:182
-#: src/components/dms/MessageContextMenu.tsx:185
+#: src/components/dms/MessageContextMenu.tsx:180
+#: src/components/dms/MessageContextMenu.tsx:183
 msgid "Reply"
 msgstr "Reply"
 
-#: src/view/com/composer/Composer.tsx:1919
+#: src/view/com/composer/Composer.tsx:1943
 msgctxt "action"
 msgid "Reply"
 msgstr ""
 
 #. Accessibility label for the reply button, verb form followed by number of replies and noun form
 #. placeholder {0}: post.replyCount || 0
-#: src/components/PostControls/index.tsx:240
+#: src/components/PostControls/index.tsx:236
 msgid "Reply ({0, plural, one {# reply} other {# replies}})"
 msgstr ""
 
 #: src/components/moderation/ModerationDetailsDialog.tsx:136
-#: src/lib/moderation/useModerationCauseDescription.ts:126
+#: src/lib/moderation/useModerationCauseDescription.ts:123
 msgid "Reply Hidden by Thread Author"
 msgstr ""
 
 #: src/components/moderation/ModerationDetailsDialog.tsx:135
-#: src/lib/moderation/useModerationCauseDescription.ts:125
+#: src/lib/moderation/useModerationCauseDescription.ts:122
 msgid "Reply Hidden by You"
 msgstr ""
 
-#: src/components/dialogs/PostInteractionSettingsDialog.tsx:418
+#: src/components/dialogs/PostInteractionSettingsDialog.tsx:415
 msgid "Reply settings are chosen by the author of the thread"
 msgstr ""
 
@@ -10156,18 +10156,18 @@ msgstr ""
 msgid "Reply sorting"
 msgstr ""
 
-#: src/components/PostControls/PostMenu/PostMenuItems.tsx:389
+#: src/components/PostControls/PostMenu/PostMenuItems.tsx:385
 msgctxt "toast"
 msgid "Reply visibility updated"
 msgstr ""
 
-#: src/components/PostControls/PostMenu/PostMenuItems.tsx:388
+#: src/components/PostControls/PostMenu/PostMenuItems.tsx:384
 msgid "Reply was successfully hidden"
 msgstr ""
 
-#: src/components/dms/MessageContextMenu.tsx:220
-#: src/features/liveNow/components/LiveStatusDialog.tsx:267
-#: src/screens/Messages/ConversationSettings/index.tsx:583
+#: src/components/dms/MessageContextMenu.tsx:218
+#: src/features/liveNow/components/LiveStatusDialog.tsx:264
+#: src/screens/Messages/ConversationSettings/index.tsx:578
 msgid "Report"
 msgstr ""
 
@@ -10183,8 +10183,8 @@ msgstr ""
 msgid "Report conversation"
 msgstr ""
 
-#: src/components/moderation/ReportDialog/index.tsx:137
-#: src/components/moderation/ReportDialog/index.tsx:335
+#: src/components/moderation/ReportDialog/index.tsx:138
+#: src/components/moderation/ReportDialog/index.tsx:336
 msgid "Report dialog"
 msgstr ""
 
@@ -10193,17 +10193,17 @@ msgstr ""
 msgid "Report feed"
 msgstr ""
 
-#: src/screens/ProfileList/components/MoreOptionsMenu.tsx:210
-#: src/screens/ProfileList/components/MoreOptionsMenu.tsx:213
+#: src/screens/ProfileList/components/MoreOptionsMenu.tsx:211
+#: src/screens/ProfileList/components/MoreOptionsMenu.tsx:214
 msgid "Report list"
 msgstr ""
 
-#: src/components/dms/MessageContextMenu.tsx:217
+#: src/components/dms/MessageContextMenu.tsx:215
 msgid "Report message"
 msgstr ""
 
-#: src/components/PostControls/PostMenu/PostMenuItems.tsx:781
-#: src/components/PostControls/PostMenu/PostMenuItems.tsx:783
+#: src/components/PostControls/PostMenu/PostMenuItems.tsx:777
+#: src/components/PostControls/PostMenu/PostMenuItems.tsx:779
 msgid "Report post"
 msgstr ""
 
@@ -10211,8 +10211,8 @@ msgstr ""
 msgid "Report sent"
 msgstr "Report sent"
 
-#: src/screens/StarterPack/StarterPackScreen.tsx:657
-#: src/screens/StarterPack/StarterPackScreen.tsx:660
+#: src/screens/StarterPack/StarterPackScreen.tsx:650
+#: src/screens/StarterPack/StarterPackScreen.tsx:653
 msgid "Report starter pack"
 msgstr ""
 
@@ -10232,7 +10232,7 @@ msgstr ""
 msgid "Report this feed"
 msgstr ""
 
-#: src/screens/Messages/ConversationSettings/index.tsx:582
+#: src/screens/Messages/ConversationSettings/index.tsx:577
 msgid "Report this group chat"
 msgstr "Report this group chat"
 
@@ -10241,7 +10241,7 @@ msgid "Report this list"
 msgstr ""
 
 #: src/components/moderation/ReportDialog/copy.ts:19
-#: src/features/liveNow/components/LiveStatusDialog.tsx:250
+#: src/features/liveNow/components/LiveStatusDialog.tsx:247
 msgid "Report this livestream"
 msgstr ""
 
@@ -10278,7 +10278,7 @@ msgstr ""
 #: src/components/PostControls/RepostButton.tsx:146
 #: src/components/PostControls/RepostButton.web.tsx:43
 #: src/components/PostControls/RepostButton.web.tsx:103
-#: src/screens/StarterPack/StarterPackScreen.tsx:577
+#: src/screens/StarterPack/StarterPackScreen.tsx:570
 msgid "Repost or quote post"
 msgstr ""
 
@@ -10286,13 +10286,13 @@ msgstr ""
 msgid "Reposted By"
 msgstr ""
 
-#: src/view/com/posts/PostFeedReason.tsx:78
-#: src/view/com/posts/PostFeedReason.tsx:97
+#: src/view/com/posts/PostFeedReason.tsx:80
+#: src/view/com/posts/PostFeedReason.tsx:99
 msgid "Reposted by {reposter}"
 msgstr ""
 
-#: src/view/com/posts/PostFeedReason.tsx:78
-#: src/view/com/posts/PostFeedReason.tsx:95
+#: src/view/com/posts/PostFeedReason.tsx:80
+#: src/view/com/posts/PostFeedReason.tsx:97
 msgid "Reposted by you"
 msgstr ""
 
@@ -10302,7 +10302,7 @@ msgstr ""
 msgid "Reposts"
 msgstr ""
 
-#: src/components/Pills.tsx:229
+#: src/components/Pills.tsx:230
 msgid "Reposts Hidden"
 msgstr "Reposts Hidden"
 
@@ -10326,29 +10326,29 @@ msgctxt "toast"
 msgid "Reposts will be shown in feeds"
 msgstr "Reposts will be shown in feeds"
 
-#: src/components/intents/GroupChatJoinDialog.tsx:463
+#: src/components/intents/GroupChatJoinDialog.tsx:468
 msgid "Request access to group chat"
 msgstr "Request access to group chat"
 
-#: src/screens/Messages/JoinRequests.tsx:182
+#: src/screens/Messages/JoinRequests.tsx:179
 msgid "Request approved."
 msgstr "Request approved."
 
-#: src/screens/Settings/components/ChangePasswordDialog.tsx:226
-#: src/screens/Settings/components/ChangePasswordDialog.tsx:232
+#: src/screens/Settings/components/ChangePasswordDialog.tsx:230
+#: src/screens/Settings/components/ChangePasswordDialog.tsx:236
 msgid "Request code"
 msgstr ""
 
-#: src/screens/Messages/JoinRequests.tsx:215
+#: src/screens/Messages/JoinRequests.tsx:211
 msgid "Request rejected."
 msgstr "Request rejected."
 
-#: src/components/dms/ChatInvite/Root.tsx:117
-#: src/components/intents/GroupChatJoinDialog.tsx:295
+#: src/components/dms/ChatInvite/Root.tsx:118
+#: src/components/intents/GroupChatJoinDialog.tsx:300
 msgid "Request to join"
 msgstr "Request to join"
 
-#: src/components/dms/ChatInvite/Root.tsx:131
+#: src/components/dms/ChatInvite/Root.tsx:132
 msgid "Requested"
 msgstr "Requested"
 
@@ -10358,8 +10358,8 @@ msgid "Requests"
 msgstr "Requests"
 
 #: src/Navigation.tsx:519
-#: src/screens/Messages/JoinRequests.tsx:59
-#: src/screens/Messages/JoinRequests.tsx:425
+#: src/screens/Messages/JoinRequests.tsx:56
+#: src/screens/Messages/JoinRequests.tsx:422
 msgid "Requests to join"
 msgstr "Requests to join"
 
@@ -10380,13 +10380,13 @@ msgstr ""
 msgid "Required in your region"
 msgstr ""
 
-#: src/components/intents/GroupChatJoinDialog.tsx:310
+#: src/components/intents/GroupChatJoinDialog.tsx:315
+#: src/screens/Messages/components/OutgoingRequestListItem.tsx:113
 #: src/screens/Messages/components/OutgoingRequestListItem.tsx:115
-#: src/screens/Messages/components/OutgoingRequestListItem.tsx:117
 msgid "Rescind request"
 msgstr "Rescind request"
 
-#: src/screens/Messages/components/OutgoingRequestListItem.tsx:50
+#: src/screens/Messages/components/OutgoingRequestListItem.tsx:48
 msgid "Rescind request to join group chat"
 msgstr "Rescind request to join group chat"
 
@@ -10394,48 +10394,48 @@ msgstr "Rescind request to join group chat"
 msgid "Resend"
 msgstr ""
 
-#: src/components/contacts/screens/VerifyNumber.tsx:365
-#: src/components/contacts/screens/VerifyNumber.tsx:382
+#: src/components/contacts/screens/VerifyNumber.tsx:368
+#: src/components/contacts/screens/VerifyNumber.tsx:385
 msgid "Resend code"
 msgstr ""
 
 #. placeholder {0}: String( clamp(Math.round(timeUntilCanResend / 1000), 0, 30), ).padStart(2, '0')
-#: src/components/contacts/screens/VerifyNumber.tsx:372
+#: src/components/contacts/screens/VerifyNumber.tsx:375
 msgid "Resend code in <0>00:{0}</0>"
 msgstr ""
 
-#: src/screens/Settings/components/DisableEmail2FADialog.tsx:174
-#: src/screens/Settings/components/DisableEmail2FADialog.tsx:177
+#: src/screens/Settings/components/DisableEmail2FADialog.tsx:182
+#: src/screens/Settings/components/DisableEmail2FADialog.tsx:185
 msgid "Resend email"
 msgstr ""
 
-#: src/components/intents/VerifyEmailIntentDialog.tsx:124
+#: src/components/intents/VerifyEmailIntentDialog.tsx:125
 msgid "Resend Email"
 msgstr ""
 
-#: src/components/intents/VerifyEmailIntentDialog.tsx:117
+#: src/components/intents/VerifyEmailIntentDialog.tsx:118
 msgid "Resend Verification Email"
 msgstr ""
 
-#: src/screens/Settings/Settings.tsx:509
 #: src/screens/Settings/Settings.tsx:511
+#: src/screens/Settings/Settings.tsx:513
 msgid "Reset activity subscription nudge"
 msgstr ""
 
-#: src/screens/Login/SetNewPasswordForm.tsx:108
+#: src/screens/Login/SetNewPasswordForm.tsx:113
 msgid "Reset code"
 msgstr ""
 
-#: src/screens/Settings/Settings.tsx:494
 #: src/screens/Settings/Settings.tsx:496
+#: src/screens/Settings/Settings.tsx:498
 msgid "Reset onboarding state"
 msgstr ""
 
-#: src/screens/Login/ForgotPasswordForm.tsx:77
+#: src/screens/Login/ForgotPasswordForm.tsx:81
 msgid "Reset password"
 msgstr ""
 
-#: src/screens/Login/LoginForm.tsx:422
+#: src/screens/Login/LoginForm.tsx:423
 msgid "Reset your password by sending a code to your email"
 msgstr "Reset your password by sending a code to your email"
 
@@ -10447,12 +10447,12 @@ msgstr "Restore default"
 msgid "Restore the {defaultChannel} deployment"
 msgstr "Restore the {defaultChannel} deployment"
 
-#: src/screens/Settings/FindContactsSettings.tsx:544
-#: src/screens/Settings/FindContactsSettings.tsx:560
+#: src/screens/Settings/FindContactsSettings.tsx:548
+#: src/screens/Settings/FindContactsSettings.tsx:564
 msgid "Resync contacts"
 msgstr ""
 
-#: src/screens/Login/LoginForm.tsx:532
+#: src/screens/Login/LoginForm.tsx:533
 msgid "Retries signing in"
 msgstr ""
 
@@ -10463,22 +10463,22 @@ msgstr ""
 
 #: src/components/ageAssurance/AgeAssuranceErrors.tsx:28
 #: src/components/ageAssurance/AgeAssuranceErrors.tsx:31
-#: src/components/contacts/screens/VerifyNumber.tsx:350
-#: src/components/contacts/screens/VerifyNumber.tsx:355
+#: src/components/contacts/screens/VerifyNumber.tsx:353
+#: src/components/contacts/screens/VerifyNumber.tsx:358
 #: src/components/Error.tsx:60
 #: src/components/Lists.tsx:115
-#: src/components/moderation/ReportDialog/index.tsx:369
+#: src/components/moderation/ReportDialog/index.tsx:370
 #: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/VideoFallback.tsx:56
 #: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/VideoFallback.tsx:59
 #: src/components/StarterPack/ProfileStarterPacks.tsx:380
-#: src/screens/Login/LoginForm.tsx:531
-#: src/screens/Login/LoginForm.tsx:537
+#: src/screens/Login/LoginForm.tsx:532
+#: src/screens/Login/LoginForm.tsx:538
 #: src/screens/Messages/ChatList.tsx:429
 #: src/screens/Messages/components/MessageListError.tsx:24
-#: src/screens/Messages/Inbox.tsx:211
-#: src/screens/Messages/JoinRequests.tsx:361
-#: src/screens/Onboarding/StepSuggestedAccounts/index.tsx:268
-#: src/screens/Onboarding/StepSuggestedAccounts/index.tsx:271
+#: src/screens/Messages/Inbox.tsx:210
+#: src/screens/Messages/JoinRequests.tsx:358
+#: src/screens/Onboarding/StepSuggestedAccounts/index.tsx:272
+#: src/screens/Onboarding/StepSuggestedAccounts/index.tsx:275
 #: src/screens/Onboarding/StepSuggestedStarterpacks/index.tsx:92
 #: src/screens/Onboarding/StepSuggestedStarterpacks/index.tsx:95
 #: src/screens/PostThread/components/ThreadError.tsx:81
@@ -10490,14 +10490,14 @@ msgstr ""
 msgid "Retry"
 msgstr ""
 
-#: src/components/moderation/ReportDialog/index.tsx:366
+#: src/components/moderation/ReportDialog/index.tsx:367
 #: src/view/screens/Storybook/Admonitions.tsx:61
 msgid "Retry loading report options"
 msgstr ""
 
 #: src/components/Error.tsx:68
 #: src/screens/List/ListHiddenScreen.tsx:223
-#: src/screens/StarterPack/StarterPackScreen.tsx:801
+#: src/screens/StarterPack/StarterPackScreen.tsx:794
 msgid "Return to previous page"
 msgstr ""
 
@@ -10507,16 +10507,16 @@ msgstr ""
 
 #: src/screens/ProfileList/components/ErrorScreen.tsx:36
 #: src/screens/Settings/components/ChangeHandleDialog.tsx:577
-#: src/screens/VideoFeed/index.tsx:1262
+#: src/screens/VideoFeed/index.tsx:1258
 #: src/view/screens/NotFound.tsx:54
 msgid "Returns to previous page"
 msgstr ""
 
-#: src/screens/StarterPack/Wizard/index.tsx:316
+#: src/screens/StarterPack/Wizard/index.tsx:312
 msgid "Returns to the previous step"
 msgstr ""
 
-#: src/screens/Login/LoginForm.tsx:613
+#: src/screens/Login/LoginForm.tsx:614
 msgid "Reveal password"
 msgstr "Reveal password"
 
@@ -10526,13 +10526,13 @@ msgid "Sad GIFs"
 msgstr "Sad GIFs"
 
 #: src/components/dialogs/BirthDateSettings.tsx:200
-#: src/components/dialogs/lists/CreateOrEditListDialog.tsx:309
-#: src/components/dialogs/lists/CreateOrEditListDialog.tsx:324
-#: src/components/dialogs/PostInteractionSettingsDialog.tsx:668
-#: src/components/dialogs/PostInteractionSettingsDialog.tsx:673
-#: src/components/StarterPack/QrCodeDialog.tsx:210
-#: src/features/liveNow/components/EditLiveDialog.tsx:197
-#: src/features/liveNow/components/EditLiveDialog.tsx:204
+#: src/components/dialogs/lists/CreateOrEditListDialog.tsx:317
+#: src/components/dialogs/lists/CreateOrEditListDialog.tsx:332
+#: src/components/dialogs/PostInteractionSettingsDialog.tsx:665
+#: src/components/dialogs/PostInteractionSettingsDialog.tsx:670
+#: src/components/StarterPack/QrCodeDialog.tsx:205
+#: src/features/liveNow/components/EditLiveDialog.tsx:199
+#: src/features/liveNow/components/EditLiveDialog.tsx:206
 #: src/screens/Messages/ConversationSettings/prompts.tsx:82
 #: src/screens/Profile/Header/EditProfileDialog.tsx:233
 #: src/screens/Profile/Header/EditProfileDialog.tsx:247
@@ -10552,34 +10552,34 @@ msgstr ""
 msgid "Save birthdate"
 msgstr ""
 
-#: src/components/activity-notifications/SubscribeProfileDialog.tsx:198
-#: src/components/activity-notifications/SubscribeProfileDialog.tsx:207
+#: src/components/activity-notifications/SubscribeProfileDialog.tsx:195
+#: src/components/activity-notifications/SubscribeProfileDialog.tsx:204
 #: src/screens/SavedFeeds.tsx:120
 #: src/screens/SavedFeeds.tsx:124
 #: src/screens/SavedFeeds.tsx:311
 #: src/screens/SavedFeeds.tsx:315
-#: src/view/com/composer/Composer.tsx:1563
+#: src/view/com/composer/Composer.tsx:1587
 #: src/view/com/composer/drafts/DraftsButton.tsx:125
 msgid "Save changes"
 msgstr ""
 
-#: src/view/com/composer/Composer.tsx:1535
+#: src/view/com/composer/Composer.tsx:1559
 #: src/view/com/composer/drafts/DraftsButton.tsx:93
 msgid "Save changes?"
 msgstr ""
 
-#: src/view/com/composer/Composer.tsx:1563
+#: src/view/com/composer/Composer.tsx:1587
 #: src/view/com/composer/drafts/DraftsButton.tsx:125
 msgid "Save draft"
 msgstr ""
 
-#: src/view/com/composer/Composer.tsx:1537
+#: src/view/com/composer/Composer.tsx:1561
 #: src/view/com/composer/drafts/DraftsButton.tsx:95
 msgid "Save draft?"
 msgstr ""
 
 #: src/components/Lightbox/chrome/ImageMenu.tsx:99
-#: src/components/MediaPreview.tsx:231
+#: src/components/MediaPreview.tsx:237
 #: src/components/Post/Embed/ImageContextMenu.tsx:70
 #: src/components/StarterPack/ShareDialog.tsx:144
 #: src/components/StarterPack/ShareDialog.tsx:150
@@ -10590,12 +10590,12 @@ msgstr ""
 msgid "Save new handle"
 msgstr ""
 
-#: src/components/StarterPack/QrCodeDialog.tsx:202
+#: src/components/StarterPack/QrCodeDialog.tsx:197
 msgid "Save QR code"
 msgstr ""
 
-#: src/components/dialogs/PostInteractionSettingsDialog.tsx:649
-#: src/components/dialogs/PostInteractionSettingsDialog.tsx:655
+#: src/components/dialogs/PostInteractionSettingsDialog.tsx:646
+#: src/components/dialogs/PostInteractionSettingsDialog.tsx:652
 msgid "Save these options for next time"
 msgstr ""
 
@@ -10617,18 +10617,18 @@ msgstr ""
 
 #: src/components/dialogs/nuxs/BookmarksAnnouncement.tsx:145
 #: src/Navigation.tsx:579
-#: src/screens/Bookmarks.tsx:59
+#: src/screens/Bookmarks.tsx:57
 msgid "Saved Posts"
 msgstr ""
 
 #: src/screens/CustomFeed/components/CustomFeedHeader.tsx:138
-#: src/screens/ProfileList/components/Header.tsx:88
+#: src/screens/ProfileList/components/Header.tsx:89
 msgid "Saved to your feeds"
 msgstr ""
 
-#: src/components/NewskieDialog.tsx:141
-#: src/view/com/notifications/NotificationFeedItem.tsx:947
-#: src/view/com/notifications/NotificationFeedItem.tsx:955
+#: src/components/NewskieDialog.tsx:142
+#: src/view/com/notifications/NotificationFeedItem.tsx:938
+#: src/view/com/notifications/NotificationFeedItem.tsx:946
 msgid "Say hello!"
 msgstr ""
 
@@ -10637,7 +10637,7 @@ msgstr ""
 msgid "Say hi to someone"
 msgstr "Say hi to someone"
 
-#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:43
+#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:44
 msgid "Scam"
 msgstr ""
 
@@ -10663,7 +10663,7 @@ msgstr ""
 msgid "Scroll right"
 msgstr ""
 
-#: src/components/dms/MessageItem.tsx:820
+#: src/components/dms/MessageItem.tsx:835
 msgid "Scroll to the message this is replying to"
 msgstr "Scroll to the message this is replying to"
 
@@ -10694,7 +10694,7 @@ msgstr ""
 msgid "Search by name or interest"
 msgstr ""
 
-#: src/components/contacts/screens/ViewMatches.tsx:356
+#: src/components/contacts/screens/ViewMatches.tsx:364
 msgid "Search contacts"
 msgstr ""
 
@@ -10720,15 +10720,15 @@ msgstr "Search for “{searchText}”"
 msgid "Search for {q}"
 msgstr "Search for {q}"
 
-#: src/screens/StarterPack/Wizard/index.tsx:541
+#: src/screens/StarterPack/Wizard/index.tsx:537
 msgid "Search for feeds that you want to suggest to others."
 msgstr ""
 
-#: src/screens/Search/Explore.tsx:373
+#: src/screens/Search/Explore.tsx:369
 msgid "Search for more accounts"
 msgstr ""
 
-#: src/screens/Search/Explore.tsx:452
+#: src/screens/Search/Explore.tsx:448
 msgid "Search for more feeds"
 msgstr ""
 
@@ -10741,7 +10741,7 @@ msgstr "Search for people"
 msgid "Search GIFs"
 msgstr ""
 
-#: src/screens/Hashtag.tsx:228
+#: src/screens/Hashtag.tsx:230
 #: src/screens/Search/SearchResults.tsx:410
 msgid "Search is currently unavailable when logged out"
 msgstr ""
@@ -10821,7 +10821,7 @@ msgstr ""
 
 #: src/components/FeedInterstitials.tsx:495
 #: src/components/FeedInterstitials.tsx:554
-#: src/components/interstitials/FeedTrendingTopics.tsx:112
+#: src/components/interstitials/FeedTrendingTopics.tsx:113
 #: src/view/shell/desktop/SidebarTrendingTopics.tsx:80
 msgid "See more"
 msgstr ""
@@ -10830,7 +10830,7 @@ msgstr ""
 msgid "See more suggested profiles"
 msgstr ""
 
-#: src/components/interstitials/FeedTrendingTopics.tsx:98
+#: src/components/interstitials/FeedTrendingTopics.tsx:99
 #: src/view/shell/desktop/SidebarTrendingTopics.tsx:66
 msgid "See more trending topics"
 msgstr "See more trending topics"
@@ -10876,7 +10876,7 @@ msgstr ""
 msgid "Select a color"
 msgstr ""
 
-#: src/components/moderation/ReportDialog/index.tsx:452
+#: src/components/moderation/ReportDialog/index.tsx:453
 msgid "Select a reason"
 msgstr ""
 
@@ -10932,11 +10932,11 @@ msgstr "Select filter type (currently: {0})"
 msgid "Select from an existing account"
 msgstr ""
 
-#: src/components/dialogs/PostInteractionSettingsDialog.tsx:553
+#: src/components/dialogs/PostInteractionSettingsDialog.tsx:550
 msgid "Select from your lists"
 msgstr ""
 
-#: src/components/dialogs/PostInteractionSettingsDialog.tsx:555
+#: src/components/dialogs/PostInteractionSettingsDialog.tsx:552
 msgid "Select from your lists <0>{numberOfListsSelected, plural, other {(# selected)}}</0>"
 msgstr ""
 
@@ -10955,7 +10955,7 @@ msgstr ""
 msgid "Select group chat members"
 msgstr "Select group chat members"
 
-#: src/components/dialogs/MutedWords.tsx:151
+#: src/components/dialogs/MutedWords.tsx:153
 msgid "Select how long to mute this word for."
 msgstr ""
 
@@ -10973,7 +10973,7 @@ msgstr ""
 msgid "Select languages"
 msgstr ""
 
-#: src/components/moderation/ReportDialog/index.tsx:507
+#: src/components/moderation/ReportDialog/index.tsx:508
 msgid "Select moderation service"
 msgstr ""
 
@@ -10993,7 +10993,7 @@ msgstr ""
 msgid "Select the {emojiName} emoji as your avatar"
 msgstr ""
 
-#: src/components/Post/Translated/index.tsx:446
+#: src/components/Post/Translated/index.tsx:443
 msgid "Select the source language"
 msgstr "Select the source language"
 
@@ -11002,7 +11002,7 @@ msgstr "Select the source language"
 msgid "Select up to 3 languages used in this post"
 msgstr ""
 
-#: src/components/dialogs/MutedWords.tsx:251
+#: src/components/dialogs/MutedWords.tsx:253
 msgid "Select what content this mute word should apply to."
 msgstr ""
 
@@ -11019,7 +11019,7 @@ msgid "Select your date of birth"
 msgstr ""
 
 #: src/screens/Onboarding/StepInterests/index.tsx:115
-#: src/screens/Settings/InterestsSettings.tsx:178
+#: src/screens/Settings/InterestsSettings.tsx:179
 msgid "Select your interests from the options below"
 msgstr ""
 
@@ -11035,7 +11035,7 @@ msgstr ""
 msgid "Selecting multiple media types is not supported."
 msgstr ""
 
-#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:188
+#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:190
 msgid "Self-harm or dangerous behaviors"
 msgstr ""
 
@@ -11047,7 +11047,7 @@ msgstr ""
 #: src/components/dialogs/EmailDialog/screens/Manage2FA/Disable.tsx:172
 #: src/components/dialogs/EmailDialog/screens/Manage2FA/Disable.tsx:179
 #: src/components/dialogs/EmailDialog/screens/Verify.tsx:311
-#: src/screens/Settings/components/DeleteAccountDialog.tsx:199
+#: src/screens/Settings/components/DeleteAccountDialog.tsx:205
 msgid "Send email"
 msgstr ""
 
@@ -11062,20 +11062,20 @@ msgstr "Send error report"
 msgid "Send feedback"
 msgstr ""
 
-#: src/screens/Messages/components/MessageComposer.tsx:324
+#: src/screens/Messages/components/MessageComposer.tsx:325
 msgid "Send message"
 msgstr ""
 
-#: src/components/PostControls/ShareMenu/RecentChats.tsx:146
+#: src/components/PostControls/ShareMenu/RecentChats.tsx:143
 msgid "Send post to {name}"
 msgstr ""
 
-#: src/components/dms/dialogs/ShareViaChatDialog.tsx:167
-#: src/components/dms/dialogs/ShareViaChatDialog.tsx:176
+#: src/components/dms/dialogs/ShareViaChatDialog.tsx:160
+#: src/components/dms/dialogs/ShareViaChatDialog.tsx:169
 msgid "Send post to..."
 msgstr ""
 
-#: src/components/moderation/ReportDialog/index.tsx:1063
+#: src/components/moderation/ReportDialog/index.tsx:1064
 msgid "Send report to {title}"
 msgstr ""
 
@@ -11084,8 +11084,8 @@ msgid "Send the message from your phone"
 msgstr ""
 
 #: src/components/dialogs/EmailDialog/screens/Verify.tsx:304
-#: src/screens/Settings/components/DisableEmail2FADialog.tsx:121
-#: src/screens/Settings/components/DisableEmail2FADialog.tsx:124
+#: src/screens/Settings/components/DisableEmail2FADialog.tsx:129
+#: src/screens/Settings/components/DisableEmail2FADialog.tsx:132
 msgid "Send verification email"
 msgstr ""
 
@@ -11097,7 +11097,7 @@ msgid "Send via chat"
 msgstr "Send via chat"
 
 #. placeholder {0}: i18n.date(new Date(message.sentAt), { timeStyle: 'short', })
-#: src/components/dms/MessageContextMenu.tsx:175
+#: src/components/dms/MessageContextMenu.tsx:173
 msgid "Sent at {0}"
 msgstr "Sent at {0}"
 
@@ -11115,11 +11115,11 @@ msgstr ""
 msgid "Set app icon to {0}"
 msgstr ""
 
-#: src/screens/Login/SetNewPasswordForm.tsx:99
+#: src/screens/Login/SetNewPasswordForm.tsx:104
 msgid "Set new password"
 msgstr ""
 
-#: src/components/dialogs/PostInteractionSettingsDialog.tsx:481
+#: src/components/dialogs/PostInteractionSettingsDialog.tsx:478
 msgid "Set precisely which groups of people can reply to your post"
 msgstr ""
 
@@ -11127,7 +11127,7 @@ msgstr ""
 msgid "Set up your account"
 msgstr ""
 
-#: src/components/dialogs/PostInteractionSettingsDialog.tsx:431
+#: src/components/dialogs/PostInteractionSettingsDialog.tsx:428
 msgid "Set who can reply to your post"
 msgstr ""
 
@@ -11135,20 +11135,20 @@ msgstr ""
 msgid "Set your birthdate below and we'll get you back to posting and exploring in no time!"
 msgstr ""
 
-#: src/screens/Login/LoginForm.tsx:352
+#: src/screens/Login/LoginForm.tsx:353
 msgid "set your hosting provider manually"
 msgstr "set your hosting provider manually"
 
-#: src/screens/Login/LoginForm.tsx:486
+#: src/screens/Login/LoginForm.tsx:487
 msgid "Set your hosting provider manually"
 msgstr "Set your hosting provider manually"
 
-#: src/screens/Login/ForgotPasswordForm.tsx:104
+#: src/screens/Login/ForgotPasswordForm.tsx:108
 msgid "Sets email for password reset"
 msgstr ""
 
 #: src/Navigation.tsx:215
-#: src/screens/Settings/Settings.tsx:100
+#: src/screens/Settings/Settings.tsx:102
 #: src/view/shell/desktop/LeftNav.tsx:755
 #: src/view/shell/Drawer.tsx:671
 msgid "Settings"
@@ -11208,7 +11208,7 @@ msgstr ""
 msgid "Settings for repost notifications"
 msgstr ""
 
-#: src/screens/ModerationInteractionSettings/index.tsx:103
+#: src/screens/ModerationInteractionSettings/index.tsx:104
 msgctxt "toast"
 msgid "Settings saved"
 msgstr ""
@@ -11222,14 +11222,14 @@ msgid "Sexually Suggestive"
 msgstr ""
 
 #: src/components/Link.tsx:428
-#: src/components/MediaPreview.tsx:237
+#: src/components/MediaPreview.tsx:243
 #: src/components/Post/Embed/ImageContextMenu.tsx:74
-#: src/components/StarterPack/QrCodeDialog.tsx:198
-#: src/screens/Hashtag.tsx:130
-#: src/screens/Messages/components/InviteLinkDialog.tsx:415
-#: src/screens/Messages/components/InviteLinkDialog.tsx:426
-#: src/screens/StarterPack/StarterPackScreen.tsx:447
-#: src/screens/Topic.tsx:89
+#: src/components/StarterPack/QrCodeDialog.tsx:193
+#: src/screens/Hashtag.tsx:132
+#: src/screens/Messages/components/InviteLinkDialog.tsx:412
+#: src/screens/Messages/components/InviteLinkDialog.tsx:423
+#: src/screens/StarterPack/StarterPackScreen.tsx:440
+#: src/screens/Topic.tsx:91
 msgid "Share"
 msgstr ""
 
@@ -11275,8 +11275,8 @@ msgstr ""
 msgid "Share link dialog"
 msgstr ""
 
-#: src/screens/Settings/FindContactsSettings.tsx:172
-#: src/screens/Settings/FindContactsSettings.tsx:181
+#: src/screens/Settings/FindContactsSettings.tsx:170
+#: src/screens/Settings/FindContactsSettings.tsx:179
 msgid "Share my profile"
 msgstr "Share my profile"
 
@@ -11304,7 +11304,7 @@ msgstr ""
 msgid "Share this search"
 msgstr "Share this search"
 
-#: src/screens/StarterPack/StarterPackScreen.tsx:440
+#: src/screens/StarterPack/StarterPackScreen.tsx:433
 msgid "Share this starter pack"
 msgstr ""
 
@@ -11314,16 +11314,16 @@ msgstr ""
 
 #: src/components/PostControls/ShareMenu/ShareMenuItems.tsx:130
 #: src/components/PostControls/ShareMenu/ShareMenuItems.tsx:133
-#: src/screens/ProfileList/components/MoreOptionsMenu.tsx:160
-#: src/screens/ProfileList/components/MoreOptionsMenu.tsx:166
-#: src/screens/StarterPack/StarterPackScreen.tsx:638
-#: src/screens/StarterPack/StarterPackScreen.tsx:646
+#: src/screens/ProfileList/components/MoreOptionsMenu.tsx:161
+#: src/screens/ProfileList/components/MoreOptionsMenu.tsx:167
+#: src/screens/StarterPack/StarterPackScreen.tsx:631
+#: src/screens/StarterPack/StarterPackScreen.tsx:639
 #: src/view/com/profile/ProfileMenu.tsx:321
 #: src/view/com/profile/ProfileMenu.tsx:333
 msgid "Share via..."
 msgstr ""
 
-#: src/components/contacts/screens/GetContacts.tsx:232
+#: src/components/contacts/screens/GetContacts.tsx:234
 msgid "Share your contacts to find friends"
 msgstr ""
 
@@ -11347,7 +11347,7 @@ msgstr "Sharing your age range reveals only the range associated with your Googl
 
 #: src/components/moderation/ContentHider.tsx:217
 #: src/components/moderation/LabelPreference.tsx:143
-#: src/components/moderation/PostHider.tsx:140
+#: src/components/moderation/PostHider.tsx:137
 msgid "Show"
 msgstr ""
 
@@ -11357,16 +11357,16 @@ msgstr ""
 
 #: src/components/moderation/ScreenHider.tsx:175
 #: src/components/moderation/ScreenHider.tsx:178
-#: src/features/liveNow/components/LiveStatusDialog.tsx:318
-#: src/features/liveNow/components/LiveStatusDialog.tsx:322
+#: src/features/liveNow/components/LiveStatusDialog.tsx:315
+#: src/features/liveNow/components/LiveStatusDialog.tsx:319
 #: src/screens/List/ListHiddenScreen.tsx:194
-#: src/screens/VideoFeed/index.tsx:739
-#: src/screens/VideoFeed/index.tsx:745
+#: src/screens/VideoFeed/index.tsx:738
+#: src/screens/VideoFeed/index.tsx:744
 msgid "Show anyway"
 msgstr ""
 
-#: src/screens/Settings/AutomationLabelSettings.tsx:185
-#: src/screens/Settings/AutomationLabelSettings.tsx:198
+#: src/screens/Settings/AutomationLabelSettings.tsx:184
+#: src/screens/Settings/AutomationLabelSettings.tsx:197
 msgid "Show automation label"
 msgstr "Show automation label"
 
@@ -11379,7 +11379,7 @@ msgstr ""
 msgid "Show badge and filter from feeds"
 msgstr ""
 
-#: src/components/dialogs/Embed.tsx:125
+#: src/components/dialogs/Embed.tsx:126
 msgid "Show customization options"
 msgstr ""
 
@@ -11387,8 +11387,8 @@ msgstr ""
 msgid "Show group chat updates"
 msgstr "Show group chat updates"
 
-#: src/components/PostControls/PostMenu/PostMenuItems.tsx:609
-#: src/components/PostControls/PostMenu/PostMenuItems.tsx:611
+#: src/components/PostControls/PostMenu/PostMenuItems.tsx:605
+#: src/components/PostControls/PostMenu/PostMenuItems.tsx:607
 msgid "Show less like this"
 msgstr ""
 
@@ -11396,7 +11396,7 @@ msgstr ""
 msgid "Show list anyway"
 msgstr ""
 
-#: src/components/dialogs/PostInteractionSettingsDialog.tsx:534
+#: src/components/dialogs/PostInteractionSettingsDialog.tsx:531
 msgid "Show lists of users to select from"
 msgstr ""
 
@@ -11404,8 +11404,8 @@ msgstr ""
 msgid "Show more"
 msgstr "Show more"
 
-#: src/components/PostControls/PostMenu/PostMenuItems.tsx:601
-#: src/components/PostControls/PostMenu/PostMenuItems.tsx:603
+#: src/components/PostControls/PostMenu/PostMenuItems.tsx:597
+#: src/components/PostControls/PostMenu/PostMenuItems.tsx:599
 msgid "Show more like this"
 msgstr ""
 
@@ -11431,8 +11431,8 @@ msgstr ""
 msgid "Show replies as"
 msgstr ""
 
-#: src/components/PostControls/PostMenu/PostMenuItems.tsx:689
-#: src/components/PostControls/PostMenu/PostMenuItems.tsx:699
+#: src/components/PostControls/PostMenu/PostMenuItems.tsx:685
+#: src/components/PostControls/PostMenu/PostMenuItems.tsx:695
 msgid "Show reply for everyone"
 msgstr ""
 
@@ -11464,16 +11464,16 @@ msgstr ""
 msgid "Show when you’re live"
 msgstr ""
 
-#: src/screens/PostThread/components/ThreadItemAnchor.tsx:599
+#: src/screens/PostThread/components/ThreadItemAnchor.tsx:596
 msgid "Shows information about when this post was created"
 msgstr ""
 
-#: src/screens/Settings/Settings.tsx:125
+#: src/screens/Settings/Settings.tsx:127
 msgid "Shows other accounts you can switch to"
 msgstr ""
 
 #: src/components/moderation/ContentHider.tsx:169
-#: src/components/moderation/PostHider.tsx:94
+#: src/components/moderation/PostHider.tsx:91
 msgid "Shows the content"
 msgstr ""
 
@@ -11481,14 +11481,14 @@ msgstr ""
 #: src/components/dialogs/Signin.tsx:100
 #: src/components/WelcomeModal.tsx:193
 #: src/components/WelcomeModal.tsx:204
-#: src/screens/Hashtag.tsx:231
+#: src/screens/Hashtag.tsx:233
 #: src/screens/Login/index.tsx:143
 #: src/screens/Login/index.tsx:165
-#: src/screens/Login/LoginForm.tsx:274
-#: src/screens/Login/LoginForm.tsx:554
-#: src/screens/Login/LoginForm.tsx:560
-#: src/screens/Messages/JoinRequest.tsx:290
-#: src/screens/Messages/JoinRequest.tsx:296
+#: src/screens/Login/LoginForm.tsx:275
+#: src/screens/Login/LoginForm.tsx:555
+#: src/screens/Login/LoginForm.tsx:561
+#: src/screens/Messages/JoinRequest.tsx:298
+#: src/screens/Messages/JoinRequest.tsx:304
 #: src/screens/Search/SearchResults.tsx:413
 #: src/view/com/auth/SplashScreen.tsx:118
 #: src/view/com/auth/SplashScreen.tsx:125
@@ -11512,8 +11512,8 @@ msgstr ""
 msgid "Sign in as…"
 msgstr "Sign in as…"
 
-#: src/screens/Deactivated.tsx:195
-#: src/screens/Deactivated.tsx:201
+#: src/screens/Deactivated.tsx:200
+#: src/screens/Deactivated.tsx:206
 msgid "Sign in or create an account"
 msgstr ""
 
@@ -11521,7 +11521,7 @@ msgstr ""
 msgid "Sign in or create your account to join the conversation!"
 msgstr ""
 
-#: src/screens/Messages/JoinRequest.tsx:216
+#: src/screens/Messages/JoinRequest.tsx:224
 msgid "Sign in to accept invite."
 msgstr "Sign in to accept invite."
 
@@ -11533,37 +11533,37 @@ msgstr ""
 msgid "Sign in to Bluesky or create a new account"
 msgstr ""
 
-#: src/screens/Messages/JoinRequest.tsx:215
+#: src/screens/Messages/JoinRequest.tsx:223
 msgid "Sign in to request access to this group chat."
 msgstr "Sign in to request access to this group chat."
 
-#: src/components/PostControls/PostMenu/PostMenuItems.tsx:587
-#: src/components/PostControls/PostMenu/PostMenuItems.tsx:589
+#: src/components/PostControls/PostMenu/PostMenuItems.tsx:583
+#: src/components/PostControls/PostMenu/PostMenuItems.tsx:585
 msgid "Sign in to view post"
 msgstr ""
 
-#: src/screens/Settings/Settings.tsx:275
 #: src/screens/Settings/Settings.tsx:277
-#: src/screens/Settings/Settings.tsx:309
-#: src/screens/SignupQueued.tsx:94
-#: src/screens/SignupQueued.tsx:97
-#: src/screens/Takendown.tsx:88
+#: src/screens/Settings/Settings.tsx:279
+#: src/screens/Settings/Settings.tsx:311
+#: src/screens/SignupQueued.tsx:101
+#: src/screens/SignupQueued.tsx:104
+#: src/screens/Takendown.tsx:86
 #: src/view/shell/desktop/LeftNav.tsx:227
 #: src/view/shell/desktop/LeftNav.tsx:282
 #: src/view/shell/desktop/LeftNav.tsx:285
 msgid "Sign out"
 msgstr ""
 
-#: src/screens/Takendown.tsx:91
+#: src/screens/Takendown.tsx:89
 msgid "Sign Out"
 msgstr ""
 
-#: src/screens/Settings/Settings.tsx:306
+#: src/screens/Settings/Settings.tsx:308
 #: src/view/shell/desktop/LeftNav.tsx:224
 msgid "Sign out?"
 msgstr ""
 
-#: src/screens/Login/LoginForm.tsx:572
+#: src/screens/Login/LoginForm.tsx:573
 msgid "Sign up"
 msgstr "Sign up"
 
@@ -11584,23 +11584,23 @@ msgid "Since"
 msgstr "Since"
 
 #: src/components/contacts/screens/PhoneInput.tsx:163
-#: src/components/contacts/screens/VerifyNumber.tsx:205
+#: src/components/contacts/screens/VerifyNumber.tsx:208
 #: src/screens/Onboarding/StepFindContactsIntro/index.tsx:86
 #: src/screens/Onboarding/StepFindContactsIntro/index.tsx:90
 #: src/screens/Onboarding/StepFinished/index.tsx:295
 #: src/screens/Onboarding/StepFinished/index.tsx:317
-#: src/screens/Onboarding/StepSuggestedAccounts/index.tsx:281
+#: src/screens/Onboarding/StepSuggestedAccounts/index.tsx:285
 #: src/screens/Onboarding/StepSuggestedStarterpacks/index.tsx:105
-#: src/screens/StarterPack/Wizard/index.tsx:206
+#: src/screens/StarterPack/Wizard/index.tsx:202
 msgid "Skip"
 msgstr ""
 
 #: src/components/contacts/screens/PhoneInput.tsx:160
-#: src/components/contacts/screens/VerifyNumber.tsx:202
+#: src/components/contacts/screens/VerifyNumber.tsx:205
 msgid "Skip contact sharing and continue to the app"
 msgstr ""
 
-#: src/view/com/composer/Composer.tsx:1580
+#: src/view/com/composer/Composer.tsx:1604
 msgid "Skip empty posts?"
 msgstr "Skip empty posts?"
 
@@ -11609,7 +11609,7 @@ msgstr "Skip empty posts?"
 msgid "Skip introduction and start using your account"
 msgstr ""
 
-#: src/screens/Onboarding/StepSuggestedAccounts/index.tsx:278
+#: src/screens/Onboarding/StepSuggestedAccounts/index.tsx:282
 #: src/screens/Onboarding/StepSuggestedStarterpacks/index.tsx:102
 msgid "Skip to next step"
 msgstr ""
@@ -11650,70 +11650,70 @@ msgstr ""
 msgid "Some other feeds you might like"
 msgstr ""
 
-#: src/components/WhoCanReply.tsx:88
+#: src/components/WhoCanReply.tsx:81
 msgid "Some people can reply"
 msgstr ""
 
-#: src/components/dms/getSystemMessageInfo.ts:86
+#: src/components/dms/getSystemMessageInfo.ts:91
 msgid "Someone joined"
 msgstr "Someone joined"
 
-#: src/components/dms/getSystemMessageInfo.ts:87
+#: src/components/dms/getSystemMessageInfo.ts:92
 msgid "Someone joined the group"
 msgstr "Someone joined the group"
 
-#: src/components/dms/getSystemMessageInfo.ts:99
+#: src/components/dms/getSystemMessageInfo.ts:106
 msgid "Someone left"
 msgstr "Someone left"
 
-#: src/components/dms/getSystemMessageInfo.ts:100
+#: src/components/dms/getSystemMessageInfo.ts:107
 msgid "Someone left the group"
 msgstr "Someone left the group"
 
 #. placeholder {0}: reaction.value
-#: src/components/dms/MessageItem.tsx:368
+#: src/components/dms/MessageItem.tsx:380
 msgid "Someone reacted {0}"
 msgstr ""
 
 #. placeholder {0}: reaction.value
-#: src/components/dms/getReactionInfo.ts:67
+#: src/components/dms/getReactionInfo.ts:72
 msgid "Someone reacted {0} to {target}"
 msgstr "Someone reacted {0} to {target}"
 
-#: src/components/dms/MessageItem.tsx:813
+#: src/components/dms/MessageItem.tsx:828
 msgid "Someone replied"
 msgstr "Someone replied"
 
-#: src/components/dms/getSystemMessageInfo.ts:60
+#: src/components/dms/getSystemMessageInfo.ts:61
 msgid "Someone was added"
 msgstr "Someone was added"
 
-#: src/components/dms/getSystemMessageInfo.ts:61
+#: src/components/dms/getSystemMessageInfo.ts:62
 msgid "Someone was added to the group"
 msgstr "Someone was added to the group"
 
-#: src/components/dms/getSystemMessageInfo.ts:73
+#: src/components/dms/getSystemMessageInfo.ts:76
 msgid "Someone was removed"
 msgstr "Someone was removed"
 
-#: src/components/dms/getSystemMessageInfo.ts:74
+#: src/components/dms/getSystemMessageInfo.ts:77
 msgid "Someone was removed from the group"
 msgstr "Someone was removed from the group"
 
-#: src/components/moderation/ReportDialog/index.tsx:142
+#: src/components/moderation/ReportDialog/index.tsx:143
 msgid "Something wasn't quite right with the data you're trying to report. Please contact support."
 msgstr ""
 
-#: src/screens/Messages/Conversation.tsx:133
-#: src/screens/Messages/ConversationSettings/index.tsx:137
-#: src/screens/Messages/JoinRequests.tsx:88
+#: src/screens/Messages/Conversation.tsx:135
+#: src/screens/Messages/ConversationSettings/index.tsx:134
+#: src/screens/Messages/JoinRequests.tsx:85
 msgid "Something went wrong"
 msgstr ""
 
-#: src/components/ageAssurance/AgeAssuranceInitDialog.tsx:139
-#: src/components/moderation/ReportDialog/index.tsx:361
-#: src/screens/Deactivated.tsx:86
-#: src/screens/Settings/components/DeactivateAccountDialog.tsx:59
+#: src/components/ageAssurance/AgeAssuranceInitDialog.tsx:141
+#: src/components/moderation/ReportDialog/index.tsx:362
+#: src/screens/Deactivated.tsx:92
+#: src/screens/Settings/components/DeactivateAccountDialog.tsx:60
 #: src/view/screens/Storybook/Admonitions.tsx:56
 msgid "Something went wrong, please try again"
 msgstr ""
@@ -11733,7 +11733,7 @@ msgstr ""
 msgid "Something went wrong. Please try again in a moment."
 msgstr ""
 
-#: src/components/moderation/ReportDialog/index.tsx:308
+#: src/components/moderation/ReportDialog/index.tsx:309
 msgid "Something went wrong. Please try again."
 msgstr ""
 
@@ -11741,7 +11741,7 @@ msgstr ""
 msgid "Something wrong? Let us know."
 msgstr ""
 
-#: src/screens/Onboarding/StepSuggestedAccounts/index.tsx:231
+#: src/screens/Onboarding/StepSuggestedAccounts/index.tsx:235
 msgid "Sorry, we're unable to load account suggestions at this time."
 msgstr ""
 
@@ -11767,20 +11767,20 @@ msgstr ""
 msgid "Source: <0>{sourceName}</0>"
 msgstr ""
 
-#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:39
+#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:40
 msgid "Spam"
 msgstr ""
 
-#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:36
+#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:37
 msgid "Spam or other inauthentic behavior or deception"
 msgstr ""
 
 #: src/lib/interests.ts:72
-#: src/screens/Search/modules/ExploreTrendingTopics.tsx:240
+#: src/screens/Search/modules/ExploreTrendingTopics.tsx:238
 msgid "Sports"
 msgstr ""
 
-#: src/components/PostControls/ShareMenu/RecentChats.tsx:234
+#: src/components/PostControls/ShareMenu/RecentChats.tsx:231
 msgid "Start a conversation, and it will appear here."
 msgstr ""
 
@@ -11789,7 +11789,7 @@ msgstr ""
 msgid "Start a group chat"
 msgstr "Start a group chat"
 
-#: src/components/dms/dialogs/NewChatDialog.tsx:192
+#: src/components/dms/dialogs/NewChatDialog.tsx:185
 msgid "Start a new chat"
 msgstr ""
 
@@ -11814,12 +11814,12 @@ msgstr ""
 
 #: src/Navigation.tsx:550
 #: src/Navigation.tsx:555
-#: src/screens/StarterPack/Wizard/index.tsx:197
+#: src/screens/StarterPack/Wizard/index.tsx:193
 msgid "Starter Pack"
 msgstr ""
 
 #. placeholder {0}: sanitizeHandle(creator.handle, '@')
-#: src/components/StarterPack/StarterPackCard.tsx:91
+#: src/components/StarterPack/StarterPackCard.tsx:87
 msgid "Starter pack by {0}"
 msgstr ""
 
@@ -11827,12 +11827,12 @@ msgstr ""
 msgid "Starter pack by <0/>"
 msgstr ""
 
-#: src/components/StarterPack/StarterPackCard.tsx:90
+#: src/components/StarterPack/StarterPackCard.tsx:86
 #: src/view/com/profile/ProfileSubpageHeader.tsx:169
 msgid "Starter pack by you"
 msgstr ""
 
-#: src/screens/StarterPack/StarterPackScreen.tsx:765
+#: src/screens/StarterPack/StarterPackScreen.tsx:758
 msgid "Starter pack is invalid"
 msgstr ""
 
@@ -11840,8 +11840,8 @@ msgstr ""
 msgid "Starter packs"
 msgstr "Starter packs"
 
-#: src/screens/Search/Explore.tsx:661
-#: src/view/screens/Profile.tsx:242
+#: src/screens/Search/Explore.tsx:657
+#: src/view/screens/Profile.tsx:239
 msgid "Starter Packs"
 msgstr ""
 
@@ -11853,7 +11853,7 @@ msgstr ""
 msgid "Starter packs let you share your favorite feeds and people with your friends."
 msgstr ""
 
-#: src/view/screens/Profile.tsx:569
+#: src/view/screens/Profile.tsx:566
 msgid "Starter Packs let you share your favorite feeds and people with your friends."
 msgstr ""
 
@@ -11867,11 +11867,11 @@ msgstr ""
 #. placeholder {1}: state.serviceDescription && !state.serviceDescription.phoneVerificationRequired ? '2' : '3'
 #. placeholder {1}: state.totalSteps
 #: src/screens/Onboarding/Layout.tsx:226
-#: src/screens/Signup/index.tsx:184
+#: src/screens/Signup/index.tsx:181
 msgid "Step {0} of {1}"
 msgstr ""
 
-#: src/screens/Settings/Settings.tsx:412
+#: src/screens/Settings/Settings.tsx:414
 msgid "Storage cleared, you need to restart the app now."
 msgstr ""
 
@@ -11880,7 +11880,7 @@ msgid "Stored as part of a secure code for matching with others"
 msgstr ""
 
 #: src/Navigation.tsx:308
-#: src/screens/Settings/Settings.tsx:475
+#: src/screens/Settings/Settings.tsx:477
 msgid "Storybook"
 msgstr ""
 
@@ -11888,25 +11888,25 @@ msgstr ""
 msgid "Streaming on Twitch? Set your live status on Bluesky to add a badge to your avatar. Tapping it takes people straight to your stream."
 msgstr ""
 
-#: src/components/ageAssurance/AgeAssuranceAppealDialog.tsx:122
-#: src/components/ageAssurance/AgeAssuranceAppealDialog.tsx:128
-#: src/components/moderation/AppealForm.tsx:154
-#: src/components/moderation/AppealForm.tsx:155
+#: src/components/ageAssurance/AgeAssuranceAppealDialog.tsx:124
+#: src/components/ageAssurance/AgeAssuranceAppealDialog.tsx:130
+#: src/components/moderation/AppealForm.tsx:165
+#: src/components/moderation/AppealForm.tsx:166
 #: src/components/SendErrorReportDialog.tsx:90
 #: src/components/SendErrorReportDialog.tsx:95
+#: src/features/liveNow/components/GoLiveDisabledDialog.tsx:138
 #: src/features/liveNow/components/GoLiveDisabledDialog.tsx:139
-#: src/features/liveNow/components/GoLiveDisabledDialog.tsx:140
+#: src/screens/Messages/components/ChatDisabled.tsx:173
 #: src/screens/Messages/components/ChatDisabled.tsx:175
-#: src/screens/Messages/components/ChatDisabled.tsx:177
 #: src/screens/Settings/components/BetaFeaturesFeedbackDialog.tsx:133
 msgid "Submit"
 msgstr ""
 
-#: src/screens/Takendown.tsx:76
+#: src/screens/Takendown.tsx:74
 msgid "Submit appeal"
 msgstr ""
 
-#: src/screens/Takendown.tsx:80
+#: src/screens/Takendown.tsx:78
 msgid "Submit Appeal"
 msgstr ""
 
@@ -11914,13 +11914,13 @@ msgstr ""
 msgid "Submit feedback"
 msgstr "Submit feedback"
 
-#: src/components/moderation/ReportDialog/index.tsx:585
-#: src/components/moderation/ReportDialog/index.tsx:658
-#: src/components/moderation/ReportDialog/index.tsx:665
+#: src/components/moderation/ReportDialog/index.tsx:586
+#: src/components/moderation/ReportDialog/index.tsx:659
+#: src/components/moderation/ReportDialog/index.tsx:666
 msgid "Submit report"
 msgstr ""
 
-#: src/components/moderation/ReportDialog/index.tsx:941
+#: src/components/moderation/ReportDialog/index.tsx:942
 msgctxt "english-only-resource"
 msgid "Submit your report through the Report non-consensual intimate imagery (NCII) form"
 msgstr "Submit your report through the Report non-consensual intimate imagery (NCII) form"
@@ -11930,13 +11930,13 @@ msgid "Subscribe"
 msgstr ""
 
 #. placeholder {0}: highlightedPublisher.name
-#: src/components/Post/Embed/StandardSiteEmbed/index.tsx:447
-#: src/components/Post/Embed/StandardSiteEmbed/index.tsx:476
+#: src/components/Post/Embed/StandardSiteEmbed/index.tsx:446
+#: src/components/Post/Embed/StandardSiteEmbed/index.tsx:475
 msgid "Subscribe on {0}"
 msgstr "Subscribe on {0}"
 
 #. placeholder {0}: highlightedPublisher.name
-#: src/components/Post/Embed/StandardSiteEmbed/index.tsx:475
+#: src/components/Post/Embed/StandardSiteEmbed/index.tsx:474
 msgid "Subscribe to {publicationTitle} on {0}"
 msgstr "Subscribe to {publicationTitle} on {0}"
 
@@ -11945,15 +11945,15 @@ msgstr "Subscribe to {publicationTitle} on {0}"
 msgid "Subscribe to @{0} to use these labels:"
 msgstr ""
 
-#: src/components/activity-notifications/SubscribeProfileDialog.tsx:252
+#: src/components/activity-notifications/SubscribeProfileDialog.tsx:249
 msgid "Subscribe to account activity"
 msgstr ""
 
-#: src/screens/Profile/Header/ProfileHeaderLabeler.tsx:356
+#: src/screens/Profile/Header/ProfileHeaderLabeler.tsx:352
 msgid "Subscribe to Labeler"
 msgstr ""
 
-#: src/screens/Profile/Header/ProfileHeaderLabeler.tsx:322
+#: src/screens/Profile/Header/ProfileHeaderLabeler.tsx:318
 msgid "Subscribe to this labeler"
 msgstr ""
 
@@ -11966,12 +11966,12 @@ msgstr ""
 msgid "Success"
 msgstr ""
 
-#: src/components/ageAssurance/AgeAssuranceInitDialog.tsx:183
+#: src/components/ageAssurance/AgeAssuranceInitDialog.tsx:192
 #: src/components/dialogs/EmailDialog/screens/Update.tsx:282
 msgid "Success!"
 msgstr ""
 
-#: src/components/intents/GroupChatJoinDialog.tsx:131
+#: src/components/intents/GroupChatJoinDialog.tsx:129
 msgid "Successfully joined the group chat!"
 msgstr "Successfully joined the group chat!"
 
@@ -11984,13 +11984,13 @@ msgstr ""
 msgid "Suggested"
 msgstr "Suggested"
 
-#: src/screens/Search/Explore.tsx:369
+#: src/screens/Search/Explore.tsx:365
 msgid "Suggested accounts"
 msgstr ""
 
 #. Accounts suggested to the user for them to follow
 #: src/components/FeedInterstitials.tsx:472
-#: src/screens/Onboarding/StepSuggestedAccounts/index.tsx:182
+#: src/screens/Onboarding/StepSuggestedAccounts/index.tsx:186
 msgid "Suggested for you"
 msgstr ""
 
@@ -12023,21 +12023,21 @@ msgstr ""
 msgid "Support for this feature in your country has not been enabled yet! Please check back later."
 msgstr ""
 
-#: src/components/dms/dialogs/NewChatDialog.tsx:98
-#: src/components/dms/dialogs/ShareViaChatDialog.tsx:114
+#: src/components/dms/dialogs/NewChatDialog.tsx:93
+#: src/components/dms/dialogs/ShareViaChatDialog.tsx:109
 msgid "Suspended accounts cannot participate in a group chat."
 msgstr "Suspended accounts cannot participate in a group chat."
 
-#: src/components/dms/dialogs/NewChatDialog.tsx:60
-#: src/components/dms/dialogs/ShareViaChatDialog.tsx:75
+#: src/components/dms/dialogs/NewChatDialog.tsx:58
+#: src/components/dms/dialogs/ShareViaChatDialog.tsx:73
 msgid "Suspended accounts cannot participate in chat."
 msgstr "Suspended accounts cannot participate in chat."
 
 #: src/components/dialogs/SwitchAccount.tsx:47
 #: src/components/dialogs/SwitchAccount.tsx:50
-#: src/screens/Settings/Settings.tsx:124
-#: src/screens/Settings/Settings.tsx:136
-#: src/screens/Settings/Settings.tsx:634
+#: src/screens/Settings/Settings.tsx:126
+#: src/screens/Settings/Settings.tsx:138
+#: src/screens/Settings/Settings.tsx:636
 #: src/view/shell/desktop/LeftNav.tsx:262
 msgid "Switch account"
 msgstr ""
@@ -12051,8 +12051,8 @@ msgstr ""
 msgid "Switch to {0}"
 msgstr ""
 
-#: src/components/dialogs/Embed.tsx:154
-#: src/components/dialogs/Embed.tsx:156
+#: src/components/dialogs/Embed.tsx:155
+#: src/components/dialogs/Embed.tsx:157
 #: src/screens/Settings/AppearanceSettings.tsx:83
 #: src/screens/Settings/AppearanceSettings.tsx:133
 msgid "System"
@@ -12061,11 +12061,11 @@ msgstr ""
 #: src/screens/Log.tsx:49
 #: src/screens/Settings/AboutSettings.tsx:117
 #: src/screens/Settings/AboutSettings.tsx:120
-#: src/screens/Settings/Settings.tsx:460
+#: src/screens/Settings/Settings.tsx:462
 msgid "System log"
 msgstr ""
 
-#: src/components/dialogs/MutedWords.tsx:291
+#: src/components/dialogs/MutedWords.tsx:293
 msgid "Tags only"
 msgstr ""
 
@@ -12077,7 +12077,7 @@ msgstr "Take the conversation private."
 msgid "Tap below to allow Bluesky to access your GPS location. We will then use that data to more accurately determine the content and features available in your region."
 msgstr ""
 
-#: src/components/dms/MessageItem.tsx:682
+#: src/components/dms/MessageItem.tsx:697
 msgid "Tap for details"
 msgstr "Tap for details"
 
@@ -12104,7 +12104,7 @@ msgstr ""
 msgid "Tap to close context menu"
 msgstr ""
 
-#: src/components/dms/ChatInvite/Root.tsx:92
+#: src/components/dms/ChatInvite/Root.tsx:93
 msgid "Tap to copy this invite link"
 msgstr "Tap to copy this invite link"
 
@@ -12112,12 +12112,12 @@ msgstr "Tap to copy this invite link"
 msgid "Tap to dismiss"
 msgstr ""
 
-#: src/components/dms/ChatInvite/Root.tsx:140
-#: src/components/intents/GroupChatJoinDialog.tsx:469
+#: src/components/dms/ChatInvite/Root.tsx:141
+#: src/components/intents/GroupChatJoinDialog.tsx:474
 msgid "Tap to join this group chat immediately"
 msgstr "Tap to join this group chat immediately"
 
-#: src/components/dms/ChatInvite/Root.tsx:105
+#: src/components/dms/ChatInvite/Root.tsx:106
 msgid "Tap to open this group chat"
 msgstr "Tap to open this group chat"
 
@@ -12130,12 +12130,12 @@ msgstr "Tap to remove"
 msgid "Tap to remove your {0} reaction"
 msgstr "Tap to remove your {0} reaction"
 
-#: src/components/dms/ChatInvite/Root.tsx:139
-#: src/components/intents/GroupChatJoinDialog.tsx:468
+#: src/components/dms/ChatInvite/Root.tsx:140
+#: src/components/intents/GroupChatJoinDialog.tsx:473
 msgid "Tap to request access to join this group chat"
 msgstr "Tap to request access to join this group chat"
 
-#: src/components/dms/MessageItem.tsx:647
+#: src/components/dms/MessageItem.tsx:662
 msgid "Tap to retry"
 msgstr "Tap to retry"
 
@@ -12148,11 +12148,11 @@ msgstr "Tap to show {0} reactions"
 msgid "Tap to show all reactions"
 msgstr "Tap to show all reactions"
 
-#: src/components/dms/MessageItem.tsx:394
+#: src/components/dms/MessageItem.tsx:406
 msgid "Tap to view reactions"
 msgstr "Tap to view reactions"
 
-#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:107
+#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:108
 msgid "Targeted harassment"
 msgstr ""
 
@@ -12180,7 +12180,7 @@ msgstr ""
 msgid "Tell us a little more"
 msgstr ""
 
-#: src/screens/Settings/components/DeleteAccountDialog.tsx:214
+#: src/screens/Settings/components/DeleteAccountDialog.tsx:220
 msgid "Temporarily deactivate your account"
 msgstr "Temporarily deactivate your account"
 
@@ -12201,13 +12201,13 @@ msgstr ""
 msgid "Terms of Service"
 msgstr ""
 
-#: src/components/dialogs/MutedWords.tsx:275
+#: src/components/dialogs/MutedWords.tsx:277
 msgid "Text & tags"
 msgstr ""
 
-#: src/components/moderation/AppealForm.tsx:118
-#: src/features/liveNow/components/GoLiveDisabledDialog.tsx:122
-#: src/screens/Messages/components/ChatDisabled.tsx:142
+#: src/components/moderation/AppealForm.tsx:129
+#: src/features/liveNow/components/GoLiveDisabledDialog.tsx:121
+#: src/screens/Messages/components/ChatDisabled.tsx:140
 msgid "Text input field"
 msgstr ""
 
@@ -12219,7 +12219,7 @@ msgstr ""
 msgid "Thanks for your feedback!"
 msgstr "Thanks for your feedback!"
 
-#: src/components/intents/VerifyEmailIntentDialog.tsx:77
+#: src/components/intents/VerifyEmailIntentDialog.tsx:78
 msgid "Thanks, you have successfully verified your email address. You can close this dialog."
 msgstr ""
 
@@ -12232,12 +12232,12 @@ msgstr ""
 msgid "That contains the following:"
 msgstr ""
 
-#: src/screens/StarterPack/StarterPackScreen.tsx:115
-#: src/screens/StarterPack/StarterPackScreen.tsx:116
-#: src/screens/StarterPack/StarterPackScreen.tsx:160
-#: src/screens/StarterPack/StarterPackScreen.tsx:161
-#: src/screens/StarterPack/Wizard/index.tsx:116
-#: src/screens/StarterPack/Wizard/index.tsx:126
+#: src/screens/StarterPack/StarterPackScreen.tsx:112
+#: src/screens/StarterPack/StarterPackScreen.tsx:113
+#: src/screens/StarterPack/StarterPackScreen.tsx:157
+#: src/screens/StarterPack/StarterPackScreen.tsx:158
+#: src/screens/StarterPack/Wizard/index.tsx:112
+#: src/screens/StarterPack/Wizard/index.tsx:122
 msgid "That starter pack could not be found."
 msgstr ""
 
@@ -12245,15 +12245,15 @@ msgstr ""
 msgid "That username is already taken"
 msgstr ""
 
-#: src/view/com/post-thread/PostQuotes.tsx:142
+#: src/view/com/post-thread/PostQuotes.tsx:135
 msgid "That's all, folks!"
 msgstr ""
 
-#: src/screens/VideoFeed/index.tsx:1234
+#: src/screens/VideoFeed/index.tsx:1230
 msgid "That's everything!"
 msgstr ""
 
-#: src/components/moderation/BlockDialog.tsx:153
+#: src/components/moderation/BlockDialog.tsx:150
 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:184
 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:422
 msgid "The account will be able to interact with you after unblocking."
@@ -12265,7 +12265,7 @@ msgid "The app will be restarted"
 msgstr ""
 
 #: src/components/moderation/ModerationDetailsDialog.tsx:139
-#: src/lib/moderation/useModerationCauseDescription.ts:129
+#: src/lib/moderation/useModerationCauseDescription.ts:126
 msgid "The author of this thread has hidden this reply."
 msgstr ""
 
@@ -12293,7 +12293,7 @@ msgstr ""
 msgid "The Discover feed now knows what you like"
 msgstr ""
 
-#: src/screens/StarterPack/StarterPackLandingScreen.tsx:332
+#: src/screens/StarterPack/StarterPackLandingScreen.tsx:324
 msgid "The experience is better in the app. Download Bluesky now and we'll pick back up where you left off."
 msgstr ""
 
@@ -12313,7 +12313,7 @@ msgstr ""
 msgid "The following services are enabled for your account: {allowedServices}"
 msgstr ""
 
-#: src/screens/ModerationInteractionSettings/index.tsx:43
+#: src/screens/ModerationInteractionSettings/index.tsx:44
 msgid "The following settings will be used as your defaults when creating new posts. You can edit these for a specific post from the composer."
 msgstr ""
 
@@ -12321,12 +12321,12 @@ msgstr ""
 msgid "The laws in your region require you to verify you're an adult to access certain features. Tap to learn more."
 msgstr ""
 
-#: src/components/intents/GroupChatJoinDialog.tsx:165
-#: src/screens/Messages/JoinRequests.tsx:205
+#: src/components/intents/GroupChatJoinDialog.tsx:163
+#: src/screens/Messages/JoinRequests.tsx:199
 msgid "The member limit has been reached."
 msgstr "The member limit has been reached."
 
-#: src/components/moderation/ReportDialog/index.tsx:314
+#: src/components/moderation/ReportDialog/index.tsx:315
 msgid "The moderation service is temporarily unavailable. Please try again later."
 msgstr "The moderation service is temporarily unavailable. Please try again later."
 
@@ -12338,41 +12338,41 @@ msgstr "The post you’re replying to was marked as being written in {suggestedL
 msgid "The Privacy Policy has been moved to <0/>"
 msgstr ""
 
-#: src/view/com/composer/state/video.ts:493
+#: src/view/com/composer/state/video.ts:498
 msgid "The processed video is too large. Please try again with a smaller file."
 msgstr "The processed video is too large. Please try again with a smaller file."
 
-#: src/view/com/composer/state/video.ts:468
+#: src/view/com/composer/state/video.ts:473
 msgid "The selected video could not be encoded."
 msgstr "The selected video could not be encoded."
 
-#: src/view/com/composer/state/video.ts:458
+#: src/view/com/composer/state/video.ts:463
 msgid "The selected video could not be processed."
 msgstr "The selected video could not be processed."
 
-#: src/view/com/composer/state/video.ts:488
+#: src/view/com/composer/state/video.ts:493
 msgid "The selected video has an unsupported aspect ratio."
 msgstr "The selected video has an unsupported aspect ratio."
 
-#: src/view/com/composer/state/video.ts:504
-#: src/view/com/composer/state/video.ts:543
+#: src/view/com/composer/state/video.ts:509
+#: src/view/com/composer/state/video.ts:548
 msgid "The selected video is larger than {VIDEO_MAX_SIZE_MB} MB. Please try again with a smaller file."
 msgstr "The selected video is larger than {VIDEO_MAX_SIZE_MB} MB. Please try again with a smaller file."
 
-#: src/view/com/composer/state/video.ts:486
+#: src/view/com/composer/state/video.ts:491
 msgid "The selected video is too long."
 msgstr "The selected video is too long."
 
-#: src/view/com/composer/state/video.ts:490
+#: src/view/com/composer/state/video.ts:495
 msgid "The selected video uses an unsupported format."
 msgstr "The selected video uses an unsupported format."
 
 #: src/lib/hooks/useCleanError.ts:41
-#: src/lib/strings/errors.ts:18
+#: src/lib/strings/errors.ts:53
 msgid "The server appears to be experiencing issues. Please try again in a few moments."
 msgstr ""
 
-#: src/screens/StarterPack/StarterPackScreen.tsx:775
+#: src/screens/StarterPack/StarterPackScreen.tsx:768
 msgid "The starter pack that you are trying to view is invalid. You may delete this starter pack instead."
 msgstr ""
 
@@ -12388,17 +12388,17 @@ msgstr ""
 msgid "The Terms of Service have been moved to"
 msgstr ""
 
-#: src/components/intents/VerifyEmailIntentDialog.tsx:89
+#: src/components/intents/VerifyEmailIntentDialog.tsx:90
 msgid "The verification code you have provided is invalid. Please make sure that you have used the correct verification link or request a new one."
 msgstr ""
 
 #: src/components/contacts/screens/PhoneInput.tsx:115
-#: src/components/contacts/screens/VerifyNumber.tsx:113
-#: src/components/contacts/screens/VerifyNumber.tsx:165
+#: src/components/contacts/screens/VerifyNumber.tsx:118
+#: src/components/contacts/screens/VerifyNumber.tsx:170
 msgid "The verification provider was unable to send a code to your phone number. Please check your phone number and try again."
 msgstr ""
 
-#: src/view/com/composer/state/video.ts:471
+#: src/view/com/composer/state/video.ts:476
 msgid "The video could not be uploaded to your hosting provider. Please try again."
 msgstr "The video could not be uploaded to your hosting provider. Please try again."
 
@@ -12410,11 +12410,11 @@ msgstr ""
 msgid "There is a limit to how often you can change your birthdate. You may need to wait a day or two before updating it again."
 msgstr ""
 
-#: src/screens/Messages/components/InviteLinkDialog.tsx:519
+#: src/screens/Messages/components/InviteLinkDialog.tsx:516
 msgid "There is no invite link for this group chat."
 msgstr "There is no invite link for this group chat."
 
-#: src/screens/Settings/components/DeactivateAccountDialog.tsx:86
+#: src/screens/Settings/components/DeactivateAccountDialog.tsx:87
 msgid "There is no time limit for account deactivation, come back any time."
 msgstr ""
 
@@ -12423,23 +12423,23 @@ msgstr ""
 msgid "There was a problem loading GIFs. Check your connection and try again."
 msgstr "There was a problem loading GIFs. Check your connection and try again."
 
-#: src/components/contacts/screens/GetContacts.tsx:147
-#: src/components/intents/GroupChatJoinDialog.tsx:149
-#: src/components/intents/GroupChatJoinDialog.tsx:195
-#: src/screens/Messages/components/OutgoingRequestListItem.tsx:36
+#: src/components/contacts/screens/GetContacts.tsx:148
+#: src/components/intents/GroupChatJoinDialog.tsx:147
+#: src/components/intents/GroupChatJoinDialog.tsx:200
+#: src/screens/Messages/components/OutgoingRequestListItem.tsx:34
 msgid "There was a problem with your internet connection, please try again"
 msgstr ""
 
 #: src/screens/CustomFeed/components/CustomFeedHeader.tsx:184
-#: src/screens/ProfileList/components/Header.tsx:91
-#: src/screens/ProfileList/components/MoreOptionsMenu.tsx:79
+#: src/screens/ProfileList/components/Header.tsx:92
+#: src/screens/ProfileList/components/MoreOptionsMenu.tsx:80
 #: src/screens/SavedFeeds.tsx:99
 #: src/screens/SavedFeeds.tsx:278
 msgid "There was an issue contacting the server"
 msgstr ""
 
 #: src/screens/CustomFeed/components/CustomFeedHeader.tsx:467
-#: src/screens/Profile/Header/ProfileHeaderLabeler.tsx:101
+#: src/screens/Profile/Header/ProfileHeaderLabeler.tsx:97
 msgid "There was an issue contacting the server, please check your internet connection and try again."
 msgstr ""
 
@@ -12447,8 +12447,8 @@ msgstr ""
 msgid "There was an issue fetching notifications. Tap here to try again."
 msgstr ""
 
-#: src/screens/Search/Explore.tsx:1015
-#: src/view/com/posts/PostFeed.tsx:834
+#: src/screens/Search/Explore.tsx:1011
+#: src/view/com/posts/PostFeed.tsx:828
 msgid "There was an issue fetching posts. Tap here to try again."
 msgstr ""
 
@@ -12469,7 +12469,7 @@ msgstr ""
 msgid "There was an issue fetching your service info"
 msgstr ""
 
-#: src/view/com/posts/PostFeedErrorMessage.tsx:153
+#: src/view/com/posts/PostFeedErrorMessage.tsx:151
 msgid "There was an issue removing this feed. Please check your internet connection and try again."
 msgstr ""
 
@@ -12480,9 +12480,9 @@ msgid "There was an issue updating your feeds, please check your internet connec
 msgstr ""
 
 #. placeholder {0}: e.toString()
-#: src/components/PostControls/PostMenu/PostMenuItems.tsx:432
-#: src/components/PostControls/PostMenu/PostMenuItems.tsx:455
-#: src/components/PostControls/PostMenu/PostMenuItems.tsx:475
+#: src/components/PostControls/PostMenu/PostMenuItems.tsx:428
+#: src/components/PostControls/PostMenu/PostMenuItems.tsx:451
+#: src/components/PostControls/PostMenu/PostMenuItems.tsx:471
 #: src/screens/Messages/ConversationSettings/Member.tsx:71
 #: src/screens/Messages/ConversationSettings/MemberMenu.tsx:114
 #: src/screens/Messages/ConversationSettings/MemberMenu.tsx:127
@@ -12503,14 +12503,14 @@ msgstr ""
 msgid "There was an issue! {0}"
 msgstr ""
 
-#: src/components/dialogs/PostInteractionSettingsDialog.tsx:241
+#: src/components/dialogs/PostInteractionSettingsDialog.tsx:238
 #: src/screens/List/ListHiddenScreen.tsx:67
 #: src/screens/List/ListHiddenScreen.tsx:81
 #: src/screens/List/ListHiddenScreen.tsx:103
-#: src/screens/ProfileList/components/Header.tsx:106
-#: src/screens/ProfileList/components/Header.tsx:120
-#: src/screens/ProfileList/components/MoreOptionsMenu.tsx:121
-#: src/screens/ProfileList/components/MoreOptionsMenu.tsx:135
+#: src/screens/ProfileList/components/Header.tsx:107
+#: src/screens/ProfileList/components/Header.tsx:121
+#: src/screens/ProfileList/components/MoreOptionsMenu.tsx:122
+#: src/screens/ProfileList/components/MoreOptionsMenu.tsx:136
 #: src/screens/ProfileList/components/SubscribeMenu.tsx:38
 #: src/screens/ProfileList/components/SubscribeMenu.tsx:53
 msgid "There was an issue. Please check your internet connection and try again."
@@ -12523,11 +12523,11 @@ msgstr ""
 msgid "There was an unexpected issue in the application. Please let us know if this happened to you!"
 msgstr ""
 
-#: src/screens/SignupQueued.tsx:133
+#: src/screens/SignupQueued.tsx:140
 msgid "There's been a rush of new users to Bluesky! We'll activate your account as soon as we can."
 msgstr ""
 
-#: src/components/dialogs/PostInteractionSettingsDialog.tsx:660
+#: src/components/dialogs/PostInteractionSettingsDialog.tsx:657
 msgid "These are your default settings"
 msgstr ""
 
@@ -12550,7 +12550,7 @@ msgstr ""
 msgid "These URLs"
 msgstr "These URLs"
 
-#: src/components/moderation/BlockDialog.tsx:353
+#: src/components/moderation/BlockDialog.tsx:354
 msgid "They own this chat"
 msgstr "They own this chat"
 
@@ -12590,12 +12590,12 @@ msgstr ""
 msgid "This app is running a deployment of <0>{currentChannel}</0>. Restore the {defaultChannel} deployment to get back to a standard build."
 msgstr "This app is running a deployment of <0>{currentChannel}</0>. Restore the {defaultChannel} deployment to get back to a standard build."
 
-#: src/components/moderation/AppealForm.tsx:96
+#: src/components/moderation/AppealForm.tsx:107
 msgid "This appeal will be sent to <0>{sourceName}</0>."
 msgstr ""
 
-#: src/features/liveNow/components/GoLiveDisabledDialog.tsx:114
-#: src/screens/Messages/components/ChatDisabled.tsx:138
+#: src/features/liveNow/components/GoLiveDisabledDialog.tsx:113
+#: src/screens/Messages/components/ChatDisabled.tsx:136
 msgid "This appeal will be sent to Bluesky's moderation service."
 msgstr ""
 
@@ -12604,7 +12604,7 @@ msgstr ""
 msgid "This author has chosen to make their posts visible only to people who are signed in."
 msgstr ""
 
-#: src/screens/Profile/components/GermButton.tsx:244
+#: src/screens/Profile/components/GermButton.tsx:245
 msgid "This button lets others open the Germ DM app to send you a message. You can manage its visibility from the Germ DM app, or you can disconnect your Bluesky account from Germ DM altogether by clicking the button below."
 msgstr ""
 
@@ -12612,18 +12612,18 @@ msgstr ""
 msgid "This chat has ended"
 msgstr "This chat has ended"
 
-#: src/components/dms/ChatInvite/Root.tsx:122
-#: src/components/intents/GroupChatJoinDialog.tsx:301
+#: src/components/dms/ChatInvite/Root.tsx:123
+#: src/components/intents/GroupChatJoinDialog.tsx:306
 msgid "This chat is full"
 msgstr "This chat is full"
 
-#: src/screens/Messages/components/ChatListItem.tsx:376
-#: src/screens/Messages/components/ChatLocked.tsx:69
+#: src/screens/Messages/components/ChatListItem.tsx:391
+#: src/screens/Messages/components/ChatLocked.tsx:73
 msgid "This chat is locked"
 msgstr "This chat is locked"
 
-#: src/screens/Messages/components/ChatLocked.tsx:45
-#: src/screens/Messages/ConversationSettings/index.tsx:437
+#: src/screens/Messages/components/ChatLocked.tsx:49
+#: src/screens/Messages/ConversationSettings/index.tsx:432
 msgid "This chat is locked by a moderation action"
 msgstr "This chat is locked by a moderation action"
 
@@ -12631,11 +12631,11 @@ msgstr "This chat is locked by a moderation action"
 msgid "This chat was disconnected"
 msgstr ""
 
-#: src/components/contacts/screens/VerifyNumber.tsx:106
+#: src/components/contacts/screens/VerifyNumber.tsx:110
 msgid "This code is invalid. Resend to get a new code."
 msgstr ""
 
-#: src/screens/Settings/components/ChangePasswordDialog.tsx:145
+#: src/screens/Settings/components/ChangePasswordDialog.tsx:149
 msgid "This confirmation code is not valid. Please try again."
 msgstr ""
 
@@ -12653,11 +12653,11 @@ msgid "This content is hosted by {0}. Do you want to enable external media?"
 msgstr ""
 
 #: src/components/moderation/ModerationDetailsDialog.tsx:104
-#: src/lib/moderation/useModerationCauseDescription.ts:85
+#: src/lib/moderation/useModerationCauseDescription.ts:82
 msgid "This content is not available because one of the users involved has blocked the other."
 msgstr ""
 
-#: src/view/com/posts/PostFeedErrorMessage.tsx:122
+#: src/view/com/posts/PostFeedErrorMessage.tsx:120
 msgid "This content is not viewable without a Bluesky account."
 msgstr ""
 
@@ -12686,7 +12686,7 @@ msgstr "This exact phrase"
 msgid "This feature allows users to receive notifications for your new posts and replies. Who do you want to enable this for?"
 msgstr ""
 
-#: src/screens/Settings/components/ExportCarDialog.tsx:166
+#: src/screens/Settings/components/ExportCarDialog.tsx:172
 msgid "This feature is in beta. You can read more about repository exports in <0>this blogpost</0>."
 msgstr ""
 
@@ -12694,11 +12694,11 @@ msgstr ""
 msgid "This feature is not available while using an app password. Please sign in with your main password."
 msgstr ""
 
-#: src/lib/strings/errors.ts:30
+#: src/lib/strings/errors.ts:65
 msgid "This feature is not available while using an App Password. Please sign in with your main password."
 msgstr ""
 
-#: src/view/com/posts/PostFeedErrorMessage.tsx:128
+#: src/view/com/posts/PostFeedErrorMessage.tsx:126
 msgid "This feed is currently receiving high traffic and is temporarily unavailable. Please try again later."
 msgstr ""
 
@@ -12716,7 +12716,7 @@ msgstr ""
 msgid "This feed is no longer online. We are showing <0>Discover</0> instead."
 msgstr ""
 
-#: src/screens/Messages/components/ChatLocked.tsx:72
+#: src/screens/Messages/components/ChatLocked.tsx:76
 msgid "This group is locked by a moderation action on the owner"
 msgstr "This group is locked by a moderation action on the owner"
 
@@ -12732,11 +12732,11 @@ msgstr "This image could not be used. Try a different format like .jpg or .png."
 msgid "This information is private and not shared with other users."
 msgstr ""
 
-#: src/components/intents/GroupChatJoinDialog.tsx:161
+#: src/components/intents/GroupChatJoinDialog.tsx:160
 msgid "This invite link has been disabled."
 msgstr "This invite link has been disabled."
 
-#: src/components/intents/GroupChatJoinDialog.tsx:236
+#: src/components/intents/GroupChatJoinDialog.tsx:241
 msgid "This invite link is invalid"
 msgstr "This invite link is invalid"
 
@@ -12744,12 +12744,12 @@ msgstr "This invite link is invalid"
 msgid "This is just a one-time security check, since we haven't seen this account on this device before."
 msgstr "This is just a one-time security check, since we haven't seen this account on this device before."
 
-#: src/features/liveNow/components/EditLiveDialog.tsx:171
+#: src/features/liveNow/components/EditLiveDialog.tsx:173
 #: src/features/liveNow/components/GoLiveDialog.tsx:161
 msgid "This is not a valid link"
 msgstr ""
 
-#: src/screens/Settings/AutomationLabelSettings.tsx:173
+#: src/screens/Settings/AutomationLabelSettings.tsx:172
 msgid "This label lets the world know that this account is automated. If turned on, this label appears next to the account's name on their profile and posts. It can be turned on or off at any time."
 msgstr "This label lets the world know that this account is automated. If turned on, this label appears next to the account's name on their profile and posts. It can be turned on or off at any time."
 
@@ -12787,21 +12787,21 @@ msgstr ""
 msgid "This list is empty."
 msgstr ""
 
-#: src/screens/Messages/components/ChatListItem.tsx:335
+#: src/screens/Messages/components/ChatListItem.tsx:340
 msgid "This message is hidden"
 msgstr "This message is hidden"
 
-#: src/components/dms/MessageItem.tsx:680
-#: src/components/dms/MessageItem.tsx:709
+#: src/components/dms/MessageItem.tsx:695
+#: src/components/dms/MessageItem.tsx:724
 msgid "This message is hidden because this user is blocking you."
 msgstr "This message is hidden because this user is blocking you."
 
-#: src/components/dms/MessageItem.tsx:679
-#: src/components/dms/MessageItem.tsx:705
+#: src/components/dms/MessageItem.tsx:694
+#: src/components/dms/MessageItem.tsx:720
 msgid "This message is hidden because you are blocking this user."
 msgstr "This message is hidden because you are blocking this user."
 
-#: src/components/moderation/ReportDialog/index.tsx:312
+#: src/components/moderation/ReportDialog/index.tsx:313
 msgid "This moderation service does not support that report reason. Please choose a different reason or moderation service."
 msgstr "This moderation service does not support that report reason. Please choose a different reason or moderation service."
 
@@ -12815,11 +12815,11 @@ msgstr "This person is blocking you"
 
 #. placeholder {0}: niceDate(i18n, createdAt)
 #. placeholder {1}: niceDate(i18n, indexedAt)
-#: src/screens/PostThread/components/ThreadItemAnchor.tsx:639
+#: src/screens/PostThread/components/ThreadItemAnchor.tsx:636
 msgid "This post claims to have been created on <0>{0}</0>, but was first seen by Bluesky on <1>{1}</1>."
 msgstr ""
 
-#: src/components/WhoCanReply.tsx:274
+#: src/components/WhoCanReply.tsx:267
 msgid "This post has an unknown type of threadgate on it. Your app may be out of date."
 msgstr ""
 
@@ -12827,15 +12827,15 @@ msgstr ""
 msgid "This post is only visible to logged-in users."
 msgstr ""
 
-#: src/screens/Bookmarks.tsx:248
+#: src/screens/Bookmarks.tsx:246
 msgid "This post was deleted by its author"
 msgstr ""
 
-#: src/components/PostControls/PostMenu/PostMenuItems.tsx:834
+#: src/components/PostControls/PostMenu/PostMenuItems.tsx:830
 msgid "This post will be hidden from feeds and threads. This cannot be undone."
 msgstr ""
 
-#: src/view/com/composer/Composer.tsx:1155
+#: src/view/com/composer/Composer.tsx:1177
 msgid "This post's author has disabled quote posts."
 msgstr ""
 
@@ -12843,12 +12843,12 @@ msgstr ""
 msgid "This profile is only visible to logged-in users. It won't be visible to people who aren't signed in."
 msgstr ""
 
-#: src/components/PostControls/PostMenu/PostMenuItems.tsx:869
+#: src/components/PostControls/PostMenu/PostMenuItems.tsx:865
 msgid "This reply will be sorted into a hidden section at the bottom of your thread and will mute notifications for subsequent replies - both for yourself and others."
 msgstr ""
 
-#: src/screens/Messages/ConversationSettings/index.tsx:156
-#: src/screens/Messages/JoinRequests.tsx:111
+#: src/screens/Messages/ConversationSettings/index.tsx:153
+#: src/screens/Messages/JoinRequests.tsx:108
 msgid "This screen is only available for group conversations."
 msgstr "This screen is only available for group conversations."
 
@@ -12856,7 +12856,7 @@ msgstr "This screen is only available for group conversations."
 msgid "This service has not provided terms of service or a privacy policy."
 msgstr ""
 
-#: src/features/liveNow/index.tsx:209
+#: src/features/liveNow/index.tsx:204
 msgid "This service is not supported while the Live feature is in beta. Allowed services: {formatted}."
 msgstr ""
 
@@ -12864,7 +12864,7 @@ msgstr ""
 msgid "This should create a domain record at:"
 msgstr ""
 
-#: src/components/ageAssurance/AgeAssuranceInitDialog.tsx:214
+#: src/components/ageAssurance/AgeAssuranceInitDialog.tsx:223
 msgid "This should only take a few minutes."
 msgstr ""
 
@@ -12876,18 +12876,18 @@ msgstr ""
 msgid "This user doesn't have any followers."
 msgstr ""
 
-#: src/components/dms/dialogs/NewChatDialog.tsx:64
-#: src/components/dms/dialogs/ShareViaChatDialog.tsx:79
+#: src/components/dms/dialogs/NewChatDialog.tsx:61
+#: src/components/dms/dialogs/ShareViaChatDialog.tsx:76
 msgid "This user has blocked you and cannot be messaged."
 msgstr "This user has blocked you and cannot be messaged."
 
 #: src/components/moderation/ModerationDetailsDialog.tsx:99
-#: src/lib/moderation/useModerationCauseDescription.ts:76
+#: src/lib/moderation/useModerationCauseDescription.ts:73
 msgid "This user has blocked you. You cannot view their content."
 msgstr ""
 
-#: src/components/dms/dialogs/NewChatDialog.tsx:68
-#: src/components/dms/dialogs/ShareViaChatDialog.tsx:83
+#: src/components/dms/dialogs/NewChatDialog.tsx:64
+#: src/components/dms/dialogs/ShareViaChatDialog.tsx:79
 msgid "This user has disabled chat and cannot be messaged."
 msgstr "This user has disabled chat and cannot be messaged."
 
@@ -12905,7 +12905,7 @@ msgstr ""
 msgid "This user is included in the <0>{0}</0> list which you have muted."
 msgstr ""
 
-#: src/components/NewskieDialog.tsx:49
+#: src/components/NewskieDialog.tsx:50
 msgid "This user is new here. Press for more info about when they joined."
 msgstr ""
 
@@ -12921,25 +12921,25 @@ msgstr "This video can’t be played on your device. Your browser or system may
 msgid "This video can’t be previewed in your browser. It will still be uploaded."
 msgstr "This video can’t be previewed in your browser. It will still be uploaded."
 
-#: src/components/dialogs/lists/CreateListFromStarterPackDialog.tsx:157
+#: src/components/dialogs/lists/CreateListFromStarterPackDialog.tsx:156
 msgid "This will create a new list with the same name, description, and members as this starter pack."
 msgstr ""
 
 #. placeholder {0}: word.value
-#: src/components/dialogs/MutedWords.tsx:454
+#: src/components/dialogs/MutedWords.tsx:456
 msgid "This will delete \"{0}\" from your muted words. You can always add it back later."
 msgstr ""
 
-#: src/screens/Settings/components/DeleteAccountDialog.tsx:330
+#: src/screens/Settings/components/DeleteAccountDialog.tsx:336
 msgid "This will irreversibly delete your Bluesky account <0>{currentHandle}</0> and all associated data. Note that this will affect any other <1>AT Protocol</1> services you use with this account."
 msgstr ""
 
 #. placeholder {0}: account.handle
-#: src/screens/Settings/Settings.tsx:688
+#: src/screens/Settings/Settings.tsx:690
 msgid "This will remove @{0} from the quick access list."
 msgstr ""
 
-#: src/components/PostControls/PostMenu/PostMenuItems.tsx:862
+#: src/components/PostControls/PostMenu/PostMenuItems.tsx:858
 msgid "This will remove your post from this quote post for all users, and replace it with a placeholder."
 msgstr ""
 
@@ -12971,7 +12971,7 @@ msgstr ""
 msgid "Threads Preferences"
 msgstr ""
 
-#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:134
+#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:135
 msgid "Threats or incitement"
 msgstr ""
 
@@ -12988,7 +12988,7 @@ msgstr "Title"
 msgid "Title (100 characters max)"
 msgstr "Title (100 characters max)"
 
-#: src/screens/Settings/components/DisableEmail2FADialog.tsx:100
+#: src/screens/Settings/components/DisableEmail2FADialog.tsx:108
 msgid "To disable the email 2FA method, please verify your access to the email address."
 msgstr ""
 
@@ -13014,21 +13014,21 @@ msgstr ""
 msgid "Toggles the sound"
 msgstr ""
 
-#: src/components/contacts/screens/VerifyNumber.tsx:123
+#: src/components/contacts/screens/VerifyNumber.tsx:127
 msgid "Too many attempts. Please wait a few minutes and try again."
 msgstr ""
 
-#: src/components/contacts/screens/VerifyNumber.tsx:176
+#: src/components/contacts/screens/VerifyNumber.tsx:179
 msgid "Too many codes sent. Please wait a few minutes and try again."
 msgstr ""
 
-#: src/components/contacts/screens/GetContacts.tsx:156
+#: src/components/contacts/screens/GetContacts.tsx:158
 msgid "Too many contacts - you've exceeded the number of contacts you can import to find your friends"
 msgstr ""
 
-#: src/screens/Hashtag.tsx:86
+#: src/screens/Hashtag.tsx:88
 #: src/screens/Search/SearchResults.tsx:83
-#: src/screens/Topic.tsx:58
+#: src/screens/Topic.tsx:60
 msgid "Top"
 msgstr ""
 
@@ -13043,25 +13043,25 @@ msgstr ""
 msgid "Topic"
 msgstr ""
 
-#: src/components/dms/MessageContextMenu.tsx:191
-#: src/components/dms/MessageContextMenu.tsx:194
-#: src/components/Post/Translated/index.tsx:150
-#: src/components/Post/Translated/index.tsx:157
-#: src/components/PostControls/PostMenu/PostMenuItems.tsx:564
-#: src/components/PostControls/PostMenu/PostMenuItems.tsx:570
+#: src/components/dms/MessageContextMenu.tsx:189
+#: src/components/dms/MessageContextMenu.tsx:192
+#: src/components/Post/Translated/index.tsx:147
+#: src/components/Post/Translated/index.tsx:154
+#: src/components/PostControls/PostMenu/PostMenuItems.tsx:560
+#: src/components/PostControls/PostMenu/PostMenuItems.tsx:566
 msgid "Translate"
 msgstr ""
 
-#: src/components/Post/Translated/index.tsx:326
+#: src/components/Post/Translated/index.tsx:323
 msgid "Translated"
 msgstr "Translated"
 
-#: src/components/Post/Translated/index.tsx:113
+#: src/components/Post/Translated/index.tsx:110
 msgid "Translating"
 msgstr "Translating"
 
-#: src/components/PostControls/PostMenu/PostMenuItems.tsx:545
-#: src/components/PostControls/PostMenu/PostMenuItems.tsx:547
+#: src/components/PostControls/PostMenu/PostMenuItems.tsx:541
+#: src/components/PostControls/PostMenu/PostMenuItems.tsx:543
 msgid "Translating…"
 msgstr "Translating…"
 
@@ -13074,8 +13074,8 @@ msgstr "Translation to the same language is unavailable on your device."
 msgid "Tree view"
 msgstr ""
 
-#: src/components/interstitials/FeedTrendingTopics.tsx:94
-#: src/screens/Search/modules/ExploreTrendingTopics.tsx:71
+#: src/components/interstitials/FeedTrendingTopics.tsx:95
+#: src/screens/Search/modules/ExploreTrendingTopics.tsx:69
 #: src/view/shell/desktop/SidebarTrendingTopics.tsx:63
 msgid "Trending"
 msgstr ""
@@ -13085,17 +13085,17 @@ msgstr ""
 msgid "Trending GIFs"
 msgstr "Trending GIFs"
 
-#: src/components/interstitials/FeedTrendingTopics.tsx:121
-#: src/screens/Search/modules/ExploreTrendingTopics.tsx:74
+#: src/components/interstitials/FeedTrendingTopics.tsx:122
+#: src/screens/Search/modules/ExploreTrendingTopics.tsx:72
 #: src/view/shell/desktop/SidebarTrendingTopics.tsx:90
 msgid "Trending options"
 msgstr ""
 
-#: src/components/interstitials/TrendingVideos.tsx:86
+#: src/components/interstitials/TrendingVideos.tsx:88
 msgid "Trending videos"
 msgstr "Trending videos"
 
-#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:103
+#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:104
 msgid "Trolling"
 msgstr ""
 
@@ -13125,8 +13125,8 @@ msgstr ""
 msgid "Try again in a moment."
 msgstr "Try again in a moment."
 
-#: src/components/Post/Translated/index.tsx:229
-#: src/components/Post/Translated/index.tsx:242
+#: src/components/Post/Translated/index.tsx:226
+#: src/components/Post/Translated/index.tsx:239
 msgid "Try Google Translate"
 msgstr "Try Google Translate"
 
@@ -13156,50 +13156,50 @@ msgid "Unable to access location. You'll need to visit your system settings to e
 msgstr ""
 
 #: src/lib/hooks/useCleanError.ts:30
-#: src/lib/strings/errors.ts:11
+#: src/lib/strings/errors.ts:40
 msgid "Unable to connect. Please check your internet connection and try again."
 msgstr ""
 
-#: src/screens/Settings/components/ChangePasswordDialog.tsx:96
-#: src/screens/Settings/components/ChangePasswordDialog.tsx:141
+#: src/screens/Settings/components/ChangePasswordDialog.tsx:98
+#: src/screens/Settings/components/ChangePasswordDialog.tsx:143
 msgid "Unable to contact your service. Please check your internet connection and try again."
 msgstr ""
 
-#: src/screens/Login/ForgotPasswordForm.tsx:66
+#: src/screens/Login/ForgotPasswordForm.tsx:70
 #: src/screens/Login/index.tsx:100
-#: src/screens/Login/LoginForm.tsx:169
-#: src/screens/Login/SetNewPasswordForm.tsx:77
+#: src/screens/Login/LoginForm.tsx:168
+#: src/screens/Login/SetNewPasswordForm.tsx:82
 #: src/screens/Signup/index.tsx:89
 msgid "Unable to contact your service. Please check your Internet connection."
 msgstr ""
 
-#: src/screens/StarterPack/StarterPackScreen.tsx:700
+#: src/screens/StarterPack/StarterPackScreen.tsx:693
 msgid "Unable to delete"
 msgstr ""
 
-#: src/screens/Messages/JoinRequests.tsx:351
+#: src/screens/Messages/JoinRequests.tsx:348
 msgid "Unable to fetch join requests."
 msgstr "Unable to fetch join requests."
 
-#: src/components/dms/dialogs/NewChatDialog.tsx:113
-#: src/components/dms/dialogs/ShareViaChatDialog.tsx:129
+#: src/components/dms/dialogs/NewChatDialog.tsx:105
+#: src/components/dms/dialogs/ShareViaChatDialog.tsx:121
 msgid "Unable to find a selected recipient."
 msgstr "Unable to find a selected recipient."
 
-#: src/components/dms/dialogs/NewChatDialog.tsx:77
-#: src/components/dms/dialogs/ShareViaChatDialog.tsx:92
+#: src/components/dms/dialogs/NewChatDialog.tsx:70
+#: src/components/dms/dialogs/ShareViaChatDialog.tsx:85
 msgid "Unable to find the selected recipient."
 msgstr "Unable to find the selected recipient."
 
-#: src/lib/strings/errors.ts:42
+#: src/lib/strings/errors.ts:77
 msgid "Unable to resolve handle"
 msgstr ""
 
-#: src/screens/Settings/Settings.tsx:534
+#: src/screens/Settings/Settings.tsx:536
 msgid "Unapply Pull Request"
 msgstr ""
 
-#: src/screens/Settings/Settings.tsx:536
+#: src/screens/Settings/Settings.tsx:538
 msgid "Unapply Pull Request {currentChannel}"
 msgstr ""
 
@@ -13211,18 +13211,18 @@ msgstr ""
 msgid "Unavailable feed information"
 msgstr ""
 
-#: src/components/dms/MessageItem.tsx:747
+#: src/components/dms/MessageItem.tsx:762
 #: src/components/dms/MessagesListBlockedFooter.tsx:97
 #: src/components/dms/MessagesListBlockedFooter.tsx:104
-#: src/components/moderation/BlockDialog.tsx:187
-#: src/components/moderation/BlockDialog.tsx:191
-#: src/components/moderation/BlockDialog.tsx:213
+#: src/components/moderation/BlockDialog.tsx:184
+#: src/components/moderation/BlockDialog.tsx:188
+#: src/components/moderation/BlockDialog.tsx:210
 #: src/screens/Messages/ConversationSettings/MemberMenu.tsx:227
 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:190
 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:365
 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:427
-#: src/screens/ProfileList/components/Header.tsx:166
-#: src/screens/ProfileList/components/Header.tsx:173
+#: src/screens/ProfileList/components/Header.tsx:167
+#: src/screens/ProfileList/components/Header.tsx:174
 msgid "Unblock"
 msgstr ""
 
@@ -13242,7 +13242,7 @@ msgstr "Unblock {displayName}"
 msgid "Unblock account"
 msgstr ""
 
-#: src/components/moderation/BlockDialog.tsx:146
+#: src/components/moderation/BlockDialog.tsx:143
 msgid "Unblock account?"
 msgstr "Unblock account?"
 
@@ -13251,8 +13251,8 @@ msgstr "Unblock account?"
 msgid "Unblock Account?"
 msgstr ""
 
-#: src/screens/ProfileList/components/MoreOptionsMenu.tsx:242
-#: src/screens/ProfileList/components/MoreOptionsMenu.tsx:245
+#: src/screens/ProfileList/components/MoreOptionsMenu.tsx:243
+#: src/screens/ProfileList/components/MoreOptionsMenu.tsx:246
 msgid "Unblock list"
 msgstr ""
 
@@ -13260,8 +13260,8 @@ msgstr ""
 #: src/features/liveEvents/components/DiscoverFeedLiveEventFeedsAndTrendingBanner.tsx:56
 #: src/features/liveEvents/components/SidebarLiveEventFeedsBanner.tsx:40
 #: src/features/liveEvents/components/SidebarLiveEventFeedsBanner.tsx:46
-#: src/screens/Profile/components/GermButton.tsx:186
 #: src/screens/Profile/components/GermButton.tsx:187
+#: src/screens/Profile/components/GermButton.tsx:188
 msgid "Undo"
 msgstr ""
 
@@ -13291,11 +13291,11 @@ msgstr ""
 msgid "Unfollow account"
 msgstr ""
 
-#: src/screens/VideoFeed/index.tsx:941
+#: src/screens/VideoFeed/index.tsx:937
 msgid "Unfollows the user"
 msgstr ""
 
-#: src/components/moderation/ReportDialog/index.tsx:569
+#: src/components/moderation/ReportDialog/index.tsx:570
 msgid "Unfortunately, none of your subscribed labelers supports this report type."
 msgstr ""
 
@@ -13311,11 +13311,11 @@ msgstr ""
 msgid "Unknown verifier"
 msgstr ""
 
-#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:72
+#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:73
 msgid "Unlabeled adult content"
 msgstr ""
 
-#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:68
+#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:69
 msgid "Unlabeled, abusive, or non-consensual adult content"
 msgstr ""
 
@@ -13325,20 +13325,20 @@ msgstr ""
 
 #. Accessibility label for the like button when the post has been liked, verb followed by number of likes and noun
 #. placeholder {0}: post.likeCount || 0
-#: src/components/PostControls/index.tsx:276
+#: src/components/PostControls/index.tsx:272
 msgid "Unlike ({0, plural, one {# like} other {# likes}})"
 msgstr ""
 
-#: src/screens/Messages/components/ChatLocked.tsx:91
+#: src/screens/Messages/components/ChatLocked.tsx:95
 msgid "Unlock chat"
 msgstr "Unlock chat"
 
-#: src/screens/Messages/ConversationSettings/index.tsx:568
+#: src/screens/Messages/ConversationSettings/index.tsx:563
 msgid "Unlock this group chat"
 msgstr "Unlock this group chat"
 
-#: src/screens/ProfileList/components/Header.tsx:180
-#: src/screens/ProfileList/components/Header.tsx:187
+#: src/screens/ProfileList/components/Header.tsx:181
+#: src/screens/ProfileList/components/Header.tsx:188
 msgid "Unmute"
 msgstr ""
 
@@ -13354,8 +13354,8 @@ msgstr ""
 msgid "Unmute {0}"
 msgstr "Unmute {0}"
 
-#: src/components/PostControls/PostMenu/PostMenuItems.tsx:754
-#: src/components/PostControls/PostMenu/PostMenuItems.tsx:760
+#: src/components/PostControls/PostMenu/PostMenuItems.tsx:750
+#: src/components/PostControls/PostMenu/PostMenuItems.tsx:756
 #: src/view/com/profile/ProfileMenu.tsx:511
 #: src/view/com/profile/ProfileMenu.tsx:517
 msgid "Unmute account"
@@ -13365,17 +13365,17 @@ msgstr ""
 msgid "Unmute conversation"
 msgstr ""
 
-#: src/screens/ProfileList/components/MoreOptionsMenu.tsx:252
-#: src/screens/ProfileList/components/MoreOptionsMenu.tsx:255
+#: src/screens/ProfileList/components/MoreOptionsMenu.tsx:253
+#: src/screens/ProfileList/components/MoreOptionsMenu.tsx:256
 msgid "Unmute list"
 msgstr ""
 
-#: src/screens/Messages/ConversationSettings/index.tsx:533
+#: src/screens/Messages/ConversationSettings/index.tsx:528
 msgid "Unmute this group chat"
 msgstr "Unmute this group chat"
 
-#: src/components/PostControls/PostMenu/PostMenuItems.tsx:646
-#: src/components/PostControls/PostMenu/PostMenuItems.tsx:649
+#: src/components/PostControls/PostMenu/PostMenuItems.tsx:642
+#: src/components/PostControls/PostMenu/PostMenuItems.tsx:645
 msgid "Unmute thread"
 msgstr ""
 
@@ -13383,12 +13383,12 @@ msgstr ""
 msgid "Unmute video"
 msgstr ""
 
-#: src/screens/ProfileList/components/Header.tsx:151
-#: src/screens/ProfileList/components/Header.tsx:158
+#: src/screens/ProfileList/components/Header.tsx:152
+#: src/screens/ProfileList/components/Header.tsx:159
 msgid "Unpin"
 msgstr ""
 
-#: src/components/FeedCard.tsx:355
+#: src/components/FeedCard.tsx:352
 #: src/screens/CustomFeed/components/CustomFeedHeader.tsx:569
 #: src/screens/CustomFeed/components/CustomFeedHeader.tsx:576
 #: src/screens/SavedFeeds.tsx:467
@@ -13400,13 +13400,13 @@ msgstr ""
 msgid "Unpin from home"
 msgstr ""
 
-#: src/components/PostControls/PostMenu/PostMenuItems.tsx:522
-#: src/components/PostControls/PostMenu/PostMenuItems.tsx:527
+#: src/components/PostControls/PostMenu/PostMenuItems.tsx:518
+#: src/components/PostControls/PostMenu/PostMenuItems.tsx:523
 msgid "Unpin from profile"
 msgstr ""
 
-#: src/screens/ProfileList/components/MoreOptionsMenu.tsx:225
-#: src/screens/ProfileList/components/MoreOptionsMenu.tsx:228
+#: src/screens/ProfileList/components/MoreOptionsMenu.tsx:226
+#: src/screens/ProfileList/components/MoreOptionsMenu.tsx:229
 msgid "Unpin moderation list"
 msgstr ""
 
@@ -13415,20 +13415,20 @@ msgstr ""
 msgid "Unpinned {0} from Home"
 msgstr ""
 
-#: src/screens/ProfileList/components/Header.tsx:78
+#: src/screens/ProfileList/components/Header.tsx:79
 msgid "Unpinned from your feeds"
 msgstr ""
 
-#: src/screens/ProfileList/components/MoreOptionsMenu.tsx:105
+#: src/screens/ProfileList/components/MoreOptionsMenu.tsx:106
 msgid "Unpinned list"
 msgstr ""
 
-#: src/screens/Settings/Settings.tsx:501
 #: src/screens/Settings/Settings.tsx:503
+#: src/screens/Settings/Settings.tsx:505
 msgid "Unsnooze email reminder"
 msgstr ""
 
-#: src/screens/Profile/Header/ProfileHeaderLabeler.tsx:354
+#: src/screens/Profile/Header/ProfileHeaderLabeler.tsx:350
 msgid "Unsubscribe"
 msgstr ""
 
@@ -13437,7 +13437,7 @@ msgstr ""
 msgid "Unsubscribe from list"
 msgstr ""
 
-#: src/screens/Profile/Header/ProfileHeaderLabeler.tsx:321
+#: src/screens/Profile/Header/ProfileHeaderLabeler.tsx:317
 msgid "Unsubscribe from this labeler"
 msgstr ""
 
@@ -13445,11 +13445,11 @@ msgstr ""
 msgid "Unsubscribed from list"
 msgstr ""
 
-#: src/view/com/composer/text-input/TextInput.tsx:127
+#: src/view/com/composer/text-input/TextInput.tsx:129
 msgid "Unsupported clipboard content"
 msgstr "Unsupported clipboard content"
 
-#: src/view/com/composer/Composer.tsx:1672
+#: src/view/com/composer/Composer.tsx:1696
 msgid "Unsupported video type: {mimeType}"
 msgstr ""
 
@@ -13483,9 +13483,9 @@ msgstr ""
 msgid "Update in Lists"
 msgstr "Update in Lists"
 
-#: src/screens/Messages/components/InviteLinkDialog.tsx:239
-#: src/screens/Messages/components/InviteLinkDialog.tsx:275
-#: src/screens/Messages/components/InviteLinkDialog.tsx:303
+#: src/screens/Messages/components/InviteLinkDialog.tsx:236
+#: src/screens/Messages/components/InviteLinkDialog.tsx:272
+#: src/screens/Messages/components/InviteLinkDialog.tsx:300
 msgid "Update invite link"
 msgstr "Update invite link"
 
@@ -13505,12 +13505,12 @@ msgstr ""
 msgid "Update your location"
 msgstr "Update your location"
 
-#: src/components/PostControls/PostMenu/PostMenuItems.tsx:356
+#: src/components/PostControls/PostMenu/PostMenuItems.tsx:352
 msgctxt "toast"
 msgid "Updating quote attachment failed"
 msgstr ""
 
-#: src/components/PostControls/PostMenu/PostMenuItems.tsx:405
+#: src/components/PostControls/PostMenu/PostMenuItems.tsx:401
 msgctxt "toast"
 msgid "Updating reply visibility failed"
 msgstr ""
@@ -13542,21 +13542,21 @@ msgstr ""
 msgid "Upload from Library"
 msgstr ""
 
-#: src/view/com/composer/Composer.tsx:2694
+#: src/view/com/composer/Composer.tsx:2718
 msgid "Uploading GIF..."
 msgstr ""
 
-#: src/lib/api/index.ts:327
-#: src/lib/api/index.ts:354
+#: src/lib/api/index.ts:336
+#: src/lib/api/index.ts:363
 msgid "Uploading images..."
 msgstr ""
 
-#: src/lib/api/index.ts:426
-#: src/lib/api/index.ts:450
+#: src/lib/api/index.ts:436
+#: src/lib/api/index.ts:460
 msgid "Uploading link thumbnail..."
 msgstr ""
 
-#: src/view/com/composer/Composer.tsx:2696
+#: src/view/com/composer/Composer.tsx:2720
 msgid "Uploading video..."
 msgstr ""
 
@@ -13591,11 +13591,11 @@ msgstr ""
 msgid "Use this to sign in to the other app along with your handle."
 msgstr ""
 
-#: src/components/ageAssurance/AgeAssuranceInitDialog.tsx:278
+#: src/components/ageAssurance/AgeAssuranceInitDialog.tsx:287
 msgid "Use your account email address, or another real email address you control, in case KWS or Bluesky needs to contact you."
 msgstr ""
 
-#: src/view/screens/Profile.tsx:396
+#: src/view/screens/Profile.tsx:393
 msgid "user"
 msgstr "user"
 
@@ -13606,12 +13606,12 @@ msgid "User blocked"
 msgstr ""
 
 #: src/components/moderation/ModerationDetailsDialog.tsx:91
-#: src/lib/moderation/useModerationCauseDescription.ts:64
+#: src/lib/moderation/useModerationCauseDescription.ts:61
 msgid "User Blocked"
 msgstr ""
 
 #. placeholder {0}: cause.source.list.name
-#: src/lib/moderation/useModerationCauseDescription.ts:56
+#: src/lib/moderation/useModerationCauseDescription.ts:53
 msgid "User Blocked by \"{0}\""
 msgstr ""
 
@@ -13623,7 +13623,7 @@ msgstr ""
 msgid "User Blocked by List"
 msgstr ""
 
-#: src/lib/moderation/useModerationCauseDescription.ts:74
+#: src/lib/moderation/useModerationCauseDescription.ts:71
 msgid "User Blocking You"
 msgstr ""
 
@@ -13637,7 +13637,7 @@ msgid "User list by {0}"
 msgstr ""
 
 #. placeholder {0}: sanitizeHandle(view.creator.handle, '@')
-#: src/state/queries/feed.ts:171
+#: src/state/queries/feed.ts:168
 msgid "User List by {0}"
 msgstr ""
 
@@ -13645,12 +13645,12 @@ msgstr ""
 msgid "User list by you"
 msgstr ""
 
-#: src/components/dialogs/lists/CreateOrEditListDialog.tsx:255
+#: src/components/dialogs/lists/CreateOrEditListDialog.tsx:263
 msgctxt "toast"
 msgid "User list created"
 msgstr ""
 
-#: src/components/dialogs/lists/CreateOrEditListDialog.tsx:241
+#: src/components/dialogs/lists/CreateOrEditListDialog.tsx:249
 msgctxt "toast"
 msgid "User list updated"
 msgstr ""
@@ -13667,21 +13667,21 @@ msgstr ""
 msgid "Username must only contain letters (a-z), numbers, and hyphens"
 msgstr ""
 
-#: src/screens/Login/LoginForm.tsx:305
+#: src/screens/Login/LoginForm.tsx:306
 msgid "Username or email"
 msgstr "Username or email"
 
-#: src/screens/Login/LoginForm.tsx:315
+#: src/screens/Login/LoginForm.tsx:316
 msgid "Username or email address"
 msgstr ""
 
 #. placeholder {0}: post.author.handle
-#: src/components/WhoCanReply.tsx:337
+#: src/components/WhoCanReply.tsx:330
 msgid "users followed by <0>@{0}</0>"
 msgstr ""
 
 #. placeholder {0}: post.author.handle
-#: src/components/WhoCanReply.tsx:324
+#: src/components/WhoCanReply.tsx:317
 msgid "users following <0>@{0}</0>"
 msgstr ""
 
@@ -13739,7 +13739,7 @@ msgstr ""
 msgid "Verify email code"
 msgstr ""
 
-#: src/components/intents/VerifyEmailIntentDialog.tsx:62
+#: src/components/intents/VerifyEmailIntentDialog.tsx:63
 msgid "Verify email dialog"
 msgstr ""
 
@@ -13753,7 +13753,7 @@ msgid "Verify now using KWS"
 msgstr "Verify now using KWS"
 
 #: src/components/contacts/screens/PhoneInput.tsx:175
-#: src/components/contacts/screens/VerifyNumber.tsx:217
+#: src/components/contacts/screens/VerifyNumber.tsx:220
 msgid "Verify phone number"
 msgstr ""
 
@@ -13766,7 +13766,7 @@ msgstr ""
 msgid "Verify this account?"
 msgstr ""
 
-#: src/components/ageAssurance/AgeAssuranceInitDialog.tsx:183
+#: src/components/ageAssurance/AgeAssuranceInitDialog.tsx:192
 msgid "Verify your age"
 msgstr ""
 
@@ -13786,7 +13786,7 @@ msgstr ""
 msgid "Verifying your age assurance status"
 msgstr ""
 
-#: src/components/contacts/screens/VerifyNumber.tsx:307
+#: src/components/contacts/screens/VerifyNumber.tsx:310
 msgid "Verifying..."
 msgstr ""
 
@@ -13797,7 +13797,7 @@ msgid "Version {0}"
 msgstr ""
 
 #. When the source of a follow is a starter pack, i.e., 'via starter pack {starterPackName}'.
-#: src/view/com/notifications/NotificationFeedItem.tsx:746
+#: src/view/com/notifications/NotificationFeedItem.tsx:738
 msgid "via starter pack <0/><1>{starterPackName}</1>"
 msgstr "via starter pack <0/><1>{starterPackName}</1>"
 
@@ -13806,7 +13806,7 @@ msgstr "via starter pack <0/><1>{starterPackName}</1>"
 msgid "Video"
 msgstr ""
 
-#: src/view/com/composer/state/video.ts:479
+#: src/view/com/composer/state/video.ts:484
 msgid "Video failed to process"
 msgstr ""
 
@@ -13815,25 +13815,25 @@ msgid "Video Feed"
 msgstr ""
 
 #. placeholder {0}: author.handle
-#: src/components/VideoPostCard.tsx:121
+#: src/components/VideoPostCard.tsx:113
 msgid "Video from {0}: {text}"
 msgstr ""
 
 #. placeholder {0}: sanitizeHandle( post.author.handle, '@', )
-#: src/screens/VideoFeed/index.tsx:1196
+#: src/screens/VideoFeed/index.tsx:1192
 msgid "Video from {0}. Tap to play or pause the video"
 msgstr ""
 
 #: src/lib/interests.ts:62
-#: src/screens/Search/modules/ExploreTrendingTopics.tsx:244
+#: src/screens/Search/modules/ExploreTrendingTopics.tsx:242
 msgid "Video Games"
 msgstr ""
 
-#: src/screens/VideoFeed/index.tsx:1195
+#: src/screens/VideoFeed/index.tsx:1191
 msgid "Video is paused"
 msgstr ""
 
-#: src/screens/VideoFeed/index.tsx:1195
+#: src/screens/VideoFeed/index.tsx:1191
 msgid "Video is playing"
 msgstr ""
 
@@ -13845,7 +13845,7 @@ msgstr ""
 msgid "Video settings"
 msgstr ""
 
-#: src/view/com/composer/Composer.tsx:2714
+#: src/view/com/composer/Composer.tsx:2738
 msgid "Video uploaded"
 msgstr ""
 
@@ -13854,35 +13854,35 @@ msgstr ""
 msgid "Video: {0}"
 msgstr ""
 
-#: src/view/screens/Profile.tsx:239
+#: src/view/screens/Profile.tsx:236
 msgid "Videos"
 msgstr ""
 
-#: src/view/com/composer/Composer.tsx:453
-#: src/view/com/composer/Composer.tsx:596
+#: src/view/com/composer/Composer.tsx:463
+#: src/view/com/composer/Composer.tsx:608
 #: src/view/com/composer/SelectMediaButton.tsx:452
 msgid "Videos must be 10 minutes or less."
 msgstr "Videos must be 10 minutes or less."
 
-#: src/view/com/composer/Composer.tsx:454
-#: src/view/com/composer/Composer.tsx:597
+#: src/view/com/composer/Composer.tsx:464
+#: src/view/com/composer/Composer.tsx:609
 #: src/view/com/composer/SelectMediaButton.tsx:453
 msgid "Videos must be less than 3 minutes long."
 msgstr ""
 
-#: src/view/com/composer/Composer.tsx:1262
+#: src/view/com/composer/Composer.tsx:1284
 msgctxt "Action to view the post the user just created"
 msgid "View"
 msgstr ""
 
 #. placeholder {0}: view.source.title
-#: src/components/Post/Embed/StandardSiteEmbed/index.tsx:340
-#: src/components/Post/Embed/StandardSiteEmbed/index.tsx:670
+#: src/components/Post/Embed/StandardSiteEmbed/index.tsx:339
+#: src/components/Post/Embed/StandardSiteEmbed/index.tsx:669
 msgid "View {0}"
 msgstr "View {0}"
 
 #. placeholder {0}: profile.handle
-#: src/screens/Profile/Header/Shell.tsx:257
+#: src/screens/Profile/Header/Shell.tsx:258
 msgid "View {0}'s avatar"
 msgstr ""
 
@@ -13891,13 +13891,13 @@ msgstr ""
 #. placeholder {0}: profile.handle
 #: src/screens/CustomFeed/components/CustomFeedHeader.tsx:505
 #: src/screens/Search/components/SearchProfileCard.tsx:37
-#: src/screens/VideoFeed/index.tsx:902
-#: src/view/com/notifications/NotificationFeedItem.tsx:608
+#: src/screens/VideoFeed/index.tsx:898
+#: src/view/com/notifications/NotificationFeedItem.tsx:600
 msgid "View {0}'s profile"
 msgstr ""
 
 #. placeholder {0}: profile.displayName || sanitizeHandle(profile.handle)
-#: src/components/ProfileCard.tsx:150
+#: src/components/ProfileCard.tsx:147
 msgid "View {0}’s profile"
 msgstr "View {0}’s profile"
 
@@ -13906,15 +13906,15 @@ msgstr "View {0}’s profile"
 msgid "View {displayName}’s profile"
 msgstr "View {displayName}’s profile"
 
-#: src/components/Post/Embed/StandardSiteEmbed/index.tsx:478
+#: src/components/Post/Embed/StandardSiteEmbed/index.tsx:477
 msgid "View {publicationTitle}"
 msgstr "View {publicationTitle}"
 
-#: src/components/ProfileHoverCard/index.web.tsx:479
+#: src/components/ProfileHoverCard/index.web.tsx:476
 msgid "View blocked user's profile"
 msgstr ""
 
-#: src/screens/Settings/components/ExportCarDialog.tsx:170
+#: src/screens/Settings/components/ExportCarDialog.tsx:176
 msgid "View blogpost for more details"
 msgstr ""
 
@@ -13922,8 +13922,8 @@ msgstr ""
 msgid "View debug entry"
 msgstr ""
 
-#: src/screens/VideoFeed/index.tsx:767
-#: src/screens/VideoFeed/index.tsx:785
+#: src/screens/VideoFeed/index.tsx:766
+#: src/screens/VideoFeed/index.tsx:784
 msgid "View details"
 msgstr ""
 
@@ -13932,7 +13932,7 @@ msgstr ""
 msgid "View full thread"
 msgstr ""
 
-#: src/screens/Settings/Settings.tsx:465
+#: src/screens/Settings/Settings.tsx:467
 msgid "View GrowthBook information"
 msgstr "View GrowthBook information"
 
@@ -13952,38 +13952,38 @@ msgstr "View incoming requests to join this group chat"
 msgid "View information about these labels"
 msgstr ""
 
-#: src/components/interstitials/TrendingVideos.tsx:199
-#: src/components/interstitials/TrendingVideos.tsx:221
-#: src/screens/Search/modules/ExploreTrendingVideos.tsx:191
-#: src/screens/Search/modules/ExploreTrendingVideos.tsx:210
+#: src/components/interstitials/TrendingVideos.tsx:201
+#: src/components/interstitials/TrendingVideos.tsx:223
+#: src/screens/Search/modules/ExploreTrendingVideos.tsx:193
+#: src/screens/Search/modules/ExploreTrendingVideos.tsx:212
 msgid "View more"
 msgstr ""
 
-#: src/components/interstitials/TrendingVideos.tsx:227
+#: src/components/interstitials/TrendingVideos.tsx:229
 msgid "View more trending videos"
 msgstr ""
 
-#: src/view/com/composer/Composer.tsx:1257
+#: src/view/com/composer/Composer.tsx:1279
 msgid "View post"
 msgstr ""
 
-#: src/components/ProfileHoverCard/index.web.tsx:465
-#: src/components/ProfileHoverCard/index.web.tsx:485
-#: src/components/ProfileHoverCard/index.web.tsx:512
-#: src/view/com/posts/PostFeedErrorMessage.tsx:183
-#: src/view/com/util/PostMeta.tsx:92
-#: src/view/com/util/PostMeta.tsx:120
+#: src/components/ProfileHoverCard/index.web.tsx:462
+#: src/components/ProfileHoverCard/index.web.tsx:482
+#: src/components/ProfileHoverCard/index.web.tsx:509
+#: src/view/com/posts/PostFeedErrorMessage.tsx:181
+#: src/view/com/util/PostMeta.tsx:93
+#: src/view/com/util/PostMeta.tsx:121
 msgid "View profile"
 msgstr ""
 
-#: src/screens/Profile/Header/Shell.tsx:163
+#: src/screens/Profile/Header/Shell.tsx:164
 msgid "View profile banner"
 msgstr "View profile banner"
 
-#: src/components/Post/Embed/StandardSiteEmbed/index.tsx:340
-#: src/components/Post/Embed/StandardSiteEmbed/index.tsx:448
-#: src/components/Post/Embed/StandardSiteEmbed/index.tsx:479
-#: src/components/Post/Embed/StandardSiteEmbed/index.tsx:670
+#: src/components/Post/Embed/StandardSiteEmbed/index.tsx:339
+#: src/components/Post/Embed/StandardSiteEmbed/index.tsx:447
+#: src/components/Post/Embed/StandardSiteEmbed/index.tsx:478
+#: src/components/Post/Embed/StandardSiteEmbed/index.tsx:669
 msgid "View publication"
 msgstr "View publication"
 
@@ -13991,7 +13991,7 @@ msgstr "View publication"
 msgid "View the avatar"
 msgstr ""
 
-#: src/screens/Messages/ConversationSettings/index.tsx:555
+#: src/screens/Messages/ConversationSettings/index.tsx:550
 msgid "View the invite link for this group chat"
 msgstr "View the invite link for this group chat"
 
@@ -14008,7 +14008,7 @@ msgstr ""
 msgid "View users who like this feed"
 msgstr ""
 
-#: src/components/VideoPostCard.tsx:398
+#: src/components/VideoPostCard.tsx:390
 msgid "View video"
 msgstr ""
 
@@ -14042,15 +14042,15 @@ msgstr ""
 msgid "Views full image"
 msgstr ""
 
-#: src/components/VideoPostCard.tsx:120
+#: src/components/VideoPostCard.tsx:112
 msgid "Views video in immersive mode"
 msgstr ""
 
-#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:126
+#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:127
 msgid "Violence"
 msgstr ""
 
-#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:127
+#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:128
 msgid "Violent or threatening content"
 msgstr ""
 
@@ -14081,12 +14081,12 @@ msgstr ""
 msgid "Warn content and filter from feeds"
 msgstr ""
 
-#: src/features/liveNow/components/LiveStatusDialog.tsx:190
-#: src/features/liveNow/components/LiveStatusDialog.tsx:199
+#: src/features/liveNow/components/LiveStatusDialog.tsx:187
+#: src/features/liveNow/components/LiveStatusDialog.tsx:196
 msgid "Watch now"
 msgstr ""
 
-#: src/components/contacts/screens/GetContacts.tsx:253
+#: src/components/contacts/screens/GetContacts.tsx:255
 msgid "We apply the highest privacy standards, and never share or sell your contact information."
 msgstr ""
 
@@ -14098,35 +14098,35 @@ msgstr "We could not connect to the service that provides this custom feed. It m
 msgid "We could not find this list. It was probably deleted."
 msgstr ""
 
-#: src/screens/Login/LoginForm.tsx:348
+#: src/screens/Login/LoginForm.tsx:349
 msgid "We couldn't find an account with that username. Please check that you've typed it correctly, or <0>set your hosting provider manually</0>."
 msgstr "We couldn't find an account with that username. Please check that you've typed it correctly, or <0>set your hosting provider manually</0>."
 
-#: src/screens/Hashtag.tsx:260
+#: src/screens/Hashtag.tsx:262
 msgid "We couldn't find any results for that tag."
 msgstr ""
 
-#: src/screens/Topic.tsx:166
+#: src/screens/Topic.tsx:168
 msgid "We couldn't find any results for that topic."
 msgstr ""
 
-#: src/screens/Messages/Conversation.tsx:134
+#: src/screens/Messages/Conversation.tsx:136
 msgid "We couldn't load this conversation"
 msgstr ""
 
-#: src/screens/Messages/JoinRequests.tsx:89
+#: src/screens/Messages/JoinRequests.tsx:86
 msgid "We couldn’t load this conversation’s join requests"
 msgstr "We couldn’t load this conversation’s join requests"
 
-#: src/screens/Messages/ConversationSettings/index.tsx:138
+#: src/screens/Messages/ConversationSettings/index.tsx:135
 msgid "We couldn’t load this conversation’s settings"
 msgstr "We couldn’t load this conversation’s settings"
 
-#: src/screens/Login/LoginForm.tsx:482
+#: src/screens/Login/LoginForm.tsx:483
 msgid "We couldn’t verify your hosting provider. Check your internet connection, or <0>set your hosting provider manually</0>."
 msgstr "We couldn’t verify your hosting provider. Check your internet connection, or <0>set your hosting provider manually</0>."
 
-#: src/components/contacts/screens/GetContacts.tsx:244
+#: src/components/contacts/screens/GetContacts.tsx:246
 msgid "We delete hashes after matches are made"
 msgstr ""
 
@@ -14134,16 +14134,16 @@ msgstr ""
 msgid "We don't store your friends' phone numbers or send any messages"
 msgstr ""
 
-#: src/screens/SignupQueued.tsx:163
+#: src/screens/SignupQueued.tsx:170
 msgid "We estimate {estimatedTime} until your account is ready."
 msgstr ""
 
-#: src/components/ageAssurance/AgeAssuranceInitDialog.tsx:197
+#: src/components/ageAssurance/AgeAssuranceInitDialog.tsx:206
 msgid "We have partnered with <0>KWS</0> to handle age verification. When you click \"Begin\" below, KWS will email you instructions to complete the verification process. If your email address has already been used to verify your age for another game or service that uses KWS, you won’t need to do it again. When you’re done, you'll be brought back to continue using Bluesky."
 msgstr ""
 
 #. placeholder {0}: currentAccount?.email
-#: src/components/intents/VerifyEmailIntentDialog.tsx:102
+#: src/components/intents/VerifyEmailIntentDialog.tsx:103
 msgid "We have sent another verification email to <0>{0}</0>."
 msgstr ""
 
@@ -14151,11 +14151,11 @@ msgstr ""
 msgid "We need to verify your number before we can look for your friends. A verification code will be sent to this number."
 msgstr ""
 
-#: src/components/contacts/screens/GetContacts.tsx:241
+#: src/components/contacts/screens/GetContacts.tsx:243
 msgid "We never keep plain phone numbers"
 msgstr ""
 
-#: src/components/contacts/screens/GetContacts.tsx:247
+#: src/components/contacts/screens/GetContacts.tsx:249
 msgid "We only suggest follows if both people consent"
 msgstr ""
 
@@ -14163,7 +14163,7 @@ msgstr ""
 msgid "We ran out of posts from your follows. Here's the latest from <0/>."
 msgstr ""
 
-#: src/screens/Settings/InterestsSettings.tsx:171
+#: src/screens/Settings/InterestsSettings.tsx:172
 msgid "We recommend selecting at least two interests."
 msgstr ""
 
@@ -14172,7 +14172,7 @@ msgstr ""
 msgid "We sent an email to <0>{0}</0> containing a link. Please click on it to complete the email verification process."
 msgstr ""
 
-#: src/view/com/composer/state/video.ts:526
+#: src/view/com/composer/state/video.ts:531
 msgid "We were unable to determine if you are allowed to upload videos. Please try again."
 msgstr ""
 
@@ -14193,11 +14193,11 @@ msgstr ""
 msgid "We were unable to receive the verification due to a connection issue. It may arrive later. If it does, your account will update automatically."
 msgstr ""
 
-#: src/screens/SignupQueued.tsx:167
+#: src/screens/SignupQueued.tsx:174
 msgid "We will let you know when your account is ready."
 msgstr ""
 
-#: src/screens/Settings/FindContactsSettings.tsx:531
+#: src/screens/Settings/FindContactsSettings.tsx:535
 msgid "We will notify you when we find your friends."
 msgstr ""
 
@@ -14227,7 +14227,7 @@ msgstr ""
 msgid "We're confirming your age assurance status with our servers. This should only take a few seconds."
 msgstr ""
 
-#: src/components/ageAssurance/AgeAssuranceInitDialog.tsx:151
+#: src/components/ageAssurance/AgeAssuranceInitDialog.tsx:155
 msgid "We're having issues initializing the age assurance process for your account. Please <0>contact support</0> for assistance."
 msgstr ""
 
@@ -14258,11 +14258,11 @@ msgstr "We're sorry, but based on the data shared by your device, you are not ol
 msgid "We're sorry, but based on your device's location, you are currently located in a region that requires age assurance."
 msgstr ""
 
-#: src/screens/ProfileList/index.tsx:88
+#: src/screens/ProfileList/index.tsx:85
 msgid "We're sorry, but we were unable to resolve this list. If this persists, please contact the list creator, @{handleOrDid}."
 msgstr ""
 
-#: src/components/dialogs/MutedWords.tsx:387
+#: src/components/dialogs/MutedWords.tsx:389
 msgid "We're sorry, but we weren't able to load your muted words at this time. Please try again."
 msgstr ""
 
@@ -14282,7 +14282,7 @@ msgstr "We’re sorry, but your search could not be completed. Please try again
 msgid "We're sorry, you cannot access this screen at this time."
 msgstr ""
 
-#: src/view/com/composer/Composer.tsx:1153
+#: src/view/com/composer/Composer.tsx:1175
 msgid "We're sorry! The post you are replying to has been deleted."
 msgstr ""
 
@@ -14291,7 +14291,7 @@ msgstr ""
 msgid "We're sorry! We can't find the page you were looking for."
 msgstr ""
 
-#: src/screens/Profile/Header/ProfileHeaderLabeler.tsx:220
+#: src/screens/Profile/Header/ProfileHeaderLabeler.tsx:216
 msgid "We're sorry! You can only subscribe to twenty labelers, and you've reached your limit of twenty."
 msgstr ""
 
@@ -14316,11 +14316,11 @@ msgstr ""
 msgid "We've confirmed your age assurance status. You can now close this dialog."
 msgstr ""
 
-#: src/screens/Deactivated.tsx:117
+#: src/screens/Deactivated.tsx:122
 msgid "Welcome back!"
 msgstr ""
 
-#: src/components/NewskieDialog.tsx:141
+#: src/components/NewskieDialog.tsx:142
 msgid "Welcome, friend!"
 msgstr ""
 
@@ -14338,7 +14338,7 @@ msgid "what’s up"
 msgstr "what’s up"
 
 #: src/view/com/auth/SplashScreen.web.tsx:100
-#: src/view/com/composer/Composer.tsx:1636
+#: src/view/com/composer/Composer.tsx:1660
 #: src/view/com/feeds/ComposerPrompt.tsx:195
 msgid "What's up?"
 msgstr ""
@@ -14347,16 +14347,16 @@ msgstr ""
 msgid "When you tap on a check, you’ll see which organizations have granted verification."
 msgstr ""
 
-#: src/components/WhoCanReply.tsx:226
+#: src/components/WhoCanReply.tsx:219
 msgid "Who can interact with this post?"
 msgstr ""
 
-#: src/screens/Messages/components/InviteLinkDialog.tsx:247
+#: src/screens/Messages/components/InviteLinkDialog.tsx:244
 msgid "Who can join this group chat and how"
 msgstr "Who can join this group chat and how"
 
-#: src/components/dialogs/PostInteractionSettingsDialog.tsx:427
-#: src/components/WhoCanReply.tsx:116
+#: src/components/dialogs/PostInteractionSettingsDialog.tsx:424
+#: src/components/WhoCanReply.tsx:109
 msgid "Who can reply"
 msgstr ""
 
@@ -14366,16 +14366,16 @@ msgstr ""
 
 #: src/screens/Home/NoFeedsPinned.tsx:80
 #: src/screens/Messages/ChatList.tsx:409
-#: src/screens/Messages/Inbox.tsx:191
+#: src/screens/Messages/Inbox.tsx:190
 msgid "Whoops!"
 msgstr ""
 
-#: src/components/interstitials/TrendingVideos.tsx:126
-#: src/screens/Search/modules/ExploreTrendingVideos.tsx:108
+#: src/components/interstitials/TrendingVideos.tsx:128
+#: src/screens/Search/modules/ExploreTrendingVideos.tsx:110
 msgid "Whoops! Trending videos failed to load."
 msgstr ""
 
-#: src/screens/Takendown.tsx:169
+#: src/screens/Takendown.tsx:167
 msgid "Why are you appealing?"
 msgstr ""
 
@@ -14424,21 +14424,21 @@ msgstr "Would you like to block this user and/or leave this conversation?"
 msgid "Would you like to save this as a draft before viewing your drafts?"
 msgstr ""
 
-#: src/view/com/composer/Composer.tsx:1551
+#: src/view/com/composer/Composer.tsx:1575
 msgid "Would you like to save this as a draft to edit later?"
 msgstr ""
 
-#: src/view/screens/Profile.tsx:447
-#: src/view/screens/Profile.tsx:448
+#: src/view/screens/Profile.tsx:444
+#: src/view/screens/Profile.tsx:445
 msgid "Write a post"
 msgstr ""
 
-#: src/view/com/composer/Composer.tsx:1732
+#: src/view/com/composer/Composer.tsx:1756
 msgid "Write post"
 msgstr ""
 
 #: src/screens/PostThread/components/ThreadComposePrompt.tsx:91
-#: src/view/com/composer/Composer.tsx:1634
+#: src/view/com/composer/Composer.tsx:1658
 msgid "Write your reply"
 msgstr ""
 
@@ -14451,18 +14451,18 @@ msgstr ""
 msgid "Wrong DID returned from server. Received: {0}"
 msgstr ""
 
-#: src/screens/Messages/ConversationSettings/index.tsx:155
-#: src/screens/Messages/JoinRequests.tsx:110
+#: src/screens/Messages/ConversationSettings/index.tsx:152
+#: src/screens/Messages/JoinRequests.tsx:107
 msgid "Wrong kind of conversation"
 msgstr "Wrong kind of conversation"
 
-#: src/features/liveNow/components/EditLiveDialog.tsx:147
+#: src/features/liveNow/components/EditLiveDialog.tsx:149
 #: src/features/liveNow/components/GoLiveDialog.tsx:142
 msgid "www.mylivestream.tv"
 msgstr ""
 
-#: src/components/moderation/ReportDialog/index.tsx:994
-#: src/components/moderation/ReportDialog/index.tsx:1003
+#: src/components/moderation/ReportDialog/index.tsx:995
+#: src/components/moderation/ReportDialog/index.tsx:1004
 msgctxt "Answer to a yes/no question"
 msgid "Yes"
 msgstr "Yes"
@@ -14472,28 +14472,28 @@ msgstr "Yes"
 msgid "Yes GIFs"
 msgstr "Yes GIFs"
 
-#: src/screens/Settings/components/DeactivateAccountDialog.tsx:105
-#: src/screens/Settings/components/DeactivateAccountDialog.tsx:107
+#: src/screens/Settings/components/DeactivateAccountDialog.tsx:106
+#: src/screens/Settings/components/DeactivateAccountDialog.tsx:108
 msgid "Yes, deactivate"
 msgstr ""
 
-#: src/screens/Settings/components/DeleteAccountDialog.tsx:348
+#: src/screens/Settings/components/DeleteAccountDialog.tsx:354
 msgid "Yes, delete my account"
 msgstr ""
 
-#: src/screens/StarterPack/StarterPackScreen.tsx:712
+#: src/screens/StarterPack/StarterPackScreen.tsx:705
 msgid "Yes, delete this starter pack"
 msgstr ""
 
-#: src/components/PostControls/PostMenu/PostMenuItems.tsx:864
+#: src/components/PostControls/PostMenu/PostMenuItems.tsx:860
 msgid "Yes, detach"
 msgstr ""
 
-#: src/components/PostControls/PostMenu/PostMenuItems.tsx:871
+#: src/components/PostControls/PostMenu/PostMenuItems.tsx:867
 msgid "Yes, hide"
 msgstr ""
 
-#: src/screens/Deactivated.tsx:139
+#: src/screens/Deactivated.tsx:144
 msgid "Yes, reactivate my account"
 msgstr ""
 
@@ -14510,7 +14510,7 @@ msgid "You are accessing Bluesky from a region that legally requires us to verif
 msgstr ""
 
 #. placeholder {0}: sanitizeHandle(profile.handle, '@')
-#: src/components/dms/MessageItem.tsx:720
+#: src/components/dms/MessageItem.tsx:735
 msgid "You are blocking {0}"
 msgstr "You are blocking {0}"
 
@@ -14526,7 +14526,7 @@ msgstr "You are blocking this person"
 msgid "You are creating an account on"
 msgstr ""
 
-#: src/features/liveNow/components/GoLiveDisabledDialog.tsx:108
+#: src/features/liveNow/components/GoLiveDisabledDialog.tsx:107
 msgid "You are currently blocked from using the Go Live feature. To appeal this moderation decision, please submit the form below."
 msgstr ""
 
@@ -14535,20 +14535,20 @@ msgstr ""
 msgid "You are currently unable to access Bluesky's Age Assurance flow. Please <0>contact our moderation team</0> if you believe this is an error."
 msgstr ""
 
-#: src/screens/SignupQueued.tsx:160
+#: src/screens/SignupQueued.tsx:167
 msgid "You are in line."
 msgstr ""
 
-#: src/features/liveNow/components/EditLiveDialog.tsx:113
-#: src/features/liveNow/components/EditLiveDialog.tsx:118
+#: src/features/liveNow/components/EditLiveDialog.tsx:115
+#: src/features/liveNow/components/EditLiveDialog.tsx:120
 msgid "You are Live"
 msgstr ""
 
-#: src/features/liveNow/index.tsx:377
+#: src/features/liveNow/index.tsx:382
 msgid "You are no longer live"
 msgstr ""
 
-#: src/view/com/composer/state/video.ts:519
+#: src/view/com/composer/state/video.ts:524
 msgid "You are not allowed to upload videos."
 msgstr ""
 
@@ -14556,7 +14556,7 @@ msgstr ""
 msgid "You are not following anyone yet"
 msgstr ""
 
-#: src/features/liveNow/index.tsx:321
+#: src/features/liveNow/index.tsx:325
 msgid "You are now live!"
 msgstr ""
 
@@ -14576,7 +14576,7 @@ msgstr ""
 msgid "You can adjust your interests at any time from \"Content and media\" settings."
 msgstr ""
 
-#: src/screens/Settings/components/DeleteAccountDialog.tsx:211
+#: src/screens/Settings/components/DeleteAccountDialog.tsx:217
 msgid "You can also <0>temporarily deactivate</0> your account instead. Your profile, posts, feeds, and lists will no longer be visible to other Bluesky users. You can reactivate your account at any time by logging in."
 msgstr ""
 
@@ -14585,11 +14585,11 @@ msgstr ""
 msgid "You can also discover new Custom Feeds to follow."
 msgstr ""
 
-#: src/screens/Settings/components/ExportCarDialog.tsx:139
+#: src/screens/Settings/components/ExportCarDialog.tsx:145
 msgid "You can also download your chat data as a \"JSONL\" file. This file only includes chat messages that you have sent and does not include chat messages that you have received."
 msgstr ""
 
-#: src/components/contacts/screens/GetContacts.tsx:250
+#: src/components/contacts/screens/GetContacts.tsx:252
 msgid "You can always opt out and delete your data"
 msgstr ""
 
@@ -14616,11 +14616,11 @@ msgid "You can now sign in with your new password."
 msgstr ""
 
 #. Toast shown when the user tries to add more images but the post gallery is already at the cap
-#: src/view/com/composer/Composer.tsx:222
+#: src/view/com/composer/Composer.tsx:224
 msgid "You can only add up to {MAX_GALLERY_IMAGES, plural, other {# images}} per post"
 msgstr "You can only add up to {MAX_GALLERY_IMAGES, plural, other {# images}} per post"
 
-#: src/view/com/composer/Composer.tsx:1556
+#: src/view/com/composer/Composer.tsx:1580
 msgid "You can only save drafts up to 1000 characters."
 msgstr ""
 
@@ -14636,7 +14636,7 @@ msgstr ""
 msgid "You can only select one video at a time."
 msgstr ""
 
-#: src/screens/Deactivated.tsx:125
+#: src/screens/Deactivated.tsx:130
 msgid "You can reactivate your account to continue logging in. Your profile and posts will be visible to other users."
 msgstr ""
 
@@ -14649,26 +14649,26 @@ msgstr "You can read chat history but can’t send new messages."
 msgid "You can select up to {MAX_GALLERY_IMAGES, plural, other {# images}} in total."
 msgstr "You can select up to {MAX_GALLERY_IMAGES, plural, other {# images}} in total."
 
-#: src/components/interstitials/FeedTrendingTopics.tsx:167
+#: src/components/interstitials/FeedTrendingTopics.tsx:168
 #: src/components/interstitials/Trending.tsx:148
-#: src/components/interstitials/TrendingVideos.tsx:137
-#: src/screens/Search/modules/ExploreTrendingTopics.tsx:105
+#: src/components/interstitials/TrendingVideos.tsx:139
+#: src/screens/Search/modules/ExploreTrendingTopics.tsx:103
 #: src/view/shell/desktop/SidebarTrendingTopics.tsx:172
 msgid "You can update this later from your settings."
 msgstr ""
 
-#: src/components/dms/ActionsWrapper.web.tsx:81
-#: src/components/dms/MessageContextMenu.tsx:129
+#: src/components/dms/ActionsWrapper.web.tsx:82
+#: src/components/dms/MessageContextMenu.tsx:127
 msgid "You cannot add more than {EMOJI_REACTION_LIMIT, plural, one {# emoji reaction} other {# emoji reactions}}"
 msgstr "You cannot add more than {EMOJI_REACTION_LIMIT, plural, one {# emoji reaction} other {# emoji reactions}}"
 
-#: src/components/dms/dialogs/NewChatDialog.tsx:105
-#: src/components/dms/dialogs/ShareViaChatDialog.tsx:121
+#: src/components/dms/dialogs/NewChatDialog.tsx:99
+#: src/components/dms/dialogs/ShareViaChatDialog.tsx:115
 msgid "You cannot create a group chat yet."
 msgstr "You cannot create a group chat yet."
 
 #: src/lib/hooks/useCleanError.ts:54
-#: src/lib/strings/errors.ts:27
+#: src/lib/strings/errors.ts:62
 msgid "You cannot update your birthdate while using an app password. Please sign in with your main password to update your birthdate."
 msgstr ""
 
@@ -14676,7 +14676,7 @@ msgstr ""
 msgid "You don't follow any users who follow @{name}."
 msgstr ""
 
-#: src/components/dialogs/PostInteractionSettingsDialog.tsx:589
+#: src/components/dialogs/PostInteractionSettingsDialog.tsx:586
 msgid "You don't have any lists yet."
 msgstr ""
 
@@ -14690,17 +14690,17 @@ msgstr ""
 msgid "You don't have any saved feeds."
 msgstr ""
 
-#: src/components/contacts/screens/ViewMatches.tsx:312
+#: src/components/contacts/screens/ViewMatches.tsx:320
 msgid "You got here first"
 msgstr ""
 
-#: src/components/intents/GroupChatJoinDialog.tsx:176
+#: src/components/intents/GroupChatJoinDialog.tsx:179
 msgid "You have been previously removed from this group and can’t join it using this link."
 msgstr "You have been previously removed from this group and can’t join it using this link."
 
 #: src/components/moderation/ModerationDetailsDialog.tsx:93
-#: src/lib/moderation/useModerationCauseDescription.ts:58
-#: src/lib/moderation/useModerationCauseDescription.ts:66
+#: src/lib/moderation/useModerationCauseDescription.ts:55
+#: src/lib/moderation/useModerationCauseDescription.ts:63
 msgid "You have blocked this user. You cannot view their content."
 msgstr ""
 
@@ -14712,13 +14712,13 @@ msgstr ""
 msgid "You have completely disabled reply, quote, and mention notifications, so this tab will no longer update. To adjust this, visit your <0>notification settings</0>."
 msgstr ""
 
-#: src/screens/Login/SetNewPasswordForm.tsx:48
-#: src/screens/Login/SetNewPasswordForm.tsx:89
-#: src/screens/Settings/components/ChangePasswordDialog.tsx:113
+#: src/screens/Login/SetNewPasswordForm.tsx:49
+#: src/screens/Login/SetNewPasswordForm.tsx:94
+#: src/screens/Settings/components/ChangePasswordDialog.tsx:115
 msgid "You have entered an invalid code. It should look like XXXXX-XXXXX."
 msgstr ""
 
-#: src/lib/moderation/useModerationCauseDescription.ts:117
+#: src/lib/moderation/useModerationCauseDescription.ts:114
 msgid "You have hidden this post"
 msgstr ""
 
@@ -14731,20 +14731,20 @@ msgid "You have marked this account as automated. You can remove it at any time
 msgstr "You have marked this account as automated. You can remove it at any time from your account settings."
 
 #: src/components/moderation/ModerationDetailsDialog.tsx:124
-#: src/lib/moderation/useModerationCauseDescription.ts:100
+#: src/lib/moderation/useModerationCauseDescription.ts:97
 msgid "You have muted this account."
 msgstr ""
 
-#: src/lib/moderation/useModerationCauseDescription.ts:94
+#: src/lib/moderation/useModerationCauseDescription.ts:91
 msgid "You have muted this user"
 msgstr ""
 
 #: src/components/dialogs/lists/UserAddRemoveListsDialog.tsx:71
-#: src/view/com/lists/MyLists.tsx:81
+#: src/view/com/lists/MyLists.tsx:84
 msgid "You have no lists."
 msgstr ""
 
-#: src/components/dialogs/StarterPackDialog.tsx:102
+#: src/components/dialogs/StarterPackDialog.tsx:99
 msgid "You have no starter packs."
 msgstr ""
 
@@ -14764,11 +14764,11 @@ msgstr ""
 msgid "You have successfully verified your email address. You can close this dialog."
 msgstr ""
 
-#: src/lib/media/video/upload.shared.ts:56
+#: src/lib/media/video/upload.shared.ts:74
 msgid "You have temporarily reached the limit for video uploads. Please try again later."
 msgstr ""
 
-#: src/view/com/composer/Composer.tsx:1546
+#: src/view/com/composer/Composer.tsx:1570
 msgid "You have unsaved changes to this draft, would you like to save them?"
 msgstr ""
 
@@ -14788,25 +14788,25 @@ msgstr ""
 msgid "You haven't made any custom feeds yet."
 msgstr ""
 
-#: src/components/dialogs/MutedWords.tsx:407
+#: src/components/dialogs/MutedWords.tsx:409
 msgid "You haven't muted any words or tags yet"
 msgstr ""
 
 #: src/components/moderation/ModerationDetailsDialog.tsx:138
-#: src/lib/moderation/useModerationCauseDescription.ts:128
+#: src/lib/moderation/useModerationCauseDescription.ts:125
 msgid "You hid this reply."
 msgstr ""
 
 #. placeholder {0}: getTimeAgo(lastInitiatedAt, new Date(), {format: 'long'})
-#: src/components/ageAssurance/AgeAssuranceInitDialog.tsx:240
+#: src/components/ageAssurance/AgeAssuranceInitDialog.tsx:249
 msgid "You initiated this flow already, {0} ago. It may take up to 5 minutes for emails to reach your inbox. Please consider waiting a few minutes before trying again."
 msgstr ""
 
-#: src/components/NewskieDialog.tsx:107
+#: src/components/NewskieDialog.tsx:108
 msgid "You joined Bluesky {timeAgoString} ago"
 msgstr ""
 
-#: src/components/NewskieDialog.tsx:104
+#: src/components/NewskieDialog.tsx:105
 msgid "You joined Bluesky using a starter pack {timeAgoString} ago"
 msgstr ""
 
@@ -14819,15 +14819,15 @@ msgstr ""
 msgid "You may appeal these labels if you feel they were placed in error."
 msgstr ""
 
-#: src/screens/StarterPack/Wizard/State.tsx:80
+#: src/screens/StarterPack/Wizard/State.tsx:76
 msgid "You may only add up to {STARTER_PACK_MAX_SIZE, plural, other {{STARTER_PACK_MAX_SIZE} profiles}}"
 msgstr ""
 
-#: src/screens/StarterPack/Wizard/State.tsx:101
+#: src/screens/StarterPack/Wizard/State.tsx:97
 msgid "You may only add up to 3 feeds"
 msgstr ""
 
-#: src/components/moderation/BlockDialog.tsx:318
+#: src/components/moderation/BlockDialog.tsx:317
 msgid "You must be a chat owner to remove a member."
 msgstr "You must be a chat owner to remove a member."
 
@@ -14852,26 +14852,26 @@ msgstr ""
 msgid "You need to verify your email address before you can enable email 2FA."
 msgstr ""
 
-#: src/components/moderation/BlockDialog.tsx:349
+#: src/components/moderation/BlockDialog.tsx:350
 msgid "You own this chat"
 msgstr "You own this chat"
 
 #. placeholder {0}: currentAccount?.handle
-#: src/screens/Deactivated.tsx:120
+#: src/screens/Deactivated.tsx:125
 msgid "You previously deactivated @{0}."
 msgstr ""
 
-#: src/screens/Settings/Settings.tsx:423
+#: src/screens/Settings/Settings.tsx:425
 msgid "You probably want to restart the app now."
 msgstr ""
 
 #. placeholder {0}: reaction.value
-#: src/components/dms/MessageItem.tsx:361
+#: src/components/dms/MessageItem.tsx:373
 msgid "You reacted {0}"
 msgstr ""
 
 #. placeholder {0}: reaction.value
-#: src/components/dms/getReactionInfo.ts:63
+#: src/components/dms/getReactionInfo.ts:68
 msgid "You reacted {0} to {target}"
 msgstr "You reacted {0} to {target}"
 
@@ -14880,42 +14880,42 @@ msgstr "You reacted {0} to {target}"
 msgid "You recently changed your birthdate"
 msgstr ""
 
-#: src/components/dms/MessageItem.tsx:806
+#: src/components/dms/MessageItem.tsx:821
 msgid "You replied"
 msgstr "You replied"
 
-#: src/components/dms/MessageItem.tsx:805
+#: src/components/dms/MessageItem.tsx:820
 msgid "You replied to {originalName}"
 msgstr "You replied to {originalName}"
 
-#: src/components/dms/MessageItem.tsx:803
+#: src/components/dms/MessageItem.tsx:818
 msgid "You replied to yourself"
 msgstr "You replied to yourself"
 
 #. Displayed when the user has requested to join a group chat.
-#: src/screens/Messages/components/OutgoingRequestListItem.tsx:105
+#: src/screens/Messages/components/OutgoingRequestListItem.tsx:103
 msgid "You requested to join"
 msgstr "You requested to join"
 
-#: src/screens/Settings/Settings.tsx:307
+#: src/screens/Settings/Settings.tsx:309
 #: src/view/shell/desktop/LeftNav.tsx:225
 msgid "You will be signed out of all your accounts."
 msgstr ""
 
 #. placeholder {0}: sanitizeHandle(profile.handle, '@')
-#: src/components/activity-notifications/SubscribeProfileDialog.tsx:140
+#: src/components/activity-notifications/SubscribeProfileDialog.tsx:137
 msgid "You will no longer receive notifications for {0}"
 msgstr ""
 
-#: src/components/PostControls/PostMenu/PostMenuItems.tsx:246
+#: src/components/PostControls/PostMenu/PostMenuItems.tsx:242
 msgid "You will no longer receive notifications for this thread"
 msgstr ""
 
-#: src/components/PostControls/PostMenu/PostMenuItems.tsx:237
+#: src/components/PostControls/PostMenu/PostMenuItems.tsx:233
 msgid "You will now receive notifications for this thread"
 msgstr ""
 
-#: src/screens/Login/SetNewPasswordForm.tsx:101
+#: src/screens/Login/SetNewPasswordForm.tsx:106
 msgid "You will receive an email with a \"reset code.\" Enter that code here, then enter your new password."
 msgstr ""
 
@@ -14924,37 +14924,37 @@ msgid "You won’t be able to rejoin unless you’re invited."
 msgstr "You won’t be able to rejoin unless you’re invited."
 
 #. When the last message in a chat was made by you.
-#: src/components/dms/getMessageInfo.ts:82
+#: src/components/dms/getMessageInfo.ts:77
 msgid "You: {message}"
 msgstr "You: {message}"
 
-#: src/screens/Signup/index.tsx:158
+#: src/screens/Signup/index.tsx:155
 msgid "You'll follow the suggested users and feeds once you finish creating your account!"
 msgstr ""
 
-#: src/screens/Signup/index.tsx:163
+#: src/screens/Signup/index.tsx:160
 msgid "You'll follow the suggested users once you finish creating your account!"
 msgstr ""
 
 #. placeholder {0}: listItemsCount - 8
-#: src/screens/StarterPack/StarterPackLandingScreen.tsx:243
+#: src/screens/StarterPack/StarterPackLandingScreen.tsx:235
 msgid "You'll follow these people and {0} others"
 msgstr ""
 
-#: src/screens/StarterPack/StarterPackLandingScreen.tsx:241
+#: src/screens/StarterPack/StarterPackLandingScreen.tsx:233
 msgid "You'll follow these people right away"
 msgstr ""
 
-#: src/components/contacts/screens/GetContacts.tsx:314
+#: src/components/contacts/screens/GetContacts.tsx:316
 msgid "You'll need to go to the System Settings for Bluesky and give permission if you want to use this feature."
 msgstr ""
 
 #. placeholder {0}: sanitizeHandle(profile.handle, '@')
-#: src/components/activity-notifications/SubscribeProfileDialog.tsx:172
+#: src/components/activity-notifications/SubscribeProfileDialog.tsx:169
 msgid "You'll start receiving notifications for {0}!"
 msgstr ""
 
-#: src/screens/StarterPack/StarterPackLandingScreen.tsx:281
+#: src/screens/StarterPack/StarterPackLandingScreen.tsx:273
 msgid "You'll stay updated with these feeds"
 msgstr ""
 
@@ -14970,25 +14970,25 @@ msgstr "You're all set! However, certain features may still be restricted until
 msgid "You’re in control"
 msgstr "You’re in control"
 
-#: src/screens/SignupQueued.tsx:130
+#: src/screens/SignupQueued.tsx:137
 msgid "You're in line"
 msgstr ""
 
-#: src/screens/Deactivated.tsx:81
-#: src/screens/Settings/components/DeactivateAccountDialog.tsx:54
+#: src/screens/Deactivated.tsx:88
+#: src/screens/Settings/components/DeactivateAccountDialog.tsx:55
 msgid "You're signed in with an App Password. Please sign in with your main password to continue deactivating your account."
 msgstr ""
 
-#: src/components/moderation/AppealForm.tsx:73
+#: src/components/moderation/AppealForm.tsx:84
 msgid "You've already appealed this label and it's being reviewed by our moderation team."
 msgstr ""
 
 #: src/components/moderation/ModerationDetailsDialog.tsx:128
-#: src/lib/moderation/useModerationCauseDescription.ts:109
+#: src/lib/moderation/useModerationCauseDescription.ts:106
 msgid "You've chosen to hide a word or tag within this post."
 msgstr ""
 
-#: src/components/contacts/screens/GetContacts.tsx:313
+#: src/components/contacts/screens/GetContacts.tsx:315
 msgid "You've denied access to your contacts"
 msgstr ""
 
@@ -15004,7 +15004,7 @@ msgstr ""
 msgid "You've reached the end of your feed! Find some more accounts to follow."
 msgstr ""
 
-#: src/view/com/composer/Composer.tsx:757
+#: src/view/com/composer/Composer.tsx:773
 msgid "You've reached the maximum number of drafts"
 msgstr ""
 
@@ -15020,35 +15020,35 @@ msgstr "You’ve reached the maximum of {MAX_FILTERS, plural, one {# filter} oth
 msgid "You've reached the start of the active content."
 msgstr ""
 
-#: src/view/com/composer/state/video.ts:530
+#: src/view/com/composer/state/video.ts:535
 msgid "You've reached your daily limit for video uploads (too many bytes)"
 msgstr ""
 
-#: src/view/com/composer/state/video.ts:534
+#: src/view/com/composer/state/video.ts:539
 msgid "You've reached your daily limit for video uploads (too many videos)"
 msgstr ""
 
-#: src/screens/VideoFeed/index.tsx:1243
+#: src/screens/VideoFeed/index.tsx:1239
 msgid "You've run out of videos to watch. Maybe it's a good time to take a break?"
 msgstr ""
 
-#: src/screens/Signup/index.tsx:194
+#: src/screens/Signup/index.tsx:191
 msgid "Your account"
 msgstr ""
 
-#: src/components/moderation/ReportDialog/index.tsx:310
+#: src/components/moderation/ReportDialog/index.tsx:311
 msgid "Your account cannot submit reports while it is suspended."
 msgstr "Your account cannot submit reports while it is suspended."
 
-#: src/screens/Settings/components/DeleteAccountDialog.tsx:128
+#: src/screens/Settings/components/DeleteAccountDialog.tsx:133
 msgid "Your account has been deleted, see ya! ✌️"
 msgstr ""
 
-#: src/screens/Takendown.tsx:142
+#: src/screens/Takendown.tsx:140
 msgid "Your account has been suspended"
 msgstr ""
 
-#: src/view/com/composer/state/video.ts:538
+#: src/view/com/composer/state/video.ts:543
 msgid "Your account is not yet old enough to upload videos. Please try again later."
 msgstr ""
 
@@ -15060,15 +15060,15 @@ msgstr "Your account is too new"
 msgid "Your account must be at least 7 days old to create a new group chat."
 msgstr "Your account must be at least 7 days old to create a new group chat."
 
-#: src/screens/Settings/components/ExportCarDialog.tsx:107
+#: src/screens/Settings/components/ExportCarDialog.tsx:113
 msgid "Your account repository, containing all public data records, can be downloaded as a \"CAR\" file. This file does not include media embeds, such as images, or your private data, which must be fetched separately."
 msgstr ""
 
-#: src/screens/Takendown.tsx:210
+#: src/screens/Takendown.tsx:208
 msgid "Your account was found to be in violation of the <0>Bluesky Social Terms of Service</0>. You have been sent an email outlining the specific violation and suspension period, if applicable. You can appeal this decision if you believe it was made in error."
 msgstr ""
 
-#: src/screens/Takendown.tsx:150
+#: src/screens/Takendown.tsx:148
 msgid "Your appeal has been submitted. If your appeal succeeds, you will receive an email."
 msgstr ""
 
@@ -15084,15 +15084,15 @@ msgstr ""
 msgid "Your choice will be remembered for future links. You can change it at any time in settings."
 msgstr ""
 
-#: src/view/com/notifications/NotificationFeedItem.tsx:386
+#: src/view/com/notifications/NotificationFeedItem.tsx:378
 msgid "Your contact {firstAuthorLink} is on Bluesky"
 msgstr ""
 
-#: src/view/com/notifications/NotificationFeedItem.tsx:384
+#: src/view/com/notifications/NotificationFeedItem.tsx:376
 msgid "Your contact {firstAuthorName} is on Bluesky"
 msgstr ""
 
-#: src/components/contacts/screens/ViewMatches.tsx:454
+#: src/components/contacts/screens/ViewMatches.tsx:462
 msgid "Your contact {name}"
 msgstr ""
 
@@ -15105,15 +15105,15 @@ msgstr ""
 msgid "Your declared age is under 18. Some settings below may be disabled. If this was a mistake, you may edit your birthdate in your <0>account settings</0>."
 msgstr ""
 
-#: src/components/ageAssurance/AgeAssuranceInitDialog.tsx:252
-#: src/components/ageAssurance/AgeAssuranceInitDialog.tsx:256
-#: src/components/ageAssurance/AgeAssuranceInitDialog.tsx:257
+#: src/components/ageAssurance/AgeAssuranceInitDialog.tsx:261
+#: src/components/ageAssurance/AgeAssuranceInitDialog.tsx:265
+#: src/components/ageAssurance/AgeAssuranceInitDialog.tsx:266
 msgid "Your email"
 msgstr ""
 
 #: src/screens/Login/ForgotPasswordForm.tsx:51
-#: src/screens/Settings/components/ChangePasswordDialog.tsx:82
-#: src/screens/Signup/state.ts:297
+#: src/screens/Settings/components/ChangePasswordDialog.tsx:84
+#: src/screens/Signup/state.ts:295
 #: src/screens/Signup/StepInfo/index.tsx:129
 msgid "Your email appears to be invalid."
 msgstr ""
@@ -15126,7 +15126,7 @@ msgstr ""
 msgid "Your first like!"
 msgstr ""
 
-#: src/components/dialogs/PostInteractionSettingsDialog.tsx:496
+#: src/components/dialogs/PostInteractionSettingsDialog.tsx:493
 msgid "Your followers"
 msgstr ""
 
@@ -15143,7 +15143,7 @@ msgstr ""
 msgid "Your hosting provider can’t be detected from an email address, so the default Bluesky service will be used. Enter your username instead, or set your provider manually."
 msgstr "Your hosting provider can’t be detected from an email address, so the default Bluesky service will be used. Enter your username instead, or set your provider manually."
 
-#: src/view/com/composer/state/video.ts:475
+#: src/view/com/composer/state/video.ts:480
 msgid "Your hosting provider does not support videos this large. Please try again with a smaller file."
 msgstr "Your hosting provider does not support videos this large. Please try again with a smaller file."
 
@@ -15155,11 +15155,11 @@ msgstr "Your hosting provider is detected automatically from the username you en
 #: src/screens/Search/modules/ExploreInterestsCard.tsx:62
 #: src/screens/Settings/ContentAndMediaSettings.tsx:94
 #: src/screens/Settings/ContentAndMediaSettings.tsx:97
-#: src/screens/Settings/InterestsSettings.tsx:49
+#: src/screens/Settings/InterestsSettings.tsx:50
 msgid "Your interests"
 msgstr ""
 
-#: src/screens/Settings/InterestsSettings.tsx:138
+#: src/screens/Settings/InterestsSettings.tsx:139
 msgctxt "toast"
 msgid "Your interests have been updated!"
 msgstr ""
@@ -15172,15 +15172,15 @@ msgstr ""
 msgid "Your location has been updated."
 msgstr ""
 
-#: src/components/dialogs/MutedWords.tsx:378
+#: src/components/dialogs/MutedWords.tsx:380
 msgid "Your muted words"
 msgstr ""
 
-#: src/screens/Messages/components/InviteLinkDialog.tsx:211
+#: src/screens/Messages/components/InviteLinkDialog.tsx:208
 msgid "Your name, avatar, the name of the group chat, and the number of members will be visible to everyone."
 msgstr "Your name, avatar, the name of the group chat, and the number of members will be visible to everyone."
 
-#: src/screens/Settings/components/ChangePasswordDialog.tsx:72
+#: src/screens/Settings/components/ChangePasswordDialog.tsx:74
 msgid "Your password has been changed successfully! Please use your new password when you sign in to Bluesky from now on."
 msgstr ""
 
@@ -15188,15 +15188,15 @@ msgstr ""
 msgid "Your password must be at least 8 characters long."
 msgstr ""
 
-#: src/view/com/composer/Composer.tsx:1253
+#: src/view/com/composer/Composer.tsx:1275
 msgid "Your post was sent"
 msgstr ""
 
-#: src/view/com/composer/Composer.tsx:1250
+#: src/view/com/composer/Composer.tsx:1272
 msgid "Your posts were sent"
 msgstr ""
 
-#: src/components/ageAssurance/AgeAssuranceInitDialog.tsx:289
+#: src/components/ageAssurance/AgeAssuranceInitDialog.tsx:298
 msgid "Your preferred language"
 msgstr ""
 
@@ -15209,24 +15209,24 @@ msgstr ""
 msgid "Your profile picture surrounded by concentric circles of other users' profile pictures"
 msgstr ""
 
-#: src/screens/Settings/components/DeactivateAccountDialog.tsx:75
+#: src/screens/Settings/components/DeactivateAccountDialog.tsx:76
 msgid "Your profile, posts, feeds, and lists will no longer be visible to other Bluesky users. You can reactivate your account at any time by logging in."
 msgstr ""
 
-#: src/view/com/composer/Composer.tsx:1252
+#: src/view/com/composer/Composer.tsx:1274
 msgid "Your reply was sent"
 msgstr ""
 
 #. placeholder {0}: state.selectedLabeler?.creator.displayName
-#: src/components/moderation/ReportDialog/index.tsx:596
+#: src/components/moderation/ReportDialog/index.tsx:597
 msgid "Your report will be sent to <0>{0}</0>."
 msgstr ""
 
-#: src/screens/Settings/InterestsSettings.tsx:63
+#: src/screens/Settings/InterestsSettings.tsx:64
 msgid "Your selected interests help us serve you content you care about."
 msgstr ""
 
-#: src/view/com/composer/Composer.tsx:1581
+#: src/view/com/composer/Composer.tsx:1605
 msgid "Your thread has empty posts that will be skipped. The remaining posts will be published as a thread."
 msgstr "Your thread has empty posts that will be skipped. The remaining posts will be published as a thread."
 

From 70195d7059a8e09725a9657a86779c556d398092 Mon Sep 17 00:00:00 2001
From: Samuel Newman <mozzius@protonmail.com>
Date: Fri, 14 Aug 2026 10:21:52 +0300
Subject: [PATCH 31/32] Drop accidental eslint dependency (#11460)

---
 .oxlintrc.json                                |   9 +-
 bskyogcard/src/types/bsky/starterPack.ts      |   3 +-
 eslint/use-exact-imports.js                   |  32 --
 .../avoid-unwrapped-text.disabled-test.js     |   0
 .../lingui-msg-rule.disabled-test.js          |   0
 .../__disabled_tests__/note.md                |   0
 .../avoid-unwrapped-text.js                   |   0
 {eslint => lint-rules}/index.js               |   1 -
 {eslint => lint-rules}/lingui-msg-rule.js     |   0
 .../use-prefixed-imports.js                   |   0
 package.json                                  |   8 +-
 pnpm-lock.yaml                                | 331 ++++++------------
 pnpm-workspace.yaml                           |   9 +
 src/ageAssurance/data.tsx                     |   3 +-
 src/ageAssurance/debug.ts                     |   3 +-
 src/analytics/metrics/types.ts                |  17 +-
 src/components/Autocomplete/types.ts          |   5 +-
 src/components/Button.tsx                     |   3 +-
 .../EmailDialog/data/useManageEmail2FA.ts     |   3 +-
 .../dialogs/SearchablePeopleList.tsx          |   6 +-
 src/components/dms/replyPreview.ts            |   4 +-
 src/components/dms/util.ts                    |   4 +-
 src/env/common.ts                             |  11 +-
 src/features/inviteFriends/themes.ts          |   7 +-
 src/features/liveEvents/types.ts              |   5 +-
 src/lib/ThemeContext.tsx                      |   6 +-
 src/lib/hooks/useOTAUpdates.ts                |   3 +-
 src/lib/media/video/multipart/types.ts        |   7 +-
 src/lib/media/video/types.ts                  |   5 +-
 src/lib/routes/tab-to-nav-item.ts             |   6 +-
 src/lib/routes/types.ts                       |   3 +-
 .../Messages/ConversationSettings/index.tsx   |  14 +-
 .../Messages/components/MessageInputEmbed.tsx |   3 +-
 .../components/groupSystemMessages.ts         |   4 +-
 src/screens/Profile/components/GermButton.tsx |   6 +-
 src/screens/Signup/state.ts                   |   6 +-
 src/state/cache/post-shadow.ts                |   4 +-
 src/state/cache/profile-shadow.ts             |   3 +-
 src/state/gallery.ts                          |   3 +-
 src/state/messages/convo/agent.ts             |   3 +-
 src/state/messages/convo/index.tsx            |   3 +-
 src/state/queries/join-links.ts               |   3 +-
 .../queries/messages/list-conversations.tsx   |  17 +-
 src/state/queries/my-lists.ts                 |   5 +-
 src/state/queries/notifications/types.ts      |   6 +-
 src/state/queries/postgate/util.ts            |   4 +-
 src/state/queries/preferences/types.ts        |   7 +-
 src/state/queries/search-posts-params.ts      |  13 +-
 src/state/session/index.tsx                   |  15 +-
 src/state/session/logging.ts                  |  12 +-
 src/state/shell/composer/index.tsx            |   7 +-
 src/state/shell/logged-out.tsx                |   6 +-
 src/state/shell/progress-guide.tsx            |   4 +-
 src/types/bsky/starterPack.ts                 |   3 +-
 src/view/com/composer/state/composer.ts       |   6 +-
 src/view/com/composer/state/video.ts          |   6 +-
 src/view/com/composer/state/videoProgress.ts  |   5 +-
 .../composer/text-input/TextInput.types.ts    |   3 +-
 src/view/com/util/Link.tsx                    |   3 +-
 src/view/com/util/List.web.tsx                |   8 +-
 src/view/com/util/UserAvatar.tsx              |   2 +-
 src/view/com/util/UserBanner.tsx              |   2 +-
 62 files changed, 197 insertions(+), 483 deletions(-)
 delete mode 100644 eslint/use-exact-imports.js
 rename {eslint => lint-rules}/__disabled_tests__/avoid-unwrapped-text.disabled-test.js (100%)
 rename {eslint => lint-rules}/__disabled_tests__/lingui-msg-rule.disabled-test.js (100%)
 rename {eslint => lint-rules}/__disabled_tests__/note.md (100%)
 rename {eslint => lint-rules}/avoid-unwrapped-text.js (100%)
 rename {eslint => lint-rules}/index.js (85%)
 rename {eslint => lint-rules}/lingui-msg-rule.js (100%)
 rename {eslint => lint-rules}/use-prefixed-imports.js (100%)

diff --git a/.oxlintrc.json b/.oxlintrc.json
index 5868f74bb8..907b47af39 100644
--- a/.oxlintrc.json
+++ b/.oxlintrc.json
@@ -60,6 +60,7 @@
     "bskyweb/**",
     "bskyembed/**",
     "bskyogcard/**",
+    "lint-rules/**",
     "src/locale/locales/_build/**",
     "src/locale/locales/**/*.js",
     "src/lexicons/**",
@@ -239,7 +240,6 @@
             }
           }
         ],
-        "bsky-internal/use-exact-imports": "error",
         "bsky-internal/use-prefixed-imports": "error",
         "bsky-internal/lingui-msg-rule": "error",
         "react/display-name": "error",
@@ -260,7 +260,6 @@
         "react/no-unsafe": "off",
         "react/react-in-jsx-scope": "off",
         "react/hook-use-state": "warn",
-        "react-native/no-inline-styles": "off",
         "react-native-a11y/has-accessibility-hint": "error",
         "react-native-a11y/has-accessibility-props": "error",
         "react-native-a11y/has-valid-accessibility-actions": "error",
@@ -275,7 +274,7 @@
         "react-native-a11y/has-valid-accessibility-ignores-invert-colors": "error",
         "react-native-a11y/has-valid-accessibility-live-region": "error",
         "react-native-a11y/has-valid-important-for-accessibility": "error",
-        "react-compiler/react-compiler": "warn",
+        "react/react-compiler": "warn",
         "simple-import-sort/imports": [
           "error",
           {
@@ -375,9 +374,7 @@
       },
       "jsPlugins": [
         "eslint-plugin-bsky-internal",
-        "eslint-plugin-react-native",
         "eslint-plugin-react-native-a11y",
-        "eslint-plugin-react-compiler",
         "eslint-plugin-simple-import-sort"
       ],
       "env": {
@@ -405,4 +402,4 @@
       }
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/bskyogcard/src/types/bsky/starterPack.ts b/bskyogcard/src/types/bsky/starterPack.ts
index 0064e16bc6..08bbe6c3b3 100644
--- a/bskyogcard/src/types/bsky/starterPack.ts
+++ b/bskyogcard/src/types/bsky/starterPack.ts
@@ -7,5 +7,4 @@ export const isView = AppBskyGraphDefs.isStarterPackView
  * Matches any starter pack view exported by our SDK
  */
 export type AnyStarterPackView =
-  | AppBskyGraphDefs.StarterPackViewBasic
-  | AppBskyGraphDefs.StarterPackView
+  AppBskyGraphDefs.StarterPackViewBasic | AppBskyGraphDefs.StarterPackView
diff --git a/eslint/use-exact-imports.js b/eslint/use-exact-imports.js
deleted file mode 100644
index 6ba2df5d6c..0000000000
--- a/eslint/use-exact-imports.js
+++ /dev/null
@@ -1,32 +0,0 @@
-const BANNED_IMPORTS = [
-  '@fortawesome/free-regular-svg-icons',
-  '@fortawesome/free-solid-svg-icons',
-]
-
-/** @type {import('eslint').Rule.RuleModule} */
-module.exports = {
-  meta: {
-    type: 'suggestion',
-    docs: {
-      description: 'Prevent importing entire icon packages',
-    },
-    schema: [],
-  },
-  create(context) {
-    return {
-      ImportDeclaration(node) {
-        const source = node.source
-        if (typeof source.value !== 'string') {
-          return
-        }
-        if (BANNED_IMPORTS.includes(source.value)) {
-          context.report({
-            node,
-            message:
-              'Import the specific thing you want instead of the entire package',
-          })
-        }
-      },
-    }
-  },
-}
diff --git a/eslint/__disabled_tests__/avoid-unwrapped-text.disabled-test.js b/lint-rules/__disabled_tests__/avoid-unwrapped-text.disabled-test.js
similarity index 100%
rename from eslint/__disabled_tests__/avoid-unwrapped-text.disabled-test.js
rename to lint-rules/__disabled_tests__/avoid-unwrapped-text.disabled-test.js
diff --git a/eslint/__disabled_tests__/lingui-msg-rule.disabled-test.js b/lint-rules/__disabled_tests__/lingui-msg-rule.disabled-test.js
similarity index 100%
rename from eslint/__disabled_tests__/lingui-msg-rule.disabled-test.js
rename to lint-rules/__disabled_tests__/lingui-msg-rule.disabled-test.js
diff --git a/eslint/__disabled_tests__/note.md b/lint-rules/__disabled_tests__/note.md
similarity index 100%
rename from eslint/__disabled_tests__/note.md
rename to lint-rules/__disabled_tests__/note.md
diff --git a/eslint/avoid-unwrapped-text.js b/lint-rules/avoid-unwrapped-text.js
similarity index 100%
rename from eslint/avoid-unwrapped-text.js
rename to lint-rules/avoid-unwrapped-text.js
diff --git a/eslint/index.js b/lint-rules/index.js
similarity index 85%
rename from eslint/index.js
rename to lint-rules/index.js
index 1df4590245..4af3a9bc73 100644
--- a/eslint/index.js
+++ b/lint-rules/index.js
@@ -7,7 +7,6 @@ const plugin = {
   },
   rules: {
     'avoid-unwrapped-text': require('./avoid-unwrapped-text'),
-    'use-exact-imports': require('./use-exact-imports'),
     'use-prefixed-imports': require('./use-prefixed-imports'),
     'lingui-msg-rule': require('./lingui-msg-rule'),
   },
diff --git a/eslint/lingui-msg-rule.js b/lint-rules/lingui-msg-rule.js
similarity index 100%
rename from eslint/lingui-msg-rule.js
rename to lint-rules/lingui-msg-rule.js
diff --git a/eslint/use-prefixed-imports.js b/lint-rules/use-prefixed-imports.js
similarity index 100%
rename from eslint/use-prefixed-imports.js
rename to lint-rules/use-prefixed-imports.js
diff --git a/package.json b/package.json
index a7114fba73..75fb7b4d00 100644
--- a/package.json
+++ b/package.json
@@ -288,9 +288,7 @@
     "babel-plugin-module-resolver": "^5.0.2",
     "babel-plugin-react-compiler": "19.1.0-rc.3",
     "babel-preset-expo": "~54.0.10",
-    "eslint-plugin-bsky-internal": "link:eslint",
-    "eslint-plugin-react-compiler": "19.1.0-rc.2",
-    "eslint-plugin-react-native": "^5.0.0",
+    "eslint-plugin-bsky-internal": "link:lint-rules",
     "eslint-plugin-react-native-a11y": "^3.5.1",
     "eslint-plugin-simple-import-sort": "^13.0.0",
     "file-loader": "6.2.0",
@@ -303,7 +301,7 @@
     "lint-staged": "^17.0.8",
     "oxlint": "^1.73.0",
     "oxlint-tsgolint": "^7.0.2001",
-    "prettier": "^3.8.3",
+    "prettier": "3.9.6",
     "react-native-dotenv": "^3.4.11",
     "react-refresh": "^0.14.0",
     "svgo": "^4.0.2",
@@ -376,7 +374,7 @@
   },
   "lint-staged": {
     "*{.js,.jsx,.ts,.tsx}": [
-      "oxlint --fix"
+      "oxlint --fix --no-error-on-unmatched-pattern"
     ],
     "*{.js,.jsx,.ts,.tsx,.css}": [
       "prettier --cache --write --ignore-unknown"
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 6cd00fba0a..1df7fbd2f3 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -215,6 +215,8 @@ overrides:
   '@types/psl': 1.1.1
   react-native-screens: 4.24.0
 
+packageExtensionsChecksum: sha256-KbeCj471Qk3TA758q8nLPkiGCPDA0TX18iO/Coy89lo=
+
 patchedDependencies:
   '@sentry/expo-upload-sourcemaps@8.18.0': 2368e1e1986165e7ead3c60017b78b2f9ade1b6a6b2f5ad27cd428608c6f12ae
   expo-age-range@0.2.18: c325225749993424461eeece1d97a99b19c00da2ebc958a73c12e4eca0c39306
@@ -472,10 +474,10 @@ importers:
         version: 8.0.10(expo@54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1))
       expo-file-system:
         specifier: ~19.0.21
-        version: 19.0.22(83f21d12a6c1aa99b4a65d070875cc68)
+        version: 19.0.23(83f21d12a6c1aa99b4a65d070875cc68)
       expo-font:
         specifier: ~14.0.11
-        version: 14.0.11(83e0f64f4281e4798012214ad5b2d72d)
+        version: 14.0.12(83e0f64f4281e4798012214ad5b2d72d)
       expo-glass-effect:
         specifier: 0.1.10
         version: 0.1.10(83e0f64f4281e4798012214ad5b2d72d)
@@ -800,16 +802,10 @@ importers:
         version: 19.1.0-rc.3
       babel-preset-expo:
         specifier: ~54.0.10
-        version: 54.0.10(@babel/core@7.29.0(supports-color@8.1.1))(@babel/runtime@7.29.2)(expo@54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1))(react-refresh@0.14.2)(supports-color@8.1.1)
+        version: 54.0.12(@babel/core@7.29.0(supports-color@8.1.1))(@babel/runtime@7.29.2)(expo@54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1))(react-refresh@0.14.2)(supports-color@8.1.1)
       eslint-plugin-bsky-internal:
-        specifier: link:eslint
-        version: link:eslint
-      eslint-plugin-react-compiler:
-        specifier: 19.1.0-rc.2
-        version: 19.1.0-rc.2(eslint@8.57.1(supports-color@8.1.1))(supports-color@8.1.1)
-      eslint-plugin-react-native:
-        specifier: ^5.0.0
-        version: 5.0.0(eslint@8.57.1(supports-color@8.1.1))
+        specifier: link:lint-rules
+        version: link:lint-rules
       eslint-plugin-react-native-a11y:
         specifier: ^3.5.1
         version: 3.5.1(eslint@8.57.1(supports-color@8.1.1))
@@ -842,7 +838,7 @@ importers:
         version: 17.0.8
       node:
         specifier: runtime:^24.18.0
-        version: runtime:24.18.0
+        version: runtime:24.19.0
       oxlint:
         specifier: ^1.73.0
         version: 1.73.0(oxlint-tsgolint@7.0.2001)
@@ -850,8 +846,8 @@ importers:
         specifier: ^7.0.2001
         version: 7.0.2001
       prettier:
-        specifier: ^3.8.3
-        version: 3.8.3
+        specifier: 3.9.6
+        version: 3.9.6
       react-native-dotenv:
         specifier: ^3.4.11
         version: 3.4.11(@babel/runtime@7.29.2)
@@ -1137,13 +1133,6 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-proposal-private-methods@7.18.6':
-    resolution: {integrity: sha512-nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA==}
-    engines: {node: '>=6.9.0'}
-    deprecated: This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-private-methods instead.
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
   '@babel/plugin-proposal-private-property-in-object@7.21.0-placeholder-for-preset-env.2':
     resolution: {integrity: sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==}
     engines: {node: '>=6.9.0'}
@@ -2030,9 +2019,6 @@ packages:
   '@expo/image-utils@0.8.12':
     resolution: {integrity: sha512-3KguH7kyKqq7pNwLb9j6BBdD/bjmNwXZG/HPWT6GWIXbwrvAJt2JNyYTP5agWJ8jbbuys1yuCzmkX+TU6rmI7A==}
 
-  '@expo/json-file@10.0.14':
-    resolution: {integrity: sha512-yWwBFywFv+SxkJp/pIzzA416JVYflNUh7pqQzgaA6nXDqRyK7KfrqVzk8PdUfDnqbBcaZZxpzNssfQZzp5KHrA==}
-
   '@expo/json-file@10.0.16':
     resolution: {integrity: sha512-fcVkWEj+hLuP2yt5W0aw6LmDRqSPWDLUSxOMcmFeV+algmIF59sQVKCwB9btjQLd4V6x9N0pISkQEkBubUHrCw==}
 
@@ -2063,9 +2049,6 @@ packages:
   '@expo/plist@0.3.5':
     resolution: {integrity: sha512-9RYVU1iGyCJ7vWfg3e7c/NVyMFs8wbl+dMWZphtFtsqyN9zppGREU3ctlD3i8KUE0sCUTVnLjCWr+VeUIDep2g==}
 
-  '@expo/plist@0.4.8':
-    resolution: {integrity: sha512-pfNtErGGzzRwHP+5+RqswzPDKkZrx+Cli0mzjQaus1ZWFsog5ibL+nVT3NcporW51o8ggnt7x813vtRbPiyOrQ==}
-
   '@expo/plist@0.4.9':
     resolution: {integrity: sha512-MPVpmKGfnQEnrCzgxuXcmPP/y/t6AVm+DcSb2Myp21LKWv1N3l8uFxMggesfF4ixAxkRlGmMMx9GyDC9M+XklQ==}
 
@@ -4378,18 +4361,6 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0 || ^8.0.0-0
 
-  babel-preset-expo@54.0.10:
-    resolution: {integrity: sha512-wTt7POavLFypLcPW/uC5v8y+mtQKDJiyGLzYCjqr9tx0Qc3vCXcDKk1iCFIj/++Iy5CWhhTflEa7VvVPNWeCfw==}
-    peerDependencies:
-      '@babel/runtime': ^7.20.0
-      expo: '*'
-      react-refresh: '>=0.14.0 <1.0.0'
-    peerDependenciesMeta:
-      '@babel/runtime':
-        optional: true
-      expo:
-        optional: true
-
   babel-preset-expo@54.0.12:
     resolution: {integrity: sha512-6xeSkdaixmQhWSYL7tfLu0pOS0BY+8ftwmdNSHtpEFSizrXYZkCjk/B6Dxr+6nwNRihixMcS0aBlWS1wlDl3pw==}
     peerDependencies:
@@ -5276,30 +5247,22 @@ packages:
     engines: {node: '>=6.0'}
     hasBin: true
 
-  eslint-plugin-react-compiler@19.1.0-rc.2:
-    resolution: {integrity: sha512-oKalwDGcD+RX9mf3NEO4zOoUMeLvjSvcbbEOpquzmzqEEM2MQdp7/FY/Hx9NzmUwFzH1W9SKTz5fihfMldpEYw==}
-    engines: {node: ^14.17.0 || ^16.0.0 || >= 18.0.0}
-    peerDependencies:
-      eslint: '>=7'
-
   eslint-plugin-react-native-a11y@3.5.1:
     resolution: {integrity: sha512-vqnXZpAiov0lxYNfEYgwABpkiBYRrt0dbtOafPkw6QaFeA0uZ+s3w9opeEMoFmV36WFxLiCxHb9fvOJ+EUc2xQ==}
     engines: {node: '>=12.0'}
     peerDependencies:
       eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8
-
-  eslint-plugin-react-native-globals@0.1.2:
-    resolution: {integrity: sha512-9aEPf1JEpiTjcFAmmyw8eiIXmcNZOqaZyHO77wgm0/dWfT/oxC1SrIq8ET38pMxHYrcB6Uew+TzUVsBeczF88g==}
-
-  eslint-plugin-react-native@5.0.0:
-    resolution: {integrity: sha512-VyWlyCC/7FC/aONibOwLkzmyKg4j9oI8fzrk9WYNs4I8/m436JuOTAFwLvEn1CVvc7La4cPfbCyspP4OYpP52Q==}
-    peerDependencies:
-      eslint: ^3.17.0 || ^4 || ^5 || ^6 || ^7 || ^8 || ^9
+    peerDependenciesMeta:
+      eslint:
+        optional: true
 
   eslint-plugin-simple-import-sort@13.0.0:
     resolution: {integrity: sha512-McAc+/Nlvcg4byY/CABGH8kqnefWBj8s3JA2okEtz8ixbECQgU46p0HkTUKa4YS7wvgGceimlc34p1nXqbWqtA==}
     peerDependencies:
       eslint: '>=5.0.0'
+    peerDependenciesMeta:
+      eslint:
+        optional: true
 
   eslint-scope@5.1.1:
     resolution: {integrity: sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==}
@@ -5475,25 +5438,12 @@ packages:
   expo-eas-client@1.0.8:
     resolution: {integrity: sha512-5or11NJhSeDoHHI6zyvQDW2cz/yFyE+1Cz8NTs5NK8JzC7J0JrkUgptWtxyfB6Xs/21YRNifd3qgbBN3hfKVgA==}
 
-  expo-file-system@19.0.22:
-    resolution: {integrity: sha512-l9pgahSc7sJD0bP9vBNeXvZjy8QKDpVHVxWmei/ESQOrzmoj5BidziqLVsyZdxsi+PfdbTtttLTAmddH/JafYA==}
-    peerDependencies:
-      expo: '*'
-      react-native: '*'
-
   expo-file-system@19.0.23:
     resolution: {integrity: sha512-MeGkid9OeNILfT/qonaXHp4f2c15xaB28U/bcN7pqZej0Kx0+6+V7e9ZIXpPHm07zVatxA+QkMTPQEGfmvVOxA==}
     peerDependencies:
       expo: '*'
       react-native: '*'
 
-  expo-font@14.0.11:
-    resolution: {integrity: sha512-ga0q61ny4s/kr4k8JX9hVH69exVSIfcIc19+qZ7gt71Mqtm7xy2c6kwsPTCyhBW2Ro5yXTT8EaZOpuRi35rHbg==}
-    peerDependencies:
-      expo: '*'
-      react: '*'
-      react-native: '*'
-
   expo-font@14.0.12:
     resolution: {integrity: sha512-QQzunE2Mxk45AsCWm3tK7OpVljbtVnKD58q4/qliev+cbye1IOduUnRIdD+P7DyButw17G9MTX795kgaQiz5hQ==}
     peerDependencies:
@@ -6043,9 +5993,6 @@ packages:
     resolution: {integrity: sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==}
     hasBin: true
 
-  hermes-estree@0.25.1:
-    resolution: {integrity: sha512-0wUoCcLp+5Ev5pDW2OriHC2MJCbwLwuRx+gAqMTOkGKJJiBCLjtrvy4PWUGn6MIVefecRpzoOZ/UV6iGdOr+Cw==}
-
   hermes-estree@0.29.1:
     resolution: {integrity: sha512-jl+x31n4/w+wEqm0I2r4CMimukLbLQEYpisys5oCre611CI5fc9TxhqkBBCJ1edDG4Kza0f7CgNz8xVMLZQOmQ==}
 
@@ -6058,9 +6005,6 @@ packages:
   hermes-estree@0.36.0:
     resolution: {integrity: sha512-A1+8zn5oss2CFP7pKsOaxorQG6FNIz1WU1VDqruLPPZl3LVgeE2C5xfFg8Ow6/Ow4mSslLLtYP1J3n38eKyW9w==}
 
-  hermes-parser@0.25.1:
-    resolution: {integrity: sha512-6pEjquH3rqaI6cYAXYPcz9MS4rY6R4ngRgrgfDshRptUZIc3lw0MCIJIGDj9++mfySOuPTHB4nrSW99BCvOPIA==}
-
   hermes-parser@0.29.1:
     resolution: {integrity: sha512-xBHWmUtRC5e/UL0tI7Ivt2riA/YBq9+SiYFU7C1oBa/j2jYGlIF9043oak1F47ihuDIxQ5nbsKueYJDRY02UgA==}
 
@@ -7305,7 +7249,7 @@ packages:
   node-releases@2.0.44:
     resolution: {integrity: sha512-5WUyunoPMsvvEhS8AxHtRzP+oA8UCkJ7YRxatWKjngndhDGLiqEVAQKWjFAiAiuL8zMRGzGSJxFnLetoa43qGQ==}
 
-  node@runtime:24.18.0:
+  node@runtime:24.19.0:
     resolution:
       type: variations
       variants:
@@ -7313,9 +7257,9 @@ packages:
             archive: tarball
             bin:
               node: bin/node
-            integrity: sha256-ZGOiNzn2sjAOvsXM1gJ14TjjhY/Br8bo+bxOT2pLdvo=
+            integrity: sha256-9ONcExZd5ogMqiVYwKpIyoitpH/iI0vtB9Ztu4CkfI0=
             type: binary
-            url: https://nodejs.org/download/release/v24.18.0/node-v24.18.0-aix-ppc64.tar.gz
+            url: https://nodejs.org/download/release/v24.19.0/node-v24.19.0-aix-ppc64.tar.gz
           targets:
             - cpu: ppc64
               os: aix
@@ -7323,9 +7267,9 @@ packages:
             archive: tarball
             bin:
               node: bin/node
-            integrity: sha256-4al+FMmcgD6WxzOUAyguoFpJnDL42D3v6e9exm+XntE=
+            integrity: sha256-gpS3qpsDmXSBwGur8eiycMhZNY8n2lehFQmv5TesOB0=
             type: binary
-            url: https://nodejs.org/download/release/v24.18.0/node-v24.18.0-darwin-arm64.tar.gz
+            url: https://nodejs.org/download/release/v24.19.0/node-v24.19.0-darwin-arm64.tar.gz
           targets:
             - cpu: arm64
               os: darwin
@@ -7333,9 +7277,9 @@ packages:
             archive: tarball
             bin:
               node: bin/node
-            integrity: sha256-39Db0+chUDQ033tyBecZ9hs6OjGyvPlym4uR/qJA8IA=
+            integrity: sha256-0bXpmdsVjGL+j3JnpEdrA12L2TsaYFusJKPw3RZuMxY=
             type: binary
-            url: https://nodejs.org/download/release/v24.18.0/node-v24.18.0-darwin-x64.tar.gz
+            url: https://nodejs.org/download/release/v24.19.0/node-v24.19.0-darwin-x64.tar.gz
           targets:
             - cpu: x64
               os: darwin
@@ -7343,9 +7287,9 @@ packages:
             archive: tarball
             bin:
               node: bin/node
-            integrity: sha256-a0SEwhkCdBdd+aqPKOLXWKgZyxwf5qtIHi+VtGOrhQg=
+            integrity: sha256-0oyKW/CoCPDtQ0odzoxUrpjwNxwL2GrFirxhP3PmZD8=
             type: binary
-            url: https://nodejs.org/download/release/v24.18.0/node-v24.18.0-linux-arm64.tar.gz
+            url: https://nodejs.org/download/release/v24.19.0/node-v24.19.0-linux-arm64.tar.gz
           targets:
             - cpu: arm64
               os: linux
@@ -7353,9 +7297,9 @@ packages:
             archive: tarball
             bin:
               node: bin/node
-            integrity: sha256-/hM4ly95KDxrwh5h2/RXa76MBa3tKZnUHIZDrTAmUUI=
+            integrity: sha256-sxqMTLxYn5FS8y/bQxhGl1nhZViltdk7f/L7KHsBPbI=
             type: binary
-            url: https://nodejs.org/download/release/v24.18.0/node-v24.18.0-linux-ppc64le.tar.gz
+            url: https://nodejs.org/download/release/v24.19.0/node-v24.19.0-linux-ppc64le.tar.gz
           targets:
             - cpu: ppc64le
               os: linux
@@ -7363,9 +7307,9 @@ packages:
             archive: tarball
             bin:
               node: bin/node
-            integrity: sha256-Nx68E5RfwWlJPnUvLdr6+rbs2My0Ubz/RuCfacXdjHo=
+            integrity: sha256-s6tqQ5KCjbn9TtloOY1VGIKSvMFYGVQtU74LEQDjMvw=
             type: binary
-            url: https://nodejs.org/download/release/v24.18.0/node-v24.18.0-linux-s390x.tar.gz
+            url: https://nodejs.org/download/release/v24.19.0/node-v24.19.0-linux-s390x.tar.gz
           targets:
             - cpu: s390x
               os: linux
@@ -7373,9 +7317,9 @@ packages:
             archive: tarball
             bin:
               node: bin/node
-            integrity: sha256-eDEwmElj23upy9AQierywu+wVcfBaTyUMXS5Z7MFDLg=
+            integrity: sha256-9iXZfNcH30/5YlSRb7xf8BTwnAnv/loeDKj21BqHidQ=
             type: binary
-            url: https://nodejs.org/download/release/v24.18.0/node-v24.18.0-linux-x64.tar.gz
+            url: https://nodejs.org/download/release/v24.19.0/node-v24.19.0-linux-x64.tar.gz
           targets:
             - cpu: x64
               os: linux
@@ -7383,10 +7327,10 @@ packages:
             archive: zip
             bin:
               node: node.exe
-            integrity: sha256-8nRmmtuTsf0Pv48h/QeGCencyEMz1PJxjS3eP5oWGgE=
-            prefix: node-v24.18.0-win-arm64
+            integrity: sha256-hQL0pQtFjUzDjtjyABVWws0jnUZJIPdAF5Jsyx4cFX8=
+            prefix: node-v24.19.0-win-arm64
             type: binary
-            url: https://nodejs.org/download/release/v24.18.0/node-v24.18.0-win-arm64.zip
+            url: https://nodejs.org/download/release/v24.19.0/node-v24.19.0-win-arm64.zip
           targets:
             - cpu: arm64
               os: win32
@@ -7394,10 +7338,10 @@ packages:
             archive: zip
             bin:
               node: node.exe
-            integrity: sha256-CuaEBrQtdyVmHal5sUA+yZJtogXGdwgn8zqsnY8m6CE=
-            prefix: node-v24.18.0-win-x64
+            integrity: sha256-V/cas2UueX2ErN3HnIHMn/HG3bKhl0zbg/AP7pv/THM=
+            prefix: node-v24.19.0-win-x64
             type: binary
-            url: https://nodejs.org/download/release/v24.18.0/node-v24.18.0-win-x64.zip
+            url: https://nodejs.org/download/release/v24.19.0/node-v24.19.0-win-x64.zip
           targets:
             - cpu: x64
               os: win32
@@ -7405,9 +7349,9 @@ packages:
             archive: tarball
             bin:
               node: bin/node
-            integrity: sha256-scbC3DG0bdj7IyL0/nWwfndcUSC8NyUd7uoo9SnUVns=
+            integrity: sha256-IIJOTTWUj65bM33M70eBOwTYmVMS9Z33OG8iVtn5q34=
             type: binary
-            url: https://unofficial-builds.nodejs.org/download/release/v24.18.0/node-v24.18.0-linux-arm64-musl.tar.gz
+            url: https://unofficial-builds.nodejs.org/download/release/v24.19.0/node-v24.19.0-linux-arm64-musl.tar.gz
           targets:
             - cpu: arm64
               os: linux
@@ -7416,14 +7360,14 @@ packages:
             archive: tarball
             bin:
               node: bin/node
-            integrity: sha256-6lhAmRHhQexrGdkXjvotkYWhMpUAWxy/VSGzFX7tHZU=
+            integrity: sha256-xgIjeG3xSl0j4iDruOYDGPUyJkCmL5Dm2eVNOhjaUy4=
             type: binary
-            url: https://unofficial-builds.nodejs.org/download/release/v24.18.0/node-v24.18.0-linux-x64-musl.tar.gz
+            url: https://unofficial-builds.nodejs.org/download/release/v24.19.0/node-v24.19.0-linux-x64-musl.tar.gz
           targets:
             - cpu: x64
               os: linux
               libc: musl
-    version: 24.18.0
+    version: 24.19.0
     hasBin: true
 
   normalize-path@3.0.0:
@@ -7951,11 +7895,6 @@ packages:
     resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
     engines: {node: '>= 0.8.0'}
 
-  prettier@3.8.3:
-    resolution: {integrity: sha512-7igPTM53cGHMW8xWuVTydi2KO233VFiTNyF5hLJqpilHfmn8C8gPf+PS7dUT64YcXFbiMGZxS9pCSxL/Dxm/Jw==}
-    engines: {node: '>=14'}
-    hasBin: true
-
   prettier@3.9.6:
     resolution: {integrity: sha512-OpN0zzVdiaiAhxpuuj5efpIS4sY9j7bY6uR5mnj5yPzGkdkjNKSJeUThPb60Jw29QuAZgA4o+/iB49kFiaBX6g==}
     engines: {node: '>=14'}
@@ -9694,12 +9633,6 @@ packages:
     resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==}
     engines: {node: '>=10'}
 
-  zod-validation-error@3.5.4:
-    resolution: {integrity: sha512-+hEiRIiPobgyuFlEojnqjJnhFvg4r/i3cqgcm67eehZf/WBaK3g6cD02YU9mtdVxZjv8CzCA9n/Rhrs3yAAvAw==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      zod: ^3.24.4
-
   zod@3.25.76:
     resolution: {integrity: sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ==}
 
@@ -10088,14 +10021,6 @@ snapshots:
       '@babel/core': 7.29.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-proposal-private-methods@7.18.6(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)':
-    dependencies:
-      '@babel/core': 7.29.0(supports-color@8.1.1)
-      '@babel/helper-create-class-features-plugin': 7.29.3(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
-      '@babel/helper-plugin-utils': 7.28.6
-    transitivePeerDependencies:
-      - supports-color
-
   '@babel/plugin-proposal-private-property-in-object@7.21.0-placeholder-for-preset-env.2(@babel/core@7.29.0(supports-color@8.1.1))':
     dependencies:
       '@babel/core': 7.29.0(supports-color@8.1.1)
@@ -10952,8 +10877,10 @@ snapshots:
     dependencies:
       eslint: 8.57.1(supports-color@8.1.1)
       eslint-visitor-keys: 3.4.3
+    optional: true
 
-  '@eslint-community/regexpp@4.12.2': {}
+  '@eslint-community/regexpp@4.12.2':
+    optional: true
 
   '@eslint/eslintrc@2.1.4(supports-color@8.1.1)':
     dependencies:
@@ -10968,8 +10895,10 @@ snapshots:
       strip-json-comments: 3.1.1
     transitivePeerDependencies:
       - supports-color
+    optional: true
 
-  '@eslint/js@8.57.1': {}
+  '@eslint/js@8.57.1':
+    optional: true
 
   '@expo/cli@54.0.25(c1408f750868568d2dc75671b50084a7)':
     dependencies:
@@ -11052,8 +10981,8 @@ snapshots:
   '@expo/config-plugins@54.0.4(supports-color@8.1.1)':
     dependencies:
       '@expo/config-types': 54.0.10
-      '@expo/json-file': 10.0.14
-      '@expo/plist': 0.4.8
+      '@expo/json-file': 10.0.16
+      '@expo/plist': 0.4.9
       '@expo/sdk-runtime-versions': 1.0.0
       chalk: 4.1.2
       debug: 4.4.3(supports-color@8.1.1)
@@ -11096,7 +11025,7 @@ snapshots:
       '@babel/code-frame': 7.10.4
       '@expo/config-plugins': 54.0.4(supports-color@8.1.1)
       '@expo/config-types': 54.0.10
-      '@expo/json-file': 10.0.14
+      '@expo/json-file': 10.2.0
       deepmerge: 4.3.1
       getenv: 2.0.0
       glob: 13.0.6
@@ -11161,11 +11090,6 @@ snapshots:
       resolve-from: 5.0.0
       semver: 7.8.0
 
-  '@expo/json-file@10.0.14':
-    dependencies:
-      '@babel/code-frame': 7.29.0
-      json5: 2.2.3
-
   '@expo/json-file@10.0.16':
     dependencies:
       '@babel/code-frame': 7.10.4
@@ -11238,7 +11162,7 @@ snapshots:
 
   '@expo/package-manager@1.10.5':
     dependencies:
-      '@expo/json-file': 10.0.14
+      '@expo/json-file': 10.2.0
       '@expo/spawn-async': 1.7.2
       chalk: 4.1.2
       npm-package-arg: 11.0.3
@@ -11251,12 +11175,6 @@ snapshots:
       base64-js: 1.5.1
       xmlbuilder: 15.1.1
 
-  '@expo/plist@0.4.8':
-    dependencies:
-      '@xmldom/xmldom': 0.8.13
-      base64-js: 1.5.1
-      xmlbuilder: 15.1.1
-
   '@expo/plist@0.4.9':
     dependencies:
       '@xmldom/xmldom': 0.8.13
@@ -11269,7 +11187,7 @@ snapshots:
       '@expo/config-plugins': 54.0.4(supports-color@8.1.1)
       '@expo/config-types': 54.0.10
       '@expo/image-utils': 0.8.12
-      '@expo/json-file': 10.0.14
+      '@expo/json-file': 10.2.0
       '@react-native/normalize-colors': 0.81.5
       debug: 4.4.3(supports-color@8.1.1)
       expo: 54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1)
@@ -11420,10 +11338,13 @@ snapshots:
       minimatch: 3.1.5
     transitivePeerDependencies:
       - supports-color
+    optional: true
 
-  '@humanwhocodes/module-importer@1.0.1': {}
+  '@humanwhocodes/module-importer@1.0.1':
+    optional: true
 
-  '@humanwhocodes/object-schema@2.0.3': {}
+  '@humanwhocodes/object-schema@2.0.3':
+    optional: true
 
   '@ide/backoff@1.0.0': {}
 
@@ -13577,6 +13498,7 @@ snapshots:
   acorn-jsx@5.3.2(acorn@8.16.0):
     dependencies:
       acorn: 8.16.0
+    optional: true
 
   acorn-walk@8.3.5:
     dependencies:
@@ -13874,38 +13796,6 @@ snapshots:
       '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@7.29.0(supports-color@8.1.1))
       '@babel/plugin-syntax-top-level-await': 7.14.5(@babel/core@7.29.0(supports-color@8.1.1))
 
-  babel-preset-expo@54.0.10(@babel/core@7.29.0(supports-color@8.1.1))(@babel/runtime@7.29.2)(expo@54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1))(react-refresh@0.14.2)(supports-color@8.1.1):
-    dependencies:
-      '@babel/helper-module-imports': 7.28.6(supports-color@8.1.1)
-      '@babel/plugin-proposal-decorators': 7.29.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
-      '@babel/plugin-proposal-export-default-from': 7.27.1(@babel/core@7.29.0(supports-color@8.1.1))
-      '@babel/plugin-syntax-export-default-from': 7.28.6(@babel/core@7.29.0(supports-color@8.1.1))
-      '@babel/plugin-transform-class-static-block': 7.28.6(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
-      '@babel/plugin-transform-export-namespace-from': 7.27.1(@babel/core@7.29.0(supports-color@8.1.1))
-      '@babel/plugin-transform-flow-strip-types': 7.27.1(@babel/core@7.29.0(supports-color@8.1.1))
-      '@babel/plugin-transform-modules-commonjs': 7.28.6(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
-      '@babel/plugin-transform-object-rest-spread': 7.28.6(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
-      '@babel/plugin-transform-parameters': 7.27.7(@babel/core@7.29.0(supports-color@8.1.1))
-      '@babel/plugin-transform-private-methods': 7.28.6(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
-      '@babel/plugin-transform-private-property-in-object': 7.28.6(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
-      '@babel/plugin-transform-runtime': 7.29.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
-      '@babel/preset-react': 7.28.5(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
-      '@babel/preset-typescript': 7.28.5(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
-      '@react-native/babel-preset': 0.81.5(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
-      babel-plugin-react-compiler: 1.0.0
-      babel-plugin-react-native-web: 0.21.2
-      babel-plugin-syntax-hermes-parser: 0.29.1
-      babel-plugin-transform-flow-enums: 0.0.2(@babel/core@7.29.0(supports-color@8.1.1))
-      debug: 4.4.3(supports-color@8.1.1)
-      react-refresh: 0.14.2
-      resolve-from: 5.0.0
-    optionalDependencies:
-      '@babel/runtime': 7.29.2
-      expo: 54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1)
-    transitivePeerDependencies:
-      - '@babel/core'
-      - supports-color
-
   babel-preset-expo@54.0.12(@babel/core@7.29.0(supports-color@8.1.1))(@babel/runtime@7.29.2)(expo@54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1))(react-refresh@0.14.2)(supports-color@8.1.1):
     dependencies:
       '@babel/helper-module-imports': 7.28.6(supports-color@8.1.1)
@@ -14580,7 +14470,8 @@ snapshots:
 
   deep-extend@0.6.0: {}
 
-  deep-is@0.1.4: {}
+  deep-is@0.1.4:
+    optional: true
 
   deepmerge@4.3.1: {}
 
@@ -14649,6 +14540,7 @@ snapshots:
   doctrine@3.0.0:
     dependencies:
       esutils: 2.0.3
+    optional: true
 
   dom-converter@0.2.0:
     dependencies:
@@ -14893,34 +14785,16 @@ snapshots:
     optionalDependencies:
       source-map: 0.6.1
 
-  eslint-plugin-react-compiler@19.1.0-rc.2(eslint@8.57.1(supports-color@8.1.1))(supports-color@8.1.1):
-    dependencies:
-      '@babel/core': 7.29.0(supports-color@8.1.1)
-      '@babel/parser': 7.29.3
-      '@babel/plugin-proposal-private-methods': 7.18.6(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
-      eslint: 8.57.1(supports-color@8.1.1)
-      hermes-parser: 0.25.1
-      zod: 3.25.76
-      zod-validation-error: 3.5.4(zod@3.25.76)
-    transitivePeerDependencies:
-      - supports-color
-
   eslint-plugin-react-native-a11y@3.5.1(eslint@8.57.1(supports-color@8.1.1)):
     dependencies:
       '@babel/runtime': 7.29.2
       ast-types-flow: 0.0.7
-      eslint: 8.57.1(supports-color@8.1.1)
       jsx-ast-utils: 3.3.5
-
-  eslint-plugin-react-native-globals@0.1.2: {}
-
-  eslint-plugin-react-native@5.0.0(eslint@8.57.1(supports-color@8.1.1)):
-    dependencies:
+    optionalDependencies:
       eslint: 8.57.1(supports-color@8.1.1)
-      eslint-plugin-react-native-globals: 0.1.2
 
   eslint-plugin-simple-import-sort@13.0.0(eslint@8.57.1(supports-color@8.1.1)):
-    dependencies:
+    optionalDependencies:
       eslint: 8.57.1(supports-color@8.1.1)
 
   eslint-scope@5.1.1:
@@ -14932,8 +14806,10 @@ snapshots:
     dependencies:
       esrecurse: 4.3.0
       estraverse: 5.3.0
+    optional: true
 
-  eslint-visitor-keys@3.4.3: {}
+  eslint-visitor-keys@3.4.3:
+    optional: true
 
   eslint@8.57.1(supports-color@8.1.1):
     dependencies:
@@ -14977,6 +14853,7 @@ snapshots:
       text-table: 0.2.0
     transitivePeerDependencies:
       - supports-color
+    optional: true
 
   esm@3.2.25:
     optional: true
@@ -14986,12 +14863,14 @@ snapshots:
       acorn: 8.16.0
       acorn-jsx: 5.3.2(acorn@8.16.0)
       eslint-visitor-keys: 3.4.3
+    optional: true
 
   esprima@4.0.1: {}
 
   esquery@1.7.0:
     dependencies:
       estraverse: 5.3.0
+    optional: true
 
   esrecurse@4.3.0:
     dependencies:
@@ -15141,23 +15020,11 @@ snapshots:
 
   expo-eas-client@1.0.8: {}
 
-  expo-file-system@19.0.22(83f21d12a6c1aa99b4a65d070875cc68):
-    dependencies:
-      expo: 54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1)
-      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1)
-
   expo-file-system@19.0.23(83f21d12a6c1aa99b4a65d070875cc68):
     dependencies:
       expo: 54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1)
       react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1)
 
-  expo-font@14.0.11(83e0f64f4281e4798012214ad5b2d72d):
-    dependencies:
-      expo: 54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1)
-      fontfaceobserver: 2.3.0
-      react: 19.1.0
-      react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1)
-
   expo-font@14.0.12(83e0f64f4281e4798012214ad5b2d72d):
     dependencies:
       expo: 54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0))(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0)(supports-color@8.1.1)
@@ -15338,7 +15205,7 @@ snapshots:
   expo-updates@29.0.17(patch_hash=04f28cb005b770e9ae8f0065eab96e43cbb1e58107f5f6ad1bdd18f6deb66487)(93a6abd34ab5ae64aff6a80525489f34):
     dependencies:
       '@expo/code-signing-certificates': 0.0.6
-      '@expo/plist': 0.4.8
+      '@expo/plist': 0.4.9
       '@expo/spawn-async': 1.7.2
       arg: 4.1.0
       chalk: 4.1.2
@@ -15466,7 +15333,8 @@ snapshots:
       json-schema-ref-resolver: 3.0.0
       rfdc: 1.4.1
 
-  fast-levenshtein@2.0.6: {}
+  fast-levenshtein@2.0.6:
+    optional: true
 
   fast-text-encoding@1.0.6: {}
 
@@ -15505,6 +15373,7 @@ snapshots:
   file-entry-cache@6.0.1:
     dependencies:
       flat-cache: 3.2.0
+    optional: true
 
   file-loader@6.2.0(webpack@5.106.2(clean-css@5.3.3)(cssnano@5.1.15(postcss@8.5.14))(csso@5.0.5)(esbuild@0.25.12)(html-minifier-terser@6.1.0)(lightningcss@1.32.0)(postcss@8.5.14)):
     dependencies:
@@ -15575,8 +15444,10 @@ snapshots:
       flatted: 3.4.4
       keyv: 4.5.4
       rimraf: 3.0.2
+    optional: true
 
-  flatted@3.4.4: {}
+  flatted@3.4.4:
+    optional: true
 
   flow-enums-runtime@0.0.6: {}
 
@@ -15732,6 +15603,7 @@ snapshots:
   globals@13.24.0:
     dependencies:
       type-fest: 0.20.2
+    optional: true
 
   globals@17.6.0: {}
 
@@ -15761,7 +15633,8 @@ snapshots:
 
   graceful-fs@4.2.11: {}
 
-  graphemer@1.4.0: {}
+  graphemer@1.4.0:
+    optional: true
 
   gzip-size@6.0.0:
     dependencies:
@@ -15795,8 +15668,6 @@ snapshots:
 
   he@1.2.0: {}
 
-  hermes-estree@0.25.1: {}
-
   hermes-estree@0.29.1: {}
 
   hermes-estree@0.32.0: {}
@@ -15805,10 +15676,6 @@ snapshots:
 
   hermes-estree@0.36.0: {}
 
-  hermes-parser@0.25.1:
-    dependencies:
-      hermes-estree: 0.25.1
-
   hermes-parser@0.29.1:
     dependencies:
       hermes-estree: 0.29.1
@@ -16137,7 +16004,8 @@ snapshots:
     dependencies:
       path-is-inside: 1.0.2
 
-  is-path-inside@3.0.3: {}
+  is-path-inside@3.0.3:
+    optional: true
 
   is-plain-obj@2.1.0: {}
 
@@ -16385,7 +16253,7 @@ snapshots:
   jest-expo@54.0.17(ff9d3150c2730c411fa3a2f331cc40ee):
     dependencies:
       '@expo/config': 12.0.13(supports-color@8.1.1)
-      '@expo/json-file': 10.0.14
+      '@expo/json-file': 10.2.0
       '@jest/create-cache-key-function': 29.7.0
       '@jest/globals': 29.7.0(supports-color@8.1.1)
       babel-jest: 29.7.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1)
@@ -16731,7 +16599,8 @@ snapshots:
 
   jsesc@3.1.0: {}
 
-  json-buffer@3.0.1: {}
+  json-buffer@3.0.1:
+    optional: true
 
   json-parse-even-better-errors@2.3.1: {}
 
@@ -16743,7 +16612,8 @@ snapshots:
 
   json-schema-traverse@1.0.0: {}
 
-  json-stable-stringify-without-jsonify@1.0.1: {}
+  json-stable-stringify-without-jsonify@1.0.1:
+    optional: true
 
   json5@2.2.3: {}
 
@@ -16765,6 +16635,7 @@ snapshots:
   keyv@4.5.4:
     dependencies:
       json-buffer: 3.0.1
+    optional: true
 
   kleur@3.0.3: {}
 
@@ -16785,6 +16656,7 @@ snapshots:
     dependencies:
       prelude-ls: 1.2.1
       type-check: 0.4.0
+    optional: true
 
   libphonenumber-js@1.13.1: {}
 
@@ -16896,7 +16768,8 @@ snapshots:
 
   lodash.memoize@4.1.2: {}
 
-  lodash.merge@4.6.2: {}
+  lodash.merge@4.6.2:
+    optional: true
 
   lodash.shuffle@4.2.0: {}
 
@@ -17480,7 +17353,7 @@ snapshots:
 
   node-releases@2.0.44: {}
 
-  node@runtime:24.18.0: {}
+  node@runtime:24.19.0: {}
 
   normalize-path@3.0.0: {}
 
@@ -17595,6 +17468,7 @@ snapshots:
       prelude-ls: 1.2.1
       type-check: 0.4.0
       word-wrap: 1.2.5
+    optional: true
 
   ora@3.4.0:
     dependencies:
@@ -18002,9 +17876,8 @@ snapshots:
       picocolors: 1.1.1
       source-map-js: 1.2.1
 
-  prelude-ls@1.2.1: {}
-
-  prettier@3.8.3: {}
+  prelude-ls@1.2.1:
+    optional: true
 
   prettier@3.9.6: {}
 
@@ -19320,7 +19193,8 @@ snapshots:
     dependencies:
       utrie: 1.0.2
 
-  text-table@0.2.0: {}
+  text-table@0.2.0:
+    optional: true
 
   thenify-all@1.6.0:
     dependencies:
@@ -19412,10 +19286,12 @@ snapshots:
   type-check@0.4.0:
     dependencies:
       prelude-ls: 1.2.1
+    optional: true
 
   type-detect@4.0.8: {}
 
-  type-fest@0.20.2: {}
+  type-fest@0.20.2:
+    optional: true
 
   type-fest@0.21.3: {}
 
@@ -19868,7 +19744,8 @@ snapshots:
 
   wonka@6.3.6: {}
 
-  word-wrap@1.2.5: {}
+  word-wrap@1.2.5:
+    optional: true
 
   wrap-ansi@10.0.0:
     dependencies:
@@ -19998,8 +19875,4 @@ snapshots:
 
   yocto-queue@0.1.0: {}
 
-  zod-validation-error@3.5.4(zod@3.25.76):
-    dependencies:
-      zod: 3.25.76
-
   zod@3.25.76: {}
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index 06aef9e617..a68437184d 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -1,6 +1,15 @@
 nodeLinker: 'hoisted'
 autoInstallPeers: true # default: true
 strictPeerDependencies: false # default: false
+packageExtensions:
+  eslint-plugin-react-native-a11y:
+    peerDependenciesMeta:
+      eslint:
+        optional: true
+  eslint-plugin-simple-import-sort:
+    peerDependenciesMeta:
+      eslint:
+        optional: true
 trustPolicy: 'no-downgrade' # default: off
 trustPolicyIgnoreAfter: 10080 # 7 days, default: undefined
 overrides:
diff --git a/src/ageAssurance/data.tsx b/src/ageAssurance/data.tsx
index e5cedf81ae..807e195a4d 100644
--- a/src/ageAssurance/data.tsx
+++ b/src/ageAssurance/data.tsx
@@ -99,8 +99,7 @@ export async function getConfig() {
   return await getPublicAppviewClient().call(app.bsky.ageassurance.getConfig)
 }
 export function getConfigFromCache():
-  | app.bsky.ageassurance.getConfig.$OutputBody
-  | undefined {
+  app.bsky.ageassurance.getConfig.$OutputBody | undefined {
   return qc.getQueryData<app.bsky.ageassurance.getConfig.$OutputBody>(
     configQueryKey,
   )
diff --git a/src/ageAssurance/debug.ts b/src/ageAssurance/debug.ts
index b640c4a2de..4b8041a9de 100644
--- a/src/ageAssurance/debug.ts
+++ b/src/ageAssurance/debug.ts
@@ -29,8 +29,7 @@ export const otherRequiredData: OtherRequiredData = {
 
 const serverStateEnabled = false || IS_E2E
 export const serverState:
-  | app.bsky.ageassurance.getState.$OutputBody
-  | undefined = serverStateEnabled
+  app.bsky.ageassurance.getState.$OutputBody | undefined = serverStateEnabled
   ? {
       state: {
         lastInitiatedAt: undefined, // new Date(2025, 1, 1).toISOString(),
diff --git a/src/analytics/metrics/types.ts b/src/analytics/metrics/types.ts
index 99daeec162..6e30c9d912 100644
--- a/src/analytics/metrics/types.ts
+++ b/src/analytics/metrics/types.ts
@@ -276,12 +276,7 @@ export type Events = {
   }
   'composer:open': {
     logContext:
-      | 'Fab'
-      | 'PostReply'
-      | 'QuotePost'
-      | 'ProfileFeed'
-      | 'Deeplink'
-      | 'Other'
+      'Fab' | 'PostReply' | 'QuotePost' | 'ProfileFeed' | 'Deeplink' | 'Other'
     isReply: boolean
     hasQuote: boolean
     hasDraft: boolean
@@ -596,10 +591,7 @@ export type Events = {
   }
   'chat:create': {
     logContext:
-      | 'ProfileHeader'
-      | 'NewChatDialog'
-      | 'SendViaChatDialog'
-      | 'ConvoSettings'
+      'ProfileHeader' | 'NewChatDialog' | 'SendViaChatDialog' | 'ConvoSettings'
   }
   'chat:open': {
     logContext:
@@ -1340,10 +1332,7 @@ export type Events = {
   // invite friends dialog opened, with the surface that triggered it
   'invite:dialog:open': {
     logContext:
-      | 'ProfileHeader'
-      | 'Drawer'
-      | 'FindContactsSettings'
-      | 'NuxAnnouncement'
+      'ProfileHeader' | 'Drawer' | 'FindContactsSettings' | 'NuxAnnouncement'
   }
   // user copied the invite link to clipboard
   'invite:action:copy': {}
diff --git a/src/components/Autocomplete/types.ts b/src/components/Autocomplete/types.ts
index 6f2610d177..ddfc9c12ce 100644
--- a/src/components/Autocomplete/types.ts
+++ b/src/components/Autocomplete/types.ts
@@ -31,10 +31,7 @@ export type AutocompleteSearch = {
 }
 
 export type AutocompleteItem =
-  | AutocompleteProfile
-  | AutocompleteTag
-  | AutocompleteEmoji
-  | AutocompleteSearch
+  AutocompleteProfile | AutocompleteTag | AutocompleteEmoji | AutocompleteSearch
 
 export type AutocompleteItemType = AutocompleteItem['type']
 
diff --git a/src/components/Button.tsx b/src/components/Button.tsx
index 2d02bb832f..54332fbc07 100644
--- a/src/components/Button.tsx
+++ b/src/components/Button.tsx
@@ -86,8 +86,7 @@ export type ButtonState = {
 export type ButtonContext = VariantProps & ButtonState
 
 type NonTextElements =
-  | React.ReactElement
-  | Iterable<React.ReactElement | null | undefined | boolean>
+  React.ReactElement | Iterable<React.ReactElement | null | undefined | boolean>
 
 export type ButtonProps = Pick<
   PressableProps,
diff --git a/src/components/dialogs/EmailDialog/data/useManageEmail2FA.ts b/src/components/dialogs/EmailDialog/data/useManageEmail2FA.ts
index d00e487474..9f811b4818 100644
--- a/src/components/dialogs/EmailDialog/data/useManageEmail2FA.ts
+++ b/src/components/dialogs/EmailDialog/data/useManageEmail2FA.ts
@@ -13,8 +13,7 @@ export function useManageEmail2FA() {
       enabled,
       token,
     }:
-      | {enabled: true; token?: undefined}
-      | {enabled: false; token: string}) => {
+      {enabled: true; token?: undefined} | {enabled: false; token: string}) => {
       if (!currentAccount?.email) {
         throw new Error('No email found for the current account')
       }
diff --git a/src/components/dialogs/SearchablePeopleList.tsx b/src/components/dialogs/SearchablePeopleList.tsx
index d368d25558..fdbdf0b7e3 100644
--- a/src/components/dialogs/SearchablePeopleList.tsx
+++ b/src/components/dialogs/SearchablePeopleList.tsx
@@ -66,11 +66,7 @@ type ErrorItem = {
 }
 
 type Item =
-  | ProfileItem
-  | ExistingChatItem
-  | EmptyItem
-  | PlaceholderItem
-  | ErrorItem
+  ProfileItem | ExistingChatItem | EmptyItem | PlaceholderItem | ErrorItem
 
 export function SearchablePeopleList({
   title,
diff --git a/src/components/dms/replyPreview.ts b/src/components/dms/replyPreview.ts
index e33dd75bae..91a736f269 100644
--- a/src/components/dms/replyPreview.ts
+++ b/src/components/dms/replyPreview.ts
@@ -11,9 +11,7 @@ import * as bsky from '#/types/bsky'
  * record (post/feed/list/etc.) so the caller can render a translated label.
  */
 type ReplyEmbedSummary =
-  | {type: 'external'; uri: string}
-  | {type: 'post'}
-  | {type: 'unknown'}
+  {type: 'external'; uri: string} | {type: 'post'} | {type: 'unknown'}
 
 function summarizeReplyEmbed(
   embed: chat.bsky.convo.defs.MessageView['embed'],
diff --git a/src/components/dms/util.ts b/src/components/dms/util.ts
index f44398f6f0..2618a84db8 100644
--- a/src/components/dms/util.ts
+++ b/src/components/dms/util.ts
@@ -62,9 +62,7 @@ export function resolveAllowGroupInvites(
   chat: {allowIncoming?: string; allowGroupInvites?: string} | undefined,
 ): 'all' | 'none' | 'following' {
   return (chat?.allowGroupInvites ?? chat?.allowIncoming ?? 'following') as
-    | 'all'
-    | 'none'
-    | 'following'
+    'all' | 'none' | 'following'
 }
 
 export function localDateString(date: Date) {
diff --git a/src/env/common.ts b/src/env/common.ts
index 0490859898..bd56d6cc53 100644
--- a/src/env/common.ts
+++ b/src/env/common.ts
@@ -14,11 +14,7 @@ export const RELEASE_VERSION: string =
  * The env the app is running in e.g. development, testflight, production, e2e
  */
 export const ENV: string = process.env.EXPO_PUBLIC_ENV as
-  | 'production'
-  | 'testflight'
-  | 'development'
-  | 'e2e'
-  | (string & {})
+  'production' | 'testflight' | 'development' | 'e2e' | (string & {})
 
 /**
  * Indicates whether the app is running in TestFlight
@@ -62,10 +58,7 @@ export const BUNDLE_DATE: number =
  * The log level for the app.
  */
 export const LOG_LEVEL = (process.env.EXPO_PUBLIC_LOG_LEVEL || 'info') as
-  | 'debug'
-  | 'info'
-  | 'warn'
-  | 'error'
+  'debug' | 'info' | 'warn' | 'error'
 
 /**
  * Enable debug logs for specific logger instances
diff --git a/src/features/inviteFriends/themes.ts b/src/features/inviteFriends/themes.ts
index 7cb64131e1..9834adfc1b 100644
--- a/src/features/inviteFriends/themes.ts
+++ b/src/features/inviteFriends/themes.ts
@@ -6,12 +6,7 @@
  * follows handleColor.
  */
 export type InviteThemeKey =
-  | 'dawn'
-  | 'sunlight'
-  | 'day'
-  | 'dusk'
-  | 'twilight'
-  | 'night'
+  'dawn' | 'sunlight' | 'day' | 'dusk' | 'twilight' | 'night'
 
 export type InviteThemeVariant = {
   /** QR data + eye color */
diff --git a/src/features/liveEvents/types.ts b/src/features/liveEvents/types.ts
index 8bc88c448c..95a9179d20 100644
--- a/src/features/liveEvents/types.ts
+++ b/src/features/liveEvents/types.ts
@@ -21,7 +21,4 @@ export type LiveEventsWorkerResponse = {
 }
 
 export type LiveEventFeedMetricContext =
-  | 'explore'
-  | 'discover'
-  | 'sidebar'
-  | 'settings'
+  'explore' | 'discover' | 'sidebar' | 'settings'
diff --git a/src/lib/ThemeContext.tsx b/src/lib/ThemeContext.tsx
index 19abb9a7f8..97cd8c2a21 100644
--- a/src/lib/ThemeContext.tsx
+++ b/src/lib/ThemeContext.tsx
@@ -8,11 +8,7 @@ import {darkTheme, defaultTheme, dimTheme} from './themes'
 export type ColorScheme = 'light' | 'dark'
 
 export type PaletteColorName =
-  | 'default'
-  | 'primary'
-  | 'secondary'
-  | 'inverted'
-  | 'error'
+  'default' | 'primary' | 'secondary' | 'inverted' | 'error'
 export type PaletteColor = {
   background: string
   backgroundLight: string
diff --git a/src/lib/hooks/useOTAUpdates.ts b/src/lib/hooks/useOTAUpdates.ts
index 180102c2cd..143eb5c619 100644
--- a/src/lib/hooks/useOTAUpdates.ts
+++ b/src/lib/hooks/useOTAUpdates.ts
@@ -60,8 +60,7 @@ function getRunningChannel(
    * entirely from embedded manifests, so narrow it ourselves.
    */
   const manifest = currentlyRunning?.manifest as
-    | {metadata?: {channel?: unknown}}
-    | undefined
+    {metadata?: {channel?: unknown}} | undefined
   const channel = manifest?.metadata?.channel
   if (typeof channel === 'string' && channel) {
     return channel
diff --git a/src/lib/media/video/multipart/types.ts b/src/lib/media/video/multipart/types.ts
index a0cfd216e3..68901d565b 100644
--- a/src/lib/media/video/multipart/types.ts
+++ b/src/lib/media/video/multipart/types.ts
@@ -44,12 +44,7 @@ export type StartUploadResponse = {
 }
 
 export type UploadState =
-  | 'created'
-  | 'finishing'
-  | 'completed'
-  | 'failed'
-  | 'aborted'
-  | 'expired'
+  'created' | 'finishing' | 'completed' | 'failed' | 'aborted' | 'expired'
 
 export type UploadStatusResponse = {
   jobId: string
diff --git a/src/lib/media/video/types.ts b/src/lib/media/video/types.ts
index 6431c567fa..f929c06664 100644
--- a/src/lib/media/video/types.ts
+++ b/src/lib/media/video/types.ts
@@ -3,10 +3,7 @@
 // on the `video:upload:compressSkipped` analytics event, so the two stay in
 // sync.
 export type VideoCompressSkipReason =
-  | 'gif'
-  | 'below-byte-threshold'
-  | 'no-webcodecs'
-  | 'compress-error-fallback'
+  'gif' | 'below-byte-threshold' | 'no-webcodecs' | 'compress-error-fallback'
 
 export type VideoUploadTransport = 'multipart' | 'legacy' | 'legacy-fallback'
 
diff --git a/src/lib/routes/tab-to-nav-item.ts b/src/lib/routes/tab-to-nav-item.ts
index 38d58b25a4..49471a1e84 100644
--- a/src/lib/routes/tab-to-nav-item.ts
+++ b/src/lib/routes/tab-to-nav-item.ts
@@ -1,11 +1,7 @@
 import {type Events} from '#/analytics/metrics/types'
 
 export type SharedNavTab =
-  | 'Home'
-  | 'Search'
-  | 'Messages'
-  | 'Notifications'
-  | 'MyProfile'
+  'Home' | 'Search' | 'Messages' | 'Notifications' | 'MyProfile'
 
 export const TAB_TO_NAV_ITEM: Record<
   SharedNavTab,
diff --git a/src/lib/routes/types.ts b/src/lib/routes/types.ts
index a038af0225..16a7c64c65 100644
--- a/src/lib/routes/types.ts
+++ b/src/lib/routes/types.ts
@@ -169,8 +169,7 @@ export type AllNavigatorParams = CommonNavigatorParams & {
 export type NavigationProp = NativeStackNavigationProp<AllNavigatorParams>
 
 export type State =
-  | NavigationState
-  | Omit<PartialState<NavigationState>, 'stale'>
+  NavigationState | Omit<PartialState<NavigationState>, 'stale'>
 
 export type RouteParams = Record<string, string>
 export type MatchResult = {params: RouteParams}
diff --git a/src/screens/Messages/ConversationSettings/index.tsx b/src/screens/Messages/ConversationSettings/index.tsx
index ed5d74b198..2ddea16b4c 100644
--- a/src/screens/Messages/ConversationSettings/index.tsx
+++ b/src/screens/Messages/ConversationSettings/index.tsx
@@ -238,14 +238,12 @@ function GroupSettings({
       : []),
   ]
   items.push(
-    ...groupMembers.map(
-      (profile): Item => ({
-        type: 'CHAT_MEMBER',
-        key: profile.did,
-        profile,
-        status: primaryMember?.did === profile.did ? 'owner' : 'standard',
-      }),
-    ),
+    ...groupMembers.map((profile): Item => ({
+      type: 'CHAT_MEMBER',
+      key: profile.did,
+      profile,
+      status: primaryMember?.did === profile.did ? 'owner' : 'standard',
+    })),
   )
   const placeholderCount = Math.max(
     0,
diff --git a/src/screens/Messages/components/MessageInputEmbed.tsx b/src/screens/Messages/components/MessageInputEmbed.tsx
index 0883dfa85e..d5bcd4043c 100644
--- a/src/screens/Messages/components/MessageInputEmbed.tsx
+++ b/src/screens/Messages/components/MessageInputEmbed.tsx
@@ -40,8 +40,7 @@ import * as bsky from '#/types/bsky'
  * embed: either a quoted post or a group chat invite link.
  */
 export type MessageEmbedState =
-  | {type: 'post'; uri: string}
-  | {type: 'invite'; code: string}
+  {type: 'post'; uri: string} | {type: 'invite'; code: string}
 
 export function useMessageEmbed() {
   const route =
diff --git a/src/screens/Messages/components/groupSystemMessages.ts b/src/screens/Messages/components/groupSystemMessages.ts
index 5a6de8fb92..fa71f7d741 100644
--- a/src/screens/Messages/components/groupSystemMessages.ts
+++ b/src/screens/Messages/components/groupSystemMessages.ts
@@ -16,9 +16,7 @@ export type SystemMessageDateDividerItem = {
 }
 
 export type RenderItem =
-  | ConvoItem
-  | SystemMessageGroupItem
-  | SystemMessageDateDividerItem
+  ConvoItem | SystemMessageGroupItem | SystemMessageDateDividerItem
 
 function getSentAt(item: ConvoItem): string | null {
   if (
diff --git a/src/screens/Profile/components/GermButton.tsx b/src/screens/Profile/components/GermButton.tsx
index 59d3d5d6bb..a3b561ae20 100644
--- a/src/screens/Profile/components/GermButton.tsx
+++ b/src/screens/Profile/components/GermButton.tsx
@@ -38,9 +38,9 @@ export function GermButton({
   const linkWarningControl = Dialog.useDialogControl()
 
   // exclude `none` and all unknown values
-  if (
-    !(germ.showButtonTo === 'everyone' || germ.showButtonTo === 'usersIFollow')
-  ) {
+  if (!(
+    germ.showButtonTo === 'everyone' || germ.showButtonTo === 'usersIFollow'
+  )) {
     return null
   }
 
diff --git a/src/screens/Signup/state.ts b/src/screens/Signup/state.ts
index c2d8684d42..4c1d9cf017 100644
--- a/src/screens/Signup/state.ts
+++ b/src/screens/Signup/state.ts
@@ -31,11 +31,7 @@ type SubmitTask = {
 }
 
 type ErrorField =
-  | 'invite-code'
-  | 'email'
-  | 'handle'
-  | 'password'
-  | 'date-of-birth'
+  'invite-code' | 'email' | 'handle' | 'password' | 'date-of-birth'
 
 export type SignupState = {
   analytics?: AnalyticsContextType
diff --git a/src/state/cache/post-shadow.ts b/src/state/cache/post-shadow.ts
index 72d9571486..6b88bbed35 100644
--- a/src/state/cache/post-shadow.ts
+++ b/src/state/cache/post-shadow.ts
@@ -25,9 +25,7 @@ export interface PostShadow {
   repostUri: AtUriString | 'pending' | undefined
   isDeleted: boolean
   embed:
-    | app.bsky.embed.record.View
-    | app.bsky.embed.recordWithMedia.View
-    | undefined
+    app.bsky.embed.record.View | app.bsky.embed.recordWithMedia.View | undefined
   pinned: boolean
   optimisticReplyCount: number | undefined
   bookmarked: boolean | undefined
diff --git a/src/state/cache/profile-shadow.ts b/src/state/cache/profile-shadow.ts
index ca516024d7..f18ec8dedb 100644
--- a/src/state/cache/profile-shadow.ts
+++ b/src/state/cache/profile-shadow.ts
@@ -47,8 +47,7 @@ export interface ProfileShadow {
   verification: app.bsky.actor.defs.VerificationState
   status: app.bsky.actor.defs.StatusView | undefined
   activitySubscription:
-    | app.bsky.notification.defs.ActivitySubscription
-    | undefined
+    app.bsky.notification.defs.ActivitySubscription | undefined
 }
 
 const shadows: WeakMap<
diff --git a/src/state/gallery.ts b/src/state/gallery.ts
index 09bc299f07..fbb5edd4c2 100644
--- a/src/state/gallery.ts
+++ b/src/state/gallery.ts
@@ -52,8 +52,7 @@ type ComposerImageWithTransformation = ComposerImageBase & {
 }
 
 export type ComposerImage =
-  | ComposerImageWithoutTransformation
-  | ComposerImageWithTransformation
+  ComposerImageWithoutTransformation | ComposerImageWithTransformation
 
 let _imageCacheDirectory: string
 
diff --git a/src/state/messages/convo/agent.ts b/src/state/messages/convo/agent.ts
index 83ca5ecf64..fa2c7fab9b 100644
--- a/src/state/messages/convo/agent.ts
+++ b/src/state/messages/convo/agent.ts
@@ -709,8 +709,7 @@ export class Convo {
   }
 
   private pendingFetchConvo:
-    | Promise<{convo: chat.bsky.convo.defs.ConvoView}>
-    | undefined
+    Promise<{convo: chat.bsky.convo.defs.ConvoView}> | undefined
   async fetchConvo() {
     if (this.pendingFetchConvo) return this.pendingFetchConvo
 
diff --git a/src/state/messages/convo/index.tsx b/src/state/messages/convo/index.tsx
index 58a465dc13..63590460ed 100644
--- a/src/state/messages/convo/index.tsx
+++ b/src/state/messages/convo/index.tsx
@@ -153,8 +153,7 @@ export function ConvoProvider({
       const queryKey = event.query.queryKey as string[]
       if (queryKey[0] === root && queryKey[1] === id) {
         const data = event.query.state.data as
-          | chat.bsky.convo.defs.ConvoView
-          | undefined
+          chat.bsky.convo.defs.ConvoView | undefined
         if (data && convo.convo && data.muted !== convo.convo.view.muted) {
           convo.updateMuted(data.muted)
         }
diff --git a/src/state/queries/join-links.ts b/src/state/queries/join-links.ts
index 91ae82fb6c..dee7f4d379 100644
--- a/src/state/queries/join-links.ts
+++ b/src/state/queries/join-links.ts
@@ -142,8 +142,7 @@ export function invalidateJoinLinkPreviewsForConvo(
       const [root] = query.queryKey
       if (root !== joinLinkPreviewQueryKeyRoot) return false
       const data = query.state.data as
-        | chat.bsky.group.getJoinLinkPreviews.$OutputBody
-        | undefined
+        chat.bsky.group.getJoinLinkPreviews.$OutputBody | undefined
       return (
         data?.joinLinkPreviews.some(
           preview =>
diff --git a/src/state/queries/messages/list-conversations.tsx b/src/state/queries/messages/list-conversations.tsx
index 82e9a37c09..71fe202053 100644
--- a/src/state/queries/messages/list-conversations.tsx
+++ b/src/state/queries/messages/list-conversations.tsx
@@ -38,10 +38,7 @@ export const RQKEY = (
   readState: 'all' | 'unread' = 'all',
   kind: 'all' | 'group' | 'direct' = 'all',
   lockStatus:
-    | 'unlocked'
-    | 'locked'
-    | 'locked-permanently'
-    | undefined = undefined,
+    'unlocked' | 'locked' | 'locked-permanently' | undefined = undefined,
   limit?: number,
 ) => [RQKEY_ROOT, status, readState, kind, lockStatus, limit] as const
 
@@ -255,9 +252,9 @@ export function ListConvosProviderInner({
           // memberCount bump to avoid double-counting.
           const alreadyKnownMember =
             queryClient
-              .getQueryData<
-                chat.bsky.actor.defs.ProfileViewBasic[]
-              >(listConvoMembersQueryKey(convoId))
+              .getQueryData<chat.bsky.actor.defs.ProfileViewBasic[]>(
+                listConvoMembersQueryKey(convoId),
+              )
               ?.some(m => m.did === did) ?? false
           mutateMembers(convoId, list =>
             list.some(m => m.did === did) ? list : list.concat(newMember),
@@ -279,9 +276,9 @@ export function ListConvosProviderInner({
           // list, skip the memberCount decrement to avoid double-counting.
           const alreadyRemovedMember =
             queryClient
-              .getQueryData<
-                chat.bsky.actor.defs.ProfileViewBasic[]
-              >(listConvoMembersQueryKey(convoId))
+              .getQueryData<chat.bsky.actor.defs.ProfileViewBasic[]>(
+                listConvoMembersQueryKey(convoId),
+              )
               ?.some(m => m.did === did) === false
           mutateMembers(convoId, list => list.filter(m => m.did !== did))
           mutateConvoView(
diff --git a/src/state/queries/my-lists.ts b/src/state/queries/my-lists.ts
index 1150fa74ec..a0ac92f52f 100644
--- a/src/state/queries/my-lists.ts
+++ b/src/state/queries/my-lists.ts
@@ -6,10 +6,7 @@ import {useAppviewClient, useSession} from '#/state/session'
 import {app} from '#/lexicons'
 
 export type MyListsFilter =
-  | 'all'
-  | 'curate'
-  | 'mod'
-  | 'all-including-subscribed'
+  'all' | 'curate' | 'mod' | 'all-including-subscribed'
 
 const RQKEY_ROOT = 'my-lists'
 export const RQKEY = (filter: MyListsFilter) => [RQKEY_ROOT, filter]
diff --git a/src/state/queries/notifications/types.ts b/src/state/queries/notifications/types.ts
index a08e8bdd35..ef57f703a5 100644
--- a/src/state/queries/notifications/types.ts
+++ b/src/state/queries/notifications/types.ts
@@ -3,8 +3,7 @@ import {type app} from '#/lexicons'
 export type Notification = app.bsky.notification.listNotifications.Notification
 
 export type NotificationType =
-  | StarterPackNotificationType
-  | OtherNotificationType
+  StarterPackNotificationType | OtherNotificationType
 
 export type FeedNotification =
   | (FeedNotificationBase & {
@@ -56,6 +55,5 @@ type FeedNotificationBase = {
   additional?: Notification[]
   subjectUri?: string
   subject?:
-    | app.bsky.feed.defs.PostView
-    | app.bsky.graph.defs.StarterPackViewBasic
+    app.bsky.feed.defs.PostView | app.bsky.graph.defs.StarterPackViewBasic
 }
diff --git a/src/state/queries/postgate/util.ts b/src/state/queries/postgate/util.ts
index f57fe0479d..97f85e9369 100644
--- a/src/state/queries/postgate/util.ts
+++ b/src/state/queries/postgate/util.ts
@@ -89,9 +89,7 @@ export function createMaybeDetachedQuoteEmbed({
       quoteUri: AtUriString
       detached: true
     }):
-  | app.bsky.embed.record.View
-  | app.bsky.embed.recordWithMedia.View
-  | undefined {
+  app.bsky.embed.record.View | app.bsky.embed.recordWithMedia.View | undefined {
   if (bsky.isType(app.bsky.embed.record.view, post.embed)) {
     if (detached) {
       return createEmbedViewDetachedRecord({uri: quoteUri})
diff --git a/src/state/queries/preferences/types.ts b/src/state/queries/preferences/types.ts
index 7ade79b834..160427cf1b 100644
--- a/src/state/queries/preferences/types.ts
+++ b/src/state/queries/preferences/types.ts
@@ -16,11 +16,6 @@ export type UsePreferencesQueryResponse = Omit<
 
 export type ThreadViewPreferences = {
   sort:
-    | 'hotness'
-    | 'oldest'
-    | 'newest'
-    | 'most-likes'
-    | 'random'
-    | (string & {})
+    'hotness' | 'oldest' | 'newest' | 'most-likes' | 'random' | (string & {})
   lab_treeViewEnabled?: boolean
 }
diff --git a/src/state/queries/search-posts-params.ts b/src/state/queries/search-posts-params.ts
index 6ed9ffea46..ac5f93cd00 100644
--- a/src/state/queries/search-posts-params.ts
+++ b/src/state/queries/search-posts-params.ts
@@ -206,12 +206,13 @@ function mergeList(a?: string[], b?: string[]): string[] | undefined {
  * than re-validated here. `q`, `limit`, `cursor` and `sort` are the caller's.
  */
 type SearchPostsV2FilterParams = {
-  [K in Exclude<
-    keyof app.bsky.feed.searchPostsV2.$Params,
-    'query' | 'limit' | 'cursor' | 'sort'
-  >]?: app.bsky.feed.searchPostsV2.$Params[K] extends
-    | readonly (infer _E)[]
-    | undefined
+  [
+    K in Exclude<
+      keyof app.bsky.feed.searchPostsV2.$Params,
+      'query' | 'limit' | 'cursor' | 'sort'
+    >
+  ]?: app.bsky.feed.searchPostsV2.$Params[K] extends
+    readonly (infer _E)[] | undefined
     ? string[]
     : app.bsky.feed.searchPostsV2.$Params[K] extends string | undefined
       ? string
diff --git a/src/state/session/index.tsx b/src/state/session/index.tsx
index 7cce22fff7..e8e3613ddc 100644
--- a/src/state/session/index.tsx
+++ b/src/state/session/index.tsx
@@ -167,8 +167,7 @@ export function Provider({children}: React.PropsWithChildren<{}>) {
         sessionEvent === 'update' &&
         sessionData &&
         (store.getState().currentBundleState.bundle as unknown as
-          | SessionBundle
-          | PublicSessionBundle) === bundle
+          SessionBundle | PublicSessionBundle) === bundle
       ) {
         failedExpiryTokensRef.current.get(accountDid)?.clear()
       }
@@ -200,8 +199,7 @@ export function Provider({children}: React.PropsWithChildren<{}>) {
       if (sessionEvent === 'expired') {
         const current = store.getState()
         const currentBundle = current.currentBundleState.bundle as unknown as
-          | SessionBundle
-          | PublicSessionBundle
+          SessionBundle | PublicSessionBundle
         const dyingRefreshJwt = sessionData?.refreshJwt
         // Stale bundle events are handled by the reducer's identity guard.
         if (
@@ -509,8 +507,7 @@ export function Provider({children}: React.PropsWithChildren<{}>) {
     SessionApiContext['refreshSession']
   >(async () => {
     const bundle = store.getState().currentBundleState.bundle as unknown as
-      | SessionBundle
-      | PublicSessionBundle
+      SessionBundle | PublicSessionBundle
     if (!bundle.session) return undefined // logged out: nothing to refresh
     const before = bundle.session.session
     const after = await bundle.session.refresh()
@@ -595,8 +592,7 @@ export function Provider({children}: React.PropsWithChildren<{}>) {
            * the leader already refreshed, then dispose the previous bundle.
            */
           const prevBundle = state.currentBundleState.bundle as unknown as
-            | SessionBundle
-            | PublicSessionBundle
+            SessionBundle | PublicSessionBundle
           // Avoid replacing the live bundle for an unrelated account update.
           const live =
             prevBundle.session && !prevBundle.session.destroyed
@@ -685,8 +681,7 @@ export function Provider({children}: React.PropsWithChildren<{}>) {
   )
 
   const bundle = state.currentBundleState.bundle as unknown as
-    | SessionBundle
-    | PublicSessionBundle
+    SessionBundle | PublicSessionBundle
 
   // @ts-expect-error window type is not declared, debug only
   // eslint-disable-next-line react-hooks/immutability
diff --git a/src/state/session/logging.ts b/src/state/session/logging.ts
index adc495d54d..77e4828a43 100644
--- a/src/state/session/logging.ts
+++ b/src/state/session/logging.ts
@@ -139,21 +139,13 @@ type Log =
   | {
       type: 'method:start'
       method:
-        | 'createAccount'
-        | 'login'
-        | 'logout'
-        | 'resumeSession'
-        | 'removeAccount'
+        'createAccount' | 'login' | 'logout' | 'resumeSession' | 'removeAccount'
       account?: RedactedAccount
     }
   | {
       type: 'method:end'
       method:
-        | 'createAccount'
-        | 'login'
-        | 'logout'
-        | 'resumeSession'
-        | 'removeAccount'
+        'createAccount' | 'login' | 'logout' | 'resumeSession' | 'removeAccount'
       account?: RedactedAccount
     }
   | {
diff --git a/src/state/shell/composer/index.tsx b/src/state/shell/composer/index.tsx
index fddf0421e9..0c60a77134 100644
--- a/src/state/shell/composer/index.tsx
+++ b/src/state/shell/composer/index.tsx
@@ -33,12 +33,7 @@ export type OnPostSuccessData =
   | undefined
 
 export type ComposerLogContext =
-  | 'Fab'
-  | 'PostReply'
-  | 'QuotePost'
-  | 'ProfileFeed'
-  | 'Deeplink'
-  | 'Other'
+  'Fab' | 'PostReply' | 'QuotePost' | 'ProfileFeed' | 'Deeplink' | 'Other'
 
 export interface ComposerOpts {
   replyTo?: ComposerOptsPostRef
diff --git a/src/state/shell/logged-out.tsx b/src/state/shell/logged-out.tsx
index fcb76818c4..3a89630c86 100644
--- a/src/state/shell/logged-out.tsx
+++ b/src/state/shell/logged-out.tsx
@@ -27,11 +27,7 @@ type Controls = {
      * The did of the account to populate the login form with.
      */
     requestedAccount?:
-      | (string & {})
-      | 'none'
-      | 'new'
-      | 'starterpack'
-      | 'groupchat'
+      (string & {}) | 'none' | 'new' | 'starterpack' | 'groupchat'
   }) => void
   /**
    * Clears the requested account so that next time the logged out view is
diff --git a/src/state/shell/progress-guide.tsx b/src/state/shell/progress-guide.tsx
index b6ebf4621b..831a10f447 100644
--- a/src/state/shell/progress-guide.tsx
+++ b/src/state/shell/progress-guide.tsx
@@ -40,9 +40,7 @@ export interface Follow10ProgressGuide extends BaseProgressGuide {
 }
 
 export type ProgressGuide =
-  | Like10AndFollow7ProgressGuide
-  | Follow10ProgressGuide
-  | undefined
+  Like10AndFollow7ProgressGuide | Follow10ProgressGuide | undefined
 
 const ProgressGuideContext = createContext<ProgressGuide>(undefined)
 ProgressGuideContext.displayName = 'ProgressGuideContext'
diff --git a/src/types/bsky/starterPack.ts b/src/types/bsky/starterPack.ts
index 21cb4634df..594fd40c89 100644
--- a/src/types/bsky/starterPack.ts
+++ b/src/types/bsky/starterPack.ts
@@ -29,5 +29,4 @@ export function isView(v: unknown): v is app.bsky.graph.defs.StarterPackView {
  * Matches any starter pack view exported by our SDK.
  */
 export type AnyStarterPackView =
-  | app.bsky.graph.defs.StarterPackViewBasic
-  | app.bsky.graph.defs.StarterPackView
+  app.bsky.graph.defs.StarterPackViewBasic | app.bsky.graph.defs.StarterPackView
diff --git a/src/view/com/composer/state/composer.ts b/src/view/com/composer/state/composer.ts
index a7fd4f1e1b..5a013a830b 100644
--- a/src/view/com/composer/state/composer.ts
+++ b/src/view/com/composer/state/composer.ts
@@ -157,8 +157,7 @@ export type ComposerAction =
   | {
       type: 'clear'
       initInteractionSettings:
-        | app.bsky.actor.defs.PostInteractionSettingsPref
-        | undefined
+        app.bsky.actor.defs.PostInteractionSettingsPref | undefined
     }
   | {
       type: 'mark_saved'
@@ -632,8 +631,7 @@ export function createComposerState({
   initImageUris: ComposerOpts['imageUris']
   initQuoteUri: string | undefined
   initInteractionSettings:
-    | app.bsky.actor.defs.PostInteractionSettingsPref
-    | undefined
+    app.bsky.actor.defs.PostInteractionSettingsPref | undefined
 }): ComposerState {
   let media: ImagesMedia | GalleryMedia | undefined
   if (initImageUris?.length) {
diff --git a/src/view/com/composer/state/video.ts b/src/view/com/composer/state/video.ts
index 4ae825a7f1..2f7a1ead62 100644
--- a/src/view/com/composer/state/video.ts
+++ b/src/view/com/composer/state/video.ts
@@ -148,11 +148,7 @@ type DoneState = {
 }
 
 export type VideoState =
-  | ErrorState
-  | CompressingState
-  | UploadingState
-  | ProcessingState
-  | DoneState
+  ErrorState | CompressingState | UploadingState | ProcessingState | DoneState
 
 export function createVideoState(
   asset: ImagePickerAsset,
diff --git a/src/view/com/composer/state/videoProgress.ts b/src/view/com/composer/state/videoProgress.ts
index bee9be68fa..984c0bc0b3 100644
--- a/src/view/com/composer/state/videoProgress.ts
+++ b/src/view/com/composer/state/videoProgress.ts
@@ -1,10 +1,7 @@
 import {type VideoCompressSkipReason} from '#/lib/media/video/types'
 
 export type VideoProgressPhase =
-  | 'compressing'
-  | 'uploading'
-  | 'uploadingWithoutCompression'
-  | 'processing'
+  'compressing' | 'uploading' | 'uploadingWithoutCompression' | 'processing'
 
 // Keep progress monotonic across the full client pipeline instead of showing
 // three separate 0 -> 100 cycles. Backend processing progress covers the
diff --git a/src/view/com/composer/text-input/TextInput.types.ts b/src/view/com/composer/text-input/TextInput.types.ts
index 490472f0a4..e5e8cadcf4 100644
--- a/src/view/com/composer/text-input/TextInput.types.ts
+++ b/src/view/com/composer/text-input/TextInput.types.ts
@@ -8,8 +8,7 @@ export type TextInputRef = {
    * @platform web
    */
   getCursorPosition: () =>
-    | {left: number; right: number; top: number; bottom: number}
-    | undefined
+    {left: number; right: number; top: number; bottom: number} | undefined
   /**
    * Closes the autocomplete popup if it is open.
    * Returns `true` if the popup was closed, `false` otherwise.
diff --git a/src/view/com/util/Link.tsx b/src/view/com/util/Link.tsx
index b2647363ea..52a5e14944 100644
--- a/src/view/com/util/Link.tsx
+++ b/src/view/com/util/Link.tsx
@@ -37,8 +37,7 @@ import {PressableWithHover} from './PressableWithHover'
 import {Text} from './text/Text'
 
 type Event =
-  | React.MouseEvent<HTMLAnchorElement, MouseEvent>
-  | GestureResponderEvent
+  React.MouseEvent<HTMLAnchorElement, MouseEvent> | GestureResponderEvent
 
 interface Props extends React.ComponentProps<typeof TouchableOpacity> {
   testID?: string
diff --git a/src/view/com/util/List.web.tsx b/src/view/com/util/List.web.tsx
index bc3d3de27a..054cb55895 100644
--- a/src/view/com/util/List.web.tsx
+++ b/src/view/com/util/List.web.tsx
@@ -521,9 +521,7 @@ let Row = function RowImpl<ItemT>({
   item: ItemT
   index: number
   renderItem:
-    | null
-    | undefined
-    | ((info: ListRenderItemInfo<ItemT>) => React.ReactNode)
+    null | undefined | ((info: ListRenderItemInfo<ItemT>) => React.ReactNode)
   extraData: unknown
   onItemSeen: ((item: ItemT) => void) | undefined
   registerRowNode: (index: number, node: HTMLElement | null) => void
@@ -604,9 +602,7 @@ Row = memo(Row) as <ItemT>(props: {
   item: ItemT
   index: number
   renderItem:
-    | null
-    | undefined
-    | ((info: ListRenderItemInfo<ItemT>) => React.ReactNode)
+    null | undefined | ((info: ListRenderItemInfo<ItemT>) => React.ReactNode)
   extraData: unknown
   onItemSeen: ((item: ItemT) => void) | undefined
   registerRowNode: (index: number, node: HTMLElement | null) => void
diff --git a/src/view/com/util/UserAvatar.tsx b/src/view/com/util/UserAvatar.tsx
index be607d1630..6122757f71 100644
--- a/src/view/com/util/UserAvatar.tsx
+++ b/src/view/com/util/UserAvatar.tsx
@@ -307,7 +307,7 @@ let UserAvatar = ({
   }, [size, style])
 
   return avatar &&
-    !((moderation?.blur && IS_ANDROID) /* android crashes with blur */) ? (
+    !(moderation?.blur && IS_ANDROID /* android crashes with blur */) ? (
     <View style={containerStyle}>
       {usePlainRNImage ? (
         <RNImage
diff --git a/src/view/com/util/UserBanner.tsx b/src/view/com/util/UserBanner.tsx
index 5c7cfa4c7c..9b297ff0ab 100644
--- a/src/view/com/util/UserBanner.tsx
+++ b/src/view/com/util/UserBanner.tsx
@@ -212,7 +212,7 @@ export function UserBanner({
       />
     </>
   ) : banner &&
-    !((moderation?.blur && IS_ANDROID) /* android crashes with blur */) ? (
+    !(moderation?.blur && IS_ANDROID /* android crashes with blur */) ? (
     <Image
       style={[styles.bannerImage, t.atoms.bg_contrast_25]}
       contentFit="cover"

From 2d9327395611424c49f3c547d104d7c3ae8ab6d5 Mon Sep 17 00:00:00 2001
From: Oleksii Bulenok <63914185+abulenok@users.noreply.github.com>
Date: Fri, 14 Aug 2026 14:37:11 +0200
Subject: [PATCH 32/32] Fix metro failing to resolve @ipld/dag-cbor in dev mode
 (#11467)

---
 babel.config.js           | 8 +++++++-
 src/lib/api/computeCid.ts | 9 ++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/babel.config.js b/babel.config.js
index c29a1d2e44..90abe51c4d 100644
--- a/babel.config.js
+++ b/babel.config.js
@@ -35,7 +35,13 @@ module.exports = function (api) {
       // cannot use `env` field because it will put them after
       // the `react-native-worklets/plugin` plugin
       ...(api.env('test')
-        ? ['@babel/plugin-transform-class-static-block']
+        ? [
+            '@babel/plugin-transform-class-static-block',
+            // Compile `import()` to require so jest (which runs without
+            // `--experimental-vm-modules`) can execute lazily-loaded modules
+            // like `@ipld/dag-cbor` via its moduleNameMapper.
+            '@babel/plugin-transform-dynamic-import',
+          ]
         : []),
       ...(api.env('production') ? ['transform-remove-console'] : []),
 
diff --git a/src/lib/api/computeCid.ts b/src/lib/api/computeCid.ts
index edd23e5901..c5bbb9830e 100644
--- a/src/lib/api/computeCid.ts
+++ b/src/lib/api/computeCid.ts
@@ -123,14 +123,9 @@ function isPlainObject(v: any): boolean {
 /**
  * Load `@ipld/dag-cbor` on demand. The dynamic `import()` lets web bundlers
  * emit it (and its ~190KB `cborg` dependency) as a separate chunk that only
- * loads when posting a thread. Under jest (which runs without
- * `--experimental-vm-modules`) dynamic import throws, so we fall back to a
- * lazy `require`, which resolves through the test moduleNameMapper.
+ * loads when posting a thread. Under jest this compiles down to a require
+ * that resolves through the test moduleNameMapper.
  */
 function importDagCbor(): Promise<typeof import('@ipld/dag-cbor')> {
-  if (process.env.NODE_ENV === 'test') {
-    // eslint-disable-next-line @typescript-eslint/no-require-imports
-    return Promise.resolve(require('@ipld/dag-cbor'))
-  }
   return import('@ipld/dag-cbor')
 }