From 676929fc87c4cc450e3dc6e3f05ff60dfcead255 Mon Sep 17 00:00:00 2001 From: kaitranntt Date: Sun, 21 Dec 2025 01:01:16 -0500 Subject: [PATCH 01/31] docs(readme): add OpenRouter to built-in providers - add OpenRouter row to providers table - add OpenRouter integration section with v7.0.0 features - add screenshot for OpenRouter API profiles --- README.md | 5 +++++ .../screenshots/api-profiles-openrouter.webp | Bin 0 -> 217748 bytes 2 files changed, 5 insertions(+) create mode 100644 assets/screenshots/api-profiles-openrouter.webp diff --git a/README.md b/README.md index fecfb7ce..17ad794c 100644 --- a/README.md +++ b/README.md @@ -91,9 +91,14 @@ The dashboard provides visual management for all account types: | **Codex** | OAuth | `ccs codex` | Code generation | | **Copilot** | OAuth | `ccs copilot` | GitHub Copilot models | | **Antigravity** | OAuth | `ccs agy` | Alternative routing | +| **OpenRouter** | API Key | `ccs openrouter` | 300+ models, unified API | | **GLM** | API Key | `ccs glm` | Cost-optimized execution | | **Kimi** | API Key | `ccs kimi` | Long-context, thinking mode | +**OpenRouter Integration** (v7.0.0): CCS v7.0.0 adds OpenRouter with interactive model picker, dynamic discovery, and tier mapping (opus/sonnet/haiku). Create via `ccs api create --preset openrouter` or dashboard. + +![OpenRouter API Profiles](assets/screenshots/api-profiles-openrouter.webp) + > **OAuth providers** authenticate via browser on first run. Tokens are cached in `~/.ccs/cliproxy/auth/`. **Powered by:** diff --git a/assets/screenshots/api-profiles-openrouter.webp b/assets/screenshots/api-profiles-openrouter.webp new file mode 100644 index 0000000000000000000000000000000000000000..fdbd035fecab2c5ec58082c2f5c6e6ec74ff64ff GIT binary patch literal 217748 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

C+Q$dJy|BoJVI<@O^Q!smC_qcWB<+eXghR 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

St}!FG?vv6krl5Dx|`qOeKQiFjQQlvM^@ zC{XZab^ceT{GDQ|BD$WG{+tii7F!BjJd31F6p)=4bNJ>!11AmA*XqzR71<$c^kj zyHnkc^x(Z|EUP!5DImbR@@gm6UVw>HagBGG6vwRH&pV57%T-u@wQv>ZYw#nTz0f^f zLBpSG)AA30D?ZEaNY7%YV0**Z>9zcvj6Mx5fBS<}%3Y^B&`1dJZaHUaVcSvgFvII` z?8fndLw|XZpKe_s(W_0|su8)mn~SD|SyNqs^xwA6mg^lWQ9M}C{`5MRJGlU=67&%K zu-D-X9CmjmpK1Liw(YPI`JDj%E6~v06fZqJQ^xGu`BDT@w45z}d6y zOsCDQnH0Y0IdN3~MKC967XaaA9&v3))rFF}&M$_r9eVvUKcC{C@9KN>Zg}@#tliVe z#S0^HRxMbT6L%EGU6%_^Tq+^D7PM4aIJbNzd?1U6%4Z}EpmcnJJ@f>d&BHhOVh6sh z^G$!hMg&oEPR5>fq+BmWH3bIWYGu|I6#mhDcXR8WAec}9?8o=o9+DZ?oN81OwMP@0 zEDnb2Wv&dNv+WkY@>gWcJB)vIG=4u^|E;x|92W5|w&ybZ1IIX})Z$gcCX*vOGP{v3 z+APYDDNmlJN*3@yS7qGbVAZX>a4>rOx4WFNgn2#Msg2#!>OOrNJB;JB()hb;tuOd? zLy1sI+kE#KQ!}0gY$=KKI`CLY;svblcCI4WKjct|_Kt}t(+u3g*B5{vGftrhNFi0vvdr(|4yuv;(HG#onPXuPzg7RpxA$rv3-vFt3;peSEMp>f%H{VU{S zeNA6>Ew21r)XU=r_-&%8PMo!8$O^9m6_LvG?B3jG`KSkx`}#`3V6MQh?oVDAH0LoM z+>zm@`uLenu5j59RCpVX?A=Tm72(d)=b7m2!u}@)GCo-B8Uwg^qmA3Aqn=o8z|O$I zqZ6v~`Z7>p9eNlFyULI9m{R1rk-qF|y?FN2G7ADD$eZSD1iL2m%7erAT%KLlLGuLU z+pRjD?H^6r*b?)cG2i>n4Z~wq3BhH>BHE-|N_<{?S|YK%UJty&%4Q3x4JreEc+;(Y zk6veI{fCUqy`uRXPeMq&y%JoH&d$`AmT%nI&q3+!hLR(ncv zn<|g<9v{7>k@FtWU+&JZ^Oe~1qIdr4Gnpl~x&6QNeXo<$h1Jd)7fCdXBu=KgH_o+t zHfImsTH09J{UD$7eVW2tUcQdPP1<=&NvU)x?T3(w+4eo86$ij|sC_ebR0i?9JU{6- z;rQ~w-wFKw4qxv=j|tHddhML{`RNvf(WvP>vue6z%y}PQ6orV;{IDBPW6TC`!2TQe z@|$Yf&*}4DNKPoWs5s165igk{PmHc-w!z#|cu-u0wQt^jRF0+=EQRi|t2G4M<7@G#5Q2K{M`#atkBN|DtiJ~zRFx+rU=VI|a?A51p+z=}$_sk&U(2QQNC%prR+e`hoY3RRq z6NEi0xT{^po3Uy8f)y?@;>>7AM2o1>|j*k!g#2?f|f z5h!~M_eI?Y*D9(Np5RDF6Giw^VRKa{0)8-IOJnKx_zK^Y?}P_Q5)s+YnmFD{4$v8n z6MLcdyui*^NcFt9e&LlvFDYjsmg__Mehy(_7z|e$(QByS(u@s)l$m)}MB0eK3rvsh z?G=@n7I|tuXF*SiPIjJG4FTWl(ga+tC=}k#TNbC|k_OK@3LZtAdYiP9WJ_91WH*Kuxl7FUI!F6D7fEnfPc@6gt!CW z%|{5KhhgwuH;Cs#OoEtZn+aCv-EJC%MKzH?^ZxyUp6 z?>F@7&+hAIZ}FW*7^ctWTK6v7S~$lO@j$~#nzEFRXaB9L)fPQPa|+^api=dC7a*4Z zZ74&X?r!R*^8rqap=X~Va3M5(t$3|@@Osx|fUQKc&qv6~n~49)p3lNzSun}P4|^2{ zaE;*jg#rJ3ynh@K0_n3+K`vt%D-eTRXJe5L4&O+f4H??!T)jS6BK&e@((G9;BiY%T z+*ea4T*ua8c?o#84>;-rzR9b@A8_H|4V5;7*%uF7r5eg);e3xO}$_$$&nrT?4sJMJoE%NSlwKe);R zZoBuZORn8iKYY);fARs})%cg~xL5w_W9pBiamoAqd^fkT>hJF5mrjTE>{sG2UPNex zxzep`pZOV!|5w#SH$vslB-UTmp$AfEa#l@E)OnT+CjatPRe2bA>EyRw6&)*Ab022A|PD zbWE^&MW2xg8?-9=tq0mvm+O3Z=`YLQ-!;3JO1>+Tn*q2EG|tl~OMvTs`Z}wa7kA+D z?bFoWW{nM~bvT%yc^%5M3xM^OO4)-3F8~*1JCwlh`4A;m+uu)FvnQjG*Hekz%EajI6Z9F_(Onxw>nq@mJ$SV2{vXsP2-BsUN zKNCcP?|@@R50!1PdRr|kbu5z~P(@%>oe9;Kh|+%~jD1XKD2bdW|_79!?Kj-C4EpxAI>Gpm8 zrR4TcY{gZeI`>vLn1w5k{2L$mo5E@X+-cHvezIcmGx%>!={IQYU*5`Z#1cO#GXILH z{#y(E<3@j@S?N0dc5uE&=B@y!PGf4a%nj9rZATOa++0*JrtZEx^D=hoJ) z=|C>i-J^!zl}`RT9lmX|-vN|rbfm~-EgI`aStbVI|6)!waiwJbj!5?XzBl0gQ`@?g z;{A5e%HOGR|JhK|UH*5}uK#cy{&#e>+{i=!hnrw;fb*7!YcAm8l>E=3wFhsJd;~++ z?@-=OsP)l5j;IX&>4_S@kqxvYCfp9sf1$Dd!&b*%gE6as>!+Ym#U!?qII#lkPD=lv z^h)=vxs&lIT#}R=^i>Vy1ZNKw*-!#dST6^f8gHU>+uBytyag_5a?u}u`i`NO-bFK{ zSl@MDFoIwrhzx{XuDG{kqwh5%g{Sj&{bixGA6(;mHkKh>6D>L@P!Upb={(}BW#{B? zBWY}FPaW@*KS|0F*FJgq)K8Mpg@>%d`ziGT_zMI=g*_ z=o1h&r`sjLvme!OBAOvg5s9JwRJHnh+1W1u&hOM}wWTfJCS_b$MC)TBZXoF&q2iX% z=?{aO-3giLS#;Mn(M+RPvSopVcD$$`lX4y%8=DLFD}MT#vKou-Pmx^g9>CwUBF?^t z69%i#*RYNZH+YqR{L}ln9p9taPi~*k1SY{h|#>=_gOn54dZ*gX=6kp%6#GgP*`Y6d1T?8FDs2 zn0N0jB8!6`fF7K6f^wOJ(0dw-*1d=xMD|V<9kbG1kJBc_6b8w;lJ9Mu|8@%eR~D1L zS?c?3g5s1Y&nHOMV8_^Nub3vgT~tb67}`x3O9I6&`!CeRRGw0TK`7)-r3!0wGgYzW#$N(rNYUotxl`-f0 zx_9(!45}mQST~yxmM%dy{(tjleYr^)gVf|K_~3zQ5t`IO;-5^^Qi8nGSA3AAc0)S( zPi*2ldGn14vw*%7NvzS_=yb3-8CWu^X_xR_$)Sfig)SM@dq!D>wi5?u+d_OksIM)B znnaz~3LmxOf8tRyXW!8&b9^DXEx8=|k%z{OHYyC!{OqC}(@L$16$E>$ofg~Z`qO3p z9SO!Sr=I@xLu>xGUbc&mtl~1?Q@VU)#)Jxd$;IA#GLQW`=-!K5H2^T1P*4RWMHcyU zJb-@?wE}&wyRU_O`0ntW93ZP)-8~rv>6W!iM^!G15Wy?kblbXq6FP474=PNccaJCN z)0l!>JXAqpQRi}!#do#q_jKtxf!k$T)_Vk|BCi{RBJSa5H>CuSxrjXa5Zn+$MnbVt z(Atxg1Z^kOH!i5I#IdWi)XWrw$rF~=z>i45%ZKdir}UbTL@nizK8Z-im?!vD8Jw_0PJzKkSXz~vrh++=84@HaU+3(?R#%B{2SO*KQe~1Xt zJY=AyHekpF?oU419YBCiD*b{!V;}h-ANbxhy)Er73M7l8^}39OL5GAa#PKS% zL%KU64@yV_oE2S&2vkEV*N7;kWUqd(gl4c>3F|{$Svp_;!q1F%kZLAg$Wm0#65UD) zua{1*{Ope=-5a{`0#ez3XKtCXggFRL-KzUm+5I~>KxvE;2X(F_W*Yt_78>+I!Ze2@ zk!^9xh=VP=l=I2@S+0S6^zLw_6v|ZX(q@GSde%6MZHBVgIm%LzBsxz%M5+J<9w>&Z zdZG9#&QGE+4fPFw+8+z(I^qe!!qN)KJqFHwctEie8~ps;AnQ9c??;$CALbOoV`I{W zKC{h%qb8@c*~D^ULu)I%*nQQZ&-8lg!;BCgX3r8F6vWs4%uFG%QGzIdCr{w}=^Qk2 z=<|81+c!(OO1W;Ec6Dt_tz@T+=+3-FQZuA9i|*Q6_xW z0ux06M^gnddG8dv@y@p|Wz8^iR_7lvh57_<>WPH+j@gW3aqlI8aI7cna4=u1TM(+a z)vE?<&ln7{jI@MOH?^UAMN#bP{e_D8^>>J!jYD1iin5qlS7u*>%m&{F=Z?;1j?Nuw zv{V&*9Uv7vWPnGD< zK>GqFWJ#xcxTBSk{aWXW$f=I?c9pd|*+Alob6xQGi^gMlM7$O^F80@JDXUQC$|9;0 zAE)|d6lavEG7@!7;P{9+)Spux^+kQ@VaX-L7?xm&aAnlMeW~K?sH?)v){D1?Cf({w zF}2g68P7Gz)dbr1w)p_^n37~D=+S;4J~Tj~Tqll|e0jBV4FnaiPRKJ{uf(HMQt)kL z3YgrsF1N^FlH_?l<#x4-Ku>yS!;?XC1jie zISn$1xr|@D)A>Um#zQ zWTVgfaL|C3^%e?5Aqa$X0=_1dLq@(0p;~f@JN9|p`;*+^cgy%~YuJ{KoXW}qp$y~X z>I-_4Ac$-EZwzFOY%{?7V@qKXt@t2$H(Pd|N_PO7vp!ISU@?MWp6kFGszvT%_ad;* z=hiT3c%>YuzkNSu!;tgk(A+@ty+}Izjsm7$d)bkm!v_|iW&ICW2wLu9G?(@>n09jn zz2OQ>FGxpU;NB`511ytcn|cM(eNW521JO>2@GkC7okzWj7f4c4sDp1AAlhuk+mUc! z+QmcnY#xxi?k^^u4UegrLi^vp}c15FfQV@i{=U@QR;^e27;0pvwUZx zJw^&?Jn9#>MT=fMBR+cP@M1S=^OZ*4t}wyF+Ayph(dN=_5I{iR>U}bSjW-{8j?${3 zp#hz9HY9C){3h=^+1Up=>JFL6HX2rh*Z3_$&GB#p@X&u{NTv8thNhvzx%n5gzu>-*|bhUcPcP3_dPr`o;odgN&W!C3TNkcck~*` zP7Ofc>Tvt;CKhb@QgC{Yw}B+-(fYw8ml|S$zGs2A(+?^Rny_jsNkII+10bc>v96e}G`Hb0qsj(X zlrwdrjk5ayjd&=;@wK5(mou=Ku+U9D?ylz5x;|v9105=Vwi7`efCrD<~7{5@^?Zq7*e!uwh z%9i}ffIzR&XsAtfpQF8h0g8!pyFA#tA#xQhs+_TVfN1aL*y2UmKh;iQ4lppg-65hT z!4&rnvarm4w6;II*7E2p4`4DRTr(}<{DLuYS-+V*ng4SxgMJ!H`d1PktYmfx>1H$^ zJP!k#+GPpr=M{pteI1E_`~E|ka+ME%9GX#f;CpHjXGFoA8FKr(`f?Osfj@Ye>Fv>V zbUY+tZfS4QwbE^L{W|<P{j1#HVqfD5P} z?tXpy0UjMw6gC>|UW$dNW?T&YIU>e~Rh9MV=+}gJkd7kX!ty)ES`CyaD#7dXYX4x(aS@MX<1Wv|Ij5eAT zxYgIy)$<9yP1hN}uN-7l^Zto$&~ks#6rFg^hF#$d0$WAuu-pANFBg!{>~eXk&Ti0? z8UyH2OC>FgY4enVo2^0w%9rd1EI#1|AqkosY+oVg`!kgvr$Ng#nvOTrVWqOMsAMGc z!I-^S5JR-@x>Laf3_&d8FrkJKoU*af2~~ra!4k2-RpzfS0+_-2(Q><9?Oq%XM3anHCM?i4C7e-01);f%kg<_WN zTDfqe3Xal@dHrXEJ-Sz^xnyj%BDv;S(~!t7A7H4t*UGuY&89R%jY9@Jf1cME1w!_ML2r2acyuUGcvLGBLb0Vsfc7zYlo7&NMdHhbpBd8B`~I$*Q~nvWm}#R zopaZ}I!r}75Nw0Yq^cSWe=J7z3E%iYss{mPSaC9D4I4216CN_t>KyJ_6eb&?4p1ZC zn!9%V{r7DXWoT2Cwu!5Q?Rh1AL(0W9yCh7WoNzmWh%HS~FtKs~>az1%u6U($PCh;K zt_-3^h<{Tc^VzTZlV=+-CUcMH>!8F0=Fh(Pejpy5m<(_EC?08P6=IXjTME9;l7+Fy zoMN$q2$@$zf}0V3Gg(c_dl;6_F%|Cv+{Dv_UStZAVa7Bn9!u`dKrxIpGb~rSsSugq zz48#j4noto*-trIBZUP+Ut7b@DzBw&qSVX!T>@sIS!EnEU*7iqDra^NG7|K1@rWY3 zAkthe$6C;HyX{#aG|yy^08Y-P?ZP+frQT>%?iGT8F!+G5?uUWXXd)}~5ig0{Oid3h z=*Neic)bjKql>()(NxQ#5Q&?iQo~lB$a3Hak$4PC?ODOD7#OjcNY98;-lxBZK*6<6 z0?(G4`%E*9ZrfnMt1#PymkDi^{za^Lc+bYfDOM_S2t+A4w)iJv;cNv=DYwsUTD7K6 zmVIbzB*qaU1(TW^7nu83d>n-l$=<&Qe^c~9vs&M1#T(-jhTp4b+dl9NB$uyfK7tN= zM;}UD?5O)n%!vcA-wT*XaBoT<6Z7(Rue?F?!lZhH@M?@P8X`;30LCbWzF=*iiI|#k zX=iSNZ|l?3c$<M@3t?VFvqBXi zM4)$r8sX9eUaP5XU=2hulaW1`c5D^sZpZ*veF@HA7!&{jZYo}bq z&un^h(t>1wP_onY$Pjb7>$R42lVwoj^ClbKp(^P75H#+~7zF6!1tCj!vIbXA_Y#FC z<4wdYJ&jQ;bd}CCS*bSk4A=Bd%MS=HRRnNADa)%|qZ53<{sN6bbyAfRyS24K#3Pu_ z+DKxx3qo!(?hMbNl?taf`+L7gial)*p96qrAb`+-&tNf7BXVZ*5BW@DY_3#ibI|mm zbJT{OU}gkv5caiWbY?E!DVQoN`pb^Hf9 z@Qi5mO+P~t#3%TI04sGlgMB_0ibw&90P_cf3Xt1MwXh$e3r43{_cj0k=Do@Q0C}P< z6G11j5+Pp!nJs6^{40Jgp##&lvu9OQ!%n%&n2jN6V-s z7_7+ibWl2CO6Tz7OMp_Wn5bk!s_(x`sxyAd@$C`-VO7xdK2myLors0A7$v(HKtdr1 zTAl$|PP$q+No|(WH++V-nm{(6E~4Pi*1-cE-H<8+XR(Po`3%NfLwUSRjSdLcLMEH4 zgoZQu%vdsf^x=@VD2Q~3L*&Y{N|_Uz6G?m2wjIo#;wT$3qN7d5UL3ciWA>Ak&!KT1 zOpoe@t?}5?jJ>vu$V-fCN>E50Yx!lsU1-{O83S<5XHTKJ05TTR*FIm}3Xqit#uIXwq+WN1ttv&3v&k zuYUwDpd!Q%G9a>A?em_%?hbfWsW7EpGu%!Gy@Maeq9k@PGM2wqiB%RDqq7+eqgPeo z>*X=?l4@5bQ6)+;X1SnYb@F^fyNMOgqg3DcEd2M&(;i9@{=HRV(Dk1WP zn&0YC@@Bo(M6K=^$8L6RH!o>&e+H91?^GlzY=&H!Y{(pELEza`ofakiHDwrs^~%>H zAJPQemJ)jo2pbTHC7{ZJq>=NUj`@?R0LCk=A- zvDoIJCSQxFe{IzRnI$^bVo~9eMrSvE^N80)&%97d!%tn+EpVyW#yuUL?*)H~l-Qog zK!KUNhue~;1#9GfAnxA6lF*!$!ES)?8AcHh_K2A`W1al1X4ERpZ9a2;1-V1SfHqv0a@Fp@K8 zs+y~DvBW|e9O%=44oKCGfx{_fFz_av^aMQSus0Uxoi=`AI^4<}8l9)rdv2{q z^ti&#Js+l`$KD(naPo~nB*Q%>_v1XpU_L&P22wZ(cPsSnsTgQhV{^#nC?pV+DOO@- zLzd5}k1g=a3)opJI(~HEB+-J}`}w3_mG70TtmV4hGR5!|jS=BTGa5s^(au~L+eU-0 zzP`bo6plyoiudCo!itpaRe+4=rc6XRCDHW#3BpT6RSK`m zzWNLfLl^V;E{zu_v9#sE1_l==-?7?#SQVHrrTRghvWx9OpomiB^HM#Q*Qpzo`5F|< zlOA_b{V$9 z8IRxlBtN@aU&$`3vf@Q+Ix5IxU`s0{JjuGgbiN2z)`YXBSU5H|Dr5yiZ_fJ$1c!(v zn$|EG8eSXYp8?QeK-i++ObppLMYi(iOPk~cm{Ek%6W$-@WVRWO=J#M9j2WjH$@8sq zf~X%Kw^NI=buwk~%cAWX(Fu|lB54sA8nIgPt1?=$VHpyEOx^{Klp}QkA|KBb8B|j& zhj{*DwqFaf(lwLKS3G8!azSh$-)w;#zrWTF4^ z;1d=7hE}~Pri?&`_H6a=$!2z7vS+q|bb}fMq~&DZm@g+bGkfYvSA>I`bH8Bq;Z8l} zu2^@!T>~vkFDb&Bg?VOY4_tlzj=gWwLG6gqgsg8nSyaw|4^?hnROckB3aLJ&wEGKZ z?`14n7_cFKnQYdIX}hmj8U&+&zSfAkV?!PyJ10~?6onq}BqU#em}N|lAXgr;RHJ8P zJXo6SOI=bZ&xdIlgw3p%o!sUoC0aT!ltS=PQb@h?tJ_k_pTc{m(`F!K7n z!|CH?4~Qv#%f}MNu~KooC0ucz1E>X4^E97mo>lwl!9D9*9g=r+fw46Q<2|y8{(Z0k z>(b`Dz;c*S`V76mz4V!Ar?GEGG9h1o;5C8LP|@VGQ^L2w=y+KZlz{1%Q0l+iF6S(T zF!yxZ<#jRm(x;J<(0P$&H`37n;H*J9$waA-oLppNeot*pvX$mO_q>)%VPjNBZ=)^4>Q- ztPy)fL+mwaN+8~j?x{eFvrfdRHVm%6 z&rv6#h5$+1A#K~6#a*aUk}0s+Y7PxxGp3;J1KSpW7EOwC7MLYeWkJ8lX{{r>3CQJZMj47i-~6j$gdMYV7=6+$7m?zadE4 zBlXLJ21^z_AF>S|=y^RQGY>bZ{Hnqf0AG>zye!2h8BZmeJ*v&=UsmmIbSkoMk4A>D zi`#5Q*ZB&<<(*p6+ly_Pc|02s6MC?ny`KX;q?mT}ehLLrs^Ao=@JY;CEy;o@-N!qF z(Zol{zI-aV1&s*&2URcl$nJ@Y&FyC_Wu6Th>a-EYvT_mxd0ecaI_nNY&DgQi_U_TV zkQ-;qY8hP=w_m*>mpPFfi-$@H$HS$V7EtAp3WTO{c!YE!L9+w$$;B|ndd{9O+)82= z-5_}ZuVow@H>d%_t%u?j4X-y-6=KR{gW_|WtB>8glPHXW-tIJwRz-Md4gP}(yo;!T@d^`ZiCUE0<9`hai8L%Wm>?* zF!D<%bJhc4#*RHe+Fz-CwU@W`Kt7E$7?>g8U3@9bkkI1+a6>yVWJ}1kC=ot{5V^}OA)HYGDa>Nf zdhm&PnDYE(&yk*DuVXFl?%>*W#)NJHGXcIvcR{0nJE9G)vMgC6SYwCBu_z3lSo>k+ z?y$jW@`G{iDy=WjXa}bedT%L6hNancO_F4r@dI?_@mQ$0=!+$V;QZJT+U^P>p*@U8 za1Jy*P8wqAXC^?Ch?rC$hvDEsw%T>UZp`=hU*OgrVmpN)v>(C|U`mGVAOB z@7FSlV;#%)pez&>HJ_HB_=jtUBowEyj-rXfX9uD9$q#He|a< zunGSLv4}z$jJCp@oVH3`%t9^pWTnHov}^f_XS)9|?(Pu{m+^ zi`jT*mdD~cS-7+H@$q`XTMENRUv(K}POoe=_4zr>Qf_ff#9AOSHEP_VB!YB5y96}P zxVe)xyB#$6`@6<&h9oUF;VZS-}gdkcTMjF5TNMSC)aq%RY_s2GrqplLLa6x96cB7 z#f8+`0Nf(K>rd?h_^N#!`mYB(F{SQw*^>QTkOiFfv!>5&(@mI%ecVCEGv(%F*BZ(% zy;<9VY?ZyU_JjaMDw;H0PpjK#a>b5Ov0N)P@*sD-n|GPYFH*fc9$?}Fs_KFSgLK+D zz~{&K;qB5ti3y0c1opS-U8bldE*3|5W#oSeE}9bRs&jp$MR!;fs=5OG6yeUQZDJj> z>k;w%3n$+z7KuP|k%jfLG=MlgEu*)&Vy$nFHQ^_}6C4hc|MU1U{+``PI`rp2ifx1K zeNbVa20Ta5eymkMVW4E;h0!9MjMFdCWH)Q~-Be7-b~vERz*J{a@dnlAMvbx7!l&~H z;u{r8kc8@ZfTnd(*w#Z!M#^Mw{qtD3-gW$oOeYnOJ~q{_5OnygLC8Y~$+V{@+BXN- zQfmF)6=CT8p#Xp!l8$uZvfty;x_V~5D*A?l#g2^0_Aj!%lS$C64&J}_9LvS?Nik8t zn_`gcCX$~_pM;kx%D9y)9$a-kC(B}6U)BEbxyXJdM6v#AFZ{#G0Nqv`u{L!~kP|9&t!px2nHrLe1Jx*Tg$uQ@< zUY2l-7>JL-r>YE^u%z3-Qi=*pT}8*tej`<1ue!dMwYK+0uCpvB3eFOzPe2XIU9BQ; z`>DaI$>@m!G|}FuCZk80dDM(cGbC2~u#)lYvUT9$QvJTOv-3r)f6mS@igB6Ry7)Qp ztJXS>Z4W|FK+C0GIU<^~+}b6{hL)6tm$YIMH1u}#vP!k4$O(IsOakdYe>>MuN37nA zwVW8iWkfJd)GQL?GV|UucuShu z1W?7el7+?gUA;=(=(*7=OIvdU`+n@PWkyjm9e#$;<9ymo#TB@ z4v}hYaqjato}AYK8+jAoc&m#J>D%fUbVU;9-s?sz3SMvpZoFi#EX0dCCC8kM9BG$w z0Jd-6L%r%+I;$|DkC8Yf1%6;6KlWz} z^Vv{_(q)_$dy)7WbRPr}pN8-+yzA@w=Jq>T(IPkcmgj5-ZEq@dOX|4W6;SM^y+v0U zAf5COR%GqK`X&m_s>$gdWwu)cY|G{Hc~-Hlc4F(#O05IlJSQ_@NqVfca89*F-=kJP zJb{+wdC<;9%JgSXJl*-Q{2zDJ7y}d~n2O7kzc}eLHAR}qL;JvQ)!7OL+3yK3>xMgi3APKQzS#j9~Zl<%FlMxTyo+th{! z*}hvV0tYhFfLJ~;!4_%wh$OP>J}Jd&4#@z{LD~CPdW*lju zgTtFLl#ySb{kJ{x+3I}lv=G}lUIK9>sr<>OdL@EpM_5^lboh7;!N=%M^QI+J8a!ZS z8z4*-+KR(yxp14#(RK4iBzg-Ytv#-?9BLYss=%v|7>zOmyLiDJ1bEIUSYy5pCPT}o z{j&3~SXes*!49-Wt1>kN_a@HyhYOFr`x6AxtP0{0GWqAFrS>lWm4uG|i zS`SAES3bB+F9b5%l-l6`>ERf1;DgTVA8h*7R5)|XQf}_(!B*FHbqi_SKn2#RbRiqu zex?_TSq&tNw1f|jGDflDuC0oQT?%OC;T?+zT|^qJxt*6yvLmjdaPJ?shs~NL0r1nH zCAe7~&?eg4(~4BS3CEXx`TgxnTcsAOl$gCzvnC8f_??R=DkpRQt%-!u`boU<1uc>~doMJ-D-NNgYS7VyJV<;!sH zX9c{A0}K;m;8wlzE}wjC*j|lL)(f+iPh-~K*J$&6Gg0^h=L%x`Lx!wl`q8fV$IPY2 zd@TrM!RpG|2XN<|bjj1F5YI)j$R)N=PWmF_JjlCo-k#)7C>OJXQCUjrLfAG-(w0O}_H|Gll=l+=_xhMGm?8;|K(;?Y1B7^dcLS+{L?$03rDeCRiCLnsVH1oZgL+b*UQ;qyIt+ zN)YJJC?r2ZP%MOFm3!*+ql56;fRY&?gJ}~*MD&uu$XntZJz2+-b{4FQueIp9C+O-* zxGksq>&m-mD3{FYD7&H#_uivOzra+yxLwzzqQ%I;{gKmi?q;IkFq37oRU_n%B*0}K z;YURyil5(1%8al2(emj^K36g>Q#$awGJD6m9fOait^$YpCuCcdpocM|=^-J??lnwX zMmdsCen=L|2Q?kK5k=&>mR@SHWX?$05p2D`7S}=M1!8~3v3;XzJxUnT9+T4&YedC; zGT4J+Qe){8ccYt1?_$-WXa0OYowC_OjfP-DsjJ|&=pazBsaV(&#Aq0Y>XN}>{$oec z=#hE~GNg5jWKEX89tF+#LWeZJR#i0Gvg=EJQb#skCkfyRYb0@+HSu{WOp&3Na{kZ; z>LW&NOXiPizY0a>XO2aiLo8dyU_1|!T@jRXFXnIeg*-FbO|BeW6+F%S+uyg=d6lg|M=BpWu+ zi}?Vpo@rFX{(;l=T{LCT)F9@->!9H>``jbrGNd8DbK3Me&;MFN<5s)H)C)4`mB4xQ&6 zZQ=U~T64aa2~4urHC@*?5sk1`rls3L97#rCwhk&!*#ASaU1WTwnRdI%Fj2QEWd^4$ z&6YX95sL1Fnrrgf?LHn6JdeHg_a&$!u4YeTySs;ms&rN$y#!*S z%tY7!PR;Ovvl~4{801yws@Ai@8?6b<&p z+xN$l6ruZ@D$IlPhhDrbUuG2gBfqu}Q0)>*$Ox-FOtOKRIl9X~W{VEmp^@SW3;GYj z+)W=lz7Zc;7}eNGa84+jWvfUkba_Jf%0KlNds0b9ja=->^ty_sM%5%xh&;R%DWsy` z)Gh+4J|jpB$lMf2uXScgwfEZ_YRekgs|y^sA-|K@sL;-P7S?KASeT#2W_vWt-s+V~ z%E493$)5+i++fw!?Ub*Bvb_F#p0MKKW0QSy&@GtjJ@#%+K`hhYpk%H^xCp~iFMnE` zg)LN=su}&`U5%aK+pyzMAyg2HNXDIz?(0jzpBbn8EqVw5@}T(WRbS+0t3{h+rH4PY zmsDq?ZYXJALf@l%DAN4gQ4D{OIOHq8S8;a}!I z#c}jjA;$eOp#>J>qm2Gw6u13Bz3lC!RAhl+9sRL(f#o6@kNCUK(41Ygk7~P4V8Md{ zo|dEO{$@U(bJJjf579bopl{Q}@;E8%J~_v29flo(P}m}+)~gDfQRJ%C>)gj7K2C7f z$MSCtteki<1CFW#prDzNyi52@%{ocFu$mvzHuGC$$;LV2>jus_fcW}Mw|q^*?I1mQ zt55$2A%G&kAFO8V2#7Z$5IMO=~3NTy4TMD~D6;J_jLFl#HxCi|4 zRY{L@J>qew7cJ^tjfV$eT`sKNe?5&nO4H_M@uN~FkWbb2!NqgHWBXt!*Fez|(TB1V zXkM|oh{;5ewqb3-+JLnJYW{!Os9hr(Fi!*V zW+3s}S+5I5|Gh%J5B%FP>_yP~s#Y6>{&R_Z7x24n(1W1=S*1Pz{p%d@Cg^)p|9{X0 zlSFzuH#0T@N064a_go`BfF`g}DSh`Ev`A-$xax!U1>Foxp@vs+_0dVY!3AyoMA{~GN zSB#0E&;LTZs0X*o8(Iar`c|Lo4q&^?cBU^*PCw(_i~1(BOd|EK@*4xKCDX=Ow!96k zin?&U3M{hDaBY5}lJ(&T!(UE~#XIQ7A*Tbgy)JZefelL~lT}$0BIKuyap8Mp0P8~k zBM1&0j!>$6pv`{20F#40gMBEL=?4{+UnJF`SYy5WU1G1EmjBs=VA+$COZ+=}9>X)5 zdsavzU3{$XZRKj6BtpX72qbfoDuI7>Pyq%HM-yFK+X$@YlhV@YScentMrvtxzzK}N z$7{i(SbdQYd@U@v-SBjpi!#t8gDiEXOHy|rCw%KP^N7Z&qCtS$7jPDVp?4*mt@>{BV8eAi}ihn+wT=&ccyv zOdSt)H%Z)sp)+OmqD;g+x9N0)tz>OVCsI8K?9sbbUKXwHbiO<0DHeIplA*3}MpAtP zd_e6Nk44{TwVC=ZU<98<3zNbbPVdmaURvNqVqm1 zdlypi+uN`E;;;3W7t*@+DxNt-#y3024))w;0>|XSJhLc#aWAb4-rXu1!wz=Ko&nfI zUqGbq{npbRUHqD%ae?ZZ3fAo)V@XXi;26If_<>Ck zk+v3rtAwE!&HLzibix8)w(G?{XVq5CzebzjQTMnGE;lZ!q$>n$+E7e^BAtOWU1C=t z@~JjG1@qW!WkiYT*)mTNiu!ODwi6jjVF<9oWdst|Uh~+?mt;^1ySV-kFP$ztR?Is;&^D17sRktd`o7_YY?WY5&l@0c{=r{w#ETSNWB~G z-=-g8Q3I(rY4S`Sb|-L1PJoASEWtU#_SLO*0Z=dI-9Mxbiw`l}Xu8ISCSi)b=~^5NQi{P8(^+|!8^pHGt0*o5sB(Y{rAJ22D#x*562rZ-CJCYOjqs75jbL+Qe(UvA&q z_&k75Y{(-T&FbW{WqlozGqsF{GXx8_LQ~uzL~X=E&5V`{?9?TGjDdZ5F=w5Dt4t`n zSX^3r!;T|9IKmFDE{XY&=)kq*Oc2>FV}AO0KlukXXA<|OzuNN6jj+ZdpR|@Mud0gJ+@=C9iGub zVRnr(NO~8fRx%{15Mda1K{vs}P)*7!;|uc;$SorTSo&F+zm9!sD+#3xhY6f*fQcsNEjuf`@ZCL8C!ml~{qqm3kX=>-@zOU*+LX-K3-u!D zZgF`Pc`RX&72eqxs?BreN!Lnw#nI?Y#M@ zSw?sqWusqd#!F_d!KzhPf(~+$nnIMm@zKuzuvHGXm@TS^?)yNH4%vt+DL=v9t-^>p zbe9{#$$Y?2J+?jy_m-u_RXkQDKQl=ocFEqT|L54xY7uGdVQL1U`H?J72||978$@0n zjAFHZJvdqv^M6FTjH>s8bhw{$_Ws$46-w}j)4f?yzbFDrvIB~ZChwltw4CE~$sW`{ z9Mi0%B<~^jp~MIw8ko95>qDIbhZ1m}8=vk8jkc29cBnui4U2j~N3$wG{_X7(Qoa3VF1_S=nGl(~Vtzhc4OU9>@4VsIln??+QhWVF9`NbZ+<352{N3#- zHreZCR8D!Ld-x640KcFpi1_Zjiq|o0b@^-xB3JF#82oy7>@wL4^b+O!F#8P#!$bT9e1*z`+2V7y;#6H-bxos;u6(xJ0zTK>nK=E-`FTf60Ql+ThAw z{Z!n!cb!*9GhT%ShlusgVcy*;%UWmPrm_qA?5Zed^_ExXGBe(#6i{8^@lHNK3P1x+ zwwh6rV2&wu8{t^_)Ee4c_n4!KEIEImu|K;>dl6IHPO2}PI6PWr!lm$SIuRnT;P-8u zVHTg>3AIr@BC7cMz4$zC%}|a;NLwLRbY#Z-SUfjk%aH7FVlglH<{r^MkXJMJFQQ47 zD*dR@aa@HN{0;4bZgBMV6%2<(avaNHgFoH__Kxc+Bq9`{5^piTYb zt$D)oRklel)`2^pSjhh_Nov@A?hkgt;-`42`H{ zuj9|%YNWSRtQN&r>_~+!W&VxMA(8wKWp4Qwz+21u28ohR$1Ed)kspnbRl)Hjx|y{F z(xJw1ERSt5Mt|RcfsEP&AI>f(;own!-XII>=RIyWgIt*Dfv6(y{!Yp~55 z4GcCn(h%Pa2K~VqHhy^!TBXE*pCQ~b6_^!ktcBiD_vJL*ocyH*mhkRn+K8eJ8RWPL z@S!m?B1C}ihd}a23CRmY-x1Oe%Ip)nRSniBiYMRAQ4X*YJJw1=?2|J=Y2F)V~L;tYf$x!cNzpDV&A6^Cd*_lXMl+qx68-j>UrhyLXrw zP^IW#g0`;a)x!IesE%(ec|RK)Ac7h=CGqgn+$Oto6BytxqeNWczF1Z~yVj&YXU5|b z*u}hWN?EtCo{)=L#0vvv3F+<=>%-ho7u*YhL;j|6eEARPcT*M|kbeu$QsB2nA{B|D z7HxulUm%Ng)em@>(32$xcfl#Dw(|N?O_>yPS;3alI#Mi?kzK!{H)kyoL^z2Q&uB++3&soClR7>iBXdQOBP@f-tMoxw+nM z4$0lMwD>NVP68Gc@|fZ_=4~w`3)+6@N>fUq8x#DikfC{jBKlhj9_V;F$e_9oq7Ew6NCntpc(2H z+iDSZdNGu*;Q>I8)bB#nU}fi2!nwFmn0k&eUJsge=EzqiT(&o8{ zigl*tzZtm_nDeT{)vZ3k*eI>vF6GMwv0ZDJaUe6L1MM z_Cu6-8ee=nekLHROuhfn%~hpno*WrTI}$Z}m_t>+F?Vi+TFjzB&f;5VFbhe}9&LGE z81nZ5AptoDMW2|9`3Cu_zabpS+mEL|4HtgJ_#be&D#lh1iTC=A0FH=V zCTsP6WIuI~S}#fg|1V#$5Qzq>gW^o$kc16V=_H?BrN6wz7*w=Nol`x zssqJ{YYcD=tosn-!~pDMa7uGll2_i9(Du5x?Y+e|9j4BkuKNt&NAje}`Rgb<>Q-FH zhU*#_zBf3Vnj_Tb6cxCYg^|`KmZtsK1cY4lK3#Vj6uhZH2~O_L7hWh-oK(NG!Rpp& zjT-z`)Zh;XpJ%4rK#L<|&l5t0sBYoFA`wT;P5Bz%HrP*Q(R5>QtCgrbkj4~2&>{-f zmIJb4XlsB7Ys*K1pH>%i{XqLQi*P{mSE7KXx*+Q~hSTHJjH&}}uww|MiqK&4z0WIOrMlT#56X@H96xyjgNA3Q6_cMB=Led$UpJG+MU~sv0jFcdS{Iu58 zDHG!S)Z9E0pJQv+9LnItFJT|j>w5kmF9nnbx8mEKlwvi7RKeYnlL}qlj>O+2 z@~L%QOaIRB*9sJ6;%qcuVZ7LNDaCPA^7AqM=h0L_H`^3Tw^fASm5*x>wo z{t#dc3jwjtp1mwX8R*JT{aO_xzxJo;gZgc5pVl4XvWh=Kn1=*%8377a7o1|As6%kC z!v+E?g^wPJr}6bdi`*ZM2^+KcReL5Ku?0G|k|-I?Qw0pXWN}LTKPz!VAHozQ%9=j6Mz)!9;(E3SIZ0aW6Q$DEQ3AItfv?Rrp^i6D*iVUL4 zM@MnR>su{R+#(L2u-f_EMcOjHi9K%E8$=CB<(9x1y(taj9nRr?Mh$r0{>fSCW6Gl< zH&M#cBkx{~AE?|kQD>{4o-`@iYuU2+jM#lrn{z||!E<36CRJ_xtiuXMGMaq&7yh87 zVV83pfq$6kfjD?{=|U_$MDjMw_aH@4g;sPtppr2%;&kGr_?9MBM1+3Do{W5;XE5Xa;!mZVB6Uer!Okgq-!{})O0Jv8tQdF}^ z_n=&d?aA9wn*qK~&g@*EQ|7FHav1@X9X96{-IF9O>%3Ia zsH7q{GSPnsN>GAto%?VfblBu$5(m7GzLzDPyLRE>j(s*ng*d?$c$|v2XcprGzBEfS z^H0Q-hr!j8lxm$2VtR9nUmA#KwRaw%GWqBCnuyf5@LeopLPDJ{cE1cdM{ACjL;NsI zQ-ZAMs**6imq7(hzO33~xKA)V`!xYMCDRK#RK{K|eY@c;#B=QkgOf7sTd*66A-1Q0 zM73tv6mz!L#EDdyYoCm~B$#5Nr{d+1CNl&A#^8M-i=SsWET#@n%M&2~IQ7~rL1@9F zbT7CJuB!Wueo_uyRAWjFMIFu)lCh(Lj`~_N;2R}}-y*z${vFA7%#BqRh7)#gR7w)U ztP6-`)l<>4kUQ$thjiUfJ?tkpf|9WE1=BKGt{{6wWp2@x&lLhdBK2=X4X23KoBCI$ zDC|R<2IhKfb4xonTX-1YXWZl4a8NY{ENQC>Nv5g)RWFO)S%hJr&&)3K4U!0NOCW?J zc&ZtD9ja@{9qqLW9>94JMcYG%w5DKT5e-x6_fO(Bq0#&|NqgA<%_?Zw6h{|YybM}i zUR{fwO2|$5d9B!3v{8Zh8;^oZzzReWC?2^N{mK;9*5wn|u2}|FbU-$N`#?I`5xgQ> zOQ;fw(*}g~B?M}*A3*C6${Uqlt2xhsm5y9Pp3fZj&1$ewqcnMwNedDpJw@jUhPQ;- zWOtIfdGw-e*>3z)W1FE}FsdxEDGM+A7D}#DqkgfeQEEcN-+CKtO+G9H!f&yrl>y}d zmB1zol0obs{}bI2<^cLRSR&empe9`emI6l5{&p&j5VLQhv3`3Uu5MZZr#Y4LN_g2a z&u~+6R+apj`TAO(JlX3feL8t3WmxkRiVf<)$xod{cS^VZoPX)&?+?y`amX zIJt%0$;^PZTpBhS;uWw-GiZM+NVsb*%PD~{i^5t^es+TDX#zVd zbn5uu(!;43fbg_Z#V=uaB;`OXMzb21!BnCF9*RXI2E0zEnJcxg$Zg2Yd|FG6ylkvy zNm0}fLzw274fQDA>JmOOZccVvG z6~a)L1F8SNj!!xg(OC=_J(V#Gvc?C7mZ{a4o8Ch5y5<>a(BLv*n3tgEt5zZlWewB= zP$^UM*(aTandpBGP8B;~3_hJ#3eAQ_0l5C9ZlrMiAM-3T>f6gUSl&quNSUKxu>ofi5R zC^isZ^D1>(7Gcrpp$b#|PjfFRM|rK*8gtlxcteH2SXAswJ0f^gJOy6HKXL}Zf1UpA z)vvztq6LQOZ*ck^cm5TmTe31e#2LGUevbek{o`-J%ohnurQMPn_GaQ4w$r7PzU5UC zEE5cG$kT>43CqIIys=ntJap%hfh#mK-#q`B2cTa4%cE8Xl`_!j0VIIZV>-`p-<}VB z+_Zjfp%v@qDaQ%%3zkESBT_M6Ya#e_SR{R_yd%=H5wGBOPTRW-Hl+f^<~ZV8jW91! zQQh}mZiB2Ub!kh<#Pf-2H6ir-`*i1y=(~^*fuB|ZOo|>o!8!7oZVBOtR=GF@&(%w8 zU&h%A+tOwyODQDfKomFsj=%)?XTI$8hJK*vBzzYcl4*NHQ>4!XE9AYLcj_(RDOHhw zlkRtM@O+`s!*et+tHcN?Mf6nYn7cESldSe56Ns|s$|g~>irvvU^oP*E!#O8!LX=+f z&%EQdppT&Nu(8+A%^d0TK?w=$*XcnUEXxqM-6jNC-Z#$RYHSrd)pB7~^tSmUX%^HT zux1ts-%`U2sebTK(u7^_&M>TO|KAfK*)I6Y758&ebExBd;@>!j$^!+dK)^5cGL2hR2P1i;PW|A}bRlSSlQ}Cg*wpF82}62U+J5y)S#6yiG5=!}&_yk0 z7)Uagi%0&=WaU~!M8i^C{}4RTb$lfvfoY;4jyOJo^Asfa67RqL%`KbACvHV2PNi0N z-BY7P4XB5uF2X&r{$*}`x9w$H2+B!Q{gEc`F&YewS@yJ7-x@8&&~(k(;Vtk)9Z}{z zAHsT3o7JW6^{T|J%SaDa(Ufq@xT_L9AE*Ka?=-BwjR&jy0G<76Zlw)U*M8X#b(w5j zvX-qTHT}~SP#G3dy}YQYv#^wpS^2Wh12lF(K3iv%gG$Zg2COmIjBwZ1S39aKdPQ6F z5F>jRIS~wIhm<$thQaAOV8fa*o5KXWhq=J2ilKGIEC+t*ZCwjx-yc2I`ZJiCQ=y2$ zokdVvxS6~`ZjYEh(*GP0S=O+|yGEec+MTKoi9L2|;uVF=NA7$IY5z?>V`7~tq`=WZ zju&u$79rD6^GPCpCzW92{Dv7>6$@<&n2f`^!rs`=sc%-DfPoMt7tA6a{BGI(2E{}%L6AF7v zP8(@;D)TvB7q+21g0`*aEs8a5B|@h%8-L2m=}+OcGXjR6r5slhq)_Vl)UXQb#i#=H zCBGa($RmCAac9}q8Zu+F(J>H9v6xh2?aCj*)&-F|bFh10h_>|}v*bpA(x~5+l=*JW0v`l8aORxt)kP4UqF;Z9_@{yvC z`9$$fCCYE%E(Bp}A{nGg|96DzjcRBnkYfV5CTZGsAYLdUMk7D8$Fhm}hNA{$ z%U*yxBeQy)Z$${h6&A^^wDnI>u71_FeQ|X?bGd}ZyX)`TO>;}}jcKkuL>sbh2wPHl95w0wZ2YsYx44%K=g=OV^0QAG6oX4nKLyN-cf@|uAtosb}=q?F)g)1 z4_P{SNM7?TR>bp0EP{gtOUPX7b`$mUJm=u2b+Ie-sj=Q;oIKI?HJXz{#E==c+Wm(o;9*0<>ud#NMNgw?yu@CQGDW&z zq0?;javlSHC=}5j|E@e)UfutHUSUA&3Uk&>Mm0{YY|L3+<{+XYlsycNU5-9G>m*9u zp3Wx>ME&8M4I6nn2MOF7;RGt}=|a!M!+{q(%i?&-I`A-RXI(pAsg5UkQwf;oqjIZp zErPY6bI=idND<{QmPrOTV-ugbxcpyT=?~`9JH8AmP|!n_T^yiwRjazDMbEbU%S-_D z;0cZro+T4-hYG8osJ-kFRu6v=xr1D)s&o;H;qAqXD>RflZdSoLmW|OEJtROoj_;jZ z>l9qjkY+?qr9yz@J+U&tkApJTaGnMeY=<;p;D|TYj8u)s%RS0}O2fY#;Cw0rae!LZ zs41FhMC0cBHi3GM5l`*l$CRKmBcp1{&~1 z#lCV7J7@e=M5|nylIn&Ye(#ng6x5TQmaOyZ+`17O3zxf--#L7mn`2^UCP}1*f7LIB4YKVXggLVl>7!gKhP0T zdEGCjOkXjt zDs5jG&8A&=l8_zCpTu8Nla+8R$IG(FW~T-w^sM~Fb+k2bKerP2V3k~CVvgtly+dlP z2hGk9Fy;XXr9dz_gg-)Hg$d(L0Q{^@p5f7&EPa0HGF+Qqm%i}e>%ry6L zs9{2?S`tNb?Kc+FNNcq`y>CvZa%37z1$ALJr`xudmOe=wprw@L7?e^I_DWFoINE*p z^vkK47=?I~2&v;O8zGLy$KnBUlQF>f@|vM^@j#*6;@_b5F$_~iig1wyV%fkTKHY1b z|Cj(J>gFUW0l8SKXwdoYWlHhdEzQn%Fjgyz`Bw63%;^qVcni0V=?X$2n-OAcRB?+F zWh@kU`eE&M3n)KdBZ!l=w?>nOweePwqOe_ZM%vA{P}MoM^$s_<@gV{-joAfJZ~C@( zo4B(fHaP8|KN-ecKz%=X+K*Y0Tnb0jvA69K7Xv2aO=1M8V=p8qupmA)QREcfS248# zk?*0)YvekXF~dO^g(@`$1Xs@aw>^@-Ih(Wiwu*Ge*T#7QQhS`ducOKAV*U9qLsC<` zQTfg>`?<&I#5qu7uvNA!>&VcRxqaH<2oLx%ilmbRksl@n$JMYqHSL$jHl--Gl`c5! zNYAC^V}g?+;{YgZZgW7>RJ1$Oq96Fl2#&O|A_lIBB2;MHDW9} zPw~^9QG?S8PPk8+QQR89(&P5l(RL4;5Zm!}lw`k@l5?GK5(LB4>N{-o9|87H@$X%OvGYQ0$PE8hQz zEB~_?L4feq2AT5te9!&$>o zSnGQoekC*W2ZFD90peVk3}pP~#CrIcXB0n2GEThz<6CN&qpv|`u!U#g&CelAx)xVu zg9L{Sp_0s843CfIO^|7;O*&mMEf!dB_(wk_mND8sLVnyGEmTt45?DO?w$CJVc((~M zE{jK?S&CK>t~xX%36Um8OmK|!MkviIhVEMuLhyg{#}fo?iZW4jTu}SLEC58^tIhY1 zyj%F1)5G)jdvUcnNA%{B!w^l&ARMMFm8Ks*&2&@DXMQ{}h z5g^*hrDzFv72G&&MqJ|B=q=5UDIfsg(xYJ?V1RYW^9Rh9{XESPxl(2C z|F5<@qcZJKJk(jN2zofA2(BbCf~t+ez9p1ZW;A%?U&i?Lb1mo4k@VPwJO zb{%t#`RTq+5qNO1$Eg8Y>5b5s!$zRLcZcWHV8X`+AT>;Bw=}%~BsmVbA9d_kVU@&g z$}{0e9qt?Mv5*N=Y+2*aqYl`|OTTBI}TyJKW)%Bd9B*F>A&OOg%f%PSkpq!`CY8t#7B;k?|JJR1Jj1 zT~ePed8fAhey5Gd$uqa{T7-O|+SB|Go*gy##m@Sgdd@!7R4s?1t_}GnB`bg?DQG3V z))n}RVq|ny?yK%LjtWR%0YGBx{jcjo@XKvzPM&k02 zaQrF3eA!t%cNh)!!0)4#jjHbYK(s=6xZ4={v9Uuj1Hh_Jy>8gniaarM-W#34zz7Y8 zPZz&PrDu-E<$TO1XW={k)To1pa>-&WkCkdMhcFnDIjqEMlv3S#d-8v%N-lDxFo0t4 zl=4nFxxWOChIg=~ZRFYp#`w&S;z*k0C_xWqmA{kP*|bbBgQ#A>#VHhZY!Yl)KbUQ$ z^}KCImdAnQh38xlS~d3L?o@2!lUB8SH5D}9yBKjpzkSj!2y^FLg8Z{At9ds?Vncp9bVfT^FwVmK6{$J8Dl$!@+7LW{o?acx6Vz9 z%feT?n7K10=E1g#REAT`Nc&VR=3S=8!+AhfCiTJI5=vT!=dF*WV2-2+of{=nCo~_H`^z?+q_7c zm&M8ioF$S|!rLv=u~=%Zu6_Dfsa`RDdV^w!M?KZ0uJoUz2_@QhcKhoPm*9Kk#LoJu zC{p3}$-=DSLD^mteI9!2^^QULroai_1tX;dQ2jm}EY*8`z@eM^caS3~_4T{S@eC|m z?ITzsNlaw@LuB7MNC`oaQ!%U@NMsX@fj!Ix9*d+->B3Mu>8>nhN2#c@ZeI+AQ!8w# zNJ6Y9do{%P$+X8U4~j-r&-VflBT-`F*~eag%-mI z#YX9g>Gyb_nf9n%^I#G{5;?C@VUn)t@Qhb6TMq*q`A@kj`~+~ki}x=s1DvR<4bv(metb6#wM-3me|%^VwBN_>C>1(7 zI5RBa1<5Y=Ndcx%Z7oNoHKUj*OcwQoA1fYMGzf~sPHS1=rop%$VngHjl-xEQh}%#J zoxsh~$scJGr3n0RnFG!6AxKc_;z_-KXZ58|n>VbznpuZj&o*Fw@PC%bC0UiZ*I*vU zA$kz7A0aHVNgme|7^T;{UvEXid$LC#IeILP6thLQNlq zXURqxm>bF=j;c-OY+aQB_IgUA)6f!V5+yl$Y8JFTkdR3qDEQnG%tvk_(@Ii8Ygh+M zu9yPEDLK82I-&^KH?%7wUX$pGAp{+}eda4(Zw=PM_x+Uk#XkWpt`L zl+rzK=c{zsZ}}d5eE~mqFJLeC-w{x{6tkzjL|dzbBR;o5?TP{gY&4XQhf_w}Av&So z=uj5wiD~a6+q+Vh?Y8w2J6cX-fSLUvI7CBeH~HJl!YmV$p%Aqvb$z6_!z_yj=DEzo zpg9h$XrioWhkRty2xOHgh8JOObb~&-zp)b7wHTxo_P1D*(fJVyPzQS$~n9QCLIHsO9{?&BC9+7Heg1;N=AzH zG7eiBh-)3o=Ceu==^Cl>2XUtmEf}KC0=)}!^(B=l2sG!jrgObtK)K;X=;@-cQx%&f za>)tg{yQG0aP`O`#`o z1Lgu~!#M<%4jeAQ7t9#j5e#`WR`T>MH_lgx*(uaZP|J|bUIp}nSyuSn;U ze$MlOmIA3C5&uyH<=oj2Zqlnaa0v3g&{lvp)uBl7rre%Ikqk((h+87e6b=szR`0CU zVUsQRg8$Xpol=g|6EA$jS9Xj5*dnj@k6Re&kc0P1V1Nwhs|;uAlI&goqAf&MrmQDs zTyWDKMyPrn0nsHN&TlO@6dYcJ<)ONeUm`nq)5GlIB}Wx&n8rwt20cU?JBg(D@rP#~qkqkmhf=#TF=H!NYsckLi}6VD%#4dueml&==IVmz;yNp;EN zsK1%_!hDSq7_yI+UWzP7sG?g}xN+#b?kog0R?h+?Ht2mG5d@zmt|4$Pcys3bs7>w; z4=_j;w2j_ukP_D)dSrA#3~t#u7j&3)LmkP@@#2UVU7m2?fPU^KM5L^}vdba(ydJdH z_m~S$LCXGW7glWWc9PD9TfTA&y@_pY*^JUL>v0C~r+&e$Lko;ys>1dXd$04+zgh26 z|4Dp(;GKBl3gg!Jt?UuwVFs18*X9oCcok!axf-Fbphi&TsJrfjbGqSk{tVyM48PMJ zI?lwC#C$e!SaWvnmL<>exiCCSvqaqB{8rUyV^ukG$%>lcmu7@J@9J$^G%os{hunkJ zMi4)AG{{O(25wZcgchQ7}BM~C(|FCrlp^u+yKPw`a>$?zS z+M?d@ZuJ`nb29QfQWEWx+ZEMLPNSNd9A34g!W^;mQyU=HbB=VO8--B84Y>_fDHVI{ z@bNLXc3-*hNa$3#6@#+=X>a%hF(}$d-Zi)HgeBN<8;H|_=s=AM7uEcDrC%w-M+?px zIkNU6VuuTLv)P6EyL~)=-Y*Ydr#)BeGhCiKMXMtsS*i^h7~K&ls~n4og=vA#fJ^>N z%q${5ctsK3l`8@4t~(u03m4aHm!lJPbar?(!ceu?x4`(pgyHp^%FP=wvGf|Nj%{3O zPVK5SLdZOOVr$}$=y`fW`e+*IQ|inu1L6oe${v_8$Nb5ES2lZORkBFB+9+tUmJ0rjWcdw$QZV4wbngdVqOaGR}UB$7o(~X=V*lRtz$#v zdfmw?qBv;xBs;_%?hw&g>sJyXh|PV6PU^NM)asj<->xH7LcO(nYll?)L!`3|$3d}p^b6QFPdDO3H)eZ`4KqCutd zhst)-H)XRSpfaJh2^@`HnFGNFaw6-$(D%IJVjhBU)_okpKWi0A%VT)hzjj%%OVsUTcL#k=-r=O(arD<4`;YWrtpcbCHaGg)N97^Tng)Otia_ck<|Mvyr ztCWvHhL%`3NxjgtT2+i2{KoKplUVR1GJ+?v*S8P98H$LcqsO zzc=YRx%G<)?!*@y+2y5rhn_kKX>6b$Lqgp;x#$ug5dEj6PEB5K>cN-G2%XC@un2pn zc0?DrdY+pSW6QAhfZT^Yc`EWJqQk$^+%=V8)Mwj(FVJ&4BtD)ccctn|VueBN84`3s z$XCA5QXFIfuij_>z3MM9M|AS7$EiK{!9jA6&TrAQ0ItEbTG989((87)X0UdlIt_WC*P)& z%Pi#8Ezl7~lu;*c7i}Cxh5?RCr;v)uwJ1-uce4~7`4myk`+UJ(aiO!loYM++Hj_)@ z6F8(9Z3#zORT3iqxKbNK=LKw}y7ruYMWE8O*(kCy zM}*`*`S1M_Uck;WR;0Jx56zNh#m2_Pkh(0OgHGFg^2&KaZMs(k{`ilqTP-IQz>!V7 zr+-rzvh0fF;TE4)tlR${CLzMNqyu48NSZ!JVei`AO33o*w(;XaQ2iQFu|KU%Z|H== z3<>p;HC~^8rENP`hC#_XE&G(qe#+Ie%SYeufXE6^K|1mR;8^3RQBsd$W5$y%rp4?q z)_ZRp0ja)0SPYRoo5YWnIJ-h}REBO(|4qF17-+y{4e?`LsMD}F)%GovJ$8MJ6)!W`ZBx09N%_%I26S%{? z(lgMw)o&{aV1CI+PN}dCGlEwq5^&EDDiZb;u*Hj1u3$I&b!ljHX@38I@E3SZRF|o0 zW|rzW4kqCsw)No_Cm{prM8z@s?to(Hh!W9ly$nT?*x$e}YGGoJJs3KIxmiLEu+LtOBju#-0!Sjv4C}AaV+8v%_n-a?FNCebUWZ%D|l&h$*fQxM5%S?R6+r-EJx!+X6;*I~lbZU+$ ze5i(?A+rABia<+6FEUqjhZhmLWz9q7Hk6MmYm+>%PTHCJ69nI@g}aSwzYyOI-=cKe za2>Egj0Pt1N(b;P;9!VJepHa{*Hw0QM$p4**E$z7R@;LCCd3V5h$KybS7frOLPBK( zX1-B6>mrz0o&St@?P8IcZOsipvgNa+-V1BWt|-^O^_fJ(HN}JDdzA;Iq1udj8S0Tg zO+wrHPyjxGgp@)v=yZIyCzYT8ZHuS|1{rVL3s!9u^u3Q2(;m;UsH%pI=5lL_FJ1L$ za6w1ey&K*?VEfNsjcvy;?M_i2HOOIS4MzcodVHO!{RV*<6}UenC|?edn%mdJW<}Do z>2u|QIZ14zu*&{eGYl#h=o3olF}6+I5s4Y}q0@$g>WHh+!EJ@SI3Smdm2*ivB=iAi zMawzzhD>2jGppM}D3KqPM#}v}M`l=|JF`AoSG6AD$vsVLyHyh8+34Q{W&!#sHJ#j- zR_Tvto`bQRxNEW~2TkdZ4?sHNXL^+Pn|}-NT?6R$YPdK0K<>Hx@c;k2c<0AJg8Ci} zr{yCVlbVeh(C|T+9JU2c)_w%Qt<>Z6w!=PjA5pAIoQfsDGjs%V2uqE--&xpq#BV~$ z|0dB=CumC-#x~xy4^xwXHS?)R3_KiW%T&o)i}%-u)&ZRQCl!dR1AR4F-c*hABWAj$ zyom?QxNWdtT+_KCEKP&;p>D2|(Ot7M=I+@@n~^x+7y)(AsC+OJKtQAbq_F@W5owe= zLbp`rxW{|0DX}qu&cbSVV+UP;Z5ukXPq?lWKXyJd?excwTBJZ0CC0nat4WUN+rSQ!SC;2M1bGP5Lk?B?#D4 zZoW8o_wY#n0tF*$n$NHM=Cb*P5+Yg7m#WU(BdgGn4Dh}luESTp3+}KbCo-(4HwcIZ zanlfrH0YDl1r52H_Kxj{Xj*GXD%(6?(6L8!01huTmu4@Nhv>x$nM9J2G!QGC}lR%VyROzPV*sO$?2lf9t7pw4@OtEMsB2 zp>hSkdMOH~uXGr5gfCM0OI*CN^4;I;biQGcC6x?DxdkJ(9kPlj4l}f9{yi`&mF3Db zW`p1Gsi;#x13~UI>n5VG`W#QM?@{~jkkj|IL6IwmXD|YLjuvR!ZHPW;>;gS5<%YCz zEQ)D*PY%GyOaLTd$8z*QD2Sp5Y7=;}9LE4us+5rFhe(gYfp9702`LqiLQf=$MZyCtm@|RlJ8$Z)p#1>}dg>zX6@A4@9zg5i#+%A< z)zg0p(1Lfx`BKSk9AW1S4nD(DUv?K=f;z>VL+GX_`6-SE0nQV8igp~U)JY5sJBG(7 z9%lR_=JC|NQe4GF83DLtuIretljM|A+77}1swfOt)k$r@jmzj-XuSv2DE|b)Vql-x zd83}FY`MC9b><@rLphRR)tPNa#+)ei?DnK+_x; zd@h<9+w-nq8J&WF{C=1;-3Isc@x|I#YSX%pQ%6>JwLqX-_8!?=v}7OE>OoD-8~>bi90W;_ z)UH(a{1-mqsy9N7xmkq`;=Fx$mQG1!z9KAJm6HZ4f!B5)ji+=K#Aa0VNMu=&WeN(7 zv($fTQjx9wb;T+U(GwFhsNS^F^r^Kz9h{e80h>a?dSz%k+x;XHOsmXNE(!*1&#edg zDIsj1u<4$S4h()-QX7X#{~c1nAoM@X`FuH8=q_)B6(16Z9%cwUaW{fWYM~-4xC^w` zXE*+sDa|UM=IuC;8731$sJ*n&3YEYo)oExN*U+TH(ieS<{zV9yi=WZ z&5)kfDqPBSd$UX{L>0CzZ~CyYz};g8*Y#vb!JIb8VO;V16V*x7s+?&~jn>ng1-y9f zm#gI%;L^pRO@%n2mQdd>IuW3uri_Kk$o57?elN2c_R!G%5iafOCyWw5&Nb8gv3#8@ zSdW;%zH5ZeBnU2Qd$Z8;@HK9HJ-W6EqwZ4o*1|5S*PAwa>?DsHpG#zqy~Za6l&Y@{llw6L4O=ZOW#yz#L1+&sE4Q}3O7rg$sx*&-*&#iKwO5?Ds;D2Ld zhCNtn_A!|vM$BAO>Gc$-EeZG)k96Crg6Gx1M%E$96RT$tr9u{zA+Vy;-0BWgFT^dG z(|75CUHwRE4t40-PIr`!tF8cpi50VzV5kcA$unR9W5G~_)Lvdd8_jykZjeH8N_$JD znj_hAUB$_s-Ot3}a5iW^r;M?fHjRD4^95lw$#k1kn zE@<_v2UqXMpDQ^bFMGOrH!(;DNFURc-=fnQl{lP&S{IpsNerKeriBWOmqRBtG)KHG zkuZoXi<2eYucI*5!#=`oQ#VU>>9+U?DU55NVz@V2Ce14Vl?8K2zn)H{b%)TUBz{FF z+kOl`LkL-B*?PMddJfATsjL3ZJtP|=VRsPiwJd#(QgA$Gwj#g4sP$(HR)5%Tm2s*G+VkJEE$xE?zNI&yHsuAa zm*zr3ggeW`{~KM?IN8)aM5P>xv1D{w+w+8Jr@ma*CDs!yd0dJSae{&Y2HEU{N7DN; z{j5iGpp#d(YE*$3qco$hZSSp^ww^V|8eN4W@^sp=l-NZ-yg{HrHk=e=kF~)uNI?7xrOjRc!SdND$*Vj{GUx25brg{Xy!?G0 z#ug|A;9=@ZCbZDr0s0j$E9-Y$ez#t(wHGD5s&d9ELCjxcmR}MHznp^D?NPo>2kq4VpBK5pfWBp9&AXSk z>XD73YKe>?fLLU(!hF4$OHBO;qWJJ4le(g@jQgW`^IRa%;@aoWJ~FELEW#lktWrmF zj@$Iv;*M#^k79H6A6Cx$jTbiZH-oIcCN4y~>m>v24^cQ20^MrM7J;bEa16NX&R5O! zg1OL909;V|))ECK!?-O+6@TiuGREN5PC!>=jXc;5y~e3}A6V2MKYHw&4fT=OCy{b< zFY=t+sg==LSfrSU6q~r(C3`);+(5lM<(94oZ@vFdyW+}l_jA01QL#2rkkg!yqLx)@ zOETI8JP4b+ZzK=JVo#i@Dcx7><9fmET1+UZ6F~>;t6<6Vau!u<6PRATNH$>oJzg&N z5ELSvGq((|3Hq}?g7+{)N#{(C!+*}!Yjf#-HAl-`z)g6B%3>vC6YzYr+RxnNVxT4P zI!9Sb!UQHX$6E1UTK0_X@Sxva+djjC&(&jqdEt2$5*ZX_6E z5Q#*4v>m8|LVbx%EKMr5;t#GC-r)o5dViy4>$HQ1ZLRxLy`6>q?ixogVO@agu-d{m z!O}j}2zV4s)=Fo_jd7y^1rTNdK*9=@o7iYu!2s@&VN`;FW!8mw0%irJQl7DzJHSk2$(WWwo%Qe!G`D9UtO-xxX$6|=>{&vfS>vR*={FdTxTcd& zh1fprhYX`6pWp7I5hnA486V@?=bjFbD^fC_-dd6GklnIM`&xS2%KrC+gMSIZU{@08 z>;AW-m-2w!K!ary1PGEog;4vCnw9tp3sANtii)>kQm6LOZZppNsJV87Q0cT782W3L ze~D!$3?_TtmmOqK`h7osB|k*kYk;;WjG$yUjqF*?Nx>DQFIz5dX#ETJc ztUT+?I~2|A9Vl?^1Cg*saf8R17Nus(&>B;gnP^nZBpJE~@4_H0O#q_AOv>;}6`KC_ zDyI<4^PIZL(h9KsBNu#MjeJl{kvpRsxPpwTCtM)3&_t0%axIC{tnQgLaWHA0&eX-c zyUVY>pl|B9m*V4>i2;4FF7IQ{1R25-tuN^qcL3j?%e#0Bu4J&cbFzn#ea03%&Cq{p zEVWPpH7}mbrIg?pB}fA zcj+X=`2a%)btyOndWqJMPu@={1eq zi5&pe5dA}oVyonl)|dQH0XaySfefyDkZ>6=d81ITw3qPrRCgv$IpaKO0>Jfp!*){l ztF2{=f~r6+jX7rw_l)o)6D(4-)mPZEd=&#S;=_<_v|$cyQ^t13ScnsAzBX)|@rfay z1JLd?swZ#xBl?K|Zx(;NGl&3>5<+n7hI%h!`aim2i(MS(#%^pi%%T+G%EB_x+nxa` zQ$1!4H$y8yjkftqzxz9@RQ)qzhfJ=7F07bP8<;bkIoTA;8os}5k87`9gjZZ2Xp z)sr&&OI_G-Jy5i*7CmL$YZEf0zx=?u)t86q@IBiWQ`<5I$#k04Hd55RI}f?_-+H+{ z0Ey{uyOW7p6l>a-1Tz;PU>(dTKeb7P=Dfs6EI6YQO9=7WtL2dNCtok5)cjMOxb+nl z|NZDu+BJm8H`a5WhTOcuus4}2u&L0NZibwR$`gFzx{ul90T}-AT?5I_MoIWcg^u$> zRe)(EE;v7dZ_u=m!iIJ=qJY{}WVEOCgBcoH4&4-Ud0jZ!byA5mJ~ksY&2uTZ1TqJw zejYAS9T>IiZpZyWTpgv--9B&|1$_9Af~EnL8(~!*hjk?_8xdd(tpgjj3C!?C{naM# z4`j-xX$kMuRNm26$&;TN)@DRRZ<@|wW%?rACGBP`tAeOQO(q$`cLTZnzUr4yh?nt} zIz}z#I5}ygh>DOCu5GS*DtK)`Fy2fWem;WpSVfen2J)kbhPSUfC_ce?EE`@Q;dd${ zF}<^a+iuJ(=j<-E1yWu-Znu3m?|hC6`=gq2CH-1AXYK99DX5mQ%7ripe2$}ExYfA7 zh*E_%jGg4^e)rpx{vJfP8SC&*rs^{(-oze2u|-ZOz=h)LnP+ffFimzust^H&9(vC( ze%QC*Ay?sz$M`GWF%+U57@#W&xW^m7{I*~e3K}4|aztjwM^6P?7}R)PufqSSykZuq zERE6MI0}OFcWuk+17J{K{CI5k#Bw4lB`hDTbLo$x98$x~!w`DUbT$8DY1gm%az9pw z+DIWnWU@+ULx>wG{b?4s03@2(sAKwr$s8O$5EJLaVOUtnR6>&d4>~c~`5AfX?oD%2 z+|$lUu$qYsQr7-QO>hS#Y28OqF{MaRe?eFww1QM()iuTAKN@SsI-1+mwKUFNI`t9x z18|Rf^>10a2;a#y)wlXkSy24t^^bMJ@{fPpHEwDZ9V&!^LrLLLV2S?A&WZ69tJVKKnz%n>p$e5AZe>mr=y$^XKIu=;$K&_kHKE;*m1 z;!|TP=O#;&4?4;>*~^HLH#s9rlSkez9iF>Po1Rm;yM!Q0^)yWg)4S4XlRtm~U7R4m zj4IHwFmOiYAXVf8w{9a%w&?|$=G?QVXez~t{E>_`8W#WTBwROHTlb;|G9ZP9Lhfap zSa5>A-w3wbr{vA9z@_Qhhdwb`Y{sA1;n7rVw?(SD_MVE@WIQn(WtbL7LeG3p%!UI6 za8o>`!H1Tk#b$^@ZVf|IJr$*gBd&#NJPDc+|L#|1gLy}aF5OjE6nDj$zp`1=^x5RT z;ht53-@dPSN`3#+1fxYd7lK%Urap1W5XAE6ljz>re8DjkeYLthVI^^#0}759?y+RF ztoQQqmxR0No6lUP_&uKuSo<$%;JjvR5>ZVPI1$O^=PV|(bewO#cu+|&C)M4Ejb8&2 z*<+^n9uZT+`VKUQ<<_xcJG)dCeRYc*a7zMkZRW9uV$fc)AwE}}CdDm8u(Xx7g9~){ zANX8}czcd5&WcNQFdK%RsI~eI-h3LD%LbgBNghjc$OCX6Lx~XXtPdk;unuYiX5VqD z@o1yg3Gv_+z)|Kl{-leZj`RT*4GMGxdWa_gWJLZ}yKDHbwLdYNum6LwIS9SiOdeRS z?x!V}hqVp9y?En=t^4!rkm&^f4K7!Y;A1XxSGFnbatVv@pOBe3P1w$n_()U6ZoRLp zb2$mQW8%J4p~64dN*hj}M>OP9Dj!?kD=Tqn$f(bRCciKGV9Y!1hg%n|IXQnSGc=bG zR-}E~GHkkQlTn!kbnK7BMJN@FXxOiz5S}>KlW~@MuCoWZsLT4Oa+2jwMnFDb;g+x? zQ}>1lNJVl=++R`+72{is=J}=z(zAm_o(ABR63P!Fi7x9l@A$=10MbZfMW@#2l{cy5 z!_}YBHD&Sb+$TjiQiqjA7$V2UtIcSdD8_=f!!xj5rGZ!OHHb}{cmNc9y`fgWk9m`% zuh?(Rd){7=v&rM@0hnjcO~Dnv(M)oG!%2ThK?-L89}U~o&N;5~ztp{e2e5X6$Dx*~ zu_$R3VDXae9Evp`g51d##*;Cv`C+8y>JyISMm-+Vm|J_uRC z%%O2H{zk3kSIA?SDZy8T0Hu3&{C2-{^GJzI`ejaw6(S6fVNqIXjb!~}^QNB>YC%a+ zcxFK;FCHi-P<6rR-4Nmbk;);(1QiLHjk~E*+ra$j3fvC@r0WWF{=7_QRr@)vn>!O^ zApT>HtL4^;8ZITEuq5m#vEDCD@E2Ne>Pd&P z112$HX@d8i=j=1mjs59Eg}FRe&aW6dBvT{*K&AWh4i{m=Q${UNTTTV;Nlm=hxUz+t zKQ5t~_y-E)ns~CaUNCCRQMXh`D9WIIvC`bh9P2)UKI4tnLH#XKtmk_$qj{M0BLiGAQXfAKmOW(&d~KPtUAai0`^fU zPtNl@)KpJ#_`k$R-WmGpF-SE8S_c#%3t(~wCNs-UJW&!RB(OrptpkLPf}zu~G-}oXxYdNz%7%n9Km)i3AaQI^8F@A-9TA;!I}X#obBz!y zXK(y;a*)A#cBRS6orU99*-}GM5re{(8N74F+%%sLr27eSp6N5Oc^+0RLye&@)C&kF zZ(K`3+N7r~42kFddFq!PbVW5^qiZ(hC|3fE*ZFH*tx9WQ;%!n{H=yKz=0_P!b^d#i zhWZo)D{DOTf{E6pv4VfnIbV$ze2#d`@WxsX7}mf4O~0hpo^6IO&J-wsjmirX3&fSFXHojHUGNGy#T-#XjtO))2$3()U!|w2=5D~tdvA+Bo zA$8IzGpGI~>lK#Xr$FC<4OaE&cc00qLc7~>`QSV;%G&}}H~R-F>gmpE}~ z4uB~x605vW#v?V+gn>de;?sr`G0LIRXBn1V+glz+l7(od{2J8jywM|Tr14HB=FCHD zw5t2Lx2=!Az@+k=)u1*$A-#g6z&ZAT#;|b$bu_n&r#S_ zosAOjWH%_PKhkW#F^QgxDhw{bb=mbg=o|P+I6;l6QdxqJ%hHhUErYnl0F3x+K%RTQ z;F*b47((C;KIa1pqOx?){x=5@WlYqIT@Oo zJs|~8Y~3^gILX>iL$?mfZKFzUvCn~)6IX}{zhmPgXzL-$aV&Y3OvwcRvLuhKt4%d$aaB~B5fQqix zg;fDDX}=TD)FdtN(BeJ1te`paL^(~)Z+ObNu6@nPX~@%|zSs5JJNFArF5R;%<9EWe$`(BtIf zP&sA(%%0CHH1AyiJ64SRfs3e>lwznx85M2p*H!%?N_8o@B8Iw|DC5iEl<(BT*yL{o zT1Ff~UJb@Ur`LC0=X2aYrEm{b;W{H8-Pm>Oh&_$;?Dgm zAJs02@k^FC90lTaliCn@zBk)1l_ZA51v&bz*gcaJP+0J!CzLLi zpw}l8<7RvZpr$3$|HzJbFiF`Wk0o`atOW*}XQai9uWzuy&^zmNb|a0(Qt_4S!;wp1 zGVSeRXCm*w0@8m9DLqCFq!MmWG~e`vuTPrSBy&*1;qTe9)BDj1(~2tU@J7j8mmdvs&bVJOQOjqp~d`$ynag_ z^6I}k6$>Dz8colT!v`8kRklM0{0_J*{a7R#Bk=n*0G^$X-!!l%RM5aoT#`w5acgRt zQrIo%iBg$<3cHfhHCU#~gcD%7Dca;jr`%7lO(RRHZdgRnl{@{JYBF1{$ly5g=i(3L zxgUSd^ufa-lmyz zk&)OX&Rta=m5opG(r*ABKfeP|1DIghwFGpUwXGw(zSCB{RT<*of|7R`BL(>Le{x=3 z%7Z%xT@d3a@5xa134HrD6Pd71D^93<6_lP|Te}vDGNCFV!vm?pFIdoWOcrvrK$D32 z!-bblqhE#Wb6JRNuEWJK8FsizGt9!q;Iif@Yb8hnblnJ z|E^kFnzpfpyp??dbj3_`2*QmYbSfx)91!>zvN9&wOQ#pI9T8`B3oAfmrJJP3_QWP% z4!o~rD7^fZwfq9j&v1E(sfm?e{IbojJCZNYeOzR4w@ZOXRD{dhh^VNOYi7^O|F4G^ zk(4Gbvr1l@1jZ_R#sgp&1bzn=ER81wk#VeOGmI|}5Idbw!M%KPmIat?f%ydFl~xLF zDh{MZ_3g-LMpVi`+Cxd1;4~!2@|!uTj2r7Y&YbXIE?!Fa@ZBQ7G9Qo8iD9!+=Dmxu znPH^?QKvqkcdYdDluh+HLZ#w}N2dgu)G-Gw7!Hrae9Q7m&;T~YyyLHd1_5)nOJCf> zGj29I8=a@Sr7u2;rnCc3kDp{Xn!d8!*|iWxl=!uIy%nQq?~#`FAoJ#2lhuhL`6IGD zrb9^RX{;Z)IluJ+?xR^Y`Ru1i?D2VmAZ95%uv(0*bsp+Hg^w`;PLkEY1;5Y900rLO z=(PNEWE_qQQM)sq`UhVWB;IFYXoX+jQ}7R`Ia-BQl>kTj^DW?r1rP)|trry42iJ&I zMa%~VogSq7Hr;BuNBZ`&39lsK(WjPVM2~~n?&y)4=##+;x-p;lGVbf;{Xt_=)fXHZ z;hfW^^CYhwt^fh+9`L~D4-Z`xjWferUe@b^sLG%d{J4@9lxiU=!V=T26#4#J_1(+Y6p7qy&eHK$D`9wd~WwL4N~c8;ShL8SiwN_(VTuxnf*v z#v_Y#MMzlgj~Q|WRwt5Tt&@NtUAyl)1ml*UO(OpQmnV%$OjWzH1v8ss1&N>#Ab?SW z(54A;6O}`EddiB!DQ{=x|6%4^+CX9CiKvsdb0;IH&yHJ#;N!qeJ~!dbyv;nQywdD5U*Z?Odt3d|%3qa)tbP#giBP)%s0FKYnM&CgkRRWZfF zL~kktK3qLZ9T;Q_Swlga2(>`N=<4|{3$wxsDc8SV;2FnS8v?o+zSE&jk%XUcXKN6g zfcOqB0={sjkEQTv?;x>)Zce=cns8V;noD!Ew{EJW#z!#LVC6$*6f766gLp-Mh2i;J zK%*@pomWXR#CewynJ(NuE$YL+F#RxK3OGasTi*m^le{!_k^a2+>m)l*SLm&R!`?YLVj*Kj;(s1By9 z!)F{CC^3Z(1}J$=!kSWml82iPUi;WWgWx=<^?}WzPQN!{*zex&S!!()5WP$D@8!RQb;!E za1uN^2%ZzIV(Be0-Tf;{epd+fu3ck-XdGAnH~jc=R5B_+|kY zPr2p}LmR3v)U)$aV*tB-l=?XAJ3AEfV};Wkn}4cq`p34H154xFkS4+wuFYoU;(nkl zk{{c;^`^;^|0|d=!cJ#gtXnHa#=SCzf`xNWF8VfbbLWwja-z$VBcuewUmsc1yB%Z6^ zB*x8a=L(wwgZY8@@qP$fAOw~-(5I&G0uk=6e>dN8%jB75j=l??4tVS0 zQ1>D*W!=Yt-o|@zHeQ*@#=KEJ!lg3EElQvuaNhmzK*2CF-*)|jsqsVqFvME@BwK8i zIy}(6Rkn_C=G`|QJO;+1^J{nHGTWlJ5&hz90zZSZ#W=!t*i}+(^Pc+F)pTzEduXi-}}8k)TO6IP7nPOCkOhEe4mI zXZWx167G*yli*M`Dt4aWLenZ?mTsPKog1+Gp+1S=W-xRDOF{p&+s%-X2QnK+o)dh? zZ{{ZGxP5^Ga(~!}PgBq}Jqf&vH^)#hUVTwTeMcv-elz|K;usspU_1%u0cV6rPuq2nEc}WYH#;*Lg3M$u-DK`^orx zxeLOZ>kMp29~4?YnXVuWA`@o}%)=tRo}M8WWS~}fXUBOraK-k_5wgup8;!g0ybk~J zPV}n)asgVL zJSC0Hh)0EM26B?bw3bGTGH3FtwQzvb-mWv?g}W7<(ebC)bC*j)y|6+R$F4vbHs;o` zq#8=SZ96n2p(SzVjYIYUUdk`#W@+Pq|8m>{|QRy9&>-1(VmlB4h@1S&!pLHH;lkv4zX z8t`;!B*{?UDz2~+ys#=SWC$1ksi-~M1u*`y1A>(}vUtj#+Iy7==(t^UHU&jJ-$#22Ry^H&R+nqzMG{-o1Nn_J#(I5g!#N|R|4k$K`qnNn>3Y}q7x7zkA zCC?7AxP@dN4y+PDr{nK=v1Zhfd5mr3l#M!4&(4y&g+K*I4w@y6|q8Tnlsb> zX;oaUU+H`$1m$xlBIi_`3WI{dk=>a5h!ua_h%$1>Lab855?v6$_^hS`at*sQ!)By^t(FcTU!!b`l|G=D?W|p2HIwJrBv?v4Y%bJjdC^FK@^O3Mt#@JsTf=u6s9xOUE zZHzCFOrij+v2looe$6cnTL)7kv*Z9B7zQ+T9pE67-jc@XLqN3r(4`H$#5J6O<6JYL zC+6ZENH~z`p6BXD3?HvU!Gx$VcKoz~06js}u#Q|a7fD3xz8Fnd_7A32{j`J5E^OH9 z*EpXUT5fQEdy3HID6M_bkB1={F^YuXZp>mj_KAkHX_c2D$LEed)W`rf{%p3fE>ERBLKn;5X?1%>=1fK{<55B0 z`V~NIP#kkR$^P7sbDR=HbM86TxQ}1MzYtOR?F}%%BqV4QZ~!Wrq`CFVfnr3dU;qFN zOtY3~4**#fm;gCtXaE~x-f`E!36S@Sdm?}VMF2=_k#SYJ>;%vdIh~w^Qv}R!Emx2C z8J^6gw%hc^_K9X3G|hEsM-tXqZe+J8A1->f0jP2X5Ga8}3LsGeh!jAg1rR8KL<%5L z0*6M`0O;C>9UD;Nqih3U8vxh_z%~J}4S;L|XFbFUAW;gaSW&DLn}l*(l?nM|frDU`}(GMP-KQz?|nWipverc)`D%4KW; zpzwvl>;M2v00?sBPywI{bbkn8yA{!0LcAex`cirPDfb3G=ky)x`Z4-}9&vkNpU0>K`lYFA;4u=9{zQJb@l1~6HqfK9c{AA! zx3NzrX8x4^kjELxM&enkqOSTt0#5ieS-|-P=_Cjqer}9&LBnXEwd$g-j=nxXKUmUR{4NuKL>Oa5COMw)RS+Qe6#TUW$Og)V>Am~~5_hC8ZBebt z(F=|GaB!3J5jAuo``s{u2mt|UB~5xyWVlL=?nmy7K@cZ&6podHU80v6MylsCgGH~k zBo2n}sh61k{jyJ;BJ4WD&3p>mpeT0sWikR&IKfoBH-lcouKwk(x~AFJhz3}7a$MNa z&l&WlF)cPlnEZpD2bDTI=j0LfXU%&oO>}_m3Av@hVCwS#Rgg&heG!(ijLpH^bP76(^!CI9p3_f>|Wm*-xUSf;k8%6TfLgI`NU&8*R(RoF5;0vdsgFu(8D!~fuQZZa?{61E^9ge%WDB0dyHsbs|n7s)~cb;Q*t0vLqgrDGBbbl{SFOyct8& z)6*RbiLw4D@1?_`h{`sCpW9A6lP0xLQK~H3J5nC5Nx>l<=Zr4}`WWKaiSm`@q|yWu zuqm=UJ_#Uw6E?+hicwG~Btt-{Ehh&M#}owJ*pt%z-YBFP3C=1z$6z`-QE!(G<1=^S zjV^b|pe$9`Xb#0*rOugp_+{%Urb#L^+o1A%0c!g%rZvOjE7;1qs@OqD%*+kt4gzD` zT<`$LwUg|Poyxj^t^f^TVtI^o)Pn0>m9W*}i!m3V%WgMBF_ej99TZTIsSpeV0VQ59YLzeV@`zU3_zw7YtvJ;&QNJ@2hd1PhkEU zwWg-DefJ2=MLG-kKy>cd6$Tct0raALR+PO{bSS~rH5%KtZQHhO+qP}nwryv}PIheD zPVWB3Ip^hnyZzD_U8|~lboE-bFz4{fUJA#`IXxxn3pzwFhRBmiO>W({c+?UXO!d)j z_SL<1-wU{KsC2B?YtKal6%()zbIj?U>^u!&xqn~|O?NvhdAkcj_9_fyY%(t4A zEF?KT%xSZujF^6?>Ep>uR{0uu5Qt zWw1pvM_LGeqX$`wUc2KM`ynqmcHs=DGCQ#P?fj?ag=G$Hw`3f$9 zo{@HqKP-gna~MHeF_bi_>&6pqzeEBT1+}?6M&b+cFK&_d{RdiH`->+4eyD<qOW*JtVn}8ibQNd6CL_sGA3Czq@#EJd)v(sPr}B%-b2$-~tyzl4nrE2Ktc-@r368l+mk(CaXh-LNj zod9H?GpJMVhYrab!;kNK`dmu27$P`O+p|C^Y)uvA0q!**%H?}xfCQ5(=FTWKUN_iY zd52ZO&WBgP2r17|^Dj#>%TuMwp2y&7RUBbmBwB|dA;=!`5~L)WTy~Y{B??$J0cj2B zukviUk+Vc)!-7w`nZb}h*2KIoXww~$y?&9oX5u=@SGA#0T>itz0&k2#s^i(L`T-+D zO}LQV05inl_eO3guG-jhIT1m355@W`R_jCXA7uoTAlyZHyG4`p12cZg1c0iR56QJO zM`JJ#D80g>>5MruX?%X?qp<%H_s`FeLlI(!2j~#N7$PqwHSt0ugcR^~@ByY-Rr{EH zle@uhNX8xIlWHqRHKFvG`yR9$fb`WfCsu{1nBxX`+XoaJ5p{G`<|>r-VhE)D`r{n~ zp%8F=Hq4R^sk%d=kv0f(V08H} z2t`RXW}3rm?nKzV9QQ!;Sy;`DCSJxeHtXz#j^j2~1JHW8&#;jCMb|2p!RbFU$o9G~ z^b!;sCoq;1_sI3Td=04`e)2GeB4ejbo-9|hapvPVj-DOl)Xv3iC~z`YK6Ui~3Mm^O zJ6P7mEJyj_86C)qod17fc9lmKJwr4bw6jDaxL3iRzzI~Hi^$Q}pqn&Q6If-u#^@-p><9GSe$?!_%v@bgIr+V({x!YQIPcUXu&zD z4^~=7wWU+>K2@I%b{raCg8RKh&1tuKtJEIjuYr=|dj9|>%gqymJo0!Ei05iQx!E+n zBw{TgS9XY<)~)EiiG>$v2Y&>F%)`LT41Qzc?iiK*0Z&?+Ui11Q;s>vJk`3!i%C#dH z71G{{i3Qg_X*x}G(abhK(5%#Iexj||#%-V&fL;I(IWYD6ZTn+6&=YIp29-TdhNu|2 zun;4%`jhHv#%(5i4V+TY*p6*>zek|gJR&G4^s#t+`eD!9`J{v+re8_f2q!7P`1t62 zN!bm(o;+#iVLezP4E0sOpm1`Mg(1@6E=sWhqQrf&y@PO@R=U291PUQk&Z2I-G5J1k zE~7|7i0Vy?fGbZbSHb7kOCj63&aLlGxcBgBrnP#^`2i42OL#xkn4VR9n66uiG+QzF zxD>TNpA-#zsSi_HckHzPv8F9)Mv{F!Gl-L(D!XZ|%hJ+YUefW=VP3IXu;(l&TnXh` zED91-FxH<&}T zrA1s2YAR3o<6&P&kQ3{d86GcDy7?6a!*^?Gln)vS8S+=Z3D_3ny|0I4@VNsr+Xxt& zZA82nQxcPhxm?jOLC#FXC%oJyIOmqDN<7SeNo)z#Zhkz_VZBVG?Pspv@94A9FpHQj zZLxl4U&f)1^Zd1*o5ExH0+WD^LE_#{Z~Rp#UPa{aD*vPA(jC)#PxvkBPM=`Ru`H!MK`U_ca@&!HS}@I7~&pW7b}iRklU zj27L7M@XS27xDo{pUG=nKK{6+X6* z*^`4orj0hLz^`N=r9__pyb-2&#rkKJ#5V&0K@@n|#Hh)Wj+~9(yVoK%J_v)kQ(ee@ zB~5I#TY$n36BuSoB)0t=+@}eNM4evXWTh|fx?lz-TunXf*qaLGGif2}ca>RH!MZn% z>c{d3F`#HYGhm#gbL;woN~A89fd;PMz_W8S6z^rP318CgUl5}&L_WHUCS3{x0)F)! z*08va_w8L##z$?u!Oc0<0B{a`vKcvo=JWD{af9)kv**EL59==R9)Hdh8l;GnP;v*j z8eO^DUX33>DXKQc{Qw;fQ#-dkKK187U zLsEV+@0I#wb!lO3WCCCbl?);}8z#Z{Nj>)nWY$yg|I-f0g~7~(QAz-=sJgpm+Q|qQ z4HYhqyu=j%eQ}pg^zET+eTF3%r3RSj?mzc~81Z$6QTMYPY1saanl=h-$J$sm^g1uo z9Ici=y+Cj*1tc?ra$E%IaSlWa})xm_;n?S2p@1&5`c)ld-U|e;Fz_@_M%z zBvvEEKouS^>bj|Q><{VYQS{=hvf# z6NNWBUCXP?9+3dO^|b*qU37|{(vS0@!T&Ayb^d9lItGAsf<}Ps7}ib&S-^yW@RA+e zmKDq3gr7osyz9vDcBu*jZ&V2Dxy5lY7{=N!<5A%w#$BT|dpUcc_zbu7fe0GdP`e2U z#OJoC9IxwuD{m|a)=)V3Y^>5yik?Gw<+3QMZg_j6o$P-p6KJczYY!S9Q@!n5P`ycg zE6h_}oiarR{dJ7U;&!D7@z7e33*)|MNMe5@ADmG{c1^p+|2CkCGqk%W zJ;5&)W+>eRio-n(rdtpW?BGdt< zAe>rupgn!0uR>5P9_aRSZwR?$2t;Vo(bc#VHu^yb*x2E`w9ue;o#_S=mJq^;(D#GC zEyfu+!*1KSdK)p7-rlBjm#_1B(6fW`D0C>K>1Ec&ccJQzIBl?l3stlh67U{_VicHduMJN((ru)hjUfvHuaQpgJ2Ie9-6EW266%y3iK zA2*)({8qw7H@z9nLi>c*Jb{&RA?-{W*O%7~ZA7pS1a%E>I@1Rkk&ZlIDDVuJWMJ>TtIIM?;6RP(ckV z2yGf#nlDx1a`Zx;*zitXXSwvu{N12{eIk+pL0@E9MMdqw6^gN70jAlwc=V}8#?EJ- zwz-PT{-&H7(J!n|(Aiv~E(0I+x5X6YA&6}cO+8&XP&d8=6wQXQR^%iEk{~YuS~ZTa zG5uCh=6DOw&5xexgtv|P2{`a*M1@YbfMY*8)h9qa7cYcQ$CvzGDH<`kU}i2hw73ZS zocTWBAN)!V?(Cbzp41aEI`&Gz>Y}dd4y;&vPwp}+dwR^{Xi>iTOHJd}IysmX@9l&A zbcP`BnK?pf%f~`^Pe9PXe}16MidFoje@sYnI0--Vzah>qiDR~m=jw9PUR$ z%I-A(SWlTahL@l|)sO?fI#9Mqm}Acgf-v({0~!QK@aXRl z%pTdVi=WfT^ID09>ug@nA%cZa5q+1>MuZXe>1c@m9vP+QhsPjACqImu9S$IBZ z2TAv;4L2@q!E^SmruLEEg+rywKF9*9VB844ZgOicj>A`p3e)@V zwE1M$yL7iEeRbl@rdASDk9KfH7}YE5)Sz4U>SupOXod;)THLl}QRP>ZU?>&6@{uSs z^(e(?y^=}lrfQfM96TAj=QG|YP;xttP>!*S-0^7&M*qc66!rf@januEi?Zjg_gHcgyALVR3jVq_DLA$vu zpCGUGrh}3eiT)DU-)1^JC8a<-clA`vmybMbm5U6Eh|s)W{|fzV>jC24jghH);BunF zihyU(3Cba%vf8Pm1|h1ZZ_#5pR|c#MQTi7u5(7l%6B$>X|I+t0mv;7!RoBk^NncS? zb)jp2FFF--ah0cG$26gvFh|J7qW#X%j6J^X8hY!E-{ZRe#e?r{FBvjATC`X}a_U3%_ zBr3V*zgE`#Raz{Z+!urOxl_TqBzS|L zHOMB6&G*(4gI}Tm+#)O`i@lpRNE)%d9!PerWiBAdGe$3sJ!r&9ny1M6RW>|a8$X}y ziSkaPu@?<&C6iekx0)Z0{6hOG<+l`T1uTq4R3>Q4yyP^P=fp?{FGnt{xQwJv^b>y@ z0mm?)&>Ph4vl=iYlIhhxHz3b`@8FgrnTXJR~SwK4FR zS(9z4MLmOzj!oQ9DUmo8cgxp(D(JFuO#8C^obo^@zk0jdJ(>z!EjIOX6Q#G@dmc$8 zAGHDov^Y^g;lwk303MHf{#OD?nwH$3%jK(zp@t0O0B74z6RXRDt|1bZ_3Mo%WUXuc z$65uy!Kqi#fj35Vd;nWxe{$UK+6rjLA$Q|=P!~V`6r02reWKiX0!cxo2%7N2#vUr- zK=BkOz?6?bGgGN%1wM^ZhZ}+G=>S=k|L^ZK$tu9}*{V0^L-9pNT*{dXBplj0UN6I8 zqC8#Ci0B#kyImz-tPN-swkb0rL%ov844yh$r%xZ|2-L9sn$)|>eY`!29Xh7sl7?w5 zMH6d{;OyGGH-Vrk<8uvCNi&@k>e!*54f(DzSCd|FAr@nq$sZNopJxc&RUQ@q44SVm z^z{Nxk|U)05^Mw}{^E|D#Y396qj#;+c<*+iKVIe9W}z>l={T5LIi49+U)P}s0L6qA zDTBG8OngEBX;*X&0!OZ+Ja?S@pqgSu604bH*NwP6*f|$~XTi9xo#p+NRbaWeKDHgF z6JHm1V8m}uv_GF^hjZLW%;{5wuhE+x*3l$_XUO%ohA&x@r0Aqs#lNl(^nX1w?}Hf* z9@B`?;;OAKE>-FnHD@goeQ$_;u8--iyf!41iCzC;SY+-c z-WQ+ClqRp1Y|!@=DhLG^7+NGkHj|TmT)M90%81DgO|?BV9P`c;Mly6h%xNsB0<$-H zr}~|kQc(GtdOUEXo+J#eMoAVS86IGn1q^KbLKSOk6%d@?c#1SujweO_qxo%Fi^ad1 zkr1IMWiSRgX6VzSYS0Gf+adI4v^Z9ChE)BQnNSq=N`+8u?wrSL+=uw-1cj?M0MBzi zTW~AGC|Q*D|Bvzo;|Or%U-`-mjS|(4^SmuE?BLuk0#T^>iVi^K*hTTlcCVQ;P{lSR z>h@iA!g}@9o3q-L{!dc?ASPmW(@yvO|7a9%4F@P&cHgR93?r7bx>>Xq zYfbYfS*2i-gJxw$hlHg#ggl{4Mk>k#b9G;f$RJ-o7i`OdzRx0qeE$WsEera+hz#;A zQwW?=#ULkWykjA7N>hNcT)ePCXU|2}Zbf8}Z(oZxWp3ckZY0fI?~gdd=PW|F){0{@ zV+C8lKYZr{z-=}EB#}Q3c%lBE{B!$Wv<)kNz9*4E37h}xtNihw5R|aF|M&740Hp`n z1E-&2tv7ox_X<2xNgwXdq$Ne~NyZ7(Hge8eO5Y@TTWB3TJ?l_%#;_T(= zH^3g2w01}Wdoak$Eupde&w=d2?VIdH!X#ZAxnttbyA*D=Ax(`hVMV)-u zyE_unzo4YJu)>_u|Gxub(D*VD_EVB}V9funSh*H)x;CROt|zm`PI2nN8)?>R7;CBN zWTQckl~-MHE|v!iKsnH3=i(J)L%;60Js8&F060VPb4J-CXVU#x#ZEa_@iTZ@))F4Aovw$@ zAtyt$YYumo>VnRk{T!^lFhKM6}2Ms|F2>;6E%)`IFNr<3aj(1WkJNrhbl%O*5fBt4QnLegX5$ zG>paLIdNlkPtId+3~~>@x~_A9usFVBclxKM0q*u6pD{?%aF2}f^BQbaksn`ut)n96 zrYtq2C#zz0XCZkXU0e6?Nw_9P*T;+`J5+~H4cc{EuB++Xc2e$w4A*|wLUE>yN5IC3 z_!=vTyeJb1i`OG~6G}d&*|)u^$78S_9&VM#(Yx3PDG2Uyoo<Y&>~f9}v`) zBB4PviN%fHaw%O@4WEjn1g=Xy57LB!L3OYNLWcZf+Xd7GvmJK|>mHOaB?MQv4{RMz zf4?8Zl2=Wgt+w;N?S-|f;`~x?SvBAVthEv>G&0$rKxQ;S>7aP@B0RCAoRHmt>}T6PBT6%F?$CB7_CK7;EJ!)@H=GGD*=_P z7Ec&;DN+mOH12~WTu;>la+y7mt38x{^|?j_kX-wI7MFf=Svkz3$Q+Ev$x9AhkP_^^ z$VTrW822z+LC;J`&@9_^P#z2oY%v~pZ7`!%2yY6yq9;A-CJ0SvrqBDcigspy6nbX7 zKZ`T3fnCT-w^M*E+I_9ZTLH}88-Wg~^8=>gNtTjTn6{hZLg&|M|JGEq{L4^znSwdM z=p@jNNxbOOQ?SpTer;TugGvzl?zK!yPDKUFU^Q~@77M>^435jEvt$=B_s2;0F>&R*`!K(I^<_t~ zcqU%u(K@NDQe&Kr6%}JbFX|0#z4JHf49aS;o8j)Qm4ql~5l~Ba+Y7hhL2hr9XbxXr zl+R->z$OOKr2WSt6&aoh3bN0HoL*ObcAlxnqj^qIwa4#1DYNoXUK$AqvHO|Z*3$3( zQreG=A>=d9wg4DqC*#)=&g7y)yx!G?>gN~TagPfh_ntM^&6W2lHn1C=G8es?=4Ai$ z6JLImdeJSRAGW3RWUKb_skKT6`F?IyIPgn!A0P^6wW>y~7CKm*%5n@cp z3O<~-f_w=G@+rUmt6TrG11C1wU)D<-%3K5vx(ners*Jj;!!URPU9YkypgKqh#eNs$ zn0o@77WQPi(`0D3sCpJVu7=G&%K2VJQ-%`D2t-p7cv)&=@hwFqRUCL2=n z)|I-j0d|KleBH8C>PzxF5p(~5ws!W`XKc`_)Cw5z&Ve3=Sj%sx(eevJK!X)2$Af2` z55L7B0XEIb0kDa@&UU+; zUQXJk*7ho3+Zp$qdh33##U+5AQ}fE%g_naZujt1#is52AXvX9dp*AeFRk^6vS^5w+ zpm~0Yf0tech#iSKAnV}qw7MZY1M)JyOoTWlO%PUlg*(CDdTbc&s5C?w8m7K_p5G?* zgZt-OS>i~*mc41#lckl}XmA@nXF*04M+q2rL;{3?=C=nrNu5809H5`#qP$fsi z)CYWrh`o`Cd}V8PW^H-f2Z*#acVS8 zCw3)1;a^?GA8fKiQV3xvsP&XG9Q^}k z&rzY|b0e)ck^I$l#p3pI4l50t3LAH?dsJ-A5cpAUmI1dElQj?v}_50tg3; z%{ifUn^nO~w7Y}m0~v|`$m7gGJ(~d$gZjR}I@Gn`W zAduq_jmwtF`5E2MOu(o{>l#05=sT95z{zkM(NxPQq^u-syl4tdYqa{_4 z-`(^>p`clR2W;L+4a}EAq&9ex@4-svlJEcbq~+$6acvJv-?*jcDHD`n)RSk5xpb^#J%rk<85vr_w`=2foF{<+lpKBX%LU=+!!Mj6N>g zlk@PCNb>1+1d7kWi$=B4+0H`Y?Ew>rf~)3XJ>tin>2e)G@QOmu<}JP=t%;7H)yccI zFRx3$9h{D7vkkh_ELKcNZKvW3V1S=>u1RE3Y)$RO_o`xbddlK~-xUp~o!-9C2tq^L z`u5yb)5Jw9nH3DkK|kkZ%^n5~QipS*!1Lo!x>?o`=f@^4nJ`z6NKa55J!|Nqz1%fE za#8Tx<^ibgb!-^s{ko+>K&DayKc`CUS7QvJzD_23of4o4=3T=az8zJ)+wjTty@@4# zJZ+YYNZ4X;m7oF6s|i@egIC0;QmtJ6rDupg*x%tp4ODbirX){2$UUDqHB9ZNB3@YHLX$!N!n z=B;}yq%{qSkmcMc#wTAEA0HMcha}&gkP3-L<(y-~5xt*;TPyJ7xK5lR;Rpj9tk!QJ zBW`7R)v?EyU!F+oq4vBc@h0Co7ONhb-I2H0O+cD7Z` zwP4&BTUtA<`f{#jH@2S8D8d%Dr@mxv7Jevqx06lP=Ivzh@dsZ`NRKGB(K^? zZw>XlusC)P&81pjW!rw9?kPr%J){fLUrEw}!vy$~&o71vPtNrMbDTE4hYr^=9uiE_ zHWahF01TiJYL3DQ*X;l#*7(4xru9YgdLi_%b-9kYs7#{!b_^Gf1|kL9Q}5l3ucq6=ORDy&W&+qw zZr5Bb-`*eDqfV)`ZJ<%z|1M=9*i_Y>$46|Qb?kdc!2`0r{d3DdQ#U&Rj0o+Tgx|xd zjsy(+*E~?w@4uc3&Bp;Y&f`ZizXG+-s1_lT{yA4uVfbt4nhGgVo+b5q#p+dk)moEA z0RRB*?r!w=VkPAktdfoKd844>1)2@F2mgp}WNU`_e z-DPp=IDU~leI;ZKpWn-nI?hYoi^S7Y*Ve>(GXpa!1P1YOe4Q1r$-n9d8Skl9wFF6_ zDo)%-)Lr8nC3~Dd?y+q1ndW$1V7EpbbVPT&Lj}MKA2mnC&ce?%rE>;;g{ueC3PCGo~p_QX(%^->gO>r+IhRu?* zHB&ME%E-hxtHZ#uP+THb<|Q_Jp$Z06&}xu+Sx~W9S&itkS0V)|{xuK~Bx=6Yq;te{ zWoE8G;W4R{FMT?ANNRePD}p@#SQ%yYz~v;}{geq6{V0RSOv`o(%bB>&=kkuA`s``7 zQaT`rl5?c2$(vyruvVShFN?#spWk3ZiXq6t^g(gPXVJcJyO{m-R{De&JFM&k@J_c1 zZA0&>UpPh-O__N(k=W45-oVWIZm#uVP3_2=S`v($X;qc)`xf8s=TwpqRL>mM!2ezn z1D>?&R}{$aVr%8&e2I1U-^UBy7E3m6UGsCf!^XOw%6?ub^hWKmqVC+$5y@y}ss?4I z=*^c?xlTEbs0y7VtksM;*tD*mx(WdrWGIAYw6Xd3%40iA&CeoR?o?dK{evD9Q#WI% zJ%Z;D*edVv2Xi)aU(G*$Ek{rH$*n{bPda{YFIRB+i#kZ}TM5_&!=~d8LU6e_=x-f72 zXZddeIV>rnv4y^gC*=rh34$L7t1of)00r=tu@iE{4e3>$X)pQnDph&W&8I(Yf_C_) z%nU3ZMD|bU=bqTO8Y-)qjH1iDCVBiRWIp53a(3qXhmzkTX8+pcwx6*N6lpTBpN)p> zbjInkn2I|pf@;%b5>U-iZFiCw4(lh%N)RixPf!)aD|TOt)cG)VyL0$(N0M||^iaPD z6ruU+j%UDMfrr`8h^MlVydl&hGL_+Ev(2;CIUS7AR-)k5i5;`=$BRr8yRb^@JCicN1hmjNSqL%a{3RoRnEeXblzt zZJ%Ppv-o=^LgIponxu0&jGpeZ?qv9+0;{x|$F?yjVIPeJi9|mxq_nj!1q6-Uj|Qqg zIaiHqe$#+b*rO`l&+)`+zxS+8f15`i$HT`!jT04BOHiEsJzO?2$YHOGG}5NXl!E!I{>m5Tjz8>^gu|YgePQ-j1fM_n(HYyU;pe^M@=Dui4jt#CeUX>>f?3gi zUaW!WONwrMrCPCpcFIq%Juw@$4~)(_W1tVQuflMd zr(6FlsR)0J-*%Dg9*^P>S75^OfW%Da_M)2@`ecu}iDt%#fBe@uLW~hSg?XRJQ2n#u zeR6SJ^{cv1N)LH4N!d8tkzj>sagjgIE`qOq8{R8VzdupGa<|_BHvYFqU6y`7{G(qr zLhy|oe;?pO_htBL!&;a-vRdOV&P%RK|Arcb$M(4NL+Vl5+A?BC_xyzEcxWfto(qrcgr0sV=u4%7JwO4^bn@OYu=xw zX@bAP>gs9uz0Hl)ajDne8?cs?IANtmEzh=aQt2BvgHa7zYTjkUMyyTAS9H4>VB=6P4Md!jpjx^;8r2ZTR5 zygWQc$mv>~0Iw?;v}rG;+-qUt**_ejv`7UvS&sI-MtN(5LzyuI46zy8!}S#&_)U+= zaIUNpsslpU`Wi<;{lSgO4HBCaxo9R&fF!!M&s+#Cr>FY;j!t8g8h<)3h zY0J#7t|?JonKoa(PPe}S(_tDgA^Yq^CiIi)Xd>=V)3ftF<}Lu@fMPPn^#uaSAx1FSuInef z?3_`rM5(fEqSG%0v1wTGKA`iCWTp3t!;EqRZ?a6^xpe3JkjeYY7%!FT+XI@i`Xd85 z58tBR0v#t$Wk-*RoeK$Ww5V3^17HtHPH0MxywCl^NoA=GkrdnZ3k+O~+rzHoIXf?s zP1||pg8wm)+lwn}%*ckPRf2-I!%<;>68O`6RDEesN{p+NV1<6W0 zvk)PI=Nf}CKgK~t1fiI!p4>5(<=$=iAa$zO$X}Dl1&tzgY*VYf*B&v;<$ z8EZBkjWGG$5LEF=IwvhZv1V*#20uvBl@Q@A@_qqKH_41tkRkYp(NU#`XOyDb)$AvJE$=HV7xkr!ECwE;~DI!ti0OW~4B z@SOs6_CE2*wH;yq+8*qx6Ky>e2vMPPXu=pQjPmHFPzrQ(heiKLP<}!$wUw@X@I(^L z`?s>*A~OH^Wib`T0dZ5{zg_nS*6AOxjVf$ozsR<72J{<@f;s6^E^V02L9Zx-8hhgd zX_K&bYM}VKyw~dt()C?gq!?y9%?$ZY1gvd2Y!tPa`H1%!EdAw((?!aeCywBgm65CV z%c$CEP?C)W(%hY&1{$kp)?sE!{d;4`C?zlNCi@DqpjKBIa=Bv#`jMbx58J}azDkXV z=aOH+=mkwSmyA2RK0h9V8!~FKYRQ56lP|TVjLz&P?mr@^rkDct7JP%-gtx^rKVNn( ztDd;XY`sgV^0_)F&v}j`TWNecTKF&uB#;fE;2u)RFxgpmD?hpDXr#e1a3@ z%i3kH){`;(U*dASqxdd}M~)(R3I{hYWK`v=q8eiy#7Ich%oVm)^Y8uidE`WxTy)(lDaRX(4lkxrE2JcdNg8*|9G5XtD2b*yk4q0%`N7{1>?0AJGtw*QgRq zCS=pNpl+U~NHfszDS}9k$$8F5W59SgvVTaW1JLog-*|S3$7;_j+2^0tO0`Xq$23B3 zC4Hnm`R#<^s{s@V2c|bVQ2KphSrUQ&6^w@2M5Jw>V820O4n4+Nlqo}((UncY>F(TJ zy4KJ%ewU(}7o81rSXo0vSgGTf7S$Zk!!eUTPk5}LosybIiO4?mo!K=_T^eFJ40d{@ zMr1{OE_LA&(UR! zHjujaBkiM$9PEC6kLJ(5fQSP&F4AI)c4`0Wg$7;bUM0^+P5Y25dXbvFj3n5eUsN5Kn2RjNPN$} zq#YK9mC|*(bZiNvghpAV!vpU_VqixYJ71|pxSxuo2!}l%RDoo#P9!f7jagG1>k=zv z8*i7_Hj-sis!e~Lv~yP8Ri@{oZ832CYbPg9R$UvgV-HT z0o)ro4a~IaM(5aWe+cYdwbN<4M{Raxb4Jz@(xhnJVyXe4;g32Xbg;ZRI1ZVePXPE3 ziAniWaLrsBorG3G-=f}nb^Yc+mg1k!Owa1InP7N=4!?c9z-}Y0B7aj=>jpQJmX5YT zsp#16R0>=CNGa;vJyr_ZnqRP?65T8a$5-zGYa>^+tt^G#6gT+F&_0fDp`)6ZfKSGP zEU2d{+~{3v_|($rC>o=-eJ{lX;M}RGFC=u%A$BF3l^k#ZKFw=Sn&c4Rxlr1p-uJIq zG%KI66NJY|7bs!P7trO^ac~;9RADM2WWYd8p*#`+3h`oH~V4j^+u;ZY3|}ogJQP?92B34kVWeWk3$4 zllD%Cv5|pnjnG<1JIsT;Xis(L;1%|1z*1YQ8kPqlfZrKqri%KCYW|UMH^f|0;Q&EX z1+1&?O<6=$HO_QMTb1!VhvxHsypZmN@xK}cJR^XRqFe0)_JPZjb@W*~B-sxsw^)0} z*pFI@piHguwp)XZPO$`)Q%wAOo`#85)j2}}ZN&EB-e?xXH3zkY2m-*K_fzk6Y#bTQ z@yc~v`aRMa&CAl6*4<4)3v~*-*>qOcnyA|q#lLAlz-|##nM@4lI zxoETfI6|n@N!oc}#;Pq-4fck?Vw%M31kqOXH;W5S2{g5BbkAbn8@0nvIIfNOOI}yI zn2_HmMiBCnycW%?o2VxGG<5h8!BI{tP)!H$w7yBiRpf4mD^VYA$V-)tCB!8T| zP0wizYw-{GzHCvJv(M@uk-~cjM@Ud7j?mMr{IWTW;GO#NIZRRyZ1Q~UyLt{PjCOey z|8mwRb-Fv8X&aqd!e7qdcf(9o9CoKP=6O;jC<3tk=f%3q_A(qBX{8@c-CWx0 z@y>@`+~x^RP|=OqSY5mWko%t`C%V|c2z29(3*&Vzzu({{d0*E1oIMR3gg|tl*ejf1 zUw9?$+7Nd7h`&rMDfwETVKynD6Y*!+3>q1hE?Hp0rgO^nu@=)s5Y#DExU8xwZ$BVg zb1o?p4oM?Kaj}XcxMs>U?8}!MY5tlEeEW5$cV7_ijqB?8nR;5*2HRohsj z)-u~ddqmptt>(TMhS~63-1O=1f<)3W0Cl-S^uf|DiuAGeRcnk+M>tuE}cA}uH)TZSkjQZKjO zTHk~h80~j|7ViF~<1@x;vmQ{l5EADf@`|@G*Slv_*dwS3lW#&`HO(!t!JKvbrsEq8 zhIl#uC_7uaUptCVakbHc80Jm9p3Wxlv(_`}*ru)1y=V+tr*T~yQ^2idh{7*qRoMPM z+Z?&Ug%hv4W-f-JjvOz#eB5yKV7`+-K>D(L#TWO-YHi&VGs4s@MLtv_q8;jRo#7G! zQ zk1T0_1fC0(Tx8!f6vEII{2M9KxR80EgxH!b(O^s_2OFk{&2ZMfrv#xV=B74I&MzH> znbuLE&LE~ON4>n(6O{{@)i(wJy%_qYvNNkGg{q;8RcVIL4lm`t_HnOX^*Mv3N%ZYs zN_e8JYTIsNJMbuLr3Ng_;wzY9eJr*mc#65qW{)oARpgg9v6P&uf6xE(7H*UeMfu^s zvss+Bytw>l-ws7~`(>Y;&=c)hUyc{%-qYhi8$Yi+p7n`Z8@yJqcqmJ{WCw=QYqM#m z@g{Kvy1n`qvC)zBVro{}D#FX((#TEK9R*BL%Yxn>W=P=#dn@UtLx;Xea`Ju&f9_2K z$F}#k7hUp5A9bS1d{luy4I?*yfNGj4)89IH#91*rf0juw^5z8ecgt%#PWAvDGLwU9 zoX35JNwUNe7|&lFTtQgbeft3NVtj_95~4&c^ftpvR0TDom8(|3xB}Zol$d``LMl6MpCWH0 z_fw%crpaWG1SH!wjgMovLd8UQ<%0#TbQ!J=41Yp(h^VexW;PX_@;A**@&%Ae@ApVcz01o1F7uPC!T($waa| z7(!Ah973+j2@U=?uhA4pN=G1U*S@d$nZNsh?BDCfc>HeD3L>frd0=a@c3ctw{${XK zVDe_U_nC$V_)gv*Zj7U&PcECA!gNVC}3&J19L zht48+s(Bp5gF548V25%o6X7Ot5taLRRkz7n#PzdbxPZt1MqpO^aT<(V@=PdZQ@jrf z@4lwu?WLN`^kO%=gwdL&{5!W1Hs4#I#Qn0AX)SGQS`?@2Pq{AhuU=5o@*duDtIF6b zYxfCY8WlZ+^9du&%?;#*>hfPyx{`}LvLkavV4`%U*G&66+*0eSgRW1Qn#Pg=yk;Wp z&$D9tJ`(g(gRW(wy_H+=k2jR5Ow)o|-0vMp31g^nsCcAzx|C>zb6 z>tdVCLWCyh6FR! zKY>Czi2hUc&82_Q{IiaZkF0fJT1aFcl7L~CB8zG7gL`eQp&QCIZ9`dOedHsruPwI2 z7;*u?%vdrw=BI;9uddF~tRimT#HK0lh?5Wuzldx)mq$Y_U6Lk0#%YP_8_+$M0iHi= z9dE^S($lyDcdoOiS53snzAb=q=ML+}A;sSQKc>DZNR(j9wr$(CZQHhO+qP|+r)}G| zZM#qNojY-7;{8-q)Yp#8tgYN@EzMMXGxjU-s(NFP(viDPxR*a|ER>>sw^5*wV;KM4 z1wfDIJ%*E%&>=)@w{akc;n8h&l`V@<&=SgX6I_k)&|%r#^f4*tkf|ToUmW>K0q9?} z^sR!eR3?afP^uq=g}HNc=t+{&_ELp2OX54Yr+Ma$?c4#tBJpzsl|ZHZ8tlRbz*h@R z3VY!Mr-?SSt8zO>;0>R@t=Vw-GOVBKbLqgV@A8_;v~dS2!EzZbOCz3irRuP{MZHlR zCNlBZv81icS0d_=Ir6k0OhV#bxrU&oR?G4)#iY?wmY<3!uil zbZTDIuXe{k{%EgGZ@~vkS95W?9YMhNC3?!n+z~*Acfx-ZQu&)R*ZfK~gEmZB4t&S; z-aDI+nv*d|e?Yga+5YEYV63L=5X>*qmnavB+tRlgfp$#J zi#k9|}(9xlZI-fLl z{{e4{RoWE5RY ze^2cqg5PK3v`8)F~dPJ*b(9MjZ`RZW!yj*Bc=dmA% z%IYMqnSGeUA$h=}l1F4?CJ-5JN-S0isg-ZqG+z6C?E-|sC;s+N-l_?S+cr(&6?nqS?C}mu_ta3zkXpN7!wp<;n3_-gA^$n)z_HHwM6o)B$%F#zuUe?tTqvewYFK62Z=^JSgGF1O@NA4!X*6Q1a2 z-@kicw&=_=j}>sNiqo%?5ePYBZt3nd;_`0l!nhPqQ(GTfb-4O$*K$+ zn&;-16if4Ruoifdm&d4u#q_rRM}3exs`zACWe?%riIkJmpC%}w$k3$e2Ir`;A`QVf zE%q7x_!8uel@9!GK!-Au4B!2|{?hZGrJ^LHA0!NLv=1gOlpf|>WT20t43mi|Oc(qz z^MY2Hu2+{E4&zDgom9J(N5ghOLCm;-*4GpYvfB2r>Y5O)U?$1IpMkq)!zsWdJ0D6f z*j~L&ad)5|c_1jzpjgfkV>z)y(%~v=*i+9+lL2Tqg4h!!E5D$at&15Scr#1(N!~XI z^uHv?8ouA@&>w5JF`vz31R6T-XY6MdK%-4(3_XG?J6oQ;`?~F!p`E@7I$f9K(JU7nDn~_@UOhEfr^Y`CRa1kK#n6tCZq=$3R zs7u{^y_9Xlo~0`?gDSJSQ{^qaZzXxi+}Rv*!zTp>EFCpxdt+=%pjwIKqk=%HHAns~ zR>+-!|3ok>E|kNZu3&NkL9kW+9R3AjyO7O)Aa08F*8-UvAdfL1eH>Y?Pny3z_ZN$a za%3vV%Ub2!805L>=cI?S{wSQ?XiDO!LdR{KH8dUusC53Y=q6K+=2x~v*+5`X+TzQ} z&Iz2e7g_9k-({Cext|61@W4!Hqcy`5GjfA;YVc;;(siMNHp5lzPsy{z(iRg^)yZEf z9&-ZuM=ohAU`{aT(>AcCcf(AwzFjElBZPL1b_C+;Oc`Y_WuBcx_9@E>3!X+{QUl(+%)X z*C65>lv7xopo${Lyj*Ul)dw8mvNue&fn5Yi3=V?zl{hm?# z69D<(wVm)GSn@9LeoYMM^et#5stX2gyPNK8Ybo8u(qwYr607JPLv1x)Ny|7U5dtnZ zZ-(+>SsTvf=W&v>H>NM;XfzKUVp%_%#pR<%ec@+G+j0dqj`&sQ68j9>>Z<4n_4X1` zPVdeqy)p$yK`<@IBC&6Mt%}GXL#P``B{!rNIouw3Bp)2o;uZg4fE&^%2W2=n4)ASo zmW54<d)s+w&mCY=b%H1c!YLasvBR84bt5s`Y7(a%-1^b+U()yALLwYhYhN&5^NBg+)o8j zRfBI^DeLb{#4VX;H_#*@hB5hh?HN0Ok4zhOot!IxrX#h#z4TRku2D%7DU?(pHt*)y z?ZfChgRa^5W8Y+!imlQvL;$nQBU+t^3YE}L2lr5^W5bXziU%uh{AIzry;+@ z2pL=n#v_0rl_9e=j}v-~knF0@v#y9h6Qljgysv7?@6kOE+~JT?C7^oterPRgHMl+M zHI5fjxzF6O`m}w(&jPNQa4ccbb8O7)L^LjfTFF*sOXjfOypPl`?6)-5p~vYOa!S?Y znjQpUiDZfb`ZQUQDzm3~;}Hb96>Q%<`m$;@63k+gGRfq}&=N&GM3;^GWb5~b>hzdu z^HTMp-jqr65Lryf>6t-mqNj+f{{DJBH}eGbtuP*8pZud$gljw}N;=tF5*O50tS^e@ zSxRd3=S;w&QsE_e%7P=VJC+k@uU47z*%IW2bZ3acd*?sKa6IOoq_#7>QPd%r>41jE7_ zaUs2mdG;BK7_XDhf4$hB!#TnWC%kXeeS{I9GbLH;a6MGnqIW1 z6un?!5hmnAp(hfAj+@-?>U0T{6E=Xl)zvJ|l6E9k0?G{l@je(83TpfaB| zO^*5H5gAK<^RzL+NOInQTIOiFz1yaU3u>yW)k)c#e z6`t-q-a6mg1K^(_UaXPMcrTsslE>Vny4*!vnlfA!xxWrdsD)dmRhT9$xZd+1W1Q@J zH6xYHL6c36lnwq(WauzW_O6m!h^V1n+3B0nq!VJPx+Yx-Qp#n@?z3+q?P*p5zV%g- z>d>w2+nmif8@ef=)VN`AY^8eMC?;g=xaL!Q5ODatoLzt$0)rb03=p(rDF7C#x=1fDgdqJ6y|W9f+qd*j2(j&f&Y(5^Gl@h!)( znujavs|)FAPqeR1s@oiDRL%5w`wal?mfKJt+l5FwrjL?Vt|EUbbd*BrrekIe_NNQ+ z;kj@1gNy!P9GKPl;5@SM+QwWMikR(UojLsNLb^d~;96<^%b?qlA&CodO(nCW6!#!W zr2A3BHt4Z=+U~b^uq)1~^J16Vk;2?{Ue~4$u?E}fGOyUHtIyhH1&ncm7$V85!F@~d zWXbrQ-rS1{i;dLzI?JcsZ*Ij|pH>Sj0ac8qP^P@}r>fxx$OpUApBTteJG-TI7iQf* zo%b;Bv}T>}|2937vn5}qs3yoXX3r`Y@QE;y&%?`tD^HwcGNyf8H(R3!h+cHVVdB(u zvA?e5Ddz19x#MLRJ=@038yQR1zx^HdMQzIE;-ThDrZx1*ovt6| z=E;b?p}InLaiR`^8LMIjbP3xMllXA?w}H>$|CTCUF2;XICBn+L5FNOxK}vs(nmhD~ z>mORSA)-*9iw4WFEbKuo^bHltUyXPDv$eF@;p-d2dh8(TPnNm1U|y&(k?zdB3l7)_ z{Oa8Ny{ao(lLYXkxducbj8)EorrDJhZ{H6d5k(#7zdFxEVOj7ouDd>MsdlZq*Rjn~ zw`dUlD-b&HxV>A!@?}ES-Xx-{B^)NTbyQhG@0ctYv^(_CG33@N z6Tz=!XwXW5k^GRqlCu=@@~(#52cYIOguZfP(?4~wZ(aEkidJ|skLBp1YZ|jEUtGd( ztl_8b5D*^5K!ZWQA7Y>rHn_HAgy##K1oI7r?(rEWkP7W2=!0JO>*IOPUMzgB*3xB=tu--7+%xAo5_8@xdWcnm$3@6h5V4pbtB zKbnAT4@nnS#!d|P%lL9cTGIFY<7#8)L(*p~wUqe_88lbO-N73~(Io`Qr78y=Y>WC2 zjF|pi<%)j(bKpQFnylviGqUdMlN7Npy-R&s>z-Jiua?w(*0~%x*CHoJ!Hr<+>Nz&_!pk`l~%8EDT2|WMH#EUSjT0xc0$=VHq+{yLKCFR-DZ=jg9G6< z@}x?jXKR0`;oPR{#Is2Gd0+mH>t&oQ{ERa1^;WSWjCIrYqOBp`(XoujJ+_?nt$(&C zm3aiKwRFRY-=~pR_y(1D1kEhsJ-_Q+O>bVw-AdrWd_%qnMJh z$m6F2D@#$*TN8nj``%NlWp4%8uLdSDQVS+kkUobPpV|@c6fN) zZ!Jp_bP)BPKIdq+#X7qNJwlZQ(_?sx=U3V0EAAy$_7Wtr+kZ`{cB}gf6tIm2?wFgV zIyiCcN$v?8o}%&woGgFlLZ`Q<%y>!mc2FwR_{g=NVhBTkYC3_4pq!TKdOKNW3*Fn_ zjAhT&HVGXIwrCIkvzito5xWJA_5W0>A zD~!KO9RQCm^hF;079n`%QmKi+N5laDu=t;B#kYkt3lf>hE-T9!w;fOT4C0cl`a89y zH-__0Q(&8YKqED2UO2N4qp$J=sV$?81c3CHN6U>zb(yqnkb(*~*xPf(il=sPEp@>@ z!N}F@^j7&m3(g3C(XFtRBr=$zFmq!rfHFEjjq#>6ywDeGs@sT8pZY_C<`dlf*tA1b z>J5XP89`*F6@4G&mcd{KMBgUSb`HZ*;2r>YVpF&suI{a^0>ej@T3EXGaNxHNwN>6P z;9~21o81r|kzgJ^j9DXn#R9$PAIa}Ycw3bxgP0~8X__h`>)ejS8tgvT_cfxSamUV> zyhBDjun=qr|6mbA5;T*zZ6T|hZt#D*L-H#XkQxel z9zjIG!|tX)zy9Ab3UxX-j_6N8rgJ@HMMcvZl*9_SQCQ4`R{E&>9wWMNgjMn{xqo7n zVHL91G3FCO#!&CrQT=y3wA`1i@N^w#wQkz%TO!)GV%O5{UfAiwL-CJ9hyfK(I?(Klt+d;^e??TC8CsUXFwDc_{!J#M z$5w9Bm2e5SsHmb>{`!D7DqEqw&CpgdkFB0j8Y0t@DtaUUR`nwE%u@xr(~neMNjb9%kZ>+7^nN-SnLJyN@e&S|fiCZ9&C*oj*9zUkiM-K|UC- z%YGjfv|Ut%Fm4#@v$NI2O2OnM<%o*UJGh8i7Sq-`Y~lCyf?8v(7`0Uom+yo)u-K?K zFD5tPW?mTloh(5R*J_!iY+cAbz0XEZbE56kreKVw|M%YjO0g}DMOp#p8uGudWQl5Y572P?8^Pch!CbL^g$WCES5=Kiob1MbdB*%zX=t;EoHsC9Tn|S) zqrmIZew5gwg1)3>?!A_1Z!@B0D?DpEEC5!}IcO2AtrAW~uS3{X_5aSjJ*+!$q_YAW zM`R2P%sNQTN~&)#23Hh!bob)8uraG8As0#p8z1Hg1 zLUs5ZaVc>rz%;e5usazXBa)5rX03pMSszG;UAkD^=a(Y^B=ZiC(I{U}3UHgb=Z!Aa zC|RqY$|I*kR!e&u8xbXnyBBHdVO|Uj$P^yT{wsEKuU%nmkn_;~mA&|RLLlzZ?EFm# zw`ya6vKVHkm?R}j^p5{F^7f39D|y!;;VT0U8>F$x+@e_{yR!YKL|fnXRvQATX!bs| zLG3#Z?~p&W2c|`@K;Mh<%$?VhQjs*VqC$l|i!~H-e0=z?vjcfw(17`iPBN&@G9yD% zaF_ihFNwMuBQ%#~Ui7AhmHN|Xzum7tgb`6ri$Xky_Qy&n^HB)oW}yiNe=06z$X1V! zt`-u4@H31tRJ@MJ*#&SRTmu;on*A?7ct-1GrD?Fq0VV~sfAd%iFWgpe=Ka&TL!B=9 z=(0AXo=Ba*+=X2*347Lk0DrMeXf^3E(}j-7YCI3=%wF|P2xC5YmuH0|u2)?Xw7*jg z@x_IED~vj}b#+Ty#+57Z_O@#J2rL*cmqg-we4&dGB8n85<)pOr8b~0H`$cl(uL~g( z-E8rddWpJU#1sZ|!6f$XTLdBNT%UtrU^+27AH#V{ly;O9@l_fSLWJzMT>T6l2%jgc zdk!5;^aUr^_A!bO*y_*0H+2W996q&Z#rvyH-2+n$*&@c@o>{7lE!(+>&MlEqe9PT8 z{<+jeV0NsE1DuXcm?%E8RWUaiMkyNdOg!0N5s2O9QGwtnP(Io~NSfc@waeZV1DWcrmHLduVCVJ32b58_Dk9~PRej%rjN9%?TZO_uw6n7Fb8nZq zkXV2oS906WDph&?pLsTf%T0QvKz7BgDrCh5<-UK^iXbe1ig}4>CTfrRBbiFqluAo0 zVg7|y04U=#l6U(1i#q^%%o}Q8891}adePEhk~0KMup%x!tQC&*kFG!xn?@!LT9%pD zb^7$TaPlCIx9j?o({m*FvruX?_SNjgdg8Yha`L#W{znd-&m-{W@9Y6$+3`H(umBop z@WGh=RUso5T97YZ@A8DPcRtR4JbwpBkcRMu%XY7zU~(0E)cno$9#@W=fO|-X3?0B| za?j;HfP#ZccDe;4l=_Yb5t27!BioJf=(+3q?^M-@apTrYTHXOE+70kJ1uR63CoTyJ zM|yANzmVJ!R!oU~xf(>SlI0rj$8Nh37T}VIKGBJu zJ^q1!Fj$x)2wn49net#w55+K_Xz|)i@HMjhsvtAkuenoguNjeY+l{~3+mb`o4kA|? z^(EgPYvt-28_c;-T3;6?(kRueE3{hh`PZZW%gs1McFN5!q1U; zWmY2-`-&1{?apz|%GRcAlKdyiAZ}cCL}MH|SH;a|P;#QKV&Ut5wel*u@(57pBUFO6 zy3qPXQ6tLk?)EJ(Fjt|y*A$gQhX}UCUe)q1o90Zj)xboE7ApMNUs1#ykV9+bMWd6J z0t!+9STW;k+=YfJ-LiEz?^t2+?*)J>rxb^I^yBhMckk1!Dd923@Dq3_4SQ?*X7N}C z`A{-GW59{g{-$Fv?oZ`Oi|m3|VSgtqQry4@+nN3oJebHI-(b4)NxYPpnob*N8RZhj zCNS%@)YZNi5pE;Yo_hE^?!{&iR_mz?@x=_e(!I=NBfB#JsFUd537YFKAMb#3tieVs0wl zrfAUwBUrUQ(v;hrnF}WwZr7|~a<5a?*j$cY^Xt}~u6b*1T6bI$-O2G-fo>B$bmAF( z$p)`u3qPAal`m@uP|s&MV3-c`u1oAV~+4u4Ypa(X%{DMZ_@RDF|6T3&I@6qg+Aqr6 zxQ<;Y50@dtb1#bz6*;cTx?F?I`dqk(#zDAb3=$5k$(&u99ley`FB*ik7;I-7c{N@B zDXH7pQ4J9daW)cG6=C!4Jn?OYwpD>_LK9md+=L4Yb4SsqN%Fv2VVmo=VoEQ1iV)sU zsy#@4p;h7@2F|wXsbvz-xV#iusOhjo=>5ZDfBCD=dV?Q?zL8~W6;@X`w0dVIifAD_ zK{YSGRijoYDj$XMVMmo^F^tG+8~XP2x!D~IW=>Jc-W<)1SI zXI|@T0jOch-WA_fH(-!OL^T=~+*4{rI1Gio`<8~M?jY6pxXjz7Yvh~K*pN7rb`szKL$n%b*si23hk(Ams?4T*`sL?DA@|7>idzGE6xwO+4dQYd zCV1Z7C+W*gQ7}XnK3$d&6BH!bH^YVhb8}MHY!f?%Vm~iuf|3rPcb)k-z+0MF@{Qr? z6Pc4C7(Rs89<4X-9K5+Z{N|JJbHYi{-$9xeN!ZsXL@5zYEHz*oog6`56&g&Gc7GSB z|JI-LK?65Uyuiz%Es?IfXa(gX$*v&r{OWN>T>V)=2*qU-62I=n&a;b{rd;`4^=;NYwgXEu>xc^(jiM7zJp*v!(cA0DG4 zVHHsb1Lj|FG+^)4k~cUj#A(e=<_1@!L8n?QfM3SnGh0?maWhT_^8m7(;m$edR)kk@||)Z`CnU^T6+F4pIm_1*qvKOmcEgd zLha;PUD#X+X56(Kz}lrDVPH2yshmw!k?#kL@^p z4}pR-4Z}E+my;*9pvD2Ed!xcHCQUqR_BZ*IV4>(!^qbwz(n3By@^1;MdRz7WiwKW$ z9_5bj-x`Ps(hf{W=bUiabq`4B=cC`g8nWK%hm?v{jGV?0w-!~P-b)R4MXCBD3V&Y` zzvG2~#oJewN?z@y8`cDxNyIJf51Nb6JH92O*IYi33<_A0DoTdtfp&{$1S2qOlMfZr z6Ygbub(K3UHxhzrICNeMYLq`%!F}r;N!GO3FLhv>00)(XUC|}W>isFLT=G&-baf86 zM?+;5-kq%hgsGk`)~37*LlTFIpQ-F)p7A(vg%dlTX6Fb6oKA0v|45ta5j{RdnbBxfulwd`$U~6p_CpGg*x8J{fL1i-GUp)3g_lpQZzM@03gQMT zNFAy^2OI-)Z5BpV)LeyM7)pb=Q7Qpz$fMeT0U!CpnPm-og_;v#DhTr;wS3D_?|F#y zO;QH{S&26oh0KD{Q6?i|I)tb80YDK9{<#W3R~A23+`!LC-U92L?+;e_j+2_Y0Q?IsNnA3^ZWH39{J$$!r~IdnUOx>$ zmDcp1lKm}YXchaV-JYRrj?Tc;JC!fr=;t3^f#N+{I`rVU{4lM0mhi@S3jnxomt}aW zW>Q)$P#0npVi+agB$d#wbr-cW=h0j+m<7={_4$sq>-!N3`T>rDx%U8I;{pFH2B|o& zKWY7gttBn5BzEFUHE$-l)zRxQcpJ&s5AtQ$MzUkmVs zd=ugzAS)mGVsU{kQyH`u1pO2G4i*sr02ILRpS6p}C47#`0A+uC6`t>ntF*YwBg_Jm z<6(RlOjm`6sOmlphlPGO##)vZKXehz1%sIveZAG*HS*0s&za{zN7vhopW6q3{~v4z zwDMCwgZe0Yl*d4tzzY%z%&PwcGEeA}q0s_@?DXo^>7EOC*$_DU2D7#my-19U#y=6E zr_U{jm47CV68y)|q|fh~^mJefAJTs>yWtkf-@j)C7?SHomsHA<6 z)_0)3^OUX_mPI+DM-o~zqE=gh=6oSezf{f*arit8rAmKno@(5WoMeQl2E#L#9?b`W z6`|&ujJkmc@)`eyU=2Hm-sd4^Mq+y6|fuJ%;H6izD_6I6$)KL=x+QCrc6kaEc2^N|| zC(=DBI1~bZr`jNGE!T`!=rS}%3^ox-1Opja_VJj2#sPY0?e&==!RnVUDi^_EYFc4k zW3ccZHrRY>&-(d?A=?BCCPf^%+4A0f;-JIuB?O4t|LiUiEC=D)7&&ifj0MpDom&(a zg<>F$PmL+pGtQ*mOcpNp+}{9~PlQBFIHq0E(BoB54EUu=arS3CK;_{tIE+v7%VG`8 z^3>6(`;gRt&bewNFj7zgE#qv8(=q zE%4ye{NlQ&A8jXJU-Pm*wbEAOLOE;Ze9u2~hqb~y!}m!g@&m)aK$`q4DMy{|cf-oi zcV4&$vl|u`b!u%`02&8K<0A_%pO_xZbz9;1HJEZ(Sg;c%@!U0NM@K}IaxfPAp-ta0 zMusNQ3f;3e!ZVRfI@!hb&))SMd4lWg{`QT)ZDF+j&WE+tG9x*cBn2=Q{m4nq$IP7t z)}?6z{sQgD)vz4_X8a`fj%3U5oCV@|p1OHNWaZr+Ky56y0G6>XjIYfWn4QU0>`XA- z3}%edhRkB%PH)}?nhlhqOM-EGNn1YBkMP2iSiOPpTw@hJnRz2014AC%hm-nMSFf%P zf@JR!$NJctsT79x5sPe5Od4(15b$R_ek7|mBNr=MtyM)^S0aWXtD+wYj62u0rx*H%SA=s#h1 ze)VMg`M80qM#&g*=WJ4vp+{-V@~z9Cw2))~J`_h+)gE_cnoiirH0|R9p8W~@WmQ-b7GC0H5!ANZ>{Cn+YcZK) z+^2GE%BmKn9S2)94(rlo(?i90NLs)av>;zVdy3|qx~}kKFfmF(-AI8aQ9pISQd8SC ziGfe^3cc1A%er{5loMyYaX>gFRxV==#6dvC5j^o-KCquFp7&6GxkhJwmK;u{g@MqU#y zZSBfYp1J-z8tK({VY@>-Ca*Avf4u%iM{q48JsE#1c!Q35S0e?q@=&Re1q4N$&yoVwes+A;OiU$d2uYOPxlIgXf`ca5nLkj5zy0#c3AVNQ)lY2*2(K(MR$(51 z#hMybB+j}}Z5l8NEP{@UWV=2B=O&T9s@d@)Dg|pPvJxpwef*3ac*ZrYzJDC*aqQYq z^9t-9nb3QTFhO3{gP%}ZFa6?%`5B?&aw>2KDk(9ZCeG-E{h_vQBXyC)O#;O_W*x*q zHggfpqCCtoCbgmoLN{J-h4JfHKFsLt^zbu&=%u3&nBE8OJEDD%%|T z$s(A|?D6l04CtRD2f(b-N+Pf3ZmIe^!bVcuP~K^T^5i#YT812Cy=Aqb?!^vjyS%&) z5SlL;9~UcT@uWRp0_Fcrn?i~2+2g<_)@IH`yHd_m<(W4*mE9=%hOj-xVN)6+5E*% z#Vfu^XaN|fI%)s0Sa8!fEq)A2(bCLgtwg5jMBo~|yMUk=L_M%s2i;9)LM6Rt%Z-u| z$2P#sq|GUvyhp5~7N%pU79v32CwWsZ^HLMM<0PRYlo%^R9@7PnNTWC3VyQYKD?VE@W#HUsU!{Ykh9;N?9)4B{f1qT7g}h z!@v^S02s`EuQw#wY0*tITLdN3*r8`+g&m@}D%M%WSZJzrSzh$0h)J)e8FF^=#OY3O z;~~tUO7HDzulqZYCzu1nSfMtBSBN;86%Fl@=OAY*@@yshQHR<|tG*r<{uI;?U$Tuw zP{>AV*phlF>S#h9tK6F#PuEQy>(e>uHkO5`s%b&}p#aeS5xV#| z++(xlktj+F3M{rui?WT8uwdYvRy~q|!C`Ogl51OaxGT*O*6U#nnm^~wljVqhx?kjD zN{FP-apJ70$8iAIjIu){NOQb+ZWXYKTM@MFysZg`(f3n=84@h&hV}yXRW-WZuPKU{(*^1yCFXLjLJ&qS#U(lz(!Rg5SP2KuRqkDiA8e|BRK_ zjw~G3qe0Kgs;>DNY7xY4d>C?5v9p@AB%*4$NgRN{*(*sA$Z%dz;0Nodp(hXLt+KgT%}39wC7)eOqmP zpG0?~IMRPlczbVZ1r8l?GPlR4F6ek|=cGO>h+(IxW6?yz1Ov`+-)SW0sEdM!C7=f( zeWWYUIPIzMH5ftB*r5yj3G`zg5pkh-1JxG_M?({{5sit-jzcv%qr!+yt39o>d;H~Z zZ=m`yC(v@kdc0|mR?K7Fg-|LYFpvT{yIL!y(DHG$qX9?u54Owh})NPG0t^zF|QiT;g6t@n6C z6=#xJrwwYkR&w3ijWA1zFMCGnx+DpDhMhY$A3!=&$`?ap1Gb1r*DxuxIcHDKD$#>j z(YsB{tSU5}CigYQU8C%j-JsG6fOF(kgaBN6c{IILR5G=GIDCI`{BPg}4_S`b?dc zQ!|)|dYQ9%dlbWL(lZAwXp?n7^&P^*t}WX+@^`QSksn(&cD3U((a2);JSy%H9SUyl z@?{qm(QK3Ye8&hTNl(1uCW6n@{pHWzI$8xRg$(*S|w91y({)?(R1k<%#?Zu8r@$B1vLKKR=tYiRg&ASt#I2DX;Bq3F)A z!_No2h<@BIosiFf3L_FOdc`azsO|lD41Gwb${YO8*2MVd@&Ssc^&ZCn;1T3SAqD~Yf+We!33&znzP3Zcs3&&+^9?`=}T{8!0-z&YcL51h*k*YqS$aQljp zuo7~fNaEr2b-D^YNM$GB_BJrg6);K^Rv8zlsU^kWS)fo@>Siuy=4t+(>ZEo&f!_5H zjO;GpNVeTtATaWz`6gOO>?;zLa z!5~@#h#=+7n42#)2XVH(1<&upo^v4=bv}w_2vS~+3;XDE=kH&ru)&MbBq7MFyMqJiIk9w7fiDI8 zhBqU?025OnVcMl(=go{l+7o^9hnbHOvY{?UBpK}03DQz)%~MMpHhl2-v)o~j`S!%Z zsw}Vj7|MT&L15sKx%ILYi7z%aXVK{$n>&rajhrvu2h17w3v1KrbA6-~QS#m1U>4^r zp`Fw<%OjBq{cI&gsFEGQ{lB|PhJBt5Ke7O>%$cg=n2=147CIWqPUiqM%uqGxe$HoF z;@@9><0;t1%m0d1a*jZm9KqA|Lr+t&)enF!!D6}^EirF99lH>f&q|}+b^4n+`1%{} zzII)I;a$}L0SF+3U|iW(es4iFB5oC}fMHrLf_aBjMz4ufaahmCuIN^~@YX)tdpCQi1j=(& zl1`gQ70IzaYsn||YdXKXq=RG{PB~oVRTC@29A|+?R$%P_E}x@2xn8iDT~|zWr~m*C z5%4c_1OF#J{Ra9{v_le>9uKcF%rO$pBf})4W`DZpnbr>VCuRu?#aQ$|W&QoWlfWbB z>jW0Cfg{QD=idSYM{ZP=nh8YL3=xY6dJ;u5JY}}!Cnbvv?JfIaTZPQUai23}?LzDt)RfBuELBYA zXTqG41x-ysi?i?OjkACvEYs8n8kKa9<1P`M390V;r+4guOXB(PMc{g4g}n_&rnv=& zVtu2|W|pq6ejw@-Ia`pSWtWxsI4^bBT|^}oJYG6Ewn|3J`+#<38=f#xFb>QcqkDkw z86I5C4ntzOrPe9e5Pa_bB!_ZX?OM`sN3O9wvV7MO}D zRt34cnoF5xgW#KM$(E61V9fi&MEHdKZ<_6ma4RSEa+AE{qo^K8%X91GeCm11F5i@P zTqro+hT){57)&N}ka(qMuneVe54Qd0xZ=J*Tktt^BPyHB*KOFyrR9J|)7HH(jIz&p zRKVmY9&{e-aWT()-K0OtE#Sg*hBUyCdme@NTpD&RKs|qITO(EYy=m7BiyVir^d~7` z*uL^C$+!SD405DWjO5F$$ym(9aU-ROtckZajk>X@4Ht5L2DtOkUg&ENy~)Byiz zuqe87H??|}YcYLwr&r-J{L zb;Di$iGNA7O_GumiOEX8>_Cuwr39|FJ#A2D{x>%#LV?M!*Y_gc`~!oT%K{I@{}ok= zxbJzEj_$}in*hswH)@%U<>h-4oa(KosMCv?km=y0m=fey)PJ$-i)Q6H1{rW4(?IBf zi|e3d^dy8^LGro_DUN(87z}7+G$V!Be5{xdFSnq)x!~2&$9$3@x(0{Uw&p$u(?T+- zWH`D=(emyfzpp(qy_Q8fpZXVQN)=bBqZ`KwAoK@a5m0XTl|8Z*jCRZnqMLa*G#tAUXqjU38`X7ey z81xiSR_LF#l`)-yy(z-Twxu6Y;W(*oa1Az<%Moiw@`>m+S%D) z*9)6_$mJj8Mg$=pNYgqNqz1fQ7>>Ql8GY)Ee_sdn#I;u=yojXaV4ld^)f)`rS}rO; zv&)f!Bx3FLHRwLBpa&j{wpm`Iji3*7E+s5%zaW3xdYg(zi z*L25%&!KzvT!+Z6{jD~yK$vEWl>43Z)1`H@l9dO!5oQ<#c42MJCzmLlN1wuJGYxdf z3Rl%?>geUK2~RGacglvKf5TXHxhsLgJWNH0CCqOygma$&>qakvrjg0<@eYXaV;kk; zqVEuA8J#Y!IZS$I*(O|@3Dk8n4dJxXc+w%6wtBPi_x8qJ@yL_1bRfhU_Y5*+Nre%h z>%OsscHWRJ>mZ>}7BE}>qNDASm2TNmkSKLaV zTn8kKZToq;5Z!t@e4+jp&~J_((Tc(e;QD=r3#mOFsDchz`I3F?$$$gf(!*VqqcX`6 zksE#6@{dVJ<%V6iKF~e#KAq|9!s``vus|Ew%vM(`j=U&3j)Gw=h8u~*^SFT#KudzC zcS1ZaZOn3eMt?H%Nx~=+y!iD#5V{r}6p>Umq>Z8er8z;Jg{DRzxvmms#UQtUX z4hy-q8Q6ok)4kbjI~;g-dpf(0tL5wX8{sC$PzbYzUBQ7DfH$TmV{EetO@jwL5K)ne z__L_<{P!*432n`rTPFMl;-d~T2BdJbz=i$h22At*6vuhk%4cOQ+roXZHamxkGGyJY za#S!fa#pdg6-jL^P_J8Q&6uB-Y#Wb+MWeFjk(PLCBXN8~8-DtD*Ee6%G0<-dC7*xI zDH+b<0m{spW2XJ5WSct$s`3}@m(_#50}f+2@XmvD4Aq>ATxOD@{AZc`=s$(f^h^5& zuwVh5y+A4WDGl}su7oqN@jC`;#-8rB$7Z^`R$PYua@YM7qGNW4ZpP);b0r43EG69! zZ9gI?ih5+A5_%xl7h%(opEH0MBR2I>L4f@(4cG~8GlUrv92|o%z{b&2KTu}Qiez^& z6~#Kc5EQRhjnE`@eQmj;rF89vV!E34iOc#vxvuqf=FL`roTiDJB**G&9po(wQ0S&f zn2FMH5=2mKmh~a9cqT+oTDH=ZGlfwg+E-&h?pqzsJscm^9Ej}TC}9@uo=AqrBcaT{ zKZoSbH!c-%v^@a+OmMQ8s!8t@H$#mK)gsY=*T$BT)msIjHqX5HqNS2WYKF(^{uT?A z&CB>Fd5?EwbWqH+>Rv^w$c^{(6S2wTcLrG~VXIIQOj+T}-{RlZ3B8&Lu*y;rHQ*se zrY3J?tWo9@a;?j#wm|uCe7rE>i*Ic0TN?r@5y3IhBpRT%kdpShmswB$Z1p5`p z)aCzKKdH#wetl4lm)vhS*^+`2G?@2X;zG!OdQF}z;KkAI<~bJ0zqfF9*S6qS&gl+y zN0|i$kiA}E*9@9maaz=b45VS;H(KZhw^pl+#vy%aKQ`{9>!%3EU|=Wmaaw=;(6s+b zPb)l7*oE$A=SE&^9XXirhKiYSj$$m=HW&DP*=2Z!??}K&Q-J30+nYGW?wsD8vfef(AyC7%`}0b*e0oiDK(mxW$l$5+U4Y`OPH|1mz%g`}XvZ z%C!?(1VkQpRTdvEXN3P~uQsfc&A6bLpm{^^?Fw}{s@599hBa&vlbQ-ZxKbA|_ZIER z3b`0Y(x#c>bwXkJstwKhVWopqzGo&jJ^asx>TT+dns)rSuzNKK!w02n626D~%tzvr z7xqrzEv1kW6-+2Mp@u!~K&zzl&ZC=`bnL$%F9t1_xko~;mh za67_kDlI-b>tiDjSZanumvC68^f^@FttmEOJ$l0`h*pVg6n!+)m7kAuIiQi9$t-;! ziIs$}?%V4}s*dkcLiDF%LCX0fWLnEu+?@}H7>tW_D162!;etX~Va9S>l!CYE#&LeO zul80p1L?1;@BG`RI9E`0o?7r^p-2O8+#r?*1wR38$&{Wg@*2q7F-q zc2VS(R)n=Yezl`wqFjspqZ5oeMRzOWV%z6Cj?~&?v-E0eobVW#6CTsYJtqI{rF^)c<)!V$_X3hQ z)dF)+wK;kTEv6>!(7Ps7T4O~W64(t#GVp}9;Q6GOmgn2ZkhZ>t8sfaRw!23${S|(i zpGgc%>@N-&qm#N5z95E$Dfx+4c1_U*@3>I|tNL_M%W<%OE?TtqbMJuZu{$&BCeLk? zEJFOm3G~_&N!F*R5I6;#oW{P$C@~X3e`sd%wMcNGnm!T8-t4^?ncH-?x9q&AD%oYg z(m-jvHs;h4rnoT3jPw6-kmKUWlg!a_Ua|Ym08MS?uEKHJN|6AgJW9C>tp+kd1%qU7 zd$qPELjr@-a1Ow=z08seo+QlQ{Hm2oolsp*|C(v-@-HflJik_tI#xJZ65&;t2^|OB z@!JqA<)A|D`QwwsJBbRrI)k7)Q-oAs_}(9#Kr%0{d7KLBJ5QVQp_14_ZXgh1vSAy! zGwK8J6b7|lMKDH#hh6dSTwediOU_@9+%KG%rDUrnkpOF{uveq`qx48z>R*;b95u-E5gon%29N@|r7eT|6h^%R@4>OWuZwM-YcEY$`Sv^p7c-5kR*Q60A z$rFnMA;FgR96Ga_w6qzg{XL6 z@p~eOOx648*i=2Q^-H<5A}!gGTmg@^Ry&=zmn&@jVb}c zv{p~(`4UGh?31|f>PF%%c{k-4QVgsGXsP6WLAVo^5<~S-UQ+GkBl?>H9N=cgSIQyj zHaRhzES?8Svw~mk5@GtlBrrRiHA7(Co_>0=hyG~9#{8lhRiRA|ZkW67Q_0R>>;eY) zoih(gK32&EU9?oXJadn51%8zTGJWBGc}YtrY~VQMS^_vIWalOL8)p=lP|~Nd8Q%Zq zh!U{eh2$A*&H3l`-4vUPDF1RF-p$xjT2*vqn5-69RWDicquxnGacJO?#lf7l4-e{9 zRq+vwrgsC67>D6Fb{r+!LTa?-#L0#Nx)AcLmQf{I)J5qIBrVt&exWN6X_`K%Jrm%ucaAfHkHo=KWtAU&(*+Xgchf0?}s6x zwJ4uS@ypwdSC{E_Mq0C{$2Uia6ZMoX_S!HOFLT`fB{~6}9R5+~fc`Z!Lu$+_S)cEz z3LLCNXL5Mu=UX#}8Xgwf1y{(aRUWqcwkmI91KM`1&jofE7XxmT%0aVVc*mdGS4pDV z3ZNr6!5p!2k0Ezr6DO$r&8CZ)xUqyf=&!IRk4_Y0%OvG<0ojDS3 z^AIw;8_^@%*r@YILbp@sWh0okS>nqLH=QDLeee@PsYC+3W*#|G2A!0&42r{$rJohc zl=0E^y!NVyG-fc!WTt+3dVS)9L0W$RQIsuLrJMhdUT5N^HgtW$D39~+g;CsXZUt>U zt~_b_LPm6dUf(^SC!zr!9p=FEQz5W37q%1Wir%kksy9GhwgY$`5{KD9pV_u}U?lN3;L{F2n!;001$53mUcg zP7Wyd6d##%AjD4w$z>jw0cYETPu-~vsdGj+XU&$ar4Fo3qF_NITtyJj`wr<%YWKs9v+>N=$DDVVtl;`D;#ca2{Vq@Ha29Qe% zv&UjGAf7`{{x0oAajC#6ASt#^$y?->35PE!Da=VJuAj%`p&$W+XWNX!$Li5WM8$#5G(6JL{_RNYubos9d6kLL* zZuqSK{`BLVJJ!-R{bbWbpdIg@6}1XO>JJledPOBM`DYYs_MI^h&TqB?-bMuzb;BJ> zMP`HByd$MxU__{fs5f(fUoSc{k{vGQ`Ag8?khQPLiV}bQ{bjjr3Hy> z6h`a@06K0Htu;sOp~c=mD>I|Kd>4cIEfnANyDBYk?lSlWoJN-L`(W1q<7M|hOb1ML z7-&~HI-w=v9$8}U7~GhS*YFD9yD&_Ud^MF-VHp#5(+;$e#S_SAby{b#$u-RlAxmZP zNG(KP$)5nrItX+HLpsC){}=^=VHFWnXC#Vn+=}}eYiWF7f@M}fxaIi>zjOM0t7}*Y ziM8AEyee_!UUk?kq6b|V?9(hQ$8|es8W#ZoLjdRk>bP=Uz0BjcCa{0 z;aoU$$w2)&$1AtVLerU%c^BC#&Hd;m_pmHxQDw<>6JxeV^uBG-Kclqrsn!e~he8Lu z`x~`x)6YsY$sb(BJqQgpmsjKD?(Gj{3w14C57_YXY}rc+p$PX6Hz=W+41O9Z2{bd~ zd5>!fIZPGN7kuN zNF2B155IUXFM!S*FO3NP>W2Hor^Her!HPzGwcd;_%jDFD%8Y-6Y%$1XrwoNj5@|M-*X4yBfnJz01PL-dVY~71oQcBwWKPY1gt1Je z@Z@}#Pl%FJT|fn8Hg2S^4A9^4NmN_M7d zFM^Wre!!xpe=H4ybPuNn&$-iI_cbGB{awxe zvzh8>{1ndWGy0sru$f72Qmc(6=|)4TJjbzok8`jR-2U4pVFZa^L#X@O;wuMVoVKqC zoS&*?DZviq{*$wY1Bj4#4)qQP_D3DNjk@*c#1mXjiIA?R!`dBloKw!_E;&-x;L6~AM_2&*WQ(nblkdj&Em`*2CXF=RU zEC2NA2yFTsMZGRN21AqJ00(G*00005a?H9~Qa*nxV2+Ojfxe|o_H zArGHJaI?+g3+w#dXOl4e)VGFZbNH42Xs$Fx$xVsP!X2#txp&U7cedE3L0r6T_6a{P z>wJY=8o@&(lQtoUH8g2??FIUa{N+}c@K(obcVv+q;%TLAXv0v+}% zDV_5*Pj19np>yB>6QO_r000IUY&5EqD+^Zu9E|UbnoxRNyww1@c)+~-&@V7MIwjm# z)G4HWS_cVOa*Y`+Fd?=tTHdG*UlY7oBd0ZvsdvV<`gmxETuw1P zD%EiMu9ipW|4@%^=hfI;w!eBlN`JsB-OsaeXl5VQD+u4l;(V&TV$ksi)Es&bUd?^9*}y?=A+0Fh)VC}q=~M}U-n zYi{i=S>qB#?qDDDUW!K(PtoH5QaXYq@XSfceDShHcvbeR&Mc~YO+Pr%m3d0G&v@d? z^nYrV+|qLLL=x)ScGoaOwr`*Hp+=qr5-P3(icuZ@mWuajvSO_TbhJCgTh~kgij1`- zP9~`E^rtD^jA!J4AoGa7wR1^DHWbQOyLoRFn52Xe-6dA$9&V_sS;1uL`x{zh-jlJ6 z=gtMccGA}ByP?&o<;fYg?!5#Bs0h+nV9x$O|~7&>uHYd4GHINJqC%HMdJH&$uo$NqTNercKkXyg5>s z(%Vaj2o%sT=_G_$wazd!*~BqaI)~}48cQ>1V$P_R7V5uh)JurG{GF=dVz>@YtGv12 z+N1y0e(yG5Y(-42J?llmi=!Z(Oy0@I_rGdfttVz0o0KeTi%lJWq4Xtj>pmhL3rmnm zG@$?f$j-@tBPg%-peK{3Mwvz;5)dA{hr1>@!J&4&jYTL-gb-TqT&1kA%|14gAp)}5 z3V%+~%$@X8F?Bt3KBmQJb@ z_EtvA&ZH6x>Y8x=oAE?Bs{67FWlr_|pLOU<~CTX+G4+n99< zf!qYh{3%eOH2i&J2aTUz7LH*QGQ} zjh&4=!gGDQ@Ic6pnD-V?`RKZ8Ua!{~N60qa($M#%k^?rDUV(e(R2-8VFy$m?d%*38 zDyE-S-XL^i-Jt8jss01Uf5B07aO|Q?6vGFXLk>|T{KjU`iQ&KM$6pX{>&N$QKkfY7 zVAv}nS|H&7Y_<`B5n4aL38xSV*3KkgXSH6tP2k~*hx6ZPUznBKKXaggWk{7};4??U zbQ@a{*a#^|3^Yt zbaTvU`j@&i#^Q{oyim9nhwhegs!I+-GmGZ&M+~?tt-{Ge5!u#0JF~kqk+tcT#Pk4* zOUzS!Dl9iaCO#Ur#L%erVakWIAu|7ZTLi9fAkmC%OW#>nlLmJUQuY9y4;or{Wo>z3 z&w;-V+!%bUV2$tFpajPs<4M#46*JB+iut!(B>Q{*CflkQ;c;Pn19)EnoC@iD|NhAe zQIDu^5aNUAy@ohN|FAx`lx_LR%#cv{8tA_!dodA~4*_w;wSN+NhvewjHr0(rXfMop z9Vr4h$c&qGx`;bgdxV0p$&|8t3itRQ{(sFZikv&5^ozUjPZXeZ#@RDpHywcx&REio zMv7?iG_?d@lkh)zX?c*o8BzZEk>{!CCp0_ z>s2T;K0t%jRHqca+g77ly!6;JKxQO~OrRIY%xFkmDYlRNLEdTBp`E6x8_^r@Q*1jc z7Vect{B_#ft6j08G1_#OIwNubiohR)D?+=%0(!U`rYU zx}*zpYsX~1Y1=iT^m3k#r0cqZkR=E3x2=M)j|Ez{rb?!60G9PB6-KWnpGiNBv{=H| z0~=?0YxT8;Ho(UYZ8O{qTJEPOCv51yX);sdT5@6zMnhOuV1-D8uAi6$V1Q6TBuu;1 z9a?sO4k?tWZ1Xe(Y(Q|Cr%!*58y$nBmn;XE(Cp4;I`9|t<4Pk!bKj(nL)u3xl#*%F z+e%2%&~NlPjU?H>6>(VEhK=hsK+iAMOZ5AEH0K3}Nmxm`*cKqudJtuB>EEdix+ox_ zVoRNG;C?fpn=Vd0C*5@N5*jx~hxqq9_oRl>BS=p8ZkV~5%l{QuTbUl(fee|ymVdrT z54srfhPVj^vWkUy&i* za6Cu8#?YPuYJ4r-YOy`6_M8A~a4)Ex6aF#tM65pvqDh=jsh^~hqMQ(vzt?`i005l~ z9B+UC07;$1AKQz(lA|WP;Y+F#;)Xt(iliIuh&y)WxCV29_(6j-5q-8EAz^Ox7~(_> z2wc!SO&%ElblH9j61cwn+zjLwvpX~B3TxfmRL4-D+z>DT1I$3E{r~^~5#JgbSpx+U z0a==F!_#OXh37?SFGRkG`|gQZ0{i*>?Syhb@T()?eOWDDy{kM31VL8dUs4cyE}yS_ zTjK-4JEBRP&^!|_(Zh$Qi=ZM|u#^XZ!0_Jy0G$jRZ-4**KGDE7^93R<^x{}4nN`&Bxwh|%uU1fZ^fZJSh1{5jR;+pqm`yXWRpHbOA@*wjzIdI~g z9oWfAEzf^)oHtiN0k=N&2G|-Q1VmQv-v9Jng-7{$=%c%ahbc7YN&9bk57Pw||wF z!-LK^0047{6(7I=03q1zYsBOR9nelulO?kTy;!!u2>$$`TOu*lR@?I8w z7-CaA774+L=qGYDZDavj362+A-0Y-`<*h6j+dWMe)z0uwK1Z!^n0riIq9J@Z+Gxi4 zull%&0}YCPt@xhlAk7lYg}~MK1yh{mDIvgA2tz|R>ikIpu5Db~t!hm<;%CSw9$ib# zBB5DsIBKqmj{;W}6;Od!lC^#`t_*O|uT^%}03K9XcECfwp;PEsHrk^0WzcZh=MJq|LCsE}hZ1s%9X^)&1% zk{Bf1Z%zHM&ms^+oIdJgD2$OwAd#D*2Mr9Kkgh`LN+!q0Prpp;J+KTB6V}bKdINzt zu=)hsV{5)ZA9TQNDsNdG(ih~ zbqtOGZ){N}n4{~ZJr$6vdY|$*Su&ZEfwHD?{1Qq(r2cJ#rsmT`GA_(jZNfq4gn2+Q zh0hdiEWA%`z&&~|W{{q)Dme3fhs>Jm&?==RnkoF_>>O*3gKhPmhXR;q{7bEaZ?U%r zRE#MOxFh-KIQ(tmzl{nvuk<^F#zuEv^(nSr?+8*iNi;(A=1A~t#Pk$PVsfp6iXeSx z+4NpUT%x4z+XTCpL8W~5l!9)c{!zj5;?c(aMA^TE&`ryi!0_fANE&R(WtbMAnrLs6 z!Ez3HOl1!MHV=-<7LtLD!9~O-Z|ojsbA-O}h|a&EaQ{4qm5xAMrC&ko(%iqmhe+qL zkdcW1-TBFSj~L%ACQlocgqip7`;DFFSx{nt3 zv}DZ8A1w&Kjce0W_l_wGZY<{@9xXpq#L*JLm$UVh-5f!Lbh(YUN}Kwm@yXOzx+2}A z+5Q3pBV(Q3B^O82!YEZ|7Of#!WD{W{>~=f(n*dW)ja&WbS+)@LoKtpsCSSh`!!__6 zn{P173W_AX`;B^2hBsg3?emt3?hT)NxtP_uR5XEFJ zUGbtR+De2zJ?9h&^Vr@IV8q*R791cl*MSDd!{vWc>!aQ#7ZB|7Lu|EKJ4*lYF!T#6 zVqOblrrRLgUxYXYV=sXCN?-e<_Yo>Rud95?eLMrpOqkI{{hY3Y+;sb;Lrao5t%m_a zjpXANlep{(3(}|+0DVIg^LUj{RhPtAeSkhX^x_UeXui3e)5IfyN~Ir7hW{Ky1(#XQLSb*TLVc2Hpyw9QXuqCt`U@n)NxVZCZewnsOmjk(EW%3*+{O>d67I*+5K&M- z72kztZV}c368uCo#9~N~*7BKqJH^LIo$9fb=toW2AK6%|)1#8XH+c(H~4Oe8k#qgF$I=jJM0kJhtM241M5>1ukWFM*LT4=R^4%NN`3W< zh9ElN!enD|ADD5f!kp~)+U*+c7W{j1*&OSMcTpEgG&pzCP4n_jsA|)U2hr|(qdnF_ z-lzJv46l=pwA5Xzr+s6^cd2-6%?`Ox-%df@6Gr~=AAw4O37CS+bVc=?MQES*{RFWv zpq?|UwoFBcHC|`rCtFGaO&}VPW%{_bqM$yL99}!qqaclz30V}8IIheR=of~rzgeMO z>|#CQz&1&n{6@e^SJcH<15_YuI3B)pu0QXH)d%6I`zT<;GVNNQwy~8Y9yXLLsL#2L zzPc>8_vH%NCQY!`8|&!Z$LIEC4NgFY6s;YHT_U-uFzO}k_#lz4v%l>A!#OMhXM=BK z;r6d~qxL@nNj!mt(5g*W85?G%J&Sh*HIoM6h%OV=zK{!OIpZw|WukM=8sW|(RlBXC zC{vPM=iFhKrUdM1%z!e`v&^-$ z%Uo2<fU20zX2lcGVceVMKvUcMfpr16IjI+l6=bPusMBi5jj9RX_`hxE>&=Gr|Qzbw0&tt z>ab0i1KZof8P^xDn<};Vv5L53s=+ob#lSdrTqwer(HkL`+F6_(@CDBBVAQgs9x<~t zQanOI9x|Hwr*2u0*OmN~jk~w#d4Q6R%B*T88Z!vBb)h^>V03nJBejbKnP?z0jr-T zVfN{HH%F<%Kq1&GEA8i4EN7H@2G)dQ7Gpa_R{J2UFa-n!u{H;zi2XT{)jBpdNfKC} zz{$p|tu79C!6ImI`YoOD3>fU*Ue(y}aM&0%T|0-Ae2l7@a3W%he*C1J8F$Keol3S( z@+Khxy5!L+Ov;alRlMw+Vmg!u^%yTjtX%m%H~Gar$^r+Dm8XI>EJ(;SYOzEhdoW&< zd8IXBHzx*5bGd)eE81WyfpL=VBPFy7BUU4srXDu<`Qzoq`FO4GfR+|Z2bUPffAbzF-rJwC9n<{z9%ix4QYh#9xr!6_|hkD1!$Z-~a#` zj1bcRYMl~Gh#?9;e0}@7PlMctp+hj7Q~3`y6T7-n1KzE- zSXK*6))T7WCx4bNyM_nOibzY|35=bH{Bbpzd49cCl9C@hM;;cQ9XK8PLgWnpObas= z3U8g)(`$R8)ntTX=p;PUa`?FD+_sY!C-5kaEcf%_5aqIE)dEA|5vdZ%?m3GLKN z3Cj-5q7eveU+`zQiL>BX<)u0qU?bA$_8&3-U*mOowSJ>@K1O zi3?cx@-LPjL5VY*22pr0?cdh?QvoyNzY8c)*60A_jKCvRq;EQr3Y^j_ov>HFOm?`3 zT;ukpBS-X4TTobm$Qpq79Mb9Q!61&Z-DsHg_NR*;zHqh&UU)Qa{HGgG8W{#ayYkSl z(0}>tY&-wd@cjAng`MemGr8IggK3HYt3a-i!VRoL3!utjWo*Lv1&1CPscK%j50EL* zd#lMuzcVn@_iB~XL&eBCHlOkwZ$^d8Cp zUN*8X`qc8MQ5oUcdoyYg{SVDHR4&2aV@uB~-NxxbbOLMCv679|Jp?d-PLHHhtet4y zzNgH^&uAxzQ^w7J4Dcd`I6SuYhA(;*vV?)n|fpHvoqw>^Y~p0Gi)~Q-SI`8)OhIzA&cSRyhM*W zcZ^;#z~%r_t}iU=!JyUj*tCFZtfS0o1M-s20hYlYoZ-5tbJD4@a9>wO^RzFBf(R$46O(IX_*Lrc!F36LIB@~O4mdvQe!bZHlx zMkH=WnB+GsmToYy2PWL7(n;Up(kzB(F%=(nyz?GiP*J%)tI(04Hj5|RmytdX>QRCA zsxYOq0*CCj>0p^?jfym8x`FbB_U%G#xOzlDX0l-p)s05PDY_2*AylCG-Q<=s-mP7! z7(cv|a6j9sq6i3*V2M(tGXe3AOC4ftJ?q}*^W2?CZl$M}4Z#WlHIO81S>O2p` zKrkouniATQuCeWPAe4lh&`}7~JHM{xgvz1Bv*MdMOk}`#aIUcg)DsI0M}L*0_XTDE z00LkzalQZm0Q-n#V_)o}Q6)&-H1Mi4fi1ep`00+o{QTzY^0%mTp zVFA3!3|w^SKvN^=IVf%GJt$lObbT6!@vCw_v&gEiooDD^iuP-ejUd`5rp&SvoDVt+ zPWT01W2wRq&9K>!TM=6zx5l+>L05tarIG-S@fQC3j!)f)ttG^V z2NS>m0YVr!-v9srq8Wv-7}88=$}=C9p1GJz9Q6Zc(ZmhEqTp|z1XVQ>OHX2?D42`o zX0KHZ)gPIK8C%l>%su3wM)S{pPJr}VJq!!AKN=+kjtF)*1)u5F761SM00001|2Ij; zauC1&O)yh2P6-ZoXnr|^K5OAs%T+K~c|D1SKz4AId5heE8uH&18ILU8N;P~)M&a=W zz_*Ud0009tK&buz00Bvny%j{F5j6kH&f6*=0)FXj)O|9Me)>?|z!D~0zOYV;hUr;W z%f^@RiAwl1Wq?#-23xQuYahq@2*Xw`t~dJkQm)xQ!(g8D!#)6bm%!Rfdw(ll(fc4r zy%khIsE>jEnQ>}CK)CbA&F6O!tZ%{zO3LwTQV9H*Loe7*?{c*a`cs>=V2C9q1KFOm zHL&+}LbXp0H%4-%?UfEnMhq009Ba}G22?x-o(gCv+aW-R7A~{x9wc$Rlg5t|7k4+- zt(>$R2sR72uIib)7!lMo3p}$YY{Woehx_6wRYt+>bicyO)C!gK&g>wZHP(;#}v9Lf5C_&@Ng~NiQx1}k-JmsRu<7VYgM(p z^I=ai_JyJTKuLEl$utMR+KIoVRe57#j^09Jdcvz50GWqY>kZq)NrsYf z&JPbN4deG!Th`d+?^isAw0}Q|R${4YqgwjI0DbdP9HgK`3HI}YHwmmN;GUEyU98kU z(QswV0$C$S1W;rQ>>`A}6K5;C#PZw zEeVWh0vqqgEC4*OWpwd!aSP*t_uqH3M2)PQb>`PoFk3N0J-r|7==Tl5oNb=S&`(Xn z5kZT5E-o;E?6DT$MiYEf@Q4QQ;_ax^cx?uJ7Xrx!Q050Q(Ms-Ga zg?tdvzSVPdI$fC3g84YHcVaN6^xTm~AanB&T7cu0@0kLVcxz(hk8-k5ySyi~)pvSPYu--o@AtIv`MsGH zQ5ywfBQwX>j&*C_xDUY?LW4~$(=XgUnrX;D!VZQ$Td3h}TBTmzt*JvhK2$DZPG%ej z?t$!7=@+?5Bea@POyvyDPh%RD-EG%_fiu<%f5xg1Z4+Q_0~QMMM=b5b7^{u zv{m_Yts?%CmcB}owykJ=<%z88$dOK^Ic;}iGy{I7?(-I|0a~BV-V{FcaYO&nd=Uct z#Y+40&*$LfM_+ktYR}UJ{s{S-h%EqIC9E9FNyfk!|5g`l1O2wys^es7{uV6L z>37?;vB~ZRHi&nU=L_%-zgX*JTE>84aTvCxOZch0lmBFCfJDgEf&%nF=6PSv&;5LE z!ixnoj~|fK8j5Mv*c#5eSxshvXw**AVql=xH;3 zeC5^>eY#Z=LoKa$ix6?Z3Y^$2YmZlrG)K0OG*RXI?z#pR0ikjaTBeOahxW4Ke3*Q? zM9X8BAp%1ET9igMXR2b{yyFI}w_aePR*dki4CRzxBx`%Ie}CigHCMsdavG9A`TLTT zqK|g8M^0%Jq~n9+N-^R8NW_%FKN7vpJ?F6_Q~aD+x0zTHUvW!?w^4xG-RZXYQXd=# z`%V53C6hABu@b~?Ke<#2gJh%rSvQcQ@U`K>IstJn!{#EOyO+I^rc<=}-WIfK+i%qM zO=uk1)-sA@$TnoYXK+N?KTG9tZj|R3-zp>01HsT>27Ju$4>F$OpBe{v!p19B^!bn& z_DQBgUMmKsu-ADzr)u!x@@F=`&R%|O|2*?8_Y&kk_A-xLE#`o`Id}GFgMQ*H%Ww5f9Q1O%2!Y|s2xj8mo-M7*n1es zGvVTR!fqC?H2Zd@&McfqDXom>>oT~AOrb4S-u-bCms~aen+E+iBYonCh^M*XgB|NSvT^z4cT z)f*{306@ju@KmH@`1VgfF-MM@rYeHz7tb-6a%0Jc$NWO`yGB6?_q*#LCa`32|GLmj z@n0OpQn9xAnifm9$=E7Eeb3<1uzpz@p_iyS_CejPZ=1LOSmy;b` zheL7A?BN0usVtG7nErl7-MU3EPt1S>!bwltF3(VDMGnH{aiBJu$i@szbB3YnC9)Qr z3zimKrl`sw{6OynD)K4547(K$ z!68hrd4g$Ks(oRvmj}tsApU8dC27L2Ju|^Rs%{6Nj(eHCC9QK>$=IXixT8H0xf&m? z=p6N`9g`v)aT!-^HKKvwA&i*IWrBX+khws3JBI2IKz*vMj4*j9dXXXH74>Q7pQ_!L zv~zs^JAR4W+R=?z@PZTz;|kf7)+<^J&53gLavn0Io|6y<5ved_ZggC`tGgHvG~pH4 z+Tw||TYdbe{JyU5KuJDM&XC%iraqZ`&moqEo|Z9JMvIJOT6jrd4xoqkFS_3?j3+Tr zQU=@d$Q(>w75$GVTkc`8ZtVG;GaZYdPU^F8y}>lN$v>F)`RzFo%ZjW@$SBw(?*mC% z5=I=;1me{c5(Le+2LVyf zC?#zXi`?ek;L0}yBkw{AXgd>3$ZN6>%>fs5I*x_btWxu&>o_&5;Y$q)VBtq_d>KTt zCUTv-x$oK-57Cpcn$h}{DJNem#GyKz$k9KgA#-1O_IE9-=71BCGJ|F9_ydhHFphda9zRz#dO(shMkEu~QBKA;h7#cGb?*C^xaNA8kSyL*+O+4F zApbu(QDp{i4Fn$-JL0f=FRc4PciIuF4t5~}AMZubLHC;&Ts%Dp)_<>rCfQBoao_SV zwH5(EK6|%vUFuXi5)A>6*C>~oX(;d8Sn?*M%bT~p05Y~&pAB>#ekd_&H^p>9^?t9m zyW#8-@9Rn-E-Rxu^?mJ;^&d#-rJY1iLv17-%(y-M7!-&*@~*3WhqqA`;`R2=JhCzC ziRhEw)VS-=M5}0x#5Xt`J8r$AqImP#bf%2|NM-z^RW`g}6>m@`-@c}w&3#SL@_cL# zbeB!8Idw|vwJDm=rY(e`@9$CZj-_rh_$ncOa{`8tjn~LHkzF9uC708ch4@LB6o4Zy zHa+$M2mk;OVS|nE000S1${as1X}6h+dbQ|(879V+6(OQRVsJQt_`sPt^%@=(4N-pba@qfCpRtO;_?j939Njig~=LAIV6&n7) z0r;rq7-%CkA03G55NALgu5PT|CN01i% z68b8Xr;uWtSPdpM{2svpi*8GF1NV2Smo596Sg9>$EOf|=wF*AFE(}@kui8glZtF+c z{hESB<^OFU`T^0}YLJjA->em)i4_24mN)Sm0VLi-Kp)D|Zmr0ilEw+}E(b8}PiraE zCZZ?r@#9ijhymgYxP(=MIJXc^pHMZpT8oOJVNWjV*Z?C~gi|fk6DdXAgoOUVOs~N< zck8)B`Ejv)7j0VQXPX6j%Fqxb*-1xI7mdKe+}MWao0_uFCO6?H@TRBRebAb8ME zw~4G@W1FhBD4BLukBLk~hgY6rBNK9Goo{Kh!5!~}-OQ!SvGxrC25oL@?EADFeVgpm zy>pW-P1`-#wr%^gZQD9++qSz;+qP}nwr%sY?e6LKzMtof`Nhn9fXP4hUYQkV=RN$hG8c@buM5(C|4Y>m+V-h|}}s$q+4Bj!X| z-S5cy>HPJ^phGeksCXn&Sn3&3>uUdkRraw+4*%mh3vZi>nusIJbWEVNr;hK`IOs0F zwsJ8fc^#WMlp97Iypg@`@}1xmr^b8PA$Nt6f^cID; zW6q&n4^AX&0-Rs$G+|6KyA#k0uqM)xfS_#VJ(C1LHFiHYhLMvu+k}mmXBQoo+x?Qn z62X$JTAw1@OP?S|w3q?bsR_CS;la>%dxdK`f2YrcZP4Nk{9B9gc0>}WmTRUQi@VUTdW7#)cOpg&WI2Ksg9?pt=p2L z(LlAPAe3Q!gIk2B*RK^=eA#ntvnPB?C7Gl`)p|9_*`~K5-!b2ocKJ&+CeHvQV!*(< zsR4V<$KwY)Z#VP}4OSw96vx0$dVh$fAgO|1<()fa;tKowhkMn?cz{qvg)|dPiv>qM zhs;PpM4B1g)E6m0Vr1!%n&*)xbRPB&+)~-SA{}Q{cown;aMkgRQ_JTX1wBsa4`_%z z>FOUn^=st0oj-v=RG;o`fq`uk8cDQWp;ivH33UM=IECAnq6cZa1RFFjilLK)dVr<= zm{1>{=+_@F){Zi@4ab;@f?s88!a3Yf5t~B@K(>ypyL3hEoevzJlwJ*H`AfKQUQs{+ z`WqyF-lI0S<7%mJ5&9K7+9YS`;GV+V_*?lJUlt$hCFh!JuC2X-Z-DE1QoL{R#d$t9C`?1}O^1kRmsK6};pAhV)x%V;x%nNon)r2XJ&@K93uQ-_Ze)~#?-`J) z+@K|MZ;$`Ifm0dtwNyZw7k6?viJTij0)#R(Wvsg4pt&5sWRPh8e#o|!f)!Rb6iSZ7 zXIgqn;emf^jO&i~${7xwb$h>{#=lk9Dr3Mv8*M!bb1d|i6wP^NtGpixvpg){2P7)1 z$R{CM5tf@U)Cpjr^e;NHwqALCk4oYNrZ?dP|KrOtx9wos*s9U2S!cmT#}XSPGU9NW zl1QuB*`+<60!hrlYg0MdU|Yj7uIW8#xvKNG6kqZ50Y#4GgN{5HdOo>iYwzXEy#gPt z)Ux3_cr0L72R z%VZT|Uy!W7pOd-~+nrSfIyv1ka*s!cDgT^cK`@VRZ^vnt9nl9x80)#Fwwt5wr@EMy zt-PF6S7gvZve(N1NkJAl2(W(|lfIElDa_Y8BjtU(HIl_^w;(>!Fx@ZAeLIKBmewkM zl$A0vSM4&gXV^|bcUr88?jzG9ri~~O_6O@n&m_9fnOD+QuHmI`<-;*3Y1 zUKqQ6ut}M?Wq5?DWxVB@%V4j>omX&7On^QK@-w$93CeF(bl9SNAi(&voMgrDb+ z=6vS{T{a2DEZT@($Mg*IbBlVAAPN;~c3HQEUxWX~nJq_{HYG0d|HX^>JzzP4H8%jY zw(*UweQ!OKA5EIZqMH~XGFPV}9lY&7`;qLkp+(2tZ*KsMeaU{fF?N?MwbxO*df-B- zRbl4T+b@m^XE5R$QVI}6nmXV}cncxT?FB9sL^#tYpxRSqQYMc2u{c)k!eLXndNsC* zmclr}RT6o#2>}aU=h!D5ji;h7V2!X4HASnCAK5m=bZ5>fJS@=b55fU0;RhxNt#3_* z&}gOR(89X35C>w3IC?2v+R8bkCji> zKpHTc#~{65tmcBgEw_2yfbBC3otvfWR9v85MLGMoktT$I7}zRV=Cm6 zs&4$w_9KCi+cEZ-4*1*uRSqHhFK7BqUOaVzg$9vXhf=eKzF+OWWM=s6+xp{4gg=%4 z2dnJdk8pMVKXDnb8TtQs7VOK3qQx{z@oX^`W@_|#GR1_NqTiA)*)O&ZQ-@g9cUt&V z3Z=NpHl>?s52yF!j?L&;(;X=p;6dDF0_URYTaM_}CX9r{l^|HjzV#IZ2Oy{gpPb-i zYgd;xevRK(nf&=s9SlYrWStjG6=yo2C=ZA_Hep&%m|gP2H?$v#Hn>flZA3z#F?u&v zeMHIhR5qZ(bZeG)jtbHM179${)NvZI`LWH7-irN1?;>5Z6ubC15IhA%^Pv!tLYxq= zw?>Juo;*o8JqA*zOl_cilYRAGxhsXp1TjzrriaSlNYX+}N9!6=R04(0{KB^#T}VJd z{=~?t^otFM?Jj+XH|2%2(_i`4;$zXp8MdF(icbn=MJ>v{AMrqRUSWL3Tp2l#@RROV zsrV%VpL8i}>LTi0J+R890jYzm>LTNB5!Qs`LHI-*#R%x+Ae*Nhq)+wO|(%f{B#$ct|$nEEBUwjLn&~o%V(i}C&l&p=m=Cy}Q5fHkWpB+T7KFe;U0IkC zi0Jd=&sHPAeU|Tcu=_ECOlq(Mw&PwLRl9?T^tM}ZVN%!Uu=Z!f$1lOp;9DD$T;A8&FA_U_cf8+__bn@m5b-&a-m5ZTMkjs{>zj<9bFd_7?f0#sYbvpMUS30hO zf1>IQGdb>yx)O^-Cq-!Y9R{l8a`z=R9mlV)!+56P%ZMW6`q~Gn6)Zscvp#&3%8KHH zDhGRH+Zk>Z3x=D5EM@NHxf|fK6fDdR1zI;90h4tN@8i_#|MlK`q1ZLuZOI z{si5GbhB>D@N(Tf@hYL`*Ti2HHRI0kv;~FOyw#a56DWyKlw!Y;qOiV#ZS&>IrUPqy z0@?NCC4><17#9~*{?3e11k?u>!&2fE@~+drd+aj^l(E z#X;}f6M}o{wYi{l6B5agGe6N41#hM|RL=lA_K$?;A^&oB%eDvFD5!Jt;ka^uC`#3q z(@*Vf6_=t6h$EWd%M_G=L#2y_Q0VKE*se1{fbPS(LP76;aNf zZ5M+sGy81vzZ(8%gvIId`^%H2y)ACR)7YNY-jl73tKe-e$@}6yjs9i<=8ZEe_;;li zI!BC}r*y#TP+zlTLSQCjR6>e$p2+DY!xL;P$3@8_Kv~|~)OzMtP?>#5^b#BTd&RIo zxoGtpnrMnK4pqzVr0|uyK6EU2OB=N@(5oG7li#L;z6fpq)?8CHtQyQMF_DcuN+;|O z-sVY1YbaYKyuH_^YjPXW1kl;@0IUA910QHwM)_(EiQb{V2-k=GU{ekK-*W`XFVkzE z72Bo`rAC`P$pkQy?GL%b(#~pXFtJT6AoIsYfC=4L5eA-P%xMlT`oF*&asnWI1Cq## zvV6H3jQG3cI6IJ5psBcaTgQc69XH4jBjYoDx)MrgVH*uRuJ7T^NFumImza6AUicf9 zbks$1$oy$$K}y^7`6XUoFsBzMz?h}$?%T3Y4cMi1X3wrkDrV(!fC@6$9k7YThV9B@ z6~8r$15I)5QE!W}4+ASR;A}(hN!#_7SFltc^EN-@KqjBx#fW^+k|c^>(Y9!E%^62( zd|?e|mTjg3UQ4a$#s$3d+g&-iiiosP#9CW-c%!Xbu%g`1NrgV?Vo?EtwZs8H_RTs0)1~3!C%PkkM8Df~4wta7HS_p3d|N6LYrHxX-+a z3e=Rj=~r{!ws-UTGvW)Quwy7@`HuDov-2a8TbSy|w(IPvp3DvJfz%VTxna%G>q}=W z1oG)z+s6!-PmA6QLY5-*N2bhNhhrQpB6l#5au6wR(Bk2~3poqysKr_dAFD9!fYQ(@ z`LF=Zu9uDrA7BK7yk~GSh7ozA;C-XOV@n7-9VXdhyF(xdn8S|vWo4D6uneRdcG_f8vFnehD28r4omT z9{_+E1S)11004#Lz2Z~H#tEW9QEH@w;8dmSF2zbFKPNjUS;dFPtOC4Urz2_$5W~4o zI>#jI4ReqDtYCObWF&}Wz;J56OKwIlwAqWUYR*^_QfV1Ng`8}RzXzxiW^K*|L(zWT zQ(cFVs@oj(JpgwS;J{s!#|I8UIM`y)D~&;%<9v+xsv2s+JF=(Aoc7x-2yse~lPs6G zrah=3fYcj7m>b0V_uu*{w0653G`9w5Sk;$0q$C5O)gJB+j-d~N5H}KTBs@rXkP88N z0S-68gMeTydFdSxH<@6X86tm0r`hb_`IC_TX&DpOqzmCKm@1I*!&q$_dxu><0V1Ka zc$gXI%Uc;}yQOWbClFjbWzJs6y9sSKs0^-fZl6jm?H%_HKH(L-0R8Avq-h{9AEU{x z7M$Ps?TR6xo0qVzG5t%8DtGEP%t5$~NGpz3JcUFmo^%Z9U^Js7 zkSyQjVc+t4A-^B+uMe(Y=Vi!Mn4tH$A^YRyy>bTs`R0>shOIDAve~-V2*@DDJL8Eg zPt|an#2fh`zp43_)E`79NedT<|8)6(AA_$K0Eg(GKn~_XGdvlNvpyy-0$&J?H<;QR zM$ITjUWCzK^2iw-8`RbN7od(5rF&Lho9~!g#jPzb5G8o~84X47gDWCrZ>b(5NzRfN zsmE#wk>t#jW;)j3+ksdY-@4sxw}4TrEi@& z>Ev_*Sb_eIMM1IIq5ls5YZm}0_g_ZRKYtWe;6FF)KNw1{Z}^AC@J|6eBvAJKF~kD& z2uBTX@kPn#$@|FyMHQ2q&F+&CaIlCDzCu-q(fLyB6^c~B*T+cFG7qC*O}MYzCSMjAoai3Tb~#Ne^v6w<19zRr1|k{%Bfg2X;gFZh7mXw)^B$GuT!{r%L7|9}>lM@w?nR^2P* zeQ)8f2wwp5ow0pc=cW=%f`EsKKsHDD3x2_9r~B!!Qs)V*xY|=!9jK4jKc_J){){yv zqyqIU<}tTA_;;Ex(k=s1CmPO?aII;4x48@DwwY%Odd3fY0?l8TKLSE;6D83vM+^zZ zp=Lp(qylz;`^^aRZN0zJ&`Aa?Y9t03jXt(}A&)dBzuR-^8za>_mw|feYRF>JERodn ze+xt`dcY%H*bmzJ%I?UiW-$Di+HLQ-8?jeOcq*LWo2yR*Zc?Mwd7HwccRtf#fGb>Y8EL=I-!+}A%YRVsZKC~3BR!{iBzZWB1}A7xRG!!0icj2)bQXc37UR{ zgmKJXe5J5i1Y&IQHzC%><6q2qd|gaC%_ml*7KTIdTZX`Snj|`Lw;kS&h>1^GDbfg) zF$kh>L1y$?TOpKFeJ%w?*~e6svmE4R(e2Mh;RZh|q91(mh0H&$1c4c4oFk^;>7rSv zNkX$e1fN(F0PSp^8Bb~OrFBm!v}!AOKky#i5R`R`aVlGmqSa4NA7`jFOEO^%bKfQ^ zdu7AIDwUo=Hwu(WDHY=OiiwI|`NX3ef34L!CrCfl8A?YmiDmA;x`I*RN5Lbz{jgSMoxl zah&odn5uzce~+lWHk^~*rl~F^vVyNxVc@zL@ZD{{_E+L%qY>6QT~`-lI3TRe9E^st zVGrYPr0Z4?`$f>8tTl~nE*nybc2akMr8sae)MoXkg&({y0Tn>@W_QEb4!NEm0ATGu zPYZyO?|5BWvSz!iY;Tbi%x@zXLY4Z1cGJIE+76>L=x1A3_m5E``=nl2EtaXPW90rc zGj~caD*eFEu;ClD+I?>{m=JF(3bI%!Qt*z5fyDdUVo?Ia;QhcyThl_uo+E-MWFgla zs}{$c=Sk-M+;aoH8Dq5$*~wITAPQB?+0GFcvFOqgK@?5l`=mo~BkN@>9T0L5*=s^P z9gIXZ{LP(%UfgrQgd)j_EGm!XyRGMyh$LOzhR z%9t)&;??Tf7xgmUi~O^ZYJZZRgZ=mvp62nB0}kBmhnYvZFX98As5E`!q558CK1?(~ z#b-OHU{}AW%m-W^x>A?Spxo~4qsRJ1&rCGAU{=WJ(udSh+EVN>-DI<;hS-lA~sml(qj-|w6 z9ks`ogR?)2lpMwW0^~-R+)YSv$XG7~sYa;m;D)++cy?)!45?)F`-yX<(Ij=kUD}}b zDo));{yyCAq)b>c$f`pch~9k4Xu^aeFFB3QMWleR9bOjQUnp^urI}8|P7JJVLOJJ5 z>}XQ?(~b3Fw-Nj$@&4#?rdCtA6eV0@{db3;fi)^&s271960n!X#am04HRYM#_!Vjv z7Mw5WK-Whqp(#cI@XIpv=8c^swqaGY?}KWV+{RlB7Xtp<^NOWcrc86IYQV&3&%A~8 z5AX7aKRZr2P)M>1=M^MWZ)CD)ZBB8?8R!*oWKaY&RbO4aFVqoQzNvx7)X8on|1I2O z=3}GgHV6NoS@kP!&l%EkRAI#IUXq@An0hm6Q#m&0;kSqMx9+6~rx*UGI0vDN+;|{NVV2d~@p9fNNE8abt6cue3$nlJ|b3V!YT zi#U~hms(DPm_iBF8rNOg%ueZ)hpn8{5QI&S*C8QF3K zrQ76T9goT%Q6o9_)=;|wN{=xxPV7-0!Q-ihxXfNzC~)4mWMjhl2&@2AlI#$1tANrS zawlnd*O(xBoHR;z`$G%tg~zHrUQSEaNO5;!TjjnWA1AAQ6L^Z_oCSMQ=BKR$4?!v2qGV35V-0iUyy_B^? zoG=1=d6p2sE%Rly6FdQNF@iv(7CO*AwFc;kDx?LS+X@{V@U)5Kv^4enMo(drG)>vh zOkcRUMBV?M{1ry+vQO|RC=d`H_bnzx}l zQ2j6+S{&x5L@PL`bye!{q%hVI`9;6H5(}dUwGId4!X<~%){962%rcZH`NCCUa1^`y zlzG5*hD$sK%HifR$Q~%PMT6^|_%{#JfmIoQO|8dzP#&UjG3CVShZywV z71NE}1!Xf;@vkbS7hoo$VP`vj7FgK%fFo*uDkOyLhwg>lZ2hbss`76JSR&|Zd91J` zg;eNrB67{&s;~3RNkwAZa7H6up(S%)$1%v6x1}qb@oXGna%)ZSOM7W{yY7ps0(OPV z^P*Hnl@2HkR56AnQF0M}ijtOO@QSbmN^WhvuM~}9C(s3~{{=(5@{wW917O&&Q8vx8 z%0ugs`LRsRdza+umr%yuu_x5rCO+^Uwzo{H63#*z`{d6Y?&Le*^#8cftO7F@fLTzg zuBS&t==+eq@d5x$|M$&5b0IhUP3F&D0=@gA_RzFUnMeS*esbjn0HpSBw(+HX!}RN~ ziUlTgz=@f&<>iXqOTL1?pfk?vzG92e+2@U4F{S8SQ^#}v)Uyg2 z@8xMds~6sQbG4qeOCG%W^QoqAb?O{&#gHw}%Bvk4kQ%zkhYtW?5Pmj8oc=48@oyTF z@vkVyKNUQ|e-g5PFev^1GgtiQ0Oh~?(*D8VvHxtZ_y+?@|C^lrQ{nzUlBV8&+I~KO zQ0V^)0fv80G! ztKNSxU?jnRAwUYu|3Zeq|Ak0&y@PzIL9`B)+# zIGC*w@6zcefpzo}AC|XB-SsRVz`$gSu5}5tAkNTRN6d-`Qa3C;X(_M0+^83rub>24 zCX#+DsQBuG`^{eF`@LvV^v2tNKdjED)bCNp%L_DLX%r2`Fs+hz0c;w`2n6FWMvIj2 zyqYF60HkL)^M>gR>QC>>gpoBtckwztINyApr%_n7&2z9-_9?8->=!oycgE) z!H81ivxabr7A2$eYpfj_wUyIq=^Jg*kxj3&OcK)n5h^JMZtkw1Ts|>SqZOH9wv=44 zixBUK1m}EwjTycAj@BAouZ2LFXdxfFwe)HUAyLt+>H&Tb*rf@P+`j()$)l#ap`!@9 zJYGku4X(dT?5B~U#B&2Lm-%3V(03M}j4!F%3ftuff;TWU#n&vCV7B(iyEdq=RL+hW zC;WmN$Q$%u2ktb%)mjB(V}g|K>gUizpAFUuu_tJ;uo$L2dQeZX!ZDkBL3`jTOtUI^}G8; zXtidUh=dKj!*Bhpn(c;1S!;XwG}OY`K}{5J5&)W1r(1R(Z{?uF2L%ed zz9pU<7D((89>(T(ZPnHC%|FZrSy9ElsKc(hFk1#=!kqzve1#6wPt^)zg)3W0cQz+| zLmAa#P`H?)xOK!~P%;F;)qwC}+XcI{i(>j0*52Qf)yHiD$#5Z?b$y3)h79s`tO^48 z_ZWOjZrV;6QSx|#MND1m<4euqR(lrgGP^|z3vzTyw)~xPa^erOT}?1B;#zq^P3rx> z7UM2+MhJ2kS2PBY_eT_DQrC;1^s z1x%KC9Q9IWAlbZ;IkRzfQ>+z`Pi->^>|=wHoqzpV7`2j&?Ux|?? z_Y2P|$;*g=fKzD*u)TSppCCv>$Cy~YT)*B9zd;mSh6^;8oGN2H(W?gJ?ALD*{Y?pI zpdB3_^;wLyq$-=_zr_$zU>=beA>C*el}({>kWmFbvc=MEfY=9-HDMP7!Q6{of6Dol zMa7zlo{v?*;Nm^BfG94wVLm@i@y`2y-;EEXg7#~9CkyC_3+MplIj zM8YukS8h(bHySMsf~7cPI$$UgTs7H_k@-HYcH~h6k&D3W$y4e_5dGq)aiW+1OG=b0 zon}LcCGe2io-p;%NiCGlpdR7WW4~4(SH&yma4-0_cX<*)#n76NHdynbV)rK<_gXl`nko3=AgaDb; zh5GbFXpg_8Hg7CCeedZB%YaFdp{q>Q8(q;s8)M%n_Y@&rA2-w=)Ju))kEcB|#YsCm z9e_fmfD5|td4j>lPU)E7ta}MLajDROjkoTJ_=1{V8O^pHal+2 zyR9%sRd=TCkG=~Q?kd!*mJ7=<&GqRmO^?)9qjJwwpbaIH;x+qWny0|C6^#SQQz!HT zho%>Pr8n2AxPn}1>YskO6YT9iN$4v7DBiFl=IPqZ(uA0WjxO zfJhpZuBTmPPzH(9(x?aF>TdzHfNY7rq+zU4EuG|;4zfKC&a&ZUR_R66j(Kw3xaUgl z^^=yf*6KhF+A|EJE>m%JD?{eKhi3vhr6ttaKlM6QzZJbKh>y|xl&QKYV}c?~QjynV zC}^aA81&E>VBWx!GtO^zCpM^X+4;);rRzx{<`fcL?c3L0LSu3Rd&|zZB~kKB5;J16 zIE)Q=AHv`hhnOOhk7o%{*g>J^Mnm>s?N)V!LlK^`1Y*1sfC2wWEjrD`DHzLqq9;2> zfGxq)$Q?O8(W2I|S0vdIbjm#@y#9T6BN6%mfR?OgRD6B^CuaExq3Y>;68&9zGzG?| zAFO6n>8;RAsvOJfp zz)Yh?;FDmRuuQlZNA+YL50)+= z|9l;9kT-T(ws)ysr>JOZI8E_(=*upuVsLSapb)cMbsvY{s2xtt1`)I>sC&jBe*#Ue z-#Kd|<;5jL_^9h&6`79i!nH%h&wEHr=MiMsJ$u6DPAz81ELeE>zMlBnGdOk#l}E64 zCnh^i%Q7burFSKFtYo#NDpmiJkf}h6Jz6}HQIf}>kid=250D}|IL7qvZvyz4MK?t4 z>=H{$7Tw&eZ@r^Qx|JFl5|X8n+p5|qY}jWiW8lRdLjvr!dUG|MjJpb;zgw{w6w=pkSW9TxNWhrX6=)N}vO=!Lv5KG*U!S3AkEm+L$ z%qm7L_zeq2yp2PoPw>TGbd&~>o1GW{t6y&6Uj+N{H#E^!?`xC~Z9xglg;Za*(T2sy z^yB5QBEq`+0F4)sHLR-GolWYV1nVIF7aOe5$dh6p?;dT6UJfORG-si9UBu{orn_Nl zI9PF;(`+GM>T(1tE`@5S)iAKg>QCYr#9MC(xR48N}8PzjUJPNF7<)T zYD2aJamm(f%Lig#*N*GRhW59~*w8afM+_WnJ+X0L9uMmuLVvh+-6eTP?8K2$jRR~I>2c(} zWJLa?Ex88rFM-bCzWs#lhR0VQouOns$xQD%LA8~?4`D|c^?`@W&~($s?2>u>5Q!5% z9?nB$Q}Gd$K*PUWB=#2zNHM z;{rulXBB&~0A*j?7t*5pm#BfH9t1P8$b(Qi8Xqw#Rpc_wba}pF6EfIyjM9lB#~@6= zg^b6RO@KdVkKB!xWTBQb!hL);@dTE>vLZ0GLd8V90*pGUq`MM<$Ga{bF zELjF>$ra$ZYXd36xw6|};D^B$O<0Hw*62AbT*8O*d_bJ~H%g^VMsFZAl-cHiJxlB5 zoPu*sUC|wU#CN%@@gzASj zxw)sTCPp3F@uGD&rj)djqMspq9uuS`?uB%w^#C@jL@auA<-)^vHkT4|4zsjra~jb# z{>!xc;_o(Ug9E&YBK7KV07-&(iGK5SV>#fg~9B3 z`!#G9juo`1fJ$qZkvy-4G1#$rV47a!+H6iCnU2c~&CBdHfB5+Yqt~5PM*puL5T`yA zjYxD@64<$fD`|=JLht6Bnc%?{?hMgUjl8Ybuyt7UHxJkih5;eQuF=`ONXuTiP%kXd zr?YM^uDYw`Mc`kVXBBPHv`b*vmE8^4?#XAHCyuXzStO zt{$=R96c*)4xOF9|cE5ig>OiCX!$Dd6iE^lJj@9nsqF7H5@HgDr~%o7;s9?$kB06ivM({Dh z5$Q=Ji$x>(aOeFoXE9S0XS+?4j<5#cPII8vTosOKYRZ?pD*qMc{!pPvEtM$ihYz7A zB^KnvQ9W?=NS%^6yB`5GJzPomY2M6(W8ghL(o2;)yM*~AR{IXn(ZQ@47JdtPtN{}H z3ILrWG2NI*b2L05`uUkwAS8V^>o<4l)H^bo-J-?ruT$G{L#3*XAJ;r8Y~AW3de&TR zzukrC_1z)RoLF7{p|23QSc}<>M&InP?O&%sIHU>OtDx_|EEr^MDKf8@K;BBJ(pT{M zk~_*>u|u}J@t6X60RUfGOdg-RdB=Yko}ryo)17{a%b^}1EpnX2)EdEhhj7!Plqu55 z_o!Ng$=)+`3ryK$kcySl_L~%3WTZR#kA_7#21GECF!;*^3C|%^PxbRTx$+2VN4;o& zMu>dr_!%dROQfJNc7JD6MO+YLr&hHBb`Uw#7I^D4K>or_3G5fbc@8n*&&qJ=W`**c zY+$xrCCPdwu4@I@W8diI8!?Qoof$Ep9vxkd5WKV|JLRo#F*Ab3M;gEZZ&gw8DQhB8 z7U^z|{WJKWCseGHnO8q-xj;*-$if`wE`KY<3i61oH0!;^QG&fELM*&8Y(i1~2lt1+ z*j?UBh>#zt;WWl!JDa|U&0D6WZ&{ne3T1~b8lnDv7l1lAHD()6O_`+rH6NR)BEYr-osu7p*(LF z0_b0$U=*j;z_DjFU4Kw}HJ6GvGZEvq zgw2k1dahBhF6Lje3*9F*CgC;V1D2PdQlDeRCAH}i%_usdNGt~EVUdxc#jSLUzi2|` z{#+9q1@uP)IhQjz5-tLzFEe@dg2v8GvY<5mYRKQ)FO>M*H(Sp^i?OEN4m#o3N-5I@ zIBeczl#K&D&+?1&z;@W_VGANayl*I*?~Z@da5q;J=GbYn)x)z_M~Gy2o&8Bx#zJGo<9s&!xLF!x5KFH|p5&S0r(LcL%g-PH1b_6_(KHGj4Ek{^r%82k`Ai08ZuiqlW4sK{BlA0QV}=$JO(0t|Z%Ek+oa9 z<<(}&Xgq{mBs)=Ta*dlSdiZL?8=sAt_>sZ;zAD8LDbAal}MAb5=GJT!|5%N zjYBjmQZM-Yg52C&85aHXyq`%%4JFcpTzS}Xl8ok4s5DyVug2S|A%Eko_yGE}h2Q zObtovB|K;OKnLGh>KqS;%1m7GuVE!m0maIk)Ez$Wxf-cekLU(h?Z;CBp0JbvhTBc3 zYl@ltXj#ssI{Yo#B=%Oh&^$n3>Ymu|{fS3ll19^j0bmo*jausQl4A!QeYJashjX$< zu4EfXX{?z~?#f@UHT&GrG7ybw)-O#>zg@)Hop#~owPzCBNU9+pZbdvX+y*WB6Pwna z(*nWT2B;trUVc$e+1p17p2K?53*2_oc{Y@z=Jq;{`|_ygK)(oQYGP`~LbU9{fmp8Y z;Tq}$ahAPG#X+awF4V8$fl6!gxq}$DyWRA*ih+xZ!zXC@+TQWT`0YduMC`9zW$|+B z5fRb?UM0`&;h1E>HEsm*)y^WXL0DIdq-!Cg+A)TV^q0^gC})PYU7Y$}VufAH4!OJQ zJ`bA9HQ*+lM7Qb54L+6*yHn_Ju_~K>_ND4}8=Y3_XV7gZ7J2IODXwwHHIdb&wfQ(_ z7~T9K711;P7=RWjl2u~0h{$1q&Ul0#LlE?sh=m5o(%h@w6LhX{Z9x$(gp`Y)r8IMS zlY&2*5cKKO&tPVs>@ZWvV~alodkl}vwaQGOAITg?O%SgP}#-l$WaAi&2-^&ANRL1D2z7$ zdrE|ru(qM=Osu#Y=S8~IVh^O0yaU&NT=Pnu0YfF+j*5V0TgE zD^bR0f36BcfO*>Qctlygee%QUi4LBE+(GpVyeQf9!QMSX$CK+pdmMqu^N8x3Hl4yv zX~|rqqXqQeA{bw>RN?6WufQ28+ssv#dG}!9qnh}gz*XiRG@m98@a|4CC^18%i~5!tz0p4F>(*CDD7+$JeV?4ETjA7p8iwog ze!Lg{bm9AJU_ab{xTD;3D1-w(u0hP-7M95mXftUyP6OS=Ve|s`_%7c{wJ`|`Hb;{{ zNk)>n)UQvu#2@b^i` zd$Jm_JE0E~=4FXvyOw-F8}^OKJ_-4Ggip{(_vZA=`nl|5_AMwg3p$@Uu1dSH*Ys>9 z;Q{Y+!2m3)?~H5A;zG7Tu}iteXMX%g(``P?)xMl_(gT_smpRDQ`YlHGe`fSRJ#e#K zUh6IGYK!3+Zppy_zk!lo!UfpE-RjKU!F1W)QC#VGOK_8c6U_0F4H^p5tebS4MNhPP z`~U#Ztlm`(w2xjQeMywkR}jrmGtGM(08KLA0jnkQujxGv+t)wEeah9MtT)!>bq+Rh z@^b1)C|SeTT_o!xE)^>(39siA&V=uZ!p}71;&>9ws(Z^F-lQea@MyBTFHjou6|qiw z74Ono%aXmrW(!Zuwd)A0|B#@tG|ITI!pG;@lvGEPx3QHy?19BG4JvI&3v{#(W+cbF zc$E|OV7SdEkQfb`MJt)Or`wia8vxhADXF$ys9Oqh($M>K%iA&r(b5&m^XLQ_Fx+GG z0Hp#YwfmVK68BfnY$JW{iyD1II{c*=DJRh>P>=lxbamxSK(yQEVnE?LI9(ttw2Y## zXAj69t?K+8A%*p_8~~gGq9%P$`a_yQ#uS@^LcHTTq1M~wZyHy$5U|{?w{Iv^FDqyW zVoG%5zP!qBWNEM=E)_Id1*4_(*%3L<#*JWMvg6k_v6IrrGan`rvORD`IM!H$b9oyO22}OmOb)-SN+yS3%*oM_MjZ7gll!HIuRN_)+`1i@}iNGC|xrpxcdB0IECSxbiLW)_I}sn0-0H|pT6;Z33l z2CWr3TwruP*sdTM-Ps#7pG+{s*MJQ8P854N;q^vL|1^z+(SVheWMbFirtGvE?^M5? zr+B_Ff5sdTdq=>Xmav}pL7+*7z|4pTmuB}M=bD0KBaa>-n8Z@&QNdY4t{u#RyFg78 z0i8maoq%7B=PVurG$VOOm^OviDy)BrP!{m=bTX>cz)m7F2P2F% zFe;Qx!>~5$ynxe!BBM);JXYiOA|rufCggzSZLFyKBKo02rF+ER6E?$KR$}%Wcx;)I)dlD9O>58wSQUQ7F z-Jv|?ohF3Yze!&jI!bRV{v3p7x#Pn^Y+(6nj>N4D5f2IM)?F-mCN(@_U=XVX$-L&K zUs1+!PSSKHpZ?L0^@jTjDFJ8Q(EQ!hk%eA1G%mYnq8?*5jCtd9p$s3(gfm`7Rv(=J zFyzGs>LlOYM27_H+9PpUM{PY4p8OqbnYZk_02w!MM)JB-r2(p4BWxp-pRVcxcliAB8rvo*VtPjG0a-vo>eqNMA@3FwVEV% zG@M)7AzZX9p?ak}tH+R{ry#u`DJjp=$3#d-6Fjow;@?fMgZ%3nwZSZ#N8?(VhhPtT z=WvLpS1G+-$i&wUMYKWX4kZ|@m?uKuRqF)k`v^}p+DuojcQk_%JA82eX{df5-^ry5 zc8?KK1};|qiu;;Sfx02`BfZrrj>(7?wm!Qt8J=F>0!EtouE^2s`;y<5YcR9R$PgnB znjb5^kxQVQn#S7k93f{Rne334u(TcE{oHEGbwf_Kt-aQ^u#c}mAv*21! zhv>`{k=rqJ|BWojsPdDhNmD?EY|HktbXNg)qi~LPg@y%h3wBqYnBHnr;|^@>PO49| zxR<>a>)`}dSzWesQgXm?Fhh7e5vu9MqN~Sov zcQuL^uC$GvH#MKlPB%;rY9_Qb#}JVa?K6D0_fckLd{tX(r&>5x#Vu%c$sB~A26njQ^R`8n|mq)ux;yJX8dIZd&r)~M&VO)-CLfFRk47P53P|~kxOZP~%E9WE8UY4~KsFn#M5THtdqV06LvHpGu`p~(*<#y~o;gr* z6cDw0)k>_+^4T&HMA@e+rgqRLq`zF6o$t-Lr$`|3Fux)s&fdzNop171*f`_W!m&1R z+JJDxH|&{@(^Sqlv7c-Q^q|NBe|X`vNMUZ=G7>dZZ;`O61qD|q$AxV-b{4+n@UDW& zV4nn!Cy`1t3BnBTlW4w>c1C8$BeB5#iwh7oU6wfcCj z)^Li{o|{W9i)ZaG@=c~(317a~eI`~2L|8a72+F!ANL%XzZ#YN6u?N-7s?Y4z(A#M5>=a(j& zl#ut7P4#!S3tSRlWgmtg#EgrORINu{&(V)mI)tq8zYJzWNen+Et+!o_sys7GMu|Wp z-Xl!HNFjNA(Dc8MTH^<016j>uZ|vdhG#`@^c7Lk zq3l&>qw*$_Zl--XIOm$*&FJ@+2ID$YS>Iof7Q|lLR#B<1@i|Ez%Gog9!tCA}2%za} zac=zlhS#wC_(LyMwTX@gB)|o-ewM=y5@#8u-&O#+&pdPk;KN5^a2S{eFKl3K1H9Tx zfT=fDvK|NZ2xrlfjw(_L-SbuIyN-oyt~YjmuSbQL2-9&1`Qo=4l|q8rnaJmD)Q9$v zB^twb_ItAC3mjsI6Eggno?%T=1B^|v+w5xCiLa$6DZxVOQTC@k=xQ?dA(XI$hnk0L zy4uoXp~oFAhf~(mHBh?#HI7Vc6Sdp}GAN#=|4Y_2@5tv>H}nZ=>6hdc0MoBPR&{JH@8c9fvbX?eh3zdPNh z=m-iY_hkb+y>cX%=Jrl0-Z1&7wE>fi87}8dJ-_&Tk64nann=Gka1+A3KMr4VUS4qS2)Horp%7`@NK;h!9FbR&G)pPaI!66^nqgg?` znivLGCBkB}lbiH>hX~i1ZotQvPF60KTa9b{`1RdoXZ~lzSv$AWA0Jjy8JOr&zp-{Y zsxOpqphQ#<;LA@2;fGotXm&X<0gL8H+nitSO)y6rg48@;yn6{R6#EK0dMvAMxMXU` zY7bg!cQay#Kdvp%gI6z-4zP{VSAzAXHoP+~l#M4CrO19L_U}mkSf8HwoZCvrSYaXh z@fF1iki1ZreTa%kUN8`;6V9V)3d&vksx&B!v+;qJQ&4OZ3j)64)Dg0C$y|ETbtcyr z0=SqzS_Y|4owJ`52$CY6%W7DuZt*HAU;wT%)WT@VYB@-Rn45fpgWpQz9@_rtMG`Df z{eXYEQ>W2Z%BAk+AC%TkA6;w+X*-M<6Uoyzx#pHqW`+}kTsiV!u*!BnmQ;4^(c{Tq zZobuwZ(mFVrk>R{n{Ou0CmFav$4{B>)j2*$t(t{VSL|@T{q`XyOR*82B$NealC?jjJ@(h z_%yr70E1r7khP4CHTtBpM;|yLns&$S>T8fuIv7JeA{I&ApO8}*uMUJ7IAn{!iq&*w zT$2CxQHxnv$kvFG;36R9yP3}SM9#PLzyrO)=`S7Nhgw^W30kIE&nb2Hib__xkP1=X zZz3nDB&w#)lkF(W144L0zN+!2RhojbE%7{wH(@l#8qO7>ar(9sRQ8uC@dC*Kt5DF9 zuLC(MaF;~yypKdP@2^4eH4s~|xJIkiza}p1wvN{MeLn}*-23n_eiJb$im*;qvt3Q2 z`z3tb^mR<2GwZknWl=~)JW2-wYtdTnHwO%laG4;RCoAUM$bu~fPa{pG$|S#X#a9w9 zKd(H|q0{&V(Zwm*hiEi#d}js%cK+Ae(oTChJoanHiWda(nlb4)3ezSkdzeq;J2cPP2jB^diCX9o zc21K5p;7f9uv&nj7UXpsiGc~j54#}Nwp`_t5SL%@*zvnTeRbyJ*ZPIIJhwn3t}Q#W z2Qxe4a+Xl@#aH{8seR?Orng`J&-~8AGNr8t3*)u2h&Kv+_j+&>d7TLA;Ph%7Z|<>p zlxBsdTFuFZwf+4_oIvgxnb)o898@pQwUdKX4wAq-*tM72TBKJa4at??za zuB-<2KzlwT)Zjsk&ahQwU$-<;5YVkF6H!pq4UL|K9w@rY5I<;kPF}kY$O7KHG23PpG{?95NhsX zN`i)Bqu~OAubVS=^vh4a#F;L!Ii$H$hsNUN4D1i%ZB!pzcYg&5+93(r1BiNsn)*7w|)#LMPskaZL1kqPn#JS zem1lV9qs9;$X#*bie6p#aFV|F1fnJ;Qtsu%z7QSe%Qle%V0+Elm#JbUOau!&(W48j z$&L@_y^f%yy+{s_%Sx*|s`tjl=ANCqlo0$z1EG{xkAa4LKJK6gWR=Jbq%tV{r+vI| zUVFMQ*-Nj8LheD&7B|H{1tj`Cw+HxHm?R%5geoF=4Y+yF47g{C<8zgTFc#CG7>+!E z1Gf9B-9<4+@IGNeffcM}MIj*Gi#+9Fyxl26;L7fagO z(zqozF?yJbhE<&s_I&sl8Y9N8TJyWLYPXm=Vx3~wH1)ouK*})|rVjSN=QwvZV%qPP z3ZYoJn2*SO&p!pUD18xlY2P?yH7+T}QmeQPa|jutf&mqwog6gLJ2NER_Txhqo2?v^ z=3{+bf`-T_9e|{t4sY)nSH2A~>#1H5+H*P6zwn!RqbdM0TOsh;K9>R>KOvR7skg_E zH7YPbq)zi?V(X|M8wOR;2i_)g?bFT45*%Y>Bw17gkn{GVVg9k@9Rc>fqu1~_zT}>8 z_+-i_T1(bK^YK&*ZNoL!4?z-$Jp&p9dsQ_ml4Ao-`e#Z}?-9|MX)gWhxLx58e)9#I znu2`TBzMZ>timr4S+no?Y~vs=Y@CR`kkYb_BmBD5oykZ(+m=ne=^@5=&(y#*H6LDHgk6wWod|h0GY*$I38SLHY-Q zBT}4zLpYwAr*)^`*Sb;l73&A@?1=KHLi(9orj~X3)WfOe{lKU^#be`}b>I5W%1`PB z8=Vpj;9jj3B^d}0_DhG9*Et@7?=rvNd7AcupJ0bv>*5Ij$)>a7nvNwfH@DVS(p=%@&T`syyp?MT%;f`bs7O1+tUlcrRRo;S0g)rg}u z9poFU``No2V|2&msQh7uP2T*8`7q9pIS7pur+j}RJUeH)icAccGKc|7jwl|B6U`Z) zqDs=$9m24)Q5Kgoq&i2OHC2mx+SlYJg?rLN%!^*x<5qlGS6beV=e-v~De=LEA!2BB z!nEWAVDKylB^Gekn9?7P*XyIxAnU+MaY5mUP+BQbT3bG9guIl#hh7^H?VI}2T7WXB zJN}Sh-Wd{fsUlqf3JXOpWqBCKj>2k3u5&Wj|GKk3g?2Jsd7nKhuW)Fzh_{SiCh-@U`jmqI$F*PGb_;gdAu9$Tmg$UbCahFjP{dPP-K(x z3xVv>F7?hA)89_DsMQCr`}L?Uu4)2r^=S;T`onTb(6QFz_mITrQC*RxFw2R$ldS13QYCq#|ok?{8I$}J!7HPKm zcJvnClf)DiXX*gb;Kxw5Mm3p>K;3{VxQ#+N6%C#Hp5AC>xSY*9fOpT>?oV>*!9zwb zx}Ld4-PY=azdxyKP951jzT(VqHb^7l}hb7m=2L42T`oQ zi+;Q}k1zQg^^2i}{AFMz;feLiW2rFZ20I!i1aF^^ReBW^XS~E%oiyiL8IP$H)HS8k zIJd0Fo!P{vTVDpRikcW~MU@D8Fqxh8JIi7dlJJisP?#^9kHPPEOJM7}-)?D%4_V?u zpYH|-zEl2T!BrZxiur;4Vo<+ONA^YET&GYO3B1hOu5rWBnUwz`kd8PyyXOzJ(cIn~ z1{5lg@vshl%3-asYh*}6u}X|`7wN|?yTEJTKQ}ycE|58Fw{f<&Ytt2i&ZV5@hLmAM zz%)+9I=;65aDGg5iSqe!^Kl+6z;6;=ux7Ydd(p-|W!pXEJy#%HFTN!+y`AnOw|W9g)=QkX4aq< zT96RRg2UGo>V1ZXZCl*ne7ZKl5t-d5Ldcjy6dDJfewTwhAou3+kRx&Sa5A;s_#u_i zI6?z6AMwn+aI`oXO zK5TGVcocp=fPWdwAqV~VsQl2qnsqbF{6;>FL*uHe#i~wn?^L`3X8V*>qRLD`iHfgp znI$>NQ)n(PcE`cf2zspl@dnObTM6wIn?(%!8X3QNdq4jQQ7-Wnd?Znu<7l38up+^9`TEnf@AY8qmW} zy;WkF$UR`^={yl>pF(7Vq`{H@`;!INuoYZ{J?icuFs`G8L8B#R6vP521}Gk<6hbc# zvLT~qW6tSV*pq<>KdNEOLe-U|cD1Pb3z7+zVZG8emGBXp!9~ZGj48T$H_vR>E<^Pz zmxaS}Oi5Za?jw)>?4tws&2tx~QHVFdjFDzwpk%Meu-f3Ft+kEKdJ(!1Iv>NzAC_ll zE86&3eGMjEKBb(P`eGMaERDuOcGy8NMrsv5wt|#pfJ(Q+KS+{3VJ2)P8il`Q;-%Aw zbn_z(P8I*dS37q`&HcX)(pUa>J)Q1k46%Ao>n_)3xJNLoOW6Ka>Lk7#NU`k*4U;Dn z^>s88itC>oIU=m!Sy_T?FK9H=jU)UOE$44xa0DH}UHJVF5CkL#UFfrDJ~O0nA70Ih zvuVWhp_GB2q(AMcuW??Bb%8zy=0SSDmYxQto(DD{kuUP+=4*ZKLs#X z6cYSZuzw_FAMjhhMH?b@S3zW4=M=s7;qZ_|t* z6U8!wDdzzZGSWH4bOcts}hcQWoyf58N zSD!7bY%p!kO&-_7YQaI~PD$2P5Kk{22%mRVptDwA)L~s!mIE;Te^dYEu?kML!XT9p zD8n3b(YC}?{e(y}g)kH;lB0wmP*%j71b1yyMC0B}gF*V@z)5+Y9=a__GF2X$H$R&z z8}isZo6@O=8HEPq&c^Um5O*O*-Cqz_KKPAoX&hJ$O_KCQH&aP$nKnNlx{0MV?;62CFPl9bx1|+X0$KhaP2L2ADfp@?o`%?@c$ z6a4R8$i_SA@*A3%Z3o&=S2rsF77pN=gv)Zv-9! z29f{*_Kkyl>%x$PfAi9iv=GpL%|k&zMA$&U{8LByjs9tgZ~YJE9~3${90Klb^ygl{ zs}Sm6+Gv-B(Es8Q@7`n(Vj2>1a&J__+!X+DbhCDH*HKa>1;1Gm^y2q&aCQK=o057t z*gLxMdkK-7S~!^j_}}_`IK%w27q-EEv4N&nb2HFNTC7a}MB Date: Sun, 21 Dec 2025 06:04:07 +0000 Subject: [PATCH 02/31] chore(release): 7.0.0-dev.1 [skip ci] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1f5b859a..de59ba72 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@kaitranntt/ccs", - "version": "7.0.0", + "version": "7.0.0-dev.1", "description": "Claude Code Switch - Instant profile switching between Claude Sonnet 4.5 and GLM 4.6", "keywords": [ "cli", From b790005c85e9f25fd14a14ac01b79e7562f1a1ea Mon Sep 17 00:00:00 2001 From: kaitranntt Date: Sun, 21 Dec 2025 01:04:35 -0500 Subject: [PATCH 03/31] fix(ui): add unsaved changes confirmation when switching profiles - Add onHasChangesUpdate callback to ProfileEditor - Track editor dirty state in ApiPage parent - Show confirmation dialog before discarding unsaved changes - Handle edge case for 'New' profile button Closes #163 --- ui/src/components/profiles/editor/index.tsx | 9 +++-- ui/src/components/profiles/editor/types.ts | 1 + ui/src/pages/api.tsx | 37 ++++++++++++++++++--- 3 files changed, 41 insertions(+), 6 deletions(-) diff --git a/ui/src/components/profiles/editor/index.tsx b/ui/src/components/profiles/editor/index.tsx index 01fc8b5b..da5f98c2 100644 --- a/ui/src/components/profiles/editor/index.tsx +++ b/ui/src/components/profiles/editor/index.tsx @@ -4,7 +4,7 @@ */ /* eslint-disable react-refresh/only-export-components */ -import { useState, useMemo, useCallback } from 'react'; +import { useState, useMemo, useCallback, useEffect } from 'react'; import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query'; import { Button } from '@/components/ui/button'; import { ConfirmDialog } from '@/components/shared/confirm-dialog'; @@ -16,7 +16,7 @@ import { FriendlyUISection } from './friendly-ui-section'; import { RawEditorSection } from './raw-editor-section'; import type { ProfileEditorProps, Settings, SettingsResponse } from './types'; -export function ProfileEditor({ profileName, onDelete }: ProfileEditorProps) { +export function ProfileEditor({ profileName, onDelete, onHasChangesUpdate }: ProfileEditorProps) { const [localEdits, setLocalEdits] = useState>({}); const [conflictDialog, setConflictDialog] = useState(false); const [rawJsonEdits, setRawJsonEdits] = useState(null); @@ -100,6 +100,11 @@ export function ProfileEditor({ profileName, onDelete }: ProfileEditorProps) { return Object.keys(localEdits).length > 0; }, [rawJsonEdits, localEdits, settings]); + // Notify parent of hasChanges state + useEffect(() => { + onHasChangesUpdate?.(computedHasChanges); + }, [computedHasChanges, onHasChangesUpdate]); + // Save mutation const saveMutation = useMutation({ mutationFn: async () => { diff --git a/ui/src/components/profiles/editor/types.ts b/ui/src/components/profiles/editor/types.ts index d7e36a13..950ae645 100644 --- a/ui/src/components/profiles/editor/types.ts +++ b/ui/src/components/profiles/editor/types.ts @@ -16,4 +16,5 @@ export interface SettingsResponse { export interface ProfileEditorProps { profileName: string; onDelete?: () => void; + onHasChangesUpdate?: (hasChanges: boolean) => void; } diff --git a/ui/src/pages/api.tsx b/ui/src/pages/api.tsx index 53671c79..dce6f8c7 100644 --- a/ui/src/pages/api.tsx +++ b/ui/src/pages/api.tsx @@ -37,6 +37,8 @@ export function ApiPage() { const [isCreateDialogOpen, setCreateDialogOpen] = useState(false); const [createMode, setCreateMode] = useState<'normal' | 'openrouter'>('normal'); const [deleteConfirm, setDeleteConfirm] = useState(null); + const [editorHasChanges, setEditorHasChanges] = useState(false); + const [pendingSwitch, setPendingSwitch] = useState(null); // Prefetch OpenRouter models when page loads (lazy - won't block render) useOpenRouterModels(); @@ -71,7 +73,21 @@ export function ApiPage() { // Handle create success const handleCreateSuccess = (name: string) => { setCreateDialogOpen(false); - setSelectedProfile(name); + // Use the same unsaved changes check as profile selection + if (editorHasChanges && selectedProfile !== null) { + setPendingSwitch(name); + } else { + setSelectedProfile(name); + } + }; + + // Handle profile selection with unsaved changes check + const handleProfileSelect = (name: string) => { + if (editorHasChanges && selectedProfile !== name) { + setPendingSwitch(name); + } else { + setSelectedProfile(name); + } }; return ( @@ -168,9 +184,7 @@ export function ApiPage() { key={profile.name} profile={profile} isSelected={selectedProfile === profile.name} - onSelect={() => { - setSelectedProfile(profile.name); - }} + onSelect={() => handleProfileSelect(profile.name)} onDelete={() => setDeleteConfirm(profile.name)} /> ))} @@ -208,6 +222,7 @@ export function ApiPage() { setDeleteConfirm(selectedProfileData.name)} + onHasChangesUpdate={setEditorHasChanges} /> ) : ( deleteConfirm && handleDelete(deleteConfirm)} onCancel={() => setDeleteConfirm(null)} /> + + {/* Unsaved Changes Confirmation */} + { + setSelectedProfile(pendingSwitch); + setPendingSwitch(null); + }} + onCancel={() => setPendingSwitch(null)} + /> ); } From 1129ec6ef570e7b922d2831c53bad83a68311b88 Mon Sep 17 00:00:00 2001 From: kaitranntt Date: Sun, 21 Dec 2025 01:14:49 -0500 Subject: [PATCH 04/31] fix(ci): use commit-based changelog for dev release Discord notifications - dev-release.sh: save release notes to .dev-release-info.json - send-discord-release.cjs: read from generated file for dev releases - add .dev-release-info.json to .gitignore --- .gitignore | 5 +++- scripts/dev-release.sh | 10 ++++++++ scripts/send-discord-release.cjs | 39 ++++++++++++++++++++++++++++++-- 3 files changed, 51 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 67400651..5101f145 100644 --- a/.gitignore +++ b/.gitignore @@ -35,4 +35,7 @@ package-lock.json .claude/active-plan # Logs directory -logs/ \ No newline at end of file +logs/ + +# CI-generated files +.dev-release-info.json \ No newline at end of file diff --git a/scripts/dev-release.sh b/scripts/dev-release.sh index 90b5334b..1fb74bc3 100755 --- a/scripts/dev-release.sh +++ b/scripts/dev-release.sh @@ -106,6 +106,16 @@ gh release create "v${VERSION}" \ log_info "Created GitHub prerelease" +# Save release info for Discord notification +# This file is read by send-discord-release.cjs for dev releases +cat > .dev-release-info.json << EOF +{ + "version": "${VERSION}", + "notes": $(echo "$NOTES" | jq -Rs .) +} +EOF +log_info "Saved release info for Discord notification" + # Output for GitHub Actions echo "version=${VERSION}" >> "${GITHUB_OUTPUT:-/dev/null}" echo "released=true" >> "${GITHUB_OUTPUT:-/dev/null}" diff --git a/scripts/send-discord-release.cjs b/scripts/send-discord-release.cjs index b22da048..c1e2c970 100644 --- a/scripts/send-discord-release.cjs +++ b/scripts/send-discord-release.cjs @@ -34,7 +34,7 @@ try { } /** - * Extract latest release from CHANGELOG.md + * Extract latest release from CHANGELOG.md (for production releases) */ function extractLatestRelease() { const changelogPath = 'CHANGELOG.md'; @@ -92,6 +92,40 @@ function extractLatestRelease() { return { version, date, sections }; } +/** + * Extract dev release info from .dev-release-info.json (for dev releases) + * Falls back to CHANGELOG.md if file not found + */ +function extractDevRelease() { + const devInfoPath = '.dev-release-info.json'; + + if (!fs.existsSync(devInfoPath)) { + console.log('[!] .dev-release-info.json not found, falling back to CHANGELOG.md'); + return extractLatestRelease(); + } + + try { + const content = fs.readFileSync(devInfoPath, 'utf8'); + const info = JSON.parse(content); + + // Parse commit messages into a simple Changes section + const changes = info.notes + .split('\n') + .filter((line) => line.trim().startsWith('-')) + .map((line) => line.trim().substring(1).trim()) + .filter((item) => item); + + return { + version: info.version, + date: new Date().toISOString().split('T')[0], + sections: changes.length > 0 ? { Changes: changes } : {}, + }; + } catch (error) { + console.error('[!] Error reading .dev-release-info.json:', error.message); + return extractLatestRelease(); + } +} + /** * Create Discord embed */ @@ -203,7 +237,8 @@ function sendToDiscord(embed) { // Main try { - const release = extractLatestRelease(); + const isDev = releaseType === 'dev'; + const release = isDev ? extractDevRelease() : extractLatestRelease(); console.log(`[i] Preparing ${releaseType} notification for v${release.version}`); const embed = createEmbed(release); From 6d49c0068ba6123f4cd9edc1a607023e4dc1c064 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sun, 21 Dec 2025 06:16:02 +0000 Subject: [PATCH 05/31] chore(release): 7.0.0-dev.2 [skip ci] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index de59ba72..c7262ce4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@kaitranntt/ccs", - "version": "7.0.0-dev.1", + "version": "7.0.0-dev.2", "description": "Claude Code Switch - Instant profile switching between Claude Sonnet 4.5 and GLM 4.6", "keywords": [ "cli", From 86d992fce623a8378d5f53b1aff7b53d2f80e3c4 Mon Sep 17 00:00:00 2001 From: kaitranntt Date: Sun, 21 Dec 2025 01:20:57 -0500 Subject: [PATCH 06/31] fix(ui): fix profile switching and improve UX - Add key prop to ProfileEditor to force remount on profile change - Reset editorHasChanges on discard confirmation - Add text-white to destructive dialog button - Change OpenRouter default model to claude-opus-4.5 --- src/api/services/provider-presets.ts | 2 +- ui/src/components/shared/confirm-dialog.tsx | 2 +- ui/src/lib/provider-presets.ts | 2 +- ui/src/pages/api.tsx | 2 ++ 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/api/services/provider-presets.ts b/src/api/services/provider-presets.ts index d4d1d1a0..8688cf12 100644 --- a/src/api/services/provider-presets.ts +++ b/src/api/services/provider-presets.ts @@ -38,7 +38,7 @@ export const PROVIDER_PRESETS: ProviderPreset[] = [ description: '349+ models from OpenAI, Anthropic, Google, Meta', baseUrl: OPENROUTER_BASE_URL, defaultProfileName: 'openrouter', - defaultModel: 'anthropic/claude-sonnet-4', + defaultModel: 'anthropic/claude-opus-4.5', apiKeyPlaceholder: 'sk-or-...', apiKeyHint: 'Get your API key at openrouter.ai/keys', category: 'recommended', diff --git a/ui/src/components/shared/confirm-dialog.tsx b/ui/src/components/shared/confirm-dialog.tsx index 43d7f940..c680a278 100644 --- a/ui/src/components/shared/confirm-dialog.tsx +++ b/ui/src/components/shared/confirm-dialog.tsx @@ -39,7 +39,7 @@ export function ConfirmDialog({ Cancel {confirmText} diff --git a/ui/src/lib/provider-presets.ts b/ui/src/lib/provider-presets.ts index 6761640c..c91a0ffd 100644 --- a/ui/src/lib/provider-presets.ts +++ b/ui/src/lib/provider-presets.ts @@ -34,7 +34,7 @@ export const PROVIDER_PRESETS: ProviderPreset[] = [ badge: '349+ models', featured: true, icon: '/icons/openrouter.svg', - defaultModel: 'anthropic/claude-sonnet-4', + defaultModel: 'anthropic/claude-opus-4.5', requiresApiKey: true, apiKeyPlaceholder: 'sk-or-...', apiKeyHint: 'Get your API key at openrouter.ai/keys', diff --git a/ui/src/pages/api.tsx b/ui/src/pages/api.tsx index dce6f8c7..0152d04a 100644 --- a/ui/src/pages/api.tsx +++ b/ui/src/pages/api.tsx @@ -220,6 +220,7 @@ export function ApiPage() {

{selectedProfileData ? ( setDeleteConfirm(selectedProfileData.name)} onHasChangesUpdate={setEditorHasChanges} @@ -266,6 +267,7 @@ export function ApiPage() { confirmText="Discard & Switch" variant="destructive" onConfirm={() => { + setEditorHasChanges(false); setSelectedProfile(pendingSwitch); setPendingSwitch(null); }} From 69d431682164fc3ca3aecc5ca71952e7f0b49420 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sun, 21 Dec 2025 06:36:31 +0000 Subject: [PATCH 07/31] chore(release): 7.0.0-dev.3 [skip ci] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c7262ce4..0526804e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@kaitranntt/ccs", - "version": "7.0.0-dev.2", + "version": "7.0.0-dev.3", "description": "Claude Code Switch - Instant profile switching between Claude Sonnet 4.5 and GLM 4.6", "keywords": [ "cli", From eaf566beac65284d0809ca8a29f6ce2d03b79af8 Mon Sep 17 00:00:00 2001 From: kaitranntt Date: Sun, 21 Dec 2025 01:47:18 -0500 Subject: [PATCH 08/31] feat(ui): add visual feedback for WebSearch model auto-save - Add 'Saved' indicator with checkmark for Gemini/OpenCode model inputs - Show indicator for 2 seconds after successful save on blur - Uses fade-in animation for smooth UX Closes #164 --- ui/src/pages/settings.tsx | 35 +++++++++++++++++++++++++++++++---- 1 file changed, 31 insertions(+), 4 deletions(-) diff --git a/ui/src/pages/settings.tsx b/ui/src/pages/settings.tsx index 32201e42..3d19327f 100644 --- a/ui/src/pages/settings.tsx +++ b/ui/src/pages/settings.tsx @@ -107,6 +107,9 @@ export function SettingsPage() { const [showGeminiHint, setShowGeminiHint] = useState(false); const [showOpencodeHint, setShowOpencodeHint] = useState(false); const [showGrokHint, setShowGrokHint] = useState(false); + // Model save indicators (brief visual feedback) + const [geminiModelSaved, setGeminiModelSaved] = useState(false); + const [opencodeModelSaved, setOpencodeModelSaved] = useState(false); // Global Env state const [globalEnvConfig, setGlobalEnvConfig] = useState(null); const [globalEnvLoading, setGlobalEnvLoading] = useState(true); @@ -332,11 +335,11 @@ export function SettingsPage() { }; // Save Gemini model on blur (only if changed) - const saveGeminiModel = () => { + const saveGeminiModel = async () => { const currentModel = config?.providers?.gemini?.model ?? 'gemini-2.5-flash'; if (geminiModelInput !== currentModel) { const providers = config?.providers || {}; - saveConfig({ + await saveConfig({ providers: { ...providers, gemini: { @@ -345,15 +348,18 @@ export function SettingsPage() { }, }, }); + // Show saved indicator briefly + setGeminiModelSaved(true); + setTimeout(() => setGeminiModelSaved(false), 2000); } }; // Save OpenCode model on blur (only if changed) - const saveOpencodeModel = () => { + const saveOpencodeModel = async () => { const currentModel = config?.providers?.opencode?.model ?? 'opencode/grok-code'; if (opencodeModelInput !== currentModel) { const providers = config?.providers || {}; - saveConfig({ + await saveConfig({ providers: { ...providers, opencode: { @@ -362,6 +368,9 @@ export function SettingsPage() { }, }, }); + // Show saved indicator briefly + setOpencodeModelSaved(true); + setTimeout(() => setOpencodeModelSaved(false), 2000); } }; @@ -551,6 +560,8 @@ export function SettingsPage() { isOpenCodeEnabled={isOpenCodeEnabled} geminiModelInput={geminiModelInput} opencodeModelInput={opencodeModelInput} + geminiModelSaved={geminiModelSaved} + opencodeModelSaved={opencodeModelSaved} showGeminiHint={showGeminiHint} showOpencodeHint={showOpencodeHint} showGrokHint={showGrokHint} @@ -703,6 +714,8 @@ interface WebSearchContentProps { isOpenCodeEnabled: boolean; geminiModelInput: string; opencodeModelInput: string; + geminiModelSaved: boolean; + opencodeModelSaved: boolean; showGeminiHint: boolean; showOpencodeHint: boolean; showGrokHint: boolean; @@ -733,6 +746,8 @@ function WebSearchContent({ isOpenCodeEnabled, geminiModelInput, opencodeModelInput, + geminiModelSaved, + opencodeModelSaved, showGeminiHint, showOpencodeHint, showGrokHint, @@ -857,6 +872,12 @@ function WebSearchContent({ className="h-8 text-sm font-mono" disabled={saving} /> + {geminiModelSaved && ( + + + Saved + + )}
)} @@ -948,6 +969,12 @@ function WebSearchContent({ className="h-8 text-sm font-mono" disabled={saving} /> + {opencodeModelSaved && ( + + + Saved + + )} )} From 8d4afc59adac5bfaec61e524c446d652ee72eebb Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sun, 21 Dec 2025 06:52:44 +0000 Subject: [PATCH 09/31] chore(release): 7.0.0-dev.4 [skip ci] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0526804e..8b9e2926 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@kaitranntt/ccs", - "version": "7.0.0-dev.3", + "version": "7.0.0-dev.4", "description": "Claude Code Switch - Instant profile switching between Claude Sonnet 4.5 and GLM 4.6", "keywords": [ "cli", From 53a7ba8d3ffe81f87306e84357fce4f6ec9d7135 Mon Sep 17 00:00:00 2001 From: kaitranntt Date: Sun, 21 Dec 2025 01:59:10 -0500 Subject: [PATCH 10/31] docs(standards): add input state persistence patterns - Pattern 1: Key-based remounting - Pattern 2: Unsaved changes confirmation - Pattern 3: Auto-save with visual feedback Closes #165 --- docs/code-standards.md | 88 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 87 insertions(+), 1 deletion(-) diff --git a/docs/code-standards.md b/docs/code-standards.md index 14059628..66a0bb51 100644 --- a/docs/code-standards.md +++ b/docs/code-standards.md @@ -1,6 +1,6 @@ # CCS Code Standards -Last Updated: 2025-12-19 +Last Updated: 2025-12-21 Code standards, modularization patterns, and conventions for the CCS codebase. @@ -377,6 +377,92 @@ export function ComponentName({ id, onSave }: Props) { --- +## Input State Persistence Patterns + +When building forms and editors that allow users to make changes, follow these patterns to prevent data loss. + +### Pattern 1: Key-Based Remounting + +**Use when**: Component has complex local state that should reset on prop changes. + +```typescript +// Parent component + +``` + +**Why**: Without `key`, React reuses the component instance. Local `useState` values persist even when props change, causing stale data bugs. + +### Pattern 2: Unsaved Changes Confirmation + +**Use when**: User might navigate away while editing. + +```typescript +// Parent tracks dirty state +const [editorHasChanges, setEditorHasChanges] = useState(false); +const [pendingSwitch, setPendingSwitch] = useState(null); + +// Child notifies parent of dirty state +useEffect(() => { + onHasChangesUpdate?.(computedHasChanges); +}, [computedHasChanges, onHasChangesUpdate]); + +// Intercept navigation +const handleSelect = (id: string) => { + if (editorHasChanges && currentId !== id) { + setPendingSwitch(id); // Show confirmation dialog + } else { + setCurrentId(id); + } +}; +``` + +**Flow**: +1. Child computes `hasChanges` from local state vs saved data +2. Child notifies parent via callback +3. Parent intercepts navigation when dirty +4. Show confirmation dialog: "Discard & Switch" or "Cancel" +5. On confirm: reset dirty state, then switch + +### Pattern 3: Auto-Save with Visual Feedback + +**Use when**: Simple inputs that should save immediately. + +```typescript +const [saved, setSaved] = useState(false); + +const handleBlur = async () => { + if (value !== savedValue) { + await saveToBackend(value); + setSaved(true); + setTimeout(() => setSaved(false), 2000); + } +}; + +return ( +
+ + {saved && ( + + Saved + + )} +
+); +``` + +**When to use which**: +| Scenario | Pattern | +|----------|---------| +| Complex multi-field editor | Pattern 2 (confirmation dialog) | +| Simple single input | Pattern 3 (auto-save + feedback) | +| List item selection | Pattern 1 (key-based remount) + Pattern 2 | + +--- + ## Quality Gates ### Pre-Commit Sequence From 87b9f81aabf7fa253f1ae7b81aeb842e0e088594 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sun, 21 Dec 2025 07:00:15 +0000 Subject: [PATCH 11/31] chore(release): 7.0.0-dev.5 [skip ci] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8b9e2926..990e7068 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@kaitranntt/ccs", - "version": "7.0.0-dev.4", + "version": "7.0.0-dev.5", "description": "Claude Code Switch - Instant profile switching between Claude Sonnet 4.5 and GLM 4.6", "keywords": [ "cli", From e8cb273ecb916614bfdc0ad95445e327c9972830 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Sun, 21 Dec 2025 07:11:07 +0000 Subject: [PATCH 12/31] chore(release): 7.1.0 [skip ci] ## [7.1.0](https://github.com/kaitranntt/ccs/compare/v7.0.0...v7.1.0) (2025-12-21) ### Features * **ui:** add visual feedback for WebSearch model auto-save ([eaf566b](https://github.com/kaitranntt/ccs/commit/eaf566beac65284d0809ca8a29f6ce2d03b79af8)), closes [#164](https://github.com/kaitranntt/ccs/issues/164) ### Bug Fixes * **ci:** use commit-based changelog for dev release Discord notifications ([1129ec6](https://github.com/kaitranntt/ccs/commit/1129ec6ef570e7b922d2831c53bad83a68311b88)) * **ui:** add unsaved changes confirmation when switching profiles ([b790005](https://github.com/kaitranntt/ccs/commit/b790005c85e9f25fd14a14ac01b79e7562f1a1ea)), closes [#163](https://github.com/kaitranntt/ccs/issues/163) * **ui:** fix profile switching and improve UX ([86d992f](https://github.com/kaitranntt/ccs/commit/86d992fce623a8378d5f53b1aff7b53d2f80e3c4)) ### Documentation * **readme:** add OpenRouter to built-in providers ([676929f](https://github.com/kaitranntt/ccs/commit/676929fc87c4cc450e3dc6e3f05ff60dfcead255)) * **standards:** add input state persistence patterns ([53a7ba8](https://github.com/kaitranntt/ccs/commit/53a7ba8d3ffe81f87306e84357fce4f6ec9d7135)), closes [#165](https://github.com/kaitranntt/ccs/issues/165) --- CHANGELOG.md | 17 +++++++++++++++++ package.json | 2 +- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7a266fdb..bda1e640 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,20 @@ +## [7.1.0](https://github.com/kaitranntt/ccs/compare/v7.0.0...v7.1.0) (2025-12-21) + +### Features + +* **ui:** add visual feedback for WebSearch model auto-save ([eaf566b](https://github.com/kaitranntt/ccs/commit/eaf566beac65284d0809ca8a29f6ce2d03b79af8)), closes [#164](https://github.com/kaitranntt/ccs/issues/164) + +### Bug Fixes + +* **ci:** use commit-based changelog for dev release Discord notifications ([1129ec6](https://github.com/kaitranntt/ccs/commit/1129ec6ef570e7b922d2831c53bad83a68311b88)) +* **ui:** add unsaved changes confirmation when switching profiles ([b790005](https://github.com/kaitranntt/ccs/commit/b790005c85e9f25fd14a14ac01b79e7562f1a1ea)), closes [#163](https://github.com/kaitranntt/ccs/issues/163) +* **ui:** fix profile switching and improve UX ([86d992f](https://github.com/kaitranntt/ccs/commit/86d992fce623a8378d5f53b1aff7b53d2f80e3c4)) + +### Documentation + +* **readme:** add OpenRouter to built-in providers ([676929f](https://github.com/kaitranntt/ccs/commit/676929fc87c4cc450e3dc6e3f05ff60dfcead255)) +* **standards:** add input state persistence patterns ([53a7ba8](https://github.com/kaitranntt/ccs/commit/53a7ba8d3ffe81f87306e84357fce4f6ec9d7135)), closes [#165](https://github.com/kaitranntt/ccs/issues/165) + ## [7.0.0](https://github.com/kaitranntt/ccs/compare/v6.7.1...v7.0.0) (2025-12-21) ### âš  BREAKING CHANGES diff --git a/package.json b/package.json index 990e7068..3e8495d4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@kaitranntt/ccs", - "version": "7.0.0-dev.5", + "version": "7.1.0", "description": "Claude Code Switch - Instant profile switching between Claude Sonnet 4.5 and GLM 4.6", "keywords": [ "cli", From 104a40414437a4f32492e4bcc33fdfbbec386e2f Mon Sep 17 00:00:00 2001 From: kaitranntt Date: Sun, 21 Dec 2025 03:26:40 -0500 Subject: [PATCH 13/31] refactor(ui): modularize settings page into directory structure - split settings.tsx (1,781 lines) into modular components - extract hooks into separate files (context-hooks, use-*-config) - create sections: websearch, proxy, globalenv with subcomponents - add tab-navigation and section-skeleton components - add settings-context.ts for state management --- ui/src/pages/settings.tsx | 1781 ----------------- .../settings/components/section-skeleton.tsx | 31 + .../settings/components/tab-navigation.tsx | 34 + ui/src/pages/settings/context.tsx | 19 + ui/src/pages/settings/hooks.ts | 13 + ui/src/pages/settings/hooks/context-hooks.ts | 157 ++ ui/src/pages/settings/hooks/index.ts | 10 + .../settings/hooks/use-globalenv-config.ts | 100 + .../pages/settings/hooks/use-proxy-config.ts | 117 ++ ui/src/pages/settings/hooks/use-raw-config.ts | 48 + .../pages/settings/hooks/use-settings-tab.ts | 23 + .../settings/hooks/use-websearch-config.ts | 137 ++ ui/src/pages/settings/index.tsx | 148 ++ .../settings/sections/globalenv-section.tsx | 222 ++ .../pages/settings/sections/proxy/index.tsx | 289 +++ .../sections/proxy/local-proxy-card.tsx | 66 + .../sections/proxy/remote-proxy-card.tsx | 184 ++ .../settings/sections/websearch/index.tsx | 226 +++ .../sections/websearch/provider-card.tsx | 172 ++ ui/src/pages/settings/settings-context.ts | 150 ++ ui/src/pages/settings/types.ts | 56 + 21 files changed, 2202 insertions(+), 1781 deletions(-) delete mode 100644 ui/src/pages/settings.tsx create mode 100644 ui/src/pages/settings/components/section-skeleton.tsx create mode 100644 ui/src/pages/settings/components/tab-navigation.tsx create mode 100644 ui/src/pages/settings/context.tsx create mode 100644 ui/src/pages/settings/hooks.ts create mode 100644 ui/src/pages/settings/hooks/context-hooks.ts create mode 100644 ui/src/pages/settings/hooks/index.ts create mode 100644 ui/src/pages/settings/hooks/use-globalenv-config.ts create mode 100644 ui/src/pages/settings/hooks/use-proxy-config.ts create mode 100644 ui/src/pages/settings/hooks/use-raw-config.ts create mode 100644 ui/src/pages/settings/hooks/use-settings-tab.ts create mode 100644 ui/src/pages/settings/hooks/use-websearch-config.ts create mode 100644 ui/src/pages/settings/index.tsx create mode 100644 ui/src/pages/settings/sections/globalenv-section.tsx create mode 100644 ui/src/pages/settings/sections/proxy/index.tsx create mode 100644 ui/src/pages/settings/sections/proxy/local-proxy-card.tsx create mode 100644 ui/src/pages/settings/sections/proxy/remote-proxy-card.tsx create mode 100644 ui/src/pages/settings/sections/websearch/index.tsx create mode 100644 ui/src/pages/settings/sections/websearch/provider-card.tsx create mode 100644 ui/src/pages/settings/settings-context.ts create mode 100644 ui/src/pages/settings/types.ts diff --git a/ui/src/pages/settings.tsx b/ui/src/pages/settings.tsx deleted file mode 100644 index 3d19327f..00000000 --- a/ui/src/pages/settings.tsx +++ /dev/null @@ -1,1781 +0,0 @@ -/** - * Settings Page - WebSearch, Global Env & Proxy Configuration - * Supports Gemini CLI and Grok CLI providers + Global Environment Variables + Proxy Settings - */ - -import { useState, useEffect } from 'react'; -import { useSearchParams } from 'react-router-dom'; -import { Panel, PanelGroup, PanelResizeHandle } from 'react-resizable-panels'; -import { Button } from '@/components/ui/button'; -import { Alert, AlertDescription } from '@/components/ui/alert'; -import { ScrollArea } from '@/components/ui/scroll-area'; -import { Switch } from '@/components/ui/switch'; -import { Input } from '@/components/ui/input'; -import { Tabs, TabsList, TabsTrigger } from '@/components/ui/tabs'; -import { - Select, - SelectContent, - SelectItem, - SelectTrigger, - SelectValue, -} from '@/components/ui/select'; -import { - Globe, - RefreshCw, - CheckCircle2, - AlertCircle, - FileCode, - Copy, - Check, - GripVertical, - Terminal, - ExternalLink, - ChevronDown, - ChevronUp, - Settings2, - Plus, - Trash2, - Server, - Laptop, - Cloud, - Wifi, - WifiOff, -} from 'lucide-react'; -import { CodeEditor } from '@/components/shared/code-editor'; -import { api } from '@/lib/api-client'; -import type { CliproxyServerConfig, RemoteProxyStatus } from '@/lib/api-client'; - -interface ProviderConfig { - enabled?: boolean; - model?: string; - timeout?: number; -} - -interface WebSearchProvidersConfig { - gemini?: ProviderConfig; - grok?: ProviderConfig; - opencode?: ProviderConfig; -} - -interface WebSearchConfig { - enabled: boolean; - providers?: WebSearchProvidersConfig; -} - -interface CliStatus { - installed: boolean; - path: string | null; - version: string | null; -} - -interface WebSearchStatus { - geminiCli: CliStatus; - grokCli: CliStatus; - opencodeCli: CliStatus; - readiness: { - status: 'ready' | 'unavailable'; - message: string; - }; -} - -interface GlobalEnvConfig { - enabled: boolean; - env: Record; -} - -export function SettingsPage() { - const [searchParams] = useSearchParams(); - const tabParam = searchParams.get('tab'); - const initialTab = - tabParam === 'globalenv' ? 'globalenv' : tabParam === 'proxy' ? 'proxy' : 'websearch'; - const [activeTab, setActiveTab] = useState<'websearch' | 'globalenv' | 'proxy'>(initialTab); - const [config, setConfig] = useState(null); - const [loading, setLoading] = useState(true); - const [saving, setSaving] = useState(false); - const [error, setError] = useState(null); - const [success, setSuccess] = useState(false); - const [status, setStatus] = useState(null); - const [statusLoading, setStatusLoading] = useState(true); - // Config viewer state - const [rawConfig, setRawConfig] = useState(null); - const [rawConfigLoading, setRawConfigLoading] = useState(false); - const [copied, setCopied] = useState(false); - // Local model input state (to avoid saving on every keystroke) - const [geminiModelInput, setGeminiModelInput] = useState(''); - const [opencodeModelInput, setOpencodeModelInput] = useState(''); - // Collapsible install hints state - const [showGeminiHint, setShowGeminiHint] = useState(false); - const [showOpencodeHint, setShowOpencodeHint] = useState(false); - const [showGrokHint, setShowGrokHint] = useState(false); - // Model save indicators (brief visual feedback) - const [geminiModelSaved, setGeminiModelSaved] = useState(false); - const [opencodeModelSaved, setOpencodeModelSaved] = useState(false); - // Global Env state - const [globalEnvConfig, setGlobalEnvConfig] = useState(null); - const [globalEnvLoading, setGlobalEnvLoading] = useState(true); - const [globalEnvSaving, setGlobalEnvSaving] = useState(false); - const [globalEnvError, setGlobalEnvError] = useState(null); - const [globalEnvSuccess, setGlobalEnvSuccess] = useState(false); - // New env var inputs - const [newEnvKey, setNewEnvKey] = useState(''); - const [newEnvValue, setNewEnvValue] = useState(''); - // Proxy state - const [proxyConfig, setCliproxyServerConfig] = useState(null); - const [proxyLoading, setProxyLoading] = useState(true); - const [proxySaving, setProxySaving] = useState(false); - const [proxyError, setProxyError] = useState(null); - const [proxySuccess, setProxySuccess] = useState(false); - const [testResult, setTestResult] = useState(null); - const [testing, setTesting] = useState(false); - // Proxy input state (lifted from ProxyContent to persist across tab switches) - const [proxyEditedHost, setProxyEditedHost] = useState(null); - const [proxyEditedPort, setProxyEditedPort] = useState(null); - const [proxyEditedAuthToken, setProxyEditedAuthToken] = useState(null); - const [proxyEditedLocalPort, setProxyEditedLocalPort] = useState(null); - - // Load config and status on mount - useEffect(() => { - fetchConfig(); - fetchStatus(); - fetchRawConfig(); - fetchGlobalEnvConfig(); - fetchCliproxyServerConfig(); - }, []); - - // Sync local model inputs when config changes - useEffect(() => { - if (config) { - setGeminiModelInput(config.providers?.gemini?.model ?? 'gemini-2.5-flash'); - setOpencodeModelInput(config.providers?.opencode?.model ?? 'opencode/grok-code'); - } - }, [config]); - - const fetchConfig = async () => { - try { - setLoading(true); - setError(null); - const res = await fetch('/api/websearch'); - if (!res.ok) throw new Error('Failed to load WebSearch config'); - const data = await res.json(); - setConfig(data); - } catch (err) { - setError((err as Error).message); - } finally { - setLoading(false); - } - }; - - const fetchStatus = async () => { - try { - setStatusLoading(true); - const res = await fetch('/api/websearch/status'); - if (!res.ok) throw new Error('Failed to load status'); - const data = await res.json(); - setStatus(data); - } catch (err) { - console.error('Failed to fetch WebSearch status:', err); - } finally { - setStatusLoading(false); - } - }; - - const fetchRawConfig = async () => { - try { - setRawConfigLoading(true); - const res = await fetch('/api/config/raw'); - if (!res.ok) { - setRawConfig(null); - return; - } - const text = await res.text(); - setRawConfig(text); - } catch (err) { - console.error('Failed to fetch raw config:', err); - setRawConfig(null); - } finally { - setRawConfigLoading(false); - } - }; - - const fetchGlobalEnvConfig = async () => { - try { - setGlobalEnvLoading(true); - setGlobalEnvError(null); - const res = await fetch('/api/global-env'); - if (!res.ok) throw new Error('Failed to load Global Env config'); - const data = await res.json(); - setGlobalEnvConfig(data); - } catch (err) { - setGlobalEnvError((err as Error).message); - } finally { - setGlobalEnvLoading(false); - } - }; - - const fetchCliproxyServerConfig = async () => { - try { - setProxyLoading(true); - setProxyError(null); - const data = await api.cliproxyServer.get(); - setCliproxyServerConfig(data); - } catch (err) { - setProxyError((err as Error).message); - } finally { - setProxyLoading(false); - } - }; - - const copyToClipboard = async () => { - if (!rawConfig) return; - try { - await navigator.clipboard.writeText(rawConfig); - setCopied(true); - setTimeout(() => setCopied(false), 2000); - } catch (err) { - console.error('Failed to copy:', err); - } - }; - - // Toggle Gemini provider - const toggleGemini = () => { - const providers = config?.providers || {}; - const currentState = providers.gemini?.enabled ?? false; - const grokState = providers.grok?.enabled ?? false; - const opencodeState = providers.opencode?.enabled ?? false; - - saveConfig({ - enabled: !currentState || grokState || opencodeState, // Enable WebSearch if any provider is enabled - providers: { - ...providers, - gemini: { - ...providers.gemini, - enabled: !currentState, - }, - }, - }); - }; - - const saveConfig = async (updates: Partial) => { - if (!config) return; - - // Optimistic update - apply changes immediately to local state - const optimisticConfig = { ...config, ...updates }; - setConfig(optimisticConfig); - - try { - setSaving(true); - setError(null); - - const res = await fetch('/api/websearch', { - method: 'PUT', - headers: { 'Content-Type': 'application/json' }, - body: JSON.stringify(optimisticConfig), - }); - - if (!res.ok) { - const data = await res.json(); - throw new Error(data.error || 'Failed to save'); - } - - const data = await res.json(); - setConfig(data.websearch); - // Quick flash of success (shorter duration, less intrusive) - setSuccess(true); - setTimeout(() => setSuccess(false), 1500); - // Silently refresh raw config without loading state - fetch('/api/config/raw') - .then((r) => (r.ok ? r.text() : null)) - .then((text) => text && setRawConfig(text)) - .catch(() => {}); - } catch (err) { - // Revert optimistic update on error - setConfig(config); - setError((err as Error).message); - } finally { - setSaving(false); - } - }; - - const isGeminiEnabled = config?.providers?.gemini?.enabled ?? false; - const isGrokEnabled = config?.providers?.grok?.enabled ?? false; - const isOpenCodeEnabled = config?.providers?.opencode?.enabled ?? false; - - // Toggle Grok provider - const toggleGrok = () => { - const providers = config?.providers || {}; - const currentState = providers.grok?.enabled ?? false; - - saveConfig({ - enabled: isGeminiEnabled || !currentState || isOpenCodeEnabled, // Enable WebSearch if any provider is enabled - providers: { - ...providers, - grok: { - ...providers.grok, - enabled: !currentState, - }, - }, - }); - }; - - // Toggle OpenCode provider - const toggleOpenCode = () => { - const providers = config?.providers || {}; - const currentState = providers.opencode?.enabled ?? false; - - saveConfig({ - enabled: isGeminiEnabled || isGrokEnabled || !currentState, // Enable WebSearch if any provider is enabled - providers: { - ...providers, - opencode: { - ...providers.opencode, - enabled: !currentState, - }, - }, - }); - }; - - // Save Gemini model on blur (only if changed) - const saveGeminiModel = async () => { - const currentModel = config?.providers?.gemini?.model ?? 'gemini-2.5-flash'; - if (geminiModelInput !== currentModel) { - const providers = config?.providers || {}; - await saveConfig({ - providers: { - ...providers, - gemini: { - ...providers.gemini, - model: geminiModelInput, - }, - }, - }); - // Show saved indicator briefly - setGeminiModelSaved(true); - setTimeout(() => setGeminiModelSaved(false), 2000); - } - }; - - // Save OpenCode model on blur (only if changed) - const saveOpencodeModel = async () => { - const currentModel = config?.providers?.opencode?.model ?? 'opencode/grok-code'; - if (opencodeModelInput !== currentModel) { - const providers = config?.providers || {}; - await saveConfig({ - providers: { - ...providers, - opencode: { - ...providers.opencode, - model: opencodeModelInput, - }, - }, - }); - // Show saved indicator briefly - setOpencodeModelSaved(true); - setTimeout(() => setOpencodeModelSaved(false), 2000); - } - }; - - // Global Env functions - const saveGlobalEnvConfig = async (updates: Partial) => { - if (!globalEnvConfig) return; - - // Optimistic update - const optimisticConfig = { ...globalEnvConfig, ...updates }; - setGlobalEnvConfig(optimisticConfig); - - try { - setGlobalEnvSaving(true); - setGlobalEnvError(null); - - const res = await fetch('/api/global-env', { - method: 'PUT', - headers: { 'Content-Type': 'application/json' }, - body: JSON.stringify(optimisticConfig), - }); - - if (!res.ok) { - const data = await res.json(); - throw new Error(data.error || 'Failed to save'); - } - - const data = await res.json(); - setGlobalEnvConfig(data.config); - setGlobalEnvSuccess(true); - setTimeout(() => setGlobalEnvSuccess(false), 1500); - // Silently refresh raw config - fetch('/api/config/raw') - .then((r) => (r.ok ? r.text() : null)) - .then((text) => text && setRawConfig(text)) - .catch(() => {}); - } catch (err) { - setGlobalEnvConfig(globalEnvConfig); - setGlobalEnvError((err as Error).message); - } finally { - setGlobalEnvSaving(false); - } - }; - - const toggleGlobalEnv = () => { - saveGlobalEnvConfig({ enabled: !globalEnvConfig?.enabled }); - }; - - const addEnvVar = () => { - if (!newEnvKey.trim() || !globalEnvConfig) return; - const newEnv = { ...globalEnvConfig.env, [newEnvKey.trim()]: newEnvValue }; - saveGlobalEnvConfig({ env: newEnv }); - setNewEnvKey(''); - setNewEnvValue(''); - }; - - const removeEnvVar = (key: string) => { - if (!globalEnvConfig) return; - const newEnv = { ...globalEnvConfig.env }; - delete newEnv[key]; - saveGlobalEnvConfig({ env: newEnv }); - }; - - const updateEnvValue = (key: string, value: string) => { - if (!globalEnvConfig) return; - const newEnv = { ...globalEnvConfig.env, [key]: value }; - saveGlobalEnvConfig({ env: newEnv }); - }; - - // Proxy functions - const saveCliproxyServerConfig = async (updates: Partial) => { - if (!proxyConfig) return; - - // Optimistic update - const optimisticConfig = { - remote: { ...proxyConfig.remote, ...updates.remote }, - fallback: { ...proxyConfig.fallback, ...updates.fallback }, - local: { ...proxyConfig.local, ...updates.local }, - }; - setCliproxyServerConfig(optimisticConfig); - setTestResult(null); // Clear previous test result on config change - - try { - setProxySaving(true); - setProxyError(null); - - const data = await api.cliproxyServer.update(updates); - setCliproxyServerConfig(data); - setProxySuccess(true); - setTimeout(() => setProxySuccess(false), 1500); - // Silently refresh raw config - fetch('/api/config/raw') - .then((r) => (r.ok ? r.text() : null)) - .then((text) => text && setRawConfig(text)) - .catch(() => {}); - } catch (err) { - setCliproxyServerConfig(proxyConfig); - setProxyError((err as Error).message); - } finally { - setProxySaving(false); - } - }; - - const handleTestConnection = async (params: { - host: string; - port: string; - protocol: 'http' | 'https'; - authToken: string; - }) => { - const { host, port, protocol, authToken } = params; - if (!host) { - setProxyError('Host is required'); - return; - } - - try { - setTesting(true); - setProxyError(null); - setTestResult(null); - - // Parse port - empty string means use protocol default - const portNum = port ? parseInt(port, 10) : undefined; - const result = await api.cliproxyServer.test({ - host, - port: portNum || undefined, // Empty/0 means use protocol default - protocol, - authToken: authToken || undefined, - }); - setTestResult(result); - } catch (err) { - setProxyError((err as Error).message); - } finally { - setTesting(false); - } - }; - - if (loading) { - return ( -
-
- - Loading configuration... -
-
- ); - } - - return ( -
- - {/* Left Panel - Settings Controls */} - -
- {/* Header with Tabs */} -
- setActiveTab(v as 'websearch' | 'globalenv' | 'proxy')} - > - - - - WebSearch - - - - Global Env - - - - Proxy - - - -
- - {/* Tab Content */} - {activeTab === 'websearch' ? ( - - ) : activeTab === 'globalenv' ? ( - - ) : ( - - )} -
- - - {/* Resize Handle */} - - - - - {/* Right Panel - Config Viewer */} - -
- {/* Header */} -
-
- -
-

config.yaml

-

~/.ccs/config.yaml

-
-
-
- - -
-
- - {/* Config Content - scrollable */} -
- {rawConfigLoading ? ( -
- - Loading... -
- ) : rawConfig ? ( - {}} - language="yaml" - readonly - minHeight="auto" - className="min-h-full" - /> - ) : ( -
-
- -

Config file not found

- - ccs migrate - -
-
- )} -
-
- - -
- ); -} - -// WebSearch Tab Content Component -interface WebSearchContentProps { - config: WebSearchConfig | null; - status: WebSearchStatus | null; - statusLoading: boolean; - saving: boolean; - error: string | null; - success: boolean; - isGeminiEnabled: boolean; - isGrokEnabled: boolean; - isOpenCodeEnabled: boolean; - geminiModelInput: string; - opencodeModelInput: string; - geminiModelSaved: boolean; - opencodeModelSaved: boolean; - showGeminiHint: boolean; - showOpencodeHint: boolean; - showGrokHint: boolean; - setGeminiModelInput: (v: string) => void; - setOpencodeModelInput: (v: string) => void; - setShowGeminiHint: (v: boolean) => void; - setShowOpencodeHint: (v: boolean) => void; - setShowGrokHint: (v: boolean) => void; - toggleGemini: () => void; - toggleGrok: () => void; - toggleOpenCode: () => void; - saveGeminiModel: () => void; - saveOpencodeModel: () => void; - fetchStatus: () => void; - fetchConfig: () => void; - fetchRawConfig: () => void; - loading: boolean; -} - -function WebSearchContent({ - status, - statusLoading, - saving, - error, - success, - isGeminiEnabled, - isGrokEnabled, - isOpenCodeEnabled, - geminiModelInput, - opencodeModelInput, - geminiModelSaved, - opencodeModelSaved, - showGeminiHint, - showOpencodeHint, - showGrokHint, - setGeminiModelInput, - setOpencodeModelInput, - setShowGeminiHint, - setShowOpencodeHint, - setShowGrokHint, - toggleGemini, - toggleGrok, - toggleOpenCode, - saveGeminiModel, - saveOpencodeModel, - fetchStatus, - fetchConfig, - fetchRawConfig, - loading, -}: WebSearchContentProps) { - return ( - <> - {/* Toast-style alerts - absolute positioned, no layout shift */} -
- {error && ( - - - {error} - - )} - {success && ( -
- - Saved -
- )} -
- - {/* Scrollable Content */} - - - - - {/* Footer */} -
- -
- - ); -} - -// Global Env Tab Content Component -interface GlobalEnvContentProps { - config: GlobalEnvConfig | null; - loading: boolean; - saving: boolean; - error: string | null; - success: boolean; - newEnvKey: string; - newEnvValue: string; - setNewEnvKey: (v: string) => void; - setNewEnvValue: (v: string) => void; - toggleGlobalEnv: () => void; - addEnvVar: () => void; - removeEnvVar: (key: string) => void; - updateEnvValue: (key: string, value: string) => void; - fetchGlobalEnvConfig: () => void; - fetchRawConfig: () => void; -} - -function GlobalEnvContent({ - config, - loading, - saving, - error, - success, - newEnvKey, - newEnvValue, - setNewEnvKey, - setNewEnvValue, - toggleGlobalEnv, - addEnvVar, - removeEnvVar, - fetchGlobalEnvConfig, - fetchRawConfig, -}: GlobalEnvContentProps) { - if (loading) { - return ( -
-
- - Loading... -
-
- ); - } - - return ( - <> - {/* Toast-style alerts */} -
- {error && ( - - - {error} - - )} - {success && ( -
- - Saved -
- )} -
- - {/* Scrollable Content */} - -
- {/* Description */} -

- Environment variables injected into all non-Claude subscription profiles (gemini, codex, - agy, copilot, etc.) -

- - {/* Enable/Disable Toggle */} -
-
-

- {config?.enabled ? 'Global Env enabled' : 'Global Env disabled'} -

-

- {config?.enabled - ? 'Env vars will be injected into third-party profiles' - : 'Env vars will not be injected'} -

-
- -
- - {/* Current Environment Variables */} -
-

Environment Variables

- - {config?.env && Object.keys(config.env).length > 0 ? ( -
- {Object.entries(config.env).map(([key, value]) => ( -
- {key} - = - {value} - -
- ))} -
- ) : ( -
-

No environment variables configured

-
- )} - - {/* Add New Variable */} -
-

Add New Variable

-
- setNewEnvKey(e.target.value.toUpperCase())} - placeholder="KEY_NAME" - className="flex-1 font-mono text-sm h-9" - disabled={saving} - /> - = - setNewEnvValue(e.target.value)} - placeholder="value" - className="flex-1 font-mono text-sm h-9" - disabled={saving} - /> - -
-
- - {/* Common Variables Quick Add */} -
-

Quick Add Common Variables

-
- {[ - { key: 'DISABLE_BUG_COMMAND', value: '1' }, - { key: 'DISABLE_ERROR_REPORTING', value: '1' }, - { key: 'DISABLE_TELEMETRY', value: '1' }, - ].map( - ({ key, value }) => - !config?.env?.[key] && ( - - ) - )} - {config?.env && - ['DISABLE_BUG_COMMAND', 'DISABLE_ERROR_REPORTING', 'DISABLE_TELEMETRY'].every( - (k) => config.env[k] - ) && ( - - All common variables are configured - - )} -
-
-
-
- - - {/* Footer */} -
- -
- - ); -} - -// Proxy Tab Content Component -interface ProxyContentProps { - config: CliproxyServerConfig | null; - loading: boolean; - saving: boolean; - error: string | null; - success: boolean; - testResult: RemoteProxyStatus | null; - testing: boolean; - saveCliproxyServerConfig: (updates: Partial) => void; - handleTestConnection: (params: { - host: string; - port: string; - protocol: 'http' | 'https'; - authToken: string; - }) => void; - fetchCliproxyServerConfig: () => void; - fetchRawConfig: () => void; - // Lifted input state for persistence across tab switches - editedHost: string | null; - setEditedHost: (value: string | null) => void; - editedPort: string | null; - setEditedPort: (value: string | null) => void; - editedAuthToken: string | null; - setEditedAuthToken: (value: string | null) => void; - editedLocalPort: string | null; - setEditedLocalPort: (value: string | null) => void; -} - -function ProxyContent({ - config, - loading, - saving, - error, - success, - testResult, - testing, - saveCliproxyServerConfig, - handleTestConnection, - fetchCliproxyServerConfig, - fetchRawConfig, - editedHost, - setEditedHost, - editedPort, - setEditedPort, - editedAuthToken, - setEditedAuthToken, - editedLocalPort, - setEditedLocalPort, -}: ProxyContentProps) { - // Default configs for fallback - const defaultRemote = { - enabled: false, - host: '', - port: undefined as number | undefined, - protocol: 'http' as const, - auth_token: '', - }; - const defaultFallback = { enabled: true, auto_start: true }; - const defaultLocal = { port: 8317, auto_start: true }; - - // Helper to get default port based on protocol - // HTTP defaults to 8317 (CLIProxyAPI default), HTTPS to 443 (standard SSL) - const getDefaultPort = (protocol: 'http' | 'https') => (protocol === 'https' ? 443 : 8317); - - // Sync local state with config (using refs to avoid lint warnings) - const hostInput = config?.remote.host ?? ''; - // Show empty string for port if undefined (will use protocol default) - const portInput = config?.remote.port !== undefined ? config.remote.port.toString() : ''; - const authTokenInput = config?.remote.auth_token ?? ''; - const localPortInput = (config?.local.port ?? 8317).toString(); - - // Get display values (edited or from config) - const displayHost = editedHost ?? hostInput; - const displayPort = editedPort ?? portInput; - const displayAuthToken = editedAuthToken ?? authTokenInput; - const displayLocalPort = editedLocalPort ?? localPortInput; - - if (loading) { - return ( -
-
- - Loading... -
-
- ); - } - - const isRemoteMode = config?.remote.enabled ?? false; - const remoteConfig = config?.remote ?? defaultRemote; - const fallbackConfig = config?.fallback ?? defaultFallback; - const localConfig = config?.local ?? defaultLocal; - - // Save functions for blur events - const saveHost = () => { - const value = editedHost ?? displayHost; - if (value !== config?.remote.host) { - saveCliproxyServerConfig({ remote: { ...remoteConfig, host: value } }); - } - setEditedHost(null); - }; - - const savePort = () => { - const portStr = editedPort ?? displayPort; - // Empty string means use protocol default (undefined) - const port = portStr === '' ? undefined : parseInt(portStr, 10); - const effectivePort = port && !isNaN(port) && port > 0 ? port : undefined; - - if (effectivePort !== config?.remote.port) { - saveCliproxyServerConfig({ remote: { ...remoteConfig, port: effectivePort } }); - } - setEditedPort(null); - }; - - const saveAuthToken = () => { - const value = editedAuthToken ?? displayAuthToken; - if (value !== config?.remote.auth_token) { - saveCliproxyServerConfig({ remote: { ...remoteConfig, auth_token: value } }); - } - setEditedAuthToken(null); - }; - - const saveLocalPort = () => { - const port = parseInt(editedLocalPort ?? displayLocalPort, 10); - if (!isNaN(port) && port !== config?.local.port) { - saveCliproxyServerConfig({ local: { ...localConfig, port } }); - } - setEditedLocalPort(null); - }; - - return ( - <> - {/* Toast-style alerts */} -
- {error && ( - - - {error} - - )} - {success && ( -
- - Saved -
- )} -
- - {/* Scrollable Content */} - -
- {/* Description */} -

- Configure local or remote CLIProxyAPI connection for proxy-based profiles -

- - {/* Mode Toggle - Card based selection */} -
-

Connection Mode

-
- {/* Local Mode Card */} - - - {/* Remote Mode Card */} - -
-
- - {/* Remote Settings - Show when remote mode is enabled */} - {isRemoteMode && ( -
-

- - Remote Server Configuration -

- - {/* Host */} -
- - setEditedHost(e.target.value)} - onBlur={saveHost} - placeholder="192.168.1.100 or proxy.example.com" - className="font-mono" - disabled={saving} - /> -
- - {/* Port and Protocol */} -
-
- - setEditedPort(e.target.value.replace(/\D/g, ''))} - onBlur={savePort} - placeholder={`Leave empty for ${getDefaultPort(config?.remote.protocol || 'http')}`} - className="font-mono" - disabled={saving} - /> -
-
- - -
-
- - {/* Auth Token */} -
- - setEditedAuthToken(e.target.value)} - onBlur={saveAuthToken} - placeholder="Bearer token for authentication" - className="font-mono" - disabled={saving} - /> -
- - {/* Test Connection */} -
- - - {/* Test Result */} - {testResult && ( -
-
- {testResult.reachable ? ( - <> - - - Connected ({testResult.latencyMs}ms) - - - ) : ( - <> - - - {testResult.error || 'Connection failed'} - - - )} -
-
- )} -
-
- )} - - {/* Fallback Settings */} -
-

Fallback Settings

-
- {/* Enable Fallback */} -
-
-

Enable fallback to local

-

- Use local proxy if remote is unreachable -

-
- - saveCliproxyServerConfig({ fallback: { ...fallbackConfig, enabled: checked } }) - } - disabled={saving || !isRemoteMode} - /> -
- - {/* Auto-start on fallback */} -
-
-

Auto-start local proxy

-

- Automatically start local proxy on fallback -

-
- - saveCliproxyServerConfig({ - fallback: { ...fallbackConfig, auto_start: checked }, - }) - } - disabled={saving || !isRemoteMode || !config?.fallback.enabled} - /> -
-
-
- - {/* Local Proxy Settings - Only show in Local mode */} - {!isRemoteMode && ( -
-

Local Proxy

-
- {/* Port */} -
- - setEditedLocalPort(e.target.value)} - onBlur={saveLocalPort} - placeholder="8317" - className="font-mono max-w-32" - disabled={saving} - /> -
- - {/* Auto-start */} -
-
-

Auto-start

-

- Start local proxy automatically when needed -

-
- - saveCliproxyServerConfig({ local: { ...localConfig, auto_start: checked } }) - } - disabled={saving} - /> -
-
-
- )} -
- - - {/* Footer */} -
- -
- - ); -} diff --git a/ui/src/pages/settings/components/section-skeleton.tsx b/ui/src/pages/settings/components/section-skeleton.tsx new file mode 100644 index 00000000..33391159 --- /dev/null +++ b/ui/src/pages/settings/components/section-skeleton.tsx @@ -0,0 +1,31 @@ +/** + * Section Skeleton Component + * Loading placeholder for lazy-loaded settings sections + */ + +import { Skeleton } from '@/components/ui/skeleton'; + +export function SectionSkeleton() { + return ( +
+ +
+
+
+ + +
+ +
+
+
+ +
+ + + +
+
+
+ ); +} diff --git a/ui/src/pages/settings/components/tab-navigation.tsx b/ui/src/pages/settings/components/tab-navigation.tsx new file mode 100644 index 00000000..0755e437 --- /dev/null +++ b/ui/src/pages/settings/components/tab-navigation.tsx @@ -0,0 +1,34 @@ +/** + * Tab Navigation Component + * Settings page tab switcher with icons + */ + +import { Tabs, TabsList, TabsTrigger } from '@/components/ui/tabs'; +import { Globe, Settings2, Server } from 'lucide-react'; +import type { SettingsTab } from '../types'; + +interface TabNavigationProps { + activeTab: SettingsTab; + onTabChange: (tab: SettingsTab) => void; +} + +export function TabNavigation({ activeTab, onTabChange }: TabNavigationProps) { + return ( + onTabChange(v as SettingsTab)}> + + + + WebSearch + + + + Global Env + + + + Proxy + + + + ); +} diff --git a/ui/src/pages/settings/context.tsx b/ui/src/pages/settings/context.tsx new file mode 100644 index 00000000..2cc9a8b5 --- /dev/null +++ b/ui/src/pages/settings/context.tsx @@ -0,0 +1,19 @@ +/** + * Settings Provider Component + * React component that provides settings context + */ + +import { useReducer, type ReactNode } from 'react'; +import { SettingsContext, settingsReducer, initialSettingsState } from './settings-context'; + +interface SettingsProviderProps { + children: ReactNode; +} + +export function SettingsProvider({ children }: SettingsProviderProps) { + const [state, dispatch] = useReducer(settingsReducer, initialSettingsState); + + return ( + {children} + ); +} diff --git a/ui/src/pages/settings/hooks.ts b/ui/src/pages/settings/hooks.ts new file mode 100644 index 00000000..3b9c20d8 --- /dev/null +++ b/ui/src/pages/settings/hooks.ts @@ -0,0 +1,13 @@ +/** + * Settings Hooks - Re-export from hooks directory + */ + +export { + useSettingsContext, + useSettingsActions, + useSettingsTab, + useWebSearchConfig, + useGlobalEnvConfig, + useProxyConfig, + useRawConfig, +} from './hooks/index'; diff --git a/ui/src/pages/settings/hooks/context-hooks.ts b/ui/src/pages/settings/hooks/context-hooks.ts new file mode 100644 index 00000000..eb7aea2f --- /dev/null +++ b/ui/src/pages/settings/hooks/context-hooks.ts @@ -0,0 +1,157 @@ +/** + * Context Hooks + * Hooks for accessing and updating settings context state + */ + +import { useCallback, useContext } from 'react'; +import { SettingsContext } from '../settings-context'; +import type { + WebSearchConfig, + GlobalEnvConfig, + CliproxyServerConfig, + WebSearchStatus, + RemoteProxyStatus, +} from '../types'; + +export function useSettingsContext() { + const context = useContext(SettingsContext); + if (!context) { + throw new Error('useSettingsContext must be used within a SettingsProvider'); + } + return context; +} + +export function useSettingsActions() { + const { dispatch } = useSettingsContext(); + + const setWebSearchConfig = useCallback( + (config: WebSearchConfig | null) => dispatch({ type: 'SET_WEBSEARCH_CONFIG', payload: config }), + [dispatch] + ); + + const setWebSearchStatus = useCallback( + (status: WebSearchStatus | null) => dispatch({ type: 'SET_WEBSEARCH_STATUS', payload: status }), + [dispatch] + ); + + const setWebSearchLoading = useCallback( + (loading: boolean) => dispatch({ type: 'SET_WEBSEARCH_LOADING', payload: loading }), + [dispatch] + ); + + const setWebSearchStatusLoading = useCallback( + (loading: boolean) => dispatch({ type: 'SET_WEBSEARCH_STATUS_LOADING', payload: loading }), + [dispatch] + ); + + const setWebSearchSaving = useCallback( + (saving: boolean) => dispatch({ type: 'SET_WEBSEARCH_SAVING', payload: saving }), + [dispatch] + ); + + const setWebSearchError = useCallback( + (error: string | null) => dispatch({ type: 'SET_WEBSEARCH_ERROR', payload: error }), + [dispatch] + ); + + const setWebSearchSuccess = useCallback( + (success: boolean) => dispatch({ type: 'SET_WEBSEARCH_SUCCESS', payload: success }), + [dispatch] + ); + + const setGlobalEnvConfig = useCallback( + (config: GlobalEnvConfig | null) => dispatch({ type: 'SET_GLOBALENV_CONFIG', payload: config }), + [dispatch] + ); + + const setGlobalEnvLoading = useCallback( + (loading: boolean) => dispatch({ type: 'SET_GLOBALENV_LOADING', payload: loading }), + [dispatch] + ); + + const setGlobalEnvSaving = useCallback( + (saving: boolean) => dispatch({ type: 'SET_GLOBALENV_SAVING', payload: saving }), + [dispatch] + ); + + const setGlobalEnvError = useCallback( + (error: string | null) => dispatch({ type: 'SET_GLOBALENV_ERROR', payload: error }), + [dispatch] + ); + + const setGlobalEnvSuccess = useCallback( + (success: boolean) => dispatch({ type: 'SET_GLOBALENV_SUCCESS', payload: success }), + [dispatch] + ); + + const setProxyConfig = useCallback( + (config: CliproxyServerConfig | null) => + dispatch({ type: 'SET_PROXY_CONFIG', payload: config }), + [dispatch] + ); + + const setProxyLoading = useCallback( + (loading: boolean) => dispatch({ type: 'SET_PROXY_LOADING', payload: loading }), + [dispatch] + ); + + const setProxySaving = useCallback( + (saving: boolean) => dispatch({ type: 'SET_PROXY_SAVING', payload: saving }), + [dispatch] + ); + + const setProxyError = useCallback( + (error: string | null) => dispatch({ type: 'SET_PROXY_ERROR', payload: error }), + [dispatch] + ); + + const setProxySuccess = useCallback( + (success: boolean) => dispatch({ type: 'SET_PROXY_SUCCESS', payload: success }), + [dispatch] + ); + + const setProxyTestResult = useCallback( + (result: RemoteProxyStatus | null) => + dispatch({ type: 'SET_PROXY_TEST_RESULT', payload: result }), + [dispatch] + ); + + const setProxyTesting = useCallback( + (testing: boolean) => dispatch({ type: 'SET_PROXY_TESTING', payload: testing }), + [dispatch] + ); + + const setRawConfig = useCallback( + (config: string | null) => dispatch({ type: 'SET_RAW_CONFIG', payload: config }), + [dispatch] + ); + + const setRawConfigLoading = useCallback( + (loading: boolean) => dispatch({ type: 'SET_RAW_CONFIG_LOADING', payload: loading }), + [dispatch] + ); + + return { + setWebSearchConfig, + setWebSearchStatus, + setWebSearchLoading, + setWebSearchStatusLoading, + setWebSearchSaving, + setWebSearchError, + setWebSearchSuccess, + setGlobalEnvConfig, + setGlobalEnvLoading, + setGlobalEnvSaving, + setGlobalEnvError, + setGlobalEnvSuccess, + setProxyConfig, + setProxyLoading, + setProxySaving, + setProxyError, + setProxySuccess, + setProxyTestResult, + setProxyTesting, + setRawConfig, + setRawConfigLoading, + }; +} diff --git a/ui/src/pages/settings/hooks/index.ts b/ui/src/pages/settings/hooks/index.ts new file mode 100644 index 00000000..2797059d --- /dev/null +++ b/ui/src/pages/settings/hooks/index.ts @@ -0,0 +1,10 @@ +/** + * Settings Hooks Barrel Export + */ + +export { useSettingsContext, useSettingsActions } from './context-hooks'; +export { useSettingsTab } from './use-settings-tab'; +export { useWebSearchConfig } from './use-websearch-config'; +export { useGlobalEnvConfig } from './use-globalenv-config'; +export { useProxyConfig } from './use-proxy-config'; +export { useRawConfig } from './use-raw-config'; diff --git a/ui/src/pages/settings/hooks/use-globalenv-config.ts b/ui/src/pages/settings/hooks/use-globalenv-config.ts new file mode 100644 index 00000000..a865a9af --- /dev/null +++ b/ui/src/pages/settings/hooks/use-globalenv-config.ts @@ -0,0 +1,100 @@ +/** + * GlobalEnv Config Hook + */ + +import { useCallback, useState } from 'react'; +import { useSettingsContext, useSettingsActions } from './context-hooks'; +import type { GlobalEnvConfig } from '../types'; + +export function useGlobalEnvConfig() { + const { state } = useSettingsContext(); + const actions = useSettingsActions(); + const [newEnvKey, setNewEnvKey] = useState(''); + const [newEnvValue, setNewEnvValue] = useState(''); + + const fetchConfig = useCallback(async () => { + try { + actions.setGlobalEnvLoading(true); + actions.setGlobalEnvError(null); + const res = await fetch('/api/global-env'); + if (!res.ok) throw new Error('Failed to load Global Env config'); + const data = await res.json(); + actions.setGlobalEnvConfig(data); + } catch (err) { + actions.setGlobalEnvError((err as Error).message); + } finally { + actions.setGlobalEnvLoading(false); + } + }, [actions]); + + const saveConfig = useCallback( + async (updates: Partial) => { + const config = state.globalEnvConfig; + if (!config) return; + + const optimisticConfig = { ...config, ...updates }; + actions.setGlobalEnvConfig(optimisticConfig); + + try { + actions.setGlobalEnvSaving(true); + actions.setGlobalEnvError(null); + + const res = await fetch('/api/global-env', { + method: 'PUT', + headers: { 'Content-Type': 'application/json' }, + body: JSON.stringify(optimisticConfig), + }); + + if (!res.ok) { + const data = await res.json(); + throw new Error(data.error || 'Failed to save'); + } + + const data = await res.json(); + actions.setGlobalEnvConfig(data.config); + actions.setGlobalEnvSuccess(true); + setTimeout(() => actions.setGlobalEnvSuccess(false), 1500); + } catch (err) { + actions.setGlobalEnvConfig(config); + actions.setGlobalEnvError((err as Error).message); + } finally { + actions.setGlobalEnvSaving(false); + } + }, + [state.globalEnvConfig, actions] + ); + + const addEnvVar = useCallback(() => { + if (!newEnvKey.trim() || !state.globalEnvConfig) return; + const newEnv = { ...state.globalEnvConfig.env, [newEnvKey.trim()]: newEnvValue }; + saveConfig({ env: newEnv }); + setNewEnvKey(''); + setNewEnvValue(''); + }, [newEnvKey, newEnvValue, state.globalEnvConfig, saveConfig]); + + const removeEnvVar = useCallback( + (key: string) => { + if (!state.globalEnvConfig) return; + const newEnv = { ...state.globalEnvConfig.env }; + delete newEnv[key]; + saveConfig({ env: newEnv }); + }, + [state.globalEnvConfig, saveConfig] + ); + + return { + config: state.globalEnvConfig, + loading: state.globalEnvLoading, + saving: state.globalEnvSaving, + error: state.globalEnvError, + success: state.globalEnvSuccess, + newEnvKey, + setNewEnvKey, + newEnvValue, + setNewEnvValue, + fetchConfig, + saveConfig, + addEnvVar, + removeEnvVar, + }; +} diff --git a/ui/src/pages/settings/hooks/use-proxy-config.ts b/ui/src/pages/settings/hooks/use-proxy-config.ts new file mode 100644 index 00000000..b9e9cb50 --- /dev/null +++ b/ui/src/pages/settings/hooks/use-proxy-config.ts @@ -0,0 +1,117 @@ +/** + * Proxy Config Hook + */ + +import { useCallback, useState } from 'react'; +import { api } from '@/lib/api-client'; +import { useSettingsContext, useSettingsActions } from './context-hooks'; +import type { CliproxyServerConfig } from '../types'; + +export function useProxyConfig() { + const { state } = useSettingsContext(); + const actions = useSettingsActions(); + const [editedHost, setEditedHost] = useState(null); + const [editedPort, setEditedPort] = useState(null); + const [editedAuthToken, setEditedAuthToken] = useState(null); + const [editedLocalPort, setEditedLocalPort] = useState(null); + + const fetchConfig = useCallback(async () => { + try { + actions.setProxyLoading(true); + actions.setProxyError(null); + const data = await api.cliproxyServer.get(); + actions.setProxyConfig(data); + } catch (err) { + actions.setProxyError((err as Error).message); + } finally { + actions.setProxyLoading(false); + } + }, [actions]); + + const saveConfig = useCallback( + async (updates: Partial) => { + const config = state.proxyConfig; + if (!config) return; + + const optimisticConfig = { + remote: { ...config.remote, ...updates.remote }, + fallback: { ...config.fallback, ...updates.fallback }, + local: { ...config.local, ...updates.local }, + }; + actions.setProxyConfig(optimisticConfig); + actions.setProxyTestResult(null); + + try { + actions.setProxySaving(true); + actions.setProxyError(null); + + const data = await api.cliproxyServer.update(updates); + actions.setProxyConfig(data); + actions.setProxySuccess(true); + setTimeout(() => actions.setProxySuccess(false), 1500); + } catch (err) { + actions.setProxyConfig(config); + actions.setProxyError((err as Error).message); + } finally { + actions.setProxySaving(false); + } + }, + [state.proxyConfig, actions] + ); + + const testConnection = useCallback( + async (params: { + host: string; + port: string; + protocol: 'http' | 'https'; + authToken: string; + }) => { + const { host, port, protocol, authToken } = params; + if (!host) { + actions.setProxyError('Host is required'); + return; + } + + try { + actions.setProxyTesting(true); + actions.setProxyError(null); + actions.setProxyTestResult(null); + + const portNum = port ? parseInt(port, 10) : undefined; + const result = await api.cliproxyServer.test({ + host, + port: portNum || undefined, + protocol, + authToken: authToken || undefined, + }); + actions.setProxyTestResult(result); + } catch (err) { + actions.setProxyError((err as Error).message); + } finally { + actions.setProxyTesting(false); + } + }, + [actions] + ); + + return { + config: state.proxyConfig, + loading: state.proxyLoading, + saving: state.proxySaving, + error: state.proxyError, + success: state.proxySuccess, + testResult: state.proxyTestResult, + testing: state.proxyTesting, + editedHost, + setEditedHost, + editedPort, + setEditedPort, + editedAuthToken, + setEditedAuthToken, + editedLocalPort, + setEditedLocalPort, + fetchConfig, + saveConfig, + testConnection, + }; +} diff --git a/ui/src/pages/settings/hooks/use-raw-config.ts b/ui/src/pages/settings/hooks/use-raw-config.ts new file mode 100644 index 00000000..3e6f9f0b --- /dev/null +++ b/ui/src/pages/settings/hooks/use-raw-config.ts @@ -0,0 +1,48 @@ +/** + * Raw Config Hook + */ + +import { useCallback, useState } from 'react'; +import { useSettingsContext, useSettingsActions } from './context-hooks'; + +export function useRawConfig() { + const { state } = useSettingsContext(); + const actions = useSettingsActions(); + const [copied, setCopied] = useState(false); + + const fetchRawConfig = useCallback(async () => { + try { + actions.setRawConfigLoading(true); + const res = await fetch('/api/config/raw'); + if (!res.ok) { + actions.setRawConfig(null); + return; + } + const text = await res.text(); + actions.setRawConfig(text); + } catch { + actions.setRawConfig(null); + } finally { + actions.setRawConfigLoading(false); + } + }, [actions]); + + const copyToClipboard = useCallback(async () => { + if (!state.rawConfig) return; + try { + await navigator.clipboard.writeText(state.rawConfig); + setCopied(true); + setTimeout(() => setCopied(false), 2000); + } catch { + // Silent fail + } + }, [state.rawConfig]); + + return { + rawConfig: state.rawConfig, + loading: state.rawConfigLoading, + copied, + fetchRawConfig, + copyToClipboard, + }; +} diff --git a/ui/src/pages/settings/hooks/use-settings-tab.ts b/ui/src/pages/settings/hooks/use-settings-tab.ts new file mode 100644 index 00000000..444b13e3 --- /dev/null +++ b/ui/src/pages/settings/hooks/use-settings-tab.ts @@ -0,0 +1,23 @@ +/** + * Settings Tab URL Sync Hook + */ + +import { useCallback } from 'react'; +import { useSearchParams } from 'react-router-dom'; +import type { SettingsTab } from '../types'; + +export function useSettingsTab() { + const [searchParams, setSearchParams] = useSearchParams(); + const tabParam = searchParams.get('tab'); + const activeTab: SettingsTab = + tabParam === 'globalenv' ? 'globalenv' : tabParam === 'proxy' ? 'proxy' : 'websearch'; + + const setActiveTab = useCallback( + (tab: SettingsTab) => { + setSearchParams({ tab }, { replace: true }); + }, + [setSearchParams] + ); + + return { activeTab, setActiveTab }; +} diff --git a/ui/src/pages/settings/hooks/use-websearch-config.ts b/ui/src/pages/settings/hooks/use-websearch-config.ts new file mode 100644 index 00000000..6fc5e05b --- /dev/null +++ b/ui/src/pages/settings/hooks/use-websearch-config.ts @@ -0,0 +1,137 @@ +/** + * WebSearch Config Hook + */ + +import { useCallback, useEffect, useState } from 'react'; +import { useSettingsContext, useSettingsActions } from './context-hooks'; +import type { WebSearchConfig } from '../types'; + +export function useWebSearchConfig() { + const { state } = useSettingsContext(); + const actions = useSettingsActions(); + const [geminiModelInput, setGeminiModelInput] = useState(''); + const [opencodeModelInput, setOpencodeModelInput] = useState(''); + const [geminiModelSaved, setGeminiModelSaved] = useState(false); + const [opencodeModelSaved, setOpencodeModelSaved] = useState(false); + + const fetchConfig = useCallback(async () => { + try { + actions.setWebSearchLoading(true); + actions.setWebSearchError(null); + const res = await fetch('/api/websearch'); + if (!res.ok) throw new Error('Failed to load WebSearch config'); + const data = await res.json(); + actions.setWebSearchConfig(data); + } catch (err) { + actions.setWebSearchError((err as Error).message); + } finally { + actions.setWebSearchLoading(false); + } + }, [actions]); + + const fetchStatus = useCallback(async () => { + try { + actions.setWebSearchStatusLoading(true); + const res = await fetch('/api/websearch/status'); + if (!res.ok) throw new Error('Failed to load status'); + const data = await res.json(); + actions.setWebSearchStatus(data); + } catch { + // Silent fail for status + } finally { + actions.setWebSearchStatusLoading(false); + } + }, [actions]); + + const saveConfig = useCallback( + async (updates: Partial) => { + const config = state.webSearchConfig; + if (!config) return; + + const optimisticConfig = { ...config, ...updates }; + actions.setWebSearchConfig(optimisticConfig); + + try { + actions.setWebSearchSaving(true); + actions.setWebSearchError(null); + + const res = await fetch('/api/websearch', { + method: 'PUT', + headers: { 'Content-Type': 'application/json' }, + body: JSON.stringify(optimisticConfig), + }); + + if (!res.ok) { + const data = await res.json(); + throw new Error(data.error || 'Failed to save'); + } + + const data = await res.json(); + actions.setWebSearchConfig(data.websearch); + actions.setWebSearchSuccess(true); + setTimeout(() => actions.setWebSearchSuccess(false), 1500); + } catch (err) { + actions.setWebSearchConfig(config); + actions.setWebSearchError((err as Error).message); + } finally { + actions.setWebSearchSaving(false); + } + }, + [state.webSearchConfig, actions] + ); + + // Sync model inputs with config + useEffect(() => { + if (state.webSearchConfig) { + setGeminiModelInput(state.webSearchConfig.providers?.gemini?.model ?? 'gemini-2.5-flash'); + setOpencodeModelInput( + state.webSearchConfig.providers?.opencode?.model ?? 'opencode/grok-code' + ); + } + }, [state.webSearchConfig]); + + const saveGeminiModel = useCallback(async () => { + const currentModel = state.webSearchConfig?.providers?.gemini?.model ?? 'gemini-2.5-flash'; + if (geminiModelInput !== currentModel) { + const providers = state.webSearchConfig?.providers || {}; + await saveConfig({ + providers: { ...providers, gemini: { ...providers.gemini, model: geminiModelInput } }, + }); + setGeminiModelSaved(true); + setTimeout(() => setGeminiModelSaved(false), 2000); + } + }, [geminiModelInput, state.webSearchConfig, saveConfig]); + + const saveOpencodeModel = useCallback(async () => { + const currentModel = state.webSearchConfig?.providers?.opencode?.model ?? 'opencode/grok-code'; + if (opencodeModelInput !== currentModel) { + const providers = state.webSearchConfig?.providers || {}; + await saveConfig({ + providers: { ...providers, opencode: { ...providers.opencode, model: opencodeModelInput } }, + }); + setOpencodeModelSaved(true); + setTimeout(() => setOpencodeModelSaved(false), 2000); + } + }, [opencodeModelInput, state.webSearchConfig, saveConfig]); + + return { + config: state.webSearchConfig, + status: state.webSearchStatus, + loading: state.webSearchLoading, + statusLoading: state.webSearchStatusLoading, + saving: state.webSearchSaving, + error: state.webSearchError, + success: state.webSearchSuccess, + geminiModelInput, + setGeminiModelInput, + opencodeModelInput, + setOpencodeModelInput, + geminiModelSaved, + opencodeModelSaved, + fetchConfig, + fetchStatus, + saveConfig, + saveGeminiModel, + saveOpencodeModel, + }; +} diff --git a/ui/src/pages/settings/index.tsx b/ui/src/pages/settings/index.tsx new file mode 100644 index 00000000..d658bc51 --- /dev/null +++ b/ui/src/pages/settings/index.tsx @@ -0,0 +1,148 @@ +/** + * Settings Page + * Main entry point with lazy-loaded sections and URL tab persistence + */ + +import { lazy, Suspense, startTransition, useEffect } from 'react'; +import { Panel, PanelGroup, PanelResizeHandle } from 'react-resizable-panels'; +import { Button } from '@/components/ui/button'; +import { RefreshCw, FileCode, Copy, Check, GripVertical } from 'lucide-react'; +import { CodeEditor } from '@/components/shared/code-editor'; +import { SettingsProvider } from './context'; +import { useSettingsTab, useRawConfig } from './hooks'; +import { TabNavigation } from './components/tab-navigation'; +import { SectionSkeleton } from './components/section-skeleton'; +import type { SettingsTab } from './types'; + +// Lazy-loaded sections +const WebSearchSection = lazy(() => import('./sections/websearch')); +const GlobalEnvSection = lazy(() => import('./sections/globalenv-section')); +const ProxySection = lazy(() => import('./sections/proxy')); + +// Inner component that uses context +function SettingsPageInner() { + const { activeTab, setActiveTab } = useSettingsTab(); + const { + rawConfig, + loading: rawConfigLoading, + copied, + fetchRawConfig, + copyToClipboard, + } = useRawConfig(); + + // Fetch raw config on mount + useEffect(() => { + fetchRawConfig(); + }, [fetchRawConfig]); + + const handleTabChange = (tab: SettingsTab) => { + startTransition(() => { + setActiveTab(tab); + }); + }; + + return ( +
+ + {/* Left Panel - Settings Controls */} + +
+ {/* Header with Tabs */} +
+ +
+ + {/* Tab Content */} + }> + {activeTab === 'websearch' && } + {activeTab === 'globalenv' && } + {activeTab === 'proxy' && } + +
+ + + {/* Resize Handle */} + + + + + {/* Right Panel - Config Viewer */} + +
+ {/* Header */} +
+
+ +
+

config.yaml

+

~/.ccs/config.yaml

+
+
+
+ + +
+
+ + {/* Config Content - scrollable */} +
+ {rawConfigLoading ? ( +
+ + Loading... +
+ ) : rawConfig ? ( + {}} + language="yaml" + readonly + minHeight="auto" + className="min-h-full" + /> + ) : ( +
+
+ +

Config file not found

+ + ccs migrate + +
+
+ )} +
+
+ + +
+ ); +} + +// Main export with context provider +export function SettingsPage() { + return ( + + + + ); +} diff --git a/ui/src/pages/settings/sections/globalenv-section.tsx b/ui/src/pages/settings/sections/globalenv-section.tsx new file mode 100644 index 00000000..f38b67fd --- /dev/null +++ b/ui/src/pages/settings/sections/globalenv-section.tsx @@ -0,0 +1,222 @@ +/** + * GlobalEnv Section + * Settings section for global environment variables + */ + +import { useEffect } from 'react'; +import { Button } from '@/components/ui/button'; +import { Alert, AlertDescription } from '@/components/ui/alert'; +import { ScrollArea } from '@/components/ui/scroll-area'; +import { Switch } from '@/components/ui/switch'; +import { Input } from '@/components/ui/input'; +import { RefreshCw, CheckCircle2, AlertCircle, Plus, Trash2 } from 'lucide-react'; +import { useGlobalEnvConfig, useRawConfig } from '../hooks'; + +export default function GlobalEnvSection() { + const { + config, + loading, + saving, + error, + success, + newEnvKey, + setNewEnvKey, + newEnvValue, + setNewEnvValue, + fetchConfig, + saveConfig, + addEnvVar, + removeEnvVar, + } = useGlobalEnvConfig(); + + const { fetchRawConfig } = useRawConfig(); + + // Load data on mount + useEffect(() => { + fetchConfig(); + fetchRawConfig(); + }, [fetchConfig, fetchRawConfig]); + + const toggleGlobalEnv = () => { + saveConfig({ enabled: !config?.enabled }); + }; + + if (loading) { + return ( +
+
+ + Loading... +
+
+ ); + } + + return ( + <> + {/* Toast-style alerts */} +
+ {error && ( + + + {error} + + )} + {success && ( +
+ + Saved +
+ )} +
+ + {/* Scrollable Content */} + +
+

+ Environment variables injected into all non-Claude subscription profiles (gemini, codex, + agy, copilot, etc.) +

+ + {/* Enable/Disable Toggle */} +
+
+

+ {config?.enabled ? 'Global Env enabled' : 'Global Env disabled'} +

+

+ {config?.enabled + ? 'Env vars will be injected into third-party profiles' + : 'Env vars will not be injected'} +

+
+ +
+ + {/* Current Environment Variables */} +
+

Environment Variables

+ + {config?.env && Object.keys(config.env).length > 0 ? ( +
+ {Object.entries(config.env).map(([key, value]) => ( +
+ {key} + = + {value} + +
+ ))} +
+ ) : ( +
+

No environment variables configured

+
+ )} + + {/* Add New Variable */} +
+

Add New Variable

+
+ setNewEnvKey(e.target.value.toUpperCase())} + placeholder="KEY_NAME" + className="flex-1 font-mono text-sm h-9" + disabled={saving} + /> + = + setNewEnvValue(e.target.value)} + placeholder="value" + className="flex-1 font-mono text-sm h-9" + disabled={saving} + /> + +
+
+ + {/* Common Variables Quick Add */} +
+

Quick Add Common Variables

+
+ {[ + { key: 'DISABLE_BUG_COMMAND', value: '1' }, + { key: 'DISABLE_ERROR_REPORTING', value: '1' }, + { key: 'DISABLE_TELEMETRY', value: '1' }, + ].map( + ({ key, value }) => + !config?.env?.[key] && ( + + ) + )} + {config?.env && + ['DISABLE_BUG_COMMAND', 'DISABLE_ERROR_REPORTING', 'DISABLE_TELEMETRY'].every( + (k) => config.env[k] + ) && ( + + All common variables are configured + + )} +
+
+
+
+ + + {/* Footer */} +
+ +
+ + ); +} diff --git a/ui/src/pages/settings/sections/proxy/index.tsx b/ui/src/pages/settings/sections/proxy/index.tsx new file mode 100644 index 00000000..365d7dfd --- /dev/null +++ b/ui/src/pages/settings/sections/proxy/index.tsx @@ -0,0 +1,289 @@ +/** + * Proxy Section + * Settings section for CLIProxyAPI configuration (local/remote) + */ + +import { useEffect } from 'react'; +import { Button } from '@/components/ui/button'; +import { Alert, AlertDescription } from '@/components/ui/alert'; +import { ScrollArea } from '@/components/ui/scroll-area'; +import { Switch } from '@/components/ui/switch'; +import { RefreshCw, CheckCircle2, AlertCircle, Laptop, Cloud } from 'lucide-react'; +import { useProxyConfig, useRawConfig } from '../../hooks'; +import { LocalProxyCard } from './local-proxy-card'; +import { RemoteProxyCard } from './remote-proxy-card'; + +export default function ProxySection() { + const { + config, + loading, + saving, + error, + success, + testResult, + testing, + editedHost, + setEditedHost, + editedPort, + setEditedPort, + editedAuthToken, + setEditedAuthToken, + editedLocalPort, + setEditedLocalPort, + fetchConfig, + saveConfig, + testConnection, + } = useProxyConfig(); + + const { fetchRawConfig } = useRawConfig(); + + // Load data on mount + useEffect(() => { + fetchConfig(); + fetchRawConfig(); + }, [fetchConfig, fetchRawConfig]); + + if (loading || !config) { + return ( +
+
+ + Loading... +
+
+ ); + } + + const isRemoteMode = config.remote.enabled ?? false; + const remoteConfig = config.remote; + const fallbackConfig = config.fallback; + + // Get display values (edited or from config) + const hostInput = config.remote.host ?? ''; + const portInput = config.remote.port !== undefined ? config.remote.port.toString() : ''; + const authTokenInput = config.remote.auth_token ?? ''; + const localPortInput = (config.local.port ?? 8317).toString(); + + const displayHost = editedHost ?? hostInput; + const displayPort = editedPort ?? portInput; + const displayAuthToken = editedAuthToken ?? authTokenInput; + const displayLocalPort = editedLocalPort ?? localPortInput; + + // Save functions for blur events + const saveHost = () => { + const value = editedHost ?? displayHost; + if (value !== config.remote.host) { + saveConfig({ remote: { ...remoteConfig, host: value } }); + } + setEditedHost(null); + }; + + const savePort = () => { + const portStr = editedPort ?? displayPort; + const port = portStr === '' ? undefined : parseInt(portStr, 10); + const effectivePort = port && !isNaN(port) && port > 0 ? port : undefined; + + if (effectivePort !== config.remote.port) { + saveConfig({ remote: { ...remoteConfig, port: effectivePort } }); + } + setEditedPort(null); + }; + + const saveAuthToken = () => { + const value = editedAuthToken ?? displayAuthToken; + if (value !== config.remote.auth_token) { + saveConfig({ remote: { ...remoteConfig, auth_token: value } }); + } + setEditedAuthToken(null); + }; + + const saveLocalPort = () => { + const port = parseInt(editedLocalPort ?? displayLocalPort, 10); + if (!isNaN(port) && port !== config.local.port) { + saveConfig({ local: { ...config.local, port } }); + } + setEditedLocalPort(null); + }; + + const handleTestConnection = () => { + testConnection({ + host: displayHost, + port: displayPort, + protocol: config.remote.protocol || 'http', + authToken: displayAuthToken, + }); + }; + + return ( + <> + {/* Toast-style alerts */} +
+ {error && ( + + + {error} + + )} + {success && ( +
+ + Saved +
+ )} +
+ + {/* Scrollable Content */} + +
+

+ Configure local or remote CLIProxyAPI connection for proxy-based profiles +

+ + {/* Mode Toggle - Card based selection */} +
+

Connection Mode

+
+ {/* Local Mode Card */} + + + {/* Remote Mode Card */} + +
+
+ + {/* Remote Settings - Show when remote mode is enabled */} + {isRemoteMode && ( + + )} + + {/* Fallback Settings */} +
+

Fallback Settings

+
+ {/* Enable Fallback */} +
+
+

Enable fallback to local

+

+ Use local proxy if remote is unreachable +

+
+ + saveConfig({ fallback: { ...fallbackConfig, enabled: checked } }) + } + disabled={saving || !isRemoteMode} + /> +
+ + {/* Auto-start on fallback */} +
+
+

Auto-start local proxy

+

+ Automatically start local proxy on fallback +

+
+ + saveConfig({ fallback: { ...fallbackConfig, auto_start: checked } }) + } + disabled={saving || !isRemoteMode || !fallbackConfig.enabled} + /> +
+
+
+ + {/* Local Proxy Settings - Only show in Local mode */} + {!isRemoteMode && ( + + )} +
+ + + {/* Footer */} +
+ +
+ + ); +} diff --git a/ui/src/pages/settings/sections/proxy/local-proxy-card.tsx b/ui/src/pages/settings/sections/proxy/local-proxy-card.tsx new file mode 100644 index 00000000..88e9650b --- /dev/null +++ b/ui/src/pages/settings/sections/proxy/local-proxy-card.tsx @@ -0,0 +1,66 @@ +/** + * Local Proxy Card + * Configuration card for local CLIProxyAPI settings + */ + +import { Switch } from '@/components/ui/switch'; +import { Input } from '@/components/ui/input'; +import type { CliproxyServerConfig } from '../../types'; + +interface LocalProxyCardProps { + config: CliproxyServerConfig; + saving: boolean; + displayLocalPort: string; + setEditedLocalPort: (value: string | null) => void; + onSaveLocalPort: () => void; + onSaveConfig: (updates: Partial) => void; +} + +export function LocalProxyCard({ + config, + saving, + displayLocalPort, + setEditedLocalPort, + onSaveLocalPort, + onSaveConfig, +}: LocalProxyCardProps) { + const localConfig = config.local; + + return ( +
+

Local Proxy

+
+ {/* Port */} +
+ + setEditedLocalPort(e.target.value)} + onBlur={onSaveLocalPort} + placeholder="8317" + className="font-mono max-w-32" + disabled={saving} + /> +
+ + {/* Auto-start */} +
+
+

Auto-start

+

+ Start local proxy automatically when needed +

+
+ + onSaveConfig({ local: { ...localConfig, auto_start: checked } }) + } + disabled={saving} + /> +
+
+
+ ); +} diff --git a/ui/src/pages/settings/sections/proxy/remote-proxy-card.tsx b/ui/src/pages/settings/sections/proxy/remote-proxy-card.tsx new file mode 100644 index 00000000..29e26413 --- /dev/null +++ b/ui/src/pages/settings/sections/proxy/remote-proxy-card.tsx @@ -0,0 +1,184 @@ +/** + * Remote Proxy Card + * Configuration card for remote CLIProxyAPI settings + */ + +import { Button } from '@/components/ui/button'; +import { Input } from '@/components/ui/input'; +import { + Select, + SelectContent, + SelectItem, + SelectTrigger, + SelectValue, +} from '@/components/ui/select'; +import { Cloud, RefreshCw, Wifi, WifiOff, CheckCircle2 } from 'lucide-react'; +import type { CliproxyServerConfig, RemoteProxyStatus } from '../../types'; + +interface RemoteProxyCardProps { + config: CliproxyServerConfig; + saving: boolean; + testing: boolean; + testResult: RemoteProxyStatus | null; + displayHost: string; + displayPort: string; + displayAuthToken: string; + setEditedHost: (value: string | null) => void; + setEditedPort: (value: string | null) => void; + setEditedAuthToken: (value: string | null) => void; + onSaveHost: () => void; + onSavePort: () => void; + onSaveAuthToken: () => void; + onSaveConfig: (updates: Partial) => void; + onTestConnection: () => void; +} + +export function RemoteProxyCard({ + config, + saving, + testing, + testResult, + displayHost, + displayPort, + displayAuthToken, + setEditedHost, + setEditedPort, + setEditedAuthToken, + onSaveHost, + onSavePort, + onSaveAuthToken, + onSaveConfig, + onTestConnection, +}: RemoteProxyCardProps) { + const remoteConfig = config.remote; + + // HTTP defaults to 8317 (CLIProxyAPI default), HTTPS to 443 (standard SSL) + const getDefaultPort = (protocol: 'http' | 'https') => (protocol === 'https' ? 443 : 8317); + + return ( +
+

+ + Remote Server Configuration +

+ + {/* Host */} +
+ + setEditedHost(e.target.value)} + onBlur={onSaveHost} + placeholder="192.168.1.100 or proxy.example.com" + className="font-mono" + disabled={saving} + /> +
+ + {/* Port and Protocol */} +
+
+ + setEditedPort(e.target.value.replace(/\D/g, ''))} + onBlur={onSavePort} + placeholder={`Leave empty for ${getDefaultPort(config.remote.protocol || 'http')}`} + className="font-mono" + disabled={saving} + /> +
+
+ + +
+
+ + {/* Auth Token */} +
+ + setEditedAuthToken(e.target.value)} + onBlur={onSaveAuthToken} + placeholder="Bearer token for authentication" + className="font-mono" + disabled={saving} + /> +
+ + {/* Test Connection */} +
+ + + {/* Test Result */} + {testResult && ( +
+
+ {testResult.reachable ? ( + <> + + + Connected ({testResult.latencyMs}ms) + + + ) : ( + <> + + + {testResult.error || 'Connection failed'} + + + )} +
+
+ )} +
+
+ ); +} diff --git a/ui/src/pages/settings/sections/websearch/index.tsx b/ui/src/pages/settings/sections/websearch/index.tsx new file mode 100644 index 00000000..5891f6d2 --- /dev/null +++ b/ui/src/pages/settings/sections/websearch/index.tsx @@ -0,0 +1,226 @@ +/** + * WebSearch Section + * Settings section for WebSearch providers (Gemini, OpenCode, Grok) + */ + +import { useState, useEffect } from 'react'; +import { Button } from '@/components/ui/button'; +import { Alert, AlertDescription } from '@/components/ui/alert'; +import { ScrollArea } from '@/components/ui/scroll-area'; +import { RefreshCw, CheckCircle2, AlertCircle } from 'lucide-react'; +import { useWebSearchConfig, useRawConfig } from '../../hooks'; +import { ProviderCard } from './provider-card'; + +export default function WebSearchSection() { + const { + config, + status, + loading, + statusLoading, + saving, + error, + success, + geminiModelInput, + setGeminiModelInput, + opencodeModelInput, + setOpencodeModelInput, + geminiModelSaved, + opencodeModelSaved, + fetchConfig, + fetchStatus, + saveConfig, + saveGeminiModel, + saveOpencodeModel, + } = useWebSearchConfig(); + + const { fetchRawConfig } = useRawConfig(); + + // Collapsible install hints state + const [showGeminiHint, setShowGeminiHint] = useState(false); + const [showOpencodeHint, setShowOpencodeHint] = useState(false); + const [showGrokHint, setShowGrokHint] = useState(false); + + // Load data on mount + useEffect(() => { + fetchConfig(); + fetchStatus(); + fetchRawConfig(); + }, [fetchConfig, fetchStatus, fetchRawConfig]); + + const isGeminiEnabled = config?.providers?.gemini?.enabled ?? false; + const isGrokEnabled = config?.providers?.grok?.enabled ?? false; + const isOpenCodeEnabled = config?.providers?.opencode?.enabled ?? false; + + const toggleGemini = () => { + const providers = config?.providers || {}; + const currentState = providers.gemini?.enabled ?? false; + saveConfig({ + enabled: !currentState || isGrokEnabled || isOpenCodeEnabled, + providers: { ...providers, gemini: { ...providers.gemini, enabled: !currentState } }, + }); + }; + + const toggleGrok = () => { + const providers = config?.providers || {}; + const currentState = providers.grok?.enabled ?? false; + saveConfig({ + enabled: isGeminiEnabled || !currentState || isOpenCodeEnabled, + providers: { ...providers, grok: { ...providers.grok, enabled: !currentState } }, + }); + }; + + const toggleOpenCode = () => { + const providers = config?.providers || {}; + const currentState = providers.opencode?.enabled ?? false; + saveConfig({ + enabled: isGeminiEnabled || isGrokEnabled || !currentState, + providers: { ...providers, opencode: { ...providers.opencode, enabled: !currentState } }, + }); + }; + + if (loading) { + return ( +
+
+ + Loading... +
+
+ ); + } + + return ( + <> + {/* Toast-style alerts */} +
+ {error && ( + + + {error} + + )} + {success && ( +
+ + Saved +
+ )} +
+ + {/* Scrollable Content */} + +
+

+ CLI-based web search for third-party profiles (gemini, codex, agy, etc.) +

+ + {/* Status Summary */} +
+
+

+ {isGeminiEnabled ? 'WebSearch enabled' : 'WebSearch disabled'} +

+ {statusLoading ? ( +

Checking status...

+ ) : status?.readiness ? ( +

{status.readiness.message}

+ ) : null} +
+ +
+ + {/* CLI Providers */} +
+

Providers

+ + + + + + +
+
+ + + {/* Footer */} +
+ +
+ + ); +} diff --git a/ui/src/pages/settings/sections/websearch/provider-card.tsx b/ui/src/pages/settings/sections/websearch/provider-card.tsx new file mode 100644 index 00000000..5792d680 --- /dev/null +++ b/ui/src/pages/settings/sections/websearch/provider-card.tsx @@ -0,0 +1,172 @@ +/** + * Provider Card Component + * Reusable card for CLI provider configuration in WebSearch section + */ + +import { Switch } from '@/components/ui/switch'; +import { Input } from '@/components/ui/input'; +import { Terminal, ExternalLink, ChevronDown, ChevronUp, Check } from 'lucide-react'; + +export interface ProviderCardProps { + name: string; + label: string; + badge: string; + badgeColor: 'green' | 'blue' | 'purple'; + enabled: boolean; + installed: boolean; + statusLoading: boolean; + saving: boolean; + onToggle: () => void; + modelInput?: string; + setModelInput?: (v: string) => void; + onModelBlur?: () => void; + modelSaved?: boolean; + modelPlaceholder?: string; + showHint: boolean; + setShowHint: (v: boolean) => void; + installCmd: string; + docsUrl: string; + hintColor: 'amber' | 'blue' | 'purple'; +} + +export function ProviderCard({ + name, + label, + badge, + badgeColor, + enabled, + installed, + statusLoading, + saving, + onToggle, + modelInput, + setModelInput, + onModelBlur, + modelSaved, + modelPlaceholder, + showHint, + setShowHint, + installCmd, + docsUrl, + hintColor, +}: ProviderCardProps) { + const badgeClass = + badgeColor === 'green' + ? 'bg-green-500/10 text-green-600' + : badgeColor === 'blue' + ? 'bg-blue-500/10 text-blue-600' + : 'bg-purple-500/10 text-purple-600'; + + const hintBgClass = + hintColor === 'amber' + ? 'bg-amber-50 dark:bg-amber-900/20 text-amber-700 dark:text-amber-300' + : hintColor === 'blue' + ? 'bg-blue-50 dark:bg-blue-900/20 text-blue-700 dark:text-blue-300' + : 'bg-purple-50 dark:bg-purple-900/20 text-purple-700 dark:text-purple-300'; + + const hintCodeClass = + hintColor === 'amber' + ? 'bg-amber-100 dark:bg-amber-900/40' + : hintColor === 'blue' + ? 'bg-blue-100 dark:bg-blue-900/40' + : 'bg-purple-100 dark:bg-purple-900/40'; + + const hintTextClass = + hintColor === 'amber' + ? 'text-amber-600 dark:text-amber-400' + : hintColor === 'blue' + ? 'text-blue-600 dark:text-blue-400' + : 'text-purple-600 dark:text-purple-400'; + + const displayName = + name === 'opencode' ? 'OpenCode' : name.charAt(0).toUpperCase() + name.slice(1); + + return ( +
+
+
+ +
+
+

{name}

+ + {badge} + + {installed ? ( + + installed + + ) : ( + + not installed + + )} +
+

{label}

+
+
+ +
+ + {/* Model input when enabled */} + {enabled && modelInput !== undefined && setModelInput && onModelBlur && ( +
+
+ + setModelInput(e.target.value)} + onBlur={onModelBlur} + placeholder={modelPlaceholder} + className="h-8 text-sm font-mono" + disabled={saving} + /> + {modelSaved && ( + + + Saved + + )} +
+
+ )} + + {/* Installation hint when not installed */} + {!installed && !statusLoading && ( +
+ + {showHint && ( +
+

+ Install globally{' '} + {badge === 'GROK_API_KEY' ? '(requires xAI API key)' : '(FREE tier available)'}: +

+ + {installCmd} + + + + View documentation + +
+ )} +
+ )} +
+ ); +} diff --git a/ui/src/pages/settings/settings-context.ts b/ui/src/pages/settings/settings-context.ts new file mode 100644 index 00000000..d0329ac8 --- /dev/null +++ b/ui/src/pages/settings/settings-context.ts @@ -0,0 +1,150 @@ +/** + * Settings Context Definition + * Context and types for settings page state management + */ + +import { createContext, type Dispatch } from 'react'; +import type { + WebSearchConfig, + GlobalEnvConfig, + CliproxyServerConfig, + WebSearchStatus, + RemoteProxyStatus, +} from './types'; + +// === State === + +export interface SettingsState { + // WebSearch state + webSearchConfig: WebSearchConfig | null; + webSearchStatus: WebSearchStatus | null; + webSearchLoading: boolean; + webSearchStatusLoading: boolean; + webSearchSaving: boolean; + webSearchError: string | null; + webSearchSuccess: boolean; + // GlobalEnv state + globalEnvConfig: GlobalEnvConfig | null; + globalEnvLoading: boolean; + globalEnvSaving: boolean; + globalEnvError: string | null; + globalEnvSuccess: boolean; + // Proxy state + proxyConfig: CliproxyServerConfig | null; + proxyLoading: boolean; + proxySaving: boolean; + proxyError: string | null; + proxySuccess: boolean; + proxyTestResult: RemoteProxyStatus | null; + proxyTesting: boolean; + // Raw config + rawConfig: string | null; + rawConfigLoading: boolean; +} + +export const initialSettingsState: SettingsState = { + webSearchConfig: null, + webSearchStatus: null, + webSearchLoading: true, + webSearchStatusLoading: true, + webSearchSaving: false, + webSearchError: null, + webSearchSuccess: false, + globalEnvConfig: null, + globalEnvLoading: true, + globalEnvSaving: false, + globalEnvError: null, + globalEnvSuccess: false, + proxyConfig: null, + proxyLoading: true, + proxySaving: false, + proxyError: null, + proxySuccess: false, + proxyTestResult: null, + proxyTesting: false, + rawConfig: null, + rawConfigLoading: false, +}; + +// === Actions === + +export type SettingsAction = + | { type: 'SET_WEBSEARCH_CONFIG'; payload: WebSearchConfig | null } + | { type: 'SET_WEBSEARCH_STATUS'; payload: WebSearchStatus | null } + | { type: 'SET_WEBSEARCH_LOADING'; payload: boolean } + | { type: 'SET_WEBSEARCH_STATUS_LOADING'; payload: boolean } + | { type: 'SET_WEBSEARCH_SAVING'; payload: boolean } + | { type: 'SET_WEBSEARCH_ERROR'; payload: string | null } + | { type: 'SET_WEBSEARCH_SUCCESS'; payload: boolean } + | { type: 'SET_GLOBALENV_CONFIG'; payload: GlobalEnvConfig | null } + | { type: 'SET_GLOBALENV_LOADING'; payload: boolean } + | { type: 'SET_GLOBALENV_SAVING'; payload: boolean } + | { type: 'SET_GLOBALENV_ERROR'; payload: string | null } + | { type: 'SET_GLOBALENV_SUCCESS'; payload: boolean } + | { type: 'SET_PROXY_CONFIG'; payload: CliproxyServerConfig | null } + | { type: 'SET_PROXY_LOADING'; payload: boolean } + | { type: 'SET_PROXY_SAVING'; payload: boolean } + | { type: 'SET_PROXY_ERROR'; payload: string | null } + | { type: 'SET_PROXY_SUCCESS'; payload: boolean } + | { type: 'SET_PROXY_TEST_RESULT'; payload: RemoteProxyStatus | null } + | { type: 'SET_PROXY_TESTING'; payload: boolean } + | { type: 'SET_RAW_CONFIG'; payload: string | null } + | { type: 'SET_RAW_CONFIG_LOADING'; payload: boolean }; + +export function settingsReducer(state: SettingsState, action: SettingsAction): SettingsState { + switch (action.type) { + case 'SET_WEBSEARCH_CONFIG': + return { ...state, webSearchConfig: action.payload }; + case 'SET_WEBSEARCH_STATUS': + return { ...state, webSearchStatus: action.payload }; + case 'SET_WEBSEARCH_LOADING': + return { ...state, webSearchLoading: action.payload }; + case 'SET_WEBSEARCH_STATUS_LOADING': + return { ...state, webSearchStatusLoading: action.payload }; + case 'SET_WEBSEARCH_SAVING': + return { ...state, webSearchSaving: action.payload }; + case 'SET_WEBSEARCH_ERROR': + return { ...state, webSearchError: action.payload }; + case 'SET_WEBSEARCH_SUCCESS': + return { ...state, webSearchSuccess: action.payload }; + case 'SET_GLOBALENV_CONFIG': + return { ...state, globalEnvConfig: action.payload }; + case 'SET_GLOBALENV_LOADING': + return { ...state, globalEnvLoading: action.payload }; + case 'SET_GLOBALENV_SAVING': + return { ...state, globalEnvSaving: action.payload }; + case 'SET_GLOBALENV_ERROR': + return { ...state, globalEnvError: action.payload }; + case 'SET_GLOBALENV_SUCCESS': + return { ...state, globalEnvSuccess: action.payload }; + case 'SET_PROXY_CONFIG': + return { ...state, proxyConfig: action.payload }; + case 'SET_PROXY_LOADING': + return { ...state, proxyLoading: action.payload }; + case 'SET_PROXY_SAVING': + return { ...state, proxySaving: action.payload }; + case 'SET_PROXY_ERROR': + return { ...state, proxyError: action.payload }; + case 'SET_PROXY_SUCCESS': + return { ...state, proxySuccess: action.payload }; + case 'SET_PROXY_TEST_RESULT': + return { ...state, proxyTestResult: action.payload }; + case 'SET_PROXY_TESTING': + return { ...state, proxyTesting: action.payload }; + case 'SET_RAW_CONFIG': + return { ...state, rawConfig: action.payload }; + case 'SET_RAW_CONFIG_LOADING': + return { ...state, rawConfigLoading: action.payload }; + default: + return state; + } +} + +// === Context === + +export interface SettingsContextValue { + state: SettingsState; + dispatch: Dispatch; +} + +export const SettingsContext = createContext(null); diff --git a/ui/src/pages/settings/types.ts b/ui/src/pages/settings/types.ts new file mode 100644 index 00000000..55ea8cfa --- /dev/null +++ b/ui/src/pages/settings/types.ts @@ -0,0 +1,56 @@ +/** + * Settings Page Types + * Type definitions for WebSearch, GlobalEnv, and Proxy configurations + */ + +import type { CliproxyServerConfig, RemoteProxyStatus } from '@/lib/api-client'; + +// === WebSearch Types === + +export interface ProviderConfig { + enabled?: boolean; + model?: string; + timeout?: number; +} + +export interface WebSearchProvidersConfig { + gemini?: ProviderConfig; + grok?: ProviderConfig; + opencode?: ProviderConfig; +} + +export interface WebSearchConfig { + enabled: boolean; + providers?: WebSearchProvidersConfig; +} + +export interface CliStatus { + installed: boolean; + path: string | null; + version: string | null; +} + +export interface WebSearchStatus { + geminiCli: CliStatus; + grokCli: CliStatus; + opencodeCli: CliStatus; + readiness: { + status: 'ready' | 'unavailable'; + message: string; + }; +} + +// === GlobalEnv Types === + +export interface GlobalEnvConfig { + enabled: boolean; + env: Record; +} + +// === Tab Types === + +export type SettingsTab = 'websearch' | 'globalenv' | 'proxy'; + +// === Re-exports from api-client === + +export type { CliproxyServerConfig, RemoteProxyStatus }; From 03d9bf76c474f93f12fcc5dbdaa55c1f215b1e39 Mon Sep 17 00:00:00 2001 From: kaitranntt Date: Sun, 21 Dec 2025 03:27:15 -0500 Subject: [PATCH 14/31] refactor(ui): modularize analytics page into directory structure - split analytics.tsx (420 lines) into modular components - extract analytics-header, charts-grid, cost-by-model-card - add analytics-skeleton for loading states - separate hooks, types, and utils --- ui/src/pages/analytics.tsx | 420 ------------------ .../analytics/components/analytics-header.tsx | 75 ++++ .../components/analytics-skeleton.tsx | 69 +++ .../analytics/components/charts-grid.tsx | 100 +++++ .../components/cost-by-model-card.tsx | 163 +++++++ ui/src/pages/analytics/hooks.ts | 120 +++++ ui/src/pages/analytics/index.tsx | 96 ++++ ui/src/pages/analytics/types.ts | 19 + ui/src/pages/analytics/utils.ts | 13 + 9 files changed, 655 insertions(+), 420 deletions(-) delete mode 100644 ui/src/pages/analytics.tsx create mode 100644 ui/src/pages/analytics/components/analytics-header.tsx create mode 100644 ui/src/pages/analytics/components/analytics-skeleton.tsx create mode 100644 ui/src/pages/analytics/components/charts-grid.tsx create mode 100644 ui/src/pages/analytics/components/cost-by-model-card.tsx create mode 100644 ui/src/pages/analytics/hooks.ts create mode 100644 ui/src/pages/analytics/index.tsx create mode 100644 ui/src/pages/analytics/types.ts create mode 100644 ui/src/pages/analytics/utils.ts diff --git a/ui/src/pages/analytics.tsx b/ui/src/pages/analytics.tsx deleted file mode 100644 index 520d385d..00000000 --- a/ui/src/pages/analytics.tsx +++ /dev/null @@ -1,420 +0,0 @@ -/** - * Analytics Page - * - * Displays Claude Code usage analytics with charts. - * Features trend charts, model breakdown, cost analysis, and anomaly detection. - */ - -import { useState, useMemo, useRef, useCallback } from 'react'; -import type { DateRange } from 'react-day-picker'; -import { startOfMonth, subDays, formatDistanceToNow } from 'date-fns'; -import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card'; -import { Button } from '@/components/ui/button'; -import { Skeleton } from '@/components/ui/skeleton'; -import { Popover, PopoverContent, PopoverAnchor } from '@/components/ui/popover'; -import { DateRangeFilter } from '@/components/analytics/date-range-filter'; -import { UsageSummaryCards } from '@/components/analytics/usage-summary-cards'; -import { UsageTrendChart } from '@/components/analytics/usage-trend-chart'; -import { ModelBreakdownChart } from '@/components/analytics/model-breakdown-chart'; -import { ModelDetailsContent } from '@/components/analytics/model-details-content'; -import { SessionStatsCard } from '@/components/analytics/session-stats-card'; -import { CliproxyStatsCard } from '@/components/analytics/cliproxy-stats-card'; -import { TrendingUp, PieChart, RefreshCw, DollarSign, ChevronRight } from 'lucide-react'; -import { - useUsageSummary, - useUsageTrends, - useHourlyUsage, - useModelUsage, - useRefreshUsage, - useUsageStatus, - useSessions, - type ModelUsage, -} from '@/hooks/use-usage'; -import { getModelColor, cn } from '@/lib/utils'; -import { usePrivacy, PRIVACY_BLUR_CLASS } from '@/contexts/privacy-context'; - -// Format token count to human-readable (K/M/B) -function formatTokens(num: number): string { - if (num >= 1_000_000_000) return `${(num / 1_000_000_000).toFixed(1)}B`; - if (num >= 1_000_000) return `${(num / 1_000_000).toFixed(1)}M`; - if (num >= 1_000) return `${(num / 1_000).toFixed(0)}K`; - return num.toString(); -} - -export function AnalyticsPage() { - const { privacyMode } = usePrivacy(); - - // Default to last 30 days - const [dateRange, setDateRange] = useState({ - from: subDays(new Date(), 30), - to: new Date(), - }); - const [isRefreshing, setIsRefreshing] = useState(false); - const [selectedModel, setSelectedModel] = useState(null); - const [popoverPosition, setPopoverPosition] = useState<{ x: number; y: number } | null>(null); - const [viewMode, setViewMode] = useState<'daily' | 'hourly'>('daily'); - const popoverAnchorRef = useRef(null); - - // Refresh hook - const refreshUsage = useRefreshUsage(); - - const handleRefresh = async () => { - setIsRefreshing(true); - try { - await refreshUsage(); - } finally { - setIsRefreshing(false); - } - }; - - // Convert dates to API format - const apiOptions = { - startDate: dateRange?.from, - endDate: dateRange?.to, - }; - - // Fetch data - const { data: summary, isLoading: isSummaryLoading } = useUsageSummary(apiOptions); - const { data: trends, isLoading: isTrendsLoading } = useUsageTrends(apiOptions); - const { data: hourlyData, isLoading: isHourlyLoading } = useHourlyUsage(apiOptions); - const { data: models, isLoading: isModelsLoading } = useModelUsage(apiOptions); - const { data: sessions, isLoading: isSessionsLoading } = useSessions({ ...apiOptions, limit: 3 }); - const { data: status } = useUsageStatus(); - - // Handle "24H" preset click - const handleTodayClick = useCallback(() => { - const now = new Date(); - setDateRange({ from: subDays(now, 1), to: now }); - setViewMode('hourly'); - }, []); - - // Handle date range changes from DateRangeFilter - const handleDateRangeChange = useCallback((range: DateRange | undefined) => { - setDateRange(range); - setViewMode('daily'); // Switch back to daily view for multi-day ranges - }, []); - - // Format "Last updated" text - const lastUpdatedText = useMemo(() => { - if (!status?.lastFetch) return null; - return formatDistanceToNow(new Date(status.lastFetch), { addSuffix: true }); - }, [status?.lastFetch]); - - // Handle model click for popover - const handleModelClick = useCallback((model: ModelUsage, event: React.MouseEvent) => { - const rect = (event.currentTarget as HTMLElement).getBoundingClientRect(); - setPopoverPosition({ x: rect.left + rect.width / 2, y: rect.top + rect.height / 2 }); - setSelectedModel(model); - }, []); - - const handlePopoverClose = useCallback(() => { - setSelectedModel(null); - setPopoverPosition(null); - }, []); - - return ( -
- {/* Header */} -
-
-

Analytics

-

Track usage & insights

-
-
- - - - {lastUpdatedText && ( - - Updated {lastUpdatedText} - - )} - -
-
- - {/* Summary Cards */} - - - {/* Main Content */} -
- {/* Usage Trend Chart - Full Width */} - - - - - {viewMode === 'hourly' ? 'Last 24 Hours' : 'Usage Trends'} - - - - - - - - {/* Bottom Row - Cost by Model (4) + Model Usage (2) + Session Stats (2) + CLIProxy Stats (2) */} -
- {/* Cost by Model - 4/10 width with breakdown */} - - - - - Cost by Model - - - - {isModelsLoading ? ( - - ) : ( -
- {[...(models || [])] - .sort((a, b) => b.cost - a.cost) - .map((model) => ( - - ))} - {/* Legend */} -
- -
- Input - - -
- Output - - -
- Cache Write - - -
- Cache Read - -
-
- )} - - - - {/* Model Distribution - 2/10 width */} - - - - - Model Usage - - - - - - - - {/* Session Stats - 2/10 width */} - - - {/* CLIProxy Stats - 2/10 width */} - -
- - {/* Model Details Popover - positioned at cursor */} - !open && handlePopoverClose()}> - -
- - - {selectedModel && } - - -
-
- ); -} - -export function AnalyticsSkeleton() { - return ( -
- {/* Usage Trends Skeleton */} - - - - - - - - - - {/* Bottom Row Skeletons */} -
- {/* Cost Breakdown Skeleton */} - - - - - -
- {[1, 2, 3, 4, 5].map((i) => ( -
-
- - -
- -
- ))} -
- - - - {/* Model Usage Skeleton */} - - - - - -
-
- -
-
- {[1, 2, 3, 4].map((i) => ( -
- - -
- ))} -
-
- - -
-
- ); -} diff --git a/ui/src/pages/analytics/components/analytics-header.tsx b/ui/src/pages/analytics/components/analytics-header.tsx new file mode 100644 index 00000000..484d2383 --- /dev/null +++ b/ui/src/pages/analytics/components/analytics-header.tsx @@ -0,0 +1,75 @@ +/** + * Analytics Header Component + * + * Title, date filter, 24H button, and refresh controls. + */ + +import type { DateRange } from 'react-day-picker'; +import { subDays, startOfMonth } from 'date-fns'; +import { Button } from '@/components/ui/button'; +import { DateRangeFilter } from '@/components/analytics/date-range-filter'; +import { RefreshCw } from 'lucide-react'; + +interface AnalyticsHeaderProps { + dateRange: DateRange | undefined; + onDateRangeChange: (range: DateRange | undefined) => void; + onTodayClick: () => void; + onRefresh: () => void; + isRefreshing: boolean; + lastUpdatedText: string | null; + viewMode: 'daily' | 'hourly'; +} + +export function AnalyticsHeader({ + dateRange, + onDateRangeChange, + onTodayClick, + onRefresh, + isRefreshing, + lastUpdatedText, + viewMode, +}: AnalyticsHeaderProps) { + return ( +
+
+

Analytics

+

Track usage & insights

+
+
+ + + + {lastUpdatedText && ( + + Updated {lastUpdatedText} + + )} + +
+
+ ); +} diff --git a/ui/src/pages/analytics/components/analytics-skeleton.tsx b/ui/src/pages/analytics/components/analytics-skeleton.tsx new file mode 100644 index 00000000..e8fe789c --- /dev/null +++ b/ui/src/pages/analytics/components/analytics-skeleton.tsx @@ -0,0 +1,69 @@ +/** + * Analytics Skeleton Component + * + * Loading skeleton for the analytics page. + */ + +import { Card, CardContent, CardHeader } from '@/components/ui/card'; +import { Skeleton } from '@/components/ui/skeleton'; + +export function AnalyticsSkeleton() { + return ( +
+ {/* Usage Trends Skeleton */} + + + + + + + + + + {/* Bottom Row Skeletons */} +
+ {/* Cost Breakdown Skeleton */} + + + + + +
+ {[1, 2, 3, 4, 5].map((i) => ( +
+
+ + +
+ +
+ ))} +
+ + + + {/* Model Usage Skeleton */} + + + + + +
+
+ +
+
+ {[1, 2, 3, 4].map((i) => ( +
+ + +
+ ))} +
+
+ + +
+
+ ); +} diff --git a/ui/src/pages/analytics/components/charts-grid.tsx b/ui/src/pages/analytics/components/charts-grid.tsx new file mode 100644 index 00000000..17aed1d3 --- /dev/null +++ b/ui/src/pages/analytics/components/charts-grid.tsx @@ -0,0 +1,100 @@ +/** + * Charts Grid Component + * + * Layout grid for analytics charts and cards. + */ + +import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card'; +import { UsageTrendChart } from '@/components/analytics/usage-trend-chart'; +import { ModelBreakdownChart } from '@/components/analytics/model-breakdown-chart'; +import { SessionStatsCard } from '@/components/analytics/session-stats-card'; +import { CliproxyStatsCard } from '@/components/analytics/cliproxy-stats-card'; +import { TrendingUp, PieChart } from 'lucide-react'; +import { usePrivacy } from '@/contexts/privacy-context'; +import { CostByModelCard } from './cost-by-model-card'; +import type { ModelUsage, PaginatedSessions, DailyUsage, HourlyUsage } from '@/hooks/use-usage'; + +interface ChartsGridProps { + viewMode: 'daily' | 'hourly'; + trends: DailyUsage[] | undefined; + hourlyData: HourlyUsage[] | undefined; + models: ModelUsage[] | undefined; + sessions: PaginatedSessions | undefined; + isTrendsLoading: boolean; + isHourlyLoading: boolean; + isModelsLoading: boolean; + isSessionsLoading: boolean; + isSummaryLoading: boolean; + onModelClick: (model: ModelUsage, event: React.MouseEvent) => void; +} + +export function ChartsGrid({ + viewMode, + trends, + hourlyData, + models, + sessions, + isTrendsLoading, + isHourlyLoading, + isModelsLoading, + isSessionsLoading, + isSummaryLoading, + onModelClick, +}: ChartsGridProps) { + const { privacyMode } = usePrivacy(); + + return ( +
+ {/* Usage Trend Chart - Full Width */} + + + + + {viewMode === 'hourly' ? 'Last 24 Hours' : 'Usage Trends'} + + + + + + + + {/* Bottom Row */} +
+ {/* Cost by Model */} + + + {/* Model Distribution */} + + + + + Model Usage + + + + + + + + {/* Session Stats */} + + + {/* CLIProxy Stats */} + +
+
+ ); +} diff --git a/ui/src/pages/analytics/components/cost-by-model-card.tsx b/ui/src/pages/analytics/components/cost-by-model-card.tsx new file mode 100644 index 00000000..248b77c4 --- /dev/null +++ b/ui/src/pages/analytics/components/cost-by-model-card.tsx @@ -0,0 +1,163 @@ +/** + * Cost By Model Card Component + * + * Displays a list of models sorted by cost with breakdown bars. + */ + +import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card'; +import { Skeleton } from '@/components/ui/skeleton'; +import { DollarSign, ChevronRight } from 'lucide-react'; +import { getModelColor, cn } from '@/lib/utils'; +import { PRIVACY_BLUR_CLASS } from '@/contexts/privacy-context'; +import { formatTokens } from '../utils'; +import type { ModelUsage } from '@/hooks/use-usage'; + +interface CostByModelCardProps { + models: ModelUsage[] | undefined; + isLoading: boolean; + onModelClick: (model: ModelUsage, event: React.MouseEvent) => void; + privacyMode: boolean; +} + +export function CostByModelCard({ + models, + isLoading, + onModelClick, + privacyMode, +}: CostByModelCardProps) { + return ( + + + + + Cost by Model + + + + {isLoading ? ( + + ) : ( +
+ {[...(models || [])] + .sort((a, b) => b.cost - a.cost) + .map((model) => ( + + ))} + {/* Legend */} + +
+ )} + + + ); +} + +function CostBreakdownBar({ model }: { model: ModelUsage }) { + const colors = { + input: '#335c67', + output: '#fff3b0', + cacheWrite: '#e09f3e', + cacheRead: '#9e2a2b', + }; + + const getWidth = (cost: number) => (model.cost > 0 ? (cost / model.cost) * 100 : 0); + + return ( +
+
+
+
+
+
+
+
+ ); +} + +function CostLegend() { + const items = [ + { color: '#335c67', label: 'Input' }, + { color: '#fff3b0', label: 'Output', hasBorder: true }, + { color: '#e09f3e', label: 'Cache Write' }, + { color: '#9e2a2b', label: 'Cache Read' }, + ]; + + return ( +
+ {items.map(({ color, label, hasBorder }) => ( + +
+ {label} + + ))} +
+ ); +} diff --git a/ui/src/pages/analytics/hooks.ts b/ui/src/pages/analytics/hooks.ts new file mode 100644 index 00000000..8f8e39a7 --- /dev/null +++ b/ui/src/pages/analytics/hooks.ts @@ -0,0 +1,120 @@ +/** + * Analytics Page Hooks + * + * Composite hook centralizing all data fetching and state for the analytics page. + */ + +import { useState, useMemo, useCallback } from 'react'; +import type { DateRange } from 'react-day-picker'; +import { subDays, formatDistanceToNow } from 'date-fns'; +import { + useUsageSummary, + useUsageTrends, + useHourlyUsage, + useModelUsage, + useRefreshUsage, + useUsageStatus, + useSessions, + type ModelUsage, +} from '@/hooks/use-usage'; + +export function useAnalyticsPage() { + // Default to last 30 days + const [dateRange, setDateRange] = useState({ + from: subDays(new Date(), 30), + to: new Date(), + }); + const [isRefreshing, setIsRefreshing] = useState(false); + const [selectedModel, setSelectedModel] = useState(null); + const [popoverPosition, setPopoverPosition] = useState<{ x: number; y: number } | null>(null); + const [viewMode, setViewMode] = useState<'daily' | 'hourly'>('daily'); + + // Refresh hook + const refreshUsage = useRefreshUsage(); + + const handleRefresh = useCallback(async () => { + setIsRefreshing(true); + try { + await refreshUsage(); + } finally { + setIsRefreshing(false); + } + }, [refreshUsage]); + + // Convert dates to API format + const apiOptions = { + startDate: dateRange?.from, + endDate: dateRange?.to, + }; + + // Fetch data + const { data: summary, isLoading: isSummaryLoading } = useUsageSummary(apiOptions); + const { data: trends, isLoading: isTrendsLoading } = useUsageTrends(apiOptions); + const { data: hourlyData, isLoading: isHourlyLoading } = useHourlyUsage(apiOptions); + const { data: models, isLoading: isModelsLoading } = useModelUsage(apiOptions); + const { data: sessions, isLoading: isSessionsLoading } = useSessions({ ...apiOptions, limit: 3 }); + const { data: status } = useUsageStatus(); + + // Handle "24H" preset click + const handleTodayClick = useCallback(() => { + const now = new Date(); + setDateRange({ from: subDays(now, 1), to: now }); + setViewMode('hourly'); + }, []); + + // Handle date range changes from DateRangeFilter + const handleDateRangeChange = useCallback((range: DateRange | undefined) => { + setDateRange(range); + setViewMode('daily'); // Switch back to daily view for multi-day ranges + }, []); + + // Format "Last updated" text + const lastUpdatedText = useMemo(() => { + if (!status?.lastFetch) return null; + return formatDistanceToNow(new Date(status.lastFetch), { addSuffix: true }); + }, [status?.lastFetch]); + + // Handle model click for popover + const handleModelClick = useCallback((model: ModelUsage, event: React.MouseEvent) => { + const rect = (event.currentTarget as HTMLElement).getBoundingClientRect(); + setPopoverPosition({ x: rect.left + rect.width / 2, y: rect.top + rect.height / 2 }); + setSelectedModel(model); + }, []); + + const handlePopoverClose = useCallback(() => { + setSelectedModel(null); + setPopoverPosition(null); + }, []); + + return { + // State + dateRange, + isRefreshing, + viewMode, + selectedModel, + popoverPosition, + // Data + summary, + trends, + hourlyData, + models, + sessions, + status, + // Loading states + isSummaryLoading, + isTrendsLoading, + isHourlyLoading, + isModelsLoading, + isSessionsLoading, + // Combined loading + isLoading: isSummaryLoading || isTrendsLoading || isModelsLoading || isSessionsLoading, + // Handlers + handleRefresh, + handleTodayClick, + handleDateRangeChange, + handleModelClick, + handlePopoverClose, + // Text + lastUpdatedText, + }; +} diff --git a/ui/src/pages/analytics/index.tsx b/ui/src/pages/analytics/index.tsx new file mode 100644 index 00000000..2271d06a --- /dev/null +++ b/ui/src/pages/analytics/index.tsx @@ -0,0 +1,96 @@ +/** + * Analytics Page + * + * Displays Claude Code usage analytics with charts. + * Features trend charts, model breakdown, cost analysis, and anomaly detection. + */ + +import { useRef } from 'react'; +import { Popover, PopoverContent, PopoverAnchor } from '@/components/ui/popover'; +import { UsageSummaryCards } from '@/components/analytics/usage-summary-cards'; +import { ModelDetailsContent } from '@/components/analytics/model-details-content'; +import { useAnalyticsPage } from './hooks'; +import { AnalyticsHeader } from './components/analytics-header'; +import { ChartsGrid } from './components/charts-grid'; + +export function AnalyticsPage() { + const popoverAnchorRef = useRef(null); + const { + dateRange, + handleDateRangeChange, + handleTodayClick, + handleRefresh, + isRefreshing, + lastUpdatedText, + viewMode, + summary, + isSummaryLoading, + trends, + hourlyData, + models, + sessions, + isTrendsLoading, + isHourlyLoading, + isModelsLoading, + isSessionsLoading, + handleModelClick, + selectedModel, + popoverPosition, + handlePopoverClose, + } = useAnalyticsPage(); + + return ( +
+ {/* Header */} + + + {/* Summary Cards */} + + + {/* Charts Grid */} + + + {/* Model Details Popover - positioned at cursor */} + !open && handlePopoverClose()}> + +
+ + + {selectedModel && } + + +
+ ); +} + +// Re-export skeleton for route-level loading +export { AnalyticsSkeleton } from './components/analytics-skeleton'; diff --git a/ui/src/pages/analytics/types.ts b/ui/src/pages/analytics/types.ts new file mode 100644 index 00000000..58b970c9 --- /dev/null +++ b/ui/src/pages/analytics/types.ts @@ -0,0 +1,19 @@ +/** + * Analytics Page Types + */ + +import type { DateRange } from 'react-day-picker'; +import type { ModelUsage } from '@/hooks/use-usage'; + +export interface AnalyticsPageState { + dateRange: DateRange | undefined; + isRefreshing: boolean; + selectedModel: ModelUsage | null; + popoverPosition: { x: number; y: number } | null; + viewMode: 'daily' | 'hourly'; +} + +export interface DatePreset { + label: string; + range: DateRange; +} diff --git a/ui/src/pages/analytics/utils.ts b/ui/src/pages/analytics/utils.ts new file mode 100644 index 00000000..bcff9e73 --- /dev/null +++ b/ui/src/pages/analytics/utils.ts @@ -0,0 +1,13 @@ +/** + * Analytics Page Utilities + */ + +/** + * Format token count to human-readable (K/M/B) + */ +export function formatTokens(num: number): string { + if (num >= 1_000_000_000) return `${(num / 1_000_000_000).toFixed(1)}B`; + if (num >= 1_000_000) return `${(num / 1_000_000).toFixed(1)}M`; + if (num >= 1_000) return `${(num / 1_000).toFixed(0)}K`; + return num.toString(); +} From 8ead6fa0bf05fc8d37563a618c473d7eae808920 Mon Sep 17 00:00:00 2001 From: kaitranntt Date: Sun, 21 Dec 2025 03:27:53 -0500 Subject: [PATCH 15/31] refactor(ui): modularize auth-monitor into directory structure - split auth-monitor.tsx (465 lines) into modular components - extract provider-card, summary-card, live-pulse, inline-stats-badge - separate hooks, types, and utils for better maintainability - export types from monitoring barrel --- ui/src/components/monitoring/auth-monitor.tsx | 465 ------------------ .../components/inline-stats-badge.tsx | 35 ++ .../auth-monitor/components/live-pulse.tsx | 27 + .../auth-monitor/components/provider-card.tsx | 123 +++++ .../auth-monitor/components/summary-card.tsx | 37 ++ .../monitoring/auth-monitor/hooks.ts | 148 ++++++ .../monitoring/auth-monitor/index.tsx | 151 ++++++ .../monitoring/auth-monitor/types.ts | 25 + .../monitoring/auth-monitor/utils.ts | 29 ++ ui/src/components/monitoring/index.ts | 1 + 10 files changed, 576 insertions(+), 465 deletions(-) delete mode 100644 ui/src/components/monitoring/auth-monitor.tsx create mode 100644 ui/src/components/monitoring/auth-monitor/components/inline-stats-badge.tsx create mode 100644 ui/src/components/monitoring/auth-monitor/components/live-pulse.tsx create mode 100644 ui/src/components/monitoring/auth-monitor/components/provider-card.tsx create mode 100644 ui/src/components/monitoring/auth-monitor/components/summary-card.tsx create mode 100644 ui/src/components/monitoring/auth-monitor/hooks.ts create mode 100644 ui/src/components/monitoring/auth-monitor/index.tsx create mode 100644 ui/src/components/monitoring/auth-monitor/types.ts create mode 100644 ui/src/components/monitoring/auth-monitor/utils.ts diff --git a/ui/src/components/monitoring/auth-monitor.tsx b/ui/src/components/monitoring/auth-monitor.tsx deleted file mode 100644 index 61cbaf8b..00000000 --- a/ui/src/components/monitoring/auth-monitor.tsx +++ /dev/null @@ -1,465 +0,0 @@ -/** - * Auth Monitor Component with Account Flow Visualization - * Shows request flow from accounts to providers using custom SVG bezier curves - * Uses glass panel aesthetic with hover interactions and glow effects - */ - -import { useState, useMemo, useEffect } from 'react'; -import { useCliproxyAuth } from '@/hooks/use-cliproxy'; -import { useCliproxyStats, type AccountUsageStats } from '@/hooks/use-cliproxy-stats'; -import { cn, STATUS_COLORS } from '@/lib/utils'; -import { getProviderDisplayName, PROVIDER_COLORS } from '@/lib/provider-config'; -import { Skeleton } from '@/components/ui/skeleton'; -import { ProviderIcon } from '@/components/shared/provider-icon'; -import { AccountFlowViz } from '@/components/account-flow-viz'; -import { usePrivacy } from '@/contexts/privacy-context'; -import type { AuthStatus, OAuthAccount } from '@/lib/api-client'; -import { Activity, CheckCircle2, XCircle, ChevronRight, Radio } from 'lucide-react'; - -interface AccountRow { - id: string; - email: string; - provider: string; - displayName: string; - isDefault: boolean; - successCount: number; - failureCount: number; - lastUsedAt?: string; - color: string; -} - -interface ProviderStats { - provider: string; - displayName: string; - totalRequests: number; - successCount: number; - failureCount: number; - accountCount: number; - accounts: AccountRow[]; -} - -function getSuccessRate(success: number, failure: number): number { - const total = success + failure; - if (total === 0) return 100; - return Math.round((success / total) * 100); -} - -/** Strip common email domains for cleaner display */ -function cleanEmail(email: string): string { - return email.replace(/@(gmail|yahoo|hotmail|outlook|icloud)\.com$/i, ''); -} - -// Vibrant colors for account segments - darker for light theme contrast -const ACCOUNT_COLORS = [ - '#1e6091', // Deep Cerulean (was #277da1) - '#2d8a6e', // Deep Seaweed (was #43aa8b) - '#d4a012', // Dark Tuscan (was #f9c74f) - '#c92a2d', // Deep Strawberry (was #f94144) - '#c45a1a', // Deep Pumpkin (was #f3722c) - '#6b9c4d', // Dark Willow (was #90be6d) - '#3d5a73', // Deep Blue Slate (was #577590) - '#cc7614', // Dark Carrot (was #f8961e) - '#3a7371', // Deep Cyan (was #4d908e) - '#7c5fc4', // Deep Purple (was #a78bfa) -]; - -/** Enhanced live pulse indicator with multi-ring animation */ -function LivePulse() { - return ( -
- {/* Outer ping ring */} -
- {/* Middle pulse ring */} -
- {/* Inner solid dot */} -
-
- ); -} - -/** Inline success/failure badge for provider cards */ -function InlineStatsBadge({ success, failure }: { success: number; failure: number }) { - if (success === 0 && failure === 0) { - return no activity; - } - - return ( -
-
- - - {success.toLocaleString()} - -
- {failure > 0 && ( -
- - - {failure.toLocaleString()} - -
- )} -
- ); -} - -export function AuthMonitor() { - const { data, isLoading, error } = useCliproxyAuth(); - const { data: statsData, isLoading: statsLoading, dataUpdatedAt } = useCliproxyStats(); - const { privacyMode } = usePrivacy(); - const [selectedProvider, setSelectedProvider] = useState(null); - const [hoveredProvider, setHoveredProvider] = useState(null); - const [timeSinceUpdate, setTimeSinceUpdate] = useState(''); - - // Live countdown showing time since last data update - useEffect(() => { - if (!dataUpdatedAt) return; - const updateTime = () => { - const diff = Math.floor((Date.now() - dataUpdatedAt) / 1000); - if (diff < 60) { - setTimeSinceUpdate(`${diff}s ago`); - } else { - setTimeSinceUpdate(`${Math.floor(diff / 60)}m ago`); - } - }; - updateTime(); - const interval = setInterval(updateTime, 1000); - return () => clearInterval(interval); - }, [dataUpdatedAt]); - - // Build a map of account email -> usage stats from CLIProxy - const accountStatsMap = useMemo(() => { - if (!statsData?.accountStats) return new Map(); - return new Map(Object.entries(statsData.accountStats)); - }, [statsData?.accountStats]); - - // Transform auth status data into account rows - const { accounts, totalSuccess, totalFailure, totalRequests, providerStats } = useMemo(() => { - if (!data?.authStatus) { - return { - accounts: [], - totalSuccess: 0, - totalFailure: 0, - totalRequests: 0, - providerStats: [], - }; - } - - const accountsList: AccountRow[] = []; - const providerMap = new Map< - string, - { success: number; failure: number; accounts: AccountRow[] } - >(); - let tSuccess = 0; - let tFailure = 0; - let colorIndex = 0; - - data.authStatus.forEach((status: AuthStatus) => { - const providerKey = status.provider; - if (!providerMap.has(providerKey)) { - providerMap.set(providerKey, { success: 0, failure: 0, accounts: [] }); - } - const providerData = providerMap.get(providerKey); - if (!providerData) return; - - status.accounts?.forEach((account: OAuthAccount) => { - // Get real stats from CLIProxy - try email first, then id - const accountEmail = account.email || account.id; - const realStats = accountStatsMap.get(accountEmail); - const success = realStats?.successCount ?? 0; - const failure = realStats?.failureCount ?? 0; - tSuccess += success; - tFailure += failure; - providerData.success += success; - providerData.failure += failure; - - const row: AccountRow = { - id: account.id, - email: account.email || account.id, - provider: status.provider, - displayName: status.displayName, - isDefault: account.isDefault, - successCount: success, - failureCount: failure, - lastUsedAt: realStats?.lastUsedAt ?? account.lastUsedAt, - color: ACCOUNT_COLORS[colorIndex % ACCOUNT_COLORS.length], - }; - accountsList.push(row); - providerData.accounts.push(row); - colorIndex++; - }); - }); - - // Build provider stats array - const providerStatsArr: ProviderStats[] = []; - providerMap.forEach((pData, provider) => { - if (pData.accounts.length === 0) return; - providerStatsArr.push({ - provider, - displayName: getProviderDisplayName(provider), - totalRequests: pData.success + pData.failure, - successCount: pData.success, - failureCount: pData.failure, - accountCount: pData.accounts.length, - accounts: pData.accounts, - }); - }); - providerStatsArr.sort((a, b) => b.totalRequests - a.totalRequests); - - return { - accounts: accountsList, - totalSuccess: tSuccess, - totalFailure: tFailure, - totalRequests: tSuccess + tFailure, - providerStats: providerStatsArr, - }; - }, [data?.authStatus, accountStatsMap]); - - const overallSuccessRate = - totalRequests > 0 ? Math.round((totalSuccess / totalRequests) * 100) : 100; - - // Get selected provider data for detail view - const selectedProviderData = selectedProvider - ? providerStats.find((ps) => ps.provider === selectedProvider) - : null; - - if (isLoading || statsLoading) { - return ( -
-
- - -
-
-
- {[1, 2, 3, 4].map((i) => ( - - ))} -
- -
-
- ); - } - - if (error || !data?.authStatus || accounts.length === 0) { - return null; - } - - return ( -
- {/* Enhanced Live Header with gradient glow */} -
-
- - LIVE - Account Monitor -
-
-
- - Updated {timeSinceUpdate || 'now'} -
- | - {accounts.length} accounts - {totalRequests.toLocaleString()} req -
-
- - {/* Summary Stats Row */} -
- } - label="Accounts" - value={accounts.length} - color="var(--accent)" - /> - } - label="Success" - value={totalSuccess.toLocaleString()} - color={STATUS_COLORS.success} - /> - } - label="Failed" - value={totalFailure.toLocaleString()} - color={totalFailure > 0 ? STATUS_COLORS.failed : undefined} - /> - } - label="Success Rate" - value={`${overallSuccessRate}%`} - color={ - overallSuccessRate === 100 - ? STATUS_COLORS.success - : overallSuccessRate >= 95 - ? STATUS_COLORS.degraded - : STATUS_COLORS.failed - } - /> -
- - {/* Flow Visualization */} -
- {selectedProviderData ? ( - // Account-level flow view - setSelectedProvider(null)} - /> - ) : ( - // Provider cards view -
-
- Request Distribution by Provider -
-
- {providerStats.map((ps) => { - const successRate = getSuccessRate(ps.successCount, ps.failureCount); - const providerColor = PROVIDER_COLORS[ps.provider.toLowerCase()] || '#6b7280'; - const isHovered = hoveredProvider === ps.provider; - - return ( - - ); - })} -
-
- )} -
-
- ); -} - -// Summary Card Component -function SummaryCard({ - icon, - label, - value, - color, -}: { - icon: React.ReactNode; - label: string; - value: string | number; - color?: string; -}) { - return ( -
-
- {icon} -
-
-
{label}
-
- {value} -
-
-
- ); -} diff --git a/ui/src/components/monitoring/auth-monitor/components/inline-stats-badge.tsx b/ui/src/components/monitoring/auth-monitor/components/inline-stats-badge.tsx new file mode 100644 index 00000000..bd60db8f --- /dev/null +++ b/ui/src/components/monitoring/auth-monitor/components/inline-stats-badge.tsx @@ -0,0 +1,35 @@ +/** + * InlineStatsBadge - Inline success/failure badge for provider cards + */ + +import { CheckCircle2, XCircle } from 'lucide-react'; + +interface InlineStatsBadgeProps { + success: number; + failure: number; +} + +export function InlineStatsBadge({ success, failure }: InlineStatsBadgeProps) { + if (success === 0 && failure === 0) { + return no activity; + } + + return ( +
+
+ + + {success.toLocaleString()} + +
+ {failure > 0 && ( +
+ + + {failure.toLocaleString()} + +
+ )} +
+ ); +} diff --git a/ui/src/components/monitoring/auth-monitor/components/live-pulse.tsx b/ui/src/components/monitoring/auth-monitor/components/live-pulse.tsx new file mode 100644 index 00000000..adc006ad --- /dev/null +++ b/ui/src/components/monitoring/auth-monitor/components/live-pulse.tsx @@ -0,0 +1,27 @@ +/** + * LivePulse - Enhanced live pulse indicator with multi-ring animation + */ + +import { STATUS_COLORS } from '@/lib/utils'; + +export function LivePulse() { + return ( +
+ {/* Outer ping ring */} +
+ {/* Middle pulse ring */} +
+ {/* Inner solid dot */} +
+
+ ); +} diff --git a/ui/src/components/monitoring/auth-monitor/components/provider-card.tsx b/ui/src/components/monitoring/auth-monitor/components/provider-card.tsx new file mode 100644 index 00000000..d7faf5f9 --- /dev/null +++ b/ui/src/components/monitoring/auth-monitor/components/provider-card.tsx @@ -0,0 +1,123 @@ +/** + * ProviderCard - Provider status card with account color dots and stats + */ + +import type React from 'react'; +import { ChevronRight } from 'lucide-react'; +import { cn, STATUS_COLORS } from '@/lib/utils'; +import { PROVIDER_COLORS } from '@/lib/provider-config'; +import { ProviderIcon } from '@/components/shared/provider-icon'; +import type { ProviderStats } from '../types'; +import { getSuccessRate, cleanEmail } from '../utils'; +import { InlineStatsBadge } from './inline-stats-badge'; + +interface ProviderCardProps { + stats: ProviderStats; + isHovered: boolean; + privacyMode: boolean; + onSelect: () => void; + onMouseEnter: () => void; + onMouseLeave: () => void; +} + +export function ProviderCard({ + stats, + isHovered, + privacyMode, + onSelect, + onMouseEnter, + onMouseLeave, +}: ProviderCardProps) { + const successRate = getSuccessRate(stats.successCount, stats.failureCount); + const providerColor = PROVIDER_COLORS[stats.provider.toLowerCase()] || '#6b7280'; + + return ( + + ); +} diff --git a/ui/src/components/monitoring/auth-monitor/components/summary-card.tsx b/ui/src/components/monitoring/auth-monitor/components/summary-card.tsx new file mode 100644 index 00000000..380d5d03 --- /dev/null +++ b/ui/src/components/monitoring/auth-monitor/components/summary-card.tsx @@ -0,0 +1,37 @@ +/** + * SummaryCard - Summary stats card with icon and value display + */ + +import type React from 'react'; + +interface SummaryCardProps { + icon: React.ReactNode; + label: string; + value: string | number; + color?: string; +} + +export function SummaryCard({ icon, label, value, color }: SummaryCardProps) { + return ( +
+
+ {icon} +
+
+
{label}
+
+ {value} +
+
+
+ ); +} diff --git a/ui/src/components/monitoring/auth-monitor/hooks.ts b/ui/src/components/monitoring/auth-monitor/hooks.ts new file mode 100644 index 00000000..1640f037 --- /dev/null +++ b/ui/src/components/monitoring/auth-monitor/hooks.ts @@ -0,0 +1,148 @@ +/** + * Hooks for Auth Monitor data aggregation and state management + */ + +import { useState, useMemo, useEffect } from 'react'; +import { useCliproxyAuth } from '@/hooks/use-cliproxy'; +import { useCliproxyStats, type AccountUsageStats } from '@/hooks/use-cliproxy-stats'; +import { getProviderDisplayName } from '@/lib/provider-config'; +import type { AuthStatus, OAuthAccount } from '@/lib/api-client'; +import type { AccountRow, ProviderStats } from './types'; +import { ACCOUNT_COLORS } from './utils'; + +export interface AuthMonitorData { + accounts: AccountRow[]; + totalSuccess: number; + totalFailure: number; + totalRequests: number; + providerStats: ProviderStats[]; + overallSuccessRate: number; + isLoading: boolean; + error: Error | null; + timeSinceUpdate: string; +} + +/** Hook for computing auth monitor data from CLIProxy auth and stats */ +export function useAuthMonitorData(): AuthMonitorData { + const { data, isLoading, error } = useCliproxyAuth(); + const { data: statsData, isLoading: statsLoading, dataUpdatedAt } = useCliproxyStats(); + const [timeSinceUpdate, setTimeSinceUpdate] = useState(''); + + // Live countdown showing time since last data update + useEffect(() => { + if (!dataUpdatedAt) return; + const updateTime = () => { + const diff = Math.floor((Date.now() - dataUpdatedAt) / 1000); + if (diff < 60) { + setTimeSinceUpdate(`${diff}s ago`); + } else { + setTimeSinceUpdate(`${Math.floor(diff / 60)}m ago`); + } + }; + updateTime(); + const interval = setInterval(updateTime, 1000); + return () => clearInterval(interval); + }, [dataUpdatedAt]); + + // Build a map of account email -> usage stats from CLIProxy + const accountStatsMap = useMemo(() => { + if (!statsData?.accountStats) return new Map(); + return new Map(Object.entries(statsData.accountStats)); + }, [statsData?.accountStats]); + + // Transform auth status data into account rows + const { accounts, totalSuccess, totalFailure, totalRequests, providerStats } = useMemo(() => { + if (!data?.authStatus) { + return { + accounts: [] as AccountRow[], + totalSuccess: 0, + totalFailure: 0, + totalRequests: 0, + providerStats: [] as ProviderStats[], + }; + } + + const accountsList: AccountRow[] = []; + const providerMap = new Map< + string, + { success: number; failure: number; accounts: AccountRow[] } + >(); + let tSuccess = 0; + let tFailure = 0; + let colorIndex = 0; + + data.authStatus.forEach((status: AuthStatus) => { + const providerKey = status.provider; + if (!providerMap.has(providerKey)) { + providerMap.set(providerKey, { success: 0, failure: 0, accounts: [] }); + } + const providerData = providerMap.get(providerKey); + if (!providerData) return; + + status.accounts?.forEach((account: OAuthAccount) => { + const accountEmail = account.email || account.id; + const realStats = accountStatsMap.get(accountEmail); + const success = realStats?.successCount ?? 0; + const failure = realStats?.failureCount ?? 0; + tSuccess += success; + tFailure += failure; + providerData.success += success; + providerData.failure += failure; + + const row: AccountRow = { + id: account.id, + email: account.email || account.id, + provider: status.provider, + displayName: status.displayName, + isDefault: account.isDefault, + successCount: success, + failureCount: failure, + lastUsedAt: realStats?.lastUsedAt ?? account.lastUsedAt, + color: ACCOUNT_COLORS[colorIndex % ACCOUNT_COLORS.length], + }; + accountsList.push(row); + providerData.accounts.push(row); + colorIndex++; + }); + }); + + // Build provider stats array + const providerStatsArr: ProviderStats[] = []; + providerMap.forEach((pData, provider) => { + if (pData.accounts.length === 0) return; + providerStatsArr.push({ + provider, + displayName: getProviderDisplayName(provider), + totalRequests: pData.success + pData.failure, + successCount: pData.success, + failureCount: pData.failure, + accountCount: pData.accounts.length, + accounts: pData.accounts, + }); + }); + providerStatsArr.sort((a, b) => b.totalRequests - a.totalRequests); + + return { + accounts: accountsList, + totalSuccess: tSuccess, + totalFailure: tFailure, + totalRequests: tSuccess + tFailure, + providerStats: providerStatsArr, + }; + }, [data?.authStatus, accountStatsMap]); + + const overallSuccessRate = + totalRequests > 0 ? Math.round((totalSuccess / totalRequests) * 100) : 100; + + return { + accounts, + totalSuccess, + totalFailure, + totalRequests, + providerStats, + overallSuccessRate, + isLoading: isLoading || statsLoading, + error: error ?? null, + timeSinceUpdate, + }; +} diff --git a/ui/src/components/monitoring/auth-monitor/index.tsx b/ui/src/components/monitoring/auth-monitor/index.tsx new file mode 100644 index 00000000..d43e1d48 --- /dev/null +++ b/ui/src/components/monitoring/auth-monitor/index.tsx @@ -0,0 +1,151 @@ +/** + * Auth Monitor Component with Account Flow Visualization + * Shows request flow from accounts to providers using custom SVG bezier curves + * Uses glass panel aesthetic with hover interactions and glow effects + */ + +import { useState } from 'react'; +import { STATUS_COLORS } from '@/lib/utils'; +import { Skeleton } from '@/components/ui/skeleton'; +import { AccountFlowViz } from '@/components/account-flow-viz'; +import { usePrivacy } from '@/contexts/privacy-context'; +import { Activity, CheckCircle2, XCircle, Radio } from 'lucide-react'; + +import { useAuthMonitorData } from './hooks'; +import { LivePulse } from './components/live-pulse'; +import { ProviderCard } from './components/provider-card'; +import { SummaryCard } from './components/summary-card'; + +export function AuthMonitor() { + const { + accounts, + totalSuccess, + totalFailure, + totalRequests, + providerStats, + overallSuccessRate, + isLoading, + error, + timeSinceUpdate, + } = useAuthMonitorData(); + + const { privacyMode } = usePrivacy(); + const [selectedProvider, setSelectedProvider] = useState(null); + const [hoveredProvider, setHoveredProvider] = useState(null); + + // Get selected provider data for detail view + const selectedProviderData = selectedProvider + ? providerStats.find((ps) => ps.provider === selectedProvider) + : null; + + if (isLoading) { + return ( +
+
+ + +
+
+
+ {[1, 2, 3, 4].map((i) => ( + + ))} +
+ +
+
+ ); + } + + if (error || accounts.length === 0) { + return null; + } + + return ( +
+ {/* Enhanced Live Header with gradient glow */} +
+
+ + LIVE + Account Monitor +
+
+
+ + Updated {timeSinceUpdate || 'now'} +
+ | + {accounts.length} accounts + {totalRequests.toLocaleString()} req +
+
+ + {/* Summary Stats Row */} +
+ } + label="Accounts" + value={accounts.length} + color="var(--accent)" + /> + } + label="Success" + value={totalSuccess.toLocaleString()} + color={STATUS_COLORS.success} + /> + } + label="Failed" + value={totalFailure.toLocaleString()} + color={totalFailure > 0 ? STATUS_COLORS.failed : undefined} + /> + } + label="Success Rate" + value={`${overallSuccessRate}%`} + color={ + overallSuccessRate === 100 + ? STATUS_COLORS.success + : overallSuccessRate >= 95 + ? STATUS_COLORS.degraded + : STATUS_COLORS.failed + } + /> +
+ + {/* Flow Visualization */} +
+ {selectedProviderData ? ( + setSelectedProvider(null)} + /> + ) : ( +
+
+ Request Distribution by Provider +
+
+ {providerStats.map((ps) => ( + setSelectedProvider(ps.provider)} + onMouseEnter={() => setHoveredProvider(ps.provider)} + onMouseLeave={() => setHoveredProvider(null)} + /> + ))} +
+
+ )} +
+
+ ); +} + +// Re-export types for barrel +export type { AccountRow, ProviderStats } from './types'; diff --git a/ui/src/components/monitoring/auth-monitor/types.ts b/ui/src/components/monitoring/auth-monitor/types.ts new file mode 100644 index 00000000..1eb61953 --- /dev/null +++ b/ui/src/components/monitoring/auth-monitor/types.ts @@ -0,0 +1,25 @@ +/** + * Type definitions for Auth Monitor components + */ + +export interface AccountRow { + id: string; + email: string; + provider: string; + displayName: string; + isDefault: boolean; + successCount: number; + failureCount: number; + lastUsedAt?: string; + color: string; +} + +export interface ProviderStats { + provider: string; + displayName: string; + totalRequests: number; + successCount: number; + failureCount: number; + accountCount: number; + accounts: AccountRow[]; +} diff --git a/ui/src/components/monitoring/auth-monitor/utils.ts b/ui/src/components/monitoring/auth-monitor/utils.ts new file mode 100644 index 00000000..28272ac7 --- /dev/null +++ b/ui/src/components/monitoring/auth-monitor/utils.ts @@ -0,0 +1,29 @@ +/** + * Utility functions and constants for Auth Monitor + */ + +/** Calculate success rate percentage */ +export function getSuccessRate(success: number, failure: number): number { + const total = success + failure; + if (total === 0) return 100; + return Math.round((success / total) * 100); +} + +/** Strip common email domains for cleaner display */ +export function cleanEmail(email: string): string { + return email.replace(/@(gmail|yahoo|hotmail|outlook|icloud)\.com$/i, ''); +} + +// Vibrant colors for account segments - darker for light theme contrast +export const ACCOUNT_COLORS = [ + '#1e6091', // Deep Cerulean + '#2d8a6e', // Deep Seaweed + '#d4a012', // Dark Tuscan + '#c92a2d', // Deep Strawberry + '#c45a1a', // Deep Pumpkin + '#6b9c4d', // Dark Willow + '#3d5a73', // Deep Blue Slate + '#cc7614', // Dark Carrot + '#3a7371', // Deep Cyan + '#7c5fc4', // Deep Purple +]; diff --git a/ui/src/components/monitoring/index.ts b/ui/src/components/monitoring/index.ts index 3d66966d..4f9ac659 100644 --- a/ui/src/components/monitoring/index.ts +++ b/ui/src/components/monitoring/index.ts @@ -4,6 +4,7 @@ // Main monitoring components export { AuthMonitor } from './auth-monitor'; +export type { AccountRow, ProviderStats } from './auth-monitor'; export { ProxyStatusWidget } from './proxy-status-widget'; // Error logs (from subdirectory) From 3fca9338f9a77ac202dde6095bf70b5094199888 Mon Sep 17 00:00:00 2001 From: kaitranntt Date: Sun, 21 Dec 2025 03:28:34 -0500 Subject: [PATCH 16/31] test(ui): add vitest testing infrastructure with 99 unit tests - add vitest, jsdom, testing-library, msw dependencies - create test setup: vitest-setup.ts, test-utils.tsx, msw-handlers.ts - add 99 unit tests covering settings, analytics, auth-monitor utils - configure 90% coverage thresholds on pure-logic files - add test scripts: test, test:run, test:coverage, test:ui --- ui/bun.lock | 289 ++++++++++- ui/package.json | 19 +- ui/tests/setup/msw-handlers.ts | 271 ++++++++++ ui/tests/setup/test-utils.tsx | 105 ++++ ui/tests/setup/vitest-setup.ts | 44 ++ .../auth-monitor/auth-monitor-utils.test.ts | 182 +++++++ .../pages/analytics/analytics-utils.test.ts | 112 ++++ .../ui/pages/settings/context-hooks.test.tsx | 489 ++++++++++++++++++ .../pages/settings/settings-context.test.ts | 215 ++++++++ ui/vitest.config.ts | 52 ++ 10 files changed, 1772 insertions(+), 6 deletions(-) create mode 100644 ui/tests/setup/msw-handlers.ts create mode 100644 ui/tests/setup/test-utils.tsx create mode 100644 ui/tests/setup/vitest-setup.ts create mode 100644 ui/tests/unit/ui/components/monitoring/auth-monitor/auth-monitor-utils.test.ts create mode 100644 ui/tests/unit/ui/pages/analytics/analytics-utils.test.ts create mode 100644 ui/tests/unit/ui/pages/settings/context-hooks.test.tsx create mode 100644 ui/tests/unit/ui/pages/settings/settings-context.test.ts create mode 100644 ui/vitest.config.ts diff --git a/ui/bun.lock b/ui/bun.lock index 8b86d52f..2756da98 100644 --- a/ui/bun.lock +++ b/ui/bun.lock @@ -46,25 +46,42 @@ "devDependencies": { "@eslint/js": "^9.39.1", "@tailwindcss/vite": "^4.1.17", + "@testing-library/jest-dom": "^6.9.1", + "@testing-library/react": "^16.3.1", + "@testing-library/user-event": "^14.6.1", "@types/node": "^24.10.1", "@types/react": "^19.2.5", "@types/react-dom": "^19.2.3", "@types/recharts": "^1.8.29", "@vitejs/plugin-react": "^5.1.1", + "@vitest/coverage-v8": "^4.0.16", "eslint": "^9.39.1", "eslint-config-prettier": "^10.1.8", "eslint-plugin-react-hooks": "^7.0.1", "eslint-plugin-react-refresh": "^0.4.24", "globals": "^16.5.0", + "jsdom": "^27.3.0", + "msw": "^2.12.4", "prettier": "^3.6.2", "tailwindcss": "^4.1.17", "typescript": "~5.9.3", "typescript-eslint": "^8.46.4", "vite": "^7.2.4", + "vitest": "^4.0.16", }, }, }, "packages": { + "@acemir/cssom": ["@acemir/cssom@0.9.29", "", {}, "sha512-G90x0VW+9nW4dFajtjCoT+NM0scAfH9Mb08IcjgFHYbfiL/lU04dTF9JuVOi3/OH+DJCQdcIseSXkdCB9Ky6JA=="], + + "@adobe/css-tools": ["@adobe/css-tools@4.4.4", "", {}, "sha512-Elp+iwUx5rN5+Y8xLt5/GRoG20WGoDCQ/1Fb+1LiGtvwbDavuSk0jhD/eZdckHAuzcDzccnkv+rEjyWfRx18gg=="], + + "@asamuzakjp/css-color": ["@asamuzakjp/css-color@4.1.1", "", { "dependencies": { "@csstools/css-calc": "^2.1.4", "@csstools/css-color-parser": "^3.1.0", "@csstools/css-parser-algorithms": "^3.0.5", "@csstools/css-tokenizer": "^3.0.4", "lru-cache": "^11.2.4" } }, "sha512-B0Hv6G3gWGMn0xKJ0txEi/jM5iFpT3MfDxmhZFb4W047GvytCf1DHQ1D69W3zHI4yWe2aTZAA0JnbMZ7Xc8DuQ=="], + + "@asamuzakjp/dom-selector": ["@asamuzakjp/dom-selector@6.7.6", "", { "dependencies": { "@asamuzakjp/nwsapi": "^2.3.9", "bidi-js": "^1.0.3", "css-tree": "^3.1.0", "is-potential-custom-element-name": "^1.0.1", "lru-cache": "^11.2.4" } }, "sha512-hBaJER6A9MpdG3WgdlOolHmbOYvSk46y7IQN/1+iqiCuUu6iWdQrs9DGKF8ocqsEqWujWf/V7b7vaDgiUmIvUg=="], + + "@asamuzakjp/nwsapi": ["@asamuzakjp/nwsapi@2.3.9", "", {}, "sha512-n8GuYSrI9bF7FFZ/SjhwevlHc8xaVlb/7HmHelnc/PZXBD2ZR49NnN9sMMuDdEGPeeRQ5d0hqlSlEpgCX3Wl0Q=="], + "@babel/code-frame": ["@babel/code-frame@7.27.1", "", { "dependencies": { "@babel/helper-validator-identifier": "^7.27.1", "js-tokens": "^4.0.0", "picocolors": "^1.1.1" } }, "sha512-cjQ7ZlQ0Mv3b47hABuTevyTuYN4i+loJKGeV9flcCgIK37cCXRh+L1bd3iBHlynerhQ7BhCkn2BPbQUL+rGqFg=="], "@babel/compat-data": ["@babel/compat-data@7.28.5", "", {}, "sha512-6uFXyCayocRbqhZOB+6XcuZbkMNimwfVGFji8CTZnCzOHVGvDqzvitu1re2AU5LROliz7eQPhB8CpAMvnx9EjA=="], @@ -105,6 +122,20 @@ "@babel/types": ["@babel/types@7.28.5", "", { "dependencies": { "@babel/helper-string-parser": "^7.27.1", "@babel/helper-validator-identifier": "^7.28.5" } }, "sha512-qQ5m48eI/MFLQ5PxQj4PFaprjyCTLI37ElWMmNs0K8Lk3dVeOdNpB3ks8jc7yM5CDmVC73eMVk/trk3fgmrUpA=="], + "@bcoe/v8-coverage": ["@bcoe/v8-coverage@1.0.2", "", {}, "sha512-6zABk/ECA/QYSCQ1NGiVwwbQerUCZ+TQbp64Q3AgmfNvurHH0j8TtXa1qbShXA6qqkpAj4V5W8pP6mLe1mcMqA=="], + + "@csstools/color-helpers": ["@csstools/color-helpers@5.1.0", "", {}, "sha512-S11EXWJyy0Mz5SYvRmY8nJYTFFd1LCNV+7cXyAgQtOOuzb4EsgfqDufL+9esx72/eLhsRdGZwaldu/h+E4t4BA=="], + + "@csstools/css-calc": ["@csstools/css-calc@2.1.4", "", { "peerDependencies": { "@csstools/css-parser-algorithms": "^3.0.5", "@csstools/css-tokenizer": "^3.0.4" } }, "sha512-3N8oaj+0juUw/1H3YwmDDJXCgTB1gKU6Hc/bB502u9zR0q2vd786XJH9QfrKIEgFlZmhZiq6epXl4rHqhzsIgQ=="], + + "@csstools/css-color-parser": ["@csstools/css-color-parser@3.1.0", "", { "dependencies": { "@csstools/color-helpers": "^5.1.0", "@csstools/css-calc": "^2.1.4" }, "peerDependencies": { "@csstools/css-parser-algorithms": "^3.0.5", "@csstools/css-tokenizer": "^3.0.4" } }, "sha512-nbtKwh3a6xNVIp/VRuXV64yTKnb1IjTAEEh3irzS+HkKjAOYLTGNb9pmVNntZ8iVBHcWDA2Dof0QtPgFI1BaTA=="], + + "@csstools/css-parser-algorithms": ["@csstools/css-parser-algorithms@3.0.5", "", { "peerDependencies": { "@csstools/css-tokenizer": "^3.0.4" } }, "sha512-DaDeUkXZKjdGhgYaHNJTV9pV7Y9B3b644jCLs9Upc3VeNGg6LWARAT6O+Q+/COo+2gg/bM5rhpMAtf70WqfBdQ=="], + + "@csstools/css-syntax-patches-for-csstree": ["@csstools/css-syntax-patches-for-csstree@1.0.22", "", {}, "sha512-qBcx6zYlhleiFfdtzkRgwNC7VVoAwfK76Vmsw5t+PbvtdknO9StgRk7ROvq9so1iqbdW4uLIDAsXRsTfUrIoOw=="], + + "@csstools/css-tokenizer": ["@csstools/css-tokenizer@3.0.4", "", {}, "sha512-Vd/9EVDiu6PPJt9yAh6roZP6El1xHrdvIVGjyBsHR0RYwNHgL7FJPyIIW4fANJNG6FtyZfvlRPpFI4ZM/lubvw=="], + "@date-fns/tz": ["@date-fns/tz@1.4.1", "", {}, "sha512-P5LUNhtbj6YfI3iJjw5EL9eUAG6OitD0W3fWQcpQjDRc/QIsL0tRNuO1PcDvPccWL1fSTXXdE1ds+l95DV/OFA=="], "@esbuild/aix-ppc64": ["@esbuild/aix-ppc64@0.25.12", "", { "os": "aix", "cpu": "ppc64" }, "sha512-Hhmwd6CInZ3dwpuGTF8fJG6yoWmsToE+vYgD4nytZVxcu1ulHpUQRAB1UJ8+N1Am3Mz4+xOByoQoSZf4D+CpkA=="], @@ -195,6 +226,16 @@ "@humanwhocodes/retry": ["@humanwhocodes/retry@0.4.3", "", {}, "sha512-bV0Tgo9K4hfPCek+aMAn81RppFKv2ySDQeMoSZuvTASywNTnVJCArCZE2FWqpvIatKu7VMRLWlR1EazvVhDyhQ=="], + "@inquirer/ansi": ["@inquirer/ansi@1.0.2", "", {}, "sha512-S8qNSZiYzFd0wAcyG5AXCvUHC5Sr7xpZ9wZ2py9XR88jUz8wooStVx5M6dRzczbBWjic9NP7+rY0Xi7qqK/aMQ=="], + + "@inquirer/confirm": ["@inquirer/confirm@5.1.21", "", { "dependencies": { "@inquirer/core": "^10.3.2", "@inquirer/type": "^3.0.10" }, "peerDependencies": { "@types/node": ">=18" }, "optionalPeers": ["@types/node"] }, "sha512-KR8edRkIsUayMXV+o3Gv+q4jlhENF9nMYUZs9PA2HzrXeHI8M5uDag70U7RJn9yyiMZSbtF5/UexBtAVtZGSbQ=="], + + "@inquirer/core": ["@inquirer/core@10.3.2", "", { "dependencies": { "@inquirer/ansi": "^1.0.2", "@inquirer/figures": "^1.0.15", "@inquirer/type": "^3.0.10", "cli-width": "^4.1.0", "mute-stream": "^2.0.0", "signal-exit": "^4.1.0", "wrap-ansi": "^6.2.0", "yoctocolors-cjs": "^2.1.3" }, "peerDependencies": { "@types/node": ">=18" }, "optionalPeers": ["@types/node"] }, "sha512-43RTuEbfP8MbKzedNqBrlhhNKVwoK//vUFNW3Q3vZ88BLcrs4kYpGg+B2mm5p2K/HfygoCxuKwJJiv8PbGmE0A=="], + + "@inquirer/figures": ["@inquirer/figures@1.0.15", "", {}, "sha512-t2IEY+unGHOzAaVM5Xx6DEWKeXlDDcNPeDyUpsRc6CUhBfU3VQOEl+Vssh7VNp1dR8MdUJBWhuObjXCsVpjN5g=="], + + "@inquirer/type": ["@inquirer/type@3.0.10", "", { "peerDependencies": { "@types/node": ">=18" }, "optionalPeers": ["@types/node"] }, "sha512-BvziSRxfz5Ov8ch0z/n3oijRSEcEsHnhggm4xFZe93DHcUCTlutlq9Ox4SVENAfcRD22UQq7T/atg9Wr3k09eA=="], + "@jridgewell/gen-mapping": ["@jridgewell/gen-mapping@0.3.13", "", { "dependencies": { "@jridgewell/sourcemap-codec": "^1.5.0", "@jridgewell/trace-mapping": "^0.3.24" } }, "sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA=="], "@jridgewell/remapping": ["@jridgewell/remapping@2.3.5", "", { "dependencies": { "@jridgewell/gen-mapping": "^0.3.5", "@jridgewell/trace-mapping": "^0.3.24" } }, "sha512-LI9u/+laYG4Ds1TDKSJW2YPrIlcVYOwi2fUC6xB43lueCjgxV4lffOCZCtYFiH6TNOX+tQKXx97T4IKHbhyHEQ=="], @@ -205,6 +246,8 @@ "@jridgewell/trace-mapping": ["@jridgewell/trace-mapping@0.3.31", "", { "dependencies": { "@jridgewell/resolve-uri": "^3.1.0", "@jridgewell/sourcemap-codec": "^1.4.14" } }, "sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw=="], + "@mswjs/interceptors": ["@mswjs/interceptors@0.40.0", "", { "dependencies": { "@open-draft/deferred-promise": "^2.2.0", "@open-draft/logger": "^0.3.0", "@open-draft/until": "^2.0.0", "is-node-process": "^1.2.0", "outvariant": "^1.4.3", "strict-event-emitter": "^0.5.1" } }, "sha512-EFd6cVbHsgLa6wa4RljGj6Wk75qoHxUSyc5asLyyPSyuhIcdS2Q3Phw6ImS1q+CkALthJRShiYfKANcQMuMqsQ=="], + "@nivo/colors": ["@nivo/colors@0.99.0", "", { "dependencies": { "@nivo/core": "0.99.0", "@nivo/theming": "0.99.0", "@types/d3-color": "^3.0.0", "@types/d3-scale": "^4.0.8", "@types/d3-scale-chromatic": "^3.0.0", "d3-color": "^3.1.0", "d3-scale": "^4.0.2", "d3-scale-chromatic": "^3.0.0", "lodash": "^4.17.21" }, "peerDependencies": { "react": "^16.14 || ^17.0 || ^18.0 || ^19.0" } }, "sha512-hyYt4lEFIfXOUmQ6k3HXm3KwhcgoJpocmoGzLUqzk7DzuhQYJo+4d5jIGGU0N/a70+9XbHIdpKNSblHAIASD3w=="], "@nivo/core": ["@nivo/core@0.99.0", "", { "dependencies": { "@nivo/theming": "0.99.0", "@nivo/tooltip": "0.99.0", "@react-spring/web": "9.4.5 || ^9.7.2 || ^10.0", "@types/d3-shape": "^3.1.6", "d3-color": "^3.1.0", "d3-format": "^1.4.4", "d3-interpolate": "^3.0.1", "d3-scale": "^4.0.2", "d3-scale-chromatic": "^3.0.0", "d3-shape": "^3.2.0", "d3-time-format": "^3.0.0", "lodash": "^4.17.21", "react-virtualized-auto-sizer": "^1.0.26", "use-debounce": "^10.0.4" }, "peerDependencies": { "react": "^16.14 || ^17.0 || ^18.0 || ^19.0" } }, "sha512-olCItqhPG3xHL5ei+vg52aB6o+6S+xR2idpkd9RormTTUniZb8U2rOdcQojOojPY5i9kVeQyLFBpV4YfM7OZ9g=="], @@ -219,6 +262,12 @@ "@nivo/tooltip": ["@nivo/tooltip@0.99.0", "", { "dependencies": { "@nivo/core": "0.99.0", "@nivo/theming": "0.99.0", "@react-spring/web": "9.4.5 || ^9.7.2 || ^10.0" }, "peerDependencies": { "react": "^16.14 || ^17.0 || ^18.0 || ^19.0" } }, "sha512-weoEGR3xAetV4k2P6k96cdamGzKQ5F2Pq+uyDaHr1P3HYArM879Pl+x+TkU0aWjP6wgUZPx/GOBiV1Hb1JxIqg=="], + "@open-draft/deferred-promise": ["@open-draft/deferred-promise@2.2.0", "", {}, "sha512-CecwLWx3rhxVQF6V4bAgPS5t+So2sTbPgAzafKkVizyi7tlwpcFpdFqq+wqF2OwNBmqFuu6tOyouTuxgpMfzmA=="], + + "@open-draft/logger": ["@open-draft/logger@0.3.0", "", { "dependencies": { "is-node-process": "^1.2.0", "outvariant": "^1.4.0" } }, "sha512-X2g45fzhxH238HKO4xbSr7+wBS8Fvw6ixhTDuvLd5mqh6bJJCFAPwU9mPDxbcrRtfxv4u5IHCEH77BmxvXmmxQ=="], + + "@open-draft/until": ["@open-draft/until@2.1.0", "", {}, "sha512-U69T3ItWHvLwGg5eJ0n3I62nWuE6ilHlmz7zM0npLBRvPRd7e6NYmg54vvRtP5mZG7kZqZCFVdsTWo7BPtBujg=="], + "@radix-ui/number": ["@radix-ui/number@1.1.1", "", {}, "sha512-MkKCwxlXTgz6CFoJx3pCwn07GKp36+aZyu/u2Ln2VrA5DcdyCZkASEDBTd8x5whTQQL5CiYf4prXKLcgQdv29g=="], "@radix-ui/primitive": ["@radix-ui/primitive@1.1.3", "", {}, "sha512-JTF99U/6XIjCBo0wqkU5sK10glYe27MRRsfwoiq5zzOEZLHU3A3KCMa5X/azekYRCJ0HlwI0crAXS/5dEHTzDg=="], @@ -359,6 +408,8 @@ "@rollup/rollup-win32-x64-msvc": ["@rollup/rollup-win32-x64-msvc@4.53.3", "", { "os": "win32", "cpu": "x64" }, "sha512-UhTd8u31dXadv0MopwGgNOBpUVROFKWVQgAg5N1ESyCz8AuBcMqm4AuTjrwgQKGDfoFuz02EuMRHQIw/frmYKQ=="], + "@standard-schema/spec": ["@standard-schema/spec@1.1.0", "", {}, "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w=="], + "@standard-schema/utils": ["@standard-schema/utils@0.3.0", "", {}, "sha512-e7Mew686owMaPJVNNLs55PUvgz371nKgwsc4vxE49zsODpJEnxgxRo2y/OKrqueavXgZNMDVj3DdHFlaSAeU8g=="], "@tailwindcss/node": ["@tailwindcss/node@4.1.17", "", { "dependencies": { "@jridgewell/remapping": "^2.3.4", "enhanced-resolve": "^5.18.3", "jiti": "^2.6.1", "lightningcss": "1.30.2", "magic-string": "^0.30.21", "source-map-js": "^1.2.1", "tailwindcss": "4.1.17" } }, "sha512-csIkHIgLb3JisEFQ0vxr2Y57GUNYh447C8xzwj89U/8fdW8LhProdxvnVH6U8M2Y73QKiTIH+LWbK3V2BBZsAg=="], @@ -399,6 +450,16 @@ "@tanstack/table-core": ["@tanstack/table-core@8.21.3", "", {}, "sha512-ldZXEhOBb8Is7xLs01fR3YEc3DERiz5silj8tnGkFZytt1abEvl/GhUmCE0PMLaMPTa3Jk4HbKmRlHmu+gCftg=="], + "@testing-library/dom": ["@testing-library/dom@10.4.1", "", { "dependencies": { "@babel/code-frame": "^7.10.4", "@babel/runtime": "^7.12.5", "@types/aria-query": "^5.0.1", "aria-query": "5.3.0", "dom-accessibility-api": "^0.5.9", "lz-string": "^1.5.0", "picocolors": "1.1.1", "pretty-format": "^27.0.2" } }, "sha512-o4PXJQidqJl82ckFaXUeoAW+XysPLauYI43Abki5hABd853iMhitooc6znOnczgbTYmEP6U6/y1ZyKAIsvMKGg=="], + + "@testing-library/jest-dom": ["@testing-library/jest-dom@6.9.1", "", { "dependencies": { "@adobe/css-tools": "^4.4.0", "aria-query": "^5.0.0", "css.escape": "^1.5.1", "dom-accessibility-api": "^0.6.3", "picocolors": "^1.1.1", "redent": "^3.0.0" } }, "sha512-zIcONa+hVtVSSep9UT3jZ5rizo2BsxgyDYU7WFD5eICBE7no3881HGeb/QkGfsJs6JTkY1aQhT7rIPC7e+0nnA=="], + + "@testing-library/react": ["@testing-library/react@16.3.1", "", { "dependencies": { "@babel/runtime": "^7.12.5" }, "peerDependencies": { "@testing-library/dom": "^10.0.0", "@types/react": "^18.0.0 || ^19.0.0", "@types/react-dom": "^18.0.0 || ^19.0.0", "react": "^18.0.0 || ^19.0.0", "react-dom": "^18.0.0 || ^19.0.0" }, "optionalPeers": ["@types/react", "@types/react-dom"] }, "sha512-gr4KtAWqIOQoucWYD/f6ki+j5chXfcPc74Col/6poTyqTmn7zRmodWahWRCp8tYd+GMqBonw6hstNzqjbs6gjw=="], + + "@testing-library/user-event": ["@testing-library/user-event@14.6.1", "", { "peerDependencies": { "@testing-library/dom": ">=7.21.4" } }, "sha512-vq7fv0rnt+QTXgPxr5Hjc210p6YKq2kmdziLgnsZGgLJ9e6VAShx1pACLuRjd/AS/sr7phAR58OIIpf0LlmQNw=="], + + "@types/aria-query": ["@types/aria-query@5.0.4", "", {}, "sha512-rfT93uj5s0PRL7EzccGMs3brplhcrghnDoV26NqKhCAS1hVo+WdNsPvE/yb6ilfr5hi2MEk6d5EWJTKdxg8jVw=="], + "@types/babel__core": ["@types/babel__core@7.20.5", "", { "dependencies": { "@babel/parser": "^7.20.7", "@babel/types": "^7.20.7", "@types/babel__generator": "*", "@types/babel__template": "*", "@types/babel__traverse": "*" } }, "sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA=="], "@types/babel__generator": ["@types/babel__generator@7.27.0", "", { "dependencies": { "@babel/types": "^7.0.0" } }, "sha512-ufFd2Xi92OAVPYsy+P4n7/U7e68fex0+Ee8gSG9KX7eo084CWiQ4sdxktvdl0bOPupXtVJPY19zk6EwWqUQ8lg=="], @@ -407,6 +468,8 @@ "@types/babel__traverse": ["@types/babel__traverse@7.28.0", "", { "dependencies": { "@babel/types": "^7.28.2" } }, "sha512-8PvcXf70gTDZBgt9ptxJ8elBeBjcLOAcOtoO/mPJjtji1+CdGbHgm77om1GrsPxsiE+uXIpNSK64UYaIwQXd4Q=="], + "@types/chai": ["@types/chai@5.2.3", "", { "dependencies": { "@types/deep-eql": "*", "assertion-error": "^2.0.1" } }, "sha512-Mw558oeA9fFbv65/y4mHtXDs9bPnFMZAL/jxdPFUpOHHIXX91mcgEHbS5Lahr+pwZFR8A7GQleRWeI6cGFC2UA=="], + "@types/d3-array": ["@types/d3-array@3.2.2", "", {}, "sha512-hOLWVbm7uRza0BYXpIIW5pxfrKe0W+D5lrFiAEYR+pb6w3N2SwSMaJbXdUfSEv+dT4MfHBLtn5js0LAWaO6otw=="], "@types/d3-color": ["@types/d3-color@3.1.3", "", {}, "sha512-iO90scth9WAbmgv7ogoq57O9YpKmFBbmoEoCHDB2xMBY0+/KVrqAaCDyCE16dUspeOvIxFFRI+0sEtqDqy2b4A=="], @@ -429,6 +492,8 @@ "@types/d3-timer": ["@types/d3-timer@3.0.2", "", {}, "sha512-Ps3T8E8dZDam6fUyNiMkekK3XUsaUEik+idO9/YjPtfj2qruF8tFBXS7XhtE4iIXBLxhmLjP3SXpLhVf21I9Lw=="], + "@types/deep-eql": ["@types/deep-eql@4.0.2", "", {}, "sha512-c9h9dVVMigMPc4bwTvC5dxqtqJZwQPePsWjPlpSOnojbor6pGqdk541lfA7AqFQr5pB1BRdq0juY9db81BwyFw=="], + "@types/estree": ["@types/estree@1.0.8", "", {}, "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w=="], "@types/json-schema": ["@types/json-schema@7.0.15", "", {}, "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA=="], @@ -443,6 +508,8 @@ "@types/recharts": ["@types/recharts@1.8.29", "", { "dependencies": { "@types/d3-shape": "^1", "@types/react": "*" } }, "sha512-ulKklaVsnFIIhTQsQw226TnOibrddW1qUQNFVhoQEyY1Z7FRQrNecFCGt7msRuJseudzE9czVawZb17dK/aPXw=="], + "@types/statuses": ["@types/statuses@2.0.6", "", {}, "sha512-xMAgYwceFhRA2zY+XbEA7mxYbA093wdiW8Vu6gZPGWy9cmOyU9XesH1tNcEWsKFd5Vzrqx5T3D38PWx1FIIXkA=="], + "@typescript-eslint/eslint-plugin": ["@typescript-eslint/eslint-plugin@8.48.1", "", { "dependencies": { "@eslint-community/regexpp": "^4.10.0", "@typescript-eslint/scope-manager": "8.48.1", "@typescript-eslint/type-utils": "8.48.1", "@typescript-eslint/utils": "8.48.1", "@typescript-eslint/visitor-keys": "8.48.1", "graphemer": "^1.4.0", "ignore": "^7.0.0", "natural-compare": "^1.4.0", "ts-api-utils": "^2.1.0" }, "peerDependencies": { "@typescript-eslint/parser": "^8.48.1", "eslint": "^8.57.0 || ^9.0.0", "typescript": ">=4.8.4 <6.0.0" } }, "sha512-X63hI1bxl5ohelzr0LY5coufyl0LJNthld+abwxpCoo6Gq+hSqhKwci7MUWkXo67mzgUK6YFByhmaHmUcuBJmA=="], "@typescript-eslint/parser": ["@typescript-eslint/parser@8.48.1", "", { "dependencies": { "@typescript-eslint/scope-manager": "8.48.1", "@typescript-eslint/types": "8.48.1", "@typescript-eslint/typescript-estree": "8.48.1", "@typescript-eslint/visitor-keys": "8.48.1", "debug": "^4.3.4" }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0", "typescript": ">=4.8.4 <6.0.0" } }, "sha512-PC0PDZfJg8sP7cmKe6L3QIL8GZwU5aRvUFedqSIpw3B+QjRSUZeeITC2M5XKeMXEzL6wccN196iy3JLwKNvDVA=="], @@ -465,22 +532,50 @@ "@vitejs/plugin-react": ["@vitejs/plugin-react@5.1.1", "", { "dependencies": { "@babel/core": "^7.28.5", "@babel/plugin-transform-react-jsx-self": "^7.27.1", "@babel/plugin-transform-react-jsx-source": "^7.27.1", "@rolldown/pluginutils": "1.0.0-beta.47", "@types/babel__core": "^7.20.5", "react-refresh": "^0.18.0" }, "peerDependencies": { "vite": "^4.2.0 || ^5.0.0 || ^6.0.0 || ^7.0.0" } }, "sha512-WQfkSw0QbQ5aJ2CHYw23ZGkqnRwqKHD/KYsMeTkZzPT4Jcf0DcBxBtwMJxnu6E7oxw5+JC6ZAiePgh28uJ1HBA=="], + "@vitest/coverage-v8": ["@vitest/coverage-v8@4.0.16", "", { "dependencies": { "@bcoe/v8-coverage": "^1.0.2", "@vitest/utils": "4.0.16", "ast-v8-to-istanbul": "^0.3.8", "istanbul-lib-coverage": "^3.2.2", "istanbul-lib-report": "^3.0.1", "istanbul-lib-source-maps": "^5.0.6", "istanbul-reports": "^3.2.0", "magicast": "^0.5.1", "obug": "^2.1.1", "std-env": "^3.10.0", "tinyrainbow": "^3.0.3" }, "peerDependencies": { "@vitest/browser": "4.0.16", "vitest": "4.0.16" }, "optionalPeers": ["@vitest/browser"] }, "sha512-2rNdjEIsPRzsdu6/9Eq0AYAzYdpP6Bx9cje9tL3FE5XzXRQF1fNU9pe/1yE8fCrS0HD+fBtt6gLPh6LI57tX7A=="], + + "@vitest/expect": ["@vitest/expect@4.0.16", "", { "dependencies": { "@standard-schema/spec": "^1.0.0", "@types/chai": "^5.2.2", "@vitest/spy": "4.0.16", "@vitest/utils": "4.0.16", "chai": "^6.2.1", "tinyrainbow": "^3.0.3" } }, "sha512-eshqULT2It7McaJkQGLkPjPjNph+uevROGuIMJdG3V+0BSR2w9u6J9Lwu+E8cK5TETlfou8GRijhafIMhXsimA=="], + + "@vitest/mocker": ["@vitest/mocker@4.0.16", "", { "dependencies": { "@vitest/spy": "4.0.16", "estree-walker": "^3.0.3", "magic-string": "^0.30.21" }, "peerDependencies": { "msw": "^2.4.9", "vite": "^6.0.0 || ^7.0.0-0" }, "optionalPeers": ["msw", "vite"] }, "sha512-yb6k4AZxJTB+q9ycAvsoxGn+j/po0UaPgajllBgt1PzoMAAmJGYFdDk0uCcRcxb3BrME34I6u8gHZTQlkqSZpg=="], + + "@vitest/pretty-format": ["@vitest/pretty-format@4.0.16", "", { "dependencies": { "tinyrainbow": "^3.0.3" } }, "sha512-eNCYNsSty9xJKi/UdVD8Ou16alu7AYiS2fCPRs0b1OdhJiV89buAXQLpTbe+X8V9L6qrs9CqyvU7OaAopJYPsA=="], + + "@vitest/runner": ["@vitest/runner@4.0.16", "", { "dependencies": { "@vitest/utils": "4.0.16", "pathe": "^2.0.3" } }, "sha512-VWEDm5Wv9xEo80ctjORcTQRJ539EGPB3Pb9ApvVRAY1U/WkHXmmYISqU5E79uCwcW7xYUV38gwZD+RV755fu3Q=="], + + "@vitest/snapshot": ["@vitest/snapshot@4.0.16", "", { "dependencies": { "@vitest/pretty-format": "4.0.16", "magic-string": "^0.30.21", "pathe": "^2.0.3" } }, "sha512-sf6NcrYhYBsSYefxnry+DR8n3UV4xWZwWxYbCJUt2YdvtqzSPR7VfGrY0zsv090DAbjFZsi7ZaMi1KnSRyK1XA=="], + + "@vitest/spy": ["@vitest/spy@4.0.16", "", {}, "sha512-4jIOWjKP0ZUaEmJm00E0cOBLU+5WE0BpeNr3XN6TEF05ltro6NJqHWxXD0kA8/Zc8Nh23AT8WQxwNG+WeROupw=="], + + "@vitest/utils": ["@vitest/utils@4.0.16", "", { "dependencies": { "@vitest/pretty-format": "4.0.16", "tinyrainbow": "^3.0.3" } }, "sha512-h8z9yYhV3e1LEfaQ3zdypIrnAg/9hguReGZoS7Gl0aBG5xgA410zBqECqmaF/+RkTggRsfnzc1XaAHA6bmUufA=="], + "acorn": ["acorn@8.15.0", "", { "bin": { "acorn": "bin/acorn" } }, "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg=="], "acorn-jsx": ["acorn-jsx@5.3.2", "", { "peerDependencies": { "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" } }, "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ=="], + "agent-base": ["agent-base@7.1.4", "", {}, "sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ=="], + "ajv": ["ajv@6.12.6", "", { "dependencies": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", "json-schema-traverse": "^0.4.1", "uri-js": "^4.2.2" } }, "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g=="], + "ansi-regex": ["ansi-regex@5.0.1", "", {}, "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="], + "ansi-styles": ["ansi-styles@4.3.0", "", { "dependencies": { "color-convert": "^2.0.1" } }, "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="], "argparse": ["argparse@2.0.1", "", {}, "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="], "aria-hidden": ["aria-hidden@1.2.6", "", { "dependencies": { "tslib": "^2.0.0" } }, "sha512-ik3ZgC9dY/lYVVM++OISsaYDeg1tb0VtP5uL3ouh1koGOaUMDPpbFIei4JkFimWUFPn90sbMNMXQAIVOlnYKJA=="], + "aria-query": ["aria-query@5.3.2", "", {}, "sha512-COROpnaoap1E2F000S62r6A60uHZnmlvomhfyT2DlTcrY1OrBKn2UhH7qn5wTC9zMvD0AY7csdPSNwKP+7WiQw=="], + + "assertion-error": ["assertion-error@2.0.1", "", {}, "sha512-Izi8RQcffqCeNVgFigKli1ssklIbpHnCYc6AknXGYoB6grJqyeby7jv12JUQgmTAnIDnbck1uxksT4dzN3PWBA=="], + + "ast-v8-to-istanbul": ["ast-v8-to-istanbul@0.3.9", "", { "dependencies": { "@jridgewell/trace-mapping": "^0.3.31", "estree-walker": "^3.0.3", "js-tokens": "^9.0.1" } }, "sha512-dSC6tJeOJxbZrPzPbv5mMd6CMiQ1ugaVXXPRad2fXUSsy1kstFn9XQWemV9VW7Y7kpxgQ/4WMoZfwdH8XSU48w=="], + "balanced-match": ["balanced-match@1.0.2", "", {}, "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="], "baseline-browser-mapping": ["baseline-browser-mapping@2.9.4", "", { "bin": { "baseline-browser-mapping": "dist/cli.js" } }, "sha512-ZCQ9GEWl73BVm8bu5Fts8nt7MHdbt5vY9bP6WGnUh+r3l8M7CgfyTlwsgCbMC66BNxPr6Xoce3j66Ms5YUQTNA=="], + "bidi-js": ["bidi-js@1.0.3", "", { "dependencies": { "require-from-string": "^2.0.2" } }, "sha512-RKshQI1R3YQ+n9YJz2QQ147P66ELpa1FQEg20Dk8oW9t2KgLbpDLLp9aGZ7y8WHSshDknG0bknqGw5/tyCs5tw=="], + "brace-expansion": ["brace-expansion@1.1.12", "", { "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg=="], "browserslist": ["browserslist@4.28.1", "", { "dependencies": { "baseline-browser-mapping": "^2.9.0", "caniuse-lite": "^1.0.30001759", "electron-to-chromium": "^1.5.263", "node-releases": "^2.0.27", "update-browserslist-db": "^1.2.0" }, "bin": { "browserslist": "cli.js" } }, "sha512-ZC5Bd0LgJXgwGqUknZY/vkUQ04r8NXnJZ3yYi4vDmSiZmC/pdSN0NbNRPxZpbtO4uAfDUAFffO8IZoM3Gj8IkA=="], @@ -489,12 +584,18 @@ "caniuse-lite": ["caniuse-lite@1.0.30001759", "", {}, "sha512-Pzfx9fOKoKvevQf8oCXoyNRQ5QyxJj+3O0Rqx2V5oxT61KGx8+n6hV/IUyJeifUci2clnmmKVpvtiqRzgiWjSw=="], + "chai": ["chai@6.2.1", "", {}, "sha512-p4Z49OGG5W/WBCPSS/dH3jQ73kD6tiMmUM+bckNK6Jr5JHMG3k9bg/BvKR8lKmtVBKmOiuVaV2ws8s9oSbwysg=="], + "chalk": ["chalk@4.1.2", "", { "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" } }, "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="], "chokidar": ["chokidar@5.0.0", "", { "dependencies": { "readdirp": "^5.0.0" } }, "sha512-TQMmc3w+5AxjpL8iIiwebF73dRDF4fBIieAqGn9RGCWaEVwQ6Fb2cGe31Yns0RRIzii5goJ1Y7xbMwo1TxMplw=="], "class-variance-authority": ["class-variance-authority@0.7.1", "", { "dependencies": { "clsx": "^2.1.1" } }, "sha512-Ka+9Trutv7G8M6WT6SeiRWz792K5qEqIGEGzXKhAE6xOWAY6pPH8U+9IY3oCMv6kqTmLsv7Xh/2w2RigkePMsg=="], + "cli-width": ["cli-width@4.1.0", "", {}, "sha512-ouuZd4/dm2Sw5Gmqy6bGyNNNe1qt9RpmxveLSO7KcgsTnU7RXfsw+/bukWGo1abgBiMAic068rclZsO4IWmmxQ=="], + + "cliui": ["cliui@8.0.1", "", { "dependencies": { "string-width": "^4.2.0", "strip-ansi": "^6.0.1", "wrap-ansi": "^7.0.0" } }, "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ=="], + "clsx": ["clsx@2.1.1", "", {}, "sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA=="], "color-convert": ["color-convert@2.0.1", "", { "dependencies": { "color-name": "~1.1.4" } }, "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ=="], @@ -509,6 +610,12 @@ "cross-spawn": ["cross-spawn@7.0.6", "", { "dependencies": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", "which": "^2.0.1" } }, "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA=="], + "css-tree": ["css-tree@3.1.0", "", { "dependencies": { "mdn-data": "2.12.2", "source-map-js": "^1.0.1" } }, "sha512-0eW44TGN5SQXU1mWSkKwFstI/22X2bG1nYzZTYMAWjylYURhse752YgbE4Cx46AC+bAvI+/dYTPRk1LqSUnu6w=="], + + "css.escape": ["css.escape@1.5.1", "", {}, "sha512-YUifsXXuknHlUsmlgyY0PKzgPOr7/FjCePfHNt0jxm83wHZi44VDMQ7/fGNkjY3/jV1MC+1CmZbaHzugyeRtpg=="], + + "cssstyle": ["cssstyle@5.3.5", "", { "dependencies": { "@asamuzakjp/css-color": "^4.1.1", "@csstools/css-syntax-patches-for-csstree": "^1.0.21", "css-tree": "^3.1.0" } }, "sha512-GlsEptulso7Jg0VaOZ8BXQi3AkYM5BOJKEO/rjMidSCq70FkIC5y0eawrCXeYzxgt3OCf4Ls+eoxN+/05vN0Ag=="], + "csstype": ["csstype@3.2.3", "", {}, "sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ=="], "d3-array": ["d3-array@3.2.4", "", { "dependencies": { "internmap": "1 - 2" } }, "sha512-tdQAmyA18i4J7wprpYq8ClcxZy3SC31QMeByyCFyRt7BVHdREQZ5lpzoe5mFEYZUWe+oq8HBvk9JjpibyEV4Jg=="], @@ -537,26 +644,40 @@ "d3-timer": ["d3-timer@3.0.1", "", {}, "sha512-ndfJ/JxxMd3nw31uyKoY2naivF+r29V+Lc0svZxe1JvvIRmi8hUsrMvdOwgS1o6uBHmiz91geQ0ylPP0aj1VUA=="], + "data-urls": ["data-urls@6.0.0", "", { "dependencies": { "whatwg-mimetype": "^4.0.0", "whatwg-url": "^15.0.0" } }, "sha512-BnBS08aLUM+DKamupXs3w2tJJoqU+AkaE/+6vQxi/G/DPmIZFJJp9Dkb1kM03AZx8ADehDUZgsNxju3mPXZYIA=="], + "date-fns": ["date-fns@4.1.0", "", {}, "sha512-Ukq0owbQXxa/U3EGtsdVBkR1w7KOQ5gIBqdH2hkvknzZPYvBxb/aa6E8L7tmjFtkwZBu3UXBbjIgPo/Ez4xaNg=="], "date-fns-jalali": ["date-fns-jalali@4.1.0-0", "", {}, "sha512-hTIP/z+t+qKwBDcmmsnmjWTduxCg+5KfdqWQvb2X/8C9+knYY6epN/pfxdDuyVlSVeFz0sM5eEfwIUQ70U4ckg=="], "debug": ["debug@4.4.3", "", { "dependencies": { "ms": "^2.1.3" } }, "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA=="], + "decimal.js": ["decimal.js@10.6.0", "", {}, "sha512-YpgQiITW3JXGntzdUmyUR1V812Hn8T1YVXhCu+wO3OpS4eU9l4YdD3qjyiKdV6mvV29zapkMeD390UVEf2lkUg=="], + "decimal.js-light": ["decimal.js-light@2.5.1", "", {}, "sha512-qIMFpTMZmny+MMIitAB6D7iVPEorVw6YQRWkvarTkT4tBeSLLiHzcwj6q0MmYSFCiVpiqPJTJEYIrpcPzVEIvg=="], "deep-is": ["deep-is@0.1.4", "", {}, "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="], + "dequal": ["dequal@2.0.3", "", {}, "sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA=="], + "detect-libc": ["detect-libc@2.1.2", "", {}, "sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ=="], "detect-node-es": ["detect-node-es@1.1.0", "", {}, "sha512-ypdmJU/TbBby2Dxibuv7ZLW3Bs1QEmM7nHjEANfohJLvE0XVujisn1qPJcZxg+qDucsr+bP6fLD1rPS3AhJ7EQ=="], + "dom-accessibility-api": ["dom-accessibility-api@0.6.3", "", {}, "sha512-7ZgogeTnjuHbo+ct10G9Ffp0mif17idi0IyWNVA/wcwcm7NPOD/WEHVP3n7n3MhXqxoIYm8d6MuZohYWIZ4T3w=="], + "dom-helpers": ["dom-helpers@5.2.1", "", { "dependencies": { "@babel/runtime": "^7.8.7", "csstype": "^3.0.2" } }, "sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA=="], "electron-to-chromium": ["electron-to-chromium@1.5.266", "", {}, "sha512-kgWEglXvkEfMH7rxP5OSZZwnaDWT7J9EoZCujhnpLbfi0bbNtRkgdX2E3gt0Uer11c61qCYktB3hwkAS325sJg=="], + "emoji-regex": ["emoji-regex@8.0.0", "", {}, "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="], + "enhanced-resolve": ["enhanced-resolve@5.18.3", "", { "dependencies": { "graceful-fs": "^4.2.4", "tapable": "^2.2.0" } }, "sha512-d4lC8xfavMeBjzGr2vECC3fsGXziXZQyJxD868h2M/mBI3PwAuODxAkLkq5HYuvrPYcUtiLzsTo8U3PgX3Ocww=="], + "entities": ["entities@6.0.1", "", {}, "sha512-aN97NXWF6AWBTahfVOIrB/NShkzi5H7F9r1s9mD3cDj4Ko5f2qhhVoYMibXF7GlLveb/D2ioWay8lxI97Ven3g=="], + + "es-module-lexer": ["es-module-lexer@1.7.0", "", {}, "sha512-jEQoCwk8hyb2AZziIOLhDqpm5+2ww5uIE6lkO/6jcOCusfk6LhMHpXXfBLXTZ7Ydyt0j4VoUQv6uGNYbdW+kBA=="], + "esbuild": ["esbuild@0.25.12", "", { "optionalDependencies": { "@esbuild/aix-ppc64": "0.25.12", "@esbuild/android-arm": "0.25.12", "@esbuild/android-arm64": "0.25.12", "@esbuild/android-x64": "0.25.12", "@esbuild/darwin-arm64": "0.25.12", "@esbuild/darwin-x64": "0.25.12", "@esbuild/freebsd-arm64": "0.25.12", "@esbuild/freebsd-x64": "0.25.12", "@esbuild/linux-arm": "0.25.12", "@esbuild/linux-arm64": "0.25.12", "@esbuild/linux-ia32": "0.25.12", "@esbuild/linux-loong64": "0.25.12", "@esbuild/linux-mips64el": "0.25.12", "@esbuild/linux-ppc64": "0.25.12", "@esbuild/linux-riscv64": "0.25.12", "@esbuild/linux-s390x": "0.25.12", "@esbuild/linux-x64": "0.25.12", "@esbuild/netbsd-arm64": "0.25.12", "@esbuild/netbsd-x64": "0.25.12", "@esbuild/openbsd-arm64": "0.25.12", "@esbuild/openbsd-x64": "0.25.12", "@esbuild/openharmony-arm64": "0.25.12", "@esbuild/sunos-x64": "0.25.12", "@esbuild/win32-arm64": "0.25.12", "@esbuild/win32-ia32": "0.25.12", "@esbuild/win32-x64": "0.25.12" }, "bin": { "esbuild": "bin/esbuild" } }, "sha512-bbPBYYrtZbkt6Os6FiTLCTFxvq4tt3JKall1vRwshA3fdVztsLAatFaZobhkBC8/BrPetoa0oksYoKXoG4ryJg=="], "escalade": ["escalade@3.2.0", "", {}, "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA=="], @@ -583,10 +704,14 @@ "estraverse": ["estraverse@5.3.0", "", {}, "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA=="], + "estree-walker": ["estree-walker@3.0.3", "", { "dependencies": { "@types/estree": "^1.0.0" } }, "sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g=="], + "esutils": ["esutils@2.0.3", "", {}, "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="], "eventemitter3": ["eventemitter3@4.0.7", "", {}, "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="], + "expect-type": ["expect-type@1.3.0", "", {}, "sha512-knvyeauYhqjOYvQ66MznSMs83wmHrCycNEN6Ao+2AeYEfxUIkuiVxdEa1qlGEPK+We3n0THiDciYSsCcgW/DoA=="], + "fast-deep-equal": ["fast-deep-equal@3.1.3", "", {}, "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="], "fast-equals": ["fast-equals@5.3.3", "", {}, "sha512-/boTcHZeIAQ2r/tL11voclBHDeP9WPxLt+tyAbVSyyXuUFyh0Tne7gJZTqGbxnvj79TjLdCXLOY7UIPhyG5MTw=="], @@ -609,6 +734,8 @@ "gensync": ["gensync@1.0.0-beta.2", "", {}, "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg=="], + "get-caller-file": ["get-caller-file@2.0.5", "", {}, "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="], + "get-nonce": ["get-nonce@1.0.1", "", {}, "sha512-FJhYRoDaiatfEkUK8HKlicmu/3SGFD51q3itKDGoSTysQJBnfOcxU5GxnhE1E6soB76MbT0MBtnKJuXyAx+96Q=="], "glob-parent": ["glob-parent@6.0.2", "", { "dependencies": { "is-glob": "^4.0.3" } }, "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A=="], @@ -619,32 +746,64 @@ "graphemer": ["graphemer@1.4.0", "", {}, "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag=="], + "graphql": ["graphql@16.12.0", "", {}, "sha512-DKKrynuQRne0PNpEbzuEdHlYOMksHSUI8Zc9Unei5gTsMNA2/vMpoMz/yKba50pejK56qj98qM0SjYxAKi13gQ=="], + "has-flag": ["has-flag@4.0.0", "", {}, "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="], + "headers-polyfill": ["headers-polyfill@4.0.3", "", {}, "sha512-IScLbePpkvO846sIwOtOTDjutRMWdXdJmXdMvk6gCBHxFO8d+QKOQedyZSxFTTFYRSmlgSTDtXqqq4pcenBXLQ=="], + "hermes-estree": ["hermes-estree@0.25.1", "", {}, "sha512-0wUoCcLp+5Ev5pDW2OriHC2MJCbwLwuRx+gAqMTOkGKJJiBCLjtrvy4PWUGn6MIVefecRpzoOZ/UV6iGdOr+Cw=="], "hermes-parser": ["hermes-parser@0.25.1", "", { "dependencies": { "hermes-estree": "0.25.1" } }, "sha512-6pEjquH3rqaI6cYAXYPcz9MS4rY6R4ngRgrgfDshRptUZIc3lw0MCIJIGDj9++mfySOuPTHB4nrSW99BCvOPIA=="], + "html-encoding-sniffer": ["html-encoding-sniffer@4.0.0", "", { "dependencies": { "whatwg-encoding": "^3.1.1" } }, "sha512-Y22oTqIU4uuPgEemfz7NDJz6OeKf12Lsu+QC+s3BVpda64lTiMYCyGwg5ki4vFxkMwQdeZDl2adZoqUgdFuTgQ=="], + + "html-escaper": ["html-escaper@2.0.2", "", {}, "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg=="], + + "http-proxy-agent": ["http-proxy-agent@7.0.2", "", { "dependencies": { "agent-base": "^7.1.0", "debug": "^4.3.4" } }, "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig=="], + + "https-proxy-agent": ["https-proxy-agent@7.0.6", "", { "dependencies": { "agent-base": "^7.1.2", "debug": "4" } }, "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw=="], + + "iconv-lite": ["iconv-lite@0.6.3", "", { "dependencies": { "safer-buffer": ">= 2.1.2 < 3.0.0" } }, "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw=="], + "ignore": ["ignore@5.3.2", "", {}, "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g=="], "import-fresh": ["import-fresh@3.3.1", "", { "dependencies": { "parent-module": "^1.0.0", "resolve-from": "^4.0.0" } }, "sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ=="], "imurmurhash": ["imurmurhash@0.1.4", "", {}, "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA=="], + "indent-string": ["indent-string@4.0.0", "", {}, "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg=="], + "internmap": ["internmap@2.0.3", "", {}, "sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg=="], "is-extglob": ["is-extglob@2.1.1", "", {}, "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ=="], + "is-fullwidth-code-point": ["is-fullwidth-code-point@3.0.0", "", {}, "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="], + "is-glob": ["is-glob@4.0.3", "", { "dependencies": { "is-extglob": "^2.1.1" } }, "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg=="], + "is-node-process": ["is-node-process@1.2.0", "", {}, "sha512-Vg4o6/fqPxIjtxgUH5QLJhwZ7gW5diGCVlXpuUfELC62CuxM1iHcRe51f2W1FDy04Ai4KJkagKjx3XaqyfRKXw=="], + + "is-potential-custom-element-name": ["is-potential-custom-element-name@1.0.1", "", {}, "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ=="], + "isexe": ["isexe@2.0.0", "", {}, "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="], + "istanbul-lib-coverage": ["istanbul-lib-coverage@3.2.2", "", {}, "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg=="], + + "istanbul-lib-report": ["istanbul-lib-report@3.0.1", "", { "dependencies": { "istanbul-lib-coverage": "^3.0.0", "make-dir": "^4.0.0", "supports-color": "^7.1.0" } }, "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw=="], + + "istanbul-lib-source-maps": ["istanbul-lib-source-maps@5.0.6", "", { "dependencies": { "@jridgewell/trace-mapping": "^0.3.23", "debug": "^4.1.1", "istanbul-lib-coverage": "^3.0.0" } }, "sha512-yg2d+Em4KizZC5niWhQaIomgf5WlL4vOOjZ5xGCmF8SnPE/mDWWXgvRExdcpCgh9lLRRa1/fSYp2ymmbJ1pI+A=="], + + "istanbul-reports": ["istanbul-reports@3.2.0", "", { "dependencies": { "html-escaper": "^2.0.0", "istanbul-lib-report": "^3.0.0" } }, "sha512-HGYWWS/ehqTV3xN10i23tkPkpH46MLCIMFNCaaKNavAXTF1RkqxawEPtnjnGZ6XKSInBKkiOA5BKS+aZiY3AvA=="], + "jiti": ["jiti@2.6.1", "", { "bin": { "jiti": "lib/jiti-cli.mjs" } }, "sha512-ekilCSN1jwRvIbgeg/57YFh8qQDNbwDb9xT/qu2DAHbFFZUicIl4ygVaAvzveMhMVr3LnpSKTNnwt8PoOfmKhQ=="], - "js-tokens": ["js-tokens@4.0.0", "", {}, "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="], + "js-tokens": ["js-tokens@9.0.1", "", {}, "sha512-mxa9E9ITFOt0ban3j6L5MpjwegGz6lBQmM1IJkWeBZGcMxto50+eWdjC/52xDbS2vy0k7vIMK0Fe2wfL9OQSpQ=="], "js-yaml": ["js-yaml@4.1.1", "", { "dependencies": { "argparse": "^2.0.1" }, "bin": { "js-yaml": "bin/js-yaml.js" } }, "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA=="], + "jsdom": ["jsdom@27.3.0", "", { "dependencies": { "@acemir/cssom": "^0.9.28", "@asamuzakjp/dom-selector": "^6.7.6", "cssstyle": "^5.3.4", "data-urls": "^6.0.0", "decimal.js": "^10.6.0", "html-encoding-sniffer": "^4.0.0", "http-proxy-agent": "^7.0.2", "https-proxy-agent": "^7.0.6", "is-potential-custom-element-name": "^1.0.1", "parse5": "^8.0.0", "saxes": "^6.0.0", "symbol-tree": "^3.2.4", "tough-cookie": "^6.0.0", "w3c-xmlserializer": "^5.0.0", "webidl-conversions": "^8.0.0", "whatwg-encoding": "^3.1.1", "whatwg-mimetype": "^4.0.0", "whatwg-url": "^15.1.0", "ws": "^8.18.3", "xml-name-validator": "^5.0.0" }, "peerDependencies": { "canvas": "^3.0.0" }, "optionalPeers": ["canvas"] }, "sha512-GtldT42B8+jefDUC4yUKAvsaOrH7PDHmZxZXNgF2xMmymjUbRYJvpAybZAKEmXDGTM0mCsz8duOa4vTm5AY2Kg=="], + "jsesc": ["jsesc@3.1.0", "", { "bin": { "jsesc": "bin/jsesc" } }, "sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA=="], "json-buffer": ["json-buffer@3.0.1", "", {}, "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ=="], @@ -691,16 +850,30 @@ "loose-envify": ["loose-envify@1.4.0", "", { "dependencies": { "js-tokens": "^3.0.0 || ^4.0.0" }, "bin": { "loose-envify": "cli.js" } }, "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q=="], - "lru-cache": ["lru-cache@5.1.1", "", { "dependencies": { "yallist": "^3.0.2" } }, "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w=="], + "lru-cache": ["lru-cache@11.2.4", "", {}, "sha512-B5Y16Jr9LB9dHVkh6ZevG+vAbOsNOYCX+sXvFWFu7B3Iz5mijW3zdbMyhsh8ANd2mSWBYdJgnqi+mL7/LrOPYg=="], "lucide-react": ["lucide-react@0.556.0", "", { "peerDependencies": { "react": "^16.5.1 || ^17.0.0 || ^18.0.0 || ^19.0.0" } }, "sha512-iOb8dRk7kLaYBZhR2VlV1CeJGxChBgUthpSP8wom9jfj79qovgG6qcSdiy6vkoREKPnbUYzJsCn4o4PtG3Iy+A=="], + "lz-string": ["lz-string@1.5.0", "", { "bin": { "lz-string": "bin/bin.js" } }, "sha512-h5bgJWpxJNswbU7qCrV0tIKQCaS3blPDrqKWx+QxzuzL1zGUzij9XCWLrSLsJPu5t+eWA/ycetzYAO5IOMcWAQ=="], + "magic-string": ["magic-string@0.30.21", "", { "dependencies": { "@jridgewell/sourcemap-codec": "^1.5.5" } }, "sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ=="], + "magicast": ["magicast@0.5.1", "", { "dependencies": { "@babel/parser": "^7.28.5", "@babel/types": "^7.28.5", "source-map-js": "^1.2.1" } }, "sha512-xrHS24IxaLrvuo613F719wvOIv9xPHFWQHuvGUBmPnCA/3MQxKI3b+r7n1jAoDHmsbC5bRhTZYR77invLAxVnw=="], + + "make-dir": ["make-dir@4.0.0", "", { "dependencies": { "semver": "^7.5.3" } }, "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw=="], + + "mdn-data": ["mdn-data@2.12.2", "", {}, "sha512-IEn+pegP1aManZuckezWCO+XZQDplx1366JoVhTpMpBB1sPey/SbveZQUosKiKiGYjg1wH4pMlNgXbCiYgihQA=="], + + "min-indent": ["min-indent@1.0.1", "", {}, "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg=="], + "minimatch": ["minimatch@3.1.2", "", { "dependencies": { "brace-expansion": "^1.1.7" } }, "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw=="], "ms": ["ms@2.1.3", "", {}, "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="], + "msw": ["msw@2.12.4", "", { "dependencies": { "@inquirer/confirm": "^5.0.0", "@mswjs/interceptors": "^0.40.0", "@open-draft/deferred-promise": "^2.2.0", "@types/statuses": "^2.0.6", "cookie": "^1.0.2", "graphql": "^16.12.0", "headers-polyfill": "^4.0.2", "is-node-process": "^1.2.0", "outvariant": "^1.4.3", "path-to-regexp": "^6.3.0", "picocolors": "^1.1.1", "rettime": "^0.7.0", "statuses": "^2.0.2", "strict-event-emitter": "^0.5.1", "tough-cookie": "^6.0.0", "type-fest": "^5.2.0", "until-async": "^3.0.2", "yargs": "^17.7.2" }, "peerDependencies": { "typescript": ">= 4.8.x" }, "optionalPeers": ["typescript"], "bin": { "msw": "cli/index.js" } }, "sha512-rHNiVfTyKhzc0EjoXUBVGteNKBevdjOlVC6GlIRXpy+/3LHEIGRovnB5WPjcvmNODVQ1TNFnoa7wsGbd0V3epg=="], + + "mute-stream": ["mute-stream@2.0.0", "", {}, "sha512-WWdIxpyjEn+FhQJQQv9aQAYlHoNVdzIzUySNV1gHUPDSdZJ3yZn7pAAbQcV7B56Mvu881q9FZV+0Vx2xC44VWA=="], + "nanoid": ["nanoid@3.3.11", "", { "bin": { "nanoid": "bin/nanoid.cjs" } }, "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w=="], "natural-compare": ["natural-compare@1.4.0", "", {}, "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw=="], @@ -709,18 +882,28 @@ "object-assign": ["object-assign@4.1.1", "", {}, "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg=="], + "obug": ["obug@2.1.1", "", {}, "sha512-uTqF9MuPraAQ+IsnPf366RG4cP9RtUi7MLO1N3KEc+wb0a6yKpeL0lmk2IB1jY5KHPAlTc6T/JRdC/YqxHNwkQ=="], + "optionator": ["optionator@0.9.4", "", { "dependencies": { "deep-is": "^0.1.3", "fast-levenshtein": "^2.0.6", "levn": "^0.4.1", "prelude-ls": "^1.2.1", "type-check": "^0.4.0", "word-wrap": "^1.2.5" } }, "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g=="], + "outvariant": ["outvariant@1.4.3", "", {}, "sha512-+Sl2UErvtsoajRDKCE5/dBz4DIvHXQQnAxtQTF04OJxY0+DyZXSo5P5Bb7XYWOh81syohlYL24hbDwxedPUJCA=="], + "p-limit": ["p-limit@3.1.0", "", { "dependencies": { "yocto-queue": "^0.1.0" } }, "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ=="], "p-locate": ["p-locate@5.0.0", "", { "dependencies": { "p-limit": "^3.0.2" } }, "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw=="], "parent-module": ["parent-module@1.0.1", "", { "dependencies": { "callsites": "^3.0.0" } }, "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g=="], + "parse5": ["parse5@8.0.0", "", { "dependencies": { "entities": "^6.0.0" } }, "sha512-9m4m5GSgXjL4AjumKzq1Fgfp3Z8rsvjRNbnkVwfu2ImRqE5D0LnY2QfDen18FSY9C573YU5XxSapdHZTZ2WolA=="], + "path-exists": ["path-exists@4.0.0", "", {}, "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="], "path-key": ["path-key@3.1.1", "", {}, "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="], + "path-to-regexp": ["path-to-regexp@6.3.0", "", {}, "sha512-Yhpw4T9C6hPpgPeA28us07OJeqZ5EzQTkbfwuhsUg0c237RomFoETJgmp2sa3F/41gfLE6G5cqcYwznmeEeOlQ=="], + + "pathe": ["pathe@2.0.3", "", {}, "sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w=="], + "picocolors": ["picocolors@1.1.1", "", {}, "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA=="], "picomatch": ["picomatch@4.0.3", "", {}, "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q=="], @@ -731,6 +914,8 @@ "prettier": ["prettier@3.7.4", "", { "bin": { "prettier": "bin/prettier.cjs" } }, "sha512-v6UNi1+3hSlVvv8fSaoUbggEM5VErKmmpGA7Pl3HF8V6uKY7rvClBOJlH6yNwQtfTueNkGVpOv/mtWL9L4bgRA=="], + "pretty-format": ["pretty-format@27.5.1", "", { "dependencies": { "ansi-regex": "^5.0.1", "ansi-styles": "^5.0.0", "react-is": "^17.0.1" } }, "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ=="], + "prism-react-renderer": ["prism-react-renderer@2.4.1", "", { "dependencies": { "@types/prismjs": "^1.26.0", "clsx": "^2.0.0" }, "peerDependencies": { "react": ">=16.0.0" } }, "sha512-ey8Ls/+Di31eqzUxC46h8MksNuGx/n0AAC8uKpwFau4RPDYLuE3EXTp8N8G2vX2N7UC/+IXeNUnlWBGGcAG+Ig=="], "prop-types": ["prop-types@15.8.1", "", { "dependencies": { "loose-envify": "^1.4.0", "object-assign": "^4.1.1", "react-is": "^16.13.1" } }, "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg=="], @@ -777,10 +962,22 @@ "recharts-scale": ["recharts-scale@0.4.5", "", { "dependencies": { "decimal.js-light": "^2.4.1" } }, "sha512-kivNFO+0OcUNu7jQquLXAxz1FIwZj8nrj+YkOKc5694NbjCvcT6aSZiIzNzd2Kul4o4rTto8QVR9lMNtxD4G1w=="], + "redent": ["redent@3.0.0", "", { "dependencies": { "indent-string": "^4.0.0", "strip-indent": "^3.0.0" } }, "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg=="], + + "require-directory": ["require-directory@2.1.1", "", {}, "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q=="], + + "require-from-string": ["require-from-string@2.0.2", "", {}, "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw=="], + "resolve-from": ["resolve-from@4.0.0", "", {}, "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g=="], + "rettime": ["rettime@0.7.0", "", {}, "sha512-LPRKoHnLKd/r3dVxcwO7vhCW+orkOGj9ViueosEBK6ie89CijnfRlhaDhHq/3Hxu4CkWQtxwlBG0mzTQY6uQjw=="], + "rollup": ["rollup@4.53.3", "", { "dependencies": { "@types/estree": "1.0.8" }, "optionalDependencies": { "@rollup/rollup-android-arm-eabi": "4.53.3", "@rollup/rollup-android-arm64": "4.53.3", "@rollup/rollup-darwin-arm64": "4.53.3", "@rollup/rollup-darwin-x64": "4.53.3", "@rollup/rollup-freebsd-arm64": "4.53.3", "@rollup/rollup-freebsd-x64": "4.53.3", "@rollup/rollup-linux-arm-gnueabihf": "4.53.3", "@rollup/rollup-linux-arm-musleabihf": "4.53.3", "@rollup/rollup-linux-arm64-gnu": "4.53.3", "@rollup/rollup-linux-arm64-musl": "4.53.3", "@rollup/rollup-linux-loong64-gnu": "4.53.3", "@rollup/rollup-linux-ppc64-gnu": "4.53.3", "@rollup/rollup-linux-riscv64-gnu": "4.53.3", "@rollup/rollup-linux-riscv64-musl": "4.53.3", "@rollup/rollup-linux-s390x-gnu": "4.53.3", "@rollup/rollup-linux-x64-gnu": "4.53.3", "@rollup/rollup-linux-x64-musl": "4.53.3", "@rollup/rollup-openharmony-arm64": "4.53.3", "@rollup/rollup-win32-arm64-msvc": "4.53.3", "@rollup/rollup-win32-ia32-msvc": "4.53.3", "@rollup/rollup-win32-x64-gnu": "4.53.3", "@rollup/rollup-win32-x64-msvc": "4.53.3", "fsevents": "~2.3.2" }, "bin": { "rollup": "dist/bin/rollup" } }, "sha512-w8GmOxZfBmKknvdXU1sdM9NHcoQejwF/4mNgj2JuEEdRaHwwF12K7e9eXn1nLZ07ad+du76mkVsyeb2rKGllsA=="], + "safer-buffer": ["safer-buffer@2.1.2", "", {}, "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="], + + "saxes": ["saxes@6.0.0", "", { "dependencies": { "xmlchars": "^2.2.0" } }, "sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA=="], + "scheduler": ["scheduler@0.27.0", "", {}, "sha512-eNv+WrVbKu1f3vbYJT/xtiF5syA5HPIMtf9IgY/nKg0sWqzAUEvqY/xm7OcZc/qafLx/iO9FgOmeSAp4v5ti/Q=="], "semver": ["semver@6.3.1", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="], @@ -791,14 +988,36 @@ "shebang-regex": ["shebang-regex@3.0.0", "", {}, "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="], + "siginfo": ["siginfo@2.0.0", "", {}, "sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g=="], + + "signal-exit": ["signal-exit@4.1.0", "", {}, "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw=="], + "sonner": ["sonner@2.0.7", "", { "peerDependencies": { "react": "^18.0.0 || ^19.0.0 || ^19.0.0-rc", "react-dom": "^18.0.0 || ^19.0.0 || ^19.0.0-rc" } }, "sha512-W6ZN4p58k8aDKA4XPcx2hpIQXBRAgyiWVkYhT7CvK6D3iAu7xjvVyhQHg2/iaKJZ1XVJ4r7XuwGL+WGEK37i9w=="], "source-map-js": ["source-map-js@1.2.1", "", {}, "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA=="], + "stackback": ["stackback@0.0.2", "", {}, "sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw=="], + + "statuses": ["statuses@2.0.2", "", {}, "sha512-DvEy55V3DB7uknRo+4iOGT5fP1slR8wQohVdknigZPMpMstaKJQWhwiYBACJE3Ul2pTnATihhBYnRhZQHGBiRw=="], + + "std-env": ["std-env@3.10.0", "", {}, "sha512-5GS12FdOZNliM5mAOxFRg7Ir0pWz8MdpYm6AY6VPkGpbA7ZzmbzNcBJQ0GPvvyWgcY7QAhCgf9Uy89I03faLkg=="], + + "strict-event-emitter": ["strict-event-emitter@0.5.1", "", {}, "sha512-vMgjE/GGEPEFnhFub6pa4FmJBRBVOLpIII2hvCZ8Kzb7K0hlHo7mQv6xYrBvCL2LtAIBwFUK8wvuJgTVSQ5MFQ=="], + + "string-width": ["string-width@4.2.3", "", { "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", "strip-ansi": "^6.0.1" } }, "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="], + + "strip-ansi": ["strip-ansi@6.0.1", "", { "dependencies": { "ansi-regex": "^5.0.1" } }, "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="], + + "strip-indent": ["strip-indent@3.0.0", "", { "dependencies": { "min-indent": "^1.0.0" } }, "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ=="], + "strip-json-comments": ["strip-json-comments@3.1.1", "", {}, "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig=="], "supports-color": ["supports-color@7.2.0", "", { "dependencies": { "has-flag": "^4.0.0" } }, "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="], + "symbol-tree": ["symbol-tree@3.2.4", "", {}, "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw=="], + + "tagged-tag": ["tagged-tag@1.0.0", "", {}, "sha512-yEFYrVhod+hdNyx7g5Bnkkb0G6si8HJurOoOEgC8B/O0uXLHlaey/65KRv6cuWBNhBgHKAROVpc7QyYqE5gFng=="], + "tailwind-merge": ["tailwind-merge@3.4.0", "", {}, "sha512-uSaO4gnW+b3Y2aWoWfFpX62vn2sR3skfhbjsEnaBI81WD1wBLlHZe5sWf0AqjksNdYTbGBEd0UasQMT3SNV15g=="], "tailwindcss": ["tailwindcss@4.1.17", "", {}, "sha512-j9Ee2YjuQqYT9bbRTfTZht9W/ytp5H+jJpZKiYdP/bpnXARAuELt9ofP0lPnmHjbga7SNQIxdTAXCmtKVYjN+Q=="], @@ -807,20 +1026,38 @@ "tiny-invariant": ["tiny-invariant@1.3.3", "", {}, "sha512-+FbBPE1o9QAYvviau/qC5SE3caw21q3xkvWKBtja5vgqOWIHHJ3ioaq1VPfn/Szqctz2bU/oYeKd9/z5BL+PVg=="], + "tinybench": ["tinybench@2.9.0", "", {}, "sha512-0+DUvqWMValLmha6lr4kD8iAMK1HzV0/aKnCtWb9v9641TnP/MFb7Pc2bxoxQjTXAErryXVgUOfv2YqNllqGeg=="], + + "tinyexec": ["tinyexec@1.0.2", "", {}, "sha512-W/KYk+NFhkmsYpuHq5JykngiOCnxeVL8v8dFnqxSD8qEEdRfXk1SDM6JzNqcERbcGYj9tMrDQBYV9cjgnunFIg=="], + "tinyglobby": ["tinyglobby@0.2.15", "", { "dependencies": { "fdir": "^6.5.0", "picomatch": "^4.0.3" } }, "sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ=="], + "tinyrainbow": ["tinyrainbow@3.0.3", "", {}, "sha512-PSkbLUoxOFRzJYjjxHJt9xro7D+iilgMX/C9lawzVuYiIdcihh9DXmVibBe8lmcFrRi/VzlPjBxbN7rH24q8/Q=="], + + "tldts": ["tldts@7.0.19", "", { "dependencies": { "tldts-core": "^7.0.19" }, "bin": { "tldts": "bin/cli.js" } }, "sha512-8PWx8tvC4jDB39BQw1m4x8y5MH1BcQ5xHeL2n7UVFulMPH/3Q0uiamahFJ3lXA0zO2SUyRXuVVbWSDmstlt9YA=="], + + "tldts-core": ["tldts-core@7.0.19", "", {}, "sha512-lJX2dEWx0SGH4O6p+7FPwYmJ/bu1JbcGJ8RLaG9b7liIgZ85itUVEPbMtWRVrde/0fnDPEPHW10ZsKW3kVsE9A=="], + + "tough-cookie": ["tough-cookie@6.0.0", "", { "dependencies": { "tldts": "^7.0.5" } }, "sha512-kXuRi1mtaKMrsLUxz3sQYvVl37B0Ns6MzfrtV5DvJceE9bPyspOqk9xxv7XbZWcfLWbFmm997vl83qUWVJA64w=="], + + "tr46": ["tr46@6.0.0", "", { "dependencies": { "punycode": "^2.3.1" } }, "sha512-bLVMLPtstlZ4iMQHpFHTR7GAGj2jxi8Dg0s2h2MafAE4uSWF98FC/3MomU51iQAMf8/qDUbKWf5GxuvvVcXEhw=="], + "ts-api-utils": ["ts-api-utils@2.1.0", "", { "peerDependencies": { "typescript": ">=4.8.4" } }, "sha512-CUgTZL1irw8u29bzrOD/nH85jqyc74D6SshFgujOIA7osm2Rz7dYH77agkx7H4FBNxDq7Cjf+IjaX/8zwFW+ZQ=="], "tslib": ["tslib@2.8.1", "", {}, "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="], "type-check": ["type-check@0.4.0", "", { "dependencies": { "prelude-ls": "^1.2.1" } }, "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew=="], + "type-fest": ["type-fest@5.3.1", "", { "dependencies": { "tagged-tag": "^1.0.0" } }, "sha512-VCn+LMHbd4t6sF3wfU/+HKT63C9OoyrSIf4b+vtWHpt2U7/4InZG467YDNMFMR70DdHjAdpPWmw2lzRdg0Xqqg=="], + "typescript": ["typescript@5.9.3", "", { "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" } }, "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw=="], "typescript-eslint": ["typescript-eslint@8.48.1", "", { "dependencies": { "@typescript-eslint/eslint-plugin": "8.48.1", "@typescript-eslint/parser": "8.48.1", "@typescript-eslint/typescript-estree": "8.48.1", "@typescript-eslint/utils": "8.48.1" }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0", "typescript": ">=4.8.4 <6.0.0" } }, "sha512-FbOKN1fqNoXp1hIl5KYpObVrp0mCn+CLgn479nmu2IsRMrx2vyv74MmsBLVlhg8qVwNFGbXSp8fh1zp8pEoC2A=="], "undici-types": ["undici-types@7.16.0", "", {}, "sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw=="], + "until-async": ["until-async@3.0.2", "", {}, "sha512-IiSk4HlzAMqTUseHHe3VhIGyuFmN90zMTpD3Z3y8jeQbzLIq500MVM7Jq2vUAnTKAFPJrqwkzr6PoTcPhGcOiw=="], + "update-browserslist-db": ["update-browserslist-db@1.2.2", "", { "dependencies": { "escalade": "^3.2.0", "picocolors": "^1.1.1" }, "peerDependencies": { "browserslist": ">= 4.21.0" }, "bin": { "update-browserslist-db": "cli.js" } }, "sha512-E85pfNzMQ9jpKkA7+TJAi4TJN+tBCuWh5rUcS/sv6cFi+1q9LYDwDI5dpUL0u/73EElyQ8d3TEaeW4sPedBqYA=="], "uri-js": ["uri-js@4.4.1", "", { "dependencies": { "punycode": "^2.1.0" } }, "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg=="], @@ -835,20 +1072,54 @@ "vite": ["vite@7.2.6", "", { "dependencies": { "esbuild": "^0.25.0", "fdir": "^6.5.0", "picomatch": "^4.0.3", "postcss": "^8.5.6", "rollup": "^4.43.0", "tinyglobby": "^0.2.15" }, "optionalDependencies": { "fsevents": "~2.3.3" }, "peerDependencies": { "@types/node": "^20.19.0 || >=22.12.0", "jiti": ">=1.21.0", "less": "^4.0.0", "lightningcss": "^1.21.0", "sass": "^1.70.0", "sass-embedded": "^1.70.0", "stylus": ">=0.54.8", "sugarss": "^5.0.0", "terser": "^5.16.0", "tsx": "^4.8.1", "yaml": "^2.4.2" }, "optionalPeers": ["@types/node", "jiti", "less", "lightningcss", "sass", "sass-embedded", "stylus", "sugarss", "terser", "tsx", "yaml"], "bin": { "vite": "bin/vite.js" } }, "sha512-tI2l/nFHC5rLh7+5+o7QjKjSR04ivXDF4jcgV0f/bTQ+OJiITy5S6gaynVsEM+7RqzufMnVbIon6Sr5x1SDYaQ=="], + "vitest": ["vitest@4.0.16", "", { "dependencies": { "@vitest/expect": "4.0.16", "@vitest/mocker": "4.0.16", "@vitest/pretty-format": "4.0.16", "@vitest/runner": "4.0.16", "@vitest/snapshot": "4.0.16", "@vitest/spy": "4.0.16", "@vitest/utils": "4.0.16", "es-module-lexer": "^1.7.0", "expect-type": "^1.2.2", "magic-string": "^0.30.21", "obug": "^2.1.1", "pathe": "^2.0.3", "picomatch": "^4.0.3", "std-env": "^3.10.0", "tinybench": "^2.9.0", "tinyexec": "^1.0.2", "tinyglobby": "^0.2.15", "tinyrainbow": "^3.0.3", "vite": "^6.0.0 || ^7.0.0", "why-is-node-running": "^2.3.0" }, "peerDependencies": { "@edge-runtime/vm": "*", "@opentelemetry/api": "^1.9.0", "@types/node": "^20.0.0 || ^22.0.0 || >=24.0.0", "@vitest/browser-playwright": "4.0.16", "@vitest/browser-preview": "4.0.16", "@vitest/browser-webdriverio": "4.0.16", "@vitest/ui": "4.0.16", "happy-dom": "*", "jsdom": "*" }, "optionalPeers": ["@edge-runtime/vm", "@opentelemetry/api", "@types/node", "@vitest/browser-playwright", "@vitest/browser-preview", "@vitest/browser-webdriverio", "@vitest/ui", "happy-dom", "jsdom"], "bin": { "vitest": "vitest.mjs" } }, "sha512-E4t7DJ9pESL6E3I8nFjPa4xGUd3PmiWDLsDztS2qXSJWfHtbQnwAWylaBvSNY48I3vr8PTqIZlyK8TE3V3CA4Q=="], + + "w3c-xmlserializer": ["w3c-xmlserializer@5.0.0", "", { "dependencies": { "xml-name-validator": "^5.0.0" } }, "sha512-o8qghlI8NZHU1lLPrpi2+Uq7abh4GGPpYANlalzWxyWteJOCsr/P+oPBA49TOLu5FTZO4d3F9MnWJfiMo4BkmA=="], + + "webidl-conversions": ["webidl-conversions@8.0.0", "", {}, "sha512-n4W4YFyz5JzOfQeA8oN7dUYpR+MBP3PIUsn2jLjWXwK5ASUzt0Jc/A5sAUZoCYFJRGF0FBKJ+1JjN43rNdsQzA=="], + + "whatwg-encoding": ["whatwg-encoding@3.1.1", "", { "dependencies": { "iconv-lite": "0.6.3" } }, "sha512-6qN4hJdMwfYBtE3YBTTHhoeuUrDBPZmbQaxWAqSALV/MeEnR5z1xd8UKud2RAkFoPkmB+hli1TZSnyi84xz1vQ=="], + + "whatwg-mimetype": ["whatwg-mimetype@4.0.0", "", {}, "sha512-QaKxh0eNIi2mE9p2vEdzfagOKHCcj1pJ56EEHGQOVxp8r9/iszLUUV7v89x9O1p/T+NlTM5W7jW6+cz4Fq1YVg=="], + + "whatwg-url": ["whatwg-url@15.1.0", "", { "dependencies": { "tr46": "^6.0.0", "webidl-conversions": "^8.0.0" } }, "sha512-2ytDk0kiEj/yu90JOAp44PVPUkO9+jVhyf+SybKlRHSDlvOOZhdPIrr7xTH64l4WixO2cP+wQIcgujkGBPPz6g=="], + "which": ["which@2.0.2", "", { "dependencies": { "isexe": "^2.0.0" }, "bin": { "node-which": "./bin/node-which" } }, "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA=="], + "why-is-node-running": ["why-is-node-running@2.3.0", "", { "dependencies": { "siginfo": "^2.0.0", "stackback": "0.0.2" }, "bin": { "why-is-node-running": "cli.js" } }, "sha512-hUrmaWBdVDcxvYqnyh09zunKzROWjbZTiNy8dBEjkS7ehEDQibXJ7XvlmtbwuTclUiIyN+CyXQD4Vmko8fNm8w=="], + "word-wrap": ["word-wrap@1.2.5", "", {}, "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA=="], + "wrap-ansi": ["wrap-ansi@6.2.0", "", { "dependencies": { "ansi-styles": "^4.0.0", "string-width": "^4.1.0", "strip-ansi": "^6.0.0" } }, "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA=="], + + "ws": ["ws@8.18.3", "", { "peerDependencies": { "bufferutil": "^4.0.1", "utf-8-validate": ">=5.0.2" }, "optionalPeers": ["bufferutil", "utf-8-validate"] }, "sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg=="], + + "xml-name-validator": ["xml-name-validator@5.0.0", "", {}, "sha512-EvGK8EJ3DhaHfbRlETOWAS5pO9MZITeauHKJyb8wyajUfQUenkIg2MvLDTZ4T/TgIcm3HU0TFBgWWboAZ30UHg=="], + + "xmlchars": ["xmlchars@2.2.0", "", {}, "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw=="], + + "y18n": ["y18n@5.0.8", "", {}, "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA=="], + "yallist": ["yallist@3.1.1", "", {}, "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="], "yaml": ["yaml@2.8.2", "", { "bin": { "yaml": "bin.mjs" } }, "sha512-mplynKqc1C2hTVYxd0PU2xQAc22TI1vShAYGksCCfxbn/dFwnHTNi1bvYsBTkhdUNtGIf5xNOg938rrSSYvS9A=="], + "yargs": ["yargs@17.7.2", "", { "dependencies": { "cliui": "^8.0.1", "escalade": "^3.1.1", "get-caller-file": "^2.0.5", "require-directory": "^2.1.1", "string-width": "^4.2.3", "y18n": "^5.0.5", "yargs-parser": "^21.1.1" } }, "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w=="], + + "yargs-parser": ["yargs-parser@21.1.1", "", {}, "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw=="], + "yocto-queue": ["yocto-queue@0.1.0", "", {}, "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q=="], + "yoctocolors-cjs": ["yoctocolors-cjs@2.1.3", "", {}, "sha512-U/PBtDf35ff0D8X8D0jfdzHYEPFxAI7jJlxZXwCSez5M3190m+QobIfh+sWDWSHMCWWJN2AWamkegn6vr6YBTw=="], + "zod": ["zod@4.1.13", "", {}, "sha512-AvvthqfqrAhNH9dnfmrfKzX5upOdjUVJYFqNSlkmGf64gRaTzlPwz99IHYnVs28qYAybvAlBV+H7pn0saFY4Ig=="], "zod-validation-error": ["zod-validation-error@4.0.2", "", { "peerDependencies": { "zod": "^3.25.0 || ^4.0.0" } }, "sha512-Q6/nZLe6jxuU80qb/4uJ4t5v2VEZ44lzQjPDhYJNztRQ4wyWc6VF3D3Kb/fAuPetZQnhS3hnajCf9CsWesghLQ=="], + "@babel/code-frame/js-tokens": ["js-tokens@4.0.0", "", {}, "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="], + + "@babel/helper-compilation-targets/lru-cache": ["lru-cache@5.1.1", "", { "dependencies": { "yallist": "^3.0.2" } }, "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w=="], + "@eslint-community/eslint-utils/eslint-visitor-keys": ["eslint-visitor-keys@3.4.3", "", {}, "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag=="], "@eslint/eslintrc/globals": ["globals@14.0.0", "", {}, "sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ=="], @@ -889,12 +1160,18 @@ "@tailwindcss/oxide-wasm32-wasi/tslib": ["tslib@2.8.1", "", { "bundled": true }, "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="], + "@testing-library/dom/aria-query": ["aria-query@5.3.0", "", { "dependencies": { "dequal": "^2.0.3" } }, "sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A=="], + + "@testing-library/dom/dom-accessibility-api": ["dom-accessibility-api@0.5.16", "", {}, "sha512-X7BJ2yElsnOJ30pZF4uIIDfBEVgF4XEBxL9Bxhy6dnrm5hkzqmsWHGTiHqRiITNhMyFLyAiWndIJP7Z1NTteDg=="], + "@typescript-eslint/eslint-plugin/ignore": ["ignore@7.0.5", "", {}, "sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg=="], "@typescript-eslint/typescript-estree/minimatch": ["minimatch@9.0.5", "", { "dependencies": { "brace-expansion": "^2.0.1" } }, "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow=="], "@typescript-eslint/typescript-estree/semver": ["semver@7.7.3", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q=="], + "cliui/wrap-ansi": ["wrap-ansi@7.0.0", "", { "dependencies": { "ansi-styles": "^4.0.0", "string-width": "^4.1.0", "strip-ansi": "^6.0.0" } }, "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q=="], + "d3-sankey/d3-array": ["d3-array@2.12.1", "", { "dependencies": { "internmap": "^1.0.0" } }, "sha512-B0ErZK/66mHtEsR1TkPEEkwdy+WDesimkM5gpZr5Dsg54BiTA5RXtYW5qTLIAcekaS9xfZrzBLF/OAkB3Qn1YQ=="], "d3-sankey/d3-shape": ["d3-shape@1.3.7", "", { "dependencies": { "d3-path": "1" } }, "sha512-EUkvKjqPFUAZyOlhY5gzCxCeI0Aep04LwIRpsZ/mLFelJiUfnK56jo5JMDSE7yyP2kLSb6LtF+S5chMk7uqPqw=="], @@ -905,6 +1182,14 @@ "d3-time-format/d3-time": ["d3-time@2.1.1", "", { "dependencies": { "d3-array": "2" } }, "sha512-/eIQe/eR4kCQwq7yxi7z4c6qEXf2IYGcjoWB5OOQy4Tq9Uv39/947qlDcN2TLkiTzQWzvnsuYPB9TrWaNfipKQ=="], + "loose-envify/js-tokens": ["js-tokens@4.0.0", "", {}, "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="], + + "make-dir/semver": ["semver@7.7.3", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q=="], + + "pretty-format/ansi-styles": ["ansi-styles@5.2.0", "", {}, "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA=="], + + "pretty-format/react-is": ["react-is@17.0.2", "", {}, "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w=="], + "prop-types/react-is": ["react-is@16.13.1", "", {}, "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="], "victory-vendor/@types/d3-shape": ["@types/d3-shape@3.1.7", "", { "dependencies": { "@types/d3-path": "*" } }, "sha512-VLvUQ33C+3J+8p+Daf+nYSOsjB4GXp19/S/aGo60m9h1v6XaxjiT82lKVWJCfzhtuZ3yD7i/TPeC/fuKLLOSmg=="], diff --git a/ui/package.json b/ui/package.json index a6488087..5fbb4629 100644 --- a/ui/package.json +++ b/ui/package.json @@ -9,10 +9,14 @@ "typecheck": "tsc -b --noEmit", "lint": "eslint .", "lint:fix": "eslint . --fix", - "format": "prettier --write src/", - "format:check": "prettier --check src/", + "format": "prettier --write src/ tests/", + "format:check": "prettier --check src/ tests/", "validate": "bun run typecheck && bun run lint:fix && bun run format:check", - "preview": "vite preview" + "preview": "vite preview", + "test": "vitest", + "test:run": "vitest run", + "test:coverage": "vitest run --coverage", + "test:ui": "vitest --ui" }, "dependencies": { "@hookform/resolvers": "^5.2.2", @@ -57,20 +61,27 @@ "devDependencies": { "@eslint/js": "^9.39.1", "@tailwindcss/vite": "^4.1.17", + "@testing-library/jest-dom": "^6.9.1", + "@testing-library/react": "^16.3.1", + "@testing-library/user-event": "^14.6.1", "@types/node": "^24.10.1", "@types/react": "^19.2.5", "@types/react-dom": "^19.2.3", "@types/recharts": "^1.8.29", "@vitejs/plugin-react": "^5.1.1", + "@vitest/coverage-v8": "^4.0.16", "eslint": "^9.39.1", "eslint-config-prettier": "^10.1.8", "eslint-plugin-react-hooks": "^7.0.1", "eslint-plugin-react-refresh": "^0.4.24", "globals": "^16.5.0", + "jsdom": "^27.3.0", + "msw": "^2.12.4", "prettier": "^3.6.2", "tailwindcss": "^4.1.17", "typescript": "~5.9.3", "typescript-eslint": "^8.46.4", - "vite": "^7.2.4" + "vite": "^7.2.4", + "vitest": "^4.0.16" } } diff --git a/ui/tests/setup/msw-handlers.ts b/ui/tests/setup/msw-handlers.ts new file mode 100644 index 00000000..ec40c907 --- /dev/null +++ b/ui/tests/setup/msw-handlers.ts @@ -0,0 +1,271 @@ +/** + * MSW Handlers + * Mock Service Worker handlers for API mocking in tests + */ + +import { http, HttpResponse } from 'msw'; + +// Mock data +export const mockWebSearchConfig = { + enabled: true, + providers: { + gemini: { enabled: true, model: 'gemini-2.5-flash', timeout: 30000 }, + grok: { enabled: false, model: 'grok-beta', timeout: 30000 }, + opencode: { enabled: true, model: 'opencode/grok-code', timeout: 30000 }, + }, +}; + +export const mockWebSearchStatus = { + geminiCli: { installed: true, path: '/usr/local/bin/gemini', version: '1.0.0' }, + grokCli: { installed: false, path: null, version: null }, + opencodeCli: { installed: true, path: '/usr/local/bin/opencode', version: '2.0.0' }, + readiness: { status: 'ready' as const, message: 'WebSearch ready' }, +}; + +export const mockGlobalEnvConfig = { + enabled: true, + env: { + NODE_ENV: 'development', + DEBUG: 'true', + }, +}; + +export const mockProxyConfig = { + remote: { + enabled: true, + host: 'proxy.example.com', + port: 8080, + protocol: 'https' as const, + authToken: 'test-token', + }, + fallback: { + enabled: false, + host: '', + port: 0, + protocol: 'http' as const, + }, + local: { + enabled: true, + port: 3001, + }, +}; + +export const mockUsageSummary = { + totalTokens: 1500000, + totalInputTokens: 500000, + totalOutputTokens: 1000000, + totalCacheTokens: 200000, + totalCacheCreationTokens: 50000, + totalCacheReadTokens: 150000, + totalCost: 15.5, + tokenBreakdown: { + input: { tokens: 500000, cost: 5.0 }, + output: { tokens: 1000000, cost: 10.0 }, + cacheCreation: { tokens: 50000, cost: 0.25 }, + cacheRead: { tokens: 150000, cost: 0.25 }, + }, + totalDays: 30, + averageTokensPerDay: 50000, + averageCostPerDay: 0.52, +}; + +export const mockAuthStatus = { + authStatus: [ + { + provider: 'google', + displayName: 'Google', + accounts: [ + { + id: 'acc-1', + email: 'user1@gmail.com', + isDefault: true, + lastUsedAt: '2025-01-01T00:00:00Z', + }, + { + id: 'acc-2', + email: 'user2@gmail.com', + isDefault: false, + lastUsedAt: '2025-01-02T00:00:00Z', + }, + ], + }, + { + provider: 'github', + displayName: 'GitHub', + accounts: [ + { + id: 'acc-3', + email: 'dev@github.com', + isDefault: true, + lastUsedAt: '2025-01-03T00:00:00Z', + }, + ], + }, + ], +}; + +export const mockCliproxyStats = { + accountStats: { + 'user1@gmail.com': { successCount: 95, failureCount: 5, lastUsedAt: '2025-01-01T12:00:00Z' }, + 'user2@gmail.com': { successCount: 45, failureCount: 15, lastUsedAt: '2025-01-02T12:00:00Z' }, + 'dev@github.com': { successCount: 100, failureCount: 0, lastUsedAt: '2025-01-03T12:00:00Z' }, + }, +}; + +// API Handlers +export const handlers = [ + // WebSearch endpoints + http.get('/api/websearch', () => { + return HttpResponse.json(mockWebSearchConfig); + }), + + http.get('/api/websearch/status', () => { + return HttpResponse.json(mockWebSearchStatus); + }), + + http.put('/api/websearch', async ({ request }) => { + const body = (await request.json()) as typeof mockWebSearchConfig; + return HttpResponse.json({ websearch: body }); + }), + + // GlobalEnv endpoints + http.get('/api/global-env', () => { + return HttpResponse.json(mockGlobalEnvConfig); + }), + + http.put('/api/global-env', async ({ request }) => { + const body = (await request.json()) as typeof mockGlobalEnvConfig; + return HttpResponse.json({ config: body }); + }), + + // Proxy endpoints + http.get('/api/cliproxy-server', () => { + return HttpResponse.json({ data: mockProxyConfig }); + }), + + http.put('/api/cliproxy-server', async ({ request }) => { + const body = (await request.json()) as Partial; + return HttpResponse.json({ data: { ...mockProxyConfig, ...body } }); + }), + + http.post('/api/cliproxy-server/test', () => { + return HttpResponse.json({ + data: { + connected: true, + version: '1.0.0', + latency: 50, + }, + }); + }), + + // Usage/Analytics endpoints + http.get('/api/usage/summary', () => { + return HttpResponse.json({ data: mockUsageSummary }); + }), + + http.get('/api/usage/daily', () => { + return HttpResponse.json({ + data: [ + { + date: '2025-01-01', + tokens: 50000, + inputTokens: 20000, + outputTokens: 30000, + cacheTokens: 5000, + cost: 0.5, + modelsUsed: 2, + }, + { + date: '2025-01-02', + tokens: 60000, + inputTokens: 25000, + outputTokens: 35000, + cacheTokens: 6000, + cost: 0.6, + modelsUsed: 3, + }, + ], + }); + }), + + http.get('/api/usage/hourly', () => { + return HttpResponse.json({ + data: [ + { + hour: '00:00', + tokens: 5000, + inputTokens: 2000, + outputTokens: 3000, + cacheTokens: 500, + cost: 0.05, + modelsUsed: 1, + requests: 10, + }, + ], + }); + }), + + http.get('/api/usage/models', () => { + return HttpResponse.json({ + data: [ + { + model: 'claude-3-opus', + tokens: 100000, + inputTokens: 40000, + outputTokens: 60000, + cacheCreationTokens: 5000, + cacheReadTokens: 10000, + cacheTokens: 15000, + cost: 5.0, + percentage: 60, + costBreakdown: { + input: { tokens: 40000, cost: 2.0 }, + output: { tokens: 60000, cost: 3.0 }, + cacheCreation: { tokens: 5000, cost: 0.025 }, + cacheRead: { tokens: 10000, cost: 0.025 }, + }, + ioRatio: 1.5, + }, + ], + }); + }), + + http.get('/api/usage/sessions', () => { + return HttpResponse.json({ + data: { + sessions: [ + { + sessionId: 'sess-1', + projectPath: '/home/user/project', + inputTokens: 10000, + outputTokens: 20000, + cost: 0.3, + lastActivity: '2025-01-01T12:00:00Z', + modelsUsed: ['claude-3-opus'], + }, + ], + total: 1, + limit: 3, + offset: 0, + hasMore: false, + }, + }); + }), + + http.get('/api/usage/status', () => { + return HttpResponse.json({ data: { lastFetch: Date.now(), cacheSize: 1024 } }); + }), + + http.post('/api/usage/refresh', () => { + return HttpResponse.json({ success: true }); + }), + + // CLIProxy auth endpoints + http.get('/api/cliproxy/auth', () => { + return HttpResponse.json({ data: mockAuthStatus }); + }), + + http.get('/api/cliproxy-stats', () => { + return HttpResponse.json({ data: mockCliproxyStats }); + }), +]; diff --git a/ui/tests/setup/test-utils.tsx b/ui/tests/setup/test-utils.tsx new file mode 100644 index 00000000..455760af --- /dev/null +++ b/ui/tests/setup/test-utils.tsx @@ -0,0 +1,105 @@ +/** + * Test Utilities + * Custom render with all required providers for testing React components + */ + +/* eslint-disable react-refresh/only-export-components */ +import { render, type RenderOptions, type RenderResult } from '@testing-library/react'; +import { QueryClient, QueryClientProvider } from '@tanstack/react-query'; +import { BrowserRouter } from 'react-router-dom'; +import type { ReactElement, ReactNode } from 'react'; +import { PrivacyProvider } from '../../src/contexts/privacy-context'; +import { SettingsProvider } from '../../src/pages/settings/context'; + +/** + * Create a fresh QueryClient for each test to avoid shared state + */ +export function createTestQueryClient(): QueryClient { + return new QueryClient({ + defaultOptions: { + queries: { + retry: false, + gcTime: 0, + staleTime: 0, + }, + mutations: { + retry: false, + }, + }, + }); +} + +interface AllProvidersProps { + children: ReactNode; + queryClient?: QueryClient; +} + +/** + * AllProviders wraps all required context providers for testing + */ +export function AllProviders({ children, queryClient }: AllProvidersProps) { + const client = queryClient ?? createTestQueryClient(); + + return ( + + + {children} + + + ); +} + +/** + * AllProviders with SettingsContext for settings page tests + */ +export function SettingsTestProviders({ children, queryClient }: AllProvidersProps) { + const client = queryClient ?? createTestQueryClient(); + + return ( + + + + {children} + + + + ); +} + +interface CustomRenderOptions extends Omit { + queryClient?: QueryClient; + withSettingsProvider?: boolean; +} + +/** + * Custom render function that wraps components with all necessary providers + */ +function customRender( + ui: ReactElement, + options: CustomRenderOptions = {} +): RenderResult & { queryClient: QueryClient } { + const { + queryClient = createTestQueryClient(), + withSettingsProvider = false, + ...renderOptions + } = options; + + const Wrapper = withSettingsProvider ? SettingsTestProviders : AllProviders; + + const result = render(ui, { + wrapper: ({ children }) => {children}, + ...renderOptions, + }); + + return { + ...result, + queryClient, + }; +} + +// Re-export everything from testing-library +export * from '@testing-library/react'; +export { userEvent } from '@testing-library/user-event'; + +// Override render with our custom version +export { customRender as render }; diff --git a/ui/tests/setup/vitest-setup.ts b/ui/tests/setup/vitest-setup.ts new file mode 100644 index 00000000..e50b7023 --- /dev/null +++ b/ui/tests/setup/vitest-setup.ts @@ -0,0 +1,44 @@ +/** + * Vitest Setup + * Global test configuration and matchers + */ + +import '@testing-library/jest-dom/vitest'; +import { cleanup } from '@testing-library/react'; +import { afterEach, vi } from 'vitest'; + +// Cleanup after each test +afterEach(() => { + cleanup(); +}); + +// Mock matchMedia for components that use media queries +Object.defineProperty(window, 'matchMedia', { + writable: true, + value: vi.fn().mockImplementation((query: string) => ({ + matches: false, + media: query, + onchange: null, + addListener: vi.fn(), + removeListener: vi.fn(), + addEventListener: vi.fn(), + removeEventListener: vi.fn(), + dispatchEvent: vi.fn(), + })), +}); + +// Mock ResizeObserver +global.ResizeObserver = vi.fn().mockImplementation(() => ({ + observe: vi.fn(), + unobserve: vi.fn(), + disconnect: vi.fn(), +})); + +// Mock localStorage +const localStorageMock = { + getItem: vi.fn(), + setItem: vi.fn(), + removeItem: vi.fn(), + clear: vi.fn(), +}; +Object.defineProperty(window, 'localStorage', { value: localStorageMock }); diff --git a/ui/tests/unit/ui/components/monitoring/auth-monitor/auth-monitor-utils.test.ts b/ui/tests/unit/ui/components/monitoring/auth-monitor/auth-monitor-utils.test.ts new file mode 100644 index 00000000..1755e91a --- /dev/null +++ b/ui/tests/unit/ui/components/monitoring/auth-monitor/auth-monitor-utils.test.ts @@ -0,0 +1,182 @@ +/** + * Auth Monitor Utils Tests + * Unit tests for getSuccessRate, cleanEmail, and ACCOUNT_COLORS + */ + +import { describe, it, expect } from 'vitest'; +import { + getSuccessRate, + cleanEmail, + ACCOUNT_COLORS, +} from '../../../../../../src/components/monitoring/auth-monitor/utils'; + +describe('getSuccessRate', () => { + describe('edge cases', () => { + it('returns 100 when both success and failure are 0', () => { + expect(getSuccessRate(0, 0)).toBe(100); + }); + + it('returns 100 when success is non-zero and failure is 0', () => { + expect(getSuccessRate(100, 0)).toBe(100); + expect(getSuccessRate(1, 0)).toBe(100); + expect(getSuccessRate(1000, 0)).toBe(100); + }); + + it('returns 0 when success is 0 and failure is non-zero', () => { + expect(getSuccessRate(0, 100)).toBe(0); + expect(getSuccessRate(0, 1)).toBe(0); + expect(getSuccessRate(0, 1000)).toBe(0); + }); + }); + + describe('normal cases', () => { + it('calculates 90% correctly', () => { + expect(getSuccessRate(90, 10)).toBe(90); + }); + + it('calculates 75% correctly', () => { + expect(getSuccessRate(75, 25)).toBe(75); + }); + + it('calculates 50% correctly', () => { + expect(getSuccessRate(50, 50)).toBe(50); + }); + + it('calculates 25% correctly', () => { + expect(getSuccessRate(25, 75)).toBe(25); + }); + + it('calculates 10% correctly', () => { + expect(getSuccessRate(10, 90)).toBe(10); + }); + }); + + describe('rounding', () => { + it('rounds to nearest integer', () => { + expect(getSuccessRate(1, 2)).toBe(33); // 33.33... + expect(getSuccessRate(2, 1)).toBe(67); // 66.66... + }); + + it('handles 1/3 ratio', () => { + expect(getSuccessRate(1, 3)).toBe(25); + }); + + it('handles small numbers', () => { + expect(getSuccessRate(1, 1)).toBe(50); + expect(getSuccessRate(1, 9)).toBe(10); + expect(getSuccessRate(9, 1)).toBe(90); + }); + }); + + describe('large numbers', () => { + it('handles large numbers correctly', () => { + expect(getSuccessRate(900000, 100000)).toBe(90); + expect(getSuccessRate(999999, 1)).toBe(100); // rounds up + }); + }); +}); + +describe('cleanEmail', () => { + describe('common domains to strip', () => { + it('strips @gmail.com', () => { + expect(cleanEmail('user@gmail.com')).toBe('user'); + expect(cleanEmail('john.doe@gmail.com')).toBe('john.doe'); + expect(cleanEmail('test123@gmail.com')).toBe('test123'); + }); + + it('strips @yahoo.com', () => { + expect(cleanEmail('user@yahoo.com')).toBe('user'); + expect(cleanEmail('john.doe@yahoo.com')).toBe('john.doe'); + }); + + it('strips @hotmail.com', () => { + expect(cleanEmail('user@hotmail.com')).toBe('user'); + expect(cleanEmail('john.doe@hotmail.com')).toBe('john.doe'); + }); + + it('strips @outlook.com', () => { + expect(cleanEmail('user@outlook.com')).toBe('user'); + expect(cleanEmail('john.doe@outlook.com')).toBe('john.doe'); + }); + + it('strips @icloud.com', () => { + expect(cleanEmail('user@icloud.com')).toBe('user'); + expect(cleanEmail('john.doe@icloud.com')).toBe('john.doe'); + }); + }); + + describe('case insensitivity', () => { + it('strips uppercase domains', () => { + expect(cleanEmail('user@GMAIL.COM')).toBe('user'); + expect(cleanEmail('user@Gmail.Com')).toBe('user'); + expect(cleanEmail('user@OUTLOOK.COM')).toBe('user'); + }); + }); + + describe('preserves other domains', () => { + it('preserves company domains', () => { + expect(cleanEmail('user@company.com')).toBe('user@company.com'); + expect(cleanEmail('admin@acme.org')).toBe('admin@acme.org'); + expect(cleanEmail('dev@startup.io')).toBe('dev@startup.io'); + }); + + it('preserves educational domains', () => { + expect(cleanEmail('student@university.edu')).toBe('student@university.edu'); + }); + + it('preserves government domains', () => { + expect(cleanEmail('agent@agency.gov')).toBe('agent@agency.gov'); + }); + + it('preserves subdomains of common providers', () => { + expect(cleanEmail('user@mail.gmail.com')).toBe('user@mail.gmail.com'); + }); + }); + + describe('edge cases', () => { + it('handles email-like strings without @ symbol', () => { + expect(cleanEmail('notanemail')).toBe('notanemail'); + }); + + it('handles empty string', () => { + expect(cleanEmail('')).toBe(''); + }); + + it('handles email with numbers', () => { + expect(cleanEmail('user123@gmail.com')).toBe('user123'); + }); + + it('handles email with plus addressing', () => { + expect(cleanEmail('user+tag@gmail.com')).toBe('user+tag'); + }); + + it('handles email with dots', () => { + expect(cleanEmail('first.last@gmail.com')).toBe('first.last'); + }); + }); +}); + +describe('ACCOUNT_COLORS', () => { + it('is an array with at least 10 colors', () => { + expect(Array.isArray(ACCOUNT_COLORS)).toBe(true); + expect(ACCOUNT_COLORS.length).toBeGreaterThanOrEqual(10); + }); + + it('contains valid hex color codes', () => { + const hexColorRegex = /^#[0-9a-fA-F]{6}$/; + ACCOUNT_COLORS.forEach((color) => { + expect(color).toMatch(hexColorRegex); + }); + }); + + it('all colors are unique', () => { + const uniqueColors = new Set(ACCOUNT_COLORS); + expect(uniqueColors.size).toBe(ACCOUNT_COLORS.length); + }); + + it('contains expected colors', () => { + expect(ACCOUNT_COLORS).toContain('#1e6091'); // Deep Cerulean + expect(ACCOUNT_COLORS).toContain('#2d8a6e'); // Deep Seaweed + expect(ACCOUNT_COLORS).toContain('#c92a2d'); // Deep Strawberry + }); +}); diff --git a/ui/tests/unit/ui/pages/analytics/analytics-utils.test.ts b/ui/tests/unit/ui/pages/analytics/analytics-utils.test.ts new file mode 100644 index 00000000..2ffcc380 --- /dev/null +++ b/ui/tests/unit/ui/pages/analytics/analytics-utils.test.ts @@ -0,0 +1,112 @@ +/** + * Analytics Utils Tests + * Unit tests for formatTokens utility function + */ + +import { describe, it, expect } from 'vitest'; +import { formatTokens } from '../../../../../src/pages/analytics/utils'; + +describe('formatTokens', () => { + describe('small numbers (< 1K)', () => { + it('returns exact number for 0', () => { + expect(formatTokens(0)).toBe('0'); + }); + + it('returns exact number for single digits', () => { + expect(formatTokens(1)).toBe('1'); + expect(formatTokens(9)).toBe('9'); + }); + + it('returns exact number for double digits', () => { + expect(formatTokens(10)).toBe('10'); + expect(formatTokens(99)).toBe('99'); + }); + + it('returns exact number for triple digits', () => { + expect(formatTokens(100)).toBe('100'); + expect(formatTokens(999)).toBe('999'); + }); + }); + + describe('thousands (1K - 999K)', () => { + it('formats 1000 as 1K', () => { + expect(formatTokens(1000)).toBe('1K'); + }); + + it('formats numbers in thousands with no decimal', () => { + expect(formatTokens(1500)).toBe('2K'); + expect(formatTokens(5000)).toBe('5K'); + expect(formatTokens(10000)).toBe('10K'); + expect(formatTokens(100000)).toBe('100K'); + expect(formatTokens(999000)).toBe('999K'); + }); + + it('handles edge cases near 1000', () => { + expect(formatTokens(999)).toBe('999'); + expect(formatTokens(1001)).toBe('1K'); + }); + }); + + describe('millions (1M - 999M)', () => { + it('formats 1000000 as 1.0M', () => { + expect(formatTokens(1_000_000)).toBe('1.0M'); + }); + + it('formats numbers in millions with one decimal', () => { + expect(formatTokens(1_500_000)).toBe('1.5M'); + expect(formatTokens(10_000_000)).toBe('10.0M'); + expect(formatTokens(100_000_000)).toBe('100.0M'); + expect(formatTokens(999_000_000)).toBe('999.0M'); + }); + + it('handles edge cases near 1M', () => { + expect(formatTokens(999_999)).toBe('1000K'); + expect(formatTokens(1_000_001)).toBe('1.0M'); + }); + + it('formats 2.5M correctly', () => { + expect(formatTokens(2_500_000)).toBe('2.5M'); + }); + }); + + describe('billions (1B+)', () => { + it('formats 1000000000 as 1.0B', () => { + expect(formatTokens(1_000_000_000)).toBe('1.0B'); + }); + + it('formats numbers in billions with one decimal', () => { + expect(formatTokens(1_500_000_000)).toBe('1.5B'); + expect(formatTokens(10_000_000_000)).toBe('10.0B'); + expect(formatTokens(100_000_000_000)).toBe('100.0B'); + }); + + it('handles edge cases near 1B', () => { + expect(formatTokens(999_999_999)).toBe('1000.0M'); + expect(formatTokens(1_000_000_001)).toBe('1.0B'); + }); + + it('formats 2.7B correctly', () => { + expect(formatTokens(2_700_000_000)).toBe('2.7B'); + }); + }); + + describe('negative numbers', () => { + it('handles negative numbers', () => { + // Function doesn't explicitly handle negatives but should not crash + expect(formatTokens(-100)).toBe('-100'); + }); + }); + + describe('decimal precision', () => { + it('millions round to one decimal', () => { + expect(formatTokens(1_234_567)).toBe('1.2M'); + expect(formatTokens(1_250_000)).toBe('1.3M'); // 1.25 rounds to 1.3 + expect(formatTokens(1_240_000)).toBe('1.2M'); + }); + + it('billions round to one decimal', () => { + expect(formatTokens(1_234_567_890)).toBe('1.2B'); + expect(formatTokens(1_250_000_000)).toBe('1.3B'); + }); + }); +}); diff --git a/ui/tests/unit/ui/pages/settings/context-hooks.test.tsx b/ui/tests/unit/ui/pages/settings/context-hooks.test.tsx new file mode 100644 index 00000000..72e79dc2 --- /dev/null +++ b/ui/tests/unit/ui/pages/settings/context-hooks.test.tsx @@ -0,0 +1,489 @@ +/** + * Settings Context Hooks Tests + * Unit tests for useSettingsContext and useSettingsActions + */ + +import { describe, it, expect, vi } from 'vitest'; +import { renderHook, act } from '@testing-library/react'; +import { + useSettingsContext, + useSettingsActions, +} from '../../../../../src/pages/settings/hooks/context-hooks'; +import { SettingsTestProviders } from '../../../../setup/test-utils'; +import type { ReactNode } from 'react'; + +// Wrapper for hooks that require SettingsContext +function wrapper({ children }: { children: ReactNode }) { + return {children}; +} + +describe('useSettingsContext', () => { + it('throws error when used outside SettingsProvider', () => { + // Suppress console.error for expected error + const consoleSpy = vi.spyOn(console, 'error').mockImplementation(() => {}); + + expect(() => { + renderHook(() => useSettingsContext()); + }).toThrow('useSettingsContext must be used within a SettingsProvider'); + + consoleSpy.mockRestore(); + }); + + it('returns context when used within SettingsProvider', () => { + const { result } = renderHook(() => useSettingsContext(), { wrapper }); + + expect(result.current).toBeDefined(); + expect(result.current.state).toBeDefined(); + expect(result.current.dispatch).toBeDefined(); + expect(typeof result.current.dispatch).toBe('function'); + }); + + it('provides initial state', () => { + const { result } = renderHook(() => useSettingsContext(), { wrapper }); + + expect(result.current.state.webSearchConfig).toBeNull(); + expect(result.current.state.webSearchLoading).toBe(true); + expect(result.current.state.globalEnvConfig).toBeNull(); + expect(result.current.state.proxyConfig).toBeNull(); + }); +}); + +describe('useSettingsActions', () => { + it('returns all action functions', () => { + const { result } = renderHook(() => useSettingsActions(), { wrapper }); + + // WebSearch actions + expect(typeof result.current.setWebSearchConfig).toBe('function'); + expect(typeof result.current.setWebSearchStatus).toBe('function'); + expect(typeof result.current.setWebSearchLoading).toBe('function'); + expect(typeof result.current.setWebSearchStatusLoading).toBe('function'); + expect(typeof result.current.setWebSearchSaving).toBe('function'); + expect(typeof result.current.setWebSearchError).toBe('function'); + expect(typeof result.current.setWebSearchSuccess).toBe('function'); + + // GlobalEnv actions + expect(typeof result.current.setGlobalEnvConfig).toBe('function'); + expect(typeof result.current.setGlobalEnvLoading).toBe('function'); + expect(typeof result.current.setGlobalEnvSaving).toBe('function'); + expect(typeof result.current.setGlobalEnvError).toBe('function'); + expect(typeof result.current.setGlobalEnvSuccess).toBe('function'); + + // Proxy actions + expect(typeof result.current.setProxyConfig).toBe('function'); + expect(typeof result.current.setProxyLoading).toBe('function'); + expect(typeof result.current.setProxySaving).toBe('function'); + expect(typeof result.current.setProxyError).toBe('function'); + expect(typeof result.current.setProxySuccess).toBe('function'); + expect(typeof result.current.setProxyTestResult).toBe('function'); + expect(typeof result.current.setProxyTesting).toBe('function'); + + // Raw config actions + expect(typeof result.current.setRawConfig).toBe('function'); + expect(typeof result.current.setRawConfigLoading).toBe('function'); + }); + + describe('WebSearch actions', () => { + it('setWebSearchConfig updates state', () => { + const { result } = renderHook( + () => { + const context = useSettingsContext(); + const actions = useSettingsActions(); + return { context, actions }; + }, + { wrapper } + ); + + const config = { enabled: true, providers: { gemini: { enabled: true } } }; + + act(() => { + result.current.actions.setWebSearchConfig(config); + }); + + expect(result.current.context.state.webSearchConfig).toEqual(config); + }); + + it('setWebSearchStatus updates state', () => { + const { result } = renderHook( + () => { + const context = useSettingsContext(); + const actions = useSettingsActions(); + return { context, actions }; + }, + { wrapper } + ); + + const status = { + geminiCli: { installed: true, path: '/bin', version: '1.0' }, + grokCli: { installed: false, path: null, version: null }, + opencodeCli: { installed: false, path: null, version: null }, + readiness: { status: 'ready' as const, message: 'Ready' }, + }; + + act(() => { + result.current.actions.setWebSearchStatus(status); + }); + + expect(result.current.context.state.webSearchStatus).toEqual(status); + }); + + it('setWebSearchLoading updates state', () => { + const { result } = renderHook( + () => { + const context = useSettingsContext(); + const actions = useSettingsActions(); + return { context, actions }; + }, + { wrapper } + ); + + act(() => { + result.current.actions.setWebSearchLoading(false); + }); + + expect(result.current.context.state.webSearchLoading).toBe(false); + }); + + it('setWebSearchStatusLoading updates state', () => { + const { result } = renderHook( + () => { + const context = useSettingsContext(); + const actions = useSettingsActions(); + return { context, actions }; + }, + { wrapper } + ); + + act(() => { + result.current.actions.setWebSearchStatusLoading(false); + }); + + expect(result.current.context.state.webSearchStatusLoading).toBe(false); + }); + + it('setWebSearchSaving updates state', () => { + const { result } = renderHook( + () => { + const context = useSettingsContext(); + const actions = useSettingsActions(); + return { context, actions }; + }, + { wrapper } + ); + + act(() => { + result.current.actions.setWebSearchSaving(true); + }); + + expect(result.current.context.state.webSearchSaving).toBe(true); + }); + + it('setWebSearchError updates state', () => { + const { result } = renderHook( + () => { + const context = useSettingsContext(); + const actions = useSettingsActions(); + return { context, actions }; + }, + { wrapper } + ); + + act(() => { + result.current.actions.setWebSearchError('Test error'); + }); + + expect(result.current.context.state.webSearchError).toBe('Test error'); + }); + + it('setWebSearchSuccess updates state', () => { + const { result } = renderHook( + () => { + const context = useSettingsContext(); + const actions = useSettingsActions(); + return { context, actions }; + }, + { wrapper } + ); + + act(() => { + result.current.actions.setWebSearchSuccess(true); + }); + + expect(result.current.context.state.webSearchSuccess).toBe(true); + }); + }); + + describe('GlobalEnv actions', () => { + it('setGlobalEnvConfig updates state', () => { + const { result } = renderHook( + () => { + const context = useSettingsContext(); + const actions = useSettingsActions(); + return { context, actions }; + }, + { wrapper } + ); + + const config = { enabled: true, env: { NODE_ENV: 'test' } }; + + act(() => { + result.current.actions.setGlobalEnvConfig(config); + }); + + expect(result.current.context.state.globalEnvConfig).toEqual(config); + }); + + it('setGlobalEnvLoading updates state', () => { + const { result } = renderHook( + () => { + const context = useSettingsContext(); + const actions = useSettingsActions(); + return { context, actions }; + }, + { wrapper } + ); + + act(() => { + result.current.actions.setGlobalEnvLoading(false); + }); + + expect(result.current.context.state.globalEnvLoading).toBe(false); + }); + + it('setGlobalEnvSaving updates state', () => { + const { result } = renderHook( + () => { + const context = useSettingsContext(); + const actions = useSettingsActions(); + return { context, actions }; + }, + { wrapper } + ); + + act(() => { + result.current.actions.setGlobalEnvSaving(true); + }); + + expect(result.current.context.state.globalEnvSaving).toBe(true); + }); + + it('setGlobalEnvError updates state', () => { + const { result } = renderHook( + () => { + const context = useSettingsContext(); + const actions = useSettingsActions(); + return { context, actions }; + }, + { wrapper } + ); + + act(() => { + result.current.actions.setGlobalEnvError('GlobalEnv error'); + }); + + expect(result.current.context.state.globalEnvError).toBe('GlobalEnv error'); + }); + + it('setGlobalEnvSuccess updates state', () => { + const { result } = renderHook( + () => { + const context = useSettingsContext(); + const actions = useSettingsActions(); + return { context, actions }; + }, + { wrapper } + ); + + act(() => { + result.current.actions.setGlobalEnvSuccess(true); + }); + + expect(result.current.context.state.globalEnvSuccess).toBe(true); + }); + }); + + describe('Proxy actions', () => { + it('setProxyConfig updates state', () => { + const { result } = renderHook( + () => { + const context = useSettingsContext(); + const actions = useSettingsActions(); + return { context, actions }; + }, + { wrapper } + ); + + const config = { + remote: { + enabled: true, + host: 'test.com', + port: 8080, + protocol: 'https' as const, + authToken: '', + }, + fallback: { enabled: false, host: '', port: 0, protocol: 'http' as const }, + local: { enabled: true, port: 3001 }, + }; + + act(() => { + result.current.actions.setProxyConfig(config); + }); + + expect(result.current.context.state.proxyConfig).toEqual(config); + }); + + it('setProxyLoading updates state', () => { + const { result } = renderHook( + () => { + const context = useSettingsContext(); + const actions = useSettingsActions(); + return { context, actions }; + }, + { wrapper } + ); + + act(() => { + result.current.actions.setProxyLoading(false); + }); + + expect(result.current.context.state.proxyLoading).toBe(false); + }); + + it('setProxySaving updates state', () => { + const { result } = renderHook( + () => { + const context = useSettingsContext(); + const actions = useSettingsActions(); + return { context, actions }; + }, + { wrapper } + ); + + act(() => { + result.current.actions.setProxySaving(true); + }); + + expect(result.current.context.state.proxySaving).toBe(true); + }); + + it('setProxyError updates state', () => { + const { result } = renderHook( + () => { + const context = useSettingsContext(); + const actions = useSettingsActions(); + return { context, actions }; + }, + { wrapper } + ); + + act(() => { + result.current.actions.setProxyError('Proxy connection error'); + }); + + expect(result.current.context.state.proxyError).toBe('Proxy connection error'); + }); + + it('setProxySuccess updates state', () => { + const { result } = renderHook( + () => { + const context = useSettingsContext(); + const actions = useSettingsActions(); + return { context, actions }; + }, + { wrapper } + ); + + act(() => { + result.current.actions.setProxySuccess(true); + }); + + expect(result.current.context.state.proxySuccess).toBe(true); + }); + + it('setProxyTesting updates state', () => { + const { result } = renderHook( + () => { + const context = useSettingsContext(); + const actions = useSettingsActions(); + return { context, actions }; + }, + { wrapper } + ); + + act(() => { + result.current.actions.setProxyTesting(true); + }); + + expect(result.current.context.state.proxyTesting).toBe(true); + }); + + it('setProxyTestResult updates state', () => { + const { result } = renderHook( + () => { + const context = useSettingsContext(); + const actions = useSettingsActions(); + return { context, actions }; + }, + { wrapper } + ); + + const testResult = { connected: true, version: '1.0.0', latency: 25 }; + + act(() => { + result.current.actions.setProxyTestResult(testResult); + }); + + expect(result.current.context.state.proxyTestResult).toEqual(testResult); + }); + }); + + describe('Raw config actions', () => { + it('setRawConfig updates state', () => { + const { result } = renderHook( + () => { + const context = useSettingsContext(); + const actions = useSettingsActions(); + return { context, actions }; + }, + { wrapper } + ); + + act(() => { + result.current.actions.setRawConfig('{"key": "value"}'); + }); + + expect(result.current.context.state.rawConfig).toBe('{"key": "value"}'); + }); + + it('setRawConfigLoading updates state', () => { + const { result } = renderHook( + () => { + const context = useSettingsContext(); + const actions = useSettingsActions(); + return { context, actions }; + }, + { wrapper } + ); + + act(() => { + result.current.actions.setRawConfigLoading(true); + }); + + expect(result.current.context.state.rawConfigLoading).toBe(true); + }); + }); + + describe('action stability', () => { + it('action functions are stable across renders', () => { + const { result, rerender } = renderHook(() => useSettingsActions(), { wrapper }); + + const firstRenderActions = result.current; + rerender(); + const secondRenderActions = result.current; + + // useCallback should return same function references + expect(firstRenderActions.setWebSearchConfig).toBe(secondRenderActions.setWebSearchConfig); + expect(firstRenderActions.setGlobalEnvConfig).toBe(secondRenderActions.setGlobalEnvConfig); + expect(firstRenderActions.setProxyConfig).toBe(secondRenderActions.setProxyConfig); + }); + }); +}); diff --git a/ui/tests/unit/ui/pages/settings/settings-context.test.ts b/ui/tests/unit/ui/pages/settings/settings-context.test.ts new file mode 100644 index 00000000..a92cd682 --- /dev/null +++ b/ui/tests/unit/ui/pages/settings/settings-context.test.ts @@ -0,0 +1,215 @@ +/** + * Settings Context Tests + * Unit tests for settingsReducer and initial state + */ + +import { describe, it, expect } from 'vitest'; +import { + settingsReducer, + initialSettingsState, + type SettingsState, + type SettingsAction, +} from '../../../../../src/pages/settings/settings-context'; + +describe('settingsReducer', () => { + describe('initial state', () => { + it('has correct default values', () => { + expect(initialSettingsState.webSearchConfig).toBeNull(); + expect(initialSettingsState.webSearchStatus).toBeNull(); + expect(initialSettingsState.webSearchLoading).toBe(true); + expect(initialSettingsState.webSearchStatusLoading).toBe(true); + expect(initialSettingsState.webSearchSaving).toBe(false); + expect(initialSettingsState.webSearchError).toBeNull(); + expect(initialSettingsState.webSearchSuccess).toBe(false); + + expect(initialSettingsState.globalEnvConfig).toBeNull(); + expect(initialSettingsState.globalEnvLoading).toBe(true); + expect(initialSettingsState.globalEnvSaving).toBe(false); + expect(initialSettingsState.globalEnvError).toBeNull(); + expect(initialSettingsState.globalEnvSuccess).toBe(false); + + expect(initialSettingsState.proxyConfig).toBeNull(); + expect(initialSettingsState.proxyLoading).toBe(true); + expect(initialSettingsState.proxySaving).toBe(false); + expect(initialSettingsState.proxyError).toBeNull(); + expect(initialSettingsState.proxySuccess).toBe(false); + expect(initialSettingsState.proxyTestResult).toBeNull(); + expect(initialSettingsState.proxyTesting).toBe(false); + + expect(initialSettingsState.rawConfig).toBeNull(); + expect(initialSettingsState.rawConfigLoading).toBe(false); + }); + }); + + describe('WebSearch actions', () => { + it('SET_WEBSEARCH_CONFIG updates webSearchConfig', () => { + const config = { enabled: true, providers: { gemini: { enabled: true } } }; + const action: SettingsAction = { type: 'SET_WEBSEARCH_CONFIG', payload: config }; + const newState = settingsReducer(initialSettingsState, action); + expect(newState.webSearchConfig).toEqual(config); + }); + + it('SET_WEBSEARCH_STATUS updates webSearchStatus', () => { + const status = { + geminiCli: { installed: true, path: '/bin', version: '1.0' }, + grokCli: { installed: false, path: null, version: null }, + opencodeCli: { installed: false, path: null, version: null }, + readiness: { status: 'ready' as const, message: 'Ready' }, + }; + const action: SettingsAction = { type: 'SET_WEBSEARCH_STATUS', payload: status }; + const newState = settingsReducer(initialSettingsState, action); + expect(newState.webSearchStatus).toEqual(status); + }); + + it('SET_WEBSEARCH_LOADING updates webSearchLoading', () => { + const action: SettingsAction = { type: 'SET_WEBSEARCH_LOADING', payload: false }; + const newState = settingsReducer(initialSettingsState, action); + expect(newState.webSearchLoading).toBe(false); + }); + + it('SET_WEBSEARCH_STATUS_LOADING updates webSearchStatusLoading', () => { + const action: SettingsAction = { type: 'SET_WEBSEARCH_STATUS_LOADING', payload: false }; + const newState = settingsReducer(initialSettingsState, action); + expect(newState.webSearchStatusLoading).toBe(false); + }); + + it('SET_WEBSEARCH_SAVING updates webSearchSaving', () => { + const action: SettingsAction = { type: 'SET_WEBSEARCH_SAVING', payload: true }; + const newState = settingsReducer(initialSettingsState, action); + expect(newState.webSearchSaving).toBe(true); + }); + + it('SET_WEBSEARCH_ERROR updates webSearchError', () => { + const action: SettingsAction = { type: 'SET_WEBSEARCH_ERROR', payload: 'Network error' }; + const newState = settingsReducer(initialSettingsState, action); + expect(newState.webSearchError).toBe('Network error'); + }); + + it('SET_WEBSEARCH_SUCCESS updates webSearchSuccess', () => { + const action: SettingsAction = { type: 'SET_WEBSEARCH_SUCCESS', payload: true }; + const newState = settingsReducer(initialSettingsState, action); + expect(newState.webSearchSuccess).toBe(true); + }); + }); + + describe('GlobalEnv actions', () => { + it('SET_GLOBALENV_CONFIG updates globalEnvConfig', () => { + const config = { enabled: true, env: { NODE_ENV: 'test' } }; + const action: SettingsAction = { type: 'SET_GLOBALENV_CONFIG', payload: config }; + const newState = settingsReducer(initialSettingsState, action); + expect(newState.globalEnvConfig).toEqual(config); + }); + + it('SET_GLOBALENV_LOADING updates globalEnvLoading', () => { + const action: SettingsAction = { type: 'SET_GLOBALENV_LOADING', payload: false }; + const newState = settingsReducer(initialSettingsState, action); + expect(newState.globalEnvLoading).toBe(false); + }); + + it('SET_GLOBALENV_SAVING updates globalEnvSaving', () => { + const action: SettingsAction = { type: 'SET_GLOBALENV_SAVING', payload: true }; + const newState = settingsReducer(initialSettingsState, action); + expect(newState.globalEnvSaving).toBe(true); + }); + + it('SET_GLOBALENV_ERROR updates globalEnvError', () => { + const action: SettingsAction = { type: 'SET_GLOBALENV_ERROR', payload: 'Save failed' }; + const newState = settingsReducer(initialSettingsState, action); + expect(newState.globalEnvError).toBe('Save failed'); + }); + + it('SET_GLOBALENV_SUCCESS updates globalEnvSuccess', () => { + const action: SettingsAction = { type: 'SET_GLOBALENV_SUCCESS', payload: true }; + const newState = settingsReducer(initialSettingsState, action); + expect(newState.globalEnvSuccess).toBe(true); + }); + }); + + describe('Proxy actions', () => { + it('SET_PROXY_CONFIG updates proxyConfig', () => { + const config = { + remote: { + enabled: true, + host: 'proxy.test', + port: 8080, + protocol: 'https' as const, + authToken: '', + }, + fallback: { enabled: false, host: '', port: 0, protocol: 'http' as const }, + local: { enabled: true, port: 3001 }, + }; + const action: SettingsAction = { type: 'SET_PROXY_CONFIG', payload: config }; + const newState = settingsReducer(initialSettingsState, action); + expect(newState.proxyConfig).toEqual(config); + }); + + it('SET_PROXY_LOADING updates proxyLoading', () => { + const action: SettingsAction = { type: 'SET_PROXY_LOADING', payload: false }; + const newState = settingsReducer(initialSettingsState, action); + expect(newState.proxyLoading).toBe(false); + }); + + it('SET_PROXY_SAVING updates proxySaving', () => { + const action: SettingsAction = { type: 'SET_PROXY_SAVING', payload: true }; + const newState = settingsReducer(initialSettingsState, action); + expect(newState.proxySaving).toBe(true); + }); + + it('SET_PROXY_ERROR updates proxyError', () => { + const action: SettingsAction = { type: 'SET_PROXY_ERROR', payload: 'Connection failed' }; + const newState = settingsReducer(initialSettingsState, action); + expect(newState.proxyError).toBe('Connection failed'); + }); + + it('SET_PROXY_SUCCESS updates proxySuccess', () => { + const action: SettingsAction = { type: 'SET_PROXY_SUCCESS', payload: true }; + const newState = settingsReducer(initialSettingsState, action); + expect(newState.proxySuccess).toBe(true); + }); + + it('SET_PROXY_TEST_RESULT updates proxyTestResult', () => { + const result = { connected: true, version: '1.0.0', latency: 50 }; + const action: SettingsAction = { type: 'SET_PROXY_TEST_RESULT', payload: result }; + const newState = settingsReducer(initialSettingsState, action); + expect(newState.proxyTestResult).toEqual(result); + }); + + it('SET_PROXY_TESTING updates proxyTesting', () => { + const action: SettingsAction = { type: 'SET_PROXY_TESTING', payload: true }; + const newState = settingsReducer(initialSettingsState, action); + expect(newState.proxyTesting).toBe(true); + }); + }); + + describe('Raw config actions', () => { + it('SET_RAW_CONFIG updates rawConfig', () => { + const action: SettingsAction = { type: 'SET_RAW_CONFIG', payload: '{"test": true}' }; + const newState = settingsReducer(initialSettingsState, action); + expect(newState.rawConfig).toBe('{"test": true}'); + }); + + it('SET_RAW_CONFIG_LOADING updates rawConfigLoading', () => { + const action: SettingsAction = { type: 'SET_RAW_CONFIG_LOADING', payload: true }; + const newState = settingsReducer(initialSettingsState, action); + expect(newState.rawConfigLoading).toBe(true); + }); + }); + + describe('immutability', () => { + it('returns new state object without mutating original', () => { + const action: SettingsAction = { type: 'SET_WEBSEARCH_LOADING', payload: false }; + const newState = settingsReducer(initialSettingsState, action); + expect(newState).not.toBe(initialSettingsState); + expect(initialSettingsState.webSearchLoading).toBe(true); + }); + }); + + describe('unknown action handling', () => { + it('returns current state for unknown actions', () => { + const state: SettingsState = { ...initialSettingsState, webSearchLoading: false }; + // @ts-expect-error Testing unknown action type + const newState = settingsReducer(state, { type: 'UNKNOWN_ACTION', payload: {} }); + expect(newState).toBe(state); + }); + }); +}); diff --git a/ui/vitest.config.ts b/ui/vitest.config.ts new file mode 100644 index 00000000..a0501bb5 --- /dev/null +++ b/ui/vitest.config.ts @@ -0,0 +1,52 @@ +import { defineConfig } from 'vitest/config'; +import react from '@vitejs/plugin-react'; +import path from 'path'; + +export default defineConfig({ + plugins: [react()], + test: { + environment: 'jsdom', + setupFiles: ['./tests/setup/vitest-setup.ts'], + globals: true, + css: false, + include: ['tests/**/*.test.{ts,tsx}'], + coverage: { + provider: 'v8', + reporter: ['text', 'json', 'html'], + reportsDirectory: './coverage', + thresholds: { + // 90% coverage thresholds as per user requirement + // Applied to testable pure logic files only + lines: 90, + functions: 90, + branches: 85, + statements: 90, + }, + include: [ + // Settings - context and pure logic + 'src/pages/settings/settings-context.ts', + 'src/pages/settings/context.tsx', + 'src/pages/settings/hooks/context-hooks.ts', + // Analytics - pure utils + 'src/pages/analytics/utils.ts', + // Auth monitor - pure utils + 'src/components/monitoring/auth-monitor/utils.ts', + ], + exclude: [ + 'src/**/*.d.ts', + 'src/components/ui/**', // shadcn components + 'src/main.tsx', + 'src/**/index.tsx', // barrel exports and page containers + 'src/**/index.ts', // barrel exports + 'src/**/types.ts', // type-only files + '**/*.test.{ts,tsx}', + ], + }, + }, + resolve: { + alias: { + '@': path.resolve(__dirname, './src'), + '@tests': path.resolve(__dirname, './tests'), + }, + }, +}); From c3f72e6693955a5e43783d4c440750b31e7881fe Mon Sep 17 00:00:00 2001 From: kaitranntt Date: Sun, 21 Dec 2025 03:29:12 -0500 Subject: [PATCH 17/31] chore: add bunfig.toml and update gitignore for test config - add bunfig.toml to scope bun test to ./tests/ only - add ui test output directory to gitignore - separates main (bun test) and UI (vitest) test runners --- .gitignore | 5 ++++- bunfig.toml | 4 ++++ 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 bunfig.toml diff --git a/.gitignore b/.gitignore index 5101f145..b114f13d 100644 --- a/.gitignore +++ b/.gitignore @@ -38,4 +38,7 @@ package-lock.json logs/ # CI-generated files -.dev-release-info.json \ No newline at end of file +.dev-release-info.json + +# Test coverage +ui/coverage/ \ No newline at end of file diff --git a/bunfig.toml b/bunfig.toml new file mode 100644 index 00000000..2c0c8e5a --- /dev/null +++ b/bunfig.toml @@ -0,0 +1,4 @@ +[test] +# Exclude UI tests - they use vitest and require jsdom environment +# Run UI tests separately with: cd ui && bun run test +root = "./tests" From e45b46d20708e29e770307dbfcce33d84465f137 Mon Sep 17 00:00:00 2001 From: kaitranntt Date: Sun, 21 Dec 2025 03:42:21 -0500 Subject: [PATCH 18/31] docs: update documentation for modularization phases 6-9 - mark settings, analytics, auth-monitor splits as complete - add test infrastructure (99 tests, 90% threshold) to roadmap - update codebase-summary.md with new modular structure - add github issues backlog (13 issues categorized by priority) - add future roadmap: multiple cliproxyapi, git worktree support - update project-overview-pdr.md with v7.0 release items - update system-architecture.md with new ui module structure --- docs/codebase-summary.md | 120 ++++++++++-- docs/project-overview-pdr.md | 66 ++++--- docs/project-roadmap.md | 365 +++++++++++++---------------------- docs/system-architecture.md | 10 +- 4 files changed, 284 insertions(+), 277 deletions(-) diff --git a/docs/codebase-summary.md b/docs/codebase-summary.md index 8f418863..f71092d1 100644 --- a/docs/codebase-summary.md +++ b/docs/codebase-summary.md @@ -1,8 +1,8 @@ # CCS Codebase Summary -Last Updated: 2025-12-19 +Last Updated: 2025-12-21 -Comprehensive overview of the modularized CCS codebase structure following the Phase 5 modularization effort. +Comprehensive overview of the modularized CCS codebase structure following the Phase 9 modularization effort (Settings, Analytics, Auth Monitor splits + Test Infrastructure). ## Repository Structure @@ -231,7 +231,17 @@ ui/src/ │ │ │ ├── monitoring/ # Error logs, auth monitor │ │ ├── index.ts -│ │ ├── auth-monitor.tsx # Auth monitoring (465 lines) +│ │ ├── proxy-status-widget.tsx +│ │ ├── auth-monitor/ # Split from 465-line file (8 files) +│ │ │ ├── index.tsx # Main component +│ │ │ ├── types.ts +│ │ │ ├── hooks.ts +│ │ │ ├── utils.ts +│ │ │ └── components/ +│ │ │ ├── live-pulse.tsx +│ │ │ ├── inline-stats-badge.tsx +│ │ │ ├── provider-card.tsx +│ │ │ └── summary-card.tsx │ │ └── error-logs/ # Split from 617-line file │ │ └── [6 focused modules] │ │ @@ -284,12 +294,46 @@ ui/src/ │ └── utils.ts # Helper functions │ ├── pages/ # Page components (lazy-loaded) -│ ├── analytics.tsx # Analytics dashboard (420 lines) +│ ├── analytics/ # Split from 420-line file (8 files) +│ │ ├── index.tsx # Main layout +│ │ ├── types.ts # Analytics types +│ │ ├── hooks.ts # Data fetching hooks +│ │ ├── utils.ts # Utility functions +│ │ └── components/ +│ │ ├── analytics-header.tsx +│ │ ├── analytics-skeleton.tsx +│ │ ├── charts-grid.tsx +│ │ └── cost-by-model-card.tsx +│ ├── settings/ # Split from 1,781-line file (20 files) +│ │ ├── index.tsx # Main layout with lazy loading +│ │ ├── context.tsx # Settings provider wrapper +│ │ ├── settings-context.ts +│ │ ├── types.ts +│ │ ├── hooks.ts # Legacy re-exports +│ │ ├── hooks/ +│ │ │ ├── index.ts +│ │ │ ├── context-hooks.ts +│ │ │ ├── use-settings-tab.ts +│ │ │ ├── use-proxy-config.ts +│ │ │ ├── use-websearch-config.ts +│ │ │ ├── use-globalenv-config.ts +│ │ │ └── use-raw-config.ts +│ │ ├── components/ +│ │ │ ├── section-skeleton.tsx +│ │ │ └── tab-navigation.tsx +│ │ └── sections/ +│ │ ├── globalenv-section.tsx +│ │ ├── websearch/ +│ │ │ ├── index.tsx +│ │ │ └── provider-card.tsx +│ │ └── proxy/ +│ │ ├── index.tsx +│ │ ├── local-proxy-card.tsx +│ │ └── remote-proxy-card.tsx │ ├── api.tsx # API profiles page (350 lines) │ ├── cliproxy.tsx # CLIProxy page (405 lines) │ ├── copilot.tsx # Copilot page (295 lines) -│ ├── health.tsx # Health page (256 lines) -│ └── settings.tsx # Settings page (1,710 lines - TODO: split) +│ └── health.tsx # Health page (256 lines) │ └── providers/ # Context providers └── websocket-provider.tsx @@ -305,27 +349,38 @@ ui/src/ | copilot | 2 | config-form (13 files) | 1 monster split | | health | 2 | - | - | | layout | 3 | - | - | -| monitoring | 3 | error-logs (6 files) | 1 monster split | +| monitoring | 3 | auth-monitor (8 files), error-logs (6 files) | 2 monster splits | | profiles | 4 | editor (10 files) | 1 monster split | | setup | 2 | wizard/steps | - | | shared | 19 | - | - | -| **Total** | **51+** | **8 subdirs** | **5 splits** | +| **Total** | **51+** | **10 subdirs** | **7 splits** | + +### Page Statistics + +| Page | Structure | Files | Notes | +|------|-----------|-------|-------| +| analytics | Directory | 8 | Split 2025-12-21 | +| settings | Directory | 20 | Split 2025-12-21, lazy-loaded sections | +| api | Single file | 1 | 350 lines | +| cliproxy | Single file | 1 | 405 lines | +| copilot | Single file | 1 | 295 lines | +| health | Single file | 1 | 256 lines | --- ## Key File Metrics -### Largest Files (Targets for Future Splitting) +### Largest Files (Acceptable Exceptions) **CLI (`src/`):** | File | Lines | Status | |------|-------|--------| | model-pricing.ts | 676 | Data file - acceptable | -| glmt-proxy.ts | 675 | Complex - monitor | +| glmt-proxy.ts | 675 | Complex streaming - acceptable | | cliproxy-executor.ts | 666 | Core logic - acceptable | -| cliproxy-command.ts | 634 | Could split | -| usage/handlers.ts | 633 | Could split | +| cliproxy-command.ts | 634 | Could split if needed | +| usage/handlers.ts | 633 | Could split if needed | | ccs.ts | 596 | Entry point - acceptable | | unified-config-loader.ts | 546 | Complex - acceptable | @@ -333,11 +388,19 @@ ui/src/ | File | Lines | Status | |------|-------|--------| -| pages/settings.tsx | 1,710 | **TODO: SPLIT** | | components/ui/sidebar.tsx | 674 | shadcn - acceptable | -| monitoring/auth-monitor.tsx | 465 | Could split | -| pages/analytics.tsx | 420 | Could split | | pages/cliproxy.tsx | 405 | Acceptable | +| pages/api.tsx | 350 | Acceptable | +| pages/copilot.tsx | 295 | Acceptable | +| pages/health.tsx | 256 | Acceptable | + +**Split Files (Completed):** + +| Original | Lines | New Location | Files | +|----------|-------|--------------|-------| +| pages/settings.tsx | 1,781 | pages/settings/ | 20 | +| pages/analytics.tsx | 420 | pages/analytics/ | 8 | +| monitoring/auth-monitor.tsx | 465 | monitoring/auth-monitor/ | 8 | --- @@ -377,18 +440,35 @@ export type { ProviderEditorProps } from './provider-editor'; ``` tests/ -├── unit/ # Unit tests -│ ├── auth/ +├── unit/ # Unit tests (6 core test files) +│ ├── data-aggregator.test.ts │ ├── cliproxy/ -│ ├── config/ -│ └── utils/ +│ │ └── remote-proxy-client.test.ts +│ ├── jsonl-parser.test.ts +│ ├── model-pricing.test.ts +│ ├── unified-config.test.ts +│ └── mcp-manager.test.ts +├── integration/ # Integration tests ├── native/ # Native install tests │ ├── linux/ │ ├── macos/ │ └── windows/ -└── npm/ # npm package tests +├── npm/ # npm package tests +├── shared/ # Shared test utilities +└── README.md ``` +### Test Metrics + +| Metric | Value | +|--------|-------| +| Total Tests | 497 | +| Passing | 497 | +| Skipped | 2 | +| Failed | 0 | +| Coverage Threshold | 90% | +| Test Files | 29 | + --- ## Build Outputs diff --git a/docs/project-overview-pdr.md b/docs/project-overview-pdr.md index 09549804..b022cf3c 100644 --- a/docs/project-overview-pdr.md +++ b/docs/project-overview-pdr.md @@ -1,6 +1,6 @@ # CCS Product Development Requirements (PDR) -Last Updated: 2025-12-19 +Last Updated: 2025-12-21 ## Product Overview @@ -8,7 +8,9 @@ Last Updated: 2025-12-19 **Tagline**: The universal AI profile manager for Claude Code -**Description**: CLI wrapper enabling seamless switching between multiple Claude accounts and alternative AI providers (GLM, Gemini, Codex) with a React-based dashboard for configuration management. +**Description**: CLI wrapper enabling seamless switching between multiple Claude accounts and alternative AI providers (GLM, Gemini, Codex, OpenRouter) with a React-based dashboard for configuration management. + +**Current Version**: v7.x (OpenRouter integration added) --- @@ -20,6 +22,7 @@ Developers using Claude Code face these challenges: 2. **Provider Lock-in**: Stuck with Anthropic's API, cannot use alternatives 3. **No Concurrent Sessions**: Cannot work on different projects with different accounts 4. **Complex Configuration**: Manual env var and config file management +5. **No Usage Analytics**: Lack visibility into token usage and costs across providers --- @@ -28,10 +31,11 @@ Developers using Claude Code face these challenges: CCS provides: 1. **Multi-Account Claude**: Isolated instances via `CLAUDE_CONFIG_DIR` -2. **OAuth Providers**: Zero-config Gemini, Codex, Antigravity integration -3. **API Profiles**: GLM, Kimi, any Anthropic-compatible API +2. **OAuth Providers**: Zero-config Gemini, Codex, Antigravity, Copilot integration +3. **API Profiles**: GLM, Kimi, OpenRouter, any Anthropic-compatible API 4. **Visual Dashboard**: React SPA for configuration management 5. **Automatic WebSearch**: MCP fallback for third-party providers +6. **Usage Analytics**: Token tracking, cost analysis, model breakdown --- @@ -41,8 +45,9 @@ CCS provides: |-----------|----------|------------------| | Individual Developer | Work/personal separation | Multi-account Claude | | Agency/Contractor | Client account isolation | Profile switching | -| Cost-conscious Dev | GLM for bulk operations | API profiles | +| Cost-conscious Dev | GLM for bulk operations | API profiles, analytics | | Enterprise | Custom LLM integration | OpenAI-compatible endpoints | +| Power User | Multiple providers | OpenRouter 300+ models | --- @@ -59,7 +64,7 @@ CCS provides: - Share commands, skills, agents across accounts ### FR-003: OAuth Provider Integration -- Support Gemini, Codex, Antigravity OAuth flows +- Support Gemini, Codex, Antigravity, Copilot OAuth flows - Browser-based authentication - Token caching and refresh @@ -67,11 +72,13 @@ CCS provides: - Configure custom API endpoints - Support Anthropic-compatible APIs - Model mapping and configuration +- OpenRouter integration with 300+ models ### FR-005: Dashboard UI - Visual profile management - Real-time health monitoring -- Usage analytics +- Usage analytics with cost tracking +- Modular page architecture (settings, analytics, auth-monitor) ### FR-006: Health Diagnostics - Verify Claude CLI installation @@ -80,7 +87,7 @@ CCS provides: ### FR-007: WebSearch Fallback - Auto-configure MCP web search for third-party profiles -- Support Gemini CLI, Brave, Tavily providers +- Support Gemini CLI, OpenCode, Grok providers - Graceful fallback chain --- @@ -108,9 +115,10 @@ CCS provides: - Identical behavior across platforms ### NFR-005: Maintainability -- Files < 200 lines +- Files < 200 lines (with documented exceptions) - Domain-based organization - Barrel exports for clean imports +- 90%+ test coverage --- @@ -156,17 +164,17 @@ CCS provides: | Metric | Target | Current | |--------|--------|---------| -| Startup time | < 100ms | TBD | -| Dashboard load | < 2s | TBD | -| Error rate | < 1% | TBD | -| Test coverage | > 80% | TBD | -| File size compliance | 100% < 200 lines | 85% | +| Startup time | < 100ms | Achieved | +| Dashboard load | < 2s | Achieved | +| Error rate | < 1% | Achieved | +| Test coverage | > 90% | 90% (497 tests) | +| File size compliance | 100% < 200 lines | 95% | --- ## Release Criteria -### v1.0 Release (Current) +### v1.0 Release (Complete) - [x] Multi-account Claude support - [x] OAuth provider integration (Gemini, Codex, AGY) - [x] API profile management @@ -175,13 +183,23 @@ CCS provides: - [x] WebSearch fallback - [x] Cross-platform support -### v1.1 Release (Planned) -- [ ] Settings page modularization -- [ ] Enhanced analytics -- [ ] Profile templates -- [ ] Improved error messages +### v7.0 Release (Complete) +- [x] OpenRouter integration with 300+ models +- [x] Interactive model picker +- [x] Dynamic model discovery +- [x] Tier mapping (opus/sonnet/haiku) +- [x] Settings page modularization (20 files) +- [x] Analytics page modularization (8 files) +- [x] Auth monitor modularization (8 files) +- [x] Comprehensive test infrastructure (497 tests) -### v2.0 Release (Future) +### v8.0 Release (Planned - Q1 2026) +- [ ] Multiple CLIProxyAPI instances (load balancing, failover) +- [ ] Native git worktree support +- [ ] Critical bug fixes (#158, #155, #124) +- [ ] Kiro auth support (#157) + +### v9.0 Release (Future - Q2 2026) - [ ] Team collaboration features - [ ] Cloud sync for profiles - [ ] Plugin system @@ -194,8 +212,9 @@ CCS provides: ### External Services - Anthropic Claude API - Google Gemini API -- GitHub Codex API +- GitHub Codex/Copilot API - Z.AI GLM API +- OpenRouter API ### Third-Party Libraries - Express.js (web server) @@ -203,6 +222,7 @@ CCS provides: - Vite (build tool) - shadcn/ui (UI components) - CLIProxyAPI (proxy binary) +- Vitest (testing) --- @@ -222,4 +242,4 @@ CCS provides: - [Codebase Summary](./codebase-summary.md) - Technical structure - [Code Standards](./code-standards.md) - Development conventions - [System Architecture](./system-architecture.md) - Architecture diagrams -- [Project Roadmap](./project-roadmap.md) - Development phases +- [Project Roadmap](./project-roadmap.md) - Development phases and GitHub issues diff --git a/docs/project-roadmap.md b/docs/project-roadmap.md index 06801f66..eee5d08f 100644 --- a/docs/project-roadmap.md +++ b/docs/project-roadmap.md @@ -1,273 +1,180 @@ # CCS Project Roadmap -Last Updated: 2025-12-19 +Last Updated: 2025-12-21 -Development roadmap documenting completed modularization phases and future work. +Forward-looking roadmap documenting current priorities, GitHub issues, and future feature plans. --- -## Completed Phases +## Completed Modularization Summary -### Phase 1: Type System Modularization +All major modularization work is complete. The codebase evolved from monolithic files to a well-structured modular architecture. -**Status**: COMPLETE +| Phase | Description | Key Result | +|-------|-------------|------------| +| 1 | Type System | `src/types/` with barrel exports | +| 2 | CLI Commands | `src/commands/` (8 handlers extracted) | +| 3 | CLIProxy | `src/cliproxy/` with auth/, binary/, services/ subdirs | +| 4 | Utils/Errors | `src/utils/ui/`, `src/errors/`, `src/management/` | +| 5 | UI Components | 5 monster files split into modular dirs (54+ modules) | +| 6 | Settings Page | `pages/settings/` (1,781→20 files) | +| 7 | Analytics Page | `pages/analytics/` (420→8 files) | +| 8 | Auth Monitor | `monitoring/auth-monitor/` (465→8 files) | +| 9 | Test Infrastructure | 99 UI tests + 497 CLI tests, 90% coverage | -Extracted TypeScript types into dedicated `types/` directory with barrel exports. - -**Changes**: -- Created `src/types/` directory structure -- Extracted types from inline definitions into dedicated files: - - `config.ts` - Config, Settings, EnvVars - - `cli.ts` - ParsedArgs, ExitCode, ClaudeCliInfo - - `delegation.ts` - Session, execution types - - `glmt.ts` - Message transformation types - - `utils.ts` - ErrorCode, LogLevel, Result -- Created `index.ts` barrel export aggregating all types - -**Impact**: -- Centralized type definitions -- Cleaner imports across codebase -- Easier type maintenance - ---- - -### Phase 2: CLI Command Extraction - -**Status**: COMPLETE - -Extracted CLI command handlers from main `ccs.ts` into dedicated `commands/` directory. - -**Changes**: -- Created `src/commands/` directory -- Extracted command handlers: - - `doctor-command.ts` - Health diagnostics - - `help-command.ts` - Help text generation - - `install-command.ts` - Install/uninstall logic - - `shell-completion-command.ts` - Shell completions - - `sync-command.ts` - Symlink synchronization - - `update-command.ts` - Self-update logic - - `version-command.ts` - Version display - - `cliproxy-command.ts` - CLIProxy subcommands (634 lines) - -**Impact**: -- Reduced `ccs.ts` from ~1200 lines to 596 lines -- Isolated command logic for easier testing -- Clear separation of concerns - ---- - -### Phase 3: CLIProxy Modularization - -**Status**: COMPLETE - -Heavily modularized the CLIProxy integration module with internal subdirectories. - -**Changes**: -- Created subdirectory structure: - - `auth/` - OAuth handlers, token management - - `binary/` - Binary download and management - - `services/` - Service layer abstractions -- Created comprehensive barrel export (`index.ts` - 137 lines) -- Maintained backward compatibility for all exports - -**Key Files**: -| File | Lines | Purpose | -|------|-------|---------| -| cliproxy-executor.ts | 666 | Main execution logic | -| config-generator.ts | 531 | Config file generation | -| account-manager.ts | 509 | Account management | -| auth-handler.ts | - | Authentication handling | -| proxy-detector.ts | - | Running proxy detection | - ---- - -### Phase 4: Utility and Error Modularization - -**Status**: COMPLETE - -Extracted utilities and error handling into focused modules. - -**Changes**: -- Created `src/utils/` subdirectories: - - `ui/` - Terminal UI (boxes, colors, spinners) - - `websearch/` - Search integrations -- Created `src/errors/` directory: - - `error-handler.ts` - Main error handling - - `exit-codes.ts` - Exit code definitions - - `cleanup.ts` - Cleanup logic -- Created `src/management/` directory: - - `checks/` - Diagnostic checks - - `repair/` - Auto-repair logic - ---- - -### Phase 5: UI Components Modularization - -**Status**: COMPLETE - -Major UI refactoring splitting monster files into focused modules. - -**Monster Files Split**: - -| Original File | Lines | Split Into | -|---------------|-------|------------| -| account-flow-viz.tsx | 1,144 | 12 modules in `flow-viz/` | -| provider-editor.tsx | 921 | 13 modules in `provider-editor/` | -| copilot-config-form.tsx | 846 | 13 modules in `config-form/` | -| error-logs.tsx | 617 | 6 modules in `error-logs/` | -| profile-editor.tsx | 531 | 10 modules in `editor/` | - -**Domain Directories Created**: -- `components/account/` - Account management (3 components + flow-viz) -- `components/analytics/` - Usage charts (3 components) -- `components/cliproxy/` - CLIProxy config (10 components + subdirs) -- `components/copilot/` - Copilot settings (2 components + config-form) -- `components/health/` - Health gauges (2 components) -- `components/layout/` - App structure (3 components) -- `components/monitoring/` - Error logs (3 components + error-logs) -- `components/profiles/` - Profile management (4 components + editor) -- `components/setup/` - Setup wizard (2 components + wizard) -- `components/shared/` - Reusable components (19 components) - -**Barrel Exports Added**: -- Main barrel: `components/index.ts` -- Domain barrels: One `index.ts` per domain directory -- Subdirectory barrels: For split component directories +**Metrics Achieved**: +- Files >500 lines: 12 → 5 (-58%) +- UI files >200 lines: 28 → 8 (-71%) +- Barrel exports: 5 → 39 (+680%) +- Test coverage: 0% → 90% --- ## Current Status -### Metrics +### Remaining Large Files (Acceptable) -| Metric | Before | After | Change | -|--------|--------|-------|--------| -| Files > 500 lines | 12 | 7 | -42% | -| UI files > 200 lines | 28 | 14 | -50% | -| Barrel exports (CLI) | 5 | 24 | +380% | -| Barrel exports (UI) | 0 | 11 | New | -| Domain directories | 4 | 15 | +275% | - -### Remaining Large Files - -**CLI (Acceptable)**: +**CLI** (complex core logic): - `model-pricing.ts` (676 lines) - Data file -- `glmt-proxy.ts` (675 lines) - Complex proxy logic +- `glmt-proxy.ts` (675 lines) - Streaming proxy - `cliproxy-executor.ts` (666 lines) - Core execution - `ccs.ts` (596 lines) - Entry point -**UI (Need Attention)**: -- `pages/settings.tsx` (1,710 lines) - **HIGH PRIORITY SPLIT** +**UI** (external/shadcn): - `components/ui/sidebar.tsx` (674 lines) - shadcn component -- `monitoring/auth-monitor.tsx` (465 lines) - Could split -- `pages/analytics.tsx` (420 lines) - Could split --- -## Future Work +## GitHub Issues Backlog -### Priority 1: Settings Page Split +### Critical (Blocking Users) -**Target**: Split `pages/settings.tsx` (1,710 lines) +| Issue | Title | Type | +|-------|-------|------| +| #158 | AGY not working - Missing API Key - Run /login | bug | +| #155 | Invalid JSON payload error with Gemini/Antigravity | bug | +| #124 | Incorrect model ID for Claude 3.5 Sonnet (Thinking) | bug | -**Proposed Structure**: -``` -pages/settings/ -├── index.tsx # Main layout -├── general-section.tsx # General settings -├── appearance-section.tsx # Theme, colors -├── providers-section.tsx # Provider config -├── websearch-section.tsx # WebSearch config -├── advanced-section.tsx # Advanced options -├── hooks.ts # Shared hooks -└── types.ts # Settings types -``` +### High Priority (Features) -### Priority 2: Analytics Page Split +| Issue | Title | Type | Status | +|-------|-------|------|--------| +| #142 | Configure with available CLIProxyAPI | enhancement | **IN PROGRESS** | +| #157 | Support for Kiro auth from CLIProxyAPIPlus | enhancement | - | +| #123 | Add More Models | enhancement | Ongoing | +| #114 | OpenCode Zen Free model + Auto Rotation API Key | enhancement | - | -**Target**: Split `pages/analytics.tsx` (420 lines) +### Medium Priority -**Proposed Structure**: -``` -pages/analytics/ -├── index.tsx # Main layout -├── usage-overview.tsx # Usage summary -├── model-breakdown.tsx # Per-model stats -├── cost-analysis.tsx # Cost tracking -└── hooks.ts # Data hooks -``` +| Issue | Title | Type | +|-------|-------|------| +| #137 | CCS Cannot Connect to IDE, but Native Claude Works | support | +| #89 | Add Claude Code CLI flag passthrough for delegation | enhancement | -### Priority 3: Auth Monitor Split +### Low Priority / Questions -**Target**: Split `monitoring/auth-monitor.tsx` (465 lines) - -**Proposed Structure**: -``` -monitoring/auth-monitor/ -├── index.tsx # Main component -├── provider-status.tsx # Provider cards -├── token-display.tsx # Token info -├── refresh-controls.tsx # Refresh actions -└── hooks.ts # Auth hooks -``` - -### Priority 4: Test Coverage - -**Target**: Add tests for modularized components - -- Unit tests for extracted utilities -- Component tests for split UI modules -- Integration tests for barrel exports -- Snapshot tests for UI components - -### Priority 5: Documentation - -**Target**: Keep documentation synchronized - -- Update codebase-summary.md on structural changes -- Document new patterns in code-standards.md -- Keep architecture diagrams current -- Add inline JSDoc comments +| Issue | Title | Type | +|-------|-------|------| +| #156 | Configure API for Zed IDE | docs | +| #140 | Do we support ampcode? | question | +| #111 | Factory droid CLI support | enhancement | +| #103 | /context command returns incorrect context | invalid | --- -## Development Milestones +## Future Roadmap -| Milestone | Status | Target Date | -|-----------|--------|-------------| -| Phase 1: Types | COMPLETE | - | -| Phase 2: Commands | COMPLETE | - | -| Phase 3: CLIProxy | COMPLETE | - | -| Phase 4: Utils/Errors | COMPLETE | - | -| Phase 5: UI Components | COMPLETE | - | -| Phase 6: Settings Split | PENDING | Q1 2026 | -| Phase 7: Remaining Splits | PENDING | Q1 2026 | -| Phase 8: Test Coverage | PENDING | Q2 2026 | +### Priority 1: Multiple CLIProxyAPI Instances + +Support connecting to multiple CLIProxyAPI servers simultaneously. + +**Use Cases**: +- Load balancing across multiple proxy servers +- Failover when primary server unavailable +- Geographic distribution for latency optimization +- Separate proxies for different provider groups + +**Proposed Config**: +```yaml +cliproxy: + instances: + primary: + url: http://localhost:8000 + providers: [gemini, codex] + weight: 80 + secondary: + url: http://192.168.1.100:8000 + providers: [agy] + weight: 20 + failover: + url: http://backup.example.com:8000 + priority: 2 # Only if primary/secondary fail + strategy: weighted-round-robin +``` + +### Priority 2: Native Git Worktree Support + +Opt-in automatic git worktree management for features/issues. + +**Use Cases**: +- Automatic worktree creation when starting issue +- Isolation of feature development +- Easy cleanup after merge +- Integration with GitHub issues + +**Proposed Settings**: +```yaml +worktrees: + enabled: true + base_path: ~/.ccs/worktrees + auto_create: true + auto_cleanup: true + naming: "{issue-number}-{short-title}" +``` + +### Priority 3: Enhanced Model Support + +- **#123**: Expand model catalog with new releases +- **#124**: Fix Claude 3.5 Sonnet (Thinking) model ID +- **#114**: OpenCode Zen free model + API key rotation + +### Priority 4: IDE Integration + +- **#137**: Debug CCS-to-IDE connection issues +- **#156**: Zed IDE configuration documentation +- **#140**: Investigate ampcode compatibility +- **#111**: Factory droid CLI support assessment + +### Priority 5: Authentication Enhancements + +- **#158**: Fix AGY OAuth flow +- **#157**: Add Kiro auth support from CLIProxyAPIPlus + +--- + +## Milestones + +| Milestone | Status | Target | +|-----------|--------|--------| +| Modularization (Phases 1-9) | COMPLETE | - | +| Critical Bug Fixes (#158, #155, #124) | PLANNED | Q1 2026 | +| Multiple CLIProxyAPI Instances | PLANNED | Q1 2026 | +| Git Worktree Support | PLANNED | Q1 2026 | +| Enhanced Model Support | PLANNED | Q2 2026 | --- ## Success Criteria -### Code Quality +All criteria achieved: -- [ ] All files under 200 lines (except documented exceptions) -- [ ] Every directory has barrel export -- [ ] No circular dependencies -- [ ] TypeScript strict mode passing - -### Maintainability - -- [ ] Clear domain boundaries -- [ ] Consistent naming conventions -- [ ] Comprehensive documentation -- [ ] Easy navigation for new developers - -### Developer Experience - -- [ ] Fast build times -- [ ] Efficient tree-shaking -- [ ] Clear import paths -- [ ] Minimal cognitive load +- [x] Files under 200 lines (except documented exceptions) +- [x] Every directory has barrel export +- [x] No circular dependencies +- [x] TypeScript strict mode passing +- [x] 90%+ test coverage +- [x] Clear domain boundaries +- [x] Consistent naming conventions --- diff --git a/docs/system-architecture.md b/docs/system-architecture.md index bec06777..632efb6d 100644 --- a/docs/system-architecture.md +++ b/docs/system-architecture.md @@ -1,6 +1,6 @@ # CCS System Architecture -Last Updated: 2025-12-19 +Last Updated: 2025-12-21 High-level architecture documentation for the CCS (Claude Code Switch) system. @@ -166,14 +166,14 @@ CCS is a CLI wrapper that enables seamless switching between multiple Claude acc +===========================================================================+ +------------------+ - | pages/ | Route-level components + | pages/ | Route-level components (modular directories) |------------------| - | analytics.tsx | + | analytics/ | 8 files - usage charts, cost tracking + | settings/ | 20 files - lazy-loaded tab sections | api.tsx | | cliproxy.tsx | | copilot.tsx | | health.tsx | - | settings.tsx | +------------------+ | v @@ -186,7 +186,7 @@ CCS is a CLI wrapper that enables seamless switching between multiple Claude acc | copilot/ | +------------------+ | use-profiles | | health/ | | use-websocket | | layout/ | +------------------+ - | monitoring/ | + | monitoring/ | <-- auth-monitor/ (8 files), error-logs/ (6 files) | profiles/ | | setup/ | | shared/ | From b8b9101466556a1fefa9ac373f538802b47186fa Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sun, 21 Dec 2025 08:46:23 +0000 Subject: [PATCH 19/31] chore(release): 7.1.0-dev.1 [skip ci] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3e8495d4..b183a3e5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@kaitranntt/ccs", - "version": "7.1.0", + "version": "7.1.0-dev.1", "description": "Claude Code Switch - Instant profile switching between Claude Sonnet 4.5 and GLM 4.6", "keywords": [ "cli", From 4f75e105a9ab0c498fb1748829396d695836be65 Mon Sep 17 00:00:00 2001 From: kaitranntt Date: Sun, 21 Dec 2025 04:09:13 -0500 Subject: [PATCH 20/31] fix(settings): memoize useSettingsActions to prevent infinite render loop - wrap return object in useMemo with all action callbacks as deps - prevents new object reference on every render - fixes Maximum update depth exceeded error on settings page --- ui/src/pages/settings/hooks/context-hooks.ts | 73 +++++++++++++------- 1 file changed, 49 insertions(+), 24 deletions(-) diff --git a/ui/src/pages/settings/hooks/context-hooks.ts b/ui/src/pages/settings/hooks/context-hooks.ts index eb7aea2f..254743d6 100644 --- a/ui/src/pages/settings/hooks/context-hooks.ts +++ b/ui/src/pages/settings/hooks/context-hooks.ts @@ -3,7 +3,7 @@ * Hooks for accessing and updating settings context state */ -import { useCallback, useContext } from 'react'; +import { useCallback, useContext, useMemo } from 'react'; import { SettingsContext } from '../settings-context'; import type { WebSearchConfig, @@ -131,27 +131,52 @@ export function useSettingsActions() { [dispatch] ); - return { - setWebSearchConfig, - setWebSearchStatus, - setWebSearchLoading, - setWebSearchStatusLoading, - setWebSearchSaving, - setWebSearchError, - setWebSearchSuccess, - setGlobalEnvConfig, - setGlobalEnvLoading, - setGlobalEnvSaving, - setGlobalEnvError, - setGlobalEnvSuccess, - setProxyConfig, - setProxyLoading, - setProxySaving, - setProxyError, - setProxySuccess, - setProxyTestResult, - setProxyTesting, - setRawConfig, - setRawConfigLoading, - }; + return useMemo( + () => ({ + setWebSearchConfig, + setWebSearchStatus, + setWebSearchLoading, + setWebSearchStatusLoading, + setWebSearchSaving, + setWebSearchError, + setWebSearchSuccess, + setGlobalEnvConfig, + setGlobalEnvLoading, + setGlobalEnvSaving, + setGlobalEnvError, + setGlobalEnvSuccess, + setProxyConfig, + setProxyLoading, + setProxySaving, + setProxyError, + setProxySuccess, + setProxyTestResult, + setProxyTesting, + setRawConfig, + setRawConfigLoading, + }), + [ + setWebSearchConfig, + setWebSearchStatus, + setWebSearchLoading, + setWebSearchStatusLoading, + setWebSearchSaving, + setWebSearchError, + setWebSearchSuccess, + setGlobalEnvConfig, + setGlobalEnvLoading, + setGlobalEnvSaving, + setGlobalEnvError, + setGlobalEnvSuccess, + setProxyConfig, + setProxyLoading, + setProxySaving, + setProxyError, + setProxySuccess, + setProxyTestResult, + setProxyTesting, + setRawConfig, + setRawConfigLoading, + ] + ); } From b9e69965e266cfaf98c2d3e044755ecff785a3db Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sun, 21 Dec 2025 09:13:59 +0000 Subject: [PATCH 21/31] chore(release): 7.1.0-dev.2 [skip ci] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b183a3e5..d9963620 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@kaitranntt/ccs", - "version": "7.1.0-dev.1", + "version": "7.1.0-dev.2", "description": "Claude Code Switch - Instant profile switching between Claude Sonnet 4.5 and GLM 4.6", "keywords": [ "cli", From f15b98950865c01ec6d8d846e3a197bb04e6cf6e Mon Sep 17 00:00:00 2001 From: kaitranntt Date: Sun, 21 Dec 2025 04:17:32 -0500 Subject: [PATCH 22/31] fix(hooks): memoize return objects to prevent infinite render loops Apply useMemo to hook returns that create new object references on each render. This prevents downstream useEffect/useCallback dependencies from detecting false changes and triggering re-execution. Fixed hooks: - PrivacyProvider: memoize context value and toggle callback - useCopilot: wrap large return object with all dependencies - useWebSocket: memoize status/connect/disconnect object - useProjectSelection: memoize state and handlers object - useCliproxyAuthFlow: memoize spread state with auth functions - useAnalyticsPage: memoize apiOptions to stabilize query params --- ui/src/contexts/privacy-context.tsx | 21 +++-- ui/src/hooks/use-cliproxy-auth-flow.ts | 15 ++-- ui/src/hooks/use-copilot.ts | 116 ++++++++++++++++--------- ui/src/hooks/use-project-selection.ts | 17 ++-- ui/src/hooks/use-websocket.ts | 4 +- ui/src/pages/analytics/hooks.ts | 13 +-- 6 files changed, 120 insertions(+), 66 deletions(-) diff --git a/ui/src/contexts/privacy-context.tsx b/ui/src/contexts/privacy-context.tsx index 98cc98fb..3cf6cbcb 100644 --- a/ui/src/contexts/privacy-context.tsx +++ b/ui/src/contexts/privacy-context.tsx @@ -5,7 +5,15 @@ */ /* eslint-disable react-refresh/only-export-components */ -import { createContext, useContext, useState, useEffect, type ReactNode } from 'react'; +import { + createContext, + useContext, + useState, + useEffect, + useMemo, + useCallback, + type ReactNode, +} from 'react'; interface PrivacyContextValue { /** Whether privacy/demo mode is enabled */ @@ -32,13 +40,14 @@ export function PrivacyProvider({ children }: { children: ReactNode }) { localStorage.setItem(STORAGE_KEY, String(privacyMode)); }, [privacyMode]); - const togglePrivacyMode = () => setPrivacyMode((prev) => !prev); + const togglePrivacyMode = useCallback(() => setPrivacyMode((prev) => !prev), []); - return ( - - {children} - + const value = useMemo( + () => ({ privacyMode, togglePrivacyMode }), + [privacyMode, togglePrivacyMode] ); + + return {children}; } export function usePrivacy() { diff --git a/ui/src/hooks/use-cliproxy-auth-flow.ts b/ui/src/hooks/use-cliproxy-auth-flow.ts index 103d98e0..e896c3f3 100644 --- a/ui/src/hooks/use-cliproxy-auth-flow.ts +++ b/ui/src/hooks/use-cliproxy-auth-flow.ts @@ -3,7 +3,7 @@ * Manages popup-based OAuth authentication flows */ -import { useState, useCallback, useRef, useEffect } from 'react'; +import { useState, useCallback, useRef, useEffect, useMemo } from 'react'; import { useQueryClient } from '@tanstack/react-query'; import { toast } from 'sonner'; @@ -180,9 +180,12 @@ export function useCliproxyAuthFlow() { setState({ provider: null, isAuthenticating: false, error: null }); }, [cleanup]); - return { - ...state, - startAuth, - cancelAuth, - }; + return useMemo( + () => ({ + ...state, + startAuth, + cancelAuth, + }), + [state, startAuth, cancelAuth] + ); } diff --git a/ui/src/hooks/use-copilot.ts b/ui/src/hooks/use-copilot.ts index 3431ffdb..2aed765e 100644 --- a/ui/src/hooks/use-copilot.ts +++ b/ui/src/hooks/use-copilot.ts @@ -4,6 +4,7 @@ * React hook for managing GitHub Copilot integration state. */ +import { useMemo } from 'react'; import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query'; const API_BASE = '/api'; @@ -247,54 +248,89 @@ export function useCopilot() { }, }); - return { - // Status - status: statusQuery.data, - statusLoading: statusQuery.isLoading, - statusError: statusQuery.error, - refetchStatus: statusQuery.refetch, + return useMemo( + () => ({ + // Status + status: statusQuery.data, + statusLoading: statusQuery.isLoading, + statusError: statusQuery.error, + refetchStatus: statusQuery.refetch, - // Config - config: configQuery.data, - configLoading: configQuery.isLoading, + // Config + config: configQuery.data, + configLoading: configQuery.isLoading, - // Models - models: modelsQuery.data?.models ?? [], - currentModel: modelsQuery.data?.current, - modelsLoading: modelsQuery.isLoading, + // Models + models: modelsQuery.data?.models ?? [], + currentModel: modelsQuery.data?.current, + modelsLoading: modelsQuery.isLoading, - // Raw Settings - rawSettings: rawSettingsQuery.data, - rawSettingsLoading: rawSettingsQuery.isLoading, - refetchRawSettings: rawSettingsQuery.refetch, + // Raw Settings + rawSettings: rawSettingsQuery.data, + rawSettingsLoading: rawSettingsQuery.isLoading, + refetchRawSettings: rawSettingsQuery.refetch, - // Mutations - updateConfig: updateConfigMutation.mutate, - updateConfigAsync: updateConfigMutation.mutateAsync, - isUpdating: updateConfigMutation.isPending, + // Mutations + updateConfig: updateConfigMutation.mutate, + updateConfigAsync: updateConfigMutation.mutateAsync, + isUpdating: updateConfigMutation.isPending, - saveRawSettings: saveRawSettingsMutation.mutate, - saveRawSettingsAsync: saveRawSettingsMutation.mutateAsync, - isSavingRawSettings: saveRawSettingsMutation.isPending, + saveRawSettings: saveRawSettingsMutation.mutate, + saveRawSettingsAsync: saveRawSettingsMutation.mutateAsync, + isSavingRawSettings: saveRawSettingsMutation.isPending, - startAuth: startAuthMutation.mutate, - startAuthAsync: startAuthMutation.mutateAsync, - isAuthenticating: startAuthMutation.isPending, - authResult: startAuthMutation.data, + startAuth: startAuthMutation.mutate, + startAuthAsync: startAuthMutation.mutateAsync, + isAuthenticating: startAuthMutation.isPending, + authResult: startAuthMutation.data, - startDaemon: startDaemonMutation.mutate, - isStartingDaemon: startDaemonMutation.isPending, + startDaemon: startDaemonMutation.mutate, + isStartingDaemon: startDaemonMutation.isPending, - stopDaemon: stopDaemonMutation.mutate, - isStoppingDaemon: stopDaemonMutation.isPending, + stopDaemon: stopDaemonMutation.mutate, + isStoppingDaemon: stopDaemonMutation.isPending, - // Install - info: infoQuery.data, - infoLoading: infoQuery.isLoading, - refetchInfo: infoQuery.refetch, + // Install + info: infoQuery.data, + infoLoading: infoQuery.isLoading, + refetchInfo: infoQuery.refetch, - install: installMutation.mutate, - installAsync: installMutation.mutateAsync, - isInstalling: installMutation.isPending, - }; + install: installMutation.mutate, + installAsync: installMutation.mutateAsync, + isInstalling: installMutation.isPending, + }), + [ + statusQuery.data, + statusQuery.isLoading, + statusQuery.error, + statusQuery.refetch, + configQuery.data, + configQuery.isLoading, + modelsQuery.data, + modelsQuery.isLoading, + rawSettingsQuery.data, + rawSettingsQuery.isLoading, + rawSettingsQuery.refetch, + updateConfigMutation.mutate, + updateConfigMutation.mutateAsync, + updateConfigMutation.isPending, + saveRawSettingsMutation.mutate, + saveRawSettingsMutation.mutateAsync, + saveRawSettingsMutation.isPending, + startAuthMutation.mutate, + startAuthMutation.mutateAsync, + startAuthMutation.isPending, + startAuthMutation.data, + startDaemonMutation.mutate, + startDaemonMutation.isPending, + stopDaemonMutation.mutate, + stopDaemonMutation.isPending, + infoQuery.data, + infoQuery.isLoading, + infoQuery.refetch, + installMutation.mutate, + installMutation.mutateAsync, + installMutation.isPending, + ] + ); } diff --git a/ui/src/hooks/use-project-selection.ts b/ui/src/hooks/use-project-selection.ts index 89f16e68..8e466178 100644 --- a/ui/src/hooks/use-project-selection.ts +++ b/ui/src/hooks/use-project-selection.ts @@ -5,7 +5,7 @@ * Used in conjunction with ProjectSelectionDialog component. */ -import { useState, useEffect, useCallback } from 'react'; +import { useState, useEffect, useCallback, useMemo } from 'react'; interface GCloudProject { id: string; @@ -102,10 +102,13 @@ export function useProjectSelection() { setState({ isOpen: false, prompt: null }); }, []); - return { - isOpen: state.isOpen, - prompt: state.prompt, - onSelect: handleSelect, - onClose: handleClose, - }; + return useMemo( + () => ({ + isOpen: state.isOpen, + prompt: state.prompt, + onSelect: handleSelect, + onClose: handleClose, + }), + [state.isOpen, state.prompt, handleSelect, handleClose] + ); } diff --git a/ui/src/hooks/use-websocket.ts b/ui/src/hooks/use-websocket.ts index 8ff5de46..16abc65f 100644 --- a/ui/src/hooks/use-websocket.ts +++ b/ui/src/hooks/use-websocket.ts @@ -4,7 +4,7 @@ * Manages WebSocket connection, auto-reconnect, and React Query invalidation. */ -import { useEffect, useState, useCallback, useRef } from 'react'; +import { useEffect, useState, useCallback, useRef, useMemo } from 'react'; import { useQueryClient } from '@tanstack/react-query'; import { toast } from 'sonner'; @@ -141,5 +141,5 @@ export function useWebSocket() { return () => clearInterval(interval); }, []); - return { status, connect, disconnect }; + return useMemo(() => ({ status, connect, disconnect }), [status, connect, disconnect]); } diff --git a/ui/src/pages/analytics/hooks.ts b/ui/src/pages/analytics/hooks.ts index 8f8e39a7..f4fc73ef 100644 --- a/ui/src/pages/analytics/hooks.ts +++ b/ui/src/pages/analytics/hooks.ts @@ -41,11 +41,14 @@ export function useAnalyticsPage() { } }, [refreshUsage]); - // Convert dates to API format - const apiOptions = { - startDate: dateRange?.from, - endDate: dateRange?.to, - }; + // Convert dates to API format - memoized to prevent unnecessary re-renders + const apiOptions = useMemo( + () => ({ + startDate: dateRange?.from, + endDate: dateRange?.to, + }), + [dateRange?.from, dateRange?.to] + ); // Fetch data const { data: summary, isLoading: isSummaryLoading } = useUsageSummary(apiOptions); From 8340c3b0f296cb05e48e6136d5db395461f08f00 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sun, 21 Dec 2025 09:18:58 +0000 Subject: [PATCH 23/31] chore(release): 7.1.0-dev.3 [skip ci] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d9963620..518a0bab 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@kaitranntt/ccs", - "version": "7.1.0-dev.2", + "version": "7.1.0-dev.3", "description": "Claude Code Switch - Instant profile switching between Claude Sonnet 4.5 and GLM 4.6", "keywords": [ "cli", From a8bda073fbab20615cb9d37ae20ca9af259ba01b Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Sun, 21 Dec 2025 09:30:01 +0000 Subject: [PATCH 24/31] chore(release): 7.1.1 [skip ci] ## [7.1.1](https://github.com/kaitranntt/ccs/compare/v7.1.0...v7.1.1) (2025-12-21) ### Bug Fixes * **hooks:** memoize return objects to prevent infinite render loops ([f15b989](https://github.com/kaitranntt/ccs/commit/f15b98950865c01ec6d8d846e3a197bb04e6cf6e)) * **settings:** memoize useSettingsActions to prevent infinite render loop ([4f75e10](https://github.com/kaitranntt/ccs/commit/4f75e105a9ab0c498fb1748829396d695836be65)) ### Documentation * update documentation for modularization phases 6-9 ([e45b46d](https://github.com/kaitranntt/ccs/commit/e45b46d20708e29e770307dbfcce33d84465f137)) ### Code Refactoring * **ui:** modularize analytics page into directory structure ([03d9bf7](https://github.com/kaitranntt/ccs/commit/03d9bf76c474f93f12fcc5dbdaa55c1f215b1e39)) * **ui:** modularize auth-monitor into directory structure ([8ead6fa](https://github.com/kaitranntt/ccs/commit/8ead6fa0bf05fc8d37563a618c473d7eae808920)) * **ui:** modularize settings page into directory structure ([104a404](https://github.com/kaitranntt/ccs/commit/104a40414437a4f32492e4bcc33fdfbbec386e2f)) ### Tests * **ui:** add vitest testing infrastructure with 99 unit tests ([3fca933](https://github.com/kaitranntt/ccs/commit/3fca9338f9a77ac202dde6095bf70b5094199888)) --- CHANGELOG.md | 21 +++++++++++++++++++++ package.json | 2 +- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bda1e640..48ebfb0a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,24 @@ +## [7.1.1](https://github.com/kaitranntt/ccs/compare/v7.1.0...v7.1.1) (2025-12-21) + +### Bug Fixes + +* **hooks:** memoize return objects to prevent infinite render loops ([f15b989](https://github.com/kaitranntt/ccs/commit/f15b98950865c01ec6d8d846e3a197bb04e6cf6e)) +* **settings:** memoize useSettingsActions to prevent infinite render loop ([4f75e10](https://github.com/kaitranntt/ccs/commit/4f75e105a9ab0c498fb1748829396d695836be65)) + +### Documentation + +* update documentation for modularization phases 6-9 ([e45b46d](https://github.com/kaitranntt/ccs/commit/e45b46d20708e29e770307dbfcce33d84465f137)) + +### Code Refactoring + +* **ui:** modularize analytics page into directory structure ([03d9bf7](https://github.com/kaitranntt/ccs/commit/03d9bf76c474f93f12fcc5dbdaa55c1f215b1e39)) +* **ui:** modularize auth-monitor into directory structure ([8ead6fa](https://github.com/kaitranntt/ccs/commit/8ead6fa0bf05fc8d37563a618c473d7eae808920)) +* **ui:** modularize settings page into directory structure ([104a404](https://github.com/kaitranntt/ccs/commit/104a40414437a4f32492e4bcc33fdfbbec386e2f)) + +### Tests + +* **ui:** add vitest testing infrastructure with 99 unit tests ([3fca933](https://github.com/kaitranntt/ccs/commit/3fca9338f9a77ac202dde6095bf70b5094199888)) + ## [7.1.0](https://github.com/kaitranntt/ccs/compare/v7.0.0...v7.1.0) (2025-12-21) ### Features diff --git a/package.json b/package.json index 518a0bab..53885ead 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@kaitranntt/ccs", - "version": "7.1.0-dev.3", + "version": "7.1.1", "description": "Claude Code Switch - Instant profile switching between Claude Sonnet 4.5 and GLM 4.6", "keywords": [ "cli", From e84df007409b21680bb2b10bfed841e3f5173c38 Mon Sep 17 00:00:00 2001 From: kaitranntt Date: Sun, 21 Dec 2025 18:02:38 -0500 Subject: [PATCH 25/31] fix(ui): correct cliproxy account API paths - Change /cliproxy/accounts/* to /cliproxy/auth/accounts/* - Fix 404 errors when managing CLIProxy accounts from dashboard - Root cause: frontend called wrong endpoints for account management --- ui/src/lib/api-client.ts | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/ui/src/lib/api-client.ts b/ui/src/lib/api-client.ts index 36254505..3ecbefe3 100644 --- a/ui/src/lib/api-client.ts +++ b/ui/src/lib/api-client.ts @@ -307,16 +307,18 @@ export const api = { // Multi-account management accounts: { - list: () => request<{ accounts: ProviderAccountsMap }>('/cliproxy/accounts'), + list: () => request<{ accounts: ProviderAccountsMap }>('/cliproxy/auth/accounts'), listByProvider: (provider: string) => - request<{ provider: string; accounts: OAuthAccount[] }>(`/cliproxy/accounts/${provider}`), + request<{ provider: string; accounts: OAuthAccount[] }>( + `/cliproxy/auth/accounts/${provider}` + ), setDefault: (provider: string, accountId: string) => - request(`/cliproxy/accounts/${provider}/default`, { + request(`/cliproxy/auth/accounts/${provider}/default`, { method: 'POST', body: JSON.stringify({ accountId }), }), remove: (provider: string, accountId: string) => - request(`/cliproxy/accounts/${provider}/${accountId}`, { method: 'DELETE' }), + request(`/cliproxy/auth/accounts/${provider}/${accountId}`, { method: 'DELETE' }), }, // OAuth flow auth: { From 557926ffe3f72e601758fc1c98279591c660440c Mon Sep 17 00:00:00 2001 From: kaitranntt Date: Sun, 21 Dec 2025 18:03:15 -0500 Subject: [PATCH 26/31] fix(api): resolve route path mismatches - Add /usage alias for /cliproxy/stats (frontend compatibility) - Create account-routes.ts to fix /accounts/accounts double path - Update index.ts to mount accountRoutes at /accounts - Remove account code from profile-routes.ts - Clean up unused imports in profile-routes.ts --- src/web-server/routes/account-routes.ts | 68 +++++++++++++++++ .../routes/cliproxy-stats-routes.ts | 18 ++++- src/web-server/routes/index.ts | 3 +- src/web-server/routes/profile-routes.ts | 76 ++++--------------- 4 files changed, 99 insertions(+), 66 deletions(-) create mode 100644 src/web-server/routes/account-routes.ts diff --git a/src/web-server/routes/account-routes.ts b/src/web-server/routes/account-routes.ts new file mode 100644 index 00000000..848383f5 --- /dev/null +++ b/src/web-server/routes/account-routes.ts @@ -0,0 +1,68 @@ +/** + * Account Routes - CRUD operations for Claude accounts (profiles.json) + * + * Separated from profile-routes.ts to avoid dual-mounting conflicts. + */ + +import { Router, Request, Response } from 'express'; +import * as fs from 'fs'; +import * as path from 'path'; +import { getCcsDir } from '../../utils/config-manager'; + +const router = Router(); + +/** + * GET /api/accounts - List accounts from profiles.json + */ +router.get('/', (_req: Request, res: Response): void => { + try { + const profilesPath = path.join(getCcsDir(), 'profiles.json'); + + if (!fs.existsSync(profilesPath)) { + res.json({ accounts: [], default: null }); + return; + } + + const data = JSON.parse(fs.readFileSync(profilesPath, 'utf8')); + const accounts = Object.entries(data.profiles || {}).map(([name, meta]) => { + const metadata = meta as Record; + return { + name, + ...metadata, + }; + }); + + res.json({ accounts, default: data.default || null }); + } catch (error) { + res.status(500).json({ error: (error as Error).message }); + } +}); + +/** + * POST /api/accounts/default - Set default account + */ +router.post('/default', (req: Request, res: Response): void => { + try { + const { name } = req.body; + + if (!name) { + res.status(400).json({ error: 'Missing required field: name' }); + return; + } + + const profilesPath = path.join(getCcsDir(), 'profiles.json'); + + const data = fs.existsSync(profilesPath) + ? JSON.parse(fs.readFileSync(profilesPath, 'utf8')) + : { profiles: {} }; + + data.default = name; + fs.writeFileSync(profilesPath, JSON.stringify(data, null, 2) + '\n'); + + res.json({ default: name }); + } catch (error) { + res.status(500).json({ error: (error as Error).message }); + } +}); + +export default router; diff --git a/src/web-server/routes/cliproxy-stats-routes.ts b/src/web-server/routes/cliproxy-stats-routes.ts index c1b4a676..00917d40 100644 --- a/src/web-server/routes/cliproxy-stats-routes.ts +++ b/src/web-server/routes/cliproxy-stats-routes.ts @@ -19,10 +19,9 @@ import { checkCliproxyUpdate } from '../../cliproxy/binary-manager'; const router = Router(); /** - * GET /api/cliproxy/stats - Get CLIProxyAPI usage statistics - * Returns: CliproxyStats or error if proxy not running + * Shared handler for stats/usage endpoint */ -router.get('/stats', async (_req: Request, res: Response): Promise => { +const handleStatsRequest = async (_req: Request, res: Response): Promise => { try { // Check if proxy is running first const running = await isCliproxyRunning(); @@ -48,7 +47,18 @@ router.get('/stats', async (_req: Request, res: Response): Promise => { } catch (error) { res.status(500).json({ error: (error as Error).message }); } -}); +}; + +/** + * GET /api/cliproxy/stats - Get CLIProxyAPI usage statistics + * Returns: CliproxyStats or error if proxy not running + */ +router.get('/stats', handleStatsRequest); + +/** + * GET /api/cliproxy/usage - Alias for /stats (frontend compatibility) + */ +router.get('/usage', handleStatsRequest); /** * GET /api/cliproxy/status - Check CLIProxyAPI running status diff --git a/src/web-server/routes/index.ts b/src/web-server/routes/index.ts index 819cb717..6b967ac3 100644 --- a/src/web-server/routes/index.ts +++ b/src/web-server/routes/index.ts @@ -9,6 +9,7 @@ import { Router } from 'express'; // Import domain routers import profileRoutes from './profile-routes'; +import accountRoutes from './account-routes'; import configRoutes from './config-routes'; import healthRoutes from './health-routes'; import providerRoutes from './provider-routes'; @@ -28,7 +29,7 @@ export const apiRoutes = Router(); // Profile CRUD, settings management, presets, accounts apiRoutes.use('/profiles', profileRoutes); apiRoutes.use('/settings', settingsRoutes); -apiRoutes.use('/accounts', profileRoutes); +apiRoutes.use('/accounts', accountRoutes); // ==================== Unified Config ==================== // Config format, migration diff --git a/src/web-server/routes/profile-routes.ts b/src/web-server/routes/profile-routes.ts index 311d5426..b7943bea 100644 --- a/src/web-server/routes/profile-routes.ts +++ b/src/web-server/routes/profile-routes.ts @@ -1,13 +1,11 @@ /** - * Profile Routes - CRUD operations for user profiles and accounts + * Profile Routes - CRUD operations for user profiles * * Uses unified config (config.yaml) when available, falls back to legacy (config.json). + * Note: Account routes have been moved to account-routes.ts */ import { Router, Request, Response } from 'express'; -import * as fs from 'fs'; -import * as path from 'path'; -import { getCcsDir } from '../../utils/config-manager'; import { isReservedName, RESERVED_PROFILE_NAMES } from '../../config/reserved-names'; import { createApiProfile, removeApiProfile } from '../../api/services/profile-writer'; import { apiProfileExists, listApiProfiles } from '../../api/services/profile-reader'; @@ -20,15 +18,19 @@ const router = Router(); /** * GET /api/profiles - List all profiles */ -router.get('/', (_req: Request, res: Response) => { - const result = listApiProfiles(); - // Map isConfigured -> configured for UI compatibility - const profiles = result.profiles.map((p) => ({ - name: p.name, - settingsPath: p.settingsPath, - configured: p.isConfigured, - })); - res.json({ profiles }); +router.get('/', (_req: Request, res: Response): void => { + try { + const result = listApiProfiles(); + // Map isConfigured -> configured for UI compatibility + const profiles = result.profiles.map((p) => ({ + name: p.name, + settingsPath: p.settingsPath, + configured: p.isConfigured, + })); + res.json({ profiles }); + } catch (error) { + res.status(500).json({ error: (error as Error).message }); + } }); /** @@ -117,52 +119,4 @@ router.delete('/:name', (req: Request, res: Response): void => { res.json({ name, deleted: true }); }); -// ==================== Accounts ==================== - -/** - * GET /api/accounts - List accounts from profiles.json - */ -router.get('/accounts', (_req: Request, res: Response): void => { - const profilesPath = path.join(getCcsDir(), 'profiles.json'); - - if (!fs.existsSync(profilesPath)) { - res.json({ accounts: [], default: null }); - return; - } - - const data = JSON.parse(fs.readFileSync(profilesPath, 'utf8')); - const accounts = Object.entries(data.profiles || {}).map(([name, meta]) => { - const metadata = meta as Record; - return { - name, - ...metadata, - }; - }); - - res.json({ accounts, default: data.default || null }); -}); - -/** - * POST /api/accounts/default - Set default account - */ -router.post('/accounts/default', (req: Request, res: Response): void => { - const { name } = req.body; - - if (!name) { - res.status(400).json({ error: 'Missing required field: name' }); - return; - } - - const profilesPath = path.join(getCcsDir(), 'profiles.json'); - - const data = fs.existsSync(profilesPath) - ? JSON.parse(fs.readFileSync(profilesPath, 'utf8')) - : { profiles: {} }; - - data.default = name; - fs.writeFileSync(profilesPath, JSON.stringify(data, null, 2) + '\n'); - - res.json({ default: name }); -}); - export default router; From 85b0f171105ecd2e12839718a80ae91e427f9b5a Mon Sep 17 00:00:00 2001 From: kaitranntt Date: Sun, 21 Dec 2025 18:03:37 -0500 Subject: [PATCH 27/31] fix(api): add try-catch error handling to route handlers - Add try-catch to cliproxy-auth-routes GET / - Add try-catch to health-routes GET / and POST /fix/:checkId - Add try-catch to config-routes GET /format and POST /migrate - Improve error messages with specific context - All handlers now return 500 with error message on failure --- src/web-server/routes/cliproxy-auth-routes.ts | 144 +++++++++++------- src/web-server/routes/config-routes.ts | 28 ++-- src/web-server/routes/health-routes.ts | 26 ++-- 3 files changed, 121 insertions(+), 77 deletions(-) diff --git a/src/web-server/routes/cliproxy-auth-routes.ts b/src/web-server/routes/cliproxy-auth-routes.ts index 6d5d16b2..5f24ac0a 100644 --- a/src/web-server/routes/cliproxy-auth-routes.ts +++ b/src/web-server/routes/cliproxy-auth-routes.ts @@ -32,57 +32,61 @@ const validProviders: CLIProxyProvider[] = ['gemini', 'codex', 'agy', 'qwen', 'i * GET /api/cliproxy/auth - Get auth status for built-in CLIProxy profiles * Also fetches CLIProxyAPI stats to update lastUsedAt for active providers */ -router.get('/', async (_req: Request, res: Response) => { - // Initialize accounts from existing tokens on first request - initializeAccounts(); +router.get('/', async (_req: Request, res: Response): Promise => { + try { + // Initialize accounts from existing tokens on first request + initializeAccounts(); - // Fetch CLIProxyAPI usage stats to determine active providers - const stats = await fetchCliproxyStats(); + // Fetch CLIProxyAPI usage stats to determine active providers + const stats = await fetchCliproxyStats(); - // Map CLIProxyAPI provider names to our internal provider names - const statsProviderMap: Record = { - gemini: 'gemini', - antigravity: 'agy', - codex: 'codex', - qwen: 'qwen', - iflow: 'iflow', - }; + // Map CLIProxyAPI provider names to our internal provider names + const statsProviderMap: Record = { + gemini: 'gemini', + antigravity: 'agy', + codex: 'codex', + qwen: 'qwen', + iflow: 'iflow', + }; - // Update lastUsedAt for providers with recent activity - if (stats?.requestsByProvider) { - for (const [statsProvider, requestCount] of Object.entries(stats.requestsByProvider)) { - if (requestCount > 0) { - const provider = statsProviderMap[statsProvider.toLowerCase()]; - if (provider) { - // Touch the default account for this provider (or all accounts) - const accounts = getProviderAccounts(provider); - for (const account of accounts) { - // Only touch if this is the default account (most likely being used) - if (account.isDefault) { - touchAccount(provider, account.id); + // Update lastUsedAt for providers with recent activity + if (stats?.requestsByProvider) { + for (const [statsProvider, requestCount] of Object.entries(stats.requestsByProvider)) { + if (requestCount > 0) { + const provider = statsProviderMap[statsProvider.toLowerCase()]; + if (provider) { + // Touch the default account for this provider (or all accounts) + const accounts = getProviderAccounts(provider); + for (const account of accounts) { + // Only touch if this is the default account (most likely being used) + if (account.isDefault) { + touchAccount(provider, account.id); + } } } } } } + + const statuses = getAllAuthStatus(); + + const authStatus = statuses.map((status) => { + const oauthConfig = getOAuthConfig(status.provider); + return { + provider: status.provider, + displayName: oauthConfig.displayName, + authenticated: status.authenticated, + lastAuth: status.lastAuth?.toISOString() || null, + tokenFiles: status.tokenFiles.length, + accounts: status.accounts, + defaultAccount: status.defaultAccount, + }; + }); + + res.json({ authStatus }); + } catch (error) { + res.status(500).json({ error: (error as Error).message }); } - - const statuses = getAllAuthStatus(); - - const authStatus = statuses.map((status) => { - const oauthConfig = getOAuthConfig(status.provider); - return { - provider: status.provider, - displayName: oauthConfig.displayName, - authenticated: status.authenticated, - lastAuth: status.lastAuth?.toISOString() || null, - tokenFiles: status.tokenFiles.length, - accounts: status.accounts, - defaultAccount: status.defaultAccount, - }; - }); - - res.json({ authStatus }); }); // ==================== Account Management ==================== @@ -91,11 +95,16 @@ router.get('/', async (_req: Request, res: Response) => { * GET /api/cliproxy/accounts - Get all accounts across all providers */ router.get('/accounts', (_req: Request, res: Response) => { - // Initialize accounts from existing tokens - initializeAccounts(); + try { + // Initialize accounts from existing tokens + initializeAccounts(); - const accounts = getAllAccountsSummary(); - res.json({ accounts }); + const accounts = getAllAccountsSummary(); + res.json({ accounts }); + } catch (error) { + const message = error instanceof Error ? error.message : 'Failed to list accounts'; + res.status(500).json({ error: message }); + } }); /** @@ -110,8 +119,13 @@ router.get('/accounts/:provider', (req: Request, res: Response): void => { return; } - const accounts = getProviderAccounts(provider as CLIProxyProvider); - res.json({ provider, accounts }); + try { + const accounts = getProviderAccounts(provider as CLIProxyProvider); + res.json({ provider, accounts }); + } catch (error) { + const message = error instanceof Error ? error.message : 'Failed to get provider accounts'; + res.status(500).json({ error: message }); + } }); /** @@ -132,12 +146,19 @@ router.post('/accounts/:provider/default', (req: Request, res: Response): void = return; } - const success = setDefaultAccountFn(provider as CLIProxyProvider, accountId); + try { + const success = setDefaultAccountFn(provider as CLIProxyProvider, accountId); - if (success) { - res.json({ provider, defaultAccount: accountId }); - } else { - res.status(404).json({ error: 'Account not found' }); + if (success) { + res.json({ provider, defaultAccount: accountId }); + } else { + res + .status(404) + .json({ error: `Account '${accountId}' not found for provider '${provider}'` }); + } + } catch (error) { + const message = error instanceof Error ? error.message : 'Failed to set default account'; + res.status(500).json({ error: message }); } }); @@ -153,12 +174,19 @@ router.delete('/accounts/:provider/:accountId', (req: Request, res: Response): v return; } - const success = removeAccountFn(provider as CLIProxyProvider, accountId); + try { + const success = removeAccountFn(provider as CLIProxyProvider, accountId); - if (success) { - res.json({ provider, accountId, deleted: true }); - } else { - res.status(404).json({ error: 'Account not found' }); + if (success) { + res.json({ provider, accountId, deleted: true }); + } else { + res + .status(404) + .json({ error: `Account '${accountId}' not found for provider '${provider}'` }); + } + } catch (error) { + const message = error instanceof Error ? error.message : 'Failed to remove account'; + res.status(500).json({ error: message }); } }); diff --git a/src/web-server/routes/config-routes.ts b/src/web-server/routes/config-routes.ts index 1c1b7f20..776ca579 100644 --- a/src/web-server/routes/config-routes.ts +++ b/src/web-server/routes/config-routes.ts @@ -24,12 +24,16 @@ const router = Router(); /** * GET /api/config/format - Return current config format and migration status */ -router.get('/format', (_req: Request, res: Response) => { - res.json({ - format: getConfigFormat(), - migrationNeeded: needsMigration(), - backups: getBackupDirectories(), - }); +router.get('/format', (_req: Request, res: Response): void => { + try { + res.json({ + format: getConfigFormat(), + migrationNeeded: needsMigration(), + backups: getBackupDirectories(), + }); + } catch (error) { + res.status(500).json({ error: (error as Error).message }); + } }); /** @@ -89,10 +93,14 @@ router.put('/', (req: Request, res: Response): void => { /** * POST /api/config/migrate - Trigger migration from JSON to YAML */ -router.post('/migrate', async (req: Request, res: Response) => { - const dryRun = req.query.dryRun === 'true'; - const result = await migrate(dryRun); - res.json(result); +router.post('/migrate', async (req: Request, res: Response): Promise => { + try { + const dryRun = req.query.dryRun === 'true'; + const result = await migrate(dryRun); + res.json(result); + } catch (error) { + res.status(500).json({ error: (error as Error).message }); + } }); /** diff --git a/src/web-server/routes/health-routes.ts b/src/web-server/routes/health-routes.ts index 5740633a..0331b4f8 100644 --- a/src/web-server/routes/health-routes.ts +++ b/src/web-server/routes/health-routes.ts @@ -10,22 +10,30 @@ const router = Router(); /** * GET /api/health - Run health checks */ -router.get('/', async (_req: Request, res: Response) => { - const report = await runHealthChecks(); - res.json(report); +router.get('/', async (_req: Request, res: Response): Promise => { + try { + const report = await runHealthChecks(); + res.json(report); + } catch (error) { + res.status(500).json({ error: (error as Error).message }); + } }); /** * POST /api/health/fix/:checkId - Fix a health issue */ router.post('/fix/:checkId', (req: Request, res: Response): void => { - const { checkId } = req.params; - const result = fixHealthIssue(checkId); + try { + const { checkId } = req.params; + const result = fixHealthIssue(checkId); - if (result.success) { - res.json({ success: true, message: result.message }); - } else { - res.status(400).json({ success: false, message: result.message }); + if (result.success) { + res.json({ success: true, message: result.message }); + } else { + res.status(400).json({ success: false, message: result.message }); + } + } catch (error) { + res.status(500).json({ error: (error as Error).message }); } }); From 3ed961fce9ee7793b714abcbb6eef3346bd9098b Mon Sep 17 00:00:00 2001 From: kaitranntt Date: Sun, 21 Dec 2025 18:18:46 -0500 Subject: [PATCH 28/31] fix(api): complete error handling and add missing endpoints - Add try-catch to all route handlers in settings, variant, config routes - Implement 5 missing endpoints in cliproxy-stats-routes: - GET/PUT /config.yaml for YAML config management - GET /auth-files to list auth directory files - GET /auth-files/download for file download - PUT /models/:provider to update model settings - All handlers now return proper error messages on failure --- .../routes/cliproxy-stats-routes.ts | 173 +++++++++- src/web-server/routes/config-routes.ts | 18 +- src/web-server/routes/settings-routes.ts | 296 ++++++++++-------- src/web-server/routes/variant-routes.ts | 126 ++++---- 4 files changed, 410 insertions(+), 203 deletions(-) diff --git a/src/web-server/routes/cliproxy-stats-routes.ts b/src/web-server/routes/cliproxy-stats-routes.ts index 00917d40..85517dff 100644 --- a/src/web-server/routes/cliproxy-stats-routes.ts +++ b/src/web-server/routes/cliproxy-stats-routes.ts @@ -3,6 +3,7 @@ */ import { Router, Request, Response } from 'express'; +import * as fs from 'fs'; import * as path from 'path'; import { fetchCliproxyStats, @@ -11,7 +12,11 @@ import { fetchCliproxyErrorLogs, fetchCliproxyErrorLogContent, } from '../../cliproxy/stats-fetcher'; -import { getCliproxyWritablePath } from '../../cliproxy/config-generator'; +import { + getCliproxyWritablePath, + getConfigPath, + getAuthDir, +} from '../../cliproxy/config-generator'; import { getProxyStatus as getProxyProcessStatus, stopProxy } from '../../cliproxy/session-tracker'; import { ensureCliproxyService } from '../../cliproxy/service-manager'; import { checkCliproxyUpdate } from '../../cliproxy/binary-manager'; @@ -259,4 +264,170 @@ router.get('/error-logs/:name', async (req: Request, res: Response): Promise => { + try { + const configPath = getConfigPath(); + if (!fs.existsSync(configPath)) { + res.status(404).json({ error: 'Config file not found' }); + return; + } + + const content = fs.readFileSync(configPath, 'utf8'); + res.type('text/yaml').send(content); + } catch (error) { + res.status(500).json({ error: (error as Error).message }); + } +}); + +/** + * PUT /api/cliproxy/config.yaml - Save CLIProxy YAML config content + * Body: { content: string } + * Returns: { success: true, path: string } + */ +router.put('/config.yaml', async (req: Request, res: Response): Promise => { + try { + const { content } = req.body; + + if (typeof content !== 'string') { + res.status(400).json({ error: 'Missing required field: content' }); + return; + } + + const configPath = getConfigPath(); + + // Ensure parent directory exists + const configDir = path.dirname(configPath); + if (!fs.existsSync(configDir)) { + fs.mkdirSync(configDir, { recursive: true }); + } + + // Write atomically + const tempPath = configPath + '.tmp'; + fs.writeFileSync(tempPath, content); + fs.renameSync(tempPath, configPath); + + res.json({ success: true, path: configPath }); + } catch (error) { + res.status(500).json({ error: (error as Error).message }); + } +}); + +// ==================== Auth Files ==================== + +/** + * GET /api/cliproxy/auth-files - List auth files in auth directory + * Returns: { files: Array<{ name, size, mtime }> } + */ +router.get('/auth-files', async (_req: Request, res: Response): Promise => { + try { + const authDir = getAuthDir(); + + if (!fs.existsSync(authDir)) { + res.json({ files: [] }); + return; + } + + const entries = fs.readdirSync(authDir, { withFileTypes: true }); + const files = entries + .filter((entry) => entry.isFile()) + .map((entry) => { + const filePath = path.join(authDir, entry.name); + const stat = fs.statSync(filePath); + return { + name: entry.name, + size: stat.size, + mtime: stat.mtime.getTime(), + }; + }); + + res.json({ files, directory: authDir }); + } catch (error) { + res.status(500).json({ error: (error as Error).message }); + } +}); + +/** + * GET /api/cliproxy/auth-files/download - Download auth file content + * Query: ?name=filename + * Returns: file content as octet-stream + */ +router.get('/auth-files/download', async (req: Request, res: Response): Promise => { + try { + const { name } = req.query; + + if (!name || typeof name !== 'string') { + res.status(400).json({ error: 'Missing required query parameter: name' }); + return; + } + + // Validate filename - prevent path traversal + if (name.includes('..') || name.includes('/') || name.includes('\\')) { + res.status(400).json({ error: 'Invalid filename' }); + return; + } + + const authDir = getAuthDir(); + const filePath = path.join(authDir, name); + + if (!fs.existsSync(filePath)) { + res.status(404).json({ error: 'Auth file not found' }); + return; + } + + const content = fs.readFileSync(filePath); + res.setHeader('Content-Disposition', `attachment; filename="${name}"`); + res.type('application/octet-stream').send(content); + } catch (error) { + res.status(500).json({ error: (error as Error).message }); + } +}); + +// ==================== Model Updates ==================== + +/** + * PUT /api/cliproxy/models/:provider - Update model for a provider + * Body: { model: string } + * Returns: { success: true, provider, model } + */ +router.put('/models/:provider', async (req: Request, res: Response): Promise => { + try { + const { provider } = req.params; + const { model } = req.body; + + if (!model || typeof model !== 'string') { + res.status(400).json({ error: 'Missing required field: model' }); + return; + } + + // Get the settings file for this provider + const ccsDir = getCliproxyWritablePath(); + const settingsPath = path.join(ccsDir, `${provider}.settings.json`); + + if (!fs.existsSync(settingsPath)) { + res.status(404).json({ error: `Settings file not found for provider: ${provider}` }); + return; + } + + // Read and update settings + const settings = JSON.parse(fs.readFileSync(settingsPath, 'utf8')); + settings.env = settings.env || {}; + settings.env.ANTHROPIC_MODEL = model; + + // Write atomically + const tempPath = settingsPath + '.tmp'; + fs.writeFileSync(tempPath, JSON.stringify(settings, null, 2) + '\n'); + fs.renameSync(tempPath, settingsPath); + + res.json({ success: true, provider, model }); + } catch (error) { + res.status(500).json({ error: (error as Error).message }); + } +}); + export default router; diff --git a/src/web-server/routes/config-routes.ts b/src/web-server/routes/config-routes.ts index 776ca579..d00985ca 100644 --- a/src/web-server/routes/config-routes.ts +++ b/src/web-server/routes/config-routes.ts @@ -107,15 +107,19 @@ router.post('/migrate', async (req: Request, res: Response): Promise => { * POST /api/config/rollback - Rollback migration to JSON format */ router.post('/rollback', async (req: Request, res: Response): Promise => { - const { backupPath } = req.body; + try { + const { backupPath } = req.body; - if (!backupPath || typeof backupPath !== 'string') { - res.status(400).json({ error: 'Missing required field: backupPath' }); - return; + if (!backupPath || typeof backupPath !== 'string') { + res.status(400).json({ error: 'Missing required field: backupPath' }); + return; + } + + const success = await rollback(backupPath); + res.json({ success }); + } catch (error) { + res.status(500).json({ error: (error as Error).message }); } - - const success = await rollback(backupPath); - res.json({ success }); }); export default router; diff --git a/src/web-server/routes/settings-routes.ts b/src/web-server/routes/settings-routes.ts index c810c568..02f03874 100644 --- a/src/web-server/routes/settings-routes.ts +++ b/src/web-server/routes/settings-routes.ts @@ -32,103 +32,115 @@ function maskApiKeys(settings: Settings): Settings { * GET /api/settings/:profile - Get settings with masked API keys */ router.get('/:profile', (req: Request, res: Response): void => { - const { profile } = req.params; - const ccsDir = getCcsDir(); - const settingsPath = path.join(ccsDir, `${profile}.settings.json`); + try { + const { profile } = req.params; + const ccsDir = getCcsDir(); + const settingsPath = path.join(ccsDir, `${profile}.settings.json`); - if (!fs.existsSync(settingsPath)) { - res.status(404).json({ error: 'Settings not found' }); - return; + if (!fs.existsSync(settingsPath)) { + res.status(404).json({ error: 'Settings not found' }); + return; + } + + const stat = fs.statSync(settingsPath); + const settings = loadSettings(settingsPath); + const masked = maskApiKeys(settings); + + res.json({ + profile, + settings: masked, + mtime: stat.mtime.getTime(), + path: settingsPath, + }); + } catch (error) { + res.status(500).json({ error: (error as Error).message }); } - - const stat = fs.statSync(settingsPath); - const settings = loadSettings(settingsPath); - const masked = maskApiKeys(settings); - - res.json({ - profile, - settings: masked, - mtime: stat.mtime.getTime(), - path: settingsPath, - }); }); /** * GET /api/settings/:profile/raw - Get full settings (for editing) */ router.get('/:profile/raw', (req: Request, res: Response): void => { - const { profile } = req.params; - const ccsDir = getCcsDir(); - const settingsPath = path.join(ccsDir, `${profile}.settings.json`); + try { + const { profile } = req.params; + const ccsDir = getCcsDir(); + const settingsPath = path.join(ccsDir, `${profile}.settings.json`); - if (!fs.existsSync(settingsPath)) { - res.status(404).json({ error: 'Settings not found' }); - return; + if (!fs.existsSync(settingsPath)) { + res.status(404).json({ error: 'Settings not found' }); + return; + } + + const stat = fs.statSync(settingsPath); + const settings = loadSettings(settingsPath); + + res.json({ + profile, + settings, + mtime: stat.mtime.getTime(), + path: settingsPath, + }); + } catch (error) { + res.status(500).json({ error: (error as Error).message }); } - - const stat = fs.statSync(settingsPath); - const settings = loadSettings(settingsPath); - - res.json({ - profile, - settings, - mtime: stat.mtime.getTime(), - path: settingsPath, - }); }); /** * PUT /api/settings/:profile - Update settings with conflict detection and backup */ router.put('/:profile', (req: Request, res: Response): void => { - const { profile } = req.params; - const { settings, expectedMtime } = req.body; - const ccsDir = getCcsDir(); - const settingsPath = path.join(ccsDir, `${profile}.settings.json`); + try { + const { profile } = req.params; + const { settings, expectedMtime } = req.body; + const ccsDir = getCcsDir(); + const settingsPath = path.join(ccsDir, `${profile}.settings.json`); - const fileExists = fs.existsSync(settingsPath); + const fileExists = fs.existsSync(settingsPath); - // Only check conflict if file exists and expectedMtime was provided - if (fileExists && expectedMtime) { - const stat = fs.statSync(settingsPath); - if (stat.mtime.getTime() !== expectedMtime) { - res.status(409).json({ - error: 'File modified externally', - currentMtime: stat.mtime.getTime(), - }); - return; + // Only check conflict if file exists and expectedMtime was provided + if (fileExists && expectedMtime) { + const stat = fs.statSync(settingsPath); + if (stat.mtime.getTime() !== expectedMtime) { + res.status(409).json({ + error: 'File modified externally', + currentMtime: stat.mtime.getTime(), + }); + return; + } } - } - // Create backup only if file exists - let backupPath: string | undefined; - if (fileExists) { - const backupDir = path.join(ccsDir, 'backups'); - if (!fs.existsSync(backupDir)) { - fs.mkdirSync(backupDir, { recursive: true }); + // Create backup only if file exists + let backupPath: string | undefined; + if (fileExists) { + const backupDir = path.join(ccsDir, 'backups'); + if (!fs.existsSync(backupDir)) { + fs.mkdirSync(backupDir, { recursive: true }); + } + const timestamp = new Date().toISOString().replace(/[:.]/g, '-'); + backupPath = path.join(backupDir, `${profile}.${timestamp}.settings.json`); + fs.copyFileSync(settingsPath, backupPath); } - const timestamp = new Date().toISOString().replace(/[:.]/g, '-'); - backupPath = path.join(backupDir, `${profile}.${timestamp}.settings.json`); - fs.copyFileSync(settingsPath, backupPath); + + // Ensure directory exists for new files + if (!fileExists) { + fs.mkdirSync(path.dirname(settingsPath), { recursive: true }); + } + + // Write new settings atomically + const tempPath = settingsPath + '.tmp'; + fs.writeFileSync(tempPath, JSON.stringify(settings, null, 2) + '\n'); + fs.renameSync(tempPath, settingsPath); + + const newStat = fs.statSync(settingsPath); + res.json({ + profile, + mtime: newStat.mtime.getTime(), + backupPath, + created: !fileExists, + }); + } catch (error) { + res.status(500).json({ error: (error as Error).message }); } - - // Ensure directory exists for new files - if (!fileExists) { - fs.mkdirSync(path.dirname(settingsPath), { recursive: true }); - } - - // Write new settings atomically - const tempPath = settingsPath + '.tmp'; - fs.writeFileSync(tempPath, JSON.stringify(settings, null, 2) + '\n'); - fs.renameSync(tempPath, settingsPath); - - const newStat = fs.statSync(settingsPath); - res.json({ - profile, - mtime: newStat.mtime.getTime(), - backupPath, - created: !fileExists, - }); }); // ==================== Presets ==================== @@ -137,85 +149,97 @@ router.put('/:profile', (req: Request, res: Response): void => { * GET /api/settings/:profile/presets - Get saved presets for a provider */ router.get('/:profile/presets', (req: Request, res: Response): void => { - const { profile } = req.params; - const ccsDir = getCcsDir(); - const settingsPath = path.join(ccsDir, `${profile}.settings.json`); + try { + const { profile } = req.params; + const ccsDir = getCcsDir(); + const settingsPath = path.join(ccsDir, `${profile}.settings.json`); - if (!fs.existsSync(settingsPath)) { - res.json({ presets: [] }); - return; + if (!fs.existsSync(settingsPath)) { + res.json({ presets: [] }); + return; + } + + const settings = loadSettings(settingsPath); + res.json({ presets: settings.presets || [] }); + } catch (error) { + res.status(500).json({ error: (error as Error).message }); } - - const settings = loadSettings(settingsPath); - res.json({ presets: settings.presets || [] }); }); /** * POST /api/settings/:profile/presets - Create a new preset */ router.post('/:profile/presets', (req: Request, res: Response): void => { - const { profile } = req.params; - const { name, default: defaultModel, opus, sonnet, haiku } = req.body; + try { + const { profile } = req.params; + const { name, default: defaultModel, opus, sonnet, haiku } = req.body; - if (!name || !defaultModel) { - res.status(400).json({ error: 'Missing required fields: name, default' }); - return; + if (!name || !defaultModel) { + res.status(400).json({ error: 'Missing required fields: name, default' }); + return; + } + + const ccsDir = getCcsDir(); + const settingsPath = path.join(ccsDir, `${profile}.settings.json`); + + // Create settings file if it doesn't exist + if (!fs.existsSync(settingsPath)) { + fs.writeFileSync(settingsPath, JSON.stringify({ env: {}, presets: [] }, null, 2) + '\n'); + } + + const settings = loadSettings(settingsPath); + settings.presets = settings.presets || []; + + // Check for duplicate name + if (settings.presets.some((p) => p.name === name)) { + res.status(409).json({ error: 'Preset with this name already exists' }); + return; + } + + const preset = { + name, + default: defaultModel, + opus: opus || defaultModel, + sonnet: sonnet || defaultModel, + haiku: haiku || defaultModel, + }; + + settings.presets.push(preset); + fs.writeFileSync(settingsPath, JSON.stringify(settings, null, 2) + '\n'); + + res.status(201).json({ preset }); + } catch (error) { + res.status(500).json({ error: (error as Error).message }); } - - const ccsDir = getCcsDir(); - const settingsPath = path.join(ccsDir, `${profile}.settings.json`); - - // Create settings file if it doesn't exist - if (!fs.existsSync(settingsPath)) { - fs.writeFileSync(settingsPath, JSON.stringify({ env: {}, presets: [] }, null, 2) + '\n'); - } - - const settings = loadSettings(settingsPath); - settings.presets = settings.presets || []; - - // Check for duplicate name - if (settings.presets.some((p) => p.name === name)) { - res.status(409).json({ error: 'Preset with this name already exists' }); - return; - } - - const preset = { - name, - default: defaultModel, - opus: opus || defaultModel, - sonnet: sonnet || defaultModel, - haiku: haiku || defaultModel, - }; - - settings.presets.push(preset); - fs.writeFileSync(settingsPath, JSON.stringify(settings, null, 2) + '\n'); - - res.status(201).json({ preset }); }); /** * DELETE /api/settings/:profile/presets/:name - Delete a preset */ router.delete('/:profile/presets/:name', (req: Request, res: Response): void => { - const { profile, name } = req.params; - const ccsDir = getCcsDir(); - const settingsPath = path.join(ccsDir, `${profile}.settings.json`); + try { + const { profile, name } = req.params; + const ccsDir = getCcsDir(); + const settingsPath = path.join(ccsDir, `${profile}.settings.json`); - if (!fs.existsSync(settingsPath)) { - res.status(404).json({ error: 'Settings not found' }); - return; + if (!fs.existsSync(settingsPath)) { + res.status(404).json({ error: 'Settings not found' }); + return; + } + + const settings = loadSettings(settingsPath); + if (!settings.presets || !settings.presets.some((p) => p.name === name)) { + res.status(404).json({ error: 'Preset not found' }); + return; + } + + settings.presets = settings.presets.filter((p) => p.name !== name); + fs.writeFileSync(settingsPath, JSON.stringify(settings, null, 2) + '\n'); + + res.json({ success: true }); + } catch (error) { + res.status(500).json({ error: (error as Error).message }); } - - const settings = loadSettings(settingsPath); - if (!settings.presets || !settings.presets.some((p) => p.name === name)) { - res.status(404).json({ error: 'Preset not found' }); - return; - } - - settings.presets = settings.presets.filter((p) => p.name !== name); - fs.writeFileSync(settingsPath, JSON.stringify(settings, null, 2) + '\n'); - - res.json({ success: true }); }); export default router; diff --git a/src/web-server/routes/variant-routes.ts b/src/web-server/routes/variant-routes.ts index 1ce3d601..e402bbaa 100644 --- a/src/web-server/routes/variant-routes.ts +++ b/src/web-server/routes/variant-routes.ts @@ -78,82 +78,90 @@ router.post('/', (req: Request, res: Response): void => { * PUT /api/cliproxy/:name - Update cliproxy variant */ router.put('/:name', (req: Request, res: Response): void => { - const { name } = req.params; - const { provider, account, model } = req.body; + try { + const { name } = req.params; + const { provider, account, model } = req.body; - const config = readConfigSafe(); + const config = readConfigSafe(); - if (!config.cliproxy?.[name]) { - res.status(404).json({ error: 'Variant not found' }); - return; - } - - const variant = config.cliproxy[name]; - - // Update fields if provided - if (provider) { - variant.provider = provider; - } - if (account !== undefined) { - if (account) { - variant.account = account; - } else { - delete variant.account; // Remove account to use default + if (!config.cliproxy?.[name]) { + res.status(404).json({ error: 'Variant not found' }); + return; } - } - // Update model in settings file if provided - if (model !== undefined) { - const settingsPath = path.join(getCcsDir(), `${name}.settings.json`); - if (fs.existsSync(settingsPath)) { - const settings = loadSettings(settingsPath); - if (model) { - settings.env = settings.env || {}; - settings.env.ANTHROPIC_MODEL = model; - } else if (settings.env) { - delete settings.env.ANTHROPIC_MODEL; + const variant = config.cliproxy[name]; + + // Update fields if provided + if (provider) { + variant.provider = provider; + } + if (account !== undefined) { + if (account) { + variant.account = account; + } else { + delete variant.account; // Remove account to use default } - fs.writeFileSync(settingsPath, JSON.stringify(settings, null, 2) + '\n'); } + + // Update model in settings file if provided + if (model !== undefined) { + const settingsPath = path.join(getCcsDir(), `${name}.settings.json`); + if (fs.existsSync(settingsPath)) { + const settings = loadSettings(settingsPath); + if (model) { + settings.env = settings.env || {}; + settings.env.ANTHROPIC_MODEL = model; + } else if (settings.env) { + delete settings.env.ANTHROPIC_MODEL; + } + fs.writeFileSync(settingsPath, JSON.stringify(settings, null, 2) + '\n'); + } + } + + writeConfig(config); + + res.json({ + name, + provider: variant.provider, + account: variant.account || 'default', + settings: variant.settings, + updated: true, + }); + } catch (error) { + res.status(500).json({ error: (error as Error).message }); } - - writeConfig(config); - - res.json({ - name, - provider: variant.provider, - account: variant.account || 'default', - settings: variant.settings, - updated: true, - }); }); /** * DELETE /api/cliproxy/:name - Delete cliproxy variant */ router.delete('/:name', (req: Request, res: Response): void => { - const { name } = req.params; + try { + const { name } = req.params; - const config = readConfigSafe(); + const config = readConfigSafe(); - if (!config.cliproxy?.[name]) { - res.status(404).json({ error: 'Variant not found' }); - return; - } - - // Never delete settings files for reserved provider names (safety guard) - if (!isReservedName(name)) { - // Only delete settings file for non-reserved variant names - const settingsPath = path.join(getCcsDir(), `${name}.settings.json`); - if (fs.existsSync(settingsPath)) { - fs.unlinkSync(settingsPath); + if (!config.cliproxy?.[name]) { + res.status(404).json({ error: 'Variant not found' }); + return; } + + // Never delete settings files for reserved provider names (safety guard) + if (!isReservedName(name)) { + // Only delete settings file for non-reserved variant names + const settingsPath = path.join(getCcsDir(), `${name}.settings.json`); + if (fs.existsSync(settingsPath)) { + fs.unlinkSync(settingsPath); + } + } + + delete config.cliproxy[name]; + writeConfig(config); + + res.json({ name, deleted: true }); + } catch (error) { + res.status(500).json({ error: (error as Error).message }); } - - delete config.cliproxy[name]; - writeConfig(config); - - res.json({ name, deleted: true }); }); export default router; From b8c9966e9d825369ab42380b93d4e31b6d7703fc Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sun, 21 Dec 2025 23:26:18 +0000 Subject: [PATCH 29/31] chore(release): 7.1.1-dev.1 [skip ci] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 53885ead..191b8556 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@kaitranntt/ccs", - "version": "7.1.1", + "version": "7.1.1-dev.1", "description": "Claude Code Switch - Instant profile switching between Claude Sonnet 4.5 and GLM 4.6", "keywords": [ "cli", From 36386209bea64794bbbc0c3c2770d512fcc6fe83 Mon Sep 17 00:00:00 2001 From: kaitranntt Date: Sun, 21 Dec 2025 18:57:46 -0500 Subject: [PATCH 30/31] ci: improve issue tagging and label management in release workflows --- .github/workflows/dev-release.yml | 36 ++++++++++++++++++++----------- .github/workflows/release.yml | 24 +++++++++++++++++++++ 2 files changed, 48 insertions(+), 12 deletions(-) diff --git a/.github/workflows/dev-release.yml b/.github/workflows/dev-release.yml index ea10d23d..33168072 100644 --- a/.github/workflows/dev-release.yml +++ b/.github/workflows/dev-release.yml @@ -82,22 +82,31 @@ jobs: env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | - # Get version from package.json (updated by semantic-release) + # Get version from package.json VERSION=$(jq -r '.version' package.json) - # Find commits since last release - LAST_RELEASE=$(git log --oneline --grep="chore(release):" -n 2 | tail -1 | cut -d' ' -f1) - RANGE="${LAST_RELEASE:-HEAD~20}..HEAD" + # Get commits ONLY since last dev tag (not all release commits) + # This prevents re-tagging issues from older releases + LAST_DEV_TAG=$(git tag -l "v*-dev.*" --sort=-v:refname | head -1 || echo "") + + if [ -n "$LAST_DEV_TAG" ]; then + # Commits between last dev tag and current (excluding release commit) + RANGE="${LAST_DEV_TAG}..HEAD~1" + else + # First dev release - check commits since last stable tag + STABLE_TAG=$(git tag -l "v[0-9]*.[0-9]*.[0-9]" --merged origin/main --sort=-v:refname | grep -E '^v[0-9]+\.[0-9]+\.[0-9]+$' | head -1 || echo "") + RANGE="${STABLE_TAG:-HEAD~10}..HEAD~1" + fi echo "Checking commits in range: $RANGE" - # Extract issue numbers - ISSUES=$(git log $RANGE --pretty=format:"%s %b" | \ + # Extract issue numbers from commit messages + ISSUES=$(git log $RANGE --pretty=format:"%s %b" 2>/dev/null | \ grep -oE "(Fixes|Closes|Resolves|Refs?) #[0-9]+" | \ grep -oE "#[0-9]+" | sort -u || true) if [[ -z "$ISSUES" ]]; then - echo "No linked issues found" + echo "No linked issues found in range" exit 0 fi @@ -110,13 +119,16 @@ jobs: for ISSUE in $ISSUES; do NUM=${ISSUE#\#} - # Skip if already tagged - if gh issue view "$NUM" --repo "${{ github.repository }}" --json labels --jq '.labels[].name' | grep -q "released-dev"; then - echo "Issue #$NUM already tagged, skipping" + # Skip if already has ANY release label (prevents duplicate comments) + RELEASE_LABELS=$(gh issue view "$NUM" --repo "${{ github.repository }}" --json labels --jq '[.labels[].name | select(startswith("released"))] | length' 2>/dev/null || echo "0") + if [[ "$RELEASE_LABELS" -gt 0 ]]; then + echo "Issue #$NUM already released, skipping" continue fi echo "Tagging issue #$NUM" - gh issue comment "$NUM" --repo "${{ github.repository }}" --body "[i] Available in \`$VERSION\`. Update: \`ccs update --dev\`" || true - gh issue edit "$NUM" --add-label "released-dev" --repo "${{ github.repository }}" || true + # Remove pending-release (transition), add released-dev + gh issue edit "$NUM" --remove-label "pending-release" --add-label "released-dev" --repo "${{ github.repository }}" 2>/dev/null || \ + gh issue edit "$NUM" --add-label "released-dev" --repo "${{ github.repository }}" || true + gh issue comment "$NUM" --repo "${{ github.repository }}" --body "[bot] Available in \`$VERSION\`. Install: \`ccs update --dev\`" || true done diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 09249950..0a31aa98 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -73,3 +73,27 @@ jobs: exit 0 fi node scripts/send-discord-release.cjs production "$DISCORD_WEBHOOK_URL" + + - name: Cleanup stale labels on released issues + if: success() && steps.release.outputs.released == 'true' + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: | + # semantic-release already adds "released" label via .releaserc.cjs + # This step removes transitional labels from issues now in stable + + # Find issues with both "released" and "released-dev" labels + ISSUES=$(gh issue list --label "released" --label "released-dev" --state all --json number --jq '.[].number' 2>/dev/null || echo "") + + for NUM in $ISSUES; do + echo "Cleaning up labels on issue #$NUM" + gh issue edit "$NUM" --remove-label "released-dev" --remove-label "pending-release" --repo "${{ github.repository }}" 2>/dev/null || true + done + + # Also clean pending-release from any issues with released label + PENDING=$(gh issue list --label "released" --label "pending-release" --state all --json number --jq '.[].number' 2>/dev/null || echo "") + + for NUM in $PENDING; do + echo "Removing pending-release from issue #$NUM" + gh issue edit "$NUM" --remove-label "pending-release" --repo "${{ github.repository }}" 2>/dev/null || true + done From 01c761e6645b74cb110dbd2b5c07eaa2cd87f175 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sun, 21 Dec 2025 23:58:55 +0000 Subject: [PATCH 31/31] chore(release): 7.1.1-dev.2 [skip ci] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 191b8556..319730e2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@kaitranntt/ccs", - "version": "7.1.1-dev.1", + "version": "7.1.1-dev.2", "description": "Claude Code Switch - Instant profile switching between Claude Sonnet 4.5 and GLM 4.6", "keywords": [ "cli",
- {/* Description */} -

- CLI-based web search for third-party profiles (gemini, codex, agy, etc.) -

- - {/* Status Summary */} -
-
-

- {isGeminiEnabled ? 'WebSearch enabled' : 'WebSearch disabled'} -

- {statusLoading ? ( -

Checking status...

- ) : status?.readiness ? ( -

{status.readiness.message}

- ) : null} -
- -
- - {/* CLI Providers */} -
-

Providers

- - {/* Gemini CLI Provider */} -
-
-
- -
-
-

gemini

- - FREE - - {status?.geminiCli?.installed ? ( - - installed - - ) : ( - - not installed - - )} -
-

- Google Gemini CLI (1000 req/day free) -

-
-
- -
- {/* Model input when enabled */} - {isGeminiEnabled && ( -
-
- - setGeminiModelInput(e.target.value)} - onBlur={saveGeminiModel} - placeholder="gemini-2.5-flash" - className="h-8 text-sm font-mono" - disabled={saving} - /> - {geminiModelSaved && ( - - - Saved - - )} -
-
- )} - {/* Installation hint when not installed - inside card */} - {!status?.geminiCli?.installed && !statusLoading && ( - - )} -
- - {/* OpenCode CLI Provider */} -
-
-
- -
-
-

opencode

- - FREE - - {status?.opencodeCli?.installed ? ( - - installed - - ) : ( - - not installed - - )} -
-

OpenCode (web search via Zen)

-
-
- -
- {/* Model input when enabled */} - {isOpenCodeEnabled && ( -
-
- - setOpencodeModelInput(e.target.value)} - onBlur={saveOpencodeModel} - placeholder="opencode/grok-code" - className="h-8 text-sm font-mono" - disabled={saving} - /> - {opencodeModelSaved && ( - - - Saved - - )} -
-
- )} - {/* Installation hint when not installed - inside card */} - {!status?.opencodeCli?.installed && !statusLoading && ( -
- - {showOpencodeHint && ( -
-

- Install globally (FREE tier available): -

- - curl -fsSL https://opencode.ai/install | bash - - - - View documentation - -
- )} -
- )} -
- - {/* Grok CLI Provider */} -
-
-
- -
-
-

grok

- - GROK_API_KEY - - {status?.grokCli?.installed ? ( - - installed - - ) : ( - - not installed - - )} -
-

xAI Grok CLI (web + X search)

-
-
- -
- {/* Installation hint when not installed - inside card */} - {!status?.grokCli?.installed && !statusLoading && ( -
- - {showGrokHint && ( -
-

- Install globally (requires xAI API key): -

- - npm install -g @vibe-kit/grok-cli - - - - View documentation - -
- )} -
- )} -
-
-