@elizaos/shared 2.0.0-alpha.538 → 2.0.3-beta.2

package/contracts/{onboarding.js → first-run-options.js}

@@ -1,7 +1,7 @@
 /**
- * Shared onboarding contracts.
+ * Shared first-run provider setup contracts.
  */
-import { isTruthyEnvValue } from "../env-utils.impl.js";
+import { isTruthyEnvValue } from "../env-utils.js";
 import { normalizeDeploymentTargetConfig, normalizeLinkedAccountFlagsConfig, normalizeServiceRoutingConfig, } from "./service-routing.js";
 export const CHARACTER_LANGUAGES = [
     "en",
@@ -25,8 +25,32 @@ export const SUBSCRIPTION_PROVIDER_SELECTIONS = [
         family: "openai",
         labelKey: "providerswitcher.chatgptSubscription",
     },
+    {
+        id: "gemini-subscription",
+        storedProvider: "gemini-cli",
+        family: "gemini",
+        labelKey: "providerswitcher.geminiSubscription",
+    },
+    {
+        id: "zai-coding-subscription",
+        storedProvider: "zai-coding",
+        family: "zai",
+        labelKey: "providerswitcher.zaiCodingPlan",
+    },
+    {
+        id: "kimi-coding-subscription",
+        storedProvider: "kimi-coding",
+        family: "moonshot",
+        labelKey: "providerswitcher.kimiCodingPlan",
+    },
+    {
+        id: "deepseek-coding-subscription",
+        storedProvider: "deepseek-coding",
+        family: "deepseek",
+        labelKey: "providerswitcher.deepseekCodingPlan",
+    },
 ];
-export const ONBOARDING_PROVIDER_CATALOG = [
+export const FIRST_RUN_PROVIDER_CATALOG = [
     {
         id: "elizacloud",
         name: "Eliza Cloud",
@@ -61,7 +85,7 @@ export const ONBOARDING_PROVIDER_CATALOG = [
         envKey: null,
         pluginName: "@elizaos/plugin-openai",
         keyPrefix: null,
-        description: "Use your ChatGPT Plus or Pro subscription via OAuth.",
+        description: "Powers Codex-backed coding agents through the official Codex surface.",
         family: "openai",
         authMode: "subscription",
         group: "subscription",
@@ -70,6 +94,62 @@ export const ONBOARDING_PROVIDER_CATALOG = [
         labelKey: "providerswitcher.chatgptSubscription",
         storedProvider: "openai-codex",
     },
+    {
+        id: "gemini-subscription",
+        name: "Gemini CLI Subscription",
+        envKey: null,
+        pluginName: "@elizaos/plugin-google-genai",
+        keyPrefix: null,
+        description: "Powers task agents through the authenticated Gemini CLI. No Gemini subscription token is imported into API env vars.",
+        family: "gemini",
+        authMode: "subscription",
+        group: "subscription",
+        order: 35,
+        labelKey: "providerswitcher.geminiSubscription",
+        storedProvider: "gemini-cli",
+    },
+    {
+        id: "zai-coding-subscription",
+        name: "z.ai Coding Plan",
+        envKey: null,
+        pluginName: "@elizaos/plugin-zai",
+        keyPrefix: null,
+        description: "Stores z.ai Coding Plan credentials for the dedicated coding endpoint only, not the general z.ai API key path.",
+        family: "zai",
+        authMode: "subscription",
+        group: "subscription",
+        order: 36,
+        labelKey: "providerswitcher.zaiCodingPlan",
+        storedProvider: "zai-coding",
+    },
+    {
+        id: "kimi-coding-subscription",
+        name: "Kimi Code",
+        envKey: null,
+        pluginName: "@elizaos/plugin-openai",
+        keyPrefix: null,
+        description: "Stores Kimi Code credentials for Kimi's coding endpoint only, not the Moonshot general API key path.",
+        family: "moonshot",
+        authMode: "subscription",
+        group: "subscription",
+        order: 37,
+        labelKey: "providerswitcher.kimiCodingPlan",
+        storedProvider: "kimi-coding",
+    },
+    {
+        id: "deepseek-coding-subscription",
+        name: "DeepSeek Coding Plan",
+        envKey: null,
+        pluginName: "@elizaos/plugin-deepseek",
+        keyPrefix: null,
+        description: "Unavailable until DeepSeek exposes a first-party coding subscription surface that can be integrated without API-key substitution.",
+        family: "deepseek",
+        authMode: "subscription",
+        group: "subscription",
+        order: 38,
+        labelKey: "providerswitcher.deepseekCodingPlan",
+        storedProvider: "deepseek-coding",
+    },
     {
         id: "anthropic",
         name: "Anthropic",
@@ -143,6 +223,20 @@ export const ONBOARDING_PROVIDER_CATALOG = [
         group: "local",
         order: 100,
     },
+    {
+        id: "cerebras",
+        name: "Cerebras",
+        envKey: "CEREBRAS_API_KEY",
+        // Cerebras serves an OpenAI-compatible API, so it runs through the
+        // OpenAI plugin's Cerebras mode (CEREBRAS_API_KEY → api.cerebras.ai).
+        pluginName: "@elizaos/plugin-openai",
+        keyPrefix: "csk-",
+        description: "Fast inference for open models via Cerebras.",
+        family: "cerebras",
+        authMode: "api-key",
+        group: "local",
+        order: 105,
+    },
     {
         id: "deepseek",
         name: "DeepSeek",
@@ -195,14 +289,27 @@ export const ONBOARDING_PROVIDER_CATALOG = [
         id: "zai",
         name: "z.ai",
         envKey: "ZAI_API_KEY",
-        pluginName: "@homunculuslabs/plugin-zai",
+        pluginName: "@elizaos/plugin-zai",
         keyPrefix: null,
-        description: "GLM models via z.ai Coding Plan.",
+        description: "GLM models via z.ai direct API billing.",
         family: "zai",
         authMode: "api-key",
         group: "local",
         order: 150,
     },
+    {
+        id: "nearai",
+        name: "NEAR AI",
+        envKey: "NEARAI_API_KEY",
+        pluginName: "@elizaos/plugin-nearai",
+        keyPrefix: null,
+        description: "TEE-backed private inference via NEAR AI Cloud.",
+        family: "nearai",
+        authMode: "api-key",
+        group: "local",
+        order: 155,
+        supportsPrimaryModelOverride: true,
+    },
     {
         id: "moonshot",
         name: "Kimi / Moonshot",
@@ -217,21 +324,22 @@ export const ONBOARDING_PROVIDER_CATALOG = [
         supportsPrimaryModelOverride: true,
     },
 ];
-export const DIRECT_ACCOUNT_PROVIDER_BY_ONBOARDING_PROVIDER = {
+export const DIRECT_ACCOUNT_PROVIDER_BY_FIRST_RUN_PROVIDER = {
     anthropic: "anthropic-api",
     openai: "openai-api",
     deepseek: "deepseek-api",
     zai: "zai-api",
     moonshot: "moonshot-api",
+    cerebras: "cerebras-api",
 };
-export const ONBOARDING_CLOUD_PROVIDER_OPTIONS = [
+export const FIRST_RUN_CLOUD_PROVIDER_OPTIONS = [
     {
         id: "elizacloud",
         name: "Eliza Cloud",
         description: "Managed cloud infrastructure. Wallets, LLMs, and RPCs included.",
     },
 ];
-function pickOnboardingCloudModelPreferences(value) {
+function pickFirstRunCloudModelPreferences(value) {
     return {
         ...(value.nanoModel ? { nanoModel: value.nanoModel } : {}),
         ...(value.smallModel ? { smallModel: value.smallModel } : {}),
@@ -254,11 +362,11 @@ function pickOnboardingCloudModelPreferences(value) {
             : {}),
     };
 }
-function readOnboardingCloudModelPreferences(source) {
+function readFirstRunCloudModelPreferences(source) {
     if (!source) {
         return {};
     }
-    return pickOnboardingCloudModelPreferences({
+    return pickFirstRunCloudModelPreferences({
         nanoModel: readConfigString(source, "nanoModel"),
         smallModel: readConfigString(source, "smallModel"),
         mediumModel: readConfigString(source, "mediumModel"),
@@ -272,10 +380,21 @@ function readOnboardingCloudModelPreferences(source) {
         mediaDescriptionModel: readConfigString(source, "mediaDescriptionModel"),
     });
 }
-const ONBOARDING_PROVIDER_ALIASES = {
+const FIRST_RUN_PROVIDER_ALIASES = {
     "openai-codex": "openai-subscription",
     "openai-subscription": "openai-subscription",
     "anthropic-subscription": "anthropic-subscription",
+    "gemini-cli": "gemini-subscription",
+    "gemini-subscription": "gemini-subscription",
+    "google-subscription": "gemini-subscription",
+    "zai-coding": "zai-coding-subscription",
+    "z.ai-coding": "zai-coding-subscription",
+    "zai-coding-subscription": "zai-coding-subscription",
+    "kimi-coding": "kimi-coding-subscription",
+    "kimi-code": "kimi-coding-subscription",
+    "kimi-coding-subscription": "kimi-coding-subscription",
+    "deepseek-coding": "deepseek-coding-subscription",
+    "deepseek-coding-subscription": "deepseek-coding-subscription",
     google: "gemini",
     "google-genai": "gemini",
     gemini: "gemini",
@@ -283,36 +402,38 @@ const ONBOARDING_PROVIDER_ALIASES = {
     grok: "grok",
     "together-ai": "together",
     together: "together",
+    "near-ai": "nearai",
+    "near-ai-cloud": "nearai",
+    "near.ai": "nearai",
+    nearai: "nearai",
     "z.ai": "zai",
     zai: "zai",
     kimi: "moonshot",
     moonshot: "moonshot",
     moonshotai: "moonshot",
     "moonshot-ai": "moonshot",
+    cerebras: "cerebras",
+    // Tolerate the linked-account form so env/integration callers normalize too.
+    "cerebras-api": "cerebras",
 };
 export function isSubscriptionProviderSelectionId(value) {
     return SUBSCRIPTION_PROVIDER_SELECTIONS.some((provider) => provider.id === value);
 }
 export function normalizeSubscriptionProviderSelectionId(value) {
-    if (value === "anthropic-subscription")
-        return "anthropic-subscription";
-    if (value === "openai-subscription" || value === "openai-codex") {
-        return "openai-subscription";
-    }
-    return null;
+    const normalized = normalizeFirstRunProviderId(value);
+    return isSubscriptionProviderSelectionId(normalized) ? normalized : null;
 }
 export function getStoredSubscriptionProvider(selectionId) {
-    return selectionId === "anthropic-subscription"
-        ? "anthropic-subscription"
-        : "openai-codex";
+    return (SUBSCRIPTION_PROVIDER_SELECTIONS.find((provider) => provider.id === selectionId)?.storedProvider ?? "anthropic-subscription");
 }
 export function getSubscriptionProviderFamily(selectionId) {
-    return selectionId === "anthropic-subscription" ? "anthropic" : "openai";
+    return (SUBSCRIPTION_PROVIDER_SELECTIONS.find((provider) => provider.id === selectionId)?.family ?? "anthropic");
 }
 export function requiresAdditionalRuntimeProvider(providerId) {
-    return normalizeOnboardingProviderId(providerId) === "anthropic-subscription";
+    const selection = normalizeSubscriptionProviderSelectionId(providerId);
+    return Boolean(selection && selection !== "openai-subscription");
 }
-export function normalizeOnboardingProviderId(value) {
+export function normalizeFirstRunProviderId(value) {
     if (typeof value !== "string")
         return null;
     const trimmed = value.trim().toLowerCase();
@@ -324,17 +445,17 @@ export function normalizeOnboardingProviderId(value) {
         trimmed.replace(/^@[^/]+\//, "").replace(/^plugin-/, ""),
     ]));
     for (const candidate of candidates) {
-        const directMatch = ONBOARDING_PROVIDER_CATALOG.find((provider) => provider.id === candidate);
+        const directMatch = FIRST_RUN_PROVIDER_CATALOG.find((provider) => provider.id === candidate);
         if (directMatch) {
             return directMatch.id;
         }
-        const alias = ONBOARDING_PROVIDER_ALIASES[candidate];
+        const alias = FIRST_RUN_PROVIDER_ALIASES[candidate];
         if (alias) {
             return alias;
         }
     }
     for (const candidate of candidates) {
-        const pluginMatches = ONBOARDING_PROVIDER_CATALOG.filter((provider) => provider.pluginName.toLowerCase() === candidate);
+        const pluginMatches = FIRST_RUN_PROVIDER_CATALOG.filter((provider) => provider.pluginName.toLowerCase() === candidate);
         if (pluginMatches.length === 0) {
             continue;
         }
@@ -350,31 +471,32 @@ export function normalizeOnboardingProviderId(value) {
     }
     return null;
 }
-export function getOnboardingProviderOption(providerId) {
-    const normalized = normalizeOnboardingProviderId(providerId);
+export function getFirstRunProviderOption(providerId) {
+    const normalized = normalizeFirstRunProviderId(providerId);
     if (!normalized)
         return null;
-    return (ONBOARDING_PROVIDER_CATALOG.find((provider) => provider.id === normalized) ?? null);
+    return (FIRST_RUN_PROVIDER_CATALOG.find((provider) => provider.id === normalized) ??
+        null);
 }
-export function getOnboardingProviderFamily(providerId) {
-    return getOnboardingProviderOption(providerId)?.family ?? null;
+export function getFirstRunProviderFamily(providerId) {
+    return getFirstRunProviderOption(providerId)?.family ?? null;
 }
-export function getStoredOnboardingProviderId(providerId) {
-    const provider = getOnboardingProviderOption(providerId);
+export function getStoredFirstRunProviderId(providerId) {
+    const provider = getFirstRunProviderOption(providerId);
     if (!provider)
         return null;
     return provider.storedProvider ?? provider.id;
 }
-export function getDirectAccountProviderForOnboardingProvider(providerId) {
-    const normalized = normalizeOnboardingProviderId(providerId);
+export function getDirectAccountProviderForFirstRunProvider(providerId) {
+    const normalized = normalizeFirstRunProviderId(providerId);
     if (!normalized)
         return null;
-    if (!(normalized in DIRECT_ACCOUNT_PROVIDER_BY_ONBOARDING_PROVIDER)) {
+    if (!(normalized in DIRECT_ACCOUNT_PROVIDER_BY_FIRST_RUN_PROVIDER)) {
         return null;
     }
-    return DIRECT_ACCOUNT_PROVIDER_BY_ONBOARDING_PROVIDER[normalized];
+    return DIRECT_ACCOUNT_PROVIDER_BY_FIRST_RUN_PROVIDER[normalized];
 }
-export function sortOnboardingProviders(providers) {
+export function sortFirstRunProviders(providers) {
     return [...providers].sort((left, right) => {
         const recommendedDelta = Number(Boolean(right.recommended)) - Number(Boolean(left.recommended));
         if (recommendedDelta !== 0) {
@@ -392,7 +514,7 @@ export function isRemoteProviderConnection(connection) {
 export function isLocalProviderConnection(connection) {
     return connection?.kind === "local-provider";
 }
-export function isOnboardingConnectionComplete(connection) {
+export function isFirstRunConnectionComplete(connection) {
     if (isLocalProviderConnection(connection)) {
         return true;
     }
@@ -431,29 +553,46 @@ function normalizeSecretString(value) {
     }
     return trimmed;
 }
-function readOnboardingEnvContainer(config) {
+function readFirstRunEnvContainer(config) {
     const env = asConfigRecord(config?.env);
     return {
         env,
         vars: asConfigRecord(env?.vars),
     };
 }
-export function readOnboardingEnvString(config, key) {
-    const { env, vars } = readOnboardingEnvContainer(config);
+export function readFirstRunEnvString(config, key) {
+    const { env, vars } = readFirstRunEnvContainer(config);
     return readConfigString(vars, key) ?? readConfigString(env, key);
 }
-export function readOnboardingEnvSecret(config, key) {
-    return normalizeSecretString(readOnboardingEnvString(config, key));
+export function readFirstRunEnvSecret(config, key) {
+    return normalizeSecretString(readFirstRunEnvString(config, key));
 }
 /** Alias to keep call-sites unchanged. */
 const _isTruthyEnvFlag = isTruthyEnvValue;
-export function getOnboardingProviderSignalEnvKeys(providerId) {
+export function getFirstRunProviderSignalEnvKeys(providerId) {
     if (providerId === "ollama") {
         return ["OLLAMA_BASE_URL"];
     }
-    const provider = getOnboardingProviderOption(providerId);
+    if (providerId === "zai") {
+        return ["ZAI_API_KEY", "Z_AI_API_KEY"];
+    }
+    const provider = getFirstRunProviderOption(providerId);
     return provider?.envKey ? [provider.envKey] : [];
 }
+function readFirstRunProviderApiKey(config, providerId) {
+    if (!providerId) {
+        return undefined;
+    }
+    const provider = getFirstRunProviderOption(providerId);
+    if (provider?.envKey == null) {
+        return undefined;
+    }
+    const canonical = readFirstRunEnvSecret(config, provider.envKey);
+    if (canonical || providerId !== "zai") {
+        return canonical;
+    }
+    return readFirstRunEnvSecret(config, "Z_AI_API_KEY");
+}
 function readPrimaryModelFromConfig(config) {
     const agents = asConfigRecord(config?.agents);
     const defaults = asConfigRecord(agents?.defaults);
@@ -472,7 +611,7 @@ function buildElizaCloudTextRoute(args) {
         backend: "elizacloud",
         transport: "cloud-proxy",
         accountId: "elizacloud",
-        ...pickOnboardingCloudModelPreferences(args),
+        ...pickFirstRunCloudModelPreferences(args),
     };
 }
 const LEGACY_CLOUD_ROUTING_KEYS = [
@@ -505,7 +644,7 @@ function resolveLegacyDeploymentTargetInConfig(config) {
                 : {}),
         };
     }
-    const cloudProvider = normalizeOnboardingProviderId(readConfigString(cloud, "provider"));
+    const cloudProvider = normalizeFirstRunProviderId(readConfigString(cloud, "provider"));
     const cloudRuntime = readConfigString(cloud, "runtime");
     const cloudAgentId = readConfigString(cloud, "agentId");
     if (cloudRuntime === "cloud" &&
@@ -659,12 +798,12 @@ export function resolveLinkedAccountsInConfig(config) {
     const next = { ...explicit };
     const cloud = asConfigRecord(config?.cloud);
     const hasCloudKey = Boolean(normalizeSecretString(cloud?.apiKey));
-    const existingCloudAccount = next.elizacloud;
-    if (hasCloudKey && !existingCloudAccount?.status) {
+    const existingCloudAccount = next.elizacloud ?? {};
+    if (hasCloudKey && !existingCloudAccount.status) {
         next.elizacloud = {
             ...existingCloudAccount,
             status: "linked",
-            source: existingCloudAccount?.source ?? "api-key",
+            source: existingCloudAccount.source ?? "api-key",
         };
     }
     return Object.keys(next).length > 0 ? next : null;
@@ -707,22 +846,17 @@ export function resolveServiceRoutingInConfig(config) {
     }
     return Object.keys(next).length > 0 ? next : null;
 }
-function deriveOnboardingConnectionFromRuntimeConfig(config) {
+function deriveFirstRunConnectionFromRuntimeConfig(config) {
     const routing = resolveServiceRoutingInConfig(config);
     const deploymentTarget = resolveDeploymentTargetInConfig(config);
     const llmText = routing?.llmText;
-    const backend = normalizeOnboardingProviderId(llmText?.backend);
-    const localProviderOption = backend
-        ? getOnboardingProviderOption(backend)
-        : null;
-    const routeApiKey = localProviderOption?.envKey != null
-        ? readOnboardingEnvSecret(config, localProviderOption.envKey)
-        : undefined;
+    const backend = normalizeFirstRunProviderId(llmText?.backend);
+    const routeApiKey = readFirstRunProviderApiKey(config, backend);
     if (llmText?.transport === "cloud-proxy" && backend === "elizacloud") {
         return {
             kind: "cloud-managed",
             cloudProvider: "elizacloud",
-            ...pickOnboardingCloudModelPreferences(llmText),
+            ...pickFirstRunCloudModelPreferences(llmText),
         };
     }
     if (llmText?.transport === "remote") {
@@ -764,25 +898,25 @@ function deriveOnboardingConnectionFromRuntimeConfig(config) {
 function resolveConfiguredLocalProviderFromSignals(config) {
     const agents = asConfigRecord(config?.agents);
     const defaults = asConfigRecord(agents?.defaults);
-    const storedSubscriptionProvider = normalizeOnboardingProviderId(readConfigString(defaults, "subscriptionProvider"));
+    const storedSubscriptionProvider = normalizeFirstRunProviderId(readConfigString(defaults, "subscriptionProvider"));
     if (storedSubscriptionProvider &&
         storedSubscriptionProvider !== "elizacloud" &&
         !requiresAdditionalRuntimeProvider(storedSubscriptionProvider)) {
         return storedSubscriptionProvider;
     }
-    for (const provider of ONBOARDING_PROVIDER_CATALOG) {
+    for (const provider of FIRST_RUN_PROVIDER_CATALOG) {
         if (provider.id === "elizacloud") {
             continue;
         }
         const providerId = provider.id;
-        const detected = getOnboardingProviderSignalEnvKeys(providerId).some((key) => Boolean(readOnboardingEnvString(config, key)));
+        const detected = getFirstRunProviderSignalEnvKeys(providerId).some((key) => Boolean(readFirstRunEnvString(config, key)));
         if (detected) {
             return providerId;
         }
     }
     return null;
 }
-export function normalizePersistedOnboardingConnection(value) {
+export function normalizePersistedFirstRunConnection(value) {
     const connection = asConfigRecord(value);
     if (!connection) {
         return null;
@@ -792,11 +926,11 @@ export function normalizePersistedOnboardingConnection(value) {
             kind: "cloud-managed",
             cloudProvider: "elizacloud",
             apiKey: normalizeSecretString(connection.apiKey),
-            ...readOnboardingCloudModelPreferences(connection),
+            ...readFirstRunCloudModelPreferences(connection),
         };
     }
     if (connection.kind === "local-provider") {
-        const provider = normalizeOnboardingProviderId(connection.provider);
+        const provider = normalizeFirstRunProviderId(connection.provider);
         if (!provider || provider === "elizacloud") {
             return null;
         }
@@ -809,7 +943,7 @@ export function normalizePersistedOnboardingConnection(value) {
     }
     if (connection.kind === "remote-provider") {
         const remoteApiBase = readConfigString(connection, "remoteApiBase");
-        const provider = normalizeOnboardingProviderId(connection.provider);
+        const provider = normalizeFirstRunProviderId(connection.provider);
         if (!remoteApiBase) {
             return null;
         }
@@ -824,7 +958,7 @@ export function normalizePersistedOnboardingConnection(value) {
     }
     return null;
 }
-export function normalizeOnboardingCredentialInputs(value) {
+export function normalizeFirstRunCredentialInputs(value) {
     const inputs = asConfigRecord(value);
     if (!inputs) {
         return null;
@@ -839,28 +973,28 @@ export function normalizeOnboardingCredentialInputs(value) {
         ...(cloudApiKey ? { cloudApiKey } : {}),
     };
 }
-export function deriveOnboardingCredentialPersistencePlan(args) {
-    const credentialInputs = normalizeOnboardingCredentialInputs(args.credentialInputs);
+export function deriveFirstRunCredentialPersistencePlan(args) {
+    const credentialInputs = normalizeFirstRunCredentialInputs(args.credentialInputs);
     const deploymentTarget = normalizeDeploymentTargetConfig(args.deploymentTarget);
     const serviceRouting = normalizeServiceRoutingConfig(args.serviceRouting);
     const llmRoute = serviceRouting?.llmText;
     const cloudApiKey = credentialInputs?.cloudApiKey;
     const llmApiKey = credentialInputs?.llmApiKey;
     if (llmRoute?.transport === "cloud-proxy" &&
-        normalizeOnboardingProviderId(llmRoute.backend) === "elizacloud" &&
+        normalizeFirstRunProviderId(llmRoute.backend) === "elizacloud" &&
         cloudApiKey) {
         return {
             llmSelection: {
                 backend: "elizacloud",
                 transport: "cloud-proxy",
                 apiKey: cloudApiKey,
-                ...pickOnboardingCloudModelPreferences(llmRoute),
+                ...pickFirstRunCloudModelPreferences(llmRoute),
             },
             cloudApiKey,
         };
     }
     if (llmRoute?.transport === "direct" && llmApiKey) {
-        const provider = normalizeOnboardingProviderId(llmRoute.backend);
+        const provider = normalizeFirstRunProviderId(llmRoute.backend);
         if (provider && provider !== "elizacloud") {
             return {
                 llmSelection: {
@@ -876,7 +1010,7 @@ export function deriveOnboardingCredentialPersistencePlan(args) {
         }
     }
     if (llmRoute?.transport === "remote" && llmApiKey) {
-        const provider = normalizeOnboardingProviderId(llmRoute.backend);
+        const provider = normalizeFirstRunProviderId(llmRoute.backend);
         const remoteApiBase = llmRoute.remoteApiBase ?? deploymentTarget?.remoteApiBase;
         if (provider && provider !== "elizacloud" && remoteApiBase) {
             return {
@@ -901,12 +1035,12 @@ export function deriveOnboardingCredentialPersistencePlan(args) {
         ...(cloudApiKey ? { cloudApiKey } : {}),
     };
 }
-export function stripOnboardingConnectionSecrets(connection) {
+export function stripFirstRunConnectionSecrets(connection) {
     if (connection.kind === "cloud-managed") {
         return {
             kind: "cloud-managed",
             cloudProvider: "elizacloud",
-            ...pickOnboardingCloudModelPreferences(connection),
+            ...pickFirstRunCloudModelPreferences(connection),
         };
     }
     if (connection.kind === "local-provider") {
@@ -923,17 +1057,14 @@ export function stripOnboardingConnectionSecrets(connection) {
         primaryModel: connection.primaryModel,
     };
 }
-export function inferCompatibilityOnboardingConnection(config) {
+export function inferCompatibilityFirstRunConnection(config) {
     const cloud = asConfigRecord(config?.cloud);
     const models = asConfigRecord(config?.models);
     const remoteApiBase = readConfigString(cloud, "remoteApiBase");
     const remoteAccessToken = normalizeSecretString(cloud?.remoteAccessToken);
     const localProvider = resolveConfiguredLocalProviderFromSignals(config);
     const primaryModel = readPrimaryModelFromConfig(config);
-    const localProviderOption = getOnboardingProviderOption(localProvider);
-    const localApiKey = localProviderOption?.envKey != null
-        ? readOnboardingEnvSecret(config, localProviderOption.envKey)
-        : undefined;
+    const localApiKey = readFirstRunProviderApiKey(config, localProvider);
     if (remoteApiBase) {
         return {
             kind: "remote-provider",
@@ -944,7 +1075,7 @@ export function inferCompatibilityOnboardingConnection(config) {
             primaryModel,
         };
     }
-    const cloudProvider = normalizeOnboardingProviderId(readConfigString(cloud, "provider"));
+    const cloudProvider = normalizeFirstRunProviderId(readConfigString(cloud, "provider"));
     const cloudApiKey = normalizeSecretString(cloud?.apiKey);
     const nanoModel = readConfigString(models, "nano");
     const smallModel = readConfigString(models, "small");
@@ -982,8 +1113,8 @@ export function inferCompatibilityOnboardingConnection(config) {
         primaryModel,
     };
 }
-export function inferOnboardingConnectionFromConfig(config) {
-    return deriveOnboardingConnectionFromRuntimeConfig(config);
+export function inferFirstRunConnectionFromConfig(config) {
+    return deriveFirstRunConnectionFromRuntimeConfig(config);
 }
 function inferLegacyCloudInferenceSelection(config) {
     const cloud = asConfigRecord(config?.cloud);
@@ -997,7 +1128,7 @@ function inferLegacyCloudInferenceSelection(config) {
         services?.inference === false) {
         return false;
     }
-    const cloudProvider = normalizeOnboardingProviderId(readConfigString(cloud, "provider"));
+    const cloudProvider = normalizeFirstRunProviderId(readConfigString(cloud, "provider"));
     const models = asConfigRecord(config?.models);
     const nanoModel = readConfigString(models, "nano");
     const smallModel = readConfigString(models, "small");
@@ -1017,17 +1148,17 @@ export function isCloudInferenceSelectedInConfig(config) {
     const routing = resolveServiceRoutingInConfig(config);
     const llmText = routing?.llmText;
     return Boolean(llmText?.transport === "cloud-proxy" &&
-        normalizeOnboardingProviderId(llmText.backend) === "elizacloud");
+        normalizeFirstRunProviderId(llmText.backend) === "elizacloud");
 }
 // ---------------------------------------------------------------------------
 // Provider option registry — allows plugins to register additional providers
-// at runtime without modifying the hardcoded ONBOARDING_PROVIDER_CATALOG.
+// at runtime without modifying the hardcoded FIRST_RUN_PROVIDER_CATALOG.
 // ---------------------------------------------------------------------------
 const _registeredProviderOptions = [];
 /**
  * Register an additional provider option at runtime.
  * Plugins should call this during initialization to add themselves to the
- * onboarding provider catalog.
+ * first-run provider catalog.
  */
 export function registerProviderOption(option) {
     const existing = _registeredProviderOptions.findIndex((o) => o.id === option.id);
@@ -1044,7 +1175,7 @@ export function registerProviderOption(option) {
  */
 export function getProviderOptions() {
     const merged = new Map();
-    for (const option of ONBOARDING_PROVIDER_CATALOG) {
+    for (const option of FIRST_RUN_PROVIDER_CATALOG) {
         merged.set(option.id, option);
     }
     for (const option of _registeredProviderOptions) {
@@ -1052,4 +1183,4 @@ export function getProviderOptions() {
     }
     return Array.from(merged.values());
 }
-//# sourceMappingURL=onboarding.js.map
+//# sourceMappingURL=first-run-options.js.map