Merge pull request #6 from gitcommit90/fix/oauth-model-high-labels

Fix ChatGPT Sol model effort label

Author: gitcommit90

README.md

@@ -98,7 +98,7 @@ ReRouted is an independent project and is not affiliated with or endorsed by any
 
 ### 1. Install
 
-[Download ReRouted 0.4.3 for Apple Silicon](https://github.com/gitcommit90/rerouted/releases/download/v0.4.3/ReRouted-0.4.3-arm64.dmg), open the DMG, and drag ReRouted to Applications.
+[Download ReRouted 0.4.4 for Apple Silicon](https://github.com/gitcommit90/rerouted/releases/download/v0.4.4/ReRouted-0.4.4-arm64.dmg), open the DMG, and drag ReRouted to Applications.
 
 ReRouted requires Apple Silicon and macOS 12 Monterey or newer.
 
@@ -204,7 +204,7 @@ The implementation is intentionally small: Electron, Node's built-in HTTP server
 
 ## Current release
 
-ReRouted `0.4.3` fixes compact usage metrics so billion and trillion totals display with `B` and `T` units instead of continuing to grow in millions. It includes the hardened OAuth callbacks and renderer lock boundaries, uncapped SQLite usage history, 60-second quota refreshes while the Quota page is open, masked account identities, and image inputs introduced in `0.4.2`. Public builds are Developer ID signed, notarized, stapled, and distributed through stable GitHub Releases with in-app updates. The public API is intentionally limited to health, model discovery, and chat completions; a published third-party client compatibility matrix is still forthcoming.
+ReRouted `0.4.4` removes the preselected High effort suffix from the ChatGPT OAuth Sol model. Sol now appears as `gpt-5.6-sol`, matching Terra and Luna, while reasoning effort remains controlled by each calling client. Existing accounts, routes, and temporary model locks migrate automatically from the old ID. Public builds are Developer ID signed, notarized, stapled, and distributed through stable GitHub Releases with in-app updates. The public API is intentionally limited to health, model discovery, and chat completions; a published third-party client compatibility matrix is still forthcoming.
 
 ReRouted is an independent personal project.
 

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "rerouted",
-  "version": "0.4.3",
+  "version": "0.4.4",
   "description": "A macOS menu-bar router for accounts, models, and automatic fallback.",
   "author": "gitcommit90",
   "homepage": "https://rerouted.dev",

package.json

@@ -49,7 +49,7 @@ const OAUTH = {
     },
     chatUrl: "https://chatgpt.com/backend-api/codex/responses",
     models: [
-      { id: "gpt-5.6-sol-high", name: "GPT 5.6 Sol (High)" },
+      { id: "gpt-5.6-sol", name: "GPT 5.6 Sol" },
       { id: "gpt-5.6-terra", name: "GPT 5.6 Terra" },
       { id: "gpt-5.6-luna", name: "GPT 5.6 Luna" },
       { id: "gpt-5.5", name: "GPT 5.5" },
@@ -134,7 +134,7 @@ const OAUTH = {
 // Catalog entries removed during config normalization. Only known defaults are
 // removed so user-added model IDs remain intact.
 const RETIRED_OAUTH_MODELS = {
-  chatgpt: ["gpt-5.3-codex"],
+  chatgpt: ["gpt-5.3-codex", "gpt-5.6-sol-high"],
   claude: [
     "claude-opus-4-6",
     "claude-sonnet-4-6",
@@ -145,6 +145,11 @@ const RETIRED_OAUTH_MODELS = {
   xai: ["grok-4", "grok-code-fast-1", "grok-3"],
 };
 
+// Keep persisted configurations and routes compatible with the old catalog ID.
+const OAUTH_MODEL_RENAMES = {
+  chatgpt: { "gpt-5.6-sol-high": "gpt-5.6-sol" },
+};
+
 const ONBOARDING_STEPS = [
   "permissions",
   "admin-password",
@@ -164,5 +169,6 @@ module.exports = {
   KEYED_PRESETS,
   OAUTH,
   RETIRED_OAUTH_MODELS,
+  OAUTH_MODEL_RENAMES,
   ONBOARDING_STEPS,
 };

src/lib/constants.js

@@ -3,7 +3,12 @@
 const fs = require("node:fs");
 const path = require("node:path");
 const { generateApiKey, generateId } = require("./password");
-const { DEFAULT_PORT, OAUTH, RETIRED_OAUTH_MODELS } = require("./constants");
+const {
+  DEFAULT_PORT,
+  OAUTH,
+  RETIRED_OAUTH_MODELS,
+  OAUTH_MODEL_RENAMES,
+} = require("./constants");
 const { ensureUniqueComboNames, providerRouteIds } = require("./combos");
 const { backfillTokenIdentity } = require("./oauth-identity");
 
@@ -105,7 +110,23 @@ function mergeOAuthCatalog(provider) {
   if (!isOAuthProvider(provider)) return;
   const family = canonicalProviderType(provider.type);
   const catalog = OAUTH[family]?.models || [];
-  const existing = new Map((provider.models || []).map((model) => [model.id, model]));
+  const renames = OAUTH_MODEL_RENAMES[family] || {};
+  const existing = new Map();
+  for (const model of provider.models || []) {
+    const renamedId = renames[model.id] || model.id;
+    const current = existing.get(renamedId);
+    existing.set(renamedId, {
+      ...(current || {}),
+      ...model,
+      id: renamedId,
+    });
+  }
+  for (const [from, to] of Object.entries(renames)) {
+    if (provider.modelLocks?.[from] && !provider.modelLocks[to]) {
+      provider.modelLocks[to] = provider.modelLocks[from];
+    }
+    delete provider.modelLocks?.[from];
+  }
   const catalogIds = new Set(catalog.map((model) => model.id));
   const retiredIds = new Set(RETIRED_OAUTH_MODELS[family] || []);
   provider.models = [
@@ -202,6 +223,15 @@ function migrate(cfg) {
   ensureOAuthAliases(cfg.providers, cfg.providerAliasCounters);
 
   if (!Array.isArray(cfg.combos)) cfg.combos = [];
+  const providerById = new Map((cfg.providers || []).map((provider) => [provider.id, provider]));
+  for (const combo of cfg.combos) {
+    for (const member of combo.members || []) {
+      const provider = providerById.get(member.providerId);
+      const family = canonicalProviderType(provider?.type);
+      const rename = OAUTH_MODEL_RENAMES[family]?.[member.model];
+      if (rename) member.model = rename;
+    }
+  }
   if (needsComboNameMigration) {
     ensureUniqueComboNames(cfg.combos, providerRouteIds(cfg.providers));
   }

src/lib/store.js

@@ -766,14 +766,15 @@ describe("format translation", () => {
   it("Codex Responses receives reasoning.effort from OpenAI and Responses clients", () => {
     const fromOpenAi = chatgpt.toResponsesBody(
       { messages: [{ role: "user", content: "hi" }], reasoning_effort: "high" },
-      "gpt-5.5",
+      "gpt-5.6-sol",
       true
     );
     const fromResponses = chatgpt.toResponsesBody(
       { messages: [{ role: "user", content: "hi" }], reasoning: { effort: "xhigh" } },
       "gpt-5.5",
       true
     );
+    assert.equal(fromOpenAi.model, "gpt-5.6-sol");
     assert.deepEqual(fromOpenAi.reasoning, { effort: "high", summary: "auto" });
     assert.deepEqual(fromResponses.reasoning, { effort: "xhigh", summary: "auto" });
   });
@@ -963,7 +964,18 @@ describe("requested OAuth model catalogs", () => {
   it("ships the requested ChatGPT, Claude, Antigravity, and Grok models", () => {
     assert.deepEqual(
       OAUTH.chatgpt.models.map((model) => model.id),
-      ["gpt-5.6-sol-high", "gpt-5.6-terra", "gpt-5.6-luna", "gpt-5.5", "gpt-5.4-mini", "gpt-5.4"]
+      [
+        "gpt-5.6-sol",
+        "gpt-5.6-terra",
+        "gpt-5.6-luna",
+        "gpt-5.5",
+        "gpt-5.4-mini",
+        "gpt-5.4",
+      ]
+    );
+    assert.deepEqual(
+      OAUTH.chatgpt.models.slice(0, 3).map((model) => model.name),
+      ["GPT 5.6 Sol", "GPT 5.6 Terra", "GPT 5.6 Luna"]
     );
     assert.deepEqual(
       OAUTH.claude.models.map((model) => model.id),
@@ -992,9 +1004,36 @@ describe("requested OAuth model catalogs", () => {
       combos: [],
     });
     const models = cfg.providers[0].models;
-    assert.ok(models.some((model) => model.id === "gpt-5.6-sol-high" && model.enabled));
+    assert.ok(models.some((model) => model.id === "gpt-5.6-sol" && model.enabled));
     assert.equal(models.find((model) => model.id === "gpt-5.4").enabled, false);
   });
+
+  it("renames the old Sol high catalog ID in providers and routes", () => {
+    const { migrate } = require("../src/lib/store");
+    const cfg = migrate({
+      providers: [
+        {
+          id: "prov_chatgpt",
+          type: "chatgpt",
+          models: [{ id: "gpt-5.6-sol-high", name: "GPT 5.6 Sol (High)", enabled: false }],
+          modelLocks: { "gpt-5.6-sol-high": { until: Date.now() + 60_000 } },
+        },
+      ],
+      combos: [
+        {
+          id: "coding",
+          name: "coding",
+          strategy: "fallback",
+          members: [{ providerId: "prov_chatgpt", model: "gpt-5.6-sol-high" }],
+        },
+      ],
+    });
+    const provider = cfg.providers[0];
+    assert.equal(provider.models.find((model) => model.id === "gpt-5.6-sol").enabled, false);
+    assert.equal(provider.models.some((model) => model.id === "gpt-5.6-sol-high"), false);
+    assert.ok(provider.modelLocks["gpt-5.6-sol"]);
+    assert.equal(cfg.combos[0].members[0].model, "gpt-5.6-sol");
+  });
 });
 
 describe("pkce", () => {