Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 19 additions & 5 deletions apps/web/src/components/chat/TraitsPicker.test.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { describe, expect, it } from "vite-plus/test";
import type { ProviderOptionDescriptor } from "@t3tools/contracts";
import { ProviderDriverKind, type ProviderOptionDescriptor } from "@t3tools/contracts";
import { buildTraitsTriggerDisplay } from "./TraitsPicker";

function selectDescriptor(
id: string,
options: ReadonlyArray<{ id: string; label: string }>,
options: ReadonlyArray<{ id: string; label: string; isDefault?: boolean }>,
currentValue: string,
): Extract<ProviderOptionDescriptor, { type: "select" }> {
return { id, label: id, type: "select", options: [...options], currentValue };
Expand All @@ -17,7 +17,7 @@ function fastModeDescriptor(
}

const EFFORT = selectDescriptor(
"effort",
"reasoningEffort",
[
{ id: "high", label: "High" },
{ id: "max", label: "Max" },
Expand All @@ -33,10 +33,13 @@ const CONTEXT_WINDOW = selectDescriptor(
"1m",
);

const CODEX = ProviderDriverKind.make("codex");

function display(descriptors: ReadonlyArray<ProviderOptionDescriptor>, fastModeEnabled: boolean) {
return buildTraitsTriggerDisplay({
provider: CODEX,
descriptors,
primarySelectDescriptorId: "effort",
primarySelectDescriptorId: "reasoningEffort",
ultrathinkPromptControlled: false,
fastModeEnabled,
});
Expand All @@ -57,6 +60,16 @@ describe("buildTraitsTriggerDisplay", () => {
});
});

it("omits Codex's default Standard tier beside reasoning", () => {
const serviceTier = selectDescriptor(
"serviceTier",
[{ id: "default", label: "Standard", isDefault: true }],
"default",
);

expect(display([EFFORT, serviceTier], false).label).toBe("High");
});

it("keeps non-fastMode booleans as text labels", () => {
const thinking: Extract<ProviderOptionDescriptor, { type: "boolean" }> = {
id: "thinking",
Expand Down Expand Up @@ -100,8 +113,9 @@ describe("buildTraitsTriggerDisplay", () => {
it("still renders the prompt-controlled ultrathink label alongside the bolt", () => {
expect(
buildTraitsTriggerDisplay({
provider: CODEX,
descriptors: [EFFORT, fastModeDescriptor(true)],
primarySelectDescriptorId: "effort",
primarySelectDescriptorId: "reasoningEffort",
ultrathinkPromptControlled: true,
fastModeEnabled: true,
}),
Expand Down
14 changes: 14 additions & 0 deletions apps/web/src/components/chat/TraitsPicker.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -388,6 +388,7 @@ export const TraitsMenuContent = memo(function TraitsMenuContentImpl({
* chevron) would leave the trigger unreadable.
*/
export function buildTraitsTriggerDisplay(input: {
provider: ProviderDriverKind;
descriptors: ReadonlyArray<ProviderOptionDescriptor>;
primarySelectDescriptorId: string | null;
ultrathinkPromptControlled: boolean;
Expand All @@ -400,6 +401,18 @@ export function buildTraitsTriggerDisplay(input: {
hasFastMode = true;
continue;
}
if (
input.provider === "codex" &&
descriptor.id === "serviceTier" &&
descriptor.type === "select" &&
input.descriptors.some(({ id }) => id === "reasoningEffort")
) {
const currentValue = getProviderOptionCurrentValue(descriptor);
const currentOption = descriptor.options.find((option) => option.id === currentValue);
if (currentOption?.id === "default" && currentOption.isDefault === true) {
continue;
}
}
const label =
input.ultrathinkPromptControlled && descriptor.id === input.primarySelectDescriptorId
? "Ultrathink"
Expand Down Expand Up @@ -457,6 +470,7 @@ export const TraitsPicker = memo(function TraitsPicker({
}

const { label: triggerLabel, showFastModeIcon } = buildTraitsTriggerDisplay({
provider,
descriptors,
primarySelectDescriptorId: primarySelectDescriptor?.id ?? null,
ultrathinkPromptControlled,
Expand Down
Loading