@pheem49/mint 1.17.0 → 1.18.0

package/src/renderer/shared/components/chat/GeminiLiveOverlay.tsx

@@ -3,6 +3,7 @@ import { createPortal } from 'react-dom'
 import { Mic, MicOff, PhoneOff, Volume2 } from 'lucide-react'
 import { VoicePoweredOrb } from '../ui/voice-powered-orb'
 import { Button } from '../ui/button'
+import { ApprovalCard } from './ApprovalCard'
 import './GeminiLiveOverlay.css'
 
 export interface GeminiLiveOverlayProps {
@@ -16,6 +17,8 @@ export interface GeminiLiveOverlayProps {
   voices: readonly string[]
   onChangeVoice: (voice: string) => void
   analyserRef?: RefObject<AnalyserNode | null>
+  pendingApproval?: any | null
+  onApproval?: (approved: boolean, autoApprove?: boolean, answer?: string) => void
 }
 const STATUS_LABEL: Record<GeminiLiveOverlayProps['status'], string> = {
   connecting: 'Connecting', listening: 'Listening', speaking: 'Speaking',
@@ -30,14 +33,27 @@ const STATUS_HINT: Record<GeminiLiveOverlayProps['status'], string> = {
   error: 'End this call and try again when you’re ready.',
 }
 
+export function resolveLiveOverlayEscape(state: {
+  voicePickerOpen: boolean
+  hasPendingApproval: boolean
+}): 'close_voice_picker' | 'ignore' | 'end_call' {
+  if (state.voicePickerOpen) return 'close_voice_picker'
+  if (state.hasPendingApproval) return 'ignore'
+  return 'end_call'
+}
+
 export default function GeminiLiveOverlay({
   status, userTranscript, assistantTranscript, isPaused, onTogglePause, onEndCall,
-  voice, voices, onChangeVoice, analyserRef,
+  voice, voices, onChangeVoice, analyserRef, pendingApproval, onApproval,
 }: GeminiLiveOverlayProps) {
   const [voicePickerOpen, setVoicePickerOpen] = useState(false)
   const dialogRef = useRef<HTMLDivElement>(null)
   const endCall = useRef(onEndCall)
   endCall.current = onEndCall
+  const voicePickerOpenRef = useRef(voicePickerOpen)
+  voicePickerOpenRef.current = voicePickerOpen
+  const hasPendingApprovalRef = useRef(Boolean(pendingApproval && onApproval))
+  hasPendingApprovalRef.current = Boolean(pendingApproval && onApproval)
   // The decorative orb must not own a microphone in this call surface.
   const emptyAnalyser = useRef<AnalyserNode | null>(null)
   useEffect(() => {
@@ -47,9 +63,26 @@ export default function GeminiLiveOverlay({
     const dialog = dialogRef.current!
     dialog.querySelector<HTMLButtonElement>('[data-call-control]:not(:disabled), [aria-label="End Live conversation"]')?.focus()
     const onKey = (event: KeyboardEvent) => {
-      if (event.key === 'Escape') { event.preventDefault(); endCall.current(); return }
+      if (event.key === 'Escape') {
+        const action = resolveLiveOverlayEscape({
+          voicePickerOpen: voicePickerOpenRef.current,
+          hasPendingApproval: hasPendingApprovalRef.current,
+        })
+        if (action === 'close_voice_picker') {
+          event.preventDefault()
+          setVoicePickerOpen(false)
+        } else if (action === 'end_call') {
+          event.preventDefault()
+          endCall.current()
+        }
+        return
+      }
       if (event.key !== 'Tab') return
-      const controls = Array.from(dialog.querySelectorAll<HTMLElement>('button:not(:disabled), [tabindex="0"]'))
+      const controls = Array.from(
+        dialog.querySelectorAll<HTMLElement>(
+          'button:not(:disabled), input:not(:disabled), textarea:not(:disabled), [tabindex="0"]',
+        ),
+      )
       const first = controls[0], last = controls[controls.length - 1]
       if (event.shiftKey && (document.activeElement === first || !dialog.contains(document.activeElement))) {
         event.preventDefault(); last?.focus()
@@ -85,6 +118,15 @@ export default function GeminiLiveOverlay({
             {assistantTranscript && <p className="gemini-live-transcript-line"><span className="gemini-live-transcript-speaker">Mint</span>{assistantTranscript}</p>}
           </> : <p className="live-orb-empty">{status === 'connecting' ? 'Your conversation will appear here.' : status === 'error' ? 'No conversation yet.' : 'Say something to get started…'}</p>}
         </div>
+        {pendingApproval && onApproval && (
+          <div className="gemini-live-approval" style={{ width: '100%', textAlign: 'left' }}>
+            <ApprovalCard
+              key={pendingApproval.id || JSON.stringify(pendingApproval)}
+              pendingApproval={pendingApproval}
+              onApproval={onApproval}
+            />
+          </div>
+        )}
         <div className="gemini-live-voice-picker">
           <Button type="button" variant="ghost" className="gemini-live-voice-btn" aria-label="Change voice" aria-expanded={voicePickerOpen} aria-haspopup="listbox" onClick={() => setVoicePickerOpen(open => !open)}>
             <Volume2 size={16} aria-hidden="true" /><span>{voice}</span>

package/src/renderer/shared/components/chat/ModelSelectorPopover.tsx

@@ -1,7 +1,7 @@
 import React, { useState, useEffect, useRef, useMemo, useCallback } from 'react'
 import { useProviderModels } from '@/hooks/useProviderModels'
 import { catalogPlatform } from '../../platform'
-import { HF_MODELS, getModelMetadata, isFreeModel, OPENROUTER_POPULAR_MODELS } from '../../constants/models'
+import { HF_MODELS, getModelMetadata, hasNativeThinkingSupport, isFreeModel, OPENROUTER_POPULAR_MODELS } from '../../constants/models'
 import type { CustomProviderConfig } from '../../types'
 import anthropicLogo from '@lobehub/icons-static-svg/icons/anthropic.svg?url'
 import deepseekLogo from '@lobehub/icons-static-svg/icons/deepseek-color.svg?url'
@@ -427,17 +427,28 @@ export default function ModelSelectorPopover({
   // Helper to resolve a model's thinking status
   const getThinkingConfig = useCallback((model: string, provider: string) => {
     const meta = getModelMetadata(model, provider)
+    const hasNative = hasNativeThinkingSupport(model, provider)
+    if (!meta.supportsThinking) {
+      return {
+        supported: false,
+        hasNative: false,
+        enabled: false,
+        effort: 'medium',
+      }
+    }
     const override = modelThinkingOverrides[model]
     if (override) {
       return {
-        supported: meta.supportsThinking,
+        supported: true,
+        hasNative,
         enabled: override.enabled ?? true,
         effort: (override.effort || 'medium').toLowerCase(),
       }
     }
     return {
-      supported: meta.supportsThinking,
-      enabled: meta.supportsThinking ? (settingsConfig?.thinkingEnabled ?? true) : false,
+      supported: true,
+      hasNative,
+      enabled: hasNative ? (settingsConfig?.thinkingEnabled ?? true) : false,
       effort: (settingsConfig?.thinkingEffort || 'medium').toLowerCase(),
     }
   }, [modelThinkingOverrides, settingsConfig?.thinkingEnabled, settingsConfig?.thinkingEffort])
@@ -567,7 +578,7 @@ export default function ModelSelectorPopover({
   }, [currentInspected])
 
   const inspectedThinking = useMemo(() => {
-    if (!currentInspected) return { supported: false, enabled: false, effort: 'medium' }
+    if (!currentInspected) return { supported: false, hasNative: false, enabled: false, effort: 'medium' }
     return getThinkingConfig(currentInspected.model, currentInspected.providerId)
   }, [currentInspected, getThinkingConfig])
 
@@ -857,9 +868,12 @@ export default function ModelSelectorPopover({
                   <button
                     type="button"
                     role="switch"
+                    disabled={!inspectedThinking.supported}
                     aria-checked={inspectedThinking.enabled}
                     className={`model-detail-switch ${inspectedThinking.enabled ? 'checked' : ''}`}
+                    style={!inspectedThinking.supported ? { opacity: 0.45, cursor: 'not-allowed' } : undefined}
                     onClick={() => {
+                      if (!inspectedThinking.supported) return
                       persistThinking(
                         currentInspected.model,
                         !inspectedThinking.enabled,
@@ -867,7 +881,9 @@ export default function ModelSelectorPopover({
                       )
                     }}
                     title={
-                      inspectedThinking.enabled
+                      !inspectedThinking.supported
+                        ? 'Thinking is not available for non-text models'
+                        : inspectedThinking.enabled
                         ? 'Disable thinking'
                         : 'Enable thinking'
                     }
@@ -876,16 +892,28 @@ export default function ModelSelectorPopover({
                   </button>
                 </div>
 
-                {!inspectedThinking.supported && (
-                  <div className="model-unsupported-note" style={{ color: inspectedThinking.enabled ? 'var(--interactive-fg)' : undefined }}>
-                    {inspectedThinking.enabled
-                      ? 'Thinking enabled (force toggle)'
-                      : 'Not flagged as reasoning model by default (toggle to force enable)'}
-                  </div>
-                )}
+                <div
+                  className="model-unsupported-note"
+                  style={{
+                    color:
+                      inspectedThinking.supported && inspectedThinking.enabled
+                        ? 'var(--interactive-fg)'
+                        : undefined,
+                  }}
+                >
+                  {!inspectedThinking.supported
+                    ? 'Non-text model (image/audio/embedding) — Thinking is not applicable'
+                    : inspectedThinking.enabled
+                    ? inspectedThinking.hasNative
+                      ? 'Native Reasoning API active'
+                      : 'Prompted Chain-of-Thought (<think>) active'
+                    : inspectedThinking.hasNative
+                    ? 'Supports Native Reasoning API'
+                    : 'Supports Prompted Chain-of-Thought (<think>)'}
+                </div>
 
                 {/* Effort Section (visible when Thinking is ON) */}
-                {inspectedThinking.enabled && (
+                {inspectedThinking.supported && inspectedThinking.enabled && (
                   <div className="model-effort-section">
                     <div className="model-detail-section-title">Effort</div>
                     <div className="model-effort-list">

package/src/renderer/shared/components/chat/RewindModal.tsx

@@ -100,7 +100,7 @@ export const RewindModal: React.FC<RewindModalProps> = ({
               style={{
                 width: '32px',
                 height: '32px',
-                borderRadius: '8px',
+                borderRadius: 'var(--radius-sm, 8px)',
                 background: 'color-mix(in srgb, var(--status-error, #ef4444) 15%, transparent)',
                 color: 'var(--status-error, #ef4444)',
                 display: 'inline-flex',
@@ -133,7 +133,7 @@ export const RewindModal: React.FC<RewindModalProps> = ({
               color: 'var(--text-muted)',
               cursor: isLoading ? 'not-allowed' : 'pointer',
               padding: '6px',
-              borderRadius: '6px',
+              borderRadius: 'var(--radius-xs, 6px)',
               display: 'flex',
               alignItems: 'center',
               justifyContent: 'center',
@@ -152,7 +152,7 @@ export const RewindModal: React.FC<RewindModalProps> = ({
           <div
             style={{
               padding: '12px 14px',
-              borderRadius: '10px',
+              borderRadius: 'var(--radius-md, 10px)',
               background: 'color-mix(in srgb, var(--status-error, #ef4444) 10%, transparent)',
               border: '1px solid color-mix(in srgb, var(--status-error, #ef4444) 25%, transparent)',
               fontSize: '13px',
@@ -181,7 +181,7 @@ export const RewindModal: React.FC<RewindModalProps> = ({
             style={{
               background: 'var(--surface-bg)',
               border: '1px solid var(--border)',
-              borderRadius: '10px',
+              borderRadius: 'var(--radius-md, 10px)',
               padding: '14px',
               display: 'flex',
               flexDirection: 'column',
@@ -213,7 +213,7 @@ export const RewindModal: React.FC<RewindModalProps> = ({
                 <span
                   style={{
                     padding: '3px 8px',
-                    borderRadius: '6px',
+                    borderRadius: 'var(--radius-xs, 6px)',
                     background: 'color-mix(in srgb, var(--accent) 15%, transparent)',
                     color: 'var(--interactive-fg)',
                     fontWeight: 600,
@@ -225,7 +225,7 @@ export const RewindModal: React.FC<RewindModalProps> = ({
                 <code
                   style={{
                     padding: '3px 7px',
-                    borderRadius: '6px',
+                    borderRadius: 'var(--radius-xs, 6px)',
                     background: 'var(--bg-input, var(--bg-surface-soft))',
                     color: 'var(--text-main)',
                     fontSize: '12px',
@@ -263,7 +263,7 @@ export const RewindModal: React.FC<RewindModalProps> = ({
                   maxHeight: '160px',
                   overflowY: 'auto',
                   border: '1px solid var(--border)',
-                  borderRadius: '8px',
+                  borderRadius: 'var(--radius-sm, 8px)',
                   background: 'var(--surface-bg)',
                   display: 'flex',
                   flexDirection: 'column',
@@ -307,7 +307,7 @@ export const RewindModal: React.FC<RewindModalProps> = ({
                             fontSize: '10.5px',
                             fontWeight: 600,
                             padding: '1px 6px',
-                            borderRadius: '4px',
+                            borderRadius: 'var(--radius-xs, 6px)',
                             background: 'color-mix(in srgb, var(--accent) 15%, transparent)',
                             color: 'var(--interactive-fg)',
                           }}
@@ -354,7 +354,7 @@ export const RewindModal: React.FC<RewindModalProps> = ({
             disabled={isLoading}
             style={{
               padding: '8px 16px',
-              borderRadius: '8px',
+              borderRadius: 'var(--radius-sm, 8px)',
               border: '1px solid var(--border)',
               background: 'transparent',
               color: 'var(--text-main)',
@@ -373,7 +373,7 @@ export const RewindModal: React.FC<RewindModalProps> = ({
             disabled={isLoading}
             style={{
               padding: '8px 18px',
-              borderRadius: '8px',
+              borderRadius: 'var(--radius-sm, 8px)',
               border: 'none',
               background: 'var(--status-error, #ef4444)',
               color: '#ffffff',

package/src/renderer/shared/components/chat/SlashSuggestions.test.tsx

@@ -2,6 +2,7 @@ import React from 'react'
 import { renderToStaticMarkup } from 'react-dom/server'
 import { describe, expect, it } from 'vitest'
 import SlashSuggestions from './SlashSuggestions'
+import { executeSlashCommand } from '../../utils/slashCommandProcessor'
 
 const render = (message: string, suppressed = false) => renderToStaticMarkup(
   <SlashSuggestions message={message} onComplete={() => {}} anchorRef={{ current: null }} suppressed={suppressed} />,
@@ -18,6 +19,10 @@ describe('composer command suggestions', () => {
     const html = render('/st')
     expect(html.indexOf('>/stats<')).toBeLessThan(html.indexOf('>/mods<'))
   })
+  it('shows /resume above /retry when typing /r', () => {
+    const html = render('/r')
+    expect(html.indexOf('>/resume<')).toBeLessThan(html.indexOf('>/retry<'))
+  })
   it('keeps a command argument as a usage hint instead of unrelated search results', () => {
     const html = render('/remember a durable fact')
     expect(html).toContain('/remember')
@@ -30,4 +35,13 @@ describe('composer command suggestions', () => {
     expect(html).not.toContain('/theme')
     expect(render('/', true)).toBe('')
   })
+  it('lists /voice in the graphical menu and routes /voice to start_voice action', () => {
+    const html = render('/voice')
+    expect(html).toContain('/voice')
+    expect(executeSlashCommand('/voice')).toEqual({
+      handled: true,
+      action: 'start_voice',
+      payload: { mode: '' },
+    })
+  })
 })

package/src/renderer/shared/components/chat/SourcesBlock.test.tsx

@@ -0,0 +1,53 @@
+import React from 'react'
+import { renderToStaticMarkup } from 'react-dom/server'
+import { describe, expect, it } from 'vitest'
+import SourcesBlock, { groupSourcesByDomain } from './SourcesBlock'
+import type { WebSearchSource } from '../../utils/agentActivity'
+
+describe('SourcesBlock', () => {
+  const mockSources: WebSearchSource[] = [
+    {
+      title: 'Nahida Cosplay Album 1',
+      url: 'https://mitaku.net/album-1',
+      domain: 'mitaku.net',
+      faviconUrl: 'https://mitaku.net/favicon.ico',
+    },
+    {
+      title: 'Nahida Cosplay Album 2',
+      url: 'https://mitaku.net/album-2',
+      domain: 'mitaku.net',
+      faviconUrl: 'https://mitaku.net/favicon.ico',
+    },
+    {
+      title: 'Mococo Cosplay',
+      url: 'https://e-hentai.org/g/12345',
+      domain: 'e-hentai.org',
+      faviconUrl: 'https://e-hentai.org/favicon.ico',
+    },
+  ]
+
+  it('groups sources by domain correctly', () => {
+    const groups = groupSourcesByDomain(mockSources)
+    expect(groups.length).toBe(2)
+    expect(groups[0].domain).toBe('mitaku.net')
+    expect(groups[0].displayDomain).toBe('mitaku')
+    expect(groups[0].items.length).toBe(2)
+    expect(groups[1].domain).toBe('e-hentai.org')
+    expect(groups[1].displayDomain).toBe('e-hentai')
+    expect(groups[1].items.length).toBe(1)
+  })
+
+  it('renders domain group cards with extra count badge', () => {
+    const html = renderToStaticMarkup(<SourcesBlock sources={mockSources} />)
+    expect(html).toContain('Sources')
+    expect(html).toContain('mitaku')
+    expect(html).toContain('+1')
+    expect(html).toContain('e-hentai')
+    expect(html).toContain('extra-badge-btn')
+  })
+
+  it('returns null when sources list is empty', () => {
+    const html = renderToStaticMarkup(<SourcesBlock sources={[]} />)
+    expect(html).toBe('')
+  })
+})