Merge remote-tracking branch 'origin/main' into bb/remove-composer-message-shadows

# Conflicts:
#	apps/desktop/src/components/assistant-ui/tool-fallback.tsx

apps/desktop/src/app/session/hooks/use-cwd-actions.ts

@@ -1,5 +1,6 @@
 import { type MutableRefObject, useCallback } from 'react'
 
+import { useI18n } from '@/i18n'
 import { notify, notifyError } from '@/store/notifications'
 import { $currentCwd, setCurrentBranch, setCurrentCwd } from '@/store/session'
 import type { SessionRuntimeInfo } from '@/types/hermes'
@@ -17,6 +18,8 @@ export function useCwdActions({
   onSessionRuntimeInfo,
   requestGateway
 }: CwdActionsOptions) {
+  const { t } = useI18n()
+  const copy = t.desktop
   const refreshProjectBranch = useCallback(
     async (cwd: string) => {
       const target = cwd.trim()
@@ -85,7 +88,7 @@ export function useCwdActions({
         const message = err instanceof Error ? err.message : String(err)
 
         if (!message.includes('unknown method')) {
-          notifyError(err, 'Working directory change failed')
+          notifyError(err, copy.cwdChangeFailed)
 
           return
         }
@@ -94,12 +97,12 @@ export function useCwdActions({
         setCurrentBranch('')
         notify({
           kind: 'warning',
-          title: 'Working directory staged',
-          message: 'Restart the desktop backend to apply cwd changes to this active session.'
+          title: copy.cwdStagedTitle,
+          message: copy.cwdStagedMessage
         })
       }
     },
-    [activeSessionId, onSessionRuntimeInfo, requestGateway]
+    [activeSessionId, copy, onSessionRuntimeInfo, requestGateway]
   )
 
   return { changeSessionCwd, refreshProjectBranch }

apps/desktop/src/app/session/hooks/use-model-controls.ts

@@ -2,6 +2,7 @@ import { type QueryClient } from '@tanstack/react-query'
 import { useCallback } from 'react'
 
 import { getGlobalModelInfo, setGlobalModel } from '@/hermes'
+import { useI18n } from '@/i18n'
 import { notifyError } from '@/store/notifications'
 import { $currentModel, $currentProvider, setCurrentModel, setCurrentProvider } from '@/store/session'
 import type { ModelOptionsResponse } from '@/types/hermes'
@@ -19,6 +20,8 @@ interface ModelControlsOptions {
 }
 
 export function useModelControls({ activeSessionId, queryClient, requestGateway }: ModelControlsOptions) {
+  const { t } = useI18n()
+  const copy = t.desktop
   const updateModelOptionsCache = useCallback(
     (provider: string, model: string, includeGlobal: boolean) => {
       const patch = (prev: ModelOptionsResponse | undefined) => ({ ...(prev ?? {}), provider, model })
@@ -91,12 +94,12 @@ export function useModelControls({ activeSessionId, queryClient, requestGateway
         setCurrentModel(prevModel)
         setCurrentProvider(prevProvider)
         updateModelOptionsCache(prevProvider, prevModel, includeGlobal)
-        notifyError(err, 'Model switch failed')
+        notifyError(err, copy.modelSwitchFailed)
 
         return false
       }
     },
-    [activeSessionId, queryClient, refreshCurrentModel, requestGateway, updateModelOptionsCache]
+    [activeSessionId, copy.modelSwitchFailed, queryClient, refreshCurrentModel, requestGateway, updateModelOptionsCache]
   )
 
   return { refreshCurrentModel, selectModel, updateModelOptionsCache }

apps/desktop/src/app/session/hooks/use-prompt-actions.ts

@@ -2,7 +2,8 @@ import type { AppendMessage, ThreadMessage } from '@assistant-ui/react'
 import { type MutableRefObject, useCallback } from 'react'
 
 import { getProfiles, transcribeAudio } from '@/hermes'
-import { branchGroupForUser, type ChatMessage, chatMessageText, textPart } from '@/lib/chat-messages'
+import { type Translations, translateNow, useI18n } from '@/i18n'
+import { appendTextPart, branchGroupForUser, type ChatMessage, chatMessageText, textPart } from '@/lib/chat-messages'
 import {
   attachmentDisplayText,
   parseCommandDispatch,
@@ -57,10 +58,10 @@ function blobToDataUrl(blob: Blob): Promise<string> {
       if (typeof reader.result === 'string') {
         resolve(reader.result)
       } else {
-        reject(new Error('Could not read recorded audio'))
+        reject(new Error(translateNow('desktop.audioReadFailed')))
       }
     })
-    reader.addEventListener('error', () => reject(reader.error || new Error('Could not read recorded audio')))
+    reader.addEventListener('error', () => reject(reader.error || new Error(translateNow('desktop.audioReadFailed'))))
     reader.readAsDataURL(blob)
   })
 }
@@ -101,12 +102,12 @@ interface SubmitTextOptions {
   fromQueue?: boolean
 }
 
-function renderCommandsCatalog(catalog: CommandsCatalogLike): string {
+function renderCommandsCatalog(catalog: CommandsCatalogLike, copy: Translations['desktop']): string {
   const desktopCatalog = filterDesktopCommandsCatalog(catalog)
 
   const sections = desktopCatalog.categories?.length
     ? desktopCatalog.categories
-    : [{ name: 'Desktop commands', pairs: desktopCatalog.pairs ?? [] }]
+    : [{ name: copy.desktopCommands, pairs: desktopCatalog.pairs ?? [] }]
 
   const body = sections
     .filter(section => section.pairs.length > 0)
@@ -118,8 +119,8 @@ function renderCommandsCatalog(catalog: CommandsCatalogLike): string {
     .join('\n\n')
 
   const tail = [
-    desktopCatalog.skill_count ? `${desktopCatalog.skill_count} skill commands available.` : '',
-    desktopCatalog.warning ? `warning: ${desktopCatalog.warning}` : ''
+    desktopCatalog.skill_count ? copy.skillCommandsAvailable(desktopCatalog.skill_count) : '',
+    desktopCatalog.warning ? copy.warningLine(desktopCatalog.warning) : ''
   ]
     .filter(Boolean)
     .join('\n')
@@ -156,6 +157,8 @@ export function usePromptActions({
   sttEnabled,
   updateSessionState
 }: PromptActionsOptions) {
+  const { t } = useI18n()
+  const copy = t.desktop
   const appendSessionTextMessage = useCallback(
     (sessionId: string, role: ChatMessage['role'], text: string) => {
       const body = text.trim()
@@ -326,7 +329,7 @@ export function usePromptActions({
         } catch (err) {
           dropOptimistic(null)
           releaseBusy()
-          notifyError(err, 'Session unavailable')
+          notifyError(err, copy.sessionUnavailable)
 
           return false
         }
@@ -334,7 +337,7 @@ export function usePromptActions({
         if (!sessionId) {
           dropOptimistic(null)
           releaseBusy()
-          notify({ kind: 'error', title: 'Session unavailable', message: 'Could not create a new session' })
+          notify({ kind: 'error', title: copy.sessionUnavailable, message: copy.createSessionFailed })
 
           return false
         }
@@ -354,7 +357,7 @@ export function usePromptActions({
 
         return true
       } catch (err) {
-        const message = inlineErrorMessage(err, 'Prompt failed')
+        const message = inlineErrorMessage(err, copy.promptFailed)
 
         releaseBusy()
         updateSessionState(sessionId, state => ({
@@ -365,7 +368,7 @@ export function usePromptActions({
               id: `assistant-error-${Date.now()}`,
               role: 'assistant',
               parts: [],
-              error: message || 'Prompt failed',
+              error: message || copy.promptFailed,
               branchGroupId: state.pendingBranchGroup ?? undefined
             }
           ],
@@ -376,12 +379,12 @@ export function usePromptActions({
         }))
 
         if (isProviderSetupError(err)) {
-          requestDesktopOnboarding('Add a provider credential before sending your first message.')
+          requestDesktopOnboarding(copy.providerCredentialRequired)
 
           return false
         }
 
-        notifyError(err, 'Prompt failed')
+        notifyError(err, copy.promptFailed)
 
         return false
       }
@@ -389,6 +392,7 @@ export function usePromptActions({
     [
       activeSessionId,
       busyRef,
+      copy,
       createBackendSessionForSend,
       requestGateway,
       selectedStoredSessionIdRef,
@@ -408,7 +412,7 @@ export function usePromptActions({
           const sessionId = sessionHint || activeSessionIdRef.current || (await createBackendSessionForSend())
 
           if (sessionId) {
-            appendSessionTextMessage(sessionId, 'system', 'empty slash command')
+            appendSessionTextMessage(sessionId, 'system', copy.emptySlashCommand)
           }
 
           return
@@ -435,16 +439,16 @@ export function usePromptActions({
 
           if (!sid) {
             setYoloActive(next)
-            notify({ kind: 'success', message: next ? 'YOLO armed for this chat' : 'YOLO off' })
+            notify({ kind: 'success', message: next ? copy.yoloArmed : copy.yoloOff })
 
             return
           }
 
           try {
             const active = await setSessionYolo(requestGateway, sid, next)
-            appendSessionTextMessage(sid, 'system', `YOLO ${active ? 'on' : 'off'} for this session`)
+            appendSessionTextMessage(sid, 'system', copy.yoloSystem(active))
           } catch {
-            notify({ kind: 'error', title: 'YOLO', message: 'Could not toggle YOLO' })
+            notify({ kind: 'error', title: copy.yoloTitle, message: copy.yoloToggleFailed })
           }
 
           return
@@ -467,7 +471,7 @@ export function usePromptActions({
           if (!target) {
             notify({
               kind: 'success',
-              message: `Profile: ${current}. Use /profile <name> or the "New session" picker to start a chat in another profile.`
+              message: copy.profileStatus(current)
             })
 
             return
@@ -480,8 +484,8 @@ export function usePromptActions({
             if (!match) {
               notify({
                 kind: 'error',
-                title: 'Unknown profile',
-                message: `No profile named "${target}". Available: ${profiles.map(profile => profile.name).join(', ')}`
+                title: copy.unknownProfile,
+                message: copy.noProfileNamed(target, profiles.map(profile => profile.name).join(', '))
               })
 
               return
@@ -493,9 +497,9 @@ export function usePromptActions({
             // Swap the live gateway now so an empty draft sends into this
             // profile immediately; an existing thread keeps its own profile.
             await ensureGatewayProfile(key)
-            notify({ kind: 'success', message: `New chats will use profile ${match.name}.` })
+            notify({ kind: 'success', message: copy.newChatsProfile(match.name) })
           } catch (err) {
-            notifyError(err, 'Failed to set profile')
+            notifyError(err, copy.setProfileFailed)
           }
 
           return
@@ -506,8 +510,8 @@ export function usePromptActions({
         if (!sessionId) {
           notify({
             kind: 'error',
-            title: 'Session unavailable',
-            message: 'Could not create a new session'
+            title: copy.sessionUnavailable,
+            message: copy.createSessionFailed
           })
 
           return
@@ -570,7 +574,7 @@ export function usePromptActions({
           try {
             const catalog = await requestGateway<CommandsCatalogLike>('commands.catalog', { session_id: sessionId })
 
-            renderSlashOutput(renderCommandsCatalog(catalog))
+            renderSlashOutput(renderCommandsCatalog(catalog, copy))
           } catch (err) {
             renderSlashOutput(`error: ${err instanceof Error ? err.message : String(err)}`)
           }
@@ -658,6 +662,7 @@ export function usePromptActions({
       appendSessionTextMessage,
       branchCurrentSession,
       busyRef,
+      copy,
       createBackendSessionForSend,
       handleSkinCommand,
       refreshSessions,
@@ -687,7 +692,7 @@ export function usePromptActions({
   const transcribeVoiceAudio = useCallback(
     async (audio: Blob) => {
       if (!sttEnabled) {
-        throw new Error('Speech-to-text is disabled in settings.')
+        throw new Error(copy.sttDisabled)
       }
 
       const dataUrl = await blobToDataUrl(audio)
@@ -695,7 +700,7 @@ export function usePromptActions({
 
       return result.transcript
     },
-    [sttEnabled]
+    [copy.sttDisabled, sttEnabled]
   )
 
   const cancelRun = useCallback(async () => {
@@ -745,9 +750,9 @@ export function usePromptActions({
     } catch (err) {
       setMutableRef(busyRef, false)
       setBusy(false)
-      notifyError(err, 'Stop failed')
+      notifyError(err, copy.stopFailed)
     }
-  }, [activeSessionId, activeSessionIdRef, busyRef, requestGateway, updateSessionState])
+  }, [activeSessionId, activeSessionIdRef, busyRef, copy.stopFailed, requestGateway, updateSessionState])
 
   // Steer = nudge the live turn without interrupting: the gateway appends the
   // text to the next tool result so the model reads it on its next iteration
@@ -853,10 +858,10 @@ export function usePromptActions({
           busy: false,
           awaitingResponse: false
         }))
-        notifyError(err, 'Regenerate failed')
+        notifyError(err, copy.regenerateFailed)
       }
     },
-    [activeSessionId, requestGateway, updateSessionState]
+    [activeSessionId, copy.regenerateFailed, requestGateway, updateSessionState]
   )
 
   const editMessage = useCallback(
@@ -926,10 +931,10 @@ export function usePromptActions({
         setBusy(false)
         setAwaitingResponse(false)
         updateSessionState(sessionId, state => ({ ...state, busy: false, awaitingResponse: false }))
-        notifyError(surfaced, 'Edit failed')
+        notifyError(surfaced, copy.editFailed)
       }
     },
-    [activeSessionId, activeSessionIdRef, busyRef, requestGateway, updateSessionState]
+    [activeSessionId, activeSessionIdRef, busyRef, copy.editFailed, requestGateway, updateSessionState]
   )
 
   const handleThreadMessagesChange = useCallback(

apps/desktop/src/app/session/hooks/use-session-actions.ts

@@ -3,6 +3,7 @@ import { useCallback, useRef } from 'react'
 import type { NavigateFunction } from 'react-router-dom'
 
 import { deleteSession, getSessionMessages, setSessionArchived } from '@/hermes'
+import { useI18n } from '@/i18n'
 import { type ChatMessage, chatMessageText, preserveLocalAssistantErrors, toChatMessages } from '@/lib/chat-messages'
 import { normalizePersonalityValue } from '@/lib/chat-runtime'
 import { embeddedImageUrls, textWithoutEmbeddedImages } from '@/lib/embedded-images'
@@ -285,6 +286,8 @@ export function useSessionActions({
   syncSessionStateToView,
   updateSessionState
 }: SessionActionsOptions) {
+  const { t } = useI18n()
+  const copy = t.desktop
   const resumeRequestRef = useRef(0)
 
   const startFreshSessionDraft = useCallback(
@@ -602,7 +605,7 @@ export function useSessionActions({
         }
 
         setMessages(preserveLocalAssistantErrors(toChatMessages(fallback.messages), $messages.get()))
-        notifyError(err, 'Resume failed')
+        notifyError(err, copy.resumeFailed)
       } finally {
         if (isCurrentResume()) {
           busyRef.current = false
@@ -614,6 +617,7 @@ export function useSessionActions({
     [
       activeSessionIdRef,
       busyRef,
+      copy,
       requestGateway,
       runtimeIdByStoredSessionIdRef,
       selectedStoredSessionIdRef,
@@ -630,8 +634,8 @@ export function useSessionActions({
       if (!sourceSessionId) {
         notify({
           kind: 'warning',
-          title: 'Nothing to branch',
-          message: 'Start or resume a chat before branching.'
+          title: copy.nothingToBranch,
+          message: copy.branchNeedsChat
         })
 
         return false
@@ -640,8 +644,8 @@ export function useSessionActions({
       if (busyRef.current) {
         notify({
           kind: 'warning',
-          title: 'Session busy',
-          message: 'Stop the current turn before branching this chat.'
+          title: copy.sessionBusy,
+          message: copy.branchStopCurrent
         })
 
         return false
@@ -671,8 +675,8 @@ export function useSessionActions({
         if (!branchMessages.length) {
           notify({
             kind: 'warning',
-            title: 'Nothing to branch',
-            message: 'This message has no text to branch from.'
+            title: copy.nothingToBranch,
+            message: copy.branchNoText
           })
 
           return false
@@ -686,14 +690,14 @@ export function useSessionActions({
           cols: 96,
           ...(cwd && { cwd }),
           messages: branchMessages.map(({ content, role }) => ({ content, role })),
-          title: 'Branch'
+          title: copy.branchTitle
         })
 
         const routedSessionId = branched.stored_session_id ?? branched.session_id
         const preview = branchMessages.map(({ content }) => content).find(Boolean) ?? null
 
         setFreshDraftReady(false)
-        upsertOptimisticSession(branched, routedSessionId, 'Branch', preview)
+        upsertOptimisticSession(branched, routedSessionId, copy.branchTitle, preview)
         ensureSessionState(branched.session_id, routedSessionId)
         setActiveSessionId(branched.session_id)
         activeSessionIdRef.current = branched.session_id
@@ -723,7 +727,7 @@ export function useSessionActions({
 
         return true
       } catch (err) {
-        notifyError(err, 'Branch failed')
+        notifyError(err, copy.branchFailed)
 
         return false
       } finally {
@@ -735,6 +739,7 @@ export function useSessionActions({
     [
       activeSessionIdRef,
       busyRef,
+      copy,
       creatingSessionRef,
       ensureSessionState,
       navigate,
@@ -812,12 +817,13 @@ export function useSessionActions({
           }
         }
 
-        notifyError(err, 'Delete failed')
+        notifyError(err, copy.deleteFailed)
       }
     },
     [
       activeSessionId,
       activeSessionIdRef,
+      copy,
       navigate,
       requestGateway,
       selectedStoredSessionId,
@@ -851,7 +857,7 @@ export function useSessionActions({
 
       try {
         await setSessionArchived(storedSessionId, true, archived?.profile)
-        notify({ durationMs: 2_000, kind: 'success', message: 'Archived' })
+        notify({ durationMs: 2_000, kind: 'success', message: copy.archived })
       } catch (err) {
         if (archived) {
           setSessions(prev => [archived, ...prev.filter(s => s.id !== storedSessionId)])
@@ -859,10 +865,10 @@ export function useSessionActions({
         }
 
         $pinnedSessionIds.set(previousPinned)
-        notifyError(err, 'Archive failed')
+        notifyError(err, copy.archiveFailed)
       }
     },
-    [selectedStoredSessionId, startFreshSessionDraft]
+    [copy, selectedStoredSessionId, startFreshSessionDraft]
   )
 
   return {