diff --git a/README.md b/README.md
index 97b930cd..eceaf511 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # Claude Code Haha
 
 <p align="center">
-  <img src="docs/images/logo-horizontal.jpg" alt="Claude Code Haha" width="480">
+  <img src="docs/images/app-icon.png" alt="Claude Code Haha" width="240">
 </p>
 
 <div align="center">
diff --git a/desktop/bun.lock b/desktop/bun.lock
index 52d20da9..13c4092d 100644
--- a/desktop/bun.lock
+++ b/desktop/bun.lock
@@ -7,6 +7,8 @@
       "dependencies": {
         "@tailwindcss/typography": "^0.5.19",
         "@types/dompurify": "^3.2.0",
+        "@xterm/addon-fit": "^0.11.0",
+        "@xterm/xterm": "^6.0.0",
         "dompurify": "^3.3.3",
         "lucide-react": "^0.469.0",
         "marked": "^15.0.7",
@@ -470,6 +472,10 @@
 
     "@vitest/utils": ["@vitest/utils@3.2.4", "https://registry.npmmirror.com/@vitest/utils/-/utils-3.2.4.tgz", { "dependencies": { "@vitest/pretty-format": "3.2.4", "loupe": "^3.1.4", "tinyrainbow": "^2.0.0" } }, "sha512-fB2V0JFrQSMsCo9HiSq3Ezpdv4iYaXRG1Sx8edX3MwxfyNn83mKiGzOcH+Fkxt4MHxr3y42fQi1oeAInqgX2QA=="],
 
+    "@xterm/addon-fit": ["@xterm/addon-fit@0.11.0", "https://registry.npmmirror.com/@xterm/addon-fit/-/addon-fit-0.11.0.tgz", {}, "sha512-jYcgT6xtVYhnhgxh3QgYDnnNMYTcf8ElbxxFzX0IZo+vabQqSPAjC3c1wJrKB5E19VwQei89QCiZZP86DCPF7g=="],
+
+    "@xterm/xterm": ["@xterm/xterm@6.0.0", "https://registry.npmmirror.com/@xterm/xterm/-/xterm-6.0.0.tgz", {}, "sha512-TQwDdQGtwwDt+2cgKDLn0IRaSxYu1tSUjgKarSDkUM0ZNiSRXFpjxEsvc/Zgc5kq5omJ+V0a8/kIM2WD3sMOYg=="],
+
     "acorn": ["acorn@8.16.0", "https://registry.npmmirror.com/acorn/-/acorn-8.16.0.tgz", { "bin": { "acorn": "bin/acorn" } }, "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw=="],
 
     "agent-base": ["agent-base@7.1.4", "https://registry.npmmirror.com/agent-base/-/agent-base-7.1.4.tgz", {}, "sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ=="],
diff --git a/desktop/package.json b/desktop/package.json
index b43d7818..7cd33e83 100644
--- a/desktop/package.json
+++ b/desktop/package.json
@@ -18,6 +18,8 @@
   "dependencies": {
     "@tailwindcss/typography": "^0.5.19",
     "@types/dompurify": "^3.2.0",
+    "@xterm/addon-fit": "^0.11.0",
+    "@xterm/xterm": "^6.0.0",
     "dompurify": "^3.3.3",
     "lucide-react": "^0.469.0",
     "marked": "^15.0.7",
diff --git a/desktop/public/app-icon.jpg b/desktop/public/app-icon.jpg
deleted file mode 100644
index 03098747..00000000
Binary files a/desktop/public/app-icon.jpg and /dev/null differ
diff --git a/desktop/public/app-icon.png b/desktop/public/app-icon.png
index 4f415f61..02f20c4c 100644
Binary files a/desktop/public/app-icon.png and b/desktop/public/app-icon.png differ
diff --git a/desktop/public/app-icon.svg b/desktop/public/app-icon.svg
new file mode 100644
index 00000000..582d3c54
--- /dev/null
+++ b/desktop/public/app-icon.svg
@@ -0,0 +1,17 @@
+<svg width="1024" height="1024" viewBox="0 0 1024 1024" fill="none" xmlns="http://www.w3.org/2000/svg">
+
+<defs>
+  <linearGradient id="accent" x1="684" y1="298" x2="834" y2="726" gradientUnits="userSpaceOnUse">
+    <stop stop-color="#F6B34C"/>
+    <stop offset="1" stop-color="#FF8A2A"/>
+  </linearGradient>
+</defs>
+
+<g>
+
+  <path d="M310 350 L510 512 L310 674" stroke="#20242E" stroke-width="64" stroke-linecap="round" stroke-linejoin="round"/>
+  <rect x="440" y="690" width="120" height="48" rx="20" fill="#20242E"/>
+  <path d="M684 298 H834 V726 H684" stroke="url(#accent)" stroke-width="64" stroke-linecap="round" stroke-linejoin="round"/>
+  <path d="M592 334L608.8 385.2L660 402L608.8 418.8L592 470L575.2 418.8L524 402L575.2 385.2L592 334Z" fill="#F5A623"/>
+</g>
+</svg>
diff --git a/desktop/scripts/build-sidecars.ts b/desktop/scripts/build-sidecars.ts
index 5c01096a..a46293dc 100644
--- a/desktop/scripts/build-sidecars.ts
+++ b/desktop/scripts/build-sidecars.ts
@@ -162,21 +162,25 @@ async function compileExecutable({
   // that causes "load code signature error 4" and SIGKILL at launch.
   // Fix: strip the broken signature, then ad-hoc sign.
   if (process.platform === 'darwin') {
-    console.log(`[build-sidecars] ad-hoc signing ${outputPath} for macOS ...`)
-    const strip = Bun.spawn(['codesign', '--remove-signature', outputPath], {
-      stdout: 'inherit',
-      stderr: 'inherit',
-    })
-    await strip.exited
-
-    const sign = Bun.spawn(
-      ['codesign', '--sign', '-', '--force', '--timestamp=none', outputPath],
-      { stdout: 'inherit', stderr: 'inherit' },
-    )
-    const signExit = await sign.exited
-    if (signExit !== 0) {
-      throw new Error(`[build-sidecars] ad-hoc codesign failed for ${outputPath} (exit ${signExit})`)
-    }
-    console.log(`[build-sidecars] ad-hoc signed ${outputPath}`)
+    await adHocSignMacBinary(outputPath)
   }
 }
+
+async function adHocSignMacBinary(outputPath: string) {
+  console.log(`[build-sidecars] ad-hoc signing ${outputPath} for macOS ...`)
+  const strip = Bun.spawn(['codesign', '--remove-signature', outputPath], {
+    stdout: 'inherit',
+    stderr: 'inherit',
+  })
+  await strip.exited
+
+  const sign = Bun.spawn(
+    ['codesign', '--sign', '-', '--force', '--timestamp=none', outputPath],
+    { stdout: 'inherit', stderr: 'inherit' },
+  )
+  const signExit = await sign.exited
+  if (signExit !== 0) {
+    throw new Error(`[build-sidecars] ad-hoc codesign failed for ${outputPath} (exit ${signExit})`)
+  }
+  console.log(`[build-sidecars] ad-hoc signed ${outputPath}`)
+}
diff --git a/desktop/sidecars/claude-sidecar.ts b/desktop/sidecars/claude-sidecar.ts
index db070432..cd0937f0 100644
--- a/desktop/sidecars/claude-sidecar.ts
+++ b/desktop/sidecars/claude-sidecar.ts
@@ -17,18 +17,21 @@
  * launcher-only 参数。
  */
 
+import { parseLauncherArgs, resolveSidecarInvocation } from './launcherRouting'
+
 const rawArgs = process.argv.slice(2)
-if (rawArgs.length === 0) {
+const invocation = resolveSidecarInvocation(rawArgs)
+if (!invocation.mode) {
   console.error('claude-sidecar: missing mode argument (expected "server", "cli" or "adapters")')
   process.exit(2)
 }
-const mode = rawArgs[0]!
-const restArgs = rawArgs.slice(1)
+const mode = invocation.mode
+const restArgs = invocation.restArgs
 
 if (mode === 'adapters') {
   await runAdapters(restArgs)
 } else {
-  const { appRoot, args } = parseLauncherArgs(restArgs)
+  const { appRoot, args } = parseLauncherArgs(restArgs, invocation.defaultAppRoot)
 
   process.env.CLAUDE_APP_ROOT = appRoot
   process.env.CALLER_DIR ||= process.cwd()
@@ -133,24 +136,3 @@ async function runAdapters(rawArgs: string[]): Promise<void> {
   // / grammY long-polling）持有 event loop，自然不会退出。这里不需要额外
   // setInterval 兜底。两个 adapter 自己注册的 SIGINT handler 都会触发。
 }
-
-function parseLauncherArgs(rawArgs: string[]): { appRoot: string; args: string[] } {
-  const nextArgs: string[] = []
-  let appRoot: string | null = process.env.CLAUDE_APP_ROOT ?? null
-
-  for (let index = 0; index < rawArgs.length; index++) {
-    const arg = rawArgs[index]
-    if (arg === '--app-root') {
-      appRoot = rawArgs[index + 1] ?? null
-      index += 1
-      continue
-    }
-    nextArgs.push(arg!)
-  }
-
-  if (!appRoot) {
-    throw new Error('Missing --app-root for claude-sidecar')
-  }
-
-  return { appRoot, args: nextArgs }
-}
diff --git a/desktop/sidecars/launcherRouting.test.ts b/desktop/sidecars/launcherRouting.test.ts
new file mode 100644
index 00000000..84d26637
--- /dev/null
+++ b/desktop/sidecars/launcherRouting.test.ts
@@ -0,0 +1,54 @@
+import { describe, expect, it } from 'vitest'
+
+import { parseLauncherArgs, resolveSidecarInvocation } from './launcherRouting'
+
+describe('resolveSidecarInvocation', () => {
+  it('keeps explicit sidecar modes unchanged', () => {
+    expect(
+      resolveSidecarInvocation(
+        ['server', '--host', '127.0.0.1'],
+        '/tmp/claude-sidecar',
+      ),
+    ).toEqual({
+      mode: 'server',
+      restArgs: ['--host', '127.0.0.1'],
+      defaultAppRoot: null,
+    })
+  })
+
+  it('defaults claude-haha invocations to cli mode', () => {
+    expect(
+      resolveSidecarInvocation(
+        ['plugin', 'install', 'demo'],
+        '/Users/demo/.local/bin/claude-haha',
+      ),
+    ).toEqual({
+      mode: 'cli',
+      restArgs: ['plugin', 'install', 'demo'],
+      defaultAppRoot: '/Users/demo/.local/bin',
+    })
+  })
+})
+
+describe('parseLauncherArgs', () => {
+  it('falls back to the provided default app root', () => {
+    expect(
+      parseLauncherArgs(['plugin', 'install', 'demo'], '/Users/demo/.local/bin'),
+    ).toEqual({
+      appRoot: '/Users/demo/.local/bin',
+      args: ['plugin', 'install', 'demo'],
+    })
+  })
+
+  it('lets explicit app root override the default', () => {
+    expect(
+      parseLauncherArgs(
+        ['--app-root', '/tmp/app', 'plugin', 'install', 'demo'],
+        '/Users/demo/.local/bin',
+      ),
+    ).toEqual({
+      appRoot: '/tmp/app',
+      args: ['plugin', 'install', 'demo'],
+    })
+  })
+})
diff --git a/desktop/sidecars/launcherRouting.ts b/desktop/sidecars/launcherRouting.ts
new file mode 100644
index 00000000..2af59c6a
--- /dev/null
+++ b/desktop/sidecars/launcherRouting.ts
@@ -0,0 +1,64 @@
+import path from 'node:path'
+
+export type SidecarMode = 'server' | 'cli' | 'adapters'
+
+const EXPLICIT_MODES = new Set<SidecarMode>(['server', 'cli', 'adapters'])
+const DESKTOP_CLI_NAMES = new Set(['claude-haha', 'claude-haha.exe'])
+
+export function resolveSidecarInvocation(
+  rawArgs: string[],
+  execPath: string = process.execPath,
+  envAppRoot: string | null = process.env.CLAUDE_APP_ROOT ?? null,
+): {
+  mode: SidecarMode | null
+  restArgs: string[]
+  defaultAppRoot: string | null
+} {
+  const explicitMode = rawArgs[0]
+  if (explicitMode && EXPLICIT_MODES.has(explicitMode as SidecarMode)) {
+    return {
+      mode: explicitMode as SidecarMode,
+      restArgs: rawArgs.slice(1),
+      defaultAppRoot: envAppRoot,
+    }
+  }
+
+  const execName = path.basename(execPath).toLowerCase()
+  if (DESKTOP_CLI_NAMES.has(execName)) {
+    return {
+      mode: 'cli',
+      restArgs: rawArgs,
+      defaultAppRoot: envAppRoot ?? path.dirname(execPath),
+    }
+  }
+
+  return {
+    mode: null,
+    restArgs: rawArgs,
+    defaultAppRoot: envAppRoot,
+  }
+}
+
+export function parseLauncherArgs(
+  rawArgs: string[],
+  defaultAppRoot: string | null = process.env.CLAUDE_APP_ROOT ?? null,
+): { appRoot: string; args: string[] } {
+  const nextArgs: string[] = []
+  let appRoot: string | null = defaultAppRoot
+
+  for (let index = 0; index < rawArgs.length; index++) {
+    const arg = rawArgs[index]
+    if (arg === '--app-root') {
+      appRoot = rawArgs[index + 1] ?? null
+      index += 1
+      continue
+    }
+    nextArgs.push(arg!)
+  }
+
+  if (!appRoot) {
+    throw new Error('Missing --app-root for claude-sidecar')
+  }
+
+  return { appRoot, args: nextArgs }
+}
diff --git a/desktop/src-tauri/Cargo.lock b/desktop/src-tauri/Cargo.lock
index 98b02845..8933a60e 100644
--- a/desktop/src-tauri/Cargo.lock
+++ b/desktop/src-tauri/Cargo.lock
@@ -309,6 +309,12 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
 
+[[package]]
+name = "cfg_aliases"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e"
+
 [[package]]
 name = "chrono"
 version = "0.4.44"
@@ -325,6 +331,8 @@ dependencies = [
 name = "claude-code-desktop"
 version = "0.1.5"
 dependencies = [
+ "anyhow",
+ "portable-pty",
  "serde",
  "serde_json",
  "tauri",
@@ -675,6 +683,12 @@ dependencies = [
  "tendril 0.5.0",
 ]
 
+[[package]]
+name = "downcast-rs"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2"
+
 [[package]]
 name = "dpi"
 version = "0.1.2"
@@ -722,7 +736,7 @@ dependencies = [
  "rustc_version",
  "toml 0.9.12+spec-1.1.0",
  "vswhom",
- "winreg",
+ "winreg 0.55.0",
 ]
 
 [[package]]
@@ -792,6 +806,17 @@ dependencies = [
  "rustc_version",
 ]
 
+[[package]]
+name = "filedescriptor"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e40758ed24c9b2eeb76c35fb0aebc66c626084edd827e07e1552279814c6682d"
+dependencies = [
+ "libc",
+ "thiserror 1.0.69",
+ "winapi",
+]
+
 [[package]]
 name = "filetime"
 version = "0.2.27"
@@ -1771,6 +1796,12 @@ dependencies = [
  "selectors 0.24.0",
 ]
 
+[[package]]
+name = "lazy_static"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
+
 [[package]]
 name = "leb128fmt"
 version = "0.1.0"
@@ -2009,6 +2040,18 @@ version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086"
 
+[[package]]
+name = "nix"
+version = "0.28.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4"
+dependencies = [
+ "bitflags 2.11.1",
+ "cfg-if",
+ "cfg_aliases",
+ "libc",
+]
+
 [[package]]
 name = "nodrop"
 version = "0.1.14"
@@ -2533,6 +2576,27 @@ dependencies = [
  "miniz_oxide",
 ]
 
+[[package]]
+name = "portable-pty"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b4a596a2b3d2752d94f51fac2d4a96737b8705dddd311a32b9af47211f08671e"
+dependencies = [
+ "anyhow",
+ "bitflags 1.3.2",
+ "downcast-rs",
+ "filedescriptor",
+ "lazy_static",
+ "libc",
+ "log",
+ "nix",
+ "serial2",
+ "shared_library",
+ "shell-words",
+ "winapi",
+ "winreg 0.10.1",
+]
+
 [[package]]
 name = "potential_utf"
 version = "0.1.5"
@@ -3291,6 +3355,17 @@ dependencies = [
  "syn 2.0.117",
 ]
 
+[[package]]
+name = "serial2"
+version = "0.2.36"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fcdbc46aa3882ec3d48ec2b5abcb4f0d863a13d7599265f3faa6d851f23c12f3"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "winapi",
+]
+
 [[package]]
 name = "serialize-to-javascript"
 version = "0.1.2"
@@ -3354,6 +3429,22 @@ dependencies = [
  "windows-sys 0.60.2",
 ]
 
+[[package]]
+name = "shared_library"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a9e7e0f2bfae24d8a5b5a66c5b257a83c7412304311512a0c054cd5e619da11"
+dependencies = [
+ "lazy_static",
+ "libc",
+]
+
+[[package]]
+name = "shell-words"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc6fe69c597f9c37bfeeeeeb33da3530379845f10be461a66d16d03eca2ded77"
+
 [[package]]
 name = "shlex"
 version = "1.3.0"
@@ -5242,6 +5333,15 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "winreg"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d"
+dependencies = [
+ "winapi",
+]
+
 [[package]]
 name = "winreg"
 version = "0.55.0"
diff --git a/desktop/src-tauri/Cargo.toml b/desktop/src-tauri/Cargo.toml
index 03f749e0..98f28b9d 100644
--- a/desktop/src-tauri/Cargo.toml
+++ b/desktop/src-tauri/Cargo.toml
@@ -18,3 +18,5 @@ tauri-plugin-process = "2"
 tauri-plugin-updater = "2"
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
+anyhow = "1.0.102"
+portable-pty = "0.9.0"
diff --git a/desktop/src-tauri/app-icon-macos.svg b/desktop/src-tauri/app-icon-macos.svg
new file mode 100644
index 00000000..af11a9e2
--- /dev/null
+++ b/desktop/src-tauri/app-icon-macos.svg
@@ -0,0 +1,42 @@
+<svg width="1024" height="1024" viewBox="0 0 1024 1024" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <defs>
+    <linearGradient id="panel" x1="190" y1="168" x2="842" y2="860" gradientUnits="userSpaceOnUse">
+      <stop stop-color="#231916"/>
+      <stop offset="1" stop-color="#18110F"/>
+    </linearGradient>
+    <linearGradient id="panelGlow" x1="256" y1="172" x2="744" y2="852" gradientUnits="userSpaceOnUse">
+      <stop stop-color="#7A3B20"/>
+      <stop offset="1" stop-color="#2B1813"/>
+    </linearGradient>
+    <radialGradient id="spark" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(592 402) rotate(90) scale(130)">
+      <stop stop-color="#FFD56A"/>
+      <stop offset="1" stop-color="#F6B23E"/>
+    </radialGradient>
+    <filter id="sparkGlow" x="470" y="280" width="244" height="244" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+      <feGaussianBlur stdDeviation="18" result="blur"/>
+      <feColorMatrix in="blur" type="matrix" values="1 0 0 0 0.95 0 1 0 0 0.63 0 0 1 0 0.14 0 0 0 0.7 0"/>
+      <feBlend in="SourceGraphic"/>
+    </filter>
+    <linearGradient id="accent" x1="684" y1="298" x2="834" y2="726" gradientUnits="userSpaceOnUse">
+      <stop stop-color="#F6B34C"/>
+      <stop offset="1" stop-color="#FF8A2A"/>
+    </linearGradient>
+    <linearGradient id="sheen" x1="244" y1="224" x2="448" y2="430" gradientUnits="userSpaceOnUse">
+      <stop stop-color="white" stop-opacity="0.22"/>
+      <stop offset="1" stop-color="white" stop-opacity="0"/>
+    </linearGradient>
+  </defs>
+
+  <rect x="120" y="120" width="784" height="784" rx="180" fill="url(#panel)"/>
+  <rect x="124" y="124" width="776" height="776" rx="176" stroke="url(#panelGlow)" stroke-width="8"/>
+  <path d="M236 260C324 190 464 170 612 206" stroke="#5C2E1D" stroke-width="18" stroke-linecap="round" opacity="0.58"/>
+  <path d="M214 760C366 824 566 824 718 754" stroke="#5C2E1D" stroke-width="18" stroke-linecap="round" opacity="0.4"/>
+  <ellipse cx="370" cy="292" rx="136" ry="92" fill="url(#sheen)"/>
+
+  <path d="M310 350L510 512L310 674" stroke="#F5F0E6" stroke-width="64" stroke-linecap="round" stroke-linejoin="round"/>
+  <rect x="440" y="690" width="120" height="48" rx="20" fill="#F5F0E6"/>
+  <path d="M684 298H834V726H684" stroke="url(#accent)" stroke-width="64" stroke-linecap="round" stroke-linejoin="round"/>
+  <g filter="url(#sparkGlow)">
+    <path d="M592 334L608.8 385.2L660 402L608.8 418.8L592 470L575.2 418.8L524 402L575.2 385.2L592 334Z" fill="url(#spark)"/>
+  </g>
+</svg>
diff --git a/desktop/src-tauri/app-icon.svg b/desktop/src-tauri/app-icon.svg
index 2ddf7d13..f4f73e67 100644
--- a/desktop/src-tauri/app-icon.svg
+++ b/desktop/src-tauri/app-icon.svg
@@ -1,67 +1,16 @@
-<svg width="512" height="512" viewBox="0 0 512 512" fill="none" xmlns="http://www.w3.org/2000/svg">
-  <defs>
-    <linearGradient id="cardSurface" x1="108" y1="82" x2="387" y2="430" gradientUnits="userSpaceOnUse">
-      <stop stop-color="#FFFEFC"/>
-      <stop offset="0.54" stop-color="#F5F2ED"/>
-      <stop offset="1" stop-color="#DDD8D2"/>
-    </linearGradient>
-    <linearGradient id="cardGloss" x1="256" y1="84" x2="256" y2="247" gradientUnits="userSpaceOnUse">
-      <stop stop-color="#FFFFFF" stop-opacity="0.9"/>
-      <stop offset="1" stop-color="#FFFFFF" stop-opacity="0"/>
-    </linearGradient>
-    <linearGradient id="brandStroke" x1="156" y1="144" x2="372" y2="386" gradientUnits="userSpaceOnUse">
-      <stop stop-color="#FF9A72"/>
-      <stop offset="0.52" stop-color="#F18258"/>
-      <stop offset="1" stop-color="#C86439"/>
-    </linearGradient>
-    <linearGradient id="brandSpark" x1="256" y1="145" x2="256" y2="263" gradientUnits="userSpaceOnUse">
-      <stop stop-color="#FFB08B"/>
-      <stop offset="0.58" stop-color="#FF8A62"/>
-      <stop offset="1" stop-color="#E26C45"/>
-    </linearGradient>
-    <filter id="cardShadow" x="64" y="76" width="384" height="392" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
-      <feDropShadow dx="0" dy="18" stdDeviation="18" flood-color="#534330" flood-opacity="0.22"/>
-    </filter>
-  </defs>
+<svg width="1024" height="1024" viewBox="0 0 1024 1024" fill="none" xmlns="http://www.w3.org/2000/svg">
 
-  <g filter="url(#cardShadow)">
-    <rect x="96" y="92" width="320" height="320" rx="82" fill="url(#cardSurface)"/>
-    <rect x="96.75" y="92.75" width="318.5" height="318.5" rx="81.25" stroke="#F5F1EB" stroke-width="1.5"/>
-    <path d="M121 146C168 117 231 107 302 118C344 124 379 138 405 159V239C370 222 324 211 273 208C210 203 158 188 121 163V146Z" fill="url(#cardGloss)"/>
-  </g>
+<defs>
+  <linearGradient id="accent" x1="684" y1="298" x2="834" y2="726" gradientUnits="userSpaceOnUse">
+    <stop stop-color="#F6B34C"/>
+    <stop offset="1" stop-color="#FF8A2A"/>
+  </linearGradient>
+</defs>
 
-  <g transform="translate(-22 -18) scale(1.06)">
-    <path
-      d="M168 193L230 255L168 317"
-      stroke="url(#brandStroke)"
-      stroke-width="33"
-      stroke-linecap="round"
-      stroke-linejoin="round"
-    />
-    <path
-      d="M344 178L391 189L341 348L303 338"
-      stroke="url(#brandStroke)"
-      stroke-width="30"
-      stroke-linecap="round"
-      stroke-linejoin="round"
-    />
-    <path
-      d="M225 332C245 349 272 350 295 333"
-      stroke="url(#brandStroke)"
-      stroke-width="17"
-      stroke-linecap="round"
-      stroke-linejoin="round"
-    />
-    <path
-      d="M301 253C310 242 323 243 331 251"
-      stroke="url(#brandStroke)"
-      stroke-width="15"
-      stroke-linecap="round"
-      stroke-linejoin="round"
-    />
-    <path
-      d="M256 145L265 176L296 167L272 191L295 213L264 207L256 238L248 207L217 213L240 191L216 167L247 176L256 145Z"
-      fill="url(#brandSpark)"
-    />
-  </g>
+<g>
+  <path d="M310 350 L510 512 L310 674" stroke="#20242E" stroke-width="64" stroke-linecap="round" stroke-linejoin="round"/>
+  <rect x="440" y="690" width="120" height="48" rx="20" fill="#20242E"/>
+  <path d="M684 298 H834 V726 H684" stroke="url(#accent)" stroke-width="64" stroke-linecap="round" stroke-linejoin="round"/>
+  <path d="M592 334L608.8 385.2L660 402L608.8 418.8L592 470L575.2 418.8L524 402L575.2 385.2L592 334Z" fill="#F5A623"/>
+</g>
 </svg>
diff --git a/desktop/src-tauri/icons/128x128.png b/desktop/src-tauri/icons/128x128.png
index 4385cafb..9c55c9b0 100644
Binary files a/desktop/src-tauri/icons/128x128.png and b/desktop/src-tauri/icons/128x128.png differ
diff --git a/desktop/src-tauri/icons/128x128@2x.png b/desktop/src-tauri/icons/128x128@2x.png
index 23031353..3993a862 100644
Binary files a/desktop/src-tauri/icons/128x128@2x.png and b/desktop/src-tauri/icons/128x128@2x.png differ
diff --git a/desktop/src-tauri/icons/32x32.png b/desktop/src-tauri/icons/32x32.png
index bd182b75..9e7fee4e 100644
Binary files a/desktop/src-tauri/icons/32x32.png and b/desktop/src-tauri/icons/32x32.png differ
diff --git a/desktop/src-tauri/icons/64x64.png b/desktop/src-tauri/icons/64x64.png
index 2d11cacd..1af7f418 100644
Binary files a/desktop/src-tauri/icons/64x64.png and b/desktop/src-tauri/icons/64x64.png differ
diff --git a/desktop/src-tauri/icons/Square107x107Logo.png b/desktop/src-tauri/icons/Square107x107Logo.png
index 75743661..93827f1b 100644
Binary files a/desktop/src-tauri/icons/Square107x107Logo.png and b/desktop/src-tauri/icons/Square107x107Logo.png differ
diff --git a/desktop/src-tauri/icons/Square142x142Logo.png b/desktop/src-tauri/icons/Square142x142Logo.png
index e1cdbdea..2cb58edb 100644
Binary files a/desktop/src-tauri/icons/Square142x142Logo.png and b/desktop/src-tauri/icons/Square142x142Logo.png differ
diff --git a/desktop/src-tauri/icons/Square150x150Logo.png b/desktop/src-tauri/icons/Square150x150Logo.png
index e9236bac..296ecbfb 100644
Binary files a/desktop/src-tauri/icons/Square150x150Logo.png and b/desktop/src-tauri/icons/Square150x150Logo.png differ
diff --git a/desktop/src-tauri/icons/Square284x284Logo.png b/desktop/src-tauri/icons/Square284x284Logo.png
index e82297e3..983a93a2 100644
Binary files a/desktop/src-tauri/icons/Square284x284Logo.png and b/desktop/src-tauri/icons/Square284x284Logo.png differ
diff --git a/desktop/src-tauri/icons/Square30x30Logo.png b/desktop/src-tauri/icons/Square30x30Logo.png
index 8c78c988..330ee213 100644
Binary files a/desktop/src-tauri/icons/Square30x30Logo.png and b/desktop/src-tauri/icons/Square30x30Logo.png differ
diff --git a/desktop/src-tauri/icons/Square310x310Logo.png b/desktop/src-tauri/icons/Square310x310Logo.png
index 281538d2..c371943a 100644
Binary files a/desktop/src-tauri/icons/Square310x310Logo.png and b/desktop/src-tauri/icons/Square310x310Logo.png differ
diff --git a/desktop/src-tauri/icons/Square44x44Logo.png b/desktop/src-tauri/icons/Square44x44Logo.png
index 510dbf79..266ea978 100644
Binary files a/desktop/src-tauri/icons/Square44x44Logo.png and b/desktop/src-tauri/icons/Square44x44Logo.png differ
diff --git a/desktop/src-tauri/icons/Square71x71Logo.png b/desktop/src-tauri/icons/Square71x71Logo.png
index 90ac2049..4e5e1a81 100644
Binary files a/desktop/src-tauri/icons/Square71x71Logo.png and b/desktop/src-tauri/icons/Square71x71Logo.png differ
diff --git a/desktop/src-tauri/icons/Square89x89Logo.png b/desktop/src-tauri/icons/Square89x89Logo.png
index c266dc85..cac6b571 100644
Binary files a/desktop/src-tauri/icons/Square89x89Logo.png and b/desktop/src-tauri/icons/Square89x89Logo.png differ
diff --git a/desktop/src-tauri/icons/StoreLogo.png b/desktop/src-tauri/icons/StoreLogo.png
index cd0c0266..dc2cc91d 100644
Binary files a/desktop/src-tauri/icons/StoreLogo.png and b/desktop/src-tauri/icons/StoreLogo.png differ
diff --git a/desktop/src-tauri/icons/android/mipmap-hdpi/ic_launcher.png b/desktop/src-tauri/icons/android/mipmap-hdpi/ic_launcher.png
index 533478c5..c37e2cda 100644
Binary files a/desktop/src-tauri/icons/android/mipmap-hdpi/ic_launcher.png and b/desktop/src-tauri/icons/android/mipmap-hdpi/ic_launcher.png differ
diff --git a/desktop/src-tauri/icons/android/mipmap-hdpi/ic_launcher_foreground.png b/desktop/src-tauri/icons/android/mipmap-hdpi/ic_launcher_foreground.png
index a6b36bac..274bb8df 100644
Binary files a/desktop/src-tauri/icons/android/mipmap-hdpi/ic_launcher_foreground.png and b/desktop/src-tauri/icons/android/mipmap-hdpi/ic_launcher_foreground.png differ
diff --git a/desktop/src-tauri/icons/android/mipmap-hdpi/ic_launcher_round.png b/desktop/src-tauri/icons/android/mipmap-hdpi/ic_launcher_round.png
index 9332b6a1..c5a1d511 100644
Binary files a/desktop/src-tauri/icons/android/mipmap-hdpi/ic_launcher_round.png and b/desktop/src-tauri/icons/android/mipmap-hdpi/ic_launcher_round.png differ
diff --git a/desktop/src-tauri/icons/android/mipmap-mdpi/ic_launcher.png b/desktop/src-tauri/icons/android/mipmap-mdpi/ic_launcher.png
index fb28c4fc..806a5227 100644
Binary files a/desktop/src-tauri/icons/android/mipmap-mdpi/ic_launcher.png and b/desktop/src-tauri/icons/android/mipmap-mdpi/ic_launcher.png differ
diff --git a/desktop/src-tauri/icons/android/mipmap-mdpi/ic_launcher_foreground.png b/desktop/src-tauri/icons/android/mipmap-mdpi/ic_launcher_foreground.png
index 092b10a8..ffa26a92 100644
Binary files a/desktop/src-tauri/icons/android/mipmap-mdpi/ic_launcher_foreground.png and b/desktop/src-tauri/icons/android/mipmap-mdpi/ic_launcher_foreground.png differ
diff --git a/desktop/src-tauri/icons/android/mipmap-mdpi/ic_launcher_round.png b/desktop/src-tauri/icons/android/mipmap-mdpi/ic_launcher_round.png
index 3b7fa755..671e6925 100644
Binary files a/desktop/src-tauri/icons/android/mipmap-mdpi/ic_launcher_round.png and b/desktop/src-tauri/icons/android/mipmap-mdpi/ic_launcher_round.png differ
diff --git a/desktop/src-tauri/icons/android/mipmap-xhdpi/ic_launcher.png b/desktop/src-tauri/icons/android/mipmap-xhdpi/ic_launcher.png
index afb60a52..2b73cacd 100644
Binary files a/desktop/src-tauri/icons/android/mipmap-xhdpi/ic_launcher.png and b/desktop/src-tauri/icons/android/mipmap-xhdpi/ic_launcher.png differ
diff --git a/desktop/src-tauri/icons/android/mipmap-xhdpi/ic_launcher_foreground.png b/desktop/src-tauri/icons/android/mipmap-xhdpi/ic_launcher_foreground.png
index 9fe160e6..6f8a6591 100644
Binary files a/desktop/src-tauri/icons/android/mipmap-xhdpi/ic_launcher_foreground.png and b/desktop/src-tauri/icons/android/mipmap-xhdpi/ic_launcher_foreground.png differ
diff --git a/desktop/src-tauri/icons/android/mipmap-xhdpi/ic_launcher_round.png b/desktop/src-tauri/icons/android/mipmap-xhdpi/ic_launcher_round.png
index 9ecb360d..d14ea701 100644
Binary files a/desktop/src-tauri/icons/android/mipmap-xhdpi/ic_launcher_round.png and b/desktop/src-tauri/icons/android/mipmap-xhdpi/ic_launcher_round.png differ
diff --git a/desktop/src-tauri/icons/android/mipmap-xxhdpi/ic_launcher.png b/desktop/src-tauri/icons/android/mipmap-xxhdpi/ic_launcher.png
index 8f4a2816..ec497f3f 100644
Binary files a/desktop/src-tauri/icons/android/mipmap-xxhdpi/ic_launcher.png and b/desktop/src-tauri/icons/android/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/desktop/src-tauri/icons/android/mipmap-xxhdpi/ic_launcher_foreground.png b/desktop/src-tauri/icons/android/mipmap-xxhdpi/ic_launcher_foreground.png
index 2dbd7801..4cd2cce0 100644
Binary files a/desktop/src-tauri/icons/android/mipmap-xxhdpi/ic_launcher_foreground.png and b/desktop/src-tauri/icons/android/mipmap-xxhdpi/ic_launcher_foreground.png differ
diff --git a/desktop/src-tauri/icons/android/mipmap-xxhdpi/ic_launcher_round.png b/desktop/src-tauri/icons/android/mipmap-xxhdpi/ic_launcher_round.png
index 1cc8ed6d..686cba35 100644
Binary files a/desktop/src-tauri/icons/android/mipmap-xxhdpi/ic_launcher_round.png and b/desktop/src-tauri/icons/android/mipmap-xxhdpi/ic_launcher_round.png differ
diff --git a/desktop/src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher.png b/desktop/src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher.png
index e4fd63d6..8b79823a 100644
Binary files a/desktop/src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher.png and b/desktop/src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/desktop/src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher_foreground.png b/desktop/src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher_foreground.png
index e19625b1..cc36933d 100644
Binary files a/desktop/src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher_foreground.png and b/desktop/src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher_foreground.png differ
diff --git a/desktop/src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher_round.png b/desktop/src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher_round.png
index 13d5f894..d991e6f6 100644
Binary files a/desktop/src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher_round.png and b/desktop/src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher_round.png differ
diff --git a/desktop/src-tauri/icons/icon.icns b/desktop/src-tauri/icons/icon.icns
index c005481d..398851de 100644
Binary files a/desktop/src-tauri/icons/icon.icns and b/desktop/src-tauri/icons/icon.icns differ
diff --git a/desktop/src-tauri/icons/icon.ico b/desktop/src-tauri/icons/icon.ico
index c914299a..f951ee90 100644
Binary files a/desktop/src-tauri/icons/icon.ico and b/desktop/src-tauri/icons/icon.ico differ
diff --git a/desktop/src-tauri/icons/icon.png b/desktop/src-tauri/icons/icon.png
index 4f415f61..bf3255e0 100644
Binary files a/desktop/src-tauri/icons/icon.png and b/desktop/src-tauri/icons/icon.png differ
diff --git a/desktop/src-tauri/icons/ios/AppIcon-20x20@1x.png b/desktop/src-tauri/icons/ios/AppIcon-20x20@1x.png
index ea97dfb1..a166f1f6 100644
Binary files a/desktop/src-tauri/icons/ios/AppIcon-20x20@1x.png and b/desktop/src-tauri/icons/ios/AppIcon-20x20@1x.png differ
diff --git a/desktop/src-tauri/icons/ios/AppIcon-20x20@2x-1.png b/desktop/src-tauri/icons/ios/AppIcon-20x20@2x-1.png
index 04ff6a6e..f01debfa 100644
Binary files a/desktop/src-tauri/icons/ios/AppIcon-20x20@2x-1.png and b/desktop/src-tauri/icons/ios/AppIcon-20x20@2x-1.png differ
diff --git a/desktop/src-tauri/icons/ios/AppIcon-20x20@2x.png b/desktop/src-tauri/icons/ios/AppIcon-20x20@2x.png
index 04ff6a6e..f01debfa 100644
Binary files a/desktop/src-tauri/icons/ios/AppIcon-20x20@2x.png and b/desktop/src-tauri/icons/ios/AppIcon-20x20@2x.png differ
diff --git a/desktop/src-tauri/icons/ios/AppIcon-20x20@3x.png b/desktop/src-tauri/icons/ios/AppIcon-20x20@3x.png
index 98bc7501..6d48bc00 100644
Binary files a/desktop/src-tauri/icons/ios/AppIcon-20x20@3x.png and b/desktop/src-tauri/icons/ios/AppIcon-20x20@3x.png differ
diff --git a/desktop/src-tauri/icons/ios/AppIcon-29x29@1x.png b/desktop/src-tauri/icons/ios/AppIcon-29x29@1x.png
index d222072e..437dce50 100644
Binary files a/desktop/src-tauri/icons/ios/AppIcon-29x29@1x.png and b/desktop/src-tauri/icons/ios/AppIcon-29x29@1x.png differ
diff --git a/desktop/src-tauri/icons/ios/AppIcon-29x29@2x-1.png b/desktop/src-tauri/icons/ios/AppIcon-29x29@2x-1.png
index 2b1b3a85..9bfa4244 100644
Binary files a/desktop/src-tauri/icons/ios/AppIcon-29x29@2x-1.png and b/desktop/src-tauri/icons/ios/AppIcon-29x29@2x-1.png differ
diff --git a/desktop/src-tauri/icons/ios/AppIcon-29x29@2x.png b/desktop/src-tauri/icons/ios/AppIcon-29x29@2x.png
index 2b1b3a85..9bfa4244 100644
Binary files a/desktop/src-tauri/icons/ios/AppIcon-29x29@2x.png and b/desktop/src-tauri/icons/ios/AppIcon-29x29@2x.png differ
diff --git a/desktop/src-tauri/icons/ios/AppIcon-29x29@3x.png b/desktop/src-tauri/icons/ios/AppIcon-29x29@3x.png
index fa40e74c..a43989b0 100644
Binary files a/desktop/src-tauri/icons/ios/AppIcon-29x29@3x.png and b/desktop/src-tauri/icons/ios/AppIcon-29x29@3x.png differ
diff --git a/desktop/src-tauri/icons/ios/AppIcon-40x40@1x.png b/desktop/src-tauri/icons/ios/AppIcon-40x40@1x.png
index 04ff6a6e..f01debfa 100644
Binary files a/desktop/src-tauri/icons/ios/AppIcon-40x40@1x.png and b/desktop/src-tauri/icons/ios/AppIcon-40x40@1x.png differ
diff --git a/desktop/src-tauri/icons/ios/AppIcon-40x40@2x-1.png b/desktop/src-tauri/icons/ios/AppIcon-40x40@2x-1.png
index 880a13d8..f63dac44 100644
Binary files a/desktop/src-tauri/icons/ios/AppIcon-40x40@2x-1.png and b/desktop/src-tauri/icons/ios/AppIcon-40x40@2x-1.png differ
diff --git a/desktop/src-tauri/icons/ios/AppIcon-40x40@2x.png b/desktop/src-tauri/icons/ios/AppIcon-40x40@2x.png
index 880a13d8..f63dac44 100644
Binary files a/desktop/src-tauri/icons/ios/AppIcon-40x40@2x.png and b/desktop/src-tauri/icons/ios/AppIcon-40x40@2x.png differ
diff --git a/desktop/src-tauri/icons/ios/AppIcon-40x40@3x.png b/desktop/src-tauri/icons/ios/AppIcon-40x40@3x.png
index 271a343e..8f04e2de 100644
Binary files a/desktop/src-tauri/icons/ios/AppIcon-40x40@3x.png and b/desktop/src-tauri/icons/ios/AppIcon-40x40@3x.png differ
diff --git a/desktop/src-tauri/icons/ios/AppIcon-512@2x.png b/desktop/src-tauri/icons/ios/AppIcon-512@2x.png
index 62bbd5f6..aaf24f03 100644
Binary files a/desktop/src-tauri/icons/ios/AppIcon-512@2x.png and b/desktop/src-tauri/icons/ios/AppIcon-512@2x.png differ
diff --git a/desktop/src-tauri/icons/ios/AppIcon-60x60@2x.png b/desktop/src-tauri/icons/ios/AppIcon-60x60@2x.png
index 271a343e..8f04e2de 100644
Binary files a/desktop/src-tauri/icons/ios/AppIcon-60x60@2x.png and b/desktop/src-tauri/icons/ios/AppIcon-60x60@2x.png differ
diff --git a/desktop/src-tauri/icons/ios/AppIcon-60x60@3x.png b/desktop/src-tauri/icons/ios/AppIcon-60x60@3x.png
index 4fffc80d..8a2c4614 100644
Binary files a/desktop/src-tauri/icons/ios/AppIcon-60x60@3x.png and b/desktop/src-tauri/icons/ios/AppIcon-60x60@3x.png differ
diff --git a/desktop/src-tauri/icons/ios/AppIcon-76x76@1x.png b/desktop/src-tauri/icons/ios/AppIcon-76x76@1x.png
index 866cd10a..caf57fd2 100644
Binary files a/desktop/src-tauri/icons/ios/AppIcon-76x76@1x.png and b/desktop/src-tauri/icons/ios/AppIcon-76x76@1x.png differ
diff --git a/desktop/src-tauri/icons/ios/AppIcon-76x76@2x.png b/desktop/src-tauri/icons/ios/AppIcon-76x76@2x.png
index bcfc5631..633238a4 100644
Binary files a/desktop/src-tauri/icons/ios/AppIcon-76x76@2x.png and b/desktop/src-tauri/icons/ios/AppIcon-76x76@2x.png differ
diff --git a/desktop/src-tauri/icons/ios/AppIcon-83.5x83.5@2x.png b/desktop/src-tauri/icons/ios/AppIcon-83.5x83.5@2x.png
index 3780ce30..3c01a7b1 100644
Binary files a/desktop/src-tauri/icons/ios/AppIcon-83.5x83.5@2x.png and b/desktop/src-tauri/icons/ios/AppIcon-83.5x83.5@2x.png differ
diff --git a/desktop/src-tauri/src/lib.rs b/desktop/src-tauri/src/lib.rs
index 7671fce4..44b68110 100644
--- a/desktop/src-tauri/src/lib.rs
+++ b/desktop/src-tauri/src/lib.rs
@@ -1,14 +1,22 @@
 use std::{
-    io::{Error as IoError, ErrorKind},
+    collections::HashMap,
+    io::{Error as IoError, ErrorKind, Read, Write},
     net::{SocketAddr, TcpListener, TcpStream},
     path::PathBuf,
-    sync::Mutex,
+    process::{Command as StdCommand, Stdio},
+    str,
+    sync::{
+        atomic::{AtomicU32, Ordering},
+        Mutex,
+    },
+    thread,
     time::{Duration, Instant},
 };
 
+use portable_pty::{native_pty_system, ChildKiller, CommandBuilder, MasterPty, PtySize};
+use serde::Serialize;
 #[cfg(target_os = "macos")]
 use tauri::menu::{MenuBuilder, MenuItemBuilder, SubmenuBuilder};
-#[cfg(target_os = "macos")]
 use tauri::Emitter;
 use tauri::{AppHandle, Manager, RunEvent, State};
 use tauri_plugin_shell::{
@@ -39,6 +47,38 @@ struct ServerStatus {
 #[derive(Default)]
 struct AdapterState(Mutex<Option<CommandChild>>);
 
+#[derive(Default)]
+struct TerminalState {
+    next_id: AtomicU32,
+    sessions: Mutex<HashMap<u32, TerminalSession>>,
+}
+
+struct TerminalSession {
+    master: Box<dyn MasterPty + Send>,
+    writer: Mutex<Box<dyn std::io::Write + Send>>,
+    killer: Mutex<Box<dyn ChildKiller + Send + Sync>>,
+}
+
+#[derive(Serialize, Clone)]
+struct TerminalSpawnResult {
+    session_id: u32,
+    shell: String,
+    cwd: String,
+}
+
+#[derive(Serialize, Clone)]
+struct TerminalOutputPayload {
+    session_id: u32,
+    data: String,
+}
+
+#[derive(Serialize, Clone)]
+struct TerminalExitPayload {
+    session_id: u32,
+    code: u32,
+    signal: Option<String>,
+}
+
 #[tauri::command]
 fn get_server_url(state: State<'_, ServerState>) -> Result<String, String> {
     let guard = state
@@ -72,6 +112,395 @@ fn restart_adapters_sidecar(app: AppHandle) -> Result<(), String> {
     Ok(())
 }
 
+#[tauri::command]
+fn terminal_spawn(
+    app: AppHandle,
+    state: State<'_, TerminalState>,
+    cols: u16,
+    rows: u16,
+    cwd: Option<String>,
+) -> Result<TerminalSpawnResult, String> {
+    let cwd_path = resolve_terminal_cwd(cwd)?;
+    let shell = default_shell();
+    let pty_system = native_pty_system();
+    let pair = pty_system
+        .openpty(PtySize {
+            rows: rows.max(8),
+            cols: cols.max(20),
+            pixel_width: 0,
+            pixel_height: 0,
+        })
+        .map_err(|err| format!("open terminal pty: {err}"))?;
+
+    let mut cmd = CommandBuilder::new(&shell);
+    cmd.cwd(cwd_path.as_os_str());
+    for (key, value) in terminal_environment(&shell) {
+        cmd.env(key, value);
+    }
+    cmd.env("TERM", "xterm-256color");
+    cmd.env("COLORTERM", "truecolor");
+
+    let mut child = pair
+        .slave
+        .spawn_command(cmd)
+        .map_err(|err| format!("spawn terminal shell: {err}"))?;
+    drop(pair.slave);
+
+    let mut reader = pair
+        .master
+        .try_clone_reader()
+        .map_err(|err| format!("clone terminal reader: {err}"))?;
+    let writer = pair
+        .master
+        .take_writer()
+        .map_err(|err| format!("open terminal writer: {err}"))?;
+    let killer = child.clone_killer();
+    let session_id = state.next_id.fetch_add(1, Ordering::Relaxed) + 1;
+
+    {
+        let mut sessions = state
+            .sessions
+            .lock()
+            .map_err(|_| "terminal state is unavailable".to_string())?;
+        sessions.insert(
+            session_id,
+            TerminalSession {
+                master: pair.master,
+                writer: Mutex::new(writer),
+                killer: Mutex::new(killer),
+            },
+        );
+    }
+
+    let output_app = app.clone();
+    thread::spawn(move || {
+        let mut buffer = [0_u8; 8192];
+        let mut pending_utf8 = Vec::new();
+        loop {
+            match reader.read(&mut buffer) {
+                Ok(0) => break,
+                Ok(n) => {
+                    let data = decode_terminal_output(&mut pending_utf8, &buffer[..n]);
+                    if !data.is_empty() {
+                        let _ = output_app.emit(
+                            "terminal-output",
+                            TerminalOutputPayload { session_id, data },
+                        );
+                    }
+                }
+                Err(err) => {
+                    let _ = output_app.emit(
+                        "terminal-output",
+                        TerminalOutputPayload {
+                            session_id,
+                            data: format!("\r\n[terminal read error: {err}]\r\n"),
+                        },
+                    );
+                    break;
+                }
+            }
+        }
+        if !pending_utf8.is_empty() {
+            let data = String::from_utf8_lossy(&pending_utf8).to_string();
+            let _ = output_app.emit(
+                "terminal-output",
+                TerminalOutputPayload { session_id, data },
+            );
+        }
+    });
+
+    let exit_app = app.clone();
+    thread::spawn(move || {
+        let status = child.wait();
+        if let Some(state) = exit_app.try_state::<TerminalState>() {
+            if let Ok(mut sessions) = state.sessions.lock() {
+                sessions.remove(&session_id);
+            }
+        }
+        match status {
+            Ok(status) => {
+                let _ = exit_app.emit(
+                    "terminal-exit",
+                    TerminalExitPayload {
+                        session_id,
+                        code: status.exit_code(),
+                        signal: status.signal().map(ToString::to_string),
+                    },
+                );
+            }
+            Err(err) => {
+                let _ = exit_app.emit(
+                    "terminal-output",
+                    TerminalOutputPayload {
+                        session_id,
+                        data: format!("\r\n[terminal wait error: {err}]\r\n"),
+                    },
+                );
+            }
+        }
+    });
+
+    Ok(TerminalSpawnResult {
+        session_id,
+        shell,
+        cwd: cwd_path.to_string_lossy().to_string(),
+    })
+}
+
+#[tauri::command]
+fn terminal_write(
+    state: State<'_, TerminalState>,
+    session_id: u32,
+    data: String,
+) -> Result<(), String> {
+    let sessions = state
+        .sessions
+        .lock()
+        .map_err(|_| "terminal state is unavailable".to_string())?;
+    let session = sessions
+        .get(&session_id)
+        .ok_or_else(|| "terminal session is not running".to_string())?;
+    let mut writer = session
+        .writer
+        .lock()
+        .map_err(|_| "terminal writer is unavailable".to_string())?;
+    writer
+        .write_all(data.as_bytes())
+        .map_err(|err| format!("write terminal input: {err}"))?;
+    writer
+        .flush()
+        .map_err(|err| format!("flush terminal input: {err}"))?;
+    Ok(())
+}
+
+#[tauri::command]
+fn terminal_resize(
+    state: State<'_, TerminalState>,
+    session_id: u32,
+    cols: u16,
+    rows: u16,
+) -> Result<(), String> {
+    let sessions = state
+        .sessions
+        .lock()
+        .map_err(|_| "terminal state is unavailable".to_string())?;
+    let session = sessions
+        .get(&session_id)
+        .ok_or_else(|| "terminal session is not running".to_string())?;
+    session
+        .master
+        .resize(PtySize {
+            rows: rows.max(8),
+            cols: cols.max(20),
+            pixel_width: 0,
+            pixel_height: 0,
+        })
+        .map_err(|err| format!("resize terminal: {err}"))?;
+    Ok(())
+}
+
+#[tauri::command]
+fn terminal_kill(state: State<'_, TerminalState>, session_id: u32) -> Result<(), String> {
+    let session = {
+        let mut sessions = state
+            .sessions
+            .lock()
+            .map_err(|_| "terminal state is unavailable".to_string())?;
+        sessions.remove(&session_id)
+    };
+
+    if let Some(session) = session {
+        let mut killer = session
+            .killer
+            .lock()
+            .map_err(|_| "terminal killer is unavailable".to_string())?;
+        killer
+            .kill()
+            .map_err(|err| format!("kill terminal shell: {err}"))?;
+    }
+    Ok(())
+}
+
+fn decode_terminal_output(pending: &mut Vec<u8>, chunk: &[u8]) -> String {
+    pending.extend_from_slice(chunk);
+    let mut output = String::new();
+
+    loop {
+        match str::from_utf8(pending) {
+            Ok(text) => {
+                output.push_str(text);
+                pending.clear();
+                break;
+            }
+            Err(err) => {
+                let valid_up_to = err.valid_up_to();
+                if valid_up_to > 0 {
+                    let text = str::from_utf8(&pending[..valid_up_to])
+                        .expect("valid_up_to marks a valid UTF-8 prefix");
+                    output.push_str(text);
+                    pending.drain(..valid_up_to);
+                    continue;
+                }
+
+                match err.error_len() {
+                    Some(error_len) => {
+                        output.push('\u{fffd}');
+                        pending.drain(..error_len);
+                    }
+                    None => break,
+                }
+            }
+        }
+    }
+
+    output
+}
+
+fn terminal_environment(shell: &str) -> HashMap<String, String> {
+    let mut env: HashMap<String, String> = std::env::vars().collect();
+    env.extend(login_shell_environment(shell));
+    ensure_utf8_locale(&mut env);
+    env
+}
+
+fn ensure_utf8_locale(env: &mut HashMap<String, String>) {
+    let fallback = default_utf8_locale();
+    for key in ["LANG", "LC_CTYPE", "LC_ALL"] {
+        let needs_fallback = env
+            .get(key)
+            .map(|value| !is_utf8_locale(value))
+            .unwrap_or(true);
+        if needs_fallback {
+            env.insert(key.to_string(), fallback.to_string());
+        }
+    }
+}
+
+fn is_utf8_locale(value: &str) -> bool {
+    let normalized = value.trim().to_ascii_lowercase().replace('-', "");
+    normalized.contains("utf8")
+}
+
+fn default_utf8_locale() -> &'static str {
+    #[cfg(target_os = "macos")]
+    {
+        "en_US.UTF-8"
+    }
+    #[cfg(all(unix, not(target_os = "macos")))]
+    {
+        "C.UTF-8"
+    }
+    #[cfg(not(unix))]
+    {
+        "C.UTF-8"
+    }
+}
+
+#[cfg(not(target_os = "windows"))]
+fn login_shell_environment(shell: &str) -> HashMap<String, String> {
+    let Ok(mut child) = StdCommand::new(shell)
+        .args(["-l", "-c", "env -0"])
+        .stdout(Stdio::piped())
+        .stderr(Stdio::null())
+        .spawn()
+    else {
+        return HashMap::new();
+    };
+
+    let deadline = Instant::now() + Duration::from_secs(2);
+    loop {
+        match child.try_wait() {
+            Ok(Some(status)) => {
+                if !status.success() {
+                    return HashMap::new();
+                }
+                let mut stdout = Vec::new();
+                if let Some(mut pipe) = child.stdout.take() {
+                    let _ = pipe.read_to_end(&mut stdout);
+                }
+                return parse_env_block(&stdout);
+            }
+            Ok(None) if Instant::now() < deadline => {
+                thread::sleep(Duration::from_millis(25));
+            }
+            Ok(None) => {
+                let _ = child.kill();
+                let _ = child.wait();
+                return HashMap::new();
+            }
+            Err(_) => return HashMap::new(),
+        }
+    }
+}
+
+#[cfg(target_os = "windows")]
+fn login_shell_environment(_shell: &str) -> HashMap<String, String> {
+    HashMap::new()
+}
+
+fn parse_env_block(bytes: &[u8]) -> HashMap<String, String> {
+    bytes
+        .split(|byte| *byte == 0)
+        .filter_map(|entry| {
+            if entry.is_empty() {
+                return None;
+            }
+            let equals = entry.iter().position(|byte| *byte == b'=')?;
+            if equals == 0 {
+                return None;
+            }
+            let key = String::from_utf8_lossy(&entry[..equals]).to_string();
+            let value = String::from_utf8_lossy(&entry[equals + 1..]).to_string();
+            Some((key, value))
+        })
+        .collect()
+}
+
+fn resolve_terminal_cwd(cwd: Option<String>) -> Result<PathBuf, String> {
+    let path = match cwd.and_then(|value| {
+        let trimmed = value.trim();
+        if trimmed.is_empty() {
+            None
+        } else {
+            Some(PathBuf::from(trimmed))
+        }
+    }) {
+        Some(path) => path,
+        None => home_dir().unwrap_or(
+            std::env::current_dir().map_err(|err| format!("resolve current directory: {err}"))?,
+        ),
+    };
+
+    if path.is_dir() {
+        Ok(path)
+    } else {
+        Err(format!("terminal cwd does not exist: {}", path.display()))
+    }
+}
+
+fn home_dir() -> Option<PathBuf> {
+    std::env::var_os("HOME")
+        .or_else(|| std::env::var_os("USERPROFILE"))
+        .map(PathBuf::from)
+}
+
+fn default_shell() -> String {
+    #[cfg(target_os = "windows")]
+    {
+        std::env::var("COMSPEC").unwrap_or_else(|_| "powershell.exe".to_string())
+    }
+    #[cfg(not(target_os = "windows"))]
+    {
+        std::env::var("SHELL").unwrap_or_else(|_| {
+            if PathBuf::from("/bin/zsh").exists() {
+                "/bin/zsh".to_string()
+            } else {
+                "/bin/bash".to_string()
+            }
+        })
+    }
+}
+
 fn reserve_local_port() -> Result<u16, String> {
     let listener =
         TcpListener::bind("127.0.0.1:0").map_err(|err| format!("bind local port: {err}"))?;
@@ -114,8 +543,7 @@ fn resolve_app_root(_app: &AppHandle) -> Result<PathBuf, String> {
     // 我们直接用当前可执行文件所在目录作为 app_root：
     //   Dev:  desktop/src-tauri/target/<profile>/  （rust 跑出来的 binary 那一层）
     //   Prod: <App>.app/Contents/MacOS/             （sidecar 二进制的同级目录）
-    let exe = std::env::current_exe()
-        .map_err(|err| format!("resolve current exe path: {err}"))?;
+    let exe = std::env::current_exe().map_err(|err| format!("resolve current exe path: {err}"))?;
     let dir = exe
         .parent()
         .ok_or_else(|| "current exe has no parent dir".to_string())?
@@ -293,26 +721,114 @@ fn stop_adapters_sidecar(app: &AppHandle) {
     }
 }
 
+#[cfg(test)]
+mod tests {
+    use super::{decode_terminal_output, default_utf8_locale, ensure_utf8_locale, parse_env_block};
+    use std::collections::HashMap;
+
+    #[test]
+    fn terminal_output_decoder_preserves_split_chinese_characters() {
+        let mut pending = Vec::new();
+        let bytes = "安装 Skills 成功\n".as_bytes();
+
+        assert_eq!(decode_terminal_output(&mut pending, &bytes[..2]), "");
+        assert_eq!(decode_terminal_output(&mut pending, &bytes[2..4]), "安");
+        assert_eq!(
+            decode_terminal_output(&mut pending, &bytes[4..]),
+            "装 Skills 成功\n"
+        );
+        assert!(pending.is_empty());
+    }
+
+    #[test]
+    fn terminal_output_decoder_keeps_incomplete_suffix_pending() {
+        let mut pending = Vec::new();
+        let bytes = "中文".as_bytes();
+
+        assert_eq!(decode_terminal_output(&mut pending, &bytes[..4]), "中");
+        assert_eq!(pending, bytes[3..4]);
+        assert_eq!(decode_terminal_output(&mut pending, &bytes[4..]), "文");
+        assert!(pending.is_empty());
+    }
+
+    #[test]
+    fn parse_env_block_reads_nul_delimited_values() {
+        let env =
+            parse_env_block(b"PATH=/opt/homebrew/bin:/usr/bin\0NODE_PATH=/tmp/node\0EMPTY=\0");
+
+        assert_eq!(
+            env.get("PATH").map(String::as_str),
+            Some("/opt/homebrew/bin:/usr/bin")
+        );
+        assert_eq!(env.get("NODE_PATH").map(String::as_str), Some("/tmp/node"));
+        assert_eq!(env.get("EMPTY").map(String::as_str), Some(""));
+    }
+
+    #[test]
+    fn terminal_environment_forces_utf8_locale_when_shell_uses_c_locale() {
+        let mut env = HashMap::from([
+            ("LANG".to_string(), "C".to_string()),
+            ("LC_CTYPE".to_string(), "POSIX".to_string()),
+            ("LC_ALL".to_string(), "C".to_string()),
+        ]);
+
+        ensure_utf8_locale(&mut env);
+
+        assert_eq!(
+            env.get("LANG").map(String::as_str),
+            Some(default_utf8_locale())
+        );
+        assert_eq!(
+            env.get("LC_CTYPE").map(String::as_str),
+            Some(default_utf8_locale())
+        );
+        assert_eq!(
+            env.get("LC_ALL").map(String::as_str),
+            Some(default_utf8_locale())
+        );
+    }
+
+    #[test]
+    fn terminal_environment_keeps_existing_utf8_locale() {
+        let mut env = HashMap::from([
+            ("LANG".to_string(), "zh_CN.UTF-8".to_string()),
+            ("LC_CTYPE".to_string(), "en_US.UTF8".to_string()),
+            ("LC_ALL".to_string(), "C.UTF-8".to_string()),
+        ]);
+
+        ensure_utf8_locale(&mut env);
+
+        assert_eq!(env.get("LANG").map(String::as_str), Some("zh_CN.UTF-8"));
+        assert_eq!(env.get("LC_CTYPE").map(String::as_str), Some("en_US.UTF8"));
+        assert_eq!(env.get("LC_ALL").map(String::as_str), Some("C.UTF-8"));
+    }
+}
+
 #[cfg_attr(mobile, tauri::mobile_entry_point)]
 pub fn run() {
     let builder = tauri::Builder::default()
         .manage(ServerState::default())
         .manage(AdapterState::default())
+        .manage(TerminalState::default())
         .plugin(tauri_plugin_shell::init())
         .plugin(tauri_plugin_dialog::init())
         .plugin(tauri_plugin_process::init())
         .plugin(tauri_plugin_updater::Builder::new().build())
         .invoke_handler(tauri::generate_handler![
             get_server_url,
-            restart_adapters_sidecar
+            restart_adapters_sidecar,
+            terminal_spawn,
+            terminal_write,
+            terminal_resize,
+            terminal_kill
         ]);
 
     // macOS: native menu bar (traffic-light overlay style)
     #[cfg(target_os = "macos")]
     let builder = builder
         .menu(|app| {
-            let about_item = MenuItemBuilder::with_id("nav_about", "关于 Claude Code Haha")
-                .build(app)?;
+            let about_item =
+                MenuItemBuilder::with_id("nav_about", "关于 Claude Code Haha").build(app)?;
             let settings_item = MenuItemBuilder::with_id("nav_settings", "设置...")
                 .accelerator("CmdOrCtrl+,")
                 .build(app)?;
@@ -341,9 +857,7 @@ pub fn run() {
                 .select_all()
                 .build()?;
 
-            let view_submenu = SubmenuBuilder::new(app, "View")
-                .fullscreen()
-                .build()?;
+            let view_submenu = SubmenuBuilder::new(app, "View").fullscreen().build()?;
 
             let window_submenu = SubmenuBuilder::new(app, "Window")
                 .minimize()
diff --git a/desktop/src/__tests__/agentsSettings.test.tsx b/desktop/src/__tests__/agentsSettings.test.tsx
index e124362d..c7c850ee 100644
--- a/desktop/src/__tests__/agentsSettings.test.tsx
+++ b/desktop/src/__tests__/agentsSettings.test.tsx
@@ -22,8 +22,11 @@ vi.mock('../stores/providerStore', () => ({
   useProviderStore: () => ({
     providers: [],
     activeId: null,
+    presets: [],
     isLoading: false,
+    isPresetsLoading: false,
     fetchProviders: vi.fn(),
+    fetchPresets: vi.fn(),
     deleteProvider: vi.fn(),
     activateProvider: vi.fn(),
     activateOfficial: vi.fn(),
diff --git a/desktop/src/__tests__/generalSettings.test.tsx b/desktop/src/__tests__/generalSettings.test.tsx
index c53c2996..6b3d031c 100644
--- a/desktop/src/__tests__/generalSettings.test.tsx
+++ b/desktop/src/__tests__/generalSettings.test.tsx
@@ -1,11 +1,30 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest'
-import { fireEvent, render, screen } from '@testing-library/react'
+import { fireEvent, render, screen, within } from '@testing-library/react'
 import '@testing-library/jest-dom'
 
 import { Settings } from '../pages/Settings'
 import { useSettingsStore } from '../stores/settingsStore'
 import { useUIStore } from '../stores/uiStore'
 import { useUpdateStore } from '../stores/updateStore'
+import type { SavedProvider } from '../types/provider'
+
+const MOCK_DELETE_PROVIDER = vi.fn()
+const providerStoreState = {
+  providers: [] as SavedProvider[],
+  activeId: null,
+  presets: [],
+  isLoading: false,
+  isPresetsLoading: false,
+  fetchProviders: vi.fn(),
+  fetchPresets: vi.fn(),
+  deleteProvider: MOCK_DELETE_PROVIDER,
+  activateProvider: vi.fn(),
+  activateOfficial: vi.fn(),
+  testProvider: vi.fn(),
+  createProvider: vi.fn(),
+  updateProvider: vi.fn(),
+  testConfig: vi.fn(),
+}
 
 vi.mock('../api/agents', () => ({
   agentsApi: {
@@ -14,19 +33,7 @@ vi.mock('../api/agents', () => ({
 }))
 
 vi.mock('../stores/providerStore', () => ({
-  useProviderStore: () => ({
-    providers: [],
-    activeId: null,
-    isLoading: false,
-    fetchProviders: vi.fn(),
-    deleteProvider: vi.fn(),
-    activateProvider: vi.fn(),
-    activateOfficial: vi.fn(),
-    testProvider: vi.fn(),
-    createProvider: vi.fn(),
-    updateProvider: vi.fn(),
-    testConfig: vi.fn(),
-  }),
+  useProviderStore: () => providerStoreState,
 }))
 
 vi.mock('../pages/AdapterSettings', () => ({
@@ -64,6 +71,21 @@ vi.mock('../components/chat/CodeViewer', () => ({
 
 describe('Settings > General tab', () => {
   beforeEach(() => {
+    MOCK_DELETE_PROVIDER.mockReset()
+    providerStoreState.providers = []
+    providerStoreState.activeId = null
+    providerStoreState.presets = []
+    providerStoreState.isLoading = false
+    providerStoreState.isPresetsLoading = false
+    providerStoreState.fetchProviders = vi.fn()
+    providerStoreState.fetchPresets = vi.fn()
+    providerStoreState.activateProvider = vi.fn()
+    providerStoreState.activateOfficial = vi.fn()
+    providerStoreState.testProvider = vi.fn()
+    providerStoreState.createProvider = vi.fn()
+    providerStoreState.updateProvider = vi.fn()
+    providerStoreState.testConfig = vi.fn()
+
     useSettingsStore.setState({
       locale: 'en',
       skipWebFetchPreflight: true,
@@ -109,6 +131,53 @@ describe('Settings > General tab', () => {
 
     expect(useSettingsStore.getState().setSkipWebFetchPreflight).toHaveBeenCalledWith(false)
   })
+
+  it('keeps extension tabs available alongside the terminal tab', () => {
+    render(<Settings />)
+
+    expect(screen.queryByText('Install')).not.toBeInTheDocument()
+    expect(screen.getByText('Terminal')).toBeInTheDocument()
+    expect(screen.getByText('MCP')).toBeInTheDocument()
+    expect(screen.getByText('Plugins')).toBeInTheDocument()
+  })
+})
+
+describe('Settings > Providers tab', () => {
+  beforeEach(() => {
+    MOCK_DELETE_PROVIDER.mockReset()
+    providerStoreState.providers = [
+      {
+        id: 'provider-1',
+        name: 'MiniMax-M2.7-highspeed(openai)',
+        presetId: 'custom',
+        apiKey: '***',
+        baseUrl: 'https://api.minimaxi.com',
+        apiFormat: 'openai_chat',
+        models: {
+          main: 'MiniMax-M2.7-highspeed',
+          haiku: '',
+          sonnet: '',
+          opus: '',
+        },
+        notes: '',
+      },
+    ]
+  })
+
+  it('requires confirmation before deleting a provider', async () => {
+    render(<Settings />)
+
+    fireEvent.click(screen.getAllByText('Delete')[0]!)
+
+    expect(MOCK_DELETE_PROVIDER).not.toHaveBeenCalled()
+    expect(screen.getByRole('dialog')).toBeInTheDocument()
+    expect(screen.getByText('Delete provider "MiniMax-M2.7-highspeed(openai)"? This cannot be undone.')).toBeInTheDocument()
+
+    const dialog = screen.getByRole('dialog')
+    fireEvent.click(within(dialog).getByRole('button', { name: 'Delete' }))
+
+    expect(MOCK_DELETE_PROVIDER).toHaveBeenCalledWith('provider-1')
+  })
 })
 
 describe('Settings > About tab', () => {
diff --git a/desktop/src/__tests__/mcpSettings.test.tsx b/desktop/src/__tests__/mcpSettings.test.tsx
index 973cad37..418dd5c3 100644
--- a/desktop/src/__tests__/mcpSettings.test.tsx
+++ b/desktop/src/__tests__/mcpSettings.test.tsx
@@ -1,5 +1,5 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest'
-import { render, screen } from '@testing-library/react'
+import { act, fireEvent, render, screen, waitFor } from '@testing-library/react'
 import '@testing-library/jest-dom'
 
 import { McpSettings } from '../pages/McpSettings'
@@ -38,6 +38,7 @@ describe('McpSettings', () => {
     })
     useMcpStore.setState({
       servers: [],
+      selectedServer: null,
       isLoading: false,
       error: null,
       fetchServers: vi.fn(),
@@ -46,6 +47,8 @@ describe('McpSettings', () => {
       deleteServer: vi.fn(),
       toggleServer: vi.fn(),
       reconnectServer: vi.fn(),
+      refreshServerStatus: vi.fn(),
+      selectServer: vi.fn(),
     })
   })
 
@@ -109,4 +112,166 @@ describe('McpSettings', () => {
     expect(screen.getByText('plugin:telegram:telegram')).toBeInTheDocument()
     expect(screen.getByText('global-user')).toBeInTheDocument()
   })
+
+  it('starts background status refresh after the fast list render', async () => {
+    const server = {
+      name: 'deepwiki',
+      scope: 'user',
+      transport: 'http',
+      enabled: true,
+      status: 'checking' as const,
+      statusLabel: 'Checking',
+      configLocation: '/tmp/config',
+      summary: 'https://example.com/mcp',
+      canEdit: true,
+      canRemove: true,
+      canReconnect: true,
+      canToggle: true,
+      config: { type: 'http' as const, url: 'https://example.com/mcp', headers: {} },
+    }
+    const refreshServerStatus = vi.fn().mockResolvedValue({
+      ...server,
+      status: 'connected' as const,
+      statusLabel: 'Connected',
+    })
+
+    useMcpStore.setState({
+      servers: [server],
+      refreshServerStatus,
+    })
+
+    render(<McpSettings />)
+
+    expect(screen.getByText('Checking')).toBeInTheDocument()
+
+    await waitFor(() => {
+      expect(refreshServerStatus).toHaveBeenCalledWith(server, '/workspace/project')
+    })
+  })
+
+  it('opens the delete confirmation modal from the edit view and deletes with the active cwd', async () => {
+    const deleteServer = vi.fn().mockResolvedValue(undefined)
+    const server = {
+      name: 'global-user',
+      scope: 'user',
+      transport: 'http',
+      enabled: true,
+      status: 'connected',
+      statusLabel: 'Connected',
+      configLocation: '/tmp/config',
+      summary: 'https://example.com/mcp',
+      canEdit: true,
+      canRemove: true,
+      canReconnect: true,
+      canToggle: true,
+      config: { type: 'http', url: 'https://example.com/mcp', headers: {} },
+    } as const
+
+    useMcpStore.setState({
+      servers: [server],
+      deleteServer,
+    })
+
+    render(<McpSettings />)
+
+    await act(async () => {
+      fireEvent.click(screen.getByRole('button', { name: 'Open global-user' }))
+    })
+
+    await act(async () => {
+      fireEvent.click(screen.getByRole('button', { name: /uninstall/i }))
+    })
+
+    expect(screen.getByRole('dialog')).toBeInTheDocument()
+    expect(screen.getByText('Delete MCP server')).toBeInTheDocument()
+    expect(screen.getByText('Delete MCP server "global-user"? This action cannot be undone.')).toBeInTheDocument()
+
+    await act(async () => {
+      fireEvent.click(screen.getByRole('button', { name: 'Delete' }))
+    })
+
+    expect(deleteServer).toHaveBeenCalledWith(server, '/workspace/project')
+  })
+
+  it('uses the active cwd when toggling a server', async () => {
+    const toggleServer = vi.fn().mockResolvedValue(undefined)
+    const server = {
+      name: 'global-user',
+      scope: 'user',
+      transport: 'http',
+      enabled: true,
+      status: 'connected',
+      statusLabel: 'Connected',
+      configLocation: '/tmp/config',
+      summary: 'https://example.com/mcp',
+      canEdit: true,
+      canRemove: true,
+      canReconnect: true,
+      canToggle: true,
+      config: { type: 'http', url: 'https://example.com/mcp', headers: {} },
+    } as const
+
+    useMcpStore.setState({
+      servers: [server],
+      toggleServer,
+    })
+
+    render(<McpSettings />)
+
+    await act(async () => {
+      fireEvent.click(screen.getByRole('switch'))
+    })
+
+    expect(toggleServer).toHaveBeenCalledWith(server, '/workspace/project')
+  })
+
+  it('shows reconnecting status immediately in the detail view', async () => {
+    let resolveReconnect: ((value: typeof server) => void) | null = null
+    const server = {
+      name: 'plugin:telegram:telegram',
+      scope: 'dynamic',
+      transport: 'stdio',
+      enabled: true,
+      status: 'failed' as 'connected' | 'needs-auth' | 'failed' | 'disabled' | 'checking',
+      statusLabel: 'Unavailable',
+      statusDetail: 'Timed out' as string | undefined,
+      configLocation: '/tmp/config',
+      summary: 'bun run start',
+      canEdit: false,
+      canRemove: false,
+      canReconnect: true,
+      canToggle: true,
+      config: { type: 'stdio' as const, command: 'bun', args: ['run', 'start'], env: {} },
+    }
+    const reconnectServer = vi.fn().mockImplementation(() => new Promise<typeof server>((resolve) => {
+      resolveReconnect = resolve
+    }))
+
+    useMcpStore.setState({
+      servers: [server],
+      reconnectServer,
+    })
+
+    render(<McpSettings />)
+
+    await act(async () => {
+      fireEvent.click(screen.getByRole('button', { name: 'Open plugin:telegram:telegram' }))
+    })
+
+    await act(async () => {
+      fireEvent.click(screen.getByRole('button', { name: /reconnect/i }))
+    })
+
+    expect(screen.getAllByText('Reconnecting...').length).toBeGreaterThan(0)
+    expect(reconnectServer).toHaveBeenCalledWith(server, '/workspace/project')
+
+    await act(async () => {
+      resolveReconnect?.({
+        ...server,
+        status: 'connected',
+        statusLabel: 'Connected',
+        statusDetail: undefined,
+      })
+    })
+  })
 })
diff --git a/desktop/src/__tests__/pages.test.tsx b/desktop/src/__tests__/pages.test.tsx
index b8656cf2..38990c7f 100644
--- a/desktop/src/__tests__/pages.test.tsx
+++ b/desktop/src/__tests__/pages.test.tsx
@@ -15,6 +15,23 @@ vi.mock('../api/skills', () => ({
 vi.mock('../api/mcp', () => ({
   mcpApi: {
     list: vi.fn(async () => ({ servers: [] })),
+    status: vi.fn(async (name: string) => ({
+      server: {
+        name,
+        scope: 'user',
+        transport: 'http',
+        enabled: true,
+        status: 'connected',
+        statusLabel: 'Connected',
+        configLocation: 'User',
+        summary: 'https://mcp.example.com/mcp',
+        canEdit: true,
+        canRemove: true,
+        canReconnect: true,
+        canToggle: true,
+        config: { type: 'http', url: 'https://mcp.example.com/mcp', headers: {} },
+      },
+    })),
   },
 }))
 
diff --git a/desktop/src/__tests__/pluginsSettings.test.tsx b/desktop/src/__tests__/pluginsSettings.test.tsx
index 3e8848e8..11e20e49 100644
--- a/desktop/src/__tests__/pluginsSettings.test.tsx
+++ b/desktop/src/__tests__/pluginsSettings.test.tsx
@@ -1,5 +1,5 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest'
-import { fireEvent, render, screen } from '@testing-library/react'
+import { act, fireEvent, render, screen } from '@testing-library/react'
 import '@testing-library/jest-dom'
 
 import { Settings } from '../pages/Settings'
@@ -23,8 +23,11 @@ vi.mock('../stores/providerStore', () => ({
   useProviderStore: () => ({
     providers: [],
     activeId: null,
+    presets: [],
     isLoading: false,
+    isPresetsLoading: false,
     fetchProviders: vi.fn(),
+    fetchPresets: vi.fn(),
     deleteProvider: vi.fn(),
     activateProvider: vi.fn(),
     activateOfficial: vi.fn(),
@@ -335,6 +338,59 @@ describe('Settings > Plugins tab', () => {
     expect(screen.getByText('Uninstall')).toBeInTheDocument()
   })
 
+  it('keeps plugin detail hook order stable while the selected plugin reloads', () => {
+    usePluginStore.setState({
+      selectedPlugin: {
+        id: 'github@claude-plugins-official',
+        name: 'github',
+        marketplace: 'claude-plugins-official',
+        scope: 'user',
+        enabled: false,
+        hasErrors: false,
+        isBuiltin: false,
+        description: 'GitHub integration',
+        componentCounts: {
+          commands: 1,
+          agents: 0,
+          skills: 0,
+          hooks: 0,
+          mcpServers: 0,
+          lspServers: 0,
+        },
+        capabilities: {
+          commands: ['review-pr'],
+          agents: [],
+          skills: [],
+          hooks: [],
+          mcpServers: [],
+          lspServers: [],
+        },
+        commandEntries: [
+          {
+            name: 'review-pr',
+            description: 'Review the current pull request.',
+          },
+        ],
+        agentEntries: [],
+        hookEntries: [],
+        skillEntries: [],
+        mcpServerEntries: [],
+        errors: [],
+      },
+    })
+
+    const { container } = render(<Settings />)
+    switchToPluginsTab()
+
+    expect(screen.getByText('GitHub integration')).toBeInTheDocument()
+
+    act(() => {
+      usePluginStore.setState({ isDetailLoading: true })
+    })
+
+    expect(container.querySelector('.animate-spin')).toBeInTheDocument()
+  })
+
   it('navigates plugin skills into the shared Skills page flow', () => {
     usePluginStore.setState({
       selectedPlugin: {
diff --git a/desktop/src/__tests__/skillsSettings.test.tsx b/desktop/src/__tests__/skillsSettings.test.tsx
index 8280b647..d13a996d 100644
--- a/desktop/src/__tests__/skillsSettings.test.tsx
+++ b/desktop/src/__tests__/skillsSettings.test.tsx
@@ -19,8 +19,11 @@ vi.mock('../stores/providerStore', () => ({
   useProviderStore: () => ({
     providers: [],
     activeId: null,
+    presets: [],
     isLoading: false,
+    isPresetsLoading: false,
     fetchProviders: vi.fn(),
+    fetchPresets: vi.fn(),
     deleteProvider: vi.fn(),
     activateProvider: vi.fn(),
     activateOfficial: vi.fn(),
diff --git a/desktop/src/api/client.ts b/desktop/src/api/client.ts
index 78468751..883d14c7 100644
--- a/desktop/src/api/client.ts
+++ b/desktop/src/api/client.ts
@@ -9,6 +9,18 @@ const DEFAULT_BASE_URL = ENV_BASE_URL || 'http://127.0.0.1:3456'
 
 let baseUrl = DEFAULT_BASE_URL
 
+function getErrorMessage(status: number, body: unknown) {
+  if (body && typeof body === 'object' && 'message' in body && typeof body.message === 'string') {
+    return body.message
+  }
+
+  if (typeof body === 'string' && body.trim().length > 0) {
+    return body
+  }
+
+  return `API error ${status}`
+}
+
 export function setBaseUrl(url: string) {
   baseUrl = url.replace(/\/$/, '')
 }
@@ -26,7 +38,7 @@ export class ApiError extends Error {
     public status: number,
     public body: unknown,
   ) {
-    super(`API error ${status}: ${typeof body === 'string' ? body : JSON.stringify(body)}`)
+    super(getErrorMessage(status, body))
     this.name = 'ApiError'
   }
 }
@@ -38,7 +50,8 @@ async function request<T>(method: string, path: string, body?: unknown, options?
   }
 
   const controller = new AbortController()
-  const timeout = setTimeout(() => controller.abort(), options?.timeout ?? 30_000)
+  const timeoutMs = options?.timeout ?? 30_000
+  const timeout = setTimeout(() => controller.abort(), timeoutMs)
   try {
     const res = await fetch(url, {
       method,
@@ -57,6 +70,9 @@ async function request<T>(method: string, path: string, body?: unknown, options?
     return res.json() as Promise<T>
   } catch (err) {
     clearTimeout(timeout)
+    if (controller.signal.aborted) {
+      throw new Error(`Request timed out after ${Math.round(timeoutMs / 1000)}s`)
+    }
     throw err
   }
 }
diff --git a/desktop/src/api/mcp.ts b/desktop/src/api/mcp.ts
index 550c9b67..113aa81b 100644
--- a/desktop/src/api/mcp.ts
+++ b/desktop/src/api/mcp.ts
@@ -7,6 +7,11 @@ export const mcpApi = {
     return api.get<{ servers: McpServerRecord[] }>(`/api/mcp${query}`)
   },
 
+  status: (name: string, cwd?: string) => {
+    const query = cwd ? `?cwd=${encodeURIComponent(cwd)}` : ''
+    return api.get<{ server: McpServerRecord }>(`/api/mcp/${encodeURIComponent(name)}/status${query}`)
+  },
+
   create: (name: string, payload: McpUpsertPayload, cwd?: string) => {
     return api.post<{ server: McpServerRecord }>('/api/mcp', {
       name,
@@ -36,4 +41,3 @@ export const mcpApi = {
     return api.post<{ server: McpServerRecord }>(`/api/mcp/${encodeURIComponent(name)}/reconnect`, cwd ? { cwd } : {})
   },
 }
-
diff --git a/desktop/src/api/plugins.ts b/desktop/src/api/plugins.ts
index 11452b77..56bddc8b 100644
--- a/desktop/src/api/plugins.ts
+++ b/desktop/src/api/plugins.ts
@@ -38,6 +38,10 @@ export const pluginsApi = {
 
   reload: (cwd?: string) => {
     const query = cwd ? `?cwd=${encodeURIComponent(cwd)}` : ''
-    return api.post<{ ok: true; summary: PluginReloadSummary }>(`/api/plugins/reload${query}`)
+    return api.post<{ ok: true; summary: PluginReloadSummary }>(
+      `/api/plugins/reload${query}`,
+      undefined,
+      { timeout: 120_000 },
+    )
   },
 }
diff --git a/desktop/src/api/providers.ts b/desktop/src/api/providers.ts
index 6531a4a2..e19ac1b7 100644
--- a/desktop/src/api/providers.ts
+++ b/desktop/src/api/providers.ts
@@ -8,7 +8,7 @@ import type {
   TestProviderConfigInput,
   ProviderTestResult,
 } from '../types/provider'
-import type { ProviderPreset } from '../config/providerPresets'
+import type { ProviderPreset } from '../types/providerPreset'
 
 type ProvidersResponse = { providers: SavedProvider[]; activeId: string | null }
 type ProviderResponse = { provider: SavedProvider }
@@ -33,6 +33,14 @@ export const providersApi = {
     return api.get<AuthStatusResponse>('/api/providers/auth-status')
   },
 
+  getSettings() {
+    return api.get<Record<string, unknown>>('/api/providers/settings')
+  },
+
+  updateSettings(settings: Record<string, unknown>) {
+    return api.put<{ ok: true }>('/api/providers/settings', settings)
+  },
+
   create(input: CreateProviderInput) {
     return api.post<ProviderResponse>('/api/providers', input)
   },
diff --git a/desktop/src/api/settings.ts b/desktop/src/api/settings.ts
index b3c34d54..4255f943 100644
--- a/desktop/src/api/settings.ts
+++ b/desktop/src/api/settings.ts
@@ -1,6 +1,20 @@
 import { api } from './client'
 import type { PermissionMode, UserSettings } from '../types/settings'
 
+export type CliLauncherStatus = {
+  supported: boolean
+  command: string
+  installed: boolean
+  launcherPath: string
+  binDir: string
+  pathConfigured: boolean
+  pathInCurrentShell: boolean
+  availableInNewTerminals: boolean
+  needsTerminalRestart: boolean
+  configTarget: string | null
+  lastError: string | null
+}
+
 export const settingsApi = {
   getUser() {
     return api.get<UserSettings>('/api/settings/user')
@@ -17,4 +31,8 @@ export const settingsApi = {
   setPermissionMode(mode: PermissionMode) {
     return api.put<{ ok: true; mode: PermissionMode }>('/api/permissions/mode', { mode })
   },
+
+  getCliLauncherStatus() {
+    return api.get<CliLauncherStatus>('/api/settings/cli-launcher')
+  },
 }
diff --git a/desktop/src/api/skills.ts b/desktop/src/api/skills.ts
index 18b0c878..c0816997 100644
--- a/desktop/src/api/skills.ts
+++ b/desktop/src/api/skills.ts
@@ -4,7 +4,7 @@ import type { SkillMeta, SkillDetail } from '../types/skill'
 export const skillsApi = {
   list: (cwd?: string) => {
     const query = cwd ? `?cwd=${encodeURIComponent(cwd)}` : ''
-    return api.get<{ skills: SkillMeta[] }>(`/api/skills${query}`)
+    return api.get<{ skills: SkillMeta[] }>(`/api/skills${query}`, { timeout: 120_000 })
   },
 
   detail: (source: string, name: string, cwd?: string) => {
@@ -14,6 +14,9 @@ export const skillsApi = {
     })
     if (cwd) query.set('cwd', cwd)
 
-    return api.get<{ detail: SkillDetail }>(`/api/skills/detail?${query.toString()}`)
+    return api.get<{ detail: SkillDetail }>(
+      `/api/skills/detail?${query.toString()}`,
+      { timeout: 120_000 },
+    )
   },
 }
diff --git a/desktop/src/api/terminal.ts b/desktop/src/api/terminal.ts
new file mode 100644
index 00000000..cd09a6fa
--- /dev/null
+++ b/desktop/src/api/terminal.ts
@@ -0,0 +1,58 @@
+import { isTauriRuntime } from '../lib/desktopRuntime'
+
+export type TerminalSpawnResult = {
+  session_id: number
+  shell: string
+  cwd: string
+}
+
+export type TerminalOutputPayload = {
+  session_id: number
+  data: string
+}
+
+export type TerminalExitPayload = {
+  session_id: number
+  code: number
+  signal?: string | null
+}
+
+type Unlisten = () => void
+
+async function invoke<T>(command: string, args?: Record<string, unknown>): Promise<T> {
+  if (!isTauriRuntime()) {
+    throw new Error('Terminal is available in the desktop app runtime.')
+  }
+  const api = await import(/* @vite-ignore */ '@tauri-apps/api/core')
+  return api.invoke<T>(command, args)
+}
+
+export const terminalApi = {
+  isAvailable: isTauriRuntime,
+
+  spawn(input: { cols: number; rows: number; cwd?: string }) {
+    return invoke<TerminalSpawnResult>('terminal_spawn', input)
+  },
+
+  write(sessionId: number, data: string) {
+    return invoke<void>('terminal_write', { sessionId, data })
+  },
+
+  resize(sessionId: number, cols: number, rows: number) {
+    return invoke<void>('terminal_resize', { sessionId, cols, rows })
+  },
+
+  kill(sessionId: number) {
+    return invoke<void>('terminal_kill', { sessionId })
+  },
+
+  async onOutput(handler: (payload: TerminalOutputPayload) => void): Promise<Unlisten> {
+    const events = await import(/* @vite-ignore */ '@tauri-apps/api/event')
+    return events.listen<TerminalOutputPayload>('terminal-output', (event) => handler(event.payload))
+  },
+
+  async onExit(handler: (payload: TerminalExitPayload) => void): Promise<Unlisten> {
+    const events = await import(/* @vite-ignore */ '@tauri-apps/api/event')
+    return events.listen<TerminalExitPayload>('terminal-exit', (event) => handler(event.payload))
+  },
+}
diff --git a/desktop/src/components/chat/AskUserQuestion.tsx b/desktop/src/components/chat/AskUserQuestion.tsx
index 67006926..93694544 100644
--- a/desktop/src/components/chat/AskUserQuestion.tsx
+++ b/desktop/src/components/chat/AskUserQuestion.tsx
@@ -135,7 +135,7 @@ export function AskUserQuestion({ toolUseId, input, result }: Props) {
   if (!activeQuestion) return null
 
   return (
-    <div className={`mb-4 ml-10 rounded-[var(--radius-lg)] border overflow-hidden ${
+    <div className={`mb-4 rounded-[var(--radius-lg)] border overflow-hidden ${
       submitted
         ? 'border-[var(--color-outline-variant)]/40 bg-[var(--color-surface-container-low)] opacity-70'
         : 'border-[var(--color-secondary)] bg-[var(--color-surface-container-lowest)]'
diff --git a/desktop/src/components/chat/AssistantMessage.tsx b/desktop/src/components/chat/AssistantMessage.tsx
index 4c7f0d89..0ed75e69 100644
--- a/desktop/src/components/chat/AssistantMessage.tsx
+++ b/desktop/src/components/chat/AssistantMessage.tsx
@@ -8,22 +8,50 @@ type Props = {
 }
 
 export function AssistantMessage({ content, isStreaming }: Props) {
+  const documentLayout = shouldUseDocumentLayout(content)
+
   return (
-    <div className="group mb-5 ml-10 flex items-end gap-1.5">
-      <div className="min-w-0">
-        <div className="rounded-[20px] rounded-tl-[8px] border border-[var(--color-border)]/60 bg-[var(--color-surface)] px-4 py-3 text-sm text-[var(--color-text-primary)] shadow-sm">
-          <MarkdownRenderer content={content} />
+    <div className="group mb-5 flex justify-start">
+      <div
+        data-message-shell="assistant"
+        data-layout={documentLayout ? 'document' : 'bubble'}
+        className={`flex min-w-0 flex-col items-start gap-2 ${
+          documentLayout
+            ? 'w-full max-w-full'
+            : 'w-full max-w-[88%] sm:max-w-[80%] lg:max-w-[72%]'
+        }`}
+      >
+        <div className={`rounded-[20px] rounded-tl-[8px] border border-[var(--color-border)]/60 bg-[var(--color-surface)] px-4 py-3 text-sm text-[var(--color-text-primary)] shadow-sm ${
+          documentLayout ? 'w-full' : 'max-w-full'
+        }`}>
+          <MarkdownRenderer content={content} variant={documentLayout ? 'document' : 'default'} />
           {!isStreaming && <InlineImageGallery text={content} />}
           {isStreaming && (
             <span className="ml-0.5 inline-block h-4 w-0.5 animate-shimmer bg-[var(--color-brand)] align-text-bottom" />
           )}
         </div>
-      </div>
 
-      <MessageActionBar
-        copyText={isStreaming ? undefined : content}
-        copyLabel="Copy reply"
-      />
+        <MessageActionBar
+          copyText={isStreaming ? undefined : content}
+          copyLabel="Copy reply"
+          align="start"
+        />
+      </div>
     </div>
   )
 }
+
+function shouldUseDocumentLayout(content: string) {
+  const normalized = content.trim()
+  if (!normalized) return false
+
+  if (/```/.test(normalized)) return true
+  if (/^\s{0,3}(#{1,6}\s|[-*+]\s|\d+\.\s|>\s|\|.+\|)/m.test(normalized)) return true
+
+  const paragraphs = normalized
+    .split(/\n\s*\n/)
+    .map((chunk) => chunk.trim())
+    .filter(Boolean)
+
+  return paragraphs.length >= 2 || normalized.split('\n').filter((line) => line.trim()).length >= 8
+}
diff --git a/desktop/src/components/chat/ChatInput.tsx b/desktop/src/components/chat/ChatInput.tsx
index d6004b38..3b29772d 100644
--- a/desktop/src/components/chat/ChatInput.tsx
+++ b/desktop/src/components/chat/ChatInput.tsx
@@ -4,6 +4,7 @@ import { useChatStore } from '../../stores/chatStore'
 import { SETTINGS_TAB_ID, useTabStore } from '../../stores/tabStore'
 import { useUIStore } from '../../stores/uiStore'
 import { useSessionStore } from '../../stores/sessionStore'
+import { useSessionRuntimeStore } from '../../stores/sessionRuntimeStore'
 import { useTeamStore } from '../../stores/teamStore'
 import { sessionsApi } from '../../api/sessions'
 import { PermissionModeSelector } from '../controls/PermissionModeSelector'
@@ -669,7 +670,9 @@ export function ChatInput({ variant = 'default' }: ChatInputProps) {
             </div>
 
             <div className="flex items-center gap-2">
-              {!isMemberSession && <ModelSelector />}
+              {!isMemberSession && activeTabId && (
+                <ModelSelector runtimeKey={activeTabId} disabled={isActive} />
+              )}
               <button
                 onClick={!isMemberSession && isActive ? () => stopGeneration(activeTabId!) : handleSubmit}
                 disabled={!isMemberSession && isActive ? false : !canSubmit}
@@ -709,6 +712,7 @@ export function ChatInput({ variant = 'default' }: ChatInputProps) {
                   const { replaceTabSession } = useTabStore.getState()
                   const { disconnectSession, connectToSession } = useChatStore.getState()
                   const newId = await createSession(newWorkDir)
+                  useSessionRuntimeStore.getState().moveSelection(oldId, newId)
                   disconnectSession(oldId)
                   replaceTabSession(oldId, newId)
                   connectToSession(newId)
diff --git a/desktop/src/components/chat/LocalSlashCommandPanel.tsx b/desktop/src/components/chat/LocalSlashCommandPanel.tsx
index b0a2e0d0..64c23cac 100644
--- a/desktop/src/components/chat/LocalSlashCommandPanel.tsx
+++ b/desktop/src/components/chat/LocalSlashCommandPanel.tsx
@@ -118,9 +118,27 @@ function McpPanel({ cwd, onClose }: { cwd?: string; onClose: () => void }) {
   useEffect(() => {
     let cancelled = false
     mcpApi.list(cwd)
-      .then((response) => {
+      .then(async (response) => {
         if (cancelled) return
-        setServers(response.servers.filter((server) => server.scope === 'user' || server.scope === 'local' || server.scope === 'project'))
+        const visibleServers = response.servers.filter((server) => server.scope === 'user' || server.scope === 'local' || server.scope === 'project')
+        setServers(visibleServers)
+
+        const statusResults = await Promise.allSettled(
+          visibleServers.map((server) => mcpApi.status(server.name, cwd)),
+        )
+        if (cancelled) return
+
+        const liveServers = new Map<string, McpServerRecord>()
+        for (const result of statusResults) {
+          if (result.status === 'fulfilled') {
+            liveServers.set(result.value.server.name, result.value.server)
+          }
+        }
+        if (liveServers.size > 0) {
+          setServers((current) =>
+            current?.map((server) => liveServers.get(server.name) ?? server) ?? current,
+          )
+        }
       })
       .catch((err) => {
         if (cancelled) return
diff --git a/desktop/src/components/chat/MessageActionBar.tsx b/desktop/src/components/chat/MessageActionBar.tsx
index 00c941d8..34070cae 100644
--- a/desktop/src/components/chat/MessageActionBar.tsx
+++ b/desktop/src/components/chat/MessageActionBar.tsx
@@ -5,6 +5,7 @@ type Props = {
   copyLabel: string
   onRewind?: () => void
   rewindLabel?: string
+  align?: 'start' | 'end'
 }
 
 export function MessageActionBar({
@@ -12,6 +13,7 @@ export function MessageActionBar({
   copyLabel,
   onRewind,
   rewindLabel = 'Rewind to here',
+  align = 'start',
 }: Props) {
   const hasCopy = Boolean(copyText?.trim())
   const hasRewind = Boolean(onRewind)
@@ -19,7 +21,13 @@ export function MessageActionBar({
   if (!hasCopy && !hasRewind) return null
 
   return (
-    <div className="shrink-0 pb-2 opacity-0 transition-opacity duration-200 group-hover:opacity-100">
+    <div
+      data-message-actions
+      data-align={align}
+      className={`flex w-full opacity-0 transition-opacity duration-200 group-hover:opacity-100 group-focus-within:opacity-100 ${
+        align === 'end' ? 'justify-end' : 'justify-start'
+      }`}
+    >
       <div className="flex items-center gap-1.5">
         {hasRewind && (
           <button
@@ -27,7 +35,7 @@ export function MessageActionBar({
             onClick={onRewind}
             aria-label={rewindLabel}
             title={rewindLabel}
-            className="inline-flex min-h-7 items-center gap-1 rounded-full border border-[var(--color-border)]/70 bg-[var(--color-surface)] px-2.5 text-[11px] font-medium text-[var(--color-text-tertiary)] transition-colors hover:border-[var(--color-brand)]/35 hover:text-[var(--color-text-primary)] focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-[var(--color-brand)]/35"
+            className="inline-flex min-h-7 items-center gap-1 rounded-full border border-[var(--color-border)]/70 bg-[var(--color-surface-container-low)] px-2.5 text-[11px] font-medium text-[var(--color-text-tertiary)] transition-colors hover:border-[var(--color-brand)]/35 hover:text-[var(--color-text-primary)] focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-[var(--color-brand)]/35"
           >
             <span className="material-symbols-outlined text-[14px]">undo</span>
             <span className="hidden min-[920px]:inline">Rewind</span>
@@ -39,7 +47,7 @@ export function MessageActionBar({
             label={copyLabel}
             displayLabel="Copy"
             displayCopiedLabel="Copied"
-            className="inline-flex min-h-7 items-center rounded-full border border-[var(--color-border)]/70 bg-[var(--color-surface)] px-2.5 text-[11px] font-medium text-[var(--color-text-tertiary)] transition-colors hover:border-[var(--color-brand)]/35 hover:text-[var(--color-text-primary)] focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-[var(--color-brand)]/35"
+            className="inline-flex min-h-7 items-center rounded-full border border-[var(--color-border)]/70 bg-[var(--color-surface-container-low)] px-2.5 text-[11px] font-medium text-[var(--color-text-tertiary)] transition-colors hover:border-[var(--color-brand)]/35 hover:text-[var(--color-text-primary)] focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-[var(--color-brand)]/35"
           />
         )}
       </div>
diff --git a/desktop/src/components/chat/MessageList.test.tsx b/desktop/src/components/chat/MessageList.test.tsx
index 09e8866d..a0b77b1d 100644
--- a/desktop/src/components/chat/MessageList.test.tsx
+++ b/desktop/src/components/chat/MessageList.test.tsx
@@ -338,6 +338,79 @@ describe('MessageList nested tool calls', () => {
     )
   })
 
+  it('keeps user actions anchored to the right bubble and assistant actions to the left bubble', () => {
+    useChatStore.setState({
+      sessions: {
+        [ACTIVE_TAB]: makeSessionState({
+          messages: [
+            {
+              id: 'user-1',
+              type: 'user_text',
+              content: '请把这条 prompt 放在右侧',
+              timestamp: 1,
+            },
+            {
+              id: 'assistant-1',
+              type: 'assistant_text',
+              content: '这条回复应该停在左侧。',
+              timestamp: 2,
+            },
+          ],
+        }),
+      },
+    })
+
+    render(<MessageList />)
+
+    const userShell = screen.getByText('请把这条 prompt 放在右侧').closest('[data-message-shell="user"]')
+    const assistantShell = screen.getByText('这条回复应该停在左侧。').closest('[data-message-shell="assistant"]')
+    const userActions = screen.getByRole('button', { name: 'Copy prompt' }).closest('[data-message-actions]')
+    const assistantActions = screen.getByRole('button', { name: 'Copy reply' }).closest('[data-message-actions]')
+
+    expect(userShell).toBeTruthy()
+    expect(userShell?.className).toContain('items-end')
+    expect(assistantShell).toBeTruthy()
+    expect(assistantShell?.className).toContain('items-start')
+    expect(assistantShell?.className).not.toContain('ml-10')
+    expect(userActions?.getAttribute('data-align')).toBe('end')
+    expect(assistantActions?.getAttribute('data-align')).toBe('start')
+  })
+
+  it('uses the document column for markdown-heavy assistant replies', () => {
+    useChatStore.setState({
+      sessions: {
+        [ACTIVE_TAB]: makeSessionState({
+          messages: [
+            {
+              id: 'assistant-doc',
+              type: 'assistant_text',
+              content: [
+                '## 交付结果',
+                '',
+                '已完成以下内容：',
+                '',
+                '- 添加任务',
+                '- 删除任务',
+                '',
+                '```bash',
+                'npm run build',
+                '```',
+              ].join('\n'),
+              timestamp: 1,
+            },
+          ],
+        }),
+      },
+    })
+
+    render(<MessageList />)
+
+    const assistantShell = screen.getByText('交付结果').closest('[data-message-shell="assistant"]')
+    expect(assistantShell?.getAttribute('data-layout')).toBe('document')
+    expect(assistantShell?.className).toContain('w-full')
+    expect(assistantShell?.className).not.toContain('ml-10')
+  })
+
   it('opens a rewind preview modal for user messages', async () => {
     vi.spyOn(sessionsApi, 'rewind').mockResolvedValue({
       target: {
diff --git a/desktop/src/components/chat/PermissionDialog.tsx b/desktop/src/components/chat/PermissionDialog.tsx
index e1de3566..8e12ac17 100644
--- a/desktop/src/components/chat/PermissionDialog.tsx
+++ b/desktop/src/components/chat/PermissionDialog.tsx
@@ -127,7 +127,7 @@ export function PermissionDialog({ requestId, toolName, input, description }: Pr
   const allowRawToggle = !preview
 
   return (
-    <div className={`mb-4 ml-10 overflow-hidden rounded-[var(--radius-lg)] border ${
+    <div className={`mb-4 overflow-hidden rounded-[var(--radius-lg)] border ${
       isPending
         ? 'border-[var(--color-warning)] bg-[var(--color-surface-container-lowest)]'
         : 'border-[var(--color-outline-variant)]/40 bg-[var(--color-surface-container-low)] opacity-70'
diff --git a/desktop/src/components/chat/StreamingIndicator.tsx b/desktop/src/components/chat/StreamingIndicator.tsx
index 1cb38f47..a6a405ab 100644
--- a/desktop/src/components/chat/StreamingIndicator.tsx
+++ b/desktop/src/components/chat/StreamingIndicator.tsx
@@ -23,7 +23,7 @@ export function StreamingIndicator() {
   }
 
   return (
-    <div className="mb-2 ml-10 flex w-fit items-center gap-2 rounded-full border border-[var(--color-border)]/40 bg-[var(--color-surface-container-low)] px-3 py-1">
+    <div className="mb-2 flex w-fit items-center gap-2 rounded-full border border-[var(--color-border)]/40 bg-[var(--color-surface-container-low)] px-3 py-1">
       <span className="text-[var(--color-brand)] animate-shimmer text-xs">✦</span>
       <span className="text-xs font-medium text-[var(--color-text-secondary)]">{verb}...</span>
       {elapsedSeconds > 0 && (
diff --git a/desktop/src/components/chat/ThinkingBlock.tsx b/desktop/src/components/chat/ThinkingBlock.tsx
index dc97706e..3975525d 100644
--- a/desktop/src/components/chat/ThinkingBlock.tsx
+++ b/desktop/src/components/chat/ThinkingBlock.tsx
@@ -18,7 +18,7 @@ export function ThinkingBlock({ content, isActive = false }: { content: string;
   const preview = firstLine.length > 80 ? firstLine.slice(0, 80) + '...' : firstLine
 
   return (
-    <div className="mb-1 ml-10">
+    <div className="mb-1">
       <style>{thinkingStyles}</style>
       <button
         onClick={() => setExpanded((v) => !v)}
diff --git a/desktop/src/components/chat/ToolCallBlock.tsx b/desktop/src/components/chat/ToolCallBlock.tsx
index d2e32be6..8c0b5201 100644
--- a/desktop/src/components/chat/ToolCallBlock.tsx
+++ b/desktop/src/components/chat/ToolCallBlock.tsx
@@ -51,7 +51,7 @@ export function ToolCallBlock({ toolName, input, result, compact = false }: Prop
 
   return (
     <div className={`overflow-hidden rounded-lg border border-[var(--color-border)]/50 bg-[var(--color-surface-container-lowest)] ${
-      compact ? 'mb-0' : 'mb-2 ml-10'
+      compact ? 'mb-0' : 'mb-2'
     }`}>
       <button
         type="button"
diff --git a/desktop/src/components/chat/ToolCallGroup.tsx b/desktop/src/components/chat/ToolCallGroup.tsx
index f63b82a2..4277d620 100644
--- a/desktop/src/components/chat/ToolCallGroup.tsx
+++ b/desktop/src/components/chat/ToolCallGroup.tsx
@@ -128,7 +128,7 @@ function AgentToolGroup({
   }, [isStreaming])
 
   return (
-    <div className="mb-2 ml-10">
+    <div className="mb-2">
       <button
         type="button"
         onClick={() => setExpanded((value) => !value)}
@@ -201,7 +201,7 @@ function ToolCallGroupMulti({ toolCalls, resultMap, childToolCallsByParent, isSt
   }, [hasNestedToolCalls, isStreaming])
 
   return (
-    <div className="mb-2 ml-10">
+    <div className="mb-2">
       <button
         type="button"
         onClick={() => setExpanded((v) => !v)}
diff --git a/desktop/src/components/chat/ToolResultBlock.tsx b/desktop/src/components/chat/ToolResultBlock.tsx
index 16ef5be6..791ae1b1 100644
--- a/desktop/src/components/chat/ToolResultBlock.tsx
+++ b/desktop/src/components/chat/ToolResultBlock.tsx
@@ -27,7 +27,7 @@ export function ToolResultBlock({ content, isError, toolName, standalone = true
   const hasMore = text.length > 200
 
   return (
-    <div className={`mb-2 ml-10 overflow-hidden rounded-xl border ${
+    <div className={`mb-2 overflow-hidden rounded-xl border ${
       isError
         ? 'border-[var(--color-error)]/20'
         : 'border-[var(--color-outline-variant)]/20'
diff --git a/desktop/src/components/chat/UserMessage.tsx b/desktop/src/components/chat/UserMessage.tsx
index 58b7f98e..729ed489 100644
--- a/desktop/src/components/chat/UserMessage.tsx
+++ b/desktop/src/components/chat/UserMessage.tsx
@@ -13,8 +13,11 @@ export function UserMessage({ content, attachments, onRewind, rewindLabel }: Pro
   const hasText = content.trim().length > 0
 
   return (
-    <div className="group mb-5 flex items-end justify-end gap-1.5">
-      <div className="min-w-0 max-w-[82%] space-y-2">
+    <div className="group mb-5 flex justify-end">
+      <div
+        data-message-shell="user"
+        className="flex min-w-0 w-full max-w-[82%] flex-col items-end gap-2 sm:max-w-[78%] lg:max-w-[72%]"
+      >
         {attachments && attachments.length > 0 && (
           <AttachmentGallery attachments={attachments} variant="message" />
         )}
@@ -27,16 +30,17 @@ export function UserMessage({ content, attachments, onRewind, rewindLabel }: Pro
             {content}
           </div>
         )}
-      </div>
 
-      {hasText && (
-        <MessageActionBar
-          copyText={content}
-          copyLabel="Copy prompt"
-          onRewind={onRewind}
-          rewindLabel={rewindLabel}
-        />
-      )}
+        {hasText && (
+          <MessageActionBar
+            copyText={content}
+            copyLabel="Copy prompt"
+            onRewind={onRewind}
+            rewindLabel={rewindLabel}
+            align="end"
+          />
+        )}
+      </div>
     </div>
   )
 }
diff --git a/desktop/src/components/controls/ModelSelector.tsx b/desktop/src/components/controls/ModelSelector.tsx
index fad9c9e9..8775478a 100644
--- a/desktop/src/components/controls/ModelSelector.tsx
+++ b/desktop/src/components/controls/ModelSelector.tsx
@@ -1,26 +1,132 @@
-import { useState, useRef, useEffect } from 'react'
-import { useSettingsStore } from '../../stores/settingsStore'
+import { useEffect, useMemo, useRef, useState } from 'react'
+import { OFFICIAL_DEFAULT_MODEL_ID, OFFICIAL_MODELS } from '../../constants/modelCatalog'
 import { useTranslation } from '../../i18n'
-import type { EffortLevel } from '../../types/settings'
+import { useChatStore } from '../../stores/chatStore'
+import { useProviderStore } from '../../stores/providerStore'
+import { DRAFT_RUNTIME_SELECTION_KEY, useSessionRuntimeStore } from '../../stores/sessionRuntimeStore'
+import { useSettingsStore } from '../../stores/settingsStore'
+import type { SavedProvider } from '../../types/provider'
+import type { RuntimeSelection } from '../../types/runtime'
+import type { EffortLevel, ModelInfo } from '../../types/settings'
 
-const MODEL_ICONS = {
-  opus: 'diamond',
-  sonnet: 'auto_awesome',
-  haiku: 'bolt',
-} as const
-
-type Props = {
-  /** Controlled mode: model ID override */
-  value?: string
-  /** Controlled mode: called on change instead of updating global store */
-  onChange?: (modelId: string) => void
+type ProviderChoice = {
+  providerId: string | null
+  providerName: string
+  isDefault: boolean
+  models: ModelInfo[]
 }
 
-export function ModelSelector({ value, onChange }: Props = {}) {
+type Props = {
+  value?: string
+  onChange?: (modelId: string) => void
+  runtimeKey?: string
+  disabled?: boolean
+}
+
+function officialChoices(availableModels: ModelInfo[], isDefault: boolean, officialName: string): ProviderChoice {
+  return {
+    providerId: null,
+    providerName: officialName,
+    isDefault,
+    models: availableModels.length > 0 ? availableModels : OFFICIAL_MODELS,
+  }
+}
+
+function buildProviderModels(
+  provider: SavedProvider,
+  labels: Record<'main' | 'haiku' | 'sonnet' | 'opus', string>,
+): ModelInfo[] {
+  const entries: Array<{ id: string; label: string }> = [
+    { id: provider.models.main.trim(), label: labels.main },
+    { id: provider.models.haiku.trim(), label: labels.haiku },
+    { id: provider.models.sonnet.trim(), label: labels.sonnet },
+    { id: provider.models.opus.trim(), label: labels.opus },
+  ]
+
+  const byId = new Map<string, { id: string; labels: string[] }>()
+  for (const entry of entries) {
+    if (!entry.id) continue
+    const existing = byId.get(entry.id)
+    if (existing) {
+      if (!existing.labels.includes(entry.label)) {
+        existing.labels.push(entry.label)
+      }
+      continue
+    }
+    byId.set(entry.id, { id: entry.id, labels: [entry.label] })
+  }
+
+  return [...byId.values()].map((entry) => ({
+    id: entry.id,
+    name: entry.id,
+    description: entry.labels.join(' · '),
+    context: '',
+  }))
+}
+
+function buildProviderChoices(
+  providers: SavedProvider[],
+  activeId: string | null,
+  availableModels: ModelInfo[],
+  officialName: string,
+  labels: Record<'main' | 'haiku' | 'sonnet' | 'opus', string>,
+): ProviderChoice[] {
+  return [
+    officialChoices(availableModels, activeId === null, officialName),
+    ...providers.map((provider) => ({
+      providerId: provider.id,
+      providerName: provider.name,
+      isDefault: activeId === provider.id,
+      models: buildProviderModels(provider, labels),
+    })),
+  ]
+}
+
+function resolveDefaultRuntimeSelection(
+  activeId: string | null,
+  activeProviderName: string | null,
+  providers: SavedProvider[],
+  currentModelId: string | undefined,
+): RuntimeSelection {
+  const inferredProviderId = activeId ?? (
+    activeProviderName
+      ? providers.find((provider) => provider.name === activeProviderName)?.id ?? null
+      : null
+  )
+
+  return {
+    providerId: inferredProviderId,
+    modelId: currentModelId ?? OFFICIAL_DEFAULT_MODEL_ID,
+  }
+}
+
+export function ModelSelector({
+  value,
+  onChange,
+  runtimeKey,
+  disabled = false,
+}: Props = {}) {
   const t = useTranslation()
-  const { currentModel: storeModel, availableModels, effortLevel, setModel, setEffort } = useSettingsStore()
+  const {
+    currentModel: storeModel,
+    availableModels,
+    effortLevel,
+    activeProviderName,
+    setModel,
+    setEffort,
+  } = useSettingsStore()
+  const {
+    providers,
+    activeId,
+    isLoading: providersLoading,
+    fetchProviders,
+  } = useProviderStore()
+  const runtimeSelection = useSessionRuntimeStore((state) =>
+    runtimeKey ? state.selections[runtimeKey] : undefined,
+  )
   const [open, setOpen] = useState(false)
   const ref = useRef<HTMLDivElement>(null)
+  const requestedProvidersRef = useRef(false)
 
   const EFFORT_OPTIONS: { value: EffortLevel; label: string }[] = [
     { value: 'low', label: t('settings.general.effort.low') },
@@ -30,7 +136,13 @@ export function ModelSelector({ value, onChange }: Props = {}) {
   ]
 
   const isControlled = value !== undefined
-  const selectedModel = isControlled ? availableModels.find((m) => m.id === value) || null : storeModel
+  const isRuntimeScoped = !isControlled && runtimeKey !== undefined
+
+  useEffect(() => {
+    if (!isRuntimeScoped || providersLoading || requestedProvidersRef.current) return
+    requestedProvidersRef.current = true
+    void fetchProviders()
+  }, [fetchProviders, isRuntimeScoped, providersLoading])
 
   useEffect(() => {
     if (!open) return
@@ -48,107 +160,234 @@ export function ModelSelector({ value, onChange }: Props = {}) {
     }
   }, [open])
 
-  const getModelIcon = (id: string): string => {
-    const lower = id.toLowerCase()
-    if (lower.includes('opus')) return MODEL_ICONS.opus
-    if (lower.includes('sonnet')) return MODEL_ICONS.sonnet
-    if (lower.includes('haiku')) return MODEL_ICONS.haiku
-    return 'smart_toy'
+  const roleLabels = useMemo(
+    () => ({
+      main: t('settings.providers.mainModel'),
+      haiku: t('settings.providers.haikuModel'),
+      sonnet: t('settings.providers.sonnetModel'),
+      opus: t('settings.providers.opusModel'),
+    }),
+    [t],
+  )
+
+  const providerChoices = useMemo(
+    () => buildProviderChoices(
+      providers,
+      activeId,
+      activeId === null ? availableModels : OFFICIAL_MODELS,
+      t('settings.providers.officialName'),
+      roleLabels,
+    ),
+    [activeId, availableModels, providers, roleLabels, t],
+  )
+
+  const selectedModel = isControlled
+    ? availableModels.find((model) => model.id === value) || null
+    : storeModel
+
+  const activeRuntimeSelection = isRuntimeScoped
+    ? runtimeSelection ?? resolveDefaultRuntimeSelection(
+      activeId,
+      activeProviderName,
+      providers,
+      storeModel?.id,
+    )
+    : null
+
+  const selectedProviderChoice = activeRuntimeSelection
+    ? providerChoices.find((choice) => choice.providerId === activeRuntimeSelection.providerId) ?? null
+    : null
+
+  const selectedRuntimeModel = activeRuntimeSelection
+    ? selectedProviderChoice?.models.find((model) => model.id === activeRuntimeSelection.modelId)
+      ?? {
+        id: activeRuntimeSelection.modelId,
+        name: activeRuntimeSelection.modelId,
+        description: '',
+        context: '',
+      }
+    : null
+
+  const buttonModelLabel = isRuntimeScoped
+    ? selectedRuntimeModel?.name ?? storeModel?.name ?? t('model.selectModel')
+    : selectedModel?.name ?? t('model.selectModel')
+  const buttonProviderLabel = isRuntimeScoped
+    ? selectedProviderChoice?.providerName ?? activeProviderName ?? t('settings.providers.officialName')
+    : null
+
+  const handleRuntimeSelect = (selection: RuntimeSelection) => {
+    if (!runtimeKey) return
+    useSessionRuntimeStore.getState().setSelection(runtimeKey, selection)
+    if (runtimeKey !== DRAFT_RUNTIME_SELECTION_KEY) {
+      useChatStore.getState().setSessionRuntime(runtimeKey, selection)
+    }
+    setOpen(false)
   }
 
   return (
     <div ref={ref} className="relative">
       <button
-        onClick={() => setOpen(!open)}
-        className="flex items-center gap-1.5 px-2.5 py-1.5 bg-[var(--color-surface-container-low)] hover:bg-[var(--color-surface-hover)] rounded-full text-xs font-medium text-[var(--color-text-secondary)] transition-colors"
+        onClick={() => !disabled && setOpen(!open)}
+        disabled={disabled}
+        className="flex max-w-[280px] items-center gap-2 rounded-full bg-[var(--color-surface-container-low)] px-3 py-1.5 text-xs font-medium text-[var(--color-text-secondary)] transition-colors hover:bg-[var(--color-surface-hover)] disabled:cursor-not-allowed disabled:opacity-50"
       >
-        <span className="material-symbols-outlined text-[14px] text-[var(--color-brand)]">auto_awesome</span>
-        <span>{selectedModel?.name ?? t('model.selectModel')}</span>
-        <span className="material-symbols-outlined text-[12px]">expand_more</span>
+        <div className="flex min-w-0 flex-1 items-center gap-2">
+          <span className="min-w-0 flex-1 truncate text-sm font-semibold text-[var(--color-text-primary)]">
+            {buttonModelLabel}
+          </span>
+          {buttonProviderLabel && (
+            <span className="max-w-[108px] flex-shrink-0 truncate text-[11px] text-[var(--color-text-tertiary)]">
+              {buttonProviderLabel}
+            </span>
+          )}
+        </div>
+        <span className="material-symbols-outlined flex-shrink-0 text-[12px]">expand_more</span>
       </button>
 
       {open && (
-        <div className="absolute right-0 bottom-full mb-2 w-[340px] rounded-xl bg-[var(--color-surface-container-lowest)] border border-[var(--color-border)] shadow-[var(--shadow-dropdown)] z-50">
-          {/* Models */}
-          <div className="p-3">
-            <div className="text-[10px] font-bold uppercase tracking-widest text-[var(--color-outline)] mb-2 px-1">
+        <div className="absolute right-0 bottom-full z-50 mb-2 w-[360px] rounded-xl border border-[var(--color-border)] bg-[var(--color-surface-container-lowest)] shadow-[var(--shadow-dropdown)]">
+          <div className="max-h-[420px] overflow-y-auto p-3">
+            <div className="mb-2 px-1 text-[10px] font-bold uppercase tracking-widest text-[var(--color-outline)]">
               {t('model.configuration')}
             </div>
-            <div className="space-y-1">
-              {availableModels.map((model) => {
-                const isSelected = model.id === selectedModel?.id
-                return (
-                  <button
-                    key={model.id}
-                    onClick={() => {
-                      if (isControlled) {
-                        onChange?.(model.id)
-                      } else {
-                        setModel(model.id)
-                      }
-                      setOpen(false)
-                    }}
-                    className={`
-                      w-full flex items-center gap-3 px-3 py-2.5 rounded-lg text-left transition-colors
-                      ${isSelected
-                        ? 'bg-[var(--color-primary-fixed)] border border-[var(--color-brand)]/20'
-                        : 'hover:bg-[var(--color-surface-hover)]'
-                      }
-                    `}
-                  >
-                    {/* Radio button */}
-                    <div className={`w-4 h-4 rounded-full border-2 flex items-center justify-center flex-shrink-0 ${
-                      isSelected
-                        ? 'border-[var(--color-brand)]'
-                        : 'border-[var(--color-outline)]'
-                    }`}>
-                      {isSelected && (
-                        <div className="w-2 h-2 rounded-full bg-[var(--color-brand)]" />
+
+            {isRuntimeScoped ? (
+              <div className="space-y-3">
+                {providerChoices.map((choice) => (
+                  <div key={choice.providerId ?? 'official'} className="space-y-1.5">
+                    <div className="flex items-center justify-between px-2 pt-1">
+                      <span className="truncate text-[11px] font-semibold tracking-[0.01em] text-[var(--color-text-secondary)]">
+                        {choice.providerName}
+                      </span>
+                      {choice.isDefault && (
+                        <span className="flex-shrink-0 text-[10px] font-medium text-[var(--color-text-tertiary)]">
+                          {t('settings.providers.default')}
+                        </span>
                       )}
                     </div>
 
-                    <span className="material-symbols-outlined text-[18px] text-[var(--color-text-secondary)]">
-                      {getModelIcon(model.id)}
-                    </span>
+                    <div className="space-y-1">
+                      {choice.models.map((model) => {
+                        const isSelected =
+                          activeRuntimeSelection?.providerId === choice.providerId &&
+                          activeRuntimeSelection.modelId === model.id
+                        return (
+                          <button
+                            key={`${choice.providerId ?? 'official'}:${model.id}`}
+                            onClick={() => handleRuntimeSelect({ providerId: choice.providerId, modelId: model.id })}
+                            className={`
+                              w-full rounded-lg border px-3 py-2.5 text-left transition-colors
+                              ${isSelected
+                                ? 'border-[var(--color-brand)]/20 bg-[var(--color-primary-fixed)]'
+                                : 'border-transparent hover:bg-[var(--color-surface-hover)]'
+                              }
+                            `}
+                          >
+                            <div className="flex items-start gap-3">
+                              <div className={`mt-0.5 flex h-4 w-4 flex-shrink-0 items-center justify-center rounded-full border-2 ${
+                                isSelected ? 'border-[var(--color-brand)]' : 'border-[var(--color-outline)]'
+                              }`}>
+                                {isSelected && (
+                                  <div className="h-2 w-2 rounded-full bg-[var(--color-brand)]" />
+                                )}
+                              </div>
 
-                    <div className="flex-1 min-w-0">
-                      <div className="text-sm font-semibold text-[var(--color-text-primary)]">{model.name}</div>
-                      {model.description && (
-                        <div className="text-[10px] text-[var(--color-text-tertiary)] mt-0.5 truncate">{model.description}</div>
-                      )}
+                              <div className="min-w-0 flex-1">
+                                <div className="truncate text-sm font-semibold text-[var(--color-text-primary)]">
+                                  {model.name}
+                                </div>
+                                {model.description && (
+                                  <div className="mt-0.5 truncate pr-[6px] text-[10px] text-[var(--color-text-tertiary)]">
+                                    {model.description}
+                                  </div>
+                                )}
+                              </div>
+                            </div>
+                          </button>
+                        )
+                      })}
                     </div>
-                  </button>
-                )
-              })}
-            </div>
+                  </div>
+                ))}
+              </div>
+            ) : (
+              <div className="space-y-1">
+                {availableModels.map((model) => {
+                  const isSelected = model.id === selectedModel?.id
+                  return (
+                    <button
+                      key={model.id}
+                      onClick={() => {
+                        if (isControlled) {
+                          onChange?.(model.id)
+                        } else {
+                          void setModel(model.id)
+                        }
+                        setOpen(false)
+                      }}
+                      className={`
+                        w-full rounded-lg px-3 py-2.5 text-left transition-colors
+                        ${isSelected
+                          ? 'bg-[var(--color-primary-fixed)] border border-[var(--color-brand)]/20'
+                          : 'hover:bg-[var(--color-surface-hover)]'
+                        }
+                      `}
+                    >
+                      <div className="flex items-center gap-3">
+                        <div className={`flex h-4 w-4 flex-shrink-0 items-center justify-center rounded-full border-2 ${
+                          isSelected ? 'border-[var(--color-brand)]' : 'border-[var(--color-outline)]'
+                        }`}>
+                          {isSelected && (
+                            <div className="h-2 w-2 rounded-full bg-[var(--color-brand)]" />
+                          )}
+                        </div>
+
+                        <div className="min-w-0 flex-1">
+                          <div className="text-sm font-semibold text-[var(--color-text-primary)]">{model.name}</div>
+                          {model.description && (
+                            <div className="mt-0.5 truncate text-[10px] text-[var(--color-text-tertiary)]">
+                              {model.description}
+                            </div>
+                          )}
+                        </div>
+                      </div>
+                    </button>
+                  )
+                })}
+              </div>
+            )}
           </div>
 
-          {/* Effort — hidden in controlled mode (not relevant for task creation) */}
-          {!isControlled && <div className="border-t border-[var(--color-border)] p-3">
-            <div className="text-[10px] font-bold uppercase tracking-widest text-[var(--color-outline)] mb-2 px-1">
-              {t('model.effort')}
+          {!isControlled && !isRuntimeScoped && (
+            <div className="border-t border-[var(--color-border)] p-3">
+              <div className="mb-2 px-1 text-[10px] font-bold uppercase tracking-widest text-[var(--color-outline)]">
+                {t('model.effort')}
+              </div>
+              <div className="grid grid-cols-4 gap-1.5">
+                {EFFORT_OPTIONS.map((opt) => {
+                  const isSelected = opt.value === effortLevel
+                  return (
+                    <button
+                      key={opt.value}
+                      onClick={() => {
+                        void setEffort(opt.value)
+                        setOpen(false)
+                      }}
+                      className={`
+                        rounded-lg py-2 text-center text-xs font-semibold transition-colors
+                        ${isSelected
+                          ? 'bg-[var(--color-brand)] text-white'
+                          : 'bg-[var(--color-surface-container-high)] text-[var(--color-text-secondary)] hover:bg-[var(--color-surface-hover)]'
+                        }
+                      `}
+                    >
+                      {opt.label}
+                    </button>
+                  )
+                })}
+              </div>
             </div>
-            <div className="grid grid-cols-4 gap-1.5">
-              {EFFORT_OPTIONS.map((opt) => {
-                const isSelected = opt.value === effortLevel
-                return (
-                  <button
-                    key={opt.value}
-                    onClick={() => { setEffort(opt.value); setOpen(false) }}
-                    className={`
-                      py-2 rounded-lg text-xs font-semibold transition-colors text-center
-                      ${isSelected
-                        ? 'bg-[var(--color-brand)] text-white'
-                        : 'bg-[var(--color-surface-container-high)] text-[var(--color-text-secondary)] hover:bg-[var(--color-surface-hover)]'
-                      }
-                    `}
-                  >
-                    {opt.label}
-                  </button>
-                )
-              })}
-            </div>
-          </div>}
+          )}
         </div>
       )}
     </div>
diff --git a/desktop/src/components/layout/AppShell.tsx b/desktop/src/components/layout/AppShell.tsx
index 44245885..1d661d8a 100644
--- a/desktop/src/components/layout/AppShell.tsx
+++ b/desktop/src/components/layout/AppShell.tsx
@@ -29,8 +29,9 @@ export function AppShell() {
 
         // Restore tabs from localStorage
         await useTabStore.getState().restoreTabs()
-        const activeId = useTabStore.getState().activeTabId
-        if (activeId) {
+        const { activeTabId: activeId, tabs } = useTabStore.getState()
+        const activeTab = tabs.find((tab) => tab.sessionId === activeId)
+        if (activeId && activeTab?.type === 'session') {
           useChatStore.getState().connectToSession(activeId)
         }
         if (!cancelled) {
diff --git a/desktop/src/components/layout/ProjectFilter.tsx b/desktop/src/components/layout/ProjectFilter.tsx
index f94fc0c2..3a370929 100644
--- a/desktop/src/components/layout/ProjectFilter.tsx
+++ b/desktop/src/components/layout/ProjectFilter.tsx
@@ -23,7 +23,7 @@ let cachedProjects: RecentProject[] | null = null
 let cacheTimestamp = 0
 const CACHE_TTL = 30_000
 
-export function ProjectFilter() {
+export function ProjectFilter({ variant = 'default' }: { variant?: 'default' | 'embedded' }) {
   const t = useTranslation()
   const { availableProjects, selectedProjects, setSelectedProjects } = useSessionStore()
   const [open, setOpen] = useState(false)
@@ -134,6 +134,7 @@ export function ProjectFilter() {
     : selectedProjects.length === 1
       ? optionByPath.get(selectedProjects[0]!)?.title || fallbackProjectTitle(selectedProjects[0]!, t('sidebar.other'))
       : `${selectedProjects.length} projects`
+  const triggerLabel = isAllSelected ? t('sidebar.allProjects') : label
 
   const toggleProject = (projectPath: string) => {
     if (isAllSelected) {
@@ -160,19 +161,45 @@ export function ProjectFilter() {
         type="button"
         onClick={() => setOpen((current) => !current)}
         aria-expanded={open}
-        className="flex items-center gap-1.5 rounded-[var(--radius-lg)] bg-[var(--color-surface-container-low)] px-3 py-2 text-sm font-medium text-[var(--color-text-primary)] shadow-[0_1px_0_rgba(255,255,255,0.6)] transition-colors hover:bg-[var(--color-surface-hover)]"
+        aria-label={triggerLabel}
+        title={triggerLabel}
+        className={
+          variant === 'embedded'
+            ? `inline-flex h-7 w-7 items-center justify-center rounded-[8px] border transition-colors duration-200 ${
+              isAllSelected
+                ? 'border-transparent text-[var(--color-text-tertiary)] hover:bg-[var(--color-sidebar-item-hover)] hover:text-[var(--color-text-secondary)]'
+                : 'border-[var(--color-sidebar-item-active-border)] bg-[var(--color-sidebar-item-active)] text-[var(--color-text-primary)] hover:bg-[var(--color-sidebar-item-hover)]'
+            }`
+            : 'inline-flex h-8 max-w-full items-center gap-1.5 rounded-[10px] border border-[var(--color-sidebar-filter-border)] bg-[var(--color-sidebar-filter-bg)] px-2 text-left text-[14px] text-[var(--color-text-primary)] transition-colors duration-200 hover:bg-[var(--color-sidebar-item-hover)]'
+        }
       >
-        <span className="truncate max-w-[180px]">{label}</span>
-        <ChevronIcon open={open} />
+        {variant === 'embedded' ? (
+          <span className="relative flex items-center justify-center">
+            <FolderIcon className="h-[14px] w-[14px]" />
+            {!isAllSelected && (
+              <span className="absolute -right-1 -top-1 h-1.5 w-1.5 rounded-full bg-[var(--color-brand)]" />
+            )}
+          </span>
+        ) : (
+          <>
+            <FolderIcon className="h-[14px] w-[14px] text-[var(--color-text-secondary)]" />
+            <span className="min-w-0">
+              <span className="block truncate text-[14px] font-semibold tracking-tight">{label}</span>
+            </span>
+            <span className="flex h-[14px] w-[14px] flex-shrink-0 items-center justify-center text-[var(--color-text-tertiary)] transition-colors">
+              <ChevronIcon open={open} />
+            </span>
+          </>
+        )}
       </button>
 
       {open && dropdownPos && createPortal(
         <div
           ref={dropdownRef}
-          className="w-[380px] max-w-[calc(100vw-32px)] overflow-hidden rounded-[20px] border border-[var(--color-border)] bg-[var(--color-surface-container-lowest)]"
+          className="w-[360px] max-w-[calc(100vw-32px)] overflow-hidden rounded-[18px] border border-[var(--color-border)] bg-[var(--color-surface-container-lowest)]"
           style={{
             position: 'fixed',
-            left: Math.min(dropdownPos.left, window.innerWidth - Math.min(380, window.innerWidth - 32) - 16),
+            left: Math.min(dropdownPos.left, window.innerWidth - Math.min(360, window.innerWidth - 32) - 16),
             ...(dropdownPos.direction === 'down'
               ? { top: dropdownPos.top }
               : { bottom: window.innerHeight - dropdownPos.top }),
@@ -184,9 +211,13 @@ export function ProjectFilter() {
             <button
               type="button"
               onClick={selectAll}
-              className="flex w-full items-center gap-3 rounded-[16px] px-4 py-3 text-left transition-colors hover:bg-[var(--color-surface-hover)]"
+              className={`flex w-full items-center gap-3 rounded-[12px] px-3 py-2.5 text-left transition-colors ${
+                isAllSelected
+                  ? 'bg-[var(--color-sidebar-item-active)]'
+                  : 'hover:bg-[var(--color-sidebar-item-hover)]'
+              }`}
             >
-              <FolderIcon />
+              <FolderIcon className="text-[var(--color-text-secondary)]" />
               <div className="min-w-0 flex-1">
                 <div className="truncate text-sm font-semibold text-[var(--color-text-primary)]">{t('sidebar.allProjects')}</div>
               </div>
@@ -207,11 +238,13 @@ export function ProjectFilter() {
                     key={option.projectPath}
                     type="button"
                     onClick={() => toggleProject(option.projectPath)}
-                    className={`flex w-full items-center gap-3 rounded-[16px] px-4 py-3 text-left transition-colors hover:bg-[var(--color-surface-hover)] ${
-                      checked ? 'bg-[var(--color-surface-selected)]' : ''
+                    className={`flex w-full items-center gap-3 rounded-[12px] px-3 py-2.5 text-left transition-colors ${
+                      checked
+                        ? 'bg-[var(--color-sidebar-item-active)]'
+                        : 'hover:bg-[var(--color-sidebar-item-hover)]'
                     }`}
                   >
-                    {option.isGit ? <GitBranchIcon /> : <FolderIcon />}
+                    {option.isGit ? <GitBranchIcon className="text-[var(--color-text-secondary)]" /> : <FolderIcon />}
                     <div className="min-w-0 flex-1">
                       <div className="truncate text-sm font-semibold text-[var(--color-text-primary)]">{option.title}</div>
                       {option.subtitle && (
@@ -277,7 +310,7 @@ function ChevronIcon({ open }: { open: boolean }) {
   )
 }
 
-function FolderIcon() {
+function FolderIcon({ className = 'text-[var(--color-text-secondary)]' }: { className?: string }) {
   return (
     <svg
       width="20"
@@ -288,14 +321,14 @@ function FolderIcon() {
       strokeWidth="1.8"
       strokeLinecap="round"
       strokeLinejoin="round"
-      className="flex-shrink-0 text-[var(--color-text-secondary)]"
+      className={`flex-shrink-0 ${className}`}
     >
       <path d="M22 19a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h5l2 3h9a2 2 0 0 1 2 2z" />
     </svg>
   )
 }
 
-function GitBranchIcon() {
+function GitBranchIcon({ className = 'text-[var(--color-text-secondary)]' }: { className?: string }) {
   return (
     <svg
       width="20"
@@ -306,7 +339,7 @@ function GitBranchIcon() {
       strokeWidth="1.8"
       strokeLinecap="round"
       strokeLinejoin="round"
-      className="flex-shrink-0 text-[var(--color-text-secondary)]"
+      className={`flex-shrink-0 ${className}`}
     >
       <circle cx="18" cy="18" r="3" />
       <circle cx="6" cy="6" r="3" />
diff --git a/desktop/src/components/layout/Sidebar.test.tsx b/desktop/src/components/layout/Sidebar.test.tsx
index c98ef8fe..f380c64a 100644
--- a/desktop/src/components/layout/Sidebar.test.tsx
+++ b/desktop/src/components/layout/Sidebar.test.tsx
@@ -1,5 +1,5 @@
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { act, fireEvent, render, screen, waitFor } from '@testing-library/react'
+import { act, fireEvent, render, screen, waitFor, within } from '@testing-library/react'
 import '@testing-library/jest-dom'
 
 vi.mock('./ProjectFilter', () => ({
@@ -17,6 +17,7 @@ vi.mock('../../i18n', () => ({
       'sidebar.noMatching': 'No matching sessions',
       'sidebar.sessionListFailed': 'Session list failed',
       'common.retry': 'Retry',
+      'common.cancel': 'Cancel',
       'common.delete': 'Delete',
       'common.rename': 'Rename',
       'sidebar.timeGroup.today': 'Today',
@@ -25,6 +26,7 @@ vi.mock('../../i18n', () => ({
       'sidebar.timeGroup.last30days': 'Last 30 Days',
       'sidebar.timeGroup.older': 'Older',
       'sidebar.missingDir': 'Missing',
+      'sidebar.confirmDelete': 'Delete this session? This cannot be undone.',
       'sidebar.collapse': 'Collapse sidebar',
       'sidebar.expand': 'Expand sidebar',
     }
@@ -121,7 +123,7 @@ describe('Sidebar', () => {
     expect(useTabStore.getState().tabs).toEqual([])
   })
 
-  it('removes the matching tab when deleting a session from the sidebar', async () => {
+  it('requires confirmation before deleting a session from the sidebar', async () => {
     deleteSession.mockResolvedValue(undefined)
     useSessionStore.setState({
       sessions: [
@@ -146,8 +148,15 @@ describe('Sidebar', () => {
 
     fireEvent.contextMenu(screen.getByRole('button', { name: /Open Session/ }))
 
+    fireEvent.click(screen.getByRole('button', { name: 'Delete' }))
+
+    expect(deleteSession).not.toHaveBeenCalled()
+    const dialog = screen.getByRole('dialog')
+    expect(dialog).toBeInTheDocument()
+    expect(screen.getByText('Delete this session? This cannot be undone.')).toBeInTheDocument()
+
     await act(async () => {
-      fireEvent.click(screen.getByRole('button', { name: 'Delete' }))
+      fireEvent.click(within(dialog).getByRole('button', { name: 'Delete' }))
     })
 
     await waitFor(() => {
diff --git a/desktop/src/components/layout/Sidebar.tsx b/desktop/src/components/layout/Sidebar.tsx
index 81011251..c0add799 100644
--- a/desktop/src/components/layout/Sidebar.tsx
+++ b/desktop/src/components/layout/Sidebar.tsx
@@ -3,6 +3,7 @@ import { useSessionStore } from '../../stores/sessionStore'
 import { useUIStore } from '../../stores/uiStore'
 import { useTranslation } from '../../i18n'
 import { ProjectFilter } from './ProjectFilter'
+import { ConfirmDialog } from '../shared/ConfirmDialog'
 import type { SessionListItem } from '../../types/session'
 import { useTabStore, SETTINGS_TAB_ID, SCHEDULED_TAB_ID } from '../../stores/tabStore'
 import { useChatStore } from '../../stores/chatStore'
@@ -29,6 +30,7 @@ export function Sidebar() {
   const disconnectSession = useChatStore((s) => s.disconnectSession)
   const [searchQuery, setSearchQuery] = useState('')
   const [contextMenu, setContextMenu] = useState<{ id: string; x: number; y: number } | null>(null)
+  const [pendingDeleteSessionId, setPendingDeleteSessionId] = useState<string | null>(null)
   const [renamingId, setRenamingId] = useState<string | null>(null)
   const [renameValue, setRenameValue] = useState('')
 
@@ -67,12 +69,18 @@ export function Sidebar() {
     setContextMenu({ id, x: e.clientX, y: e.clientY })
   }, [])
 
-  const handleDelete = useCallback(async (id: string) => {
+  const handleDelete = useCallback((id: string) => {
     setContextMenu(null)
-    await deleteSession(id)
-    disconnectSession(id)
-    closeTab(id)
-  }, [closeTab, deleteSession, disconnectSession])
+    setPendingDeleteSessionId(id)
+  }, [])
+
+  const confirmDelete = useCallback(async () => {
+    if (!pendingDeleteSessionId) return
+    await deleteSession(pendingDeleteSessionId)
+    disconnectSession(pendingDeleteSessionId)
+    closeTab(pendingDeleteSessionId)
+    setPendingDeleteSessionId(null)
+  }, [closeTab, deleteSession, disconnectSession, pendingDeleteSessionId])
 
   const handleStartRename = useCallback((id: string, currentTitle: string) => {
     setContextMenu(null)
@@ -125,7 +133,7 @@ export function Sidebar() {
       <div className={`px-3 pb-2 ${isTauri && !isWindows ? 'pt-[44px]' : 'pt-3'}`}>
         <div className={`flex ${sidebarOpen ? 'items-center justify-between gap-3' : 'flex-col items-center gap-2'}`}>
           <div className={`flex min-w-0 items-center ${sidebarOpen ? 'gap-2.5' : 'justify-center'}`}>
-            <img src="/app-icon.png" alt="" className="h-8 w-8 rounded-lg flex-shrink-0" />
+            <img src="/app-icon.png" alt="" className="h-8 w-8 flex-shrink-0" />
             <span
               className={`sidebar-copy ${sidebarOpen ? 'sidebar-copy--visible' : 'sidebar-copy--hidden'} text-[13px] font-semibold tracking-tight text-[var(--color-text-primary)]`}
               style={{ fontFamily: 'var(--font-headline)' }}
@@ -200,30 +208,31 @@ export function Sidebar() {
         <>
           <div
             data-testid="sidebar-project-filter-section"
-            className="sidebar-section sidebar-section--visible relative z-20 flex-none px-3 pb-1"
+            className="sidebar-section sidebar-section--visible relative z-20 flex-none px-3 pb-2"
             style={{ overflow: 'visible' }}
           >
-            <div className="flex items-center justify-between">
-              <ProjectFilter />
+            <div className="flex h-9 items-center rounded-[14px] border border-[var(--color-sidebar-search-border)] bg-[var(--color-sidebar-search-bg)] pl-1.5 pr-3 transition-colors focus-within:border-[var(--color-border-focus)]">
+              <ProjectFilter variant="embedded" />
+              <span className="mx-2 h-4 w-px bg-[var(--color-border)]/80" aria-hidden="true" />
+              <span className="pointer-events-none flex shrink-0 items-center text-[var(--color-text-tertiary)]">
+                <SearchIcon />
+              </span>
+              <input
+                id="sidebar-search"
+                type="text"
+                placeholder={t('sidebar.searchPlaceholder')}
+                value={searchQuery}
+                onChange={(e) => setSearchQuery(e.target.value)}
+                className="min-w-0 flex-1 bg-transparent pl-2 pr-0 text-[13px] text-[var(--color-text-primary)] placeholder:text-[var(--color-text-tertiary)] outline-none"
+              />
             </div>
           </div>
 
-          <div className="sidebar-section sidebar-section--visible flex-none px-3 pb-2">
-            <input
-              id="sidebar-search"
-              type="text"
-              placeholder={t('sidebar.searchPlaceholder')}
-              value={searchQuery}
-              onChange={(e) => setSearchQuery(e.target.value)}
-              className="w-full h-8 px-2.5 text-xs rounded-[var(--radius-md)] border border-[var(--color-border)] bg-[var(--color-surface)] text-[var(--color-text-primary)] placeholder:text-[var(--color-text-tertiary)] outline-none transition-colors focus:border-[var(--color-border-focus)]"
-            />
-          </div>
-
           <div
             data-testid="sidebar-session-list-section"
             className="sidebar-section sidebar-section--visible flex flex-1 min-h-0 flex-col"
           >
-            <div className="min-h-0 flex-1 overflow-y-auto px-3">
+            <div className="sidebar-scroll-area min-h-0 flex-1 overflow-y-auto px-3">
               {error && (
                 <div className="mx-1 mt-2 rounded-[var(--radius-md)] border border-[var(--color-error)]/20 bg-[var(--color-error)]/5 px-3 py-2">
                   <div className="text-xs font-medium text-[var(--color-error)]">{t('sidebar.sessionListFailed')}</div>
@@ -246,7 +255,7 @@ export function Sidebar() {
                 if (!items || items.length === 0) return null
                 return (
                   <div key={group} className="mb-1">
-                    <div className="px-2 pb-1 pt-3 text-[11px] font-semibold tracking-wide text-[var(--color-text-tertiary)]">
+                    <div className="px-2 pb-1 pt-4 text-[11px] font-semibold tracking-wide text-[var(--color-text-tertiary)]">
                       {timeGroupLabels[group]}
                     </div>
                     {items.map((session) => (
@@ -274,22 +283,22 @@ export function Sidebar() {
                             }}
                             onContextMenu={(e) => handleContextMenu(e, session.id)}
                             className={`
-                              group w-full rounded-[var(--radius-md)] py-1.5 pl-4 pr-3 text-left text-sm transition-colors duration-200
+                              group w-full rounded-[12px] px-3 py-2 text-left text-sm transition-colors duration-200
                               ${session.id === activeTabId
-                                ? 'bg-[var(--color-surface-selected)] text-[var(--color-text-primary)]'
-                                : 'text-[var(--color-text-secondary)] hover:bg-[var(--color-surface-hover)]'
+                                ? 'bg-[var(--color-sidebar-item-active)] text-[var(--color-text-primary)]'
+                                : 'text-[var(--color-text-secondary)] hover:bg-[var(--color-sidebar-item-hover)]'
                               }
                             `}
                           >
-                            <span className="flex items-center gap-2">
+                            <span className="flex items-center gap-2.5">
                               <span
-                                className="h-1 w-1 flex-shrink-0 rounded-full"
+                                className="h-1.5 w-1.5 flex-shrink-0 rounded-full"
                                 style={{
                                   backgroundColor: session.id === activeTabId ? 'var(--color-brand)' : 'var(--color-text-tertiary)',
                                   opacity: session.id === activeTabId ? 1 : 0.5,
                                 }}
                               />
-                              <span className="flex-1 truncate">{session.title || 'Untitled'}</span>
+                              <span className="flex-1 truncate font-medium tracking-[-0.01em]">{session.title || 'Untitled'}</span>
                               {!session.workDirExists && (
                                 <span
                                   className="flex-shrink-0 text-[10px] text-[var(--color-warning)]"
@@ -350,6 +359,17 @@ export function Sidebar() {
           </button>
         </div>
       )}
+
+      <ConfirmDialog
+        open={pendingDeleteSessionId !== null}
+        onClose={() => setPendingDeleteSessionId(null)}
+        onConfirm={confirmDelete}
+        title={t('common.delete')}
+        body={pendingDeleteSessionId ? t('sidebar.confirmDelete') : ''}
+        confirmLabel={t('common.delete')}
+        cancelLabel={t('common.cancel')}
+        confirmVariant="danger"
+      />
     </aside>
   )
 }
@@ -399,11 +419,11 @@ function NavItem({
       aria-label={label}
       title={collapsed ? label : undefined}
       className={`
-        flex items-center rounded-[var(--radius-md)] transition-all duration-200
-        ${collapsed ? 'h-10 w-10 justify-center px-0 py-0' : 'w-full gap-2.5 px-3 py-2 text-sm'}
+        flex items-center transition-colors duration-200
+        ${collapsed ? 'h-10 w-10 justify-center rounded-[var(--radius-md)] px-0 py-0' : 'w-full gap-2.5 rounded-[12px] px-3 py-2.5 text-sm'}
         ${active
-          ? 'bg-[var(--color-surface-selected)] font-medium text-[var(--color-text-primary)] shadow-[0_8px_24px_rgba(15,23,42,0.08)]'
-          : 'text-[var(--color-text-secondary)] hover:bg-[var(--color-surface-hover)] hover:text-[var(--color-text-primary)]'
+          ? 'bg-[var(--color-sidebar-item-active)] font-medium text-[var(--color-text-primary)]'
+          : 'text-[var(--color-text-secondary)] hover:bg-[var(--color-sidebar-item-hover)] hover:text-[var(--color-text-primary)]'
         }
       `}
     >
@@ -455,6 +475,15 @@ function ClockIcon() {
   )
 }
 
+function SearchIcon() {
+  return (
+    <svg width="15" height="15" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round">
+      <circle cx="11" cy="11" r="7" />
+      <line x1="21" y1="21" x2="16.65" y2="16.65" />
+    </svg>
+  )
+}
+
 function SidebarToggleIcon({ collapsed }: { collapsed: boolean }) {
   return (
     <svg
diff --git a/desktop/src/components/layout/StatusBar.tsx b/desktop/src/components/layout/StatusBar.tsx
index e95ad7b0..82c742d1 100644
--- a/desktop/src/components/layout/StatusBar.tsx
+++ b/desktop/src/components/layout/StatusBar.tsx
@@ -1,15 +1,20 @@
 import { useSettingsStore } from '../../stores/settingsStore'
 import { useSessionStore } from '../../stores/sessionStore'
+import { useSessionRuntimeStore } from '../../stores/sessionRuntimeStore'
 import { useTabStore } from '../../stores/tabStore'
 
 export function StatusBar() {
   const { currentModel } = useSettingsStore()
   const activeTabId = useTabStore((s) => s.activeTabId)
+  const runtimeSelection = useSessionRuntimeStore((s) =>
+    activeTabId ? s.selections[activeTabId] : undefined,
+  )
   const projectPath = useSessionStore((s) => s.sessions.find((session) => session.id === activeTabId)?.projectPath)
 
   const projectName = projectPath
     ? projectPath.split('-').filter(Boolean).pop() || ''
     : ''
+  const modelLabel = runtimeSelection?.modelId ?? currentModel?.name ?? null
 
   return (
     <div className="h-[var(--statusbar-height)] flex items-center justify-between px-4 border-t border-[var(--color-border)] bg-[var(--color-surface-sidebar)] select-none text-[11px]">
@@ -20,9 +25,9 @@ export function StatusBar() {
       </div>
 
       <div className="flex items-center gap-4">
-        {currentModel && (
+        {modelLabel && (
           <span className="text-[var(--color-text-tertiary)] font-[var(--font-mono)]">
-            {currentModel.name}
+            {modelLabel}
           </span>
         )}
       </div>
diff --git a/desktop/src/components/plugins/PluginDetail.tsx b/desktop/src/components/plugins/PluginDetail.tsx
index ef0acfe2..14c0d897 100644
--- a/desktop/src/components/plugins/PluginDetail.tsx
+++ b/desktop/src/components/plugins/PluginDetail.tsx
@@ -4,6 +4,7 @@ import { useSessionStore } from '../../stores/sessionStore'
 import { useTranslation } from '../../i18n'
 import { useUIStore } from '../../stores/uiStore'
 import { Button } from '../shared/Button'
+import { ConfirmDialog } from '../shared/ConfirmDialog'
 import type { PluginCapabilityKey } from '../../types/plugin'
 import { SETTINGS_TAB_ID, useTabStore } from '../../stores/tabStore'
 import { useSkillStore } from '../../stores/skillStore'
@@ -36,10 +37,20 @@ export function PluginDetail() {
   const selectServer = useMcpStore((s) => s.selectServer)
   const t = useTranslation()
   const [actionKey, setActionKey] = useState<string | null>(null)
+  const [showUninstallDialog, setShowUninstallDialog] = useState(false)
 
   const activeSession = sessions.find((session) => session.id === activeSessionId)
   const currentWorkDir = activeSession?.workDir || undefined
 
+  const otherCapabilityItems = useMemo(
+    () =>
+      CAPABILITY_ORDER.map((key) => ({
+        key,
+        items: selectedPlugin?.capabilities[key] ?? [],
+      })),
+    [selectedPlugin],
+  )
+
   if (isDetailLoading) {
     return (
       <div className="flex justify-center py-12">
@@ -52,14 +63,6 @@ export function PluginDetail() {
 
   const canMutate = selectedPlugin.scope !== 'managed' && selectedPlugin.scope !== 'builtin'
   const canNavigateSharedCapabilities = selectedPlugin.enabled
-  const otherCapabilityItems = useMemo(
-    () =>
-      CAPABILITY_ORDER.map((key) => ({
-        key,
-        items: selectedPlugin.capabilities[key],
-      })),
-    [selectedPlugin],
-  )
 
   const runAction = async (key: string, fn: () => Promise<string>) => {
     setActionKey(key)
@@ -98,11 +101,6 @@ export function PluginDetail() {
     }
   }
 
-  const confirmUninstall = () => {
-    const label = t('settings.plugins.confirmUninstall', { name: selectedPlugin.name })
-    return window.confirm(label)
-  }
-
   const openSettingsTab = (tab: 'skills' | 'agents' | 'mcp') => {
     useUIStore.getState().setPendingSettingsTab(tab)
     useTabStore.getState().openTab(SETTINGS_TAB_ID, 'Settings', 'settings')
@@ -290,8 +288,7 @@ export function PluginDetail() {
               size="sm"
               loading={isApplying && actionKey === 'uninstall'}
               onClick={() => {
-                if (!confirmUninstall()) return
-                void runAction('uninstall', () => uninstallPlugin(selectedPlugin.id, selectedPlugin.scope, false, currentWorkDir))
+                setShowUninstallDialog(true)
               }}
             >
               {t('settings.plugins.uninstall')}
@@ -483,6 +480,24 @@ export function PluginDetail() {
           </div>
         </div>
       </section>
+
+      <ConfirmDialog
+        open={showUninstallDialog}
+        onClose={() => {
+          if (isApplying && actionKey === 'uninstall') return
+          setShowUninstallDialog(false)
+        }}
+        onConfirm={async () => {
+          setShowUninstallDialog(false)
+          await runAction('uninstall', () => uninstallPlugin(selectedPlugin.id, selectedPlugin.scope, false, currentWorkDir))
+        }}
+        title={t('settings.plugins.uninstall')}
+        body={t('settings.plugins.confirmUninstall', { name: selectedPlugin.name })}
+        confirmLabel={t('settings.plugins.uninstall')}
+        cancelLabel={t('common.cancel')}
+        confirmVariant="danger"
+        loading={isApplying && actionKey === 'uninstall'}
+      />
     </div>
   )
 }
diff --git a/desktop/src/components/plugins/PluginList.tsx b/desktop/src/components/plugins/PluginList.tsx
index 273a44bd..7d8df76a 100644
--- a/desktop/src/components/plugins/PluginList.tsx
+++ b/desktop/src/components/plugins/PluginList.tsx
@@ -102,7 +102,7 @@ export function PluginList() {
   return (
     <div className="flex flex-col gap-6 min-w-0">
       <section className="rounded-2xl border border-[var(--color-border)] bg-[var(--color-surface-container-low)] overflow-hidden">
-        <div className="grid gap-4 px-5 py-5 min-w-0 xl:grid-cols-[minmax(0,1.5fr)_minmax(340px,1fr)] xl:items-end">
+        <div className="grid gap-4 px-5 py-5 min-w-0 2xl:grid-cols-[minmax(0,1.45fr)_minmax(420px,0.95fr)] 2xl:items-end">
           <div className="min-w-0">
             <div className="text-[11px] font-semibold uppercase tracking-[0.2em] text-[var(--color-text-tertiary)] mb-2">
               {t('settings.plugins.browserEyebrow')}
@@ -129,8 +129,8 @@ export function PluginList() {
             )}
           </div>
 
-          <div className="flex flex-col gap-3 min-w-0">
-            <div className="grid grid-cols-2 gap-3 min-w-0 sm:grid-cols-4">
+          <div className="flex flex-col gap-3 min-w-0 rounded-2xl border border-[var(--color-border)] bg-[var(--color-surface)] p-4">
+            <div className="grid min-w-0 grid-cols-[repeat(auto-fit,minmax(120px,1fr))] gap-3">
               <SummaryCard
                 label={t('settings.plugins.summary.total')}
                 value={String(summary?.total ?? plugins.length)}
@@ -152,12 +152,22 @@ export function PluginList() {
                 icon="storefront"
               />
             </div>
-            <div className="flex flex-wrap gap-2 justify-end">
-              <Button variant="secondary" size="sm" onClick={() => void fetchPlugins(currentWorkDir)}>
+            <div className="flex flex-wrap gap-2 sm:justify-end">
+              <Button
+                variant="secondary"
+                size="sm"
+                className="min-h-9 flex-1 sm:flex-none"
+                onClick={() => void fetchPlugins(currentWorkDir)}
+              >
                 <span className="material-symbols-outlined text-[16px]">refresh</span>
                 {t('settings.plugins.refresh')}
               </Button>
-              <Button size="sm" onClick={handleReload} loading={isApplying}>
+              <Button
+                size="sm"
+                className="min-h-9 flex-1 sm:flex-none"
+                onClick={handleReload}
+                loading={isApplying}
+              >
                 <span className="material-symbols-outlined text-[16px]">sync</span>
                 {t('settings.plugins.apply')}
               </Button>
@@ -316,12 +326,14 @@ function SummaryCard({
   icon: string
 }) {
   return (
-    <div className="rounded-xl border border-[var(--color-border)] bg-[var(--color-surface)] px-3 py-3 min-w-0">
-      <div className="flex items-center gap-1.5 text-[11px] uppercase tracking-[0.12em] text-[var(--color-text-tertiary)] min-w-0">
+    <div className="min-w-0 rounded-xl border border-[var(--color-border)] bg-[var(--color-surface-container-low)] px-3 py-3">
+      <div className="flex min-w-0 items-start gap-1.5 text-[11px] uppercase tracking-[0.08em] text-[var(--color-text-tertiary)]">
         <span className="material-symbols-outlined text-[14px] flex-shrink-0">{icon}</span>
-        <span className="truncate">{label}</span>
+        <span className="min-w-0 break-words text-[10px] leading-4 whitespace-normal">
+          {label}
+        </span>
       </div>
-      <div className="mt-2 text-lg font-semibold text-[var(--color-text-primary)] truncate">
+      <div className="mt-2 truncate text-xl font-semibold text-[var(--color-text-primary)]">
         {value}
       </div>
     </div>
diff --git a/desktop/src/components/settings/InstallCenter.tsx b/desktop/src/components/settings/InstallCenter.tsx
deleted file mode 100644
index 9a81aaa3..00000000
--- a/desktop/src/components/settings/InstallCenter.tsx
+++ /dev/null
@@ -1,433 +0,0 @@
-import { useEffect, useMemo, useRef, useState } from 'react'
-import { sessionsApi } from '../../api/sessions'
-import { useChatStore } from '../../stores/chatStore'
-import { useMcpStore } from '../../stores/mcpStore'
-import { usePluginStore } from '../../stores/pluginStore'
-import { useSessionStore } from '../../stores/sessionStore'
-import { useSkillStore } from '../../stores/skillStore'
-import { useTranslation } from '../../i18n'
-import { MessageList } from '../chat/MessageList'
-import { ComputerUsePermissionModal } from '../chat/ComputerUsePermissionModal'
-import { Button } from '../shared/Button'
-import { Textarea } from '../shared/Textarea'
-import { DirectoryPicker } from '../shared/DirectoryPicker'
-import { useUIStore } from '../../stores/uiStore'
-import { buildInstallerPrompt } from '../../lib/installAssistantPrompt'
-
-const INSTALLER_SESSION_KEY = 'cc-haha-installer-session-id'
-const INSTALLER_CONTEXT_KEY = 'cc-haha-installer-context-dir'
-
-const EXAMPLE_PROMPTS = [
-  '安装 plugin：skill-creator@claude-plugins-official，并应用到当前桌面端',
-  '添加一个 MCP：name=linear，url=https://example.com/mcp，优先用户级',
-  '帮我把一个 GitHub 仓库里的 skill 装到 ~/.claude/skills，并告诉我装到了哪里',
-]
-
-function readStoredValue(key: string) {
-  try {
-    return localStorage.getItem(key) || ''
-  } catch {
-    return ''
-  }
-}
-
-function writeStoredValue(key: string, value: string) {
-  try {
-    if (value) {
-      localStorage.setItem(key, value)
-    } else {
-      localStorage.removeItem(key)
-    }
-  } catch {
-    // noop
-  }
-}
-
-export function InstallCenter() {
-  const t = useTranslation()
-  const sessions = useSessionStore((s) => s.sessions)
-  const fetchSessions = useSessionStore((s) => s.fetchSessions)
-  const connectToSession = useChatStore((s) => s.connectToSession)
-  const disconnectSession = useChatStore((s) => s.disconnectSession)
-  const sendMessage = useChatStore((s) => s.sendMessage)
-  const stopGeneration = useChatStore((s) => s.stopGeneration)
-  const fetchPlugins = usePluginStore((s) => s.fetchPlugins)
-  const reloadPlugins = usePluginStore((s) => s.reloadPlugins)
-  const fetchSkills = useSkillStore((s) => s.fetchSkills)
-  const fetchServers = useMcpStore((s) => s.fetchServers)
-  const addToast = useUIStore((s) => s.addToast)
-  const setPendingSettingsTab = useUIStore((s) => s.setPendingSettingsTab)
-
-  const [sessionId, setSessionId] = useState<string | null>(() => {
-    const stored = readStoredValue(INSTALLER_SESSION_KEY)
-    return stored || null
-  })
-  const [contextDir, setContextDir] = useState(() => readStoredValue(INSTALLER_CONTEXT_KEY))
-  const [draft, setDraft] = useState('')
-  const [isCreating, setIsCreating] = useState(false)
-  const createPromiseRef = useRef<Promise<string> | null>(null)
-  const previousChatStateRef = useRef<'idle' | 'thinking' | 'tool_executing' | 'streaming' | 'permission_pending'>('idle')
-
-  const installerSession = useMemo(
-    () => sessions.find((session) => session.id === sessionId) || null,
-    [sessionId, sessions],
-  )
-  const sessionState = useChatStore((s) =>
-    sessionId ? s.sessions[sessionId] : undefined,
-  )
-  const chatState = sessionState?.chatState ?? 'idle'
-  const pendingComputerUsePermission =
-    sessionState?.pendingComputerUsePermission?.request ?? null
-  const isBusy = isCreating || chatState !== 'idle'
-
-  useEffect(() => {
-    if (!sessionId) return
-    connectToSession(sessionId)
-    return () => {
-      disconnectSession(sessionId)
-    }
-  }, [connectToSession, disconnectSession, sessionId])
-
-  useEffect(() => {
-    writeStoredValue(INSTALLER_CONTEXT_KEY, contextDir.trim())
-  }, [contextDir])
-
-  useEffect(() => {
-    if (!sessionId) return
-    const previousState = previousChatStateRef.current
-    previousChatStateRef.current = chatState
-
-    if (previousState === 'idle' || chatState !== 'idle') return
-
-    const cwd = installerSession?.workDir || undefined
-
-    void (async () => {
-      await reloadPlugins(cwd).catch(() => null)
-      await Promise.allSettled([
-        fetchPlugins(cwd),
-        fetchSkills(cwd),
-        fetchServers(cwd ? [cwd] : undefined, cwd),
-      ])
-    })()
-  }, [
-    chatState,
-    fetchPlugins,
-    fetchServers,
-    fetchSkills,
-    installerSession?.workDir,
-    reloadPlugins,
-    sessionId,
-  ])
-
-  const ensureInstallerSession = async () => {
-    if (sessionId && installerSession) {
-      return sessionId
-    }
-
-    if (createPromiseRef.current) {
-      return createPromiseRef.current
-    }
-
-    setIsCreating(true)
-    createPromiseRef.current = (async () => {
-      const { sessionId: createdSessionId } = await sessionsApi.create(
-        contextDir.trim() || undefined,
-      )
-      await sessionsApi.rename(
-        createdSessionId,
-        t('settings.install.sessionTitle'),
-      )
-      writeStoredValue(INSTALLER_SESSION_KEY, createdSessionId)
-      setSessionId(createdSessionId)
-      await fetchSessions()
-      connectToSession(createdSessionId)
-      return createdSessionId
-    })()
-
-    try {
-      return await createPromiseRef.current
-    } finally {
-      createPromiseRef.current = null
-      setIsCreating(false)
-    }
-  }
-
-  const handleSubmit = async () => {
-    const request = draft.trim()
-    if (!request || isBusy) return
-
-    try {
-      const ensuredSessionId = await ensureInstallerSession()
-      sendMessage(
-        ensuredSessionId,
-        buildInstallerPrompt(request),
-        undefined,
-        { displayContent: request },
-      )
-      setDraft('')
-    } catch (error) {
-      addToast({
-        type: 'error',
-        message:
-          error instanceof Error
-            ? error.message
-            : t('settings.install.createFailed'),
-      })
-    }
-  }
-
-  const handleRefresh = async () => {
-    const cwd = installerSession?.workDir || undefined
-    await Promise.all([
-      fetchPlugins(cwd),
-      fetchSkills(cwd),
-      fetchServers(cwd ? [cwd] : undefined, cwd),
-    ])
-    addToast({
-      type: 'success',
-      message: t('settings.install.refreshDone'),
-    })
-  }
-
-  const startFreshConversation = async () => {
-    if (sessionId) {
-      disconnectSession(sessionId)
-    }
-    writeStoredValue(INSTALLER_SESSION_KEY, '')
-    setSessionId(null)
-    previousChatStateRef.current = 'idle'
-    addToast({
-      type: 'info',
-      message: t('settings.install.newConversationReady'),
-    })
-  }
-
-  return (
-    <div className="w-full min-w-0">
-      <section className="rounded-2xl border border-[var(--color-border)] bg-[var(--color-surface-container-low)] overflow-hidden">
-        <div className="grid gap-4 px-5 py-5 xl:grid-cols-[minmax(0,1.5fr)_minmax(280px,1fr)] xl:items-start">
-          <div className="min-w-0">
-            <div className="text-[11px] font-semibold uppercase tracking-[0.2em] text-[var(--color-text-tertiary)] mb-2">
-              {t('settings.install.eyebrow')}
-            </div>
-            <div className="flex items-center gap-3 mb-2">
-              <span className="material-symbols-outlined text-[22px] text-[var(--color-brand)]">
-                download
-              </span>
-              <h2 className="text-lg font-semibold text-[var(--color-text-primary)]">
-                {t('settings.install.title')}
-              </h2>
-            </div>
-            <p className="text-sm leading-6 text-[var(--color-text-secondary)] max-w-3xl">
-              {t('settings.install.description')}
-            </p>
-          </div>
-
-          <div className="grid grid-cols-2 gap-3 sm:grid-cols-4 xl:grid-cols-2">
-            <SummaryPill
-              label={t('settings.install.targets.plugins')}
-              icon="extension"
-            />
-            <SummaryPill
-              label={t('settings.install.targets.mcp')}
-              icon="hub"
-            />
-            <SummaryPill
-              label={t('settings.install.targets.skills')}
-              icon="auto_awesome"
-            />
-            <SummaryPill
-              label={installerSession?.workDir || t('settings.install.contextAuto')}
-              icon="folder"
-            />
-          </div>
-        </div>
-      </section>
-
-      <section className="mt-6 rounded-2xl border border-[var(--color-border)] bg-[var(--color-surface)] p-5">
-        <div className="flex flex-wrap items-center justify-between gap-3">
-          <div>
-            <h3 className="text-sm font-semibold text-[var(--color-text-primary)]">
-              {t('settings.install.composeTitle')}
-            </h3>
-            <p className="text-xs text-[var(--color-text-tertiary)] mt-1">
-              {t('settings.install.composeHint')}
-            </p>
-          </div>
-          <div className="flex flex-wrap gap-2">
-            <Button
-              size="sm"
-              variant="secondary"
-              onClick={() => void handleRefresh()}
-            >
-              {t('settings.install.refresh')}
-            </Button>
-            <Button
-              size="sm"
-              variant="secondary"
-              onClick={() => void startFreshConversation()}
-            >
-              {t('settings.install.newConversation')}
-            </Button>
-          </div>
-        </div>
-
-        <div className="mt-4 grid gap-4 xl:grid-cols-[minmax(0,1fr)_320px]">
-          <div className="min-w-0">
-            <Textarea
-              value={draft}
-              onChange={(event) => setDraft(event.target.value)}
-              onKeyDown={(event) => {
-                if ((event.metaKey || event.ctrlKey) && event.key === 'Enter') {
-                  event.preventDefault()
-                  void handleSubmit()
-                }
-              }}
-              placeholder={t('settings.install.placeholder')}
-              className="min-h-[140px]"
-            />
-            <div className="mt-3 flex flex-wrap items-center gap-2">
-              {EXAMPLE_PROMPTS.map((example) => (
-                <button
-                  key={example}
-                  type="button"
-                  onClick={() => setDraft(example)}
-                  className="rounded-full border border-[var(--color-border)] bg-[var(--color-surface-container-low)] px-3 py-1.5 text-xs text-[var(--color-text-secondary)] transition-colors hover:bg-[var(--color-surface-hover)] hover:text-[var(--color-text-primary)]"
-                >
-                  {example}
-                </button>
-              ))}
-            </div>
-            <div className="mt-4 flex flex-wrap items-center gap-2">
-              {chatState !== 'idle' && sessionId ? (
-                <Button
-                  size="sm"
-                  variant="danger"
-                  onClick={() => stopGeneration(sessionId)}
-                >
-                  {t('settings.install.stop')}
-                </Button>
-              ) : null}
-              <Button
-                size="sm"
-                onClick={() => void handleSubmit()}
-                loading={isCreating}
-                disabled={!draft.trim() || isBusy}
-                icon={
-                  !isCreating ? (
-                    <span className="material-symbols-outlined text-[16px]">send</span>
-                  ) : undefined
-                }
-              >
-                {t('settings.install.send')}
-              </Button>
-              <span className="text-xs text-[var(--color-text-tertiary)]">
-                {installerSession?.workDir
-                  ? t('settings.install.contextUsing', {
-                      path: installerSession.workDir,
-                    })
-                  : t('settings.install.contextDefault')}
-              </span>
-            </div>
-          </div>
-
-          <div className="rounded-xl border border-[var(--color-border)] bg-[var(--color-surface-container-low)] p-4">
-            <div className="text-xs font-semibold uppercase tracking-[0.16em] text-[var(--color-text-tertiary)]">
-              {t('settings.install.contextTitle')}
-            </div>
-            <p className="mt-2 text-xs leading-5 text-[var(--color-text-tertiary)]">
-              {t('settings.install.contextHint')}
-            </p>
-            <div className="mt-3">
-              <DirectoryPicker value={contextDir} onChange={setContextDir} />
-            </div>
-            <div className="mt-4 flex flex-wrap gap-2">
-              <Button
-                size="sm"
-                variant="ghost"
-                onClick={() => setPendingSettingsTab('plugins')}
-              >
-                {t('settings.install.goPlugins')}
-              </Button>
-              <Button
-                size="sm"
-                variant="ghost"
-                onClick={() => setPendingSettingsTab('mcp')}
-              >
-                {t('settings.install.goMcp')}
-              </Button>
-              <Button
-                size="sm"
-                variant="ghost"
-                onClick={() => setPendingSettingsTab('skills')}
-              >
-                {t('settings.install.goSkills')}
-              </Button>
-            </div>
-          </div>
-        </div>
-      </section>
-
-      <section className="mt-6 rounded-2xl border border-[var(--color-border)] bg-[var(--color-surface)] overflow-hidden">
-        <div className="flex items-center justify-between gap-3 border-b border-[var(--color-border)] bg-[var(--color-surface-container-low)] px-5 py-4">
-          <div>
-            <h3 className="text-sm font-semibold text-[var(--color-text-primary)]">
-              {t('settings.install.sessionTitle')}
-            </h3>
-            <p className="text-xs text-[var(--color-text-tertiary)] mt-1">
-              {sessionId
-                ? t('settings.install.sessionHint')
-                : t('settings.install.sessionEmpty')}
-            </p>
-          </div>
-          {sessionId ? (
-            <span className="rounded-full border border-[var(--color-border)] bg-[var(--color-surface)] px-2.5 py-1 text-[10px] font-semibold uppercase tracking-[0.12em] text-[var(--color-text-tertiary)]">
-              {chatState}
-            </span>
-          ) : null}
-        </div>
-
-        <div className="min-h-[420px] bg-[var(--color-surface-container-lowest)]">
-          {sessionId ? (
-            <>
-              <MessageList sessionId={sessionId} />
-              <ComputerUsePermissionModal
-                sessionId={sessionId}
-                request={pendingComputerUsePermission}
-              />
-            </>
-          ) : (
-            <div className="flex h-[420px] flex-col items-center justify-center px-6 text-center">
-              <span className="material-symbols-outlined text-[36px] text-[var(--color-text-tertiary)] mb-3">
-                forum
-              </span>
-              <p className="text-sm text-[var(--color-text-secondary)]">
-                {t('settings.install.sessionEmpty')}
-              </p>
-              <p className="mt-2 max-w-md text-xs leading-6 text-[var(--color-text-tertiary)]">
-                {t('settings.install.sessionEmptyHint')}
-              </p>
-            </div>
-          )}
-        </div>
-      </section>
-    </div>
-  )
-}
-
-function SummaryPill({
-  label,
-  icon,
-}: {
-  label: string
-  icon: string
-}) {
-  return (
-    <div className="rounded-xl border border-[var(--color-border)] bg-[var(--color-surface)] px-3 py-3 min-w-0">
-      <div className="flex items-center gap-1.5 text-[11px] uppercase tracking-[0.12em] text-[var(--color-text-tertiary)] min-w-0">
-        <span className="material-symbols-outlined text-[14px] flex-shrink-0">{icon}</span>
-        <span className="truncate">{label}</span>
-      </div>
-    </div>
-  )
-}
diff --git a/desktop/src/components/shared/ConfirmDialog.tsx b/desktop/src/components/shared/ConfirmDialog.tsx
new file mode 100644
index 00000000..6284547d
--- /dev/null
+++ b/desktop/src/components/shared/ConfirmDialog.tsx
@@ -0,0 +1,49 @@
+import { Modal } from './Modal'
+import { Button } from './Button'
+
+type ConfirmDialogProps = {
+  open: boolean
+  onClose: () => void
+  onConfirm: () => void | Promise<void>
+  title: string
+  body: string
+  confirmLabel: string
+  cancelLabel: string
+  confirmVariant?: 'primary' | 'danger'
+  loading?: boolean
+}
+
+export function ConfirmDialog({
+  open,
+  onClose,
+  onConfirm,
+  title,
+  body,
+  confirmLabel,
+  cancelLabel,
+  confirmVariant = 'danger',
+  loading = false,
+}: ConfirmDialogProps) {
+  return (
+    <Modal
+      open={open}
+      onClose={loading ? () => {} : onClose}
+      title={title}
+      width={460}
+      footer={(
+        <>
+          <Button variant="secondary" onClick={onClose} disabled={loading}>
+            {cancelLabel}
+          </Button>
+          <Button variant={confirmVariant} onClick={() => void onConfirm()} loading={loading}>
+            {confirmLabel}
+          </Button>
+        </>
+      )}
+    >
+      <p className="text-sm leading-6 text-[var(--color-text-secondary)]">
+        {body}
+      </p>
+    </Modal>
+  )
+}
diff --git a/desktop/src/config/providerPresets.ts b/desktop/src/config/providerPresets.ts
deleted file mode 100644
index 984514de..00000000
--- a/desktop/src/config/providerPresets.ts
+++ /dev/null
@@ -1,78 +0,0 @@
-// Provider presets inspired by cc-switch (https://github.com/farion1231/cc-switch)
-// Original work by Jason Young, MIT License
-
-import type { ApiFormat } from '../types/provider'
-
-export type ModelMapping = {
-  main: string
-  haiku: string
-  sonnet: string
-  opus: string
-}
-
-export type ProviderPreset = {
-  id: string
-  name: string
-  baseUrl: string
-  apiFormat: ApiFormat
-  defaultModels: ModelMapping
-  needsApiKey: boolean
-  websiteUrl: string
-}
-
-export const PROVIDER_PRESETS: ProviderPreset[] = [
-  {
-    id: 'official',
-    name: 'Claude Official',
-    baseUrl: '',
-    apiFormat: 'anthropic',
-    defaultModels: { main: '', haiku: '', sonnet: '', opus: '' },
-    needsApiKey: false,
-    websiteUrl: 'https://www.anthropic.com/claude-code',
-  },
-  {
-    id: 'deepseek',
-    name: 'DeepSeek',
-    baseUrl: 'https://api.deepseek.com/anthropic',
-    apiFormat: 'anthropic',
-    defaultModels: { main: 'DeepSeek-V3.2', haiku: 'DeepSeek-V3.2', sonnet: 'DeepSeek-V3.2', opus: 'DeepSeek-V3.2' },
-    needsApiKey: true,
-    websiteUrl: 'https://platform.deepseek.com',
-  },
-  {
-    id: 'zhipuglm',
-    name: 'Zhipu GLM',
-    baseUrl: 'https://open.bigmodel.cn/api/anthropic',
-    apiFormat: 'anthropic',
-    defaultModels: { main: 'glm-5', haiku: 'glm-5', sonnet: 'glm-5', opus: 'glm-5' },
-    needsApiKey: true,
-    websiteUrl: 'https://open.bigmodel.cn',
-  },
-  {
-    id: 'kimi',
-    name: 'Kimi',
-    baseUrl: 'https://api.moonshot.cn/anthropic',
-    apiFormat: 'anthropic',
-    defaultModels: { main: 'kimi-k2.5', haiku: 'kimi-k2.5', sonnet: 'kimi-k2.5', opus: 'kimi-k2.5' },
-    needsApiKey: true,
-    websiteUrl: 'https://platform.moonshot.cn',
-  },
-  {
-    id: 'minimax',
-    name: 'MiniMax',
-    baseUrl: 'https://api.minimaxi.com/anthropic',
-    apiFormat: 'anthropic',
-    defaultModels: { main: 'MiniMax-M2.7', haiku: 'MiniMax-M2.7', sonnet: 'MiniMax-M2.7', opus: 'MiniMax-M2.7' },
-    needsApiKey: true,
-    websiteUrl: 'https://platform.minimaxi.com',
-  },
-  {
-    id: 'custom',
-    name: 'Custom',
-    baseUrl: '',
-    apiFormat: 'anthropic',
-    defaultModels: { main: '', haiku: '', sonnet: '', opus: '' },
-    needsApiKey: true,
-    websiteUrl: '',
-  },
-]
diff --git a/desktop/src/constants/modelCatalog.ts b/desktop/src/constants/modelCatalog.ts
new file mode 100644
index 00000000..fbd8dbb7
--- /dev/null
+++ b/desktop/src/constants/modelCatalog.ts
@@ -0,0 +1,24 @@
+import type { ModelInfo } from '../types/settings'
+
+export const OFFICIAL_DEFAULT_MODEL_ID = 'claude-opus-4-7'
+
+export const OFFICIAL_MODELS: ModelInfo[] = [
+  {
+    id: 'claude-opus-4-7',
+    name: 'Opus 4.7',
+    description: 'Most capable for ambitious work',
+    context: '1m',
+  },
+  {
+    id: 'claude-sonnet-4-6',
+    name: 'Sonnet 4.6',
+    description: 'Most efficient for everyday tasks',
+    context: '200k',
+  },
+  {
+    id: 'claude-haiku-4-5',
+    name: 'Haiku 4.5',
+    description: 'Fastest for quick answers',
+    context: '200k',
+  },
+]
diff --git a/desktop/src/i18n/locales/en.ts b/desktop/src/i18n/locales/en.ts
index 1cb6335f..1ae3b485 100644
--- a/desktop/src/i18n/locales/en.ts
+++ b/desktop/src/i18n/locales/en.ts
@@ -24,6 +24,7 @@ export const en = {
   'sidebar.noMatching': 'No matching sessions',
   'sidebar.sessionListFailed': 'Session list failed to load',
   'sidebar.missingDir': 'missing dir',
+  'sidebar.confirmDelete': 'Delete this session? This cannot be undone.',
   'sidebar.allProjects': 'All projects',
   'sidebar.other': 'Other',
   'sidebar.timeGroup.today': 'Today',
@@ -50,11 +51,26 @@ export const en = {
   'settings.tab.providers': 'Providers',
   'settings.tab.permissions': 'Permissions',
   'settings.tab.general': 'General',
-  'settings.tab.install': 'Install',
+  'settings.tab.terminal': 'Terminal',
   'settings.tab.skills': 'Skills',
   'settings.tab.mcp': 'MCP',
   'settings.tab.plugins': 'Plugins',
 
+  // Settings > Terminal
+  'settings.terminal.title': 'Terminal',
+  'settings.terminal.description': 'Run host-machine commands for plugin, skill, and MCP setup without leaving the desktop app.',
+  'settings.terminal.clear': 'Clear',
+  'settings.terminal.restart': 'Restart',
+  'settings.terminal.windowTitle': 'Host shell',
+  'settings.terminal.unavailableTitle': 'Desktop runtime required',
+  'settings.terminal.unavailableBody': 'Open this page in the packaged desktop app to start an interactive terminal.',
+  'settings.terminal.status.idle': 'Idle',
+  'settings.terminal.status.starting': 'Starting',
+  'settings.terminal.status.running': 'Running',
+  'settings.terminal.status.exited': 'Exited',
+  'settings.terminal.status.error': 'Error',
+  'settings.terminal.status.unavailable': 'Unavailable',
+
   // Settings > Claude Official Login
   'settings.claudeOfficialLogin.intro': 'Using official Claude models requires signing in to your Claude.ai account. Click the button below to open the official Claude login page in your browser; you\'ll be returned here after authorizing.',
   'settings.claudeOfficialLogin.loginButton': 'Sign in to Claude',
@@ -80,6 +96,8 @@ export const en = {
   'settings.providers.proxyFailed': '② Proxy failed: {error}',
   'settings.providers.confirmDelete': 'Delete provider "{name}"? This cannot be undone.',
   'settings.providers.activate': 'Activate',
+  'settings.providers.default': 'Default',
+  'settings.providers.setDefault': 'Set default',
   'settings.providers.test': 'Test',
   'settings.providers.edit': 'Edit',
   'settings.providers.requestFailed': 'Request failed',
@@ -102,7 +120,7 @@ export const en = {
   'settings.providers.sameAsMain': 'Same as main',
   'settings.providers.testConnection': 'Test Connection',
   'settings.providers.settingsJson': 'Settings JSON',
-  'settings.providers.settingsJsonDesc': '~/.claude/settings.json — edit directly, will be written on save.',
+  'settings.providers.settingsJsonDesc': '~/.claude/cc-haha/settings.json — edit directly, will be written on save.',
   'settings.providers.jsonError': 'JSON syntax error: {error}',
   'settings.providers.apiFormat': 'API Format',
   'settings.providers.apiFormatAnthropic': 'Anthropic Messages (native)',
@@ -206,6 +224,7 @@ export const en = {
   'settings.mcp.form.rawConfig': 'Raw config',
   'settings.mcp.form.command': 'Command to launch',
   'settings.mcp.form.commandPlaceholder': 'npx',
+  'settings.mcp.form.commandHostHint': 'STDIO MCP commands run on the host machine. Install runtimes like Node.js, Python, Bun, or uv yourself and make sure the command is available in PATH.',
   'settings.mcp.form.arguments': 'Arguments',
   'settings.mcp.form.argumentPlaceholder': 'chrome-devtools-mcp@latest',
   'settings.mcp.form.addArgument': 'Add argument',
@@ -289,36 +308,6 @@ export const en = {
   'settings.agents.source.flagSettings': 'CLI arg',
   'settings.agents.source.built-in': 'Built-in',
 
-  // Settings > Install Center
-  'settings.install.eyebrow': 'AI Installer',
-  'settings.install.title': 'Install Center',
-  'settings.install.description': 'Describe the plugin, MCP server, or skill you want. The desktop app will reuse a dedicated session to execute the installation flow and then sync results back to the existing management pages.',
-  'settings.install.targets.plugins': 'Plugins',
-  'settings.install.targets.mcp': 'MCP',
-  'settings.install.targets.skills': 'Skills',
-  'settings.install.contextAuto': 'Default context',
-  'settings.install.composeTitle': 'Natural language install',
-  'settings.install.composeHint': 'Describe what to install, where it comes from, and whether it should land in user or project scope.',
-  'settings.install.placeholder': 'Example: install plugin skill-creator@claude-plugins-official and apply it to the current desktop runtime. Or: add a user-scope MCP at https://example.com/mcp.',
-  'settings.install.send': 'Send request',
-  'settings.install.stop': 'Stop',
-  'settings.install.refresh': 'Refresh state',
-  'settings.install.newConversation': 'New install chat',
-  'settings.install.contextDefault': 'If no directory is selected, the installer session starts from your home directory.',
-  'settings.install.contextUsing': 'Installer session directory: {path}',
-  'settings.install.contextTitle': 'Execution directory',
-  'settings.install.contextHint': 'Most user-scope installs do not need a project path. If you need project skills or local/project MCP config, pick a directory here and then start a new install chat.',
-  'settings.install.goPlugins': 'Open Plugins',
-  'settings.install.goMcp': 'Open MCP',
-  'settings.install.goSkills': 'Open Skills',
-  'settings.install.sessionTitle': 'Installer session',
-  'settings.install.sessionHint': 'This panel shows the full installer session, including tool calls and results.',
-  'settings.install.sessionEmpty': 'No installer session yet',
-  'settings.install.sessionEmptyHint': 'After you send the first installation request, the app will reuse the session chat pipeline and show the full execution trace here.',
-  'settings.install.createFailed': 'Failed to create installer session',
-  'settings.install.refreshDone': 'Plugin, MCP, and skill state refreshed',
-  'settings.install.newConversationReady': 'A fresh installer conversation is ready; your next request will start a new install context.',
-
   // Settings > Skills
   'settings.skills.title': 'Installed Skills',
   'settings.skills.description': 'Skills extend Claude with specialized capabilities. Manage skills in ~/.claude/skills/',
diff --git a/desktop/src/i18n/locales/zh.ts b/desktop/src/i18n/locales/zh.ts
index bba0f4da..5bf553dc 100644
--- a/desktop/src/i18n/locales/zh.ts
+++ b/desktop/src/i18n/locales/zh.ts
@@ -26,6 +26,7 @@ export const zh: Record<TranslationKey, string> = {
   'sidebar.noMatching': '没有匹配的会话',
   'sidebar.sessionListFailed': '会话列表加载失败',
   'sidebar.missingDir': '目录缺失',
+  'sidebar.confirmDelete': '确定要删除这个会话吗？此操作不可撤销。',
   'sidebar.allProjects': '所有项目',
   'sidebar.other': '其他',
   'sidebar.timeGroup.today': '今天',
@@ -52,11 +53,26 @@ export const zh: Record<TranslationKey, string> = {
   'settings.tab.providers': '服务商',
   'settings.tab.permissions': '权限',
   'settings.tab.general': '通用',
-  'settings.tab.install': '安装中心',
+  'settings.tab.terminal': '终端',
   'settings.tab.skills': '技能',
   'settings.tab.mcp': 'MCP',
   'settings.tab.plugins': '插件',
 
+  // Settings > Terminal
+  'settings.terminal.title': '终端',
+  'settings.terminal.description': '直接运行宿主机命令，用于安装插件、Skills、MCP 等需要命令行的扩展。',
+  'settings.terminal.clear': '清屏',
+  'settings.terminal.restart': '重启',
+  'settings.terminal.windowTitle': '宿主机 Shell',
+  'settings.terminal.unavailableTitle': '需要桌面端运行时',
+  'settings.terminal.unavailableBody': '请在打包后的桌面端里打开这个页面，才能启动交互式终端。',
+  'settings.terminal.status.idle': '空闲',
+  'settings.terminal.status.starting': '启动中',
+  'settings.terminal.status.running': '运行中',
+  'settings.terminal.status.exited': '已退出',
+  'settings.terminal.status.error': '错误',
+  'settings.terminal.status.unavailable': '不可用',
+
   // Settings > Claude Official Login
   'settings.claudeOfficialLogin.intro': '使用官方 Claude 模型需要登录你的 Claude.ai 账号。点击下方按钮,浏览器会打开 Claude 官方登录页面,授权后自动回到这里。',
   'settings.claudeOfficialLogin.loginButton': '登录 Claude 账号',
@@ -82,6 +98,8 @@ export const zh: Record<TranslationKey, string> = {
   'settings.providers.proxyFailed': '② 代理转换失败: {error}',
   'settings.providers.confirmDelete': '删除服务商 "{name}"？此操作不可撤销。',
   'settings.providers.activate': '激活',
+  'settings.providers.default': '默认',
+  'settings.providers.setDefault': '设为默认',
   'settings.providers.test': '测试',
   'settings.providers.edit': '编辑',
   'settings.providers.requestFailed': '请求失败',
@@ -104,7 +122,7 @@ export const zh: Record<TranslationKey, string> = {
   'settings.providers.sameAsMain': '与主模型相同',
   'settings.providers.testConnection': '测试连接',
   'settings.providers.settingsJson': '设置 JSON',
-  'settings.providers.settingsJsonDesc': '~/.claude/settings.json — 直接编辑，保存时写入。',
+  'settings.providers.settingsJsonDesc': '~/.claude/cc-haha/settings.json — 直接编辑，保存时写入。',
   'settings.providers.jsonError': 'JSON 语法错误: {error}',
   'settings.providers.apiFormat': 'API 格式',
   'settings.providers.apiFormatAnthropic': 'Anthropic Messages (原生)',
@@ -208,6 +226,7 @@ export const zh: Record<TranslationKey, string> = {
   'settings.mcp.form.rawConfig': '原始配置',
   'settings.mcp.form.command': '启动命令',
   'settings.mcp.form.commandPlaceholder': 'npx',
+  'settings.mcp.form.commandHostHint': 'STDIO MCP 命令会直接在宿主机上运行。像 Node.js、Python、Bun、uv 这类运行时需要用户自己安装，并确保这个命令在 PATH 里可用。',
   'settings.mcp.form.arguments': '参数',
   'settings.mcp.form.argumentPlaceholder': 'chrome-devtools-mcp@latest',
   'settings.mcp.form.addArgument': '添加参数',
@@ -291,36 +310,6 @@ export const zh: Record<TranslationKey, string> = {
   'settings.agents.source.flagSettings': 'CLI 参数',
   'settings.agents.source.built-in': '内置',
 
-  // Settings > Install Center
-  'settings.install.eyebrow': 'AI 安装助手',
-  'settings.install.title': '安装中心',
-  'settings.install.description': '直接描述你想安装的 plugin、MCP 或 skill。底层会复用安装专用 session 去执行，并把结果同步回现有管理页。',
-  'settings.install.targets.plugins': 'Plugins',
-  'settings.install.targets.mcp': 'MCP',
-  'settings.install.targets.skills': 'Skills',
-  'settings.install.contextAuto': '默认上下文',
-  'settings.install.composeTitle': '自然语言安装',
-  'settings.install.composeHint': '描述你要安装什么、来源在哪里、希望落到用户级还是项目级。',
-  'settings.install.placeholder': '例如：安装 plugin skill-creator@claude-plugins-official，并帮我应用到当前桌面端；或者：添加一个 user scope 的 MCP，地址是 https://example.com/mcp。',
-  'settings.install.send': '发送安装请求',
-  'settings.install.stop': '中断执行',
-  'settings.install.refresh': '刷新安装状态',
-  'settings.install.newConversation': '新建安装会话',
-  'settings.install.contextDefault': '未指定目录时默认使用 Home 目录启动安装会话。',
-  'settings.install.contextUsing': '当前安装会话目录：{path}',
-  'settings.install.contextTitle': '执行目录',
-  'settings.install.contextHint': '大部分用户级安装不依赖项目目录；如果你要安装 project skill 或 local/project MCP，可以先在这里选目录，再开始新的安装会话。',
-  'settings.install.goPlugins': '查看插件',
-  'settings.install.goMcp': '查看 MCP',
-  'settings.install.goSkills': '查看技能',
-  'settings.install.sessionTitle': '安装助手会话',
-  'settings.install.sessionHint': '这里展示安装专用 session 的完整执行过程、工具调用和结果。',
-  'settings.install.sessionEmpty': '还没有安装会话',
-  'settings.install.sessionEmptyHint': '发送第一条安装请求后，这里会直接复用 session 聊天链路展示完整过程。',
-  'settings.install.createFailed': '创建安装会话失败',
-  'settings.install.refreshDone': '已刷新插件、MCP 和技能状态',
-  'settings.install.newConversationReady': '已准备新的安装会话；下一条请求会启动新的安装上下文。',
-
   // Settings > Skills
   'settings.skills.title': '已安装技能',
   'settings.skills.description': '技能扩展 Claude 的能力。在 ~/.claude/skills/ 中管理技能。',
diff --git a/desktop/src/lib/installAssistantPrompt.ts b/desktop/src/lib/installAssistantPrompt.ts
deleted file mode 100644
index 0d717711..00000000
--- a/desktop/src/lib/installAssistantPrompt.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-const INSTALLER_RULES = `You are the installation assistant for Claude Code Haha desktop.
-
-Your job is to help the user install or configure Claude Code extensions and integrations, especially:
-- Skills
-- MCP servers
-- Plugins and marketplaces
-
-Execution rules:
-1. Act directly when the request is clear. Do not ask for confirmation on obvious next steps.
-2. Prefer existing Claude CLI capabilities and existing config formats over inventing new files.
-3. Inspect before changing things if the request depends on the current local state.
-4. Prefer user scope unless the user explicitly asks for project/local scope.
-5. For plugin installation, use the existing plugin and marketplace commands, and run reload/apply steps when needed.
-6. For MCP setup, prefer the existing MCP commands and config locations, and include required auth/header details when available.
-7. For skill installation, install to ~/.claude/skills unless the user clearly asks for a project-scoped skill.
-8. Keep unrelated workspace files untouched.
-
-Command guidance:
-- Plugin install: run Bash with \`claude plugin install <plugin-id> --scope <scope>\`
-- For a normal plugin installation request, do both:
-  1. \`claude plugin install <plugin-id> --scope <scope>\`
-  2. \`claude plugin enable <plugin-id> --scope <scope>\`
-- Only skip the enable step if the user explicitly asks to install without enabling.
-- Marketplace add: run Bash with \`claude plugin marketplace add <source> --scope <scope>\`
-- MCP add: run Bash with \`claude mcp add ...\`
-- Do NOT run \`claude /plugin ...\` in Bash. Slash commands such as \`/plugin install\` are not shell syntax.
-- If the user gives a GitHub URL under \`anthropics/claude-plugins-official/external_plugins/<name>\`, treat the plugin id as \`<name>@claude-plugins-official\`.
-- If the user gives a skill marketplace page, inspect the page and prefer the exact published install command shown on that page.
-- For AI Templates skill pages (\`aitmpl.com/component/skill/...\`), if the page shows an install command like \`npx claude-code-templates@latest --skill <slug>\`, run that command directly in Bash.
-- After a successful plugin install or enable step, tell the user that the desktop Install Center will refresh Plugins / Skills / MCP views automatically. Only do extra reload steps if they are necessary for the current task.
-
-Response rules:
-- Briefly explain what you are doing.
-- After finishing, summarize exactly what was installed or changed, where it landed, and whether the user should check Plugins, MCP, or Skills.
-- If you are blocked by missing information, ask only the minimal question needed to proceed.`
-
-export function buildInstallerPrompt(userRequest: string) {
-  return `${INSTALLER_RULES}
-
-User request:
-${userRequest.trim()}`
-}
diff --git a/desktop/src/pages/ActiveSession.tsx b/desktop/src/pages/ActiveSession.tsx
index 84104838..0cc18ec4 100644
--- a/desktop/src/pages/ActiveSession.tsx
+++ b/desktop/src/pages/ActiveSession.tsx
@@ -141,7 +141,7 @@ export function ActiveSession() {
               </>
             ) : (
               <>
-                <img src="/app-icon.png" alt="Claude Code Haha" className="mb-6 h-24 w-24 rounded-[22px]" style={{ boxShadow: 'var(--shadow-dropdown)' }} />
+                <img src="/app-icon.png" alt="Claude Code Haha" className="mb-6 h-24 w-24" />
                 <h1 className="mb-2 text-3xl font-extrabold tracking-tight text-[var(--color-text-primary)]" style={{ fontFamily: 'var(--font-headline)' }}>
                   {t('empty.title')}
                 </h1>
diff --git a/desktop/src/pages/AdapterSettings.tsx b/desktop/src/pages/AdapterSettings.tsx
index 5526234f..bc7e6769 100644
--- a/desktop/src/pages/AdapterSettings.tsx
+++ b/desktop/src/pages/AdapterSettings.tsx
@@ -4,6 +4,7 @@ import { useTranslation } from '../i18n'
 import { Input } from '../components/shared/Input'
 import { Button } from '../components/shared/Button'
 import { DirectoryPicker } from '../components/shared/DirectoryPicker'
+import { ConfirmDialog } from '../components/shared/ConfirmDialog'
 
 type ImTab = 'feishu' | 'telegram'
 
@@ -37,6 +38,8 @@ export function AdapterSettings() {
   // Pairing
   const [pairingCode, setPairingCode] = useState<string | null>(null)
   const [isGenerating, setIsGenerating] = useState(false)
+  const [pendingUnbind, setPendingUnbind] = useState<{ platform: 'telegram' | 'feishu'; userId: string | number } | null>(null)
+  const [isUnbinding, setIsUnbinding] = useState(false)
 
   useEffect(() => {
     fetchConfig()
@@ -114,10 +117,20 @@ export function AdapterSettings() {
   }, [generatePairingCode])
 
   const handleUnbind = useCallback(async (platform: 'telegram' | 'feishu', userId: string | number) => {
-    if (!confirm(t('settings.adapters.unbindConfirm'))) return
-    await removePairedUser(platform, userId)
-    await fetchConfig()
-  }, [removePairedUser, fetchConfig, t])
+    setPendingUnbind({ platform, userId })
+  }, [])
+
+  const confirmUnbind = useCallback(async () => {
+    if (!pendingUnbind) return
+    setIsUnbinding(true)
+    try {
+      await removePairedUser(pendingUnbind.platform, pendingUnbind.userId)
+      await fetchConfig()
+      setPendingUnbind(null)
+    } finally {
+      setIsUnbinding(false)
+    }
+  }, [pendingUnbind, removePairedUser, fetchConfig])
 
   // Collect all paired users across platforms
   const allPairedUsers = [
@@ -344,6 +357,21 @@ export function AdapterSettings() {
           </span>
         )}
       </div>
+
+      <ConfirmDialog
+        open={pendingUnbind !== null}
+        onClose={() => {
+          if (isUnbinding) return
+          setPendingUnbind(null)
+        }}
+        onConfirm={confirmUnbind}
+        title={t('settings.adapters.unbind')}
+        body={t('settings.adapters.unbindConfirm')}
+        confirmLabel={t('settings.adapters.unbind')}
+        cancelLabel={t('common.cancel')}
+        confirmVariant="danger"
+        loading={isUnbinding}
+      />
     </div>
   )
 }
diff --git a/desktop/src/pages/EmptySession.tsx b/desktop/src/pages/EmptySession.tsx
index 47658d8b..e7a5d77b 100644
--- a/desktop/src/pages/EmptySession.tsx
+++ b/desktop/src/pages/EmptySession.tsx
@@ -3,8 +3,12 @@ import { skillsApi } from '../api/skills'
 import { useTranslation } from '../i18n'
 import { useSessionStore } from '../stores/sessionStore'
 import { useChatStore } from '../stores/chatStore'
+import { useProviderStore } from '../stores/providerStore'
+import { useSessionRuntimeStore, DRAFT_RUNTIME_SELECTION_KEY } from '../stores/sessionRuntimeStore'
+import { useSettingsStore } from '../stores/settingsStore'
 import { useUIStore } from '../stores/uiStore'
 import { SETTINGS_TAB_ID, useTabStore } from '../stores/tabStore'
+import { OFFICIAL_DEFAULT_MODEL_ID } from '../constants/modelCatalog'
 import { DirectoryPicker } from '../components/shared/DirectoryPicker'
 import { PermissionModeSelector } from '../components/controls/PermissionModeSelector'
 import { ModelSelector } from '../components/controls/ModelSelector'
@@ -54,6 +58,7 @@ export function EmptySession() {
   const slashItemRefs = useRef<(HTMLButtonElement | null)[]>([])
   const createSession = useSessionStore((state) => state.createSession)
   const sendMessage = useChatStore((state) => state.sendMessage)
+  const setSessionRuntime = useChatStore((state) => state.setSessionRuntime)
   const connectToSession = useChatStore((state) => state.connectToSession)
   const setActiveView = useUIStore((state) => state.setActiveView)
   const addToast = useUIStore((state) => state.addToast)
@@ -201,10 +206,34 @@ export function EmptySession() {
 
     setIsSubmitting(true)
     try {
+      const settings = useSettingsStore.getState()
+      let providerState = useProviderStore.getState()
+      if (
+        settings.activeProviderName &&
+        providerState.providers.length === 0 &&
+        !providerState.isLoading
+      ) {
+        await providerState.fetchProviders()
+        providerState = useProviderStore.getState()
+      }
+      const inferredProviderId = providerState.activeId ?? (
+        settings.activeProviderName
+          ? providerState.providers.find((provider) => provider.name === settings.activeProviderName)?.id ?? null
+          : null
+      )
+      const draftSelection =
+        useSessionRuntimeStore.getState().selections[DRAFT_RUNTIME_SELECTION_KEY]
+        ?? {
+          providerId: inferredProviderId,
+          modelId: settings.currentModel?.id ?? OFFICIAL_DEFAULT_MODEL_ID,
+        }
       const sessionId = await createSession(workDir || undefined)
       setActiveView('code')
       useTabStore.getState().openTab(sessionId, 'New Session')
       connectToSession(sessionId)
+      useSessionRuntimeStore.getState().setSelection(sessionId, draftSelection)
+      useSessionRuntimeStore.getState().clearSelection(DRAFT_RUNTIME_SELECTION_KEY)
+      setSessionRuntime(sessionId, draftSelection)
       const attachmentPayload: AttachmentRef[] = attachments.map((attachment) => ({
         type: attachment.type,
         name: attachment.name,
@@ -428,7 +457,7 @@ export function EmptySession() {
     <div className="relative flex flex-1 flex-col overflow-hidden bg-[var(--color-surface)]">
       <div className="flex flex-1 flex-col items-center justify-center p-8 pb-32">
         <div className="flex max-w-md flex-col items-center text-center">
-          <img src="/app-icon.png" alt="Claude Code Haha" className="mb-6 h-24 w-24 rounded-[22px]" style={{ boxShadow: 'var(--shadow-dropdown)' }} />
+          <img src="/app-icon.png" alt="Claude Code Haha" className="mb-6 h-24 w-24" />
           <h1 className="mb-2 text-3xl font-extrabold tracking-tight text-[var(--color-text-primary)]" style={{ fontFamily: 'var(--font-headline)' }}>
             {t('empty.title')}
           </h1>
@@ -557,7 +586,7 @@ export function EmptySession() {
               </div>
 
               <div className="flex items-center gap-3">
-                <ModelSelector />
+                <ModelSelector runtimeKey={DRAFT_RUNTIME_SELECTION_KEY} disabled={isSubmitting} />
                 <button
                   onClick={handleSubmit}
                   disabled={(!input.trim() && attachments.length === 0) || isSubmitting}
diff --git a/desktop/src/pages/McpSettings.tsx b/desktop/src/pages/McpSettings.tsx
index a25e23bc..f63eb2a3 100644
--- a/desktop/src/pages/McpSettings.tsx
+++ b/desktop/src/pages/McpSettings.tsx
@@ -1,4 +1,4 @@
-import { useEffect, useMemo, useState } from 'react'
+import { useEffect, useMemo, useRef, useState } from 'react'
 import { Button } from '../components/shared/Button'
 import { Input } from '../components/shared/Input'
 import { Modal } from '../components/shared/Modal'
@@ -63,6 +63,7 @@ const MCP_GROUP_ORDER: McpGroupKey[] = [
 
 const STATUS_TONE: Record<McpServerRecord['status'], string> = {
   connected: 'bg-emerald-500/10 text-emerald-600 border-emerald-500/20',
+  checking: 'bg-slate-500/10 text-slate-600 border-slate-500/20',
   'needs-auth': 'bg-amber-500/10 text-amber-600 border-amber-500/20',
   failed: 'bg-rose-500/10 text-rose-600 border-rose-500/20',
   disabled: 'bg-[var(--color-surface-hover)] text-[var(--color-text-secondary)] border-[var(--color-border)]',
@@ -228,6 +229,22 @@ function scopeLabel(server: McpServerRecord, t: ReturnType<typeof useTranslation
   return t(`settings.mcp.scope.${group}`)
 }
 
+function StatusBadge({ server }: { server: McpServerRecord }) {
+  return (
+    <span className={`inline-flex items-center rounded-full border px-2.5 py-1 text-[11px] font-semibold ${STATUS_TONE[server.status]}`}>
+      {server.statusLabel}
+    </span>
+  )
+}
+
+function getServerIdentityKey(server: Pick<McpServerRecord, 'name' | 'scope' | 'projectPath'>) {
+  if (server.scope === 'local' || server.scope === 'project') {
+    return `${server.scope}:${server.projectPath ?? ''}:${server.name}`
+  }
+
+  return `${server.scope}:${server.name}`
+}
+
 function ToggleSwitch({
   checked,
   disabled,
@@ -349,9 +366,7 @@ function ServerRow({
       <div className="min-w-0">
         <div className="flex items-center gap-3 mb-2 min-w-0">
           <div className="text-[1.05rem] font-semibold text-[var(--color-text-primary)] truncate">{server.name}</div>
-          <span className={`inline-flex items-center rounded-full border px-2.5 py-1 text-[11px] font-semibold ${STATUS_TONE[server.status]}`}>
-            {server.statusLabel}
-          </span>
+          <StatusBadge server={server} />
         </div>
         <div className="flex flex-wrap items-center gap-2 text-xs text-[var(--color-text-tertiary)]">
           <span className="rounded-full bg-[var(--color-surface-hover)] px-2 py-1 font-medium text-[var(--color-text-secondary)]">
@@ -382,7 +397,7 @@ function ServerRow({
 }
 
 export function McpSettings() {
-  const { servers, selectedServer, isLoading, error, fetchServers, createServer, updateServer, deleteServer, toggleServer, reconnectServer, selectServer } = useMcpStore()
+  const { servers, selectedServer, isLoading, error, fetchServers, createServer, updateServer, deleteServer, toggleServer, reconnectServer, refreshServerStatus, selectServer } = useMcpStore()
   const addToast = useUIStore((s) => s.addToast)
   const sessions = useSessionStore((s) => s.sessions)
   const activeSessionId = useSessionStore((s) => s.activeSessionId)
@@ -393,9 +408,11 @@ export function McpSettings() {
   const [isDeleting, setIsDeleting] = useState(false)
   const [busyServerName, setBusyServerName] = useState<string | null>(null)
   const [pendingDeleteServer, setPendingDeleteServer] = useState<McpServerRecord | null>(null)
+  const refreshInFlightRef = useRef(new Set<string>())
 
   const activeSession = sessions.find((session) => session.id === activeSessionId)
   const currentWorkDir = activeSession?.workDir || undefined
+  const resolveOperationCwd = (server?: McpServerRecord) => server?.projectPath ?? currentWorkDir
 
   useEffect(() => {
     void fetchServers(undefined, currentWorkDir)
@@ -441,10 +458,55 @@ export function McpSettings() {
     }
   }, [selectedServer])
 
+  useEffect(() => {
+    const pendingServers = servers.filter((server) => (
+      server.enabled &&
+      server.status === 'checking' &&
+      !refreshInFlightRef.current.has(getServerIdentityKey(server))
+    ))
+
+    if (pendingServers.length === 0) return
+
+    let cancelled = false
+    const queue = [...pendingServers]
+    const workerCount = Math.min(2, queue.length)
+
+    const runWorker = async () => {
+      while (!cancelled) {
+        const server = queue.shift()
+        if (!server) return
+
+        const key = getServerIdentityKey(server)
+        refreshInFlightRef.current.add(key)
+        try {
+          const updated = await refreshServerStatus(server, resolveOperationCwd(server))
+          if (cancelled) return
+
+          setView((current) => {
+            if (current.type !== 'details' && current.type !== 'edit') return current
+            if (getServerIdentityKey(current.server) !== key) return current
+            return { ...current, server: updated }
+          })
+        } catch {
+          // Keep passive checks silent. Explicit reconnect remains the action that
+          // surfaces failures to the user.
+        } finally {
+          refreshInFlightRef.current.delete(key)
+        }
+      }
+    }
+
+    void Promise.all(Array.from({ length: workerCount }, () => runWorker()))
+
+    return () => {
+      cancelled = true
+    }
+  }, [servers, refreshServerStatus, currentWorkDir])
+
   const handleToggle = async (server: McpServerRecord) => {
     setBusyServerName(server.name)
     try {
-      const updated = await toggleServer(server.name, undefined)
+      const updated = await toggleServer(server, resolveOperationCwd(server))
       addToast({
         type: 'success',
         message: updated.enabled ? t('settings.mcp.toast.enabled', { name: server.name }) : t('settings.mcp.toast.disabled', { name: server.name }),
@@ -460,9 +522,21 @@ export function McpSettings() {
   }
 
   const handleReconnect = async (server: McpServerRecord) => {
+    const optimistic = {
+      ...server,
+      status: 'checking' as const,
+      statusLabel: t('status.reconnecting'),
+      statusDetail: undefined,
+    }
+
     setBusyServerName(server.name)
+    setView((current) => {
+      if (current.type !== 'details' && current.type !== 'edit') return current
+      if (getServerIdentityKey(current.server) !== getServerIdentityKey(server)) return current
+      return { ...current, server: optimistic }
+    })
     try {
-      const updated = await reconnectServer(server.name, undefined)
+      const updated = await reconnectServer(server, resolveOperationCwd(server))
       addToast({
         type: updated.status === 'connected' ? 'success' : 'warning',
         message: updated.status === 'connected'
@@ -472,6 +546,11 @@ export function McpSettings() {
       if (view.type === 'edit') setView({ type: 'edit', server: updated })
       if (view.type === 'details') setView({ type: 'details', server: updated })
     } catch (error) {
+      setView((current) => {
+        if (current.type !== 'details' && current.type !== 'edit') return current
+        if (getServerIdentityKey(current.server) !== getServerIdentityKey(server)) return current
+        return { ...current, server }
+      })
       addToast({
         type: 'error',
         message: error instanceof Error ? error.message : t('settings.mcp.toast.reconnectFailed'),
@@ -490,7 +569,7 @@ export function McpSettings() {
     if (!server) return
     setIsDeleting(true)
     try {
-      await deleteServer(server.name, server.scope, undefined)
+      await deleteServer(server, resolveOperationCwd(server))
       addToast({
         type: 'success',
         message: t('settings.mcp.toast.deleted', { name: server.name }),
@@ -508,14 +587,39 @@ export function McpSettings() {
     }
   }
 
+  const deleteModal = (
+    <Modal
+      open={pendingDeleteServer !== null}
+      onClose={() => {
+        if (isDeleting) return
+        setPendingDeleteServer(null)
+      }}
+      title={t('settings.mcp.form.deleteTitle')}
+      footer={(
+        <>
+          <Button variant="ghost" onClick={() => setPendingDeleteServer(null)} disabled={isDeleting}>
+            {t('settings.mcp.form.cancel')}
+          </Button>
+          <Button variant="danger" onClick={confirmDelete} loading={isDeleting}>
+            {t('settings.mcp.form.confirmDelete')}
+          </Button>
+        </>
+      )}
+    >
+      <p className="text-sm leading-6 text-[var(--color-text-secondary)]">
+        {pendingDeleteServer ? t('settings.mcp.form.deleteConfirmBody', { name: pendingDeleteServer.name }) : ''}
+      </p>
+    </Modal>
+  )
+
   const handleSave = async () => {
     if (!isDraftValid(draft)) return
     setIsSaving(true)
     try {
       const payload = buildPayload(draft)
       const saved = view.type === 'edit'
-        ? await updateServer(view.server.name, payload, undefined)
-        : await createServer(draft.name.trim(), payload, undefined)
+        ? await updateServer(view.server, payload, resolveOperationCwd(view.server))
+        : await createServer(draft.name.trim(), payload, currentWorkDir)
 
       addToast({
         type: 'success',
@@ -573,44 +677,53 @@ export function McpSettings() {
   if (view.type === 'details') {
     const server = view.server
     return (
-      <div className="max-w-5xl min-w-0">
-        <button
-          type="button"
-          onClick={() => setView({ type: 'list' })}
-          className="mb-5 inline-flex items-center gap-2 text-sm text-[var(--color-text-secondary)] transition-colors hover:text-[var(--color-text-primary)]"
-        >
-          <span className="material-symbols-outlined text-[18px]">arrow_back</span>
-          {t('settings.mcp.form.back')}
-        </button>
+      <>
+        <div className="max-w-5xl min-w-0">
+          <button
+            type="button"
+            onClick={() => setView({ type: 'list' })}
+            className="mb-5 inline-flex items-center gap-2 text-sm text-[var(--color-text-secondary)] transition-colors hover:text-[var(--color-text-primary)]"
+          >
+            <span className="material-symbols-outlined text-[18px]">arrow_back</span>
+            {t('settings.mcp.form.back')}
+          </button>
 
-        <div className="flex items-start justify-between gap-4 mb-8">
-          <div>
-            <h2 className="text-[2.2rem] font-semibold tracking-[-0.03em] text-[var(--color-text-primary)]">{server.name}</h2>
-            <p className="mt-3 text-base text-[var(--color-text-secondary)]">{server.summary}</p>
+          <div className="flex items-start justify-between gap-4 mb-8">
+            <div>
+              <h2 className="text-[2.2rem] font-semibold tracking-[-0.03em] text-[var(--color-text-primary)]">{server.name}</h2>
+              <p className="mt-3 text-base text-[var(--color-text-secondary)]">{server.summary}</p>
+              <div className="mt-4 flex flex-wrap items-center gap-3">
+                <StatusBadge server={server} />
+                {server.statusDetail && (
+                  <span className="text-sm text-[var(--color-text-tertiary)]">{server.statusDetail}</span>
+                )}
+              </div>
+            </div>
+            {server.canReconnect && (
+              <Button variant="secondary" onClick={() => handleReconnect(server)} loading={busyServerName === server.name}>
+                <span className="material-symbols-outlined text-[16px]">sync</span>
+                {t('settings.mcp.form.reconnect')}
+              </Button>
+            )}
           </div>
-          {server.canReconnect && (
-            <Button variant="secondary" onClick={() => handleReconnect(server)} loading={busyServerName === server.name}>
-              <span className="material-symbols-outlined text-[16px]">sync</span>
-              {t('settings.mcp.form.reconnect')}
-            </Button>
-          )}
+
+          <section className="rounded-[var(--radius-xl)] border border-[var(--color-border)] bg-[var(--color-surface)] p-6">
+            <div className="grid gap-4 md:grid-cols-2">
+              <InfoPair label={t('settings.mcp.form.transport')} value={transportLabel(server.transport, t)} />
+              <InfoPair label={t('settings.mcp.form.scope')} value={scopeLabel(server, t)} />
+              <InfoPair label={t('settings.mcp.form.status')} value={server.statusLabel} />
+              <InfoPair label={t('settings.mcp.form.location')} value={server.configLocation} />
+            </div>
+            <div className="mt-5">
+              <div className="text-sm font-semibold text-[var(--color-text-primary)] mb-2">{t('settings.mcp.form.rawConfig')}</div>
+              <pre className="overflow-x-auto rounded-[var(--radius-lg)] bg-[var(--color-surface-hover)] p-4 text-xs text-[var(--color-text-secondary)]">
+                {JSON.stringify(server.config, null, 2)}
+              </pre>
+            </div>
+          </section>
         </div>
-
-        <section className="rounded-[var(--radius-xl)] border border-[var(--color-border)] bg-[var(--color-surface)] p-6">
-          <div className="grid gap-4 md:grid-cols-2">
-            <InfoPair label={t('settings.mcp.form.transport')} value={transportLabel(server.transport, t)} />
-            <InfoPair label={t('settings.mcp.form.scope')} value={scopeLabel(server, t)} />
-            <InfoPair label={t('settings.mcp.form.status')} value={server.statusLabel} />
-            <InfoPair label={t('settings.mcp.form.location')} value={server.configLocation} />
-          </div>
-          <div className="mt-5">
-            <div className="text-sm font-semibold text-[var(--color-text-primary)] mb-2">{t('settings.mcp.form.rawConfig')}</div>
-            <pre className="overflow-x-auto rounded-[var(--radius-lg)] bg-[var(--color-surface-hover)] p-4 text-xs text-[var(--color-text-secondary)]">
-              {JSON.stringify(server.config, null, 2)}
-            </pre>
-          </div>
-        </section>
-      </div>
+        {deleteModal}
+      </>
     )
   }
 
@@ -621,48 +734,57 @@ export function McpSettings() {
     const isBusy = isSaving || isDeleting
 
     return (
-      <div className="max-w-5xl min-w-0">
-        <button
-          type="button"
-          onClick={() => setView({ type: 'list' })}
-          className="mb-5 inline-flex items-center gap-2 text-sm text-[var(--color-text-secondary)] transition-colors hover:text-[var(--color-text-primary)]"
-        >
-          <span className="material-symbols-outlined text-[18px]">arrow_back</span>
-          {t('settings.mcp.form.back')}
-        </button>
+      <>
+        <div className="max-w-5xl min-w-0">
+          <button
+            type="button"
+            onClick={() => setView({ type: 'list' })}
+            className="mb-5 inline-flex items-center gap-2 text-sm text-[var(--color-text-secondary)] transition-colors hover:text-[var(--color-text-primary)]"
+          >
+            <span className="material-symbols-outlined text-[18px]">arrow_back</span>
+            {t('settings.mcp.form.back')}
+          </button>
 
-        <div className="flex items-start justify-between gap-4 mb-8">
-          <div>
-            <h2 className="text-[2.2rem] font-semibold tracking-[-0.03em] text-[var(--color-text-primary)]">
-              {editing ? t('settings.mcp.form.editTitle', { name: targetServer!.name }) : t('settings.mcp.form.createTitle')}
-            </h2>
-            <p className="mt-3 text-base text-[var(--color-text-secondary)]">
-              {editing ? t('settings.mcp.form.editHint') : t('settings.mcp.form.createHint')}
-            </p>
+          <div className="flex items-start justify-between gap-4 mb-8">
+            <div>
+              <h2 className="text-[2.2rem] font-semibold tracking-[-0.03em] text-[var(--color-text-primary)]">
+                {editing ? t('settings.mcp.form.editTitle', { name: targetServer!.name }) : t('settings.mcp.form.createTitle')}
+              </h2>
+              <p className="mt-3 text-base text-[var(--color-text-secondary)]">
+                {editing ? t('settings.mcp.form.editHint') : t('settings.mcp.form.createHint')}
+              </p>
+              {editing && targetServer && (
+                <div className="mt-4 flex flex-wrap items-center gap-3">
+                  <StatusBadge server={targetServer} />
+                  {targetServer.statusDetail && (
+                    <span className="text-sm text-[var(--color-text-tertiary)]">{targetServer.statusDetail}</span>
+                  )}
+                </div>
+              )}
+            </div>
+
+            <div className="flex items-center gap-3">
+              {editing && targetServer?.canReconnect && (
+                <Button variant="secondary" onClick={() => handleReconnect(targetServer)} loading={busyServerName === targetServer.name}>
+                  <span className="material-symbols-outlined text-[16px]">sync</span>
+                  {t('settings.mcp.form.reconnect')}
+                </Button>
+              )}
+              {editing && targetServer?.canRemove && (
+                <Button
+                  variant="ghost"
+                  className="text-[var(--color-error)] hover:text-[var(--color-error)] hover:bg-[var(--color-error)]/8"
+                  onClick={() => handleDelete(targetServer)}
+                  loading={isDeleting}
+                >
+                  <span className="material-symbols-outlined text-[16px]">delete</span>
+                  {t('settings.mcp.form.uninstall')}
+                </Button>
+              )}
+            </div>
           </div>
 
-          <div className="flex items-center gap-3">
-            {editing && targetServer?.canReconnect && (
-              <Button variant="secondary" onClick={() => handleReconnect(targetServer)} loading={busyServerName === targetServer.name}>
-                <span className="material-symbols-outlined text-[16px]">sync</span>
-                {t('settings.mcp.form.reconnect')}
-              </Button>
-            )}
-            {editing && targetServer?.canRemove && (
-              <Button
-                variant="ghost"
-                className="text-[var(--color-error)] hover:text-[var(--color-error)] hover:bg-[var(--color-error)]/8"
-                onClick={() => handleDelete(targetServer)}
-                loading={isDeleting}
-              >
-                <span className="material-symbols-outlined text-[16px]">delete</span>
-                {t('settings.mcp.form.uninstall')}
-              </Button>
-            )}
-          </div>
-        </div>
-
-        <div className="space-y-4">
+          <div className="space-y-4">
           <section className="rounded-[var(--radius-xl)] border border-[var(--color-border)] bg-[var(--color-surface)] p-5">
             <Input
               label={t('settings.mcp.form.name')}
@@ -722,6 +844,9 @@ export function McpSettings() {
                   placeholder={t('settings.mcp.form.commandPlaceholder')}
                   required
                 />
+                <p className="mt-2 text-xs leading-5 text-[var(--color-text-tertiary)]">
+                  {t('settings.mcp.form.commandHostHint')}
+                </p>
               </section>
 
               <ArraySection
@@ -802,7 +927,9 @@ export function McpSettings() {
             </Button>
           </div>
         </div>
-      </div>
+        </div>
+        {deleteModal}
+      </>
     )
   }
 
@@ -882,29 +1009,7 @@ export function McpSettings() {
           })}
         </div>
       )}
-
-      <Modal
-        open={pendingDeleteServer !== null}
-        onClose={() => {
-          if (isDeleting) return
-          setPendingDeleteServer(null)
-        }}
-        title={t('settings.mcp.form.deleteTitle')}
-        footer={(
-          <>
-            <Button variant="ghost" onClick={() => setPendingDeleteServer(null)} disabled={isDeleting}>
-              {t('settings.mcp.form.cancel')}
-            </Button>
-            <Button variant="danger" onClick={confirmDelete} loading={isDeleting}>
-              {t('settings.mcp.form.confirmDelete')}
-            </Button>
-          </>
-        )}
-      >
-        <p className="text-sm leading-6 text-[var(--color-text-secondary)]">
-          {pendingDeleteServer ? t('settings.mcp.form.deleteConfirmBody', { name: pendingDeleteServer.name }) : ''}
-        </p>
-      </Modal>
+      {deleteModal}
     </div>
   )
 }
diff --git a/desktop/src/pages/Settings.tsx b/desktop/src/pages/Settings.tsx
index 6c059d63..e01f582e 100644
--- a/desktop/src/pages/Settings.tsx
+++ b/desktop/src/pages/Settings.tsx
@@ -3,13 +3,13 @@ import { useSettingsStore } from '../stores/settingsStore'
 import { useProviderStore } from '../stores/providerStore'
 import { useTranslation } from '../i18n'
 import { Modal } from '../components/shared/Modal'
+import { ConfirmDialog } from '../components/shared/ConfirmDialog'
 import { Input } from '../components/shared/Input'
 import { Button } from '../components/shared/Button'
 import type { PermissionMode, EffortLevel, ThemeMode } from '../types/settings'
 import type { Locale } from '../i18n'
-import { PROVIDER_PRESETS } from '../config/providerPresets'
-import type { ProviderPreset } from '../config/providerPresets'
 import type { SavedProvider, UpdateProviderInput, ProviderTestResult, ModelMapping, ApiFormat } from '../types/provider'
+import type { ProviderPreset } from '../types/providerPreset'
 import { AdapterSettings } from './AdapterSettings'
 import { useAgentStore } from '../stores/agentStore'
 import { useSessionStore } from '../stores/sessionStore'
@@ -23,11 +23,11 @@ import { PluginList } from '../components/plugins/PluginList'
 import { PluginDetail } from '../components/plugins/PluginDetail'
 import { ComputerUseSettings } from './ComputerUseSettings'
 import { McpSettings } from './McpSettings'
+import { TerminalSettings } from './TerminalSettings'
 import { useUIStore, type SettingsTab } from '../stores/uiStore'
 import { ClaudeOfficialLogin } from '../components/settings/ClaudeOfficialLogin'
 import { useUpdateStore } from '../stores/updateStore'
 import { formatBytes } from '../lib/formatBytes'
-import { InstallCenter } from '../components/settings/InstallCenter'
 
 export function Settings() {
   const [activeTab, setActiveTab] = useState<SettingsTab>('providers')
@@ -50,7 +50,7 @@ export function Settings() {
             <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')} />
             <TabButton icon="chat" label={t('settings.tab.adapters')} active={activeTab === 'adapters'} onClick={() => setActiveTab('adapters')} />
-            <TabButton icon="download" label={t('settings.tab.install')} active={activeTab === 'install'} onClick={() => setActiveTab('install')} />
+            <TabButton icon="terminal" label={t('settings.tab.terminal')} active={activeTab === 'terminal'} onClick={() => setActiveTab('terminal')} />
             <TabButton icon="dns" label={t('settings.tab.mcp')} active={activeTab === 'mcp'} onClick={() => setActiveTab('mcp')} />
             <TabButton icon="smart_toy" label={t('settings.tab.agents')} active={activeTab === 'agents'} onClick={() => setActiveTab('agents')} />
             <TabButton icon="auto_awesome" label={t('settings.tab.skills')} active={activeTab === 'skills'} onClick={() => setActiveTab('skills')} />
@@ -68,7 +68,7 @@ export function Settings() {
           {activeTab === 'permissions' && <PermissionSettings />}
           {activeTab === 'general' && <GeneralSettings />}
           {activeTab === 'adapters' && <AdapterSettings />}
-          {activeTab === 'install' && <InstallCenter />}
+          {activeTab === 'terminal' && <TerminalSettings />}
           {activeTab === 'mcp' && <McpSettings />}
           {activeTab === 'agents' && <AgentsSettings />}
           {activeTab === 'skills' && <SkillSettings />}
@@ -100,19 +100,53 @@ function TabButton({ icon, label, active, onClick }: { icon: string; label: stri
 // ─── Provider Settings ──────────────────────────────────────
 
 function ProviderSettings() {
-  const { providers, activeId, isLoading, fetchProviders, deleteProvider, activateProvider, activateOfficial, testProvider } = useProviderStore()
+  const {
+    providers,
+    activeId,
+    presets,
+    isLoading,
+    isPresetsLoading,
+    fetchProviders,
+    fetchPresets,
+    deleteProvider,
+    activateProvider,
+    activateOfficial,
+    testProvider,
+  } = useProviderStore()
   const fetchSettings = useSettingsStore((s) => s.fetchAll)
   const t = useTranslation()
   const [editingProvider, setEditingProvider] = useState<SavedProvider | null>(null)
   const [showCreateModal, setShowCreateModal] = useState(false)
+  const [pendingDeleteProvider, setPendingDeleteProvider] = useState<SavedProvider | null>(null)
+  const [isDeletingProvider, setIsDeletingProvider] = useState(false)
   const [testResults, setTestResults] = useState<Record<string, { loading: boolean; result?: ProviderTestResult }>>({})
 
-  useEffect(() => { fetchProviders() }, [fetchProviders])
+  useEffect(() => {
+    void fetchProviders()
+    void fetchPresets()
+  }, [fetchPresets, fetchProviders])
+
+  const presetMap = useMemo(
+    () => new Map(presets.map((preset) => [preset.id, preset])),
+    [presets],
+  )
 
   const handleDelete = async (provider: SavedProvider) => {
     if (activeId === provider.id) return
-    if (!window.confirm(t('settings.providers.confirmDelete', { name: provider.name }))) return
-    await deleteProvider(provider.id).catch(console.error)
+    setPendingDeleteProvider(provider)
+  }
+
+  const confirmDelete = async () => {
+    if (!pendingDeleteProvider) return
+    setIsDeletingProvider(true)
+    try {
+      await deleteProvider(pendingDeleteProvider.id)
+      setPendingDeleteProvider(null)
+    } catch (error) {
+      console.error(error)
+    } finally {
+      setIsDeletingProvider(false)
+    }
   }
 
   const handleTest = async (provider: SavedProvider) => {
@@ -144,7 +178,7 @@ function ProviderSettings() {
           <h2 className="text-base font-semibold text-[var(--color-text-primary)]">{t('settings.providers.title')}</h2>
           <p className="text-sm text-[var(--color-text-tertiary)] mt-0.5">{t('settings.providers.description')}</p>
         </div>
-        <Button size="sm" onClick={() => setShowCreateModal(true)}>
+        <Button size="sm" onClick={() => setShowCreateModal(true)} disabled={isPresetsLoading || presets.length === 0}>
           <span className="material-symbols-outlined text-[16px]">add</span>
           {t('settings.providers.addProvider')}
         </Button>
@@ -167,7 +201,7 @@ function ProviderSettings() {
             <div className="flex items-center gap-2">
               <span className="text-sm font-semibold text-[var(--color-text-primary)]">{t('settings.providers.officialName')}</span>
               {isOfficialActive && (
-                <span className="px-1.5 py-0.5 text-[10px] font-bold rounded border border-[var(--color-brand)]/18 bg-[var(--color-brand)]/14 text-[var(--color-brand)] leading-none">{t('common.active')}</span>
+                <span className="px-1.5 py-0.5 text-[10px] font-bold rounded border border-[var(--color-brand)]/18 bg-[var(--color-brand)]/14 text-[var(--color-brand)] leading-none">{t('settings.providers.default')}</span>
               )}
             </div>
             <div className="text-xs text-[var(--color-text-tertiary)] mt-0.5">{t('settings.providers.officialDesc')}</div>
@@ -191,7 +225,7 @@ function ProviderSettings() {
           {providers.map((provider) => {
             const isActive = activeId === provider.id
             const test = testResults[provider.id]
-            const preset = PROVIDER_PRESETS.find((p) => p.id === provider.presetId)
+            const preset = presetMap.get(provider.presetId)
             return (
               <div
                 key={provider.id}
@@ -214,7 +248,7 @@ function ProviderSettings() {
                       </span>
                     )}
                     {isActive && (
-                      <span className="px-1.5 py-0.5 text-[10px] font-bold rounded border border-[var(--color-brand)]/18 bg-[var(--color-brand)]/14 text-[var(--color-brand)] leading-none">{t('common.active')}</span>
+                      <span className="px-1.5 py-0.5 text-[10px] font-bold rounded border border-[var(--color-brand)]/18 bg-[var(--color-brand)]/14 text-[var(--color-brand)] leading-none">{t('settings.providers.default')}</span>
                     )}
                   </div>
                   <div className="text-xs text-[var(--color-text-tertiary)] truncate mt-0.5">
@@ -239,7 +273,7 @@ function ProviderSettings() {
                 </div>
                 <div className="flex items-center gap-1 opacity-0 group-hover:opacity-100 transition-opacity flex-shrink-0">
                   {!isActive && (
-                    <Button variant="ghost" size="sm" onClick={() => handleActivate(provider.id)}>{t('settings.providers.activate')}</Button>
+                    <Button variant="ghost" size="sm" onClick={() => handleActivate(provider.id)}>{t('settings.providers.setDefault')}</Button>
                   )}
                   <Button variant="ghost" size="sm" onClick={() => handleTest(provider)} loading={test?.loading}>{t('settings.providers.test')}</Button>
                   <Button variant="ghost" size="sm" onClick={() => setEditingProvider(provider)}>{t('settings.providers.edit')}</Button>
@@ -255,13 +289,28 @@ function ProviderSettings() {
 
       {/* Create Modal — conditionally rendered so state resets on close */}
       {showCreateModal && (
-        <ProviderFormModal open={true} onClose={() => setShowCreateModal(false)} mode="create" />
+        <ProviderFormModal open={true} onClose={() => setShowCreateModal(false)} mode="create" presets={presets} />
       )}
 
       {/* Edit Modal */}
       {editingProvider && (
-        <ProviderFormModal key={editingProvider.id} open={true} onClose={() => setEditingProvider(null)} mode="edit" provider={editingProvider} />
+        <ProviderFormModal key={editingProvider.id} open={true} onClose={() => setEditingProvider(null)} mode="edit" provider={editingProvider} presets={presets} />
       )}
+
+      <ConfirmDialog
+        open={pendingDeleteProvider !== null}
+        onClose={() => {
+          if (isDeletingProvider) return
+          setPendingDeleteProvider(null)
+        }}
+        onConfirm={confirmDelete}
+        title={t('common.delete')}
+        body={pendingDeleteProvider ? t('settings.providers.confirmDelete', { name: pendingDeleteProvider.name }) : ''}
+        confirmLabel={t('common.delete')}
+        cancelLabel={t('common.cancel')}
+        confirmVariant="danger"
+        loading={isDeletingProvider}
+      />
     </div>
   )
 }
@@ -273,6 +322,7 @@ type ProviderFormProps = {
   onClose: () => void
   mode: 'create' | 'edit'
   provider?: SavedProvider
+  presets: ProviderPreset[]
 }
 
 function requirePreset(preset: ProviderPreset | undefined): ProviderPreset {
@@ -282,15 +332,27 @@ function requirePreset(preset: ProviderPreset | undefined): ProviderPreset {
   return preset
 }
 
-function ProviderFormModal({ open, onClose, mode, provider }: ProviderFormProps) {
+function buildFallbackPreset(provider?: SavedProvider): ProviderPreset {
+  return {
+    id: provider?.presetId ?? 'custom',
+    name: provider?.name ?? 'Custom',
+    baseUrl: provider?.baseUrl ?? '',
+    apiFormat: provider?.apiFormat ?? 'anthropic',
+    defaultModels: provider?.models ?? { main: '', haiku: '', sonnet: '', opus: '' },
+    needsApiKey: true,
+    websiteUrl: '',
+  }
+}
+
+function ProviderFormModal({ open, onClose, mode, provider, presets }: ProviderFormProps) {
   const { createProvider, updateProvider, testConfig } = useProviderStore()
   const fetchSettings = useSettingsStore((s) => s.fetchAll)
   const t = useTranslation()
 
-  const availablePresets = PROVIDER_PRESETS.filter((p) => p.id !== 'official')
-  const fallbackPreset = requirePreset(
-    availablePresets[availablePresets.length - 1] ?? PROVIDER_PRESETS[0],
-  )
+  const availablePresets = presets.filter((p) => p.id !== 'official')
+  const fallbackPreset = provider
+    ? buildFallbackPreset(provider)
+    : requirePreset(availablePresets[availablePresets.length - 1])
   const initialPreset = requirePreset(
     provider
       ? availablePresets.find((p) => p.id === provider.presetId) ?? fallbackPreset
@@ -318,8 +380,8 @@ function ProviderFormModal({ open, onClose, mode, provider }: ProviderFormProps)
       jsonPastedRef.current = false
       return
     }
-    import('../api/settings').then(({ settingsApi }) => {
-      settingsApi.getUser().then((settings) => {
+    import('../api/providers').then(({ providersApi }) => {
+      providersApi.getSettings().then((settings) => {
         const needsProxy = apiFormat !== 'anthropic'
         const merged = {
           ...settings,
@@ -358,12 +420,13 @@ function ProviderFormModal({ open, onClose, mode, provider }: ProviderFormProps)
     if (!canSubmit) return
     setIsSubmitting(true)
     try {
-      // Write the edited settings.json first (for all presets including official)
+      // Write the edited cc-haha settings.json first so provider-specific model
+      // settings never conflict with the user's global ~/.claude/settings.json.
       if (settingsJson.trim()) {
         try {
           const parsed = JSON.parse(settingsJson)
-          const { settingsApi } = await import('../api/settings')
-          await settingsApi.updateUser(parsed)
+          const { providersApi } = await import('../api/providers')
+          await providersApi.updateSettings(parsed)
         } catch {
           // JSON validation already prevents this
         }
@@ -1334,7 +1397,20 @@ function AboutSettings() {
   const initialize = useUpdateStore((s) => s.initialize)
 
   useEffect(() => {
-    import('@tauri-apps/api/app').then((mod) => mod.getVersion()).then(setVersion).catch(() => setVersion('0.1.0'))
+    let cancelled = false
+
+    import('@tauri-apps/api/app')
+      .then((mod) => mod.getVersion())
+      .then((value) => {
+        if (!cancelled) setVersion(value)
+      })
+      .catch(() => {
+        if (!cancelled) setVersion('0.1.0')
+      })
+
+    return () => {
+      cancelled = true
+    }
   }, [])
 
   useEffect(() => {
@@ -1377,7 +1453,7 @@ function AboutSettings() {
   return (
     <div className="w-full min-w-0 max-w-lg mx-auto flex flex-col items-center py-6">
       {/* Logo + App Name + Version */}
-      <img src="/app-icon.png" alt="Claude Code Haha" className="w-20 h-20 rounded-2xl shadow-md mb-4" />
+      <img src="/app-icon.png" alt="Claude Code Haha" className="w-20 h-20 mb-4" />
       <h1 className="text-xl font-bold text-[var(--color-text-primary)]">Claude Code Haha</h1>
       {version && (
         <span className="text-xs text-[var(--color-text-tertiary)] mt-1">{t('settings.about.version')} {version}</span>
diff --git a/desktop/src/pages/TerminalSettings.test.tsx b/desktop/src/pages/TerminalSettings.test.tsx
new file mode 100644
index 00000000..04e72a98
--- /dev/null
+++ b/desktop/src/pages/TerminalSettings.test.tsx
@@ -0,0 +1,128 @@
+import { act, render, screen, waitFor } from '@testing-library/react'
+import '@testing-library/jest-dom'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+const terminalMocks = vi.hoisted(() => {
+  const terminalInstance = {
+    cols: 80,
+    rows: 24,
+    loadAddon: vi.fn(),
+    open: vi.fn(),
+    dispose: vi.fn(),
+    onData: vi.fn(),
+    write: vi.fn(),
+    writeln: vi.fn(),
+    clear: vi.fn(),
+  }
+  const fitInstance = {
+    fit: vi.fn(),
+  }
+  return {
+    available: false,
+    terminalInstance,
+    fitInstance,
+    spawn: vi.fn(),
+    write: vi.fn(),
+    resize: vi.fn(),
+    kill: vi.fn(),
+    onOutput: vi.fn(),
+    onExit: vi.fn(),
+  }
+})
+
+vi.mock('@xterm/xterm', () => ({
+  Terminal: vi.fn(() => terminalMocks.terminalInstance),
+}))
+
+vi.mock('@xterm/addon-fit', () => ({
+  FitAddon: vi.fn(() => terminalMocks.fitInstance),
+}))
+
+vi.mock('../api/terminal', () => ({
+  terminalApi: {
+    isAvailable: () => terminalMocks.available,
+    spawn: terminalMocks.spawn,
+    write: terminalMocks.write,
+    resize: terminalMocks.resize,
+    kill: terminalMocks.kill,
+    onOutput: terminalMocks.onOutput,
+    onExit: terminalMocks.onExit,
+  },
+}))
+
+import { TerminalSettings } from './TerminalSettings'
+
+describe('TerminalSettings', () => {
+  beforeEach(() => {
+    terminalMocks.available = false
+    terminalMocks.spawn.mockReset()
+    terminalMocks.write.mockReset()
+    terminalMocks.resize.mockReset()
+    terminalMocks.kill.mockReset()
+    terminalMocks.onOutput.mockReset()
+    terminalMocks.onExit.mockReset()
+    terminalMocks.terminalInstance.loadAddon.mockClear()
+    terminalMocks.terminalInstance.open.mockClear()
+    terminalMocks.terminalInstance.dispose.mockClear()
+    terminalMocks.terminalInstance.onData.mockClear()
+    terminalMocks.terminalInstance.write.mockClear()
+    terminalMocks.terminalInstance.writeln.mockClear()
+    terminalMocks.terminalInstance.clear.mockClear()
+    terminalMocks.fitInstance.fit.mockClear()
+    terminalMocks.onOutput.mockResolvedValue(vi.fn())
+    terminalMocks.onExit.mockResolvedValue(vi.fn())
+    terminalMocks.write.mockResolvedValue(undefined)
+    terminalMocks.resize.mockResolvedValue(undefined)
+    terminalMocks.kill.mockResolvedValue(undefined)
+    terminalMocks.spawn.mockResolvedValue({
+      session_id: 7,
+      shell: '/bin/zsh',
+      cwd: '/Users/test',
+    })
+    vi.stubGlobal('ResizeObserver', class {
+      observe = vi.fn()
+      disconnect = vi.fn()
+    })
+  })
+
+  it('shows a desktop-runtime empty state outside Tauri', () => {
+    render(<TerminalSettings />)
+
+    expect(screen.getByText('Desktop runtime required')).toBeInTheDocument()
+    expect(terminalMocks.spawn).not.toHaveBeenCalled()
+  })
+
+  it('starts a host terminal session when Tauri is available', async () => {
+    terminalMocks.available = true
+
+    render(<TerminalSettings />)
+
+    await waitFor(() => {
+      expect(terminalMocks.spawn).toHaveBeenCalledWith({ cols: 80, rows: 24 })
+    })
+    expect(screen.getByText('/bin/zsh')).toBeInTheDocument()
+    expect(screen.getByText('/Users/test')).toBeInTheDocument()
+    expect(terminalMocks.terminalInstance.open).toHaveBeenCalled()
+    expect(terminalMocks.fitInstance.fit).toHaveBeenCalled()
+  })
+
+  it('writes matching terminal output events into xterm', async () => {
+    terminalMocks.available = true
+    let outputHandler: ((payload: { session_id: number; data: string }) => void) | undefined
+    terminalMocks.onOutput.mockImplementation(async (handler) => {
+      outputHandler = handler
+      return vi.fn()
+    })
+
+    render(<TerminalSettings />)
+    await waitFor(() => expect(terminalMocks.spawn).toHaveBeenCalled())
+
+    act(() => {
+      outputHandler?.({ session_id: 7, data: 'hello\r\n' })
+      outputHandler?.({ session_id: 8, data: 'ignored\r\n' })
+    })
+
+    expect(terminalMocks.terminalInstance.write).toHaveBeenCalledWith('hello\r\n')
+    expect(terminalMocks.terminalInstance.write).not.toHaveBeenCalledWith('ignored\r\n')
+  })
+})
diff --git a/desktop/src/pages/TerminalSettings.tsx b/desktop/src/pages/TerminalSettings.tsx
new file mode 100644
index 00000000..e944fb68
--- /dev/null
+++ b/desktop/src/pages/TerminalSettings.tsx
@@ -0,0 +1,275 @@
+import { useCallback, useEffect, useRef, useState } from 'react'
+import type { Terminal as XTermTerminal } from '@xterm/xterm'
+import type { FitAddon as XTermFitAddon } from '@xterm/addon-fit'
+import { useTranslation, type TranslationKey } from '../i18n'
+import { terminalApi } from '../api/terminal'
+
+type TerminalStatus = 'idle' | 'starting' | 'running' | 'exited' | 'error' | 'unavailable'
+
+const STATUS_LABEL_KEYS: Record<TerminalStatus, TranslationKey> = {
+  idle: 'settings.terminal.status.idle',
+  starting: 'settings.terminal.status.starting',
+  running: 'settings.terminal.status.running',
+  exited: 'settings.terminal.status.exited',
+  error: 'settings.terminal.status.error',
+  unavailable: 'settings.terminal.status.unavailable',
+}
+
+export function TerminalSettings() {
+  const t = useTranslation()
+  const hostRef = useRef<HTMLDivElement | null>(null)
+  const terminalRef = useRef<XTermTerminal | null>(null)
+  const fitRef = useRef<XTermFitAddon | null>(null)
+  const sessionIdRef = useRef<number | null>(null)
+  const unlistenRef = useRef<Array<() => void>>([])
+  const [status, setStatus] = useState<TerminalStatus>(() => terminalApi.isAvailable() ? 'idle' : 'unavailable')
+  const [error, setError] = useState<string | null>(null)
+  const [shellInfo, setShellInfo] = useState<{ shell: string; cwd: string } | null>(null)
+
+  const resizeSession = useCallback(() => {
+    const terminal = terminalRef.current
+    const fit = fitRef.current
+    const sessionId = sessionIdRef.current
+    if (!terminal || !fit) return
+
+    fit.fit()
+    if (sessionId) {
+      void terminalApi.resize(sessionId, terminal.cols, terminal.rows).catch(() => {})
+    }
+  }, [])
+
+  const startTerminal = useCallback(async () => {
+    if (!terminalApi.isAvailable()) {
+      setStatus('unavailable')
+      return
+    }
+
+    const host = hostRef.current
+    if (!host) return
+
+    setError(null)
+    setStatus('starting')
+    setShellInfo(null)
+
+    const existing = sessionIdRef.current
+    if (existing) {
+      await terminalApi.kill(existing).catch(() => {})
+      sessionIdRef.current = null
+    }
+    unlistenRef.current.forEach((unlisten) => unlisten())
+    unlistenRef.current = []
+
+    terminalRef.current?.dispose()
+    fitRef.current = null
+    host.innerHTML = ''
+
+    const [{ Terminal }, { FitAddon }] = await Promise.all([
+      import('@xterm/xterm'),
+      import('@xterm/addon-fit'),
+    ])
+
+    const terminal = new Terminal({
+      cursorBlink: true,
+      convertEol: false,
+      fontFamily: "var(--font-mono), 'SFMono-Regular', Consolas, monospace",
+      fontSize: 12,
+      lineHeight: 1.25,
+      scrollback: 4000,
+      theme: {
+        background: '#121212',
+        foreground: '#d7d2d0',
+        cursor: '#ffb59f',
+        selectionBackground: '#5f4a40',
+        black: '#1f1f1f',
+        red: '#ff6d67',
+        green: '#7ef18a',
+        yellow: '#f8c55f',
+        blue: '#77a8ff',
+        magenta: '#d699ff',
+        cyan: '#61d6d6',
+        white: '#d7d2d0',
+        brightBlack: '#8f8683',
+        brightRed: '#ff8a85',
+        brightGreen: '#9ff7a7',
+        brightYellow: '#ffdd7a',
+        brightBlue: '#a6c5ff',
+        brightMagenta: '#e3b8ff',
+        brightCyan: '#8ceeee',
+        brightWhite: '#ffffff',
+      },
+    })
+    const fit = new FitAddon()
+    terminal.loadAddon(fit)
+    terminal.open(host)
+    terminalRef.current = terminal
+    fitRef.current = fit
+    fit.fit()
+
+    const outputUnlisten = await terminalApi.onOutput((payload) => {
+      if (payload.session_id === sessionIdRef.current) {
+        terminal.write(payload.data)
+      }
+    })
+    const exitUnlisten = await terminalApi.onExit((payload) => {
+      if (payload.session_id !== sessionIdRef.current) return
+      setStatus('exited')
+      const signal = payload.signal ? `, ${payload.signal}` : ''
+      terminal.writeln(`\r\n[process exited: ${payload.code}${signal}]`)
+      sessionIdRef.current = null
+    })
+    unlistenRef.current = [outputUnlisten, exitUnlisten]
+
+    terminal.onData((data) => {
+      const sessionId = sessionIdRef.current
+      if (sessionId) {
+        void terminalApi.write(sessionId, data).catch((err) => {
+          setError(err instanceof Error ? err.message : String(err))
+          setStatus('error')
+        })
+      }
+    })
+
+    try {
+      const result = await terminalApi.spawn({ cols: terminal.cols, rows: terminal.rows })
+      sessionIdRef.current = result.session_id
+      setShellInfo({ shell: result.shell, cwd: result.cwd })
+      setStatus('running')
+      resizeSession()
+    } catch (err) {
+      outputUnlisten()
+      exitUnlisten()
+      terminal.dispose()
+      terminalRef.current = null
+      fitRef.current = null
+      setError(err instanceof Error ? err.message : String(err))
+      setStatus('error')
+    }
+  }, [resizeSession])
+
+  useEffect(() => {
+    if (!terminalApi.isAvailable()) return
+    void startTerminal()
+
+    const observer = new ResizeObserver(() => resizeSession())
+    if (hostRef.current) observer.observe(hostRef.current)
+
+    return () => {
+      observer.disconnect()
+      const sessionId = sessionIdRef.current
+      if (sessionId) {
+        void terminalApi.kill(sessionId).catch(() => {})
+      }
+      terminalRef.current?.dispose()
+      terminalRef.current = null
+      fitRef.current = null
+      unlistenRef.current.forEach((unlisten) => unlisten())
+      unlistenRef.current = []
+      sessionIdRef.current = null
+    }
+  }, [resizeSession, startTerminal])
+
+  const clearTerminal = () => {
+    terminalRef.current?.clear()
+  }
+
+  return (
+    <div className="flex h-full min-h-[620px] flex-col overflow-hidden">
+      <div className="mb-4 flex flex-wrap items-start justify-between gap-3">
+        <div className="min-w-0">
+          <h2 className="text-base font-semibold text-[var(--color-text-primary)]">
+            {t('settings.terminal.title')}
+          </h2>
+          <p className="mt-0.5 max-w-2xl text-sm text-[var(--color-text-tertiary)]">
+            {t('settings.terminal.description')}
+          </p>
+        </div>
+        <div className="flex items-center gap-2">
+          <button
+            type="button"
+            onClick={clearTerminal}
+            disabled={!terminalRef.current}
+            className="inline-flex h-8 items-center gap-1.5 rounded-[var(--radius-md)] border border-[var(--color-border)] px-2.5 text-xs font-medium text-[var(--color-text-secondary)] transition-colors hover:bg-[var(--color-surface-hover)] hover:text-[var(--color-text-primary)] disabled:cursor-not-allowed disabled:opacity-50"
+          >
+            <span className="material-symbols-outlined text-[16px]">mop</span>
+            {t('settings.terminal.clear')}
+          </button>
+          <button
+            type="button"
+            onClick={() => void startTerminal()}
+            className="inline-flex h-8 items-center gap-1.5 rounded-[var(--radius-md)] bg-[var(--color-text-primary)] px-2.5 text-xs font-medium text-[var(--color-surface)] transition-colors hover:opacity-90"
+          >
+            <span className="material-symbols-outlined text-[16px]">restart_alt</span>
+            {t('settings.terminal.restart')}
+          </button>
+        </div>
+      </div>
+
+      <div className="mb-3 flex flex-wrap items-center gap-2 text-xs text-[var(--color-text-tertiary)]">
+        <StatusPill status={status} label={t(STATUS_LABEL_KEYS[status])} />
+        {shellInfo && (
+          <>
+            <span className="font-mono">{shellInfo.shell}</span>
+            <span className="text-[var(--color-border)]">/</span>
+            <span className="min-w-0 max-w-full truncate font-mono">{shellInfo.cwd}</span>
+          </>
+        )}
+      </div>
+
+      {error && (
+        <div className="mb-3 rounded-[var(--radius-md)] border border-[var(--color-error)]/20 bg-[var(--color-error)]/10 px-3 py-2 text-sm text-[var(--color-error)]">
+          {error}
+        </div>
+      )}
+
+      {status === 'unavailable' ? (
+        <div className="flex flex-1 items-center justify-center rounded-[var(--radius-lg)] border border-dashed border-[var(--color-border)] bg-[var(--color-surface-container-low)] p-8 text-center">
+          <div>
+            <span className="material-symbols-outlined mb-3 block text-[32px] text-[var(--color-text-tertiary)]">
+              desktop_windows
+            </span>
+            <p className="text-sm font-medium text-[var(--color-text-primary)]">
+              {t('settings.terminal.unavailableTitle')}
+            </p>
+            <p className="mt-1 text-sm text-[var(--color-text-tertiary)]">
+              {t('settings.terminal.unavailableBody')}
+            </p>
+          </div>
+        </div>
+      ) : (
+        <div className="min-h-0 flex-1 overflow-hidden rounded-[var(--radius-lg)] border border-[var(--color-terminal-border)] bg-[var(--color-terminal-bg)] shadow-[var(--shadow-dropdown)]">
+          <div className="flex h-8 items-center gap-2 border-b border-[var(--color-terminal-border)] bg-[var(--color-terminal-header)] px-3">
+            <span className="h-2.5 w-2.5 rounded-full bg-[var(--color-terminal-danger)]" />
+            <span className="h-2.5 w-2.5 rounded-full bg-[var(--color-terminal-warning)]" />
+            <span className="h-2.5 w-2.5 rounded-full bg-[var(--color-terminal-accent)]" />
+            <span className="ml-2 truncate font-mono text-[11px] text-[var(--color-terminal-muted)]">
+              {t('settings.terminal.windowTitle')}
+            </span>
+          </div>
+          <div
+            ref={hostRef}
+            data-testid="settings-terminal-host"
+            className="settings-terminal-host h-[calc(100%-2rem)] w-full overflow-hidden p-2"
+          />
+        </div>
+      )}
+    </div>
+  )
+}
+
+function StatusPill({ status, label }: { status: TerminalStatus; label: string }) {
+  const color =
+    status === 'running'
+      ? 'bg-[var(--color-success)]'
+      : status === 'error'
+        ? 'bg-[var(--color-error)]'
+        : status === 'starting'
+          ? 'bg-[var(--color-warning)]'
+          : 'bg-[var(--color-text-tertiary)]'
+
+  return (
+    <span className="inline-flex h-6 items-center gap-1.5 rounded-full border border-[var(--color-border)] bg-[var(--color-surface-container-low)] px-2.5 text-[11px] font-medium text-[var(--color-text-secondary)]">
+      <span className={`h-1.5 w-1.5 rounded-full ${color}`} />
+      {label}
+    </span>
+  )
+}
diff --git a/desktop/src/stores/chatStore.test.ts b/desktop/src/stores/chatStore.test.ts
index e8d6ea68..5130efab 100644
--- a/desktop/src/stores/chatStore.test.ts
+++ b/desktop/src/stores/chatStore.test.ts
@@ -1,5 +1,6 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import type { MessageEntry } from '../types/session'
+import { useSessionRuntimeStore } from './sessionRuntimeStore'
 
 const {
   sendMock,
@@ -114,6 +115,8 @@ describe('chatStore history mapping', () => {
     refreshTasksMock.mockReset()
     cliTaskStoreSnapshot.tasks = []
     cliTaskStoreSnapshot.sessionId = null
+    useSessionRuntimeStore.setState({ selections: {} })
+    localStorage.clear()
     useChatStore.setState({
       ...initialState,
       sessions: {},
@@ -157,6 +160,30 @@ describe('chatStore history mapping', () => {
     expect(mapped[3]).toMatchObject({ parentToolUseId: 'agent-1' })
   })
 
+  it('merges consecutive assistant text blocks when restoring transcript history', () => {
+    const messages: MessageEntry[] = [
+      {
+        id: 'assistant-merge-1',
+        type: 'assistant',
+        timestamp: '2026-04-06T00:00:00.000Z',
+        model: 'opus',
+        content: [
+          { type: 'text', text: '第一段：Windows 下的桌面端输出。' },
+          { type: 'text', text: '\r\n第二段：刷新后也不应该被拆开。' },
+        ],
+      },
+    ]
+
+    const mapped = mapHistoryMessagesToUiMessages(messages)
+
+    expect(mapped).toMatchObject([
+      {
+        type: 'assistant_text',
+        content: '第一段：Windows 下的桌面端输出。\r\n第二段：刷新后也不应该被拆开。',
+      },
+    ])
+  })
+
   it('surfaces teammate prompt content when mapping member transcript history', () => {
     const messages: MessageEntry[] = [
       {
@@ -234,6 +261,75 @@ describe('chatStore history mapping', () => {
     ])
   })
 
+  it('replays saved runtime selection when reconnecting a session', () => {
+    useSessionRuntimeStore.getState().setSelection(TEST_SESSION_ID, {
+      providerId: 'provider-1',
+      modelId: 'kimi-k2.6',
+    })
+
+    useChatStore.getState().connectToSession(TEST_SESSION_ID)
+
+    expect(sendMock).toHaveBeenCalledWith(TEST_SESSION_ID, {
+      type: 'set_runtime_config',
+      providerId: 'provider-1',
+      modelId: 'kimi-k2.6',
+    })
+    expect(sendMock.mock.calls.slice(0, 2)).toEqual([
+      [
+        TEST_SESSION_ID,
+        {
+          type: 'set_runtime_config',
+          providerId: 'provider-1',
+          modelId: 'kimi-k2.6',
+        },
+      ],
+      [TEST_SESSION_ID, { type: 'prewarm_session' }],
+    ])
+  })
+
+  it('prewarms regular desktop sessions when connecting', () => {
+    useChatStore.getState().connectToSession(TEST_SESSION_ID)
+
+    expect(sendMock).toHaveBeenCalledWith(TEST_SESSION_ID, {
+      type: 'prewarm_session',
+    })
+  })
+
+  it('does not prewarm team member sessions', () => {
+    getMemberBySessionIdMock.mockReturnValue({
+      agentId: 'reviewer@test-team',
+      role: 'reviewer',
+      status: 'running',
+    })
+
+    useChatStore.getState().connectToSession(TEST_SESSION_ID)
+
+    expect(sendMock).not.toHaveBeenCalledWith(TEST_SESSION_ID, {
+      type: 'prewarm_session',
+    })
+  })
+
+  it('does not prewarm synthetic app tabs', () => {
+    useChatStore.getState().connectToSession('__settings__')
+
+    expect(sendMock).not.toHaveBeenCalledWith('__settings__', {
+      type: 'prewarm_session',
+    })
+  })
+
+  it('sends explicit runtime overrides over websocket', () => {
+    useChatStore.getState().setSessionRuntime(TEST_SESSION_ID, {
+      providerId: null,
+      modelId: 'claude-opus-4-7',
+    })
+
+    expect(sendMock).toHaveBeenCalledWith(TEST_SESSION_ID, {
+      type: 'set_runtime_config',
+      providerId: null,
+      modelId: 'claude-opus-4-7',
+    })
+  })
+
   it('keeps AskUserQuestion permission requests out of the message list while tracking the pending request', () => {
     useChatStore.setState({
       sessions: {
@@ -532,6 +628,133 @@ describe('chatStore history mapping', () => {
     ).toBe('permission_pending')
   })
 
+  it('keeps delayed text blocks from one streamed assistant turn in a single message', () => {
+    vi.useFakeTimers()
+
+    useChatStore.setState({
+      sessions: {
+        [TEST_SESSION_ID]: {
+          messages: [],
+          chatState: 'idle',
+          connectionState: 'connected',
+          streamingText: '',
+          streamingToolInput: '',
+          activeToolUseId: null,
+          activeToolName: null,
+          activeThinkingId: null,
+          pendingPermission: null,
+          pendingComputerUsePermission: null,
+          tokenUsage: { input_tokens: 0, output_tokens: 0 },
+          elapsedSeconds: 0,
+          statusVerb: '',
+          slashCommands: [],
+          agentTaskNotifications: {},
+          elapsedTimer: null,
+        },
+      },
+    })
+
+    useChatStore.getState().handleServerMessage(TEST_SESSION_ID, {
+      type: 'content_start',
+      blockType: 'text',
+    })
+    useChatStore.getState().handleServerMessage(TEST_SESSION_ID, {
+      type: 'content_delta',
+      text: '第一段：先到达。',
+    })
+    vi.advanceTimersByTime(60)
+
+    useChatStore.getState().handleServerMessage(TEST_SESSION_ID, {
+      type: 'content_start',
+      blockType: 'text',
+    })
+    useChatStore.getState().handleServerMessage(TEST_SESSION_ID, {
+      type: 'content_delta',
+      text: '\r\n第二段：稍后到达，但仍属于同一轮回复。',
+    })
+    vi.advanceTimersByTime(60)
+
+    useChatStore.getState().handleServerMessage(TEST_SESSION_ID, {
+      type: 'message_complete',
+      usage: { input_tokens: 1, output_tokens: 2 },
+    })
+
+    expect(useChatStore.getState().sessions[TEST_SESSION_ID]?.messages).toMatchObject([
+      {
+        type: 'assistant_text',
+        content: '第一段：先到达。\r\n第二段：稍后到达，但仍属于同一轮回复。',
+      },
+    ])
+
+    vi.runOnlyPendingTimers()
+    vi.useRealTimers()
+  })
+
+  it('does not split one streamed markdown reply when task progress arrives mid-stream', () => {
+    vi.useFakeTimers()
+
+    useChatStore.setState({
+      sessions: {
+        [TEST_SESSION_ID]: {
+          messages: [],
+          chatState: 'idle',
+          connectionState: 'connected',
+          streamingText: '',
+          streamingToolInput: '',
+          activeToolUseId: null,
+          activeToolName: null,
+          activeThinkingId: null,
+          pendingPermission: null,
+          pendingComputerUsePermission: null,
+          tokenUsage: { input_tokens: 0, output_tokens: 0 },
+          elapsedSeconds: 0,
+          statusVerb: '',
+          slashCommands: [],
+          agentTaskNotifications: {},
+          elapsedTimer: null,
+        },
+      },
+    })
+
+    useChatStore.getState().handleServerMessage(TEST_SESSION_ID, {
+      type: 'content_start',
+      blockType: 'text',
+    })
+    useChatStore.getState().handleServerMessage(TEST_SESSION_ID, {
+      type: 'content_delta',
+      text: '1. **`core/audio/waveform.py:19-31`** — 同步阻塞 I/O。',
+    })
+    vi.advanceTimersByTime(60)
+
+    useChatStore.getState().handleServerMessage(TEST_SESSION_ID, {
+      type: 'status',
+      state: 'tool_executing',
+      verb: 'Task in progress',
+    })
+
+    useChatStore.getState().handleServerMessage(TEST_SESSION_ID, {
+      type: 'content_delta',
+      text: ' 建议直接用 `subprocess.PIPE` 流式处理。',
+    })
+    vi.advanceTimersByTime(60)
+
+    useChatStore.getState().handleServerMessage(TEST_SESSION_ID, {
+      type: 'message_complete',
+      usage: { input_tokens: 1, output_tokens: 2 },
+    })
+
+    expect(useChatStore.getState().sessions[TEST_SESSION_ID]?.messages).toMatchObject([
+      {
+        type: 'assistant_text',
+        content:
+          '1. **`core/audio/waveform.py:19-31`** — 同步阻塞 I/O。 建议直接用 `subprocess.PIPE` 流式处理。',
+      },
+    ])
+
+    vi.runOnlyPendingTimers()
+    vi.useRealTimers()
+  })
+
   it('sends Computer Use approval payloads back over websocket', () => {
     useChatStore.setState({
       sessions: {
diff --git a/desktop/src/stores/chatStore.ts b/desktop/src/stores/chatStore.ts
index 94d87f38..357466c8 100644
--- a/desktop/src/stores/chatStore.ts
+++ b/desktop/src/stores/chatStore.ts
@@ -4,11 +4,13 @@ import { sessionsApi } from '../api/sessions'
 import { useTeamStore } from './teamStore'
 import { useSessionStore } from './sessionStore'
 import { useCLITaskStore } from './cliTaskStore'
+import { useSessionRuntimeStore } from './sessionRuntimeStore'
 import { useTabStore } from './tabStore'
 import { randomSpinnerVerb } from '../config/spinnerVerbs'
 import { AGENT_LIFECYCLE_TYPES } from '../types/team'
 import type { MessageEntry } from '../types/session'
 import type { PermissionMode } from '../types/settings'
+import type { RuntimeSelection } from '../types/runtime'
 import type {
   AgentTaskNotification,
   AttachmentRef,
@@ -106,6 +108,7 @@ type ChatStore = {
     requestId: string,
     response: ComputerUsePermissionResponse,
   ) => void
+  setSessionRuntime: (sessionId: string, selection: RuntimeSelection) => void
   setSessionPermissionMode: (sessionId: string, mode: PermissionMode) => void
   stopGeneration: (sessionId: string) => void
   loadHistory: (sessionId: string) => Promise<void>
@@ -128,6 +131,46 @@ const nextId = () => `msg-${++msgCounter}-${Date.now()}`
 let pendingDelta = ''
 let flushTimer: ReturnType<typeof setTimeout> | null = null
 
+function consumePendingDelta(): string {
+  if (flushTimer) {
+    clearTimeout(flushTimer)
+    flushTimer = null
+  }
+  const text = pendingDelta
+  pendingDelta = ''
+  return text
+}
+
+function appendAssistantTextMessage(
+  messages: UIMessage[],
+  content: string,
+  timestamp: number,
+  model?: string,
+): UIMessage[] {
+  if (!content.trim()) return messages
+
+  const last = messages[messages.length - 1]
+  if (last?.type === 'assistant_text') {
+    const merged: UIMessage = {
+      ...last,
+      content: last.content + content,
+      ...(model ?? last.model ? { model: model ?? last.model } : {}),
+    }
+    return [...messages.slice(0, -1), merged]
+  }
+
+  return [
+    ...messages,
+    {
+      id: nextId(),
+      type: 'assistant_text',
+      content,
+      timestamp,
+      ...(model ? { model } : {}),
+    },
+  ]
+}
+
 /** Helper: immutably update a specific session within the sessions record */
 function updateSessionIn(
   sessions: Record<string, PerSessionState>,
@@ -181,6 +224,14 @@ export const useChatStore = create<ChatStore>((set, get) => ({
       get().handleServerMessage(sessionId, msg)
     })
 
+    const runtimeSelection = useSessionRuntimeStore.getState().selections[sessionId]
+    if (runtimeSelection) {
+      wsManager.send(sessionId, { type: 'set_runtime_config', ...runtimeSelection })
+    }
+    if (!sessionId.startsWith('__') && !useTeamStore.getState().getMemberBySessionId(sessionId)) {
+      wsManager.send(sessionId, { type: 'prewarm_session' })
+    }
+
     get().loadHistory(sessionId)
     sessionsApi.getSlashCommands(sessionId)
       .then(({ commands }) => {
@@ -200,8 +251,7 @@ export const useChatStore = create<ChatStore>((set, get) => ({
     if (session?.elapsedTimer) clearInterval(session.elapsedTimer)
     if (flushTimer) { clearTimeout(flushTimer); flushTimer = null }
     if (pendingDelta) {
-      const text = pendingDelta
-      pendingDelta = ''
+      const text = consumePendingDelta()
       set((s) => ({ sessions: updateSessionIn(s.sessions, sessionId, (sess) => ({ streamingText: sess.streamingText + text })) }))
     }
     wsManager.disconnect(sessionId)
@@ -241,20 +291,11 @@ export const useChatStore = create<ChatStore>((set, get) => ({
         clearTimeout(flushTimer)
         flushTimer = null
       }
-      const bufferedDelta = pendingDelta
-      pendingDelta = ''
-      const pendingAssistantText = `${session.streamingText}${bufferedDelta}`.trim()
+      const bufferedDelta = consumePendingDelta()
+      const pendingAssistantText = `${session.streamingText}${bufferedDelta}`
 
-      const newMessages = pendingAssistantText
-        ? [
-            ...session.messages,
-            {
-              id: nextId(),
-              type: 'assistant_text' as const,
-              content: pendingAssistantText,
-              timestamp: Date.now(),
-            },
-          ]
+      const newMessages = pendingAssistantText.trim()
+        ? appendAssistantTextMessage(session.messages, pendingAssistantText, Date.now())
         : [...session.messages]
       if (!isMemberSession && allTasksDone) {
         newMessages.push({
@@ -348,6 +389,13 @@ export const useChatStore = create<ChatStore>((set, get) => ({
     }))
   },
 
+  setSessionRuntime: (sessionId, selection) => {
+    wsManager.send(sessionId, {
+      type: 'set_runtime_config',
+      ...selection,
+    })
+  },
+
   setSessionPermissionMode: (sessionId, mode) => {
     if (!get().sessions[sessionId]) return
     wsManager.send(sessionId, { type: 'set_permission_mode', mode })
@@ -357,8 +405,7 @@ export const useChatStore = create<ChatStore>((set, get) => ({
     wsManager.send(sessionId, { type: 'stop_generation' })
     if (flushTimer) { clearTimeout(flushTimer); flushTimer = null }
     if (pendingDelta) {
-      const text = pendingDelta
-      pendingDelta = ''
+      const text = consumePendingDelta()
       set((s) => ({ sessions: updateSessionIn(s.sessions, sessionId, (sess) => ({ streamingText: sess.streamingText + text })) }))
     }
     set((s) => {
@@ -481,17 +528,24 @@ export const useChatStore = create<ChatStore>((set, get) => ({
 
       case 'status':
         update((session) => {
-          const pendingText = session.streamingText.trim()
-          const shouldFlush = pendingText && session.chatState === 'streaming' && msg.state !== 'streaming'
+          const pendingText = `${session.streamingText}${consumePendingDelta()}`
+          const hasPendingStreamText =
+            session.chatState === 'streaming' && pendingText.trim().length > 0
+          // Background task progress can arrive while the assistant is still
+          // streaming one markdown reply. Keep that turn intact so we do not
+          // split formatting markers (for example backticks/strong markers)
+          // across separate bubbles.
+          const preserveStreamingTurn = hasPendingStreamText && msg.state !== 'idle'
+          const shouldFlush = hasPendingStreamText && msg.state === 'idle'
           return {
-            chatState: msg.state,
+            chatState: preserveStreamingTurn ? 'streaming' : msg.state,
             ...(msg.verb && msg.verb !== 'Thinking' ? { statusVerb: msg.verb } : {}),
             ...(msg.tokens ? { tokenUsage: { ...session.tokenUsage, output_tokens: msg.tokens } } : {}),
             ...(msg.state === 'idle' ? { activeThinkingId: null, statusVerb: '' } : {}),
             ...(shouldFlush ? {
-              messages: [...session.messages, { id: nextId(), type: 'assistant_text' as const, content: pendingText, timestamp: Date.now() }],
+              messages: appendAssistantTextMessage(session.messages, pendingText, Date.now()),
               streamingText: '',
-            } : {}),
+            } : pendingText !== session.streamingText ? { streamingText: pendingText } : {}),
           }
         })
         if (msg.state === 'idle') {
@@ -508,15 +562,19 @@ export const useChatStore = create<ChatStore>((set, get) => ({
       case 'content_start': {
         const session = get().sessions[sessionId]
         if (!session) break
-        const pendingText = session.streamingText.trim()
-        if (pendingText) {
+        const pendingText = `${session.streamingText}${consumePendingDelta()}`
+        if (msg.blockType !== 'text' && pendingText.trim()) {
           update((s) => ({
-            messages: [...s.messages, { id: nextId(), type: 'assistant_text' as const, content: pendingText, timestamp: Date.now() }],
+            messages: appendAssistantTextMessage(s.messages, pendingText, Date.now()),
             streamingText: '',
           }))
         }
         if (msg.blockType === 'text') {
-          update(() => ({ streamingText: '', chatState: 'streaming', activeThinkingId: null }))
+          update((s) => ({
+            ...(pendingText !== s.streamingText ? { streamingText: pendingText } : {}),
+            chatState: 'streaming',
+            activeThinkingId: null,
+          }))
         } else if (msg.blockType === 'tool_use') {
           update(() => ({
             activeToolUseId: msg.toolUseId ?? null,
@@ -546,9 +604,9 @@ export const useChatStore = create<ChatStore>((set, get) => ({
 
       case 'thinking':
         update((s) => {
-          const pendingText = s.streamingText.trim()
-          const base = pendingText
-            ? [...s.messages, { id: nextId(), type: 'assistant_text' as const, content: pendingText, timestamp: Date.now() }]
+          const pendingText = `${s.streamingText}${consumePendingDelta()}`
+          const base = pendingText.trim()
+            ? appendAssistantTextMessage(s.messages, pendingText, Date.now())
             : s.messages
           const last = base[base.length - 1]
           if (last && last.type === 'thinking') {
@@ -643,12 +701,14 @@ export const useChatStore = create<ChatStore>((set, get) => ({
       case 'message_complete': {
         const session = get().sessions[sessionId]
         if (!session) break
-        const text = session.streamingText
-        if (text) {
+        const text = `${session.streamingText}${consumePendingDelta()}`
+        if (text.trim()) {
           update((s) => ({
-            messages: [...s.messages, { id: nextId(), type: 'assistant_text', content: text, timestamp: Date.now() }],
+            messages: appendAssistantTextMessage(s.messages, text, Date.now()),
             streamingText: '',
           }))
+        } else if (text !== session.streamingText) {
+          update(() => ({ streamingText: text }))
         }
         if (session.elapsedTimer) clearInterval(session.elapsedTimer)
         update(() => ({
@@ -664,12 +724,12 @@ export const useChatStore = create<ChatStore>((set, get) => ({
 
       case 'error':
         update((s) => {
-          const pendingText = s.streamingText.trim()
-          const newMessages = [...s.messages]
-          if (pendingText) {
-            newMessages.push({ id: nextId(), type: 'assistant_text' as const, content: pendingText, timestamp: Date.now() })
+          const pendingText = `${s.streamingText}${consumePendingDelta()}`
+          let newMessages = s.messages
+          if (pendingText.trim()) {
+            newMessages = appendAssistantTextMessage(newMessages, pendingText, Date.now())
           }
-          newMessages.push({ id: nextId(), type: 'error', message: msg.message, code: msg.code, timestamp: Date.now() })
+          newMessages = [...newMessages, { id: nextId(), type: 'error', message: msg.message, code: msg.code, timestamp: Date.now() }]
           return {
             messages: newMessages,
             chatState: 'idle',
@@ -791,6 +851,30 @@ function extractVisibleTeammateMessageContents(text: string): string[] {
   return contents
 }
 
+function pushAssistantHistoryText(
+  messages: UIMessage[],
+  content: string,
+  timestamp: number,
+  model?: string,
+): void {
+  if (!content.trim()) return
+
+  const last = messages[messages.length - 1]
+  if (last?.type === 'assistant_text') {
+    last.content += content
+    if (model && !last.model) last.model = model
+    return
+  }
+
+  messages.push({
+    id: nextId(),
+    type: 'assistant_text',
+    content,
+    timestamp,
+    ...(model ? { model } : {}),
+  })
+}
+
 type HistoryMappingOptions = {
   includeTeammateMessages?: boolean
 }
@@ -900,7 +984,7 @@ export function mapHistoryMessagesToUiMessages(
     if ((msg.type === 'assistant' || msg.type === 'tool_use') && Array.isArray(msg.content)) {
       for (const block of msg.content as AssistantHistoryBlock[]) {
         if (block.type === 'thinking' && block.thinking) uiMessages.push({ id: nextId(), type: 'thinking', content: block.thinking, timestamp })
-        else if (block.type === 'text' && block.text) uiMessages.push({ id: nextId(), type: 'assistant_text', content: block.text, timestamp, model: msg.model })
+        else if (block.type === 'text' && block.text) pushAssistantHistoryText(uiMessages, block.text, timestamp, msg.model)
         else if (block.type === 'tool_use') uiMessages.push({ id: nextId(), type: 'tool_use', toolName: block.name ?? 'unknown', toolUseId: block.id ?? '', input: block.input, timestamp, parentToolUseId: msg.parentToolUseId })
       }
       continue
diff --git a/desktop/src/stores/mcpStore.ts b/desktop/src/stores/mcpStore.ts
index 18770e42..905848f0 100644
--- a/desktop/src/stores/mcpStore.ts
+++ b/desktop/src/stores/mcpStore.ts
@@ -9,17 +9,49 @@ type McpStore = {
   error: string | null
   fetchServers: (projectPaths?: string[], fallbackCwd?: string) => Promise<void>
   createServer: (name: string, payload: McpUpsertPayload, cwd?: string) => Promise<McpServerRecord>
-  updateServer: (name: string, payload: McpUpsertPayload, cwd?: string) => Promise<McpServerRecord>
-  deleteServer: (name: string, scope: string, cwd?: string) => Promise<void>
-  toggleServer: (name: string, cwd?: string) => Promise<McpServerRecord>
-  reconnectServer: (name: string, cwd?: string) => Promise<McpServerRecord>
+  updateServer: (server: McpServerRecord, payload: McpUpsertPayload, cwd?: string) => Promise<McpServerRecord>
+  deleteServer: (server: McpServerRecord, cwd?: string) => Promise<void>
+  toggleServer: (server: McpServerRecord, cwd?: string) => Promise<McpServerRecord>
+  reconnectServer: (server: McpServerRecord, cwd?: string) => Promise<McpServerRecord>
+  refreshServerStatus: (server: McpServerRecord, cwd?: string) => Promise<McpServerRecord>
   selectServer: (server: McpServerRecord | null) => void
 }
 
-function upsertByName(servers: McpServerRecord[], server: McpServerRecord) {
-  const index = servers.findIndex((item) => item.name === server.name)
-  if (index === -1) return [...servers, server]
-  return servers.map((item, itemIndex) => (itemIndex === index ? server : item))
+function isProjectScoped(server: Pick<McpServerRecord, 'scope'>) {
+  return server.scope === 'local' || server.scope === 'project'
+}
+
+function attachProjectPath(server: McpServerRecord, cwd?: string) {
+  if (!isProjectScoped(server)) {
+    return {
+      ...server,
+      projectPath: undefined,
+    }
+  }
+
+  return {
+    ...server,
+    projectPath: cwd ?? server.projectPath,
+  }
+}
+
+function isSameServer(a: Pick<McpServerRecord, 'name' | 'scope' | 'projectPath'>, b: Pick<McpServerRecord, 'name' | 'scope' | 'projectPath'>) {
+  if (a.name !== b.name || a.scope !== b.scope) return false
+  if (!isProjectScoped(a) && !isProjectScoped(b)) return true
+  return (a.projectPath ?? '') === (b.projectPath ?? '')
+}
+
+function replaceServer(
+  servers: McpServerRecord[],
+  previous: Pick<McpServerRecord, 'name' | 'scope' | 'projectPath'>,
+  next: McpServerRecord,
+  cwd?: string,
+) {
+  const normalizedNext = attachProjectPath(next, cwd)
+  const index = servers.findIndex((item) => isSameServer(item, previous))
+  if (index === -1) return [...servers, normalizedNext]
+
+  return servers.map((item, itemIndex) => (itemIndex === index ? normalizedNext : item))
 }
 
 export const useMcpStore = create<McpStore>((set) => ({
@@ -68,57 +100,69 @@ export const useMcpStore = create<McpStore>((set) => ({
 
   createServer: async (name, payload, cwd) => {
     const response = await mcpApi.create(name, payload, cwd)
+    const created = attachProjectPath(response.server, cwd)
     set((state) => ({
-      servers: [...state.servers, response.server],
-      selectedServer: response.server,
+      servers: [...state.servers, created],
+      selectedServer: created,
       error: null,
     }))
-    return response.server
+    return created
   },
 
-  updateServer: async (name, payload, cwd) => {
-    const response = await mcpApi.update(name, payload, cwd)
+  updateServer: async (server, payload, cwd) => {
+    const response = await mcpApi.update(server.name, payload, cwd)
+    const updated = attachProjectPath(response.server, cwd ?? server.projectPath)
     set((state) => ({
-      servers: upsertByName(
-        state.servers.filter((server) => server.name !== name),
-        response.server,
-      ),
-      selectedServer: response.server,
+      servers: replaceServer(state.servers, server, updated, cwd ?? server.projectPath),
+      selectedServer: state.selectedServer && isSameServer(state.selectedServer, server) ? updated : state.selectedServer,
       error: null,
     }))
-    return response.server
+    return updated
   },
 
-  deleteServer: async (name, scope, cwd) => {
-    await mcpApi.remove(name, scope, cwd)
+  deleteServer: async (server, cwd) => {
+    await mcpApi.remove(server.name, server.scope, cwd)
     set((state) => ({
-      servers: state.servers.filter((server) => !(server.name === name && server.scope === scope && (server.projectPath ?? '') === (cwd ?? ''))),
+      servers: state.servers.filter((item) => !isSameServer(item, server)),
       selectedServer:
-        state.selectedServer?.name === name && state.selectedServer?.scope === scope
+        state.selectedServer && isSameServer(state.selectedServer, server)
           ? null
           : state.selectedServer,
       error: null,
     }))
   },
 
-  toggleServer: async (name, cwd) => {
-    const response = await mcpApi.toggle(name, cwd)
+  toggleServer: async (server, cwd) => {
+    const response = await mcpApi.toggle(server.name, cwd)
+    const updated = attachProjectPath(response.server, cwd ?? server.projectPath)
     set((state) => ({
-      servers: upsertByName(state.servers, response.server),
-      selectedServer: state.selectedServer?.name === name ? response.server : state.selectedServer,
+      servers: replaceServer(state.servers, server, updated, cwd ?? server.projectPath),
+      selectedServer: state.selectedServer && isSameServer(state.selectedServer, server) ? updated : state.selectedServer,
       error: null,
     }))
-    return response.server
+    return updated
   },
 
-  reconnectServer: async (name, cwd) => {
-    const response = await mcpApi.reconnect(name, cwd)
+  reconnectServer: async (server, cwd) => {
+    const response = await mcpApi.reconnect(server.name, cwd)
+    const updated = attachProjectPath(response.server, cwd ?? server.projectPath)
     set((state) => ({
-      servers: upsertByName(state.servers, response.server),
-      selectedServer: state.selectedServer?.name === name ? response.server : state.selectedServer,
+      servers: replaceServer(state.servers, server, updated, cwd ?? server.projectPath),
+      selectedServer: state.selectedServer && isSameServer(state.selectedServer, server) ? updated : state.selectedServer,
       error: null,
     }))
-    return response.server
+    return updated
+  },
+
+  refreshServerStatus: async (server, cwd) => {
+    const response = await mcpApi.status(server.name, cwd)
+    const updated = attachProjectPath(response.server, cwd ?? server.projectPath)
+    set((state) => ({
+      servers: replaceServer(state.servers, server, updated, cwd ?? server.projectPath),
+      selectedServer: state.selectedServer && isSameServer(state.selectedServer, server) ? updated : state.selectedServer,
+      error: null,
+    }))
+    return updated
   },
 
   selectServer: (server) => set({ selectedServer: server }),
diff --git a/desktop/src/stores/providerStore.ts b/desktop/src/stores/providerStore.ts
index 82db219d..e4214d33 100644
--- a/desktop/src/stores/providerStore.ts
+++ b/desktop/src/stores/providerStore.ts
@@ -3,6 +3,7 @@
 import { create } from 'zustand'
 import { providersApi } from '../api/providers'
 import { useSettingsStore } from './settingsStore'
+import { OFFICIAL_DEFAULT_MODEL_ID } from '../constants/modelCatalog'
 import type {
   SavedProvider,
   CreateProviderInput,
@@ -10,19 +11,18 @@ import type {
   TestProviderConfigInput,
   ProviderTestResult,
 } from '../types/provider'
-
-// 与后端 src/server/api/models.ts 的 DEFAULT_MODEL 保持一致:
-// 切回"官方"时把聊天页的 currentModel 重置到这个,避免残留第三方 provider
-// 的 model id 在官方模型列表里找不到、ModelSelector 显示但不选中的状态。
-const OFFICIAL_DEFAULT_MODEL_ID = 'claude-opus-4-7'
+import type { ProviderPreset } from '../types/providerPreset'
 
 type ProviderStore = {
   providers: SavedProvider[]
   activeId: string | null
+  presets: ProviderPreset[]
   isLoading: boolean
+  isPresetsLoading: boolean
   error: string | null
 
   fetchProviders: () => Promise<void>
+  fetchPresets: () => Promise<void>
   createProvider: (input: CreateProviderInput) => Promise<SavedProvider>
   updateProvider: (id: string, input: UpdateProviderInput) => Promise<SavedProvider>
   deleteProvider: (id: string) => Promise<void>
@@ -35,7 +35,9 @@ type ProviderStore = {
 export const useProviderStore = create<ProviderStore>((set, get) => ({
   providers: [],
   activeId: null,
+  presets: [],
   isLoading: false,
+  isPresetsLoading: false,
   error: null,
 
   fetchProviders: async () => {
@@ -48,6 +50,16 @@ export const useProviderStore = create<ProviderStore>((set, get) => ({
     }
   },
 
+  fetchPresets: async () => {
+    set({ isPresetsLoading: true, error: null })
+    try {
+      const { presets } = await providersApi.presets()
+      set({ presets, isPresetsLoading: false })
+    } catch (err) {
+      set({ isPresetsLoading: false, error: err instanceof Error ? err.message : String(err) })
+    }
+  },
+
   createProvider: async (input) => {
     const { provider } = await providersApi.create(input)
     await get().fetchProviders()
@@ -68,10 +80,8 @@ export const useProviderStore = create<ProviderStore>((set, get) => ({
   activateProvider: async (id) => {
     await providersApi.activate(id)
     await get().fetchProviders()
-    // 联动聊天页:把 currentModel 重置到新 provider 的 main model。
-    // 不这么做的话,用户在切换前手动选过的 model id (写进了 settings.json 的
-    // `model` 字段) 会继续被后端当作 explicit 返回,但新 provider 的模型列表
-    // 里没这个 id, ModelSelector 会卡在"显示旧名字 + radio 不选中"。
+    // 更新默认 provider 时，同步刷新默认 model，避免 settings.json 里残留
+    // 旧 provider 的 model id 导致默认选择指向不存在的模型。
     const provider = get().providers.find((p) => p.id === id)
     if (provider) {
       const settings = useSettingsStore.getState()
@@ -83,7 +93,7 @@ export const useProviderStore = create<ProviderStore>((set, get) => ({
   activateOfficial: async () => {
     await providersApi.activateOfficial()
     await get().fetchProviders()
-    // 切回官方时同样重置 currentModel,避免残留第三方 model id。
+    // 切回官方默认时同样重置 currentModel，避免残留第三方 model id。
     const settings = useSettingsStore.getState()
     await settings.setModel(OFFICIAL_DEFAULT_MODEL_ID)
     await settings.fetchAll()
diff --git a/desktop/src/stores/sessionRuntimeStore.ts b/desktop/src/stores/sessionRuntimeStore.ts
new file mode 100644
index 00000000..0a0baee7
--- /dev/null
+++ b/desktop/src/stores/sessionRuntimeStore.ts
@@ -0,0 +1,69 @@
+import { create } from 'zustand'
+import type { RuntimeSelection } from '../types/runtime'
+
+const STORAGE_KEY = 'cc-haha-session-runtime'
+
+export const DRAFT_RUNTIME_SELECTION_KEY = '__draft__'
+
+type SessionRuntimeStore = {
+  selections: Record<string, RuntimeSelection>
+  setSelection: (key: string, selection: RuntimeSelection) => void
+  clearSelection: (key: string) => void
+  moveSelection: (fromKey: string, toKey: string) => void
+}
+
+function loadSelections(): Record<string, RuntimeSelection> {
+  if (typeof localStorage === 'undefined') return {}
+  try {
+    const raw = localStorage.getItem(STORAGE_KEY)
+    if (!raw) return {}
+    const parsed = JSON.parse(raw) as Record<string, RuntimeSelection>
+    return parsed && typeof parsed === 'object' ? parsed : {}
+  } catch {
+    return {}
+  }
+}
+
+function persistSelections(selections: Record<string, RuntimeSelection>) {
+  if (typeof localStorage === 'undefined') return
+  try {
+    localStorage.setItem(STORAGE_KEY, JSON.stringify(selections))
+  } catch {
+    // noop
+  }
+}
+
+export const useSessionRuntimeStore = create<SessionRuntimeStore>((set) => ({
+  selections: loadSelections(),
+
+  setSelection: (key, selection) =>
+    set((state) => {
+      const selections = {
+        ...state.selections,
+        [key]: selection,
+      }
+      persistSelections(selections)
+      return { selections }
+    }),
+
+  clearSelection: (key) =>
+    set((state) => {
+      if (!(key in state.selections)) return state
+      const { [key]: _removed, ...rest } = state.selections
+      persistSelections(rest)
+      return { selections: rest }
+    }),
+
+  moveSelection: (fromKey, toKey) =>
+    set((state) => {
+      const selection = state.selections[fromKey]
+      if (!selection) return state
+      const { [fromKey]: _removed, ...rest } = state.selections
+      const selections = {
+        ...rest,
+        [toKey]: selection,
+      }
+      persistSelections(selections)
+      return { selections }
+    }),
+}))
diff --git a/desktop/src/stores/sessionStore.ts b/desktop/src/stores/sessionStore.ts
index 82fc405b..8f395e37 100644
--- a/desktop/src/stores/sessionStore.ts
+++ b/desktop/src/stores/sessionStore.ts
@@ -1,5 +1,6 @@
 import { create } from 'zustand'
 import { sessionsApi } from '../api/sessions'
+import { useSessionRuntimeStore } from './sessionRuntimeStore'
 import type { SessionListItem } from '../types/session'
 
 type SessionStore = {
@@ -74,6 +75,7 @@ export const useSessionStore = create<SessionStore>((set, get) => ({
 
   deleteSession: async (id: string) => {
     await sessionsApi.delete(id)
+    useSessionRuntimeStore.getState().clearSelection(id)
     set((s) => ({
       sessions: s.sessions.filter((session) => session.id !== id),
       activeSessionId: s.activeSessionId === id ? null : s.activeSessionId,
diff --git a/desktop/src/stores/settingsStore.test.ts b/desktop/src/stores/settingsStore.test.ts
new file mode 100644
index 00000000..02a57ada
--- /dev/null
+++ b/desktop/src/stores/settingsStore.test.ts
@@ -0,0 +1,22 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+describe('settingsStore locale defaults', () => {
+  beforeEach(() => {
+    vi.resetModules()
+    window.localStorage.clear()
+  })
+
+  it('defaults to Chinese when no locale is stored', async () => {
+    const { useSettingsStore } = await import('./settingsStore')
+
+    expect(useSettingsStore.getState().locale).toBe('zh')
+  })
+
+  it('keeps a stored locale override', async () => {
+    window.localStorage.setItem('cc-haha-locale', 'en')
+
+    const { useSettingsStore } = await import('./settingsStore')
+
+    expect(useSettingsStore.getState().locale).toBe('en')
+  })
+})
diff --git a/desktop/src/stores/settingsStore.ts b/desktop/src/stores/settingsStore.ts
index 2fa8f56e..3613287d 100644
--- a/desktop/src/stores/settingsStore.ts
+++ b/desktop/src/stores/settingsStore.ts
@@ -12,7 +12,7 @@ function getStoredLocale(): Locale {
     const stored = localStorage.getItem(LOCALE_STORAGE_KEY)
     if (stored === 'en' || stored === 'zh') return stored
   } catch { /* localStorage unavailable */ }
-  return 'en'
+  return 'zh'
 }
 
 type SettingsStore = {
diff --git a/desktop/src/stores/uiStore.ts b/desktop/src/stores/uiStore.ts
index 89865566..1e0b91eb 100644
--- a/desktop/src/stores/uiStore.ts
+++ b/desktop/src/stores/uiStore.ts
@@ -33,7 +33,7 @@ export type SettingsTab =
   | 'permissions'
   | 'general'
   | 'adapters'
-  | 'install'
+  | 'terminal'
   | 'mcp'
   | 'agents'
   | 'skills'
diff --git a/desktop/src/theme/globals.css b/desktop/src/theme/globals.css
index 57f11120..a9c4c085 100644
--- a/desktop/src/theme/globals.css
+++ b/desktop/src/theme/globals.css
@@ -1,4 +1,5 @@
 @import "tailwindcss";
+@import "@xterm/xterm/css/xterm.css";
 @plugin "@tailwindcss/typography";
 
 /* ─── Self-hosted fonts (no Google CDN dependency) ────────────── */
@@ -94,6 +95,19 @@
   --line-numbers-font-size: 11px;
 }
 
+.settings-terminal-host .xterm {
+  height: 100%;
+  padding: 0;
+}
+
+.settings-terminal-host .xterm-viewport {
+  scrollbar-color: rgba(215, 210, 208, 0.35) transparent;
+}
+
+.settings-terminal-host .xterm-screen {
+  outline: none;
+}
+
 /* ─── Tailwind Theme Override (matches prototype design system) ─── */
 @theme {
   --color-primary: #8F482F;
@@ -159,6 +173,15 @@
   --color-surface-sidebar: var(--color-surface-container-low);
   --color-surface-hover: var(--color-surface-container-high);
   --color-surface-selected: var(--color-surface-container);
+  --color-sidebar-filter-bg: transparent;
+  --color-sidebar-filter-border: rgba(218, 193, 186, 0.92);
+  --color-sidebar-filter-icon-bg: transparent;
+  --color-sidebar-search-bg: rgba(255, 255, 255, 0.78);
+  --color-sidebar-search-border: rgba(218, 193, 186, 0.88);
+  --color-sidebar-item-hover: rgba(239, 238, 234, 0.82);
+  --color-sidebar-item-active: rgba(239, 238, 234, 0.94);
+  --color-sidebar-item-active-border: rgba(143, 72, 47, 0.12);
+  --sidebar-panel-bg-image: none;
 
   /* Border aliases */
   --color-border: var(--color-outline-variant);
@@ -179,6 +202,7 @@
 
   /* Shadows */
   --shadow-dropdown: 0 4px 20px rgba(27, 28, 26, 0.04), 0 12px 40px rgba(27, 28, 26, 0.08);
+  --shadow-sidebar-filter: none;
   --shadow-focus-ring: 0 0 0 1px rgba(143, 72, 47, 0.16);
   --shadow-error-ring: 0 0 0 1px rgba(186, 26, 26, 0.18);
   --shadow-button-primary: 0 8px 24px rgba(143, 72, 47, 0.18);
@@ -290,9 +314,20 @@
   --color-success: #7EDB8B;
   --color-warning: #F7C46C;
 
-  --color-surface-sidebar: var(--color-surface-container-low);
+  --color-surface-sidebar: #171615;
   --color-surface-hover: var(--color-surface-container-highest);
   --color-surface-selected: var(--color-surface-container);
+  --color-sidebar-filter-bg: rgba(255, 255, 255, 0.01);
+  --color-sidebar-filter-border: rgba(255, 255, 255, 0.08);
+  --color-sidebar-filter-icon-bg: transparent;
+  --color-sidebar-search-bg: rgba(255, 255, 255, 0.03);
+  --color-sidebar-search-border: rgba(255, 255, 255, 0.06);
+  --color-sidebar-item-hover: rgba(255, 255, 255, 0.04);
+  --color-sidebar-item-active: rgba(255, 255, 255, 0.06);
+  --color-sidebar-item-active-border: rgba(255, 181, 159, 0.14);
+  --sidebar-panel-bg-image:
+    radial-gradient(circle at top left, rgba(255, 181, 159, 0.045), transparent 34%),
+    linear-gradient(180deg, rgba(255, 255, 255, 0.02), rgba(255, 255, 255, 0));
 
   --color-border: rgba(90, 65, 56, 0.18);
   --color-border-focus: rgba(255, 181, 159, 0.55);
@@ -306,7 +341,8 @@
   --color-brand: var(--color-primary);
   --color-text-accent: var(--color-tertiary);
 
-  --shadow-dropdown: 0 12px 32px rgba(0, 0, 0, 0.4);
+  --shadow-dropdown: 0 16px 40px rgba(0, 0, 0, 0.42);
+  --shadow-sidebar-filter: none;
   --shadow-focus-ring: 0 0 0 1px rgba(255, 181, 159, 0.32);
   --shadow-error-ring: 0 0 0 1px rgba(255, 180, 171, 0.26);
   --shadow-button-primary: 0 12px 24px rgba(255, 110, 64, 0.18);
@@ -449,6 +485,8 @@ button, input, textarea, select, a, [role="button"] {
 .sidebar-panel {
   width: var(--sidebar-width);
   min-width: var(--sidebar-width);
+  background-image: var(--sidebar-panel-bg-image);
+  background-repeat: no-repeat;
   transition:
     background-color var(--motion-sidebar-duration) var(--motion-sidebar-easing),
     border-color var(--motion-sidebar-duration) var(--motion-sidebar-easing);
@@ -598,6 +636,28 @@ button, input, textarea, select, a, [role="button"] {
 ::-webkit-scrollbar-thumb { background: var(--color-outline); border-radius: 9999px; opacity: 0.3; }
 ::-webkit-scrollbar-thumb:hover { opacity: 0.6; }
 
+.sidebar-scroll-area {
+  scrollbar-width: thin;
+  scrollbar-color: color-mix(in srgb, var(--color-outline) 72%, transparent) transparent;
+}
+
+.sidebar-scroll-area::-webkit-scrollbar {
+  width: 4px;
+}
+
+.sidebar-scroll-area::-webkit-scrollbar-track {
+  background: transparent;
+}
+
+.sidebar-scroll-area::-webkit-scrollbar-thumb {
+  background: color-mix(in srgb, var(--color-outline) 78%, transparent);
+  border-radius: 9999px;
+}
+
+.sidebar-scroll-area::-webkit-scrollbar-thumb:hover {
+  background: color-mix(in srgb, var(--color-outline) 92%, transparent);
+}
+
 /* Animations */
 @keyframes shimmer {
   0%, 100% { opacity: 0.4; }
diff --git a/desktop/src/types/chat.ts b/desktop/src/types/chat.ts
index 2fbb9fec..c0c0247d 100644
--- a/desktop/src/types/chat.ts
+++ b/desktop/src/types/chat.ts
@@ -1,10 +1,12 @@
 import type { PermissionMode } from './settings'
+import type { RuntimeSelection } from './runtime'
 
 // Source: src/server/ws/events.ts
 
 // ─── Client → Server ──────────────────────────────────────────────
 
 export type ClientMessage =
+  | { type: 'prewarm_session' }
   | { type: 'user_message'; content: string; attachments?: AttachmentRef[] }
   | {
       type: 'permission_response'
@@ -19,6 +21,7 @@ export type ClientMessage =
       response: ComputerUsePermissionResponse
     }
   | { type: 'set_permission_mode'; mode: PermissionMode }
+  | ({ type: 'set_runtime_config' } & RuntimeSelection)
   | { type: 'stop_generation' }
   | { type: 'ping' }
 
diff --git a/desktop/src/types/mcp.ts b/desktop/src/types/mcp.ts
index cba6b4ff..247c05db 100644
--- a/desktop/src/types/mcp.ts
+++ b/desktop/src/types/mcp.ts
@@ -24,7 +24,7 @@ export type McpServerRecord = {
   scope: string
   transport: string
   enabled: boolean
-  status: 'connected' | 'needs-auth' | 'failed' | 'disabled'
+  status: 'connected' | 'needs-auth' | 'failed' | 'disabled' | 'checking'
   statusLabel: string
   statusDetail?: string
   configLocation: string
diff --git a/desktop/src/types/providerPreset.ts b/desktop/src/types/providerPreset.ts
new file mode 100644
index 00000000..c27382cf
--- /dev/null
+++ b/desktop/src/types/providerPreset.ts
@@ -0,0 +1,18 @@
+import type { ApiFormat } from './provider'
+
+export type ModelMapping = {
+  main: string
+  haiku: string
+  sonnet: string
+  opus: string
+}
+
+export type ProviderPreset = {
+  id: string
+  name: string
+  baseUrl: string
+  apiFormat: ApiFormat
+  defaultModels: ModelMapping
+  needsApiKey: boolean
+  websiteUrl: string
+}
diff --git a/desktop/src/types/runtime.ts b/desktop/src/types/runtime.ts
new file mode 100644
index 00000000..1c0fcd00
--- /dev/null
+++ b/desktop/src/types/runtime.ts
@@ -0,0 +1,4 @@
+export type RuntimeSelection = {
+  providerId: string | null
+  modelId: string
+}
diff --git a/docs/en/index.md b/docs/en/index.md
index 155fd246..05acb4e1 100644
--- a/docs/en/index.md
+++ b/docs/en/index.md
@@ -6,7 +6,7 @@ hero:
   text: Locally Runnable Claude Code
   tagline: Repaired from leaked source, supports any Anthropic-compatible API endpoint (MiniMax, OpenRouter, etc.)
   image:
-    src: /images/banner.jpg
+    src: /images/logo-horizontal.png
     alt: Claude Code Haha
   actions:
     - theme: brand
diff --git a/docs/images/app-icon-dark.png b/docs/images/app-icon-dark.png
new file mode 100644
index 00000000..19dc2785
Binary files /dev/null and b/docs/images/app-icon-dark.png differ
diff --git a/docs/images/app-icon-dark.svg b/docs/images/app-icon-dark.svg
new file mode 100644
index 00000000..e77d3d7a
--- /dev/null
+++ b/docs/images/app-icon-dark.svg
@@ -0,0 +1,26 @@
+<svg width="1024" height="1024" viewBox="0 0 1024 1024" fill="none" xmlns="http://www.w3.org/2000/svg">
+
+<defs>
+  <radialGradient id="g1" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(592 402) rotate(90) scale(130)">
+    <stop stop-color="#FFD56A"/>
+    <stop offset="1" stop-color="#F6B23E"/>
+  </radialGradient>
+  <filter id="glow" x="470" y="280" width="244" height="244" filterUnits="userSpaceOnUse">
+    <feGaussianBlur stdDeviation="18" result="blur"/>
+    <feColorMatrix in="blur" type="matrix" values="1 0 0 0 0.95 0 1 0 0 0.63 0 0 1 0 0.14 0 0 0 0.7 0"/>
+    <feBlend in="SourceGraphic"/>
+  </filter>
+  <linearGradient id="accent" x1="684" y1="298" x2="834" y2="726" gradientUnits="userSpaceOnUse">
+    <stop stop-color="#F6B34C"/>
+    <stop offset="1" stop-color="#FF8A2A"/>
+  </linearGradient>
+</defs>
+
+<g>
+
+  <path d="M310 350 L510 512 L310 674" stroke="#F5F0E6" stroke-width="64" stroke-linecap="round" stroke-linejoin="round"/>
+  <rect x="440" y="690" width="120" height="48" rx="20" fill="#F5F0E6"/>
+  <path d="M684 298 H834 V726 H684" stroke="url(#accent)" stroke-width="64" stroke-linecap="round" stroke-linejoin="round"/>
+  <g filter="url(#glow)"><path d="M592 334L608.8 385.2L660 402L608.8 418.8L592 470L575.2 418.8L524 402L575.2 385.2L592 334Z" fill="url(#g1)"/></g>
+</g>
+</svg>
diff --git a/docs/images/app-icon-light.png b/docs/images/app-icon-light.png
new file mode 100644
index 00000000..02f20c4c
Binary files /dev/null and b/docs/images/app-icon-light.png differ
diff --git a/docs/images/app-icon-light.svg b/docs/images/app-icon-light.svg
new file mode 100644
index 00000000..582d3c54
--- /dev/null
+++ b/docs/images/app-icon-light.svg
@@ -0,0 +1,17 @@
+<svg width="1024" height="1024" viewBox="0 0 1024 1024" fill="none" xmlns="http://www.w3.org/2000/svg">
+
+<defs>
+  <linearGradient id="accent" x1="684" y1="298" x2="834" y2="726" gradientUnits="userSpaceOnUse">
+    <stop stop-color="#F6B34C"/>
+    <stop offset="1" stop-color="#FF8A2A"/>
+  </linearGradient>
+</defs>
+
+<g>
+
+  <path d="M310 350 L510 512 L310 674" stroke="#20242E" stroke-width="64" stroke-linecap="round" stroke-linejoin="round"/>
+  <rect x="440" y="690" width="120" height="48" rx="20" fill="#20242E"/>
+  <path d="M684 298 H834 V726 H684" stroke="url(#accent)" stroke-width="64" stroke-linecap="round" stroke-linejoin="round"/>
+  <path d="M592 334L608.8 385.2L660 402L608.8 418.8L592 470L575.2 418.8L524 402L575.2 385.2L592 334Z" fill="#F5A623"/>
+</g>
+</svg>
diff --git a/docs/images/app-icon.jpg b/docs/images/app-icon.jpg
deleted file mode 100644
index 03098747..00000000
Binary files a/docs/images/app-icon.jpg and /dev/null differ
diff --git a/docs/images/app-icon.png b/docs/images/app-icon.png
index 289f77e2..02f20c4c 100644
Binary files a/docs/images/app-icon.png and b/docs/images/app-icon.png differ
diff --git a/docs/images/app-icon.svg b/docs/images/app-icon.svg
new file mode 100644
index 00000000..582d3c54
--- /dev/null
+++ b/docs/images/app-icon.svg
@@ -0,0 +1,17 @@
+<svg width="1024" height="1024" viewBox="0 0 1024 1024" fill="none" xmlns="http://www.w3.org/2000/svg">
+
+<defs>
+  <linearGradient id="accent" x1="684" y1="298" x2="834" y2="726" gradientUnits="userSpaceOnUse">
+    <stop stop-color="#F6B34C"/>
+    <stop offset="1" stop-color="#FF8A2A"/>
+  </linearGradient>
+</defs>
+
+<g>
+
+  <path d="M310 350 L510 512 L310 674" stroke="#20242E" stroke-width="64" stroke-linecap="round" stroke-linejoin="round"/>
+  <rect x="440" y="690" width="120" height="48" rx="20" fill="#20242E"/>
+  <path d="M684 298 H834 V726 H684" stroke="url(#accent)" stroke-width="64" stroke-linecap="round" stroke-linejoin="round"/>
+  <path d="M592 334L608.8 385.2L660 402L608.8 418.8L592 470L575.2 418.8L524 402L575.2 385.2L592 334Z" fill="#F5A623"/>
+</g>
+</svg>
diff --git a/docs/images/banner.jpg b/docs/images/banner.jpg
deleted file mode 100644
index f2bc6f6e..00000000
Binary files a/docs/images/banner.jpg and /dev/null differ
diff --git a/docs/images/banner.png b/docs/images/banner.png
new file mode 100644
index 00000000..8a188b96
Binary files /dev/null and b/docs/images/banner.png differ
diff --git a/docs/images/banner.svg b/docs/images/banner.svg
new file mode 100644
index 00000000..7805ed12
--- /dev/null
+++ b/docs/images/banner.svg
@@ -0,0 +1,83 @@
+<svg width="2752" height="921" viewBox="0 0 2752 921" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <defs>
+    <linearGradient id="bannerBg" x1="166" y1="84" x2="2550" y2="902" gradientUnits="userSpaceOnUse">
+      <stop stop-color="#2C1814"/>
+      <stop offset="0.48" stop-color="#1D110F"/>
+      <stop offset="1" stop-color="#120B0A"/>
+    </linearGradient>
+    <radialGradient id="bannerGlowLeft" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(726 322) rotate(28) scale(734 480)">
+      <stop stop-color="#FF7A37" stop-opacity="0.4"/>
+      <stop offset="0.54" stop-color="#FF5B2E" stop-opacity="0.22"/>
+      <stop offset="1" stop-color="#FF5B2E" stop-opacity="0"/>
+    </radialGradient>
+    <radialGradient id="bannerGlowRight" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(2296 222) rotate(180) scale(560 320)">
+      <stop stop-color="#FFD15C" stop-opacity="0.18"/>
+      <stop offset="1" stop-color="#FFD15C" stop-opacity="0"/>
+    </radialGradient>
+    <linearGradient id="iconAccent" x1="256" y1="180" x2="796" y2="606" gradientUnits="userSpaceOnUse">
+      <stop stop-color="#FF5B2E"/>
+      <stop offset="0.5" stop-color="#FF8134"/>
+      <stop offset="1" stop-color="#FFD15C"/>
+    </linearGradient>
+    <linearGradient id="promptStroke" x1="542" y1="236" x2="650" y2="236" gradientUnits="userSpaceOnUse">
+      <stop stop-color="#FFF8F1"/>
+      <stop offset="1" stop-color="#FFE7B3"/>
+    </linearGradient>
+    <linearGradient id="hahaText" x1="2080" y1="262" x2="2648" y2="494" gradientUnits="userSpaceOnUse">
+      <stop stop-color="#FF5B2E"/>
+      <stop offset="0.6" stop-color="#FF7C38"/>
+      <stop offset="1" stop-color="#FFB340"/>
+    </linearGradient>
+    <linearGradient id="chipBg" x1="1154" y1="568" x2="1662" y2="568" gradientUnits="userSpaceOnUse">
+      <stop stop-color="#4A231B"/>
+      <stop offset="1" stop-color="#2B1712"/>
+    </linearGradient>
+    <filter id="tileShadow" x="152" y="124" width="714" height="714" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+      <feDropShadow dx="0" dy="26" stdDeviation="28" flood-color="#B54216" flood-opacity="0.28"/>
+    </filter>
+  </defs>
+
+  <rect width="2752" height="921" rx="56" fill="url(#bannerBg)"/>
+  <rect x="24" y="24" width="2704" height="873" rx="36" stroke="#3B231D" stroke-width="2"/>
+  <ellipse cx="742" cy="338" rx="762" ry="486" fill="url(#bannerGlowLeft)"/>
+  <ellipse cx="2260" cy="216" rx="562" ry="328" fill="url(#bannerGlowRight)"/>
+
+  <path d="M132 176C330 70 630 76 842 180" stroke="#7A3926" stroke-width="8" stroke-linecap="round" opacity="0.55"/>
+  <path d="M98 748C332 824 688 812 914 712" stroke="#7A3926" stroke-width="8" stroke-linecap="round" opacity="0.42"/>
+  <path d="M1972 150H2640" stroke="#4B2B24" stroke-width="6" stroke-linecap="round"/>
+  <path d="M2128 764H2644" stroke="#4B2B24" stroke-width="6" stroke-linecap="round"/>
+  <circle cx="2112" cy="230" r="14" fill="#FFD15C"/>
+  <circle cx="2368" cy="142" r="10" fill="#FF7C38"/>
+  <circle cx="2514" cy="238" r="8" fill="#FF5B2E"/>
+  <path d="M2380 254L2394 290L2430 304L2394 318L2380 354L2366 318L2330 304L2366 290L2380 254Z" fill="#FFD15C"/>
+  <path d="M2560 118L2572 146L2600 158L2572 170L2560 198L2548 170L2520 158L2548 146L2560 118Z" fill="#FFB340"/>
+
+  <g filter="url(#tileShadow)">
+    <rect x="216" y="166" width="586" height="586" rx="170" fill="#211514"/>
+    <rect x="219" y="169" width="580" height="580" rx="167" stroke="#422621" stroke-width="6"/>
+  </g>
+
+  <path d="M364 282L500 418L364 554" stroke="url(#iconAccent)" stroke-width="58" stroke-linecap="round" stroke-linejoin="round"/>
+  <path d="M572 246H650V574H572" stroke="url(#promptStroke)" stroke-width="44" stroke-linecap="round" stroke-linejoin="round"/>
+  <path d="M464 514H544" stroke="url(#iconAccent)" stroke-width="28" stroke-linecap="round"/>
+  <path d="M506 236L524 288L576 270L540 310L576 350L524 334L506 386L488 334L436 350L472 310L436 270L488 288L506 236Z" fill="#FFD15C"/>
+
+  <text x="962" y="440" fill="#FFF5EC" font-family="Avenir Next, SF Pro Display, Inter, Helvetica Neue, Arial, sans-serif" font-size="222" font-weight="800" letter-spacing="-7">
+    Claude Code
+  </text>
+  <text x="2200" y="440" fill="url(#hahaText)" font-family="Avenir Next, SF Pro Display, Inter, Helvetica Neue, Arial, sans-serif" font-size="222" font-weight="800" letter-spacing="-7">
+    Haha
+  </text>
+
+  <text x="968" y="560" fill="#D2B9AC" font-family="JetBrains Mono, SFMono-Regular, Menlo, monospace" font-size="44" font-weight="700" letter-spacing="8">
+    NEXT-GEN PERSONAL AI AGENT
+  </text>
+
+  <rect x="1148" y="604" width="520" height="70" rx="35" fill="url(#chipBg)" stroke="#6C382A" stroke-width="2"/>
+  <text x="1210" y="650" fill="#FFE8B8" font-family="Avenir Next, SF Pro Display, Inter, Helvetica Neue, Arial, sans-serif" font-size="34" font-weight="700" letter-spacing="3">
+    DESKTOP EDITION
+  </text>
+
+  <path d="M970 714H1830" stroke="url(#iconAccent)" stroke-width="10" stroke-linecap="round"/>
+  <path d="M1866 714H1984" stroke="#FFD15C" stroke-width="10" stroke-linecap="round"/>
+</svg>
diff --git a/docs/images/logo-horizontal.jpg b/docs/images/logo-horizontal.jpg
deleted file mode 100644
index 859b0eac..00000000
Binary files a/docs/images/logo-horizontal.jpg and /dev/null differ
diff --git a/docs/images/logo-horizontal.png b/docs/images/logo-horizontal.png
new file mode 100644
index 00000000..e1cc11e1
Binary files /dev/null and b/docs/images/logo-horizontal.png differ
diff --git a/docs/images/logo-horizontal.svg b/docs/images/logo-horizontal.svg
new file mode 100644
index 00000000..11cfd35e
--- /dev/null
+++ b/docs/images/logo-horizontal.svg
@@ -0,0 +1,68 @@
+<svg width="2200" height="640" viewBox="0 0 2200 640" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <defs>
+    <linearGradient id="iconAura" x1="48" y1="70" x2="500" y2="426" gradientUnits="userSpaceOnUse">
+      <stop stop-color="#FF5B2E"/>
+      <stop offset="0.52" stop-color="#FF8A2B"/>
+      <stop offset="1" stop-color="#FFD15C"/>
+    </linearGradient>
+    <linearGradient id="accentRibbon" x1="86" y1="122" x2="424" y2="384" gradientUnits="userSpaceOnUse">
+      <stop stop-color="#FF5B2E"/>
+      <stop offset="0.46" stop-color="#FF7C38"/>
+      <stop offset="1" stop-color="#FFB340"/>
+    </linearGradient>
+    <linearGradient id="promptStroke" x1="263" y1="152" x2="345" y2="152" gradientUnits="userSpaceOnUse">
+      <stop stop-color="#FFF7EF"/>
+      <stop offset="1" stop-color="#FFE8B8"/>
+    </linearGradient>
+    <linearGradient id="hahaText" x1="1508" y1="174" x2="2040" y2="308" gradientUnits="userSpaceOnUse">
+      <stop stop-color="#FF5B2E"/>
+      <stop offset="0.55" stop-color="#FF7A37"/>
+      <stop offset="1" stop-color="#FFB340"/>
+    </linearGradient>
+    <linearGradient id="taglineLine" x1="598" y1="434" x2="1572" y2="434" gradientUnits="userSpaceOnUse">
+      <stop stop-color="#FFB340"/>
+      <stop offset="0.52" stop-color="#FF7A37"/>
+      <stop offset="1" stop-color="#FF5B2E"/>
+    </linearGradient>
+    <filter id="softBlur" x="-120" y="-120" width="760" height="760" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+      <feGaussianBlur stdDeviation="46"/>
+    </filter>
+    <filter id="tileShadow" x="42" y="44" width="464" height="464" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+      <feDropShadow dx="0" dy="18" stdDeviation="18" flood-color="#B64516" flood-opacity="0.18"/>
+    </filter>
+  </defs>
+
+  <g filter="url(#softBlur)" opacity="0.34">
+    <ellipse cx="264" cy="250" rx="188" ry="150" fill="url(#iconAura)"/>
+  </g>
+
+  <path d="M80 166C152 114 248 96 354 116" stroke="url(#accentRibbon)" stroke-width="26" stroke-linecap="round" opacity="0.9"/>
+  <path d="M98 404C194 456 318 458 414 410" stroke="url(#accentRibbon)" stroke-width="22" stroke-linecap="round" opacity="0.82"/>
+  <circle cx="110" cy="286" r="10" fill="#FFD15C"/>
+  <circle cx="418" cy="166" r="11" fill="#FF7A37"/>
+  <circle cx="450" cy="338" r="8" fill="#FF5B2E"/>
+  <path d="M390 96L400 122L426 132L400 142L390 168L380 142L354 132L380 122L390 96Z" fill="#FFD15C"/>
+
+  <g filter="url(#tileShadow)">
+    <rect x="96" y="102" width="356" height="356" rx="108" fill="#211514"/>
+    <rect x="98" y="104" width="352" height="352" rx="106" stroke="#3A2522" stroke-width="4"/>
+  </g>
+
+  <path d="M184 186L268 270L184 354" stroke="url(#accentRibbon)" stroke-width="36" stroke-linecap="round" stroke-linejoin="round"/>
+  <path d="M300 168H364V372H300" stroke="url(#promptStroke)" stroke-width="30" stroke-linecap="round" stroke-linejoin="round"/>
+  <path d="M234 324H270" stroke="url(#accentRibbon)" stroke-width="18" stroke-linecap="round"/>
+  <path d="M262 162L272 191L302 181L281 204L301 227L272 218L262 247L252 218L223 227L243 204L222 181L252 191L262 162Z" fill="#FFD15C"/>
+
+  <text x="598" y="292" fill="#271714" font-family="Avenir Next, SF Pro Display, Inter, Helvetica Neue, Arial, sans-serif" font-size="188" font-weight="800" letter-spacing="-7">
+    Claude Code
+  </text>
+  <text x="1558" y="292" fill="url(#hahaText)" font-family="Avenir Next, SF Pro Display, Inter, Helvetica Neue, Arial, sans-serif" font-size="188" font-weight="800" letter-spacing="-7">
+    Haha
+  </text>
+
+  <text x="602" y="394" fill="#7A5C51" font-family="JetBrains Mono, SFMono-Regular, Menlo, monospace" font-size="36" font-weight="700" letter-spacing="7">
+    NEXT-GEN PERSONAL AI AGENT
+  </text>
+  <path d="M602 434H1548" stroke="url(#taglineLine)" stroke-width="8" stroke-linecap="round"/>
+  <path d="M1578 434H1682" stroke="#FFD15C" stroke-width="8" stroke-linecap="round"/>
+</svg>
diff --git a/docs/index.md b/docs/index.md
index 4612c970..db49f622 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -6,7 +6,7 @@ hero:
   text: 本地可运行的 Claude Code
   tagline: 基于泄露源码修复，支持接入任意 Anthropic 兼容 API（MiniMax、OpenRouter 等）
   image:
-    src: /images/app-icon.png
+    src: /images/logo-horizontal.png
     alt: Claude Code Haha
   actions:
     - theme: brand
diff --git a/docs/public/images/banner.jpg b/docs/public/images/banner.jpg
deleted file mode 100644
index f2bc6f6e..00000000
Binary files a/docs/public/images/banner.jpg and /dev/null differ
diff --git a/docs/public/images/banner.png b/docs/public/images/banner.png
new file mode 100644
index 00000000..8a188b96
Binary files /dev/null and b/docs/public/images/banner.png differ
diff --git a/runtime/requirements-win.txt b/runtime/requirements-win.txt
index 32c7a94c..2e736c96 100644
--- a/runtime/requirements-win.txt
+++ b/runtime/requirements-win.txt
@@ -1,4 +1,4 @@
-mss>=10.1.0
+mss>=9.0.2,<10
 Pillow>=11.3.0
 pyautogui>=0.9.54
 pywin32>=306
diff --git a/runtime/requirements.txt b/runtime/requirements.txt
index 06466fae..1f49b657 100644
--- a/runtime/requirements.txt
+++ b/runtime/requirements.txt
@@ -1,4 +1,4 @@
-mss>=10.1.0
+mss>=9.0.2,<10
 Pillow>=11.3.0
 pyautogui>=0.9.54
 pyobjc-core>=11.1
diff --git a/src/main.tsx b/src/main.tsx
index 7fa988bf..554ca95a 100644
--- a/src/main.tsx
+++ b/src/main.tsx
@@ -2723,6 +2723,26 @@ async function run(): Promise<CommanderCommand> {
           }));
         }, configs).catch(err => logForDebugging(`[MCP] ${label} connect error: ${err}`));
       };
+      const getDesktopMcpStartupTimeoutMs = (): number => {
+        const raw = process.env.CC_HAHA_DESKTOP_AWAIT_MCP_TIMEOUT_MS;
+        if (raw === undefined) return 5_000;
+        const parsed = Number.parseInt(raw, 10);
+        if (!Number.isFinite(parsed) || parsed < 0) return 5_000;
+        return parsed;
+      };
+      const waitForDesktopMcpStartup = async (promise: Promise<void>, label: string): Promise<void> => {
+        const timeoutMs = getDesktopMcpStartupTimeoutMs();
+        if (timeoutMs === 0) return;
+        let timer: ReturnType<typeof setTimeout> | undefined;
+        const timedOut = await Promise.race([promise.then(() => false), new Promise<boolean>(resolve => {
+          timer = setTimeout(resolve, timeoutMs, true);
+        })]);
+        if (timer) clearTimeout(timer);
+        if (timedOut) {
+          logForDebugging(`[MCP] ${label} servers not ready after ${timeoutMs}ms — proceeding; background connection continues`);
+        }
+      };
+
       // Await all MCP configs for regular print-mode sessions — they're
       // often single-turn, so "late-connecting servers visible next turn"
       // doesn't help. SDK init message and turn-1 tool list should include
@@ -2742,10 +2762,13 @@ async function run(): Promise<CommanderCommand> {
       // fetch was kicked off early (line ~2558) so only residual time blocks
       // here. --bare skips claude.ai entirely for perf-sensitive scripts.
       profileCheckpoint('before_connectMcp');
+      const regularMcpConnect = connectMcpBatch(regularMcpConfigs, 'regular');
       if (sdkUrl) {
-        void connectMcpBatch(regularMcpConfigs, 'regular');
+        if (process.env.CC_HAHA_DESKTOP_AWAIT_MCP === '1') {
+          await waitForDesktopMcpStartup(regularMcpConnect, 'regular MCP');
+        }
       } else {
-        await connectMcpBatch(regularMcpConfigs, 'regular');
+        await regularMcpConnect;
       }
       profileCheckpoint('after_connectMcp');
       // Dedup: suppress plugin MCP servers that duplicate a claude.ai
diff --git a/src/server/__tests__/computer-use-requirements.test.ts b/src/server/__tests__/computer-use-requirements.test.ts
new file mode 100644
index 00000000..17eb9e43
--- /dev/null
+++ b/src/server/__tests__/computer-use-requirements.test.ts
@@ -0,0 +1,18 @@
+import { describe, expect, test } from 'bun:test'
+
+import darwinRequirements from '../../../runtime/requirements.txt' with { type: 'text' }
+import win32Requirements from '../../../runtime/requirements-win.txt' with { type: 'text' }
+
+function findRequirement(requirements: string, packageName: string): string | undefined {
+  return requirements
+    .split(/\r?\n/)
+    .map(line => line.trim())
+    .find(line => line.startsWith(`${packageName}`))
+}
+
+describe('computer use requirements', () => {
+  test('pins mss to the last Python 3.8-compatible major version', () => {
+    expect(findRequirement(darwinRequirements, 'mss')).toBe('mss>=9.0.2,<10')
+    expect(findRequirement(win32Requirements, 'mss')).toBe('mss>=9.0.2,<10')
+  })
+})
diff --git a/src/server/__tests__/conversation-service.test.ts b/src/server/__tests__/conversation-service.test.ts
index 8cbb9871..84046cad 100644
--- a/src/server/__tests__/conversation-service.test.ts
+++ b/src/server/__tests__/conversation-service.test.ts
@@ -3,6 +3,7 @@ import * as fs from 'node:fs/promises'
 import * as os from 'node:os'
 import * as path from 'node:path'
 import { ConversationService } from '../services/conversationService.js'
+import { ProviderService } from '../services/providerService.js'
 
 describe('ConversationService', () => {
   let tmpDir: string
@@ -12,6 +13,7 @@ describe('ConversationService', () => {
   let originalModel: string | undefined
   let originalEntrypoint: string | undefined
   let originalOAuthToken: string | undefined
+  let originalProviderManagedByHost: string | undefined
 
   beforeEach(async () => {
     tmpDir = await fs.mkdtemp(path.join(os.tmpdir(), 'cc-haha-conversation-service-'))
@@ -21,6 +23,7 @@ describe('ConversationService', () => {
     originalModel = process.env.ANTHROPIC_MODEL
     originalEntrypoint = process.env.CLAUDE_CODE_ENTRYPOINT
     originalOAuthToken = process.env.CLAUDE_CODE_OAUTH_TOKEN
+    originalProviderManagedByHost = process.env.CLAUDE_CODE_PROVIDER_MANAGED_BY_HOST
 
     process.env.CLAUDE_CONFIG_DIR = tmpDir
     process.env.ANTHROPIC_AUTH_TOKEN = 'test-token'
@@ -30,6 +33,7 @@ describe('ConversationService', () => {
     // Clear inherited CLAUDE_CODE_ENTRYPOINT so tests can assert whether
     // buildChildEnv injects it or not without interference from the shell env.
     delete process.env.CLAUDE_CODE_ENTRYPOINT
+    delete process.env.CLAUDE_CODE_PROVIDER_MANAGED_BY_HOST
   })
 
   afterEach(async () => {
@@ -51,6 +55,9 @@ describe('ConversationService', () => {
     if (originalOAuthToken === undefined) delete process.env.CLAUDE_CODE_OAUTH_TOKEN
     else process.env.CLAUDE_CODE_OAUTH_TOKEN = originalOAuthToken
 
+    if (originalProviderManagedByHost === undefined) delete process.env.CLAUDE_CODE_PROVIDER_MANAGED_BY_HOST
+    else process.env.CLAUDE_CODE_PROVIDER_MANAGED_BY_HOST = originalProviderManagedByHost
+
     await fs.rm(tmpDir, { recursive: true, force: true })
   })
 
@@ -130,6 +137,62 @@ describe('ConversationService', () => {
     expect(env.CLAUDE_CODE_ENTRYPOINT).toBeUndefined()
   })
 
+  test('buildChildEnv injects explicit provider runtime env for session-scoped providers', async () => {
+    const providerService = new ProviderService()
+    const provider = await providerService.addProvider({
+      presetId: 'custom',
+      name: 'Packy',
+      apiKey: 'provider-key',
+      baseUrl: 'https://api.packy.example',
+      apiFormat: 'openai_chat',
+      models: {
+        main: 'kimi-k2.6',
+        haiku: '',
+        sonnet: '',
+        opus: '',
+      },
+    })
+
+    const service = new ConversationService() as any
+    const env = (await service.buildChildEnv('/tmp', undefined, {
+      providerId: provider.id,
+    })) as Record<string, string>
+
+    expect(env.ANTHROPIC_BASE_URL).toBe(`http://127.0.0.1:3456/proxy/providers/${provider.id}`)
+    expect(env.ANTHROPIC_API_KEY).toBe('proxy-managed')
+    expect(env.ANTHROPIC_MODEL).toBe('kimi-k2.6')
+    expect(env.CLAUDE_CODE_PROVIDER_MANAGED_BY_HOST).toBe('1')
+    expect(env.CLAUDE_CODE_ENTRYPOINT).toBeUndefined()
+  })
+
+  test('buildChildEnv can force official auth even when a custom default provider exists', async () => {
+    const ccHahaDir = path.join(tmpDir, 'cc-haha')
+    await fs.mkdir(ccHahaDir, { recursive: true })
+    await fs.writeFile(
+      path.join(ccHahaDir, 'settings.json'),
+      JSON.stringify({ env: { ANTHROPIC_AUTH_TOKEN: 'custom-provider-token' } }),
+      'utf-8',
+    )
+
+    const { hahaOAuthService } = await import('../services/hahaOAuthService.js')
+    await hahaOAuthService.saveTokens({
+      accessToken: 'forced-official-token',
+      refreshToken: 'forced-official-refresh',
+      expiresAt: Date.now() + 30 * 60_000,
+      scopes: ['user:inference'],
+      subscriptionType: 'max',
+    })
+
+    const service = new ConversationService() as any
+    const env = (await service.buildChildEnv('/tmp', undefined, {
+      providerId: null,
+    })) as Record<string, string>
+
+    expect(env.ANTHROPIC_API_KEY).toBeUndefined()
+    expect(env.CLAUDE_CODE_ENTRYPOINT).toBe('claude-desktop')
+    expect(env.CLAUDE_CODE_OAUTH_TOKEN).toBe('forced-official-token')
+  })
+
   test('buildChildEnv does not leak inherited CLAUDE_CODE_OAUTH_TOKEN when official token is unavailable', async () => {
     const ccHahaDir = path.join(tmpDir, 'cc-haha')
     await fs.mkdir(ccHahaDir, { recursive: true })
@@ -185,4 +248,33 @@ describe('ConversationService', () => {
     expect(args).toContain('--sdk-url')
     expect(args).toContain('--replay-user-messages')
   })
+
+  test('buildChildEnv asks desktop SDK sessions to wait briefly for MCP tools', async () => {
+    const service = new ConversationService() as any
+    const env = (await service.buildChildEnv(
+      '/tmp',
+      'ws://127.0.0.1:3456/sdk/test-session?token=test-token',
+    )) as Record<string, string>
+
+    expect(env.CC_HAHA_DESKTOP_AWAIT_MCP).toBe('1')
+    expect(env.CC_HAHA_DESKTOP_AWAIT_MCP_TIMEOUT_MS).toBe('5000')
+  })
+
+  test('buildSessionCliArgs forwards the selected runtime model and effort to the CLI process', () => {
+    const service = new ConversationService() as any
+    const args = service.buildSessionCliArgs(
+      '123e4567-e89b-12d3-a456-426614174000',
+      'ws://127.0.0.1:3456/sdk/test-session?token=test-token',
+      false,
+      {
+        model: 'model-b-opus',
+        effort: 'max',
+      },
+    ) as string[]
+
+    expect(args).toContain('--model')
+    expect(args).toContain('model-b-opus')
+    expect(args).toContain('--effort')
+    expect(args).toContain('max')
+  })
 })
diff --git a/src/server/__tests__/conversations.test.ts b/src/server/__tests__/conversations.test.ts
index 18f143ec..ad1f04da 100644
--- a/src/server/__tests__/conversations.test.ts
+++ b/src/server/__tests__/conversations.test.ts
@@ -10,7 +10,8 @@ import * as fs from 'fs/promises'
 import * as path from 'path'
 import * as os from 'os'
 import { fileURLToPath } from 'node:url'
-import { ConversationService } from '../services/conversationService.js'
+import { ConversationService, conversationService } from '../services/conversationService.js'
+import { ProviderService } from '../services/providerService.js'
 
 // ============================================================================
 // ConversationService unit tests
@@ -271,6 +272,19 @@ describe('WebSocket Chat Integration', () => {
 
     return messages
   }
+
+  async function waitUntil(
+    predicate: () => boolean | Promise<boolean>,
+    label: string,
+    timeoutMs = 8000,
+  ): Promise<void> {
+    const startedAt = Date.now()
+    while (Date.now() - startedAt < timeoutMs) {
+      if (await predicate()) return
+      await new Promise((resolve) => setTimeout(resolve, 50))
+    }
+    throw new Error(`Timed out waiting for ${label}`)
+  }
   const originalCliPath = process.env.CLAUDE_CLI_PATH
 
   beforeAll(async () => {
@@ -504,6 +518,123 @@ describe('WebSocket Chat Integration', () => {
     expect(secondTurn.some((m) => m.type === 'error')).toBe(false)
   })
 
+  it('should prewarm the CLI before the first user turn and reuse that process', async () => {
+    const createRes = await fetch(`${baseUrl}/api/sessions`, {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify({ workDir: process.cwd() }),
+    })
+    expect(createRes.status).toBe(201)
+    const { sessionId } = await createRes.json() as { sessionId: string }
+
+    const originalStartSession = conversationService.startSession.bind(conversationService)
+    const startCalls: Array<{ sessionId: string }> = []
+
+    conversationService.startSession = (async function patchedStartSession(
+      sid: string,
+      workDir: string,
+      sdkUrl: string,
+      options?: { permissionMode?: string; model?: string; effort?: string; providerId?: string | null },
+    ) {
+      startCalls.push({ sessionId: sid })
+      return originalStartSession(sid, workDir, sdkUrl, options)
+    }) as typeof conversationService.startSession
+
+    const messages: any[] = []
+    const ws = new WebSocket(`${wsUrl}/ws/${sessionId}`)
+    let connected = false
+    let awaitingCompletion = false
+    let preUserMessageCount = 0
+    let resolveCompletion: (() => void) | null = null
+    let rejectCompletion: ((err: Error) => void) | null = null
+
+    try {
+      await new Promise<void>((resolve, reject) => {
+        const timeout = setTimeout(() => {
+          reject(new Error(`Timed out waiting for prewarm connection for session ${sessionId}`))
+        }, 5000)
+
+        ws.onmessage = (event) => {
+          const msg = JSON.parse(event.data as string)
+          messages.push(msg)
+
+          if (msg.type === 'connected' && !connected) {
+            connected = true
+            clearTimeout(timeout)
+            ws.send(JSON.stringify({ type: 'prewarm_session' }))
+            resolve()
+            return
+          }
+
+          if (msg.type === 'error') {
+            const err = new Error(msg.message)
+            clearTimeout(timeout)
+            rejectCompletion?.(err)
+            reject(err)
+            return
+          }
+
+          if (awaitingCompletion && msg.type === 'message_complete') {
+            resolveCompletion?.()
+          }
+        }
+
+        ws.onerror = () => {
+          const err = new Error(`WebSocket error for prewarm session ${sessionId}`)
+          clearTimeout(timeout)
+          rejectCompletion?.(err)
+          reject(err)
+        }
+      })
+
+      await waitUntil(
+        () => startCalls.length === 1 && conversationService.hasSession(sessionId),
+        `prewarmed CLI process for ${sessionId}`,
+      )
+      await waitUntil(async () => {
+        const commandsRes = await fetch(`${baseUrl}/api/sessions/${sessionId}/slash-commands`)
+        if (!commandsRes.ok) return false
+        const { commands } = await commandsRes.json() as { commands?: Array<{ name: string }> }
+        if (!Array.isArray(commands)) return false
+        return commands.some((command) => command.name === 'help')
+      }, `prewarmed slash commands for ${sessionId}`)
+
+      preUserMessageCount = messages.length
+      expect(
+        messages
+          .slice(0, preUserMessageCount)
+          .some((msg) => ['content_start', 'content_delta', 'thinking', 'message_complete'].includes(msg.type)),
+      ).toBe(false)
+
+      awaitingCompletion = true
+      const completion = new Promise<void>((resolve, reject) => {
+        const timeout = setTimeout(() => {
+          reject(new Error(`Timed out waiting for completion after prewarm for session ${sessionId}`))
+        }, 10_000)
+        resolveCompletion = () => {
+          clearTimeout(timeout)
+          resolve()
+        }
+        rejectCompletion = (err) => {
+          clearTimeout(timeout)
+          reject(err)
+        }
+      })
+
+      ws.send(JSON.stringify({ type: 'user_message', content: 'first turn after prewarm' }))
+      await completion
+
+      expect(startCalls).toHaveLength(1)
+      expect(messages.some((msg) => msg.type === 'content_delta')).toBe(true)
+      expect(messages.some((msg) => msg.type === 'message_complete')).toBe(true)
+      expect(messages.some((msg) => msg.type === 'error')).toBe(false)
+    } finally {
+      ws.close()
+      conversationService.startSession = originalStartSession
+      conversationService.stopSession(sessionId)
+    }
+  }, 20_000)
+
   it('should resume streaming to a reconnected client during an active turn', async () => {
     await withMockStreamDelay(150, async () => {
       const sessionId = `chat-reconnect-${crypto.randomUUID()}`
@@ -571,4 +702,285 @@ describe('WebSocket Chat Integration', () => {
       expect(secondMessages.some((msg) => msg.type === 'message_complete')).toBe(true)
     })
   })
+
+  it('should keep using the selected runtime config across the whole session until changed', async () => {
+    const providerService = new ProviderService()
+    const providerA = await providerService.addProvider({
+      presetId: 'custom',
+      name: 'Provider A',
+      apiKey: 'key-a',
+      baseUrl: 'http://127.0.0.1:1/anthropic',
+      apiFormat: 'anthropic',
+      models: {
+        main: 'model-a-main',
+        haiku: 'model-a-haiku',
+        sonnet: 'model-a-sonnet',
+        opus: 'model-a-opus',
+      },
+    })
+    const providerB = await providerService.addProvider({
+      presetId: 'custom',
+      name: 'Provider B',
+      apiKey: 'key-b',
+      baseUrl: 'http://127.0.0.1:1/anthropic',
+      apiFormat: 'anthropic',
+      models: {
+        main: 'model-b-main',
+        haiku: 'model-b-haiku',
+        sonnet: 'model-b-sonnet',
+        opus: 'model-b-opus',
+      },
+    })
+
+    const createRes = await fetch(`${baseUrl}/api/sessions`, {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify({ workDir: process.cwd() }),
+    })
+    expect(createRes.status).toBe(201)
+    const { sessionId } = await createRes.json() as { sessionId: string }
+
+    const originalStartSession = conversationService.startSession.bind(conversationService)
+    const startCalls: Array<{
+      sessionId: string
+      options: { permissionMode?: string; model?: string; effort?: string; providerId?: string | null } | undefined
+    }> = []
+
+    conversationService.startSession = (async function patchedStartSession(
+      sid: string,
+      workDir: string,
+      sdkUrl: string,
+      options?: { permissionMode?: string; model?: string; effort?: string; providerId?: string | null },
+    ) {
+      startCalls.push({ sessionId: sid, options })
+      return originalStartSession(sid, workDir, sdkUrl, options)
+    }) as typeof conversationService.startSession
+
+    try {
+      const ws = new WebSocket(`${wsUrl}/ws/${sessionId}`)
+      let phase: 'boot' | 'turn1' | 'switching' | 'turn2' | 'turn3' | 'done' = 'boot'
+      let switchingTriggered = false
+
+      await new Promise<void>((resolve, reject) => {
+        const timeout = setTimeout(() => {
+          ws.close()
+          reject(new Error(`Timed out waiting for runtime persistence flow for session ${sessionId}`))
+        }, 15_000)
+
+        ws.onmessage = (event) => {
+          const msg = JSON.parse(event.data as string)
+
+          if (msg.type === 'connected' && phase === 'boot') {
+            ws.send(JSON.stringify({
+              type: 'set_runtime_config',
+              providerId: providerA.id,
+              modelId: 'model-a-sonnet',
+            }))
+            ws.send(JSON.stringify({ type: 'user_message', content: 'first turn' }))
+            phase = 'turn1'
+            return
+          }
+
+          if (msg.type === 'error') {
+            clearTimeout(timeout)
+            ws.close()
+            reject(new Error(msg.message))
+            return
+          }
+
+          if (msg.type === 'message_complete' && phase === 'turn1' && !switchingTriggered) {
+            switchingTriggered = true
+            phase = 'switching'
+            ws.send(JSON.stringify({
+              type: 'set_runtime_config',
+              providerId: providerB.id,
+              modelId: 'model-b-opus',
+            }))
+            return
+          }
+
+          if (
+            msg.type === 'status' &&
+            msg.state === 'idle' &&
+            phase === 'switching'
+          ) {
+            ws.send(JSON.stringify({ type: 'user_message', content: 'second turn' }))
+            phase = 'turn2'
+            return
+          }
+
+          if (msg.type === 'message_complete' && phase === 'turn2') {
+            ws.send(JSON.stringify({ type: 'user_message', content: 'third turn' }))
+            phase = 'turn3'
+            return
+          }
+
+          if (msg.type === 'message_complete' && phase === 'turn3') {
+            clearTimeout(timeout)
+            phase = 'done'
+            ws.close()
+            resolve()
+          }
+        }
+
+        ws.onerror = () => {
+          reject(new Error(`WebSocket error for runtime persistence session ${sessionId}`))
+        }
+      })
+
+      expect(startCalls).toHaveLength(2)
+      expect(startCalls[0]).toMatchObject({
+        sessionId,
+        options: {
+          providerId: providerA.id,
+          model: 'model-a-sonnet',
+        },
+      })
+      expect(startCalls[1]).toMatchObject({
+        sessionId,
+        options: {
+          providerId: providerB.id,
+          model: 'model-b-opus',
+        },
+      })
+    } finally {
+      conversationService.startSession = originalStartSession
+      conversationService.stopSession(sessionId)
+    }
+  }, 20_000)
+
+  it('should wait for an in-flight runtime restart before sending the next user turn', async () => {
+    const providerService = new ProviderService()
+    const providerA = await providerService.addProvider({
+      presetId: 'custom',
+      name: 'Provider Restart A',
+      apiKey: 'key-a',
+      baseUrl: 'http://127.0.0.1:1/anthropic',
+      apiFormat: 'anthropic',
+      models: {
+        main: 'restart-a-main',
+        haiku: 'restart-a-haiku',
+        sonnet: 'restart-a-sonnet',
+        opus: 'restart-a-opus',
+      },
+    })
+    const providerB = await providerService.addProvider({
+      presetId: 'custom',
+      name: 'Provider Restart B',
+      apiKey: 'key-b',
+      baseUrl: 'http://127.0.0.1:1/anthropic',
+      apiFormat: 'anthropic',
+      models: {
+        main: 'restart-b-main',
+        haiku: 'restart-b-haiku',
+        sonnet: 'restart-b-sonnet',
+        opus: 'restart-b-opus',
+      },
+    })
+
+    const createRes = await fetch(`${baseUrl}/api/sessions`, {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify({ workDir: process.cwd() }),
+    })
+    expect(createRes.status).toBe(201)
+    const { sessionId } = await createRes.json() as { sessionId: string }
+
+    const originalStartSession = conversationService.startSession.bind(conversationService)
+    const startCalls: Array<{
+      sessionId: string
+      options: { permissionMode?: string; model?: string; effort?: string; providerId?: string | null } | undefined
+    }> = []
+
+    conversationService.startSession = (async function patchedStartSession(
+      sid: string,
+      workDir: string,
+      sdkUrl: string,
+      options?: { permissionMode?: string; model?: string; effort?: string; providerId?: string | null },
+    ) {
+      startCalls.push({ sessionId: sid, options })
+      return originalStartSession(sid, workDir, sdkUrl, options)
+    }) as typeof conversationService.startSession
+
+    try {
+      const ws = new WebSocket(`${wsUrl}/ws/${sessionId}`)
+      let phase: 'boot' | 'turn1' | 'turn2' | 'turn3' | 'done' = 'boot'
+
+      await new Promise<void>((resolve, reject) => {
+        const timeout = setTimeout(() => {
+          ws.close()
+          reject(new Error(`Timed out waiting for runtime restart synchronization flow for session ${sessionId}`))
+        }, 15_000)
+
+        ws.onmessage = (event) => {
+          const msg = JSON.parse(event.data as string)
+
+          if (msg.type === 'connected' && phase === 'boot') {
+            ws.send(JSON.stringify({
+              type: 'set_runtime_config',
+              providerId: providerA.id,
+              modelId: 'restart-a-sonnet',
+            }))
+            ws.send(JSON.stringify({ type: 'user_message', content: 'first turn' }))
+            phase = 'turn1'
+            return
+          }
+
+          if (msg.type === 'error') {
+            clearTimeout(timeout)
+            ws.close()
+            reject(new Error(msg.message))
+            return
+          }
+
+          if (msg.type === 'message_complete' && phase === 'turn1') {
+            ws.send(JSON.stringify({
+              type: 'set_runtime_config',
+              providerId: providerB.id,
+              modelId: 'restart-b-opus',
+            }))
+            ws.send(JSON.stringify({ type: 'user_message', content: 'second turn immediately after switch' }))
+            phase = 'turn2'
+            return
+          }
+
+          if (msg.type === 'message_complete' && phase === 'turn2') {
+            ws.send(JSON.stringify({ type: 'user_message', content: 'third turn should reuse restarted runtime' }))
+            phase = 'turn3'
+            return
+          }
+
+          if (msg.type === 'message_complete' && phase === 'turn3') {
+            clearTimeout(timeout)
+            phase = 'done'
+            ws.close()
+            resolve()
+          }
+        }
+
+        ws.onerror = () => {
+          reject(new Error(`WebSocket error for runtime restart synchronization session ${sessionId}`))
+        }
+      })
+
+      expect(startCalls).toHaveLength(2)
+      expect(startCalls[0]).toMatchObject({
+        sessionId,
+        options: {
+          providerId: providerA.id,
+          model: 'restart-a-sonnet',
+        },
+      })
+      expect(startCalls[1]).toMatchObject({
+        sessionId,
+        options: {
+          providerId: providerB.id,
+          model: 'restart-b-opus',
+        },
+      })
+    } finally {
+      conversationService.startSession = originalStartSession
+      conversationService.stopSession(sessionId)
+    }
+  }, 20_000)
 })
diff --git a/src/server/__tests__/desktop-cli-launcher.test.ts b/src/server/__tests__/desktop-cli-launcher.test.ts
new file mode 100644
index 00000000..5be027b7
--- /dev/null
+++ b/src/server/__tests__/desktop-cli-launcher.test.ts
@@ -0,0 +1,100 @@
+import { afterEach, beforeEach, describe, expect, it } from 'bun:test'
+import { chmod, mkdtemp, readFile, rm, writeFile } from 'node:fs/promises'
+import { join } from 'node:path'
+import { tmpdir } from 'node:os'
+
+import { ensureDesktopCliLauncherInstalled } from '../services/desktopCliLauncherService.js'
+
+const isWindows = process.platform === 'win32'
+const unixOnly = isWindows ? it.skip : it
+
+const ORIGINAL_HOME = process.env.HOME
+const ORIGINAL_USERPROFILE = process.env.USERPROFILE
+const ORIGINAL_SHELL = process.env.SHELL
+const ORIGINAL_PATH = process.env.PATH
+const ORIGINAL_CLAUDE_CLI_PATH = process.env.CLAUDE_CLI_PATH
+
+describe('ensureDesktopCliLauncherInstalled', () => {
+  let tempHome = ''
+  let tempSourceDir = ''
+
+  beforeEach(async () => {
+    tempHome = await mkdtemp(join(tmpdir(), 'desktop-cli-home-'))
+    tempSourceDir = await mkdtemp(join(tmpdir(), 'desktop-cli-source-'))
+    process.env.HOME = tempHome
+    process.env.USERPROFILE = tempHome
+    process.env.SHELL = '/bin/zsh'
+    process.env.PATH = ''
+  })
+
+  afterEach(async () => {
+    if (ORIGINAL_HOME === undefined) {
+      delete process.env.HOME
+    } else {
+      process.env.HOME = ORIGINAL_HOME
+    }
+
+    if (ORIGINAL_USERPROFILE === undefined) {
+      delete process.env.USERPROFILE
+    } else {
+      process.env.USERPROFILE = ORIGINAL_USERPROFILE
+    }
+
+    if (ORIGINAL_SHELL === undefined) {
+      delete process.env.SHELL
+    } else {
+      process.env.SHELL = ORIGINAL_SHELL
+    }
+
+    if (ORIGINAL_PATH === undefined) {
+      delete process.env.PATH
+    } else {
+      process.env.PATH = ORIGINAL_PATH
+    }
+
+    if (ORIGINAL_CLAUDE_CLI_PATH === undefined) {
+      delete process.env.CLAUDE_CLI_PATH
+    } else {
+      process.env.CLAUDE_CLI_PATH = ORIGINAL_CLAUDE_CLI_PATH
+    }
+
+    await rm(tempHome, { recursive: true, force: true })
+    await rm(tempSourceDir, { recursive: true, force: true })
+  })
+
+  unixOnly('copies the bundled sidecar into the user bin dir and configures PATH', async () => {
+    const sourcePath = join(tempSourceDir, 'claude-sidecar')
+    await writeFile(sourcePath, '#!/bin/sh\necho desktop-sidecar\n', 'utf8')
+    await chmod(sourcePath, 0o755)
+    process.env.CLAUDE_CLI_PATH = sourcePath
+
+    const status = await ensureDesktopCliLauncherInstalled()
+    const launcherPath = join(tempHome, '.local', 'bin', 'claude-haha')
+    const shellConfigPath = join(tempHome, '.zshrc')
+
+    expect(status.supported).toBe(true)
+    expect(status.installed).toBe(true)
+    expect(status.command).toBe('claude-haha')
+    expect(status.launcherPath).toBe(launcherPath)
+    expect(status.availableInNewTerminals).toBe(true)
+    expect(status.needsTerminalRestart).toBe(true)
+    expect(status.configTarget).toBe(shellConfigPath)
+
+    expect(await readFile(launcherPath, 'utf8')).toContain('desktop-sidecar')
+    expect(await readFile(shellConfigPath, 'utf8')).toContain(
+      'export PATH="$HOME/.local/bin:$PATH"',
+    )
+  })
+
+  it('reports unsupported status when the current launcher is not a bundled sidecar', async () => {
+    const sourcePath = join(tempSourceDir, 'claude')
+    await writeFile(sourcePath, '#!/bin/sh\necho plain-cli\n', 'utf8')
+    process.env.CLAUDE_CLI_PATH = sourcePath
+
+    const status = await ensureDesktopCliLauncherInstalled()
+
+    expect(status.supported).toBe(false)
+    expect(status.installed).toBe(false)
+    expect(status.command).toBe('claude-haha')
+  })
+})
diff --git a/src/server/__tests__/mcp.test.ts b/src/server/__tests__/mcp.test.ts
index 0ccb7f64..c1650039 100644
--- a/src/server/__tests__/mcp.test.ts
+++ b/src/server/__tests__/mcp.test.ts
@@ -3,12 +3,17 @@ import * as fs from 'fs/promises'
 import * as os from 'os'
 import * as path from 'path'
 import * as mcpClient from '../../services/mcp/client.js'
+import * as mcpConfig from '../../services/mcp/config.js'
+import * as mcpHostPreflight from '../services/mcpHostPreflight.js'
 import { handleMcpApi } from '../api/mcp.js'
 
 let tmpDir: string
 let projectRoot: string
 let originalConfigDir: string | undefined
 let connectSpy: ReturnType<typeof spyOn> | undefined
+let getClaudeCodeMcpConfigsSpy: ReturnType<typeof spyOn> | undefined
+let reconnectSpy: ReturnType<typeof spyOn> | undefined
+let hostPreflightSpy: ReturnType<typeof spyOn> | undefined
 
 async function setup() {
   tmpDir = await fs.mkdtemp(path.join(os.tmpdir(), 'claude-mcp-test-'))
@@ -52,6 +57,11 @@ describe('MCP API', () => {
   beforeEach(async () => {
     await setup()
 
+    hostPreflightSpy = spyOn(mcpHostPreflight, 'inspectMcpHostCommand').mockResolvedValue({
+      ok: true,
+      resolvedCommand: '/usr/bin/mock-command',
+    })
+
     connectSpy = spyOn(mcpClient, 'connectToServer').mockImplementation(async (name, config) => ({
       name,
       type: 'connected',
@@ -65,6 +75,12 @@ describe('MCP API', () => {
   afterEach(async () => {
     connectSpy?.mockRestore()
     connectSpy = undefined
+    getClaudeCodeMcpConfigsSpy?.mockRestore()
+    getClaudeCodeMcpConfigsSpy = undefined
+    reconnectSpy?.mockRestore()
+    reconnectSpy = undefined
+    hostPreflightSpy?.mockRestore()
+    hostPreflightSpy = undefined
     await teardown()
   })
 
@@ -88,6 +104,7 @@ describe('MCP API', () => {
     const createdBody = await createRes.json()
     expect(createdBody.server.name).toBe('chrome-devtools')
     expect(createdBody.server.transport).toBe('stdio')
+    expect(createdBody.server.status).toBe('checking')
 
     const list = makeRequest('GET', `/api/mcp?cwd=${encodeURIComponent(projectRoot)}`)
     const listRes = await handleMcpApi(list.req, list.url, list.segments)
@@ -96,8 +113,91 @@ describe('MCP API', () => {
 
     expect(listBody.servers).toHaveLength(1)
     expect(listBody.servers[0].name).toBe('chrome-devtools')
-    expect(listBody.servers[0].status).toBe('connected')
+    expect(listBody.servers[0].status).toBe('checking')
     expect(listBody.servers[0].config.command).toBe('npx')
+    expect(connectSpy).not.toHaveBeenCalled()
+  })
+
+  it('checks a single server status on demand', async () => {
+    const create = makeRequest('POST', '/api/mcp', {
+      cwd: projectRoot,
+      name: 'deepwiki',
+      scope: 'user',
+      config: {
+        type: 'http',
+        url: 'https://mcp.example.com/mcp',
+        headers: {},
+      },
+    })
+    await handleMcpApi(create.req, create.url, create.segments)
+
+    const status = makeRequest('GET', `/api/mcp/deepwiki/status?cwd=${encodeURIComponent(projectRoot)}`)
+    const statusRes = await handleMcpApi(status.req, status.url, status.segments)
+
+    expect(statusRes.status).toBe(200)
+    const body = await statusRes.json()
+    expect(body.server.name).toBe('deepwiki')
+    expect(body.server.status).toBe('connected')
+    expect(connectSpy).toHaveBeenCalled()
+  })
+
+  it('rejects stdio MCP creation when the host command is unavailable', async () => {
+    hostPreflightSpy?.mockResolvedValueOnce({
+      ok: false,
+      message: 'Host command "npx" is not available in PATH.',
+    })
+
+    const create = makeRequest('POST', '/api/mcp', {
+      cwd: projectRoot,
+      name: 'chrome-devtools',
+      scope: 'local',
+      config: {
+        type: 'stdio',
+        command: 'npx',
+        args: ['chrome-devtools-mcp@latest'],
+        env: {},
+      },
+    })
+
+    const createRes = await handleMcpApi(create.req, create.url, create.segments)
+
+    expect(createRes.status).toBe(400)
+    await expect(createRes.json()).resolves.toMatchObject({
+      message: 'Host command "npx" is not available in PATH.',
+    })
+  })
+
+  it('surfaces host preflight failures in live status checks without connecting', async () => {
+    const create = makeRequest('POST', '/api/mcp', {
+      cwd: projectRoot,
+      name: 'chrome-devtools',
+      scope: 'local',
+      config: {
+        type: 'stdio',
+        command: 'npx',
+        args: ['chrome-devtools-mcp@latest'],
+        env: {},
+      },
+    })
+    await handleMcpApi(create.req, create.url, create.segments)
+
+    hostPreflightSpy?.mockResolvedValueOnce({
+      ok: false,
+      message: 'Host command "npx" is not available in PATH.',
+    })
+
+    const status = makeRequest('GET', `/api/mcp/chrome-devtools/status?cwd=${encodeURIComponent(projectRoot)}`)
+    const statusRes = await handleMcpApi(status.req, status.url, status.segments)
+
+    expect(statusRes.status).toBe(200)
+    await expect(statusRes.json()).resolves.toMatchObject({
+      server: {
+        name: 'chrome-devtools',
+        status: 'failed',
+        statusDetail: 'Host command "npx" is not available in PATH.',
+      },
+    })
+    expect(connectSpy).not.toHaveBeenCalled()
   })
 
   it('updates, toggles, and deletes MCP servers', async () => {
@@ -153,4 +253,100 @@ describe('MCP API', () => {
     const listBody = await listRes.json()
     expect(listBody.servers.some((server: { name: string }) => server.name === 'context7')).toBe(false)
   })
+
+  it('reconnects plugin-scoped MCP servers exposed via the merged server list', async () => {
+    const pluginServerName = 'plugin:telegram:telegram'
+    const pluginServerConfig = {
+      scope: 'dynamic',
+      type: 'stdio',
+      command: 'bun',
+      args: ['run', 'start'],
+      env: {
+        CLAUDE_PLUGIN_ROOT: '/tmp/telegram-plugin',
+      },
+      pluginSource: 'telegram@claude-plugins-official',
+    } as const
+
+    getClaudeCodeMcpConfigsSpy = spyOn(mcpConfig, 'getClaudeCodeMcpConfigs').mockResolvedValue({
+      servers: {
+        [pluginServerName]: pluginServerConfig,
+      },
+      errors: [],
+    })
+
+    reconnectSpy = spyOn(mcpClient, 'reconnectMcpServerImpl').mockResolvedValue({
+      name: pluginServerName,
+      client: {
+        name: pluginServerName,
+        type: 'connected',
+        client: {} as never,
+        capabilities: {},
+        config: pluginServerConfig,
+        cleanup: mock(async () => {}),
+      },
+    })
+
+    const reconnect = makeRequest('POST', `/api/mcp/${encodeURIComponent(pluginServerName)}/reconnect`, {
+      cwd: projectRoot,
+    })
+    const reconnectRes = await handleMcpApi(reconnect.req, reconnect.url, reconnect.segments)
+
+    expect(reconnectRes.status).toBe(200)
+    expect(reconnectSpy).toHaveBeenCalledWith(pluginServerName, pluginServerConfig)
+
+    const body = await reconnectRes.json()
+    expect(body.server.name).toBe(pluginServerName)
+    expect(body.server.scope).toBe('dynamic')
+  })
+
+  it('returns a failed server state when reconnect preflight fails on the host machine', async () => {
+    const pluginServerName = 'plugin:telegram:telegram'
+    const pluginServerConfig = {
+      scope: 'dynamic',
+      type: 'stdio',
+      command: 'npx',
+      args: ['telegram-mcp'],
+      env: {},
+      pluginSource: 'telegram@claude-plugins-official',
+    } as const
+
+    getClaudeCodeMcpConfigsSpy = spyOn(mcpConfig, 'getClaudeCodeMcpConfigs').mockResolvedValue({
+      servers: {
+        [pluginServerName]: pluginServerConfig,
+      },
+      errors: [],
+    })
+
+    hostPreflightSpy?.mockResolvedValueOnce({
+      ok: false,
+      message: 'Host command "npx" is not available in PATH.',
+    })
+
+    reconnectSpy = spyOn(mcpClient, 'reconnectMcpServerImpl').mockResolvedValue({
+      name: pluginServerName,
+      client: {
+        name: pluginServerName,
+        type: 'connected',
+        client: {} as never,
+        capabilities: {},
+        config: pluginServerConfig,
+        cleanup: mock(async () => {}),
+      },
+    })
+
+    const reconnect = makeRequest('POST', `/api/mcp/${encodeURIComponent(pluginServerName)}/reconnect`, {
+      cwd: projectRoot,
+    })
+    const reconnectRes = await handleMcpApi(reconnect.req, reconnect.url, reconnect.segments)
+
+    expect(reconnectRes.status).toBe(200)
+    expect(reconnectSpy).not.toHaveBeenCalled()
+    await expect(reconnectRes.json()).resolves.toMatchObject({
+      server: {
+        name: pluginServerName,
+        status: 'failed',
+        statusDetail: 'Host command "npx" is not available in PATH.',
+      },
+    })
+  })
 })
diff --git a/src/server/__tests__/provider-presets.test.ts b/src/server/__tests__/provider-presets.test.ts
new file mode 100644
index 00000000..c698905a
--- /dev/null
+++ b/src/server/__tests__/provider-presets.test.ts
@@ -0,0 +1,105 @@
+import { describe, test, expect, beforeEach, afterEach } from 'bun:test'
+import * as fs from 'fs/promises'
+import * as os from 'os'
+import * as path from 'path'
+
+import { handleProvidersApi } from '../api/providers.js'
+import { PROVIDER_PRESETS } from '../config/providerPresets.js'
+
+let tmpDir: string
+let originalConfigDir: string | undefined
+
+beforeEach(async () => {
+  tmpDir = await fs.mkdtemp(path.join(os.tmpdir(), 'provider-presets-test-'))
+  originalConfigDir = process.env.CLAUDE_CONFIG_DIR
+  process.env.CLAUDE_CONFIG_DIR = tmpDir
+})
+
+afterEach(async () => {
+  if (originalConfigDir !== undefined) {
+    process.env.CLAUDE_CONFIG_DIR = originalConfigDir
+  } else {
+    delete process.env.CLAUDE_CONFIG_DIR
+  }
+  await fs.rm(tmpDir, { recursive: true, force: true })
+})
+
+function makeRequest(
+  method: string,
+  urlStr: string,
+  body?: Record<string, unknown>,
+): { req: Request; url: URL; segments: string[] } {
+  const url = new URL(urlStr, 'http://localhost:3456')
+  const init: RequestInit = { method }
+  if (body) {
+    init.headers = { 'Content-Type': 'application/json' }
+    init.body = JSON.stringify(body)
+  }
+  const req = new Request(url.toString(), init)
+  const segments = url.pathname.split('/').filter(Boolean)
+  return { req, url, segments }
+}
+
+describe('provider presets API', () => {
+  test('GET /api/providers/presets returns the configured presets', async () => {
+    const { req, url, segments } = makeRequest('GET', '/api/providers/presets')
+    const response = await handleProvidersApi(req, url, segments)
+
+    expect(response.status).toBe(200)
+    expect(await response.json()).toEqual({ presets: PROVIDER_PRESETS })
+  })
+
+  test('configured presets include built-in official and custom entries', () => {
+    expect(PROVIDER_PRESETS.some((preset) => preset.id === 'official')).toBe(true)
+    expect(PROVIDER_PRESETS.some((preset) => preset.id === 'custom')).toBe(true)
+  })
+
+  test('configured presets keep current default model ids aligned with official provider docs', () => {
+    const deepseek = PROVIDER_PRESETS.find((preset) => preset.id === 'deepseek')
+    const zhipu = PROVIDER_PRESETS.find((preset) => preset.id === 'zhipuglm')
+    const kimi = PROVIDER_PRESETS.find((preset) => preset.id === 'kimi')
+    const minimax = PROVIDER_PRESETS.find((preset) => preset.id === 'minimax')
+
+    expect(deepseek?.defaultModels.main).toBe('deepseek-chat')
+    expect(deepseek?.defaultModels.haiku).toBe('deepseek-chat')
+    expect(zhipu?.defaultModels.main).toBe('glm-5.1')
+    expect(zhipu?.defaultModels.haiku).toBe('glm-4.5-air')
+    expect(zhipu?.defaultModels.sonnet).toBe('glm-5-turbo')
+    expect(zhipu?.defaultModels.opus).toBe('glm-5.1')
+    expect(kimi?.defaultModels.main).toBe('kimi-k2.6')
+    expect(minimax?.defaultModels.main).toBe('MiniMax-M2.7')
+  })
+
+  test('GET and PUT /api/providers/settings read and write cc-haha settings.json', async () => {
+    const initial = {
+      env: {
+        ANTHROPIC_MODEL: 'glm-5.1',
+      },
+      model: 'glm-5.1',
+    }
+    await fs.mkdir(path.join(tmpDir, 'cc-haha'), { recursive: true })
+    await fs.writeFile(
+      path.join(tmpDir, 'cc-haha', 'settings.json'),
+      JSON.stringify(initial, null, 2),
+      'utf-8',
+    )
+
+    const getReq = makeRequest('GET', '/api/providers/settings')
+    const getRes = await handleProvidersApi(getReq.req, getReq.url, getReq.segments)
+    expect(getRes.status).toBe(200)
+    expect(await getRes.json()).toEqual(initial)
+
+    const updateBody = {
+      model: 'kimi-k2.6',
+      env: {
+        ANTHROPIC_MODEL: 'kimi-k2.6',
+      },
+    }
+    const putReq = makeRequest('PUT', '/api/providers/settings', updateBody)
+    const putRes = await handleProvidersApi(putReq.req, putReq.url, putReq.segments)
+    expect(putRes.status).toBe(200)
+
+    const updatedRaw = await fs.readFile(path.join(tmpDir, 'cc-haha', 'settings.json'), 'utf-8')
+    expect(JSON.parse(updatedRaw)).toEqual(updateBody)
+  })
+})
diff --git a/src/server/__tests__/providers-real.test.ts b/src/server/__tests__/providers-real.test.ts
index a5f48783..955867d4 100644
--- a/src/server/__tests__/providers-real.test.ts
+++ b/src/server/__tests__/providers-real.test.ts
@@ -66,7 +66,7 @@ describe('Real Provider Configs', () => {
     // 验证写入 cc-haha/settings.json
     const settings = await readCcHahaSettings()
     expect((settings.env as Record<string, string>).ANTHROPIC_BASE_URL).toBe('https://api.minimaxi.com/anthropic')
-    expect((settings.env as Record<string, string>).ANTHROPIC_AUTH_TOKEN).toBe('sk-fake-test-key-for-testing-only')
+    expect((settings.env as Record<string, string>).ANTHROPIC_API_KEY).toBe('sk-fake-test-key-for-testing-only')
     expect((settings.env as Record<string, string>).ANTHROPIC_MODEL).toBe('MiniMax-M2.7-highspeed')
 
     // 验证原版 settings.json 没有被创建
@@ -106,7 +106,7 @@ describe('Real Provider Configs', () => {
     await service.activateProvider(jiekou.id)
     settings = await readCcHahaSettings()
     expect((settings.env as Record<string, string>).ANTHROPIC_BASE_URL).toBe('https://api.jiekou.ai/anthropic')
-    expect((settings.env as Record<string, string>).ANTHROPIC_AUTH_TOKEN).toBe('sk-fake-test-key-for-testing-only')
+    expect((settings.env as Record<string, string>).ANTHROPIC_API_KEY).toBe('sk-fake-test-key-for-testing-only')
     expect((settings.env as Record<string, string>).ANTHROPIC_MODEL).toBe('claude-opus-4-7')
 
     // 验证 activeId 正确
@@ -151,7 +151,7 @@ describe('Real Provider Configs', () => {
 
     // 验证新字段写入
     expect((settings.env as Record<string, string>).ANTHROPIC_BASE_URL).toBe('https://api.jiekou.ai/anthropic')
-    expect((settings.env as Record<string, string>).ANTHROPIC_AUTH_TOKEN).toBe('sk_test')
+    expect((settings.env as Record<string, string>).ANTHROPIC_API_KEY).toBe('sk_test')
 
     // 验证已有字段保留
     expect(settings.customField).toBe('should_be_preserved')
@@ -181,7 +181,7 @@ describe('Real Provider Configs', () => {
     settings = await readCcHahaSettings()
     const env = settings.env as Record<string, string> | undefined
     expect(env?.ANTHROPIC_BASE_URL).toBeUndefined()
-    expect(env?.ANTHROPIC_AUTH_TOKEN).toBeUndefined()
+    expect(env?.ANTHROPIC_API_KEY).toBeUndefined()
     expect(env?.ANTHROPIC_MODEL).toBeUndefined()
 
     console.log('✅ activateOfficial 正确清除了 provider env')
@@ -213,7 +213,7 @@ describe('Real Provider Configs', () => {
         effortLevel: 'high',
         env: {
           ANTHROPIC_BASE_URL: 'https://original-claude-code.api.com',
-          ANTHROPIC_AUTH_TOKEN: 'original-key',
+          ANTHROPIC_API_KEY: 'original-key',
         },
       }, null, 2),
     )
@@ -231,13 +231,13 @@ describe('Real Provider Configs', () => {
     // 验证原版 settings.json 没被修改
     const original = JSON.parse(await fs.readFile(path.join(tmpDir, 'settings.json'), 'utf-8'))
     expect((original.env as Record<string, string>).ANTHROPIC_BASE_URL).toBe('https://original-claude-code.api.com')
-    expect((original.env as Record<string, string>).ANTHROPIC_AUTH_TOKEN).toBe('original-key')
+    expect((original.env as Record<string, string>).ANTHROPIC_API_KEY).toBe('original-key')
     expect(original.effortLevel).toBe('high')
 
     // 验证 cc-haha/settings.json 是 Haha 自己的
     const haha = await readCcHahaSettings()
     expect((haha.env as Record<string, string>).ANTHROPIC_BASE_URL).toBe('https://api.minimaxi.com/anthropic')
-    expect((haha.env as Record<string, string>).ANTHROPIC_AUTH_TOKEN).toBe('sk-haha-key')
+    expect((haha.env as Record<string, string>).ANTHROPIC_API_KEY).toBe('sk-haha-key')
 
     console.log('✅ 原版 settings.json 完好无损，Haha 配置独立存储')
   })
diff --git a/src/server/__tests__/providers.test.ts b/src/server/__tests__/providers.test.ts
index fef8bf8e..426f8a3c 100644
--- a/src/server/__tests__/providers.test.ts
+++ b/src/server/__tests__/providers.test.ts
@@ -50,26 +50,30 @@ function makeRequest(
 /** A sample provider input for reuse across tests */
 function sampleInput(overrides?: Partial<CreateProviderInput>): CreateProviderInput {
   return {
+    presetId: 'custom',
     name: 'Test Provider',
     baseUrl: 'https://api.example.com',
     apiKey: 'sk-test-key-123',
-    models: [
-      { id: 'model-a', name: 'Model A' },
-      { id: 'model-b', name: 'Model B' },
-    ],
+    apiFormat: 'anthropic',
+    models: {
+      main: 'model-main',
+      haiku: 'model-haiku',
+      sonnet: 'model-sonnet',
+      opus: 'model-opus',
+    },
     ...overrides,
   }
 }
 
 /** Read the settings.json written to the temp config dir */
 async function readSettings(): Promise<Record<string, unknown>> {
-  const raw = await fs.readFile(path.join(tmpDir, 'settings.json'), 'utf-8')
+  const raw = await fs.readFile(path.join(tmpDir, 'cc-haha', 'settings.json'), 'utf-8')
   return JSON.parse(raw) as Record<string, unknown>
 }
 
 /** Read the providers.json written to the temp config dir */
 async function readProvidersConfig(): Promise<Record<string, unknown>> {
-  const raw = await fs.readFile(path.join(tmpDir, 'providers.json'), 'utf-8')
+  const raw = await fs.readFile(path.join(tmpDir, 'cc-haha', 'providers.json'), 'utf-8')
   return JSON.parse(raw) as Record<string, unknown>
 }
 
@@ -86,8 +90,8 @@ describe('ProviderService', () => {
   describe('listProviders', () => {
     test('should return empty array when no providers exist', async () => {
       const svc = new ProviderService()
-      const providers = await svc.listProviders()
-      expect(providers).toEqual([])
+      const result = await svc.listProviders()
+      expect(result).toEqual({ providers: [], activeId: null })
     })
 
     test('should return all added providers', async () => {
@@ -95,10 +99,11 @@ describe('ProviderService', () => {
       await svc.addProvider(sampleInput({ name: 'Provider A' }))
       await svc.addProvider(sampleInput({ name: 'Provider B' }))
 
-      const providers = await svc.listProviders()
+      const { providers, activeId } = await svc.listProviders()
       expect(providers).toHaveLength(2)
       expect(providers[0].name).toBe('Provider A')
       expect(providers[1].name).toBe('Provider B')
+      expect(activeId).toBeNull()
     })
   })
 
@@ -113,35 +118,33 @@ describe('ProviderService', () => {
       expect(provider.name).toBe('Test Provider')
       expect(provider.baseUrl).toBe('https://api.example.com')
       expect(provider.apiKey).toBe('sk-test-key-123')
-      expect(provider.models).toHaveLength(2)
-      expect(provider.createdAt).toBeGreaterThan(0)
-      expect(provider.updatedAt).toBeGreaterThan(0)
+      expect(provider.models.main).toBe('model-main')
     })
 
-    test('first provider should be auto-activated', async () => {
+    test('new providers should not be auto-activated', async () => {
       const svc = new ProviderService()
       const provider = await svc.addProvider(sampleInput())
 
-      expect(provider.isActive).toBe(true)
+      expect(provider.id).toBeDefined()
+      const { activeId } = await svc.listProviders()
+      expect(activeId).toBeNull()
     })
 
-    test('first provider auto-activation should sync to settings.json', async () => {
+    test('adding a provider should not sync settings until activated', async () => {
       const svc = new ProviderService()
       await svc.addProvider(sampleInput())
 
-      const settings = await readSettings()
-      const env = settings.env as Record<string, string>
-      expect(env.ANTHROPIC_BASE_URL).toBe('https://api.example.com')
-      expect(env.ANTHROPIC_AUTH_TOKEN).toBe('sk-test-key-123')
-      expect(settings.model).toBe('model-a')
+      await expect(fs.readFile(path.join(tmpDir, 'cc-haha', 'settings.json'), 'utf-8')).rejects.toThrow()
     })
 
-    test('second provider should not be auto-activated', async () => {
+    test('adding additional providers should keep activeId unchanged', async () => {
       const svc = new ProviderService()
       await svc.addProvider(sampleInput({ name: 'First' }))
       const second = await svc.addProvider(sampleInput({ name: 'Second' }))
 
-      expect(second.isActive).toBe(false)
+      expect(second.id).toBeDefined()
+      const { activeId } = await svc.listProviders()
+      expect(activeId).toBeNull()
     })
 
     test('should preserve optional notes field', async () => {
@@ -193,7 +196,6 @@ describe('ProviderService', () => {
       expect(updated.baseUrl).toBe('https://new-api.example.com')
       // unchanged fields preserved
       expect(updated.apiKey).toBe('sk-test-key-123')
-      expect(updated.updatedAt).toBeGreaterThanOrEqual(added.updatedAt)
     })
 
     test('should throw 404 for non-existent provider', async () => {
@@ -211,8 +213,8 @@ describe('ProviderService', () => {
     test('updating active provider should re-sync settings.json', async () => {
       const svc = new ProviderService()
       const added = await svc.addProvider(sampleInput())
+      await svc.activateProvider(added.id)
 
-      // First provider is auto-activated, so updating it should re-sync
       await svc.updateProvider(added.id, {
         baseUrl: 'https://new-api.example.com',
         apiKey: 'sk-new-key',
@@ -221,7 +223,8 @@ describe('ProviderService', () => {
       const settings = await readSettings()
       const env = settings.env as Record<string, string>
       expect(env.ANTHROPIC_BASE_URL).toBe('https://new-api.example.com')
-      expect(env.ANTHROPIC_AUTH_TOKEN).toBe('sk-new-key')
+      expect(env.ANTHROPIC_API_KEY).toBe('sk-new-key')
+      expect(env.ANTHROPIC_MODEL).toBe('model-main')
     })
   })
 
@@ -236,7 +239,7 @@ describe('ProviderService', () => {
       // Second is inactive, so deletion should succeed
       await svc.deleteProvider(second.id)
 
-      const providers = await svc.listProviders()
+      const { providers } = await svc.listProviders()
       expect(providers).toHaveLength(1)
       expect(providers[0].name).toBe('First')
     })
@@ -244,6 +247,7 @@ describe('ProviderService', () => {
     test('should throw 409 when deleting an active provider', async () => {
       const svc = new ProviderService()
       const active = await svc.addProvider(sampleInput())
+      await svc.activateProvider(active.id)
 
       try {
         await svc.deleteProvider(active.id)
@@ -281,14 +285,13 @@ describe('ProviderService', () => {
         }),
       )
 
-      await svc.activateProvider(second.id, 'model-a')
+      await svc.activateProvider(second.id)
 
       // Second should now be active
-      const providers = await svc.listProviders()
-      const activeFirst = providers.find((p) => p.id === first.id)
-      const activeSecond = providers.find((p) => p.id === second.id)
-      expect(activeFirst!.isActive).toBe(false)
-      expect(activeSecond!.isActive).toBe(true)
+      const { activeId, providers } = await svc.listProviders()
+      expect(activeId).toBe(second.id)
+      expect(providers.find((p) => p.id === first.id)).toBeDefined()
+      expect(providers.find((p) => p.id === second.id)).toBeDefined()
     })
 
     test('should write correct settings.json on activation', async () => {
@@ -302,19 +305,23 @@ describe('ProviderService', () => {
         }),
       )
 
-      await svc.activateProvider(second.id, 'model-b')
+      await svc.activateProvider(second.id)
 
       const settings = await readSettings()
       const env = settings.env as Record<string, string>
       expect(env.ANTHROPIC_BASE_URL).toBe('https://second-api.example.com')
-      expect(env.ANTHROPIC_AUTH_TOKEN).toBe('sk-second-key')
-      expect(settings.model).toBe('model-b')
+      expect(env.ANTHROPIC_API_KEY).toBe('sk-second-key')
+      expect(env.ANTHROPIC_MODEL).toBe('model-main')
+      expect(env.ANTHROPIC_DEFAULT_HAIKU_MODEL).toBe('model-haiku')
+      expect(env.ANTHROPIC_DEFAULT_SONNET_MODEL).toBe('model-sonnet')
+      expect(env.ANTHROPIC_DEFAULT_OPUS_MODEL).toBe('model-opus')
     })
 
     test('should preserve existing settings.json fields on activation', async () => {
       // Pre-seed settings with an extra field
+      await fs.mkdir(path.join(tmpDir, 'cc-haha'), { recursive: true })
       await fs.writeFile(
-        path.join(tmpDir, 'settings.json'),
+        path.join(tmpDir, 'cc-haha', 'settings.json'),
         JSON.stringify({ theme: 'dark', env: { CUSTOM_VAR: 'keep-me' } }),
       )
 
@@ -322,7 +329,7 @@ describe('ProviderService', () => {
       const provider = await svc.addProvider(sampleInput())
 
       // Re-activate to verify merge behavior
-      await svc.activateProvider(provider.id, 'model-a')
+      await svc.activateProvider(provider.id)
 
       const settings = await readSettings()
       expect(settings.theme).toBe('dark')
@@ -331,24 +338,11 @@ describe('ProviderService', () => {
       expect(env.ANTHROPIC_BASE_URL).toBe('https://api.example.com')
     })
 
-    test('should throw 400 for non-existent model id', async () => {
-      const svc = new ProviderService()
-      const provider = await svc.addProvider(sampleInput())
-
-      try {
-        await svc.activateProvider(provider.id, 'non-existent-model')
-        expect(true).toBe(false)
-      } catch (err: unknown) {
-        const apiErr = err as { statusCode: number }
-        expect(apiErr.statusCode).toBe(400)
-      }
-    })
-
     test('should throw 404 for non-existent provider id', async () => {
       const svc = new ProviderService()
 
       try {
-        await svc.activateProvider('non-existent-id', 'model-a')
+        await svc.activateProvider('non-existent-id')
         expect(true).toBe(false)
       } catch (err: unknown) {
         const apiErr = err as { statusCode: number }
@@ -356,33 +350,36 @@ describe('ProviderService', () => {
       }
     })
 
-    test('activeModel should be persisted in providers.json', async () => {
+    test('activeId should be persisted in providers.json', async () => {
       const svc = new ProviderService()
       const provider = await svc.addProvider(sampleInput())
 
-      await svc.activateProvider(provider.id, 'model-b')
+      await svc.activateProvider(provider.id)
 
       const config = await readProvidersConfig()
-      expect(config.activeModel).toBe('model-b')
+      expect(config.activeId).toBe(provider.id)
     })
   })
 
-  // ─── getActiveProvider ───────────────────────────────────────────────────
+  // ─── getProviderForProxy ─────────────────────────────────────────────────
 
-  describe('getActiveProvider', () => {
-    test('should return null when no providers exist', async () => {
+  describe('getProviderForProxy', () => {
+    test('should return null when no provider is active', async () => {
       const svc = new ProviderService()
-      const active = await svc.getActiveProvider()
+      const active = await svc.getProviderForProxy()
       expect(active).toBeNull()
     })
 
-    test('should return the active provider', async () => {
+    test('should return the active provider proxy config', async () => {
       const svc = new ProviderService()
       const provider = await svc.addProvider(sampleInput())
+      await svc.activateProvider(provider.id)
 
-      const active = await svc.getActiveProvider()
+      const active = await svc.getProviderForProxy()
       expect(active).not.toBeNull()
-      expect(active!.id).toBe(provider.id)
+      expect(active!.baseUrl).toBe(provider.baseUrl)
+      expect(active!.apiKey).toBe(provider.apiKey)
+      expect(active!.apiFormat).toBe('anthropic')
     })
   })
 })
@@ -424,17 +421,24 @@ describe('Providers API', () => {
 
   test('POST /api/providers should create a provider', async () => {
     const { req, url, segments } = makeRequest('POST', '/api/providers', {
+      presetId: 'custom',
       name: 'New Provider',
       baseUrl: 'https://api.example.com',
       apiKey: 'sk-test',
-      models: [{ id: 'gpt-4', name: 'GPT-4' }],
+      apiFormat: 'anthropic',
+      models: {
+        main: 'gpt-4',
+        haiku: 'gpt-4-haiku',
+        sonnet: 'gpt-4-sonnet',
+        opus: 'gpt-4-opus',
+      },
     })
     const res = await handleProvidersApi(req, url, segments)
 
     expect(res.status).toBe(201)
-    const body = (await res.json()) as { provider: { name: string; isActive: boolean } }
+    const body = (await res.json()) as { provider: { name: string; models: { main: string } } }
     expect(body.provider.name).toBe('New Provider')
-    expect(body.provider.isActive).toBe(true) // first provider auto-activated
+    expect(body.provider.models.main).toBe('gpt-4')
   })
 
   test('POST /api/providers should return 400 for invalid input', async () => {
@@ -501,6 +505,7 @@ describe('Providers API', () => {
   test('DELETE /api/providers/:id should return 409 for active provider', async () => {
     const svc = new ProviderService()
     const active = await svc.addProvider(sampleInput())
+    await svc.activateProvider(active.id)
 
     const { req, url, segments } = makeRequest('DELETE', `/api/providers/${active.id}`)
     const res = await handleProvidersApi(req, url, segments)
@@ -524,7 +529,6 @@ describe('Providers API', () => {
     const { req, url, segments } = makeRequest(
       'POST',
       `/api/providers/${second.id}/activate`,
-      { modelId: 'model-a' },
     )
     const res = await handleProvidersApi(req, url, segments)
 
@@ -536,11 +540,11 @@ describe('Providers API', () => {
     const settings = await readSettings()
     const env = settings.env as Record<string, string>
     expect(env.ANTHROPIC_BASE_URL).toBe('https://second.example.com')
-    expect(env.ANTHROPIC_AUTH_TOKEN).toBe('sk-second')
-    expect(settings.model).toBe('model-a')
+    expect(env.ANTHROPIC_API_KEY).toBe('sk-second')
+    expect(env.ANTHROPIC_MODEL).toBe('model-main')
   })
 
-  test('POST /api/providers/:id/activate should return 400 for missing modelId', async () => {
+  test('POST /api/providers/:id/activate should not require modelId', async () => {
     const svc = new ProviderService()
     const provider = await svc.addProvider(sampleInput())
 
@@ -551,10 +555,10 @@ describe('Providers API', () => {
     )
     const res = await handleProvidersApi(req, url, segments)
 
-    expect(res.status).toBe(400)
+    expect(res.status).toBe(200)
   })
 
-  test('POST /api/providers/:id/activate should return 400 for invalid model', async () => {
+  test('POST /api/providers/:id/activate should ignore modelId because session runtime selects the model', async () => {
     const svc = new ProviderService()
     const provider = await svc.addProvider(sampleInput())
 
@@ -565,7 +569,7 @@ describe('Providers API', () => {
     )
     const res = await handleProvidersApi(req, url, segments)
 
-    expect(res.status).toBe(400)
+    expect(res.status).toBe(200)
   })
 
   // ─── Method not allowed ──────────────────────────────────────────────────
diff --git a/src/server/__tests__/settings.test.ts b/src/server/__tests__/settings.test.ts
index 018d06dc..f776ab58 100644
--- a/src/server/__tests__/settings.test.ts
+++ b/src/server/__tests__/settings.test.ts
@@ -10,16 +10,31 @@ import { SettingsService } from '../services/settingsService.js'
 import { handleSettingsApi } from '../api/settings.js'
 import { handleModelsApi } from '../api/models.js'
 import { handleStatusApi, resetUsage, addUsage } from '../api/status.js'
+import { ProviderService } from '../services/providerService.js'
 
 // ─── Test helpers ─────────────────────────────────────────────────────────────
 
 let tmpDir: string
 let originalConfigDir: string | undefined
+let originalHome: string | undefined
+let originalUserProfile: string | undefined
+let originalShell: string | undefined
+let originalPath: string | undefined
+let originalCliPath: string | undefined
 
 async function setup() {
   tmpDir = await fs.mkdtemp(path.join(os.tmpdir(), 'claude-test-'))
   originalConfigDir = process.env.CLAUDE_CONFIG_DIR
+  originalHome = process.env.HOME
+  originalUserProfile = process.env.USERPROFILE
+  originalShell = process.env.SHELL
+  originalPath = process.env.PATH
+  originalCliPath = process.env.CLAUDE_CLI_PATH
   process.env.CLAUDE_CONFIG_DIR = tmpDir
+  process.env.HOME = tmpDir
+  process.env.USERPROFILE = tmpDir
+  process.env.SHELL = '/bin/zsh'
+  process.env.PATH = ''
 }
 
 async function teardown() {
@@ -28,6 +43,37 @@ async function teardown() {
   } else {
     delete process.env.CLAUDE_CONFIG_DIR
   }
+
+  if (originalHome !== undefined) {
+    process.env.HOME = originalHome
+  } else {
+    delete process.env.HOME
+  }
+
+  if (originalUserProfile !== undefined) {
+    process.env.USERPROFILE = originalUserProfile
+  } else {
+    delete process.env.USERPROFILE
+  }
+
+  if (originalShell !== undefined) {
+    process.env.SHELL = originalShell
+  } else {
+    delete process.env.SHELL
+  }
+
+  if (originalPath !== undefined) {
+    process.env.PATH = originalPath
+  } else {
+    delete process.env.PATH
+  }
+
+  if (originalCliPath !== undefined) {
+    process.env.CLAUDE_CLI_PATH = originalCliPath
+  } else {
+    delete process.env.CLAUDE_CLI_PATH
+  }
+
   await fs.rm(tmpDir, { recursive: true, force: true })
 }
 
@@ -202,6 +248,26 @@ describe('Settings API', () => {
     expect(body2.model).toBe('claude-opus-4-7')
   })
 
+  it('GET /api/settings/cli-launcher should expose bundled launcher status', async () => {
+    if (process.platform === 'win32') return
+
+    const sidecarPath = path.join(tmpDir, 'claude-sidecar')
+    await fs.writeFile(sidecarPath, '#!/bin/sh\necho desktop-sidecar\n', {
+      encoding: 'utf8',
+      mode: 0o755,
+    })
+    process.env.CLAUDE_CLI_PATH = sidecarPath
+
+    const { req, url, segments } = makeRequest('GET', '/api/settings/cli-launcher')
+    const res = await handleSettingsApi(req, url, segments)
+
+    expect(res.status).toBe(200)
+    const body = await res.json()
+    expect(body.command).toBe('claude-haha')
+    expect(body.installed).toBe(true)
+    expect(body.availableInNewTerminals).toBe(true)
+  })
+
   it('GET /api/permissions/mode should return default mode', async () => {
     const { req, url, segments } = makeRequest('GET', '/api/permissions/mode')
     const res = await handleSettingsApi(req, url, segments)
@@ -254,7 +320,7 @@ describe('Models API', () => {
     expect(res.status).toBe(200)
     const body = await res.json()
     expect(body.models).toBeArray()
-    expect(body.models.length).toBe(4)
+    expect(body.models.length).toBe(3)
     expect(body.models[0].id).toContain('claude')
   })
 
@@ -264,7 +330,7 @@ describe('Models API', () => {
 
     expect(res.status).toBe(200)
     const body = await res.json()
-    expect(body.model.id).toBe('claude-sonnet-4-6')
+    expect(body.model.id).toBe('claude-opus-4-7')
   })
 
   it('PUT /api/models/current should switch model', async () => {
@@ -291,6 +357,66 @@ describe('Models API', () => {
     expect(res.status).toBe(400)
   })
 
+  it('GET /api/models/current should prefer cc-haha managed model over global user model when provider is active', async () => {
+    const settingsSvc = new SettingsService()
+    await settingsSvc.updateUserSettings({ model: 'kimi-k2.6' })
+
+    const providerSvc = new ProviderService()
+    const provider = await providerSvc.addProvider({
+      presetId: 'zhipuglm',
+      name: 'Zhipu GLM',
+      baseUrl: 'https://open.bigmodel.cn/api/anthropic',
+      apiKey: 'test-key',
+      apiFormat: 'anthropic',
+      models: {
+        main: 'glm-5.1',
+        haiku: 'glm-4.5-air',
+        sonnet: 'glm-5-turbo',
+        opus: 'glm-5.1',
+      },
+    })
+    await providerSvc.activateProvider(provider.id)
+    await providerSvc.updateManagedSettings({ model: 'glm-5-turbo' })
+
+    const { req, url, segments } = makeRequest('GET', '/api/models/current')
+    const res = await handleModelsApi(req, url, segments)
+
+    expect(res.status).toBe(200)
+    const body = await res.json()
+    expect(body.model.id).toBe('glm-5-turbo')
+  })
+
+  it('PUT /api/models/current should persist to cc-haha managed settings when provider is active', async () => {
+    const settingsSvc = new SettingsService()
+    const providerSvc = new ProviderService()
+    const provider = await providerSvc.addProvider({
+      presetId: 'zhipuglm',
+      name: 'Zhipu GLM',
+      baseUrl: 'https://open.bigmodel.cn/api/anthropic',
+      apiKey: 'test-key',
+      apiFormat: 'anthropic',
+      models: {
+        main: 'glm-5.1',
+        haiku: 'glm-4.5-air',
+        sonnet: 'glm-5-turbo',
+        opus: 'glm-5.1',
+      },
+    })
+    await providerSvc.activateProvider(provider.id)
+
+    const putReq = makeRequest('PUT', '/api/models/current', {
+      modelId: 'glm-5-turbo',
+    })
+    const putRes = await handleModelsApi(putReq.req, putReq.url, putReq.segments)
+    expect(putRes.status).toBe(200)
+
+    const managedSettings = await providerSvc.getManagedSettings()
+    expect(managedSettings.model).toBe('glm-5-turbo')
+
+    const globalSettings = await settingsSvc.getUserSettings()
+    expect(globalSettings.model).toBeUndefined()
+  })
+
   it('GET /api/effort should return default effort level', async () => {
     const { req, url, segments } = makeRequest('GET', '/api/effort')
     const res = await handleModelsApi(req, url, segments)
diff --git a/src/server/api/computer-use.ts b/src/server/api/computer-use.ts
index 6b80c2a9..16239161 100644
--- a/src/server/api/computer-use.ts
+++ b/src/server/api/computer-use.ts
@@ -21,6 +21,10 @@ import { DEFAULT_DESKTOP_GRANT_FLAGS } from '../../utils/computerUse/preauthoriz
 import MAC_HELPER_CONTENT from '../../../runtime/mac_helper.py' with { type: 'text' }
 // @ts-ignore — Bun text import
 import WIN_HELPER_CONTENT from '../../../runtime/win_helper.py' with { type: 'text' }
+// @ts-ignore — Bun text import
+import REQUIREMENTS_DARWIN from '../../../runtime/requirements.txt' with { type: 'text' }
+// @ts-ignore — Bun text import
+import REQUIREMENTS_WIN32 from '../../../runtime/requirements-win.txt' with { type: 'text' }
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url))
 const projectRoot = path.resolve(__dirname, '../../..')
@@ -30,24 +34,6 @@ const runtimeStateRoot = join(claudeHome, '.runtime')
 const venvRoot = join(runtimeStateRoot, 'venv')
 const installStampPath = join(runtimeStateRoot, 'requirements.sha256')
 
-// Embedded content of requirements — platform-specific.
-const REQUIREMENTS_DARWIN = `mss>=10.1.0
-Pillow>=11.3.0
-pyautogui>=0.9.54
-pyobjc-core>=11.1
-pyobjc-framework-Cocoa>=11.1
-pyobjc-framework-Quartz>=11.1
-`
-
-const REQUIREMENTS_WIN32 = `mss>=10.1.0
-Pillow>=11.3.0
-pyautogui>=0.9.54
-pywin32>=306
-psutil>=5.9.0
-pyperclip>=1.8.2
-screeninfo>=0.8.1
-`
-
 const isWindows = process.platform === 'win32'
 const REQUIREMENTS_CONTENT = isWindows ? REQUIREMENTS_WIN32 : REQUIREMENTS_DARWIN
 
diff --git a/src/server/api/mcp.ts b/src/server/api/mcp.ts
index a5427268..e5bc9545 100644
--- a/src/server/api/mcp.ts
+++ b/src/server/api/mcp.ts
@@ -5,7 +5,6 @@ import {
 import {
   clearServerCache,
   connectToServer,
-  getMcpServerConnectionBatchSize,
   reconnectMcpServerImpl,
 } from '../../services/mcp/client.js'
 import {
@@ -16,6 +15,7 @@ import {
   removeMcpConfig,
   setMcpServerEnabled,
 } from '../../services/mcp/config.js'
+import { inspectMcpHostCommand } from '../services/mcpHostPreflight.js'
 import type {
   ConfigScope,
   McpHTTPServerConfig,
@@ -55,7 +55,7 @@ type McpServerDto = {
   scope: string
   transport: string
   enabled: boolean
-  status: 'connected' | 'needs-auth' | 'failed' | 'disabled'
+  status: 'connected' | 'needs-auth' | 'failed' | 'disabled' | 'checking'
   statusLabel: string
   statusDetail?: string
   configLocation: string
@@ -153,11 +153,59 @@ function getStatusLabel(status: McpServerDto['status']): string {
       return 'Unavailable'
     case 'disabled':
       return 'Disabled'
+    case 'checking':
+      return 'Checking'
     default:
       return status
   }
 }
 
+function getInitialStatus(
+  enabled: boolean,
+): Pick<McpServerDto, 'status' | 'statusDetail' | 'statusLabel'> {
+  if (!enabled) {
+    return {
+      status: 'disabled',
+      statusLabel: getStatusLabel('disabled'),
+      statusDetail: 'Server disabled for the current project',
+    }
+  }
+
+  return {
+    status: 'checking',
+    statusLabel: getStatusLabel('checking'),
+  }
+}
+
+async function getHostPreflightStatus(
+  config: ScopedMcpServerConfig | McpServerConfig,
+  enabled: boolean,
+): Promise<Pick<McpServerDto, 'status' | 'statusDetail' | 'statusLabel'> | null> {
+  if (!enabled) {
+    return null
+  }
+
+  if ((config.type ?? 'stdio') !== 'stdio') {
+    return null
+  }
+
+  const stdioConfig = config as McpStdioServerConfig
+  const result = await inspectMcpHostCommand(
+    stdioConfig.command,
+    getCwd(),
+    stdioConfig.env,
+  )
+  if (result.ok) {
+    return null
+  }
+
+  return {
+    status: 'failed',
+    statusLabel: getStatusLabel('failed'),
+    statusDetail: result.message,
+  }
+}
+
 async function inspectServerStatus(
   name: string,
   config: ScopedMcpServerConfig,
@@ -171,6 +219,11 @@ async function inspectServerStatus(
     }
   }
 
+  const hostPreflightStatus = await getHostPreflightStatus(config, enabled)
+  if (hostPreflightStatus) {
+    return hostPreflightStatus
+  }
+
   try {
     const client = await connectToServer(name, config)
     await clearServerCache(name, config).catch(() => {})
@@ -197,12 +250,12 @@ async function inspectServerStatus(
   }
 }
 
-async function serializeServer(
+function buildServerDto(
   name: string,
   config: ScopedMcpServerConfig,
-): Promise<McpServerDto> {
+  status: Pick<McpServerDto, 'status' | 'statusDetail' | 'statusLabel'>,
+): McpServerDto {
   const enabled = !isMcpServerDisabled(name)
-  const status = await inspectServerStatus(name, config, enabled)
   const transport = config.type ?? 'stdio'
   const canEdit = EDITABLE_SCOPES.has(config.scope) && (transport === 'stdio' || transport === 'http' || transport === 'sse')
 
@@ -210,7 +263,7 @@ async function serializeServer(
     name,
     scope: config.scope,
     transport,
-    enabled,
+    enabled: !isMcpServerDisabled(name),
     status: status.status,
     statusLabel: status.statusLabel,
     statusDetail: status.statusDetail,
@@ -224,6 +277,34 @@ async function serializeServer(
   }
 }
 
+function serializeServerSnapshot(
+  name: string,
+  config: ScopedMcpServerConfig,
+): McpServerDto {
+  return buildServerDto(name, config, getInitialStatus(!isMcpServerDisabled(name)))
+}
+
+async function serializeServerWithLiveStatus(
+  name: string,
+  config: ScopedMcpServerConfig,
+): Promise<McpServerDto> {
+  const enabled = !isMcpServerDisabled(name)
+  const status = await inspectServerStatus(name, config, enabled)
+  return buildServerDto(name, config, status)
+}
+
+async function resolveServerForRuntimeAction(
+  name: string,
+): Promise<ScopedMcpServerConfig | null> {
+  const configured = getMcpConfigByName(name)
+  if (configured) {
+    return configured
+  }
+
+  const { servers } = await getClaudeCodeMcpConfigs()
+  return servers[name] ?? null
+}
+
 function buildServerConfig(config: unknown): McpServerConfig {
   if (!config || typeof config !== 'object') {
     throw ApiError.badRequest('Missing or invalid "config" in request body')
@@ -309,19 +390,27 @@ async function listServers(): Promise<Response> {
   const visibleServers = Object.entries(servers)
     .filter(([name, config]) => isVisibleServer(name, config))
     .sort((a, b) => a[0].localeCompare(b[0]))
+  return Response.json({
+    servers: visibleServers.map(([name, config]) => serializeServerSnapshot(name, config)),
+  })
+}
 
-  const concurrency = Math.max(1, getMcpServerConnectionBatchSize())
-  const items: McpServerDto[] = []
-
-  for (let index = 0; index < visibleServers.length; index += concurrency) {
-    const chunk = visibleServers.slice(index, index + concurrency)
-    const chunkItems = await Promise.all(
-      chunk.map(([name, config]) => serializeServer(name, config)),
-    )
-    items.push(...chunkItems)
+async function getServerStatus(name: string): Promise<Response> {
+  const existing = await resolveServerForRuntimeAction(name)
+  if (!existing) {
+    throw ApiError.notFound(`MCP server not found: ${name}`)
   }
 
-  return Response.json({ servers: items })
+  return Response.json({
+    server: await serializeServerWithLiveStatus(name, existing),
+  })
+}
+
+async function assertHostPrerequisites(config: McpServerConfig) {
+  const hostPreflightStatus = await getHostPreflightStatus(config, true)
+  if (hostPreflightStatus?.statusDetail) {
+    throw ApiError.badRequest(hostPreflightStatus.statusDetail)
+  }
 }
 
 async function createServer(body: Record<string, unknown>): Promise<Response> {
@@ -332,6 +421,7 @@ async function createServer(body: Record<string, unknown>): Promise<Response> {
 
   const scope = ensureConfigScope(typeof body.scope === 'string' ? body.scope : undefined)
   const config = buildServerConfig(body.config)
+  await assertHostPrerequisites(config)
 
   try {
     await addMcpConfig(name, config, scope)
@@ -348,7 +438,7 @@ async function createServer(body: Record<string, unknown>): Promise<Response> {
     throw ApiError.internal(`Created MCP server "${name}" could not be reloaded`)
   }
 
-  return Response.json({ server: await serializeServer(name, created) }, { status: 201 })
+  return Response.json({ server: serializeServerSnapshot(name, created) }, { status: 201 })
 }
 
 async function updateServer(name: string, body: Record<string, unknown>): Promise<Response> {
@@ -363,6 +453,7 @@ async function updateServer(name: string, body: Record<string, unknown>): Promis
 
   const nextScope = ensureConfigScope(typeof body.scope === 'string' ? body.scope : existing.scope)
   const nextConfig = buildServerConfig(body.config)
+  await assertHostPrerequisites(nextConfig)
   const previousConfig = stripScope(existing)
   const previousScope = existing.scope
 
@@ -391,7 +482,7 @@ async function updateServer(name: string, body: Record<string, unknown>): Promis
     throw ApiError.internal(`Updated MCP server "${name}" could not be reloaded`)
   }
 
-  return Response.json({ server: await serializeServer(name, updated) })
+  return Response.json({ server: serializeServerSnapshot(name, updated) })
 }
 
 async function deleteServer(name: string, url: URL): Promise<Response> {
@@ -409,7 +500,7 @@ async function deleteServer(name: string, url: URL): Promise<Response> {
 }
 
 async function toggleServer(name: string): Promise<Response> {
-  const existing = getMcpConfigByName(name)
+  const existing = await resolveServerForRuntimeAction(name)
   if (!existing) {
     throw ApiError.notFound(`MCP server not found: ${name}`)
   }
@@ -419,14 +510,22 @@ async function toggleServer(name: string): Promise<Response> {
 
   if (!enabled) {
     await clearServerCache(name, existing).catch(() => {})
-    const updated = await serializeServer(name, existing)
+    const updated = serializeServerSnapshot(name, existing)
     return Response.json({ server: updated })
   }
 
+  const hostPreflightStatus = await getHostPreflightStatus(existing, true)
+  if (hostPreflightStatus) {
+    await clearServerCache(name, existing).catch(() => {})
+    return Response.json({
+      server: buildServerDto(name, existing, hostPreflightStatus),
+    })
+  }
+
   const result = await reconnectMcpServerImpl(name, existing)
   await clearServerCache(name, existing).catch(() => {})
 
-  const updated = await serializeServer(name, existing)
+  const updated = await serializeServerWithLiveStatus(name, existing)
   const statusDetail =
     result.client.type === 'failed' && 'error' in result.client ? result.client.error : undefined
 
@@ -439,15 +538,23 @@ async function toggleServer(name: string): Promise<Response> {
 }
 
 async function reconnectServer(name: string): Promise<Response> {
-  const existing = getMcpConfigByName(name)
+  const existing = await resolveServerForRuntimeAction(name)
   if (!existing) {
     throw ApiError.notFound(`MCP server not found: ${name}`)
   }
 
+  const hostPreflightStatus = await getHostPreflightStatus(existing, !isMcpServerDisabled(name))
+  if (hostPreflightStatus) {
+    await clearServerCache(name, existing).catch(() => {})
+    return Response.json({
+      server: buildServerDto(name, existing, hostPreflightStatus),
+    })
+  }
+
   const result = await reconnectMcpServerImpl(name, existing)
   await clearServerCache(name, existing).catch(() => {})
 
-  const server = await serializeServer(name, existing)
+  const server = await serializeServerWithLiveStatus(name, existing)
   const statusDetail =
     result.client.type === 'failed' && 'error' in result.client ? result.client.error : undefined
 
@@ -479,6 +586,10 @@ export async function handleMcpApi(
         return listServers()
       }
 
+      if (req.method === 'GET' && serverName && action === 'status') {
+        return getServerStatus(serverName)
+      }
+
       if (req.method === 'POST' && !serverName) {
         return createServer(body ?? {})
       }
diff --git a/src/server/api/models.ts b/src/server/api/models.ts
index f90d530b..5811aabd 100644
--- a/src/server/api/models.ts
+++ b/src/server/api/models.ts
@@ -100,28 +100,28 @@ async function handleModelsList(): Promise<Response> {
 
 async function handleCurrentModel(req: Request): Promise<Response> {
   if (req.method === 'GET') {
-    const settings = await settingsService.getUserSettings()
-    const explicitModel = (settings.model as string) || ''
-    const contextTier = (settings.modelContext as string) || undefined
-    const env = (settings.env as Record<string, string>) || {}
-
     // Build the full model list: prefer active provider's models, fall back to defaults
     const { providers, activeId } = await providerService.listProviders()
     const activeProvider = activeId ? providers.find((p) => p.id === activeId) : null
+    const settings = activeProvider
+      ? await providerService.getManagedSettings()
+      : await settingsService.getUserSettings()
+    const explicitModel = (settings.model as string) || ''
+    const contextTier = (settings.modelContext as string) || undefined
+    const env = (settings.env as Record<string, string>) || {}
 
     let currentModelId: string
     let currentModelName: string
 
     if (activeProvider) {
-      // Provider is active — use the model from env (set by syncToSettings when provider was activated)
-      // unless user explicitly set a different model ID in settings
+      // Provider is active — only use the provider-managed cc-haha settings.
+      // This avoids leaking global ~/.claude/settings.json model choices into
+      // the active provider flow.
       const providerEnvModel = env.ANTHROPIC_MODEL
-      if (providerEnvModel && (!explicitModel || explicitModel === DEFAULT_MODEL)) {
-        // No explicit model override — use the provider's configured model
+      if (providerEnvModel && !explicitModel) {
         currentModelId = providerEnvModel
         currentModelName = providerEnvModel
       } else {
-        // User explicitly set a model (possibly from the provider's model list)
         currentModelId = explicitModel || providerEnvModel || activeProvider.models.main
         currentModelName = currentModelId
       }
@@ -175,7 +175,12 @@ async function handleCurrentModel(req: Request): Promise<Response> {
       // Clear context tier when switching to a non-composite model
       updates.modelContext = undefined
     }
-    await settingsService.updateUserSettings(updates)
+    const { activeId } = await providerService.listProviders()
+    if (activeId) {
+      await providerService.updateManagedSettings(updates)
+    } else {
+      await settingsService.updateUserSettings(updates)
+    }
     return Response.json({ ok: true, model: modelId })
   }
 
diff --git a/src/server/api/providers.ts b/src/server/api/providers.ts
index 8a2eaef0..1747828f 100644
--- a/src/server/api/providers.ts
+++ b/src/server/api/providers.ts
@@ -4,7 +4,9 @@
  * GET    /api/providers              — list all saved providers + activeId
  * GET    /api/providers/presets       — list available presets
  * GET    /api/providers/auth-status   — check whether any usable auth exists
+ * GET    /api/providers/settings      — read cc-haha managed settings.json
  * POST   /api/providers              — add a provider
+ * PUT    /api/providers/settings      — update cc-haha managed settings.json
  * PUT    /api/providers/:id          — update a provider
  * DELETE /api/providers/:id          — delete a provider
  * POST   /api/providers/:id/activate — activate a saved provider
@@ -62,6 +64,19 @@ export async function handleProvidersApi(
       return Response.json(status)
     }
 
+    // /api/providers/settings
+    if (id === 'settings') {
+      if (req.method === 'GET') {
+        return Response.json(await providerService.getManagedSettings())
+      }
+      if (req.method === 'PUT') {
+        const body = await parseJsonBody(req)
+        await providerService.updateManagedSettings(body)
+        return Response.json({ ok: true })
+      }
+      throw methodNotAllowed(req.method)
+    }
+
     // POST /api/providers/official
     if (id === 'official' && req.method === 'POST') {
       await providerService.activateOfficial()
diff --git a/src/server/api/settings.ts b/src/server/api/settings.ts
index 0463185d..26b90d97 100644
--- a/src/server/api/settings.ts
+++ b/src/server/api/settings.ts
@@ -12,6 +12,7 @@
 
 import { SettingsService } from '../services/settingsService.js'
 import { ApiError, errorResponse } from '../middleware/errorHandler.js'
+import { ensureDesktopCliLauncherInstalled } from '../services/desktopCliLauncherService.js'
 
 const settingsService = new SettingsService()
 
@@ -47,6 +48,10 @@ export async function handleSettingsApi(
       case 'project':
         return await handleProjectSettings(req, url)
 
+      case 'cli-launcher':
+        if (method !== 'GET') throw methodNotAllowed(method)
+        return Response.json(await ensureDesktopCliLauncherInstalled())
+
       default:
         throw ApiError.notFound(`Unknown settings endpoint: ${sub}`)
     }
diff --git a/src/server/config/providerPresets.json b/src/server/config/providerPresets.json
new file mode 100644
index 00000000..17dc457d
--- /dev/null
+++ b/src/server/config/providerPresets.json
@@ -0,0 +1,86 @@
+[
+  {
+    "id": "official",
+    "name": "Claude Official",
+    "baseUrl": "",
+    "apiFormat": "anthropic",
+    "defaultModels": {
+      "main": "",
+      "haiku": "",
+      "sonnet": "",
+      "opus": ""
+    },
+    "needsApiKey": false,
+    "websiteUrl": "https://www.anthropic.com/claude-code"
+  },
+  {
+    "id": "deepseek",
+    "name": "DeepSeek",
+    "baseUrl": "https://api.deepseek.com/anthropic",
+    "apiFormat": "anthropic",
+    "defaultModels": {
+      "main": "deepseek-chat",
+      "haiku": "deepseek-chat",
+      "sonnet": "deepseek-chat",
+      "opus": "deepseek-chat"
+    },
+    "needsApiKey": true,
+    "websiteUrl": "https://platform.deepseek.com"
+  },
+  {
+    "id": "zhipuglm",
+    "name": "Zhipu GLM",
+    "baseUrl": "https://open.bigmodel.cn/api/anthropic",
+    "apiFormat": "anthropic",
+    "defaultModels": {
+      "main": "glm-5.1",
+      "haiku": "glm-4.5-air",
+      "sonnet": "glm-5-turbo",
+      "opus": "glm-5.1"
+    },
+    "needsApiKey": true,
+    "websiteUrl": "https://open.bigmodel.cn"
+  },
+  {
+    "id": "kimi",
+    "name": "Kimi",
+    "baseUrl": "https://api.moonshot.cn/anthropic",
+    "apiFormat": "anthropic",
+    "defaultModels": {
+      "main": "kimi-k2.6",
+      "haiku": "kimi-k2.6",
+      "sonnet": "kimi-k2.6",
+      "opus": "kimi-k2.6"
+    },
+    "needsApiKey": true,
+    "websiteUrl": "https://platform.moonshot.cn"
+  },
+  {
+    "id": "minimax",
+    "name": "MiniMax",
+    "baseUrl": "https://api.minimaxi.com/anthropic",
+    "apiFormat": "anthropic",
+    "defaultModels": {
+      "main": "MiniMax-M2.7",
+      "haiku": "MiniMax-M2.7",
+      "sonnet": "MiniMax-M2.7",
+      "opus": "MiniMax-M2.7"
+    },
+    "needsApiKey": true,
+    "websiteUrl": "https://platform.minimaxi.com"
+  },
+  {
+    "id": "custom",
+    "name": "Custom",
+    "baseUrl": "",
+    "apiFormat": "anthropic",
+    "defaultModels": {
+      "main": "",
+      "haiku": "",
+      "sonnet": "",
+      "opus": ""
+    },
+    "needsApiKey": true,
+    "websiteUrl": ""
+  }
+]
diff --git a/src/server/config/providerPresets.ts b/src/server/config/providerPresets.ts
index 7c3e327b..c743fc48 100644
--- a/src/server/config/providerPresets.ts
+++ b/src/server/config/providerPresets.ts
@@ -1,78 +1,31 @@
 // Provider presets inspired by cc-switch (https://github.com/farion1231/cc-switch)
 // Original work by Jason Young, MIT License
 
-import type { ApiFormat } from '../types/provider.js'
+import { z } from 'zod'
 
-export type ModelMapping = {
-  main: string
-  haiku: string
-  sonnet: string
-  opus: string
-}
+import providerPresetsJson from './providerPresets.json'
+import { ApiFormatSchema } from '../types/provider.js'
 
-export type ProviderPreset = {
-  id: string
-  name: string
-  baseUrl: string
-  apiFormat: ApiFormat
-  defaultModels: ModelMapping
-  needsApiKey: boolean
-  websiteUrl: string
-}
+const ModelMappingSchema = z.object({
+  main: z.string(),
+  haiku: z.string(),
+  sonnet: z.string(),
+  opus: z.string(),
+})
 
-export const PROVIDER_PRESETS: ProviderPreset[] = [
-  {
-    id: 'official',
-    name: 'Claude Official',
-    baseUrl: '',
-    apiFormat: 'anthropic',
-    defaultModels: { main: '', haiku: '', sonnet: '', opus: '' },
-    needsApiKey: false,
-    websiteUrl: 'https://www.anthropic.com/claude-code',
-  },
-  {
-    id: 'deepseek',
-    name: 'DeepSeek',
-    baseUrl: 'https://api.deepseek.com/anthropic',
-    apiFormat: 'anthropic',
-    defaultModels: { main: 'DeepSeek-V3.2', haiku: 'DeepSeek-V3.2', sonnet: 'DeepSeek-V3.2', opus: 'DeepSeek-V3.2' },
-    needsApiKey: true,
-    websiteUrl: 'https://platform.deepseek.com',
-  },
-  {
-    id: 'zhipuglm',
-    name: 'Zhipu GLM',
-    baseUrl: 'https://open.bigmodel.cn/api/anthropic',
-    apiFormat: 'anthropic',
-    defaultModels: { main: 'glm-5', haiku: 'glm-5', sonnet: 'glm-5', opus: 'glm-5' },
-    needsApiKey: true,
-    websiteUrl: 'https://open.bigmodel.cn',
-  },
-  {
-    id: 'kimi',
-    name: 'Kimi',
-    baseUrl: 'https://api.moonshot.cn/anthropic',
-    apiFormat: 'anthropic',
-    defaultModels: { main: 'kimi-k2.5', haiku: 'kimi-k2.5', sonnet: 'kimi-k2.5', opus: 'kimi-k2.5' },
-    needsApiKey: true,
-    websiteUrl: 'https://platform.moonshot.cn',
-  },
-  {
-    id: 'minimax',
-    name: 'MiniMax',
-    baseUrl: 'https://api.minimaxi.com/anthropic',
-    apiFormat: 'anthropic',
-    defaultModels: { main: 'MiniMax-M2.7', haiku: 'MiniMax-M2.7', sonnet: 'MiniMax-M2.7', opus: 'MiniMax-M2.7' },
-    needsApiKey: true,
-    websiteUrl: 'https://platform.minimaxi.com',
-  },
-  {
-    id: 'custom',
-    name: 'Custom',
-    baseUrl: '',
-    apiFormat: 'anthropic',
-    defaultModels: { main: '', haiku: '', sonnet: '', opus: '' },
-    needsApiKey: true,
-    websiteUrl: '',
-  },
-]
+const ProviderPresetSchema = z.object({
+  id: z.string().min(1),
+  name: z.string().min(1),
+  baseUrl: z.string(),
+  apiFormat: ApiFormatSchema,
+  defaultModels: ModelMappingSchema,
+  needsApiKey: z.boolean(),
+  websiteUrl: z.string(),
+})
+
+const ProviderPresetsSchema = z.array(ProviderPresetSchema)
+
+export type ModelMapping = z.infer<typeof ModelMappingSchema>
+export type ProviderPreset = z.infer<typeof ProviderPresetSchema>
+
+export const PROVIDER_PRESETS = ProviderPresetsSchema.parse(providerPresetsJson)
diff --git a/src/server/index.ts b/src/server/index.ts
index a81120de..784ccde9 100644
--- a/src/server/index.ts
+++ b/src/server/index.ts
@@ -14,6 +14,7 @@ import { cronScheduler } from './services/cronScheduler.js'
 import { handleProxyRequest } from './proxy/handler.js'
 import { ProviderService } from './services/providerService.js'
 import { handleHahaOAuthCallback } from './api/haha-oauth.js'
+import { ensureDesktopCliLauncherInstalled } from './services/desktopCliLauncherService.js'
 
 function readArgValue(flag: string): string | undefined {
   const args = process.argv.slice(2)
@@ -218,6 +219,13 @@ export function startServer(port = PORT, host = HOST) {
   // Start the cron scheduler to execute scheduled tasks
   cronScheduler.start()
 
+  void ensureDesktopCliLauncherInstalled().catch((error) => {
+    console.error(
+      '[desktop-cli-launcher] failed to install bundled launcher:',
+      error instanceof Error ? error.message : error,
+    )
+  })
+
   console.log(`[Server] Claude Code API server running at http://${host}:${port}`)
   return server
 }
diff --git a/src/server/proxy/handler.ts b/src/server/proxy/handler.ts
index 6569eb19..88e00443 100644
--- a/src/server/proxy/handler.ts
+++ b/src/server/proxy/handler.ts
@@ -21,26 +21,49 @@ import type { AnthropicRequest } from './transform/types.js'
 const providerService = new ProviderService()
 
 export async function handleProxyRequest(req: Request, url: URL): Promise<Response> {
-  // Only handle POST /proxy/v1/messages
-  if (req.method !== 'POST' || url.pathname !== '/proxy/v1/messages') {
+  const providerMatch = url.pathname.match(/^\/proxy\/providers\/([^/]+)\/v1\/messages$/)
+  const providerId = providerMatch ? decodeURIComponent(providerMatch[1]!) : undefined
+  const isActiveProxyPath = url.pathname === '/proxy/v1/messages'
+
+  // Only handle POST /proxy/v1/messages or POST /proxy/providers/:providerId/v1/messages
+  if (req.method !== 'POST' || (!isActiveProxyPath && !providerMatch)) {
     return Response.json(
-      { error: 'Not Found', message: 'Proxy only handles POST /proxy/v1/messages' },
+      {
+        error: 'Not Found',
+        message: 'Proxy only handles POST /proxy/v1/messages and POST /proxy/providers/:providerId/v1/messages',
+      },
       { status: 404 },
     )
   }
 
-  // Read active provider config
-  const config = await providerService.getActiveProviderForProxy()
+  // Read active/default provider config or an explicitly-scoped provider config.
+  const config = await providerService.getProviderForProxy(providerId)
   if (!config) {
     return Response.json(
-      { type: 'error', error: { type: 'invalid_request_error', message: 'No active provider configured for proxy' } },
+      {
+        type: 'error',
+        error: {
+          type: 'invalid_request_error',
+          message: providerId
+            ? `Provider "${providerId}" is not configured for proxy`
+            : 'No active provider configured for proxy',
+        },
+      },
       { status: 400 },
     )
   }
 
   if (config.apiFormat === 'anthropic') {
     return Response.json(
-      { type: 'error', error: { type: 'invalid_request_error', message: 'Active provider uses anthropic format — proxy not needed' } },
+      {
+        type: 'error',
+        error: {
+          type: 'invalid_request_error',
+          message: providerId
+            ? `Provider "${providerId}" uses anthropic format — proxy not needed`
+            : 'Active provider uses anthropic format — proxy not needed',
+        },
+      },
       { status: 400 },
     )
   }
diff --git a/src/server/services/conversationService.ts b/src/server/services/conversationService.ts
index e3cd80aa..babf7389 100644
--- a/src/server/services/conversationService.ts
+++ b/src/server/services/conversationService.ts
@@ -9,7 +9,12 @@
 import * as fs from 'node:fs'
 import * as os from 'node:os'
 import * as path from 'node:path'
+import { ProviderService } from './providerService.js'
 import { sessionService } from './sessionService.js'
+import {
+  buildClaudeCliArgs,
+  resolveClaudeCliLauncher,
+} from '../../utils/desktopBundledCli.js'
 
 type AttachmentRef = {
   type: 'file' | 'image'
@@ -43,6 +48,7 @@ type SessionStartOptions = {
   permissionMode?: string
   model?: string
   effort?: string
+  providerId?: string | null
 }
 
 export class ConversationStartupError extends Error {
@@ -63,6 +69,7 @@ export class ConversationStartupError extends Error {
 
 export class ConversationService {
   private sessions = new Map<string, SessionProcess>()
+  private providerService = new ProviderService()
 
   private buildSessionCliArgs(
     sessionId: string,
@@ -136,7 +143,7 @@ export class ConversationService {
     // 工作目录就变成 `/`。把 CALLER_DIR / PWD 显式覆盖成 workDir，preload.ts
     // chdir 后落到正确目录。
     //
-    const childEnv = await this.buildChildEnv(workDir, sdkUrl)
+    const childEnv = await this.buildChildEnv(workDir, sdkUrl, options)
 
     let proc: ReturnType<typeof Bun.spawn>
     try {
@@ -225,6 +232,10 @@ export class ConversationService {
     }
   }
 
+  getRecentSdkMessages(sessionId: string): any[] {
+    return [...(this.sessions.get(sessionId)?.sdkMessages ?? [])]
+  }
+
   sendMessage(
     sessionId: string,
     content: string,
@@ -504,6 +515,7 @@ export class ConversationService {
   private async buildChildEnv(
     workDir: string,
     sdkUrl?: string,
+    options?: SessionStartOptions,
   ): Promise<Record<string, string>> {
     // Provider isolation: when Desktop has its own provider config/index,
     // strip inherited provider env vars so the child CLI reads fresh values
@@ -524,7 +536,7 @@ export class ConversationService {
 
     const cleanEnv = { ...process.env }
     delete cleanEnv.CLAUDE_CODE_OAUTH_TOKEN
-    if (this.shouldStripInheritedProviderEnv()) {
+    if (this.shouldStripInheritedProviderEnv(options?.providerId)) {
       for (const key of PROVIDER_ENV_KEYS) {
         delete cleanEnv[key]
       }
@@ -540,6 +552,11 @@ export class ConversationService {
       }
     }
 
+    const explicitProviderEnv =
+      typeof options?.providerId === 'string'
+        ? await this.providerService.getProviderRuntimeEnv(options.providerId)
+        : null
+
     return {
       ...cleanEnv,
       CLAUDE_CODE_ENABLE_TASKS: '1',
@@ -552,16 +569,26 @@ export class ConversationService {
       ...(desktopServerUrl
         ? { CC_HAHA_DESKTOP_SERVER_URL: desktopServerUrl }
         : {}),
+      ...(sdkUrl
+        ? {
+            CC_HAHA_DESKTOP_AWAIT_MCP: '1',
+            CC_HAHA_DESKTOP_AWAIT_MCP_TIMEOUT_MS: '5000',
+          }
+        : {}),
       // Tell the CLI entrypoint to skip project .env loading. Provider env
       // should come from Desktop-managed config or inherited launch env, not
       // be reintroduced from the repo's .env file.
       CC_HAHA_SKIP_DOTENV: '1',
+      ...(explicitProviderEnv
+        ? { CLAUDE_CODE_PROVIDER_MANAGED_BY_HOST: '1' }
+        : {}),
       // "官方" 模式 (cc-haha/settings.json 没 provider env) 下,把 CLI 标记为
       // managed-OAuth,让它忽略外部 ANTHROPIC_API_KEY / ANTHROPIC_AUTH_TOKEN
       // 残留、只走用户 /login 的 OAuth token。自定义 provider 模式绝不能设,
       // 否则 CLI 会忽略 provider 的 AUTH_TOKEN、错误地走 OAuth 打到第三方
       // endpoint。详见 src/utils/auth.ts isManagedOAuthContext()。
-      ...(this.shouldMarkManagedOAuth()
+      ...(explicitProviderEnv ?? {}),
+      ...(this.shouldMarkManagedOAuth(options?.providerId)
         ? await this.buildOfficialOAuthEnv()
         : {}),
     }
@@ -595,7 +622,11 @@ export class ConversationService {
     return env
   }
 
-  private shouldStripInheritedProviderEnv(): boolean {
+  private shouldStripInheritedProviderEnv(providerId?: string | null): boolean {
+    if (providerId !== undefined) {
+      return true
+    }
+
     const configDir =
       process.env.CLAUDE_CONFIG_DIR || path.join(os.homedir(), '.claude')
     const ccHahaDir = path.join(configDir, 'cc-haha')
@@ -633,7 +664,14 @@ export class ConversationService {
    * 默认 (读不到 settings.json) 按"官方"处理 — 即使用户从未用过 cc-haha
    * provider 管理,也希望官方 OAuth 能正常工作。
    */
-  private shouldMarkManagedOAuth(): boolean {
+  private shouldMarkManagedOAuth(providerId?: string | null): boolean {
+    if (providerId === null) {
+      return true
+    }
+    if (typeof providerId === 'string') {
+      return false
+    }
+
     const configDir =
       process.env.CLAUDE_CONFIG_DIR || path.join(os.homedir(), '.claude')
     const settingsPath = path.join(configDir, 'cc-haha', 'settings.json')
@@ -655,35 +693,13 @@ export class ConversationService {
     }
   }
 
-  private resolveBundledCliPath(): string | null {
-    // 桌面端 P0+P2 之后只有一个合并的 sidecar 二进制 —— `claude-sidecar`，
-    // 它通过第一个 positional 参数 (server / cli) 选模式。当前进程要么
-    // 已经是这个 sidecar 自己（spawn 子 CLI 时复用同一个文件），要么是
-    // 旧 dev 模式下走 bin/claude-haha。这里支持两种命名：
-    //   - 桌面端 prod build：进程名 claude-sidecar*
-    //   - 旧 server-only 二进制（向后兼容）：claude-server*
-    const execPath = process.execPath
-    const execName = path.basename(execPath)
-
-    if (execName.startsWith('claude-sidecar')) {
-      // 复用同一个二进制，调用 cli 模式
-      return execPath
-    }
-
-    if (execName.startsWith('claude-server')) {
-      const bundledCliPath = path.join(
-        path.dirname(execPath),
-        execName.replace(/^claude-server/, 'claude-cli'),
-      )
-      return fs.existsSync(bundledCliPath) ? bundledCliPath : null
-    }
-
-    return null
-  }
-
   private resolveCliArgs(baseArgs: string[]): string[] {
-    const cliCommand = process.env.CLAUDE_CLI_PATH || this.resolveBundledCliPath()
-    if (!cliCommand) {
+    const launcher = resolveClaudeCliLauncher({
+      cliPath: process.env.CLAUDE_CLI_PATH,
+      execPath: process.execPath,
+    })
+
+    if (!launcher) {
       if (process.platform === 'win32') {
         return [
           process.execPath,
@@ -694,35 +710,7 @@ export class ConversationService {
       return [path.resolve(import.meta.dir, '../../../bin/claude-haha'), ...baseArgs]
     }
 
-    if (/\.(?:[cm]?[jt]s|tsx?)$/i.test(cliCommand)) {
-      return ['bun', cliCommand, ...baseArgs]
-    }
-
-    const cliBaseName = path.basename(cliCommand)
-
-    // 合并 sidecar 模式：第一个参数必须是 'cli'，后面跟 --app-root 透传
-    if (cliBaseName.startsWith('claude-sidecar')) {
-      const args = ['cli', ...baseArgs]
-      if (process.env.CLAUDE_APP_ROOT) {
-        return [cliCommand, 'cli', '--app-root', process.env.CLAUDE_APP_ROOT, ...baseArgs]
-      }
-      return [cliCommand, ...args]
-    }
-
-    // 旧两段式 sidecar：claude-cli 二进制需要 --app-root
-    if (
-      process.env.CLAUDE_APP_ROOT &&
-      cliBaseName.startsWith('claude-cli')
-    ) {
-      return [
-        cliCommand,
-        '--app-root',
-        process.env.CLAUDE_APP_ROOT,
-        ...baseArgs,
-      ]
-    }
-
-    return [cliCommand, ...baseArgs]
+    return buildClaudeCliArgs(launcher, baseArgs, process.env.CLAUDE_APP_ROOT)
   }
 
   private clearStaleLock(sessionId: string): boolean {
diff --git a/src/server/services/desktopCliLauncherService.ts b/src/server/services/desktopCliLauncherService.ts
new file mode 100644
index 00000000..8e1a9b99
--- /dev/null
+++ b/src/server/services/desktopCliLauncherService.ts
@@ -0,0 +1,476 @@
+import { createHash } from 'node:crypto'
+import { createReadStream } from 'node:fs'
+import {
+  chmod,
+  copyFile,
+  mkdir,
+  readFile,
+  rename,
+  stat,
+  unlink,
+  writeFile,
+} from 'node:fs/promises'
+import { homedir } from 'node:os'
+import { delimiter, dirname, join, resolve } from 'node:path'
+
+import { resolveClaudeCliLauncher } from '../../utils/desktopBundledCli.js'
+import { execFileNoThrow } from '../../utils/execFileNoThrow.js'
+import { getShellConfigPaths } from '../../utils/shellConfig.js'
+import { getUserBinDir } from '../../utils/xdg.js'
+
+const DESKTOP_CLI_NAME = 'claude-haha'
+const PATH_BLOCK_START = '# >>> Claude Code Haha PATH >>>'
+const PATH_BLOCK_END = '# <<< Claude Code Haha PATH <<<'
+const WINDOWS_PATH_TARGET = 'Windows User PATH'
+const WINDOWS_USER_BIN_EXPR = '%USERPROFILE%\\.local\\bin'
+
+export type DesktopCliLauncherStatus = {
+  supported: boolean
+  command: string
+  installed: boolean
+  launcherPath: string
+  binDir: string
+  pathConfigured: boolean
+  pathInCurrentShell: boolean
+  availableInNewTerminals: boolean
+  needsTerminalRestart: boolean
+  configTarget: string | null
+  lastError: string | null
+}
+
+let inFlightEnsure: Promise<DesktopCliLauncherStatus> | null = null
+
+export function getDesktopCliCommandName(
+  platform: NodeJS.Platform = process.platform,
+) {
+  return platform === 'win32' ? `${DESKTOP_CLI_NAME}.exe` : DESKTOP_CLI_NAME
+}
+
+export function resolveHomeDir(env: NodeJS.ProcessEnv = process.env) {
+  return env.HOME || env.USERPROFILE || homedir()
+}
+
+export function isPathEntryPresent(
+  pathValue: string | undefined,
+  targetDir: string,
+  platform: NodeJS.Platform = process.platform,
+  homeDir: string = resolveHomeDir(),
+) {
+  if (!pathValue) return false
+
+  if (platform === 'win32') {
+    const normalizedTarget = normalizeWindowsPathEntry(targetDir, homeDir)
+    return pathValue
+      .split(';')
+      .map((entry) => normalizeWindowsPathEntry(entry, homeDir))
+      .some((entry) => entry === normalizedTarget)
+  }
+
+  const normalizedTarget = resolve(targetDir)
+  return pathValue
+    .split(delimiter)
+    .map((entry) => entry.trim())
+    .filter(Boolean)
+    .some((entry) => {
+      try {
+        return resolve(entry) === normalizedTarget
+      } catch {
+        return false
+      }
+    })
+}
+
+export function upsertManagedPathBlock(
+  existingContent: string,
+  block: string,
+): string {
+  const escapedStart = PATH_BLOCK_START.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
+  const escapedEnd = PATH_BLOCK_END.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
+  const pattern = new RegExp(`${escapedStart}[\\s\\S]*?${escapedEnd}\\n?`, 'm')
+  const nextBlock = `${block.trimEnd()}\n`
+
+  if (pattern.test(existingContent)) {
+    return existingContent.replace(pattern, nextBlock)
+  }
+
+  const trimmed = existingContent.trimEnd()
+  if (!trimmed) {
+    return nextBlock
+  }
+
+  return `${trimmed}\n\n${nextBlock}`
+}
+
+export function buildManagedPathBlock(
+  shellType: 'zsh' | 'bash' | 'fish',
+  binDir: string,
+  homeDir: string = resolveHomeDir(),
+) {
+  const defaultBinDir = join(homeDir, '.local', 'bin')
+  const pathExpr = resolve(binDir) === resolve(defaultBinDir) ? '$HOME/.local/bin' : binDir
+
+  if (shellType === 'fish') {
+    return [
+      PATH_BLOCK_START,
+      `if not contains "${pathExpr}" $PATH`,
+      `  set -gx PATH "${pathExpr}" $PATH`,
+      'end',
+      PATH_BLOCK_END,
+    ].join('\n')
+  }
+
+  return [
+    PATH_BLOCK_START,
+    `export PATH="${pathExpr}:$PATH"`,
+    PATH_BLOCK_END,
+  ].join('\n')
+}
+
+export async function ensureDesktopCliLauncherInstalled(): Promise<DesktopCliLauncherStatus> {
+  if (inFlightEnsure) {
+    return inFlightEnsure
+  }
+
+  const promise = ensureDesktopCliLauncherInstalledImpl()
+  inFlightEnsure = promise
+
+  try {
+    return await promise
+  } finally {
+    if (inFlightEnsure === promise) {
+      inFlightEnsure = null
+    }
+  }
+}
+
+async function ensureDesktopCliLauncherInstalledImpl(): Promise<DesktopCliLauncherStatus> {
+  const homeDir = resolveHomeDir()
+  const binDir = getUserBinDir({ homedir: homeDir })
+  const launcherPath = join(binDir, getDesktopCliCommandName())
+  const sourcePath = resolveBundledSidecarSourcePath()
+
+  if (!sourcePath) {
+    return buildStatus({
+      supported: false,
+      launcherPath,
+      binDir,
+      command: DESKTOP_CLI_NAME,
+      installed: false,
+      pathConfigured: false,
+      pathInCurrentShell: isPathEntryPresent(process.env.PATH, binDir),
+      configTarget: null,
+      lastError: null,
+    })
+  }
+
+  let lastError: string | null = null
+
+  try {
+    await syncLauncherBinary(sourcePath, launcherPath)
+  } catch (error) {
+    lastError = error instanceof Error ? error.message : String(error)
+  }
+
+  const installed = await isUsableLauncher(launcherPath)
+  const currentPathReady = isPathEntryPresent(process.env.PATH, binDir)
+
+  let pathConfigured = currentPathReady
+  let configTarget: string | null = null
+
+  try {
+    if (process.platform === 'win32') {
+      const windowsResult = await ensureWindowsUserPathConfigured(binDir, homeDir)
+      pathConfigured = currentPathReady || windowsResult.pathConfigured
+      configTarget = windowsResult.configTarget
+      lastError ||= windowsResult.lastError
+    } else {
+      const unixResult = await ensureUnixShellPathConfigured(binDir, homeDir)
+      pathConfigured = currentPathReady || unixResult.pathConfigured
+      configTarget = unixResult.configTarget
+      lastError ||= unixResult.lastError
+    }
+  } catch (error) {
+    lastError ||= error instanceof Error ? error.message : String(error)
+  }
+
+  return buildStatus({
+    supported: true,
+    command: DESKTOP_CLI_NAME,
+    launcherPath,
+    binDir,
+    installed,
+    pathConfigured,
+    pathInCurrentShell: currentPathReady,
+    configTarget,
+    lastError,
+  })
+}
+
+function buildStatus(
+  input: Omit<
+    DesktopCliLauncherStatus,
+    'availableInNewTerminals' | 'needsTerminalRestart'
+  >,
+): DesktopCliLauncherStatus {
+  const availableInNewTerminals =
+    input.installed && (input.pathInCurrentShell || input.pathConfigured)
+
+  return {
+    ...input,
+    availableInNewTerminals,
+    needsTerminalRestart:
+      availableInNewTerminals && !input.pathInCurrentShell,
+  }
+}
+
+function resolveBundledSidecarSourcePath(): string | null {
+  const launcher = resolveClaudeCliLauncher({
+    cliPath: process.env.CLAUDE_CLI_PATH,
+    execPath: process.execPath,
+  })
+
+  if (!launcher || launcher.kind !== 'sidecar') {
+    return null
+  }
+
+  return launcher.command
+}
+
+async function syncLauncherBinary(sourcePath: string, targetPath: string) {
+  await mkdir(dirname(targetPath), { recursive: true })
+
+  if (await filesMatch(sourcePath, targetPath)) {
+    return
+  }
+
+  const tempPath = `${targetPath}.tmp.${process.pid}.${Date.now()}`
+  await copyFile(sourcePath, tempPath)
+
+  if (process.platform !== 'win32') {
+    await chmod(tempPath, 0o755)
+  }
+
+  try {
+    if (process.platform === 'win32') {
+      await replaceWindowsBinary(tempPath, targetPath)
+    } else {
+      await rename(tempPath, targetPath)
+      await chmod(targetPath, 0o755)
+    }
+  } finally {
+    await unlink(tempPath).catch(() => undefined)
+  }
+}
+
+async function replaceWindowsBinary(tempPath: string, targetPath: string) {
+  try {
+    await unlink(targetPath)
+  } catch {
+    // noop
+  }
+
+  try {
+    await rename(tempPath, targetPath)
+    return
+  } catch {
+    // The existing executable may still be in use. Rename it away and retry.
+  }
+
+  const backupPath = `${targetPath}.old.${Date.now()}`
+  try {
+    await rename(targetPath, backupPath)
+  } catch {
+    // noop
+  }
+
+  await rename(tempPath, targetPath)
+  await unlink(backupPath).catch(() => undefined)
+}
+
+async function filesMatch(sourcePath: string, targetPath: string) {
+  try {
+    const [sourceStats, targetStats] = await Promise.all([
+      stat(sourcePath),
+      stat(targetPath),
+    ])
+
+    if (!sourceStats.isFile() || !targetStats.isFile()) {
+      return false
+    }
+
+    if (sourceStats.size !== targetStats.size) {
+      return false
+    }
+
+    const [sourceHash, targetHash] = await Promise.all([
+      hashFile(sourcePath),
+      hashFile(targetPath),
+    ])
+    return sourceHash === targetHash
+  } catch {
+    return false
+  }
+}
+
+async function hashFile(filePath: string) {
+  return await new Promise<string>((resolvePromise, reject) => {
+    const hash = createHash('sha256')
+    const stream = createReadStream(filePath)
+    stream.on('data', (chunk) => hash.update(chunk))
+    stream.on('error', reject)
+    stream.on('end', () => resolvePromise(hash.digest('hex')))
+  })
+}
+
+async function isUsableLauncher(filePath: string) {
+  try {
+    const fileStats = await stat(filePath)
+    return fileStats.isFile() && fileStats.size > 0
+  } catch {
+    return false
+  }
+}
+
+async function ensureUnixShellPathConfigured(
+  binDir: string,
+  homeDir: string,
+): Promise<{
+  pathConfigured: boolean
+  configTarget: string | null
+  lastError: string | null
+}> {
+  const shellType = resolveShellType()
+  const configPaths = getShellConfigPaths({ env: process.env, homedir: homeDir })
+  const configTarget =
+    configPaths[shellType] ??
+    (process.platform === 'darwin' ? configPaths.zsh : configPaths.bash)
+
+  if (!configTarget) {
+    return {
+      pathConfigured: false,
+      configTarget: null,
+      lastError: 'Could not resolve a shell config file for PATH setup',
+    }
+  }
+
+  const block = buildManagedPathBlock(shellType, binDir, homeDir)
+  const existingContent = await readFile(configTarget, 'utf8').catch(() => '')
+  const nextContent = upsertManagedPathBlock(existingContent, block)
+
+  if (nextContent !== existingContent) {
+    await mkdir(dirname(configTarget), { recursive: true })
+    await writeFile(configTarget, nextContent, 'utf8')
+  }
+
+  return {
+    pathConfigured: true,
+    configTarget,
+    lastError: null,
+  }
+}
+
+async function ensureWindowsUserPathConfigured(
+  binDir: string,
+  homeDir: string,
+): Promise<{
+  pathConfigured: boolean
+  configTarget: string
+  lastError: string | null
+}> {
+  const userPath = await readWindowsUserPath()
+  if (isPathEntryPresent(userPath, binDir, 'win32', homeDir)) {
+    return {
+      pathConfigured: true,
+      configTarget: WINDOWS_PATH_TARGET,
+      lastError: null,
+    }
+  }
+
+  const script = [
+    `$bin = [Environment]::ExpandEnvironmentVariables('${WINDOWS_USER_BIN_EXPR}')`,
+    `$userPath = [Environment]::GetEnvironmentVariable('Path', 'User')`,
+    `$segments = @()`,
+    `if ($userPath) { $segments = $userPath.Split(';') | Where-Object { $_ -and $_.Trim() -ne '' } }`,
+    `$normalized = $segments | ForEach-Object { [Environment]::ExpandEnvironmentVariables($_).TrimEnd('\\').ToLowerInvariant() }`,
+    `if (-not ($normalized -contains $bin.TrimEnd('\\').ToLowerInvariant())) {`,
+    `  $newPath = if ([string]::IsNullOrWhiteSpace($userPath)) { '${WINDOWS_USER_BIN_EXPR}' } else { '${WINDOWS_USER_BIN_EXPR};' + $userPath }`,
+    `  [Environment]::SetEnvironmentVariable('Path', $newPath, 'User')`,
+    `  $signature = @'`,
+    `using System;`,
+    `using System.Runtime.InteropServices;`,
+    `public static class NativeMethods {`,
+    `  [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Auto)]`,
+    `  public static extern IntPtr SendMessageTimeout(IntPtr hWnd, uint Msg, IntPtr wParam, string lParam, uint fuFlags, uint uTimeout, out IntPtr lpdwResult);`,
+    `}`,
+    `'@`,
+    `  Add-Type -TypeDefinition $signature -ErrorAction SilentlyContinue | Out-Null`,
+    `  $HWND_BROADCAST = [IntPtr]0xffff`,
+    `  $WM_SETTINGCHANGE = 0x1A`,
+    `  $SMTO_ABORTIFHUNG = 0x2`,
+    `  $result = [IntPtr]::Zero`,
+    `  [void][NativeMethods]::SendMessageTimeout($HWND_BROADCAST, $WM_SETTINGCHANGE, [IntPtr]::Zero, 'Environment', $SMTO_ABORTIFHUNG, 5000, [ref]$result)`,
+    `}`,
+  ].join('\n')
+
+  const result = await execFileNoThrow(
+    'powershell.exe',
+    ['-NoProfile', '-NonInteractive', '-Command', script],
+    { useCwd: false },
+  )
+
+  if (result.code !== 0) {
+    return {
+      pathConfigured: false,
+      configTarget: WINDOWS_PATH_TARGET,
+      lastError:
+        result.stderr.trim() ||
+        result.stdout.trim() ||
+        result.error ||
+        'Failed to update Windows user PATH',
+    }
+  }
+
+  return {
+    pathConfigured: true,
+    configTarget: WINDOWS_PATH_TARGET,
+    lastError: null,
+  }
+}
+
+function resolveShellType(): 'zsh' | 'bash' | 'fish' {
+  const shellPath = process.env.SHELL || ''
+  if (shellPath.includes('fish')) return 'fish'
+  if (shellPath.includes('bash')) return 'bash'
+  if (shellPath.includes('zsh')) return 'zsh'
+  return process.platform === 'darwin' ? 'zsh' : 'bash'
+}
+
+async function readWindowsUserPath() {
+  const result = await execFileNoThrow(
+    'powershell.exe',
+    [
+      '-NoProfile',
+      '-NonInteractive',
+      '-Command',
+      `[Environment]::GetEnvironmentVariable('Path', 'User')`,
+    ],
+    { useCwd: false },
+  )
+
+  if (result.code !== 0) {
+    return ''
+  }
+
+  return result.stdout.trim()
+}
+
+function normalizeWindowsPathEntry(entry: string, homeDir: string) {
+  return entry
+    .trim()
+    .replace(/^"+|"+$/g, '')
+    .replace(/%USERPROFILE%/gi, homeDir)
+    .replace(/%HOMEDRIVE%%HOMEPATH%/gi, homeDir)
+    .replace(/\//g, '\\')
+    .replace(/\\+$/, '')
+    .toLowerCase()
+}
diff --git a/src/server/services/mcpHostPreflight.ts b/src/server/services/mcpHostPreflight.ts
new file mode 100644
index 00000000..57ddca2b
--- /dev/null
+++ b/src/server/services/mcpHostPreflight.ts
@@ -0,0 +1,166 @@
+import { constants } from 'node:fs'
+import { access } from 'node:fs/promises'
+import path from 'node:path'
+import { getCwd } from '../../utils/cwd.js'
+import { which } from '../../utils/which.js'
+
+type HostCommandCheckResult =
+  | {
+      ok: true
+      resolvedCommand: string
+    }
+  | {
+      ok: false
+      message: string
+    }
+
+function getPathSearchList(envPath?: string) {
+  return (envPath ?? process.env.PATH ?? '')
+    .split(path.delimiter)
+    .map((entry) => entry.trim())
+    .filter(Boolean)
+}
+
+function getWindowsExecutableCandidates(command: string) {
+  if (process.platform !== 'win32') {
+    return [command]
+  }
+
+  const ext = path.extname(command)
+  if (ext) {
+    return [command]
+  }
+
+  const pathext = (process.env.PATHEXT ?? '.EXE;.CMD;.BAT;.COM')
+    .split(';')
+    .map((entry) => entry.trim())
+    .filter(Boolean)
+
+  return [command, ...pathext.map((entry) => `${command}${entry.toLowerCase()}`)]
+}
+
+function isPathLikeCommand(command: string) {
+  return (
+    path.isAbsolute(command) ||
+    command.startsWith('./') ||
+    command.startsWith('../') ||
+    command.startsWith('.\\') ||
+    command.startsWith('..\\') ||
+    command.includes('/') ||
+    command.includes('\\')
+  )
+}
+
+function buildRuntimeHint(command: string) {
+  const normalized = path.basename(command).toLowerCase()
+
+  if (['node', 'npm', 'npx', 'pnpm', 'yarn'].includes(normalized)) {
+    return `Install Node.js on this machine so "${command}" is available in PATH, then retry.`
+  }
+
+  if (['python', 'python3', 'pip', 'pip3'].includes(normalized)) {
+    return `Install Python on this machine so "${command}" is available in PATH, then retry.`
+  }
+
+  if (normalized === 'uv') {
+    return 'Install uv on this machine so "uv" is available in PATH, then retry.'
+  }
+
+  if (normalized === 'bun') {
+    return 'Install Bun on this machine so "bun" is available in PATH, then retry.'
+  }
+
+  return `Install "${command}" on this machine or update PATH, then retry.`
+}
+
+function buildMissingCommandMessage(command: string) {
+  return `Host command "${command}" is not available in PATH. This STDIO MCP runs on the host machine. ${buildRuntimeHint(command)}`
+}
+
+function buildMissingPathMessage(command: string, resolvedPath: string) {
+  return `Host command path "${command}" could not be found at "${resolvedPath}". This STDIO MCP runs on the host machine, so the configured executable path must exist locally.`
+}
+
+function buildNonExecutablePathMessage(command: string, resolvedPath: string) {
+  return `Host command path "${command}" exists at "${resolvedPath}" but is not executable. This STDIO MCP runs on the host machine, so the configured executable must be runnable by the local OS user.`
+}
+
+async function resolveCommandFromPath(
+  command: string,
+  envPath?: string,
+): Promise<string | null> {
+  const pathEntries = getPathSearchList(envPath)
+
+  for (const entry of pathEntries) {
+    for (const candidate of getWindowsExecutableCandidates(command)) {
+      const resolvedPath = path.join(entry, candidate)
+      try {
+        await access(
+          resolvedPath,
+          process.platform === 'win32' ? constants.F_OK : constants.X_OK,
+        )
+        return resolvedPath
+      } catch {
+        // Continue searching other PATH entries.
+      }
+    }
+  }
+
+  return null
+}
+
+export async function inspectMcpHostCommand(
+  command: string,
+  cwd: string = getCwd(),
+  env?: Record<string, string>,
+): Promise<HostCommandCheckResult> {
+  const trimmedCommand = command.trim()
+  if (!trimmedCommand) {
+    return {
+      ok: false,
+      message: 'STDIO MCP command is empty.',
+    }
+  }
+
+  if (isPathLikeCommand(trimmedCommand)) {
+    const resolvedPath = path.isAbsolute(trimmedCommand)
+      ? trimmedCommand
+      : path.resolve(cwd, trimmedCommand)
+
+    try {
+      await access(
+        resolvedPath,
+        process.platform === 'win32' ? constants.F_OK : constants.X_OK,
+      )
+      return {
+        ok: true,
+        resolvedCommand: resolvedPath,
+      }
+    } catch (error) {
+      const maybeErr = error as NodeJS.ErrnoException
+      return {
+        ok: false,
+        message:
+          maybeErr.code === 'ENOENT'
+            ? buildMissingPathMessage(trimmedCommand, resolvedPath)
+            : buildNonExecutablePathMessage(trimmedCommand, resolvedPath),
+      }
+    }
+  }
+
+  const resolvedCommand =
+    env?.PATH
+      ? await resolveCommandFromPath(trimmedCommand, env.PATH)
+      : await which(trimmedCommand)
+  if (resolvedCommand) {
+    return {
+      ok: true,
+      resolvedCommand,
+    }
+  }
+
+  return {
+    ok: false,
+    message: buildMissingCommandMessage(trimmedCommand),
+  }
+}
diff --git a/src/server/services/providerService.ts b/src/server/services/providerService.ts
index b4683001..c06d5815 100644
--- a/src/server/services/providerService.ts
+++ b/src/server/services/providerService.ts
@@ -28,6 +28,7 @@ import type {
 
 const MANAGED_ENV_KEYS = [
   'ANTHROPIC_BASE_URL',
+  'ANTHROPIC_API_KEY',
   'ANTHROPIC_AUTH_TOKEN',
   'ANTHROPIC_MODEL',
   'ANTHROPIC_DEFAULT_HAIKU_MODEL',
@@ -115,6 +116,15 @@ export class ProviderService {
     }
   }
 
+  async getManagedSettings(): Promise<Record<string, unknown>> {
+    return this.readSettings()
+  }
+
+  async updateManagedSettings(settings: Record<string, unknown>): Promise<void> {
+    const current = await this.readSettings()
+    await this.writeSettings(Object.assign({}, current, settings))
+  }
+
   // --- CRUD ---
 
   async listProviders(): Promise<{ providers: SavedProvider[]; activeId: string | null }> {
@@ -213,24 +223,46 @@ export class ProviderService {
 
   // --- Settings sync ---
 
-  private async syncToSettings(provider: SavedProvider): Promise<void> {
-    const settings = await this.readSettings()
-    const existingEnv = (settings.env as Record<string, string>) || {}
-
+  private buildManagedEnv(
+    provider: SavedProvider,
+    options?: { proxyPath?: string },
+  ): Record<string, string> {
     const needsProxy = provider.apiFormat != null && provider.apiFormat !== 'anthropic'
+    const proxyPath = options?.proxyPath ?? '/proxy'
     const baseUrl = needsProxy
-      ? `http://127.0.0.1:${ProviderService.serverPort}/proxy`
+      ? `http://127.0.0.1:${ProviderService.serverPort}${proxyPath}`
       : provider.baseUrl
 
-    settings.env = {
-      ...existingEnv,
+    return {
       ANTHROPIC_BASE_URL: baseUrl,
-      ANTHROPIC_AUTH_TOKEN: needsProxy ? 'proxy-managed' : provider.apiKey,
+      ANTHROPIC_API_KEY: needsProxy ? 'proxy-managed' : provider.apiKey,
       ANTHROPIC_MODEL: provider.models.main,
       ANTHROPIC_DEFAULT_HAIKU_MODEL: provider.models.haiku,
       ANTHROPIC_DEFAULT_SONNET_MODEL: provider.models.sonnet,
       ANTHROPIC_DEFAULT_OPUS_MODEL: provider.models.opus,
     }
+  }
+
+  async getProviderRuntimeEnv(id: string): Promise<Record<string, string>> {
+    const provider = await this.getProvider(id)
+    return this.buildManagedEnv(provider, {
+      proxyPath: `/proxy/providers/${provider.id}`,
+    })
+  }
+
+  private async syncToSettings(provider: SavedProvider): Promise<void> {
+    const settings = await this.readSettings()
+    const existingEnv = (settings.env as Record<string, string>) || {}
+    const cleanedEnv = { ...existingEnv }
+
+    for (const key of MANAGED_ENV_KEYS) {
+      delete cleanedEnv[key]
+    }
+
+    settings.env = {
+      ...cleanedEnv,
+      ...this.buildManagedEnv(provider),
+    }
 
     await this.writeSettings(settings)
   }
@@ -297,11 +329,20 @@ export class ProviderService {
 
   // --- Proxy support ---
 
-  async getActiveProviderForProxy(): Promise<{
+  async getProviderForProxy(providerId?: string): Promise<{
     baseUrl: string
     apiKey: string
     apiFormat: ApiFormat
   } | null> {
+    if (providerId) {
+      const provider = await this.getProvider(providerId)
+      return {
+        baseUrl: provider.baseUrl,
+        apiKey: provider.apiKey,
+        apiFormat: provider.apiFormat ?? 'anthropic',
+      }
+    }
+
     const index = await this.readIndex()
     if (!index.activeId) return null
     const provider = index.providers.find((p) => p.id === index.activeId)
@@ -313,6 +354,14 @@ export class ProviderService {
     }
   }
 
+  async getActiveProviderForProxy(): Promise<{
+    baseUrl: string
+    apiKey: string
+    apiFormat: ApiFormat
+  } | null> {
+    return this.getProviderForProxy()
+  }
+
   // --- Test ---
 
   async testProvider(
@@ -530,4 +579,3 @@ function validateResponseBody(
   }
   return { ok: true, model: (body.model as string) || undefined }
 }
-
diff --git a/src/server/services/titleService.ts b/src/server/services/titleService.ts
index 0b4c134f..5a99f356 100644
--- a/src/server/services/titleService.ts
+++ b/src/server/services/titleService.ts
@@ -40,29 +40,41 @@ export function deriveTitle(raw: string): string | undefined {
 }
 
 /**
- * Generate an AI title using the active provider's Haiku model.
+ * Generate an AI title using the session's provider Haiku model when possible.
  * Fire-and-forget — returns null on any failure.
  */
-export async function generateTitle(conversationText: string): Promise<string | null> {
+export async function generateTitle(
+  conversationText: string,
+  providerId?: string | null,
+): Promise<string | null> {
   const trimmed = conversationText.trim()
   if (!trimmed) return null
 
   try {
     const providerService = new ProviderService()
-    const { activeId, providers } = await providerService.listProviders()
-    if (!activeId) return null
+    if (providerId === null) return null
 
-    const provider = providers.find((p) => p.id === activeId)
-    if (!provider?.baseUrl || !provider?.apiKey) return null
+    let resolvedProvider = providerId
+      ? await providerService.getProvider(providerId)
+      : null
 
-    const model = provider.models.haiku || provider.models.main
-    const url = `${provider.baseUrl.replace(/\/+$/, '')}/v1/messages`
+    if (!resolvedProvider) {
+      const { activeId, providers } = await providerService.listProviders()
+      resolvedProvider = activeId
+        ? providers.find((provider) => provider.id === activeId) ?? null
+        : null
+    }
+
+    if (!resolvedProvider?.baseUrl || !resolvedProvider?.apiKey) return null
+
+    const model = resolvedProvider.models.haiku || resolvedProvider.models.main
+    const url = `${resolvedProvider.baseUrl.replace(/\/+$/, '')}/v1/messages`
 
     const response = await fetch(url, {
       method: 'POST',
       headers: {
         'Content-Type': 'application/json',
-        'x-api-key': provider.apiKey,
+        'x-api-key': resolvedProvider.apiKey,
         'anthropic-version': '2023-06-01',
       },
       body: JSON.stringify({
diff --git a/src/server/ws/events.ts b/src/server/ws/events.ts
index 6ee11911..16278eb9 100644
--- a/src/server/ws/events.ts
+++ b/src/server/ws/events.ts
@@ -9,6 +9,7 @@
 // ============================================================================
 
 export type ClientMessage =
+  | { type: 'prewarm_session' }
   | { type: 'user_message'; content: string; attachments?: AttachmentRef[] }
   | {
       type: 'permission_response'
@@ -23,6 +24,7 @@ export type ClientMessage =
       response: ComputerUsePermissionResponse
     }
   | { type: 'set_permission_mode'; mode: string }
+  | { type: 'set_runtime_config'; providerId: string | null; modelId: string }
   | { type: 'stop_generation' }
   | { type: 'ping' }
 
diff --git a/src/server/ws/handler.ts b/src/server/ws/handler.ts
index 86ae831a..6b3f9797 100644
--- a/src/server/ws/handler.ts
+++ b/src/server/ws/handler.ts
@@ -49,6 +49,18 @@ const sessionTitleState = new Map<string, {
   allUserMessages: string[]
 }>()
 
+const runtimeOverrides = new Map<string, {
+  providerId: string | null
+  modelId: string
+}>()
+
+const runtimeTransitionPromises = new Map<string, Promise<void>>()
+const sessionStartupPromises = new Map<string, Promise<void>>()
+const prewarmPendingSessions = new Set<string>()
+const prewarmedSessions = new Set<string>()
+const prewarmIdleTimers = new Map<string, ReturnType<typeof setTimeout>>()
+const DEFAULT_PREWARM_IDLE_TIMEOUT_MS = 5 * 60_000
+
 export function getSlashCommands(sessionId: string): Array<{ name: string; description: string }> {
   return sessionSlashCommands.get(sessionId) || []
 }
@@ -91,7 +103,11 @@ export const handleWebSocket = {
     }
 
     activeSessions.set(sessionId, ws)
-    rebindSessionOutput(sessionId, ws)
+    if (prewarmedSessions.has(sessionId)) {
+      bindPrewarmMetadataCapture(sessionId)
+    } else {
+      rebindSessionOutput(sessionId, ws)
+    }
 
     const msg: ServerMessage = { type: 'connected', sessionId }
     ws.send(JSON.stringify(msg))
@@ -128,6 +144,14 @@ export const handleWebSocket = {
           handleSetPermissionMode(ws, message)
           break
 
+        case 'set_runtime_config':
+          void handleSetRuntimeConfig(ws, message)
+          break
+
+        case 'prewarm_session':
+          handlePrewarmSession(ws)
+          break
+
         case 'stop_generation':
           handleStopGeneration(ws)
           break
@@ -185,56 +209,50 @@ async function handleUserMessage(
   message: Extract<ClientMessage, { type: 'user_message' }>
 ) {
   const { sessionId } = ws.data
-  let workDir = os.homedir()
 
   // Clear any stale stop flag from a previous turn
   sessionStopRequested.delete(sessionId)
+  clearPrewarmState(sessionId)
 
   // Send thinking status
   sendMessage(ws, { type: 'status', state: 'thinking', verb: 'Thinking' })
 
-  // 启动 CLI 子进程（如果还没有）
-  if (!conversationService.hasSession(sessionId)) {
+  const pendingRuntimeTransition = runtimeTransitionPromises.get(sessionId)
+  if (pendingRuntimeTransition) {
     try {
-      // Resolve the session's actual working directory
-      try {
-        const resolved = await sessionService.getSessionWorkDir(sessionId)
-        if (resolved) workDir = resolved
-        console.log(
-          `[WS] handleUserMessage: sessionId=${sessionId}, resolved workDir=${JSON.stringify(
-            resolved,
-          )}, will spawn CLI with workDir=${workDir}`,
-        )
-      } catch (resolveErr) {
-        // fallback to cwd if session file not found
-        console.warn(
-          `[WS] handleUserMessage: failed to resolve workDir for ${sessionId}, using fallback=${workDir}: ${
-            resolveErr instanceof Error ? resolveErr.message : String(resolveErr)
-          }`,
-        )
-      }
-      const runtimeSettings = await getRuntimeSettings()
-      const sdkUrl =
-        `ws://${ws.data.serverHost}:${ws.data.serverPort}/sdk/${sessionId}` +
-        `?token=${encodeURIComponent(crypto.randomUUID())}`
-      await conversationService.startSession(sessionId, workDir, sdkUrl, runtimeSettings)
+      await pendingRuntimeTransition
     } catch (err) {
       const errMsg = err instanceof Error ? err.message : String(err)
-      const code =
-        err instanceof ConversationStartupError ? err.code : 'CLI_START_FAILED'
-      console.error(`[WS] CLI start failed for ${sessionId}: ${errMsg}`)
+      console.error(`[WS] Runtime transition failed before handling user message for ${sessionId}: ${errMsg}`)
       sendMessage(ws, {
         type: 'error',
-        message: errMsg,
-        code,
-        retryable:
-          err instanceof ConversationStartupError ? err.retryable : false,
+        message: `Failed to switch provider/model: ${errMsg}`,
+        code: 'CLI_RESTART_FAILED',
       })
       sendMessage(ws, { type: 'status', state: 'idle' })
       return
     }
   }
 
+  // 启动 CLI 子进程（如果还没有）
+  try {
+    await ensureCliSessionStarted(ws, sessionId, 'user_message')
+  } catch (err) {
+    const errMsg = err instanceof Error ? err.message : String(err)
+    const code =
+      err instanceof ConversationStartupError ? err.code : 'CLI_START_FAILED'
+    console.error(`[WS] CLI start failed for ${sessionId}: ${errMsg}`)
+    sendMessage(ws, {
+      type: 'error',
+      message: errMsg,
+      code,
+      retryable:
+        err instanceof ConversationStartupError ? err.retryable : false,
+    })
+    sendMessage(ws, { type: 'status', state: 'idle' })
+    return
+  }
+
   // Track user message for title generation
   let titleState = sessionTitleState.get(sessionId)
   if (!titleState) {
@@ -274,6 +292,29 @@ async function handleUserMessage(
   userMessageSent = true
 }
 
+function handlePrewarmSession(ws: ServerWebSocket<WebSocketData>) {
+  const { sessionId } = ws.data
+  if (conversationService.hasSession(sessionId) || sessionStartupPromises.has(sessionId)) {
+    return
+  }
+
+  prewarmPendingSessions.add(sessionId)
+  void ensureCliSessionStarted(ws, sessionId, 'prewarm_session')
+    .then(() => {
+      if (!prewarmPendingSessions.delete(sessionId)) return
+      bindPrewarmMetadataCapture(sessionId)
+      markPrewarmed(sessionId)
+    })
+    .catch((err) => {
+      prewarmPendingSessions.delete(sessionId)
+      console.warn(
+        `[WS] Prewarm failed for ${sessionId}: ${
+          err instanceof Error ? err.message : String(err)
+        }`,
+      )
+    })
+}
+
 function handlePermissionResponse(
   ws: ServerWebSocket<WebSocketData>,
   message: Extract<ClientMessage, { type: 'permission_response' }>
@@ -331,6 +372,45 @@ function handleSetPermissionMode(
   }
 }
 
+async function handleSetRuntimeConfig(
+  ws: ServerWebSocket<WebSocketData>,
+  message: Extract<ClientMessage, { type: 'set_runtime_config' }>
+) {
+  const { sessionId } = ws.data
+  const modelId = typeof message.modelId === 'string' ? message.modelId.trim() : ''
+  if (!modelId) {
+    sendMessage(ws, {
+      type: 'error',
+      message: 'Runtime model selection is invalid.',
+      code: 'RUNTIME_CONFIG_INVALID',
+    })
+    return
+  }
+
+  const nextOverride = {
+    providerId: message.providerId ?? null,
+    modelId,
+  }
+  const prevOverride = runtimeOverrides.get(sessionId)
+  runtimeOverrides.set(sessionId, nextOverride)
+
+  if (
+    prevOverride &&
+    prevOverride.providerId === nextOverride.providerId &&
+    prevOverride.modelId === nextOverride.modelId
+  ) {
+    return
+  }
+
+  if (!conversationService.hasSession(sessionId)) {
+    return
+  }
+
+  await enqueueRuntimeTransition(sessionId, () =>
+    restartSessionWithRuntimeConfig(ws, sessionId),
+  )
+}
+
 async function restartSessionWithPermissionMode(
   ws: ServerWebSocket<WebSocketData>,
   sessionId: string,
@@ -346,7 +426,7 @@ async function restartSessionWithPermissionMode(
     conversationService.stopSession(sessionId)
 
     // Rebuild runtime settings (will pick up the persisted mode)
-    const runtimeSettings = await getRuntimeSettings()
+    const runtimeSettings = await getRuntimeSettings(sessionId)
     const sdkUrl =
       `ws://${ws.data.serverHost}:${ws.data.serverPort}/sdk/${sessionId}` +
       `?token=${encodeURIComponent(crypto.randomUUID())}`
@@ -366,6 +446,40 @@ async function restartSessionWithPermissionMode(
   }
 }
 
+async function restartSessionWithRuntimeConfig(
+  ws: ServerWebSocket<WebSocketData>,
+  sessionId: string,
+): Promise<void> {
+  try {
+    sendMessage(ws, {
+      type: 'status',
+      state: 'thinking',
+      verb: 'Switching provider and model...',
+    })
+
+    const workDir = conversationService.getSessionWorkDir(sessionId)
+    conversationService.stopSession(sessionId)
+
+    const runtimeSettings = await getRuntimeSettings(sessionId)
+    const sdkUrl =
+      `ws://${ws.data.serverHost}:${ws.data.serverPort}/sdk/${sessionId}` +
+      `?token=${encodeURIComponent(crypto.randomUUID())}`
+    await conversationService.startSession(sessionId, workDir, sdkUrl, runtimeSettings)
+
+    sendMessage(ws, { type: 'status', state: 'idle' })
+    console.log(`[WS] Restarted CLI for ${sessionId} with runtime override`)
+  } catch (err) {
+    const errMsg = err instanceof Error ? err.message : String(err)
+    console.error(`[WS] Failed to restart CLI for ${sessionId} after runtime override: ${errMsg}`)
+    sendMessage(ws, {
+      type: 'error',
+      message: `Failed to switch provider/model: ${errMsg}`,
+      code: 'CLI_RESTART_FAILED',
+    })
+    sendMessage(ws, { type: 'status', state: 'idle' })
+  }
+}
+
 function handleStopGeneration(ws: ServerWebSocket<WebSocketData>) {
   const { sessionId } = ws.data
   console.log(`[WS] Stop generation requested for session: ${sessionId}`)
@@ -404,6 +518,7 @@ function triggerTitleGeneration(ws: ServerWebSocket<WebSocketData>, sessionId: s
   const text = count === 1
     ? state.firstUserMessage
     : state.allUserMessages.join('\n')
+  const runtimeProviderId = runtimeOverrides.get(sessionId)?.providerId
 
   // Fire-and-forget: derive quick title, then upgrade with AI
   void (async () => {
@@ -418,7 +533,7 @@ function triggerTitleGeneration(ws: ServerWebSocket<WebSocketData>, sessionId: s
       }
 
       // Stage 2: AI-generated title
-      const aiTitle = await generateTitle(text)
+      const aiTitle = await generateTitle(text, runtimeProviderId)
       if (aiTitle) {
         await saveAiTitle(sessionId, aiTitle)
         sendMessage(ws, { type: 'session_title_updated', sessionId, title: aiTitle })
@@ -471,6 +586,122 @@ function cleanupSessionRuntimeState(sessionId: string) {
   cleanupStreamState(sessionId)
   sessionSlashCommands.delete(sessionId)
   sessionTitleState.delete(sessionId)
+  runtimeOverrides.delete(sessionId)
+  runtimeTransitionPromises.delete(sessionId)
+  sessionStartupPromises.delete(sessionId)
+  clearPrewarmState(sessionId)
+}
+
+function getPrewarmIdleTimeoutMs(): number {
+  const raw = process.env.CC_HAHA_PREWARM_IDLE_TIMEOUT_MS
+  if (!raw) return DEFAULT_PREWARM_IDLE_TIMEOUT_MS
+  const parsed = Number.parseInt(raw, 10)
+  return Number.isFinite(parsed) && parsed >= 0
+    ? parsed
+    : DEFAULT_PREWARM_IDLE_TIMEOUT_MS
+}
+
+function clearPrewarmState(sessionId: string) {
+  prewarmPendingSessions.delete(sessionId)
+  prewarmedSessions.delete(sessionId)
+  const timer = prewarmIdleTimers.get(sessionId)
+  if (timer) {
+    clearTimeout(timer)
+    prewarmIdleTimers.delete(sessionId)
+  }
+}
+
+function markPrewarmed(sessionId: string) {
+  prewarmedSessions.add(sessionId)
+  const timeoutMs = getPrewarmIdleTimeoutMs()
+  if (timeoutMs === 0) return
+
+  const existingTimer = prewarmIdleTimers.get(sessionId)
+  if (existingTimer) clearTimeout(existingTimer)
+
+  const timer = setTimeout(() => {
+    prewarmIdleTimers.delete(sessionId)
+    if (!prewarmedSessions.has(sessionId)) return
+    console.log(`[WS] Prewarmed session ${sessionId} idle for ${timeoutMs}ms, stopping CLI subprocess`)
+    conversationService.stopSession(sessionId)
+    prewarmedSessions.delete(sessionId)
+  }, timeoutMs)
+  prewarmIdleTimers.set(sessionId, timer)
+}
+
+function cacheSessionInitMetadata(sessionId: string, cliMsg: any) {
+  if (cliMsg?.type !== 'system' || cliMsg.subtype !== 'init') return
+  if (cliMsg.slash_commands && Array.isArray(cliMsg.slash_commands)) {
+    sessionSlashCommands.set(sessionId, cliMsg.slash_commands.map((cmd: any) => ({
+      name: typeof cmd === 'string' ? cmd : (cmd.name || cmd.command || ''),
+      description: typeof cmd === 'string' ? '' : (cmd.description || ''),
+    })))
+  }
+}
+
+function bindPrewarmMetadataCapture(sessionId: string) {
+  for (const msg of conversationService.getRecentSdkMessages(sessionId)) {
+    cacheSessionInitMetadata(sessionId, msg)
+  }
+  if (!conversationService.hasSession(sessionId)) return
+
+  conversationService.clearOutputCallbacks(sessionId)
+  conversationService.onOutput(sessionId, (cliMsg) => {
+    cacheSessionInitMetadata(sessionId, cliMsg)
+  })
+}
+
+async function resolveSessionWorkDir(sessionId: string, fallback = os.homedir()): Promise<string> {
+  let workDir = fallback
+  try {
+    const resolved = await sessionService.getSessionWorkDir(sessionId)
+    if (resolved) workDir = resolved
+    console.log(
+      `[WS] resolveSessionWorkDir: sessionId=${sessionId}, resolved workDir=${JSON.stringify(
+        resolved,
+      )}, will spawn CLI with workDir=${workDir}`,
+    )
+  } catch (resolveErr) {
+    console.warn(
+      `[WS] resolveSessionWorkDir: failed to resolve workDir for ${sessionId}, using fallback=${workDir}: ${
+        resolveErr instanceof Error ? resolveErr.message : String(resolveErr)
+      }`,
+    )
+  }
+  return workDir
+}
+
+async function ensureCliSessionStarted(
+  ws: ServerWebSocket<WebSocketData>,
+  sessionId: string,
+  reason: 'user_message' | 'prewarm_session',
+): Promise<void> {
+  const pendingStartup = sessionStartupPromises.get(sessionId)
+  if (pendingStartup) {
+    await pendingStartup
+    return
+  }
+
+  if (conversationService.hasSession(sessionId)) return
+
+  const startup = (async () => {
+    const workDir = await resolveSessionWorkDir(sessionId)
+    const runtimeSettings = await getRuntimeSettings(sessionId)
+    const sdkUrl =
+      `ws://${ws.data.serverHost}:${ws.data.serverPort}/sdk/${sessionId}` +
+      `?token=${encodeURIComponent(crypto.randomUUID())}`
+    console.log(`[WS] Starting CLI for ${sessionId} due to ${reason}`)
+    await conversationService.startSession(sessionId, workDir, sdkUrl, runtimeSettings)
+  })()
+
+  sessionStartupPromises.set(sessionId, startup)
+  try {
+    await startup
+  } finally {
+    if (sessionStartupPromises.get(sessionId) === startup) {
+      sessionStartupPromises.delete(sessionId)
+    }
+  }
 }
 
 function translateCliMessage(cliMsg: any, sessionId: string): ServerMessage[] {
@@ -740,12 +971,7 @@ function translateCliMessage(cliMsg: any, sessionId: string): ServerMessage[] {
         // NOTE: Do NOT send status:idle here — the CLI init fires while
         // processing the first user message, and sending idle would reset
         // the frontend's streaming state prematurely.
-        if (cliMsg.slash_commands && Array.isArray(cliMsg.slash_commands)) {
-          sessionSlashCommands.set(sessionId, cliMsg.slash_commands.map((cmd: any) => ({
-            name: typeof cmd === 'string' ? cmd : (cmd.name || cmd.command || ''),
-            description: typeof cmd === 'string' ? '' : (cmd.description || ''),
-          })))
-        }
+        cacheSessionInitMetadata(sessionId, cliMsg)
         const messages: ServerMessage[] = [
           // Send model info as a system notification, not a status change
           { type: 'system_notification', subtype: 'init', message: `Model: ${cliMsg.model || 'unknown'}`, data: { model: cliMsg.model } },
@@ -845,32 +1071,53 @@ function rebindSessionOutput(
   })
 }
 
-async function getRuntimeSettings(): Promise<{
+async function getRuntimeSettings(sessionId?: string): Promise<{
   permissionMode?: string
   model?: string
   effort?: string
+  providerId?: string | null
 }> {
+  const runtimeOverride = sessionId ? runtimeOverrides.get(sessionId) : undefined
+  if (runtimeOverride) {
+    const userSettings = await settingsService.getUserSettings()
+    const effort =
+      typeof userSettings.effort === 'string' && userSettings.effort.trim()
+        ? userSettings.effort
+        : undefined
+
+    return {
+      permissionMode: await settingsService.getPermissionMode().catch(() => undefined),
+      model: runtimeOverride.modelId,
+      effort,
+      providerId: runtimeOverride.providerId,
+    }
+  }
+
+  // Check if a custom provider is active
+  const { activeId } = await providerService.listProviders()
   const userSettings = await settingsService.getUserSettings()
+  const providerSettings = activeId
+    ? await providerService.getManagedSettings()
+    : undefined
+  const modelSettings = providerSettings ?? userSettings
   const modelContext =
-    typeof userSettings.modelContext === 'string' && userSettings.modelContext.trim()
-      ? userSettings.modelContext
+    typeof modelSettings.modelContext === 'string' && modelSettings.modelContext.trim()
+      ? modelSettings.modelContext
       : undefined
   const effort =
     typeof userSettings.effort === 'string' && userSettings.effort.trim()
       ? userSettings.effort
       : undefined
 
-  // Check if a custom provider is active
-  const { activeId } = await providerService.listProviders()
-
   let model: string | undefined
   if (activeId) {
-    // Provider is active — only pass --model if user explicitly selected a non-default model.
-    // Otherwise the CLI should use ANTHROPIC_MODEL from env (set by syncToSettings).
-    // Default Anthropic model should be overridden by the provider's model.
-    const baseModel = (userSettings.model as string) || ''
-    if (baseModel && baseModel !== 'claude-sonnet-4-6') {
-      // User explicitly selected a different model — pass it through
+    // Provider is active — only consult provider-managed cc-haha settings.
+    // Global ~/.claude/settings.json model values must not bleed into provider mode.
+    const baseModel =
+      typeof modelSettings.model === 'string' && modelSettings.model.trim()
+        ? modelSettings.model
+        : ''
+    if (baseModel) {
       model = baseModel
       if (modelContext) model += `:${modelContext}`
     }
@@ -890,6 +1137,23 @@ async function getRuntimeSettings(): Promise<{
   }
 }
 
+function enqueueRuntimeTransition(
+  sessionId: string,
+  transition: () => Promise<void>,
+): Promise<void> {
+  const previous = runtimeTransitionPromises.get(sessionId) ?? Promise.resolve()
+  const next = previous
+    .catch(() => {})
+    .then(transition)
+    .finally(() => {
+      if (runtimeTransitionPromises.get(sessionId) === next) {
+        runtimeTransitionPromises.delete(sessionId)
+      }
+    })
+  runtimeTransitionPromises.set(sessionId, next)
+  return next
+}
+
 /**
  * Send a message to a specific session's WebSocket (for use by services)
  */
diff --git a/src/utils/betas.ts b/src/utils/betas.ts
index 7a1747ca..da429117 100644
--- a/src/utils/betas.ts
+++ b/src/utils/betas.ts
@@ -27,7 +27,7 @@ import { has1mContext } from './context.js'
 import { isEnvDefinedFalsy, isEnvTruthy } from './envUtils.js'
 import { getCanonicalName } from './model/model.js'
 import { get3PModelCapabilityOverride } from './model/modelSupportOverrides.js'
-import { getAPIProvider } from './model/providers.js'
+import { getAPIProvider, isFirstPartyAnthropicBaseUrl } from './model/providers.js'
 import { getInitialSettings } from './settings/settings.js'
 
 /**
@@ -215,6 +215,7 @@ export function getToolSearchBetaHeader(): string {
 export function shouldIncludeFirstPartyOnlyBetas(): boolean {
   return (
     (getAPIProvider() === 'firstParty' || getAPIProvider() === 'foundry') &&
+    (getAPIProvider() !== 'firstParty' || isFirstPartyAnthropicBaseUrl()) &&
     !isEnvTruthy(process.env.CLAUDE_CODE_DISABLE_EXPERIMENTAL_BETAS)
   )
 }
@@ -398,6 +399,10 @@ export function getMergedBetas(
   model: string,
   options?: { isAgenticQuery?: boolean },
 ): string[] {
+  if (getAPIProvider() === 'firstParty' && !isFirstPartyAnthropicBaseUrl()) {
+    return []
+  }
+
   const baseBetas = [...getModelBetas(model)]
 
   // Agentic queries always need claude-code and cli-internal beta headers.
diff --git a/src/utils/desktopBundledCli.ts b/src/utils/desktopBundledCli.ts
new file mode 100644
index 00000000..0a462ac3
--- /dev/null
+++ b/src/utils/desktopBundledCli.ts
@@ -0,0 +1,93 @@
+import * as fs from 'node:fs'
+import * as path from 'node:path'
+
+export type ClaudeCliLauncher = {
+  command: string
+  kind: 'script' | 'sidecar' | 'binary'
+  requiresAppRoot: boolean
+}
+
+export function resolveBundledCliPathFromExecPath(
+  execPath: string = process.execPath,
+): string | null {
+  const execName = path.basename(execPath)
+
+  if (execName.startsWith('claude-sidecar')) {
+    return execPath
+  }
+
+  if (execName.startsWith('claude-server')) {
+    const bundledCliPath = path.join(
+      path.dirname(execPath),
+      execName.replace(/^claude-server/, 'claude-cli'),
+    )
+    return fs.existsSync(bundledCliPath) ? bundledCliPath : null
+  }
+
+  return null
+}
+
+export function resolveClaudeCliLauncher(options?: {
+  cliPath?: string | null
+  execPath?: string
+}): ClaudeCliLauncher | null {
+  const command =
+    options?.cliPath || resolveBundledCliPathFromExecPath(options?.execPath)
+
+  if (!command) {
+    return null
+  }
+
+  if (/\.(?:[cm]?[jt]s|tsx?)$/i.test(command)) {
+    return {
+      command,
+      kind: 'script',
+      requiresAppRoot: false,
+    }
+  }
+
+  const cliBaseName = path.basename(command)
+  if (cliBaseName.startsWith('claude-sidecar')) {
+    return {
+      command,
+      kind: 'sidecar',
+      requiresAppRoot: true,
+    }
+  }
+
+  if (cliBaseName.startsWith('claude-cli')) {
+    return {
+      command,
+      kind: 'binary',
+      requiresAppRoot: true,
+    }
+  }
+
+  return {
+    command,
+    kind: 'binary',
+    requiresAppRoot: false,
+  }
+}
+
+export function buildClaudeCliArgs(
+  launcher: ClaudeCliLauncher,
+  baseArgs: string[],
+  appRoot: string | undefined = process.env.CLAUDE_APP_ROOT,
+): string[] {
+  if (launcher.kind === 'script') {
+    return ['bun', launcher.command, ...baseArgs]
+  }
+
+  if (launcher.kind === 'sidecar') {
+    return appRoot
+      ? [launcher.command, 'cli', '--app-root', appRoot, ...baseArgs]
+      : [launcher.command, 'cli', ...baseArgs]
+  }
+
+  if (launcher.requiresAppRoot && appRoot) {
+    return [launcher.command, '--app-root', appRoot, ...baseArgs]
+  }
+
+  return [launcher.command, ...baseArgs]
+}
diff --git a/src/utils/shell/bashProvider.test.ts b/src/utils/shell/bashProvider.test.ts
new file mode 100644
index 00000000..8fed95ae
--- /dev/null
+++ b/src/utils/shell/bashProvider.test.ts
@@ -0,0 +1,41 @@
+import { afterEach, describe, expect, test } from 'bun:test'
+import { createBashShellProvider } from './bashProvider.js'
+
+const ORIGINAL_CLAUDE_CLI_PATH = process.env.CLAUDE_CLI_PATH
+const ORIGINAL_CLAUDE_APP_ROOT = process.env.CLAUDE_APP_ROOT
+
+afterEach(() => {
+  if (ORIGINAL_CLAUDE_CLI_PATH === undefined) {
+    delete process.env.CLAUDE_CLI_PATH
+  } else {
+    process.env.CLAUDE_CLI_PATH = ORIGINAL_CLAUDE_CLI_PATH
+  }
+
+  if (ORIGINAL_CLAUDE_APP_ROOT === undefined) {
+    delete process.env.CLAUDE_APP_ROOT
+  } else {
+    process.env.CLAUDE_APP_ROOT = ORIGINAL_CLAUDE_APP_ROOT
+  }
+})
+
+describe('createBashShellProvider', () => {
+  test('injects a bundled claude wrapper for desktop sidecars', async () => {
+    process.env.CLAUDE_CLI_PATH = '/tmp/claude-sidecar'
+    process.env.CLAUDE_APP_ROOT = '/tmp/claude-desktop-app'
+
+    const provider = await createBashShellProvider('/bin/bash', {
+      skipSnapshot: true,
+    })
+
+    const { commandString } = await provider.buildExecCommand(
+      'claude plugin install demo@claude-plugins-official --scope user',
+      {
+        id: 'wrapper-test',
+        useSandbox: false,
+      },
+    )
+
+    expect(commandString).toContain('claude() {')
+    expect(commandString).toContain('/tmp/claude-sidecar cli --app-root "$CLAUDE_APP_ROOT" "$@"')
+  })
+})
diff --git a/src/utils/shell/bashProvider.ts b/src/utils/shell/bashProvider.ts
index 2881711a..4db50e69 100644
--- a/src/utils/shell/bashProvider.ts
+++ b/src/utils/shell/bashProvider.ts
@@ -22,6 +22,7 @@ import {
   hasTmuxToolBeenUsed,
 } from '../tmuxSocket.js'
 import { windowsPathToPosixPath } from '../windowsPaths.js'
+import { resolveClaudeCliLauncher } from '../desktopBundledCli.js'
 import type { ShellProvider } from './shellProvider.js'
 
 /**
@@ -55,6 +56,34 @@ function getDisableExtglobCommand(shellPath: string): string | null {
   return null
 }
 
+function buildBundledClaudeShellWrapper(): string | null {
+  const launcher = resolveClaudeCliLauncher({
+    cliPath: process.env.CLAUDE_CLI_PATH,
+    execPath: process.execPath,
+  })
+
+  if (!launcher) {
+    return null
+  }
+
+  const quotedCommand = quote([launcher.command])
+  let invoke = ''
+
+  if (launcher.kind === 'script') {
+    invoke = `command bun ${quotedCommand} "$@"`
+  } else if (launcher.kind === 'sidecar') {
+    invoke = launcher.requiresAppRoot
+      ? `if [ -z "$CLAUDE_APP_ROOT" ]; then echo "bundled claude wrapper requires CLAUDE_APP_ROOT" >&2; return 1; fi; ${quotedCommand} cli --app-root "$CLAUDE_APP_ROOT" "$@"`
+      : `${quotedCommand} cli "$@"`
+  } else if (launcher.requiresAppRoot) {
+    invoke = `if [ -n "$CLAUDE_APP_ROOT" ]; then ${quotedCommand} --app-root "$CLAUDE_APP_ROOT" "$@"; else ${quotedCommand} "$@"; fi`
+  } else {
+    invoke = `${quotedCommand} "$@"`
+  }
+
+  return `claude() { ${invoke}; }`
+}
+
 export async function createBashShellProvider(
   shellPath: string,
   options?: { skipSnapshot?: boolean },
@@ -172,6 +201,11 @@ export async function createBashShellProvider(
         commandParts.push(sessionEnvScript)
       }
 
+      const bundledClaudeWrapper = buildBundledClaudeShellWrapper()
+      if (bundledClaudeWrapper) {
+        commandParts.push(bundledClaudeWrapper)
+      }
+
       // Disable extended glob patterns for security (after sourcing user config to override)
       const disableExtglobCmd = getDisableExtglobCommand(shellPath)
       if (disableExtglobCmd) {