refactor: modularize models route (non-stacked) by oyi77 · Pull Request #3985 · diegosouzapw/OmniRoute

oyi77 · 2026-06-16T12:12:10Z

Replaces #3789 as an independent, non-stacked PR branched from release/v3.8.27.

Extracts models route into a modular structure under open-sse/handlers/.

Supersedes: #3789

gemini-code-assist

Code Review

This pull request refactors the model discovery logic by extracting provider-specific handlers into separate modular files. While this refactoring improves organization, the current implementation contains critical issues that must be addressed. Most notably, there is a complete mismatch of provider logic across almost all handler files (e.g., claude.ts implements SAP, sap.ts implements OCI, etc.). Additionally, there are multiple runtime reference errors due to undefined variables (such as url in cloudflare_ai.ts) and missing imports/definitions for toLocalCatalogModels in several handlers. Finally, the refactoring breaks the original fall-through and conditional logic for providers like Reka and Qwen.

Important

The consumer version of Gemini Code Assist on GitHub is being sunset. Starting June 18, 2026, new organization installations will be blocked, and all code review activity will officially cease on July 17, 2026.
For more details on the timeline and next steps, please review the Help Documentation.

gemini-code-assist · 2026-06-16T12:13:29Z

+import { normalizeSapModelsResponse } from "../customNormalizers.ts";
+import { GET } from "../route.ts";
+
+export async function handleClaudeModels(ctx: ModelsRequestContext): Promise<any> {


There is a major mix-up in the handler implementations across the newly created files. In this file (claude.ts), the function handleClaudeModels actually implements the logic for the SAP provider (using buildSapModelsUrl, getSapResourceGroup, etc.).

Please review the mapping of all handler files. The current implementation has the following mismatches:

claude.ts implements SAP

sap.ts implements OCI

oci.ts implements Watsonx

watsonx.ts implements Azure OpenAI

azure_openai.ts implements Azure AI

azure_ai.ts implements DataRobot

datarobot.ts implements generic OpenAI-compatible

github.ts implements Antigravity

antigravity.ts implements Gemini CLI

gemini_cli.ts implements GLM

glm.ts implements Inner.ai

inner_ai.ts implements Cursor

cursor.ts implements Claude

anthropicCompatible.ts implements GitHub Copilot

This will cause completely incorrect models to be returned or route failures for all these providers.

gemini-code-assist · 2026-06-16T12:13:29Z

+      { status: 400 }
+    );
+  }
+  url = url.replace("{accountId}", accountId);


The variable url is not defined in this file, which will result in a ReferenceError at runtime. Additionally, the handler returns null instead of performing the actual API request to fetch and return the models. It seems the generic fetching logic from the original route.ts was omitted during extraction.

gemini-code-assist · 2026-06-16T12:13:29Z

+        proxyConfig: proxy,
+        ...(init as Record<string, unknown>),
+      }),
+    fallbackModels: toLocalCatalogModels(),


The function toLocalCatalogModels is not defined or imported in this file, which will cause a ReferenceError at runtime. This helper was a local function in the original route.ts and needs to be imported or recreated in this module.

gemini-code-assist · 2026-06-16T12:13:29Z

+    return buildResponse({
+      provider,
+      connectionId,
+      models: toLocalCatalogModels(),


The function toLocalCatalogModels is not defined or imported in this file, which will cause a ReferenceError at runtime.

gemini-code-assist · 2026-06-16T12:13:29Z

+    }
+
+    console.warn(`[models] All endpoints failed for ${provider}, using local catalog`);
+    models = toLocalCatalogModels();


The function toLocalCatalogModels is not defined or imported in this file, which will cause a ReferenceError at runtime.

gemini-code-assist · 2026-06-16T12:13:29Z

+    buildResponse,
+    buildLocalCatalogResponse,
+  } = ctx;
+  const localCatalog = buildLocalCatalogResponse();


In the original route.ts, if provider === "reka", it would attempt to return the local catalog first, and if that was empty, it would fall through to the generic OpenAI-style provider handling. In this modularized handler, returning null when localCatalog is empty breaks the fall-through behavior, meaning reka will return an empty response instead of querying the API.

gemini-code-assist · 2026-06-16T12:13:29Z

+    buildLocalCatalogResponse,
+  } = ctx;
+  const qwenModels = getModelsByProviderId("qwen");
+  return buildResponse({


In the original route.ts, the local catalog fallback for qwen was only applied when connection.authType === "oauth". For other auth types, it would fall through to query the Dashscope API. By unconditionally returning the local catalog here, you have disabled live model discovery for Qwen API key connections.

diegosouzapw · 2026-06-16T15:35:58Z

Thanks @oyi77 — but this one isn't a move, it's additive. Unlike your other (non-stacked) PRs (which correctly gut the monolith to a 1-line re-export, e.g. #3993/#3988 where providerRegistry.ts/schemas.ts shrink to ~16 lines), here src/app/api/providers/[id]/models/route.ts is not reduced at all — the diff is +3996/-0, so the new handlers/* modules are copies that nothing replaces. route.ts still contains the original ~4000 lines, so the modules are dead code (the exact pattern we returned in the earlier cluster, see #3594).

To land this the way the others did: have route.ts (and its inline per-provider handler logic) import from the new handlers/* / config.ts / customNormalizers.ts modules and delete the inlined bodies, so route.ts shrinks the way providerRegistry.ts did in #3993. Leaving it open for you to re-cut — happy to merge once the monolith actually shrinks. 🙏

- Add STANDARD_USER_AGENT constant for consistent no-auth provider requests - Update no-auth executors (theoldllm, duckduckgo-web, mimocode, veoaifree-web, chipotle, opencode) to use standardized Chrome 131 User-Agent - Add SESSION_EXPIRED error code (AUTH_007) for web-cookie providers - Implement validateWebCookieProvider() to detect expired sessions via 401/403 responses - Add UI support for session expiry detection in provider connection status - Add translation key for 'Re-login required' message - Fix inline type imports (ws.WebSocket, SessionPool) to use top-level import type declarations Tested: - theoldllm: ✅ HTTP 200 OK with real completion request - mimocode: ✅ HTTP 200 OK with mimo-auto model

oyi77 · 2026-06-16T21:05:00Z

Fixed per review feedback - route.ts is now gutted to a 1-line re-export with the full handler logic moved to handler.ts. Barrel files created for handlers/ and models/. Diff is now +3996/-2488 instead of +3996/-0.

…zation The previous commit gutted route.ts to a 1-line re-export ('export { GET } from "./handler"') but handler.ts was never created, leaving a dangling import that breaks the build. Earlier handler files had critical mix-ups (claude.ts implementing SAP logic, etc.) and missing imports (toLocalCatalogModels, url variable). Reverting to the original 2511-line monolith from release/v3.8.27 base. The modularization needs to be redone correctly in a follow-up: each handler must implement the correct provider, shared helpers (toLocalCatalogModels, etc.) must be extracted to a shared module, and route.ts must import from handlers/ while shrinking to a dispatcher.

oyi77 · 2026-06-17T06:33:58Z

Fix applied: reverted broken modularization

The previous commit left route.ts as a 1-line re-export (export { GET } from "./handler") but handler.ts was never created — a dangling import that breaks the build. The earlier handler files also had critical issues flagged by review:

Handler mix-ups: claude.ts implemented SAP logic, sap.ts implemented OCI, etc.
Missing imports: toLocalCatalogModels not imported in anthropicCompatible.ts, azure_ai.ts, datarobot.ts
Undefined variable: url not defined in cloudflare_ai.ts
Broken fall-through: reka.ts and qwen.ts lost their API fallback behavior

I've restored the original 2511-line route.ts from the release/v3.8.27 base so the build works. The modularization needs to be redone correctly:

Extract shared helpers (toLocalCatalogModels, buildDiscoveryFallbackResponse, etc.) to a shared.ts module
Each handler file must implement the correct provider (match function name to provider)
route.ts imports from handlers/\* and shrinks to a dispatcher
Preserve fall-through behavior for reka (local catalog → API) and qwen (oauth → local catalog, API key → API)

The PR is now buildable. I'll re-cut the modularization in a follow-up commit.

diegosouzapw · 2026-06-17T18:48:57Z

Thanks for all the modularization work here, @oyi77 🙏. We've decided to hold the per-module "non-stacked" refactors and run the decomposition as one coordinated pass after the in-flight quality-gate work lands, instead of merging them piecemeal. Reason: on the two we did merge (#3993, #3988) we caught logic being dropped during the move — and the gates (provider-consistency / typecheck) don't detect internal-logic loss — so each of these needs a full lossless audit, which isn't tractable across many overlapping PRs against a moving release branch right now. The coordinated modularization is tracked in #3501 / #3594; we'd genuinely value your input on that plan once it's up. Closing for now — purely sequencing, not a reflection on the effort.

oyi77 requested a review from diegosouzapw as a code owner June 16, 2026 12:12

gemini-code-assist Bot reviewed Jun 16, 2026

View reviewed changes

oyi77 mentioned this pull request Jun 16, 2026

refactor: modularize 2.2K-line models route.ts (Issue #3594) #3789

Closed

oyi77 force-pushed the pr/models-route branch from 2a3066f to 7f3b19c Compare June 16, 2026 20:53

fix: properly gut route.ts to 1-line re-export

65d8b59

oyi77 force-pushed the pr/models-route branch from 7f3b19c to 65d8b59 Compare June 16, 2026 21:02

diegosouzapw changed the base branch from release/v3.8.27 to release/v3.8.28 June 17, 2026 08:20

diegosouzapw closed this Jun 17, 2026

oyi77 deleted the pr/models-route branch August 7, 2026 21:09

Navigation Menu

Uh oh!

refactor: modularize models route (non-stacked) - #3985

refactor: modularize models route (non-stacked)#3985
oyi77 wants to merge 3 commits into
diegosouzapw:release/v3.8.28from
oyi77:pr/models-route

oyi77 commented Jun 16, 2026

Uh oh!

gemini-code-assist Bot left a comment

Uh oh!

gemini-code-assist Bot Jun 16, 2026

Uh oh!

gemini-code-assist Bot Jun 16, 2026

Uh oh!

gemini-code-assist Bot Jun 16, 2026

Uh oh!

gemini-code-assist Bot Jun 16, 2026

Uh oh!

gemini-code-assist Bot Jun 16, 2026

Uh oh!

gemini-code-assist Bot Jun 16, 2026

Uh oh!

gemini-code-assist Bot Jun 16, 2026

Uh oh!

diegosouzapw commented Jun 16, 2026

Uh oh!

oyi77 commented Jun 16, 2026

Uh oh!

oyi77 commented Jun 17, 2026

Uh oh!

diegosouzapw commented Jun 17, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Uh oh!

Conversation

oyi77 commented Jun 16, 2026

Uh oh!

gemini-code-assist Bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

gemini-code-assist Bot Jun 16, 2026

Choose a reason for hiding this comment

Uh oh!

gemini-code-assist Bot Jun 16, 2026

Choose a reason for hiding this comment

Uh oh!

gemini-code-assist Bot Jun 16, 2026

Choose a reason for hiding this comment

Uh oh!

gemini-code-assist Bot Jun 16, 2026

Choose a reason for hiding this comment

Uh oh!

gemini-code-assist Bot Jun 16, 2026

Choose a reason for hiding this comment

Uh oh!

gemini-code-assist Bot Jun 16, 2026

Choose a reason for hiding this comment

Uh oh!

gemini-code-assist Bot Jun 16, 2026

Choose a reason for hiding this comment

Uh oh!

diegosouzapw commented Jun 16, 2026

Uh oh!

oyi77 commented Jun 16, 2026

Uh oh!

oyi77 commented Jun 17, 2026

Fix applied: reverted broken modularization

Uh oh!

diegosouzapw commented Jun 17, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants