diff --git a/assets/vue/components/basecomponents/ChamiloIcons.js b/assets/vue/components/basecomponents/ChamiloIcons.js
index 99c514b755b..fa09a4da9b9 100644
--- a/assets/vue/components/basecomponents/ChamiloIcons.js
+++ b/assets/vue/components/basecomponents/ChamiloIcons.js
@@ -158,4 +158,5 @@ export const chamiloIconToClass = {
   "health-check": "mdi mdi-clipboard-pulse-outline",
   "promotion": "mdi mdi-school-outline",
   "help": "mdi mdi-face-agent",
+  "robot": "mdi mdi-robot",
 }
diff --git a/assets/vue/router/documents.js b/assets/vue/router/documents.js
index ee42fa9ac66..6b0dd13d9c0 100644
--- a/assets/vue/router/documents.js
+++ b/assets/vue/router/documents.js
@@ -44,6 +44,12 @@ export default {
       path: "show",
       component: () => import("../views/documents/DocumentShow.vue"),
     },
+    {
+      name: "DocumentsGenerateMedia",
+      path: "generate_media",
+      component: () => import("../views/documents/DocumentsGenerateMedia.vue"),
+      meta: { breadcrumb: "Generate media" },
+    },
     {
       name: "DocumentsAddVariation",
       path: "add_variation/:resourceFileId",
diff --git a/assets/vue/views/documents/DocumentsGenerateMedia.vue b/assets/vue/views/documents/DocumentsGenerateMedia.vue
new file mode 100644
index 00000000000..118ee11d6ad
--- /dev/null
+++ b/assets/vue/views/documents/DocumentsGenerateMedia.vue
@@ -0,0 +1,954 @@
+<template>
+  <BaseToolbar>
+    <BaseButton
+      :label="t('Back')"
+      icon="back"
+      type="black"
+      @click="router.back()"
+    />
+  </BaseToolbar>
+
+  <div class="p-4 space-y-4">
+    <h2 class="text-xl font-semibold">{{ t("Generate media") }}</h2>
+
+    <!-- Permission / settings gate -->
+    <div
+      v-if="!canEdit"
+      class="p-3 rounded border border-gray-200 text-sm"
+    >
+      {{ t("You do not have permission to generate AI media in this course.") }}
+    </div>
+
+    <div
+      v-else-if="!aiHelpersEnabled"
+      class="p-3 rounded border border-gray-200 text-sm"
+    >
+      {{ t("AI helpers are disabled at platform level.") }}
+    </div>
+
+    <div
+      v-else-if="!imageGeneratorEnabled && !videoGeneratorEnabled"
+      class="p-3 rounded border border-gray-200 text-sm"
+    >
+      {{ t("AI media generation is disabled in course settings.") }}
+    </div>
+
+    <div
+      v-else-if="isLoadingCaps"
+      class="text-sm text-gray-600"
+    >
+      {{ t("Loading...") }}
+    </div>
+
+    <div
+      v-else-if="!canUseAnyType"
+      class="p-3 rounded border border-gray-200 text-sm"
+    >
+      {{ t("No AI media providers available.") }}
+    </div>
+
+    <div
+      v-else
+      class="space-y-4"
+    >
+      <!-- Type (image/video) -->
+      <div
+        v-if="typeOptions.length > 1"
+        class="space-y-1"
+      >
+        <label class="font-semibold text-sm">{{ t("Type") }}</label>
+        <Dropdown
+          v-model="selectedType"
+          :options="typeOptions"
+          optionLabel="label"
+          optionValue="value"
+          class="w-full"
+        />
+      </div>
+
+      <!-- Provider -->
+      <div
+        v-if="providerOptions.length > 1"
+        class="space-y-1"
+      >
+        <label class="font-semibold text-sm">{{ t("Provider") }}</label>
+        <Dropdown
+          v-model="selectedProvider"
+          :options="providerOptions"
+          optionLabel="label"
+          optionValue="value"
+          :placeholder="t('Select a provider')"
+          class="w-full"
+        />
+      </div>
+
+      <!-- Folder -->
+      <div class="space-y-1">
+        <label class="font-semibold text-sm">{{ t("Destination folder") }}</label>
+        <Dropdown
+          v-model="selectedFolderId"
+          :options="folders"
+          optionLabel="label"
+          optionValue="value"
+          :placeholder="t('Select a folder')"
+          class="w-full"
+        />
+      </div>
+
+      <!-- Name -->
+      <div class="space-y-1">
+        <label class="font-semibold text-sm">{{ t("File name") }}</label>
+        <InputText
+          v-model="fileName"
+          class="w-full"
+          :placeholder="t('Example: generated_media')"
+        />
+        <p class="text-xs text-gray-600">
+          {{ t("The name is not added to the prompt; it is only used for saving the file.") }}
+        </p>
+      </div>
+
+      <!-- Prompt -->
+      <div class="space-y-1">
+        <label class="font-semibold text-sm">{{ t("Prompt") }}</label>
+        <textarea
+          v-model="prompt"
+          class="w-full border border-gray-300 rounded px-3 py-2 min-h-[140px]"
+          :placeholder="t('Describe what you want to generate...')"
+        />
+      </div>
+
+      <!-- Actions -->
+      <div class="flex flex-wrap items-center gap-2">
+        <BaseButton
+          :label="isGenerating ? t('Generating...') : t('Generate')"
+          icon="robot"
+          type="primary"
+          :disabled="!canGenerate || isGenerating || isSaving || isPollingVideoJob"
+          @click="generate"
+        />
+
+        <BaseButton
+          v-if="hasGeneratedResult"
+          :label="isSaving ? t('Saving...') : t('Save to Documents')"
+          icon="check"
+          type="secondary"
+          :disabled="!canAccept || isSaving || isGenerating || isPollingVideoJob"
+          @click="acceptAndSave"
+        />
+
+        <span
+          v-if="statusMessage"
+          class="text-sm text-gray-700"
+        >
+          {{ statusMessage }}
+        </span>
+      </div>
+
+      <!-- Video job status -->
+      <div
+        v-if="selectedType === 'video' && isPollingVideoJob"
+        class="p-3 rounded border border-blue-200 bg-blue-50 text-sm"
+      >
+        <div class="font-semibold">{{ t("Video generation is in progress") }}</div>
+        <div class="mt-1">
+          {{ t("Job") }}: <code>{{ videoJobId }}</code>
+          <span v-if="videoJobStatus">
+            — {{ t("Status") }}: <strong>{{ videoJobStatus }}</strong></span
+          >
+        </div>
+      </div>
+
+      <!-- Preview -->
+      <div
+        v-if="previewUrl"
+        class="space-y-2"
+      >
+        <h3 class="font-semibold">{{ t("Preview") }}</h3>
+
+        <img
+          v-if="selectedType === 'image'"
+          :src="previewUrl"
+          class="max-w-full rounded border border-gray-200"
+          alt="Generated preview"
+        />
+
+        <video
+          v-else
+          :src="previewUrl"
+          class="max-w-full rounded border border-gray-200"
+          controls
+        />
+      </div>
+
+      <!-- Revised prompt -->
+      <div
+        v-if="revisedPrompt"
+        class="space-y-1"
+      >
+        <h3 class="font-semibold">{{ t("Modified prompt") }}</h3>
+        <textarea
+          :value="revisedPrompt"
+          class="w-full border border-gray-300 rounded px-3 py-2 min-h-[120px] bg-gray-50"
+          readonly
+        />
+      </div>
+
+      <!-- Saved -->
+      <div
+        v-if="savedIri"
+        class="p-3 rounded border border-green-200 bg-green-50 text-sm"
+      >
+        <div class="font-semibold">{{ t("Saved in Documents") }}</div>
+        <div class="mt-1">
+          {{ t("Document IRI") }}: <code>{{ savedIri }}</code>
+        </div>
+        <div class="mt-3">
+          <BaseButton
+            :label="t('Go to folder')"
+            icon="folder-open"
+            type="secondary"
+            @click="goToFolder"
+          />
+        </div>
+      </div>
+
+      <!-- Provider used -->
+      <div
+        v-if="providerUsed"
+        class="text-xs text-gray-600"
+      >
+        {{ t("Provider used") }}: <strong>{{ providerLabel(providerUsed) }}</strong>
+      </div>
+
+      <!-- Video note -->
+      <div
+        v-if="hasGeneratedResult && selectedType === 'video' && !canAccept && !isPollingVideoJob"
+        class="p-3 rounded border border-yellow-200 bg-yellow-50 text-sm"
+      >
+        <div class="font-semibold">{{ t("This video result cannot be saved yet") }}</div>
+        <div class="mt-1">
+          {{
+            t(
+              "Saving is only supported when the provider returns base64 content. If you only received a URL, saving is disabled to avoid downloading in the browser.",
+            )
+          }}
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { computed, onBeforeUnmount, onMounted, ref, watch } from "vue"
+import axios from "axios"
+import { useRoute, useRouter } from "vue-router"
+import { useI18n } from "vue-i18n"
+import { useCidReq } from "../../composables/cidReq"
+import { RESOURCE_LINK_PUBLISHED } from "../../constants/entity/resourcelink"
+import BaseToolbar from "../../components/basecomponents/BaseToolbar.vue"
+import BaseButton from "../../components/basecomponents/BaseButton.vue"
+import { usePlatformConfig } from "../../store/platformConfig"
+import { useCourseSettings } from "../../store/courseSettingStore"
+import { useSecurityStore } from "../../store/securityStore"
+import { checkIsAllowedToEdit } from "../../composables/userPermissions"
+
+const route = useRoute()
+const router = useRouter()
+const { t } = useI18n()
+const { cid, sid, gid } = useCidReq()
+
+const platformConfig = usePlatformConfig()
+const courseSettingsStore = useCourseSettings()
+const securityStore = useSecurityStore()
+
+const isLoadingCaps = ref(false)
+
+const hasImage = ref(false)
+const hasVideo = ref(false)
+
+const providersByType = ref({ image: [], video: [] })
+const selectedType = ref("image")
+const selectedProvider = ref(null)
+
+const folders = ref([])
+const selectedFolderId = ref(null)
+
+const fileName = ref("")
+const prompt = ref("")
+const revisedPrompt = ref("")
+const previewUrl = ref("")
+const savedIri = ref("")
+const providerUsed = ref("")
+
+// Generated result kept in memory until teacher accepts it.
+const generatedResult = ref(null)
+
+const isGenerating = ref(false)
+const isSaving = ref(false)
+const statusMessage = ref("")
+
+const rawCanEdit = ref(false)
+const canEdit = computed(() => !!rawCanEdit.value)
+
+// Video polling state (OpenAI video is job-based).
+const isPollingVideoJob = ref(false)
+const videoJobId = ref("")
+const videoJobStatus = ref("")
+let videoPollTimeoutHandle = null
+let videoPollAttempts = 0
+
+// Polling config (best effort defaults).
+const VIDEO_POLL_INTERVAL_MS = 3000
+const VIDEO_POLL_MAX_ATTEMPTS = 80
+
+// Platform + course settings (same pattern as LP generator)
+const aiHelpersEnabled = computed(() => {
+  const v = String(platformConfig.getSetting("ai_helpers.enable_ai_helpers"))
+  return v === "true"
+})
+
+const imageGeneratorEnabled = computed(() => {
+  const v = String(courseSettingsStore?.getSetting?.("image_generator"))
+  return v === "true"
+})
+
+const videoGeneratorEnabled = computed(() => {
+  const v = String(courseSettingsStore?.getSetting?.("video_generator"))
+  return v === "true"
+})
+
+function providerLabel(code) {
+  const c = String(code || "")
+    .toLowerCase()
+    .trim()
+
+  const map = {
+    openai: "OpenAI",
+    deepseek: "DeepSeek",
+    grok: "Grok",
+    mistral: "Mistral",
+    gemini: "Gemini",
+  }
+
+  return map[c] || c.toUpperCase()
+}
+
+function normalizeProviderList(input) {
+  // capabilities.types.image => string[]
+  if (!Array.isArray(input)) return []
+  return input
+    .map((p) => String(p || "").trim())
+    .filter(Boolean)
+    .map((code) => ({
+      code,
+      name: providerLabel(code),
+    }))
+}
+
+const canUseImage = computed(() => {
+  return canEdit.value && aiHelpersEnabled.value && imageGeneratorEnabled.value && hasImage.value
+})
+
+const canUseVideo = computed(() => {
+  return canEdit.value && aiHelpersEnabled.value && videoGeneratorEnabled.value && hasVideo.value
+})
+
+const canUseAnyType = computed(() => canUseImage.value || canUseVideo.value)
+
+const typeOptions = computed(() => {
+  const opts = []
+  if (canUseImage.value) opts.push({ label: t("Image"), value: "image" })
+  if (canUseVideo.value) opts.push({ label: t("Video"), value: "video" })
+  return opts
+})
+
+const providerOptions = computed(() => {
+  const list = providersByType.value?.[selectedType.value] || []
+  return list.map((p) => ({ label: p.name, value: p.code }))
+})
+
+watch(
+  () => selectedType.value,
+  () => {
+    // Reset generation state when switching type to avoid accidental saves.
+    stopVideoPolling("Type changed by user.")
+    generatedResult.value = null
+    previewUrl.value = ""
+    revisedPrompt.value = ""
+    providerUsed.value = ""
+    savedIri.value = ""
+    statusMessage.value = ""
+
+    const list = providersByType.value?.[selectedType.value] || []
+    selectedProvider.value = list[0]?.code ?? null
+  },
+)
+
+watch(
+  () => selectedProvider.value,
+  () => {
+    // Provider changes should cancel any existing polling to avoid mixing providers/jobs.
+    if (isPollingVideoJob.value) {
+      stopVideoPolling("Provider changed by user.")
+      statusMessage.value = t("Video polling was stopped because the provider changed.")
+    }
+  },
+)
+
+const canGenerate = computed(() => {
+  return (
+    canUseAnyType.value &&
+    !!selectedType.value &&
+    !!selectedProvider.value &&
+    !!selectedFolderId.value &&
+    !!fileName.value?.trim() &&
+    !!prompt.value?.trim()
+  )
+})
+
+const hasGeneratedResult = computed(() => !!generatedResult.value)
+
+const canAccept = computed(() => {
+  // We only support saving when we have base64 content.
+  // This avoids frontend downloading URLs.
+  if (!generatedResult.value) return false
+  if (!generatedResult.value.is_base64) return false
+  if (!generatedResult.value.content) return false
+  return true
+})
+
+function normalizeResourceNodeId(value) {
+  if (value == null) return null
+  if (typeof value === "number") return value
+
+  if (typeof value === "string") {
+    const iriMatch = value.match(/\/api\/resource_nodes\/(\d+)/)
+    if (iriMatch) return Number(iriMatch[1])
+    if (/^\d+$/.test(value)) return Number(value)
+  }
+
+  return null
+}
+
+function sanitizeFilenameBase(name) {
+  // Keep it predictable for filesystem + UX.
+  const raw = String(name || "").trim()
+  if (!raw) return "generated_media"
+
+  return (
+    raw
+      .replace(/[\\/:"*?<>|]+/g, "_") // Windows forbidden chars + slashes
+      .replace(/\s+/g, "_")
+      .replace(/_+/g, "_")
+      .replace(/^_+|_+$/g, "")
+      .slice(0, 80) || "generated_media"
+  )
+}
+
+function guessExtension(contentType, type) {
+  const ct = String(contentType || "").toLowerCase()
+
+  if (type === "image") {
+    if (ct.includes("png")) return "png"
+    if (ct.includes("jpeg") || ct.includes("jpg")) return "jpg"
+    if (ct.includes("webp")) return "webp"
+    if (ct.includes("gif")) return "gif"
+    return "png"
+  }
+
+  if (ct.includes("webm")) return "webm"
+  if (ct.includes("mp4")) return "mp4"
+  return "mp4"
+}
+
+function ensureFilenameWithExtension(name, ext) {
+  const base = sanitizeFilenameBase(name)
+  if (/\.[a-z0-9]+$/i.test(base)) return base
+  return `${base}.${ext}`
+}
+
+function base64ToFile(base64, filename, mime) {
+  const binary = atob(base64)
+  const bytes = new Uint8Array(binary.length)
+
+  for (let i = 0; i < binary.length; i++) {
+    bytes[i] = binary.charCodeAt(i)
+  }
+
+  const blob = new Blob([bytes], { type: mime })
+  return new File([blob], filename, { type: mime })
+}
+
+function buildResourceLinkList() {
+  return JSON.stringify([{ gid, sid, cid, visibility: RESOURCE_LINK_PUBLISHED }])
+}
+
+async function saveToDocuments(file, type) {
+  const formData = new FormData()
+
+  // Must match CreateDocumentFileAction schema.
+  formData.append("uploadFile", file)
+
+  // Title without extension usually looks better in Documents listings.
+  const titleNoExt = String(file.name).replace(/\.[^/.]+$/i, "")
+  formData.append("title", titleNoExt)
+  formData.append("filetype", "file")
+
+  formData.append("parentResourceNodeId", String(selectedFolderId.value))
+  formData.append("resourceLinkList", buildResourceLinkList())
+  formData.append("fileExistsOption", "rename")
+
+  const response = await axios.post("/api/documents", formData, {
+    headers: { "Content-Type": "multipart/form-data" },
+  })
+
+  const data = response?.data || {}
+  savedIri.value = String(data?.["@id"] || data?.id || "")
+
+  return data
+}
+
+async function fetchFolders(nodeId = null) {
+  const startId = normalizeResourceNodeId(nodeId ?? route.params.node ?? route.query.node)
+
+  // In this route (/resources/document/:node/) startId should exist, but keep a safe fallback.
+  const safeStart = startId || null
+  const foldersList = safeStart ? [{ label: t("Documents"), value: safeStart }] : []
+
+  if (!safeStart) {
+    console.warn("[AI Media] No valid start node id found for folders.")
+    return foldersList
+  }
+
+  try {
+    const queue = [{ id: safeStart, path: "" }]
+    const maxDepth = 5
+    let depth = 0
+
+    while (queue.length > 0 && depth < maxDepth) {
+      const current = queue.shift()
+      const currentNodeId = normalizeResourceNodeId(current?.id)
+
+      if (!currentNodeId) {
+        depth++
+        continue
+      }
+
+      const response = await axios.get("/api/documents", {
+        params: {
+          loadNode: 1,
+          filetype: ["folder"],
+          "resourceNode.parent": currentNodeId,
+          cid,
+          sid,
+          gid,
+          page: 1,
+          itemsPerPage: 200,
+        },
+      })
+
+      const members = response.data?.["hydra:member"] || []
+      for (const folder of members) {
+        const folderNodeId =
+          normalizeResourceNodeId(folder?.resourceNode?.id) ?? normalizeResourceNodeId(folder?.resourceNodeId)
+
+        if (!folderNodeId) continue
+
+        const fullPath = `${current.path}/${folder.title}`.replace(/^\/+/, "")
+        foldersList.push({ label: fullPath, value: folderNodeId })
+        queue.push({ id: folderNodeId, path: fullPath })
+      }
+
+      depth++
+    }
+  } catch (e) {
+    console.error("[AI Media] Failed to fetch folders:", e)
+  }
+
+  return foldersList
+}
+
+async function loadCapabilities() {
+  isLoadingCaps.value = true
+
+  try {
+    const { data } = await axios.get("/ai/capabilities")
+
+    // Raw availability from backend (providers exist).
+    hasImage.value = !!data?.has?.image
+    hasVideo.value = !!data?.has?.video
+
+    providersByType.value = {
+      image: normalizeProviderList(data?.types?.image),
+      video: normalizeProviderList(data?.types?.video),
+    }
+
+    // Pick a type that is actually usable under settings + capabilities.
+    const usableImage = canUseImage.value && providersByType.value.image.length > 0
+    const usableVideo = canUseVideo.value && providersByType.value.video.length > 0
+
+    if (!usableImage && usableVideo) {
+      selectedType.value = "video"
+    } else {
+      selectedType.value = "image"
+    }
+
+    const list = providersByType.value?.[selectedType.value] || []
+    selectedProvider.value = list[0]?.code ?? null
+  } catch (e) {
+    console.error("[AI Media] Failed to load capabilities:", e)
+    hasImage.value = false
+    hasVideo.value = false
+    providersByType.value = { image: [], video: [] }
+  } finally {
+    isLoadingCaps.value = false
+  }
+}
+function stopVideoPolling(reason = "") {
+  if (videoPollTimeoutHandle) {
+    clearTimeout(videoPollTimeoutHandle)
+    videoPollTimeoutHandle = null
+  }
+
+  if (isPollingVideoJob.value) {
+    console.info("[AI Media] Video polling stopped.", reason ? `Reason: ${reason}` : "")
+  }
+
+  isPollingVideoJob.value = false
+  videoPollAttempts = 0
+  videoJobId.value = ""
+  videoJobStatus.value = ""
+}
+
+async function pollVideoJobOnce(jobId, providerCode) {
+  // Server-side polling endpoint.
+  // Expected: { success: true, text?: string, result: { id, status, is_base64, content, url, content_type, error? } }.
+  const response = await axios.get(`/ai/video_job/${encodeURIComponent(jobId)}`, {
+    params: {
+      ai_provider: providerCode || null,
+    },
+  })
+
+  return response?.data
+}
+
+async function pollVideoJob(jobId, providerCode) {
+  if (!isPollingVideoJob.value) return
+
+  videoPollAttempts += 1
+  if (videoPollAttempts > VIDEO_POLL_MAX_ATTEMPTS) {
+    console.warn("[AI Media] Video polling reached maximum attempts.")
+    statusMessage.value = t("Video generation is taking too long. Please try again later.")
+    stopVideoPolling("Max attempts reached.")
+    return
+  }
+
+  try {
+    const data = await pollVideoJobOnce(jobId, providerCode)
+
+    if (!data?.success) {
+      const msg = String(data?.text || "")
+      console.warn("[AI Media] Video job status request failed:", msg)
+      statusMessage.value = msg || t("Failed to check video status.")
+      scheduleNextVideoPoll(jobId, providerCode)
+      return
+    }
+
+    const result = data?.result || {}
+    const status = String(result.status || "")
+    videoJobStatus.value = status
+
+    // Prefer a provider/server error message when available.
+    const serverError = String(result.error || data?.text || "").trim()
+
+    // Update stored result (job-based).
+    generatedResult.value = {
+      ...(generatedResult.value || {}),
+      id: jobId,
+      status,
+      content: String(result.content || ""),
+      url: String(result.url || ""),
+      is_base64: !!result.is_base64,
+      content_type: String(result.content_type || "video/mp4"),
+      error: serverError || "",
+    }
+
+    if (isTerminalVideoStatus(status)) {
+      if (isSuccessVideoStatus(status)) {
+        const isBase64 = !!result.is_base64
+        const content = String(result.content || "")
+        const url = String(result.url || "")
+        const contentType = String(result.content_type || "video/mp4")
+
+        if (isBase64 && content) {
+          previewUrl.value = `data:${contentType};base64,${content}`
+          statusMessage.value = t("Video generated successfully. You can now save it.")
+        } else if (!isBase64 && url) {
+          previewUrl.value = url
+          statusMessage.value = t(
+            "Video generated successfully, but saving is disabled because the provider returned a URL.",
+          )
+        } else {
+          statusMessage.value = t("Video generation completed, but no playable content was returned.")
+        }
+      } else {
+        statusMessage.value = serverError ? serverError : t("Video generation failed.")
+      }
+
+      stopVideoPolling("Terminal status reached.")
+      return
+    }
+
+    statusMessage.value = t("Waiting for the video to be ready...")
+    scheduleNextVideoPoll(jobId, providerCode)
+  } catch (e) {
+    console.error("[AI Media] Video polling failed:", e)
+    statusMessage.value = t("Failed to check video status.")
+    scheduleNextVideoPoll(jobId, providerCode)
+  }
+}
+
+function isTerminalVideoStatus(status) {
+  const s = String(status || "")
+    .toLowerCase()
+    .trim()
+  return ["completed", "succeeded", "done", "failed", "canceled", "cancelled", "error"].includes(s)
+}
+
+function isSuccessVideoStatus(status) {
+  const s = String(status || "")
+    .toLowerCase()
+    .trim()
+  return ["completed", "succeeded", "done"].includes(s)
+}
+
+function scheduleNextVideoPoll(jobId, providerCode) {
+  videoPollTimeoutHandle = setTimeout(async () => {
+    await pollVideoJob(jobId, providerCode)
+  }, VIDEO_POLL_INTERVAL_MS)
+}
+
+function startVideoPolling(jobId, providerCode) {
+  stopVideoPolling("Restart polling with a new job.")
+  isPollingVideoJob.value = true
+  videoJobId.value = String(jobId || "")
+  videoJobStatus.value = ""
+  videoPollAttempts = 0
+
+  console.info("[AI Media] Video polling started.", `Job: ${jobId}`, providerCode ? `Provider: ${providerCode}` : "")
+  scheduleNextVideoPoll(jobId, providerCode)
+}
+
+async function generate() {
+  stopVideoPolling("New generation requested.")
+  statusMessage.value = ""
+  revisedPrompt.value = ""
+  previewUrl.value = ""
+  savedIri.value = ""
+  providerUsed.value = ""
+  generatedResult.value = null
+  videoJobId.value = ""
+  videoJobStatus.value = ""
+
+  if (!canGenerate.value) {
+    statusMessage.value = t("Please complete all fields.")
+    return
+  }
+
+  // Extra guard if user toggled type manually.
+  if (selectedType.value === "image" && !canUseImage.value) {
+    statusMessage.value = t("Image generation is not enabled for this course.")
+    return
+  }
+  if (selectedType.value === "video" && !canUseVideo.value) {
+    statusMessage.value = t("Video generation is not enabled for this course.")
+    return
+  }
+
+  isGenerating.value = true
+
+  try {
+    const endpoint = selectedType.value === "video" ? "/ai/generate_video" : "/ai/generate_image"
+
+    const { data } = await axios.post(
+      endpoint,
+      {
+        n: 1,
+        language: "en",
+        prompt: prompt.value,
+        tool: "document",
+        ai_provider: selectedProvider.value,
+      },
+      { headers: { "Content-Type": "application/json" } },
+    )
+
+    if (!data?.success) {
+      const msg = String(data?.text || "")
+      console.warn("[AI Media] Generation failed:", msg)
+      statusMessage.value = msg ? msg : t("Generation failed.")
+      return
+    }
+
+    providerUsed.value = String(data?.provider_used || selectedProvider.value || "")
+    const result = data?.result || {}
+
+    const content = String(result.content || "")
+    const url = String(result.url || "")
+    const id = String(result.id || "")
+    const status = String(result.status || "")
+    const isBase64 = !!result.is_base64
+    const contentType = String(result.content_type || (selectedType.value === "video" ? "video/mp4" : "image/png"))
+    revisedPrompt.value = String(result.revised_prompt || "")
+
+    generatedResult.value = {
+      id: id || null,
+      status: status || null,
+      content,
+      url,
+      is_base64: isBase64,
+      content_type: contentType,
+    }
+
+    // Preview logic:
+    // - Image: backend should return base64 (preferred).
+    // - Video: can be base64, url, or job-based id/status.
+    if (isBase64 && content) {
+      previewUrl.value = `data:${contentType};base64,${content}`
+      statusMessage.value = t("Generated successfully. Review the preview and save when ready.")
+      return
+    }
+
+    if (!isBase64 && url) {
+      previewUrl.value = url
+      statusMessage.value = t("Generated successfully. Saving is disabled because the provider returned a URL.")
+      return
+    }
+
+    // Job-based video: start polling until we get content or url.
+    if (selectedType.value === "video" && id) {
+      statusMessage.value = t("Video generation started. Waiting for the result...")
+      startVideoPolling(id, providerUsed.value || selectedProvider.value)
+      return
+    }
+
+    console.warn("[AI Media] AI returned an empty or unsupported payload:", result)
+    statusMessage.value = t("AI returned an empty response.")
+    generatedResult.value = null
+  } catch (e) {
+    console.error("[AI Media] Generate failed:", e)
+    statusMessage.value = t("Generation failed.")
+  } finally {
+    isGenerating.value = false
+  }
+}
+
+async function acceptAndSave() {
+  statusMessage.value = ""
+
+  if (!generatedResult.value) {
+    statusMessage.value = t("Nothing to save yet.")
+    return
+  }
+
+  // We only save base64 results to avoid frontend downloading URLs.
+  if (!generatedResult.value.is_base64 || !generatedResult.value.content) {
+    statusMessage.value = t("This provider did not return base64 content. Please try another provider.")
+    return
+  }
+
+  isSaving.value = true
+
+  try {
+    const ext = guessExtension(generatedResult.value.content_type, selectedType.value)
+    const finalName = ensureFilenameWithExtension(fileName.value, ext)
+
+    const mime = generatedResult.value.content_type || (selectedType.value === "video" ? "video/mp4" : "image/png")
+
+    const file = base64ToFile(generatedResult.value.content, finalName, mime)
+
+    const savedDoc = await saveToDocuments(file, selectedType.value)
+
+    // Build a human-readable path for success message.
+    const folderLabel =
+      folders.value.find((f) => Number(f.value) === Number(selectedFolderId.value))?.label || t("Documents")
+
+    // Prefer backend title because it may have renamed due to conflicts.
+    const savedTitle =
+      String(savedDoc?.resourceNode?.title || savedDoc?.title || "").trim() ||
+      String(file.name).replace(/\.[^/.]+$/i, "")
+
+    const savedPath = `${folderLabel}/${savedTitle}`.replace(/^\/+/, "")
+
+    // Redirect to folder list and show toast there (via query params).
+    router.push({
+      name: "DocumentsList",
+      params: { node: selectedFolderId.value },
+      query: {
+        ...route.query,
+        cid,
+        sid,
+        gid,
+        ai_saved: "1",
+        ai_saved_path: savedPath,
+        ai_saved_iri: String(savedDoc?.["@id"] || ""),
+      },
+    })
+  } catch (e) {
+    console.error("[AI Media] Save failed:", e)
+    statusMessage.value = t("Saving failed.")
+  } finally {
+    isSaving.value = false
+  }
+}
+
+function goToFolder() {
+  router.push({
+    name: "DocumentsList",
+    params: { node: selectedFolderId.value },
+    query: { ...route.query, cid, sid, gid },
+  })
+}
+
+onMounted(async () => {
+  // Load course settings (same pattern as LP generator usage).
+  try {
+    await courseSettingsStore.loadCourseSettings(cid, sid)
+  } catch (e) {
+    console.error("[AI Media] loadCourseSettings failed:", e)
+  }
+
+  // Permission check (teacher/admin).
+  try {
+    let allowed = await checkIsAllowedToEdit(true, true, true, false)
+    const roles = securityStore.user?.roles ?? []
+
+    if (!allowed && Array.isArray(roles) && (roles.includes("ROLE_ADMIN") || roles.includes("ROLE_GLOBAL_ADMIN"))) {
+      allowed = true
+    }
+
+    rawCanEdit.value = !!allowed
+  } catch (e) {
+    console.error("[AI Media] Permission check failed:", e)
+    rawCanEdit.value = false
+  }
+
+  // Only load capabilities if the feature is usable by settings + permissions.
+  if (canEdit.value && aiHelpersEnabled.value && (imageGeneratorEnabled.value || videoGeneratorEnabled.value)) {
+    await loadCapabilities()
+  }
+
+  folders.value = await fetchFolders()
+  selectedFolderId.value = normalizeResourceNodeId(route.params.node) || folders.value[0]?.value || null
+
+  // Ensure selected type is valid when only one is available.
+  if (typeOptions.value.length === 1) {
+    selectedType.value = typeOptions.value[0].value
+  }
+})
+
+onBeforeUnmount(() => {
+  // Prevent orphan polling timers when leaving the page.
+  stopVideoPolling("Component unmounted.")
+})
+</script>
diff --git a/assets/vue/views/documents/DocumentsList.vue b/assets/vue/views/documents/DocumentsList.vue
index 479f5bc1912..cde4b9ce333 100644
--- a/assets/vue/views/documents/DocumentsList.vue
+++ b/assets/vue/views/documents/DocumentsList.vue
@@ -98,6 +98,14 @@
       only-icon
       type="primary"
     />
+    <BaseButton
+      v-if="showGenerateMediaButton"
+      :label="t('Generate media')"
+      icon="robot"
+      only-icon
+      type="black"
+      @click="goToGenerateMedia"
+    />
   </SectionHeader>
 
   <BaseTable
@@ -349,9 +357,7 @@
         icon="alert"
         size="big"
       />
-      <span v-if="item"
-      >{{ t("Are you sure you want to delete {0}?", [item.title]) }}</span
-      >
+      <span v-if="item">{{ t("Are you sure you want to delete {0}?", [item.title]) }}</span>
     </div>
   </BaseDialogConfirmCancel>
 
@@ -478,7 +484,7 @@ import { RESOURCE_LINK_DRAFT, RESOURCE_LINK_PUBLISHED } from "../../constants/en
 import { isEmpty } from "lodash"
 import { useRoute, useRouter } from "vue-router"
 import { useI18n } from "vue-i18n"
-import { computed, onMounted, ref, watch } from "vue"
+import { computed, onMounted, ref, unref, watch } from "vue"
 import { useCidReq } from "../../composables/cidReq"
 import { useDatatableList } from "../../composables/datatableList"
 import { useFormatDate } from "../../composables/formatDate"
@@ -502,13 +508,27 @@ import SectionHeader from "../../components/layout/SectionHeader.vue"
 import { checkIsAllowedToEdit } from "../../composables/userPermissions"
 import { usePlatformConfig } from "../../store/platformConfig"
 import BaseTable from "../../components/basecomponents/BaseTable.vue"
+import { useCourseSettings } from "../../store/courseSettingStore"
 
 const store = useStore()
 const route = useRoute()
 const router = useRouter()
 const securityStore = useSecurityStore()
-
+const courseSettingsStore = useCourseSettings()
 const platformConfigStore = usePlatformConfig()
+
+const aiHelpersEnabled = computed(() => {
+  return String(platformConfigStore.getSetting("ai_helpers.enable_ai_helpers")) === "true"
+})
+
+const imageGeneratorEnabled = computed(() => {
+  return String(courseSettingsStore?.getSetting?.("image_generator")) === "true"
+})
+
+const videoGeneratorEnabled = computed(() => {
+  return String(courseSettingsStore?.getSetting?.("video_generator")) === "true"
+})
+
 const allowAccessUrlFiles = computed(
   () => "false" !== platformConfigStore.getSetting("document.access_url_specific_files"),
 )
@@ -619,8 +639,28 @@ onMounted(async () => {
   await loadAllFolders()
   options.value.itemsPerPage = resolveDefaultRows(totalItems.value || 0)
   onUpdateOptions(options.value)
+  try {
+    await courseSettingsStore.loadCourseSettings(cid, sid)
+  } catch (e) {
+    console.error("[AI] loadCourseSettings failed:", e)
+  }
+  await loadAiCapabilities()
+  consumeAiSavedToast()
 })
 
+watch(
+  () => [
+    unref(cid),
+    unref(sid),
+    unref(gid),
+    aiHelpersEnabled.value,
+    imageGeneratorEnabled.value,
+    videoGeneratorEnabled.value,
+  ],
+  () => loadAiCapabilities(),
+  { immediate: true },
+)
+
 watch(totalItems, (n) => {
   const def = Number(platformConfigStore.getSetting("display.table_default_row", 10))
   if (def === 0 && n) {
@@ -955,23 +995,22 @@ function showSlideShowWithFirstImage() {
 async function showUsageDialog() {
   try {
     const response = await axios.get(`/api/documents/${cid}/usage`, {
-      headers: { Accept: 'application/json' },
+      headers: { Accept: "application/json" },
       params: { sid, gid },
     })
 
     usageData.value = response.data
   } catch (error) {
-    console.error('Error fetching documents quota usage:', error)
+    console.error("Error fetching documents quota usage:", error)
     usageData.value = {
       datasets: [{ data: [100] }],
-      labels: [t('Storage usage unavailable')],
+      labels: [t("Storage usage unavailable")],
     }
   }
 
   isFileUsageDialogVisible.value = true
 }
 
-
 function showRecordAudioDialog() {
   isRecordAudioDialogVisible.value = true
 }
@@ -1275,4 +1314,82 @@ const submitTemplateForm = async () => {
     notification.showErrorNotification(t("Error submitting the form."))
   }
 }
+
+const hasAiImage = ref(false)
+const hasAiVideo = ref(false)
+
+const showGenerateMediaButton = computed(() => {
+  if (!isCurrentTeacher.value) return false
+  if (!aiHelpersEnabled.value) return false
+
+  const canImage = imageGeneratorEnabled.value && hasAiImage.value
+  const canVideo = !isCertificateMode.value && videoGeneratorEnabled.value && hasAiVideo.value
+
+  return canImage || canVideo
+})
+
+async function loadAiCapabilities() {
+  if (!aiHelpersEnabled.value || (!imageGeneratorEnabled.value && !videoGeneratorEnabled.value)) {
+    hasAiImage.value = false
+    hasAiVideo.value = false
+    return
+  }
+
+  try {
+    const { data } = await axios.get("/ai/capabilities", {
+      params: {
+        cid: unref(cid),
+        sid: unref(sid),
+        gid: unref(gid),
+      },
+      headers: { Accept: "application/json" },
+    })
+
+    console.warn("[AI] capabilities:", data)
+
+    const backendHasImage = !!(data?.has?.image ?? data?.image)
+    const backendHasVideo = !!(data?.has?.video ?? data?.video)
+
+    hasAiImage.value = imageGeneratorEnabled.value && backendHasImage
+    hasAiVideo.value = videoGeneratorEnabled.value && backendHasVideo
+  } catch (e) {
+    console.error("[AI] Failed to load capabilities:", e?.response || e)
+    hasAiImage.value = false
+    hasAiVideo.value = false
+  }
+}
+
+function goToGenerateMedia() {
+  router.push({
+    name: "DocumentsGenerateMedia",
+    params: { node: route.params.node },
+    query: { ...route.query, cid, sid, gid },
+  })
+}
+
+function consumeAiSavedToast() {
+  // Show toast only once after redirect from AI generator.
+  if (String(route.query.ai_saved || "") !== "1") {
+    return
+  }
+
+  const path = String(route.query.ai_saved_path || "").trim()
+  if (path) {
+    notification.showSuccessNotification(`${t("Saved")}: ${path}`)
+  } else {
+    notification.showSuccessNotification(t("Saved"))
+  }
+
+  // Remove params so it doesn't show again on refresh/back.
+  const newQuery = { ...route.query }
+  delete newQuery.ai_saved
+  delete newQuery.ai_saved_path
+  delete newQuery.ai_saved_iri
+
+  router.replace({
+    name: route.name,
+    params: route.params,
+    query: newQuery,
+  })
+}
 </script>
diff --git a/public/main/inc/lib/course.lib.php b/public/main/inc/lib/course.lib.php
index 16c6c7e762a..2908c4945ea 100644
--- a/public/main/inc/lib/course.lib.php
+++ b/public/main/inc/lib/course.lib.php
@@ -5440,6 +5440,14 @@ public static function getCourseSettingVariables(AppPlugin $appPlugin = null)
             'subscribe_users_to_forum_notifications',
             'learning_path_generator',
             'exercise_generator',
+            'open_answers_grader',
+            'tutor_chatbot',
+            'task_grader',
+            'content_analyser',
+            'image_generator',
+            'glossary_terms_generator',
+            'video_generator',
+            'course_analyser',
         ];
 
         $courseModels = ExerciseLib::getScoreModels();
diff --git a/src/CoreBundle/AiProvider/AiImageProviderInterface.php b/src/CoreBundle/AiProvider/AiImageProviderInterface.php
index 79c0d168bdf..efcda2e7e9e 100644
--- a/src/CoreBundle/AiProvider/AiImageProviderInterface.php
+++ b/src/CoreBundle/AiProvider/AiImageProviderInterface.php
@@ -11,11 +11,20 @@ interface AiImageProviderInterface
     /**
      * Generate an image.
      *
-     * @param string $prompt   The complete prompt, with language, question, context and answer
-     * @param string $toolName A tag, e.g. 'open_answer_grade'.
-     * @param ?array $options  An array of options (format etc.)
+     * @param string $prompt   The prompt to generate an image from
+     * @param string $toolName A tag, e.g. 'document_image_generate'
+     * @param ?array  $options Provider-specific options
      *
-     * @return ?string The raw text of the image in base64, or a URL
+     * @return string|array|null
+     *  - string: legacy mode (base64 or URL)
+     *  - array: structured response for UI (preferred)
+     *      [
+     *          'content' => string (base64),
+     *          'url' => string,
+     *          'is_base64' => bool,
+     *          'content_type' => string,
+     *          'revised_prompt' => ?string
+     *      ]
      */
-    public function generateImage(string $prompt, string $toolName, ?array $options = []): ?string;
+    public function generateImage(string $prompt, string $toolName, ?array $options = []): string|array|null;
 }
diff --git a/src/CoreBundle/AiProvider/AiProviderFactory.php b/src/CoreBundle/AiProvider/AiProviderFactory.php
index 88d48da60d0..5074b70b9a7 100644
--- a/src/CoreBundle/AiProvider/AiProviderFactory.php
+++ b/src/CoreBundle/AiProvider/AiProviderFactory.php
@@ -13,31 +13,32 @@
 use Symfony\Bundle\SecurityBundle\Security;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 
-class AiProviderFactory
+final class AiProviderFactory
 {
-    private array $providers;
-    private array $providersByType;
+    /**
+     * @var array<string, array<string, object>>
+     */
+    private array $providers = [];
+
+    /**
+     * @var array<string, array<string, object>>
+     */
+    private array $providersByType = [];
+
     private string $defaultProvider;
-    private AiRequestsRepository $aiRequestsRepository;
-    private Security $security;
 
     public function __construct(
-        HttpClientInterface $httpClient,
-        SettingsManager $settingsManager,
-        AiRequestsRepository $aiRequestsRepository,
-        Security $security
+        private readonly HttpClientInterface $httpClient,
+        private readonly SettingsManager $settingsManager,
+        private readonly AiRequestsRepository $aiRequestsRepository,
+        private readonly Security $security
     ) {
-        $this->aiRequestsRepository = $aiRequestsRepository;
-        $this->security = $security;
+        $config = $this->readProvidersConfig();
 
-        // Get AI providers from settings
-        $configJson = $settingsManager->getSetting('ai_helpers.ai_providers', true);
-        $config = json_decode($configJson, true) ?? [];
-
-        // Get the first available provider from configuration as default
+        // Default provider = first key in config (if any)
         $this->defaultProvider = array_key_first($config) ?? 'openai';
 
-        // Define an array of supported providers to scan through
+        // Provider name -> class prefix
         $possibleProviders = [
             'openai' => 'OpenAi',
             'deepseek' => 'DeepSeek',
@@ -45,67 +46,193 @@ public function __construct(
             'mistral' => 'Mistral',
             'gemini' => 'Gemini',
         ];
-        // Define an array of types
-        $serviceTypes = [
+
+        // Suffix used only if you create type-specific classes (optional)
+        $typeSuffix = [
             'text' => '',
             'image' => 'Image',
             'video' => 'Video',
             'document' => 'Document',
             'document_process' => 'DocumentProcess',
         ];
-        // Initialize AI providers dynamically
-        // Each available provider will have a form like ['deepseek']['image'] = Chamilo\CoreBundle\AiProvider\DeepSeekImageProvider $object;
+
+        // Expected interface per known type
+        $typeInterface = [
+            'text' => AiProviderInterface::class,
+            'image' => AiImageProviderInterface::class,
+            'video' => AiVideoProviderInterface::class,
+            'document' => AiDocumentProviderInterface::class,
+            // 'document_process' intentionally not validated (no interface yet)
+        ];
+
         $this->providers = [];
-        // For practical purposes, we also build a providersByType array in reverse order: ['image']['deepseek'] = Chamilo\CoreBundle\AiProvider\DeepSeekImageProvider $object;
         $this->providersByType = [];
+
         foreach ($config as $providerName => $providerConfig) {
-            // Check if the provider appears in the config, otherwise ignore this provider
-            if (\in_array($providerName, array_keys($possibleProviders))) {
-                $providerPrefix = $possibleProviders[$providerName];
-                foreach ($serviceTypes as $type => $serviceName) {
-                    // Check if the service (text, image, etc.) appears in the provider config, otherwise ignore this service
-                    if (\in_array($type, array_keys($providerConfig))) {
-                        $className = $providerPrefix.$serviceName.'Provider';
-                        $filePath = __DIR__.'/'.$className.'.php';
-                        // For some reason, dynamically loading the class without the fully qualified class name doesn't work
-                        $fullyQualifiedClassName = 'Chamilo\CoreBundle\AiProvider\\'.$className;
-                        if (class_exists($fullyQualifiedClassName)) {
-                            try {
-                                $providerObject = new $fullyQualifiedClassName(
-                                    $httpClient,
-                                    $settingsManager,
-                                    $this->aiRequestsRepository,
-                                    $this->security
-                                );
-                                $this->providers[$providerName][$type] = $providerObject;
-                                $this->providersByType[$type][$providerName] = $providerObject;
-                            } catch (Exception $e) {
-                                error_log('Could not create instance of class '.$className.': '.$e->getMessage());
+            if (!isset($possibleProviders[$providerName])) {
+                error_log('[AI] Unsupported provider in config: "'.$providerName.'". Skipping.');
+                continue;
+            }
+
+            if (!\is_array($providerConfig)) {
+                error_log('[AI] Provider config for "'.$providerName.'" must be an array. Skipping.');
+                continue;
+            }
+
+            $providerPrefix = $possibleProviders[$providerName];
+
+            // Base provider class (e.g. OpenAiProvider)
+            $baseClass = 'Chamilo\\CoreBundle\\AiProvider\\'.$providerPrefix.'Provider';
+            $baseObject = $this->instantiateProvider($baseClass);
+
+            // If base class cannot be instantiated, we can still allow type-specific classes.
+            if (!$baseObject && !class_exists($baseClass)) {
+                error_log('[AI] Base provider class not found: '.$baseClass.'.');
+            } elseif (!$baseObject) {
+                error_log('[AI] Base provider class exists but could not be instantiated: '.$baseClass.'.');
+            }
+
+            foreach ($typeSuffix as $type => $suffix) {
+                // Only types explicitly present in provider config are considered enabled
+                if (!array_key_exists($type, $providerConfig)) {
+                    continue;
+                }
+
+                $typeClass = 'Chamilo\\CoreBundle\\AiProvider\\'.$providerPrefix.$suffix.'Provider';
+
+                // Known types: we can fallback to base provider if it implements the right interface
+                if (isset($typeInterface[$type])) {
+                    $iface = $typeInterface[$type];
+                    $obj = null;
+
+                    // 1) Prefer type-specific class if exists (optional architecture)
+                    if ($typeClass !== $baseClass && class_exists($typeClass)) {
+                        $obj = $this->instantiateProvider($typeClass);
+
+                        if ($obj && !($obj instanceof $iface)) {
+                            error_log('[AI] Provider "'.$providerName.'" type-class "'.$typeClass.'" does not implement '.$iface.'. Falling back to base provider.');
+                            $obj = null;
+                        }
+                    }
+
+                    // 2) Fallback to base provider
+                    if (!$obj) {
+                        if ($baseObject && ($baseObject instanceof $iface)) {
+                            $obj = $baseObject;
+
+                            if ($typeClass !== $baseClass && !class_exists($typeClass)) {
+                                error_log('[AI] Provider "'.$providerName.'" uses base provider for type "'.$type.'" (no dedicated type class found).');
                             }
                         } else {
-                            error_log('Class '.$fullyQualifiedClassName.' does not seem to exist in the path.');
+                            error_log('[AI] Provider "'.$providerName.'" is configured for type "'.$type.'" but no usable implementation was found (expected '.$iface.').');
+                            continue;
                         }
                     }
+
+                    $this->providers[$providerName][$type] = $obj;
+                    $this->providersByType[$type][$providerName] = $obj;
+                    continue;
+                }
+
+                // Unknown type (e.g. document_process): do NOT fallback to base provider.
+                // Require a dedicated class to avoid claiming support when methods don't exist.
+                if ($typeClass !== $baseClass && class_exists($typeClass)) {
+                    $obj = $this->instantiateProvider($typeClass);
+
+                    if (!$obj) {
+                        error_log('[AI] Provider "'.$providerName.'" is configured for unknown type "'.$type.'" but could not instantiate "'.$typeClass.'".');
+                        continue;
+                    }
+
+                    $this->providers[$providerName][$type] = $obj;
+                    $this->providersByType[$type][$providerName] = $obj;
+                } else {
+                    error_log('[AI] Provider "'.$providerName.'" is configured for unknown type "'.$type.'" but no dedicated class was found (expected "'.$typeClass.'").');
                 }
             }
         }
-        // Ensure the selected default provider exists
-        if (!isset($this->providers[$this->defaultProvider])) {
+
+        // Ensure default provider exists when config is not empty
+        if (!empty($config) && !isset($this->providers[$this->defaultProvider])) {
             throw new InvalidArgumentException("The default AI provider '{$this->defaultProvider}' is not configured properly.");
         }
     }
 
-    public function getProvider(?string $provider = null, ?string $serviceType = 'text'): AiProviderInterface
+    public function hasProvidersForType(string $serviceType): bool
+    {
+        return !empty($this->providersByType[$serviceType] ?? []);
+    }
+
+    /**
+     * @return string[] Provider names supporting the given service type
+     */
+    public function getProvidersForType(string $serviceType): array
     {
-        $provider = $provider ?? $this->defaultProvider;
+        return array_keys($this->providersByType[$serviceType] ?? []);
+    }
+
+    public function getProvider(?string $provider = null, ?string $serviceType = 'text'): object
+    {
+        $serviceType = $serviceType ?? 'text';
 
-        if (!isset($this->providers[$provider])) {
-            throw new InvalidArgumentException("AI Provider '$provider' is not supported.");
+        if (null === $provider) {
+            if (isset($this->providers[$this->defaultProvider][$serviceType])) {
+                $provider = $this->defaultProvider;
+            } else {
+                $provider = array_key_first($this->providersByType[$serviceType] ?? []);
+            }
         }
+
+        if (empty($provider) || !isset($this->providers[$provider])) {
+            throw new InvalidArgumentException("AI Provider '{$provider}' is not supported or not configured.");
+        }
+
         if (!isset($this->providers[$provider][$serviceType])) {
-            throw new InvalidArgumentException("AI Provider '$provider' is not supported for service type '$serviceType'.");
+            throw new InvalidArgumentException("AI Provider '{$provider}' is not supported for service type '{$serviceType}'.");
         }
 
         return $this->providers[$provider][$serviceType];
     }
+
+    /**
+     * Read and normalize JSON config from settings.
+     *
+     * @return array<string, mixed>
+     */
+    private function readProvidersConfig(): array
+    {
+        $configJson = $this->settingsManager->getSetting('ai_helpers.ai_providers', true);
+
+        if (\is_string($configJson)) {
+            return json_decode($configJson, true) ?? [];
+        }
+
+        if (\is_array($configJson)) {
+            return $configJson;
+        }
+
+        return [];
+    }
+
+    /**
+     * Instantiate a provider class using the unified constructor signature.
+     */
+    private function instantiateProvider(string $fqcn): ?object
+    {
+        if (!class_exists($fqcn)) {
+            return null;
+        }
+
+        try {
+            return new $fqcn(
+                $this->httpClient,
+                $this->settingsManager,
+                $this->aiRequestsRepository,
+                $this->security
+            );
+        } catch (Exception $e) {
+            error_log('[AI] Could not instantiate '.$fqcn.': '.$e->getMessage());
+            return null;
+        }
+    }
 }
diff --git a/src/CoreBundle/AiProvider/AiVideoProviderInterface.php b/src/CoreBundle/AiProvider/AiVideoProviderInterface.php
index d01144b9217..b4f433b71b6 100644
--- a/src/CoreBundle/AiProvider/AiVideoProviderInterface.php
+++ b/src/CoreBundle/AiProvider/AiVideoProviderInterface.php
@@ -11,11 +11,13 @@ interface AiVideoProviderInterface
     /**
      * Generate a video.
      *
-     * @param string $prompt   The complete prompt, with language, question, context and answer
-     * @param string $toolName A tag, e.g. 'open_answer_grade'.
-     * @param ?array $options  An array of options (format etc.)
+     * @param string $prompt   The prompt to generate a video from
+     * @param string $toolName A tag, e.g. 'document_video_generate'
+     * @param ?array  $options Provider-specific options
      *
-     * @return string The raw text of the video in base64, or a URL
+     * @return string|array|null
+     *  - string: legacy mode (base64 or URL)
+     *  - array: structured response for UI (preferred)
      */
-    public function generateVideo(string $prompt, string $toolName, ?array $options = []): string;
+    public function generateVideo(string $prompt, string $toolName, ?array $options = []): string|array|null;
 }
diff --git a/src/CoreBundle/AiProvider/DeepSeekProvider.php b/src/CoreBundle/AiProvider/DeepSeekProvider.php
index 70b49ddcdaa..1d156f519fa 100644
--- a/src/CoreBundle/AiProvider/DeepSeekProvider.php
+++ b/src/CoreBundle/AiProvider/DeepSeekProvider.php
@@ -15,49 +15,44 @@
 use Symfony\Component\Security\Core\User\UserInterface;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 
-class DeepSeekProvider implements AiProviderInterface
+class DeepSeekProvider implements AiProviderInterface, AiDocumentProviderInterface
 {
+    private array $providerConfig;
     private string $apiUrl;
     private string $apiKey;
     private string $model;
     private float $temperature;
-    private string $organizationId;
-    private int $monthlyTokenLimit;
-    private HttpClientInterface $httpClient;
-    private AiRequestsRepository $aiRequestsRepository;
-    private Security $security;
+    private int $maxTokens;
 
     public function __construct(
-        HttpClientInterface $httpClient,
+        private readonly HttpClientInterface $httpClient,
         SettingsManager $settingsManager,
-        AiRequestsRepository $aiRequestsRepository,
-        Security $security
+        private readonly AiRequestsRepository $aiRequestsRepository,
+        private readonly Security $security
     ) {
-        $this->httpClient = $httpClient;
-        $this->aiRequestsRepository = $aiRequestsRepository;
-        $this->security = $security;
-
-        // Get AI providers from settings
         $configJson = $settingsManager->getSetting('ai_helpers.ai_providers', true);
-        $config = json_decode($configJson, true) ?? [];
+        $config = \is_string($configJson) ? (json_decode($configJson, true) ?? []) : (\is_array($configJson) ? $configJson : []);
 
-        if (!isset($config['deepseek'])) {
+        if (!isset($config['deepseek']) || !\is_array($config['deepseek'])) {
             throw new RuntimeException('DeepSeek configuration is missing.');
         }
-        if (!isset($config['deepseek']['text'])) {
-            throw new RuntimeException('DeepSeek configuration for text processing is missing.');
-        }
 
-        $this->apiKey = $config['deepseek']['api_key'] ?? '';
-        $this->organizationId = $config['deepseek']['organization_id'] ?? '';
-        $this->monthlyTokenLimit = $config['deepseek']['monthly_token_limit'] ?? 1000;
-        $this->apiUrl = $config['deepseek']['text']['url'] ?? 'https://api.deepseek.com/chat/completions';
-        $this->model = $config['deepseek']['text']['model'] ?? 'deepseek-chat';
-        $this->temperature = $config['deepseek']['text']['temperature'] ?? 0.7;
+        $this->providerConfig = $config['deepseek'];
+        $this->apiKey = (string) ($this->providerConfig['api_key'] ?? '');
 
-        if (empty($this->apiKey)) {
+        if ('' === trim($this->apiKey)) {
             throw new RuntimeException('DeepSeek API key is missing.');
         }
+
+        $textCfg = $this->providerConfig['text'] ?? [];
+        if (!\is_array($textCfg)) {
+            $textCfg = [];
+        }
+
+        $this->apiUrl = (string) ($textCfg['url'] ?? 'https://api.deepseek.com/chat/completions');
+        $this->model = (string) ($textCfg['model'] ?? 'deepseek-chat');
+        $this->temperature = (float) ($textCfg['temperature'] ?? 0.7);
+        $this->maxTokens = (int) ($textCfg['max_tokens'] ?? 1000);
     }
 
     public function generateQuestions(string $topic, int $numQuestions, string $questionType, string $language): ?string
@@ -80,12 +75,11 @@ public function generateQuestions(string $topic, int $numQuestions, string $ques
             $topic
         );
 
-        return $this->requestDeepSeekAI($prompt, 'quiz');
+        return $this->requestDeepSeek($prompt, 'quiz');
     }
 
     public function generateLearnPath(string $topic, int $chaptersCount, string $language, int $wordsCount, bool $addTests, int $numQuestions): ?array
     {
-        // Step 1: Generate the Table of Contents
         $tableOfContentsPrompt = \sprintf(
             'Generate a structured table of contents for a course in "%s" with %d chapters on "%s".
             Return a numbered list, each chapter on a new line. No conclusion.',
@@ -94,17 +88,16 @@ public function generateLearnPath(string $topic, int $chaptersCount, string $lan
             $topic
         );
 
-        $lpStructure = $this->requestDeepSeekAI($tableOfContentsPrompt, 'learnpath');
+        $lpStructure = $this->requestDeepSeek($tableOfContentsPrompt, 'learnpath');
         if (!$lpStructure) {
             return ['success' => false, 'message' => 'Failed to generate course structure.'];
         }
 
-        // Step 2: Generate content for each chapter
         $lpItems = [];
         $chapters = explode("\n", trim($lpStructure));
-        foreach ($chapters as $index => $chapterTitle) {
+        foreach ($chapters as $chapterTitle) {
             $chapterTitle = trim($chapterTitle);
-            if (empty($chapterTitle)) {
+            if ('' === $chapterTitle) {
                 continue;
             }
 
@@ -117,7 +110,7 @@ public function generateLearnPath(string $topic, int $chaptersCount, string $lan
                 $chapterTitle
             );
 
-            $chapterContent = $this->requestDeepSeekAI($chapterPrompt, 'learnpath');
+            $chapterContent = $this->requestDeepSeek($chapterPrompt, 'learnpath');
             if (!$chapterContent) {
                 continue;
             }
@@ -128,10 +121,9 @@ public function generateLearnPath(string $topic, int $chaptersCount, string $lan
             ];
         }
 
-        // Step 3: Generate quizzes if enabled
         $quizItems = [];
         if ($addTests) {
-            foreach ($lpItems as &$chapter) {
+            foreach ($lpItems as $chapter) {
                 $quizPrompt = \sprintf(
                     'Generate %d multiple-choice questions in Aiken format in %s about "%s".
         Ensure each question follows this format:
@@ -150,11 +142,9 @@ public function generateLearnPath(string $topic, int $chaptersCount, string $lan
                     $chapter['title']
                 );
 
-                $quizContent = $this->requestDeepSeekAI($quizPrompt, 'learnpath');
-
+                $quizContent = $this->requestDeepSeek($quizPrompt, 'learnpath');
                 if ($quizContent) {
                     $validQuestions = $this->filterValidAikenQuestions($quizContent);
-
                     if (!empty($validQuestions)) {
                         $quizItems[] = [
                             'title' => 'Quiz: '.$chapter['title'],
@@ -173,31 +163,18 @@ public function generateLearnPath(string $topic, int $chaptersCount, string $lan
         ];
     }
 
-    private function filterValidAikenQuestions(string $quizContent): array
+    public function gradeOpenAnswer(string $prompt, string $toolName): ?string
     {
-        $questions = preg_split('/\n{2,}/', trim($quizContent));
-
-        $validQuestions = [];
-        foreach ($questions as $questionBlock) {
-            $lines = explode("\n", trim($questionBlock));
-
-            if (\count($lines) < 6) {
-                continue;
-            }
-
-            $options = \array_slice($lines, 1, 4);
-            $validOptions = array_filter($options, fn ($line) => preg_match('/^[A-D]\. .+/', $line));
-
-            $answerLine = end($lines);
-            if (4 === \count($validOptions) && preg_match('/^ANSWER: [A-D]$/', $answerLine)) {
-                $validQuestions[] = implode("\n", $lines);
-            }
-        }
+        return $this->requestDeepSeek($prompt, $toolName);
+    }
 
-        return $validQuestions;
+    public function generateDocument(string $prompt, string $toolName, ?array $options = []): ?string
+    {
+        // Document is text-like for DeepSeek
+        return $this->requestDeepSeek($prompt, $toolName);
     }
 
-    private function requestDeepSeekAI(string $prompt, string $toolName): ?string
+    private function requestDeepSeek(string $prompt, string $toolName): ?string
     {
         $userId = $this->getUserId();
         if (!$userId) {
@@ -211,7 +188,7 @@ private function requestDeepSeekAI(string $prompt, string $toolName): ?string
                 ['role' => 'user', 'content' => $prompt],
             ],
             'temperature' => $this->temperature,
-            'max_tokens' => 300,
+            'max_tokens' => $this->maxTokens,
         ];
 
         try {
@@ -223,44 +200,85 @@ private function requestDeepSeekAI(string $prompt, string $toolName): ?string
                 'json' => $payload,
             ]);
 
-            $statusCode = $response->getStatusCode();
-            $data = $response->toArray();
-
-            if (200 === $statusCode && isset($data['choices'][0]['message']['content'])) {
-                $generatedContent = $data['choices'][0]['message']['content'];
-
-                $aiRequest = new AiRequests();
-                $aiRequest->setUserId($userId)
-                    ->setToolName($toolName)
-                    ->setRequestText($prompt)
-                    ->setPromptTokens($data['usage']['prompt_tokens'] ?? 0)
-                    ->setCompletionTokens($data['usage']['completion_tokens'] ?? 0)
-                    ->setTotalTokens($data['usage']['total_tokens'] ?? 0)
-                    ->setAiProvider('deepseek')
-                ;
-
-                $this->aiRequestsRepository->save($aiRequest);
+            $data = $response->toArray(false);
 
-                return $generatedContent;
+            $generatedContent = $data['choices'][0]['message']['content'] ?? null;
+            if (!\is_string($generatedContent) || '' === trim($generatedContent)) {
+                error_log('[AI][DeepSeek] Empty content returned.');
+                return null;
             }
 
-            return null;
+            $this->saveAiRequest(
+                $userId,
+                $toolName,
+                $prompt,
+                'deepseek',
+                (int) ($data['usage']['prompt_tokens'] ?? 0),
+                (int) ($data['usage']['completion_tokens'] ?? 0),
+                (int) ($data['usage']['total_tokens'] ?? 0)
+            );
+
+            return $generatedContent;
         } catch (Exception $e) {
             error_log('[AI][DeepSeek] Exception: '.$e->getMessage());
-
             return null;
         }
     }
 
-    public function gradeOpenAnswer(string $prompt, string $toolName): ?string
+    private function filterValidAikenQuestions(string $quizContent): array
     {
-        return $this->requestDeepSeekAI($prompt, $toolName);
+        $questions = preg_split('/\n{2,}/', trim($quizContent));
+
+        $validQuestions = [];
+        foreach ($questions as $questionBlock) {
+            $lines = explode("\n", trim($questionBlock));
+
+            if (\count($lines) < 6) {
+                continue;
+            }
+
+            $options = \array_slice($lines, 1, 4);
+            $validOptions = array_filter($options, static fn ($line) => (bool) preg_match('/^[A-D]\. .+/', $line));
+
+            $answerLine = end($lines);
+            if (4 === \count($validOptions) && \is_string($answerLine) && preg_match('/^ANSWER: [A-D]$/', $answerLine)) {
+                $validQuestions[] = implode("\n", $lines);
+            }
+        }
+
+        return $validQuestions;
+    }
+
+    private function saveAiRequest(
+        int $userId,
+        string $toolName,
+        string $requestText,
+        string $provider,
+        int $promptTokens = 0,
+        int $completionTokens = 0,
+        int $totalTokens = 0
+    ): void {
+        try {
+            $aiRequest = new AiRequests();
+            $aiRequest
+                ->setUserId($userId)
+                ->setToolName($toolName)
+                ->setRequestText($requestText)
+                ->setPromptTokens($promptTokens)
+                ->setCompletionTokens($completionTokens)
+                ->setTotalTokens($totalTokens)
+                ->setAiProvider($provider)
+            ;
+
+            $this->aiRequestsRepository->save($aiRequest);
+        } catch (Exception $e) {
+            error_log('[AI] Failed to save AiRequests record: '.$e->getMessage());
+        }
     }
 
     private function getUserId(): ?int
     {
         $user = $this->security->getUser();
-
         return $user instanceof UserInterface ? $user->getId() : null;
     }
 }
diff --git a/src/CoreBundle/AiProvider/GeminiProvider.php b/src/CoreBundle/AiProvider/GeminiProvider.php
index 7f62dbb8573..dc3374aed34 100644
--- a/src/CoreBundle/AiProvider/GeminiProvider.php
+++ b/src/CoreBundle/AiProvider/GeminiProvider.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+/* For licensing terms, see /license.txt */
+
 namespace Chamilo\CoreBundle\AiProvider;
 
 use Chamilo\CoreBundle\Entity\AiRequests;
@@ -13,47 +15,57 @@
 use Symfony\Component\Security\Core\User\UserInterface;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 
-class GeminiProvider implements AiProviderInterface
+final class GeminiProvider implements AiProviderInterface, AiDocumentProviderInterface
 {
-    private string $apiUrl;
     private string $apiKey;
-    private string $model;
-    private float $temperature;
-    private HttpClientInterface $httpClient;
-    private AiRequestsRepository $aiRequestsRepository;
-    private Security $security;
+
+    // Text
+    private string $textModel;
+    private string $textUrlTemplate;
+    private float $textTemperature;
+    private int $textMaxOutputTokens;
+
+    // Document (fallbacks to text if missing)
+    private string $documentModel;
+    private string $documentUrlTemplate;
+    private float $documentTemperature;
+    private int $documentMaxOutputTokens;
 
     public function __construct(
-        HttpClientInterface $httpClient,
-        SettingsManager $settingsManager,
-        AiRequestsRepository $aiRequestsRepository,
-        Security $security
+        private readonly HttpClientInterface $httpClient,
+        private readonly SettingsManager $settingsManager,
+        private readonly AiRequestsRepository $aiRequestsRepository,
+        private readonly Security $security
     ) {
-        $this->httpClient = $httpClient;
-        $this->aiRequestsRepository = $aiRequestsRepository;
-        $this->security = $security;
+        $config = $this->readProvidersConfig();
 
-        // Get AI providers from settings
-        $configJson = $settingsManager->getSetting('ai_helpers.ai_providers', true);
-        $config = json_decode($configJson, true) ?? [];
-
-        if (!isset($config['gemini'])) {
+        if (!isset($config['gemini']) || !\is_array($config['gemini'])) {
             throw new RuntimeException('Gemini configuration is missing.');
         }
-        if (!isset($config['gemini']['text'])) {
-            throw new RuntimeException('Gemini configuration for text processing is missing.');
-        }
 
-        $this->apiKey = $config['gemini']['api_key'] ?? '';
-        // Gemini expects endpoint like: https://generativelanguage.googleapis.com/v1beta/models/gemini-2.5-flash:generateContent
-        $this->model = $config['gemini']['text']['model'] ?? 'gemini-2.5-flash';
-        $tempApiUrl = $config['gemini']['text']['url'] ?? 'https://generativelanguage.googleapis.com/v1beta/models/%s:generateContent';
-        $this->apiUrl = \sprintf($tempApiUrl, $this->model);
-        $this->temperature = $config['gemini']['text']['temperature'] ?? 0.7;
+        $providerConfig = $config['gemini'];
 
-        if (empty($this->apiKey)) {
+        $this->apiKey = (string) ($providerConfig['api_key'] ?? '');
+        if ('' === $this->apiKey) {
             throw new RuntimeException('Gemini API key is missing.');
         }
+
+        $textCfg = $providerConfig['text'] ?? null;
+        if (!\is_array($textCfg)) {
+            throw new RuntimeException('Gemini configuration for text processing is missing.');
+        }
+
+        $this->textModel = (string) ($textCfg['model'] ?? 'gemini-2.5-flash');
+        $this->textUrlTemplate = (string) ($textCfg['url'] ?? 'https://generativelanguage.googleapis.com/v1beta/models/%s:generateContent');
+        $this->textTemperature = (float) ($textCfg['temperature'] ?? 0.7);
+        $this->textMaxOutputTokens = (int) ($textCfg['max_output_tokens'] ?? 1000);
+
+        $docCfg = $providerConfig['document'] ?? null;
+
+        $this->documentModel = \is_array($docCfg) ? (string) ($docCfg['model'] ?? $this->textModel) : $this->textModel;
+        $this->documentUrlTemplate = \is_array($docCfg) ? (string) ($docCfg['url'] ?? $this->textUrlTemplate) : $this->textUrlTemplate;
+        $this->documentTemperature = \is_array($docCfg) ? (float) ($docCfg['temperature'] ?? $this->textTemperature) : $this->textTemperature;
+        $this->documentMaxOutputTokens = \is_array($docCfg) ? (int) ($docCfg['max_output_tokens'] ?? $this->textMaxOutputTokens) : $this->textMaxOutputTokens;
     }
 
     public function generateQuestions(string $topic, int $numQuestions, string $questionType, string $language): ?string
@@ -76,19 +88,18 @@ public function generateQuestions(string $topic, int $numQuestions, string $ques
             $topic
         );
 
-        return $this->requestGemini($prompt, 'quiz');
+        return $this->requestGemini(
+            $this->buildUrl($this->textUrlTemplate, $this->textModel),
+            $this->textTemperature,
+            $this->textMaxOutputTokens,
+            $prompt,
+            'quiz'
+        );
     }
 
-    public function generateLearnPath(
-        string $topic,
-        int $chaptersCount,
-        string $language,
-        int $wordsCount,
-        bool $addTests,
-        int $numQuestions
-    ): ?array {
-        // Step 1: Generate the Table of Contents
-        $tableOfContentsPrompt = \sprintf(
+    public function generateLearnPath(string $topic, int $chaptersCount, string $language, int $wordsCount, bool $addTests, int $numQuestions): ?array
+    {
+        $tocPrompt = \sprintf(
             'Generate a structured table of contents for a course in "%s" with %d chapters on "%s".
             Return a numbered list, each chapter on a new line. No conclusion.',
             $language,
@@ -96,17 +107,23 @@ public function generateLearnPath(
             $topic
         );
 
-        $lpStructure = $this->requestGemini($tableOfContentsPrompt, 'learnpath');
+        $lpStructure = $this->requestGemini(
+            $this->buildUrl($this->textUrlTemplate, $this->textModel),
+            $this->textTemperature,
+            $this->textMaxOutputTokens,
+            $tocPrompt,
+            'learnpath'
+        );
+
         if (!$lpStructure) {
             return ['success' => false, 'message' => 'Failed to generate course structure.'];
         }
 
-        // Step 2: Generate content for each chapter
         $lpItems = [];
         $chapters = explode("\n", trim($lpStructure));
-        foreach ($chapters as $index => $chapterTitle) {
+        foreach ($chapters as $chapterTitle) {
             $chapterTitle = trim($chapterTitle);
-            if (empty($chapterTitle)) {
+            if ('' === $chapterTitle) {
                 continue;
             }
 
@@ -119,7 +136,14 @@ public function generateLearnPath(
                 $chapterTitle
             );
 
-            $chapterContent = $this->requestGemini($chapterPrompt, 'learnpath');
+            $chapterContent = $this->requestGemini(
+                $this->buildUrl($this->textUrlTemplate, $this->textModel),
+                $this->textTemperature,
+                $this->textMaxOutputTokens,
+                $chapterPrompt,
+                'learnpath'
+            );
+
             if (!$chapterContent) {
                 continue;
             }
@@ -130,10 +154,9 @@ public function generateLearnPath(
             ];
         }
 
-        // Step 3: Generate quizzes if enabled
         $quizItems = [];
         if ($addTests) {
-            foreach ($lpItems as &$chapter) {
+            foreach ($lpItems as $chapter) {
                 $quizPrompt = \sprintf(
                     'Generate %d multiple-choice questions in Aiken format in %s about "%s".
             Ensure each question follows this format:
@@ -152,17 +175,24 @@ public function generateLearnPath(
                     $chapter['title']
                 );
 
-                $quizContent = $this->requestGemini($quizPrompt, 'learnpath');
+                $quizContent = $this->requestGemini(
+                    $this->buildUrl($this->textUrlTemplate, $this->textModel),
+                    $this->textTemperature,
+                    $this->textMaxOutputTokens,
+                    $quizPrompt,
+                    'learnpath'
+                );
 
-                if ($quizContent) {
-                    $validQuestions = $this->filterValidAikenQuestions($quizContent);
+                if (!$quizContent) {
+                    continue;
+                }
 
-                    if (!empty($validQuestions)) {
-                        $quizItems[] = [
-                            'title' => 'Quiz: '.$chapter['title'],
-                            'content' => implode("\n\n", $validQuestions),
-                        ];
-                    }
+                $valid = $this->filterValidAikenQuestions($quizContent);
+                if (!empty($valid)) {
+                    $quizItems[] = [
+                        'title' => 'Quiz: '.$chapter['title'],
+                        'content' => implode("\n\n", $valid),
+                    ];
                 }
             }
         }
@@ -175,38 +205,40 @@ public function generateLearnPath(
         ];
     }
 
-    private function filterValidAikenQuestions(string $quizContent): array
+    public function gradeOpenAnswer(string $prompt, string $toolName): ?string
     {
-        $questions = preg_split('/\n{2,}/', trim($quizContent));
-
-        $validQuestions = [];
-        foreach ($questions as $questionBlock) {
-            $lines = explode("\n", trim($questionBlock));
-
-            if (\count($lines) < 6) {
-                continue;
-            }
-
-            $options = \array_slice($lines, 1, 4);
-            $validOptions = array_filter($options, fn ($line) => preg_match('/^[A-D]\. .+/', $line));
+        return $this->requestGemini(
+            $this->buildUrl($this->textUrlTemplate, $this->textModel),
+            $this->textTemperature,
+            $this->textMaxOutputTokens,
+            $prompt,
+            $toolName
+        );
+    }
 
-            $answerLine = end($lines);
-            if (4 === \count($validOptions) && preg_match('/^ANSWER: [A-D]$/', $answerLine)) {
-                $validQuestions[] = implode("\n", $lines);
-            }
+    public function generateDocument(string $prompt, string $toolName, ?array $options = []): ?string
+    {
+        $format = isset($options['format']) ? (string) $options['format'] : '';
+        if ('' !== $format) {
+            $prompt .= "\n\nOutput format: {$format}.";
         }
 
-        return $validQuestions;
+        return $this->requestGemini(
+            $this->buildUrl($this->documentUrlTemplate, $this->documentModel),
+            $this->documentTemperature,
+            $this->documentMaxOutputTokens,
+            $prompt,
+            $toolName
+        );
     }
 
-    private function requestGemini(string $prompt, string $toolName): ?string
+    private function requestGemini(string $url, float $temperature, int $maxOutputTokens, string $prompt, string $toolName): ?string
     {
         $userId = $this->getUserId();
         if (!$userId) {
             throw new RuntimeException('User not authenticated.');
         }
 
-        // Gemini expects a "contents" array (of turns), with inner "parts" [{"text": "..."}]
         $payload = [
             'contents' => [
                 [
@@ -216,13 +248,13 @@ private function requestGemini(string $prompt, string $toolName): ?string
                 ],
             ],
             'generationConfig' => [
-                'temperature' => $this->temperature,
-                'maxOutputTokens' => 1000,
+                'temperature' => $temperature,
+                'maxOutputTokens' => $maxOutputTokens,
             ],
         ];
 
         try {
-            $response = $this->httpClient->request('POST', $this->apiUrl, [
+            $response = $this->httpClient->request('POST', $url, [
                 'headers' => [
                     'x-goog-api-key' => $this->apiKey,
                     'Content-Type' => 'application/json',
@@ -231,48 +263,92 @@ private function requestGemini(string $prompt, string $toolName): ?string
             ]);
 
             $statusCode = $response->getStatusCode();
-            $data = $response->toArray();
+            $data = $response->toArray(false);
 
-            // Gemini returns "candidates" (array), first candidate, first part of content
             if (
-                200 === $statusCode
-                && isset($data['candidates'][0]['content']['parts'][0]['text'])
+                200 !== $statusCode
+                || !isset($data['candidates'][0]['content']['parts'][0]['text'])
             ) {
-                $generatedContent = $data['candidates'][0]['content']['parts'][0]['text'];
-
-                $aiRequest = new AiRequests();
-                $aiRequest->setUserId($userId)
-                    ->setToolName($toolName)
-                    ->setRequestText($prompt)
-                    // Gemini does not currently return token counts, so we set to 0
-                    ->setPromptTokens($data['usage']['prompt_tokens'] ?? 0)
-                    ->setCompletionTokens($data['usage']['completion_tokens'] ?? 0)
-                    ->setTotalTokens($data['usage']['total_tokens'] ?? 0)
-                    ->setAiProvider('gemini')
-                ;
-
-                $this->aiRequestsRepository->save($aiRequest);
-
-                return $generatedContent;
+                error_log('[AI][Gemini] Invalid response (status='.$statusCode.').');
+                return null;
             }
 
-            return null;
+            $generatedContent = (string) $data['candidates'][0]['content']['parts'][0]['text'];
+
+            // Gemini usually returns usageMetadata, not usage.prompt_tokens
+            $usageMeta = $data['usageMetadata'] ?? [];
+            $promptTokens = (int) ($usageMeta['promptTokenCount'] ?? 0);
+            $completionTokens = (int) ($usageMeta['candidatesTokenCount'] ?? 0);
+            $totalTokens = (int) ($usageMeta['totalTokenCount'] ?? ($promptTokens + $completionTokens));
+
+            $aiRequest = new AiRequests();
+            $aiRequest
+                ->setUserId($userId)
+                ->setToolName($toolName)
+                ->setRequestText($prompt)
+                ->setPromptTokens($promptTokens)
+                ->setCompletionTokens($completionTokens)
+                ->setTotalTokens($totalTokens)
+                ->setAiProvider('gemini')
+            ;
+
+            $this->aiRequestsRepository->save($aiRequest);
+
+            return $generatedContent;
         } catch (Exception $e) {
             error_log('[AI][Gemini] Exception: '.$e->getMessage());
-
             return null;
         }
     }
 
-    public function gradeOpenAnswer(string $prompt, string $toolName): ?string
+    private function filterValidAikenQuestions(string $quizContent): array
+    {
+        $questions = preg_split('/\n{2,}/', trim($quizContent)) ?: [];
+
+        $validQuestions = [];
+        foreach ($questions as $questionBlock) {
+            $lines = explode("\n", trim($questionBlock));
+
+            if (\count($lines) < 6) {
+                continue;
+            }
+
+            $options = \array_slice($lines, 1, 4);
+            $validOptions = array_filter($options, static fn ($line) => (bool) preg_match('/^[A-D]\. .+/', $line));
+
+            $answerLine = (string) end($lines);
+            if (4 === \count($validOptions) && preg_match('/^ANSWER: [A-D]$/', $answerLine)) {
+                $validQuestions[] = implode("\n", $lines);
+            }
+        }
+
+        return $validQuestions;
+    }
+
+    private function buildUrl(string $template, string $model): string
     {
-        return $this->requestGemini($prompt, $toolName);
+        // If template expects %s, inject model; else keep as-is
+        return str_contains($template, '%s') ? \sprintf($template, $model) : $template;
     }
 
     private function getUserId(): ?int
     {
         $user = $this->security->getUser();
-
         return $user instanceof UserInterface ? $user->getId() : null;
     }
+
+    private function readProvidersConfig(): array
+    {
+        $configJson = $this->settingsManager->getSetting('ai_helpers.ai_providers', true);
+
+        if (\is_string($configJson)) {
+            return json_decode($configJson, true) ?? [];
+        }
+
+        if (\is_array($configJson)) {
+            return $configJson;
+        }
+
+        return [];
+    }
 }
diff --git a/src/CoreBundle/AiProvider/GrokDocumentProvider.php b/src/CoreBundle/AiProvider/GrokDocumentProvider.php
index 87d3cdda864..53a48a95985 100644
--- a/src/CoreBundle/AiProvider/GrokDocumentProvider.php
+++ b/src/CoreBundle/AiProvider/GrokDocumentProvider.php
@@ -10,13 +10,12 @@
 use Exception;
 use RuntimeException;
 use Symfony\Bundle\SecurityBundle\Security;
+use Symfony\Component\Security\Core\User\UserInterface;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 
 /**
  * Grok (xAI) provider for document generation.
- * Note: As of January 2026, document generation is not natively supported in the xAI API as binary files (e.g., PDF).
- * This implementation uses the text responses endpoint to generate structured text content (e.g., Markdown),
- * which can be post-processed into a document format client-side.
+ * Note: This provider generates structured text (e.g., Markdown) that can be converted to PDF client-side.
  */
 class GrokDocumentProvider implements AiDocumentProviderInterface
 {
@@ -24,18 +23,21 @@ class GrokDocumentProvider implements AiDocumentProviderInterface
     private string $apiKey;
     private string $model;
     private array $defaultOptions;
+
     private HttpClientInterface $httpClient;
     private AiRequestsRepository $aiRequestsRepository;
     private SettingsManager $settingsManager;
+    private Security $security;
 
     public function __construct(
         HttpClientInterface $httpClient,
-        AiRequestsRepository $aiRequestsRepository,
         SettingsManager $settingsManager,
+        AiRequestsRepository $aiRequestsRepository,
         Security $security
     ) {
         $this->httpClient = $httpClient;
         $this->aiRequestsRepository = $aiRequestsRepository;
+        $this->settingsManager = $settingsManager;
         $this->security = $security;
 
         // Get AI providers from settings
@@ -48,25 +50,28 @@ public function __construct(
         if (!isset($config['grok']['document'])) {
             throw new RuntimeException('Grok configuration for document generation is missing.');
         }
-        $grokConfig = $config['grok'];
 
-        $this->apiUrl = $grokConfig['url'] ?? 'https://api.x.ai/v1/responses';
-        $this->apiKey = $grokConfig['api_key'] ?? '';
-        $this->model = $grokConfig['model'] ?? 'grok-4-1-fast-reasoning';
+        $providerConfig = $config['grok'];
+        $documentConfig = $providerConfig['document'];
 
+        $this->apiKey = $providerConfig['api_key'] ?? '';
         if (empty($this->apiKey)) {
             throw new RuntimeException('Grok API key is missing.');
         }
 
+        // Prefer type-specific config, fallback to root keys if needed
+        $this->apiUrl = $documentConfig['url'] ?? ($providerConfig['url'] ?? 'https://api.x.ai/v1/responses');
+        $this->model = $documentConfig['model'] ?? ($providerConfig['model'] ?? 'grok-4-1-fast-reasoning');
+
         $this->defaultOptions = [
-            'temperature' => $grokConfig['temperature'] ?? 0.7,
-            'format' => $grokConfig['format'] ?? 'pdf', // e.g., 'markdown', 'pdf' (for prompt instruction)
+            'temperature' => $documentConfig['temperature'] ?? ($providerConfig['temperature'] ?? 0.7),
+            'format' => $documentConfig['format'] ?? 'pdf',
         ];
     }
 
     public function generateDocument(string $prompt, string $toolName, ?array $options = []): ?string
     {
-        return $this->requestGrokAI($prompt, $toolName, $options);
+        return $this->requestGrokAI($prompt, $toolName, $options ?? []);
     }
 
     private function requestGrokAI(string $prompt, string $toolName, array $options = []): ?string
@@ -76,13 +81,11 @@ private function requestGrokAI(string $prompt, string $toolName, array $options
             throw new RuntimeException('User not authenticated.');
         }
 
-        // Build system prompt to instruct document generation
         $systemContent = 'You are a helpful assistant that generates well-structured documents. Output in the specified format (e.g., Markdown for easy conversion to PDF).';
 
-        // Append format instruction to user prompt if provided
         $userContent = $prompt;
         $format = $options['format'] ?? $this->defaultOptions['format'];
-        if ($format) {
+        if (!empty($format)) {
             $userContent .= "\n\nOutput the document in {$format} format.";
         }
 
@@ -111,29 +114,24 @@ private function requestGrokAI(string $prompt, string $toolName, array $options
 
             $data = $response->toArray();
 
-            // Check for error key first
             if (isset($data['error'])) {
                 throw new RuntimeException('API error: '.$data['error']['message']);
             }
 
-            // Extract generated content from response structure
             if (isset($data['output'][0]['content'][0]['text'])) {
-                $generatedContent = $data['output'][0]['content'][0]['text'];
+                $generatedContent = (string) $data['output'][0]['content'][0]['text'];
 
-                // Usage is available for text generation
                 $usage = $data['usage'] ?? ['prompt_tokens' => 0, 'completion_tokens' => 0, 'total_tokens' => 0];
 
-                // Log request
                 $aiRequest = new AiRequests();
                 $aiRequest->setUserId($userId)
                     ->setToolName($toolName)
                     ->setRequestText($prompt)
-                    ->setPromptTokens($usage['prompt_tokens'])
-                    ->setCompletionTokens($usage['completion_tokens'])
-                    ->setTotalTokens($usage['total_tokens'])
+                    ->setPromptTokens((int) ($usage['prompt_tokens'] ?? 0))
+                    ->setCompletionTokens((int) ($usage['completion_tokens'] ?? 0))
+                    ->setTotalTokens((int) ($usage['total_tokens'] ?? 0))
                     ->setAiProvider('grok')
                 ;
-
                 $this->aiRequestsRepository->save($aiRequest);
 
                 return $generatedContent;
@@ -141,7 +139,7 @@ private function requestGrokAI(string $prompt, string $toolName, array $options
 
             return null;
         } catch (Exception $e) {
-            error_log('[AI][Grok] Exception: '.$e->getMessage());
+            error_log('[AI][Grok][Document] Exception: '.$e->getMessage());
 
             return null;
         }
@@ -149,6 +147,8 @@ private function requestGrokAI(string $prompt, string $toolName, array $options
 
     private function getUserId(): ?int
     {
-        return $this->user ? $this->user->getId() : null;
+        $user = $this->security->getUser();
+
+        return $user instanceof UserInterface ? $user->getId() : null;
     }
 }
diff --git a/src/CoreBundle/AiProvider/GrokImageProvider.php b/src/CoreBundle/AiProvider/GrokImageProvider.php
index 9ca133a70b4..e397b5ee13b 100644
--- a/src/CoreBundle/AiProvider/GrokImageProvider.php
+++ b/src/CoreBundle/AiProvider/GrokImageProvider.php
@@ -49,7 +49,7 @@ public function __construct(
         $this->model = $config['grok']['image']['model'] ?? 'grok-2-image';
         $this->defaultOptions = [
             'response_format' => $config['grok']['image']['response_format'] ?? 'b64_json',
-            'n' => 1, // Number of images is fixed until we add an interface for choosing
+            'n' => 1,
         ];
 
         if (empty($this->apiKey)) {
@@ -57,11 +57,12 @@ public function __construct(
         }
     }
 
-    public function generateImage(string $prompt, string $toolName, ?array $options = []): ?string
+    public function generateImage(string $prompt, string $toolName, ?array $options = []): string|array|null
     {
-        return $this->requestGrokAI($prompt, $toolName, $options);
+        return $this->requestGrokAI($prompt, $toolName, $options ?? []);
     }
-    private function requestGrokAI(string $prompt, string $toolName, array $options = []): ?string
+
+    private function requestGrokAI(string $prompt, string $toolName, array $options = []): string|array|null
     {
         $userId = $this->getUserId();
         if (!$userId) {
@@ -70,7 +71,8 @@ private function requestGrokAI(string $prompt, string $toolName, array $options
 
         $payload = [
             'model' => $this->model,
-            'prompt' => $prompt,  // Direct prompt string, no messages array
+            // Direct prompt string (no messages array for this endpoint)
+            'prompt' => $prompt,
             ...array_merge($this->defaultOptions, $options),
         ];
 
@@ -95,32 +97,45 @@ private function requestGrokAI(string $prompt, string $toolName, array $options
                 throw new RuntimeException('API error: '.$data['error']['message']);
             }
 
-            // Proper access: assuming response_format 'b64_json'
+            // Usage might not exist for images; default to 0
+            $usage = $data['usage'] ?? ['prompt_tokens' => 0, 'completion_tokens' => 0, 'total_tokens' => 0];
+
+            // Log request
+            $aiRequest = new AiRequests();
+            $aiRequest->setUserId($userId)
+                ->setToolName($toolName)
+                ->setRequestText($prompt)
+                ->setPromptTokens((int) ($usage['prompt_tokens'] ?? 0))
+                ->setCompletionTokens((int) ($usage['completion_tokens'] ?? 0))
+                ->setTotalTokens((int) ($usage['total_tokens'] ?? 0))
+                ->setAiProvider('grok')
+            ;
+            $this->aiRequestsRepository->save($aiRequest);
+
+            // Preferred response: base64
             if (isset($data['data'][0]['b64_json'])) {
-                $generatedContent = $data['data'][0]['b64_json'];
-
-                // Usage might not exist for images; default to 0
-                $usage = $data['usage'] ?? ['prompt_tokens' => 0, 'completion_tokens' => 0, 'total_tokens' => 0];
-
-                // Log request
-                $aiRequest = new AiRequests();
-                $aiRequest->setUserId($userId)
-                    ->setToolName($toolName)
-                    ->setRequestText($prompt)
-                    ->setPromptTokens($usage['prompt_tokens'])
-                    ->setCompletionTokens($usage['completion_tokens'])
-                    ->setTotalTokens($usage['total_tokens'])
-                    ->setAiProvider('grok')
-                ;
-
-                $this->aiRequestsRepository->save($aiRequest);
+                return [
+                    'content' => (string) $data['data'][0]['b64_json'],
+                    'is_base64' => true,
+                    'content_type' => 'image/png',
+                    'revised_prompt' => $data['data'][0]['revised_prompt'] ?? null,
+                ];
+            }
 
-                return $generatedContent;
+            // Alternative response: URL
+            if (isset($data['data'][0]['url'])) {
+                return [
+                    'url' => (string) $data['data'][0]['url'],
+                    'is_base64' => false,
+                    'content_type' => 'image/png',
+                    'revised_prompt' => $data['data'][0]['revised_prompt'] ?? null,
+                ];
             }
 
+            // Legacy fallback (should rarely happen)
             return null;
         } catch (Exception $e) {
-            error_log('[AI][Grok] Exception: '.$e->getMessage());
+            error_log('[AI][Grok][Image] Exception: '.$e->getMessage());
 
             return null;
         }
diff --git a/src/CoreBundle/AiProvider/GrokProvider.php b/src/CoreBundle/AiProvider/GrokProvider.php
index 0bc667dcde2..acb1829b4c3 100644
--- a/src/CoreBundle/AiProvider/GrokProvider.php
+++ b/src/CoreBundle/AiProvider/GrokProvider.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+/* For licensing terms, see /license.txt */
+
 namespace Chamilo\CoreBundle\AiProvider;
 
 use Chamilo\CoreBundle\Entity\AiRequests;
@@ -13,45 +15,81 @@
 use Symfony\Component\Security\Core\User\UserInterface;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 
-class GrokProvider implements AiProviderInterface
+final class GrokProvider implements AiProviderInterface, AiImageProviderInterface, AiDocumentProviderInterface
 {
-    private string $apiUrl;
     private string $apiKey;
-    private string $model;
-    private float $temperature;
-    private HttpClientInterface $httpClient;
-    private AiRequestsRepository $aiRequestsRepository;
-    private Security $security;
+
+    // Text
+    private string $textApiUrl;
+    private string $textModel;
+    private float $textTemperature;
+    private int $textMaxTokens;
+
+    // Image
+    private string $imageApiUrl;
+    private string $imageModel;
+    private array $imageDefaultOptions = [];
+
+    // Document (usually same as text, but configurable)
+    private string $documentApiUrl;
+    private string $documentModel;
+    private float $documentTemperature;
+    private int $documentMaxTokens;
 
     public function __construct(
-        HttpClientInterface $httpClient,
-        SettingsManager $settingsManager,
-        AiRequestsRepository $aiRequestsRepository,
-        Security $security
+        private readonly HttpClientInterface $httpClient,
+        private readonly SettingsManager $settingsManager,
+        private readonly AiRequestsRepository $aiRequestsRepository,
+        private readonly Security $security
     ) {
-        $this->httpClient = $httpClient;
-        $this->aiRequestsRepository = $aiRequestsRepository;
-        $this->security = $security;
+        $config = $this->readProvidersConfig();
 
-        // Get AI providers from settings
-        $configJson = $settingsManager->getSetting('ai_helpers.ai_providers', true);
-        $config = json_decode($configJson, true) ?? [];
-
-        if (!isset($config['grok'])) {
+        if (!isset($config['grok']) || !\is_array($config['grok'])) {
             throw new RuntimeException('Grok configuration is missing.');
         }
-        if (!isset($config['grok']['text'])) {
-            throw new RuntimeException('Grok configuration for text processing is missing.');
-        }
 
-        $this->apiKey = $config['grok']['api_key'] ?? '';
-        $this->apiUrl = $config['grok']['text']['url'] ?? 'https://api.x.ai/v1/chat/completions';
-        $this->model = $config['grok']['text']['model'] ?? 'grok-beta';
-        $this->temperature = $config['grok']['text']['temperature'] ?? 0.7;
+        $providerConfig = $config['grok'];
 
-        if (empty($this->apiKey)) {
+        $this->apiKey = (string) ($providerConfig['api_key'] ?? '');
+        if ('' === $this->apiKey) {
             throw new RuntimeException('Grok API key is missing.');
         }
+
+        // TEXT config (required for AiProviderInterface usage)
+        $textCfg = $providerConfig['text'] ?? null;
+        if (!\is_array($textCfg)) {
+            throw new RuntimeException('Grok configuration for text processing is missing.');
+        }
+
+        $this->textApiUrl = (string) ($textCfg['url'] ?? 'https://api.x.ai/v1/chat/completions');
+        $this->textModel = (string) ($textCfg['model'] ?? 'grok-beta');
+        $this->textTemperature = (float) ($textCfg['temperature'] ?? 0.7);
+        $this->textMaxTokens = (int) ($textCfg['max_tokens'] ?? 1000);
+
+        // IMAGE config (optional but required to support "image" type)
+        $imageCfg = $providerConfig['image'] ?? null;
+        if (\is_array($imageCfg)) {
+            $this->imageApiUrl = (string) ($imageCfg['url'] ?? 'https://api.x.ai/v1/images/generations');
+            $this->imageModel = (string) ($imageCfg['model'] ?? 'grok-2-image');
+
+            // Default options; can be overridden per-call via $options
+            $this->imageDefaultOptions = [
+                'response_format' => (string) ($imageCfg['response_format'] ?? 'b64_json'),
+                'n' => (int) ($imageCfg['n'] ?? 1),
+            ];
+        } else {
+            $this->imageApiUrl = '';
+            $this->imageModel = '';
+            $this->imageDefaultOptions = [];
+        }
+
+        // DOCUMENT config (optional; fallback to text if absent)
+        $docCfg = $providerConfig['document'] ?? null;
+
+        $this->documentApiUrl = \is_array($docCfg) ? (string) ($docCfg['url'] ?? $this->textApiUrl) : $this->textApiUrl;
+        $this->documentModel = \is_array($docCfg) ? (string) ($docCfg['model'] ?? $this->textModel) : $this->textModel;
+        $this->documentTemperature = \is_array($docCfg) ? (float) ($docCfg['temperature'] ?? $this->textTemperature) : $this->textTemperature;
+        $this->documentMaxTokens = \is_array($docCfg) ? (int) ($docCfg['max_tokens'] ?? $this->textMaxTokens) : $this->textMaxTokens;
     }
 
     public function generateQuestions(string $topic, int $numQuestions, string $questionType, string $language): ?string
@@ -74,13 +112,12 @@ public function generateQuestions(string $topic, int $numQuestions, string $ques
             $topic
         );
 
-        return $this->requestGrokAI($prompt, 'quiz');
+        return $this->requestText($this->textApiUrl, $this->textModel, $this->textTemperature, $this->textMaxTokens, $prompt, 'quiz');
     }
 
     public function generateLearnPath(string $topic, int $chaptersCount, string $language, int $wordsCount, bool $addTests, int $numQuestions): ?array
     {
-        // Step 1: Generate the Table of Contents
-        $tableOfContentsPrompt = \sprintf(
+        $tocPrompt = \sprintf(
             'Generate a structured table of contents for a course in "%s" with %d chapters on "%s".
             Return a numbered list, each chapter on a new line. No conclusion.',
             $language,
@@ -88,17 +125,16 @@ public function generateLearnPath(string $topic, int $chaptersCount, string $lan
             $topic
         );
 
-        $lpStructure = $this->requestGrokAI($tableOfContentsPrompt, 'learnpath');
+        $lpStructure = $this->requestText($this->textApiUrl, $this->textModel, $this->textTemperature, $this->textMaxTokens, $tocPrompt, 'learnpath');
         if (!$lpStructure) {
             return ['success' => false, 'message' => 'Failed to generate course structure.'];
         }
 
-        // Step 2: Generate content for each chapter
         $lpItems = [];
         $chapters = explode("\n", trim($lpStructure));
-        foreach ($chapters as $index => $chapterTitle) {
+        foreach ($chapters as $chapterTitle) {
             $chapterTitle = trim($chapterTitle);
-            if (empty($chapterTitle)) {
+            if ('' === $chapterTitle) {
                 continue;
             }
 
@@ -111,7 +147,7 @@ public function generateLearnPath(string $topic, int $chaptersCount, string $lan
                 $chapterTitle
             );
 
-            $chapterContent = $this->requestGrokAI($chapterPrompt, 'learnpath');
+            $chapterContent = $this->requestText($this->textApiUrl, $this->textModel, $this->textTemperature, $this->textMaxTokens, $chapterPrompt, 'learnpath');
             if (!$chapterContent) {
                 continue;
             }
@@ -122,10 +158,9 @@ public function generateLearnPath(string $topic, int $chaptersCount, string $lan
             ];
         }
 
-        // Step 3: Generate quizzes if enabled
         $quizItems = [];
         if ($addTests) {
-            foreach ($lpItems as &$chapter) {
+            foreach ($lpItems as $chapter) {
                 $quizPrompt = \sprintf(
                     'Generate %d multiple-choice questions in Aiken format in %s about "%s".
             Ensure each question follows this format:
@@ -144,17 +179,17 @@ public function generateLearnPath(string $topic, int $chaptersCount, string $lan
                     $chapter['title']
                 );
 
-                $quizContent = $this->requestGrokAI($quizPrompt, 'learnpath');
-
-                if ($quizContent) {
-                    $validQuestions = $this->filterValidAikenQuestions($quizContent);
+                $quizContent = $this->requestText($this->textApiUrl, $this->textModel, $this->textTemperature, $this->textMaxTokens, $quizPrompt, 'learnpath');
+                if (!$quizContent) {
+                    continue;
+                }
 
-                    if (!empty($validQuestions)) {
-                        $quizItems[] = [
-                            'title' => 'Quiz: '.$chapter['title'],
-                            'content' => implode("\n\n", $validQuestions),
-                        ];
-                    }
+                $validQuestions = $this->filterValidAikenQuestions($quizContent);
+                if (!empty($validQuestions)) {
+                    $quizItems[] = [
+                        'title' => 'Quiz: '.$chapter['title'],
+                        'content' => implode("\n\n", $validQuestions),
+                    ];
                 }
             }
         }
@@ -167,50 +202,75 @@ public function generateLearnPath(string $topic, int $chaptersCount, string $lan
         ];
     }
 
-    private function filterValidAikenQuestions(string $quizContent): array
+    public function gradeOpenAnswer(string $prompt, string $toolName): ?string
     {
-        $questions = preg_split('/\n{2,}/', trim($quizContent));
+        return $this->requestText($this->textApiUrl, $this->textModel, $this->textTemperature, $this->textMaxTokens, $prompt, $toolName);
+    }
 
-        $validQuestions = [];
-        foreach ($questions as $questionBlock) {
-            $lines = explode("\n", trim($questionBlock));
+    public function generateImage(string $prompt, string $toolName, ?array $options = []): string|array|null
+    {
+        if ('' === $this->imageApiUrl || '' === $this->imageModel) {
+            error_log('[AI][Grok][Image] Image is not configured for this provider.');
+            return null;
+        }
 
+        return $this->requestImage($prompt, $toolName, $options ?? []);
+    }
+
+    public function generateDocument(string $prompt, string $toolName, ?array $options = []): ?string
+    {
+        // Document generation is treated as structured text generation (Markdown/HTML/etc).
+        // The caller can decide how to convert it to a file (PDF, DOCX...) later.
+        $format = isset($options['format']) ? (string) $options['format'] : '';
+        if ('' !== $format) {
+            $prompt .= "\n\nOutput format: {$format}.";
+        }
+
+        return $this->requestText(
+            $this->documentApiUrl,
+            $this->documentModel,
+            $this->documentTemperature,
+            $this->documentMaxTokens,
+            $prompt,
+            $toolName
+        );
+    }
+
+    private function filterValidAikenQuestions(string $quizContent): array
+    {
+        $questions = preg_split('/\n{2,}/', trim($quizContent)) ?: [];
+
+        $valid = [];
+        foreach ($questions as $block) {
+            $lines = explode("\n", trim($block));
             if (\count($lines) < 6) {
                 continue;
             }
 
             $options = \array_slice($lines, 1, 4);
-            $validOptions = array_filter($options, fn ($line) => preg_match('/^[A-D]\. .+/', $line));
+            $validOptions = array_filter($options, static fn ($line) => (bool) preg_match('/^[A-D]\. .+/', $line));
 
-            $answerLine = end($lines);
+            $answerLine = (string) end($lines);
             if (4 === \count($validOptions) && preg_match('/^ANSWER: [A-D]$/', $answerLine)) {
-                $validQuestions[] = implode("\n", $lines);
+                $valid[] = implode("\n", $lines);
             }
         }
 
-        return $validQuestions;
+        return $valid;
     }
 
-    private function requestGrokAI(string $prompt, string $toolName): ?string
+    private function requestText(string $url, string $model, float $temperature, int $maxTokens, string $prompt, string $toolName): ?string
     {
         $userId = $this->getUserId();
         if (!$userId) {
             throw new RuntimeException('User not authenticated.');
         }
 
-        $payload = [
-            'model' => $this->model,
-            'input' => [  // Changed from 'messages'
-                ['role' => 'system', 'content' => 'You are a helpful AI assistant that generates structured educational content.'],
-                ['role' => 'user', 'content' => $prompt],
-            ],
-            'temperature' => $this->temperature,
-            'max_tokens' => 1000,
-            // Optional: Add if needed, e.g., 'store' => true, 'parallel_tool_calls' => false
-        ];
+        $system = 'You are a helpful AI assistant that generates structured educational content.';
+        $payload = $this->buildTextPayload($url, $model, $system, $prompt, $temperature, $maxTokens);
 
         try {
-            $response = $this->httpClient->request('POST', $this->apiUrl, [
+            $response = $this->httpClient->request('POST', $url, [
                 'headers' => [
                     'Authorization' => 'Bearer '.$this->apiKey,
                     'Content-Type' => 'application/json',
@@ -218,44 +278,226 @@ private function requestGrokAI(string $prompt, string $toolName): ?string
                 'json' => $payload,
             ]);
 
-            $statusCode = $response->getStatusCode();
-            $data = $response->toArray();
+            $status = $response->getStatusCode();
+            $rawBody = $response->getContent(false);
+            $data = json_decode($rawBody, true);
 
-            if (200 === $statusCode && isset($data['output'][0]['content'][0]['text']) && 'completed' === $data['status']) {  // Updated parsing and status check
-                $generatedContent = $data['output'][0]['content'][0]['text'];
+            if (200 !== $status || !\is_array($data)) {
+                error_log('[AI][Grok][Text] Invalid response (status='.$status.').');
+                return null;
+            }
 
-                $aiRequest = new AiRequests();
-                $aiRequest->setUserId($userId)
-                    ->setToolName($toolName)
-                    ->setRequestText($prompt)
-                    ->setPromptTokens($data['usage']['prompt_tokens'] ?? 0)
-                    ->setCompletionTokens($data['usage']['completion_tokens'] ?? 0)
-                    ->setTotalTokens($data['usage']['total_tokens'] ?? 0)
-                    ->setAiProvider('grok')
-                ;
+            $generated = $this->extractTextContent($data);
+            if (null === $generated || '' === trim($generated)) {
+                error_log('[AI][Grok][Text] Empty content returned by API.');
+                return null;
+            }
+
+            $usage = $this->extractUsage($data);
 
-                $this->aiRequestsRepository->save($aiRequest);
+            $this->logRequest($userId, $toolName, $prompt, $usage['prompt_tokens'], $usage['completion_tokens'], $usage['total_tokens'], 'grok');
+
+            return $generated;
+        } catch (Exception $e) {
+            error_log('[AI][Grok][Text] Exception: '.$e->getMessage());
+            return null;
+        }
+    }
 
-                return $generatedContent;
+    private function requestImage(string $prompt, string $toolName, array $options = []): string|array|null
+    {
+        $userId = $this->getUserId();
+        if (!$userId) {
+            throw new RuntimeException('User not authenticated.');
+        }
+
+        $merged = array_merge($this->imageDefaultOptions, $options);
+
+        // Normalize response_format values
+        if (isset($merged['response_format'])) {
+            $rf = (string) $merged['response_format'];
+            if ('base64' === $rf) {
+                $merged['response_format'] = 'b64_json';
             }
+        }
+
+        $payload = array_merge([
+            'model' => $this->imageModel,
+            'prompt' => $prompt,
+        ], $merged);
 
+        try {
+            $response = $this->httpClient->request('POST', $this->imageApiUrl, [
+                'headers' => [
+                    'Authorization' => 'Bearer '.$this->apiKey,
+                    'Content-Type' => 'application/json',
+                ],
+                'json' => $payload,
+            ]);
+
+            $status = $response->getStatusCode();
+            $rawBody = $response->getContent(false);
+            $data = json_decode($rawBody, true);
+
+            if (200 !== $status || !\is_array($data)) {
+                error_log('[AI][Grok][Image] Invalid response (status='.$status.').');
+                return null;
+            }
+
+            // Log request (images usually have no usage)
+            $this->logRequest($userId, $toolName, $prompt, 0, 0, 0, 'grok');
+
+            // Prefer base64
+            if (isset($data['data'][0]['b64_json'])) {
+                return [
+                    'content' => (string) $data['data'][0]['b64_json'],
+                    'is_base64' => true,
+                    'content_type' => 'image/png',
+                    'revised_prompt' => $data['data'][0]['revised_prompt'] ?? null,
+                ];
+            }
+
+            // URL fallback
+            if (isset($data['data'][0]['url'])) {
+                return [
+                    'url' => (string) $data['data'][0]['url'],
+                    'is_base64' => false,
+                    'content_type' => 'image/png',
+                    'revised_prompt' => $data['data'][0]['revised_prompt'] ?? null,
+                ];
+            }
+
+            error_log('[AI][Grok][Image] No usable image content found in response.');
             return null;
         } catch (Exception $e) {
-            error_log('[AI][Grok] Exception: '.$e->getMessage());
-
+            error_log('[AI][Grok][Image] Exception: '.$e->getMessage());
             return null;
         }
     }
 
-    public function gradeOpenAnswer(string $prompt, string $toolName): ?string
+    private function buildTextPayload(string $url, string $model, string $system, string $prompt, float $temperature, int $maxTokens): array
+    {
+        // If using /responses endpoint
+        if ($this->isResponsesEndpoint($url)) {
+            return [
+                'model' => $model,
+                'input' => [
+                    ['role' => 'system', 'content' => $system],
+                    ['role' => 'user', 'content' => $prompt],
+                ],
+                'temperature' => $temperature,
+                'max_output_tokens' => $maxTokens,
+            ];
+        }
+
+        // OpenAI-compatible /chat/completions (xAI supports legacy endpoint)
+        return [
+            'model' => $model,
+            'messages' => [
+                ['role' => 'system', 'content' => $system],
+                ['role' => 'user', 'content' => $prompt],
+            ],
+            'temperature' => $temperature,
+            'max_tokens' => $maxTokens,
+        ];
+    }
+
+    private function extractTextContent(array $data): ?string
+    {
+        // /responses style
+        if (isset($data['output'][0]['content'][0]['text']) && \is_string($data['output'][0]['content'][0]['text'])) {
+            return $data['output'][0]['content'][0]['text'];
+        }
+
+        // Sometimes APIs return output_text
+        if (isset($data['output_text']) && \is_string($data['output_text'])) {
+            return $data['output_text'];
+        }
+
+        // /chat/completions style
+        if (isset($data['choices'][0]['message']['content']) && \is_string($data['choices'][0]['message']['content'])) {
+            return $data['choices'][0]['message']['content'];
+        }
+
+        // Some providers may return choices[0].text
+        if (isset($data['choices'][0]['text']) && \is_string($data['choices'][0]['text'])) {
+            return $data['choices'][0]['text'];
+        }
+
+        return null;
+    }
+
+    private function extractUsage(array $data): array
     {
-        return $this->requestGrokAI($prompt, $toolName);
+        // Default usage
+        $usage = [
+            'prompt_tokens' => 0,
+            'completion_tokens' => 0,
+            'total_tokens' => 0,
+        ];
+
+        if (isset($data['usage']) && \is_array($data['usage'])) {
+            $u = $data['usage'];
+
+            // Common OpenAI-compatible keys
+            $usage['prompt_tokens'] = (int) ($u['prompt_tokens'] ?? $usage['prompt_tokens']);
+            $usage['completion_tokens'] = (int) ($u['completion_tokens'] ?? $usage['completion_tokens']);
+            $usage['total_tokens'] = (int) ($u['total_tokens'] ?? $usage['total_tokens']);
+
+            // Some responses APIs use input_tokens/output_tokens
+            if (isset($u['input_tokens'])) {
+                $usage['prompt_tokens'] = (int) $u['input_tokens'];
+            }
+            if (isset($u['output_tokens'])) {
+                $usage['completion_tokens'] = (int) $u['output_tokens'];
+            }
+            if (0 === $usage['total_tokens']) {
+                $usage['total_tokens'] = $usage['prompt_tokens'] + $usage['completion_tokens'];
+            }
+        }
+
+        return $usage;
+    }
+
+    private function logRequest(int $userId, string $toolName, string $prompt, int $promptTokens, int $completionTokens, int $totalTokens, string $provider): void
+    {
+        $aiRequest = new AiRequests();
+        $aiRequest
+            ->setUserId($userId)
+            ->setToolName($toolName)
+            ->setRequestText($prompt)
+            ->setPromptTokens($promptTokens)
+            ->setCompletionTokens($completionTokens)
+            ->setTotalTokens($totalTokens)
+            ->setAiProvider($provider)
+        ;
+
+        $this->aiRequestsRepository->save($aiRequest);
     }
 
     private function getUserId(): ?int
     {
         $user = $this->security->getUser();
-
         return $user instanceof UserInterface ? $user->getId() : null;
     }
+
+    private function readProvidersConfig(): array
+    {
+        $configJson = $this->settingsManager->getSetting('ai_helpers.ai_providers', true);
+
+        if (\is_string($configJson)) {
+            return json_decode($configJson, true) ?? [];
+        }
+
+        if (\is_array($configJson)) {
+            return $configJson;
+        }
+
+        return [];
+    }
+
+    private function isResponsesEndpoint(string $url): bool
+    {
+        return str_contains($url, '/responses');
+    }
 }
diff --git a/src/CoreBundle/AiProvider/MistralProvider.php b/src/CoreBundle/AiProvider/MistralProvider.php
index 372572a8553..6e15b25eae3 100644
--- a/src/CoreBundle/AiProvider/MistralProvider.php
+++ b/src/CoreBundle/AiProvider/MistralProvider.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+/* For licensing terms, see /license.txt */
+
 namespace Chamilo\CoreBundle\AiProvider;
 
 use Chamilo\CoreBundle\Entity\AiRequests;
@@ -13,45 +15,57 @@
 use Symfony\Component\Security\Core\User\UserInterface;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 
-class MistralProvider implements AiProviderInterface
+final class MistralProvider implements AiProviderInterface, AiDocumentProviderInterface
 {
-    private string $apiUrl;
     private string $apiKey;
-    private string $model;
-    private float $temperature;
-    private HttpClientInterface $httpClient;
-    private AiRequestsRepository $aiRequestsRepository;
-    private Security $security;
+
+    // Text
+    private string $textApiUrl;
+    private string $textModel;
+    private float $textTemperature;
+    private int $textMaxTokens;
+
+    // Document (fallbacks to text if missing)
+    private string $documentApiUrl;
+    private string $documentModel;
+    private float $documentTemperature;
+    private int $documentMaxTokens;
 
     public function __construct(
-        HttpClientInterface $httpClient,
-        SettingsManager $settingsManager,
-        AiRequestsRepository $aiRequestsRepository,
-        Security $security
+        private readonly HttpClientInterface $httpClient,
+        private readonly SettingsManager $settingsManager,
+        private readonly AiRequestsRepository $aiRequestsRepository,
+        private readonly Security $security
     ) {
-        $this->httpClient = $httpClient;
-        $this->aiRequestsRepository = $aiRequestsRepository;
-        $this->security = $security;
-
-        // Get AI providers from settings
-        $configJson = $settingsManager->getSetting('ai_helpers.ai_providers', true);
-        $config = json_decode($configJson, true) ?? [];
+        $config = $this->readProvidersConfig();
 
-        if (!isset($config['mistral'])) {
+        if (!isset($config['mistral']) || !\is_array($config['mistral'])) {
             throw new RuntimeException('Mistral configuration is missing.');
         }
-        if (!isset($config['mistral']['text'])) {
-            throw new RuntimeException('DeepSeek configuration for text processing is missing.');
-        }
 
-        $this->apiKey = $config['mistral']['api_key'] ?? '';
-        $this->apiUrl = $config['mistral']['text']['url'] ?? 'https://api.mistral.ai/v1/chat/completions';
-        $this->model = $config['mistral']['text']['model'] ?? 'mistral-large-latest';
-        $this->temperature = $config['mistral']['text']['temperature'] ?? 0.7;
+        $providerConfig = $config['mistral'];
 
-        if (empty($this->apiKey)) {
+        $this->apiKey = (string) ($providerConfig['api_key'] ?? '');
+        if ('' === $this->apiKey) {
             throw new RuntimeException('Mistral API key is missing.');
         }
+
+        $textCfg = $providerConfig['text'] ?? null;
+        if (!\is_array($textCfg)) {
+            throw new RuntimeException('Mistral configuration for text processing is missing.');
+        }
+
+        $this->textApiUrl = (string) ($textCfg['url'] ?? 'https://api.mistral.ai/v1/chat/completions');
+        $this->textModel = (string) ($textCfg['model'] ?? 'mistral-large-latest');
+        $this->textTemperature = (float) ($textCfg['temperature'] ?? 0.7);
+        $this->textMaxTokens = (int) ($textCfg['max_tokens'] ?? 1000);
+
+        $docCfg = $providerConfig['document'] ?? null;
+
+        $this->documentApiUrl = \is_array($docCfg) ? (string) ($docCfg['url'] ?? $this->textApiUrl) : $this->textApiUrl;
+        $this->documentModel = \is_array($docCfg) ? (string) ($docCfg['model'] ?? $this->textModel) : $this->textModel;
+        $this->documentTemperature = \is_array($docCfg) ? (float) ($docCfg['temperature'] ?? $this->textTemperature) : $this->textTemperature;
+        $this->documentMaxTokens = \is_array($docCfg) ? (int) ($docCfg['max_tokens'] ?? $this->textMaxTokens) : $this->textMaxTokens;
     }
 
     public function generateQuestions(string $topic, int $numQuestions, string $questionType, string $language): ?string
@@ -74,13 +88,12 @@ public function generateQuestions(string $topic, int $numQuestions, string $ques
             $topic
         );
 
-        return $this->requestMistralAI($prompt, 'quiz');
+        return $this->requestMistral($this->textApiUrl, $this->textModel, $this->textTemperature, $this->textMaxTokens, $prompt, 'quiz');
     }
 
     public function generateLearnPath(string $topic, int $chaptersCount, string $language, int $wordsCount, bool $addTests, int $numQuestions): ?array
     {
-        // Step 1: Generate the Table of Contents
-        $tableOfContentsPrompt = \sprintf(
+        $tocPrompt = \sprintf(
             'Generate a structured table of contents for a course in "%s" with %d chapters on "%s".
             Return a numbered list, each chapter on a new line. No conclusion.',
             $language,
@@ -88,30 +101,29 @@ public function generateLearnPath(string $topic, int $chaptersCount, string $lan
             $topic
         );
 
-        $lpStructure = $this->requestMistralAI($tableOfContentsPrompt, 'learnpath');
+        $lpStructure = $this->requestMistral($this->textApiUrl, $this->textModel, $this->textTemperature, $this->textMaxTokens, $tocPrompt, 'learnpath');
         if (!$lpStructure) {
             return ['success' => false, 'message' => 'Failed to generate course structure.'];
         }
 
-        // Step 2: Generate content for each chapter
         $lpItems = [];
         $chapters = explode("\n", trim($lpStructure));
-        foreach ($chapters as $index => $chapterTitle) {
+        foreach ($chapters as $chapterTitle) {
             $chapterTitle = trim($chapterTitle);
-            if (empty($chapterTitle)) {
+            if ('' === $chapterTitle) {
                 continue;
             }
 
             $chapterPrompt = \sprintf(
                 'Create a learning chapter in HTML for "%s" in "%s" with %d words.
-                Title: "%s". Assume the reader already knows the context.',
+Title: "%s". Assume the reader already knows the context.',
                 $topic,
                 $language,
                 $wordsCount,
                 $chapterTitle
             );
 
-            $chapterContent = $this->requestMistralAI($chapterPrompt, 'learnpath');
+            $chapterContent = $this->requestMistral($this->textApiUrl, $this->textModel, $this->textTemperature, $this->textMaxTokens, $chapterPrompt, 'learnpath');
             if (!$chapterContent) {
                 continue;
             }
@@ -122,10 +134,9 @@ public function generateLearnPath(string $topic, int $chaptersCount, string $lan
             ];
         }
 
-        // Step 3: Generate quizzes if enabled
         $quizItems = [];
         if ($addTests) {
-            foreach ($lpItems as &$chapter) {
+            foreach ($lpItems as $chapter) {
                 $quizPrompt = \sprintf(
                     'Generate %d multiple-choice questions in Aiken format in %s about "%s".
             Ensure each question follows this format:
@@ -144,17 +155,17 @@ public function generateLearnPath(string $topic, int $chaptersCount, string $lan
                     $chapter['title']
                 );
 
-                $quizContent = $this->requestMistralAI($quizPrompt, 'learnpath');
-
-                if ($quizContent) {
-                    $validQuestions = $this->filterValidAikenQuestions($quizContent);
+                $quizContent = $this->requestMistral($this->textApiUrl, $this->textModel, $this->textTemperature, $this->textMaxTokens, $quizPrompt, 'learnpath');
+                if (!$quizContent) {
+                    continue;
+                }
 
-                    if (!empty($validQuestions)) {
-                        $quizItems[] = [
-                            'title' => 'Quiz: '.$chapter['title'],
-                            'content' => implode("\n\n", $validQuestions),
-                        ];
-                    }
+                $validQuestions = $this->filterValidAikenQuestions($quizContent);
+                if (!empty($validQuestions)) {
+                    $quizItems[] = [
+                        'title' => 'Quiz: '.$chapter['title'],
+                        'content' => implode("\n\n", $validQuestions),
+                    ];
                 }
             }
         }
@@ -167,31 +178,29 @@ public function generateLearnPath(string $topic, int $chaptersCount, string $lan
         ];
     }
 
-    private function filterValidAikenQuestions(string $quizContent): array
+    public function gradeOpenAnswer(string $prompt, string $toolName): ?string
     {
-        $questions = preg_split('/\n{2,}/', trim($quizContent));
-
-        $validQuestions = [];
-        foreach ($questions as $questionBlock) {
-            $lines = explode("\n", trim($questionBlock));
-
-            if (\count($lines) < 6) {
-                continue;
-            }
-
-            $options = \array_slice($lines, 1, 4);
-            $validOptions = array_filter($options, fn ($line) => preg_match('/^[A-D]\. .+/', $line));
+        return $this->requestMistral($this->textApiUrl, $this->textModel, $this->textTemperature, $this->textMaxTokens, $prompt, $toolName);
+    }
 
-            $answerLine = end($lines);
-            if (4 === \count($validOptions) && preg_match('/^ANSWER: [A-D]$/', $answerLine)) {
-                $validQuestions[] = implode("\n", $lines);
-            }
+    public function generateDocument(string $prompt, string $toolName, ?array $options = []): ?string
+    {
+        $format = isset($options['format']) ? (string) $options['format'] : '';
+        if ('' !== $format) {
+            $prompt .= "\n\nOutput format: {$format}.";
         }
 
-        return $validQuestions;
+        return $this->requestMistral(
+            $this->documentApiUrl,
+            $this->documentModel,
+            $this->documentTemperature,
+            $this->documentMaxTokens,
+            $prompt,
+            $toolName
+        );
     }
 
-    private function requestMistralAI(string $prompt, string $toolName): ?string
+    private function requestMistral(string $url, string $model, float $temperature, int $maxTokens, string $prompt, string $toolName): ?string
     {
         $userId = $this->getUserId();
         if (!$userId) {
@@ -199,17 +208,17 @@ private function requestMistralAI(string $prompt, string $toolName): ?string
         }
 
         $payload = [
-            'model' => $this->model,
+            'model' => $model,
             'messages' => [
                 ['role' => 'system', 'content' => 'You are a helpful AI assistant that generates structured educational content.'],
                 ['role' => 'user', 'content' => $prompt],
             ],
-            'temperature' => $this->temperature,
-            'max_tokens' => 1000,
+            'temperature' => $temperature,
+            'max_tokens' => $maxTokens,
         ];
 
         try {
-            $response = $this->httpClient->request('POST', $this->apiUrl, [
+            $response = $this->httpClient->request('POST', $url, [
                 'headers' => [
                     'Authorization' => 'Bearer '.$this->apiKey,
                     'Content-Type' => 'application/json',
@@ -218,43 +227,82 @@ private function requestMistralAI(string $prompt, string $toolName): ?string
             ]);
 
             $statusCode = $response->getStatusCode();
-            $data = $response->toArray();
+            $data = $response->toArray(false);
+
+            if (200 !== $statusCode || !isset($data['choices'][0]['message']['content'])) {
+                error_log('[AI][Mistral] Invalid response (status='.$statusCode.').');
+                return null;
+            }
 
-            if (200 === $statusCode && isset($data['choices'][0]['message']['content'])) {
-                $generatedContent = $data['choices'][0]['message']['content'];
+            $generatedContent = (string) $data['choices'][0]['message']['content'];
 
-                $aiRequest = new AiRequests();
-                $aiRequest->setUserId($userId)
-                    ->setToolName($toolName)
-                    ->setRequestText($prompt)
-                    ->setPromptTokens($data['usage']['prompt_tokens'] ?? 0)
-                    ->setCompletionTokens($data['usage']['completion_tokens'] ?? 0)
-                    ->setTotalTokens($data['usage']['total_tokens'] ?? 0)
-                    ->setAiProvider('mistral')
-                ;
+            $usage = $data['usage'] ?? [];
+            $promptTokens = (int) ($usage['prompt_tokens'] ?? 0);
+            $completionTokens = (int) ($usage['completion_tokens'] ?? 0);
+            $totalTokens = (int) ($usage['total_tokens'] ?? ($promptTokens + $completionTokens));
 
-                $this->aiRequestsRepository->save($aiRequest);
+            $aiRequest = new AiRequests();
+            $aiRequest
+                ->setUserId($userId)
+                ->setToolName($toolName)
+                ->setRequestText($prompt)
+                ->setPromptTokens($promptTokens)
+                ->setCompletionTokens($completionTokens)
+                ->setTotalTokens($totalTokens)
+                ->setAiProvider('mistral')
+            ;
 
-                return $generatedContent;
-            }
+            $this->aiRequestsRepository->save($aiRequest);
 
-            return null;
+            return $generatedContent;
         } catch (Exception $e) {
             error_log('[AI][Mistral] Exception: '.$e->getMessage());
-
             return null;
         }
     }
 
-    public function gradeOpenAnswer(string $prompt, string $toolName): ?string
+    private function filterValidAikenQuestions(string $quizContent): array
     {
-        return $this->requestMistralAI($prompt, $toolName);
+        $questions = preg_split('/\n{2,}/', trim($quizContent)) ?: [];
+
+        $validQuestions = [];
+        foreach ($questions as $questionBlock) {
+            $lines = explode("\n", trim($questionBlock));
+
+            if (\count($lines) < 6) {
+                continue;
+            }
+
+            $options = \array_slice($lines, 1, 4);
+            $validOptions = array_filter($options, static fn ($line) => (bool) preg_match('/^[A-D]\. .+/', $line));
+
+            $answerLine = (string) end($lines);
+            if (4 === \count($validOptions) && preg_match('/^ANSWER: [A-D]$/', $answerLine)) {
+                $validQuestions[] = implode("\n", $lines);
+            }
+        }
+
+        return $validQuestions;
     }
 
     private function getUserId(): ?int
     {
         $user = $this->security->getUser();
-
         return $user instanceof UserInterface ? $user->getId() : null;
     }
+
+    private function readProvidersConfig(): array
+    {
+        $configJson = $this->settingsManager->getSetting('ai_helpers.ai_providers', true);
+
+        if (\is_string($configJson)) {
+            return json_decode($configJson, true) ?? [];
+        }
+
+        if (\is_array($configJson)) {
+            return $configJson;
+        }
+
+        return [];
+    }
 }
diff --git a/src/CoreBundle/AiProvider/OpenAiProvider.php b/src/CoreBundle/AiProvider/OpenAiProvider.php
index 9456792ea23..dfaf9b5dfa4 100644
--- a/src/CoreBundle/AiProvider/OpenAiProvider.php
+++ b/src/CoreBundle/AiProvider/OpenAiProvider.php
@@ -10,46 +10,43 @@
 use Exception;
 use RuntimeException;
 use Symfony\Bundle\SecurityBundle\Security;
+use Symfony\Component\Mime\Part\DataPart;
+use Symfony\Component\Mime\Part\Multipart\FormDataPart;
 use Symfony\Component\Security\Core\User\UserInterface;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 
-class OpenAiProvider implements AiProviderInterface
+class OpenAiProvider implements AiProviderInterface, AiImageProviderInterface, AiVideoProviderInterface, AiDocumentProviderInterface
 {
-    private string $apiUrl;
+    private array $providerConfig;
     private string $apiKey;
-    private string $model;
-    private float $temperature;
-    private HttpClientInterface $httpClient;
-    private AiRequestsRepository $aiRequestsRepository;
-    private Security $security;
+    private string $organizationId;
+    private int $monthlyTokenLimit;
+
+    // OpenAI Videos API constraints (validate early to avoid avoidable 400s).
+    private const ALLOWED_VIDEO_MODELS = ['sora-2', 'sora-2-pro'];
+    private const ALLOWED_VIDEO_SECONDS = ['4', '8', '12'];
+    private const ALLOWED_VIDEO_SIZES = ['720x1280', '1280x720', '1024x1792', '1792x1024'];
 
     public function __construct(
-        HttpClientInterface $httpClient,
+        private readonly HttpClientInterface $httpClient,
         SettingsManager $settingsManager,
-        AiRequestsRepository $aiRequestsRepository,
-        Security $security
+        private readonly AiRequestsRepository $aiRequestsRepository,
+        private readonly Security $security
     ) {
-        $this->httpClient = $httpClient;
-        $this->aiRequestsRepository = $aiRequestsRepository;
-        $this->security = $security;
-
-        // Get AI providers from settings
         $configJson = $settingsManager->getSetting('ai_helpers.ai_providers', true);
-        $config = json_decode($configJson, true) ?? [];
+        $config = \is_string($configJson) ? (json_decode($configJson, true) ?? []) : (\is_array($configJson) ? $configJson : []);
 
-        if (!isset($config['openai'])) {
+        if (!isset($config['openai']) || !\is_array($config['openai'])) {
             throw new RuntimeException('OpenAI configuration is missing.');
         }
-        if (!isset($config['openai']['text'])) {
-            throw new RuntimeException('Gemini configuration for text processing is missing.');
-        }
 
-        $this->apiKey = $config['openai']['api_key'] ?? '';
-        $this->apiUrl = $config['openai']['text']['url'] ?? 'https://api.openai.com/v1/chat/completions';
-        $this->model = $config['openai']['text']['model'] ?? 'gpt-3.5-turbo';
-        $this->temperature = $config['openai']['text']['temperature'] ?? 0.7;
+        $this->providerConfig = $config['openai'];
+
+        $this->apiKey = (string) ($this->providerConfig['api_key'] ?? '');
+        $this->organizationId = (string) ($this->providerConfig['organization_id'] ?? '');
+        $this->monthlyTokenLimit = (int) ($this->providerConfig['monthly_token_limit'] ?? 0);
 
-        if (empty($this->apiKey)) {
+        if ('' === trim($this->apiKey)) {
             throw new RuntimeException('OpenAI API key is missing.');
         }
     }
@@ -74,12 +71,11 @@ public function generateQuestions(string $topic, int $numQuestions, string $ques
             $topic
         );
 
-        return $this->requestOpenAI($prompt, 'quiz');
+        return $this->requestChatCompletion($prompt, 'quiz', 'text');
     }
 
     public function generateLearnPath(string $topic, int $chaptersCount, string $language, int $wordsCount, bool $addTests, int $numQuestions): ?array
     {
-        // Step 1: Generate the Table of Contents
         $tableOfContentsPrompt = \sprintf(
             'Generate a structured table of contents for a course in "%s" with %d chapters on "%s".
             Return a numbered list, each chapter on a new line. No conclusion.',
@@ -88,17 +84,16 @@ public function generateLearnPath(string $topic, int $chaptersCount, string $lan
             $topic
         );
 
-        $lpStructure = $this->requestOpenAI($tableOfContentsPrompt, 'learnpath');
+        $lpStructure = $this->requestChatCompletion($tableOfContentsPrompt, 'learnpath', 'text');
         if (!$lpStructure) {
             return ['success' => false, 'message' => 'Failed to generate course structure.'];
         }
 
-        // Step 2: Generate content for each chapter
         $lpItems = [];
         $chapters = explode("\n", trim($lpStructure));
-        foreach ($chapters as $index => $chapterTitle) {
+        foreach ($chapters as $chapterTitle) {
             $chapterTitle = trim($chapterTitle);
-            if (empty($chapterTitle)) {
+            if ('' === $chapterTitle) {
                 continue;
             }
 
@@ -111,7 +106,7 @@ public function generateLearnPath(string $topic, int $chaptersCount, string $lan
                 $chapterTitle
             );
 
-            $chapterContent = $this->requestOpenAI($chapterPrompt, 'learnpath');
+            $chapterContent = $this->requestChatCompletion($chapterPrompt, 'learnpath', 'text');
             if (!$chapterContent) {
                 continue;
             }
@@ -122,10 +117,9 @@ public function generateLearnPath(string $topic, int $chaptersCount, string $lan
             ];
         }
 
-        // Step 3: Generate quizzes if enabled
         $quizItems = [];
         if ($addTests) {
-            foreach ($lpItems as &$chapter) {
+            foreach ($lpItems as $chapter) {
                 $quizPrompt = \sprintf(
                     'Generate %d multiple-choice questions in Aiken format in %s about "%s".
             Ensure each question follows this format:
@@ -144,7 +138,7 @@ public function generateLearnPath(string $topic, int $chaptersCount, string $lan
                     $chapter['title']
                 );
 
-                $quizContent = $this->requestOpenAI($quizPrompt, 'learnpath');
+                $quizContent = $this->requestChatCompletion($quizPrompt, 'learnpath', 'text');
 
                 if ($quizContent) {
                     $validQuestions = $this->filterValidAikenQuestions($quizContent);
@@ -167,94 +161,698 @@ public function generateLearnPath(string $topic, int $chaptersCount, string $lan
         ];
     }
 
-    private function filterValidAikenQuestions(string $quizContent): array
+    public function gradeOpenAnswer(string $prompt, string $toolName): ?string
     {
-        $questions = preg_split('/\n{2,}/', trim($quizContent));
+        return $this->requestChatCompletion($prompt, $toolName, 'text');
+    }
 
-        $validQuestions = [];
-        foreach ($questions as $questionBlock) {
-            $lines = explode("\n", trim($questionBlock));
+    public function generateDocument(string $prompt, string $toolName, ?array $options = []): ?string
+    {
+        return $this->requestChatCompletion($prompt, $toolName, 'document');
+    }
 
-            if (\count($lines) < 6) {
-                continue;
+    public function generateImage(string $prompt, string $toolName, ?array $options = []): string|array|null
+    {
+        $userId = $this->getUserId();
+        if (!$userId) {
+            throw new RuntimeException('User not authenticated.');
+        }
+
+        $cfg = $this->getTypeConfig('image');
+        $url = (string) ($cfg['url'] ?? 'https://api.openai.com/v1/images/generations');
+        $model = (string) ($cfg['model'] ?? 'gpt-image-1');
+        $size = (string) ($cfg['size'] ?? '1024x1024');
+        $quality = (string) ($cfg['quality'] ?? 'standard');
+        $n = (int) (($options['n'] ?? null) ?? ($cfg['n'] ?? 1));
+
+        $promptTrimmed = trim($prompt);
+        $promptForLog = mb_substr($promptTrimmed, 0, 200);
+
+        if ('dall-e-3' === $model && $n !== 1) {
+            error_log(sprintf('[AI][OpenAI][image] Model "%s" only supports n=1. Forcing n from %d to 1.', $model, $n));
+            $n = 1;
+        }
+
+        $payload = [
+            'model' => $model,
+            'prompt' => $promptTrimmed,
+            'size' => $size,
+            'quality' => $quality,
+            'n' => $n,
+        ];
+
+        // Best-effort: allow response_format for any model that supports it.
+        $responseFormat = (string) ($cfg['response_format'] ?? 'b64_json');
+        if ('' !== trim($responseFormat)) {
+            $payload['response_format'] = $responseFormat;
+        }
+
+        error_log(sprintf(
+            '[AI][OpenAI][image] Request: userId=%d tool=%s url=%s model=%s size=%s quality=%s n=%d prompt="%s"',
+            $userId,
+            $toolName,
+            $url,
+            $model,
+            $size,
+            $quality,
+            $n,
+            $promptForLog
+        ));
+
+        try {
+            $response = $this->httpClient->request('POST', $url, [
+                'headers' => $this->buildAuthHeaders(true),
+                'json' => $payload,
+            ]);
+
+            $status = $response->getStatusCode();
+            $headers = $response->getHeaders(false);
+            $requestId = $this->extractRequestId($headers);
+
+            $raw = $response->getContent(false);
+            $rawForLog = mb_substr((string) $raw, 0, 2000);
+
+            if ($status >= 400) {
+                $decoded = json_decode((string) $raw, true);
+                $msg = $decoded['error']['message'] ?? null;
+                $type = $decoded['error']['type'] ?? null;
+                $code = $decoded['error']['code'] ?? null;
+                $param = $decoded['error']['param'] ?? null;
+
+                $finalMsg = $msg ?: 'OpenAI returned an error response.';
+                error_log(sprintf(
+                    '[AI][OpenAI][image] HTTP %d request_id=%s type=%s code=%s param=%s body=%s',
+                    $status,
+                    (string) $requestId,
+                    (string) $type,
+                    (string) $code,
+                    (string) $param,
+                    $rawForLog
+                ));
+
+                return 'Error: '.$finalMsg;
             }
 
-            $options = \array_slice($lines, 1, 4);
-            $validOptions = array_filter($options, fn ($line) => preg_match('/^[A-D]\. .+/', $line));
+            $data = json_decode((string) $raw, true);
+            if (!is_array($data)) {
+                error_log(sprintf(
+                    '[AI][OpenAI][image] Invalid JSON response. HTTP %d request_id=%s body=%s',
+                    $status,
+                    (string) $requestId,
+                    $rawForLog
+                ));
 
-            $answerLine = end($lines);
-            if (4 === \count($validOptions) && preg_match('/^ANSWER: [A-D]$/', $answerLine)) {
-                $validQuestions[] = implode("\n", $lines);
+                return 'Error: Invalid JSON response from OpenAI.';
+            }
+
+            if (!isset($data['data'][0]) || !is_array($data['data'][0])) {
+                error_log(sprintf(
+                    '[AI][OpenAI][image] Missing image data[0]. HTTP %d request_id=%s keys=%s body=%s',
+                    $status,
+                    (string) $requestId,
+                    implode(',', array_keys($data)),
+                    $rawForLog
+                ));
+
+                return 'Error: OpenAI response missing image data.';
+            }
+
+            $item = $data['data'][0];
+
+            $result = [
+                'content' => null,
+                'url' => null,
+                'is_base64' => false,
+                'content_type' => 'image/png',
+                'revised_prompt' => $item['revised_prompt'] ?? null,
+            ];
+
+            if (isset($item['b64_json']) && \is_string($item['b64_json']) && '' !== $item['b64_json']) {
+                $result['content'] = $item['b64_json'];
+                $result['is_base64'] = true;
+            } elseif (isset($item['url']) && \is_string($item['url']) && '' !== $item['url']) {
+                $result['url'] = $item['url'];
+                $result['is_base64'] = false;
+            } else {
+                error_log(sprintf(
+                    '[AI][OpenAI][image] Response did not include b64_json or url. HTTP %d request_id=%s body=%s',
+                    $status,
+                    (string) $requestId,
+                    $rawForLog
+                ));
+
+                return 'Error: OpenAI response did not include image content.';
             }
+
+            $this->saveAiRequest(
+                $userId,
+                $toolName,
+                $promptTrimmed,
+                'openai',
+                (int) ($data['usage']['prompt_tokens'] ?? 0),
+                (int) ($data['usage']['completion_tokens'] ?? 0),
+                (int) ($data['usage']['total_tokens'] ?? 0)
+            );
+
+            error_log(sprintf(
+                '[AI][OpenAI][image] Success. HTTP %d request_id=%s revised_prompt=%s returned_base64=%s returned_url=%s',
+                $status,
+                (string) $requestId,
+                isset($result['revised_prompt']) ? (string) $result['revised_prompt'] : '',
+                $result['is_base64'] ? 'yes' : 'no',
+                !empty($result['url']) ? 'yes' : 'no'
+            ));
+
+            return $result;
+        } catch (Exception $e) {
+            error_log('[AI][OpenAI][image] Exception: '.$e->getMessage());
+            return 'Error: '.$e->getMessage();
+        }
+    }
+
+    public function generateVideo(string $prompt, string $toolName, ?array $options = []): string|array|null
+    {
+        $userId = $this->getUserId();
+        if (!$userId) {
+            throw new RuntimeException('User not authenticated.');
         }
 
-        return $validQuestions;
+        $cfg = $this->getTypeConfig('video');
+        $url = (string) ($cfg['url'] ?? 'https://api.openai.com/v1/videos');
+        $model = (string) ($cfg['model'] ?? 'sora-2');
+        $seconds = (string) (($options['seconds'] ?? null) ?? ($cfg['seconds'] ?? '8'));
+        $size = (string) (($options['size'] ?? null) ?? ($cfg['size'] ?? '720x1280'));
+
+        $model = strtolower(trim($model));
+        $seconds = trim((string) $seconds);
+        $size = trim((string) $size);
+
+        if (!in_array($model, self::ALLOWED_VIDEO_MODELS, true)) {
+            return 'Error: Invalid value for model. Expected one of: '.implode(', ', self::ALLOWED_VIDEO_MODELS).'.';
+        }
+
+        if (!in_array($seconds, self::ALLOWED_VIDEO_SECONDS, true)) {
+            return 'Error: Invalid value for seconds. Expected one of: '.implode(', ', self::ALLOWED_VIDEO_SECONDS).'.';
+        }
+
+        if (!in_array($size, self::ALLOWED_VIDEO_SIZES, true)) {
+            return 'Error: Invalid value for size. Expected one of: '.implode(', ', self::ALLOWED_VIDEO_SIZES).'.';
+        }
+
+        $promptTrimmed = trim($prompt);
+        $promptForLog = mb_substr($promptTrimmed, 0, 200);
+
+        error_log(sprintf(
+            '[AI][OpenAI][video] Request: userId=%d tool=%s url=%s model=%s seconds=%s size=%s prompt="%s"',
+            $userId,
+            $toolName,
+            $url,
+            $model,
+            $seconds,
+            $size,
+            $promptForLog
+        ));
+
+        try {
+            $fields = [
+                'model' => $model,
+                'prompt' => $promptTrimmed,
+                'seconds' => $seconds,
+                'size' => $size,
+            ];
+
+            if (
+                isset($options['input_reference_path'])
+                && is_string($options['input_reference_path'])
+                && '' !== $options['input_reference_path']
+            ) {
+                $path = $options['input_reference_path'];
+                if (is_readable($path)) {
+                    $fields['input_reference'] = DataPart::fromPath($path);
+                } else {
+                    error_log('[AI][OpenAI][video] input_reference_path is not readable: '.$path);
+                }
+            }
+
+            $formData = new FormDataPart($fields);
+
+            $headers = array_merge(
+                $this->buildAuthHeaders(false),
+                $formData->getPreparedHeaders()->toArray(),
+                [
+                    'Accept' => 'application/json',
+                ]
+            );
+
+            $response = $this->httpClient->request('POST', $url, [
+                'headers' => $headers,
+                'body' => $formData->bodyToIterable(),
+            ]);
+
+            $status = $response->getStatusCode();
+            $respHeaders = $response->getHeaders(false);
+            $requestId = $this->extractRequestId($respHeaders);
+
+            $raw = (string) $response->getContent(false);
+            $rawForLog = mb_substr($raw, 0, 2000);
+
+            if ($status >= 400) {
+                $err = $this->decodeOpenAiError($raw);
+                $finalMsg = (string) ($err['message'] ?? '');
+
+                if ('' === trim($finalMsg)) {
+                    $finalMsg = sprintf(
+                        'OpenAI returned HTTP %d. Ensure your project/org has access to model "%s" and the organization is verified if required.',
+                        $status,
+                        $model
+                    );
+                }
+
+                error_log(sprintf(
+                    '[AI][OpenAI][video] HTTP %d request_id=%s type=%s code=%s param=%s error="%s" body=%s',
+                    $status,
+                    (string) $requestId,
+                    (string) ($err['type'] ?? ''),
+                    (string) ($err['code'] ?? ''),
+                    (string) ($err['param'] ?? ''),
+                    $finalMsg,
+                    $rawForLog !== '' ? $rawForLog : '(empty body)'
+                ));
+
+                return 'Error: '.$finalMsg;
+            }
+
+            $data = json_decode($raw, true);
+            if (!is_array($data)) {
+                error_log(sprintf(
+                    '[AI][OpenAI][video] Invalid JSON response. HTTP %d request_id=%s body=%s',
+                    $status,
+                    (string) $requestId,
+                    $rawForLog !== '' ? $rawForLog : '(empty body)'
+                ));
+                return 'Error: Invalid JSON response from OpenAI.';
+            }
+
+            if (!isset($data['id']) || !is_string($data['id']) || '' === trim($data['id'])) {
+                error_log(sprintf(
+                    '[AI][OpenAI][video] Missing "id" in response. HTTP %d request_id=%s keys=%s body=%s',
+                    $status,
+                    (string) $requestId,
+                    implode(',', array_keys($data)),
+                    $rawForLog
+                ));
+                return 'Error: OpenAI response missing "id".';
+            }
+
+            $result = [
+                'id' => $data['id'],
+                'status' => (string) ($data['status'] ?? ''),
+                'content' => null,
+                'url' => null,
+                'is_base64' => false,
+                'content_type' => 'video/mp4',
+                'revised_prompt' => null,
+                'job' => $data,
+            ];
+
+            $this->saveAiRequest($userId, $toolName, $promptTrimmed, 'openai', 0, 0, 0);
+
+            error_log(sprintf(
+                '[AI][OpenAI][video] Job created. HTTP %d request_id=%s id=%s status=%s',
+                $status,
+                (string) $requestId,
+                (string) $result['id'],
+                (string) $result['status']
+            ));
+
+            return $result;
+        } catch (Exception $e) {
+            error_log('[AI][OpenAI][video] Exception: '.$e->getMessage());
+            return 'Error: '.$e->getMessage();
+        }
     }
 
-    private function requestOpenAI(string $prompt, string $toolName): ?string
+    public function getVideoJobStatus(string $jobId): ?array
+    {
+        $cfg = $this->getTypeConfig('video');
+        $statusUrlTpl = (string) ($cfg['status_url'] ?? 'https://api.openai.com/v1/videos/{id}');
+        $statusUrl = str_replace('{id}', rawurlencode($jobId), $statusUrlTpl);
+
+        try {
+            $response = $this->httpClient->request('GET', $statusUrl, [
+                'headers' => $this->buildAuthHeaders(false),
+            ]);
+
+            $status = $response->getStatusCode();
+            $headers = $response->getHeaders(false);
+            $requestId = $this->extractRequestId($headers);
+
+            $raw = (string) $response->getContent(false);
+
+            if ($status >= 400) {
+                $msg = $this->extractOpenAiErrorMessage($raw);
+                error_log(sprintf(
+                    '[AI][OpenAI][video] Status HTTP %d request_id=%s id=%s error="%s" body=%s',
+                    $status,
+                    $requestId,
+                    $jobId,
+                    $msg,
+                    $this->safeTruncate($raw, 2000)
+                ));
+                return [
+                    'id' => $jobId,
+                    'status' => 'failed',
+                    'error' => $msg,
+                    'job' => null,
+                ];
+            }
+
+            $data = json_decode($raw, true);
+            if (!is_array($data)) {
+                return [
+                    'id' => $jobId,
+                    'status' => '',
+                    'error' => 'Invalid JSON response from OpenAI.',
+                    'job' => null,
+                ];
+            }
+
+            return [
+                'id' => (string) ($data['id'] ?? $jobId),
+                'status' => (string) ($data['status'] ?? ''),
+                'error' => null,
+                'job' => $data,
+            ];
+        } catch (Exception $e) {
+            error_log('[AI][OpenAI][video] getVideoJobStatus exception: '.$e->getMessage());
+            return [
+                'id' => $jobId,
+                'status' => '',
+                'error' => $e->getMessage(),
+                'job' => null,
+            ];
+        }
+    }
+
+    public function getVideoJobContentAsBase64(string $jobId, int $maxBytes = 15728640): ?array
+    {
+        $cfg = $this->getTypeConfig('video');
+        $contentUrlTpl = (string) ($cfg['content_url'] ?? 'https://api.openai.com/v1/videos/{id}/content');
+        $contentUrl = str_replace('{id}', rawurlencode($jobId), $contentUrlTpl);
+
+        // Optional query variant (e.g. "preview") if you want smaller payloads for UI previews.
+        // Keep empty by default.
+        $variant = isset($cfg['content_variant']) ? trim((string) $cfg['content_variant']) : '';
+        if ($variant !== '') {
+            $separator = (str_contains($contentUrl, '?')) ? '&' : '?';
+            $contentUrl .= $separator.'variant='.rawurlencode($variant);
+        }
+
+        try {
+            $response = $this->httpClient->request('GET', $contentUrl, [
+                'headers' => array_merge($this->buildAuthHeaders(false), [
+                    'Accept' => '*/*',
+                ]),
+            ]);
+
+            $status = $response->getStatusCode();
+            $headers = $response->getHeaders(false);
+            $requestId = $this->extractRequestId($headers);
+
+            $contentType = (string) ($headers['content-type'][0] ?? 'video/mp4');
+            $raw = (string) $response->getContent(false);
+
+            if ($status >= 400) {
+                $msg = $this->extractOpenAiErrorMessage($raw);
+                error_log(sprintf(
+                    '[AI][OpenAI][video] Content HTTP %d request_id=%s id=%s error="%s" body=%s',
+                    $status,
+                    $requestId,
+                    $jobId,
+                    $msg,
+                    $this->safeTruncate($raw, 2000)
+                ));
+                return [
+                    'is_base64' => false,
+                    'content' => null,
+                    'url' => null,
+                    'content_type' => $contentType,
+                    'error' => $msg,
+                ];
+            }
+
+            // Sometimes the content endpoint can return JSON with a URL.
+            if ($raw !== '' && ($raw[0] === '{' || $raw[0] === '[')) {
+                $json = json_decode($raw, true);
+                if (is_array($json)) {
+                    $url = $json['url'] ?? ($json['data']['url'] ?? null);
+                    if (is_string($url) && '' !== trim($url)) {
+                        return [
+                            'is_base64' => false,
+                            'content' => null,
+                            'url' => trim($url),
+                            'content_type' => 'video/mp4',
+                            'error' => null,
+                        ];
+                    }
+                }
+
+                return [
+                    'is_base64' => false,
+                    'content' => null,
+                    'url' => null,
+                    'content_type' => 'video/mp4',
+                    'error' => 'Content endpoint returned JSON but no URL was found.',
+                ];
+            }
+
+            if (strlen($raw) > $maxBytes) {
+                return [
+                    'is_base64' => false,
+                    'content' => null,
+                    'url' => null,
+                    'content_type' => $contentType,
+                    'error' => 'Video exceeded the maximum allowed size.',
+                ];
+            }
+
+            return [
+                'is_base64' => true,
+                'content' => base64_encode($raw),
+                'url' => null,
+                'content_type' => $contentType,
+                'error' => null,
+            ];
+        } catch (Exception $e) {
+            error_log('[AI][OpenAI][video] getVideoJobContentAsBase64 exception: '.$e->getMessage());
+            return [
+                'is_base64' => false,
+                'content' => null,
+                'url' => null,
+                'content_type' => 'video/mp4',
+                'error' => $e->getMessage(),
+            ];
+        }
+    }
+
+    private function requestChatCompletion(string $prompt, string $toolName, string $type): ?string
     {
         $userId = $this->getUserId();
         if (!$userId) {
             throw new RuntimeException('User not authenticated.');
         }
 
+        $cfg = $this->getTypeConfig($type);
+        if ('document' === $type && empty($cfg)) {
+            $cfg = $this->getTypeConfig('text');
+        }
+
+        if (empty($cfg)) {
+            error_log('[AI][OpenAI] Missing config for type: '.$type);
+            return null;
+        }
+
+        $url = (string) ($cfg['url'] ?? 'https://api.openai.com/v1/chat/completions');
+        $model = (string) ($cfg['model'] ?? 'gpt-4o-mini');
+        $temperature = (float) ($cfg['temperature'] ?? 0.7);
+        $maxTokens = (int) ($cfg['max_tokens'] ?? 1000);
+
         $payload = [
-            'model' => $this->model,
+            'model' => $model,
             'messages' => [
                 ['role' => 'system', 'content' => 'You are a helpful AI assistant that generates structured educational content.'],
                 ['role' => 'user', 'content' => $prompt],
             ],
-            'temperature' => $this->temperature,
-            'max_tokens' => 1000,
+            'temperature' => $temperature,
+            'max_tokens' => $maxTokens,
         ];
 
         try {
-            $response = $this->httpClient->request('POST', $this->apiUrl, [
-                'headers' => [
-                    'Authorization' => 'Bearer '.$this->apiKey,
-                    'Content-Type' => 'application/json',
-                ],
+            $response = $this->httpClient->request('POST', $url, [
+                'headers' => $this->buildAuthHeaders(true),
                 'json' => $payload,
             ]);
 
-            $statusCode = $response->getStatusCode();
-            $data = $response->toArray();
+            $data = $response->toArray(false);
+
+            $generatedContent = $data['choices'][0]['message']['content'] ?? null;
+            if (!\is_string($generatedContent) || '' === trim($generatedContent)) {
+                error_log('[AI][OpenAI] Empty content returned for type: '.$type);
+                return null;
+            }
+
+            $this->saveAiRequest(
+                $userId,
+                $toolName,
+                $prompt,
+                'openai',
+                (int) ($data['usage']['prompt_tokens'] ?? 0),
+                (int) ($data['usage']['completion_tokens'] ?? 0),
+                (int) ($data['usage']['total_tokens'] ?? 0)
+            );
 
-            if (200 === $statusCode && isset($data['choices'][0]['message']['content'])) {
-                $generatedContent = $data['choices'][0]['message']['content'];
+            return $generatedContent;
+        } catch (Exception $e) {
+            error_log('[AI][OpenAI] Exception: '.$e->getMessage());
+            return null;
+        }
+    }
 
-                $aiRequest = new AiRequests();
-                $aiRequest->setUserId($userId)
-                    ->setToolName($toolName)
-                    ->setRequestText($prompt)
-                    ->setPromptTokens($data['usage']['prompt_tokens'] ?? 0)
-                    ->setCompletionTokens($data['usage']['completion_tokens'] ?? 0)
-                    ->setTotalTokens($data['usage']['total_tokens'] ?? 0)
-                    ->setAiProvider('openai')
-                ;
+    private function filterValidAikenQuestions(string $quizContent): array
+    {
+        $questions = preg_split('/\n{2,}/', trim($quizContent));
 
-                $this->aiRequestsRepository->save($aiRequest);
+        $validQuestions = [];
+        foreach ($questions as $questionBlock) {
+            $lines = explode("\n", trim($questionBlock));
 
-                return $generatedContent;
+            if (\count($lines) < 6) {
+                continue;
             }
 
-            return null;
-        } catch (Exception $e) {
-            error_log('[AI][OpenAI] Exception: '.$e->getMessage());
+            $options = \array_slice($lines, 1, 4);
+            $validOptions = array_filter($options, static fn ($line) => (bool) preg_match('/^[A-D]\. .+/', $line));
 
-            return null;
+            $answerLine = end($lines);
+            if (4 === \count($validOptions) && \is_string($answerLine) && preg_match('/^ANSWER: [A-D]$/', $answerLine)) {
+                $validQuestions[] = implode("\n", $lines);
+            }
         }
+
+        return $validQuestions;
     }
 
-    public function gradeOpenAnswer(string $prompt, string $toolName): ?string
+    private function getTypeConfig(string $type): array
+    {
+        $cfg = $this->providerConfig[$type] ?? null;
+        return \is_array($cfg) ? $cfg : [];
+    }
+
+    private function buildAuthHeaders(bool $json): array
     {
-        return $this->requestOpenAI($prompt, $toolName);
+        $headers = [
+            'Authorization' => 'Bearer '.$this->apiKey,
+        ];
+
+        if ('' !== trim($this->organizationId)) {
+            $headers['OpenAI-Organization'] = $this->organizationId;
+        }
+
+        $projectId = (string) ($this->providerConfig['project_id'] ?? '');
+        if ('' !== trim($projectId)) {
+            $headers['OpenAI-Project'] = $projectId;
+        }
+
+        if ($json) {
+            $headers['Content-Type'] = 'application/json';
+        }
+
+        return $headers;
+    }
+
+    private function saveAiRequest(
+        int $userId,
+        string $toolName,
+        string $requestText,
+        string $provider,
+        int $promptTokens = 0,
+        int $completionTokens = 0,
+        int $totalTokens = 0
+    ): void {
+        try {
+            $aiRequest = new AiRequests();
+            $aiRequest
+                ->setUserId($userId)
+                ->setToolName($toolName)
+                ->setRequestText($requestText)
+                ->setPromptTokens($promptTokens)
+                ->setCompletionTokens($completionTokens)
+                ->setTotalTokens($totalTokens)
+                ->setAiProvider($provider)
+            ;
+
+            $this->aiRequestsRepository->save($aiRequest);
+        } catch (Exception $e) {
+            error_log('[AI] Failed to save AiRequests record: '.$e->getMessage());
+        }
     }
 
     private function getUserId(): ?int
     {
         $user = $this->security->getUser();
-
         return $user instanceof UserInterface ? $user->getId() : null;
     }
+
+    private function extractRequestId(array $headers): string
+    {
+        return (string) ($headers['x-request-id'][0] ?? $headers['request-id'][0] ?? '');
+    }
+
+    private function extractOpenAiErrorMessage(string $raw): string
+    {
+        $decoded = json_decode($raw, true);
+        if (is_array($decoded)) {
+            $msg = $decoded['error']['message'] ?? null;
+            if (is_string($msg) && trim($msg) !== '') {
+                return trim($msg);
+            }
+        }
+        return 'OpenAI returned an error response.';
+    }
+
+    private function safeTruncate(string $s, int $max = 2000): string
+    {
+        return mb_substr($s, 0, $max);
+    }
+
+    private function decodeOpenAiError(string $raw): array
+    {
+        $decoded = json_decode($raw, true);
+
+        if (!is_array($decoded)) {
+            return [
+                'message' => null,
+                'type' => null,
+                'code' => null,
+                'param' => null,
+            ];
+        }
+
+        $err = $decoded['error'] ?? null;
+        if (!is_array($err)) {
+            return [
+                'message' => null,
+                'type' => null,
+                'code' => null,
+                'param' => null,
+            ];
+        }
+
+        return [
+            'message' => isset($err['message']) && is_string($err['message']) ? $err['message'] : null,
+            'type' => isset($err['type']) && is_string($err['type']) ? $err['type'] : null,
+            'code' => isset($err['code']) && is_string($err['code']) ? $err['code'] : null,
+            'param' => isset($err['param']) && is_string($err['param']) ? $err['param'] : null,
+        ];
+    }
 }
diff --git a/src/CoreBundle/Controller/AiController.php b/src/CoreBundle/Controller/AiController.php
index 028a56bd926..19badccf47c 100644
--- a/src/CoreBundle/Controller/AiController.php
+++ b/src/CoreBundle/Controller/AiController.php
@@ -6,7 +6,9 @@
 
 namespace Chamilo\CoreBundle\Controller;
 
+use Chamilo\CoreBundle\AiProvider\AiImageProviderInterface;
 use Chamilo\CoreBundle\AiProvider\AiProviderFactory;
+use Chamilo\CoreBundle\AiProvider\AiVideoProviderInterface;
 use Chamilo\CoreBundle\Entity\TrackEDefault;
 use Chamilo\CoreBundle\Entity\TrackEExercise;
 use Chamilo\CoreBundle\Repository\TrackEAttemptRepository;
@@ -19,33 +21,61 @@
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Attribute\Route;
+use Symfony\Component\Security\Core\Exception\AccessDeniedException;
+use Symfony\Contracts\HttpClient\HttpClientInterface;
 
 use const FILTER_SANITIZE_NUMBER_INT;
 
-/**
- * Controller to handle AI-related functionalities.
- */
 #[Route('/ai')]
 class AiController extends AbstractController
 {
     public function __construct(
         private readonly AiProviderFactory $aiProviderFactory,
         private readonly TrackEAttemptRepository $attemptRepo,
-        private readonly EntityManagerInterface $em
+        private readonly EntityManagerInterface $em,
+        private readonly HttpClientInterface $httpClient,
     ) {}
 
+    #[Route('/capabilities', name: 'chamilo_core_ai_capabilities', methods: ['GET'])]
+    public function capabilities(): JsonResponse
+    {
+        return new JsonResponse([
+            'success' => true,
+            'types' => [
+                'text' => $this->aiProviderFactory->getProvidersForType('text'),
+                'image' => $this->aiProviderFactory->getProvidersForType('image'),
+                'video' => $this->aiProviderFactory->getProvidersForType('video'),
+                'document' => $this->aiProviderFactory->getProvidersForType('document'),
+                'document_process' => $this->aiProviderFactory->getProvidersForType('document_process'),
+            ],
+            'has' => [
+                'text' => $this->aiProviderFactory->hasProvidersForType('text'),
+                'image' => $this->aiProviderFactory->hasProvidersForType('image'),
+                'video' => $this->aiProviderFactory->hasProvidersForType('video'),
+                'document' => $this->aiProviderFactory->hasProvidersForType('document'),
+            ],
+        ]);
+    }
+
     #[Route('/generate_aiken', name: 'chamilo_core_ai_generate_aiken', methods: ['POST'])]
     public function generateAiken(Request $request): JsonResponse
     {
         try {
             $data = json_decode($request->getContent(), true);
+            if (!is_array($data)) {
+                return new JsonResponse([
+                    'success' => false,
+                    'text' => 'Invalid JSON payload.',
+                ], 400);
+            }
+
             $nQ = (int) ($data['nro_questions'] ?? 0);
             $language = (string) ($data['language'] ?? 'en');
             $topic = trim((string) ($data['quiz_name'] ?? ''));
-            $questionType = $data['question_type'] ?? 'multiple_choice';
+            $questionType = (string) ($data['question_type'] ?? 'multiple_choice');
             $aiProvider = $data['ai_provider'] ?? null;
 
-            if ($nQ <= 0 || empty($topic)) {
+            if ($nQ <= 0 || '' === $topic) {
                 return new JsonResponse([
                     'success' => false,
                     'text' => 'Invalid request parameters. Ensure all fields are filled correctly.',
@@ -55,7 +85,14 @@ public function generateAiken(Request $request): JsonResponse
             $aiService = $this->aiProviderFactory->getProvider($aiProvider, 'text');
             $questions = $aiService->generateQuestions($topic, $nQ, $questionType, $language);
 
-            if (str_starts_with($questions, 'Error:')) {
+            if (empty($questions)) {
+                return new JsonResponse([
+                    'success' => false,
+                    'text' => 'AI request returned an empty response.',
+                ], 500);
+            }
+
+            if (\is_string($questions) && str_starts_with($questions, 'Error:')) {
                 return new JsonResponse([
                     'success' => false,
                     'text' => $questions,
@@ -64,10 +101,10 @@ public function generateAiken(Request $request): JsonResponse
 
             return new JsonResponse([
                 'success' => true,
-                'text' => trim($questions),
+                'text' => trim((string) $questions),
             ]);
         } catch (Exception $e) {
-            error_log('AI Request failed: '.$e->getMessage());
+            error_log('[AI] Aiken generation failed: '.$e->getMessage());
 
             return new JsonResponse([
                 'success' => false,
@@ -87,11 +124,8 @@ public function openAnswerGrade(Request $request): JsonResponse
             return $this->json(['error' => 'Missing parameters'], 400);
         }
 
-        /** @var TrackEExercise $trackExercise */
-        $trackExercise = $this->em
-            ->getRepository(TrackEExercise::class)
-            ->find($exeId)
-        ;
+        /** @var TrackEExercise|null $trackExercise */
+        $trackExercise = $this->em->getRepository(TrackEExercise::class)->find($exeId);
         if (null === $trackExercise) {
             return $this->json(['error' => 'Exercise attempt not found'], 404);
         }
@@ -108,10 +142,7 @@ public function openAnswerGrade(Request $request): JsonResponse
         $answerText = $attempt->getAnswer();
 
         if (ctype_digit($answerText)) {
-            $cqa = $this->em
-                ->getRepository(CQuizAnswer::class)
-                ->find((int) $answerText)
-            ;
+            $cqa = $this->em->getRepository(CQuizAnswer::class)->find((int) $answerText);
             if ($cqa) {
                 $answerText = $cqa->getAnswer();
             }
@@ -131,6 +162,7 @@ public function openAnswerGrade(Request $request): JsonResponse
         $courseTitle = $courseInfo['title'] ?? '';
         $maxScore = $question->selectWeighting();
         $questionText = $question->selectTitle();
+
         $prompt = \sprintf(
             "In language %s, for the question: '%s', in the context of %s, provide a score between 0 and %d on one line, then feedback on the next line for the following answer: '%s'.",
             $language,
@@ -140,9 +172,8 @@ public function openAnswerGrade(Request $request): JsonResponse
             $answerText
         );
 
-        $raw = trim((string) $this->aiProviderFactory
-            ->getProvider()
-            ->gradeOpenAnswer($prompt, 'open_answer_grade'));
+        $provider = $this->aiProviderFactory->getProvider(null, 'text');
+        $raw = trim((string) $provider->gradeOpenAnswer($prompt, 'open_answer_grade'));
 
         if ('' === $raw) {
             return $this->json(['error' => 'AI request failed'], 500);
@@ -167,6 +198,7 @@ public function openAnswerGrade(Request $request): JsonResponse
             ->setCId($courseId)
             ->setSessionId(api_get_session_id())
         ;
+
         $this->em->persist($track);
         $this->em->flush();
 
@@ -180,41 +212,623 @@ public function openAnswerGrade(Request $request): JsonResponse
     public function generateImage(Request $request): JsonResponse
     {
         try {
+            try {
+                $this->denyIfNotTeacher();
+            } catch (AccessDeniedException $e) {
+                return new JsonResponse([
+                    'success' => false,
+                    'text' => 'Access denied.',
+                ], 403);
+            }
+
             $data = json_decode($request->getContent(), true);
+            if (!is_array($data)) {
+                return new JsonResponse([
+                    'success' => false,
+                    'text' => 'Invalid JSON payload.',
+                ], 400);
+            }
+
             $n = (int) ($data['n'] ?? 1);
             $language = (string) ($data['language'] ?? 'en');
             $prompt = trim((string) ($data['prompt'] ?? ''));
             $toolName = trim((string) ($data['tool'] ?? 'document'));
             $aiProvider = $data['ai_provider'] ?? null;
 
-            if ($n <= 0 || empty($prompt) || empty($toolName)) {
+            if ($n <= 0 || '' === $prompt || '' === $toolName) {
                 return new JsonResponse([
                     'success' => false,
                     'text' => 'Invalid request parameters. Ensure all fields are filled correctly.',
                 ], 400);
             }
 
-            $aiService = $this->aiProviderFactory->getProvider($aiProvider, 'image');
-            $questions = $aiService->generateImage($prompt, $toolName, ['language' => $language, 'n' => $n]);
+            $availableProviders = $this->aiProviderFactory->getProvidersForType('image');
+            if (empty($availableProviders)) {
+                return new JsonResponse([
+                    'success' => false,
+                    'text' => 'No AI providers available for image generation.',
+                ], 400);
+            }
+
+            $explicitProvider = null;
+            if (null !== $aiProvider && '' !== (string) $aiProvider) {
+                $explicitProvider = (string) $aiProvider;
+
+                if (!in_array($explicitProvider, $availableProviders, true)) {
+                    return new JsonResponse([
+                        'success' => false,
+                        'text' => 'Selected AI provider is not available for image generation.',
+                    ], 400);
+                }
+            }
+
+            $providersToTry = $explicitProvider ? [$explicitProvider] : $availableProviders;
+            $errors = [];
+            $providerUsed = null;
+            $result = null;
+
+            foreach ($providersToTry as $providerName) {
+                try {
+                    $aiService = $this->aiProviderFactory->getProvider($providerName, 'image');
+
+                    if (!$aiService instanceof AiImageProviderInterface) {
+                        $errors[$providerName] = 'Provider does not implement image generation interface.';
+                        continue;
+                    }
+
+                    $result = $aiService->generateImage($prompt, $toolName, [
+                        'language' => $language,
+                        'n' => $n,
+                    ]);
+
+                    if (empty($result)) {
+                        $errors[$providerName] = 'Provider returned an empty response.';
+                        continue;
+                    }
+
+                    if (\is_string($result) && str_starts_with($result, 'Error:')) {
+                        $errors[$providerName] = $result;
+                        $result = null;
+                        continue;
+                    }
+
+                    $providerUsed = $providerName;
+                    break;
+                } catch (\Throwable $e) {
+                    $errors[$providerName] = $e->getMessage();
+                    continue;
+                }
+            }
+
+            if (null === $providerUsed || empty($result)) {
+                error_log('[AI][image] Image generation failed for all providers: '.json_encode($errors));
 
-            if (str_starts_with($questions, 'Error:')) {
                 return new JsonResponse([
                     'success' => false,
-                    'text' => $questions,
+                    'text' => $explicitProvider
+                        ? 'Image generation failed for the selected provider.'
+                        : 'All image providers failed.',
+                    'providers_tried' => $providersToTry,
+                    'errors' => $errors,
                 ], 500);
             }
 
+            if (\is_string($result)) {
+                $normalized = [
+                    'content' => trim($result),
+                    'url' => null,
+                    'is_base64' => true,
+                    'content_type' => 'image/png',
+                    'revised_prompt' => null,
+                ];
+
+                return new JsonResponse([
+                    'success' => true,
+                    'text' => $normalized['content'],
+                    'result' => $normalized,
+                    'provider_used' => $providerUsed,
+                    'providers_tried' => $providersToTry,
+                    'errors' => $errors,
+                ]);
+            }
+
+            $content = isset($result['content']) && \is_string($result['content']) ? trim($result['content']) : '';
+            $url = isset($result['url']) && \is_string($result['url']) ? trim($result['url']) : '';
+            $isBase64 = (bool) ($result['is_base64'] ?? false);
+            $contentType = (string) ($result['content_type'] ?? 'image/png');
+
+            if (!$isBase64 && '' === $content && '' !== $url) {
+                try {
+                    $fetched = $this->fetchUrlAsBase64($url, 10 * 1024 * 1024);
+                    $result['content'] = $fetched['content'];
+                    $result['content_type'] = $fetched['content_type'];
+                    $result['is_base64'] = true;
+                    $result['url'] = null;
+                } catch (\Throwable $e) {
+                    error_log('[AI][image] Failed to fetch image URL as base64: '.$e->getMessage());
+
+                    return new JsonResponse([
+                        'success' => false,
+                        'text' => 'Image was generated, but could not be converted to base64 for preview.',
+                    ], 500);
+                }
+            }
+
+            $text = '';
+            if (!empty($result['content']) && \is_string($result['content'])) {
+                $text = trim($result['content']);
+            }
+
             return new JsonResponse([
                 'success' => true,
-                'text' => trim($questions),
+                'text' => $text,
+                'result' => $result,
+                'provider_used' => $providerUsed,
+                'providers_tried' => $providersToTry,
+                'errors' => $errors,
             ]);
         } catch (Exception $e) {
-            error_log('AI Request failed: '.$e->getMessage());
+            error_log('[AI][image] Controller exception: '.$e->getMessage());
 
             return new JsonResponse([
                 'success' => false,
-                'text' => 'An error occurred while generating questions. Please contact the administrator.',
+                'text' => 'An error occurred while generating the image. Please contact the administrator.',
             ], 500);
         }
     }
+
+    #[Route('/generate_video', name: 'chamilo_core_ai_generate_video', methods: ['POST'])]
+    public function generateVideo(Request $request): JsonResponse
+    {
+        try {
+            try {
+                $this->denyIfNotTeacher();
+            } catch (AccessDeniedException $e) {
+                return new JsonResponse([
+                    'success' => false,
+                    'text' => 'Access denied.',
+                ], 403);
+            }
+
+            $data = json_decode($request->getContent(), true);
+            if (!is_array($data)) {
+                return new JsonResponse([
+                    'success' => false,
+                    'text' => 'Invalid JSON payload.',
+                ], 400);
+            }
+
+            $n = (int) ($data['n'] ?? 1);
+            $language = (string) ($data['language'] ?? 'en');
+            $prompt = trim((string) ($data['prompt'] ?? ''));
+            $toolName = trim((string) ($data['tool'] ?? 'document'));
+            $aiProvider = $data['ai_provider'] ?? null;
+
+            // Optional overrides
+            $seconds = isset($data['seconds']) ? trim((string) $data['seconds']) : null;
+            $size = isset($data['size']) ? trim((string) $data['size']) : null;
+
+            if ($n <= 0 || '' === $prompt || '' === $toolName) {
+                return new JsonResponse([
+                    'success' => false,
+                    'text' => 'Invalid request parameters. Ensure all fields are filled correctly.',
+                ], 400);
+            }
+
+            $availableProviders = $this->aiProviderFactory->getProvidersForType('video');
+            if (empty($availableProviders)) {
+                return new JsonResponse([
+                    'success' => false,
+                    'text' => 'No AI providers available for video generation.',
+                ], 400);
+            }
+
+            $explicitProvider = null;
+            if (null !== $aiProvider && '' !== (string) $aiProvider) {
+                $explicitProvider = (string) $aiProvider;
+
+                if (!in_array($explicitProvider, $availableProviders, true)) {
+                    return new JsonResponse([
+                        'success' => false,
+                        'text' => 'Selected AI provider is not available for video generation.',
+                    ], 400);
+                }
+            }
+
+            $providersToTry = $explicitProvider ? [$explicitProvider] : $availableProviders;
+            $errors = [];
+            $providerUsed = null;
+            $result = null;
+
+            foreach ($providersToTry as $providerName) {
+                try {
+                    $aiService = $this->aiProviderFactory->getProvider($providerName, 'video');
+
+                    if (!$aiService instanceof AiVideoProviderInterface) {
+                        $errors[$providerName] = 'Provider does not implement video generation interface.';
+                        continue;
+                    }
+
+                    $options = [
+                        'language' => $language,
+                        'n' => $n,
+                    ];
+
+                    if (null !== $seconds && $seconds !== '') {
+                        $options['seconds'] = $seconds; // must be string: "4"|"8"|"12"
+                    }
+                    if (null !== $size && $size !== '') {
+                        $options['size'] = $size;
+                    }
+
+                    $result = $aiService->generateVideo($prompt, $toolName, $options);
+
+                    if (empty($result)) {
+                        $errors[$providerName] = 'Provider returned an empty response.';
+                        $result = null;
+                        continue;
+                    }
+
+                    if (\is_string($result) && str_starts_with($result, 'Error:')) {
+                        $errors[$providerName] = $result;
+                        $result = null;
+                        continue;
+                    }
+
+                    $providerUsed = $providerName;
+                    break;
+                } catch (\Throwable $e) {
+                    $errors[$providerName] = $e->getMessage();
+                    $result = null;
+                    continue;
+                }
+            }
+
+            if (null === $providerUsed || empty($result)) {
+                error_log('[AI][video] Video generation failed for all providers: '.json_encode($errors));
+
+                $firstError = '';
+                foreach ($errors as $err) {
+                    if (is_string($err) && '' !== trim($err)) {
+                        $firstError = trim($err);
+                        break;
+                    }
+                }
+
+                $message = $firstError !== '' ? preg_replace('/^Error:\s*/', '', $firstError) : (
+                $explicitProvider
+                    ? 'Video generation failed for the selected provider.'
+                    : 'All video providers failed.'
+                );
+
+                $statusCode = $this->mapVideoErrorToHttpStatus($message);
+
+                return new JsonResponse([
+                    'success' => false,
+                    'text' => $message,
+                    'providers_tried' => $providersToTry,
+                    'errors' => $errors,
+                ], $statusCode);
+            }
+
+            if (\is_string($result)) {
+                $raw = trim($result);
+
+                $normalized = [
+                    'content' => null,
+                    'url' => null,
+                    'id' => null,
+                    'status' => null,
+                    'is_base64' => false,
+                    'content_type' => 'video/mp4',
+                    'revised_prompt' => null,
+                ];
+
+                if ($this->looksLikeUrl($raw)) {
+                    $normalized['url'] = $raw;
+                } elseif ($this->looksLikeBase64($raw)) {
+                    $normalized['content'] = $raw;
+                    $normalized['is_base64'] = true;
+                } else {
+                    $normalized['id'] = $raw;
+                }
+
+                return new JsonResponse([
+                    'success' => true,
+                    'text' => (string) ($normalized['url'] ?? $normalized['content'] ?? $normalized['id'] ?? ''),
+                    'result' => $normalized,
+                    'provider_used' => $providerUsed,
+                    'providers_tried' => $providersToTry,
+                    'errors' => $errors,
+                ]);
+            }
+
+            if (!is_array($result)) {
+                return new JsonResponse([
+                    'success' => false,
+                    'text' => 'Provider returned an unsupported response type.',
+                ], 500);
+            }
+
+            $result['is_base64'] = (bool) ($result['is_base64'] ?? false);
+            $result['content_type'] = (string) ($result['content_type'] ?? 'video/mp4');
+            $result['revised_prompt'] = $result['revised_prompt'] ?? null;
+
+            $url = isset($result['url']) && \is_string($result['url']) ? trim($result['url']) : '';
+            $content = isset($result['content']) && \is_string($result['content']) ? trim($result['content']) : '';
+
+            if (empty($content) && !empty($url) && false === (bool) ($result['is_base64'] ?? false)) {
+                try {
+                    $fetched = $this->fetchUrlAsBase64($url, 15 * 1024 * 1024);
+                    $result['content'] = $fetched['content'];
+                    $result['content_type'] = $fetched['content_type'];
+                    $result['is_base64'] = true;
+                    $result['url'] = null;
+                } catch (\Throwable $e) {
+                    error_log('[AI][video] Failed to fetch video URL as base64: '.$e->getMessage());
+                }
+            }
+
+            $text = '';
+            if (isset($result['url']) && \is_string($result['url']) && '' !== trim($result['url'])) {
+                $text = trim($result['url']);
+            } elseif (isset($result['content']) && \is_string($result['content']) && '' !== trim($result['content'])) {
+                $text = trim($result['content']);
+            } elseif (isset($result['id']) && \is_string($result['id']) && '' !== trim($result['id'])) {
+                $text = trim($result['id']);
+            }
+
+            return new JsonResponse([
+                'success' => true,
+                'text' => $text,
+                'result' => $result,
+                'provider_used' => $providerUsed,
+                'providers_tried' => $providersToTry,
+                'errors' => $errors,
+            ]);
+        } catch (Exception $e) {
+            error_log('[AI][video] Video generation failed: '.$e->getMessage());
+
+            return new JsonResponse([
+                'success' => false,
+                'text' => 'An error occurred while generating the video. Please contact the administrator.',
+            ], 500);
+        }
+    }
+
+    /**
+     * Returns a reasonable HTTP status code for known provider errors.
+     */
+    private function mapVideoErrorToHttpStatus(string $message): int
+    {
+        $m = strtolower(trim($message));
+
+        if ($m === '') {
+            return 500;
+        }
+
+        // OpenAI typical cases
+        if (str_contains($m, 'invalid api key') || str_contains($m, 'incorrect api key') || str_contains($m, 'unauthorized')) {
+            return 401;
+        }
+
+        if (str_contains($m, 'must be verified') || str_contains($m, 'verify organization') || str_contains($m, 'organization must be verified')) {
+            return 403;
+        }
+
+        if (str_contains($m, 'does not have access') || str_contains($m, 'not authorized') || str_contains($m, 'permission')) {
+            return 403;
+        }
+
+        if (str_contains($m, 'rate limit') || str_contains($m, 'too many requests')) {
+            return 429;
+        }
+
+        if (str_contains($m, 'insufficient_quota') || str_contains($m, 'quota')) {
+            return 402;
+        }
+
+        return 500;
+    }
+
+    private function looksLikeUrl(string $s): bool
+    {
+        $s = trim($s);
+        if ($s === '') {
+            return false;
+        }
+
+        return (bool) filter_var($s, FILTER_VALIDATE_URL);
+    }
+
+    private function looksLikeBase64(string $s): bool
+    {
+        $s = trim($s);
+        if ($s === '' || strlen($s) < 64) {
+            return false;
+        }
+
+        // Basic base64 charset check
+        if (!preg_match('/^[A-Za-z0-9+\/=\r\n]+$/', $s)) {
+            return false;
+        }
+
+        // Validate decode (strict)
+        $decoded = base64_decode($s, true);
+        if ($decoded === false) {
+            return false;
+        }
+
+        // Video will likely be binary; just ensure not empty
+        return $decoded !== '';
+    }
+
+    #[Route('/video_job/{id}', name: 'chamilo_core_ai_video_job', methods: ['GET'])]
+    public function videoJobStatus(string $id, Request $request): JsonResponse
+    {
+        try {
+            try {
+                $this->denyIfNotTeacher();
+            } catch (AccessDeniedException $e) {
+                return new JsonResponse([
+                    'success' => false,
+                    'text' => 'Access denied.',
+                ], 403);
+            }
+
+            $aiProvider = $request->query->get('ai_provider');
+
+            $aiService = $this->aiProviderFactory->getProvider($aiProvider, 'video');
+            if (!$aiService instanceof AiVideoProviderInterface) {
+                return new JsonResponse([
+                    'success' => false,
+                    'text' => 'Selected AI provider does not support video generation.',
+                ], 400);
+            }
+
+            if (!method_exists($aiService, 'getVideoJobStatus')) {
+                return new JsonResponse([
+                    'success' => false,
+                    'text' => 'This AI provider does not expose a video job status method.',
+                ], 400);
+            }
+
+            $job = $aiService->getVideoJobStatus($id);
+            if (empty($job)) {
+                return new JsonResponse([
+                    'success' => false,
+                    'text' => 'Failed to fetch video job status.',
+                ], 500);
+            }
+
+            $status = (string) ($job['status'] ?? '');
+            $jobError = isset($job['error']) && is_string($job['error']) ? trim($job['error']) : '';
+
+            $result = [
+                'id' => (string) ($job['id'] ?? $id),
+                'status' => $status,
+                'content' => null,
+                'url' => null,
+                'is_base64' => false,
+                'content_type' => 'video/mp4',
+                'revised_prompt' => null,
+                'error' => $jobError !== '' ? $jobError : null,
+            ];
+
+            if (in_array($status, ['completed', 'succeeded', 'done'], true)) {
+                if (method_exists($aiService, 'getVideoJobContentAsBase64')) {
+                    $maxBytes = 15 * 1024 * 1024;
+                    $content = $aiService->getVideoJobContentAsBase64($id, $maxBytes);
+
+                    if (is_array($content)) {
+                        $result['is_base64'] = (bool) ($content['is_base64'] ?? false);
+                        $result['content'] = $content['content'] ?? null;
+                        $result['url'] = $content['url'] ?? null;
+                        $result['content_type'] = (string) ($content['content_type'] ?? 'video/mp4');
+
+                        if (!empty($content['error'])) {
+                            $result['error'] = is_string($content['error']) ? trim($content['error']) : (string) $content['error'];
+
+                            return new JsonResponse([
+                                'success' => true,
+                                'text' => (string) $result['error'],
+                                'result' => $result,
+                                'provider_used' => $aiProvider,
+                            ]);
+                        }
+                    }
+                }
+            }
+
+            return new JsonResponse([
+                'success' => true,
+                'text' => $jobError !== '' ? $jobError : '',
+                'result' => $result,
+                'provider_used' => $aiProvider,
+            ]);
+        } catch (Exception $e) {
+            error_log('[AI][video] Video job status failed: '.$e->getMessage());
+
+            return new JsonResponse([
+                'success' => false,
+                'text' => 'An error occurred while checking the video status. Please contact the administrator.',
+            ], 500);
+        }
+    }
+
+    private function denyIfNotTeacher(): void
+    {
+        if (!$this->isGranted('ROLE_CURRENT_COURSE_TEACHER')
+            && !$this->isGranted('ROLE_CURRENT_COURSE_SESSION_TEACHER')
+            && !$this->isGranted('ROLE_TEACHER')
+        ) {
+            throw new \RuntimeException('Access denied.');
+        }
+    }
+
+    private function fetchUrlAsBase64(string $url, int $maxBytes = 10485760): array
+    {
+        if (!$this->isSafeRemoteUrl($url)) {
+            throw new \RuntimeException('Remote URL is not allowed.');
+        }
+
+        $response = $this->httpClient->request('GET', $url, [
+            'headers' => [
+                'Accept' => '*/*',
+            ],
+        ]);
+
+        $headers = $response->getHeaders(false);
+        $contentType = $headers['content-type'][0] ?? 'application/octet-stream';
+
+        $lenHeader = $headers['content-length'][0] ?? null;
+        if (null !== $lenHeader && is_numeric($lenHeader) && (int) $lenHeader > $maxBytes) {
+            throw new \RuntimeException('Remote content is too large to inline as base64.');
+        }
+
+        $binary = $response->getContent(false);
+
+        if (strlen($binary) > $maxBytes) {
+            throw new \RuntimeException('Remote content exceeded the maximum allowed size.');
+        }
+
+        return [
+            'content' => base64_encode($binary),
+            'content_type' => (string) $contentType,
+            'is_base64' => true,
+            'url' => null,
+        ];
+    }
+
+    private function isSafeRemoteUrl(string $url): bool
+    {
+        $parts = parse_url($url);
+        if (!is_array($parts)) {
+            return false;
+        }
+
+        $scheme = strtolower((string) ($parts['scheme'] ?? ''));
+        if (!in_array($scheme, ['https'], true)) {
+            return false;
+        }
+
+        $host = strtolower((string) ($parts['host'] ?? ''));
+        if ('' === $host) {
+            return false;
+        }
+
+        if (in_array($host, ['localhost', '127.0.0.1', '::1'], true)) {
+            return false;
+        }
+
+        $ip = gethostbyname($host);
+        if (filter_var($ip, FILTER_VALIDATE_IP)) {
+            // Block private/reserved ranges (basic SSRF hardening).
+            if (!filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
 }
diff --git a/src/CoreBundle/Controller/PlatformConfigurationController.php b/src/CoreBundle/Controller/PlatformConfigurationController.php
index 7d5ce7fbb66..9886d57619d 100644
--- a/src/CoreBundle/Controller/PlatformConfigurationController.php
+++ b/src/CoreBundle/Controller/PlatformConfigurationController.php
@@ -226,6 +226,8 @@ public function courseSettingsList(
             'enable_lp_auto_launch' => $courseSettingsManager->getCourseSettingValue('enable_lp_auto_launch'),
             'enable_forum_auto_launch' => $courseSettingsManager->getCourseSettingValue('enable_forum_auto_launch'),
             'learning_path_generator' => $courseSettingsManager->getCourseSettingValue('learning_path_generator'),
+            'image_generator' => $courseSettingsManager->getCourseSettingValue('image_generator'),
+            'video_generator' => $courseSettingsManager->getCourseSettingValue('video_generator'),
             'display_info_advance_inside_homecourse' => $courseSettingsManager->getCourseSettingValue('display_info_advance_inside_homecourse'),
         ];