Evenfire is an intelligence layer platform for running LLM agents that take real actions, on your infrastructure
TypeScript
refactor(control-api): parameterize subscription admin routes
Jose Gabriel Ramirez Encinas294d8f38c398
diff --git a/control-api/package-lock.json b/control-api/package-lock.jsonindex fa7611520..94148d62e 100644--- a/control-api/package-lock.json+++ b/control-api/package-lock.json@@ -1,12 +1,12 @@{"name": "clerum-control-api",- "version": "0.1.552",+ "version": "0.1.553","lockfileVersion": 3,"requires": true,"packages": {"": {"name": "clerum-control-api",- "version": "0.1.552",+ "version": "0.1.553","dependencies": {"@clerum/display-field": "file:../packages/display-field","@clerum/image-policy": "file:../packages/image-policy",diff --git a/control-api/package.json b/control-api/package.jsonindex 8211afaca..989dbe548 100644--- a/control-api/package.json+++ b/control-api/package.json@@ -1,6 +1,6 @@{"name": "clerum-control-api",- "version": "0.1.552",+ "version": "0.1.553","description": "Internal Clerum control plane REST API + UI for managing CRDs and secrets","main": "dist/main.js","engines": {diff --git a/control-api/src/routes/admin/codexSubscription.ts b/control-api/src/routes/admin/codexSubscription.tsindex 4c324e876..ba1340332 100644--- a/control-api/src/routes/admin/codexSubscription.ts+++ b/control-api/src/routes/admin/codexSubscription.ts@@ -1,4 +1,6 @@import { Router } from 'express'+import type { NextFunction, Request, Response } from 'express'+import { PROVIDER_AUTH_MODE, isLlmProviderId } from '@clerum/llm-providers'import { config } from '../../config.js'import { pool } from '../../db.js'import { asyncHandler } from '../../http/asyncHandler.js'@@ -57,7 +59,30 @@ import {import type { StaleModelWarning } from './staleModelWarning.js'const log = rootLogger.child({ module: 'admin-codex-subscription' })-const BASE = '/admin/llm/providers/codex-subscription'+export const SUBSCRIPTION_ADMIN_BASE = '/admin/llm/providers/:providerId'+const BASE = SUBSCRIPTION_ADMIN_BASE++export function mountSubscriptionAdminRoutes(+ router: Router,+ options: { providerId: string; enabled: () => boolean }+): void {+ router.use(SUBSCRIPTION_ADMIN_BASE, (req: Request, res: Response, next: NextFunction) => {+ const providerId = typeof req.params.providerId === 'string' ? req.params.providerId : ''+ if (!isLlmProviderId(providerId) || PROVIDER_AUTH_MODE[providerId] !== 'oauth-broker') {+ res.status(404).json({ error: 'not_found' })+ return+ }+ if (providerId !== options.providerId) {+ res.status(404).json({ error: 'not_found' })+ return+ }+ if (!options.enabled()) {+ res.status(404).json({ error: 'disabled' })+ return+ }+ next()+ })+}function dbClient() {return { query: (text: string, values?: unknown[]) => pool.query(text, values) }@@ -192,6 +217,10 @@ export function createAdminCodexSubscriptionRouter(gateway?: K8sGateway): Router {const router = Router()+ mountSubscriptionAdminRoutes(router, {+ providerId: 'codex-subscription',+ enabled: () => config.codexSubscriptionEnabled,+ })async function listHostsOrUnavailable(): Promise<HostRecord[] | null> {if (!gateway) return nulldiff --git a/control-api/test/routes.admin.codexSubscription.test.ts b/control-api/test/routes.admin.codexSubscription.test.tsindex f3ea9ab2e..d3933b441 100644--- a/control-api/test/routes.admin.codexSubscription.test.ts+++ b/control-api/test/routes.admin.codexSubscription.test.ts@@ -159,6 +159,32 @@ describe('admin Codex subscription routes', () => {vi.mocked(pool.query).mockReset()})+ it('returns 404 not_found for a static-credentials provider id', async () => {+ const res = await request(app).get('/admin/llm/providers/openai/connections')+ expect(res.status).toBe(404)+ expect(res.body).toEqual({ error: 'not_found' })+ assertNoLeak(res.body)+ })++ it('returns 404 not_found for an unknown provider id', async () => {+ const res = await request(app).get('/admin/llm/providers/not-a-provider/connections')+ expect(res.status).toBe(404)+ expect(res.body).toEqual({ error: 'not_found' })+ })++ it('returns 404 not_found for grok-subscription until that adapter is mounted', async () => {+ const res = await request(app).get('/admin/llm/providers/grok-subscription/connections')+ expect(res.status).toBe(404)+ expect(res.body).toEqual({ error: 'not_found' })+ })++ it('returns 404 disabled for the connections list when the Codex flag is off', async () => {+ config.codexSubscriptionEnabled = false+ const res = await request(app).get('/admin/llm/providers/codex-subscription/connections')+ expect(res.status).toBe(404)+ expect(res.body).toEqual({ error: 'disabled' })+ })+it('returns 404 while the feature flag is off', async () => {oauth.getConnection.mockRejectedValue(new CodexSubscriptionOAuthError('disabled', 'off'))const res = await request(app).get('/admin/llm/providers/codex-subscription/connection')diff --git a/mcp-host/package-lock.json b/mcp-host/package-lock.jsonindex 3e51a6eb4..a485c2635 100644--- a/mcp-host/package-lock.json+++ b/mcp-host/package-lock.json@@ -1,12 +1,12 @@{"name": "clerum-mcp-host",- "version": "0.1.330",+ "version": "0.1.331","lockfileVersion": 3,"requires": true,"packages": {"": {"name": "clerum-mcp-host",- "version": "0.1.330",+ "version": "0.1.331","license": "SEE LICENSE IN LICENSE","dependencies": {"@anthropic-ai/sdk": "^0.32.0",diff --git a/mcp-host/package.json b/mcp-host/package.jsonindex 856c5c2a1..75e24cbd9 100644--- a/mcp-host/package.json+++ b/mcp-host/package.json@@ -1,6 +1,6 @@{"name": "clerum-mcp-host",- "version": "0.1.330",+ "version": "0.1.331","description": "MCP Host - reads Host CRD and provides LLM access via OpenAI/Claude","main": "dist/main.js","engines": {diff --git a/mcp-host/src/pluginWorkloadSdk/promptBridge/controlApiClient.ts b/mcp-host/src/pluginWorkloadSdk/promptBridge/controlApiClient.tsindex 8c664e769..bb7884a40 100644--- a/mcp-host/src/pluginWorkloadSdk/promptBridge/controlApiClient.ts+++ b/mcp-host/src/pluginWorkloadSdk/promptBridge/controlApiClient.ts@@ -1,3 +1,4 @@+import { PROVIDER_AUTH_MODE, isLlmProviderId } from '@clerum/llm-providers'import { CircuitBreaker } from '../domain/circuitBreaker'import {PluginWorkloadError,@@ -18,6 +19,10 @@ import { readSdkOnlyCodexBinding } from '../sdkOnlyCodexBinding'* to provider_unavailable while open (resets after 60s without calls).*/+function isOauthBrokerProvider(provider: string): boolean {+ return isLlmProviderId(provider) && PROVIDER_AUTH_MODE[provider] === 'oauth-broker'+}+export interface ControlApiClientOptions {baseUrl: stringgetAccessToken: () => string@@ -632,7 +637,7 @@ export class PluginWorkloadSdkControlApiClient {true)}- const binding = expectedProvider === 'codex-subscription' ? readSdkOnlyCodexBinding() : null+ const binding = isOauthBrokerProvider(expectedProvider) ? readSdkOnlyCodexBinding() : nullconst reservationOnlyReady = capabilities.reservationOnlyOauthBroker === trueconst contractReady =capabilities.contractVersion === 3 && capabilities.supportedContractVersions.includes(3)@@ -654,7 +659,7 @@ export class PluginWorkloadSdkControlApiClient {capabilities.defaultCatalogRevision === binding.catalogRevision &&capabilities.defaultCredentialRevision === binding.credentialRevision)const codexBindingReady =- expectedProvider !== 'codex-subscription' ||+ !isOauthBrokerProvider(expectedProvider) ||(reservationOnlyReady &&contractReady &&binding !== null &&@@ -683,19 +688,19 @@ export class PluginWorkloadSdkControlApiClient {? 'policy_revoking': capabilities.policyState === 'disabled'? 'policy_disabled'- : expectedProvider === 'codex-subscription' && !codexBindingReady+ : isOauthBrokerProvider(expectedProvider) && !codexBindingReady? 'codex_execution_binding_missing': capabilities.v2Ready? 'bootstrap_target_mismatch': 'policy_not_ready'return {ready: true,- contractVersion: expectedProvider === 'codex-subscription' ? 3 : 2,+ contractVersion: isOauthBrokerProvider(expectedProvider) ? 3 : 2,provider: expectedProvider,model: expectedModel,policyReady,policyState: capabilities.policyState,- ...(expectedProvider === 'codex-subscription' ? { codexBindingReady } : {}),+ ...(isOauthBrokerProvider(expectedProvider) ? { codexBindingReady } : {}),...(policyReason ? { policyReason } : {}),...(capabilities.v2Ready &&capabilities.policyRevision >= 1 &&