diff --git a/adapters/telegram/index.ts b/adapters/telegram/index.ts
index a3985169b..a87cf9275 100644
--- a/adapters/telegram/index.ts
+++ b/adapters/telegram/index.ts
@@ -392,7 +392,11 @@ async function handleServerMessage(chatId: string, msg: ServerMessage): Promise<
           const text = accumulatedText.get(chatId)
           if (text?.trim()) {
             try {
-              await bot.api.editMessageText(numericChatId, placeholders.get(chatId)!.messageId, text)
+              const chunks = splitMessage(text, TELEGRAM_TEXT_LIMIT)
+              await bot.api.editMessageText(numericChatId, placeholders.get(chatId)!.messageId, chunks[0]!)
+              for (let i = 1; i < chunks.length; i++) {
+                await bot.api.sendMessage(numericChatId, chunks[i]!)
+              }
             } catch { /* ignore */ }
           }
           placeholders.delete(chatId)
diff --git a/desktop/src/components/chat/AskUserQuestion.tsx b/desktop/src/components/chat/AskUserQuestion.tsx
index 7a9670916..28e62140a 100644
--- a/desktop/src/components/chat/AskUserQuestion.tsx
+++ b/desktop/src/components/chat/AskUserQuestion.tsx
@@ -73,7 +73,7 @@ export function AskUserQuestion({ sessionId, toolUseId, input, result }: Props)
   const inputObject = (input && typeof input === 'object') ? input as Record<string, unknown> : {}
   const [activeTab, setActiveTab] = useState(0)
   const [selections, setSelections] = useState<QuestionSelections>({})
-  const [freeText, setFreeText] = useState('')
+  const [freeTexts, setFreeTexts] = useState<Record<number, string>>({})
   const [hasSubmitted, setHasSubmitted] = useState(false)
   const composingRef = useRef(false)
 
@@ -95,11 +95,12 @@ export function AskUserQuestion({ sessionId, toolUseId, input, result }: Props)
         .filter((answer): answer is string => typeof answer === 'string' && answer.trim().length > 0)
         .join(', ')
     }
-    return freeText.trim() || questions
-      .map((question, index) => getSelectedAnswer(question, selections[index]))
+    const textParts = questions.map((_q, i) => freeTexts[i]?.trim()).filter(Boolean)
+    const selectParts = questions
+      .map((question, i) => freeTexts[i]?.trim() ? '' : getSelectedAnswer(question, selections[i]))
       .filter(Boolean)
-      .join('; ')
-  }, [freeText, questions, resultAnswers, selections])
+    return textParts.join('; ') + (textParts.length > 0 && selectParts.length > 0 ? '; ' : '') + selectParts.join('; ')
+  }, [freeTexts, questions, resultAnswers, selections])
   const submitted = Object.keys(resultAnswers).length > 0 || hasSubmitted
 
   const handleSelect = (qIndex: number, label: string) => {
@@ -126,7 +127,7 @@ export function AskUserQuestion({ sessionId, toolUseId, input, result }: Props)
       }
       return { ...prev, [qIndex]: [label] }
     })
-    setFreeText('')
+    setFreeTexts((prev) => { const next = { ...prev }; delete next[qIndex]; return next })
   }
 
   const handleSubmit = () => {
@@ -134,17 +135,23 @@ export function AskUserQuestion({ sessionId, toolUseId, input, result }: Props)
 
     const parts: string[] = []
     for (let i = 0; i < questions.length; i++) {
-      const selected = getSelectedAnswer(questions[i]!, selections[i])
-      if (selected) parts.push(selected)
+      const text = freeTexts[i]?.trim()
+      if (text) {
+        parts.push(text)
+      } else {
+        const selected = getSelectedAnswer(questions[i]!, selections[i])
+        if (selected) parts.push(selected)
+      }
     }
-    const response = freeText.trim() || parts.join('; ') || ''
+    const response = parts.join('; ') || ''
     if (!response) return
 
     if (!targetSessionId || !pendingRequest) return
 
     const answers = questions.reduce<Record<string, string>>((acc, question, index) => {
-      if (freeText.trim()) {
-        acc[question.question] = freeText.trim()
+      const text = freeTexts[index]?.trim()
+      if (text) {
+        acc[question.question] = text
       } else {
         const selected = getSelectedAnswer(question, selections[index])
         if (selected) acc[question.question] = selected
@@ -162,7 +169,9 @@ export function AskUserQuestion({ sessionId, toolUseId, input, result }: Props)
   }
 
   // All questions must be answered (via selection or free text) to enable submit
-  const allAnswered = freeText.trim().length > 0 || questions.every((_, i) => (selections[i]?.length ?? 0) > 0)
+  const allAnswered = questions.every((_, i) =>
+    (freeTexts[i]?.trim()?.length ?? 0) > 0 || (selections[i]?.length ?? 0) > 0
+  )
   const safeActiveTab = Math.min(activeTab, questions.length - 1)
   const activeQuestion = questions[safeActiveTab]
 
@@ -202,7 +211,7 @@ export function AskUserQuestion({ sessionId, toolUseId, input, result }: Props)
         <div className="flex px-4 border-b border-[var(--color-outline-variant)]/20 bg-[var(--color-surface-container-low)] overflow-x-auto">
           {questions.map((q, i) => {
             const isActive = safeActiveTab === i
-            const isAnswered = (selections[i]?.length ?? 0) > 0
+            const isAnswered = (freeTexts[i]?.trim()?.length ?? 0) > 0 || (selections[i]?.length ?? 0) > 0
             const tabLabel = q.header || `Q${i + 1}`
             return (
               <button
@@ -292,10 +301,12 @@ export function AskUserQuestion({ sessionId, toolUseId, input, result }: Props)
             </label>
             <input
               type="text"
-              value={freeText}
+              value={freeTexts[safeActiveTab] ?? ''}
               onChange={(e) => {
-                setFreeText(e.target.value)
-                if (e.target.value.trim()) setSelections({})
+                setFreeTexts((prev) => ({ ...prev, [safeActiveTab]: e.target.value }))
+                if (e.target.value.trim()) {
+                  setSelections((prev) => { const next = { ...prev }; delete next[safeActiveTab]; return next })
+                }
               }}
               onCompositionStart={() => { composingRef.current = true }}
               onCompositionEnd={() => { composingRef.current = false }}
diff --git a/desktop/src/components/chat/MessageList.tsx b/desktop/src/components/chat/MessageList.tsx
index 20b7e1b1e..307dd4035 100644
--- a/desktop/src/components/chat/MessageList.tsx
+++ b/desktop/src/components/chat/MessageList.tsx
@@ -129,15 +129,31 @@ function getChatSelectionFromContainer(
 function ChatSelectionMenu({
   selection,
   onAdd,
+  onDismiss,
 }: {
   selection: ChatSelectionState | null
   onAdd: () => void
+  onDismiss: () => void
 }) {
   const t = useTranslation()
+  const ref = useRef<HTMLButtonElement>(null)
+
+  useEffect(() => {
+    if (!selection) return
+    const handle = (event: MouseEvent) => {
+      if (ref.current && !ref.current.contains(event.target as Node)) {
+        onDismiss()
+      }
+    }
+    document.addEventListener('mousedown', handle)
+    return () => document.removeEventListener('mousedown', handle)
+  }, [selection, onDismiss])
+
   if (!selection) return null
 
   return (
     <button
+      ref={ref}
       type="button"
       onMouseDown={(event) => event.preventDefault()}
       onClick={onAdd}
@@ -335,7 +351,7 @@ function SelectableChatMessage({
       }}
     >
       {children}
-      <ChatSelectionMenu selection={selectionMenu} onAdd={addCurrentSelectionToChat} />
+      <ChatSelectionMenu selection={selectionMenu} onAdd={addCurrentSelectionToChat} onDismiss={() => setSelectionMenu(null)} />
     </div>
   )
 }
diff --git a/desktop/src/components/layout/TabBar.tsx b/desktop/src/components/layout/TabBar.tsx
index 94af3ba3a..52cd13534 100644
--- a/desktop/src/components/layout/TabBar.tsx
+++ b/desktop/src/components/layout/TabBar.tsx
@@ -167,7 +167,10 @@ export function TabBar() {
     setContextMenu(null)
     const otherTabs = tabs.filter((t) => t.sessionId !== sessionId)
     for (const tab of otherTabs) {
-      if (isSessionTab(tab)) disconnectSession(tab.sessionId)
+      if (isSessionTab(tab)) {
+        const state = useChatStore.getState().sessions[tab.sessionId]
+        if (!state || state.chatState === 'idle') disconnectSession(tab.sessionId)
+      }
       closeTabWithCleanup(tab)
     }
   }
@@ -177,7 +180,10 @@ export function TabBar() {
     const idx = tabs.findIndex((t) => t.sessionId === sessionId)
     const leftTabs = tabs.slice(0, idx)
     for (const tab of leftTabs) {
-      if (isSessionTab(tab)) disconnectSession(tab.sessionId)
+      if (isSessionTab(tab)) {
+        const state = useChatStore.getState().sessions[tab.sessionId]
+        if (!state || state.chatState === 'idle') disconnectSession(tab.sessionId)
+      }
       closeTabWithCleanup(tab)
     }
   }
@@ -187,7 +193,10 @@ export function TabBar() {
     const idx = tabs.findIndex((t) => t.sessionId === sessionId)
     const rightTabs = tabs.slice(idx + 1)
     for (const tab of rightTabs) {
-      if (isSessionTab(tab)) disconnectSession(tab.sessionId)
+      if (isSessionTab(tab)) {
+        const state = useChatStore.getState().sessions[tab.sessionId]
+        if (!state || state.chatState === 'idle') disconnectSession(tab.sessionId)
+      }
       closeTabWithCleanup(tab)
     }
   }
@@ -195,7 +204,10 @@ export function TabBar() {
   const handleCloseAll = () => {
     setContextMenu(null)
     for (const tab of tabs) {
-      if (isSessionTab(tab)) disconnectSession(tab.sessionId)
+      if (isSessionTab(tab)) {
+        const state = useChatStore.getState().sessions[tab.sessionId]
+        if (!state || state.chatState === 'idle') disconnectSession(tab.sessionId)
+      }
       closeTabWithCleanup(tab)
     }
   }
diff --git a/desktop/src/components/workspace/WorkspacePanel.tsx b/desktop/src/components/workspace/WorkspacePanel.tsx
index 1adfa2164..705d04c07 100644
--- a/desktop/src/components/workspace/WorkspacePanel.tsx
+++ b/desktop/src/components/workspace/WorkspacePanel.tsx
@@ -321,15 +321,31 @@ function getLineRangeForText(value: string, text: string) {
 function FloatingSelectionMenu({
   selection,
   onAdd,
+  onDismiss,
 }: {
   selection: FloatingSelectionMenuState | null
   onAdd: () => void
+  onDismiss: () => void
 }) {
   const t = useTranslation()
+  const ref = useRef<HTMLButtonElement>(null)
+
+  useEffect(() => {
+    if (!selection) return
+    const handle = (event: globalThis.MouseEvent) => {
+      if (ref.current && !ref.current.contains(event.target as Node)) {
+        onDismiss()
+      }
+    }
+    document.addEventListener('mousedown', handle)
+    return () => document.removeEventListener('mousedown', handle)
+  }, [selection, onDismiss])
+
   if (!selection) return null
 
   return (
     <button
+      ref={ref}
       type="button"
       onMouseDown={(event) => event.preventDefault()}
       onClick={onAdd}
@@ -650,7 +666,7 @@ function CodeSurface({
           </div>
         )}
       </div>
-      <FloatingSelectionMenu selection={selectionMenu} onAdd={addCurrentSelectionToChat} />
+      <FloatingSelectionMenu selection={selectionMenu} onAdd={addCurrentSelectionToChat} onDismiss={() => setSelectionMenu(null)} />
     </div>
   )
 }
@@ -704,7 +720,7 @@ function MarkdownSurface({
           className="workspace-markdown-preview prose-p:text-[14px] prose-p:leading-7 prose-h1:text-[24px] prose-h2:text-[18px] prose-h3:text-[15px] prose-code:text-[12px] prose-pre:my-4"
         />
       </div>
-      <FloatingSelectionMenu selection={selectionMenu} onAdd={addCurrentSelectionToChat} />
+      <FloatingSelectionMenu selection={selectionMenu} onAdd={addCurrentSelectionToChat} onDismiss={() => setSelectionMenu(null)} />
     </div>
   )
 }
diff --git a/desktop/src/pages/Settings.tsx b/desktop/src/pages/Settings.tsx
index a66bc8bf4..59000e99d 100644
--- a/desktop/src/pages/Settings.tsx
+++ b/desktop/src/pages/Settings.tsx
@@ -83,7 +83,7 @@ export function Settings() {
       <div className="flex-1 flex overflow-hidden">
         {/* Tab navigation */}
         <div className="w-[180px] border-r border-[var(--color-border)] py-3 flex-shrink-0 flex flex-col">
-          <div className="flex-1">
+          <div className="flex-1 overflow-y-auto">
             <TabButton icon="dns" label={t('settings.tab.providers')} active={activeTab === 'providers'} onClick={() => setActiveTab('providers')} />
             <TabButton icon="shield" label={t('settings.tab.permissions')} active={activeTab === 'permissions'} onClick={() => setActiveTab('permissions')} />
             <TabButton icon="tune" label={t('settings.tab.general')} active={activeTab === 'general'} onClick={() => setActiveTab('general')} />
diff --git a/desktop/src/stores/chatStore.ts b/desktop/src/stores/chatStore.ts
index 443e4f98f..e2d0a7600 100644
--- a/desktop/src/stores/chatStore.ts
+++ b/desktop/src/stores/chatStore.ts
@@ -924,15 +924,28 @@ export const useChatStore = create<ChatStore>((set, get) => ({
           update(() => ({ streamingText: text }))
         }
         if (session.elapsedTimer) clearInterval(session.elapsedTimer)
-        update(() => ({
-          tokenUsage: msg.usage,
-          chatState: 'idle',
-          activeThinkingId: null,
-          pendingPermission: null,
-          pendingComputerUsePermission: null,
-          elapsedTimer: null,
-        }))
-        useTabStore.getState().updateTabStatus(sessionId, 'idle')
+
+        const hasRunningBgTasks = hasRunningBackgroundTasks(session.backgroundAgentTasks)
+        if (hasRunningBgTasks) {
+          update(() => ({
+            tokenUsage: msg.usage,
+            chatState: 'awaiting_agents',
+            activeThinkingId: null,
+            pendingPermission: null,
+            pendingComputerUsePermission: null,
+            elapsedTimer: null,
+          }))
+        } else {
+          update(() => ({
+            tokenUsage: msg.usage,
+            chatState: 'idle',
+            activeThinkingId: null,
+            pendingPermission: null,
+            pendingComputerUsePermission: null,
+            elapsedTimer: null,
+          }))
+          useTabStore.getState().updateTabStatus(sessionId, 'idle')
+        }
         const notification = wasAgentRunning
           ? buildAgentCompletionNotification(sessionId, completionMessages, text)
           : null
@@ -1132,6 +1145,19 @@ export const useChatStore = create<ChatStore>((set, get) => ({
                 },
               }
             })
+            // Awaiting agents → idle once all background tasks finish
+            const postSession = get().sessions[sessionId]
+            if (
+              postSession?.chatState === 'awaiting_agents' &&
+              !hasRunningBackgroundTasks(postSession.backgroundAgentTasks)
+            ) {
+              set((s) => ({
+                sessions: updateSessionIn(s.sessions, sessionId, () => ({
+                  chatState: 'idle' as const,
+                })),
+              }))
+              useTabStore.getState().updateTabStatus(sessionId, 'idle')
+            }
           }
         }
         break
@@ -1141,6 +1167,11 @@ export const useChatStore = create<ChatStore>((set, get) => ({
   },
 }))
 
+function hasRunningBackgroundTasks(tasks: Record<string, BackgroundAgentTask> | undefined): boolean {
+  if (!tasks) return false
+  return Object.values(tasks).some((t) => t.status === 'running')
+}
+
 function updateOptimisticSessionTitle(sessionId: string, content: string): void {
   const title = deriveSessionTitle(content)
   if (!title) return
diff --git a/desktop/src/stores/providerStore.ts b/desktop/src/stores/providerStore.ts
index 77c6624cb..947607c85 100644
--- a/desktop/src/stores/providerStore.ts
+++ b/desktop/src/stores/providerStore.ts
@@ -143,13 +143,18 @@ export const useProviderStore = create<ProviderStore>((set, get) => ({
   activateProvider: async (id) => {
     await providersApi.activate(id)
     await get().fetchProviders()
-    // 更新默认 provider 时，同步刷新默认 model，避免 settings.json 里残留
-    // 旧 provider 的 model id 导致默认选择指向不存在的模型。
     const provider = get().providers.find((p) => p.id === id)
     if (provider) {
       const settings = useSettingsStore.getState()
-      await settings.setModel(provider.models.main)
+      const currentModelId = settings.currentModel?.id
+      const modelIds = providerModelIds(provider)
+      // 只在当前模型不兼容新 provider 时才 fallback 到 main model，
+      // 避免静默覆盖用户已选模型（#494）。
+      if (!currentModelId || !modelIds.has(currentModelId)) {
+        await settings.setModel(provider.models.main)
+      }
       await settings.fetchAll()
+      refreshConnectedSessionsForProvider(provider, get().activeId)
     }
   },
 
diff --git a/desktop/src/types/chat.ts b/desktop/src/types/chat.ts
index cb8b24b6c..53ce554e2 100644
--- a/desktop/src/types/chat.ts
+++ b/desktop/src/types/chat.ts
@@ -91,7 +91,7 @@ export type TokenUsage = {
   cache_creation_tokens?: number
 }
 
-export type ChatState = 'idle' | 'thinking' | 'tool_executing' | 'streaming' | 'permission_pending'
+export type ChatState = 'idle' | 'thinking' | 'tool_executing' | 'streaming' | 'permission_pending' | 'awaiting_agents'
 
 export type TeamMemberStatus = {
   agentId: string
diff --git a/src/server/__tests__/conversation-service.test.ts b/src/server/__tests__/conversation-service.test.ts
index 264ac80dc..5f4b716c6 100644
--- a/src/server/__tests__/conversation-service.test.ts
+++ b/src/server/__tests__/conversation-service.test.ts
@@ -307,6 +307,14 @@ describe('ConversationService', () => {
     )
     expect(env.CC_HAHA_DESKTOP_SERVER_URL).toBe('http://127.0.0.1:3456')
     expect(env.CLAUDE_CODE_ENABLE_SDK_FILE_CHECKPOINTING).toBe('1')
+    expect(env.CLAUDE_CODE_RESUME_INTERRUPTED_TURN).toBe('1')
+  })
+
+  test('buildChildEnv does not force interrupted-turn resume for non-SDK sessions', async () => {
+    const service = new ConversationService() as any
+    const env = (await service.buildChildEnv('/tmp')) as Record<string, string>
+
+    expect(env.CLAUDE_CODE_RESUME_INTERRUPTED_TURN).toBeUndefined()
   })
 
   test('uses bun entrypoint fallback on Windows dev mode', () => {
diff --git a/src/server/__tests__/workspace-service.test.ts b/src/server/__tests__/workspace-service.test.ts
index 408c7c3ed..a5a88ced9 100644
--- a/src/server/__tests__/workspace-service.test.ts
+++ b/src/server/__tests__/workspace-service.test.ts
@@ -394,7 +394,7 @@ describe('WorkspaceService', () => {
     })
   })
 
-  it('lists a single directory level with dotfiles excluded and directories first', async () => {
+  it('lists a single directory level with dotfiles included and directories first', async () => {
     const workDir = await makeTempDir('workspace-service-tree-')
     const service = new WorkspaceService(async () => workDir)
 
@@ -411,6 +411,7 @@ describe('WorkspaceService', () => {
       entries: [
         { name: 'a-dir', path: 'a-dir', isDirectory: true },
         { name: 'b-dir', path: 'b-dir', isDirectory: true },
+        { name: '.hidden.txt', path: '.hidden.txt', isDirectory: false },
         { name: 'z-file.txt', path: 'z-file.txt', isDirectory: false },
       ],
     })
diff --git a/src/server/services/conversationService.ts b/src/server/services/conversationService.ts
index 2418b8526..19afcfffc 100644
--- a/src/server/services/conversationService.ts
+++ b/src/server/services/conversationService.ts
@@ -925,6 +925,16 @@ export class ConversationService {
       CLAUDE_CODE_ENABLE_TASKS: '1',
       CLAUDE_CODE_ENABLE_SDK_FILE_CHECKPOINTING: '1',
       CLAUDE_CODE_DIAGNOSTICS_FILE: cliDiagnosticsPath,
+      // Desktop frequently restarts the SDK CLI in-place (stop generation,
+      // runtime/model switch, reconnect). When the previous turn was
+      // interrupted, print.ts only re-enqueues that interrupted user prompt if
+      // this env flag is enabled. Without it, the resumed transcript keeps the
+      // synthetic "[Request interrupted by user]" / "No response requested."
+      // pair, but the interrupted prompt is not actively resumed on restart,
+      // which can make follow-up turns appear to "forget" earlier user input.
+      ...(sdkUrl
+        ? { CLAUDE_CODE_RESUME_INTERRUPTED_TURN: '1' }
+        : {}),
       CLAUDE_COWORK_MEMORY_PATH_OVERRIDE: this.resolveDesktopAutoMemoryPath(workDir),
       CALLER_DIR: workDir,
       PWD: workDir,
diff --git a/src/server/services/workspaceService.ts b/src/server/services/workspaceService.ts
index 2d93e2902..54adac610 100644
--- a/src/server/services/workspaceService.ts
+++ b/src/server/services/workspaceService.ts
@@ -512,12 +512,14 @@ export class WorkspaceService {
       }
     }
     const visibleEntries = entries
-      .filter((entry) => !entry.name.startsWith('.'))
       .sort((a, b) => {
         if (a.isDirectory() !== b.isDirectory()) {
           return a.isDirectory() ? -1 : 1
         }
-        return a.name.localeCompare(b.name)
+        const aDot = a.name.startsWith('.') ? 0 : 1
+        const bDot = b.name.startsWith('.') ? 0 : 1
+        if (aDot !== bDot) return aDot - bDot
+        return a.name.replace(/^\./, '').localeCompare(b.name.replace(/^\./, ''))
       })
       .map((entry) => ({
         name: entry.name,