Skip to content

Commit ca458db

Browse files
Merge remote-tracking branch 'origin/main' into fix/issue-24459
Co-Authored-By: Claude Opus 5.5 <[email protected]>
2 parents f4feb1c + 305a90d commit ca458db

7 files changed

Lines changed: 73 additions & 23 deletions

File tree

‎apps/web/src/cloud/managedRelayState.ts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,11 +150,14 @@ export function useManagedRelayDevices() {
150150
/** How this account can raise its tunnel cap: link T3 Chat, or upgrade the linked plan. */
151151
export type ManagedTunnelUpgrade = "link" | "pro" | "premier" | null;
152152

153-
// Mirrors the relay's cap without manual overrides, which the relay does not expose.
153+
// Mirrors the relay's cap: a manual override is exact, otherwise the T3 Chat plan raises the default.
154154
function managedTunnelCap(t3Chat: RelayT3ChatLinkResponse): {
155155
readonly limit: number;
156156
readonly upgrade: ManagedTunnelUpgrade;
157157
} {
158+
if (t3Chat.maxTunnelsOverride !== undefined) {
159+
return { limit: t3Chat.maxTunnelsOverride, upgrade: null };
160+
}
158161
if (!t3Chat.available) return { limit: DEFAULT_MANAGED_TUNNEL_LIMIT, upgrade: null };
159162
switch (t3Chat.link?.plan) {
160163
case "premier":

‎infra/relay/src/environments/ManagedEndpointProvider.test.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -343,6 +343,7 @@ function makeTunnelLimits(
343343
}
344344
return yield* reserve;
345345
}),
346+
getOverride: () => Effect.die("unused"),
346347
});
347348
}
348349

‎infra/relay/src/environments/ManagedTunnelLimits.test.ts‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,27 @@ const reserve = (
121121
),
122122
);
123123

124+
const getOverride = (override?: number) =>
125+
Effect.gen(function* () {
126+
const limits = yield* ManagedTunnelLimits.ManagedTunnelLimits;
127+
return yield* limits.getOverride({ userId: "user-1" });
128+
}).pipe(
129+
Effect.provide(
130+
ManagedTunnelLimits.layer.pipe(
131+
Layer.provide(
132+
Layer.succeed(
133+
RelayDb.RelayDb,
134+
makeFakeDb({
135+
otherSlots: () => 0,
136+
...(override === undefined ? {} : { override }),
137+
}),
138+
),
139+
),
140+
Layer.provide(t3ChatLayer("free")),
141+
),
142+
),
143+
);
144+
124145
describe("ManagedTunnelLimits", () => {
125146
it.effect("rejects concurrent reservations past the limit", () => {
126147
const reserved: Array<string> = [];
@@ -383,7 +404,9 @@ describe("ManagedTunnelLimits", () => {
383404
reserve({ override, activeTunnels: override, plan: "premier", lookups }),
384405
);
385406
expect(error).toMatchObject({ _tag: "ManagedTunnelLimitExceeded", maxTunnels: override });
407+
expect(yield* getOverride(override)).toBe(override);
386408
}
409+
expect(yield* getOverride()).toBeNull();
387410
expect(lookups).toEqual([]);
388411
}),
389412
);

‎infra/relay/src/environments/ManagedTunnelLimits.ts‎

Lines changed: 24 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -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) {

‎infra/relay/src/http/Api.test.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ import * as HookInbox from "../hooks/HookInbox.ts";
6464
import * as EnvironmentLinks from "../environments/EnvironmentLinks.ts";
6565
import * as ManagedEndpointAllocations from "../environments/ManagedEndpointAllocations.ts";
6666
import * as ManagedEndpointProvider from "../environments/ManagedEndpointProvider.ts";
67+
import * as ManagedTunnelLimits from "../environments/ManagedTunnelLimits.ts";
6768
import * as AgentActivityPublisher from "../agentActivity/AgentActivityPublisher.ts";
6869
import * as EnvironmentPublishSignatures from "../environments/EnvironmentPublishSignatures.ts";
6970
import * as T3ChatAccounts from "../t3chat/T3ChatAccounts.ts";
@@ -130,6 +131,7 @@ describe("managed endpoint provisioning errors", () => {
130131
Layer.mock(ManagedEndpointProvider.ManagedEndpointProvider, {}),
131132
Layer.mock(Devices.Devices, {}),
132133
Layer.mock(T3ChatAccounts.T3ChatAccounts, { available: false }),
134+
Layer.mock(ManagedTunnelLimits.ManagedTunnelLimits, {}),
133135
),
134136
),
135137
Layer.provideMerge(
@@ -241,6 +243,7 @@ describe("device listing compatibility", () => {
241243
},
242244
}),
243245
Layer.mock(T3ChatAccounts.T3ChatAccounts, { available: false }),
246+
Layer.mock(ManagedTunnelLimits.ManagedTunnelLimits, {}),
244247
),
245248
),
246249
Layer.provideMerge(
@@ -322,6 +325,7 @@ describe("Cloudflare rate-limit retry hint", () => {
322325
Layer.mock(ManagedEndpointProvider.ManagedEndpointProvider, {}),
323326
Layer.mock(Devices.Devices, {}),
324327
Layer.mock(T3ChatAccounts.T3ChatAccounts, { available: false }),
328+
Layer.mock(ManagedTunnelLimits.ManagedTunnelLimits, {}),
325329
),
326330
),
327331
Layer.provideMerge(

‎infra/relay/src/http/Api.ts‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ import * as AgentActivityPublisher from "../agentActivity/AgentActivityPublisher
7474
import * as EnvironmentConnector from "../environments/EnvironmentConnector.ts";
7575
import * as EnvironmentLinker from "../environments/EnvironmentLinker.ts";
7676
import * as ManagedEndpointProvider from "../environments/ManagedEndpointProvider.ts";
77+
import * as ManagedTunnelLimits from "../environments/ManagedTunnelLimits.ts";
7778
import * as ManagedEndpointAllocations from "../environments/ManagedEndpointAllocations.ts";
7879
import * as EnvironmentPublishSignatures from "../environments/EnvironmentPublishSignatures.ts";
7980
import * as MobileRegistrations from "../agentActivity/MobileRegistrations.ts";
@@ -825,6 +826,7 @@ export const layerClientApi = HttpApiBuilder.group(
825826
const managedEndpointProvider = yield* ManagedEndpointProvider.ManagedEndpointProvider;
826827
const devices = yield* Devices.Devices;
827828
const t3Chat = yield* T3ChatAccounts.T3ChatAccounts;
829+
const tunnelLimits = yield* ManagedTunnelLimits.ManagedTunnelLimits;
828830
return handlers
829831
.handle(
830832
"listEnvironments",
@@ -996,12 +998,20 @@ export const layerClientApi = HttpApiBuilder.group(
996998
"getT3ChatLink",
997999
Effect.fn("relay.api.client.getT3ChatLink")(function* () {
9981000
yield* appendRelayCredentialResponseHeaders;
999-
if (!t3Chat.available) return { available: false, link: null };
10001001
const { userId } = yield* RelayClientPrincipal;
1001-
const link = yield* t3Chat
1002-
.getLink({ userId })
1003-
.pipe(Effect.catch(() => relayInternalErrorResponse("upstream_unavailable")));
1004-
return { available: true, link };
1002+
const link = t3Chat.available
1003+
? yield* t3Chat
1004+
.getLink({ userId })
1005+
.pipe(Effect.catch(() => relayInternalErrorResponse("upstream_unavailable")))
1006+
: null;
1007+
const maxTunnelsOverride = yield* tunnelLimits
1008+
.getOverride({ userId })
1009+
.pipe(Effect.catch(() => relayInternalErrorResponse("internal_error")));
1010+
return {
1011+
available: t3Chat.available,
1012+
link,
1013+
...(maxTunnelsOverride === null ? {} : { maxTunnelsOverride }),
1014+
};
10051015
}, mapRelayCommonApiErrors("not_authorized")),
10061016
)
10071017
.handle(

‎packages/contracts/src/relay.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -981,6 +981,8 @@ export const RelayT3ChatLinkResponse = Schema.Struct({
981981
// False when this relay has no T3 Chat secret, so clients hide the feature.
982982
available: Schema.Boolean,
983983
link: Schema.NullOr(RelayT3ChatLink),
984+
// A manual cap that replaces the plan's; T3 Chat upgrades do not raise it.
985+
maxTunnelsOverride: Schema.optionalKey(Schema.Number),
984986
});
985987
export type RelayT3ChatLinkResponse = typeof RelayT3ChatLinkResponse.Type;
986988

0 commit comments

Comments
 (0)