@devries-cameron20 / t3code Mirror · read-only / commits / 305a90dce4
Fork 0

The best way to control Claude Code, Codex and more from any computer or phone

Mirrored from https://github.com/Camo67/t3code.git

Synced Nov 22, 12:00 UTC

fix(relay): show the account's real tunnel cap in T3 Connect settings (#27442)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>

Julius Marminge committed Oct 30, 2026 at 01:47 UTC 305a90dce44b8b7813d951662f13ce8510a3c669
7 files changed +73 -23
apps/web/src/cloud/managedRelayState.ts
+4 -1
@@ -150,11 +150,14 @@ export function useManagedRelayDevices() {
150 /** How this account can raise its tunnel cap: link T3 Chat, or upgrade the linked plan. */
151 export type ManagedTunnelUpgrade = "link" | "pro" | "premier" | null;
152
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.
154 function managedTunnelCap(t3Chat: RelayT3ChatLinkResponse): {
155 readonly limit: number;
156 readonly upgrade: ManagedTunnelUpgrade;
157 } {
158 + if (t3Chat.maxTunnelsOverride !== undefined) {
159 + return { limit: t3Chat.maxTunnelsOverride, upgrade: null };
160 + }
161 if (!t3Chat.available) return { limit: DEFAULT_MANAGED_TUNNEL_LIMIT, upgrade: null };
162 switch (t3Chat.link?.plan) {
163 case "premier":
infra/relay/src/environments/ManagedEndpointProvider.test.ts
+1
@@ -343,6 +343,7 @@ function makeTunnelLimits(
343 }
344 return yield* reserve;
345 }),
346 + getOverride: () => Effect.die("unused"),
347 });
348 }
349
infra/relay/src/environments/ManagedTunnelLimits.test.ts
+23
@@ -121,6 +121,27 @@ const reserve = (
121 ),
122 );
123
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 +
145 describe("ManagedTunnelLimits", () => {
146 it.effect("rejects concurrent reservations past the limit", () => {
147 const reserved: Array<string> = [];
@@ -383,7 +404,9 @@ describe("ManagedTunnelLimits", () => {
404 reserve({ override, activeTunnels: override, plan: "premier", lookups }),
405 );
406 expect(error).toMatchObject({ _tag: "ManagedTunnelLimitExceeded", maxTunnels: override });
407 + expect(yield* getOverride(override)).toBe(override);
408 }
409 + expect(yield* getOverride()).toBeNull();
410 expect(lookups).toEqual([]);
411 }),
412 );
infra/relay/src/environments/ManagedTunnelLimits.ts
+24 -17
@@ -106,6 +106,10 @@ export class ManagedTunnelLimits extends Context.Service<
106 input: { readonly userId: string; readonly environmentId: string },
107 reserve: Effect.Effect<A, E, R>,
108 ) => 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>;
113 }
114 >()("t3code-relay/environments/ManagedTunnelLimits") {}
115
@@ -126,7 +130,24 @@ const make = Effect.gen(function* () {
130 ),
131 );
132
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 +
147 return ManagedTunnelLimits.of({
148 + getOverride: Effect.fn("relay.managed_tunnel_limits.get_override")(function* (input) {
149 + return yield* loadOverride(input.userId);
150 + }),
151 withCapacity: Effect.fn("relay.managed_tunnel_limits.with_capacity")(function* <A, E, R>(
152 input: { readonly userId: string; readonly environmentId: string },
153 reserve: Effect.Effect<A, E, R>,
@@ -148,22 +169,8 @@ const make = Effect.gen(function* () {
169 ),
170 );
171
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;
174
175 const pendingCutoff = DateTime.formatIso(
176 DateTime.subtract(yield* DateTime.now, {
@@ -196,7 +203,7 @@ const make = Effect.gen(function* () {
203 // A manual override is the exact cap; a T3 Chat plan raises only the default.
204 // Runs under the user lock, bounded by the T3 Chat request timeout.
205 const maxTunnels =
199 - t3Chat.available && overrides.length === 0
206 + t3Chat.available && override === null
207 ? Math.max(baseMaxTunnels, yield* t3ChatTunnelLimit(input.userId))
208 : baseMaxTunnels;
209 if (activeTunnels >= maxTunnels) {
infra/relay/src/http/Api.test.ts
+4
@@ -64,6 +64,7 @@ import * as HookInbox from "../hooks/HookInbox.ts";
64 import * as EnvironmentLinks from "../environments/EnvironmentLinks.ts";
65 import * as ManagedEndpointAllocations from "../environments/ManagedEndpointAllocations.ts";
66 import * as ManagedEndpointProvider from "../environments/ManagedEndpointProvider.ts";
67 +import * as ManagedTunnelLimits from "../environments/ManagedTunnelLimits.ts";
68 import * as AgentActivityPublisher from "../agentActivity/AgentActivityPublisher.ts";
69 import * as EnvironmentPublishSignatures from "../environments/EnvironmentPublishSignatures.ts";
70 import * as T3ChatAccounts from "../t3chat/T3ChatAccounts.ts";
@@ -130,6 +131,7 @@ describe("managed endpoint provisioning errors", () => {
131 Layer.mock(ManagedEndpointProvider.ManagedEndpointProvider, {}),
132 Layer.mock(Devices.Devices, {}),
133 Layer.mock(T3ChatAccounts.T3ChatAccounts, { available: false }),
134 + Layer.mock(ManagedTunnelLimits.ManagedTunnelLimits, {}),
135 ),
136 ),
137 Layer.provideMerge(
@@ -241,6 +243,7 @@ describe("device listing compatibility", () => {
243 },
244 }),
245 Layer.mock(T3ChatAccounts.T3ChatAccounts, { available: false }),
246 + Layer.mock(ManagedTunnelLimits.ManagedTunnelLimits, {}),
247 ),
248 ),
249 Layer.provideMerge(
@@ -322,6 +325,7 @@ describe("Cloudflare rate-limit retry hint", () => {
325 Layer.mock(ManagedEndpointProvider.ManagedEndpointProvider, {}),
326 Layer.mock(Devices.Devices, {}),
327 Layer.mock(T3ChatAccounts.T3ChatAccounts, { available: false }),
328 + Layer.mock(ManagedTunnelLimits.ManagedTunnelLimits, {}),
329 ),
330 ),
331 Layer.provideMerge(
infra/relay/src/http/Api.ts
+15 -5
@@ -74,6 +74,7 @@ import * as AgentActivityPublisher from "../agentActivity/AgentActivityPublisher
74 import * as EnvironmentConnector from "../environments/EnvironmentConnector.ts";
75 import * as EnvironmentLinker from "../environments/EnvironmentLinker.ts";
76 import * as ManagedEndpointProvider from "../environments/ManagedEndpointProvider.ts";
77 +import * as ManagedTunnelLimits from "../environments/ManagedTunnelLimits.ts";
78 import * as ManagedEndpointAllocations from "../environments/ManagedEndpointAllocations.ts";
79 import * as EnvironmentPublishSignatures from "../environments/EnvironmentPublishSignatures.ts";
80 import * as MobileRegistrations from "../agentActivity/MobileRegistrations.ts";
@@ -825,6 +826,7 @@ export const layerClientApi = HttpApiBuilder.group(
826 const managedEndpointProvider = yield* ManagedEndpointProvider.ManagedEndpointProvider;
827 const devices = yield* Devices.Devices;
828 const t3Chat = yield* T3ChatAccounts.T3ChatAccounts;
829 + const tunnelLimits = yield* ManagedTunnelLimits.ManagedTunnelLimits;
830 return handlers
831 .handle(
832 "listEnvironments",
@@ -996,12 +998,20 @@ export const layerClientApi = HttpApiBuilder.group(
998 "getT3ChatLink",
999 Effect.fn("relay.api.client.getT3ChatLink")(function* () {
1000 yield* appendRelayCredentialResponseHeaders;
999 - if (!t3Chat.available) return { available: false, link: null };
1001 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 + };
1015 }, mapRelayCommonApiErrors("not_authorized")),
1016 )
1017 .handle(
packages/contracts/src/relay.ts
+2
@@ -981,6 +981,8 @@ export const RelayT3ChatLinkResponse = Schema.Struct({
981 // False when this relay has no T3 Chat secret, so clients hide the feature.
982 available: Schema.Boolean,
983 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),
986 });
987 export type RelayT3ChatLinkResponse = typeof RelayT3ChatLinkResponse.Type;
988