diff --git a/electron/ipc/handlers.ts b/electron/ipc/handlers.ts
index 6748b0e..feb3a7d 100644
--- a/electron/ipc/handlers.ts
+++ b/electron/ipc/handlers.ts
@@ -52,6 +52,9 @@ export function registerAllIPCHandlers(
   ipcMain.handle('agent:sendMessage', async (_event, userMessage: MetonaMessage, sessionId: string) => {
     log.info('[AGENT] sendMessage:', sessionId, userMessage.content.slice(0, 80));
 
+    // 发送消息前确保 Adapter 使用最新配置（防止 config:set 中间状态导致 reload 失败）
+    reloadAdapter();
+
     // TRACE 层：开始录制
     sessionRecorder.startRecording(sessionId);
 
diff --git a/electron/main.ts b/electron/main.ts
index 5788589..379900f 100644
--- a/electron/main.ts
+++ b/electron/main.ts
@@ -230,15 +230,20 @@ async function initialize(): Promise<void> {
 
   // ===== 热重载 Adapter 回调（设置变更时触发）=====
   const reloadAdapter = () => {
-    const newAdapter = createAdapter();
-    agentLoop.setAdapter(newAdapter);
-    // Provider 切换时同步 contextLength：仅 Ollama 使用 numCtx 作为有效上下文窗口
-    const provider = configService.get<string>('llm.provider') ?? '';
-    if (provider === 'ollama') {
-      const numCtx = configService.get<number>('ollama.numCtx');
-      agentLoop.updateConfig({ contextLength: numCtx ?? undefined });
-    } else {
-      agentLoop.updateConfig({ contextLength: undefined });
+    try {
+      const newAdapter = createAdapter();
+      agentLoop.setAdapter(newAdapter);
+      // Provider 切换时同步 contextLength：仅 Ollama 使用 numCtx 作为有效上下文窗口
+      const provider = configService.get<string>('llm.provider') ?? '';
+      if (provider === 'ollama') {
+        const numCtx = configService.get<number>('ollama.numCtx');
+        agentLoop.updateConfig({ contextLength: numCtx ?? undefined });
+      } else {
+        agentLoop.updateConfig({ contextLength: undefined });
+      }
+      log.info(`[CONFIG] Adapter reloaded: provider=${provider}`);
+    } catch (err) {
+      log.error(`[CONFIG] Failed to reload adapter: ${(err as Error).message}`);
     }
   };
 
diff --git a/src/components/settings/SettingsModal.tsx b/src/components/settings/SettingsModal.tsx
index ea844b2..81d1b9a 100644
--- a/src/components/settings/SettingsModal.tsx
+++ b/src/components/settings/SettingsModal.tsx
@@ -118,11 +118,26 @@ function LLMSettings() {
     }
   }, [provider, numCtx]);
 
+  // 切换 Provider 时自动填充默认 URL + 清空 Ollama 的 apiKey
+  const handleProviderChange = (newProvider: string) => {
+    setProvider(newProvider);
+    // Ollama 不需要 API Key，切换到 Ollama 时清空旧 key
+    if (newProvider === 'ollama' && apiKey) {
+      setApiKey('');
+    }
+    // 自动填充默认 URL（仅在 URL 为空或与旧 provider 默认 URL 匹配时）
+    const currentUrl = baseURL.trim();
+    const isDefaultUrl = Object.values(PROVIDER_URLS).includes(currentUrl);
+    if (isDefaultUrl || !currentUrl) {
+      setBaseURL(PROVIDER_URLS[newProvider] ?? '');
+    }
+  };
+
   return (
     <Stack spacing={2}>
       <Typography variant="subtitle2" sx={{ fontWeight: 600 }}>LLM 配置</Typography>
       <FormControl size="small"><InputLabel>Provider</InputLabel>
-        <Select value={provider} label="Provider" onChange={(e) => setProvider(e.target.value)}>
+        <Select value={provider} label="Provider" onChange={(e) => handleProviderChange(e.target.value)}>
           <MenuItem value="deepseek">DeepSeek</MenuItem>
           <MenuItem value="agnes">Agnes AI</MenuItem>
           <MenuItem value="ollama">Ollama (本地)</MenuItem>
@@ -130,9 +145,11 @@ function LLMSettings() {
       </FormControl>
       <TextField size="small" label="API Base URL" value={baseURL} onChange={(e) => setBaseURL(e.target.value)} placeholder="如 https://api.deepseek.com" />
       <TextField size="small" label="模型名称" value={model} onChange={(e) => setModel(e.target.value)} placeholder="如 deepseek-v4-pro、qwen3:latest" />
-      <TextField size="small" label="API Key" type={showKey ? 'text' : 'password'} value={apiKey} onChange={(e) => setApiKey(e.target.value)} placeholder="sk-...（本地模型可留空）"
-        slotProps={{ input: { endAdornment: <IconButton size="small" onClick={() => setShowKey(!showKey)}>{showKey ? <EyeOff size={14} /> : <Eye size={14} />}</IconButton> } }}
-      />
+      {provider !== 'ollama' && (
+        <TextField size="small" label="API Key" type={showKey ? 'text' : 'password'} value={apiKey} onChange={(e) => setApiKey(e.target.value)} placeholder="sk-..."
+          slotProps={{ input: { endAdornment: <IconButton size="small" onClick={() => setShowKey(!showKey)}>{showKey ? <EyeOff size={14} /> : <Eye size={14} />}</IconButton> } }}
+        />
+      )}
       {provider === 'ollama' && (
         <TextField
           size="small"