@@ -106,6 +106,10 @@ export class ManagedTunnelLimits extends Context.Service<
106106 input : { readonly userId : string ; readonly environmentId : string } ,
107107 reserve : Effect . Effect < A , E , R > ,
108108 ) => Effect . Effect < A , E | ManagedTunnelLimitExceeded | ManagedTunnelLimitPersistenceError , R > ;
109+ /** The user's manual cap, which replaces the default and any T3 Chat plan cap. */
110+ readonly getOverride : ( input : {
111+ readonly userId : string ;
112+ } ) => Effect . Effect < number | null , ManagedTunnelLimitPersistenceError > ;
109113 }
110114> ( ) ( "t3code-relay/environments/ManagedTunnelLimits" ) { }
111115
@@ -126,7 +130,24 @@ const make = Effect.gen(function* () {
126130 ) ,
127131 ) ;
128132
133+ const loadOverride = ( userId : string ) =>
134+ db
135+ . select ( { maxTunnels : relayManagedTunnelLimits . maxTunnels } )
136+ . from ( relayManagedTunnelLimits )
137+ . where ( eq ( relayManagedTunnelLimits . userId , userId ) )
138+ . limit ( 1 )
139+ . pipe (
140+ Effect . map ( ( rows ) => rows [ 0 ] ?. maxTunnels ?? null ) ,
141+ Effect . mapError (
142+ ( cause ) =>
143+ new ManagedTunnelLimitPersistenceError ( { operation : "load-limit" , userId, cause } ) ,
144+ ) ,
145+ ) ;
146+
129147 return ManagedTunnelLimits . of ( {
148+ getOverride : Effect . fn ( "relay.managed_tunnel_limits.get_override" ) ( function * ( input ) {
149+ return yield * loadOverride ( input . userId ) ;
150+ } ) ,
130151 withCapacity : Effect . fn ( "relay.managed_tunnel_limits.with_capacity" ) ( function * < A , E , R > (
131152 input : { readonly userId : string ; readonly environmentId : string } ,
132153 reserve : Effect . Effect < A , E , R > ,
@@ -148,22 +169,8 @@ const make = Effect.gen(function* () {
148169 ) ,
149170 ) ;
150171
151- const overrides = yield * db
152- . select ( { maxTunnels : relayManagedTunnelLimits . maxTunnels } )
153- . from ( relayManagedTunnelLimits )
154- . where ( eq ( relayManagedTunnelLimits . userId , input . userId ) )
155- . limit ( 1 )
156- . pipe (
157- Effect . mapError (
158- ( cause ) =>
159- new ManagedTunnelLimitPersistenceError ( {
160- operation : "load-limit" ,
161- userId : input . userId ,
162- cause,
163- } ) ,
164- ) ,
165- ) ;
166- const baseMaxTunnels = overrides [ 0 ] ?. maxTunnels ?? DEFAULT_MANAGED_TUNNEL_LIMIT ;
172+ const override = yield * loadOverride ( input . userId ) ;
173+ const baseMaxTunnels = override ?? DEFAULT_MANAGED_TUNNEL_LIMIT ;
167174
168175 const pendingCutoff = DateTime . formatIso (
169176 DateTime . subtract ( yield * DateTime . now , {
@@ -196,7 +203,7 @@ const make = Effect.gen(function* () {
196203 // A manual override is the exact cap; a T3 Chat plan raises only the default.
197204 // Runs under the user lock, bounded by the T3 Chat request timeout.
198205 const maxTunnels =
199- t3Chat . available && overrides . length === 0
206+ t3Chat . available && override === null
200207 ? Math . max ( baseMaxTunnels , yield * t3ChatTunnelLimit ( input . userId ) )
201208 : baseMaxTunnels ;
202209 if ( activeTunnels >= maxTunnels ) {
0 commit comments