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, 23:15 UTC
fix(codex): display inherited service tiers across models (#15623)
Co-authored-by: Julius Marminge <julius0216@outlook.com>
maria committed
Oct 20, 2026 at 05:05 UTC
3b844dab5ced7277ce4a2cf0e5e11d0f04e62241
3 files changed
+132
-9
apps/server/src/orchestration-v2/Adapters/CodexAdapterV2.test.ts
+15
@@ -645,6 +645,21 @@ describe("CodexAdapterV2 runtime policy", () => {
645
omitServiceTier: true,
646
});
647
assert.equal(managed.serviceTier, undefined);
648
+
649
+ for (const tier of [undefined, "default"]) {
650
+ const params = yield* CodexAdapterV2.buildCodexTurnStartParams({
651
+ nativeThreadId: "native-model-options",
652
+ codexInput: [{ type: "text", text: "test" }],
653
+ runtimePolicy: { runtimeMode: "full-access", interactionMode: "default", cwd: null },
654
+ modelSelection: {
655
+ instanceId: ProviderInstanceId.make("codex"),
656
+ model: "gpt-5.4",
657
+ options: tier === undefined ? [] : [{ id: "serviceTier", value: tier }],
658
+ },
659
+ });
660
+ if (tier === undefined) assert.notProperty(params, "serviceTier");
661
+ else assert.equal(params.serviceTier, "default");
662
+ }
663
}),
664
);
665
apps/server/src/provider/CodexProvider.catalog.test.ts
+72
-6
@@ -1,6 +1,7 @@
1
import * as NodeServices from "@effect/platform-node/NodeServices";
2
import { assert, it } from "@effect/vitest";
3
import { CodexSettings } from "@t3tools/contracts";
4
+import { getProviderOptionCurrentLabel } from "@t3tools/shared/model";
5
import * as DateTime from "effect/DateTime";
6
import * as Effect from "effect/Effect";
7
import * as FileSystem from "effect/FileSystem";
@@ -27,15 +28,15 @@ const model = (tiers) => ({
28
id: "gpt-6.1-sol", model: "gpt-6.1-sol", displayName: "GPT-6.1 Sol", description: "",
29
hidden: false, isDefault: true, defaultReasoningEffort: "high",
30
supportedReasoningEfforts: [{ reasoningEffort: "high", description: "" }],
30
- serviceTiers: tiers.map((id) => ({ id, name: id, description: "" })),
31
+ serviceTiers: tiers.map((id) => ({ id, name: id === "priority" ? "Fast" : id, description: "" })),
32
});
33
setTimeout(() => {
34
const tiers = ultrafast ? ["priority", "ultrafast"] : ["priority"];
34
- fs.writeFileSync(cachePath, JSON.stringify({ fetched_at: new Date().toISOString(), models: [model(tiers)] }));
35
+ fs.writeFileSync(cachePath, JSON.stringify({ fetched_at: new Date().toISOString(), models: [model(tiers), { ...model(tiers), id: "gpt-6-luna", model: "gpt-6-luna", isDefault: false }] }));
36
}, 300);
37
const write = (message) => process.stdout.write(JSON.stringify(message) + "\n");
38
readline.createInterface({ input: process.stdin }).on("line", (line) => {
38
- const { id, method } = JSON.parse(line);
39
+ const { id, method, params } = JSON.parse(line);
40
if (id === undefined) return;
41
if (method === "initialize") {
42
write({ id, result: { userAgent: "codex/0.162.0", codexHome: process.env.CODEX_HOME, platformFamily: "unix", platformOs: "macos" } });
@@ -43,6 +44,12 @@ readline.createInterface({ input: process.stdin }).on("line", (line) => {
44
write({ id, result: { account: { type: "chatgpt", email: "test@example.com", planType: "promax" }, requiresOpenaiAuth: false } });
45
} else if (method === "skills/list") {
46
write({ id, result: { data: [] } });
47
+ } else if (method === "config/read") {
48
+ fs.writeFileSync(path.join(process.env.CODEX_HOME, "config-request.json"), JSON.stringify(params));
49
+ const tier = process.env.FAKE_SERVICE_TIER;
50
+ if (tier === "hang") return;
51
+ if (tier === "error") write({ id, error: { code: -32601, message: "unsupported" } });
52
+ else write({ id, result: { config: tier === "missing" ? {} : { service_tier: tier }, origins: {}, layers: null } });
53
} else if (method === "model/list") {
54
write({ id, result: { data: JSON.parse(fs.readFileSync(cachePath, "utf8")).models, nextCursor: null } });
55
} else {
@@ -53,7 +60,10 @@ readline.createInterface({ input: process.stdin }).on("line", (line) => {
60
61
const decodeCodexSettings = Schema.decodeSync(CodexSettings);
62
56
-const solServiceTiers = Effect.fn("solServiceTiers")(function* (ultrafastEntitled: boolean) {
63
+const probeCatalog = Effect.fn("probeCatalog")(function* (
64
+ ultrafastEntitled: boolean,
65
+ serviceTier = "error",
66
+) {
67
const fs = yield* FileSystem.FileSystem;
68
const path = yield* Path.Path;
69
const dir = yield* fs.makeTempDirectoryScoped({ prefix: "t3-codex-catalog-" });
@@ -76,7 +86,7 @@ const solServiceTiers = Effect.fn("solServiceTiers")(function* (ultrafastEntitle
86
defaultReasoningEffort: "high",
87
supportedReasoningEfforts: [{ reasoningEffort: "high", description: "" }],
88
serviceTiers: (ultrafastEntitled ? ["priority"] : ["priority", "ultrafast"]).map(
79
- (id) => ({ id, name: id, description: "" }),
89
+ (id) => ({ id, name: id === "priority" ? "Fast" : id, description: "" }),
90
),
91
},
92
],
@@ -87,8 +97,20 @@ const solServiceTiers = Effect.fn("solServiceTiers")(function* (ultrafastEntitle
97
const provider = yield* checkCodexProviderStatus(
98
decodeCodexSettings({ binaryPath, homePath: dir }),
99
undefined,
90
- { ...environment, FAKE_ULTRAFAST_ENTITLED: ultrafastEntitled ? "1" : "0" },
100
+ {
101
+ ...environment,
102
+ FAKE_ULTRAFAST_ENTITLED: ultrafastEntitled ? "1" : "0",
103
+ FAKE_SERVICE_TIER: serviceTier,
104
+ },
105
);
106
+ const configRequest = yield* fs.readFileString(path.join(dir, "config-request.json"));
107
+ assert.deepStrictEqual(JSON.parse(configRequest), { includeLayers: false });
108
+ assert.equal(provider.status, "ready");
109
+ return provider;
110
+});
111
+
112
+const solServiceTiers = Effect.fn("solServiceTiers")(function* (ultrafastEntitled: boolean) {
113
+ const provider = yield* probeCatalog(ultrafastEntitled);
114
const serviceTier = provider.models
115
.find((model) => model.slug === "gpt-6.1-sol")
116
?.capabilities?.optionDescriptors?.find((descriptor) => descriptor.id === "serviceTier");
@@ -107,4 +129,48 @@ it.layer(NodeServices.layer, { excludeTestServices: true })("Codex catalog disco
129
assert.deepStrictEqual(yield* solServiceTiers(false), ["default", "priority"]);
130
}).pipe(Effect.scoped),
131
);
132
+
133
+ it.effect("displays the inherited global Fast tier on every discovered model", () =>
134
+ Effect.gen(function* () {
135
+ for (const tier of ["fast", "priority"]) {
136
+ const provider = yield* probeCatalog(false, tier);
137
+ assert.deepStrictEqual(
138
+ provider.models.map((model) => model.slug),
139
+ ["gpt-6.1-sol", "gpt-6-luna"],
140
+ );
141
+ for (const model of provider.models) {
142
+ const descriptors = model.capabilities?.optionDescriptors ?? [];
143
+ const serviceTier = descriptors.find((descriptor) => descriptor.id === "serviceTier");
144
+ assert.equal(serviceTier?.type, "select");
145
+ if (serviceTier?.type !== "select") return;
146
+ assert.equal(getProviderOptionCurrentLabel(serviceTier), "Fast");
147
+ assert.deepStrictEqual(
148
+ serviceTier.options.filter((option) => option.isDefault).map((option) => option.id),
149
+ ["priority"],
150
+ );
151
+ assert.equal(
152
+ descriptors.find((descriptor) => descriptor.id === "reasoningEffort")?.currentValue,
153
+ "high",
154
+ );
155
+ }
156
+ assert.equal(provider.models.find((model) => model.isDefault)?.slug, "gpt-6.1-sol");
157
+ }
158
+ }).pipe(Effect.scoped),
159
+ );
160
+
161
+ it.effect(
162
+ "preserves the catalog when global tier config is missing, unknown, failing, or stalled",
163
+ () =>
164
+ Effect.gen(function* () {
165
+ const baseline = yield* probeCatalog(false, "missing");
166
+ const serviceTier = baseline.models[0]?.capabilities?.optionDescriptors?.find(
167
+ (descriptor) => descriptor.id === "serviceTier",
168
+ );
169
+ assert.equal(getProviderOptionCurrentLabel(serviceTier), "Standard");
170
+ for (const config of ["unsupported", "error", "hang"]) {
171
+ const provider = yield* probeCatalog(false, config);
172
+ assert.deepStrictEqual(provider.models, baseline.models, config);
173
+ }
174
+ }).pipe(Effect.scoped, Effect.timeout("8 seconds")),
175
+ );
176
});
apps/server/src/provider/CodexProvider.ts
+45
-3
@@ -68,6 +68,7 @@ type CodexRateLimitsProbe =
68
69
const CODEX_APP_SERVER_PROBE_FORCE_KILL_AFTER = "2 seconds" as const;
70
const CODEX_CATALOG_REFRESH_TIMEOUT = "3 seconds" as const;
71
+const CODEX_CONFIG_PROBE_TIMEOUT = "3 seconds" as const;
72
const CODEX_CATALOG_REFRESH_POLL = "100 millis" as const;
73
const CODEX_CLIENT_NAME = "T3 Code";
74
// Codex's probe does a full handshake plus account, models, and skills requests, which can
@@ -269,6 +270,37 @@ export function applyPreferredCodexDefaultModel(
270
});
271
}
272
273
+function applyConfiguredCodexServiceTier(
274
+ models: ReadonlyArray<ServerProviderModel>,
275
+ serviceTier: string | undefined,
276
+): ReadonlyArray<ServerProviderModel> {
277
+ if (!serviceTier) return models;
278
+ return models.map((model) => {
279
+ if (!model.capabilities?.optionDescriptors) return model;
280
+ return {
281
+ ...model,
282
+ capabilities: {
283
+ ...model.capabilities,
284
+ optionDescriptors: model.capabilities.optionDescriptors.map((descriptor) => {
285
+ if (descriptor.id !== "serviceTier" || descriptor.type !== "select") return descriptor;
286
+ const value = descriptor.options.find(
287
+ (option) =>
288
+ option.id === serviceTier || (serviceTier === "fast" && option.id === "priority"),
289
+ )?.id;
290
+ if (!value) return descriptor;
291
+ return {
292
+ ...descriptor,
293
+ currentValue: value,
294
+ options: descriptor.options.map(({ isDefault: _isDefault, ...option }) =>
295
+ option.id === value ? { ...option, isDefault: true } : option,
296
+ ),
297
+ };
298
+ }),
299
+ },
300
+ };
301
+ });
302
+}
303
+
304
/**
305
* Codex has no static default capability set, so a bare custom slug borrows
306
* the first built-in's descriptors; an entry with its own capabilities keeps
@@ -484,7 +516,7 @@ const probeCodexAppServerProvider = Effect.fn("probeCodexAppServerProvider")(fun
516
} satisfies CodexAppServerProviderSnapshot;
517
}
518
487
- const [skillsResponse, models, rateLimits] = yield* Effect.all(
519
+ const [skillsResponse, models, serviceTier, rateLimits] = yield* Effect.all(
520
[
521
client.request("skills/list", {
522
cwds: [input.cwd],
@@ -492,6 +524,15 @@ const probeCodexAppServerProvider = Effect.fn("probeCodexAppServerProvider")(fun
524
accountResponse.account?.type === "chatgpt"
525
? requestCodexChatGptModels({ client, codexHome: initialize.codexHome, spawnedAtMs })
526
: requestAllCodexModels(client),
527
+ // The shared catalog must exclude config from the server's launch project.
528
+ client.request("config/read", { includeLayers: false }).pipe(
529
+ Effect.map((response) => response.config.service_tier ?? undefined),
530
+ Effect.timeoutOption(CODEX_CONFIG_PROBE_TIMEOUT),
531
+ Effect.map(Option.getOrUndefined),
532
+ Effect.catch(() => Effect.logDebug("Codex config read failed.").pipe(Effect.as(undefined))),
533
+ ),
534
+ // Usage is an enrichment: a failure or a slow answer degrades to "no
535
+ // usage this probe" rather than costing the account and models.
536
input.skipNativeUsage
537
? Effect.succeed(undefined)
538
: client.request("account/rateLimits/read", null).pipe(
@@ -521,8 +562,9 @@ const probeCodexAppServerProvider = Effect.fn("probeCodexAppServerProvider")(fun
562
account: accountResponse,
563
...(rateLimits ? { rateLimits } : {}),
564
version,
524
- models: applyPreferredCodexDefaultModel(
525
- appendCustomCodexModels(models, input.customModels ?? []),
565
+ models: applyConfiguredCodexServiceTier(
566
+ applyPreferredCodexDefaultModel(appendCustomCodexModels(models, input.customModels ?? [])),
567
+ serviceTier,
568
),
569
skills: parseCodexSkillsListResponse(skillsResponse, input.cwd),
570
} satisfies CodexAppServerProviderSnapshot;