diff --git a/src/renderer/components/Header.tsx b/src/renderer/components/Header.tsx
index c2463458..78451c06 100644
--- a/src/renderer/components/Header.tsx
+++ b/src/renderer/components/Header.tsx
@@ -5,12 +5,14 @@ import { useAtomValue, useSetAtom } from 'jotai'
 import * as sessionActions from '../stores/sessionActions'
 import Toolbar from './Toolbar'
 import { cn } from '@/lib/utils'
+import { getModelDisplayName } from '../packages/models'
 
 interface Props { }
 
 export default function Header(props: Props) {
     const theme = useTheme()
     const currentSession = useAtomValue(atoms.currentSessionAtom)
+    const settings = useAtomValue(atoms.settingsAtom)
     const setChatConfigDialogSession = useSetAtom(atoms.chatConfigDialogAtom)
 
     useEffect(() => {
@@ -52,11 +54,17 @@ export default function Header(props: Props) {
                         editCurrentSession()
                     }}
                 >
-                    {
-                        <Typography variant="h6" noWrap className={cn('max-w-56', 'ml-3')}>
-                            {currentSession.name}
-                        </Typography>
-                    }
+                    <Typography variant="h6" noWrap className={cn('max-w-56', 'ml-3')}>
+                        {currentSession.name}
+                    </Typography>
+                    <Typography 
+                        variant="body2" 
+                        color="text.secondary" 
+                        noWrap 
+                        className="ml-2 self-center"
+                    >
+                        {getModelDisplayName({...settings, aiProvider: currentSession.aiProvider || settings.aiProvider}, currentSession.type || 'chat')}
+                    </Typography>
                 </Typography>
                 <Toolbar />
             </div>
diff --git a/src/renderer/pages/ChatConfigWindow.tsx b/src/renderer/pages/ChatConfigWindow.tsx
index 32aca110..46c503ce 100644
--- a/src/renderer/pages/ChatConfigWindow.tsx
+++ b/src/renderer/pages/ChatConfigWindow.tsx
@@ -7,16 +7,19 @@ import {
     DialogTitle,
     DialogContentText,
     TextField,
+    Box,
 } from '@mui/material'
 import {
     Session,
     createMessage,
+    ModelSettings,
 } from '../../shared/types'
 import { useTranslation } from 'react-i18next'
 import * as sessionActions from '../stores/sessionActions'
 import * as atoms from '../stores/atoms'
 import { useAtom } from 'jotai'
 import { trackingEvent } from '@/packages/event'
+import AIProviderSelect from '../components/AIProviderSelect'
 
 interface Props {
 }
@@ -24,6 +27,7 @@ interface Props {
 export default function ChatConfigWindow(props: Props) {
     const { t } = useTranslation()
     const [chatConfigDialogSession, setChatConfigDialogSession] = useAtom(atoms.chatConfigDialogAtom)
+    const [settings] = useAtom(atoms.settingsAtom)
 
     const [editingData, setEditingData] = React.useState<Session | null>(chatConfigDialogSession)
     useEffect(() => {
@@ -78,9 +82,23 @@ export default function ChatConfigWindow(props: Props) {
         setChatConfigDialogSession(null)
     }
 
+    // Create a merged settings object that uses the session provider if set
+    const effectiveSettings = React.useMemo(() => ({
+        ...settings,
+        aiProvider: editingData?.aiProvider || settings.aiProvider,
+    }), [settings, editingData?.aiProvider])
+
     if (!chatConfigDialogSession || !editingData) {
         return null
     }
+
+    const handleProviderChange = (newSettings: ModelSettings) => {
+        setEditingData({
+            ...editingData,
+            aiProvider: newSettings.aiProvider,
+        })
+    }
+
     return (
         <Dialog open={!!chatConfigDialogSession} onClose={onCancel} fullWidth>
             <DialogTitle>{t('Conversation Settings')}</DialogTitle>
@@ -95,7 +113,13 @@ export default function ChatConfigWindow(props: Props) {
                     value={editingData.name}
                     onChange={(e) => setEditingData({ ...editingData, name: e.target.value })}
                 />
-                <div className='mt-1'>
+                <Box className='mt-4'>
+                    <AIProviderSelect
+                        settings={effectiveSettings}
+                        setSettings={handleProviderChange}                        
+                    />
+                </Box>
+                <div className='mt-4'>
                     <TextField
                         margin="dense"
                         label={t('Instruction (System Prompt)')}
diff --git a/src/renderer/stores/sessionActions.ts b/src/renderer/stores/sessionActions.ts
index 558f43ba..3fbcbc1e 100644
--- a/src/renderer/stores/sessionActions.ts
+++ b/src/renderer/stores/sessionActions.ts
@@ -4,6 +4,7 @@ import {
     createMessage,
     Message,
     Session,
+    ModelProvider,
 } from '../../shared/types'
 import * as atoms from './atoms'
 import * as promptFormat from '../packages/prompts'
@@ -180,12 +181,17 @@ export async function generate(sessionId: string, targetMsg: Message) {
         return
     }
     const placeholder = '...'
+    
+    // Use session aiProvider if specified, otherwise use global setting
+    const effectiveAIProvider: ModelProvider = session.aiProvider || settings.aiProvider
+    const effectiveSettings = { ...settings, aiProvider: effectiveAIProvider }
+    
     targetMsg = {
         ...targetMsg,
         content: placeholder,
         cancel: undefined,
-        aiProvider: settings.aiProvider,
-        model: getModelDisplayName(settings, session.type || 'chat'),
+        aiProvider: effectiveAIProvider,
+        model: getModelDisplayName(effectiveSettings, session.type || 'chat'),
         generating: true,
         errorCode: undefined,
         error: undefined,
@@ -197,7 +203,7 @@ export async function generate(sessionId: string, targetMsg: Message) {
     let targetMsgIx = messages.findIndex((m) => m.id === targetMsg.id)
 
     try {
-        const model = getModel(settings, configs)
+        const model = getModel(effectiveSettings, configs)
         switch (session.type) {
             case 'chat':
             case undefined:
@@ -237,7 +243,7 @@ export async function generate(sessionId: string, targetMsg: Message) {
             errorCode,
             error: `${err.message}`,
             errorExtra: {
-                aiProvider: settings.aiProvider,
+                aiProvider: effectiveAIProvider,
                 host: err['host'],
             },
         }
@@ -254,7 +260,9 @@ async function _generateName(sessionId: string, modifyName: (sessionId: string,
     }
     const configs = await platform.getConfig()
     try {
-        const model = getModel(settings, configs)
+        const effectiveAIProvider: ModelProvider = session.aiProvider || settings.aiProvider
+        const effectiveSettings = { ...settings, aiProvider: effectiveAIProvider }
+        const model = getModel(effectiveSettings, configs)
         let name = await model.chat(promptFormat.nameConversation(
             session.messages
                 .filter(m => m.role !== 'system')
diff --git a/src/shared/types.ts b/src/shared/types.ts
index fe07c9f6..59367f46 100644
--- a/src/shared/types.ts
+++ b/src/shared/types.ts
@@ -49,6 +49,7 @@ export interface Session {
     type?: SessionType
     name: string
     picUrl?: string
+    aiProvider?: ModelProvider
     messages: Message[]
     copilotId?: string
 }
@@ -69,6 +70,7 @@ export enum ModelProvider {
     Ollama = 'ollama',
     SiliconFlow = 'silicon-flow',
     LMStudio = 'lm-studio',
+    PPIO = 'ppio',
 }
 
 export interface ModelSettings {
@@ -115,6 +117,11 @@ export interface ModelSettings {
     siliconCloudKey: string
     siliconCloudModel: siliconflow.Model | 'custom-model'
 
+    // ppio
+    ppioHost: string
+    ppioKey: string
+    ppioModel: string
+
     temperature: number
     topP: number
     openaiMaxContextMessageCount: number