Hide Codex costs from live provider identity not launch URL

/model updates providerName without rewriting baseURL, so a URL-only hide
was stale after API to Codex switches. Live Codex identity hides; a present
non-Codex identity shows; URL match remains the no-name fallback.

Author: TheGreatAxios

CHANGELOG.md

@@ -13,6 +13,14 @@ parallel copies under `docs/` or `scripts/notes/`. At cut time: rename
 
 ## [Unreleased]
 
+### Fixed
+
+- Codex ChatGPT subscription sessions no longer show a public-rate dollar
+  cost estimate. Hide follows the live provider identity after `/model`
+  switches, not the launch base URL. Context usage and `/cost` still work;
+  `/cost` reports the cost as covered by ChatGPT subscription. Metered
+  OpenAI API endpoints keep dollar estimates.
+
 ## [0.3.11] - 2026-08-31
 
 ### Changed
@@ -37,10 +45,6 @@ parallel copies under `docs/` or `scripts/notes/`. At cut time: rename
 
 ### Fixed
 
-- Codex ChatGPT subscription sessions no longer show a public-rate dollar
-  cost estimate. Context usage and `/cost` still work; `/cost` reports the
-  hide reason as ChatGPT subscription. Metered OpenAI API endpoints keep
-  dollar estimates.
 - Failed sessions with an `error` string in `run.json` are valid resume
   candidates, not corrupt files. A truly unreadable session id prints one
   recovery line; parse diagnostics go to the structured log, not the

src/cost/cost-summary.test.ts

@@ -1,6 +1,5 @@
 import { afterEach, describe, expect, it } from "bun:test";
 
-import { CODEX_BASE_URL } from "../auth/codex/constants.js";
 import { setModelContextWindows } from "../provider/context-window.js";
 import {
   buildCostSummary,
@@ -55,11 +54,12 @@ describe("buildCostSummary", () => {
     expect(summary.costHiddenReason).toBe("coding-plan");
   });
 
-  it("hides cost for a Codex ChatGPT subscription base URL", () => {
+  it("hides cost for a Codex ChatGPT subscription identity", () => {
     const summary = buildCostSummary({
       ...baseInput,
       modelId: "gpt-5.6-luna",
-      baseURL: CODEX_BASE_URL,
+      providerName: "codex/default",
+      baseURL: "https://api.openai.com/v1",
     });
     expect(summary.costHiddenReason).toBe("chatgpt-subscription");
   });
@@ -116,13 +116,15 @@ describe("formatStatusBarSegments", () => {
     const summary = buildCostSummary({
       ...baseInput,
       modelId: "gpt-5.6-luna",
-      baseURL: CODEX_BASE_URL,
+      providerName: "codex/default",
+      baseURL: "https://api.openai.com/v1",
       totalCost: 1.1897,
       formattedCost: "$1.1897",
     });
-    const segments = formatStatusBarSegments(summary);
-    expect(segments.costLabel).toBeUndefined();
-    expect(segments.contextLabel).toMatch(/^Ctx /);
+    expect(formatStatusBarSegments(summary)).toEqual({
+      contextLabel: "Ctx 16%",
+      contextPercentUsed: 16,
+    });
   });
 
   it("renders an unknown context window as --% rather than 0%", () => {
@@ -165,13 +167,21 @@ describe("formatCostCommandOutput", () => {
     expect(formatCostCommandOutput(summary)).toContain("Cost: hidden (coding-plan endpoint)");
   });
 
-  it("reports the reason cost is hidden for a ChatGPT subscription endpoint", () => {
+  it("reports ChatGPT subscription coverage instead of a hidden dollar figure", () => {
     const summary = buildCostSummary({
       ...baseInput,
       modelId: "gpt-5.6-luna",
-      baseURL: CODEX_BASE_URL,
+      providerName: "codex/default",
+      baseURL: "https://api.openai.com/v1",
     });
-    expect(formatCostCommandOutput(summary)).toContain("Cost: hidden (ChatGPT subscription)");
+    expect(formatCostCommandOutput(summary)).toBe(
+      [
+        "Model: gpt-5.6-luna",
+        "Cost: covered by ChatGPT subscription (not billed per token)",
+        "Tokens: 1000 in / 500 out / 200 cache-read",
+        "Context: 64000/400000 (16%)",
+      ].join("\n"),
+    );
   });
 
   it("reports the reason cost is hidden for a provider marked free", () => {

src/cost/cost-summary.ts

@@ -9,6 +9,7 @@ import type { PricingCache } from "./pricing-fetcher.js";
 export interface CostSummaryInput {
   modelId: string;
   baseURL?: string | undefined;
+  providerName?: string | undefined;
   providerFree?: boolean | undefined;
   pricingCache: PricingCache | null;
   totalCost: number;
@@ -45,6 +46,7 @@ export function buildCostSummary(input: CostSummaryInput): CostSummary {
     costHiddenReason: costHiddenReason({
       modelId: input.modelId,
       baseURL: input.baseURL,
+      providerName: input.providerName,
       providerFree: input.providerFree,
       pricingCache: input.pricingCache,
     }),
@@ -90,21 +92,24 @@ export function formatStatusBarSegments(summary: CostSummary): StatusBarCostSegm
   };
 }
 
-const HIDDEN_REASON_TEXT: Record<CostHiddenReason, string> = {
+const HIDDEN_REASON_TEXT: Record<Exclude<CostHiddenReason, "chatgpt-subscription">, string> = {
   "provider-free": "provider marked free",
   "coding-plan": "coding-plan endpoint",
-  "chatgpt-subscription": "ChatGPT subscription",
   "free-model": "free model",
   "zero-priced": "zero-priced in the pricing registry",
 };
 
 export function formatCostCommandOutput(summary: CostSummary): string {
   const window = summary.contextWindow > 0 ? String(summary.contextWindow) : "unknown";
-  const lines = [
-    `Model: ${summary.modelId}`,
+  const costLine =
     summary.costHiddenReason === null
       ? `Cost: ${summary.formattedCost}`
-      : `Cost: hidden (${HIDDEN_REASON_TEXT[summary.costHiddenReason]})`,
+      : summary.costHiddenReason === "chatgpt-subscription"
+        ? "Cost: covered by ChatGPT subscription (not billed per token)"
+        : `Cost: hidden (${HIDDEN_REASON_TEXT[summary.costHiddenReason]})`;
+  const lines = [
+    `Model: ${summary.modelId}`,
+    costLine,
     `Tokens: ${String(summary.inputTokens)} in / ${String(summary.outputTokens)} out / ${String(summary.cacheReadTokens)} cache-read`,
     `Context: ${String(summary.contextTokens)}/${window} (${formatContextPercentLabel(summary.contextPercentUsed, summary.contextIsEstimate)})`,
   ];

src/cost/cost-visibility.test.ts

@@ -80,12 +80,30 @@ describe("isChatGPTSubscriptionBaseURL", () => {
   it("does not match chatgpt.com outside the backend-api path", () => {
     expect(isChatGPTSubscriptionBaseURL("https://chatgpt.com/")).toBe(false);
     expect(isChatGPTSubscriptionBaseURL("https://chatgpt.com/backend")).toBe(false);
+    expect(isChatGPTSubscriptionBaseURL("https://chatgpt.com/backend-api-v2")).toBe(false);
   });
 
-  it("handles undefined and malformed URLs without over-matching", () => {
+  it("matches the backend-api path case-insensitively", () => {
+    expect(isChatGPTSubscriptionBaseURL("https://chatgpt.com/BACKEND-API")).toBe(true);
+    expect(isChatGPTSubscriptionBaseURL("https://chatgpt.com/Backend-Api/codex/responses")).toBe(
+      true,
+    );
+  });
+
+  it("matches query and hash via pathname, not as part of the path prefix", () => {
+    expect(isChatGPTSubscriptionBaseURL("https://chatgpt.com/backend-api?foo=1")).toBe(true);
+    expect(isChatGPTSubscriptionBaseURL("https://chatgpt.com/backend-api#section")).toBe(true);
+  });
+
+  it("does not match http against the https Codex origin", () => {
+    expect(isChatGPTSubscriptionBaseURL("http://chatgpt.com/backend-api")).toBe(false);
+  });
+
+  it("rejects undefined, unanchored substrings, and lookalike hosts", () => {
     expect(isChatGPTSubscriptionBaseURL(undefined)).toBe(false);
-    expect(isChatGPTSubscriptionBaseURL("not a url chatgpt.com/backend-api")).toBe(true);
-    expect(isChatGPTSubscriptionBaseURL("not a url chatgpt.com/")).toBe(false);
+    expect(isChatGPTSubscriptionBaseURL("not a url chatgpt.com/backend-api")).toBe(false);
+    expect(isChatGPTSubscriptionBaseURL("notchatgpt.com/backend-api")).toBe(false);
+    expect(isChatGPTSubscriptionBaseURL("chatgpt.com/backend-api")).toBe(true);
   });
 });
 
@@ -116,6 +134,28 @@ describe("costHiddenReason", () => {
     ).toBe("chatgpt-subscription");
   });
 
+  it("hides on live Codex provider identity even when baseURL is still the metered API", () => {
+    expect(
+      costHiddenReason({
+        modelId: "gpt-5.6-luna",
+        providerName: "codex/default",
+        baseURL: "https://api.openai.com/v1",
+        pricingCache,
+      }),
+    ).toBe("chatgpt-subscription");
+  });
+
+  it("shows cost on live non-Codex identity even when baseURL is still the ChatGPT backend", () => {
+    expect(
+      costHiddenReason({
+        modelId: "gpt-5.6-luna",
+        providerName: "openai",
+        baseURL: CODEX_BASE_URL,
+        pricingCache,
+      }),
+    ).toBeNull();
+  });
+
   it("hides for a free-named model", () => {
     expect(costHiddenReason({ modelId: "qwen3:free", pricingCache })).toBe("free-model");
   });
@@ -138,6 +178,7 @@ describe("costHiddenReason", () => {
     expect(
       costHiddenReason({
         modelId: "gpt-5.6-luna",
+        providerName: "openai",
         baseURL: "https://api.openai.com/v1",
         pricingCache,
       }),

src/cost/cost-visibility.ts

@@ -1,4 +1,5 @@
 import { CODEX_BASE_URL } from "../auth/codex/constants.js";
+import { isCodexProviderName } from "../config/codex-providers.js";
 import { lookupModelPricing, type PricingCache } from "./pricing-fetcher.js";
 
 // Free-model naming conventions: OpenRouter appends ":free", some gateways use
@@ -30,17 +31,21 @@ export function isCodingPlanBaseURL(baseURL: string | undefined): boolean {
 // not apply there, so dollar estimates must be suppressed. Matched against
 // the canonical Codex base (origin + path prefix) so api.openai.com stays
 // metered and a bare chatgpt.com host does not hide costs.
-const CHATGPT_SUBSCRIPTION_FALLBACK = /chatgpt\.com\/backend-api(\/|$)/i;
+const CODEX_BASE = new URL(CODEX_BASE_URL);
+const CODEX_ORIGIN = CODEX_BASE.origin;
+const CODEX_PATH = CODEX_BASE.pathname.replace(/\/$/, "").toLowerCase();
+// Host-anchored: a scheme or start of string must precede chatgpt.com so
+// notchatgpt.com/backend-api never matches. Query/hash after the path still
+// count. Unparseable noise that merely contains the substring does not.
+const CHATGPT_SUBSCRIPTION_FALLBACK = /(?:^|\/\/)chatgpt\.com\/backend-api(?:\/|$|\?|#)/i;
 
 export function isChatGPTSubscriptionBaseURL(baseURL: string | undefined): boolean {
   if (baseURL === undefined) return false;
   try {
     const url = new URL(baseURL);
-    const codex = new URL(CODEX_BASE_URL);
-    if (url.origin !== codex.origin) return false;
-    const basePath = codex.pathname.replace(/\/$/, "");
-    const path = url.pathname.replace(/\/$/, "") || "/";
-    return path === basePath || path.startsWith(`${basePath}/`);
+    if (url.origin !== CODEX_ORIGIN) return false;
+    const path = url.pathname.replace(/\/$/, "").toLowerCase() || "/";
+    return path === CODEX_PATH || path.startsWith(`${CODEX_PATH}/`);
   } catch {
     return CHATGPT_SUBSCRIPTION_FALLBACK.test(baseURL);
   }
@@ -54,6 +59,10 @@ export function isFreeModelByPricing(cache: PricingCache | null, modelId: string
 
 export interface CostVisibilityInput {
   baseURL?: string | undefined;
+  // Live /model identity. When set, it wins over a stale launch baseURL for
+  // the ChatGPT-subscription hide: Codex names hide even on api.openai.com,
+  // non-Codex names show even on CODEX_BASE_URL. Undefined falls back to URL.
+  providerName?: string | undefined;
   modelId: string;
   providerFree?: boolean | undefined;
   pricingCache: PricingCache | null;
@@ -62,15 +71,22 @@ export interface CostVisibilityInput {
 export type CostHiddenReason =
   "provider-free" | "coding-plan" | "chatgpt-subscription" | "free-model" | "zero-priced";
 
+function isChatGPTSubscriptionSession(input: CostVisibilityInput): boolean {
+  if (input.providerName !== undefined) {
+    return isCodexProviderName(input.providerName);
+  }
+  return isChatGPTSubscriptionBaseURL(input.baseURL);
+}
+
 // Non-null when the dollar cost should be suppressed: a manual provider
-// override, a coding-plan endpoint, a ChatGPT/Codex subscription endpoint, a
-// free-named model, or a model the pricing registry reports as zero-cost. The
-// reason is carried to the display so /cost can say which condition hid the
-// figure.
+// override, a coding-plan endpoint, a ChatGPT/Codex subscription (live
+// provider identity, else Codex URL), a free-named model, or a model the
+// pricing registry reports as zero-cost. The reason is carried to the
+// display so /cost can say which condition hid the figure.
 export function costHiddenReason(input: CostVisibilityInput): CostHiddenReason | null {
   if (input.providerFree === true) return "provider-free";
   if (isCodingPlanBaseURL(input.baseURL)) return "coding-plan";
-  if (isChatGPTSubscriptionBaseURL(input.baseURL)) return "chatgpt-subscription";
+  if (isChatGPTSubscriptionSession(input)) return "chatgpt-subscription";
   if (isFreeModelId(input.modelId)) return "free-model";
   return isFreeModelByPricing(input.pricingCache, input.modelId) ? "zero-priced" : null;
 }

src/tui/runner.ts

@@ -2086,6 +2086,7 @@ export async function runTUI(initialConfig: Config): Promise<number> {
         const summary = buildCostSummary({
           modelId: config.model,
           baseURL: config.baseURL,
+          providerName: config.providerName,
           pricingCache,
           totalCost,
           formattedCost: formatCost(totalCost),