fix: resolve rebase conflicts and add missing nebius provider types

Author: daniel-lxs

packages/types/src/provider-settings.ts

@@ -30,6 +30,7 @@ export const providerNames = [
 	"groq",
 	"chutes",
 	"litellm",
+	"nebius",
 ] as const
 
 export const providerNamesSchema = z.enum(providerNames)
@@ -200,6 +201,12 @@ const litellmSchema = baseProviderSettingsSchema.extend({
 	litellmModelId: z.string().optional(),
 })
 
+const nebiusSchema = baseProviderSettingsSchema.extend({
+	nebiusBaseUrl: z.string().optional(),
+	nebiusApiKey: z.string().optional(),
+	nebiusModelId: z.string().optional(),
+})
+
 const defaultSchema = z.object({
 	apiProvider: z.undefined(),
 })
@@ -226,6 +233,7 @@ export const providerSettingsSchemaDiscriminated = z.discriminatedUnion("apiProv
 	groqSchema.merge(z.object({ apiProvider: z.literal("groq") })),
 	chutesSchema.merge(z.object({ apiProvider: z.literal("chutes") })),
 	litellmSchema.merge(z.object({ apiProvider: z.literal("litellm") })),
+	nebiusSchema.merge(z.object({ apiProvider: z.literal("nebius") })),
 	defaultSchema,
 ])
 
@@ -252,6 +260,7 @@ export const providerSettingsSchema = z.object({
 	...groqSchema.shape,
 	...chutesSchema.shape,
 	...litellmSchema.shape,
+	...nebiusSchema.shape,
 	...codebaseIndexProviderSchema.shape,
 })
 
@@ -353,4 +362,8 @@ export const PROVIDER_SETTINGS_KEYS = keysOf<ProviderSettings>()([
 	"litellmBaseUrl",
 	"litellmApiKey",
 	"litellmModelId",
+	// Nebius
+	"nebiusBaseUrl",
+	"nebiusApiKey",
+	"nebiusModelId",
 ])

src/api/providers/index.ts

@@ -20,3 +20,4 @@ export { XAIHandler } from "./xai"
 export { GroqHandler } from "./groq"
 export { ChutesHandler } from "./chutes"
 export { LiteLLMHandler } from "./litellm"
+export { NebiusHandler } from "./nebius"

webview-ui/src/components/settings/ApiOptions.tsx

@@ -418,7 +418,11 @@ const ApiOptions = ({
 			)}
 
 			{selectedProvider === "nebius" && (
-				<Nebius apiConfiguration={apiConfiguration} setApiConfigurationField={setApiConfigurationField} />
+				<Nebius
+					apiConfiguration={apiConfiguration}
+					setApiConfigurationField={setApiConfigurationField}
+					organizationAllowList={organizationAllowList}
+				/>
 			)}
 
 			{selectedProvider === "human-relay" && (

webview-ui/src/components/settings/providers/Nebius.tsx

@@ -1,7 +1,9 @@
 import { useCallback } from "react"
 import { VSCodeTextField } from "@vscode/webview-ui-toolkit/react"
 
-import { ProviderSettings, RouterModels, nebiusDefaultModelId } from "@roo/shared/api"
+import type { ProviderSettings, OrganizationAllowList } from "@roo-code/types"
+
+import { RouterModels, nebiusDefaultModelId } from "@roo/api"
 
 import { useAppTranslation } from "@src/i18n/TranslationContext"
 
@@ -12,9 +14,15 @@ type NebiusProps = {
 	apiConfiguration: ProviderSettings
 	setApiConfigurationField: (field: keyof ProviderSettings, value: ProviderSettings[keyof ProviderSettings]) => void
 	routerModels?: RouterModels
+	organizationAllowList: OrganizationAllowList
 }
 
-export const Nebius = ({ apiConfiguration, setApiConfigurationField, routerModels }: NebiusProps) => {
+export const Nebius = ({
+	apiConfiguration,
+	setApiConfigurationField,
+	routerModels,
+	organizationAllowList,
+}: NebiusProps) => {
 	const { t } = useAppTranslation()
 
 	const handleInputChange = useCallback(
@@ -59,6 +67,7 @@ export const Nebius = ({ apiConfiguration, setApiConfigurationField, routerModel
 				serviceName="Nebius"
 				serviceUrl="https://docs.nebius.ai/"
 				setApiConfigurationField={setApiConfigurationField}
+				organizationAllowList={organizationAllowList}
 			/>
 		</>
 	)