Skip to content

A desktop coding agent with free access to frontier models.

TypeScript

fix(models): every catalog model in the picker, names and summaries from the catalog

ogsamrata74097c52a2f
diff --git a/apps/app/src/app/constants.test.ts b/apps/app/src/app/constants.test.ts
index 6a5e47a3..dfa6d64c 100644
--- a/apps/app/src/app/constants.test.ts
+++ b/apps/app/src/app/constants.test.ts
@@ -25,8 +25,10 @@ describe("omnirush.ai extension catalog platform filter", () => {
});
test("recognises every omnirush.ai catalog model, not just the built-in ones", () => {
- expect([...BUILTIN_OMNIRUSH_MODEL_IDS]).toEqual(["gpt-6-astra", "gpt-6-sol", "gpt-5.6-sol"]);
+ expect([...BUILTIN_OMNIRUSH_MODEL_IDS]).toEqual(["gpt-6-astra", "gpt-6.1-sol", "gpt-6-sol"]);
expect(isOmniRushModelID("gpt-6-sol")).toEqual(true);
+ expect(isOmniRushModelID("gpt-6.1-sol")).toEqual(true);
+ expect(isOmniRushModelID("nova-9.0.1-preview")).toEqual(true);
expect(isOmniRushModelID("gpt-5.6-sol")).toEqual(true);
expect(isOmniRushModelID("GPT-6-Astra")).toEqual(true);
expect(isOmniRushModelID("meta-muse-spark")).toEqual(true);
diff --git a/apps/app/src/app/constants.ts b/apps/app/src/app/constants.ts
index ba68b307..5d2c9130 100644
--- a/apps/app/src/app/constants.ts
+++ b/apps/app/src/app/constants.ts
@@ -23,10 +23,11 @@ export const HIDE_TITLEBAR_PREF_KEY = "omnirush.hideTitlebar";
/**
* The models the engine serves before the account's catalog first syncs (and
- * offline); the first entry is the default. The catalog itself comes from the
- * server, so any other catalog model is just as valid.
+ * offline); the first entry is the default. Mirrors the server's
+ * builtinOmniRushModelCatalog (the backend's list at 2026-10-04). Only a
+ * fallback: the picker lists whatever the account's catalog lists.
*/
-export const BUILTIN_OMNIRUSH_MODEL_IDS = ["gpt-6-astra", "gpt-6-sol", "gpt-5.6-sol"] as const;
+export const BUILTIN_OMNIRUSH_MODEL_IDS = ["gpt-6-astra", "gpt-6.1-sol", "gpt-6-sol"] as const;
export const DEFAULT_MODEL: ModelRef = {
providerID: "omnirush",
diff --git a/apps/app/src/app/utils/index.ts b/apps/app/src/app/utils/index.ts
index aa342d05..0b56c7ff 100644
--- a/apps/app/src/app/utils/index.ts
+++ b/apps/app/src/app/utils/index.ts
@@ -122,15 +122,26 @@ export const FRIENDLY_MODEL_LABELS: [pattern: string, label: string][] = [
/**
* Resolve a friendly display name for a model ID.
- * Checks FRIENDLY_MODEL_LABELS first (substring match), then falls back
- * to humanizeModelLabel which title-cases the raw ID.
+ * An exact FRIENDLY_MODEL_LABELS id comes first; then the name the engine
+ * reports (for omnirush.ai models, the catalog's display_name), unless it is
+ * just the raw id; then a substring match of the table (so
+ * "gpt-4.1-2025-04-14" still hits "gpt-4.1"); then humanizeModelLabel, which
+ * title-cases the raw ID. A catalog model the table does not know (a new
+ * one, "gpt-6.1-sol" before it was added) therefore shows the catalog's name,
+ * never a shorter id it happens to contain.
*/
export function resolveModelDisplayName(modelID: string, reportedName?: string | null): string {
+ const id = modelID.trim().toLowerCase();
+ const exact = FRIENDLY_MODEL_LABELS.find(([pattern]) => pattern === id);
+ if (exact) return exact[1];
+ const trimmedReportedName = reportedName?.trim();
+ if (trimmedReportedName && trimmedReportedName.toLowerCase() !== id) {
+ return trimmedReportedName;
+ }
const normalized = `${modelID} ${reportedName ?? ""}`.trim().toLowerCase();
for (const [pattern, label] of FRIENDLY_MODEL_LABELS) {
if (normalized.includes(pattern)) return label;
}
- const trimmedReportedName = reportedName?.trim();
if (trimmedReportedName) return trimmedReportedName;
return humanizeModelLabel(modelID);
}
diff --git a/apps/app/tests/model-behavior.test.ts b/apps/app/tests/model-behavior.test.ts
index 893f9aff..0baa6f7a 100644
--- a/apps/app/tests/model-behavior.test.ts
+++ b/apps/app/tests/model-behavior.test.ts
@@ -165,6 +165,16 @@ describe("model behavior options", () => {
expect(resolveModelProviderDisplayName("omnirush", "muse-spark-1.3", "omnirush.ai")).toBe("omnirush.ai");
});
+ test("names a catalog model the app has never heard of by the catalog's display name", () => {
+ expect(resolveModelDisplayName("gpt-6.1-sol", "GPT 6.1 Sol")).toBe("GPT 6.1 Sol");
+ // A new id that contains a known one keeps its own catalog name.
+ expect(resolveModelDisplayName("gpt-6-sol-mini", "GPT 6 Sol Mini")).toBe("GPT 6 Sol Mini");
+ expect(resolveModelDisplayName("nova-9.0.1-preview", "Nova 9.0.1 Preview")).toBe("Nova 9.0.1 Preview");
+ // A reported name that is only the raw id is humanized as before.
+ expect(resolveModelDisplayName("nova-9.0.1-preview", "nova-9.0.1-preview")).toBe("nova-9.0.1-preview");
+ expect(resolveModelDisplayName("nova-9.0.1-preview")).toBe("Nova 9.0.1 Preview");
+ });
+
test("shows both omnirush.ai models under the omnirush.ai provider with their display names", () => {
expect(OMNIRUSH_MODELS.map((internal) => resolveModelDisplayName(internal.id, internal.name)))
.toEqual(["GPT 6 Astra", "GPT-5.6 Sol"]);
diff --git a/apps/app/tests/subagent-model-setting.test.ts b/apps/app/tests/subagent-model-setting.test.ts
index 7334b2fc..150a7a9e 100644
--- a/apps/app/tests/subagent-model-setting.test.ts
+++ b/apps/app/tests/subagent-model-setting.test.ts
@@ -28,8 +28,9 @@ describe("sub-agent model setting (app)", () => {
test("defaults new sessions to GPT-5.6 Sol", () => {
expect(DEFAULT_SUBAGENT_SETTING).toEqual({ model: "gpt-5.6-sol", effort: null });
});
- test("GPT 6 Sol is built in between Astra and GPT-5.6 Sol, with its display name", () => {
- expect([...BUILTIN_OMNIRUSH_MODEL_IDS]).toEqual(["gpt-6-astra", "gpt-6-sol", "gpt-5.6-sol"]);
+ test("the built-in fallback is the backend's list (GPT 6.1 Sol included), with display names", () => {
+ expect([...BUILTIN_OMNIRUSH_MODEL_IDS]).toEqual(["gpt-6-astra", "gpt-6.1-sol", "gpt-6-sol"]);
+ expect(resolveModelDisplayName("gpt-6.1-sol")).toBe("GPT 6.1 Sol");
expect(resolveModelDisplayName("gpt-6-sol")).toBe("GPT 6 Sol");
expect(resolveModelDisplayName("gpt-6-astra")).toBe("GPT 6 Astra");
expect(resolveModelDisplayName("gpt-5.6-sol")).toBe("GPT-5.6 Sol");
diff --git a/apps/server/src/__fixtures__/omnirush-model-catalog.json b/apps/server/src/__fixtures__/omnirush-model-catalog.json
index cccab7e7..e333391f 100644
--- a/apps/server/src/__fixtures__/omnirush-model-catalog.json
+++ b/apps/server/src/__fixtures__/omnirush-model-catalog.json
@@ -31,11 +31,11 @@
}
},
{
- "id": "gpt-6-sol",
+ "id": "gpt-6.1-sol",
"object": "model",
"created": 0,
"owned_by": "omnirush",
- "display_name": "GPT 6 Sol",
+ "display_name": "GPT 6.1 Sol",
"default": false,
"reasoning_levels": [
"low",
@@ -60,11 +60,11 @@
}
},
{
- "id": "gpt-5.6-sol",
+ "id": "gpt-6-sol",
"object": "model",
"created": 0,
"owned_by": "omnirush",
- "display_name": "GPT-5.6 Sol",
+ "display_name": "GPT 6 Sol",
"default": false,
"reasoning_levels": [
"low",
diff --git a/apps/server/src/__fixtures__/omnirush-model-catalog.ts b/apps/server/src/__fixtures__/omnirush-model-catalog.ts
index 4d69e229..4689fecd 100644
--- a/apps/server/src/__fixtures__/omnirush-model-catalog.ts
+++ b/apps/server/src/__fixtures__/omnirush-model-catalog.ts
@@ -23,7 +23,7 @@ export type BackendCatalogBody = { object: string; catalog_version: string; data
/**
* GET /omnirush/v1/models as the backend's catalog serves it to an account
* with Meta Muse on (rendered from the backend's own catalog code): Astra
- * (default), GPT 6 Sol and GPT-5.6 Sol, then meta-muse-spark, muse-spark-1.1 and muse-spark-1.3
+ * (default), GPT 6.1 Sol and GPT 6 Sol, then meta-muse-spark, muse-spark-1.1 and muse-spark-1.3
* (beta, text only). muse-spark-1.2 is unlisted. A fresh copy on every call.
*/
export function backendCatalogBody(): BackendCatalogBody {
diff --git a/apps/server/src/omnirush-gateway-broker.test.ts b/apps/server/src/omnirush-gateway-broker.test.ts
index 17dc1a3c..96bc2434 100644
--- a/apps/server/src/omnirush-gateway-broker.test.ts
+++ b/apps/server/src/omnirush-gateway-broker.test.ts
@@ -6,12 +6,14 @@ import { fileURLToPath } from "node:url";
import { OmniRushGatewayBroker, grantExhaustedCopy, guardEventStream, type GrantClock } from "./omnirush-gateway-broker.js";
import { OmniRushReasoningEffort } from "./opencode-plugins/omnirush-reasoning-effort.js";
+import { omnirushModelWantsReasoningSummary, sanitizeOmniRushModelCatalog } from "./omnirush-model-catalog.js";
import type { OmniRushGatewayCredentialBundle } from "./types.js";
type UpstreamCall = { body: Record<string, unknown>; headers: Headers };
-function capturingBroker(calls: UpstreamCall[]) {
+function capturingBroker(calls: UpstreamCall[], extra: Partial<ConstructorParameters<typeof OmniRushGatewayBroker>[0]> = {}) {
return new OmniRushGatewayBroker({
+ ...extra,
credentials: {
gatewayUrl: "https://gateway.example/omnirush/v1",
accessToken: "access-token",
@@ -253,6 +255,32 @@ describe("OmniRush gateway broker", () => {
]);
});
+ test("summaries follow the account's catalog: GPT 6.1 Sol and any new Codex-route model, never Muse", async () => {
+ // Without a catalog the built-in one decides: GPT 6.1 Sol is in it.
+ const builtinCalls: UpstreamCall[] = [];
+ await capturingBroker(builtinCalls).handle(gatewayRequest({ model: "gpt-6.1-sol", input: "x" }), "responses");
+ expect(builtinCalls.map((call) => call.body)).toEqual([{ model: "gpt-6.1-sol", input: "x", reasoning: { summary: "auto" } }]);
+
+ const catalog = sanitizeOmniRushModelCatalog({
+ data: [
+ { id: "gpt-6-astra", family: "OpenAI", default: true, reasoning_levels: ["low", "high", "xhigh", "max"] },
+ { id: "gpt-7.2-nova", family: "OpenAI", reasoning_levels: ["low", "high"] },
+ { id: "meta-muse-spark", family: "Meta Muse", reasoning_levels: ["minimal", "low"] },
+ ],
+ })!;
+ const calls: UpstreamCall[] = [];
+ const broker = capturingBroker(calls, { reasoningSummaryFor: (model) => omnirushModelWantsReasoningSummary(catalog, model) });
+ for (const model of ["gpt-7.2-nova", "meta-muse-spark", "gpt-6.1-sol"]) {
+ await broker.handle(gatewayRequest({ model, input: "x" }), "responses");
+ }
+ expect(calls.map((call) => call.body)).toEqual([
+ { model: "gpt-7.2-nova", input: "x", reasoning: { summary: "auto" } },
+ { model: "meta-muse-spark", input: "x" },
+ // Not in this account's catalog: left as the engine made it.
+ { model: "gpt-6.1-sol", input: "x" },
+ ]);
+ });
+
test("leaves compaction and malformed request bodies without a summary default", async () => {
const calls: UpstreamCall[] = [];
const broker = capturingBroker(calls);
diff --git a/apps/server/src/omnirush-gateway-broker.ts b/apps/server/src/omnirush-gateway-broker.ts
index a19ba2d3..ffc39fbc 100644
--- a/apps/server/src/omnirush-gateway-broker.ts
+++ b/apps/server/src/omnirush-gateway-broker.ts
@@ -10,9 +10,15 @@ import {
SUBAGENT_FALLBACK_MODEL_HEADER,
SUBAGENT_ROOT_SESSION_HEADER,
} from "./omnirush-swarm.js";
+import { builtinOmniRushModelCatalog, omnirushModelWantsReasoningSummary } from "./omnirush-model-catalog.js";
const TRACE_CAPABILITY_TTL_MS = 5 * 60_000;
+/** Without the account's catalog (a standalone broker): the built-in catalog decides. */
+function defaultReasoningSummaryFor(model: string): boolean {
+ return omnirushModelWantsReasoningSummary(builtinOmniRushModelCatalog(), model);
+}
+
/** A sub-agent request the gateway refused on the picked model and that was sent again on the main model. */
export type SubagentModelFallbackEvent = {
/** The sub-agent session (x-omnirush-session-id), when the request named it. */
@@ -53,6 +59,11 @@ type BrokerOptions = {
subagentRetryDelayMs?: number;
/** Whether a picked sub-agent model is in its refusal cooldown (sent straight to the main model). */
subagentModelRefused?: (model: string) => boolean;
+ /**
+ * Whether a Responses request for this model asks for reasoning summaries
+ * (the account's catalog decides; the built-in catalog when unset).
+ */
+ reasoningSummaryFor?: (model: string) => boolean | Promise<boolean>;
/** Hears the gateway's mandatory-update signals (see GatewayUpdateSignal). */
onUpdateSignal?: (signal: GatewayUpdateSignal) => void;
/**
@@ -717,18 +728,30 @@ function withReasoningEffort(body: ArrayBuffer, effort: string): ArrayBuffer | s
/**
* OpenCode currently opts into OpenAI summaries only for GPT-5 model IDs.
- * Ask for the summaries the transcript displays for our GPT-6 models too,
- * preserving any explicit summary option. Apply this at the final forwarding
- * boundary so sub-agent fallbacks use the destination model's options.
+ * Ask for the summaries the transcript displays for every catalog model that
+ * wants them (`wantsSummary`: the account's catalog decides, see
+ * omnirushModelWantsReasoningSummary), preserving any explicit summary
+ * option. Apply this at the final forwarding boundary so sub-agent fallbacks
+ * use the destination model's options.
*/
-function withReasoningSummary(body: ArrayBuffer | string): ArrayBuffer | string {
+async function withReasoningSummary(
+ body: ArrayBuffer | string,
+ wantsSummary: (model: string) => boolean | Promise<boolean>,
+): Promise<ArrayBuffer | string> {
let parsed: unknown;
try {
parsed = JSON.parse(typeof body === "string" ? body : new TextDecoder().decode(body));
} catch {
return body;
}
- if (!isRecord(parsed) || (parsed.model !== "gpt-6-astra" && parsed.model !== "gpt-6-sol")) return body;
+ if (!isRecord(parsed) || typeof parsed.model !== "string") return body;
+ let wanted = false;
+ try {
+ wanted = await wantsSummary(parsed.model);
+ } catch {
+ wanted = false;
+ }
+ if (!wanted) return body;
if (parsed.reasoning != null && !isRecord(parsed.reasoning)) return body;
const reasoning = isRecord(parsed.reasoning) ? parsed.reasoning : {};
if ("summary" in reasoning) return body;
@@ -901,6 +924,7 @@ export class OmniRushGatewayBroker {
private readonly subagentRetryDelayMs: number;
private readonly subagentModelRefused?: (model: string) => boolean;
private readonly onUpdateSignal?: (signal: GatewayUpdateSignal) => void;
+ private readonly reasoningSummaryFor: (model: string) => boolean | Promise<boolean>;
private readonly clientHeader: string | null;
private refreshInFlight: Promise<boolean> | null = null;
/** Whether the last failed refresh left the session as it was (unreachable, 5xx, contended). */
@@ -933,6 +957,7 @@ export class OmniRushGatewayBroker {
this.subagentRetryDelayMs = options.subagentRetryDelayMs ?? SUBAGENT_RETRY_DELAY_MS;
this.subagentModelRefused = options.subagentModelRefused;
this.onUpdateSignal = options.onUpdateSignal;
+ this.reasoningSummaryFor = options.reasoningSummaryFor ?? defaultReasoningSummaryFor;
}
/**
@@ -1357,7 +1382,9 @@ export class OmniRushGatewayBroker {
body: ArrayBuffer | string | undefined,
accessToken?: string,
): Promise<Response> {
- const forwardedBody = path === "responses" && body !== undefined ? withReasoningSummary(body) : body;
+ const forwardedBody = path === "responses" && body !== undefined
+ ? await withReasoningSummary(body, this.reasoningSummaryFor)
+ : body;
let failure: ReturnType<typeof fetchFailure> | null = null;
for (let attempt = 0; attempt <= UNREACHABLE_RETRY_DELAYS_MS.length; attempt += 1) {
if (attempt > 0) {
diff --git a/apps/server/src/omnirush-model-catalog-sync.test.ts b/apps/server/src/omnirush-model-catalog-sync.test.ts
index 59ce0836..7a85c2a9 100644
--- a/apps/server/src/omnirush-model-catalog-sync.test.ts
+++ b/apps/server/src/omnirush-model-catalog-sync.test.ts
@@ -113,10 +113,10 @@ function harness(config: ServerConfig, options: {
return Object.assign(record, { sync });
}
-const MUSE_IDS = ["gpt-6-astra", "gpt-6-sol", "gpt-5.6-sol", "meta-muse-spark", "muse-spark-1.1", "muse-spark-1.3"];
+const MUSE_IDS = ["gpt-6-astra", "gpt-6.1-sol", "gpt-6-sol", "meta-muse-spark", "muse-spark-1.1", "muse-spark-1.3"];
/** The engine config file is written with sorted keys. */
const MUSE_ENGINE_IDS = [...MUSE_IDS].sort();
-const BUILTIN_ENGINE_IDS = ["gpt-5.6-sol", "gpt-6-astra", "gpt-6-sol"];
+const BUILTIN_ENGINE_IDS = ["gpt-6-astra", "gpt-6-sol", "gpt-6.1-sol"];
describe("omnirush model catalog sync", () => {
test("a changed catalog is stored and ALWAYS reloads the engine, even when the config file already moved on", async () => {
diff --git a/apps/server/src/omnirush-model-catalog.test.ts b/apps/server/src/omnirush-model-catalog.test.ts
index 2888d49b..66febac5 100644
--- a/apps/server/src/omnirush-model-catalog.test.ts
+++ b/apps/server/src/omnirush-model-catalog.test.ts
@@ -10,6 +10,7 @@ import {
engineModelsFromCatalog,
omnirushDefaultModelId,
omnirushModelCatalogPath,
+ omnirushModelWantsReasoningSummary,
readOmniRushModelCatalog,
sanitizeOmniRushModelCatalog,
writeOmniRushModelCatalog,
@@ -60,7 +61,7 @@ function keyPaths(value: unknown, prefix = ""): string[] {
describe("omnirush model catalog sanitizer", () => {
test("reads the backend catalog: Astra first and default, Muse under its family with its own efforts", () => {
const catalog = sanitizeOmniRushModelCatalog(backendCatalogBody());
- expect(catalog?.map((model) => model.id)).toEqual(["gpt-6-astra", "gpt-6-sol", "gpt-5.6-sol", "meta-muse-spark", "muse-spark-1.1", "muse-spark-1.3"]);
+ expect(catalog?.map((model) => model.id)).toEqual(["gpt-6-astra", "gpt-6.1-sol", "gpt-6-sol", "meta-muse-spark", "muse-spark-1.1", "muse-spark-1.3"]);
expect(catalog && omnirushDefaultModelId(catalog)).toBe("gpt-6-astra");
expect(catalog?.filter((model) => model.default).map((model) => model.id)).toEqual(["gpt-6-astra"]);
expect(catalog?.[5]).toEqual({
@@ -75,7 +76,7 @@ describe("omnirush model catalog sanitizer", () => {
});
});
- test("Astra, GPT 6 Sol and GPT-5.6 Sol from the backend equal the built-in catalog, so a Muse-less account never reloads", () => {
+ test("Astra, GPT 6.1 Sol and GPT 6 Sol from the backend equal the built-in catalog, so a Muse-less account never reloads", () => {
const body = backendCatalogBody();
const openaiOnly = { ...body, data: body.data.slice(0, 3) };
const catalog = sanitizeOmniRushModelCatalog(openaiOnly);
@@ -152,27 +153,60 @@ describe("omnirush model catalog sanitizer", () => {
}]);
});
- test("an older backend's four fields give Astra and both Sols their v1.0.9 metadata", () => {
+ test("an older backend's four fields give Astra and both Sols the shared metadata", () => {
const catalog = sanitizeOmniRushModelCatalog({
object: "list",
data: [
{ id: "gpt-6-astra", display_name: "GPT 6 Astra", default: true, reasoning_levels: ["low", "high", "xhigh", "max"] },
+ { id: "gpt-6.1-sol", display_name: "GPT 6.1 Sol", default: false, reasoning_levels: ["low", "high", "xhigh", "max"] },
{ id: "gpt-6-sol", display_name: "GPT 6 Sol", default: false, reasoning_levels: ["low", "high", "xhigh", "max"] },
- { id: "gpt-5.6-sol", display_name: "GPT-5.6 Sol", default: false, reasoning_levels: ["low", "high", "xhigh", "max"] },
],
});
expect(catalog).toEqual(builtinOmniRushModelCatalog());
});
- test("the built-ins list Astra, GPT 6 Sol, GPT-5.6 Sol; a backend without GPT 6 Sol serves just the other two", () => {
+ test("the built-ins are only the fallback (the backend's list); the catalog decides what is served", () => {
expect(builtinOmniRushModelCatalog().map((model) => [model.id, model.display_name, model.default])).toEqual([
["gpt-6-astra", "GPT 6 Astra", true],
+ ["gpt-6.1-sol", "GPT 6.1 Sol", false],
["gpt-6-sol", "GPT 6 Sol", false],
- ["gpt-5.6-sol", "GPT-5.6 Sol", false],
]);
const body = backendCatalogBody();
- const catalog = sanitizeOmniRushModelCatalog({ ...body, data: body.data.filter((model) => model.id === "gpt-6-astra" || model.id === "gpt-5.6-sol") });
- expect(catalog).toEqual(builtinOmniRushModelCatalog().filter((model) => model.id !== "gpt-6-sol"));
+ const catalog = sanitizeOmniRushModelCatalog({ ...body, data: body.data.filter((model) => model.id === "gpt-6-astra" || model.id === "gpt-6-sol") });
+ expect(catalog).toEqual(builtinOmniRushModelCatalog().filter((model) => model.id !== "gpt-6.1-sol"));
+ });
+
+ test("takes any catalog model: an id with dots, an id never seen before, a new default", () => {
+ const catalog = sanitizeOmniRushModelCatalog({
+ object: "list",
+ data: [
+ { id: "gpt-6-astra", display_name: "GPT 6 Astra", default: false, family: "OpenAI", reasoning_levels: ["low", "high", "xhigh", "max"] },
+ { id: "nova-9.0.1-preview", display_name: "Nova 9.0.1 Preview", default: true, family: "Nova", reasoning_levels: ["low", "high"] },
+ { id: "gpt-6.1-sol", display_name: "GPT 6.1 Sol", default: false, family: "OpenAI", reasoning_levels: ["low", "high", "xhigh", "max"] },
+ ],
+ })!;
+ expect(catalog.map((model) => [model.id, model.display_name])).toEqual([
+ ["gpt-6-astra", "GPT 6 Astra"],
+ ["nova-9.0.1-preview", "Nova 9.0.1 Preview"],
+ ["gpt-6.1-sol", "GPT 6.1 Sol"],
+ ]);
+ expect(omnirushDefaultModelId(catalog)).toBe("nova-9.0.1-preview");
+ const engine = engineModelsFromCatalog(catalog);
+ expect(Object.keys(engine)).toEqual(["gpt-6-astra", "nova-9.0.1-preview", "gpt-6.1-sol"]);
+ expect(engine["gpt-6.1-sol"]?.name).toBe("GPT 6.1 Sol");
+ expect(engine["nova-9.0.1-preview"]?.family).toBe("Nova");
+ });
+
+ test("reasoning summaries follow the catalog: every Codex-route reasoning model, not a fixed pair of ids", () => {
+ const catalog = sanitizeOmniRushModelCatalog(backendCatalogBody())!;
+ expect(omnirushModelWantsReasoningSummary(catalog, "gpt-6-astra")).toBe(true);
+ expect(omnirushModelWantsReasoningSummary(catalog, "gpt-6.1-sol")).toBe(true);
+ expect(omnirushModelWantsReasoningSummary(catalog, "gpt-6-sol")).toBe(true);
+ expect(omnirushModelWantsReasoningSummary(catalog, "meta-muse-spark")).toBe(false);
+ expect(omnirushModelWantsReasoningSummary(catalog, "not-in-catalog")).toBe(false);
+ expect(omnirushModelWantsReasoningSummary(catalog, undefined)).toBe(false);
+ const withNew = sanitizeOmniRushModelCatalog({ data: [{ id: "gpt-7.2-nova", family: "OpenAI", reasoning_levels: ["low", "high"] }] })!;
+ expect(omnirushModelWantsReasoningSummary(withNew, "gpt-7.2-nova")).toBe(true);
});
test("keeps exactly one default, and at most 32 models", () => {
diff --git a/apps/server/src/omnirush-model-catalog.ts b/apps/server/src/omnirush-model-catalog.ts
index 6e98e21c..e5134304 100644
--- a/apps/server/src/omnirush-model-catalog.ts
+++ b/apps/server/src/omnirush-model-catalog.ts
@@ -9,8 +9,10 @@
* never point the engine anywhere but the local gateway broker.
*
* The last good catalog is kept at <runtimeStorageDir>/omnirush-model-catalog.json.
- * Without one (first run, offline, or a backend that fails) the engine gets
- * the built-in Astra, GPT 6 Sol and GPT-5.6 Sol (the v1.0.9 metadata).
+ * Every list the app shows (model picker, sub-agent models, names) comes from
+ * it; nothing filters by model id. Without one (first run, offline, or a
+ * backend that fails) the engine gets the built-in fallback: the backend's
+ * list at 2026-10-04 (GPT 6 Astra, GPT 6.1 Sol, GPT 6 Sol).
*/
import { mkdir, readFile, rm } from "node:fs/promises";
import { join } from "node:path";
@@ -79,14 +81,15 @@ function catalogModel(
}
/**
- * The Codex-route models before the first sync: Astra (the default), GPT 6
- * Sol and GPT-5.6 Sol, with the v1.0.9 metadata (same efforts as Astra).
+ * The fallback before the first sync (and when no catalog was ever stored):
+ * the backend's list at 2026-10-04, Astra the default, with the Codex-route
+ * metadata. Only a fallback: the synced catalog replaces it whole.
*/
export function builtinOmniRushModelCatalog(): OmniRushModelCatalog {
return [
catalogModel("gpt-6-astra", "GPT 6 Astra", PROVIDER_FAMILY, true),
+ catalogModel("gpt-6.1-sol", "GPT 6.1 Sol", PROVIDER_FAMILY, false),
catalogModel("gpt-6-sol", "GPT 6 Sol", PROVIDER_FAMILY, false),
- catalogModel("gpt-5.6-sol", "GPT-5.6 Sol", PROVIDER_FAMILY, false),
];
}
@@ -122,8 +125,8 @@ function sanitizeModel(raw: unknown): OmniRushCatalogModel | null {
// could never answer through it.
if (raw.api !== undefined && raw.api !== null && raw.api !== "responses") return null;
// An older backend lists only id, display_name, default and
- // reasoning_levels: known ids keep their built-in metadata, new ids get the
- // shared defaults.
+ // reasoning_levels: the rest gets the shared defaults (the Codex-route
+ // metadata). Any id is taken, dots included; none is special.
const fallback = builtinOmniRushModelCatalog().find((model) => model.id === id)
?? catalogModel(id, id, null, false);
const limits = isRecord(raw.limits) ? raw.limits : {};
@@ -241,3 +244,16 @@ export function engineModelsFromCatalog(catalog: OmniRushModelCatalog): Record<s
...(model.status === "beta" ? { status: "beta" } : {}),
}]));
}
+
+/**
+ * Whether the broker asks for reasoning summaries on a Responses request for
+ * `modelId`: a reasoning model of the catalog on the Codex route (the
+ * provider's own family; the engine opts in for GPT-5 ids only). Decided by
+ * the catalog, so a model added to it (gpt-6.1-sol) gets the summaries the
+ * transcript shows without a desktop release.
+ */
+export function omnirushModelWantsReasoningSummary(catalog: OmniRushModelCatalog, modelId: unknown): boolean {
+ if (typeof modelId !== "string") return false;
+ const model = catalog.find((entry) => entry.id === modelId);
+ return Boolean(model && model.capabilities.reasoning && (model.family ?? PROVIDER_FAMILY) === PROVIDER_FAMILY);
+}
diff --git a/apps/server/src/omnirush-runtime-config.test.ts b/apps/server/src/omnirush-runtime-config.test.ts
index 20ff7fc2..be79f49c 100644
--- a/apps/server/src/omnirush-runtime-config.test.ts
+++ b/apps/server/src/omnirush-runtime-config.test.ts
@@ -213,11 +213,11 @@ describe("omnirush runtime config file", () => {
.filter(([, options]) => options.disabled !== true)
.map(([key]) => key);
- expect(Object.keys(models)).toEqual(["gpt-6-astra", "gpt-6-sol", "gpt-5.6-sol"]);
+ expect(Object.keys(models)).toEqual(["gpt-6-astra", "gpt-6.1-sol", "gpt-6-sol"]);
expect(models["gpt-6-astra"]).toMatchObject({ name: "GPT 6 Astra", reasoning: true, tool_call: true, variants });
expect(models["gpt-6-sol"]).toMatchObject({ name: "GPT 6 Sol", reasoning: true, tool_call: true, variants });
- expect(models["gpt-5.6-sol"]).toMatchObject({ name: "GPT-5.6 Sol", reasoning: true, tool_call: true, variants });
- for (const id of ["gpt-6-astra", "gpt-6-sol", "gpt-5.6-sol"]) {
+ expect(models["gpt-6.1-sol"]).toMatchObject({ name: "GPT 6.1 Sol", reasoning: true, tool_call: true, variants });
+ for (const id of ["gpt-6-astra", "gpt-6.1-sol", "gpt-6-sol"]) {
expect(Object.keys(models[id]!.variants as object).sort()).toEqual(Object.keys(variants).sort());
expect(enabledVariants(models[id]!)).toEqual(["low", "high", "xhigh", "max"]);
}
@@ -635,7 +635,7 @@ function v109OmniRushProvider(baseURL: string) {
name: "omnirush.ai",
env: ["OMNIRUSH_ACCESS_TOKEN"],
options: { baseURL },
- models: { "gpt-6-astra": model("GPT 6 Astra"), "gpt-6-sol": model("GPT 6 Sol"), "gpt-5.6-sol": model("GPT-5.6 Sol") },
+ models: { "gpt-6-astra": model("GPT 6 Astra"), "gpt-6.1-sol": model("GPT 6.1 Sol"), "gpt-6-sol": model("GPT 6 Sol") },
};
}
@@ -703,7 +703,7 @@ describe("omnirush runtime config from the model catalog", () => {
};
expect(parsed.model).toBe("omnirush/gpt-6-astra");
- expect(Object.keys(models).sort()).toEqual(["gpt-5.6-sol", "gpt-6-astra", "gpt-6-sol", "meta-muse-spark", "muse-spark-1.1", "muse-spark-1.3"]);
+ expect(Object.keys(models).sort()).toEqual(["gpt-6-astra", "gpt-6-sol", "gpt-6.1-sol", "meta-muse-spark", "muse-spark-1.1", "muse-spark-1.3"]);
const { models: _v109Models, ...v109Plumbing } = v109OmniRushProvider("http://127.0.0.1:48123/omnirush-gateway/v1");
const { models: _models, ...plumbing } = provider;
expect(plumbing).toEqual(v109Plumbing);
diff --git a/apps/server/src/omnirush-subagent-model.routes.test.ts b/apps/server/src/omnirush-subagent-model.routes.test.ts
index 7b1299e9..d61c0df9 100644
--- a/apps/server/src/omnirush-subagent-model.routes.test.ts
+++ b/apps/server/src/omnirush-subagent-model.routes.test.ts
@@ -70,14 +70,21 @@ describe("sub-agent model routes", () => {
expect(initial.signedIn).toBe(true);
expect((initial.models as Array<{ id: string; name: string; efforts: string[] }>).map((model) => [model.id, model.name, model.efforts.join(",")])).toEqual([
["gpt-6-astra", "GPT 6 Astra", "low,high,xhigh,max"],
+ ["gpt-6.1-sol", "GPT 6.1 Sol", "low,high,xhigh,max"],
["gpt-6-sol", "GPT 6 Sol", "low,high,xhigh,max"],
- ["gpt-5.6-sol", "GPT-5.6 Sol", "low,high,xhigh,max"],
]);
- // A missing preference defaults to GPT-5.6 Sol while preserving the main effort.
- expect(await resolve({ sessionId: "ses_child", rootSessionId: "ses_main", inherited: main, main })).toEqual({
- model: { providerID: "omnirush", modelID: "gpt-5.6-sol" },
+ // A missing preference names GPT-5.6 Sol; a catalog that does not list it keeps the main model and effort.
+ expect(await resolve({ sessionId: "ses_child", rootSessionId: "ses_main", inherited: main, main })).toMatchObject({
+ model: { providerID: "omnirush", modelID: "gpt-6-astra" },
variant: "max",
- gatewayFallback: { model: "gpt-6-astra", effort: "max" },
+ fallback: { requested: "gpt-5.6-sol", used: "gpt-6-astra", reason: "not_in_catalog" },
+ });
+ // GPT 6.1 Sol, from the catalog, is a sub-agent model like any other.
+ await fetch(`${base}/omnirush/subagent-model`, { method: "PUT", headers: client, body: JSON.stringify({ model: "gpt-6.1-sol", effort: "xhigh" }) });
+ expect(await resolve({ sessionId: "ses_child", rootSessionId: "ses_main", inherited: main, main })).toEqual({
+ model: { providerID: "omnirush", modelID: "gpt-6.1-sol" },
+ variant: "xhigh",
+ gatewayFallback: { model: "gpt-6-astra", effort: "xhigh" },
});
const bad = await fetch(`${base}/omnirush/subagent-model`, { method: "PUT", headers: client, body: JSON.stringify({ model: "gpt-6-sol", effort: "turbo" }) });
diff --git a/apps/server/src/server.ts b/apps/server/src/server.ts
index 1265fd8e..8ca378cf 100644
--- a/apps/server/src/server.ts
+++ b/apps/server/src/server.ts
@@ -174,7 +174,7 @@ import {
writeOmniRushWorkspaceConfig,
} from "./omnirush-workspace-config-store.js";
import { buildOmniRushRuntimeConfigObject, omnirushGatewayConfigured, omnirushRuntimeConfigFilePath, writeOmniRushRuntimeConfigFile } from "./omnirush-runtime-config.js";
-import { readOmniRushModelCatalog } from "./omnirush-model-catalog.js";
+import { omnirushModelWantsReasoningSummary, readOmniRushModelCatalog } from "./omnirush-model-catalog.js";
import {
SUBAGENT_MODEL_FALLBACK_TRACE,
readSubagentModelSetting,
@@ -988,6 +988,9 @@ export async function startServer(config: ServerConfig): Promise<ServeResult> {
// the refused model for a while, and the session uploader records the model the
// sub-agent's messages really ran on.
subagentModelRefused: (model) => subagentModelRefusals(config).isRefused(model),
+ // Reasoning summaries for every reasoning model the account's catalog
+ // lists on the Codex route (not a hardcoded pair of ids).
+ reasoningSummaryFor: async (model) => omnirushModelWantsReasoningSummary(await readOmniRushModelCatalog(config), model),
// The desktop's update gate (banner, blocked view); session uploads and
// project archives go on whatever it says.
...(config.omnirushGatewayCredentials?.onUpdateSignal ? { onUpdateSignal: config.omnirushGatewayCredentials.onUpdateSignal } : {}),