@open-mercato/shared 0.6.1-develop.3188.1.499d530779 → 0.6.1-develop.3198.1.aa979623f0

package/dist/lib/ai/opencode-provider.js

@@ -1,4 +1,5 @@
 const OPEN_CODE_PROVIDER_IDS = ["anthropic", "openai", "google"];
+const DEFAULT_AI_PROVIDER_ID = "openai";
 const OPEN_CODE_PROVIDERS = {
   anthropic: {
     id: "anthropic",
@@ -10,7 +11,7 @@ const OPEN_CODE_PROVIDERS = {
     id: "openai",
     name: "OpenAI",
     envKeys: ["OPENAI_API_KEY", "OPENCODE_OPENAI_API_KEY"],
-    defaultModel: "gpt-4o-mini"
+    defaultModel: "gpt-5-mini"
   },
   google: {
     id: "google",
@@ -19,6 +20,16 @@ const OPEN_CODE_PROVIDERS = {
     defaultModel: "gemini-3-flash"
   }
 };
+function resolveAiProviderIdFromEnv(env = process.env, fallback = DEFAULT_AI_PROVIDER_ID) {
+  const candidates = [env.OM_AI_PROVIDER, env.OPENCODE_PROVIDER];
+  for (const candidate of candidates) {
+    const normalized = normalizeToken(candidate)?.toLowerCase();
+    if (normalized && isOpenCodeProviderId(normalized)) {
+      return normalized;
+    }
+  }
+  return fallback;
+}
 function normalizeToken(value) {
   if (typeof value !== "string") return null;
   const normalized = value.trim();
@@ -93,6 +104,7 @@ function isOpenCodeProviderConfigured(providerId, env = process.env) {
 function resolveOpenCodeModel(providerId, options) {
   const env = options?.env ?? process.env;
   const overrideModel = normalizeToken(options?.overrideModel);
+  const omAiModel = normalizeToken(env.OM_AI_MODEL);
   const opencodeModel = normalizeToken(env.OPENCODE_MODEL);
   let source = "default";
   let selectedModel = OPEN_CODE_PROVIDERS[providerId].defaultModel;
@@ -100,6 +112,10 @@ function resolveOpenCodeModel(providerId, options) {
     selectedModel = opencodeModel;
     source = "opencode_model";
   }
+  if (omAiModel) {
+    selectedModel = omAiModel;
+    source = "om_ai_model";
+  }
   if (overrideModel) {
     selectedModel = overrideModel;
     source = "override";
@@ -121,12 +137,14 @@ function resolveOpenCodeModel(providerId, options) {
   };
 }
 export {
+  DEFAULT_AI_PROVIDER_ID,
   OPEN_CODE_PROVIDERS,
   OPEN_CODE_PROVIDER_IDS,
   getOpenCodeProviderConfiguredEnvKey,
   isOpenCodeProviderConfigured,
   isOpenCodeProviderId,
   requireOpenCodeProviderApiKey,
+  resolveAiProviderIdFromEnv,
   resolveFirstConfiguredOpenCodeProvider,
   resolveOpenCodeModel,
   resolveOpenCodeProviderApiKey,

package/dist/lib/ai/opencode-provider.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/lib/ai/opencode-provider.ts"],
-  "sourcesContent": ["type EnvLookup = Record<string, string | undefined>\n\nexport type OpenCodeProviderId = 'anthropic' | 'openai' | 'google'\n\nexport type OpenCodeProviderDefinition = {\n  id: OpenCodeProviderId\n  name: string\n  envKeys: readonly string[]\n  defaultModel: string\n}\n\nexport const OPEN_CODE_PROVIDER_IDS = ['anthropic', 'openai', 'google'] as const\n\nexport const OPEN_CODE_PROVIDERS: Record<OpenCodeProviderId, OpenCodeProviderDefinition> = {\n  anthropic: {\n    id: 'anthropic',\n    name: 'Anthropic',\n    envKeys: ['ANTHROPIC_API_KEY', 'OPENCODE_ANTHROPIC_API_KEY'],\n    defaultModel: 'claude-haiku-4-5-20251001',\n  },\n  openai: {\n    id: 'openai',\n    name: 'OpenAI',\n    envKeys: ['OPENAI_API_KEY', 'OPENCODE_OPENAI_API_KEY'],\n    defaultModel: 'gpt-4o-mini',\n  },\n  google: {\n    id: 'google',\n    name: 'Google',\n    envKeys: ['GOOGLE_GENERATIVE_AI_API_KEY', 'OPENCODE_GOOGLE_API_KEY'],\n    defaultModel: 'gemini-3-flash',\n  },\n}\n\nexport type OpenCodeModelResolution = {\n  modelId: string\n  modelWithProvider: string\n  source: 'override' | 'opencode_model' | 'default'\n}\n\nfunction normalizeToken(value: string | null | undefined): string | null {\n  if (typeof value !== 'string') return null\n  const normalized = value.trim()\n  return normalized.length > 0 ? normalized : null\n}\n\nfunction parseModelToken(token: string): { providerPrefix: string | null; modelId: string } {\n  const slashIndex = token.indexOf('/')\n  if (slashIndex <= 0) {\n    return {\n      providerPrefix: null,\n      modelId: token,\n    }\n  }\n\n  return {\n    providerPrefix: token.slice(0, slashIndex).trim().toLowerCase(),\n    modelId: token.slice(slashIndex + 1).trim(),\n  }\n}\n\nexport function isOpenCodeProviderId(value: string): value is OpenCodeProviderId {\n  return (OPEN_CODE_PROVIDER_IDS as readonly string[]).includes(value)\n}\n\nexport function resolveOpenCodeProviderId(\n  providerId: string | null | undefined,\n  fallback: OpenCodeProviderId = 'anthropic',\n): OpenCodeProviderId {\n  const normalized = normalizeToken(providerId)?.toLowerCase()\n  if (normalized && isOpenCodeProviderId(normalized)) {\n    return normalized\n  }\n\n  return fallback\n}\n\nexport function resolveFirstConfiguredOpenCodeProvider(\n  options?: {\n    env?: EnvLookup\n    order?: readonly OpenCodeProviderId[]\n  },\n): OpenCodeProviderId | null {\n  const env = options?.env ?? process.env\n  const order = options?.order ?? OPEN_CODE_PROVIDER_IDS\n\n  for (const providerId of order) {\n    if (isOpenCodeProviderConfigured(providerId, env)) {\n      return providerId\n    }\n  }\n\n  return null\n}\n\nexport function resolveOpenCodeProviderApiKey(\n  providerId: OpenCodeProviderId,\n  env: EnvLookup = process.env,\n): string | null {\n  const provider = OPEN_CODE_PROVIDERS[providerId]\n  for (const key of provider.envKeys) {\n    const value = normalizeToken(env[key])\n    if (value) {\n      return value\n    }\n  }\n\n  return null\n}\n\nexport function requireOpenCodeProviderApiKey(\n  providerId: OpenCodeProviderId,\n  env: EnvLookup = process.env,\n): string {\n  const apiKey = resolveOpenCodeProviderApiKey(providerId, env)\n  if (apiKey) {\n    return apiKey\n  }\n\n  const provider = OPEN_CODE_PROVIDERS[providerId]\n  const envKeysHint = provider.envKeys.join(' or ')\n  throw new Error(\n    `Missing API key for provider \"${providerId}\". Set ${envKeysHint} in your .env file.`,\n  )\n}\n\nexport function getOpenCodeProviderConfiguredEnvKey(\n  providerId: OpenCodeProviderId,\n  env: EnvLookup = process.env,\n): string {\n  const provider = OPEN_CODE_PROVIDERS[providerId]\n  for (const key of provider.envKeys) {\n    if (normalizeToken(env[key])) {\n      return key\n    }\n  }\n\n  return provider.envKeys[0]\n}\n\nexport function isOpenCodeProviderConfigured(\n  providerId: OpenCodeProviderId,\n  env: EnvLookup = process.env,\n): boolean {\n  return resolveOpenCodeProviderApiKey(providerId, env) !== null\n}\n\nexport function resolveOpenCodeModel(\n  providerId: OpenCodeProviderId,\n  options?: {\n    overrideModel?: string | null | undefined\n    env?: EnvLookup\n  },\n): OpenCodeModelResolution {\n  const env = options?.env ?? process.env\n  const overrideModel = normalizeToken(options?.overrideModel)\n  const opencodeModel = normalizeToken(env.OPENCODE_MODEL)\n\n  let source: OpenCodeModelResolution['source'] = 'default'\n  let selectedModel = OPEN_CODE_PROVIDERS[providerId].defaultModel\n\n  if (opencodeModel) {\n    selectedModel = opencodeModel\n    source = 'opencode_model'\n  }\n\n  if (overrideModel) {\n    selectedModel = overrideModel\n    source = 'override'\n  }\n\n  const parsed = parseModelToken(selectedModel)\n  if (parsed.providerPrefix && parsed.providerPrefix !== providerId) {\n    throw new Error(\n      `Model \"${selectedModel}\" does not match configured provider \"${providerId}\"`,\n    )\n  }\n\n  const modelId = normalizeToken(parsed.modelId)\n  if (!modelId) {\n    throw new Error(`Model \"${selectedModel}\" is invalid`)\n  }\n\n  return {\n    modelId,\n    modelWithProvider: `${providerId}/${modelId}`,\n    source,\n  }\n}\n"],
-  "mappings": "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",
+  "sourcesContent": ["type EnvLookup = Record<string, string | undefined>\n\nexport type OpenCodeProviderId = 'anthropic' | 'openai' | 'google'\n\nexport type OpenCodeProviderDefinition = {\n  id: OpenCodeProviderId\n  name: string\n  envKeys: readonly string[]\n  defaultModel: string\n}\n\nexport const OPEN_CODE_PROVIDER_IDS = ['anthropic', 'openai', 'google'] as const\n\n/**\n * Default provider id used by the unified AI framework when neither\n * `OM_AI_PROVIDER` nor the legacy `OPENCODE_PROVIDER` is set. The default\n * targets OpenAI + `gpt-5-mini` (see {@link OPEN_CODE_PROVIDERS.openai}).\n */\nexport const DEFAULT_AI_PROVIDER_ID: OpenCodeProviderId = 'openai'\n\nexport const OPEN_CODE_PROVIDERS: Record<OpenCodeProviderId, OpenCodeProviderDefinition> = {\n  anthropic: {\n    id: 'anthropic',\n    name: 'Anthropic',\n    envKeys: ['ANTHROPIC_API_KEY', 'OPENCODE_ANTHROPIC_API_KEY'],\n    defaultModel: 'claude-haiku-4-5-20251001',\n  },\n  openai: {\n    id: 'openai',\n    name: 'OpenAI',\n    envKeys: ['OPENAI_API_KEY', 'OPENCODE_OPENAI_API_KEY'],\n    defaultModel: 'gpt-5-mini',\n  },\n  google: {\n    id: 'google',\n    name: 'Google',\n    envKeys: ['GOOGLE_GENERATIVE_AI_API_KEY', 'OPENCODE_GOOGLE_API_KEY'],\n    defaultModel: 'gemini-3-flash',\n  },\n}\n\nexport type OpenCodeModelResolution = {\n  modelId: string\n  modelWithProvider: string\n  source: 'override' | 'om_ai_model' | 'opencode_model' | 'default'\n}\n\n/**\n * Resolves the requested AI provider id from the unified env vars.\n *\n * Precedence (highest first):\n *   1. `OM_AI_PROVIDER` \u2014 new canonical variable for the unified AI module.\n *   2. `OPENCODE_PROVIDER` \u2014 legacy variable, kept for backward compatibility.\n *   3. {@link DEFAULT_AI_PROVIDER_ID} (currently `openai`).\n *\n * Unknown / empty values fall through to the next tier so a typo in\n * `OM_AI_PROVIDER` does not silently disable the legacy fallback.\n */\nexport function resolveAiProviderIdFromEnv(\n  env: EnvLookup = process.env,\n  fallback: OpenCodeProviderId = DEFAULT_AI_PROVIDER_ID,\n): OpenCodeProviderId {\n  const candidates = [env.OM_AI_PROVIDER, env.OPENCODE_PROVIDER]\n  for (const candidate of candidates) {\n    const normalized = normalizeToken(candidate)?.toLowerCase()\n    if (normalized && isOpenCodeProviderId(normalized)) {\n      return normalized\n    }\n  }\n  return fallback\n}\n\nfunction normalizeToken(value: string | null | undefined): string | null {\n  if (typeof value !== 'string') return null\n  const normalized = value.trim()\n  return normalized.length > 0 ? normalized : null\n}\n\nfunction parseModelToken(token: string): { providerPrefix: string | null; modelId: string } {\n  const slashIndex = token.indexOf('/')\n  if (slashIndex <= 0) {\n    return {\n      providerPrefix: null,\n      modelId: token,\n    }\n  }\n\n  return {\n    providerPrefix: token.slice(0, slashIndex).trim().toLowerCase(),\n    modelId: token.slice(slashIndex + 1).trim(),\n  }\n}\n\nexport function isOpenCodeProviderId(value: string): value is OpenCodeProviderId {\n  return (OPEN_CODE_PROVIDER_IDS as readonly string[]).includes(value)\n}\n\nexport function resolveOpenCodeProviderId(\n  providerId: string | null | undefined,\n  fallback: OpenCodeProviderId = 'anthropic',\n): OpenCodeProviderId {\n  const normalized = normalizeToken(providerId)?.toLowerCase()\n  if (normalized && isOpenCodeProviderId(normalized)) {\n    return normalized\n  }\n\n  return fallback\n}\n\nexport function resolveFirstConfiguredOpenCodeProvider(\n  options?: {\n    env?: EnvLookup\n    order?: readonly OpenCodeProviderId[]\n  },\n): OpenCodeProviderId | null {\n  const env = options?.env ?? process.env\n  const order = options?.order ?? OPEN_CODE_PROVIDER_IDS\n\n  for (const providerId of order) {\n    if (isOpenCodeProviderConfigured(providerId, env)) {\n      return providerId\n    }\n  }\n\n  return null\n}\n\nexport function resolveOpenCodeProviderApiKey(\n  providerId: OpenCodeProviderId,\n  env: EnvLookup = process.env,\n): string | null {\n  const provider = OPEN_CODE_PROVIDERS[providerId]\n  for (const key of provider.envKeys) {\n    const value = normalizeToken(env[key])\n    if (value) {\n      return value\n    }\n  }\n\n  return null\n}\n\nexport function requireOpenCodeProviderApiKey(\n  providerId: OpenCodeProviderId,\n  env: EnvLookup = process.env,\n): string {\n  const apiKey = resolveOpenCodeProviderApiKey(providerId, env)\n  if (apiKey) {\n    return apiKey\n  }\n\n  const provider = OPEN_CODE_PROVIDERS[providerId]\n  const envKeysHint = provider.envKeys.join(' or ')\n  throw new Error(\n    `Missing API key for provider \"${providerId}\". Set ${envKeysHint} in your .env file.`,\n  )\n}\n\nexport function getOpenCodeProviderConfiguredEnvKey(\n  providerId: OpenCodeProviderId,\n  env: EnvLookup = process.env,\n): string {\n  const provider = OPEN_CODE_PROVIDERS[providerId]\n  for (const key of provider.envKeys) {\n    if (normalizeToken(env[key])) {\n      return key\n    }\n  }\n\n  return provider.envKeys[0]\n}\n\nexport function isOpenCodeProviderConfigured(\n  providerId: OpenCodeProviderId,\n  env: EnvLookup = process.env,\n): boolean {\n  return resolveOpenCodeProviderApiKey(providerId, env) !== null\n}\n\nexport function resolveOpenCodeModel(\n  providerId: OpenCodeProviderId,\n  options?: {\n    overrideModel?: string | null | undefined\n    env?: EnvLookup\n  },\n): OpenCodeModelResolution {\n  const env = options?.env ?? process.env\n  const overrideModel = normalizeToken(options?.overrideModel)\n  const omAiModel = normalizeToken(env.OM_AI_MODEL)\n  const opencodeModel = normalizeToken(env.OPENCODE_MODEL)\n\n  let source: OpenCodeModelResolution['source'] = 'default'\n  let selectedModel = OPEN_CODE_PROVIDERS[providerId].defaultModel\n\n  if (opencodeModel) {\n    selectedModel = opencodeModel\n    source = 'opencode_model'\n  }\n\n  if (omAiModel) {\n    selectedModel = omAiModel\n    source = 'om_ai_model'\n  }\n\n  if (overrideModel) {\n    selectedModel = overrideModel\n    source = 'override'\n  }\n\n  const parsed = parseModelToken(selectedModel)\n  if (parsed.providerPrefix && parsed.providerPrefix !== providerId) {\n    throw new Error(\n      `Model \"${selectedModel}\" does not match configured provider \"${providerId}\"`,\n    )\n  }\n\n  const modelId = normalizeToken(parsed.modelId)\n  if (!modelId) {\n    throw new Error(`Model \"${selectedModel}\" is invalid`)\n  }\n\n  return {\n    modelId,\n    modelWithProvider: `${providerId}/${modelId}`,\n    source,\n  }\n}\n"],
+  "mappings": "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",
   "names": []
 }

package/dist/lib/version.js

@@ -1,4 +1,4 @@
-const APP_VERSION = "0.6.1-develop.3188.1.499d530779";
+const APP_VERSION = "0.6.1-develop.3198.1.aa979623f0";
 const appVersion = APP_VERSION;
 export {
   APP_VERSION,

package/dist/lib/version.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/lib/version.ts"],
-  "sourcesContent": ["// Build-time generated version\nexport const APP_VERSION = '0.6.1-develop.3188.1.499d530779'\nexport const appVersion = APP_VERSION\n"],
+  "sourcesContent": ["// Build-time generated version\nexport const APP_VERSION = '0.6.1-develop.3198.1.aa979623f0'\nexport const appVersion = APP_VERSION\n"],
   "mappings": "AACO,MAAM,cAAc;AACpB,MAAM,aAAa;",
   "names": []
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-mercato/shared",
-  "version": "0.6.1-develop.3188.1.499d530779",
+  "version": "0.6.1-develop.3198.1.aa979623f0",
   "type": "module",
   "main": "./dist/index.js",
   "scripts": {
@@ -92,7 +92,7 @@
     "@mikro-orm/core": "^7.0.14",
     "@mikro-orm/decorators": "^7.0.14",
     "@mikro-orm/postgresql": "^7.0.14",
-    "@open-mercato/cache": "0.6.1-develop.3188.1.499d530779",
+    "@open-mercato/cache": "0.6.1-develop.3198.1.aa979623f0",
     "dotenv": "^17.4.2",
     "rate-limiter-flexible": "^11.0.1",
     "reflect-metadata": "^0.2.2",

package/src/lib/ai/__tests__/opencode-provider.test.ts

@@ -1,4 +1,5 @@
 import {
+  resolveAiProviderIdFromEnv,
   resolveOpenCodeProviderId,
   resolveFirstConfiguredOpenCodeProvider,
   resolveOpenCodeModel,
@@ -47,8 +48,8 @@ describe('opencode provider helpers', () => {
   it('resolves default model when no overrides are set', () => {
     const model = resolveOpenCodeModel('openai', { env: {} })
     expect(model).toEqual({
-      modelId: 'gpt-4o-mini',
-      modelWithProvider: 'openai/gpt-4o-mini',
+      modelId: 'gpt-5-mini',
+      modelWithProvider: 'openai/gpt-5-mini',
       source: 'default',
     })
   })
@@ -64,11 +65,36 @@ describe('opencode provider helpers', () => {
     })
   })
 
-  it('prefers explicit override model over OPENCODE_MODEL', () => {
+  it('prefers OM_AI_MODEL over the legacy OPENCODE_MODEL', () => {
+    const model = resolveOpenCodeModel('openai', {
+      env: {
+        OM_AI_MODEL: 'openai/gpt-5-mini',
+        OPENCODE_MODEL: 'openai/gpt-4.1-mini',
+      },
+    })
+    expect(model).toEqual({
+      modelId: 'gpt-5-mini',
+      modelWithProvider: 'openai/gpt-5-mini',
+      source: 'om_ai_model',
+    })
+  })
+
+  it('falls back to OPENCODE_MODEL when OM_AI_MODEL is unset', () => {
     const model = resolveOpenCodeModel('openai', {
-      overrideModel: 'gpt-4.1',
       env: { OPENCODE_MODEL: 'openai/gpt-4.1-mini' },
     })
+    expect(model.source).toBe('opencode_model')
+    expect(model.modelId).toBe('gpt-4.1-mini')
+  })
+
+  it('prefers explicit override model over OM_AI_MODEL and OPENCODE_MODEL', () => {
+    const model = resolveOpenCodeModel('openai', {
+      overrideModel: 'gpt-4.1',
+      env: {
+        OM_AI_MODEL: 'openai/gpt-5-mini',
+        OPENCODE_MODEL: 'openai/gpt-4.1-mini',
+      },
+    })
     expect(model).toEqual({
       modelId: 'gpt-4.1',
       modelWithProvider: 'openai/gpt-4.1',
@@ -76,6 +102,40 @@ describe('opencode provider helpers', () => {
     })
   })
 
+  describe('resolveAiProviderIdFromEnv', () => {
+    it('returns OM_AI_PROVIDER when set', () => {
+      expect(resolveAiProviderIdFromEnv({ OM_AI_PROVIDER: 'anthropic' })).toBe('anthropic')
+    })
+
+    it('falls back to OPENCODE_PROVIDER when OM_AI_PROVIDER is unset', () => {
+      expect(
+        resolveAiProviderIdFromEnv({ OPENCODE_PROVIDER: 'google' }),
+      ).toBe('google')
+    })
+
+    it('prefers OM_AI_PROVIDER over OPENCODE_PROVIDER', () => {
+      expect(
+        resolveAiProviderIdFromEnv({
+          OM_AI_PROVIDER: 'openai',
+          OPENCODE_PROVIDER: 'anthropic',
+        }),
+      ).toBe('openai')
+    })
+
+    it('skips unknown values and falls through to the legacy var', () => {
+      expect(
+        resolveAiProviderIdFromEnv({
+          OM_AI_PROVIDER: 'pirate',
+          OPENCODE_PROVIDER: 'google',
+        }),
+      ).toBe('google')
+    })
+
+    it('defaults to openai when neither var is set', () => {
+      expect(resolveAiProviderIdFromEnv({})).toBe('openai')
+    })
+  })
+
   it('throws when model provider prefix conflicts with selected provider', () => {
     expect(() =>
       resolveOpenCodeModel('openai', {

package/src/lib/ai/opencode-provider.ts

@@ -11,6 +11,13 @@ export type OpenCodeProviderDefinition = {
 
 export const OPEN_CODE_PROVIDER_IDS = ['anthropic', 'openai', 'google'] as const
 
+/**
+ * Default provider id used by the unified AI framework when neither
+ * `OM_AI_PROVIDER` nor the legacy `OPENCODE_PROVIDER` is set. The default
+ * targets OpenAI + `gpt-5-mini` (see {@link OPEN_CODE_PROVIDERS.openai}).
+ */
+export const DEFAULT_AI_PROVIDER_ID: OpenCodeProviderId = 'openai'
+
 export const OPEN_CODE_PROVIDERS: Record<OpenCodeProviderId, OpenCodeProviderDefinition> = {
   anthropic: {
     id: 'anthropic',
@@ -22,7 +29,7 @@ export const OPEN_CODE_PROVIDERS: Record<OpenCodeProviderId, OpenCodeProviderDef
     id: 'openai',
     name: 'OpenAI',
     envKeys: ['OPENAI_API_KEY', 'OPENCODE_OPENAI_API_KEY'],
-    defaultModel: 'gpt-4o-mini',
+    defaultModel: 'gpt-5-mini',
   },
   google: {
     id: 'google',
@@ -35,7 +42,32 @@ export const OPEN_CODE_PROVIDERS: Record<OpenCodeProviderId, OpenCodeProviderDef
 export type OpenCodeModelResolution = {
   modelId: string
   modelWithProvider: string
-  source: 'override' | 'opencode_model' | 'default'
+  source: 'override' | 'om_ai_model' | 'opencode_model' | 'default'
+}
+
+/**
+ * Resolves the requested AI provider id from the unified env vars.
+ *
+ * Precedence (highest first):
+ *   1. `OM_AI_PROVIDER` — new canonical variable for the unified AI module.
+ *   2. `OPENCODE_PROVIDER` — legacy variable, kept for backward compatibility.
+ *   3. {@link DEFAULT_AI_PROVIDER_ID} (currently `openai`).
+ *
+ * Unknown / empty values fall through to the next tier so a typo in
+ * `OM_AI_PROVIDER` does not silently disable the legacy fallback.
+ */
+export function resolveAiProviderIdFromEnv(
+  env: EnvLookup = process.env,
+  fallback: OpenCodeProviderId = DEFAULT_AI_PROVIDER_ID,
+): OpenCodeProviderId {
+  const candidates = [env.OM_AI_PROVIDER, env.OPENCODE_PROVIDER]
+  for (const candidate of candidates) {
+    const normalized = normalizeToken(candidate)?.toLowerCase()
+    if (normalized && isOpenCodeProviderId(normalized)) {
+      return normalized
+    }
+  }
+  return fallback
 }
 
 function normalizeToken(value: string | null | undefined): string | null {
@@ -154,6 +186,7 @@ export function resolveOpenCodeModel(
 ): OpenCodeModelResolution {
   const env = options?.env ?? process.env
   const overrideModel = normalizeToken(options?.overrideModel)
+  const omAiModel = normalizeToken(env.OM_AI_MODEL)
   const opencodeModel = normalizeToken(env.OPENCODE_MODEL)
 
   let source: OpenCodeModelResolution['source'] = 'default'
@@ -164,6 +197,11 @@ export function resolveOpenCodeModel(
     source = 'opencode_model'
   }
 
+  if (omAiModel) {
+    selectedModel = omAiModel
+    source = 'om_ai_model'
+  }
+
   if (overrideModel) {
     selectedModel = overrideModel
     source = 'override'