Skip to content

Commit d6d1dad

Browse files
Mezzleclaude
andcommitted
fix(codex): send the chosen cyber access program even when the model lacks it
#27835 asks that a choice T3 cannot honour fail visibly instead of being replaced. Falling back to the model's default could turn a Standard choice into Daybreak on a Daybreak-only model. An explicit, recognised choice is sent again and Codex rejects it; the default applies only without one. Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent 9c399b4 commit d6d1dad

6 files changed

Lines changed: 42 additions & 60 deletions

File tree

‎apps/server/src/orchestration-v2/Adapters/CodexAdapterV2.test.ts‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -225,21 +225,27 @@ describe("CodexAdapterV2 runtime policy", () => {
225225
}),
226226
);
227227

228-
it.effect("sends only a cyber access program Codex accepts", () =>
228+
it.effect("sends the chosen cyber access program, else the model's default", () =>
229229
Effect.gen(function* () {
230-
const build = (cyberAccessProgram?: string) =>
230+
const build = (value?: string, defaultCyberAccessProgram?: string) =>
231231
CodexAdapterV2.buildCodexTurnStartParams({
232232
nativeThreadId: "native-cyber",
233233
codexInput: [{ type: "text", text: "test" }],
234234
runtimePolicy: { runtimeMode: "full-access", interactionMode: "default", cwd: null },
235-
modelSelection: { instanceId: ProviderInstanceId.make("codex"), model: "gpt-5.4" },
236-
cyberAccessProgram,
235+
modelSelection: {
236+
instanceId: ProviderInstanceId.make("codex"),
237+
model: "gpt-5.4",
238+
...(value === undefined ? {} : { options: [{ id: "cyberAccessProgram", value }] }),
239+
},
240+
defaultCyberAccessProgram,
237241
});
238242

239243
// Custom models have no catalog entry, so Codex keeps its own treatment.
240244
assert.notProperty(yield* build(), "cyberAccessProgram");
241-
assert.notProperty(yield* build("automatic"), "cyberAccessProgram");
242-
assert.equal((yield* build("daybreakBlue")).cyberAccessProgram, "daybreakBlue");
245+
assert.equal((yield* build(undefined, "standard")).cyberAccessProgram, "standard");
246+
assert.equal((yield* build("automatic", "standard")).cyberAccessProgram, "standard");
247+
assert.equal((yield* build("daybreakBlue", "standard")).cyberAccessProgram, "daybreakBlue");
248+
assert.equal((yield* build("standard", "daybreakBlue")).cyberAccessProgram, "standard");
243249
}),
244250
);
245251

‎apps/server/src/orchestration-v2/Adapters/CodexAdapterV2.ts‎

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -773,7 +773,7 @@ export const buildCodexTurnStartParams = Effect.fn("CodexAdapterV2.buildCodexTur
773773
/** ChatGPT token sharing does not accept service tiers. */
774774
readonly omitServiceTier?: boolean;
775775
readonly appContext?: ProviderAdapter.ProviderAdapterV2TurnInput["appContext"];
776-
readonly cyberAccessProgram?: string | undefined;
776+
readonly defaultCyberAccessProgram?: string | undefined;
777777
}) {
778778
const runtimeModeDefaults = codexRuntimeModeTurnDefaults(input.runtimePolicy.runtimeMode);
779779
const approvalPolicy =
@@ -793,9 +793,10 @@ export const buildCodexTurnStartParams = Effect.fn("CodexAdapterV2.buildCodexTur
793793
input.omitServiceTier === true
794794
? undefined
795795
: getCodexServiceTierOptionValue(input.modelSelection);
796-
const cyberAccessProgram = isCodexCyberAccessProgram(input.cyberAccessProgram)
797-
? input.cyberAccessProgram
798-
: undefined;
796+
const selectedCyberAccessProgram = getCodexCyberAccessProgramOptionValue(input.modelSelection);
797+
const cyberAccessProgram = [selectedCyberAccessProgram, input.defaultCyberAccessProgram].find(
798+
isCodexCyberAccessProgram,
799+
);
799800
// MCP-written app context must be quoted user input, not developer instructions.
800801
const appContext = Object.fromEntries(
801802
(input.appContext ?? []).map((entry) => [
@@ -1660,7 +1661,7 @@ export const createCodexAdapterV2 = Effect.fn("CodexAdapterV2.createCodexAdapter
16601661
{ instanceId, environment, enabled, config }: ProviderAdapterDriverCreateInput<CodexSettings>,
16611662
hooks: Pick<
16621663
CodexAdapterV2Options,
1663-
"onUsageLimits" | "resolveRuntime" | "compatibility" | "resolveCyberAccessProgram"
1664+
"onUsageLimits" | "resolveRuntime" | "compatibility" | "defaultCyberAccessProgram"
16641665
> = {},
16651666
) {
16661667
const clientFactory = yield* CodexAppServerClientFactory;
@@ -1711,10 +1712,7 @@ export interface CodexAdapterV2Options {
17111712
readonly environment: NodeJS.ProcessEnv;
17121713
readonly clientFactory: CodexAppServerClientFactoryShape;
17131714
readonly onUsageLimits?: ManagedServerProvider["applyUsageLimits"];
1714-
/** Checks the selection against the model's current catalog entry, falling back to its default. */
1715-
readonly resolveCyberAccessProgram?: (
1716-
modelSelection: ModelSelection,
1717-
) => Effect.Effect<string | undefined>;
1715+
readonly defaultCyberAccessProgram?: (model: string) => Effect.Effect<string | undefined>;
17181716
readonly resolveRuntime?: Effect.Effect<CodexEffectiveRuntime, ProviderSetupError, Scope.Scope>;
17191717
readonly compatibility?: (
17201718
version: string,
@@ -6803,12 +6801,12 @@ export const makeCodexAdapterV2 = Effect.fn("makeCodexAdapterV2")(function* (
68036801
) {
68046802
const threadId = yield* getNativeThreadId(turnInput.providerThread);
68056803
const mcpSession = yield* mcpSessions.read(turnInput.threadId);
6806-
const cyberAccessProgram =
6807-
adapterOptions.resolveCyberAccessProgram === undefined
6808-
? getCodexCyberAccessProgramOptionValue(turnInput.modelSelection)
6809-
: yield* adapterOptions.resolveCyberAccessProgram(turnInput.modelSelection);
6804+
const defaultCyberAccessProgram =
6805+
adapterOptions.defaultCyberAccessProgram === undefined
6806+
? undefined
6807+
: yield* adapterOptions.defaultCyberAccessProgram(turnInput.modelSelection.model);
68106808
const turnStartParams = yield* buildCodexTurnStartParams({
6811-
cyberAccessProgram,
6809+
defaultCyberAccessProgram,
68126810
nativeThreadId: threadId,
68136811
codexInput,
68146812
runtimePolicy: turnInput.runtimePolicy,

‎apps/server/src/provider/CodexProvider.test.ts‎

Lines changed: 7 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,14 @@
11
import { assert, it } from "@effect/vitest";
2-
import { ProviderInstanceId, type ServerProviderModel } from "@t3tools/contracts";
32

43
import {
54
appendCustomCodexModels,
65
applyPreferredCodexDefaultModel,
76
applyConfiguredCodexCyberAccess,
87
codexApiKeyCyberAccessProgramsDisabled,
9-
codexCyberAccessProgram,
8+
codexDefaultCyberAccessProgram,
109
mapCodexModelCapabilities,
1110
} from "./CodexProvider.ts";
1211

13-
const cyberProgram = (models: ReadonlyArray<ServerProviderModel>, model: string, value?: string) =>
14-
codexCyberAccessProgram(models, {
15-
instanceId: ProviderInstanceId.make("codex"),
16-
model,
17-
...(value === undefined ? {} : { options: [{ id: "cyberAccessProgram", value }] }),
18-
});
19-
2012
it("maps current Codex model capability fields", () => {
2113
const capabilities = mapCodexModelCapabilities({
2214
additionalSpeedTiers: [],
@@ -202,7 +194,7 @@ it("defaults cyber access to Standard when the catalog offers it", () => {
202194
assert.deepInclude(cyber(["daybreakBlue"]), { currentValue: "daybreakBlue" });
203195
});
204196

205-
it("resolves the cyber access program against the model's catalog entry", () => {
197+
it("finds the default cyber access program for a model", () => {
206198
const capabilities = mapCodexModelCapabilities({
207199
additionalSpeedTiers: [],
208200
availableAccessPrograms: { cyber: ["standard", "daybreakBlue"] },
@@ -216,12 +208,8 @@ it("resolves the cyber access program against the model's catalog entry", () =>
216208
supportedReasoningEfforts: [],
217209
});
218210
const models = [{ slug: "gpt-test", name: "GPT Test", isCustom: false, capabilities }];
219-
assert.strictEqual(cyberProgram(models, "gpt-test"), "standard");
220-
assert.strictEqual(cyberProgram(models, "gpt-test", "daybreakBlue"), "daybreakBlue");
221-
// A selection kept from another model, or a value the model does not offer.
222-
assert.strictEqual(cyberProgram(models, "gpt-test", "daybreakRed"), "standard");
223-
assert.strictEqual(cyberProgram(models, "gpt-test", "automatic"), "standard");
224-
assert.strictEqual(cyberProgram(models, "my-model", "daybreakBlue"), undefined);
211+
assert.strictEqual(codexDefaultCyberAccessProgram(models, "gpt-test"), "standard");
212+
assert.strictEqual(codexDefaultCyberAccessProgram(models, "my-model"), undefined);
225213
});
226214

227215
it("follows Codex's daybreak setting for the default program", () => {
@@ -257,15 +245,14 @@ it("follows Codex's daybreak setting for the default program", () => {
257245
daybreakEnabled: true,
258246
apiKeyProgramsDisabled: false,
259247
});
260-
assert.strictEqual(cyberProgram(on, "both"), "daybreakBlue");
261-
assert.strictEqual(cyberProgram(on, "standard"), "standard");
248+
assert.strictEqual(codexDefaultCyberAccessProgram(on, "both"), "daybreakBlue");
249+
assert.strictEqual(codexDefaultCyberAccessProgram(on, "standard"), "standard");
262250

263251
const disabled = applyConfiguredCodexCyberAccess(models, {
264252
daybreakEnabled: false,
265253
apiKeyProgramsDisabled: true,
266254
});
267-
assert.strictEqual(cyberProgram(disabled, "both"), undefined);
268-
assert.strictEqual(cyberProgram(disabled, "both", "daybreakBlue"), undefined);
255+
assert.strictEqual(codexDefaultCyberAccessProgram(disabled, "both"), undefined);
269256
});
270257

271258
it("treats an unread config as disabling API-key cyber access programs", () => {

‎apps/server/src/provider/CodexProvider.ts‎

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import type {
2323
ServerProvider,
2424
ServerProviderState,
2525
ModelCapabilities,
26-
ModelSelection,
2726
ProviderOptionDescriptor,
2827
ServerProviderModel,
2928
ServerProviderSkill,
@@ -37,7 +36,6 @@ import {
3736
} from "@t3tools/shared/model";
3837
import { resolveSpawnCommand } from "@t3tools/shared/shell";
3938
import { codexAppServerArgs, resolveCodexLaunchArgs } from "./codexLaunchArgs.ts";
40-
import { getCodexCyberAccessProgramOptionValue } from "../codexModelOptions.ts";
4139
import {
4240
buildServerProvider,
4341
COMPACT_SLASH_COMMAND,
@@ -349,22 +347,15 @@ export function applyConfiguredCodexCyberAccess(
349347
});
350348
}
351349

352-
/**
353-
* A selection the model does not offer, such as one kept from another model,
354-
* gets the model's default, as do older threads and agent-started turns.
355-
*/
356-
export function codexCyberAccessProgram(
350+
/** Applies when a selection names no program, such as older threads and agent-started turns. */
351+
export function codexDefaultCyberAccessProgram(
357352
models: ReadonlyArray<ServerProviderModel>,
358-
modelSelection: ModelSelection,
353+
slug: string,
359354
): string | undefined {
360-
const selected = getCodexCyberAccessProgramOptionValue(modelSelection);
361355
const descriptor = models
362-
.find((model) => model.slug === modelSelection.model)
356+
.find((model) => model.slug === slug)
363357
?.capabilities?.optionDescriptors?.find(({ id }) => id === "cyberAccessProgram");
364-
if (descriptor?.type !== "select") return undefined;
365-
return descriptor.options.some((option) => option.id === selected)
366-
? selected
367-
: descriptor.currentValue;
358+
return descriptor?.type === "select" ? descriptor.currentValue : undefined;
368359
}
369360

370361
/** An unread config may have them disabled, and Codex rejects a program it does not allow. */

‎apps/server/src/provider/Drivers/CodexDriver.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import {
2727
makePendingCodexProvider,
2828
probeCodexSkillsForCwd,
2929
withCodexAppServerClient,
30-
codexCyberAccessProgram,
30+
codexDefaultCyberAccessProgram,
3131
} from "../CodexProvider.ts";
3232
import { resolveCodexLaunchArgs } from "../codexLaunchArgs.ts";
3333
import { makeManagedServerProvider } from "@t3tools/provider-core/server/managedProvider";
@@ -215,9 +215,9 @@ export const CodexDriver: ProviderDriver<
215215
},
216216
{
217217
onUsageLimits: (update) => snapshot.applyUsageLimits(update),
218-
resolveCyberAccessProgram: (modelSelection) =>
218+
defaultCyberAccessProgram: (model) =>
219219
snapshot.getSnapshot.pipe(
220-
Effect.map((value) => codexCyberAccessProgram(value.models, modelSelection)),
220+
Effect.map((value) => codexDefaultCyberAccessProgram(value.models, model)),
221221
),
222222
compatibility: installation.compatibility,
223223
},

‎apps/server/src/provider/Drivers/CodexManagedProvider.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import {
2020
checkCodexProviderStatus,
2121
makePendingCodexProvider,
2222
probeCodexSkillsForCwd,
23-
codexCyberAccessProgram,
23+
codexDefaultCyberAccessProgram,
2424
} from "../CodexProvider.ts";
2525
import { makeManagedServerProvider } from "@t3tools/provider-core/server/managedProvider";
2626
import { mergeProviderInstanceEnvironment } from "@t3tools/provider-core/server/instanceEnvironment";
@@ -245,9 +245,9 @@ export const makeManagedCodexProvider = Effect.fn("makeManagedCodexProvider")(fu
245245
// already wraps openSession in withAccess, so resolve without re-entering it.
246246
const orchestrationAdapter = yield* createCodexAdapterV2(input, {
247247
onUsageLimits: (update) => snapshot.applyUsageLimits(update),
248-
resolveCyberAccessProgram: (modelSelection) =>
248+
defaultCyberAccessProgram: (model) =>
249249
snapshot.getSnapshot.pipe(
250-
Effect.map((value) => codexCyberAccessProgram(value.models, modelSelection)),
250+
Effect.map((value) => codexDefaultCyberAccessProgram(value.models, model)),
251251
),
252252
resolveRuntime: runtime.resolve,
253253
}).pipe(

0 commit comments

Comments
 (0)