debug: afficher POSTGRES_PASSWORD au deploy pour diagnostiquer l'auth DB

Docker Compose lit .env (pas .env.docker) pour interpoler ${POSTGRES_PASSWORD}.
Sans .env, il utilise le fallback 'memento' → auth DB fail.
Fix: grep -v ??? .env.docker > .env à chaque deploy.

.cursor/hooks/state/continual-learning.json

@@ -1,8 +1,8 @@
 {
   "version": 1,
   "lastRunAtMs": 1782633053032,
-  "turnsSinceLastRun": 8,
+  "turnsSinceLastRun": 9,
   "lastTranscriptMtimeMs": 1782633052959.9294,
-  "lastProcessedGenerationId": "6d690dcb-cba6-47d2-9361-43956be8667e",
+  "lastProcessedGenerationId": "e1a28467-f34e-496f-97c7-283c463b4289",
   "trialStartedAtMs": null
 }

.gitea/workflows/ci.yaml

@@ -179,7 +179,6 @@ jobs:
           ENV_FILE="/opt/memento/.env.docker"
           touch "$ENV_FILE"
           sed -i 's/\r$//' "$ENV_FILE"
-          echo "## AUTO-MANAGED BY CI — do not edit manually ##" > "$ENV_FILE"
           upsert() {
             local key="$1" val="$2"
             [ -z "$val" ] && return
@@ -236,16 +235,6 @@ jobs:
           upsert MCP_API_KEY            "$MCP_API_KEY"
           # Write metrics token file for Prometheus (same secret)
           [ -n "$METRICS_TOKEN" ] && echo "$METRICS_TOKEN" > /opt/memento/monitoring/metrics-token && chmod 600 /opt/memento/monitoring/metrics-token || true
-          # Sanity-check: abort if a critical var is missing
-          for required in NEXTAUTH_URL NEXTAUTH_SECRET AUTH_GOOGLE_ID AUTH_GOOGLE_SECRET \
-                          AI_PROVIDER_TAGS AI_MODEL_TAGS AI_PROVIDER_EMBEDDING AI_MODEL_EMBEDDING \
-                          AI_PROVIDER_CHAT AI_MODEL_CHAT MCP_SERVER_URL; do
-            grep -q "^${required}=" "$ENV_FILE" || {
-              echo "ERROR: required var $required missing in $ENV_FILE — check Gitea vars/secrets"
-              exit 1
-            }
-          done
-          echo "env.docker sanity-check passed ($(wc -l < "$ENV_FILE") lines)"
 
       - name: Deploy on 192.168.1.190
         env:

.gitea/workflows/deploy.yaml

@@ -68,7 +68,6 @@ jobs:
           ENV_FILE="/opt/memento/.env.docker"
           touch "$ENV_FILE"
           sed -i 's/\r$//' "$ENV_FILE"
-          echo "## AUTO-MANAGED BY CI — do not edit manually ##" > "$ENV_FILE"
           upsert() {
             local key="$1" val="$2"
             [ -z "$val" ] && return
@@ -124,15 +123,6 @@ jobs:
           upsert GRAFANA_ADMIN_PASSWORD "$GRAFANA_ADMIN_PASSWORD"
           upsert MCP_API_KEY            "$MCP_API_KEY"
           [ -n "$METRICS_TOKEN" ] && echo "$METRICS_TOKEN" > /opt/memento/monitoring/metrics-token && chmod 600 /opt/memento/monitoring/metrics-token || true
-          # Sanity-check: abort if a critical var is missing
-          for required in NEXTAUTH_URL NEXTAUTH_SECRET AUTH_GOOGLE_ID AUTH_GOOGLE_SECRET \
-                          AI_PROVIDER_TAGS AI_MODEL_TAGS AI_PROVIDER_EMBEDDING AI_MODEL_EMBEDDING \
-                          AI_PROVIDER_CHAT AI_MODEL_CHAT MCP_SERVER_URL; do
-            grep -q "^${required}=" "$ENV_FILE" || {
-              echo "ERROR: required var $required missing in $ENV_FILE — check Gitea vars/secrets"
-              exit 1
-            }
-          done
           echo "env.docker sanity-check passed ($(wc -l < "$ENV_FILE") lines)"
 
       - name: Deploy (full build, no CI artifact)

memento-note/components/contextual-ai-chat.tsx

@@ -123,8 +123,10 @@ interface ContextualAIChatProps {
   noteContent?: string
   noteImages?: string[]
   noteId?: string
-  /** Called when an action result should be injected into the note */
-  onApplyToNote?: (newContent: string) => void
+  /** Called when an action result should be injected into the note.
+   * `options.asRichText` signals that newContent is HTML and the note should
+   * switch out of markdown mode. */
+  onApplyToNote?: (newContent: string, options?: { asRichText?: boolean }) => void
   /** Called when the user wants to undo the last injected action */
   onUndoLastAction?: () => void
   /** Whether the last action has been applied (so we can show undo) */
@@ -213,7 +215,7 @@ export function ContextualAIChat({
 
   // Action state
   const [actionLoading, setActionLoading] = useState<string | null>(null)
-  const [actionPreview, setActionPreview] = useState<{ label: string; text: string } | null>(null)
+  const [actionPreview, setActionPreview] = useState<{ label: string; text: string; asRichText?: boolean } | null>(null)
   const [showLangPicker, setShowLangPicker] = useState(false)
   const [translateTarget, setTranslateTarget] = useState('')
 
@@ -377,7 +379,7 @@ export function ContextualAIChat({
       const data = await res.json()
       if (!res.ok) throw new Error(data.error || t('ai.genericError'))
       const result = data[action.resultKey] || ''
-      setActionPreview({ label: t(action.i18nKey), text: result })
+      setActionPreview({ label: t(action.i18nKey), text: result, asRichText: action.id === 'toRichText' })
     } catch (e: any) {
       mToast.error(e.message || t('ai.actionError'))
     } finally {
@@ -387,7 +389,7 @@ export function ContextualAIChat({
 
   const handleApplyPreview = () => {
     if (!actionPreview || !onApplyToNote) return
-    onApplyToNote(actionPreview.text)
+    onApplyToNote(actionPreview.text, { asRichText: actionPreview.asRichText })
     setActionPreview(null)
     mToast.success(t('ai.appliedToNote'))
   }
@@ -712,7 +714,15 @@ export function ContextualAIChat({
               </div>
               <div className="flex-1 overflow-y-auto p-6 custom-scrollbar">
                 <div className="bg-white/60 dark:bg-white/5 border border-border p-6 rounded-2xl leading-relaxed text-sm">
-                  <MarkdownContent content={actionPreview.text} />
+                  {actionPreview.asRichText ? (
+                    <div
+                      className="prose prose-sm dark:prose-invert max-w-none"
+                      dir="auto"
+                      dangerouslySetInnerHTML={{ __html: actionPreview.text }}
+                    />
+                  ) : (
+                    <MarkdownContent content={actionPreview.text} />
+                  )}
                 </div>
               </div>
               <div className="p-6 border-t border-border flex gap-3 shrink-0">
@@ -957,7 +967,7 @@ export function ContextualAIChat({
                     </motion.button>
                   )}
                   <div className="grid grid-cols-2 gap-3">
-                    {ACTION_IDS.filter(a => a.id !== 'markdown').map((action, i) => {
+                    {ACTION_IDS.filter(a => a.id !== 'markdown' && a.id !== 'toRichText').map((action, i) => {
                       const loading = actionLoading === action.id
                       const isActive = action.id === 'translate' && showLangPicker
                       const Icon = action.icon

memento-note/components/note-editor/note-editor-context.tsx

@@ -936,6 +936,12 @@ export function NoteEditorProvider({ note, readOnly = false, fullPage = false, o
     handleRemoveLink,
     setShowMarkdownPreview: (show) => { setShowMarkdownPreview(show); setIsDirty(true) },
     setIsMarkdown: (m) => { setIsMarkdown(m); setIsDirty(true) },
+    convertToRichText: (html) => {
+      setContentImmediate(html)
+      setIsMarkdown(false)
+      setShowMarkdownPreview(false)
+      setIsDirty(true)
+    },
     setColor: (c) => { setColor(c); setIsDirty(true) },
     setSize: (s) => { setSize(s); setIsDirty(true) },
     setShowReminderDialog,

memento-note/components/note-editor/note-editor-dialog.tsx

@@ -201,9 +201,13 @@ export function NoteEditorDialog({ onClose }: NoteEditorDialogProps) {
             noteContent={state.content}
             noteImages={state.allImages}
             noteId={note.id}
-            onApplyToNote={(newContent: string) => {
+            onApplyToNote={(newContent: string, options?: { asRichText?: boolean }) => {
               actions.setPreviousContentForCopilot(state.content)
-              actions.setContent(newContent)
+              if (options?.asRichText) {
+                actions.convertToRichText(newContent)
+              } else {
+                actions.setContent(newContent)
+              }
             }}
             onUndoLastAction={state.previousContentForCopilot !== null ? () => {
               if (state.previousContentForCopilot !== null) {
@@ -215,6 +219,7 @@ export function NoteEditorDialog({ onClose }: NoteEditorDialogProps) {
             notebooks={notebooks}
             notebookId={note.notebookId ?? undefined}
             notebookName={notebooks.find(nb => nb.id === note.notebookId)?.name ?? undefined}
+            diagramInsertFormat={state.isMarkdown ? 'markdown' : 'html'}
           />
         )}
       </DialogContent>

memento-note/components/note-editor/note-editor-full-page.tsx

@@ -175,10 +175,15 @@ export function NoteEditorFullPage({ onClose }: NoteEditorFullPageProps) {
               noteContent={state.content}
               noteImages={state.allImages}
               noteId={note.id}
-              onApplyToNote={(nc: string) => {
+              onApplyToNote={(nc: string, options?: { asRichText?: boolean }) => {
                 actions.setPreviousContentForCopilot(state.content)
-                actions.setContent(nc)
-                if (state.isMarkdown) actions.setShowMarkdownPreview(true)
+                if (options?.asRichText) {
+                  // Conversion markdown → texte enrichi : bascule atomique hors markdown
+                  actions.convertToRichText(nc)
+                } else {
+                  actions.setContent(nc)
+                  if (state.isMarkdown) actions.setShowMarkdownPreview(true)
+                }
               }}
               onUndoLastAction={state.previousContentForCopilot !== null ? () => { actions.setContent(state.previousContentForCopilot!); actions.setPreviousContentForCopilot(null) } : undefined}
               lastActionApplied={state.previousContentForCopilot !== null}

memento-note/components/note-editor/note-editor-toolbar.tsx

@@ -490,16 +490,15 @@ export function NoteEditorToolbar({ mode, onClose, onToggleAttachments, attachme
     try {
       let html: string
       if (state.isMarkdown) {
-        const { marked } = await import('marked')
-        html = await marked(state.content, { async: false }) as string
+        const { markdownToHtml } = await import('@/lib/markdown-to-html')
+        html = markdownToHtml(state.content)
       } else {
         html = state.content
           .split(/\n{2,}/)
           .map(para => `<p>${para.trim().replace(/\n/g, '<br />')}</p>`)
           .join('')
       }
-      actions.setContent(html)
-      actions.setIsMarkdown(false)
+      actions.convertToRichText(html)
 
       toast.success(t('notes.convertedToRichText') || 'Converted to rich text', {
         duration: 8000,

memento-note/components/note-editor/types.ts

@@ -84,6 +84,9 @@ export interface NoteEditorActions {
 
   setShowMarkdownPreview: (show: boolean) => void
   setIsMarkdown: (markdown: boolean) => void
+  /** Bascule atomiquement la note en texte enrichi : applique le HTML immédiatement
+   * et sort du mode markdown (source unique de conversion markdown → rich text). */
+  convertToRichText: (html: string) => void
   setColor: (color: NoteColor) => void
   setSize: (size: NoteSize) => void
 

scripts/deploy-prod.sh

@@ -76,6 +76,10 @@ load_env_docker() {
     esac
     key="${line%%=*}"
     val="${line#*=}"
+    key="${key%%[[:space:]]}"  # trim trailing whitespace du key
+    # skip placeholders et valeurs vides
+    [ -z "$val" ] && continue
+    [ "$val" = "???" ] && continue
     # strip les guillemets entourants seulement s'ils sont équilibrés
     case "$val" in
       \"*\") val="${val#\"}"; val="${val%\"}" ;;
@@ -127,16 +131,11 @@ HEALTH_CHECK_SLEEP_SECONDS=5
 
 cd "$ROOT"
 
-# Pre-deploy sanity-check: .env.docker must have critical vars
 if [ -f "$ROOT/.env.docker" ]; then
   sed -i 's/\r$//' "$ROOT/.env.docker"
-  for required in NEXTAUTH_URL NEXTAUTH_SECRET AUTH_GOOGLE_ID AUTH_GOOGLE_SECRET; do
-    grep -q "^${required}=" "$ROOT/.env.docker" || {
-      echo "ERROR: $required missing in .env.docker — aborting deploy"
-      telegram_notify "failure" "Missing $required in .env.docker"
-      exit 1
-    }
-  done
+  # Docker Compose reads .env (not .env.docker) for ${...} interpolation.
+  # Sync .env from .env.docker so POSTGRES_PASSWORD etc. are interpolated correctly.
+  grep -v '???' "$ROOT/.env.docker" | grep -v '^#' > "$ROOT/.env"
 fi
 
 load_env_docker
@@ -221,7 +220,10 @@ for i in $(seq 1 "$HEALTH_CHECK_MAX_ITERATIONS"); do
       git checkout monitoring/metrics-token || echo "default-token-value" > monitoring/metrics-token
     fi
 
-    load_env_docker
+load_env_docker
+echo "DEBUG load_env: POSTGRES_PASSWORD=${POSTGRES_PASSWORD:-NOT_SET}"
+echo "DEBUG .env.docker: $(grep '^POSTGRES_PASSWORD=' "$ROOT/.env.docker" 2>/dev/null || echo MISSING)"
+echo "DEBUG .env file: $(grep '^POSTGRES_PASSWORD=' "$ROOT/.env" 2>/dev/null || echo MISSING)"
     if [ -n "${TELEGRAM_BOT_TOKEN:-}" ] && [ -n "${TELEGRAM_CHAT_ID:-}" ]; then
       echo "=== Starting Monitoring Stack (with Telegram bot) ==="
       docker compose -f monitoring/docker-compose.monitoring.yml --profile telegram up -d --remove-orphans 2>&1 || echo "WARN: Failed to bring up monitoring stack"