From dadad8dcb3b2a449140a9c490d94b7c1e8ab1d47 Mon Sep 17 00:00:00 2001
From: lethemanh <lethemanh@lethemanhs-MacBook-Pro.local>
Date: Mon, 2 Mar 2026 12:30:47 +0700
Subject: [PATCH 1/6] fix: Remove API key step when creating openrag assistant
 :bug:

---
 .../CreateAssistantSteps/providers.json       |  1 -
 .../useAssistantDialog.js                     | 19 ++++++++++++++-----
 .../Views/CreateAssistantDialog.jsx           |  3 ++-
 .../components/Views/EditAssistantDialog.jsx  |  8 +++++---
 4 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/packages/cozy-search/src/components/CreateAssistantSteps/providers.json b/packages/cozy-search/src/components/CreateAssistantSteps/providers.json
index ce61c47fb6..5099f2af69 100644
--- a/packages/cozy-search/src/components/CreateAssistantSteps/providers.json
+++ b/packages/cozy-search/src/components/CreateAssistantSteps/providers.json
@@ -5,7 +5,6 @@
     "models": ["openrag"],
     "description": "assistant_create.steps.provider_selection.openrag.description",
     "icon": "OpenRagLogo",
-    "baseUrl": "/api/openrag",
     "external": false
   },
   {
diff --git a/packages/cozy-search/src/components/CreateAssistantSteps/useAssistantDialog.js b/packages/cozy-search/src/components/CreateAssistantSteps/useAssistantDialog.js
index 162ca6a883..6d46711412 100644
--- a/packages/cozy-search/src/components/CreateAssistantSteps/useAssistantDialog.js
+++ b/packages/cozy-search/src/components/CreateAssistantSteps/useAssistantDialog.js
@@ -1,7 +1,7 @@
-import { useState } from 'react'
+import { useMemo, useState } from 'react'
+import { useI18n, useExtendI18n } from 'twake-i18n'
 
 import { useAlert } from 'cozy-ui/transpiled/react/providers/Alert'
-import { useI18n, useExtendI18n } from 'twake-i18n'
 
 import { locales } from '../../locales'
 
@@ -38,6 +38,13 @@ export const useAssistantDialog = ({ onClose, initialData = {} }) => {
     ...initialData
   })
 
+  const canSubmit = useMemo(
+    () =>
+      step === STEPS.API_KEY ||
+      (step === STEPS.MODEL_SELECTION && selectedProvider?.id === 'openrag'),
+    [step, selectedProvider?.id]
+  )
+
   const handleChange = field => event => {
     const value = event.target?.value !== undefined ? event.target.value : event
     setFormData(prev => ({ ...prev, [field]: value }))
@@ -58,7 +65,8 @@ export const useAssistantDialog = ({ onClose, initialData = {} }) => {
     setFormData(prev => ({
       ...prev,
       baseUrl: provider.baseUrl,
-      isCustomModel: provider.id === 'custom'
+      isCustomModel: provider.id === 'custom',
+      model: provider.id === 'openrag' ? provider.models[0] : prev.model
     }))
     setSelectedProvider({
       ...provider,
@@ -80,7 +88,7 @@ export const useAssistantDialog = ({ onClose, initialData = {} }) => {
    */
   const handleNext = async onSubmit => {
     try {
-      if (step === STEPS.API_KEY) {
+      if (canSubmit) {
         await onSubmit(formData)
         onClose()
       } else {
@@ -117,6 +125,7 @@ export const useAssistantDialog = ({ onClose, initialData = {} }) => {
     handleBack,
     handleNext,
     isNextDisabled,
-    handleChangeModel
+    handleChangeModel,
+    canSubmit
   }
 }
diff --git a/packages/cozy-search/src/components/Views/CreateAssistantDialog.jsx b/packages/cozy-search/src/components/Views/CreateAssistantDialog.jsx
index 7fe66b43b1..2870584ee0 100644
--- a/packages/cozy-search/src/components/Views/CreateAssistantDialog.jsx
+++ b/packages/cozy-search/src/components/Views/CreateAssistantDialog.jsx
@@ -35,6 +35,7 @@ const CreateAssistantDialog = ({ open, onClose }) => {
     step,
     formData,
     selectedProvider,
+    canSubmit,
     handleBack,
     handleNext,
     handleChange,
@@ -102,7 +103,7 @@ const CreateAssistantDialog = ({ open, onClose }) => {
           onClick={() => handleNext(onSubmit)}
           disabled={isNextDisabled()}
           label={
-            step === STEPS.API_KEY
+            canSubmit
               ? t('assistant_create.buttons.create')
               : t('assistant_create.buttons.next')
           }
diff --git a/packages/cozy-search/src/components/Views/EditAssistantDialog.jsx b/packages/cozy-search/src/components/Views/EditAssistantDialog.jsx
index fc0ba54fa6..87be0e8fa4 100644
--- a/packages/cozy-search/src/components/Views/EditAssistantDialog.jsx
+++ b/packages/cozy-search/src/components/Views/EditAssistantDialog.jsx
@@ -38,6 +38,7 @@ const EditAssistantDialog = ({ open, onClose }) => {
     step,
     formData,
     selectedProvider,
+    canSubmit,
     setFormData,
     setSelectedProvider,
     handleBack,
@@ -67,7 +68,8 @@ const EditAssistantDialog = ({ open, onClose }) => {
         isCustomModel: assistant.isCustomModel || false,
         model: provider?.auth?.login || '',
         baseUrl: provider?.data?.baseUrl || '',
-        apiKey: provider?.auth?.apiKey || ''
+        apiKey: provider?.auth?.apiKey || '',
+        encryptedApiKey: provider?.auth?.credentials_encrypted || ''
       })
 
       const selectProviderDefault = getSelectedProviderByModel(
@@ -138,9 +140,9 @@ const EditAssistantDialog = ({ open, onClose }) => {
         <Button
           variant="primary"
           onClick={() => handleNext(onSubmit)}
-          disabled={isNextDisabled(true)}
+          disabled={isNextDisabled(!!formData.encryptedApiKey)}
           label={
-            step === STEPS.API_KEY
+            canSubmit
               ? t('assistant_edit.buttons.edit')
               : t('assistant_edit.buttons.next')
           }

From dc5f0e4fed35020583fd6ecaa93401a843a1aec2 Mon Sep 17 00:00:00 2001
From: lethemanh <lethemanh@lethemanhs-MacBook-Pro.local>
Date: Fri, 6 Mar 2026 13:43:47 +0700
Subject: [PATCH 2/6] feat: Change flow select provider and model :sparkles:

---
 .../CreateAssistantSteps/ApiKeyStep.jsx       | 50 ++++++++-----------
 .../CreateAssistantSteps/Provider.jsx         | 15 ++++--
 .../CreateAssistantSteps/helpers.js           |  9 ++--
 .../CreateAssistantSteps/providers.json       |  2 +-
 .../CreateAssistantSteps/styles.styl          | 10 ++--
 .../useAssistantDialog.js                     | 22 +++++---
 .../Views/CreateAssistantDialog.jsx           |  7 ++-
 .../components/Views/EditAssistantDialog.jsx  | 19 ++++---
 .../cozy-search/src/components/constants.js   |  2 +
 packages/cozy-search/src/locales/en.json      |  3 +-
 packages/cozy-search/src/locales/fr.json      |  3 +-
 packages/cozy-search/src/locales/ru.json      |  3 +-
 packages/cozy-search/src/locales/vi.json      |  3 +-
 13 files changed, 85 insertions(+), 63 deletions(-)

diff --git a/packages/cozy-search/src/components/CreateAssistantSteps/ApiKeyStep.jsx b/packages/cozy-search/src/components/CreateAssistantSteps/ApiKeyStep.jsx
index d4e88a3126..87d5fd9ce8 100644
--- a/packages/cozy-search/src/components/CreateAssistantSteps/ApiKeyStep.jsx
+++ b/packages/cozy-search/src/components/CreateAssistantSteps/ApiKeyStep.jsx
@@ -1,39 +1,24 @@
-import React, { useMemo, useState } from 'react'
-import { Link } from 'react-router-dom'
+import cx from 'classnames'
+import React, { useState } from 'react'
 
 import Card from 'cozy-ui/transpiled/react/Card'
 import Icon from 'cozy-ui/transpiled/react/Icon'
 import IconButton from 'cozy-ui/transpiled/react/IconButton'
 import EyeIcon from 'cozy-ui/transpiled/react/Icons/Eye'
-import SelectBox from 'cozy-ui/transpiled/react/SelectBox'
 import TextField from 'cozy-ui/transpiled/react/TextField'
 import Typography from 'cozy-ui/transpiled/react/Typography'
+import { useCozyTheme } from 'cozy-ui-plus/dist/providers/CozyTheme'
 import { useI18n } from 'twake-i18n'
 
-const ApiKeyStep = ({ apiKey, selectedProvider, onChange, onModelSelect }) => {
+const ApiKeyStep = ({ apiKey, selectedProvider, onChange }) => {
+  const { type: theme } = useCozyTheme()
   const [showPassword, setShowPassword] = useState(false)
 
   const { t } = useI18n()
-  const {
-    models,
-    id,
-    name: providerName,
-    model,
-    baseUrl
-  } = selectedProvider || {}
+  const { id, name: providerName, model, baseUrl } = selectedProvider || {}
 
   const isCustomModel = id === 'custom'
 
-  const mappedModels = useMemo(
-    () =>
-      models?.map(model => ({
-        label: model,
-        value: model
-      })),
-    // eslint-disable-next-line react-hooks/preserve-manual-memoization
-    [models]
-  )
-
   return (
     <div className="u-flex u-flex-column u-gap-1">
       <Typography variant="body1" className="u-mb-1 u-c-text-secondary">
@@ -85,10 +70,15 @@ const ApiKeyStep = ({ apiKey, selectedProvider, onChange, onModelSelect }) => {
           <Typography variant="h6" className="u-mb-half">
             {t('assistant_create.steps.configuration.model.label')}
           </Typography>
-          <SelectBox
-            options={mappedModels}
-            value={{ label: model, value: model }}
-            onChange={selectedModel => onModelSelect(selectedModel.value)}
+          <TextField
+            fullWidth
+            placeholder={t(
+              'assistant_create.steps.configuration.model.placeholder'
+            )}
+            value={model}
+            onChange={onChange('model')}
+            variant="outlined"
+            type="text"
           />
         </div>
       )}
@@ -121,7 +111,12 @@ const ApiKeyStep = ({ apiKey, selectedProvider, onChange, onModelSelect }) => {
         />
       </div>
 
-      <Card className="u-bg-paleGrey u-p-1 u-bdw-0">
+      <Card
+        className={cx(' u-p-1 u-bdw-0', {
+          'u-bg-primaryBackgroundLight': theme === 'light',
+          'u-bg-coolGrey': theme === 'dark'
+        })}
+      >
         <Typography variant="h6" className="u-mb-half">
           {t('assistant_create.steps.configuration.no_key')}
         </Typography>
@@ -133,9 +128,6 @@ const ApiKeyStep = ({ apiKey, selectedProvider, onChange, onModelSelect }) => {
                 : t('assistant_create.steps.configuration.custom_provider')
             })}
           </span>
-          <Link underline="hover" to="/" className="u-primaryColor">
-            {t('assistant_create.steps.configuration.read_docs')}
-          </Link>
         </Typography>
       </Card>
     </div>
diff --git a/packages/cozy-search/src/components/CreateAssistantSteps/Provider.jsx b/packages/cozy-search/src/components/CreateAssistantSteps/Provider.jsx
index ebfdb32018..35ad860a9b 100644
--- a/packages/cozy-search/src/components/CreateAssistantSteps/Provider.jsx
+++ b/packages/cozy-search/src/components/CreateAssistantSteps/Provider.jsx
@@ -6,6 +6,7 @@ import CheckIcon from 'cozy-ui/transpiled/react/Icons/Check'
 import PlusSmallIcon from 'cozy-ui/transpiled/react/Icons/PlusSmall'
 import Typography from 'cozy-ui/transpiled/react/Typography'
 import { useI18n } from 'twake-i18n'
+import { useCozyTheme } from 'cozy-ui-plus/dist/providers/CozyTheme'
 
 import styles from './styles.styl'
 import AnthropicLogo from '../../assets/anthropic.svg'
@@ -27,17 +28,21 @@ const ICONS = {
 
 const Provider = ({ selectedProvider, provider, onSelect }) => {
   const { t } = useI18n()
+  const { type: theme } = useCozyTheme()
   const isSelected = selectedProvider?.id === provider.id
   const isOpenRag = provider.id === 'openrag'
 
   return (
     <button
       type="button"
-      className={`u-p-1 u-c-pointer u-flex u-flex-row u-flex-items-center ${
-        styles['model-card']
-      } ${isSelected ? styles.selected : ''} ${
-        isOpenRag ? styles.openrag : ''
-      }`}
+      className={cx(
+        'u-p-1 u-c-pointer u-flex u-flex-row u-flex-items-center',
+        styles['model-card'],
+        {
+          [styles['model-card--selected']]: isSelected,
+          [styles[`model-card--openrag--${theme}`]]: isOpenRag
+        }
+      )}
       onClick={() => onSelect(provider)}
     >
       <div
diff --git a/packages/cozy-search/src/components/CreateAssistantSteps/helpers.js b/packages/cozy-search/src/components/CreateAssistantSteps/helpers.js
index 9e3897dcad..03e2d67630 100644
--- a/packages/cozy-search/src/components/CreateAssistantSteps/helpers.js
+++ b/packages/cozy-search/src/components/CreateAssistantSteps/helpers.js
@@ -3,14 +3,13 @@ import providers from './providers.json'
 /**
  * Get the provider corresponding to a given model name.
  * If no provider matches, return the custom provider.
- * @param {string} modelName - The name of the model.
+ * @param {string} providerId - The ID of the provider.
  * @returns {object} The provider object.
  */
-export const getSelectedProviderByModel = modelName => {
+export const getSelectedProviderById = providerId => {
   return (
-    providers.find(provider => provider.models?.includes(modelName)) || {
-      ...providers.find(provider => provider.id === 'custom'),
-      name: modelName
+    providers.find(provider => provider.id === providerId) || {
+      ...providers.find(provider => provider.id === 'custom')
     }
   )
 }
diff --git a/packages/cozy-search/src/components/CreateAssistantSteps/providers.json b/packages/cozy-search/src/components/CreateAssistantSteps/providers.json
index 5099f2af69..7a3b790a6e 100644
--- a/packages/cozy-search/src/components/CreateAssistantSteps/providers.json
+++ b/packages/cozy-search/src/components/CreateAssistantSteps/providers.json
@@ -1,7 +1,7 @@
 [
   {
     "id": "openrag",
-    "name": "LINAGORA",
+    "name": "OPENRAG",
     "models": ["openrag"],
     "description": "assistant_create.steps.provider_selection.openrag.description",
     "icon": "OpenRagLogo",
diff --git a/packages/cozy-search/src/components/CreateAssistantSteps/styles.styl b/packages/cozy-search/src/components/CreateAssistantSteps/styles.styl
index f7a0cf9b8f..09b7bbb526 100644
--- a/packages/cozy-search/src/components/CreateAssistantSteps/styles.styl
+++ b/packages/cozy-search/src/components/CreateAssistantSteps/styles.styl
@@ -28,11 +28,15 @@
     text-align left
     background inherit
 
-    &.selected
+    &--selected
       border 1px solid var(--primaryColor)
 
-    &.openrag
-      background linear-gradient(90deg, #EFF6FF 0%, #FAF5FF 100%)
+    &--openrag
+      &--light
+        background linear-gradient(90deg, #EFF6FF 0%, #FAF5FF 100%)
+
+      &--dark
+        background linear-gradient(90deg, #3A2899 0%, #0C091B 100%)
 
   & .icon-container
     width 53px
diff --git a/packages/cozy-search/src/components/CreateAssistantSteps/useAssistantDialog.js b/packages/cozy-search/src/components/CreateAssistantSteps/useAssistantDialog.js
index 6d46711412..722c86efbd 100644
--- a/packages/cozy-search/src/components/CreateAssistantSteps/useAssistantDialog.js
+++ b/packages/cozy-search/src/components/CreateAssistantSteps/useAssistantDialog.js
@@ -1,9 +1,13 @@
 import { useMemo, useState } from 'react'
-import { useI18n, useExtendI18n } from 'twake-i18n'
 
+import Minilog from 'cozy-minilog'
 import { useAlert } from 'cozy-ui/transpiled/react/providers/Alert'
+import { useI18n, useExtendI18n } from 'twake-i18n'
 
 import { locales } from '../../locales'
+import { OPENRAG_MODEL } from '../constants'
+
+const log = Minilog('[AssistantDialog]')
 
 export const STEPS = {
   BASIC_INFO: 0,
@@ -34,14 +38,14 @@ export const useAssistantDialog = ({ onClose, initialData = {} }) => {
     model: '',
     baseUrl: '',
     apiKey: '',
-    isCustomModel: false,
     ...initialData
   })
 
   const canSubmit = useMemo(
     () =>
       step === STEPS.API_KEY ||
-      (step === STEPS.MODEL_SELECTION && selectedProvider?.id === 'openrag'),
+      (step === STEPS.MODEL_SELECTION &&
+        selectedProvider?.id === OPENRAG_MODEL),
     [step, selectedProvider?.id]
   )
 
@@ -62,11 +66,14 @@ export const useAssistantDialog = ({ onClose, initialData = {} }) => {
   }
 
   const handleProviderSelection = provider => {
+    const isOpenrag = provider.id === OPENRAG_MODEL
     setFormData(prev => ({
       ...prev,
-      baseUrl: provider.baseUrl,
-      isCustomModel: provider.id === 'custom',
-      model: provider.id === 'openrag' ? provider.models[0] : prev.model
+      baseUrl: provider.baseUrl ?? '',
+      model: isOpenrag ? provider.models[0] : '',
+      apiKey: '',
+      encryptedApiKey: '',
+      providerId: provider.id
     }))
     setSelectedProvider({
       ...provider,
@@ -94,7 +101,8 @@ export const useAssistantDialog = ({ onClose, initialData = {} }) => {
       } else {
         setStep(prev => prev + 1)
       }
-    } catch (_error) {
+    } catch (error) {
+      log.error('Error in handleNext:', error)
       showAlert({ message: t('assistant.default_error'), severity: 'error' })
     }
   }
diff --git a/packages/cozy-search/src/components/Views/CreateAssistantDialog.jsx b/packages/cozy-search/src/components/Views/CreateAssistantDialog.jsx
index 2870584ee0..d1d7b67d6b 100644
--- a/packages/cozy-search/src/components/Views/CreateAssistantDialog.jsx
+++ b/packages/cozy-search/src/components/Views/CreateAssistantDialog.jsx
@@ -43,7 +43,10 @@ const CreateAssistantDialog = ({ open, onClose }) => {
     handleAvatarChange,
     isNextDisabled,
     handleChangeModel
-  } = useAssistantDialog({ onClose })
+  } = useAssistantDialog({
+    onClose,
+    initialData: { selectedProvider: { id: 'openrag' } }
+  })
 
   const getTitle = () => {
     if (step === STEPS.API_KEY) {
@@ -60,7 +63,7 @@ const CreateAssistantDialog = ({ open, onClose }) => {
       model: formData.model,
       apiKey: formData.apiKey,
       baseUrl: formData.baseUrl,
-      isCustomModel: formData.isCustomModel
+      providerId: selectedProvider.id
     })
     showAlert({ message: t('assistant_create.success'), severity: 'success' })
   }
diff --git a/packages/cozy-search/src/components/Views/EditAssistantDialog.jsx b/packages/cozy-search/src/components/Views/EditAssistantDialog.jsx
index 87be0e8fa4..de9d6e9bfb 100644
--- a/packages/cozy-search/src/components/Views/EditAssistantDialog.jsx
+++ b/packages/cozy-search/src/components/Views/EditAssistantDialog.jsx
@@ -19,7 +19,7 @@ import { useI18n, useExtendI18n } from 'twake-i18n'
 import { locales } from '../../locales'
 import { useAssistant } from '../AssistantProvider'
 import AssistantDialogContent from '../CreateAssistantSteps/AssistantDialogContent'
-import { getSelectedProviderByModel } from '../CreateAssistantSteps/helpers'
+import { getSelectedProviderById } from '../CreateAssistantSteps/helpers'
 import styles from '../CreateAssistantSteps/styles.styl'
 import {
   useAssistantDialog,
@@ -65,20 +65,25 @@ const EditAssistantDialog = ({ open, onClose }) => {
         name: assistant.name || '',
         description: assistant.prompt || '',
         icon: assistant.icon || '',
-        isCustomModel: assistant.isCustomModel || false,
         model: provider?.auth?.login || '',
         baseUrl: provider?.data?.baseUrl || '',
         apiKey: provider?.auth?.apiKey || '',
-        encryptedApiKey: provider?.auth?.credentials_encrypted || ''
+        encryptedApiKey: provider?.auth?.credentials_encrypted || '',
+        providerId:
+          assistant?.relationships?.provider?.data?.metadata?.providerId
       })
 
-      const selectProviderDefault = getSelectedProviderByModel(
-        provider?.auth?.login
+      const selectProviderDefault = getSelectedProviderById(
+        assistant?.relationships?.provider?.data?.metadata?.providerId
       )
       setSelectedProvider({
         ...selectProviderDefault,
         model: provider?.auth?.login,
-        baseUrl: provider?.data?.baseUrl
+        baseUrl: provider?.data?.baseUrl,
+        name:
+          selectProviderDefault.id === 'custom'
+            ? provider?.auth?.login
+            : selectProviderDefault.name
       })
     }
     fetchAssistant()
@@ -99,7 +104,7 @@ const EditAssistantDialog = ({ open, onClose }) => {
       model: formData.model,
       apiKey: formData.apiKey,
       baseUrl: formData.baseUrl,
-      isCustomModel: formData.isCustomModel
+      providerId: selectedProvider.id
     })
     showAlert({ message: t('assistant_edit.success'), severity: 'success' })
   }
diff --git a/packages/cozy-search/src/components/constants.js b/packages/cozy-search/src/components/constants.js
index 2a6771b456..4de897e0d3 100644
--- a/packages/cozy-search/src/components/constants.js
+++ b/packages/cozy-search/src/components/constants.js
@@ -4,3 +4,5 @@ export const DEFAULT_ASSISTANT = {
 }
 
 export const FETCH_CONVERSATIONS_LIMIT = 50
+
+export const OPENRAG_MODEL = 'openrag'
diff --git a/packages/cozy-search/src/locales/en.json b/packages/cozy-search/src/locales/en.json
index d26e48b7f0..47366f68a5 100644
--- a/packages/cozy-search/src/locales/en.json
+++ b/packages/cozy-search/src/locales/en.json
@@ -135,7 +135,8 @@
         "description": "Enter provider URL, model and your API key to configure the new assistant. Your key will be stored securely.",
         "custom_provider_description": "Configure your custom AI provider settings",
         "model": {
-          "label": "Model"
+          "label": "Model",
+          "placeholder": "Enter the model name of the provider"
         },
         "provider": {
           "label": "Provider name",
diff --git a/packages/cozy-search/src/locales/fr.json b/packages/cozy-search/src/locales/fr.json
index 8fbf7ac6ed..56a1d8a48f 100644
--- a/packages/cozy-search/src/locales/fr.json
+++ b/packages/cozy-search/src/locales/fr.json
@@ -135,7 +135,8 @@
         "description": "Saisissez l'URL du fournisseur, le modèle et votre clé API pour configurer le nouvel assistant. Votre clé sera stockée de manière sécurisée.",
         "custom_provider_description": "Configurez les paramètres de votre fournisseur d'IA personnalisé",
         "model": {
-          "label": "Modèle"
+          "label": "Modèle",
+          "placeholder": "Entrez le nom du modèle du fournisseur"
         },
         "provider": {
           "label": "Nom du fournisseur",
diff --git a/packages/cozy-search/src/locales/ru.json b/packages/cozy-search/src/locales/ru.json
index ab716943c6..5a39cd1108 100644
--- a/packages/cozy-search/src/locales/ru.json
+++ b/packages/cozy-search/src/locales/ru.json
@@ -135,7 +135,8 @@
         "description": "Введите URL провайдера, модель и ваш API‑ключ для настройки нового ассистента. Ваш ключ будет надежно сохранен.",
         "custom_provider_description": "Настройте параметры вашего собственного провайдера ИИ",
         "model": {
-          "label": "Модель"
+          "label": "Модель",
+          "placeholder": "Введите название модели провайдера"
         },
         "provider": {
           "label": "Название провайдера",
diff --git a/packages/cozy-search/src/locales/vi.json b/packages/cozy-search/src/locales/vi.json
index 22ff6b3233..30810a4ffd 100644
--- a/packages/cozy-search/src/locales/vi.json
+++ b/packages/cozy-search/src/locales/vi.json
@@ -135,7 +135,8 @@
         "description": "Nhập URL nhà cung cấp, mô hình và khóa API của bạn để định cấu hình trợ lý mới. Khóa của bạn sẽ được lưu trữ an toàn.",
         "custom_provider_description": "Cấu hình cài đặt nhà cung cấp AI tùy chỉnh",
         "model": {
-          "label": "Mô hình"
+          "label": "Mô hình",
+          "placeholder": "Nhập tên mô hình của nhà cung cấp"
         },
         "provider": {
           "label": "Tên nhà cung cấp",

From b9dbf0fb481d8dd1400672f191a4c6f9d67e2626 Mon Sep 17 00:00:00 2001
From: lethemanh <lethemanh@lethemanhs-MacBook-Pro.local>
Date: Mon, 9 Mar 2026 11:26:48 +0700
Subject: [PATCH 3/6] feat: Change wording of openrag :speech_balloon:

---
 .../src/components/CreateAssistantSteps/providers.json          | 2 +-
 packages/cozy-search/src/locales/en.json                        | 2 +-
 packages/cozy-search/src/locales/fr.json                        | 2 +-
 packages/cozy-search/src/locales/ru.json                        | 2 +-
 packages/cozy-search/src/locales/vi.json                        | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/cozy-search/src/components/CreateAssistantSteps/providers.json b/packages/cozy-search/src/components/CreateAssistantSteps/providers.json
index 7a3b790a6e..ca3d73c69e 100644
--- a/packages/cozy-search/src/components/CreateAssistantSteps/providers.json
+++ b/packages/cozy-search/src/components/CreateAssistantSteps/providers.json
@@ -1,7 +1,7 @@
 [
   {
     "id": "openrag",
-    "name": "OPENRAG",
+    "name": "Twake",
     "models": ["openrag"],
     "description": "assistant_create.steps.provider_selection.openrag.description",
     "icon": "OpenRagLogo",
diff --git a/packages/cozy-search/src/locales/en.json b/packages/cozy-search/src/locales/en.json
index 47366f68a5..f296cb9c8e 100644
--- a/packages/cozy-search/src/locales/en.json
+++ b/packages/cozy-search/src/locales/en.json
@@ -108,7 +108,7 @@
         "description": "Choose the AI model that best matches your requirements.",
         "by": "by",
         "openrag": {
-          "description": "Work with drive files, chat, email from your Twake Workplace"
+          "description": "The AI assistant integrated into Twake, letting you work on your data without ever letting it leave your Workplace"
         },
         "google": {
           "description": "Google's most capable model for text and multimodal tasks"
diff --git a/packages/cozy-search/src/locales/fr.json b/packages/cozy-search/src/locales/fr.json
index 56a1d8a48f..18813f833b 100644
--- a/packages/cozy-search/src/locales/fr.json
+++ b/packages/cozy-search/src/locales/fr.json
@@ -108,7 +108,7 @@
         "description": "Choisissez le modèle d'IA qui correspond le mieux à vos besoins.",
         "by": "par",
         "openrag": {
-          "description": "Travaillez avec des fichiers Drive, le chat et les emails depuis votre Twake Workplace"
+          "description": "L'assistant IA intégré à Twake, pour travailler sur vos données sans jamais les faire sortir de votre Workplace"
         },
         "google": {
           "description": "Le modèle le plus performant de Google pour les tâches textuelles et multimodales"
diff --git a/packages/cozy-search/src/locales/ru.json b/packages/cozy-search/src/locales/ru.json
index 5a39cd1108..d616411741 100644
--- a/packages/cozy-search/src/locales/ru.json
+++ b/packages/cozy-search/src/locales/ru.json
@@ -108,7 +108,7 @@
         "description": "Выберите модель ИИ, которая лучше всего соответствует вашим требованиям.",
         "by": "от",
         "openrag": {
-          "description": "Работайте с файлами Drive, чатом и электронной почтой из вашего Twake Workplace"
+          "description": "ИИ-ассистент, интегрированный в Twake, позволяет вам работать со своими данными, гарантируя, что они никогда не покинут пределы вашего рабочего пространства"
         },
         "google": {
           "description": "Самая мощная модель Google для текстовых и мультимодальных задач"
diff --git a/packages/cozy-search/src/locales/vi.json b/packages/cozy-search/src/locales/vi.json
index 30810a4ffd..61cf0493e5 100644
--- a/packages/cozy-search/src/locales/vi.json
+++ b/packages/cozy-search/src/locales/vi.json
@@ -108,7 +108,7 @@
         "description": "Chọn mô hình AI phù hợp nhất với yêu cầu của bạn.",
         "by": "bởi",
         "openrag": {
-          "description": "Làm việc với tệp trên Drive, chat, email từ Twake Workplace của bạn"
+          "description": "Trợ lý AI được tích hợp vào Twake, cho phép bạn xử lý dữ liệu của mình mà không bao giờ phải đưa dữ liệu ra khỏi Không gian làm việc của bạn"
         },
         "google": {
           "description": "Mô hình mạnh nhất của Google cho tác vụ văn bản và đa phương thức"

From a51c7721eb53026bb9830f42b16dda2b75548fb9 Mon Sep 17 00:00:00 2001
From: lethemanh <lethemanh@lethemanhs-MacBook-Pro.local>
Date: Wed, 18 Mar 2026 00:00:04 +0700
Subject: [PATCH 4/6] chore: Upgrade cozy-client to 60.22.1 :arrow_up:

---
 packages/cozy-search/package.json |  2 +-
 yarn.lock                         | 56 +++++++++++++++----------------
 2 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/packages/cozy-search/package.json b/packages/cozy-search/package.json
index aaaba5ef52..34d63c42d5 100644
--- a/packages/cozy-search/package.json
+++ b/packages/cozy-search/package.json
@@ -27,7 +27,7 @@
     "babel-plugin-tsconfig-paths": "^1.0.3",
     "babel-preset-cozy-app": "^2.8.4",
     "cozy-bar": "^29.0.0",
-    "cozy-client": "^60.21.0",
+    "cozy-client": "^60.22.1",
     "cozy-device-helper": "^4.0.3",
     "cozy-flags": "^4.9.1",
     "cozy-intent": "^2.31.1",
diff --git a/yarn.lock b/yarn.lock
index 48c0721f52..3cf55a343c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -17624,16 +17624,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cozy-client@npm:^60.21.0":
-  version: 60.21.0
-  resolution: "cozy-client@npm:60.21.0"
+"cozy-client@npm:^60.21.3":
+  version: 60.21.3
+  resolution: "cozy-client@npm:60.21.3"
   dependencies:
     "@cozy/minilog": "npm:1.0.0"
     "@fastify/deepmerge": "npm:^2.0.2"
     "@types/jest": "npm:^26.0.20"
     "@types/lodash": "npm:^4.14.170"
     btoa: "npm:^1.2.1"
-    cozy-stack-client: "npm:^60.21.0"
+    cozy-stack-client: "npm:^60.21.1"
     date-fns: "npm:^2.30.0"
     fast-deep-equal: "npm:^3.1.3"
     json-stable-stringify: "npm:^1.0.1"
@@ -17659,20 +17659,20 @@ __metadata:
     react-native-google-play-integrity: ^1.1.0
     react-native-inappbrowser-reborn: ^3.5.1
     react-native-ios11-devicecheck: ^0.0.3
-  checksum: 10c0/1f4bb2113b87d2645ea0482e9d17afe92028eac2ca3dbb27f126919432fc6095723d0e7d906cac74d14262796a5d37cbff3303b63b9fa9beaeda7593cb10219d
+  checksum: 10c0/ec55310b2258dcc3dd3f78af74f5d9c0d7e47f7371899c44ec073145748a2b80455c18793a63d277aa30e3cb9129a5e929aa7c5a8109e9881dc82d354b82541f
   languageName: node
   linkType: hard
 
-"cozy-client@npm:^60.21.3":
-  version: 60.21.3
-  resolution: "cozy-client@npm:60.21.3"
+"cozy-client@npm:^60.22.0":
+  version: 60.22.0
+  resolution: "cozy-client@npm:60.22.0"
   dependencies:
     "@cozy/minilog": "npm:1.0.0"
     "@fastify/deepmerge": "npm:^2.0.2"
     "@types/jest": "npm:^26.0.20"
     "@types/lodash": "npm:^4.14.170"
     btoa: "npm:^1.2.1"
-    cozy-stack-client: "npm:^60.21.1"
+    cozy-stack-client: "npm:^60.22.0"
     date-fns: "npm:^2.30.0"
     fast-deep-equal: "npm:^3.1.3"
     json-stable-stringify: "npm:^1.0.1"
@@ -17698,20 +17698,20 @@ __metadata:
     react-native-google-play-integrity: ^1.1.0
     react-native-inappbrowser-reborn: ^3.5.1
     react-native-ios11-devicecheck: ^0.0.3
-  checksum: 10c0/ec55310b2258dcc3dd3f78af74f5d9c0d7e47f7371899c44ec073145748a2b80455c18793a63d277aa30e3cb9129a5e929aa7c5a8109e9881dc82d354b82541f
+  checksum: 10c0/c2587ef000e6b9d9961528fb07d0fb6ebf0a4f17bd947e2178d9a116fe2319a85cba23e5e5ae67ed6c4fa2b73f83dbc6460f97fbf8706e630639bb16b9cea7c4
   languageName: node
   linkType: hard
 
-"cozy-client@npm:^60.22.0":
-  version: 60.22.0
-  resolution: "cozy-client@npm:60.22.0"
+"cozy-client@npm:^60.22.1":
+  version: 60.23.0
+  resolution: "cozy-client@npm:60.23.0"
   dependencies:
     "@cozy/minilog": "npm:1.0.0"
     "@fastify/deepmerge": "npm:^2.0.2"
     "@types/jest": "npm:^26.0.20"
     "@types/lodash": "npm:^4.14.170"
     btoa: "npm:^1.2.1"
-    cozy-stack-client: "npm:^60.22.0"
+    cozy-stack-client: "npm:^60.23.0"
     date-fns: "npm:^2.30.0"
     fast-deep-equal: "npm:^3.1.3"
     json-stable-stringify: "npm:^1.0.1"
@@ -17737,7 +17737,7 @@ __metadata:
     react-native-google-play-integrity: ^1.1.0
     react-native-inappbrowser-reborn: ^3.5.1
     react-native-ios11-devicecheck: ^0.0.3
-  checksum: 10c0/c2587ef000e6b9d9961528fb07d0fb6ebf0a4f17bd947e2178d9a116fe2319a85cba23e5e5ae67ed6c4fa2b73f83dbc6460f97fbf8706e630639bb16b9cea7c4
+  checksum: 10c0/c27a75f3bca9c42ec89b8ead17acb46af5a93475d5fb73e61e728d87643aa6d34d31b7f75ce7633ee5afd6ed8f573e4b34aa368687bfc11a35c96cc984c97e14
   languageName: node
   linkType: hard
 
@@ -18366,7 +18366,7 @@ __metadata:
     babel-preset-cozy-app: "npm:^2.8.4"
     classnames: "npm:^2.5.1"
     cozy-bar: "npm:^29.0.0"
-    cozy-client: "npm:^60.21.0"
+    cozy-client: "npm:^60.22.1"
     cozy-device-helper: "npm:^4.0.3"
     cozy-flags: "npm:^4.9.1"
     cozy-intent: "npm:^2.31.1"
@@ -18601,42 +18601,42 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cozy-stack-client@npm:^60.21.0":
-  version: 60.21.0
-  resolution: "cozy-stack-client@npm:60.21.0"
+"cozy-stack-client@npm:^60.21.1":
+  version: 60.21.1
+  resolution: "cozy-stack-client@npm:60.21.1"
   dependencies:
     detect-node: "npm:^2.0.4"
     mime: "npm:^2.4.0"
     qs: "npm:^6.7.0"
   peerDependencies:
     cozy-flags: ">2.8.6"
-  checksum: 10c0/c8a8eb0a8e2833f723ecc6c910fe4ec32fd415ef6ef2d338e898ba167b7b72d1a083ac0e1395da2ffc24eb6b56a6b022f35a541134755e5ebf5f0776d00e5176
+  checksum: 10c0/3378d30ca18cdfe5ce97fb3e57d0bda690edddb0d47af236b3dff2e78b990fe7ec0efed77aec93f22960552213694accbf0a46a5999ef4918b3f9bcde7e6b887
   languageName: node
   linkType: hard
 
-"cozy-stack-client@npm:^60.21.1":
-  version: 60.21.1
-  resolution: "cozy-stack-client@npm:60.21.1"
+"cozy-stack-client@npm:^60.22.0":
+  version: 60.22.0
+  resolution: "cozy-stack-client@npm:60.22.0"
   dependencies:
     detect-node: "npm:^2.0.4"
     mime: "npm:^2.4.0"
     qs: "npm:^6.7.0"
   peerDependencies:
     cozy-flags: ">2.8.6"
-  checksum: 10c0/3378d30ca18cdfe5ce97fb3e57d0bda690edddb0d47af236b3dff2e78b990fe7ec0efed77aec93f22960552213694accbf0a46a5999ef4918b3f9bcde7e6b887
+  checksum: 10c0/964fb94d2fa9fe140238467e385092905a451e156cb5c9fe5cf36f088e4e85388fc0b73a726ac01bd9ebc2868608c8bb10abc4607afe5a1794d14a886ef07284
   languageName: node
   linkType: hard
 
-"cozy-stack-client@npm:^60.22.0":
-  version: 60.22.0
-  resolution: "cozy-stack-client@npm:60.22.0"
+"cozy-stack-client@npm:^60.23.0":
+  version: 60.23.0
+  resolution: "cozy-stack-client@npm:60.23.0"
   dependencies:
     detect-node: "npm:^2.0.4"
     mime: "npm:^2.4.0"
     qs: "npm:^6.7.0"
   peerDependencies:
     cozy-flags: ">2.8.6"
-  checksum: 10c0/964fb94d2fa9fe140238467e385092905a451e156cb5c9fe5cf36f088e4e85388fc0b73a726ac01bd9ebc2868608c8bb10abc4607afe5a1794d14a886ef07284
+  checksum: 10c0/c0b402de95699a896ca68f36f38197bc525f72a5bb02654215d385c4833b494b816fbc5bcccaf01fd343031a59652808563f32e236300bb1a4418b1a65a0ebb3
   languageName: node
   linkType: hard
 

From 3302346d760b481c6732ffabb1c046c7679d5cba Mon Sep 17 00:00:00 2001
From: Paul Tran-Van <paul.tranvan@gmail.com>
Date: Wed, 18 Mar 2026 13:42:51 +0100
Subject: [PATCH 5/6] feat: Upgrade cozy-client for latest assistant
 improvements

---
 packages/cozy-search/package.json |  2 +-
 yarn.lock                         | 80 +++++++++++++++----------------
 2 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/packages/cozy-search/package.json b/packages/cozy-search/package.json
index 34d63c42d5..8bfd471c49 100644
--- a/packages/cozy-search/package.json
+++ b/packages/cozy-search/package.json
@@ -27,7 +27,7 @@
     "babel-plugin-tsconfig-paths": "^1.0.3",
     "babel-preset-cozy-app": "^2.8.4",
     "cozy-bar": "^29.0.0",
-    "cozy-client": "^60.22.1",
+    "cozy-client": "60.23.0",
     "cozy-device-helper": "^4.0.3",
     "cozy-flags": "^4.9.1",
     "cozy-intent": "^2.31.1",
diff --git a/yarn.lock b/yarn.lock
index 3cf55a343c..21a2019ab9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -17281,6 +17281,45 @@ __metadata:
   languageName: node
   linkType: hard
 
+"cozy-client@npm:60.23.0":
+  version: 60.23.0
+  resolution: "cozy-client@npm:60.23.0"
+  dependencies:
+    "@cozy/minilog": "npm:1.0.0"
+    "@fastify/deepmerge": "npm:^2.0.2"
+    "@types/jest": "npm:^26.0.20"
+    "@types/lodash": "npm:^4.14.170"
+    btoa: "npm:^1.2.1"
+    cozy-stack-client: "npm:^60.23.0"
+    date-fns: "npm:^2.30.0"
+    fast-deep-equal: "npm:^3.1.3"
+    json-stable-stringify: "npm:^1.0.1"
+    lodash: "npm:^4.17.13"
+    microee: "npm:^0.0.6"
+    node-fetch: "npm:^2.6.1"
+    node-polyglot: "npm:2.4.2"
+    open: "npm:7.4.2"
+    prop-types: "npm:^15.6.2"
+    react-redux: "npm:^7.2.0"
+    redux: "npm:3 || 4"
+    redux-thunk: "npm:^2.3.0"
+    server-destroy: "npm:^1.0.1"
+    sift: "npm:^6.0.0"
+    url-search-params-polyfill: "npm:^8.0.0"
+  peerDependencies:
+    cozy-device-helper: ">=2.1.0"
+    cozy-flags: ">2.8.6"
+    cozy-intent: ">=2.23.0"
+    cozy-logger: ">1.7.0"
+    react: ^16.7.0
+    react-native: ~0.63.5
+    react-native-google-play-integrity: ^1.1.0
+    react-native-inappbrowser-reborn: ^3.5.1
+    react-native-ios11-devicecheck: ^0.0.3
+  checksum: 10c0/c27a75f3bca9c42ec89b8ead17acb46af5a93475d5fb73e61e728d87643aa6d34d31b7f75ce7633ee5afd6ed8f573e4b34aa368687bfc11a35c96cc984c97e14
+  languageName: node
+  linkType: hard
+
 "cozy-client@npm:^37.2.0":
   version: 37.2.0
   resolution: "cozy-client@npm:37.2.0"
@@ -17702,45 +17741,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cozy-client@npm:^60.22.1":
-  version: 60.23.0
-  resolution: "cozy-client@npm:60.23.0"
-  dependencies:
-    "@cozy/minilog": "npm:1.0.0"
-    "@fastify/deepmerge": "npm:^2.0.2"
-    "@types/jest": "npm:^26.0.20"
-    "@types/lodash": "npm:^4.14.170"
-    btoa: "npm:^1.2.1"
-    cozy-stack-client: "npm:^60.23.0"
-    date-fns: "npm:^2.30.0"
-    fast-deep-equal: "npm:^3.1.3"
-    json-stable-stringify: "npm:^1.0.1"
-    lodash: "npm:^4.17.13"
-    microee: "npm:^0.0.6"
-    node-fetch: "npm:^2.6.1"
-    node-polyglot: "npm:2.4.2"
-    open: "npm:7.4.2"
-    prop-types: "npm:^15.6.2"
-    react-redux: "npm:^7.2.0"
-    redux: "npm:3 || 4"
-    redux-thunk: "npm:^2.3.0"
-    server-destroy: "npm:^1.0.1"
-    sift: "npm:^6.0.0"
-    url-search-params-polyfill: "npm:^8.0.0"
-  peerDependencies:
-    cozy-device-helper: ">=2.1.0"
-    cozy-flags: ">2.8.6"
-    cozy-intent: ">=2.23.0"
-    cozy-logger: ">1.7.0"
-    react: ^16.7.0
-    react-native: ~0.63.5
-    react-native-google-play-integrity: ^1.1.0
-    react-native-inappbrowser-reborn: ^3.5.1
-    react-native-ios11-devicecheck: ^0.0.3
-  checksum: 10c0/c27a75f3bca9c42ec89b8ead17acb46af5a93475d5fb73e61e728d87643aa6d34d31b7f75ce7633ee5afd6ed8f573e4b34aa368687bfc11a35c96cc984c97e14
-  languageName: node
-  linkType: hard
-
 "cozy-dataproxy-lib@npm:^4.14.1, cozy-dataproxy-lib@workspace:packages/cozy-dataproxy-lib":
   version: 0.0.0-use.local
   resolution: "cozy-dataproxy-lib@workspace:packages/cozy-dataproxy-lib"
@@ -18366,7 +18366,7 @@ __metadata:
     babel-preset-cozy-app: "npm:^2.8.4"
     classnames: "npm:^2.5.1"
     cozy-bar: "npm:^29.0.0"
-    cozy-client: "npm:^60.22.1"
+    cozy-client: "npm:60.23.0"
     cozy-device-helper: "npm:^4.0.3"
     cozy-flags: "npm:^4.9.1"
     cozy-intent: "npm:^2.31.1"

From 34b2fd47a7955d72c34fa066e08463857d453f41 Mon Sep 17 00:00:00 2001
From: Paul Tran-Van <paul.tranvan@gmail.com>
Date: Wed, 18 Mar 2026 14:07:20 +0100
Subject: [PATCH 6/6] fix: Init default provider data for openrag assistant
 :bug:

- Resolve full openrag provider from providers.json so
  formData.model is initialized to "openrag" instead of ""
- Extract providerId into a variable in EditAssistantDialog
  for readability
---
 .../src/components/Views/CreateAssistantDialog.jsx       | 8 +++++++-
 .../src/components/Views/EditAssistantDialog.jsx         | 9 ++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/packages/cozy-search/src/components/Views/CreateAssistantDialog.jsx b/packages/cozy-search/src/components/Views/CreateAssistantDialog.jsx
index d1d7b67d6b..7956aac603 100644
--- a/packages/cozy-search/src/components/Views/CreateAssistantDialog.jsx
+++ b/packages/cozy-search/src/components/Views/CreateAssistantDialog.jsx
@@ -18,12 +18,15 @@ import { useI18n, useExtendI18n } from 'twake-i18n'
 
 import { locales } from '../../locales'
 import AssistantDialogContent from '../CreateAssistantSteps/AssistantDialogContent'
+import { getSelectedProviderById } from '../CreateAssistantSteps/helpers'
 import styles from '../CreateAssistantSteps/styles.styl'
 import {
   useAssistantDialog,
   STEPS
 } from '../CreateAssistantSteps/useAssistantDialog'
 
+const defaultProvider = getSelectedProviderById('openrag')
+
 const CreateAssistantDialog = ({ open, onClose }) => {
   useExtendI18n(locales)
   const { t } = useI18n()
@@ -45,7 +48,10 @@ const CreateAssistantDialog = ({ open, onClose }) => {
     handleChangeModel
   } = useAssistantDialog({
     onClose,
-    initialData: { selectedProvider: { id: 'openrag' } }
+    initialData: {
+      selectedProvider: defaultProvider,
+      model: defaultProvider.models[0]
+    }
   })
 
   const getTitle = () => {
diff --git a/packages/cozy-search/src/components/Views/EditAssistantDialog.jsx b/packages/cozy-search/src/components/Views/EditAssistantDialog.jsx
index de9d6e9bfb..6d87912e40 100644
--- a/packages/cozy-search/src/components/Views/EditAssistantDialog.jsx
+++ b/packages/cozy-search/src/components/Views/EditAssistantDialog.jsx
@@ -61,6 +61,8 @@ const EditAssistantDialog = ({ open, onClose }) => {
       )
       const assistant = response.data
       const provider = response.included[0]
+      const providerId =
+        assistant?.relationships?.provider?.data?.metadata?.providerId
       setFormData({
         name: assistant.name || '',
         description: assistant.prompt || '',
@@ -69,13 +71,10 @@ const EditAssistantDialog = ({ open, onClose }) => {
         baseUrl: provider?.data?.baseUrl || '',
         apiKey: provider?.auth?.apiKey || '',
         encryptedApiKey: provider?.auth?.credentials_encrypted || '',
-        providerId:
-          assistant?.relationships?.provider?.data?.metadata?.providerId
+        providerId
       })
 
-      const selectProviderDefault = getSelectedProviderById(
-        assistant?.relationships?.provider?.data?.metadata?.providerId
-      )
+      const selectProviderDefault = getSelectedProviderById(providerId)
       setSelectedProvider({
         ...selectProviderDefault,
         model: provider?.auth?.login,