@pheem49/mint 1.16.0 → 1.17.0

package/src/renderer/shared/components/{ChatMessageItem.test.tsx → chat/ChatMessageItem.test.tsx}

@@ -1,28 +1,66 @@
-import { describe, expect, it } from 'vitest'
+/// <reference path="../../env.d.ts" />
+import { describe, expect, it, vi } from 'vitest'
+// @ts-ignore react-dom/server lacks types without @types/react-dom
 import { renderToStaticMarkup } from 'react-dom/server'
-import { FormattedMessage } from './FormattedMessage'
+import { FormattedMessage } from '../../utils/markdown'
 import ChatMessageItem, { type ChatMessageItemProps } from './ChatMessageItem'
-import type { AgentProgress } from '../types'
-import { compactAgentProgressForPersistence, reduceLiveAgentProgress } from '../agentProgress'
+import { TurnFileChanges } from './TurnFileChanges'
+import type { AgentProgress } from '../../types'
+import { compactAgentProgressForPersistence, reduceLiveAgentProgress } from '../../agentProgress'
 
 const action = () => {}
 const base: ChatMessageItemProps = {
   interaction: { id: 7, status: 'completed', aiText: 'Ready', userText: 'Hello', createdAt: '2026-10-10T00:00:00Z' },
-  copiedId: null, speakingText: null, agentActivitySnapshots: {}, thinkingExpanded: {},
-  onThinkingExpandedChange: action, handleCopyMessage: action, speak: action,
-  toggleActivity: action, renderFileChanges: () => null,
+  copiedId: null,
+  speakingText: null,
+  agentActivitySnapshots: {},
+  handleCopyMessage: action,
+  speak: action,
+  toggleActivity: action,
 }
 const unchanged = (next: Partial<ChatMessageItemProps>) => (ChatMessageItem as any).compare(base, { ...base, ...next })
 
-describe('message update isolation', () => {
-  it('updates a file summary when its initially expanded review is collapsed', () => {
-    expect(unchanged({ openReviewIds: { '7': false } })).toBe(false)
+it('does not render duplicate completion status pills in message bubble', () => {
+  const progress: any[] = [{ type: 'RunCompleted', data: { summary: { outcome: 'UNVERIFIED' } } }]
+  const html = renderToStaticMarkup(<ChatMessageItem {...base} interaction={{ ...base.interaction, agentActivity: progress }} />)
+  expect(html).not.toContain('data-completion-status')
+})
+
+it('renders provider brand logo instead of a plain colored dot in provider-model-chip', () => {
+  const html = renderToStaticMarkup(
+    <ChatMessageItem
+      {...base}
+      interaction={{
+        ...base.interaction,
+        status: 'completed',
+        provider: 'deepseek',
+        model: 'deepseek-flash',
+      }}
+    />
+  )
+  expect(html).toContain('provider-model-chip')
+  expect(html).toContain('provider-chip-logo')
+  expect(html).toContain('deepseek')
+  expect(html).toContain('deepseek-flash')
+  expect(html).not.toContain('provider-chip-dot')
+})
+
+describe('message update isolation and TurnFileChanges deep module', () => {
+  it('updates only the message whose activity drawer state or snapshot changed', () => {
+    expect(unchanged({ openActivityIds: { '8': true } })).toBe(true)
+    expect(unchanged({ openActivityIds: { '7': true } })).toBe(false)
   })
-  it('updates only the message whose file details or show-more state changed', () => {
-    expect(unchanged({ openFileDiffs: { '8-/other.ts': true } })).toBe(true)
-    expect(unchanged({ openFileDiffs: { '7-/own.ts': true } })).toBe(false)
-    expect(unchanged({ showAllFileChanges: { '8': true } })).toBe(true)
-    expect(unchanged({ showAllFileChanges: { '7': true } })).toBe(false)
+  it('renders TurnFileChanges summary and show-more button when >3 files changed', () => {
+    const changes = [1, 2, 3, 4].map((i) => ({
+      path: `src/file-${i}.ts`,
+      created: i === 1,
+      additions: 5,
+      deletions: 1,
+      hunks: [{ oldText: 'old', newText: 'new' }],
+    }))
+    const html = renderToStaticMarkup(<TurnFileChanges changes={changes} />)
+    expect(html).toContain('1 created, 3 modified')
+    expect(html).toContain('Show 1 more file')
   })
   it('does not retain stale user actions', () => {
     expect(unchanged({ onEditMessage: () => {} })).toBe(false)
@@ -65,4 +103,43 @@ describe('view_image results on Desktop and Web', () => {
     const html = renderToStaticMarkup(<ChatMessageItem {...base} interaction={{ ...base.interaction, agentActivity: [{ type: 'ToolEnd', data: { action: 'view_image', input: { path: 'unavailable.png' }, result } }] }} />)
     expect(html).not.toContain('data-viewed-image=')
   })
+  it('forwards onOpenArtifact to viewed image preview trigger', () => {
+    const onOpenArtifact = vi.fn()
+    const saved = JSON.parse(JSON.stringify(compactAgentProgressForPersistence(progress)))
+    const html = renderToStaticMarkup(
+      <ChatMessageItem
+        {...base}
+        onOpenArtifact={onOpenArtifact}
+        interaction={{ ...base.interaction, status: 'completed', agentActivity: saved }}
+      />
+    )
+    expect(html).toContain('title="Open full image in Tools Surface"')
+    expect(html).toContain('aria-label="Expand mobile.png"')
+  })
+
+  it.each(['completed', 'failed', 'interrupted'] as const)(
+    'renders activity drawer for %s turns when progress exists',
+    (status) => {
+      const html = renderToStaticMarkup(
+        <ChatMessageItem
+          {...base}
+          interaction={{ ...base.interaction, status, agentActivity: progress }}
+        />
+      )
+      expect(html).toContain('agent-activity-history')
+      expect(html).toContain('agent-activity-toggle')
+    }
+  )
+
+  it('does not render historical activity drawer when queued or running', () => {
+    for (const status of ['queued', 'running'] as const) {
+      const html = renderToStaticMarkup(
+        <ChatMessageItem
+          {...base}
+          interaction={{ ...base.interaction, status, agentActivity: progress }}
+        />
+      )
+      expect(html).not.toContain('agent-activity-history')
+    }
+  })
 })

package/src/renderer/shared/components/{ChatMessageItem.tsx → chat/ChatMessageItem.tsx}

@@ -1,19 +1,17 @@
+import type { ArtifactFile } from '../../utils/artifacts'
 import React, { useMemo } from 'react'
-import { renderCopyIcon, renderSpeakerIcon } from '../utils/markdown'
-import { fallbackNotice } from '../utils/providers'
-import WeatherCard from './WeatherCard'
-import StockCard from './StockCard'
-import CalculationCard from './CalculationCard'
-import ImageSearchCard from './ImageSearchCard'
-import ImageGenCard from './ImageGenCard'
-import McpToolResults from './McpToolResults'
-import ViewedImages from './ViewedImages'
-import { parseUtcDate } from '../utils/ui'
-import { parseWebSearchSources } from '../utils/agentActivity'
-import { EMPTY_AGENT_PROGRESS } from '../agentProgress'
-import { FormattedMessage } from './FormattedMessage'
-import { ProgressActivity } from './ProgressActivity'
+import { FormattedMessage, renderCopyIcon, renderSpeakerIcon } from '../../utils/markdown'
+import { fallbackNotice } from '../../utils/providers'
+import McpToolResults from '../activity/McpToolResults'
+import ViewedImages from '../activity/ViewedImages'
+import { parseUtcDate } from '../../utils/ui'
+import { parseWebSearchSources } from '../../utils/agentActivity'
+import { EMPTY_AGENT_PROGRESS } from '../../agentProgress'
+import { AgentActivityDrawer } from '../activity/AgentActivityDrawer'
 import SourcesBlock from './SourcesBlock'
+import { TurnFileChanges, type RewindRequestPayload } from './TurnFileChanges'
+import { ToolResultCards } from '../cards/ToolResultCards'
+import ProviderBrandIcon from '../ui/ProviderBrandIcon'
 
 export interface ChatMessageItemProps {
   interaction: any
@@ -21,17 +19,16 @@ export interface ChatMessageItemProps {
   onEditMessage?: (text: string) => void
   speakingText: string | null
   agentActivitySnapshots: Record<string, any[]>
-  thinkingExpanded: Record<string, boolean>
   openActivityIds?: Record<string, boolean>
-  openReviewIds?: Record<string, boolean>
-  openFileDiffs?: Record<string, boolean>
-  onThinkingExpandedChange: (key: string, expanded: boolean) => void
   handleCopyMessage: (id: string | number, text: string) => void
   speak: (text: string) => void
   toggleActivity: (id: string) => void
-  showAllFileChanges?: Record<string, boolean>
-  workspacePath?: string
-  renderFileChanges: (interaction: any) => React.ReactNode
+  chatId?: string
+  customProviders?: Array<{ id: string; displayName?: string; logoDataUrl?: string }>
+  onOpenArtifact?: (artifact: ArtifactFile) => void
+  onOpenReview?: () => void
+  onRewindRequest?: (payload: RewindRequestPayload) => void
+  onRewindError?: (message: string) => void
 }
 
 const ChatMessageItem = React.memo(
@@ -42,15 +39,14 @@ const ChatMessageItem = React.memo(
       onEditMessage,
       speakingText,
       agentActivitySnapshots,
-      thinkingExpanded,
       openActivityIds,
-      openReviewIds,
-      openFileDiffs,
-      onThinkingExpandedChange,
       handleCopyMessage,
       speak,
       toggleActivity,
-      renderFileChanges,
+      onOpenArtifact,
+      onOpenReview,
+      onRewindRequest,
+      onRewindError,
     } = props
 
     const isSystemEvent = interaction.provider === 'system' && interaction.model === 'provider_change'
@@ -88,97 +84,6 @@ const ChatMessageItem = React.memo(
     const isAiCopied = copiedId === interaction.id
     const isSpeaking = speakingText === interaction.aiText
 
-    const fallbackWeatherData = useMemo(() => {
-      if (interaction.aiText && (interaction.aiText.includes('```weather_json') || interaction.aiText.includes('```weather-json'))) {
-        return null
-      }
-      for (const event of progress || []) {
-        if (event.type === 'ToolEnd' && (event.data?.action === 'weather' || event.data?.name === 'weather')) {
-          const res = event.data.result || event.data.output || ''
-          const match = typeof res === 'string' && res.match(/```weather_json\s*([\s\S]*?)\s*```/)
-          if (match && match[1]) {
-            try {
-              return JSON.parse(match[1])
-            } catch {}
-          }
-        }
-      }
-      return null
-    }, [interaction.aiText, progress])
-
-    const fallbackStockData = useMemo(() => {
-      if (interaction.aiText && (interaction.aiText.includes('```stock_json') || interaction.aiText.includes('```stock-json'))) {
-        return null
-      }
-      for (const event of progress || []) {
-        if (event.type === 'ToolEnd' && (event.data?.action === 'stock' || event.data?.name === 'stock')) {
-          const res = event.data.result || event.data.output || ''
-          const match = typeof res === 'string' && res.match(/```stock_json\s*([\s\S]*?)\s*```/)
-          if (match && match[1]) {
-            try {
-              return JSON.parse(match[1])
-            } catch {}
-          }
-        }
-      }
-      return null
-    }, [interaction.aiText, progress])
-
-    const fallbackCalcData = useMemo(() => {
-      if (interaction.aiText && (interaction.aiText.includes('```calculation_json') || interaction.aiText.includes('```calculation-json'))) {
-        return null
-      }
-      for (const event of progress || []) {
-        if (event.type === 'ToolEnd' && (event.data?.action === 'calculation' || event.data?.name === 'calculation')) {
-          const res = event.data.result || event.data.output || ''
-          const match = typeof res === 'string' && res.match(/```calculation_json\s*([\s\S]*?)\s*```/)
-          if (match && match[1]) {
-            try {
-              return JSON.parse(match[1])
-            } catch {}
-          }
-        }
-      }
-      return null
-    }, [interaction.aiText, progress])
-
-    const fallbackImageSearchData = useMemo(() => {
-      if (interaction.aiText && (interaction.aiText.includes('```image_search_json') || interaction.aiText.includes('```image-search-json'))) {
-        return null
-      }
-      for (const event of progress || []) {
-        if (event.type === 'ToolEnd' && (event.data?.action === 'image_search' || event.data?.name === 'image_search')) {
-          const res = event.data.result || event.data.output || ''
-          const match = typeof res === 'string' && res.match(/```image_search_json\s*([\s\S]*?)\s*```/)
-          if (match && match[1]) {
-            try {
-              return JSON.parse(match[1])
-            } catch {}
-          }
-        }
-      }
-      return null
-    }, [interaction.aiText, progress])
-
-    const fallbackImageGenData = useMemo(() => {
-      if (interaction.aiText && (interaction.aiText.includes('```image_gen_json') || interaction.aiText.includes('```image-gen-json'))) {
-        return null
-      }
-      const imageGenActions = new Set(['generate_image', 'image_studio.generate', 'image_generate'])
-      for (const event of progress || []) {
-        if (event.type === 'ToolEnd' && (imageGenActions.has(event.data?.action) || imageGenActions.has(event.data?.name))) {
-          const res = event.data.result || event.data.output || ''
-          const match = typeof res === 'string' && res.match(/```image_gen_json\s*([\s\S]*?)\s*```/)
-          if (match && match[1]) {
-            try {
-              return JSON.parse(match[1])
-            } catch {}
-          }
-        }
-      }
-      return null
-    }, [interaction.aiText, progress])
-
     return (
       <div key={interaction.id} style={{ display: 'flex', flexDirection: 'column', gap: '8px', marginBottom: '16px' }}>
         {interaction.userText && (
@@ -214,27 +119,41 @@ const ChatMessageItem = React.memo(
         )}
         <div className="message ai-message">
           <div className="bubble-wrapper">
-            {interaction.status === 'completed' && <ProgressActivity progress={progress} id={String(interaction.id)}
-              historical isOpen={Boolean(openActivityIds?.[String(interaction.id)])} onToggle={toggleActivity} />}
-            {interaction.status === 'completed' && renderFileChanges(interaction)}
+            {interaction.status !== 'queued' && interaction.status !== 'running' && (
+              <AgentActivityDrawer
+                progress={progress}
+                id={String(interaction.id)}
+                historical
+                isOpen={Boolean(openActivityIds?.[String(interaction.id)])}
+                onToggle={toggleActivity}
+                chatId={props.chatId || interaction.chatId}
+                onOpenArtifact={onOpenArtifact}
+              />
+            )}
+            {interaction.status !== 'queued' && interaction.status !== 'running' && (
+              <TurnFileChanges
+                progress={progress}
+                interaction={interaction}
+                onOpenArtifact={onOpenArtifact}
+                onOpenReview={onOpenReview}
+                onRewindRequest={onRewindRequest}
+                onRewindError={onRewindError}
+              />
+            )}
             <div className="message-bubble">
               {interaction.status === 'queued' && <span>Queued for this session…</span>}
               {interaction.status === 'running' && <span>Mint is responding…</span>}
               {interaction.status === 'failed' && <span>This turn failed. Send the prompt again to retry.</span>}
               {interaction.status === 'interrupted' && <span>This turn was interrupted. Send the prompt again to retry.</span>}
-              <McpToolResults progress={progress} running={interaction.status === 'running'} interrupted={interaction.status === 'interrupted'} />
-              <ViewedImages progress={progress} />
-              {fallbackWeatherData && <WeatherCard data={fallbackWeatherData} />}
-              {fallbackStockData && <StockCard data={fallbackStockData} />}
-              {fallbackCalcData && <CalculationCard data={fallbackCalcData} />}
-              {fallbackImageSearchData && <ImageSearchCard data={fallbackImageSearchData} />}
-              {fallbackImageGenData && <ImageGenCard data={fallbackImageGenData} />}
+              <McpToolResults progress={progress} running={interaction.status === 'running'} interrupted={interaction.status === 'interrupted'} chatId={props.chatId || interaction.chatId} />
+              <ViewedImages progress={progress} chatId={props.chatId || interaction.chatId} onOpenArtifact={onOpenArtifact} />
+              <ToolResultCards progress={progress} aiText={interaction.aiText} />
               {memoizedAiContent}
             </div>
             {webSources.length > 0 && <SourcesBlock sources={webSources} />}
             <div className="message-time" style={{ display: 'flex', alignItems: 'center', gap: '8px' }}>
               {interaction.status === 'completed' && <span className="provider-model-chip" data-provider={(interaction.provider || '').toLowerCase()} title={`${interaction.provider} • ${interaction.model}`}>
-                <span className="provider-chip-dot" aria-hidden="true" />
+                <ProviderBrandIcon provider={interaction.provider} model={interaction.model} customProviders={props.customProviders} size={13} />
                 <span className="provider-chip-name">{interaction.provider}</span>
                 <span className="provider-chip-divider">/</span>
                 <span className="provider-chip-model">{interaction.model}</span>
@@ -266,14 +185,33 @@ const ChatMessageItem = React.memo(
     )
   },
   (prevProps, nextProps) => {
-    if (prevProps.onEditMessage !== nextProps.onEditMessage
-      || prevProps.onThinkingExpandedChange !== nextProps.onThinkingExpandedChange
-      || prevProps.handleCopyMessage !== nextProps.handleCopyMessage
-      || prevProps.speak !== nextProps.speak
-      || prevProps.toggleActivity !== nextProps.toggleActivity) return false
+    if (
+      prevProps.onEditMessage !== nextProps.onEditMessage ||
+      prevProps.handleCopyMessage !== nextProps.handleCopyMessage ||
+      prevProps.speak !== nextProps.speak ||
+      prevProps.toggleActivity !== nextProps.toggleActivity ||
+      prevProps.onOpenArtifact !== nextProps.onOpenArtifact ||
+      prevProps.onOpenReview !== nextProps.onOpenReview ||
+      prevProps.onRewindRequest !== nextProps.onRewindRequest ||
+      prevProps.onRewindError !== nextProps.onRewindError
+    ) {
+      return false
+    }
     const p = prevProps.interaction
     const n = nextProps.interaction
-    if (p.id !== n.id || p.aiText !== n.aiText || p.userText !== n.userText || p.createdAt !== n.createdAt || p.status !== n.status || p.agentActivity !== n.agentActivity || p.provider !== n.provider || p.model !== n.model || p.fallbackProvider !== n.fallbackProvider || p.fallbackReason !== n.fallbackReason || p.chatId !== n.chatId) {
+    if (
+      p.id !== n.id ||
+      p.aiText !== n.aiText ||
+      p.userText !== n.userText ||
+      p.createdAt !== n.createdAt ||
+      p.status !== n.status ||
+      p.agentActivity !== n.agentActivity ||
+      p.provider !== n.provider ||
+      p.model !== n.model ||
+      p.fallbackProvider !== n.fallbackProvider ||
+      p.fallbackReason !== n.fallbackReason ||
+      p.chatId !== n.chatId
+    ) {
       return false
     }
 
@@ -289,38 +227,16 @@ const ChatMessageItem = React.memo(
     const nextSpeaking = nextProps.speakingText === n.aiText
     if (prevSpeaking !== nextSpeaking) return false
 
-    const prevExpanded = prevProps.thinkingExpanded[String(p.id)] ?? false
-    const nextExpanded = nextProps.thinkingExpanded[String(n.id)] ?? false
-    if (prevExpanded !== nextExpanded) return false
-
-    const prevExtExpanded = prevProps.thinkingExpanded[`extended-${p.id}`] ?? false
-    const nextExtExpanded = nextProps.thinkingExpanded[`extended-${n.id}`] ?? false
-    if (prevExtExpanded !== nextExtExpanded) return false
-
     const prevOpenActivity = prevProps.openActivityIds?.[String(p.id)] ?? false
     const nextOpenActivity = nextProps.openActivityIds?.[String(n.id)] ?? false
     if (prevOpenActivity !== nextOpenActivity) return false
 
-    const prevOpenReview = prevProps.openReviewIds?.[String(p.id)] ?? true
-    const nextOpenReview = nextProps.openReviewIds?.[String(n.id)] ?? true
-    if (prevOpenReview !== nextOpenReview) return false
-
-    if (prevProps.workspacePath !== nextProps.workspacePath) return false
-    if (Boolean(prevProps.showAllFileChanges?.[String(p.id)]) !== Boolean(nextProps.showAllFileChanges?.[String(n.id)])) return false
-    if (prevProps.openFileDiffs !== nextProps.openFileDiffs) {
-      const prefix = `${p.id}-`
-      const keys = new Set([...Object.keys(prevProps.openFileDiffs ?? {}), ...Object.keys(nextProps.openFileDiffs ?? {})])
-      for (const key of keys) {
-        if (key.startsWith(prefix) && Boolean(prevProps.openFileDiffs?.[key]) !== Boolean(nextProps.openFileDiffs?.[key])) return false
-      }
-    }
-
     const prevSnap = prevProps.agentActivitySnapshots[String(p.id)]
     const nextSnap = nextProps.agentActivitySnapshots[String(n.id)]
     if (prevSnap !== nextSnap) return false
 
     return true
-  }
+  },
 )
 
 export default ChatMessageItem

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

@@ -0,0 +1,31 @@
+import { createElement } from 'react'
+import { renderToStaticMarkup } from 'react-dom/server'
+import { describe, expect, it } from 'vitest'
+import ChatPanel, { shouldProbeOllamaModels, ThinkingElapsedMeta } from './ChatPanel'
+import { chatPanelFixture } from '../../../tests/chatPanelFixture'
+import { installRendererPlatform } from '../../platform'
+import * as webAdapter from '../../../src-web/tauri'
+
+describe('Shared Tools entry point', () => {
+  it('keeps Sources out of the chat header and offers Tools instead', () => {
+    installRendererPlatform(webAdapter)
+    const html = renderToStaticMarkup(createElement(ChatPanel, { ...chatPanelFixture(), tools: { modsPanelTarget: null, onOpenMods: () => {}, open: false, backgroundTaskCount: 0, onToggle: () => {} } } as any))
+    expect(html).not.toContain('Open session sources')
+    expect(html).toContain('Open tools panel')
+  })
+  it('does not duplicate Desktop’s titlebar Tools button', () => {
+    installRendererPlatform(webAdapter)
+    const html = renderToStaticMarkup(createElement(ChatPanel, chatPanelFixture() as any))
+    expect(html).not.toContain('Open session sources')
+  })
+  it('isolates thinking elapsed timer markup and gates Ollama probing to Ollama configurations', () => {
+    installRendererPlatform(webAdapter)
+    const elapsedHtml = renderToStaticMarkup(createElement(ThinkingElapsedMeta))
+    expect(elapsedHtml).toContain('thinking-status-meta')
+    expect(elapsedHtml).toContain('· 0s · Esc to cancel')
+
+    expect(shouldProbeOllamaModels({ activeProvider: 'gemini' } as any, {})).toBe(false)
+    expect(shouldProbeOllamaModels({ activeProvider: 'ollama' } as any, {})).toBe(true)
+    expect(shouldProbeOllamaModels({ activeProvider: 'gemini' } as any, { ollamaHost: 'http://localhost:11434' })).toBe(true)
+  })
+})