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
22 changes: 19 additions & 3 deletions packages/shared/src/agent-models.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,12 @@ describe("SUPERSET_CHAT_MODELS", () => {
expect(ids).toContain("openai/gpt-5.6-terra");
expect(ids).toContain("openai/gpt-5.6-luna");
});

it("no longer offers the models Codex retired 2026-08-31", () => {
const ids = SUPERSET_CHAT_MODELS.map((model) => model.id);
expect(ids).not.toContain("openai/gpt-5.4");
expect(ids).not.toContain("openai/gpt-5.3-codex");
});
});

describe("getAgentModelSupport", () => {
Expand Down Expand Up @@ -142,8 +148,10 @@ describe("buildAgentModelArgs", () => {
const groupOf = (id: string) =>
models.find((model) => model.id === id)?.group;
expect(groupOf("gpt-5.6-sol")).toBe("Current");
expect(groupOf("gpt-5.4")).toBe("Retiring 2026-08-31");
expect(groupOf("gpt-5.3-codex")).toBe("Retiring 2026-08-31");
expect(groupOf("gpt-5.5")).toBe("Retiring 2026-10-14");
// Retired 2026-08-31 and gone from the live catalog since.
expect(groupOf("gpt-5.4")).toBeUndefined();
expect(groupOf("gpt-5.3-codex")).toBeUndefined();
});

it("passes a pinned legacy claude model through to the CLI flag", () => {
Expand Down Expand Up @@ -215,7 +223,7 @@ describe("buildAgentModelArgs", () => {
}
});

it("includes opus 5 and the GPT-5.6 models for the other CLIs", () => {
it("includes opus 5 and the current GPT models for the other CLIs", () => {
for (const model of [
"claude-opus-5-high",
"gpt-5.6-terra-medium",
Expand All @@ -228,6 +236,9 @@ describe("buildAgentModelArgs", () => {
}
for (const model of [
"anthropic/claude-opus-5",
"openai/gpt-6-astra",
"openai/gpt-6-sol",
"openai/gpt-6-luna",
"openai/gpt-5.6-sol",
"openai/gpt-5.6-terra",
"openai/gpt-5.6-luna",
Expand Down Expand Up @@ -260,6 +271,10 @@ describe("buildAgentModelArgs", () => {
"--model",
"openai-codex/gpt-5.6-sol",
]);
expect(buildAgentModelArgs("omp", "openai-codex/gpt-6-astra")).toEqual([
"--model",
"openai-codex/gpt-6-astra",
]);
});
});

Expand Down Expand Up @@ -413,6 +428,7 @@ describe("getAgentEfforts", () => {
"high",
"xhigh",
"max",
"ultra",
]);
expect(getAgentEfforts("codex", "gpt-6-sol").map((e) => e.id)).toEqual([
"low",
Expand Down
33 changes: 16 additions & 17 deletions packages/shared/src/agent-models.ts
Original file line number Diff line number Diff line change
Expand Up @@ -103,9 +103,6 @@ export const SUPERSET_CHAT_MODELS: readonly SupersetChatModel[] = [
},
{ id: "openai/gpt-5.6-luna", label: "GPT-5.6 Luna", provider: "OpenAI" },
{ id: "openai/gpt-5.5", label: "GPT-5.5", provider: "OpenAI" },
// Retiring from Codex on 2026-08-31; prefer the GPT-5.6 models above.
{ id: "openai/gpt-5.4", label: "GPT-5.4", provider: "OpenAI" },
{ id: "openai/gpt-5.3-codex", label: "GPT-5.3 Codex", provider: "OpenAI" },
];

const LATEST_GROUP = "Latest";
Expand All @@ -114,7 +111,7 @@ const CURSOR_ANTHROPIC_GROUP = "Anthropic";
const CURSOR_OPENAI_GROUP = "OpenAI";
const CURSOR_OTHER_GROUP = "Other";
const CURRENT_GROUP = "Current";
const CODEX_RETIRING_GROUP = "Retiring 2026-08-31";
const CODEX_RETIRING_GROUP = "Retiring 2026-10-14";

export const AGENT_MODEL_SUPPORT: readonly AgentModelSupport[] = [
{
Expand Down Expand Up @@ -154,15 +151,9 @@ export const AGENT_MODEL_SUPPORT: readonly AgentModelSupport[] = [
{ id: "gpt-5.6-sol", label: "GPT-5.6 Sol", group: CURRENT_GROUP },
{ id: "gpt-5.6-terra", label: "GPT-5.6 Terra", group: CURRENT_GROUP },
{ id: "gpt-5.6-luna", label: "GPT-5.6 Luna", group: CURRENT_GROUP },
{ id: "gpt-5.5", label: "GPT-5.5", group: CURRENT_GROUP },
// Superseded by gpt-5.6-terra/luna; the header dates the retirement
// Superseded by the GPT-6 family; the header dates the retirement
// so it reaches the person picking rather than only this file.
{ id: "gpt-5.4", label: "GPT-5.4", group: CODEX_RETIRING_GROUP },
{
id: "gpt-5.3-codex",
label: "GPT-5.3 Codex",
group: CODEX_RETIRING_GROUP,
},
{ id: "gpt-5.5", label: "GPT-5.5", group: CODEX_RETIRING_GROUP },
],
},
{
Expand Down Expand Up @@ -272,11 +263,15 @@ export const AGENT_MODEL_SUPPORT: readonly AgentModelSupport[] = [
// no longer lists the old `openai/gpt-5`. anthropic ids follow the
// same models.dev catalog but need an authed anthropic provider to
// appear in that listing; `claude-fable-5-1` was checked against
// models.dev directly (2026-09-01).
// models.dev directly (2026-09-01), the gpt-6 family likewise
// (2026-09-23).
{ id: "anthropic/claude-opus-5", label: "Claude Opus 5" },
{ id: "anthropic/claude-fable-5-1", label: "Claude Fable 5.1" },
{ id: "anthropic/claude-fable-5", label: "Claude Fable 5" },
{ id: "anthropic/claude-sonnet-4-5", label: "Claude Sonnet 4.5" },
{ id: "openai/gpt-6-astra", label: "GPT-6 Astra" },
{ id: "openai/gpt-6-sol", label: "GPT-6 Sol" },
{ id: "openai/gpt-6-luna", label: "GPT-6 Luna" },
{ id: "openai/gpt-5.6-sol", label: "GPT-5.6 Sol" },
{ id: "openai/gpt-5.6-terra", label: "GPT-5.6 Terra" },
{ id: "openai/gpt-5.6-luna", label: "GPT-5.6 Luna" },
Expand All @@ -289,7 +284,8 @@ export const AGENT_MODEL_SUPPORT: readonly AgentModelSupport[] = [
// OMP accepts configured role aliases as well as exact
// provider/model selectors. Exact ids verified against
// `omp models --json` in OMP 18.0.1; `claude-fable-5-1` against the
// catalog bundled in OMP 18.1.2.
// catalog bundled in OMP 18.1.2; the gpt-6 family against
// pi-catalog 18.2.11.
{ id: "@smol", label: "Configured fast model" },
{ id: "@slow", label: "Configured slow model" },
{ id: "@plan", label: "Configured plan model" },
Expand All @@ -300,6 +296,9 @@ export const AGENT_MODEL_SUPPORT: readonly AgentModelSupport[] = [
id: "anthropic/claude-sonnet-4-6",
label: "Claude Sonnet 4.6",
},
{ id: "openai-codex/gpt-6-astra", label: "GPT-6 Astra" },
{ id: "openai-codex/gpt-6-sol", label: "GPT-6 Sol" },
{ id: "openai-codex/gpt-6-luna", label: "GPT-6 Luna" },
{ id: "openai-codex/gpt-5.6-sol", label: "GPT-5.6 Sol" },
{ id: "openai-codex/gpt-5.6-terra", label: "GPT-5.6 Terra" },
{ id: "openai-codex/gpt-5.6-luna", label: "GPT-5.6 Luna" },
Expand Down Expand Up @@ -523,8 +522,8 @@ export const AGENT_EFFORT_SUPPORT: readonly AgentEffortSupport[] = [
{ id: "medium", label: "Medium" },
{ id: "high", label: "High" },
{ id: "xhigh", label: "xHigh" },
// Per-model support comes from Codex's live model catalog. GPT-6 Sol
// supports `ultra`; GPT-6 Luna supports up to `max`.
// Per-model support comes from Codex's live model catalog. GPT-6
// Astra and Sol support `ultra`; GPT-6 Luna supports up to `max`.
{
id: "max",
label: "Max",
Expand All @@ -540,7 +539,7 @@ export const AGENT_EFFORT_SUPPORT: readonly AgentEffortSupport[] = [
{
id: "ultra",
label: "Ultra",
models: ["gpt-6-sol", "gpt-5.6-sol", "gpt-5.6-terra"],
models: ["gpt-6-astra", "gpt-6-sol", "gpt-5.6-sol", "gpt-5.6-terra"],
},
],
},
Expand Down
Loading