diff --git a/src/main/presenter/configPresenter/index.ts b/src/main/presenter/configPresenter/index.ts
index 3c123abae..889f2e0ff 100644
--- a/src/main/presenter/configPresenter/index.ts
+++ b/src/main/presenter/configPresenter/index.ts
@@ -32,7 +32,7 @@ import { DEFAULT_PROVIDERS } from './providers'
 import path from 'path'
 import { app, nativeTheme, shell, ipcMain } from 'electron'
 import fs from 'fs'
-import { CONFIG_EVENTS, SYSTEM_EVENTS, FLOATING_BUTTON_EVENTS } from '@/events'
+import { CONFIG_EVENTS, SYSTEM_EVENTS, FLOATING_BUTTON_EVENTS, SESSION_EVENTS } from '@/events'
 import { McpConfHelper } from './mcpConfHelper'
 import { presenter } from '@/presenter'
 import { compare } from 'compare-versions'
@@ -1329,6 +1329,7 @@ export class ConfigPresenter implements IConfigPresenter {
   private notifyAcpAgentsChanged() {
     console.log('[ACP] notifyAcpAgentsChanged: sending MODEL_LIST_CHANGED event for provider "acp"')
     eventBus.sendToRenderer(CONFIG_EVENTS.MODEL_LIST_CHANGED, SendTarget.ALL_WINDOWS, 'acp')
+    eventBus.sendToRenderer(SESSION_EVENTS.LIST_UPDATED, SendTarget.ALL_WINDOWS)
   }
 
   // Provide getMcpConfHelper method to get MCP configuration helper
diff --git a/src/main/presenter/newAgentPresenter/index.ts b/src/main/presenter/newAgentPresenter/index.ts
index 6f290d6dd..b1b1b91f8 100644
--- a/src/main/presenter/newAgentPresenter/index.ts
+++ b/src/main/presenter/newAgentPresenter/index.ts
@@ -365,14 +365,10 @@ export class NewAgentPresenter {
     const enriched: SessionWithState[] = []
 
     for (const record of records) {
-      const agent = await this.resolveAgentImplementation(record.agentId)
-      const state = await agent.getSessionState(record.id)
-      enriched.push({
-        ...record,
-        status: state?.status ?? 'idle',
-        providerId: state?.providerId ?? '',
-        modelId: state?.modelId ?? ''
-      })
+      const session = await this.tryBuildSessionWithState(record)
+      if (session) {
+        enriched.push(session)
+      }
     }
 
     return enriched
@@ -381,14 +377,7 @@ export class NewAgentPresenter {
   async getSession(sessionId: string): Promise<SessionWithState | null> {
     const record = this.sessionManager.get(sessionId)
     if (!record) return null
-    const agent = await this.resolveAgentImplementation(record.agentId)
-    const state = await agent.getSessionState(sessionId)
-    return {
-      ...record,
-      status: state?.status ?? 'idle',
-      providerId: state?.providerId ?? '',
-      modelId: state?.modelId ?? ''
-    }
+    return await this.tryBuildSessionWithState(record)
   }
 
   async getMessages(sessionId: string): Promise<ChatMessageRecord[]> {
@@ -556,7 +545,11 @@ export class NewAgentPresenter {
   async getActiveSession(webContentsId: number): Promise<SessionWithState | null> {
     const sessionId = this.sessionManager.getActiveSessionId(webContentsId)
     if (!sessionId) return null
-    return this.getSession(sessionId)
+    const session = await this.getSession(sessionId)
+    if (!session) {
+      this.sessionManager.unbindWindow(webContentsId)
+    }
+    return session
   }
 
   async getAgents(): Promise<Agent[]> {
@@ -891,6 +884,29 @@ export class NewAgentPresenter {
     return false
   }
 
+  private async buildSessionWithState(record: SessionRecord): Promise<SessionWithState> {
+    const agent = await this.resolveAgentImplementation(record.agentId)
+    const state = await agent.getSessionState(record.id)
+    return {
+      ...record,
+      status: state?.status ?? 'idle',
+      providerId: state?.providerId ?? '',
+      modelId: state?.modelId ?? ''
+    }
+  }
+
+  private async tryBuildSessionWithState(record: SessionRecord): Promise<SessionWithState | null> {
+    try {
+      return await this.buildSessionWithState(record)
+    } catch (error) {
+      console.warn(
+        `[NewAgentPresenter] Skipping unavailable session id=${record.id} agent=${record.agentId}:`,
+        error
+      )
+      return null
+    }
+  }
+
   private async resolveAgentImplementation(agentId: string): Promise<IAgentImplementation> {
     if (this.agentRegistry.has(agentId)) {
       return this.agentRegistry.resolve(agentId)
diff --git a/src/preload/index.d.ts b/src/preload/index.d.ts
index c44294752..6036ffb1c 100644
--- a/src/preload/index.d.ts
+++ b/src/preload/index.d.ts
@@ -14,6 +14,10 @@ declare global {
       toRelativePath?(filePath: string, baseDir?: string): string
       formatPathForInput?(filePath: string): string
     }
+    __deepchatDev?: {
+      goToWelcome(): boolean
+      clearWelcomeOverride(): boolean
+    }
     floatingButtonAPI: typeof floatingButtonAPI
   }
 }
diff --git a/src/preload/index.ts b/src/preload/index.ts
index b789aba1b..8d0b5c4e5 100644
--- a/src/preload/index.ts
+++ b/src/preload/index.ts
@@ -11,6 +11,9 @@ import {
 import { exposeElectronAPI } from '@electron-toolkit/preload'
 
 const ALLOWED_PROTOCOLS = ['http:', 'https:', 'mailto:', 'tel:', 'deepchat:']
+const isDevHiddenApiEnabled =
+  process.env.NODE_ENV === 'development' || Boolean(process.env.ELECTRON_RENDERER_URL)
+const DEV_WELCOME_OVERRIDE_KEY = '__deepchat_dev_force_welcome'
 
 const isValidExternalUrl = (url: string): boolean => {
   try {
@@ -101,6 +104,33 @@ const api = {
     return `'${filePath.replace(/'/g, `'\\''`)}'`
   }
 }
+
+const setDevWelcomeOverride = (enabled: boolean) => {
+  try {
+    if (enabled) {
+      window.sessionStorage.setItem(DEV_WELCOME_OVERRIDE_KEY, '1')
+    } else {
+      window.sessionStorage.removeItem(DEV_WELCOME_OVERRIDE_KEY)
+    }
+  } catch (error) {
+    console.warn('Preload: Failed to update dev welcome override:', error)
+  }
+}
+
+const deepchatDevApi = isDevHiddenApiEnabled
+  ? {
+      goToWelcome: () => {
+        setDevWelcomeOverride(true)
+        window.location.hash = '/welcome'
+        return true
+      },
+      clearWelcomeOverride: () => {
+        setDevWelcomeOverride(false)
+        return true
+      }
+    }
+  : undefined
+
 exposeElectronAPI()
 
 // Use `contextBridge` APIs to expose Electron APIs to
@@ -109,12 +139,19 @@ exposeElectronAPI()
 if (process.contextIsolated) {
   try {
     contextBridge.exposeInMainWorld('api', api)
+    if (deepchatDevApi) {
+      contextBridge.exposeInMainWorld('__deepchatDev', deepchatDevApi)
+    }
   } catch (error) {
     console.error('Preload: Failed to expose API via contextBridge:', error)
   }
 } else {
   // @ts-ignore (define in dts)
   window.api = api
+  if (deepchatDevApi) {
+    // @ts-ignore (define in dts)
+    window.__deepchatDev = deepchatDevApi
+  }
 }
 window.addEventListener('DOMContentLoaded', () => {
   cachedWebContentsId = ipcRenderer.sendSync('get-web-contents-id')
diff --git a/src/renderer/settings/components/ProviderModelList.vue b/src/renderer/settings/components/ProviderModelList.vue
index cd38a08bd..66fb5f4f5 100644
--- a/src/renderer/settings/components/ProviderModelList.vue
+++ b/src/renderer/settings/components/ProviderModelList.vue
@@ -63,13 +63,13 @@
           <DynamicScrollerItem
             :item="item"
             :active="active"
-            :size-dependencies="getItemSizeDependencies(item)"
+            :size-dependencies="getScrollerItemSizeDependencies(item)"
           >
-            <div v-if="item.type === 'label'" class="px-3 py-2 text-xs text-muted-foreground">
+            <div v-if="isLabelItem(item)" class="px-3 py-2 text-xs text-muted-foreground">
               {{ item.label }}
             </div>
             <div
-              v-else-if="item.type === 'provider-actions'"
+              v-else-if="isProviderActionsItem(item)"
               class="flex flex-wrap items-center justify-between gap-3 px-3 py-2 bg-muted/30"
             >
               <div class="text-sm font-medium">{{ getProviderName(item.providerId) }}</div>
@@ -94,7 +94,7 @@
                 </Button>
               </div>
             </div>
-            <div v-else class="bg-card">
+            <div v-else-if="isModelItem(item)" class="bg-card">
               <ModelConfigItem
                 :model-name="item.model.name"
                 :model-id="item.model.id"
@@ -246,6 +246,28 @@ const virtualItems = computed<VirtualModelListItem[]>(() => {
   return items
 })
 
+const isLabelItem = (item: unknown): item is Extract<VirtualModelListItem, { type: 'label' }> => {
+  return (
+    typeof item === 'object' && item !== null && (item as VirtualModelListItem).type === 'label'
+  )
+}
+
+const isProviderActionsItem = (
+  item: unknown
+): item is Extract<VirtualModelListItem, { type: 'provider-actions' }> => {
+  return (
+    typeof item === 'object' &&
+    item !== null &&
+    (item as VirtualModelListItem).type === 'provider-actions'
+  )
+}
+
+const isModelItem = (item: unknown): item is Extract<VirtualModelListItem, { type: 'model' }> => {
+  return (
+    typeof item === 'object' && item !== null && (item as VirtualModelListItem).type === 'model'
+  )
+}
+
 const getItemSizeDependencies = (item: VirtualModelListItem) => {
   if (item.type === 'model') {
     return [
@@ -270,6 +292,10 @@ const getItemSizeDependencies = (item: VirtualModelListItem) => {
   return [item.label]
 }
 
+const getScrollerItemSizeDependencies = (item: unknown) => {
+  return getItemSizeDependencies(item as VirtualModelListItem)
+}
+
 const getProviderName = (providerId: string) => {
   const provider = props.providers.find((p) => p.id === providerId)
   return provider?.name || providerId
diff --git a/src/renderer/src/App.vue b/src/renderer/src/App.vue
index c8c0a10fc..8a1794677 100644
--- a/src/renderer/src/App.vue
+++ b/src/renderer/src/App.vue
@@ -26,6 +26,8 @@ import AppBar from '@/components/AppBar.vue'
 import { useDeviceVersion } from '@/composables/useDeviceVersion'
 import WindowSideBar from './components/WindowSideBar.vue'
 
+const DEV_WELCOME_OVERRIDE_KEY = '__deepchat_dev_force_welcome'
+
 const route = useRoute()
 const configPresenter = usePresenter('configPresenter')
 const artifactStore = useArtifactStore()
@@ -144,11 +146,45 @@ const handleErrorClosed = () => {
 
 const router = useRouter()
 const activeTab = ref('chat')
+const isStartupRouteReady = ref(false)
+
+const isDevWelcomeOverrideEnabled = () => {
+  if (!import.meta.env.DEV) return false
+
+  try {
+    return window.sessionStorage.getItem(DEV_WELCOME_OVERRIDE_KEY) === '1'
+  } catch {
+    return false
+  }
+}
+
+const ensureStartupWelcomeState = async () => {
+  try {
+    await router.isReady()
+
+    const currentRoute = router.currentRoute.value
+    const isWelcomeRoute = currentRoute.name === 'welcome' || currentRoute.path === '/welcome'
 
-const getInitComplete = async () => {
-  const initComplete = await configPresenter.getSetting('init_complete')
-  if (!initComplete) {
-    router.push({ name: 'welcome' })
+    if (isDevWelcomeOverrideEnabled()) {
+      if (!isWelcomeRoute) {
+        await router.replace({ name: 'welcome' })
+      }
+      return
+    }
+
+    const initComplete = Boolean(await configPresenter.getSetting('init_complete'))
+    if (!initComplete) {
+      if (!isWelcomeRoute) {
+        await router.replace({ name: 'welcome' })
+      }
+      return
+    }
+
+    if (isWelcomeRoute) {
+      await router.replace({ name: 'chat' })
+    }
+  } finally {
+    isStartupRouteReady.value = true
   }
 }
 
@@ -192,7 +228,7 @@ const handleEscKey = (event: KeyboardEvent) => {
   }
 }
 
-getInitComplete()
+void ensureStartupWelcomeState()
 
 onMounted(() => {
   // Set initial body class
@@ -332,7 +368,7 @@ onBeforeUnmount(() => {
         <div
           class="flex-1 min-w-0 bg-background overflow-hidden rounded-tl-xl border-black/20 dark:border-white/10 border-l border-t"
         >
-          <RouterView />
+          <RouterView v-if="isStartupRouteReady" />
         </div>
       </div>
     </div>
diff --git a/src/renderer/src/components/mock/MockWelcomePage.vue b/src/renderer/src/components/mock/MockWelcomePage.vue
index 9cf97e9d7..b25407d95 100644
--- a/src/renderer/src/components/mock/MockWelcomePage.vue
+++ b/src/renderer/src/components/mock/MockWelcomePage.vue
@@ -7,9 +7,11 @@
       </div>
 
       <!-- Heading -->
-      <h1 class="text-3xl font-semibold text-foreground mb-2">Welcome to DeepChat Agent</h1>
+      <h1 class="text-3xl font-semibold text-foreground mb-2">
+        {{ t('welcome.page.title') }}
+      </h1>
       <p class="text-sm text-muted-foreground text-center max-w-md mb-10">
-        Connect a model provider to start build
+        {{ t('welcome.page.description') }}
       </p>
 
       <!-- Provider grid -->
@@ -21,7 +23,7 @@
           @click="onAddProvider"
         >
           <ModelIcon :model-id="provider.id" custom-class="w-6 h-6" :is-dark="themeStore.isDark" />
-          <span class="text-xs text-foreground/80">{{ provider.name }}</span>
+          <span class="text-xs text-foreground/80">{{ t(provider.nameKey) }}</span>
         </button>
       </div>
 
@@ -29,27 +31,27 @@
         class="text-xs text-muted-foreground hover:text-foreground transition-colors mb-12"
         @click="onAddProvider"
       >
-        Browse all providers...
+        {{ t('welcome.page.browseProviders') }}
       </button>
 
       <!-- ACP agent section (optional) -->
       <div class="flex flex-col items-center gap-3 w-full max-w-sm">
         <div class="flex items-center gap-3 w-full">
           <div class="flex-1 h-px bg-border"></div>
-          <span class="text-xs text-muted-foreground/60">or connect an agent</span>
+          <span class="text-xs text-muted-foreground/60">{{ t('welcome.page.connectAgent') }}</span>
           <div class="flex-1 h-px bg-border"></div>
         </div>
 
         <button
           class="flex items-center gap-3 w-full rounded-xl border border-dashed border-border/60 px-4 py-3 hover:bg-accent/30 hover:border-border transition-all duration-150"
-          @click="onAddProvider"
+          @click="onSetupAcp"
         >
           <div class="flex items-center justify-center w-8 h-8 rounded-lg bg-muted/60 shrink-0">
             <Icon icon="lucide:terminal" class="w-4 h-4 text-muted-foreground" />
           </div>
           <div class="text-left">
-            <p class="text-sm text-foreground/80">Set up an ACP agent</p>
-            <p class="text-xs text-muted-foreground/60">Claude Code, Codex, Kimi, or your own</p>
+            <p class="text-sm text-foreground/80">{{ t('welcome.page.acpTitle') }}</p>
+            <p class="text-xs text-muted-foreground/60">{{ t('welcome.page.acpDescription') }}</p>
           </div>
           <Icon icon="lucide:chevron-right" class="w-4 h-4 text-muted-foreground/40 ml-auto" />
         </button>
@@ -60,28 +62,56 @@
 
 <script setup lang="ts">
 import { Icon } from '@iconify/vue'
+import { useI18n } from 'vue-i18n'
 import { usePresenter } from '@/composables/usePresenter'
+import { SETTINGS_EVENTS } from '@/events'
 import { useThemeStore } from '@/stores/theme'
 import ModelIcon from '../icons/ModelIcon.vue'
 
+const { t } = useI18n()
 const windowPresenter = usePresenter('windowPresenter')
 const themeStore = useThemeStore()
 
 const providers = [
-  { id: 'claude', name: 'Claude' },
-  { id: 'openai', name: 'OpenAI' },
-  { id: 'deepseek', name: 'DeepSeek' },
-  { id: 'gemini', name: 'Gemini' },
-  { id: 'ollama', name: 'Ollama' },
-  { id: 'openrouter', name: 'OpenRouter' }
+  { id: 'claude', nameKey: 'welcome.page.providers.claude' },
+  { id: 'openai', nameKey: 'welcome.page.providers.openai' },
+  { id: 'deepseek', nameKey: 'welcome.page.providers.deepseek' },
+  { id: 'gemini', nameKey: 'welcome.page.providers.gemini' },
+  { id: 'ollama', nameKey: 'welcome.page.providers.ollama' },
+  { id: 'openrouter', nameKey: 'welcome.page.providers.openrouter' }
 ]
 
-const onAddProvider = () => {
+type SettingsRouteName = 'settings-provider' | 'settings-acp'
+
+const navigateToSettings = (windowId: number, routeName: SettingsRouteName) => {
+  windowPresenter.sendToWindow(windowId, SETTINGS_EVENTS.NAVIGATE, {
+    routeName
+  })
+}
+
+const openSettings = async (routeName: SettingsRouteName) => {
   const windowId = window.api.getWindowId()
   if (windowId != null) {
-    void windowPresenter.openOrFocusSettingsWindow()
+    await windowPresenter.createSettingsWindow()
+    const settingsWindowId = windowPresenter.getSettingsWindowId()
+    if (settingsWindowId != null) {
+      navigateToSettings(settingsWindowId, routeName)
+      window.setTimeout(() => {
+        if (windowPresenter.getSettingsWindowId() === settingsWindowId) {
+          navigateToSettings(settingsWindowId, routeName)
+        }
+      }, 250)
+    }
   }
 }
+
+const onAddProvider = async () => {
+  await openSettings('settings-provider')
+}
+
+const onSetupAcp = async () => {
+  await openSettings('settings-acp')
+}
 </script>
 
 <style scoped>
diff --git a/src/renderer/src/i18n/da-DK/welcome.json b/src/renderer/src/i18n/da-DK/welcome.json
index 557f951c4..5c3c3c9cf 100644
--- a/src/renderer/src/i18n/da-DK/welcome.json
+++ b/src/renderer/src/i18n/da-DK/welcome.json
@@ -33,5 +33,21 @@
     "getStarted": "Kom i gang",
     "next": "Næste",
     "back": "Tilbage"
+  },
+  "page": {
+    "title": "Velkommen til DeepChat Agent",
+    "description": "Tilslut en modeludbyder for at komme i gang",
+    "browseProviders": "Gennemse alle udbydere...",
+    "connectAgent": "eller tilslut en agent",
+    "acpTitle": "Sæt en ACP-agent op",
+    "acpDescription": "Claude Code, Codex, Kimi eller din egen",
+    "providers": {
+      "claude": "Claude",
+      "openai": "OpenAI",
+      "deepseek": "DeepSeek",
+      "gemini": "Gemini",
+      "ollama": "Ollama",
+      "openrouter": "OpenRouter"
+    }
   }
 }
diff --git a/src/renderer/src/i18n/en-US/welcome.json b/src/renderer/src/i18n/en-US/welcome.json
index 20da27958..8a58fe1f0 100644
--- a/src/renderer/src/i18n/en-US/welcome.json
+++ b/src/renderer/src/i18n/en-US/welcome.json
@@ -33,5 +33,21 @@
     "getStarted": "Get Started",
     "next": "Next",
     "back": "Back"
+  },
+  "page": {
+    "title": "Welcome to DeepChat Agent",
+    "description": "Connect a model provider to get started",
+    "browseProviders": "Browse all providers...",
+    "connectAgent": "or connect an agent",
+    "acpTitle": "Set up an ACP agent",
+    "acpDescription": "Claude Code, Codex, Kimi, or your own",
+    "providers": {
+      "claude": "Claude",
+      "openai": "OpenAI",
+      "deepseek": "DeepSeek",
+      "gemini": "Gemini",
+      "ollama": "Ollama",
+      "openrouter": "OpenRouter"
+    }
   }
 }
diff --git a/src/renderer/src/i18n/fa-IR/welcome.json b/src/renderer/src/i18n/fa-IR/welcome.json
index d5913e0e2..67a85e590 100644
--- a/src/renderer/src/i18n/fa-IR/welcome.json
+++ b/src/renderer/src/i18n/fa-IR/welcome.json
@@ -33,5 +33,21 @@
     "getStarted": "آغاز کنید",
     "next": "بعدی",
     "back": "بازگشت"
+  },
+  "page": {
+    "title": "به DeepChat Agent خوش آمدید",
+    "description": "برای شروع، یک ارائه‌دهنده مدل متصل کنید",
+    "browseProviders": "مرور همه ارائه‌دهنده‌ها...",
+    "connectAgent": "یا یک ایجنت متصل کنید",
+    "acpTitle": "یک ایجنت ACP راه‌اندازی کنید",
+    "acpDescription": "Claude Code، Codex، Kimi یا ایجنت خودتان",
+    "providers": {
+      "claude": "Claude",
+      "openai": "OpenAI",
+      "deepseek": "DeepSeek",
+      "gemini": "Gemini",
+      "ollama": "Ollama",
+      "openrouter": "OpenRouter"
+    }
   }
 }
diff --git a/src/renderer/src/i18n/fr-FR/welcome.json b/src/renderer/src/i18n/fr-FR/welcome.json
index 918e4e39e..9a7cc2caa 100644
--- a/src/renderer/src/i18n/fr-FR/welcome.json
+++ b/src/renderer/src/i18n/fr-FR/welcome.json
@@ -33,5 +33,21 @@
     "getStarted": "Commencer",
     "next": "Suivant",
     "back": "Retour"
+  },
+  "page": {
+    "title": "Bienvenue dans DeepChat Agent",
+    "description": "Connectez un fournisseur de modèles pour commencer",
+    "browseProviders": "Parcourir tous les fournisseurs...",
+    "connectAgent": "ou connecter un agent",
+    "acpTitle": "Configurer un agent ACP",
+    "acpDescription": "Claude Code, Codex, Kimi ou le vôtre",
+    "providers": {
+      "claude": "Claude",
+      "openai": "OpenAI",
+      "deepseek": "DeepSeek",
+      "gemini": "Gemini",
+      "ollama": "Ollama",
+      "openrouter": "OpenRouter"
+    }
   }
 }
diff --git a/src/renderer/src/i18n/he-IL/welcome.json b/src/renderer/src/i18n/he-IL/welcome.json
index 5d742a512..cbf82dc22 100644
--- a/src/renderer/src/i18n/he-IL/welcome.json
+++ b/src/renderer/src/i18n/he-IL/welcome.json
@@ -33,5 +33,21 @@
     "getStarted": "התחל",
     "next": "הבא",
     "back": "חזור"
+  },
+  "page": {
+    "title": "ברוכים הבאים ל-DeepChat Agent",
+    "description": "חברו ספק מודלים כדי להתחיל",
+    "browseProviders": "עיינו בכל הספקים...",
+    "connectAgent": "או חברו סוכן",
+    "acpTitle": "הגדירו סוכן ACP",
+    "acpDescription": "Claude Code, Codex, Kimi או סוכן משלכם",
+    "providers": {
+      "claude": "Claude",
+      "openai": "OpenAI",
+      "deepseek": "DeepSeek",
+      "gemini": "Gemini",
+      "ollama": "Ollama",
+      "openrouter": "OpenRouter"
+    }
   }
 }
diff --git a/src/renderer/src/i18n/ja-JP/welcome.json b/src/renderer/src/i18n/ja-JP/welcome.json
index e4ddd6265..1d097a119 100644
--- a/src/renderer/src/i18n/ja-JP/welcome.json
+++ b/src/renderer/src/i18n/ja-JP/welcome.json
@@ -33,5 +33,21 @@
     "getStarted": "始める",
     "next": "次へ",
     "back": "戻る"
+  },
+  "page": {
+    "title": "DeepChat Agentへようこそ",
+    "description": "始めるにはモデルプロバイダーを接続してください",
+    "browseProviders": "すべてのプロバイダーを見る...",
+    "connectAgent": "またはエージェントを接続",
+    "acpTitle": "ACP エージェントを設定",
+    "acpDescription": "Claude Code、Codex、Kimi、または独自のエージェント",
+    "providers": {
+      "claude": "Claude",
+      "openai": "OpenAI",
+      "deepseek": "DeepSeek",
+      "gemini": "Gemini",
+      "ollama": "Ollama",
+      "openrouter": "OpenRouter"
+    }
   }
 }
diff --git a/src/renderer/src/i18n/ko-KR/welcome.json b/src/renderer/src/i18n/ko-KR/welcome.json
index 9038ac081..eed762ed3 100644
--- a/src/renderer/src/i18n/ko-KR/welcome.json
+++ b/src/renderer/src/i18n/ko-KR/welcome.json
@@ -33,5 +33,21 @@
     "getStarted": "시작하기",
     "next": "다음",
     "back": "뒤로"
+  },
+  "page": {
+    "title": "DeepChat Agent에 오신 것을 환영합니다",
+    "description": "시작하려면 모델 제공자를 연결하세요",
+    "browseProviders": "모든 제공자 보기...",
+    "connectAgent": "또는 에이전트 연결",
+    "acpTitle": "ACP 에이전트 설정",
+    "acpDescription": "Claude Code, Codex, Kimi 또는 직접 만든 에이전트",
+    "providers": {
+      "claude": "Claude",
+      "openai": "OpenAI",
+      "deepseek": "DeepSeek",
+      "gemini": "Gemini",
+      "ollama": "Ollama",
+      "openrouter": "OpenRouter"
+    }
   }
 }
diff --git a/src/renderer/src/i18n/pt-BR/welcome.json b/src/renderer/src/i18n/pt-BR/welcome.json
index 25b171559..4b5b93e8c 100644
--- a/src/renderer/src/i18n/pt-BR/welcome.json
+++ b/src/renderer/src/i18n/pt-BR/welcome.json
@@ -33,5 +33,21 @@
     "getStarted": "Começar",
     "next": "Próximo",
     "back": "Voltar"
+  },
+  "page": {
+    "title": "Boas-vindas ao DeepChat Agent",
+    "description": "Conecte um provedor de modelo para começar",
+    "browseProviders": "Ver todos os provedores...",
+    "connectAgent": "ou conectar um agente",
+    "acpTitle": "Configurar um agente ACP",
+    "acpDescription": "Claude Code, Codex, Kimi ou o seu próprio",
+    "providers": {
+      "claude": "Claude",
+      "openai": "OpenAI",
+      "deepseek": "DeepSeek",
+      "gemini": "Gemini",
+      "ollama": "Ollama",
+      "openrouter": "OpenRouter"
+    }
   }
 }
diff --git a/src/renderer/src/i18n/ru-RU/welcome.json b/src/renderer/src/i18n/ru-RU/welcome.json
index 2abc7242c..afd111150 100644
--- a/src/renderer/src/i18n/ru-RU/welcome.json
+++ b/src/renderer/src/i18n/ru-RU/welcome.json
@@ -33,5 +33,21 @@
     "getStarted": "Начать",
     "next": "Далее",
     "back": "Назад"
+  },
+  "page": {
+    "title": "Добро пожаловать в DeepChat Agent",
+    "description": "Подключите провайдера моделей, чтобы начать",
+    "browseProviders": "Посмотреть всех провайдеров...",
+    "connectAgent": "или подключить агента",
+    "acpTitle": "Настроить ACP-агента",
+    "acpDescription": "Claude Code, Codex, Kimi или вашего собственного",
+    "providers": {
+      "claude": "Claude",
+      "openai": "OpenAI",
+      "deepseek": "DeepSeek",
+      "gemini": "Gemini",
+      "ollama": "Ollama",
+      "openrouter": "OpenRouter"
+    }
   }
 }
diff --git a/src/renderer/src/i18n/zh-CN/welcome.json b/src/renderer/src/i18n/zh-CN/welcome.json
index ab83693a7..95f7f6acb 100644
--- a/src/renderer/src/i18n/zh-CN/welcome.json
+++ b/src/renderer/src/i18n/zh-CN/welcome.json
@@ -33,5 +33,21 @@
     "getStarted": "开始使用",
     "next": "下一步",
     "back": "返回"
+  },
+  "page": {
+    "title": "欢迎使用 DeepChat Agent",
+    "description": "连接一个模型服务商即可开始使用",
+    "browseProviders": "浏览所有服务商...",
+    "connectAgent": "或连接一个 Agent",
+    "acpTitle": "设置 ACP Agent",
+    "acpDescription": "Claude Code、Codex、Kimi，或你自己的 Agent",
+    "providers": {
+      "claude": "Claude",
+      "openai": "OpenAI",
+      "deepseek": "DeepSeek",
+      "gemini": "Gemini",
+      "ollama": "Ollama",
+      "openrouter": "OpenRouter"
+    }
   }
 }
diff --git a/src/renderer/src/i18n/zh-HK/welcome.json b/src/renderer/src/i18n/zh-HK/welcome.json
index 62fc3c2ec..d599e8fa3 100644
--- a/src/renderer/src/i18n/zh-HK/welcome.json
+++ b/src/renderer/src/i18n/zh-HK/welcome.json
@@ -33,5 +33,21 @@
     "getStarted": "開始使用",
     "next": "下一步",
     "back": "返回"
+  },
+  "page": {
+    "title": "歡迎使用 DeepChat Agent",
+    "description": "連接一個模型服務提供者即可開始使用",
+    "browseProviders": "瀏覽所有服務提供者...",
+    "connectAgent": "或連接一個 Agent",
+    "acpTitle": "設定 ACP Agent",
+    "acpDescription": "Claude Code、Codex、Kimi，或你自己的 Agent",
+    "providers": {
+      "claude": "Claude",
+      "openai": "OpenAI",
+      "deepseek": "DeepSeek",
+      "gemini": "Gemini",
+      "ollama": "Ollama",
+      "openrouter": "OpenRouter"
+    }
   }
 }
diff --git a/src/renderer/src/i18n/zh-TW/welcome.json b/src/renderer/src/i18n/zh-TW/welcome.json
index 474810179..209b9967f 100644
--- a/src/renderer/src/i18n/zh-TW/welcome.json
+++ b/src/renderer/src/i18n/zh-TW/welcome.json
@@ -33,5 +33,21 @@
     "getStarted": "開始使用",
     "next": "下一步",
     "back": "返回"
+  },
+  "page": {
+    "title": "歡迎使用 DeepChat Agent",
+    "description": "連接一個模型服務提供者即可開始使用",
+    "browseProviders": "瀏覽所有服務提供者...",
+    "connectAgent": "或連接一個 Agent",
+    "acpTitle": "設定 ACP Agent",
+    "acpDescription": "Claude Code、Codex、Kimi，或你自己的 Agent",
+    "providers": {
+      "claude": "Claude",
+      "openai": "OpenAI",
+      "deepseek": "DeepSeek",
+      "gemini": "Gemini",
+      "ollama": "Ollama",
+      "openrouter": "OpenRouter"
+    }
   }
 }
diff --git a/src/renderer/src/pages/WelcomePage.vue b/src/renderer/src/pages/WelcomePage.vue
index c8cefa02a..5c309cb6d 100644
--- a/src/renderer/src/pages/WelcomePage.vue
+++ b/src/renderer/src/pages/WelcomePage.vue
@@ -7,9 +7,11 @@
       </div>
 
       <!-- Heading -->
-      <h1 class="text-3xl font-semibold text-foreground mb-2">Welcome to DeepChat Agent</h1>
+      <h1 class="text-3xl font-semibold text-foreground mb-2">
+        {{ t('welcome.page.title') }}
+      </h1>
       <p class="text-sm text-muted-foreground text-center max-w-md mb-10">
-        Connect a model provider to start build
+        {{ t('welcome.page.description') }}
       </p>
 
       <!-- Provider grid -->
@@ -21,7 +23,7 @@
           @click="onAddProvider"
         >
           <ModelIcon :model-id="provider.id" custom-class="w-6 h-6" :is-dark="themeStore.isDark" />
-          <span class="text-xs text-foreground/80">{{ provider.name }}</span>
+          <span class="text-xs text-foreground/80">{{ t(provider.nameKey) }}</span>
         </button>
       </div>
 
@@ -29,27 +31,27 @@
         class="text-xs text-muted-foreground hover:text-foreground transition-colors mb-12"
         @click="onAddProvider"
       >
-        Browse all providers...
+        {{ t('welcome.page.browseProviders') }}
       </button>
 
       <!-- ACP agent section (optional) -->
       <div class="flex flex-col items-center gap-3 w-full max-w-sm">
         <div class="flex items-center gap-3 w-full">
           <div class="flex-1 h-px bg-border"></div>
-          <span class="text-xs text-muted-foreground/60">or connect an agent</span>
+          <span class="text-xs text-muted-foreground/60">{{ t('welcome.page.connectAgent') }}</span>
           <div class="flex-1 h-px bg-border"></div>
         </div>
 
         <button
           class="flex items-center gap-3 w-full rounded-xl border border-dashed border-border/60 px-4 py-3 hover:bg-accent/30 hover:border-border transition-all duration-150"
-          @click="onAddProvider"
+          @click="onSetupAcp"
         >
           <div class="flex items-center justify-center w-8 h-8 rounded-lg bg-muted/60 shrink-0">
             <Icon icon="lucide:terminal" class="w-4 h-4 text-muted-foreground" />
           </div>
           <div class="text-left">
-            <p class="text-sm text-foreground/80">Set up an ACP agent</p>
-            <p class="text-xs text-muted-foreground/60">Claude Code, Codex, Kimi, or your own</p>
+            <p class="text-sm text-foreground/80">{{ t('welcome.page.acpTitle') }}</p>
+            <p class="text-xs text-muted-foreground/60">{{ t('welcome.page.acpDescription') }}</p>
           </div>
           <Icon icon="lucide:chevron-right" class="w-4 h-4 text-muted-foreground/40 ml-auto" />
         </button>
@@ -60,27 +62,70 @@
 
 <script setup lang="ts">
 import { Icon } from '@iconify/vue'
+import { useI18n } from 'vue-i18n'
+import { useRoute, useRouter } from 'vue-router'
 import { usePresenter } from '@/composables/usePresenter'
 import { useThemeStore } from '@/stores/theme'
+import { usePageRouterStore } from '@/stores/ui/pageRouter'
+import { SETTINGS_EVENTS } from '@/events'
 import ModelIcon from '@/components/icons/ModelIcon.vue'
 
+const route = useRoute()
+const router = useRouter()
+const { t } = useI18n()
+const configPresenter = usePresenter('configPresenter')
 const windowPresenter = usePresenter('windowPresenter')
 const themeStore = useThemeStore()
+const pageRouter = usePageRouterStore()
 
 const providers = [
-  { id: 'claude', name: 'Claude' },
-  { id: 'openai', name: 'OpenAI' },
-  { id: 'deepseek', name: 'DeepSeek' },
-  { id: 'gemini', name: 'Gemini' },
-  { id: 'ollama', name: 'Ollama' },
-  { id: 'openrouter', name: 'OpenRouter' }
+  { id: 'claude', nameKey: 'welcome.page.providers.claude' },
+  { id: 'openai', nameKey: 'welcome.page.providers.openai' },
+  { id: 'deepseek', nameKey: 'welcome.page.providers.deepseek' },
+  { id: 'gemini', nameKey: 'welcome.page.providers.gemini' },
+  { id: 'ollama', nameKey: 'welcome.page.providers.ollama' },
+  { id: 'openrouter', nameKey: 'welcome.page.providers.openrouter' }
 ]
 
-const onAddProvider = () => {
+type SettingsRouteName = 'settings-provider' | 'settings-acp'
+
+const navigateToSettings = (windowId: number, routeName: SettingsRouteName) => {
+  windowPresenter.sendToWindow(windowId, SETTINGS_EVENTS.NAVIGATE, {
+    routeName
+  })
+}
+
+const openSettings = async (routeName: SettingsRouteName) => {
   const windowId = window.api.getWindowId()
-  if (windowId != null) {
-    void windowPresenter.openOrFocusSettingsWindow()
+  if (windowId == null) {
+    return
+  }
+
+  await configPresenter.setSetting('init_complete', true)
+  pageRouter.goToNewThread()
+
+  if (route.name === 'welcome') {
+    await router.replace({ name: 'chat' })
   }
+
+  await windowPresenter.createSettingsWindow()
+  const settingsWindowId = windowPresenter.getSettingsWindowId()
+  if (settingsWindowId != null) {
+    navigateToSettings(settingsWindowId, routeName)
+    window.setTimeout(() => {
+      if (windowPresenter.getSettingsWindowId() === settingsWindowId) {
+        navigateToSettings(settingsWindowId, routeName)
+      }
+    }, 250)
+  }
+}
+
+const onAddProvider = async () => {
+  await openSettings('settings-provider')
+}
+
+const onSetupAcp = async () => {
+  await openSettings('settings-acp')
 }
 </script>
 
diff --git a/src/renderer/src/router/index.ts b/src/renderer/src/router/index.ts
index 584fcd814..c0ba8b401 100644
--- a/src/renderer/src/router/index.ts
+++ b/src/renderer/src/router/index.ts
@@ -19,7 +19,7 @@ const router = createRouter({
     {
       path: '/welcome',
       name: 'welcome',
-      component: () => import('@/views/WelcomeView.vue'),
+      component: () => import('@/pages/WelcomePage.vue'),
       meta: {
         titleKey: 'routes.welcome',
         icon: 'lucide:message-square'
diff --git a/src/renderer/src/stores/ui/pageRouter.ts b/src/renderer/src/stores/ui/pageRouter.ts
index 547f741f2..1959c23de 100644
--- a/src/renderer/src/stores/ui/pageRouter.ts
+++ b/src/renderer/src/stores/ui/pageRouter.ts
@@ -1,15 +1,10 @@
 import { defineStore } from 'pinia'
 import { ref, computed } from 'vue'
 import { usePresenter } from '@/composables/usePresenter'
-import { CONFIG_EVENTS } from '@/events'
 
-export type PageRoute =
-  | { name: 'welcome' }
-  | { name: 'newThread' }
-  | { name: 'chat'; sessionId: string }
+export type PageRoute = { name: 'newThread' } | { name: 'chat'; sessionId: string }
 
 export const usePageRouterStore = defineStore('pageRouter', () => {
-  const configPresenter = usePresenter('configPresenter')
   const newAgentPresenter = usePresenter('newAgentPresenter')
 
   // --- State ---
@@ -20,14 +15,7 @@ export const usePageRouterStore = defineStore('pageRouter', () => {
 
   async function initialize(): Promise<void> {
     try {
-      // 1. Check if any provider is enabled
-      const enabledProviders = configPresenter.getEnabledProviders()
-      if (!enabledProviders || enabledProviders.length === 0) {
-        route.value = { name: 'welcome' }
-        return
-      }
-
-      // 2. Check for active new-agent session on this window content first
+      // 1. Check for active new-agent session on this window content first
       const webContentsId = window.api.getWebContentsId()
       const activeNewSession = await newAgentPresenter.getActiveSession(webContentsId)
       if (activeNewSession) {
@@ -35,7 +23,7 @@ export const usePageRouterStore = defineStore('pageRouter', () => {
         return
       }
 
-      // 3. Default to new thread
+      // 2. Default to new thread
       route.value = { name: 'newThread' }
     } catch (e) {
       error.value = String(e)
@@ -43,10 +31,6 @@ export const usePageRouterStore = defineStore('pageRouter', () => {
     }
   }
 
-  function goToWelcome(): void {
-    route.value = { name: 'welcome' }
-  }
-
   function goToNewThread(): void {
     route.value = { name: 'newThread' }
   }
@@ -60,27 +44,10 @@ export const usePageRouterStore = defineStore('pageRouter', () => {
   const currentRoute = computed(() => route.value.name)
   const chatSessionId = computed(() => (route.value.name === 'chat' ? route.value.sessionId : null))
 
-  // --- Event Listeners ---
-
-  window.electron.ipcRenderer.on(CONFIG_EVENTS.PROVIDER_CHANGED, async () => {
-    try {
-      const enabledProviders = configPresenter.getEnabledProviders()
-      if (!enabledProviders || enabledProviders.length === 0) {
-        goToWelcome()
-      } else if (route.value.name === 'welcome') {
-        // Providers became available, go to new thread
-        goToNewThread()
-      }
-    } catch (e) {
-      error.value = String(e)
-    }
-  })
-
   return {
     route,
     error,
     initialize,
-    goToWelcome,
     goToNewThread,
     goToChat,
     currentRoute,
diff --git a/src/renderer/src/stores/ui/session.ts b/src/renderer/src/stores/ui/session.ts
index 2049bb237..fbbd62b1a 100644
--- a/src/renderer/src/stores/ui/session.ts
+++ b/src/renderer/src/stores/ui/session.ts
@@ -171,6 +171,7 @@ export const useSessionStore = defineStore('session', () => {
     error.value = null
     try {
       const webContentsId = window.api.getWebContentsId()
+      const previousActiveSessionId = activeSessionId.value
       const [result, activeSession] = await Promise.all([
         newAgentPresenter.getSessionList(),
         newAgentPresenter.getActiveSession(webContentsId)
@@ -178,12 +179,15 @@ export const useSessionStore = defineStore('session', () => {
       sessions.value = result.map(mapToUISession)
 
       const nextActiveSessionId = activeSession?.id ?? null
-      if (activeSessionId.value !== nextActiveSessionId) {
-        if (activeSessionId.value && activeSessionId.value !== nextActiveSessionId) {
+      if (previousActiveSessionId !== nextActiveSessionId) {
+        if (previousActiveSessionId && previousActiveSessionId !== nextActiveSessionId) {
           messageStore.clearStreamingState()
         }
         activeSessionId.value = nextActiveSessionId
       }
+      if (previousActiveSessionId && !nextActiveSessionId && pageRouter.currentRoute === 'chat') {
+        pageRouter.goToNewThread()
+      }
     } catch (e) {
       error.value = `Failed to load sessions: ${e}`
     } finally {
diff --git a/src/renderer/src/views/ChatTabView.vue b/src/renderer/src/views/ChatTabView.vue
index b3e619726..790b7b3e6 100644
--- a/src/renderer/src/views/ChatTabView.vue
+++ b/src/renderer/src/views/ChatTabView.vue
@@ -1,12 +1,13 @@
 <template>
   <div class="flex h-full w-full flex-row overflow-hidden">
     <div class="flex h-full min-w-0 w-0 flex-1 transition-[width] duration-200 ease-out">
-      <WelcomePage v-if="pageRouter.currentRoute === 'welcome'" />
-      <NewThreadPage v-else-if="pageRouter.currentRoute === 'newThread'" />
-      <ChatPage
-        v-else-if="pageRouter.currentRoute === 'chat' && pageRouter.chatSessionId"
-        :session-id="pageRouter.chatSessionId"
-      />
+      <template v-if="isReady">
+        <NewThreadPage v-if="pageRouter.currentRoute === 'newThread'" />
+        <ChatPage
+          v-else-if="pageRouter.currentRoute === 'chat' && pageRouter.chatSessionId"
+          :session-id="pageRouter.chatSessionId"
+        />
+      </template>
     </div>
 
     <ChatSidePanel
@@ -17,9 +18,8 @@
 </template>
 
 <script setup lang="ts">
-import { onMounted } from 'vue'
+import { onMounted, ref } from 'vue'
 import ChatSidePanel from '@/components/sidepanel/ChatSidePanel.vue'
-import WelcomePage from '@/pages/WelcomePage.vue'
 import NewThreadPage from '@/pages/NewThreadPage.vue'
 import ChatPage from '@/pages/ChatPage.vue'
 import { usePageRouterStore } from '@/stores/ui/pageRouter'
@@ -33,15 +33,20 @@ const sessionStore = useSessionStore()
 const agentStore = useAgentStore()
 const projectStore = useProjectStore()
 const modelStore = useModelStore()
+const isReady = ref(false)
 
 onMounted(async () => {
-  await Promise.all([
-    pageRouter.initialize(),
-    sessionStore.fetchSessions(),
-    agentStore.fetchAgents(),
-    modelStore.initialize()
-  ])
-  projectStore.fetchProjects()
+  try {
+    await Promise.all([
+      pageRouter.initialize(),
+      sessionStore.fetchSessions(),
+      agentStore.fetchAgents(),
+      modelStore.initialize()
+    ])
+    projectStore.fetchProjects()
+  } finally {
+    isReady.value = true
+  }
 })
 </script>
 
diff --git a/src/renderer/src/views/WelcomeView.vue b/src/renderer/src/views/WelcomeView.vue
deleted file mode 100644
index 851d6e701..000000000
--- a/src/renderer/src/views/WelcomeView.vue
+++ /dev/null
@@ -1,450 +0,0 @@
-<script setup lang="ts">
-import { ref, computed, watch, nextTick, onMounted, defineAsyncComponent } from 'vue'
-import { Icon } from '@iconify/vue'
-import logo from '@/assets/logo.png'
-import { useProviderStore } from '@/stores/providerStore'
-import { useModelStore } from '@/stores/modelStore'
-import { usePresenter } from '@/composables/usePresenter'
-import { useRouter } from 'vue-router'
-import { MODEL_META } from '@shared/presenter'
-import { ModelType } from '@shared/model'
-import { useI18n } from 'vue-i18n'
-import { useThemeStore } from '@/stores/theme'
-import { useLanguageStore } from '@/stores/language'
-import { initAppStores } from '@/lib/storeInitializer'
-
-const themeStore = useThemeStore()
-
-const Button = defineAsyncComponent(() =>
-  import('@shadcn/components/ui/button').then((mod) => mod.Button)
-)
-const Card = defineAsyncComponent(() =>
-  import('@shadcn/components/ui/card').then((mod) => mod.Card)
-)
-const CardHeader = defineAsyncComponent(() =>
-  import('@shadcn/components/ui/card').then((mod) => mod.CardHeader)
-)
-const CardContent = defineAsyncComponent(() =>
-  import('@shadcn/components/ui/card').then((mod) => mod.CardContent)
-)
-const CardFooter = defineAsyncComponent(() =>
-  import('@shadcn/components/ui/card').then((mod) => mod.CardFooter)
-)
-const Label = defineAsyncComponent(() =>
-  import('@shadcn/components/ui/label').then((mod) => mod.Label)
-)
-const ModelIcon = defineAsyncComponent(() => import('@/components/icons/ModelIcon.vue'))
-const Input = defineAsyncComponent(() =>
-  import('@shadcn/components/ui/input').then((mod) => mod.Input)
-)
-const Select = defineAsyncComponent(() =>
-  import('@shadcn/components/ui/select').then((mod) => mod.Select)
-)
-const SelectContent = defineAsyncComponent(() =>
-  import('@shadcn/components/ui/select').then((mod) => mod.SelectContent)
-)
-const SelectItem = defineAsyncComponent(() =>
-  import('@shadcn/components/ui/select').then((mod) => mod.SelectItem)
-)
-const SelectTrigger = defineAsyncComponent(() =>
-  import('@shadcn/components/ui/select').then((mod) => mod.SelectTrigger)
-)
-const SelectValue = defineAsyncComponent(() =>
-  import('@shadcn/components/ui/select').then((mod) => mod.SelectValue)
-)
-const ModelConfigItem = defineAsyncComponent(
-  () => import('@/components/settings/ModelConfigItem.vue')
-)
-const Dialog = defineAsyncComponent(() =>
-  import('@shadcn/components/ui/dialog').then((mod) => mod.Dialog)
-)
-const DialogContent = defineAsyncComponent(() =>
-  import('@shadcn/components/ui/dialog').then((mod) => mod.DialogContent)
-)
-const DialogHeader = defineAsyncComponent(() =>
-  import('@shadcn/components/ui/dialog').then((mod) => mod.DialogHeader)
-)
-const DialogTitle = defineAsyncComponent(() =>
-  import('@shadcn/components/ui/dialog').then((mod) => mod.DialogTitle)
-)
-const DialogDescription = defineAsyncComponent(() =>
-  import('@shadcn/components/ui/dialog').then((mod) => mod.DialogDescription)
-)
-const DialogFooter = defineAsyncComponent(() =>
-  import('@shadcn/components/ui/dialog').then((mod) => mod.DialogFooter)
-)
-const ModelCheckDialog = defineAsyncComponent(
-  () => import('@/components/settings/ModelCheckDialog.vue')
-)
-
-const providerStore = useProviderStore()
-const modelStore = useModelStore()
-const languageStore = useLanguageStore()
-const configPresenter = usePresenter('configPresenter')
-const router = useRouter()
-
-const { t } = useI18n()
-
-type Step = {
-  title: string
-  description: string
-  icon: string
-  image?: string
-}
-
-const steps: Step[] = [
-  {
-    title: 'welcome.steps.welcome.title',
-    description: 'welcome.steps.welcome.description',
-    icon: 'lucide:sparkles',
-    image: logo
-  },
-  {
-    title: 'welcome.steps.provider.title',
-    description: 'welcome.steps.provider.description',
-    icon: 'lucide:user'
-  },
-  {
-    title: 'welcome.steps.configuration.title',
-    description: 'welcome.steps.configuration.description',
-    icon: 'lucide:settings'
-  },
-  {
-    title: 'welcome.steps.complete.title',
-    description: 'welcome.steps.complete.description',
-    icon: 'lucide:check-circle'
-  }
-]
-
-const currentStep = ref(0)
-
-const selectedProvider = ref<string>('openai')
-const apiKey = ref('')
-const baseUrl = ref('')
-const showApiKey = ref(false)
-
-const providerModels = computed(() => {
-  return (
-    modelStore.allProviderModels.find((p) => p.providerId === selectedProvider.value)?.models ?? []
-  )
-})
-
-const providerModelLoading = ref(false)
-
-const showErrorDialog = ref(false)
-const showSuccessDialog = ref(false)
-const dialogMessage = ref('')
-
-// 模型检查弹窗状态
-const showModelCheckDialog = ref(false)
-
-const nextStep = async () => {
-  if (currentStep.value < steps.length - 1) {
-    if (currentStep.value === 1) {
-      const provider = providerStore.providers.find((p) => p.id === selectedProvider.value)
-      const isOllamaApi = provider?.apiType === 'ollama'
-      if ((!apiKey.value || !baseUrl.value) && !isOllamaApi) {
-        showErrorDialog.value = true
-        dialogMessage.value = t('settings.provider.dialog.verify.missingFields')
-        return
-      }
-      providerModelLoading.value = true
-      await providerStore.updateProviderConfig(selectedProvider.value, {
-        apiKey: apiKey.value,
-        baseUrl: baseUrl.value,
-        enable: true
-      })
-      await modelStore.refreshProviderModels(selectedProvider.value)
-
-      currentStep.value++
-      setTimeout(() => {
-        providerModelLoading.value = false
-      }, 2000)
-    } else {
-      currentStep.value++
-    }
-  } else {
-    configPresenter.setSetting('init_complete', true)
-    router.push({
-      name: 'chat',
-      query: {
-        modelId: providerModels.value[0].id,
-        providerId: selectedProvider.value
-      }
-    })
-  }
-}
-
-const previousStep = () => {
-  if (currentStep.value > 0) {
-    currentStep.value--
-  }
-}
-watch(
-  () => selectedProvider.value,
-  (newVal) => {
-    // console.log('selectedProvider', newVal)
-    const provider = providerStore.providers.find((p) => p.id === newVal)
-    if (provider) {
-      baseUrl.value = provider.baseUrl
-      apiKey.value = provider.apiKey
-    }
-  }
-)
-
-const cancelWatch = watch(
-  () => providerStore.providers,
-  (newVal) => {
-    if (newVal.length > 0) {
-      console.log('newVal', newVal)
-      selectedProvider.value = newVal[0].id
-      baseUrl.value = newVal[0].baseUrl
-      apiKey.value = newVal[0].apiKey
-      nextTick(() => {
-        cancelWatch()
-      })
-    }
-  },
-  { immediate: true }
-)
-
-onMounted(async () => {
-  await initAppStores()
-  languageStore.initLanguage()
-})
-
-const handleModelEnabledChange = async (model: MODEL_META, enabled: boolean) => {
-  try {
-    await modelStore.updateModelStatus(selectedProvider.value, model.id, enabled)
-  } catch (error) {
-    console.error('Failed to update model status:', error)
-  }
-  console.log('handleModelEnabledChange', model, enabled)
-}
-
-const openModelCheckDialog = () => {
-  showModelCheckDialog.value = true
-}
-
-const isLastStep = computed(() => currentStep.value === steps.length - 1)
-const isFirstStep = computed(() => currentStep.value === 0)
-</script>
-
-<template>
-  <div class="h-full flex items-center justify-center bg-background p-4 w-full">
-    <Card class="w-full max-w-2xl">
-      <CardHeader>
-        <div class="flex items-center space-x-4">
-          <Icon :icon="steps[currentStep].icon" class="w-8 h-8 text-primary" />
-          <div>
-            <h2 class="text-2xl font-bold">{{ t(steps[currentStep].title) }}</h2>
-            <p class="text-muted-foreground">
-              {{ t(steps[currentStep].description) }}
-            </p>
-          </div>
-        </div>
-      </CardHeader>
-
-      <CardContent>
-        <!-- Step Content -->
-        <div class="min-h-[300px]">
-          <template v-if="currentStep === 0">
-            <div class="text-center space-y-4 pt-12">
-              <img :src="steps[currentStep].image" class="w-16 h-16 mx-auto" />
-              <h3 class="text-xl font-semibold">{{ t('welcome.title') }}</h3>
-              <p class="text-muted-foreground">
-                {{ t('welcome.description') }}
-              </p>
-            </div>
-          </template>
-
-          <template v-else-if="currentStep === 1">
-            <div class="space-y-6 max-w-xs mx-auto">
-              <div class="flex flex-col gap-2">
-                <Label for="provider-select">{{ t('welcome.provider.select') }}</Label>
-                <Select v-model="selectedProvider">
-                  <SelectTrigger class="w-full">
-                    <SelectValue placeholder="Select a provider" />
-                  </SelectTrigger>
-                  <SelectContent>
-                    <SelectItem
-                      v-for="provider in providerStore.providers"
-                      :key="provider.id"
-                      :value="provider.id"
-                    >
-                      <div class="flex items-center space-x-2">
-                        <ModelIcon
-                          :model-id="provider.id"
-                          :custom-class="'w-4 h-4 text-muted-foreground'"
-                          :is-dark="themeStore.isDark"
-                        />
-                        <span>{{ provider.name }}</span>
-                      </div>
-                    </SelectItem>
-                  </SelectContent>
-                </Select>
-              </div>
-
-              <!-- Add API Configuration Section -->
-              <div class="mt-6 space-y-4">
-                <div class="flex flex-col gap-2">
-                  <Label for="api-url">{{ t('welcome.provider.apiUrl') }}</Label>
-                  <Input id="api-url" v-model="baseUrl" placeholder="Enter API URL" />
-                  <div v-if="selectedProvider !== 'gemini'" class="text-xs text-muted-foreground">
-                    {{ `${baseUrl ?? ''}/chat/completions` }}
-                  </div>
-                </div>
-
-                <div v-show="selectedProvider !== 'ollama'" class="flex flex-col gap-2">
-                  <Label for="api-key">{{ t('welcome.provider.apiKey') }}</Label>
-                  <div class="relative w-full">
-                    <Input
-                      id="api-key"
-                      v-model="apiKey"
-                      :type="showApiKey ? 'text' : 'password'"
-                      placeholder="Enter API Key"
-                      style="padding-right: 2.5rem !important"
-                    />
-                    <Button
-                      variant="ghost"
-                      size="sm"
-                      class="absolute right-2 top-1/2 transform -translate-y-1/2 h-7 w-7 p-0 hover:bg-transparent"
-                      @click="showApiKey = !showApiKey"
-                    >
-                      <Icon
-                        :icon="showApiKey ? 'lucide:eye-off' : 'lucide:eye'"
-                        class="w-4 h-4 text-muted-foreground hover:text-foreground"
-                      />
-                    </Button>
-                  </div>
-                  <div class="text-xs text-muted-foreground">
-                    {{ t('settings.provider.getKeyTip') }}
-                    <a
-                      :href="
-                        providerStore.providers.find((p) => p.id === selectedProvider)?.websites
-                          ?.apiKey || '#'
-                      "
-                      target="_blank"
-                      class="text-primary"
-                    >
-                      {{ providerStore.providers.find((p) => p.id === selectedProvider)?.name }}
-                    </a>
-                    {{ t('settings.provider.getKeyTipEnd') }}
-                  </div>
-                </div>
-              </div>
-            </div>
-          </template>
-
-          <template v-else-if="currentStep === 2">
-            <!-- Add Preferences Setup -->
-            <div class="space-y-4">
-              <!-- 模型检查按钮 -->
-              <div
-                v-show="!providerModelLoading && providerModels.length > 0"
-                class="flex justify-center"
-              >
-                <Button
-                  variant="outline"
-                  size="sm"
-                  class="rounded-lg"
-                  @click="openModelCheckDialog"
-                >
-                  <Icon icon="lucide:check-check" class="w-4 h-4 mr-2 text-muted-foreground" />
-                  {{ t('settings.provider.verifyKey') }}
-                </Button>
-              </div>
-
-              <div
-                v-show="!providerModelLoading"
-                class="flex flex-col w-full border rounded-lg max-h-80 overflow-y-auto"
-              >
-                <ModelConfigItem
-                  v-for="model in modelStore.allProviderModels.find(
-                    (p) => p.providerId === selectedProvider
-                  )?.models"
-                  :key="model.id"
-                  :model-name="model.name"
-                  :model-id="model.id"
-                  :provider-id="selectedProvider"
-                  :group="model.group"
-                  :enabled="model.enabled ?? false"
-                  :type="model.type ?? ModelType.Chat"
-                  @enabled-change="handleModelEnabledChange(model, $event)"
-                />
-              </div>
-              <div v-if="providerModelLoading">
-                <div class="flex items-center justify-center">
-                  <Icon icon="lucide:loader" class="w-4 h-4 animate-spin" />
-                </div>
-              </div>
-              <div v-if="!providerModelLoading && providerModels.length <= 0">同步模型失败...</div>
-              <!-- Add preferences components here -->
-            </div>
-          </template>
-
-          <template v-else>
-            <div class="text-center space-y-4">
-              <Icon icon="lucide:party-popper" class="w-16 h-16 mx-auto text-primary" />
-              <h3 class="text-xl font-semibold">{{ t('welcome.complete.title') }}</h3>
-              <p class="text-muted-foreground">
-                {{ t('welcome.complete.description') }}
-              </p>
-            </div>
-          </template>
-        </div>
-      </CardContent>
-
-      <CardFooter class="flex justify-between">
-        <Button
-          variant="outline"
-          class="rounded-lg"
-          size="sm"
-          :class="{ 'opacity-0': isFirstStep }"
-          @click="previousStep"
-        >
-          <Icon icon="lucide:arrow-left" class="w-4 h-4 mr-2" />
-          {{ t('welcome.buttons.back') }}
-        </Button>
-
-        <Button class="rounded-lg" size="sm" @click="nextStep">
-          <span>{{
-            isLastStep ? t('welcome.buttons.getStarted') : t('welcome.buttons.next')
-          }}</span>
-          <Icon v-if="!isLastStep" icon="lucide:arrow-right" class="w-4 h-4 ml-2" />
-        </Button>
-      </CardFooter>
-    </Card>
-  </div>
-
-  <Dialog v-model:open="showErrorDialog">
-    <DialogContent>
-      <DialogHeader>
-        <DialogTitle>{{ t('dialog.error.title') }}</DialogTitle>
-        <DialogDescription>{{ dialogMessage }}</DialogDescription>
-      </DialogHeader>
-      <DialogFooter>
-        <Button @click="showErrorDialog = false">{{ t('dialog.close') }}</Button>
-      </DialogFooter>
-    </DialogContent>
-  </Dialog>
-
-  <Dialog v-model:open="showSuccessDialog">
-    <DialogContent>
-      <DialogHeader>
-        <DialogTitle>{{ t('settings.provider.dialog.verify.success') }}</DialogTitle>
-        <DialogDescription>{{ dialogMessage }}</DialogDescription>
-      </DialogHeader>
-      <DialogFooter>
-        <Button @click="showSuccessDialog = false">{{ t('dialog.close') }}</Button>
-      </DialogFooter>
-    </DialogContent>
-  </Dialog>
-
-  <!-- 模型检查弹窗 -->
-  <ModelCheckDialog
-    :open="showModelCheckDialog"
-    :provider-id="selectedProvider"
-    @update:open="showModelCheckDialog = $event"
-  />
-</template>
diff --git a/test/main/presenter/newAgentPresenter/newAgentPresenter.test.ts b/test/main/presenter/newAgentPresenter/newAgentPresenter.test.ts
index 089149d59..9c0e89b68 100644
--- a/test/main/presenter/newAgentPresenter/newAgentPresenter.test.ts
+++ b/test/main/presenter/newAgentPresenter/newAgentPresenter.test.ts
@@ -192,12 +192,16 @@ describe('NewAgentPresenter', () => {
       expect(result.title).toBe('Hello world')
       expect(result.projectDir).toBe('/tmp/proj')
       expect(result.status).toBe('idle')
-      expect(deepChatAgent.initSession).toHaveBeenCalledWith('mock-session-id', {
-        providerId: 'openai',
-        modelId: 'gpt-4',
-        projectDir: '/tmp/proj',
-        permissionMode: 'full_access'
-      })
+      expect(deepChatAgent.initSession).toHaveBeenCalledWith(
+        'mock-session-id',
+        expect.objectContaining({
+          agentId: 'deepchat',
+          providerId: 'openai',
+          modelId: 'gpt-4',
+          projectDir: '/tmp/proj',
+          permissionMode: 'full_access'
+        })
+      )
       await new Promise((r) => setTimeout(r, 0))
       expect(deepChatAgent.processMessage).toHaveBeenCalledWith(
         'mock-session-id',
@@ -224,12 +228,16 @@ describe('NewAgentPresenter', () => {
     it('calls agent.initSession and processMessage', async () => {
       await presenter.createSession({ agentId: 'deepchat', message: 'Hello' }, 1)
 
-      expect(deepChatAgent.initSession).toHaveBeenCalledWith('mock-session-id', {
-        providerId: 'openai',
-        modelId: 'gpt-4',
-        projectDir: null,
-        permissionMode: 'full_access'
-      })
+      expect(deepChatAgent.initSession).toHaveBeenCalledWith(
+        'mock-session-id',
+        expect.objectContaining({
+          agentId: 'deepchat',
+          providerId: 'openai',
+          modelId: 'gpt-4',
+          projectDir: null,
+          permissionMode: 'full_access'
+        })
+      )
       // processMessage is called non-blocking, so we give it a tick
       await new Promise((r) => setTimeout(r, 0))
       expect(deepChatAgent.processMessage).toHaveBeenCalledWith(
@@ -254,12 +262,16 @@ describe('NewAgentPresenter', () => {
     it('uses default provider/model from config when not specified', async () => {
       await presenter.createSession({ agentId: 'deepchat', message: 'Hi' }, 1)
 
-      expect(deepChatAgent.initSession).toHaveBeenCalledWith(expect.any(String), {
-        providerId: 'openai',
-        modelId: 'gpt-4',
-        projectDir: null,
-        permissionMode: 'full_access'
-      })
+      expect(deepChatAgent.initSession).toHaveBeenCalledWith(
+        expect.any(String),
+        expect.objectContaining({
+          agentId: 'deepchat',
+          providerId: 'openai',
+          modelId: 'gpt-4',
+          projectDir: null,
+          permissionMode: 'full_access'
+        })
+      )
     })
 
     it('uses input provider/model when specified', async () => {
@@ -268,12 +280,16 @@ describe('NewAgentPresenter', () => {
         1
       )
 
-      expect(deepChatAgent.initSession).toHaveBeenCalledWith(expect.any(String), {
-        providerId: 'anthropic',
-        modelId: 'claude-3',
-        projectDir: null,
-        permissionMode: 'full_access'
-      })
+      expect(deepChatAgent.initSession).toHaveBeenCalledWith(
+        expect.any(String),
+        expect.objectContaining({
+          agentId: 'deepchat',
+          providerId: 'anthropic',
+          modelId: 'claude-3',
+          projectDir: null,
+          permissionMode: 'full_access'
+        })
+      )
     })
 
     it('uses input permission mode when specified', async () => {
@@ -288,12 +304,16 @@ describe('NewAgentPresenter', () => {
         1
       )
 
-      expect(deepChatAgent.initSession).toHaveBeenCalledWith(expect.any(String), {
-        providerId: 'anthropic',
-        modelId: 'claude-3',
-        projectDir: null,
-        permissionMode: 'default'
-      })
+      expect(deepChatAgent.initSession).toHaveBeenCalledWith(
+        expect.any(String),
+        expect.objectContaining({
+          agentId: 'deepchat',
+          providerId: 'anthropic',
+          modelId: 'claude-3',
+          projectDir: null,
+          permissionMode: 'default'
+        })
+      )
     })
 
     it('passes generationSettings to agent.initSession', async () => {
@@ -312,19 +332,23 @@ describe('NewAgentPresenter', () => {
         1
       )
 
-      expect(deepChatAgent.initSession).toHaveBeenCalledWith(expect.any(String), {
-        providerId: 'openai',
-        modelId: 'gpt-4',
-        projectDir: null,
-        permissionMode: 'full_access',
-        generationSettings: {
-          systemPrompt: 'Custom prompt',
-          temperature: 1.1,
-          contextLength: 8192,
-          maxTokens: 2048,
-          reasoningEffort: 'low'
-        }
-      })
+      expect(deepChatAgent.initSession).toHaveBeenCalledWith(
+        expect.any(String),
+        expect.objectContaining({
+          agentId: 'deepchat',
+          providerId: 'openai',
+          modelId: 'gpt-4',
+          projectDir: null,
+          permissionMode: 'full_access',
+          generationSettings: {
+            systemPrompt: 'Custom prompt',
+            temperature: 1.1,
+            contextLength: 8192,
+            maxTokens: 2048,
+            reasoningEffort: 'low'
+          }
+        })
+      )
     })
 
     it('throws when no provider/model available', async () => {
@@ -524,12 +548,16 @@ describe('NewAgentPresenter', () => {
         projectDir: '/tmp/workspace'
       })
 
-      expect(deepChatAgent.initSession).toHaveBeenCalledWith('mock-session-id', {
-        providerId: 'acp',
-        modelId: 'acp-coder',
-        projectDir: '/tmp/workspace',
-        permissionMode: 'full_access'
-      })
+      expect(deepChatAgent.initSession).toHaveBeenCalledWith(
+        'mock-session-id',
+        expect.objectContaining({
+          agentId: 'acp-coder',
+          providerId: 'acp',
+          modelId: 'acp-coder',
+          projectDir: '/tmp/workspace',
+          permissionMode: 'full_access'
+        })
+      )
       expect(llmProviderPresenter.prepareAcpSession).toHaveBeenCalledWith(
         'mock-session-id',
         'acp-coder',
@@ -601,6 +629,85 @@ describe('NewAgentPresenter', () => {
       expect(sessions[0].providerId).toBe('openai')
       expect(sessions[0].modelId).toBe('gpt-4')
     })
+
+    it('skips sessions whose agent implementation cannot be resolved', async () => {
+      const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {})
+      sqlitePresenter.newSessionsTable.list.mockReturnValue([
+        {
+          id: 'missing-agent',
+          agent_id: 'disabled-agent',
+          title: 'Disabled',
+          project_dir: null,
+          is_pinned: 0,
+          created_at: 1000,
+          updated_at: 2000
+        },
+        {
+          id: 's1',
+          agent_id: 'deepchat',
+          title: 'Chat 1',
+          project_dir: null,
+          is_pinned: 0,
+          created_at: 1000,
+          updated_at: 2000
+        }
+      ])
+
+      const sessions = await presenter.getSessionList()
+
+      expect(sessions).toHaveLength(1)
+      expect(sessions[0].id).toBe('s1')
+      expect(warnSpy).toHaveBeenCalledWith(
+        '[NewAgentPresenter] Skipping unavailable session id=missing-agent agent=disabled-agent:',
+        expect.any(Error)
+      )
+      warnSpy.mockRestore()
+    })
+
+    it('skips sessions whose state loading fails', async () => {
+      const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {})
+      sqlitePresenter.newSessionsTable.list.mockReturnValue([
+        {
+          id: 'broken-state',
+          agent_id: 'deepchat',
+          title: 'Broken',
+          project_dir: null,
+          is_pinned: 0,
+          created_at: 1000,
+          updated_at: 2000
+        },
+        {
+          id: 'healthy-state',
+          agent_id: 'deepchat',
+          title: 'Healthy',
+          project_dir: null,
+          is_pinned: 0,
+          created_at: 1001,
+          updated_at: 2001
+        }
+      ])
+      deepChatAgent.getSessionState.mockImplementation(async (sessionId: string) => {
+        if (sessionId === 'broken-state') {
+          throw new Error('state failed')
+        }
+        return {
+          status: 'idle',
+          providerId: 'openai',
+          modelId: 'gpt-4',
+          permissionMode: 'full_access'
+        }
+      })
+
+      const sessions = await presenter.getSessionList()
+
+      expect(sessions).toHaveLength(1)
+      expect(sessions[0].id).toBe('healthy-state')
+      expect(warnSpy).toHaveBeenCalledWith(
+        '[NewAgentPresenter] Skipping unavailable session id=broken-state agent=deepchat:',
+        expect.any(Error)
+      )
+      warnSpy.mockRestore()
+    })
   })
 
   describe('getSession', () => {
@@ -624,6 +731,26 @@ describe('NewAgentPresenter', () => {
       sqlitePresenter.newSessionsTable.get.mockReturnValue(undefined)
       expect(await presenter.getSession('unknown')).toBeNull()
     })
+
+    it('returns null when session agent is unavailable', async () => {
+      const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {})
+      sqlitePresenter.newSessionsTable.get.mockReturnValue({
+        id: 's-disabled',
+        agent_id: 'disabled-agent',
+        title: 'Disabled',
+        project_dir: null,
+        is_pinned: 0,
+        created_at: 1000,
+        updated_at: 2000
+      })
+
+      expect(await presenter.getSession('s-disabled')).toBeNull()
+      expect(warnSpy).toHaveBeenCalledWith(
+        '[NewAgentPresenter] Skipping unavailable session id=s-disabled agent=disabled-agent:',
+        expect.any(Error)
+      )
+      warnSpy.mockRestore()
+    })
   })
 
   describe('getSessionCompactionState', () => {
@@ -1126,5 +1253,38 @@ describe('NewAgentPresenter', () => {
       expect(session).not.toBeNull()
       expect(session!.id).toBe('s1')
     })
+
+    it('returns null and clears binding when bound session becomes unavailable', async () => {
+      const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {})
+
+      await presenter.activateSession(1, 's-disabled')
+      sqlitePresenter.newSessionsTable.get.mockReturnValueOnce({
+        id: 's-disabled',
+        agent_id: 'disabled-agent',
+        title: 'Disabled',
+        project_dir: null,
+        is_pinned: 0,
+        created_at: 1000,
+        updated_at: 2000
+      })
+
+      await expect(presenter.getActiveSession(1)).resolves.toBeNull()
+
+      sqlitePresenter.newSessionsTable.get.mockReturnValue({
+        id: 's-disabled',
+        agent_id: 'deepchat',
+        title: 'Recovered',
+        project_dir: null,
+        is_pinned: 0,
+        created_at: 1000,
+        updated_at: 2000
+      })
+      await expect(presenter.getActiveSession(1)).resolves.toBeNull()
+      expect(warnSpy).toHaveBeenCalledWith(
+        '[NewAgentPresenter] Skipping unavailable session id=s-disabled agent=disabled-agent:',
+        expect.any(Error)
+      )
+      warnSpy.mockRestore()
+    })
   })
 })
diff --git a/test/renderer/components/App.startup.test.ts b/test/renderer/components/App.startup.test.ts
new file mode 100644
index 000000000..3d5bf1ab9
--- /dev/null
+++ b/test/renderer/components/App.startup.test.ts
@@ -0,0 +1,208 @@
+import { mount, flushPromises } from '@vue/test-utils'
+import { reactive, ref } from 'vue'
+import { afterEach, describe, expect, it, vi } from 'vitest'
+
+const DEV_WELCOME_OVERRIDE_KEY = '__deepchat_dev_force_welcome'
+
+const mountApp = async (options?: { initComplete?: boolean; routeName?: 'chat' | 'welcome' }) => {
+  vi.resetModules()
+
+  const initComplete = options?.initComplete ?? false
+  const routeName = options?.routeName ?? 'chat'
+  const route = reactive({
+    name: routeName,
+    path: routeName === 'welcome' ? '/welcome' : '/chat',
+    fullPath: routeName === 'welcome' ? '/welcome' : '/chat'
+  })
+  const currentRoute = ref(route)
+
+  const setRoute = (name: 'chat' | 'welcome') => {
+    route.name = name
+    route.path = name === 'welcome' ? '/welcome' : '/chat'
+    route.fullPath = route.path
+    currentRoute.value = route
+  }
+
+  const router = {
+    isReady: vi.fn().mockResolvedValue(undefined),
+    replace: vi.fn().mockImplementation(async ({ name }: { name: 'chat' | 'welcome' }) => {
+      setRoute(name)
+    }),
+    push: vi.fn().mockImplementation(async ({ name }: { name: string }) => {
+      if (name === 'chat' || name === 'welcome') {
+        setRoute(name)
+      }
+    }),
+    currentRoute
+  }
+
+  const configPresenter = {
+    getSetting: vi.fn().mockResolvedValue(initComplete)
+  }
+  const pageRouterStore = {
+    goToNewThread: vi.fn()
+  }
+  const toast = vi.fn(() => ({ dismiss: vi.fn() }))
+
+  ;(window as any).electron = {
+    ipcRenderer: {
+      on: vi.fn(),
+      removeAllListeners: vi.fn(),
+      send: vi.fn()
+    }
+  }
+
+  vi.doMock('vue-router', async () => {
+    const actual = await vi.importActual<typeof import('vue-router')>('vue-router')
+    return {
+      ...actual,
+      useRoute: () => route,
+      useRouter: () => router
+    }
+  })
+
+  vi.doMock('vue-i18n', () => ({
+    useI18n: () => ({
+      t: (key: string) => key
+    })
+  }))
+
+  vi.doMock('@/composables/usePresenter', () => ({
+    usePresenter: (name: string) => {
+      if (name === 'configPresenter') return configPresenter
+      return {}
+    }
+  }))
+  vi.doMock('@/stores/artifact', () => ({
+    useArtifactStore: () => ({
+      hideArtifact: vi.fn()
+    })
+  }))
+  vi.doMock('@/stores/ui/session', () => ({
+    useSessionStore: () => ({
+      hasActiveSession: false,
+      activeSessionId: null,
+      closeSession: vi.fn(),
+      selectSession: vi.fn()
+    })
+  }))
+  vi.doMock('@/stores/ui/pageRouter', () => ({
+    usePageRouterStore: () => pageRouterStore
+  }))
+  vi.doMock('@/components/use-toast', () => ({
+    useToast: () => ({
+      toast
+    })
+  }))
+  vi.doMock('@/stores/uiSettingsStore', () => ({
+    useUiSettingsStore: () => ({
+      fontSizeClass: 'text-base',
+      fontSizeLevel: 1,
+      updateFontSizeLevel: vi.fn()
+    })
+  }))
+  vi.doMock('@/stores/theme', () => ({
+    useThemeStore: () => ({
+      themeMode: 'light',
+      isDark: false
+    })
+  }))
+  vi.doMock('@/stores/language', () => ({
+    useLanguageStore: () => ({
+      dir: 'ltr'
+    })
+  }))
+  vi.doMock('@/stores/modelCheck', () => ({
+    useModelCheckStore: () => ({
+      isDialogOpen: false,
+      currentProviderId: null,
+      closeDialog: vi.fn()
+    })
+  }))
+  vi.doMock('@/lib/storeInitializer', () => ({
+    initAppStores: vi.fn(),
+    useMcpInstallDeeplinkHandler: () => ({
+      setup: vi.fn(),
+      cleanup: vi.fn()
+    })
+  }))
+  vi.doMock('@/composables/useFontManager', () => ({
+    useFontManager: () => ({
+      setupFontListener: vi.fn()
+    })
+  }))
+  vi.doMock('@/composables/useDeviceVersion', () => ({
+    useDeviceVersion: () => ({
+      isWinMacOS: false
+    })
+  }))
+
+  const App = (await import('@/App.vue')).default
+
+  mount(App, {
+    global: {
+      stubs: {
+        RouterView: true,
+        AppBar: true,
+        WindowSideBar: true,
+        UpdateDialog: true,
+        MessageDialog: true,
+        McpSamplingDialog: true,
+        SelectedTextContextMenu: true,
+        TranslatePopup: true,
+        ModelCheckDialog: {
+          template: '<div />',
+          props: ['open', 'providerId']
+        },
+        Toaster: true
+      }
+    }
+  })
+
+  await flushPromises()
+
+  return {
+    route,
+    router,
+    configPresenter
+  }
+}
+
+afterEach(() => {
+  window.sessionStorage.removeItem(DEV_WELCOME_OVERRIDE_KEY)
+})
+
+describe('App startup welcome flow', () => {
+  it('routes to welcome when init is incomplete', async () => {
+    const { router, configPresenter } = await mountApp({
+      initComplete: false,
+      routeName: 'chat'
+    })
+
+    expect(configPresenter.getSetting).toHaveBeenCalledWith('init_complete')
+    expect(router.replace).toHaveBeenCalledWith({ name: 'welcome' })
+  })
+
+  it('redirects welcome back to chat when init is complete', async () => {
+    const { router, configPresenter, route } = await mountApp({
+      initComplete: true,
+      routeName: 'welcome'
+    })
+
+    expect(configPresenter.getSetting).toHaveBeenCalledWith('init_complete')
+    expect(router.replace).toHaveBeenCalledWith({ name: 'chat' })
+    expect(route.name).toBe('chat')
+  })
+
+  it('keeps welcome when dev override is enabled', async () => {
+    window.sessionStorage.setItem(DEV_WELCOME_OVERRIDE_KEY, '1')
+
+    const { router, route } = await mountApp({
+      initComplete: true,
+      routeName: 'chat'
+    })
+
+    expect(router.replace).toHaveBeenCalledWith({ name: 'welcome' })
+    expect(route.name).toBe('welcome')
+  })
+})
diff --git a/test/renderer/components/WelcomePage.test.ts b/test/renderer/components/WelcomePage.test.ts
new file mode 100644
index 000000000..ef2131509
--- /dev/null
+++ b/test/renderer/components/WelcomePage.test.ts
@@ -0,0 +1,290 @@
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import { mount } from '@vue/test-utils'
+import { SETTINGS_EVENTS } from '@/events'
+
+afterEach(() => {
+  vi.clearAllTimers()
+  vi.useRealTimers()
+})
+
+describe('WelcomePage', () => {
+  it('marks init complete and navigates provider entry to provider settings', async () => {
+    vi.resetModules()
+    vi.useFakeTimers()
+
+    const router = {
+      replace: vi.fn().mockResolvedValue(undefined)
+    }
+    const pageRouter = {
+      goToNewThread: vi.fn()
+    }
+    const configPresenter = {
+      setSetting: vi.fn().mockResolvedValue(undefined)
+    }
+    const windowPresenter = {
+      createSettingsWindow: vi.fn().mockResolvedValue(9),
+      getSettingsWindowId: vi.fn(() => 9),
+      sendToWindow: vi.fn(() => true)
+    }
+
+    ;(window as any).api = {
+      getWindowId: vi.fn(() => 7)
+    }
+
+    vi.doMock('@/composables/usePresenter', () => ({
+      usePresenter: (name: string) => {
+        if (name === 'configPresenter') return configPresenter
+        if (name === 'windowPresenter') return windowPresenter
+        return {}
+      }
+    }))
+    vi.doMock('@/stores/ui/pageRouter', () => ({
+      usePageRouterStore: () => pageRouter
+    }))
+    vi.doMock('@iconify/vue', () => ({
+      Icon: {
+        name: 'Icon',
+        template: '<span />'
+      }
+    }))
+    vi.doMock('@/stores/theme', () => ({
+      useThemeStore: () => ({
+        isDark: false
+      })
+    }))
+    vi.doMock('@/components/icons/ModelIcon.vue', () => ({
+      default: {
+        name: 'ModelIcon',
+        template: '<span />'
+      }
+    }))
+    vi.doMock('vue-router', async () => {
+      const actual = await vi.importActual<typeof import('vue-router')>('vue-router')
+      return {
+        ...actual,
+        useRoute: () => ({
+          name: 'welcome'
+        }),
+        useRouter: () => router
+      }
+    })
+    vi.doMock('vue-i18n', () => ({
+      useI18n: () => ({
+        t: (key: string) => key
+      })
+    }))
+
+    const WelcomePage = (await import('@/pages/WelcomePage.vue')).default
+
+    const wrapper = mount(WelcomePage, {
+      global: {
+        stubs: {
+          Icon: true
+        }
+      }
+    })
+
+    const browseButton = wrapper
+      .findAll('button')
+      .find((button) => button.text().includes('welcome.page.browseProviders'))
+
+    expect(browseButton).toBeDefined()
+
+    await browseButton!.trigger('click')
+    await vi.runAllTimersAsync()
+
+    expect(configPresenter.setSetting).toHaveBeenCalledWith('init_complete', true)
+    expect(pageRouter.goToNewThread).toHaveBeenCalledTimes(1)
+    expect(router.replace).toHaveBeenCalledWith({ name: 'chat' })
+    expect(windowPresenter.createSettingsWindow).toHaveBeenCalledTimes(1)
+    expect(windowPresenter.sendToWindow).toHaveBeenCalledWith(9, SETTINGS_EVENTS.NAVIGATE, {
+      routeName: 'settings-provider'
+    })
+    expect(windowPresenter.sendToWindow).toHaveBeenCalledTimes(2)
+  })
+
+  it('navigates the ACP entry to ACP settings', async () => {
+    vi.resetModules()
+    vi.useFakeTimers()
+
+    const router = {
+      replace: vi.fn().mockResolvedValue(undefined)
+    }
+    const pageRouter = {
+      goToNewThread: vi.fn()
+    }
+    const configPresenter = {
+      setSetting: vi.fn().mockResolvedValue(undefined)
+    }
+    const windowPresenter = {
+      createSettingsWindow: vi.fn().mockResolvedValue(9),
+      getSettingsWindowId: vi.fn(() => 9),
+      sendToWindow: vi.fn(() => true)
+    }
+
+    ;(window as any).api = {
+      getWindowId: vi.fn(() => 7)
+    }
+
+    vi.doMock('@/composables/usePresenter', () => ({
+      usePresenter: (name: string) => {
+        if (name === 'configPresenter') return configPresenter
+        if (name === 'windowPresenter') return windowPresenter
+        return {}
+      }
+    }))
+    vi.doMock('@/stores/ui/pageRouter', () => ({
+      usePageRouterStore: () => pageRouter
+    }))
+    vi.doMock('@iconify/vue', () => ({
+      Icon: {
+        name: 'Icon',
+        template: '<span />'
+      }
+    }))
+    vi.doMock('@/stores/theme', () => ({
+      useThemeStore: () => ({
+        isDark: false
+      })
+    }))
+    vi.doMock('@/components/icons/ModelIcon.vue', () => ({
+      default: {
+        name: 'ModelIcon',
+        template: '<span />'
+      }
+    }))
+    vi.doMock('vue-router', async () => {
+      const actual = await vi.importActual<typeof import('vue-router')>('vue-router')
+      return {
+        ...actual,
+        useRoute: () => ({
+          name: 'welcome'
+        }),
+        useRouter: () => router
+      }
+    })
+    vi.doMock('vue-i18n', () => ({
+      useI18n: () => ({
+        t: (key: string) => key
+      })
+    }))
+
+    const WelcomePage = (await import('@/pages/WelcomePage.vue')).default
+
+    const wrapper = mount(WelcomePage, {
+      global: {
+        stubs: {
+          Icon: true
+        }
+      }
+    })
+
+    const browseButton = wrapper
+      .findAll('button')
+      .find((button) => button.text().includes('welcome.page.acpTitle'))
+
+    expect(browseButton).toBeDefined()
+
+    await browseButton!.trigger('click')
+    await vi.runAllTimersAsync()
+
+    expect(configPresenter.setSetting).toHaveBeenCalledWith('init_complete', true)
+    expect(pageRouter.goToNewThread).toHaveBeenCalledTimes(1)
+    expect(router.replace).toHaveBeenCalledWith({ name: 'chat' })
+    expect(windowPresenter.createSettingsWindow).toHaveBeenCalledTimes(1)
+    expect(windowPresenter.sendToWindow).toHaveBeenCalledWith(9, SETTINGS_EVENTS.NAVIGATE, {
+      routeName: 'settings-acp'
+    })
+    expect(windowPresenter.sendToWindow).toHaveBeenCalledTimes(2)
+  })
+
+  it('does nothing when no window id is available', async () => {
+    vi.resetModules()
+
+    const router = {
+      replace: vi.fn().mockResolvedValue(undefined)
+    }
+    const pageRouter = {
+      goToNewThread: vi.fn()
+    }
+    const configPresenter = {
+      setSetting: vi.fn().mockResolvedValue(undefined)
+    }
+    const windowPresenter = {
+      createSettingsWindow: vi.fn().mockResolvedValue(9),
+      getSettingsWindowId: vi.fn(() => 9),
+      sendToWindow: vi.fn(() => true)
+    }
+
+    ;(window as any).api = {
+      getWindowId: vi.fn(() => null)
+    }
+
+    vi.doMock('@/composables/usePresenter', () => ({
+      usePresenter: (name: string) => {
+        if (name === 'configPresenter') return configPresenter
+        if (name === 'windowPresenter') return windowPresenter
+        return {}
+      }
+    }))
+    vi.doMock('@/stores/ui/pageRouter', () => ({
+      usePageRouterStore: () => pageRouter
+    }))
+    vi.doMock('@iconify/vue', () => ({
+      Icon: {
+        name: 'Icon',
+        template: '<span />'
+      }
+    }))
+    vi.doMock('@/stores/theme', () => ({
+      useThemeStore: () => ({
+        isDark: false
+      })
+    }))
+    vi.doMock('@/components/icons/ModelIcon.vue', () => ({
+      default: {
+        name: 'ModelIcon',
+        template: '<span />'
+      }
+    }))
+    vi.doMock('vue-router', async () => {
+      const actual = await vi.importActual<typeof import('vue-router')>('vue-router')
+      return {
+        ...actual,
+        useRoute: () => ({
+          name: 'welcome'
+        }),
+        useRouter: () => router
+      }
+    })
+    vi.doMock('vue-i18n', () => ({
+      useI18n: () => ({
+        t: (key: string) => key
+      })
+    }))
+
+    const WelcomePage = (await import('@/pages/WelcomePage.vue')).default
+
+    const wrapper = mount(WelcomePage, {
+      global: {
+        stubs: {
+          Icon: true
+        }
+      }
+    })
+
+    const browseButton = wrapper
+      .findAll('button')
+      .find((button) => button.text().includes('welcome.page.browseProviders'))
+
+    expect(browseButton).toBeDefined()
+
+    await browseButton!.trigger('click')
+
+    expect(configPresenter.setSetting).not.toHaveBeenCalled()
+    expect(pageRouter.goToNewThread).not.toHaveBeenCalled()
+    expect(router.replace).not.toHaveBeenCalled()
+    expect(windowPresenter.createSettingsWindow).not.toHaveBeenCalled()
+    expect(windowPresenter.sendToWindow).not.toHaveBeenCalled()
+  })
+})
diff --git a/test/renderer/stores/pageRouter.test.ts b/test/renderer/stores/pageRouter.test.ts
index a3a3adea7..feac0a13e 100644
--- a/test/renderer/stores/pageRouter.test.ts
+++ b/test/renderer/stores/pageRouter.test.ts
@@ -1,20 +1,10 @@
 import { describe, expect, it, vi } from 'vitest'
 
-const setupStore = async (options?: {
-  activeNewSession?: { id: string } | null
-  activeLegacySession?: { sessionId: string } | null
-}) => {
+const setupStore = async (options?: { activeNewSession?: { id: string } | null }) => {
   vi.resetModules()
-
-  const configPresenter = {
-    getEnabledProviders: vi.fn().mockReturnValue(['openai'])
-  }
   const newAgentPresenter = {
     getActiveSession: vi.fn().mockResolvedValue(options?.activeNewSession ?? null)
   }
-  const sessionPresenter = {
-    getActiveSession: vi.fn().mockResolvedValue(options?.activeLegacySession ?? null)
-  }
 
   vi.doMock('pinia', () => ({
     defineStore: (_id: string, setup: () => unknown) => setup
@@ -22,9 +12,8 @@ const setupStore = async (options?: {
 
   vi.doMock('@/composables/usePresenter', () => ({
     usePresenter: (name: string) => {
-      if (name === 'configPresenter') return configPresenter
       if (name === 'newAgentPresenter') return newAgentPresenter
-      return sessionPresenter
+      return {}
     }
   }))
   ;(window as any).electron = {
@@ -39,32 +28,78 @@ const setupStore = async (options?: {
 
   const { usePageRouterStore } = await import('@/stores/ui/pageRouter')
   const store = usePageRouterStore()
-  return { store, newAgentPresenter, sessionPresenter }
+
+  return {
+    store,
+    newAgentPresenter
+  }
 }
 
 describe('pageRouter.initialize', () => {
-  it('prefers new-agent active session over legacy presenter', async () => {
-    const { store, newAgentPresenter, sessionPresenter } = await setupStore({
-      activeNewSession: { id: 'new-session-1' },
-      activeLegacySession: { sessionId: 'legacy-session-1' }
+  it('uses the active new-agent session when it exists', async () => {
+    const { store, newAgentPresenter } = await setupStore({
+      activeNewSession: { id: 'new-session-1' }
     })
 
     await store.initialize()
 
     expect(newAgentPresenter.getActiveSession).toHaveBeenCalledWith(1)
-    expect(sessionPresenter.getActiveSession).not.toHaveBeenCalled()
     expect(store.route.value).toEqual({ name: 'chat', sessionId: 'new-session-1' })
   })
 
   it('defaults to new thread when no new-agent active session exists', async () => {
-    const { store, sessionPresenter } = await setupStore({
-      activeNewSession: null,
-      activeLegacySession: { sessionId: 'legacy-session-2' }
+    const { store, newAgentPresenter } = await setupStore({
+      activeNewSession: null
+    })
+
+    await store.initialize()
+
+    expect(newAgentPresenter.getActiveSession).toHaveBeenCalledWith(1)
+    expect(store.route.value).toEqual({ name: 'newThread' })
+  })
+
+  it('allows manually going to new thread', async () => {
+    const { store } = await setupStore({
+      activeNewSession: null
     })
+    store.goToNewThread()
+
+    expect(store.route.value).toEqual({ name: 'newThread' })
+  })
+
+  it('falls back to new thread when active session lookup fails', async () => {
+    vi.resetModules()
+
+    const newAgentPresenter = {
+      getActiveSession: vi.fn().mockRejectedValue(new Error('boom'))
+    }
+
+    vi.doMock('pinia', () => ({
+      defineStore: (_id: string, setup: () => unknown) => setup
+    }))
+
+    vi.doMock('@/composables/usePresenter', () => ({
+      usePresenter: (name: string) => {
+        if (name === 'newAgentPresenter') return newAgentPresenter
+        return {}
+      }
+    }))
+    ;(window as any).electron = {
+      ipcRenderer: {
+        on: vi.fn(),
+        removeListener: vi.fn()
+      }
+    }
+    ;(window as any).api = {
+      getWebContentsId: vi.fn(() => 1)
+    }
+
+    const { usePageRouterStore } = await import('@/stores/ui/pageRouter')
+    const store = usePageRouterStore()
 
     await store.initialize()
 
-    expect(sessionPresenter.getActiveSession).not.toHaveBeenCalled()
     expect(store.route.value).toEqual({ name: 'newThread' })
+    expect(store.error.value).toContain('boom')
   })
 })
diff --git a/test/renderer/stores/sessionStore.test.ts b/test/renderer/stores/sessionStore.test.ts
index 56747fe9b..1f53e30bf 100644
--- a/test/renderer/stores/sessionStore.test.ts
+++ b/test/renderer/stores/sessionStore.test.ts
@@ -20,6 +20,12 @@ const setupStore = async () => {
     onRendererTabReady: vi.fn(),
     onRendererTabActivated: vi.fn()
   }
+  const pageRouter = {
+    goToChat: vi.fn(),
+    goToNewThread: vi.fn(),
+    currentRoute: 'chat'
+  }
+  const listeners = new Map<string, Array<(...args: any[]) => void>>()
 
   vi.doMock('pinia', () => ({
     defineStore: (_id: string, setup: () => unknown) => setup
@@ -30,10 +36,7 @@ const setupStore = async () => {
   }))
 
   vi.doMock('@/stores/ui/pageRouter', () => ({
-    usePageRouterStore: () => ({
-      goToChat: vi.fn(),
-      goToNewThread: vi.fn()
-    })
+    usePageRouterStore: () => pageRouter
   }))
   const clearStreamingState = vi.fn()
   vi.doMock('@/stores/ui/message', () => ({
@@ -44,7 +47,11 @@ const setupStore = async () => {
   }))
   ;(window as any).electron = {
     ipcRenderer: {
-      on: vi.fn(),
+      on: vi.fn((event: string, handler: (...args: any[]) => void) => {
+        const handlers = listeners.get(event) ?? []
+        handlers.push(handler)
+        listeners.set(event, handlers)
+      }),
       removeListener: vi.fn()
     }
   }
@@ -53,8 +60,14 @@ const setupStore = async () => {
   }
 
   const { useSessionStore } = await import('@/stores/ui/session')
+  const { SESSION_EVENTS } = await import('@/events')
   const store = useSessionStore()
-  return { store, clearStreamingState, newAgentPresenter }
+  const emitIpc = (event: string, payload?: unknown) => {
+    for (const handler of listeners.get(event) ?? []) {
+      handler(undefined, payload)
+    }
+  }
+  return { store, clearStreamingState, newAgentPresenter, pageRouter, emitIpc, SESSION_EVENTS }
 }
 
 describe('sessionStore.getFilteredGroups', () => {
@@ -191,4 +204,27 @@ describe('sessionStore streaming cleanup', () => {
     expect(clearStreamingState).toHaveBeenCalledTimes(1)
     expect(store.activeSessionId.value).toBe('session-b')
   })
+
+  it('returns to new thread when active session becomes unavailable', async () => {
+    const { store, clearStreamingState, newAgentPresenter, pageRouter } = await setupStore()
+    store.activeSessionId.value = 'session-a'
+    pageRouter.currentRoute = 'chat'
+    newAgentPresenter.getActiveSession.mockResolvedValueOnce(null)
+
+    await store.fetchSessions()
+
+    expect(clearStreamingState).toHaveBeenCalledTimes(1)
+    expect(store.activeSessionId.value).toBeNull()
+    expect(pageRouter.goToNewThread).toHaveBeenCalledTimes(1)
+  })
+
+  it('reloads sessions when the session list update event fires', async () => {
+    const { newAgentPresenter, emitIpc, SESSION_EVENTS } = await setupStore()
+
+    emitIpc(SESSION_EVENTS.LIST_UPDATED)
+    await new Promise((resolve) => setTimeout(resolve, 0))
+
+    expect(newAgentPresenter.getSessionList).toHaveBeenCalledTimes(1)
+    expect(newAgentPresenter.getActiveSession).toHaveBeenCalledTimes(1)
+  })
 })