feat: use site caps for AIG gating, add support to dev-exec and serve (#7904)

* feat: use site caps for AIG gating, add support to dev-exec and serve

* address nits

Author: kathmbeck

src/commands/dev-exec/dev-exec.ts

@@ -1,7 +1,10 @@
 import { OptionValues } from 'commander'
 import execa from 'execa'
 
-import { getDotEnvVariables, injectEnvVariables } from '../../utils/dev.js'
+import { parseAIGatewayContext, setupAIGateway } from '@netlify/ai/bootstrap'
+
+import { NETLIFYDEVLOG, log } from '../../utils/command-helpers.js'
+import { getDotEnvVariables, getSiteInformation, injectEnvVariables } from '../../utils/dev.js'
 import { getEnvelopeEnv } from '../../utils/env/index.js'
 import BaseCommand from '../base-command.js'
 
@@ -10,9 +13,33 @@ export const devExec = async (cmd: string, options: OptionValues, command: BaseC
 
   // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
   const withEnvelopeEnvVars = await getEnvelopeEnv({ api, context: options.context, env: cachedConfig.env, siteInfo })
-  const withDotEnvVars = await getDotEnvVariables({ devConfig: { ...config.dev }, env: withEnvelopeEnvVars, site })
+  const env = await getDotEnvVariables({ devConfig: { ...config.dev }, env: withEnvelopeEnvVars, site })
+
+  const { capabilities, siteUrl } = await getSiteInformation({
+    offline: false,
+    api,
+    site,
+    siteInfo,
+  })
+
+  if (!capabilities.aiGatewayDisabled) {
+    await setupAIGateway({ api, env, siteID: site.id, siteURL: siteUrl })
+
+    const aiGatewayEnv = env.AI_GATEWAY as (typeof env)[string] | undefined
+    if (aiGatewayEnv) {
+      const aiGatewayContext = parseAIGatewayContext(aiGatewayEnv.value)
+      if (aiGatewayContext?.envVars) {
+        for (const envVar of aiGatewayContext.envVars) {
+          env[envVar.key] = { sources: ['internal'], value: aiGatewayContext.token }
+          env[envVar.url] = { sources: ['internal'], value: aiGatewayContext.url }
+        }
+      }
+    }
+  } else {
+    log(`${NETLIFYDEVLOG} AI Gateway is disabled for this account`)
+  }
 
-  injectEnvVariables(withDotEnvVars)
+  injectEnvVariables(env)
 
   await execa(cmd, command.args.slice(1), {
     stdio: 'inherit',

src/commands/dev/dev.ts

@@ -158,18 +158,17 @@ export const dev = async (options: OptionValues, command: BaseCommand) => {
   if (!options.offline && !options.offlineEnv && !capabilities.aiGatewayDisabled) {
     await setupAIGateway({ api, env, siteID: site.id, siteURL: siteUrl })
 
-    // Parse AI Gateway context and inject provider API keys
-    // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition -- AI_GATEWAY is conditionally set by setupAIGateway
-    if (env.AI_GATEWAY) {
-      const aiGatewayContext = parseAIGatewayContext(env.AI_GATEWAY.value)
+    const aiGatewayEnv = env.AI_GATEWAY as (typeof env)[string] | undefined
+    if (aiGatewayEnv) {
+      const aiGatewayContext = parseAIGatewayContext(aiGatewayEnv.value)
       if (aiGatewayContext?.envVars) {
         for (const envVar of aiGatewayContext.envVars) {
           env[envVar.key] = { sources: ['internal'], value: aiGatewayContext.token }
           env[envVar.url] = { sources: ['internal'], value: aiGatewayContext.url }
         }
       }
     }
-  } else if (capabilities.aiGatewayDisabled) {
+  } else if (!options.offline && !options.offlineEnv && capabilities.aiGatewayDisabled) {
     log(`${NETLIFYDEVLOG} AI Gateway is disabled for this account`)
   }
 

src/commands/functions/functions-serve.ts

@@ -41,7 +41,7 @@ export const functionsServe = async (options: OptionValues, command: BaseCommand
 
   if (!options.offline && !capabilities.aiGatewayDisabled) {
     await setupAIGateway({ api, env, siteID: site.id, siteURL: siteUrl })
-  } else if (capabilities.aiGatewayDisabled) {
+  } else if (!options.offline && capabilities.aiGatewayDisabled) {
     log(`${NETLIFYDEVLOG} AI Gateway is disabled for this account`)
   }
 

src/commands/serve/serve.ts

@@ -1,5 +1,6 @@
 import process from 'process'
 
+import { parseAIGatewayContext, setupAIGateway } from '@netlify/ai/bootstrap'
 import type { OptionValues } from 'commander'
 
 import {
@@ -56,8 +57,6 @@ export const serve = async (options: OptionValues, command: BaseCommand) => {
   }
 
   env = await getDotEnvVariables({ devConfig, env, site })
-  injectEnvVariables(env)
-  await promptEditorHelper({ chalk, config, log, NETLIFYDEVLOG, repositoryRoot, state })
 
   const { accountId, addonsUrls, capabilities, siteUrl, timeouts } = await getSiteInformation({
     // inherited from base command --offline
@@ -67,6 +66,26 @@ export const serve = async (options: OptionValues, command: BaseCommand) => {
     siteInfo,
   })
 
+  if (!options.offline && !capabilities.aiGatewayDisabled) {
+    await setupAIGateway({ api, env, siteID: site.id, siteURL: siteUrl })
+
+    const aiGatewayEnv = env.AI_GATEWAY as (typeof env)[string] | undefined
+    if (aiGatewayEnv) {
+      const aiGatewayContext = parseAIGatewayContext(aiGatewayEnv.value)
+      if (aiGatewayContext?.envVars) {
+        for (const envVar of aiGatewayContext.envVars) {
+          env[envVar.key] = { sources: ['internal'], value: aiGatewayContext.token }
+          env[envVar.url] = { sources: ['internal'], value: aiGatewayContext.url }
+        }
+      }
+    }
+  } else if (!options.offline && capabilities.aiGatewayDisabled) {
+    log(`${NETLIFYDEVLOG} AI Gateway is disabled for this account`)
+  }
+
+  injectEnvVariables(env)
+  await promptEditorHelper({ chalk, config, log, NETLIFYDEVLOG, repositoryRoot, state })
+
   if (!site.root) {
     throw new Error('Site root not found')
   }

src/utils/dev.ts

@@ -118,18 +118,33 @@ const SYNCHRONOUS_FUNCTION_TIMEOUT = 30
 // default 15 minutes for background functions
 const BACKGROUND_FUNCTION_TIMEOUT = 900
 
-/**
- *
- * @param {object} config
- * @param {boolean} config.offline
- * @param {*} config.api
- * @param {*} config.site
- * @param {*} config.siteInfo
- * @returns
- */
+interface GetSiteInformationOptions {
+  api: NetlifyAPI
+  offline: boolean
+  site: { id?: string }
+  siteInfo: SiteInfo
+}
 
-// @ts-expect-error TS(7031) FIXME: Binding element 'api' implicitly has an 'any' type... Remove this comment to see the full error message
-export const getSiteInformation = async ({ api, offline, site, siteInfo }) => {
+export interface SiteInformationResult {
+  addonsUrls: Record<string, string>
+  siteUrl: string
+  accountId?: string
+  capabilities: {
+    backgroundFunctions?: boolean
+    aiGatewayDisabled: boolean
+  }
+  timeouts: {
+    syncFunctions: number
+    backgroundFunctions: number
+  }
+}
+
+export const getSiteInformation = async ({
+  api,
+  offline,
+  site,
+  siteInfo,
+}: GetSiteInformationOptions): Promise<SiteInformationResult> => {
   if (site.id && !offline) {
     validateSiteInfo({ site, siteInfo })
     const [accounts, addons] = await Promise.all([getAccounts({ api }), getAddons({ api, site })])
@@ -143,7 +158,7 @@ export const getSiteInformation = async ({ api, offline, site, siteInfo }) => {
       accountId: account?.id,
       capabilities: {
         backgroundFunctions: supportsBackgroundFunctions(account),
-        aiGatewayDisabled: account?.capabilities?.ai_gateway_disabled?.included ?? false,
+        aiGatewayDisabled: siteInfo.capabilities?.ai_gateway_disabled ?? false,
       },
       timeouts: {
         syncFunctions: siteInfo.functions_timeout ?? siteInfo.functions_config?.timeout ?? SYNCHRONOUS_FUNCTION_TIMEOUT,

src/utils/types.ts

@@ -95,11 +95,16 @@ export interface SiteInfo {
         repo_url: string
       }
     | undefined
-  capabilities: Record<string, unknown>
+  capabilities?: {
+    ai_gateway_disabled?: boolean
+    [key: string]: unknown
+  }
   created_at: string
   custom_domain: string
   deploy_hook: string
   deploy_url: string
+  functions_timeout?: number
+  functions_config?: { timeout?: number }
   dev_server_settings?:
     | {
         cmd: string