Merge pull request #128 from pylon-code/upstream/2026-08-28-codex-0150-plans

fix(codex): accept Codex 0.150 account plans

Author: rynfar

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

@@ -1,6 +1,12 @@
 import { assert, it } from "@effect/vitest";
 
-import { applyPreferredCodexDefaultModel, mapCodexModelCapabilities } from "./CodexProvider.ts";
+import * as CodexSchema from "effect-codex-app-server/schema";
+
+import {
+  applyPreferredCodexDefaultModel,
+  codexAccountAuthLabel,
+  mapCodexModelCapabilities,
+} from "./CodexProvider.ts";
 
 it("maps current Codex model capability fields", () => {
   const capabilities = mapCodexModelCapabilities({
@@ -144,3 +150,46 @@ it("ignores custom models that shadow a preferred slug", () => {
 
   assert.deepStrictEqual(models.find((model) => model.isDefault)?.slug, "gpt-5.4");
 });
+
+it("labels every account plan Codex can report", () => {
+  // The switch ends in `satisfies never`, so this table and the generated
+  // `PlanType` literals have to stay in step: adding a literal without a case
+  // fails typecheck, and reordering a case into the wrong group fails here.
+  const labels: ReadonlyArray<readonly [string, string]> = [
+    ["free", "ChatGPT Free Subscription"],
+    ["go", "ChatGPT Go Subscription"],
+    ["plus", "ChatGPT Plus Subscription"],
+    ["pro", "ChatGPT Pro 20x Subscription"],
+    ["prolite", "ChatGPT Pro 5x Subscription"],
+    ["team", "ChatGPT Team Subscription"],
+    ["self_serve_business_prolite", "ChatGPT Business Subscription"],
+    ["self_serve_business_usage_based", "ChatGPT Business Subscription"],
+    ["business", "ChatGPT Business Subscription"],
+    ["ent26", "ChatGPT Enterprise Subscription"],
+    ["enterprise_cbp_automation", "ChatGPT Enterprise Subscription"],
+    ["enterprise_cbp_usage_based", "ChatGPT Enterprise Subscription"],
+    ["enterprise", "ChatGPT Enterprise Subscription"],
+    ["edu", "ChatGPT Edu Subscription"],
+    ["edu_plus", "ChatGPT Edu Subscription"],
+    ["edu_pro", "ChatGPT Edu Subscription"],
+    ["unknown", "ChatGPT Subscription"],
+  ];
+
+  for (const [planType, expected] of labels) {
+    assert.strictEqual(
+      codexAccountAuthLabel({
+        email: "user@example.com",
+        planType: planType as CodexSchema.V2GetAccountResponse__PlanType,
+        type: "chatgpt",
+      }),
+      expected,
+    );
+  }
+});
+
+it("labels non-ChatGPT account types", () => {
+  assert.strictEqual(codexAccountAuthLabel({ type: "apiKey" }), "OpenAI API Key");
+  assert.strictEqual(codexAccountAuthLabel({ type: "amazonBedrock" }), "Amazon Bedrock");
+  assert.strictEqual(codexAccountAuthLabel(undefined), undefined);
+  assert.strictEqual(codexAccountAuthLabel(null), undefined);
+});

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

@@ -92,7 +92,7 @@ function reasoningEffortLabel(reasoningEffort: string): string {
   return REASONING_EFFORT_LABELS[reasoningEffort] ?? reasoningEffort;
 }
 
-function codexAccountAuthLabel(account: CodexSchema.V2GetAccountResponse["account"]) {
+export function codexAccountAuthLabel(account: CodexSchema.V2GetAccountResponse["account"]) {
   if (!account) return undefined;
   if (account.type === "apiKey") return "OpenAI API Key";
   if (account.type === "amazonBedrock") return "Amazon Bedrock";
@@ -111,13 +111,18 @@ function codexAccountAuthLabel(account: CodexSchema.V2GetAccountResponse["accoun
       return "ChatGPT Pro 5x Subscription";
     case "team":
       return "ChatGPT Team Subscription";
+    case "self_serve_business_prolite":
     case "self_serve_business_usage_based":
     case "business":
       return "ChatGPT Business Subscription";
+    case "ent26":
+    case "enterprise_cbp_automation":
     case "enterprise_cbp_usage_based":
     case "enterprise":
       return "ChatGPT Enterprise Subscription";
     case "edu":
+    case "edu_plus":
+    case "edu_pro":
       return "ChatGPT Edu Subscription";
     case "unknown":
       return "ChatGPT Subscription";

packages/effect-codex-app-server/scripts/generate.ts

@@ -145,8 +145,10 @@ const ManualSchemas: Record<string, Schema.Json> = {
   },
 };
 
-// Codex 0.150 added these multi-agent values before our next full protocol
-// refresh. Keep every generated response namespace compatible with them.
+// Enum values Codex 0.150 added before our next full protocol refresh, across
+// both the multi-agent and account surfaces. Each entry replaces the upstream
+// definition wholesale, so keep it a superset of the pinned ref and keep every
+// generated response namespace compatible with it.
 const Codex0150DefinitionSchemas: Record<string, Schema.Json> = {
   CollabAgentTool: {
     type: "string",
@@ -166,6 +168,28 @@ const Codex0150DefinitionSchemas: Record<string, Schema.Json> = {
     type: "string",
     enum: ["inProgress", "completed", "failed", "interrupted"],
   },
+  PlanType: {
+    type: "string",
+    enum: [
+      "free",
+      "go",
+      "plus",
+      "pro",
+      "prolite",
+      "team",
+      "self_serve_business_prolite",
+      "self_serve_business_usage_based",
+      "business",
+      "ent26",
+      "enterprise_cbp_automation",
+      "enterprise_cbp_usage_based",
+      "enterprise",
+      "edu",
+      "edu_plus",
+      "edu_pro",
+      "unknown",
+    ],
+  },
   SubAgentActivityKind: {
     type: "string",
     enum: ["started", "interacted", "interrupted", "completed"],

packages/effect-codex-app-server/src/_generated/schema.gen.ts

@@ -2411,11 +2411,16 @@ export type ServerNotification__PlanType =
   | "pro"
   | "prolite"
   | "team"
+  | "self_serve_business_prolite"
   | "self_serve_business_usage_based"
   | "business"
+  | "ent26"
+  | "enterprise_cbp_automation"
   | "enterprise_cbp_usage_based"
   | "enterprise"
   | "edu"
+  | "edu_plus"
+  | "edu_pro"
   | "unknown";
 export const ServerNotification__PlanType = Schema.Literals([
   "free",
@@ -2424,11 +2429,16 @@ export const ServerNotification__PlanType = Schema.Literals([
   "pro",
   "prolite",
   "team",
+  "self_serve_business_prolite",
   "self_serve_business_usage_based",
   "business",
+  "ent26",
+  "enterprise_cbp_automation",
   "enterprise_cbp_usage_based",
   "enterprise",
   "edu",
+  "edu_plus",
+  "edu_pro",
   "unknown",
 ]);
 
@@ -3248,11 +3258,16 @@ export type V2AccountRateLimitsUpdatedNotification__PlanType =
   | "pro"
   | "prolite"
   | "team"
+  | "self_serve_business_prolite"
   | "self_serve_business_usage_based"
   | "business"
+  | "ent26"
+  | "enterprise_cbp_automation"
   | "enterprise_cbp_usage_based"
   | "enterprise"
   | "edu"
+  | "edu_plus"
+  | "edu_pro"
   | "unknown";
 export const V2AccountRateLimitsUpdatedNotification__PlanType = Schema.Literals([
   "free",
@@ -3261,11 +3276,16 @@ export const V2AccountRateLimitsUpdatedNotification__PlanType = Schema.Literals(
   "pro",
   "prolite",
   "team",
+  "self_serve_business_prolite",
   "self_serve_business_usage_based",
   "business",
+  "ent26",
+  "enterprise_cbp_automation",
   "enterprise_cbp_usage_based",
   "enterprise",
   "edu",
+  "edu_plus",
+  "edu_pro",
   "unknown",
 ]);
 
@@ -3336,11 +3356,16 @@ export type V2AccountUpdatedNotification__PlanType =
   | "pro"
   | "prolite"
   | "team"
+  | "self_serve_business_prolite"
   | "self_serve_business_usage_based"
   | "business"
+  | "ent26"
+  | "enterprise_cbp_automation"
   | "enterprise_cbp_usage_based"
   | "enterprise"
   | "edu"
+  | "edu_plus"
+  | "edu_pro"
   | "unknown";
 export const V2AccountUpdatedNotification__PlanType = Schema.Literals([
   "free",
@@ -3349,11 +3374,16 @@ export const V2AccountUpdatedNotification__PlanType = Schema.Literals([
   "pro",
   "prolite",
   "team",
+  "self_serve_business_prolite",
   "self_serve_business_usage_based",
   "business",
+  "ent26",
+  "enterprise_cbp_automation",
   "enterprise_cbp_usage_based",
   "enterprise",
   "edu",
+  "edu_plus",
+  "edu_pro",
   "unknown",
 ]);
 
@@ -4140,11 +4170,16 @@ export type V2GetAccountRateLimitsResponse__PlanType =
   | "pro"
   | "prolite"
   | "team"
+  | "self_serve_business_prolite"
   | "self_serve_business_usage_based"
   | "business"
+  | "ent26"
+  | "enterprise_cbp_automation"
   | "enterprise_cbp_usage_based"
   | "enterprise"
   | "edu"
+  | "edu_plus"
+  | "edu_pro"
   | "unknown";
 export const V2GetAccountRateLimitsResponse__PlanType = Schema.Literals([
   "free",
@@ -4153,11 +4188,16 @@ export const V2GetAccountRateLimitsResponse__PlanType = Schema.Literals([
   "pro",
   "prolite",
   "team",
+  "self_serve_business_prolite",
   "self_serve_business_usage_based",
   "business",
+  "ent26",
+  "enterprise_cbp_automation",
   "enterprise_cbp_usage_based",
   "enterprise",
   "edu",
+  "edu_plus",
+  "edu_pro",
   "unknown",
 ]);
 
@@ -4228,11 +4268,16 @@ export type V2GetAccountResponse__PlanType =
   | "pro"
   | "prolite"
   | "team"
+  | "self_serve_business_prolite"
   | "self_serve_business_usage_based"
   | "business"
+  | "ent26"
+  | "enterprise_cbp_automation"
   | "enterprise_cbp_usage_based"
   | "enterprise"
   | "edu"
+  | "edu_plus"
+  | "edu_pro"
   | "unknown";
 export const V2GetAccountResponse__PlanType = Schema.Literals([
   "free",
@@ -4241,11 +4286,16 @@ export const V2GetAccountResponse__PlanType = Schema.Literals([
   "pro",
   "prolite",
   "team",
+  "self_serve_business_prolite",
   "self_serve_business_usage_based",
   "business",
+  "ent26",
+  "enterprise_cbp_automation",
   "enterprise_cbp_usage_based",
   "enterprise",
   "edu",
+  "edu_plus",
+  "edu_pro",
   "unknown",
 ]);
 

packages/effect-codex-app-server/src/schema.test.ts

@@ -3,6 +3,9 @@ import * as Schema from "effect/Schema";
 
 import * as CodexSchema from "./schema.ts";
 
+const isGetAccountResponse = Schema.is(CodexSchema.V2GetAccountResponse);
+const isAccountPlanType = Schema.is(CodexSchema.V2GetAccountResponse__PlanType);
+
 it("accepts Codex 0.150 multi-agent values", () => {
   const schemas = [
     CodexSchema.ServerNotification__SubAgentActivityKind,
@@ -71,3 +74,51 @@ it("accepts Codex 0.150 multi-agent values", () => {
 
   assert.equal(Schema.is(CodexSchema.V2ThreadResumeResponse)(resumeResponse), true);
 });
+
+it("accepts Codex 0.150 account plan values", () => {
+  const planTypes = [
+    "self_serve_business_prolite",
+    "ent26",
+    "enterprise_cbp_automation",
+    "edu_plus",
+    "edu_pro",
+  ];
+
+  // Every generated namespace that carries a plan, not just the one the account
+  // probe reads: `account/rateLimits/read` decodes through
+  // `V2GetAccountRateLimitsResponse`, and a namespace missed by a hand-edit to
+  // the generated schema would otherwise ship green.
+  const planTypeSchemas = [
+    CodexSchema.ServerNotification__PlanType,
+    CodexSchema.V2AccountRateLimitsUpdatedNotification__PlanType,
+    CodexSchema.V2AccountUpdatedNotification__PlanType,
+    CodexSchema.V2GetAccountRateLimitsResponse__PlanType,
+    CodexSchema.V2GetAccountResponse__PlanType,
+  ];
+
+  for (const planType of planTypes) {
+    for (const schema of planTypeSchemas) {
+      assert.equal(Schema.is(schema)(planType), true);
+    }
+
+    const accountResponse = {
+      account: {
+        email: "user@example.com",
+        planType,
+        type: "chatgpt",
+      },
+      requiresOpenaiAuth: true,
+    };
+
+    assert.equal(isGetAccountResponse(accountResponse), true);
+  }
+});
+
+it("rejects account plans Codex has not published yet", () => {
+  // Documents today's behaviour rather than endorsing it. `planType` is a closed
+  // literal on a required field and `account/read` is a bare `yield*`, so an
+  // unrecognized plan fails the whole Codex probe instead of degrading one
+  // label. Widening the decode is a separate decision; this test will fail
+  // loudly when that decision is made.
+  assert.equal(isAccountPlanType("plan_from_the_future"), false);
+});