release: 0.0.48

Merge pull request #299 from leookun/fix/issue-298-per-user-ca
Fix shared root CA by generating one per installation
2026-08-17 19:47:10 +08:00 · 2026-08-12 20:32:19 +08:00 · 2026-08-12 20:11:43 +08:00 · 2026-08-12 20:04:29 +08:00 · 2026-08-12 01:22:35 +08:00 · 2026-08-12 01:14:24 +08:00
107 changed files with 5365 additions and 2297 deletions
@@ -10,9 +10,3 @@

 <!-- 描述如何验证这个变更 / Describe how to verify this change -->

-## 检查清单 / Checklist
-
- [ ] 代码已通过 `gofmt` 和 `go vet` / Code passes `gofmt` and `go vet`
- [ ] 前端构建无报错 / Frontend builds without errors
- [ ] 新增 UI 文案已同步所有 locale 文件 / New UI strings synced to all locale files
- [ ] 提交信息符合 Conventional Commits 规范 / Commit messages follow Conventional Commits
@@ -0,0 +1,107 @@
+<div align="center">
+
+# cursor-byok
+
+cursor-byok 是 Cursor 后端的本地实现。
+<br>
+<br>
+<a href="https://trendshift.io/repositories/39260?utm_source=repository-badge&amp;utm_medium=badge&amp;utm_campaign=badge-repository-39260" target="_blank" rel="noopener noreferrer"><img src="https://trendshift.io/api/badge/repositories/39260" alt="leookun/cursor-byok | Trendshift" width="250" height="55" /></a>
+
+[使用教程](https://docs.leokun.cn) · [下载最新版](https://github.com/leookun/cursor-byok/releases/latest) · [问题反馈](https://github.com/leookun/cursor-byok/issues) · [English](./README.md)
+
+[![Release](https://img.shields.io/github/v/release/leookun/cursor-byok?style=flat-square)](https://github.com/leookun/cursor-byok/releases/latest)
+[![Downloads](https://img.shields.io/github/downloads/leookun/cursor-byok/total?style=flat-square)](https://github.com/leookun/cursor-byok/releases)
+[![License](https://img.shields.io/github/license/leookun/cursor-byok?style=flat-square)](./LICENSE)
+[![Platforms](https://img.shields.io/badge/platform-macOS%20%7C%20Windows%20%7C%20Linux-lightgrey?style=flat-square)](https://github.com/leookun/cursor-byok/releases/latest)
+
+</div>
+
+![cursor-byok 支持接入多种模型 API](./images/cn-brand.png)
+
+![cursor-byok 主界面](./images/cn-home.png)
+
+## 项目介绍
+
+cursor-byok 是一个开源的 Cursor 本地模型接入工具。它通过运行在本机的服务连接 Cursor 与你配置的模型 API，让模型请求使用自己的渠道处理，同时保留 Cursor Agent 的工具调用、Skills 和 MCP 等能力。
+
+你可以接入 OpenAI、Anthropic 及其兼容服务，自由配置接口地址、模型、密钥和请求参数，不再局限于平台预设的模型渠道。
+
+> [!IMPORTANT]
+> cursor-byok 本身免费开源，但你接入的模型 API 可能由对应服务商收费。本项目不是 Cursor 官方产品，与 Cursor 或其开发公司无隶属关系。
+
+## 核心能力
+
+- **自定义模型渠道**：配置自己的 API 地址、访问密钥和模型标识。
+- **多种接口协议**：支持 OpenAI、Anthropic 兼容接口及自定义端点。
+- **模型管理**：添加、复制、编辑、排序和批量测试多个模型配置。
+- **连接性能测试**：查看首字延迟、生成速度与模型服务的原始响应。
+- **Agent 工作流**：支持工具调用、Skills、MCP 和多轮会话。
+- **会话统计**：查看 Token 消耗、缓存命中率、对话轮次和价值估算。
+- **跨平台运行**：支持 macOS、Windows 和 Linux。
+
+## 快速开始
+
+1. 从 [GitHub Releases](https://github.com/leookun/cursor-byok/releases/latest) 下载对应平台的最新版本。
+2. 启动 cursor-byok，打开“模型配置”，填写接口地址、API Key 和模型标识。
+3. 测试模型配置；测试通过后返回主界面启动服务。
+4. 打开 Cursor，选择已配置的模型并开始使用 Agent。
+
+更完整的安装、系统配置和常见问题说明，请查看 [详细使用教程](https://docs.leokun.cn)。
+
+## 模型管理
+
+模型配置支持 OpenAI 与 Anthropic 两类接口协议。每个模型渠道可以独立设置上下文窗口、最大输出 Token、推理强度、自定义请求头和额外请求参数。
+
+![cursor-byok 模型配置](./images/cn-model.png)
+
+## 工作原理
+
+```text
+Cursor 客户端
+    │
+    │ Agent 请求与工具结果
+    ▼
+cursor-byok 本地服务
+    │
+    │ OpenAI / Anthropic 兼容请求
+    ▼
+你配置的模型 API
+```
+
+cursor-byok 在本机负责协议适配、模型请求转发、工具调用衔接与会话状态管理。模型 API Key 和应用配置保存在本机；实际请求仍会发送到你所配置的模型服务商。
+
+## 为什么做这个项目
+
+很多 Agent 产品会将工具能力、模型选择、订阅方案和计费方式绑定在一起，用户只能使用平台提供的模型渠道。
+
+我希望将模型选择权交还给用户：开发者可以充分利用已有的模型 API 和额度，自由选择适合自己的模型与服务商，也可以在需要时自托管相关服务。
+
+## 路线图
+
+项目将继续改进模型兼容性、Agent 工具链、本地运行稳定性和自托管体验，并探索更多 IDE、Chat 与 Agent 场景。
+
+详细计划与进展请查看 [正式版路线图](https://github.com/leookun/cursor-byok/discussions/32)。
+
+## 社区与支持
+
+- [使用教程](https://docs.leokun.cn)
+- [GitHub Issues](https://github.com/leookun/cursor-byok/issues)
+- [Telegram 交流群](https://t.me/cursor_byok)
+- QQ 交流群：`1095916242`、`1094411438`、`1095918002`、`1094419321`
+
+
+## 开发与贡献
+
+欢迎提交 Issue 和 Pull Request。开发环境、构建命令、项目结构及提交规范请阅读 [贡献指南](./CONTRIBUTING.md)。
+
+
+## 贡献者名单
+
+<a href="https://github.com/leookun/cursor-byok/graphs/contributors">
+  <img src="https://contrib.rocks/image?repo=leookun/cursor-byok" />
+</a>
+
+
+## 许可证
+
+本项目基于 [MIT License](./LICENSE) 开源。
@@ -1,39 +1,110 @@
-<img  width="820"  alt="image" src="https://github.com/user-attachments/assets/2e1710b0-cdbd-4576-bd24-1614df016219" />
+<div align="center">

-<img width="820"  alt="image" src="https://github.com/user-attachments/assets/00885453-6a91-4052-aadf-f686daeec881" />
+# cursor-byok
+cursor-byok is a local implementation of Cursor's backend.
+<br>
+<br>
+<a href="https://trendshift.io/repositories/39260?utm_source=repository-badge&amp;utm_medium=badge&amp;utm_campaign=badge-repository-39260" target="_blank" rel="noopener noreferrer"><img src="https://trendshift.io/api/badge/repositories/39260" alt="leookun/cursor-byok | Trendshift" width="250" height="55" /></a>

-<img  width="820"  alt="image" src="https://github.com/user-attachments/assets/a607be84-a738-4e33-9750-13352e74001c" />
+[User Guide](https://docs.leokun.cn) · [Download](https://github.com/leookun/cursor-byok/releases/latest) · [Report an Issue](https://github.com/leookun/cursor-byok/issues) · [中文版本说明](./README-CN.md)

-
-## 交流群组
-https://t.me/cursor_byok
-
-
-## 为什么做这个项目
-
-公司喜欢把 Agent 服务与模型绑定在一起，让用户只能在指定模型、指定订阅和指定计费方式下使用工具。
-
-我希望打破这种绑定关系：模型应该可以自由选择。开发者应该能够把自己的模型 API 接入到任何 IDE、Chat、Agent 或开发工具中，也可以自托管整套服务，避免被单一平台锁定。
-
-这个项目的目标，是让模型选择权重新回到用户手里。
-
-## 路线图
-
-[正式版路线图](https://github.com/leookun/cursor-byok/discussions/32)
-[详细使用教程](https://docs.leokun.cn)
-
-## 后续
-
-后续会继续扩展更多工具和使用场景，包括但不限于：
-
- 支持更多 IDE 接入
- 支持更多 Chat 类应用
- 支持更多 Agent 工具和工作流
- 提供更完善的自托管部署方式
- 持续优化不同模型 API 的兼容性
- 降低接入成本，让已有模型额度可以被更充分地利用
-
-最终希望做到：让你的模型 API 可以自由接入到你想使用的任何工具中。
+[![Release](https://img.shields.io/github/v/release/leookun/cursor-byok?style=flat-square)](https://github.com/leookun/cursor-byok/releases/latest)
+[![Downloads](https://img.shields.io/github/downloads/leookun/cursor-byok/total?style=flat-square)](https://github.com/leookun/cursor-byok/releases)
+[![License](https://img.shields.io/github/license/leookun/cursor-byok?style=flat-square)](./LICENSE)
+[![Platforms](https://img.shields.io/badge/platform-macOS%20%7C%20Windows%20%7C%20Linux-lightgrey?style=flat-square)](https://github.com/leookun/cursor-byok/releases/latest)



+</div>
+
+![Connect cursor-byok to a wide range of model APIs](./images/en-brand.png)
+
+![cursor-byok dashboard](./images/en-home.png)
+
+## About
+
+cursor-byok is an open-source local model gateway for Cursor. It runs a service on your machine that connects Cursor to the model APIs you configure, routes model requests through your own providers, and preserves Cursor Agent capabilities such as tool calling, Skills, and MCP.
+
+You can connect OpenAI- and Anthropic-compatible services, customize endpoints, model IDs, API keys, and request parameters, and use model channels beyond the options built into the platform.
+
+> [!IMPORTANT]
+> cursor-byok is free and open source, but the model APIs you connect may charge for usage. This is an independent project and is not affiliated with or endorsed by Cursor or its developers.
+
+## Features
+
+- **Bring your own model channels:** Configure your own API endpoint, credentials, and model IDs.
+- **Multiple API protocols:** Use OpenAI- and Anthropic-compatible APIs or a custom endpoint.
+- **Model management:** Add, duplicate, edit, reorder, and batch-test multiple model configurations.
+- **Connection benchmarks:** Measure time to first token, generation speed, and inspect raw provider responses.
+- **Agent workflows:** Keep tool calling, Skills, MCP, and multi-turn conversations available.
+- **Session metrics:** Track token usage, cache hit rate, conversation turns, and estimated value.
+- **Cross-platform:** Run on macOS, Windows, and Linux.
+
+## Quick Start
+
+1. Download the latest build for your platform from [GitHub Releases](https://github.com/leookun/cursor-byok/releases/latest).
+2. Launch cursor-byok, open **Model Settings**, and enter the endpoint, API key, and model ID.
+3. Test the model configuration. Once it passes, return to the dashboard and start the service.
+4. Open Cursor, select the configured model, and start using Agent.
+
+For complete installation steps, system configuration, and troubleshooting, see the [User Guide](https://docs.leokun.cn).
+
+## Model Management
+
+Model configurations support both OpenAI and Anthropic API protocols. Each model channel can independently define its context window, maximum output tokens, reasoning effort, custom headers, and additional request parameters.
+
+![cursor-byok model settings](./images/en-model.png)
+
+## How It Works
+
+```text
+Cursor client
+    │
+    │ Agent requests and tool results
+    ▼
+cursor-byok local service
+    │
+    │ OpenAI- / Anthropic-compatible requests
+    ▼
+Your model API
+```
+
+cursor-byok handles protocol adaptation, model request forwarding, tool-call coordination, and conversation state on your machine. API keys and application settings are stored locally; requests are still sent to the model provider you configure.
+
+## Why This Project
+
+Many Agent products bundle their tool capabilities with a fixed set of models, subscriptions, and billing options, leaving users limited to the channels offered by the platform.
+
+cursor-byok is built to return model choice to the user. Developers can make full use of the APIs and credits they already have, choose the models and providers that fit their needs, and self-host related services when required.
+
+## Roadmap
+
+The project will continue to improve model compatibility, Agent tooling, local runtime stability, and the self-hosting experience while exploring support for more IDE, chat, and Agent workflows.
+
+See the [release roadmap](https://github.com/leookun/cursor-byok/discussions/32) for plans and progress.
+
+## Community and Support
+
+- [User Guide](https://docs.leokun.cn)
+- [GitHub Issues](https://github.com/leookun/cursor-byok/issues)
+- [Telegram community](https://t.me/cursor_byok)
+- QQ groups: `1095916242`, `1094411438`, `1095918002`, `1094419321`
+
+
+
+## Development and Contributing
+
+Issues and pull requests are welcome. See the [Contributing Guide](./CONTRIBUTING_EN.md) for prerequisites, build commands, project structure, and contribution guidelines.
+
+## Contributors
+
+<a href="https://github.com/leookun/cursor-byok/graphs/contributors">
+  <img src="https://contrib.rocks/image?repo=leookun/cursor-byok" />
+</a>
+
+
+## License
+
+This project is open source under the [MIT License](./LICENSE).
+
+
@@ -8,7 +8,7 @@ info:
  description: "Cursor助手"
  copyright: "© 2026, Cursor助手"
  comments: "Cursor助手"
-  version: "0.0.45"
+  version: "0.0.48"

 dev_mode:
  root_path: .
@@ -17,9 +17,9 @@
 		<key>CFBundlePackageType</key>
 		<string>APPL</string>
 		<key>CFBundleShortVersionString</key>
-		<string>0.0.45</string>
+		<string>0.0.48</string>
 		<key>CFBundleVersion</key>
-		<string>0.0.45</string>
+		<string>0.0.48</string>
 		<key>LSMinimumSystemVersion</key>
 		<string>12.0.0</string>
 		<key>LSUIElement</key>
@@ -17,9 +17,9 @@
 		<key>CFBundlePackageType</key>
 		<string>APPL</string>
 		<key>CFBundleShortVersionString</key>
-		<string>0.0.45</string>
+		<string>0.0.48</string>
 		<key>CFBundleVersion</key>
-		<string>0.0.45</string>
+		<string>0.0.48</string>
 		<key>LSMinimumSystemVersion</key>
 		<string>12.0.0</string>
 		<key>LSUIElement</key>
@@ -6,7 +6,7 @@
 name: "Cursor助手"
 arch: ${GOARCH}
 platform: "linux"
-version: "0.0.45"
+version: "0.0.48"
 section: "default"
 priority: "extra"
 maintainer: ${GIT_COMMITTER_NAME} <${GIT_COMMITTER_EMAIL}>
@@ -24,24 +24,24 @@ contents:
  - src: "./build/linux/Cursor助手.desktop"
    dst: "/usr/share/applications/Cursor助手.desktop"

-# Default dependencies for Debian 12/Ubuntu 22.04+ with WebKit 4.1
+# Default dependencies for the GTK4 + WebKitGTK 6.0 stack (Ubuntu 24.04+ / Debian 13+)
 depends:
-  - libgtk-3-0
-  - libwebkit2gtk-4.1-0
+  - libgtk-4-1
+  - libwebkitgtk-6.0-4

-# Distribution-specific overrides for different package formats and WebKit versions
+# Distribution-specific overrides for different package formats
 overrides:
-  # RPM packages for RHEL/CentOS/AlmaLinux/Rocky Linux (WebKit 4.0)
+  # RPM packages for Fedora / RHEL / AlmaLinux / Rocky Linux
  rpm:
    depends:
-      - gtk3
-      - webkit2gtk4.1
-  
-  # Arch Linux packages (WebKit 4.1)  
+      - gtk4
+      - webkitgtk6.0
+
+  # Arch Linux packages
  archlinux:
    depends:
-      - gtk3
-      - webkit2gtk-4.1
+      - gtk4
+      - webkitgtk-6.0

 # scripts section to ensure desktop database is updated after install
 scripts:
@@ -50,13 +50,26 @@ scripts:
  # preremove: "./build/linux/nfpm/scripts/preremove.sh"
  # postremove: "./build/linux/nfpm/scripts/postremove.sh"

+# If you build your app with -tags gtk3 (legacy WebKit2GTK 4.1 stack — supported through v3.0.x, removed in v3.1),
+# replace the depends/overrides above with these:
+#
+# depends:
+#   - libgtk-3-0
+#   - libwebkit2gtk-4.1-0
+# overrides:
+#   rpm:
+#     depends:
+#       - gtk3
+#       - webkit2gtk4.1
+#   archlinux:
+#     depends:
+#       - gtk3
+#       - webkit2gtk-4.1
+#
 # replaces:
 #   - foobar
 # provides:
 #   - bar
-# depends:
-#   - gtk3
-#   - libwebkit2gtk
 # recommends:
 #   - whatever
 # suggests:
@@ -1,10 +1,10 @@
 {
 	"fixed": {
-		"file_version": "0.0.45"
+		"file_version": "0.0.48"
 	},
 	"info": {
 		"0000": {
-			"ProductVersion": "0.0.45",
+			"ProductVersion": "0.0.48",
 			"CompanyName": "Cursor助手",
 			"FileDescription": "Cursor助手",
 			"LegalCopyright": "© 2026, Cursor助手",
@@ -14,7 +14,7 @@
    !define INFO_PRODUCTNAME "Cursor助手"
 !endif
 !ifndef INFO_PRODUCTVERSION
-    !define INFO_PRODUCTVERSION "0.0.45"
+    !define INFO_PRODUCTVERSION "0.0.48"
 !endif
 !ifndef INFO_COPYRIGHT
    !define INFO_COPYRIGHT "© 2026, Cursor助手"
@@ -27,8 +27,16 @@
 !endif
 !define UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${UNINST_KEY_NAME}"

+!ifndef WAILS_INSTALL_SCOPE
+    !define WAILS_INSTALL_SCOPE "machine"
+!endif
+
 !ifndef REQUEST_EXECUTION_LEVEL
-    !define REQUEST_EXECUTION_LEVEL "admin"
+    !if "${WAILS_INSTALL_SCOPE}" == "user"
+        !define REQUEST_EXECUTION_LEVEL "user"
+    !else
+        !define REQUEST_EXECUTION_LEVEL "admin"
+    !endif
 !endif

 RequestExecutionLevel "${REQUEST_EXECUTION_LEVEL}"
@@ -115,23 +123,40 @@ RequestExecutionLevel "${REQUEST_EXECUTION_LEVEL}"
    WriteUninstaller "$INSTDIR\uninstall.exe"

    SetRegView 64
-    WriteRegStr HKLM "${UNINST_KEY}" "Publisher" "${INFO_COMPANYNAME}"
-    WriteRegStr HKLM "${UNINST_KEY}" "DisplayName" "${INFO_PRODUCTNAME}"
-    WriteRegStr HKLM "${UNINST_KEY}" "DisplayVersion" "${INFO_PRODUCTVERSION}"
-    WriteRegStr HKLM "${UNINST_KEY}" "DisplayIcon" "$INSTDIR\${PRODUCT_EXECUTABLE}"
-    WriteRegStr HKLM "${UNINST_KEY}" "UninstallString" "$\"$INSTDIR\uninstall.exe$\""
-    WriteRegStr HKLM "${UNINST_KEY}" "QuietUninstallString" "$\"$INSTDIR\uninstall.exe$\" /S"
+    !if "${WAILS_INSTALL_SCOPE}" == "user"
+        WriteRegStr HKCU "${UNINST_KEY}" "Publisher" "${INFO_COMPANYNAME}"
+        WriteRegStr HKCU "${UNINST_KEY}" "DisplayName" "${INFO_PRODUCTNAME}"
+        WriteRegStr HKCU "${UNINST_KEY}" "DisplayVersion" "${INFO_PRODUCTVERSION}"
+        WriteRegStr HKCU "${UNINST_KEY}" "DisplayIcon" "$INSTDIR\${PRODUCT_EXECUTABLE}"
+        WriteRegStr HKCU "${UNINST_KEY}" "UninstallString" "$\"$INSTDIR\uninstall.exe$\""
+        WriteRegStr HKCU "${UNINST_KEY}" "QuietUninstallString" "$\"$INSTDIR\uninstall.exe$\" /S"

-    ${GetSize} "$INSTDIR" "/S=0K" $0 $1 $2
-    IntFmt $0 "0x%08X" $0
-    WriteRegDWORD HKLM "${UNINST_KEY}" "EstimatedSize" "$0"
+        ${GetSize} "$INSTDIR" "/S=0K" $0 $1 $2
+        IntFmt $0 "0x%08X" $0
+        WriteRegDWORD HKCU "${UNINST_KEY}" "EstimatedSize" "$0"
+    !else
+        WriteRegStr HKLM "${UNINST_KEY}" "Publisher" "${INFO_COMPANYNAME}"
+        WriteRegStr HKLM "${UNINST_KEY}" "DisplayName" "${INFO_PRODUCTNAME}"
+        WriteRegStr HKLM "${UNINST_KEY}" "DisplayVersion" "${INFO_PRODUCTVERSION}"
+        WriteRegStr HKLM "${UNINST_KEY}" "DisplayIcon" "$INSTDIR\${PRODUCT_EXECUTABLE}"
+        WriteRegStr HKLM "${UNINST_KEY}" "UninstallString" "$\"$INSTDIR\uninstall.exe$\""
+        WriteRegStr HKLM "${UNINST_KEY}" "QuietUninstallString" "$\"$INSTDIR\uninstall.exe$\" /S"
+
+        ${GetSize} "$INSTDIR" "/S=0K" $0 $1 $2
+        IntFmt $0 "0x%08X" $0
+        WriteRegDWORD HKLM "${UNINST_KEY}" "EstimatedSize" "$0"
+    !endif
 !macroend

 !macro wails.deleteUninstaller
    Delete "$INSTDIR\uninstall.exe"

    SetRegView 64
-    DeleteRegKey HKLM "${UNINST_KEY}"
+    !if "${WAILS_INSTALL_SCOPE}" == "user"
+        DeleteRegKey HKCU "${UNINST_KEY}"
+    !else
+        DeleteRegKey HKLM "${UNINST_KEY}"
+    !endif
 !macroend

 !macro wails.setShellContext
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
-    <assemblyIdentity type="win32" name="com.cursor.wuxianxubei" version="0.0.45" processorArchitecture="*"/>
+    <assemblyIdentity type="win32" name="com.cursor.wuxianxubei" version="0.0.48" processorArchitecture="*"/>
    <dependency>
        <dependentAssembly>
            <assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="*" publicKeyToken="6595b64144ccf1df" language="*"/>
@@ -28,6 +28,7 @@ type exchangeContext struct {
 type Server struct {
 	config      Config
 	certManager *certs.Manager
+	caCertPEM   []byte
 	store       *exchangeStore
 	counter     atomic.Uint64
 	proxyServer *http.Server
@@ -43,13 +44,14 @@ func New(config Config) (*Server, error) {
 	if err := validateLoopbackAddress(config.UIAddr); err != nil {
 		return nil, err
 	}
-	manager, err := certs.NewEmbeddedManager()
+	manager, caCertPEM, err := certs.NewGeneratedManager()
 	if err != nil {
 		return nil, fmt.Errorf("加载 MITM CA 失败：%w", err)
 	}
 	server := &Server{
 		config:      config,
 		certManager: manager,
+		caCertPEM:   caCertPEM,
 		store:       newExchangeStore(config.MaxExchanges),
 	}
 	proxyHandler, err := server.newProxyHandler()
@@ -8,8 +8,6 @@ import (
 	"net/http"
 	"strings"
 	"time"
-
-	"cursor/internal/certs"
 )

 //go:embed web/*
@@ -93,7 +91,7 @@ func (server *Server) handleEvents(writer http.ResponseWriter, request *http.Req
 func (server *Server) handleCACertificate(writer http.ResponseWriter, _ *http.Request) {
 	writer.Header().Set("Content-Type", "application/x-x509-ca-cert")
 	writer.Header().Set("Content-Disposition", `attachment; filename="cursor-local-proxy-ca.crt"`)
-	_, _ = writer.Write(certs.EmbeddedCACertPEM())
+	_, _ = writer.Write(server.caCertPEM)
 }

 func writeJSON(writer http.ResponseWriter, status int, payload any) {
@@ -17,6 +17,7 @@
    "copy-text-to-clipboard": "^3.2.2",
    "dayjs": "^1.11.20",
    "resize-observer-polyfill": "^1.5.1",
+    "sortablejs": "^1.15.7",
    "vue": "^3.5.22",
    "vue-chartjs": "^5.3.3",
    "vue-router": "^4.6.3"
@@ -196,6 +196,7 @@ onBeforeUnmount(() => {
      <div
        v-show="visible"
        class="modal-mask-layer fixed inset-0 z-999 flex items-center justify-center bg-black/50 p-4"
+        @click.self="closeAd"
      >
        <Transition name="ad-frame">
          <iframe
@@ -2,6 +2,7 @@
 import Button from "@/components/ui/Button.vue";
 import Card from "@/components/ui/Card.vue";
 import Tooltip from "@/components/ui/Tooltip.vue";
+import { useMessage } from "@/composables/useMessage";
 import { showModal } from "@/composables/useModal";
 import {
  disconnectCursorAccount,
@@ -13,6 +14,7 @@ import { Browser } from "@wailsio/runtime";
 import { computed, onMounted, onUnmounted, ref } from "vue";

 const CURSOR_ACCOUNT_CONTRIBUTOR_URL = "https://github.com/aike0210";
+const message = useMessage();

 const cursorAccountStatus = ref({
  state: "signed_out",
@@ -23,30 +25,52 @@ const cursorAccountStatus = ref({
 const cursorAccountBusy = ref(false);
 let cursorAccountTimer = null;

+function maskCursorAccountIdentifier(value) {
+  const identifier = String(value || "").trim();
+  if (!identifier) return "";
+
+  const atIndex = identifier.indexOf("@");
+  if (atIndex > 0 && atIndex < identifier.length - 1) {
+    const localPart = identifier.slice(0, atIndex);
+    const domain = identifier.slice(atIndex + 1);
+    const maskedLocalPart = localPart.length <= 2
+      ? `${localPart[0]}***`
+      : `${localPart[0]}***${localPart.at(-1)}`;
+    return `${maskedLocalPart}@${domain}`;
+  }
+
+  if (identifier.length <= 8) return "****";
+  return `${identifier.slice(0, 4)}****${identifier.slice(-4)}`;
+}
+
 const cursorAccountSignedIn = computed(
  () => cursorAccountStatus.value.state === "signed_in",
 );
 const cursorAccountWaiting = computed(
  () => cursorAccountStatus.value.state === "waiting",
 );
+const cursorAccountDisplayIdentifier = computed(() => {
+  if (!cursorAccountSignedIn.value) return "";
+  return maskCursorAccountIdentifier(
+    cursorAccountStatus.value.email || cursorAccountStatus.value.authId,
+  );
+});
 const cursorAccountStateText = computed(() => {
  if (cursorAccountSignedIn.value) return "已经登录";
  if (cursorAccountWaiting.value) return "等待浏览器登录";
  return "未连接";
 });

-async function showActionError(title, error) {
-  await showModal({
-    title,
-    content: String(error || "服务错误").trim() || "服务错误",
-  });
+function showActionError(title, error) {
+  const detail = String(error || "服务错误").trim() || "服务错误";
+  message(`${title}：${detail}`);
 }

 async function handleOpenContributor() {
  try {
    await Browser.OpenURL(CURSOR_ACCOUNT_CONTRIBUTOR_URL);
  } catch (error) {
-    await showActionError("打开贡献者主页失败", toUserError(error));
+    showActionError("打开贡献者主页失败", toUserError(error));
  }
 }

@@ -59,7 +83,7 @@ async function handleCursorAccountLogin() {
  try {
    cursorAccountStatus.value = await startCursorAccountLogin();
  } catch (error) {
-    await showActionError("登录失败", toUserError(error));
+    showActionError("登录失败", toUserError(error));
    await refreshCursorAccountStatus().catch(() => {});
  } finally {
    cursorAccountBusy.value = false;
@@ -80,7 +104,7 @@ async function handleCursorAccountDisconnect() {
  try {
    cursorAccountStatus.value = await disconnectCursorAccount();
  } catch (error) {
-    await showActionError("退出登录失败", toUserError(error));
+    showActionError("退出登录失败", toUserError(error));
  } finally {
    cursorAccountBusy.value = false;
  }
@@ -137,10 +161,10 @@ onUnmounted(() => {
      <div class="flex items-end justify-between gap-4">
        <div class="min-w-0">
          <div
-            v-if="cursorAccountSignedIn && (cursorAccountStatus.email || cursorAccountStatus.authId)"
+            v-if="cursorAccountDisplayIdentifier"
            class="truncate text-sm text-[#d0d0d0]"
          >
-            {{ cursorAccountStatus.email || cursorAccountStatus.authId }}
+            {{ cursorAccountDisplayIdentifier }}
          </div>
          <div class="mt-1 text-sm text-[#a3a3a3]">
            独立用于插件、Skills 和 MCP；不会改变 Cursor 客户端当前账号
@@ -19,6 +19,7 @@ const modelTypeOptions = [
 ];

 const reasoningEffortOptions = [
+  { label: "不设置", value: "", icon: "icon-[mdi--minus-circle-outline]" },
  { label: "低", value: "low", icon: "icon-[mdi--head-outline]" },
  { label: "中", value: "medium", icon: "icon-[mdi--head-lightbulb-outline]" },
  { label: "高", value: "high", icon: "icon-[mdi--brain]" },
@@ -51,7 +52,6 @@ const props = defineProps({
    type: Object,
    default: () => createEmptyModelAdapter(),
  },
-  errorMessage: { type: String, default: "" },
 });

 const emit = defineEmits(["cancel", "save"]);
@@ -286,13 +286,6 @@ function handleSave() {
                />
              </label>

-              <div
-                v-if="errorMessage"
-                class="mt-4 rounded-[8px] border border-[#4b1d1d] bg-[#2a1313] px-3 py-2 text-sm text-[#fca5a5]"
-              >
-                {{ errorMessage }}
-              </div>
-
              <div class="mt-5 flex justify-end gap-2">
                <Button variant="default" @click="handleCancel">取消</Button>
                <Button variant="primary" @click="handleSave">保存</Button>
@@ -44,7 +44,7 @@ const summaryText = computed(() => {
    return "测试中...";
  }
  if (normalizedStatus.value === "error") {
-    return "测试失败";
+    return "测试失败,请查看原始信息";
  }
  return props.emptyText;
 });
@@ -100,16 +100,16 @@ const summaryClass = computed(() => {
 </script>

 <template>
-  <div class="rounded-[8px] border px-3 py-3" :class="panelClass">
+  <div class="rounded-[8px] border-none px-3 py-3" :class="panelClass">
    <div class="flex items-start justify-between gap-3">
      <div class="min-w-0 flex-1">
        <div class="flex items-center gap-1.5">
          <div
-            :class="compact ? 'text-[11px] uppercase tracking-[0.08em] text-[#666]' : 'text-sm font-medium text-white'"
+            :class="compact ? 'text-[11px] uppercase tracking-[0.08em] text-white/80' : 'text-[11px] uppercase tracking-[0.08em] text-white/80'"
          >
            {{ title }}
          </div>
-          <div v-if="rawResponseText" class="center-row gap-1 text-[11px] text-[#8f8f8f]">
+          <div v-if="rawResponseText" class="center-row gap-1 text-[11px] text-white/80">
            <span>原始返回</span>
            <Tooltip :content="rawResponseText" copyable />
          </div>
@@ -118,12 +118,7 @@ const summaryClass = computed(() => {
          {{ summaryText }}
        </div>
      </div>
-      <span
-        v-if="stale"
-        class="shrink-0 rounded-[999px] border border-[#8a6d1a] px-2 py-1 text-xs text-[#f6d77a]"
-      >
-        需重测
-      </span>
+
    </div>

    <div v-if="stale" class="mt-2 text-xs text-[#f6d77a]">
@@ -134,19 +129,19 @@ const summaryClass = computed(() => {
      v-if="showMetrics && normalizedStatus === 'success'"
      class="mt-3 grid grid-cols-1 gap-2 md:grid-cols-2"
    >
-      <div class="rounded-[8px] bg-[#1c1c1c] px-3 py-2">
+      <div class="rounded-[8px] bg-black/20 px-3 py-2">
        <div class="text-[11px] uppercase tracking-[0.08em] text-[#666]">总耗时</div>
-        <div class="mt-1 text-sm text-[#d4d4d4]">{{ formatDuration(result?.totalDurationMS) }}</div>
+        <div class="mt-1 text-sm text-white/80">{{ formatDuration(result?.totalDurationMS) }}</div>
      </div>
-      <div class="rounded-[8px] bg-[#1c1c1c] px-3 py-2">
+      <div class="rounded-[8px] bg-black/20 px-3 py-2">
        <div class="text-[11px] uppercase tracking-[0.08em] text-[#666]">输出 Token</div>
-        <div class="mt-1 text-sm text-[#d4d4d4]">{{ result?.outputTokens ?? 0 }}</div>
+        <div class="mt-1 text-sm text-white/80">{{ result?.outputTokens ?? 0 }}</div>
      </div>
    </div>

    <div
      v-if="normalizedStatus === 'success' && result?.tokensEstimated"
-      class="mt-2 text-xs text-[#8f8f8f]"
+      class="mt-2 text-xs text-white/80"
    >
      输出 Token 为估算值
    </div>
@@ -1,16 +1,15 @@
 <script setup>
 import Button from "@/components/ui/Button.vue";
+import Combobox from "@/components/ui/Combobox.vue";
 import Input from "@/components/ui/Input.vue";
 import ModelAdapterTestCard from "@/components/ModelAdapterTestCard.vue";
-import MultiSelect from "@/components/ui/MultiSelect.vue";
 import Select from "@/components/ui/Select.vue";
 import Tooltip from "@/components/ui/Tooltip.vue";
-import { getModelEditorContext } from "@/services/clientApi";
+import { useMessage } from "@/composables/useMessage";
 import {
  ANTHROPIC_THINKING_EFFORT_DEFAULT,
  appState,
  buildModelAdapterTestRequestHash,
-  buildModelAdaptersFromModelIDs,
  createEmptyModelAdapter,
  CUSTOM_HEADERS_DEFAULT_JSON,
  EXTRA_PARAMS_DEFAULT_JSON,
@@ -25,12 +24,10 @@ import {
  OPENAI_EXTRA_PARAMS_DEFAULT_JSON,
  runModelAdapterTest,
  saveModelAdapterAt,
-  saveModelAdaptersFromModelIDs,
  toUserError,
  validateModelAdapters,
 } from "@/state/appState";
-import { Window } from "@wailsio/runtime";
-import { computed, onBeforeUnmount, onMounted, reactive, ref, watch } from "vue";
+import { computed, onBeforeUnmount, reactive, ref, watch } from "vue";

 const modelTypeTabs = [
  { label: "OpenAI", value: "openai", icon: "icon-[bxl--openai]" },
@@ -38,6 +35,7 @@ const modelTypeTabs = [
 ];

 const reasoningEffortOptions = [
+  { label: "不设置", value: "", icon: "icon-[mdi--minus-circle-outline]" },
  { label: "低", value: "low", icon: "icon-[mdi--head-outline]" },
  { label: "中", value: "medium", icon: "icon-[mdi--head-lightbulb-outline]" },
  { label: "高", value: "high", icon: "icon-[mdi--brain]" },
@@ -59,17 +57,22 @@ const openAIEndpointOptions = [
  { label: "自定义路径(请输入完整请求地址)", value: OPENAI_ENDPOINT_CUSTOM, icon: "icon-[mdi--pencil-outline]" },
 ];

-const editorIndex = ref(-1);
-const draft = reactive(createEmptyModelAdapter());
-const errorMessage = ref("");
-const loading = ref(true);
+const props = defineProps({
+  index: { type: Number, default: -1 },
+  adapter: { type: Object, default: () => createEmptyModelAdapter() },
+});
+
+const emit = defineEmits(["close", "saved"]);
+const message = useMessage();
+
+const editorIndex = ref(props.index);
+const draft = reactive(normalizeModelAdapter(props.adapter));
+if (!draft.type) {
+  draft.type = "openai";
+}
 const lastTestAdapterID = ref("");
 const localTestFailure = ref("");
-const modelPrefix = ref("");
-const existingModelPrefixCleared = ref(false);
-const availableModelIDs = ref([]);
-const selectedModelIDs = ref([]);
-const modelSelectionMode = ref("auto");
+const availableModelIDs = ref(draft.modelID ? [draft.modelID] : []);
 const modelListLoading = ref(false);
 const modelListRequestSeq = ref(0);
 let modelListDebounceTimer = 0;
@@ -97,31 +100,10 @@ const modelOptions = computed(() => availableModelIDs.value.map((modelID) => ({
  value: modelID,
  icon: "icon-[mdi--cube-outline]",
 })));
-const isManualModelInput = computed(() => modelSelectionMode.value === "manual");
-const activeModelIDs = computed(() => (
-  isManualModelInput.value
-    ? [String(draft.modelID || "").trim()].filter(Boolean)
-    : selectedModelIDs.value
+const canFetchModels = computed(() => Boolean(
+  draft.type && String(draft.baseURL || "").trim() && String(draft.apiKey || "").trim(),
 ));
-const primaryModelID = computed(() => (
-  isManualModelInput.value
-    ? String(draft.modelID || "").trim()
-    : selectedModelIDs.value.includes(draft.modelID) ? draft.modelID : selectedModelIDs.value[0] || ""
-));
-const selectedTestAdapter = computed(() => {
-  if (isManualModelInput.value) {
-    const modelID = primaryModelID.value;
-    return normalizeModelAdapter({
-      ...draft,
-      modelID,
-      displayName: modelID,
-    });
-  }
-  const adapters = buildModelAdaptersFromModelIDs(draft, selectedModelIDs.value, modelPrefix.value);
-  return adapters.find((adapter) => adapter.modelID === primaryModelID.value)
-    ?? adapters[0]
-    ?? normalizeModelAdapter(draft);
-});
+const selectedTestAdapter = computed(() => normalizeModelAdapter(draft));
 const currentRequestHash = computed(() => buildModelAdapterTestRequestHash(selectedTestAdapter.value));
 const directModelTestResult = computed(() => getModelAdapterTestResult(selectedTestAdapter.value));
 const rememberedModelTestResult = computed(() =>
@@ -139,8 +121,6 @@ const modelTestSummary = computed(() => {
  return activeModelTestResult.value?.summaryText || "尚未测试";
 });

-const title = computed(() => (editorIndex.value >= 0 ? "编辑模型配置" : "新增模型配置"));
-
 function ensureOpenAIExtraParamsJSON() {
  if (!String(draft.openAIExtraParamsJSON || "").trim()) {
    draft.openAIExtraParamsJSON = OPENAI_EXTRA_PARAMS_DEFAULT_JSON;
@@ -167,12 +147,11 @@ function ensureAnthropicThinkingEffort() {

 const fieldTips = {
  displayName: "仅用于界面展示，便于你区分不同模型。",
-  modelID: "可多选。保存时只会写入选中的模型，每个模型生成一条配置。",
-  manualModelID: "请求实际发送给服务端的模型名称，例如 gpt-4.1 或 claude-sonnet。",
+  modelID: "可以直接输入模型标识，或从服务端返回的列表中选择。",
  baseURL: "模型服务的 API 根地址，通常为兼容 OpenAI 或 Anthropic 的接口入口。",
  apiKey: "调用该模型服务需要使用的访问密钥。",
  contextWindowTokens: "模型单次可接受的最大上下文 Token 数。留空时使用默认值。",
-  reasoningEffort: "推理强度仅对部分支持 reasoning_effort 的模型生效，并不是所有模型都支持。越高通常越稳，但也可能更慢。",
+  reasoningEffort: "仅当模型支持 reasoning_effort 时才选择推理强度；选择“不设置”后，请求不会携带该参数。越高通常越稳，但也可能更慢。",
  maxCompletionTokens: "单次回复允许生成的最大 Token 数。留空时使用默认值。",
  openAIEndpoint: "选择接口协议端点。选“自定义路径”时，请在接口地址栏填写完整请求地址（含 /chat/completions 或 /responses 路径后缀），系统会根据末段自动判断协议形态。",
  openAIExtraParams: "开启后会把 JSON 对象覆盖到 OpenAI 请求体。同名字段以这里为准。OpenAI service_tier 支持 auto、default、flex、scale、priority。",
@@ -183,54 +162,20 @@ const fieldTips = {
  tooltipData: "模型列表 hover 时显示的备注说明。",
 };

-async function loadContext() {
-  try {
-    const ctx = await getModelEditorContext();
-    editorIndex.value = typeof ctx.index === "number" ? ctx.index : -1;
-    const parsed = JSON.parse(ctx.adapterJSON || "{}");
-    Object.assign(draft, normalizeModelAdapter(parsed));
-    if (draft.modelID) {
-      availableModelIDs.value = [draft.modelID];
-      selectedModelIDs.value = [draft.modelID];
-    }
-    modelPrefix.value = draft.displayName || "";
-    if (!draft.type) {
-      draft.type = "openai";
-    }
-  } catch (_error) {
-    Object.assign(draft, createEmptyModelAdapter());
-    draft.type = "openai";
-  } finally {
-    loading.value = false;
-  }
-}
-
-function syncSelectionWithAvailable() {
-  const available = availableModelIDs.value;
-  const kept = selectedModelIDs.value.filter((modelID) => available.includes(modelID));
-  selectedModelIDs.value = kept;
-  draft.modelID = kept.includes(draft.modelID) ? draft.modelID : kept[0] || "";
-}
-
-function handleModelSelectionChange(values) {
-  selectedModelIDs.value = values;
-  draft.modelID = values.includes(draft.modelID) ? draft.modelID : values[0] || "";
-}
-
 async function refreshModelList() {
  const baseURL = String(draft.baseURL || "").trim();
  const apiKey = String(draft.apiKey || "").trim();
  if (!baseURL || !apiKey || !draft.type) {
-    modelSelectionMode.value = "auto";
-    availableModelIDs.value = draft.modelID ? [draft.modelID] : [];
-    syncSelectionWithAvailable();
+    modelListRequestSeq.value += 1;
+    availableModelIDs.value = [];
+    modelListLoading.value = false;
    return [];
  }

  const requestSeq = modelListRequestSeq.value + 1;
  modelListRequestSeq.value = requestSeq;
-  modelSelectionMode.value = "auto";
  modelListLoading.value = true;
+  availableModelIDs.value = [];
  try {
    const models = await fetchAvailableModelIDs({
      type: draft.type,
@@ -242,19 +187,11 @@ async function refreshModelList() {
    if (requestSeq !== modelListRequestSeq.value) {
      return availableModelIDs.value;
    }
-    if (editorIndex.value >= 0 && !existingModelPrefixCleared.value) {
-      modelPrefix.value = "";
-      existingModelPrefixCleared.value = true;
-    }
-    modelSelectionMode.value = "auto";
    availableModelIDs.value = models;
-    syncSelectionWithAvailable();
    return models;
  } catch (_error) {
    if (requestSeq === modelListRequestSeq.value) {
-      modelSelectionMode.value = "manual";
      availableModelIDs.value = [];
-      selectedModelIDs.value = [];
    }
    return availableModelIDs.value;
  } finally {
@@ -265,33 +202,17 @@ async function refreshModelList() {
 }

 async function persistDraft() {
-  const models = activeModelIDs.value;
-  if (models.length === 0) {
-    const error = isManualModelInput.value ? "请填写模型标识" : "请先选择要保存的模型";
-    errorMessage.value = error;
-    return { ok: false, error, adapter: null };
-  }
-
-  const selectedModelID = primaryModelID.value || models[0];
-  const adapter = normalizeModelAdapter({
-    ...draft,
-    modelID: selectedModelID,
-    displayName: isManualModelInput.value
-      ? String(modelPrefix.value || selectedModelID).trim()
-      : `${String(modelPrefix.value || "模型").trim()}-${selectedModelID}`,
-  });
+  const adapter = normalizeModelAdapter(draft);

  const singleCheck = validateModelAdapters([adapter]);
  if (singleCheck) {
-    errorMessage.value = singleCheck;
+    message(singleCheck);
    return { ok: false, error: singleCheck, adapter: null };
  }

-  const result = isManualModelInput.value
-    ? await saveModelAdapterAt(editorIndex.value, adapter)
-    : await saveModelAdaptersFromModelIDs(adapter, models, modelPrefix.value, selectedModelID);
+  const result = await saveModelAdapterAt(editorIndex.value, adapter);
  if (!result.ok) {
-    errorMessage.value = result.error;
+    message(result.error);
    return { ok: false, error: result.error, adapter: null };
  }

@@ -303,7 +224,6 @@ async function persistDraft() {
  } else {
    Object.assign(draft, adapter);
  }
-  errorMessage.value = "";
  return {
    ok: true,
    error: "",
@@ -316,18 +236,19 @@ async function handleSave() {
  if (!result.ok) {
    return;
  }
-  await Window.Close();
+  emit("saved", result.adapter);
+  emit("close");
 }

-async function handleCancel() {
-  await Window.Close();
+function handleCancel() {
+  emit("close");
 }

 function handleModelTypeChange(type) {
  draft.type = type;
-  modelSelectionMode.value = "auto";
+  modelListRequestSeq.value += 1;
+  modelListLoading.value = false;
  availableModelIDs.value = [];
-  selectedModelIDs.value = [];
  draft.modelID = "";
  if (type === "openai" && !draft.openAIEndpoint) {
    draft.openAIEndpoint = OPENAI_ENDPOINT_RESPONSES;
@@ -409,22 +330,18 @@ watch(
    const baseURL = String(draft.baseURL || "").trim();
    const apiKey = String(draft.apiKey || "").trim();
    if (!baseURL || !apiKey) {
-      modelSelectionMode.value = "auto";
+      modelListRequestSeq.value += 1;
      modelListLoading.value = false;
-      availableModelIDs.value = draft.modelID ? [draft.modelID] : [];
-      syncSelectionWithAvailable();
+      availableModelIDs.value = [];
      return;
    }
    modelListDebounceTimer = window.setTimeout(() => {
      void refreshModelList();
    }, 600);
  },
+  { immediate: true },
 );

-onMounted(async () => {
-  await loadContext();
-});
-
 onBeforeUnmount(() => {
  window.clearTimeout(modelListDebounceTimer);
 });
@@ -432,24 +349,14 @@ onBeforeUnmount(() => {

 <template>
  <div class="flex h-full flex-col text-[#e5e5e5]">
-    <div class="flex shrink-0 items-center justify-between px-4 pb-2">
-      <h2 class="text-base font-medium text-white">{{ title }}</h2>
-      <div class="flex items-center gap-2">
-        <Button variant="default" @click="handleCancel">取消</Button>
-        <Button variant="default" :disabled="isCurrentConfigTesting || appState.configSaving" @click="handleTest">
-          {{ isCurrentConfigTesting ? "测试中..." : "保存并测试" }}
-        </Button>
-        <Button variant="primary" :disabled="appState.configSaving" @click="handleSave">
-          {{ appState.configSaving ? "保存中..." : "保存" }}
-        </Button>
-      </div>
-    </div>
-
-    <div v-if="loading" class="flex flex-1 items-center justify-center text-sm text-[#a3a3a3]">
-      加载中...
-    </div>
-
-    <div v-else class="flex-1 overflow-y-auto min-h-0 px-4 pb-4">
+     <div class="flex-shrink-0 p-4"   v-if="localTestFailure || activeModelTestResult">
+       <ModelAdapterTestCard
+          :result="localTestFailure ? { status: 'error', error: '测试失败', summaryText: '测试失败', rawResponse: modelTestSummary } : activeModelTestResult"
+          :stale="modelTestResultStale"
+          :show-metrics="true"
+        />
+     </div>
+    <div class="flex-1 min-h-0 overflow-y-auto px-4 py-4 scroll-shadow-bottom">
      <div class="flex flex-col gap-4">
        <div class="center-row gap-2">
          <button
@@ -497,11 +404,11 @@ onBeforeUnmount(() => {

          <label class="flex flex-col gap-1">
            <span class="center-row justify-start gap-1.5 text-sm text-[#d4d4d4]">
-              <Tooltip :content="isManualModelInput ? fieldTips.displayName : fieldTips.modelID" />
-              <span>{{ isManualModelInput ? "显示名称" : "模型前缀" }}</span>
+              <Tooltip :content="fieldTips.displayName" />
+              <span>显示名称</span>
            </span>
            <input
-              v-model="modelPrefix"
+              v-model="draft.displayName"
              type="text"
              placeholder="例如：GPT-5"
              class="h-9 rounded-[6px] border border-[#3f3f3f] bg-[#232323] px-3 text-sm text-[#e5e5e5] outline-none focus:border-[#10AD5D]"
@@ -510,26 +417,28 @@ onBeforeUnmount(() => {

          <div class="flex flex-col gap-1">
            <span class="center-row justify-start gap-1.5 text-sm text-[#d4d4d4]">
-              <Tooltip :content="isManualModelInput ? fieldTips.manualModelID : fieldTips.modelID" />
-              <span>{{ isManualModelInput ? "模型标识" : "选择模型" }}</span>
+              <Tooltip :content="fieldTips.modelID" />
+              <span>模型标识</span>
            </span>
-            <input
-              v-if="isManualModelInput"
+            <Combobox
              v-model="draft.modelID"
-              type="text"
-              placeholder="例如：gpt-4.1"
-              class="h-9 rounded-[6px] border border-[#3f3f3f] bg-[#232323] px-3 text-sm text-[#e5e5e5] outline-none focus:border-[#10AD5D]"
-            />
-            <MultiSelect
-              v-else
-              :model-value="selectedModelIDs"
              :options="modelOptions"
-              :disabled="modelListLoading || modelOptions.length === 0"
-              :placeholder="modelListLoading ? '正在获取模型...' : '请输入接口地址和访问密钥'"
-              :summary-formatter="(count, total) => `已选择 ${count} / ${total} 个模型`"
+              :loading="modelListLoading"
+              placeholder="例如：gpt-4.1"
+              empty-text="没有匹配的模型"
              aria-label="选择模型"
-              @update:model-value="handleModelSelectionChange"
-            />
+            >
+              <template #append>
+                <button
+                  type="button"
+                  class="center-row h-9  shrink-0 gap-1.5 whitespace-nowrap rounded-[6px] border border-[#3f3f3f] bg-[#292929] px-[8px]  text-sm text-[#d4d4d4] outline-none transition-colors hover:border-[#505050] hover:bg-[#303030] hover:text-white focus-visible:border-[#10AD5D] disabled:cursor-not-allowed disabled:opacity-50"
+                  :disabled="modelListLoading || !canFetchModels"
+                  @click="refreshModelList"
+                >
+                  <span>获取模型</span>
+                </button>
+              </template>
+            </Combobox>
          </div>

          <label class="flex flex-col gap-1">
@@ -696,19 +605,16 @@ onBeforeUnmount(() => {
          />
        </label>

-        <ModelAdapterTestCard
-          :result="localTestFailure ? { status: 'error', error: '测试失败', summaryText: '测试失败', rawResponse: modelTestSummary } : activeModelTestResult"
-          :stale="modelTestResultStale"
-          :show-metrics="true"
-        />
-
-        <div
-          v-if="errorMessage"
-          class="rounded-[8px] border border-[#4b1d1d] bg-[#2a1313] px-3 py-2 text-sm text-[#fca5a5]"
-        >
-          {{ errorMessage }}
-        </div>
      </div>
    </div>
+    <div class="flex shrink-0 items-center justify-end gap-2 px-4 py-3">
+      <Button variant="default" :disabled="appState.configSaving" @click="handleCancel">取消</Button>
+      <Button variant="default" :disabled="isCurrentConfigTesting || appState.configSaving" @click="handleTest">
+        {{ isCurrentConfigTesting ? "测试中..." : "保存并测试" }}
+      </Button>
+      <Button variant="primary" :disabled="appState.configSaving" @click="handleSave">
+        {{ appState.configSaving ? "保存中..." : "保存" }}
+      </Button>
+    </div>
  </div>
 </template>
@@ -1,12 +1,9 @@
 <script setup></script>
 <template>
  <div
-    class="rounded-[8px] p-[1px]"
-    style="background: linear-gradient(to bottom, #656565 0%, #3A3A3A 10px, #3A3A3A 100%);"
+    class="rounded-[8px] border border-[#343434] bg-[#292929] p-4 "
+  
  >
-    <div class="rounded-[7px] bg-[#292929] p-4">
-      <slot />
-    </div>
-
+    <slot />
  </div>
 </template>
@@ -0,0 +1,337 @@
+<script setup>
+import { autoUpdate, computePosition, flip, offset, shift, size } from "@floating-ui/dom";
+import { computed, nextTick, onBeforeUnmount, ref, useId, watch, watchPostEffect } from "vue";
+
+const props = defineProps({
+  modelValue: { type: String, default: "" },
+  options: { type: Array, default: () => [] },
+  placeholder: { type: String, default: "" },
+  emptyText: { type: String, default: "没有匹配项" },
+  loading: { type: Boolean, default: false },
+  disabled: { type: Boolean, default: false },
+  ariaLabel: { type: String, default: "" },
+});
+
+const emit = defineEmits(["update:modelValue", "change", "blur"]);
+
+const rootRef = ref(null);
+const inputRef = ref(null);
+const menuRef = ref(null);
+const optionRefs = ref([]);
+const isOpen = ref(false);
+const activeIndex = ref(-1);
+const showAllOptions = ref(false);
+const menuStyle = ref({});
+const listboxID = useId();
+
+const normalizedOptions = computed(() => props.options.map((option, optionIndex) => {
+  if (typeof option === "string") {
+    return { label: option, value: option, icon: "", optionIndex };
+  }
+  return {
+    label: option?.label ?? option?.value ?? "",
+    value: option?.value ?? "",
+    icon: option?.icon ?? option?.iconClass ?? "",
+    optionIndex,
+  };
+}));
+
+const filteredOptions = computed(() => {
+  const query = String(props.modelValue || "").trim().toLocaleLowerCase();
+  if (showAllOptions.value || !query) {
+    return normalizedOptions.value;
+  }
+  return normalizedOptions.value.filter((option) => (
+    String(option.label).toLocaleLowerCase().includes(query)
+    || String(option.value).toLocaleLowerCase().includes(query)
+  ));
+});
+const activeOption = computed(() => filteredOptions.value[activeIndex.value] ?? null);
+const activeDescendant = computed(() => (
+  isOpen.value && activeOption.value ? `${listboxID}-option-${activeOption.value.optionIndex}` : undefined
+));
+
+function setOptionRef(el, index) {
+  if (el) {
+    optionRefs.value[index] = el;
+    return;
+  }
+  delete optionRefs.value[index];
+}
+
+function focusActiveOption() {
+  nextTick(() => optionRefs.value[activeOption.value?.optionIndex]?.scrollIntoView({ block: "nearest" }));
+}
+
+function openMenu({ showAll = false } = {}) {
+  if (props.disabled || normalizedOptions.value.length === 0) {
+    return;
+  }
+  showAllOptions.value = showAll;
+  isOpen.value = true;
+  const selectedIndex = filteredOptions.value.findIndex((option) => option.value === props.modelValue);
+  activeIndex.value = selectedIndex >= 0 ? selectedIndex : filteredOptions.value.length ? 0 : -1;
+  nextTick(updatePosition);
+}
+
+function closeMenu({ restoreFocus = false, notifyBlur = false } = {}) {
+  if (!isOpen.value) {
+    if (notifyBlur) {
+      emit("blur");
+    }
+    return;
+  }
+  isOpen.value = false;
+  activeIndex.value = -1;
+  if (restoreFocus) {
+    nextTick(() => inputRef.value?.focus());
+  }
+  if (notifyBlur) {
+    emit("blur");
+  }
+}
+
+function handleInput(event) {
+  emit("update:modelValue", event.target.value);
+  showAllOptions.value = false;
+  isOpen.value = normalizedOptions.value.length > 0;
+  activeIndex.value = filteredOptions.value.length ? 0 : -1;
+}
+
+function selectOption(option) {
+  if (!option) {
+    return;
+  }
+  emit("update:modelValue", option.value);
+  emit("change", option.value);
+  closeMenu();
+}
+
+function toggleMenu() {
+  if (isOpen.value) {
+    closeMenu({ restoreFocus: true });
+    return;
+  }
+  openMenu({ showAll: true });
+  nextTick(() => inputRef.value?.focus());
+}
+
+function moveActiveIndex(step) {
+  if (!isOpen.value) {
+    openMenu({ showAll: true });
+    return;
+  }
+  const total = filteredOptions.value.length;
+  if (!total) {
+    return;
+  }
+  const current = activeIndex.value >= 0 ? activeIndex.value : 0;
+  activeIndex.value = (current + step + total) % total;
+  focusActiveOption();
+}
+
+function handleInputKeydown(event) {
+  switch (event.key) {
+    case "ArrowDown":
+      event.preventDefault();
+      moveActiveIndex(1);
+      break;
+    case "ArrowUp":
+      event.preventDefault();
+      moveActiveIndex(-1);
+      break;
+    case "Enter":
+      if (isOpen.value && activeIndex.value >= 0) {
+        event.preventDefault();
+        selectOption(filteredOptions.value[activeIndex.value]);
+      }
+      break;
+    case "Escape":
+      if (isOpen.value) {
+        event.preventDefault();
+        closeMenu({ restoreFocus: true });
+      }
+      break;
+    case "Tab":
+      closeMenu({ notifyBlur: true });
+      break;
+    default:
+      break;
+  }
+}
+
+function handlePointerDown(event) {
+  if (rootRef.value?.contains(event.target) || menuRef.value?.contains(event.target)) {
+    return;
+  }
+  closeMenu({ notifyBlur: true });
+}
+
+function updatePosition() {
+  if (!rootRef.value || !menuRef.value) {
+    return;
+  }
+  computePosition(rootRef.value, menuRef.value, {
+    placement: "bottom-start",
+    middleware: [
+      offset(6),
+      flip({ padding: 12 }),
+      shift({ padding: 12 }),
+      size({
+        apply({ rects, elements, availableHeight }) {
+          Object.assign(elements.floating.style, {
+            width: `${rects.reference.width}px`,
+            maxHeight: `${Math.max(availableHeight, 160)}px`,
+          });
+        },
+        padding: 12,
+      }),
+    ],
+  }).then(({ x, y }) => {
+    menuStyle.value = { left: `${x}px`, top: `${y}px` };
+  });
+}
+
+watch(filteredOptions, (options) => {
+  if (!isOpen.value) {
+    return;
+  }
+  activeIndex.value = options.length ? Math.min(Math.max(activeIndex.value, 0), options.length - 1) : -1;
+  nextTick(updatePosition);
+});
+
+watch(normalizedOptions, (options) => {
+  if (options.length === 0) {
+    closeMenu();
+  }
+});
+
+watchPostEffect((cleanup) => {
+  if (!isOpen.value || !rootRef.value || !menuRef.value) {
+    return;
+  }
+  const stopAutoUpdate = autoUpdate(rootRef.value, menuRef.value, updatePosition);
+  cleanup(stopAutoUpdate);
+});
+
+watch(isOpen, (open) => {
+  if (open) {
+    document.addEventListener("pointerdown", handlePointerDown);
+    return;
+  }
+  document.removeEventListener("pointerdown", handlePointerDown);
+});
+
+watch(() => props.disabled, (disabled) => {
+  if (disabled) {
+    closeMenu();
+  }
+});
+
+onBeforeUnmount(() => {
+  document.removeEventListener("pointerdown", handlePointerDown);
+});
+</script>
+
+<template>
+  <div class="flex w-full min-w-0 items-center gap-2">
+    <div
+      ref="rootRef"
+      class="flex h-9 min-w-0 flex-1 items-center rounded-[6px] border border-[#3f3f3f] bg-[#232323] transition-colors focus-within:border-[#10AD5D]"
+    >
+      <input
+        ref="inputRef"
+        :value="modelValue"
+        type="text"
+        role="combobox"
+        autocomplete="off"
+        autocapitalize="none"
+        autocorrect="off"
+        spellcheck="false"
+        class="min-w-0 flex-1 bg-transparent px-3 text-sm text-[#e5e5e5] outline-none placeholder:text-[#7b7b7b] disabled:cursor-not-allowed disabled:opacity-60"
+        :placeholder="placeholder"
+        :disabled="disabled"
+        :aria-label="ariaLabel || undefined"
+        :aria-expanded="isOpen"
+        :aria-controls="listboxID"
+        :aria-activedescendant="activeDescendant"
+        aria-autocomplete="list"
+        aria-haspopup="listbox"
+        @focus="openMenu({ showAll: true })"
+        @input="handleInput"
+        @change="emit('change', $event.target.value)"
+        @keydown="handleInputKeydown"
+      />
+      <button
+        type="button"
+        class="center-row h-full w-9 shrink-0 text-[#8f8f8f] outline-none transition-colors hover:text-[#d4d4d4] disabled:cursor-not-allowed disabled:opacity-60"
+        :disabled="disabled || loading"
+        :aria-label="ariaLabel || undefined"
+        :aria-expanded="isOpen"
+        tabindex="-1"
+        @mousedown.prevent
+        @click="toggleMenu"
+      >
+        <span v-if="loading" class="icon-[mdi--loading] animate-spin text-[17px]"></span>
+        <span v-else class="icon-[mdi--chevron-down] text-[18px] transition-transform duration-200" :class="isOpen ? 'rotate-180' : ''"></span>
+      </button>
+    </div>
+    <div v-if="$slots.append" class="shrink-0">
+      <slot name="append" />
+    </div>
+  </div>
+
+  <Teleport to="body">
+    <Transition
+      enter-active-class="transition duration-150 ease-out"
+      enter-from-class="translate-y-1 opacity-0"
+      enter-to-class="translate-y-0 opacity-100"
+      leave-active-class="transition duration-100 ease-in"
+      leave-from-class="translate-y-0 opacity-100"
+      leave-to-class="translate-y-1 opacity-0"
+    >
+      <div
+        v-show="isOpen && normalizedOptions.length"
+        ref="menuRef"
+        :id="listboxID"
+        role="listbox"
+        class="fixed z-[999] overflow-y-auto rounded-[8px] border border-[#3f3f3f] bg-[#232323] p-1 shadow-[0_16px_30px_-12px_rgba(0,0,0,0.7)]"
+        :style="menuStyle"
+      >
+        <ul v-show="filteredOptions.length" role="presentation" class="py-1">
+          <li
+            v-for="option in normalizedOptions"
+            v-show="filteredOptions.includes(option)"
+            :key="option.value"
+            role="presentation"
+          >
+            <button
+              :ref="(el) => setOptionRef(el, option.optionIndex)"
+              :id="`${listboxID}-option-${option.optionIndex}`"
+              type="button"
+              role="option"
+              class="flex w-full items-center rounded-[6px] px-3 py-2 text-left text-sm outline-none transition-colors"
+              :class="[
+                option.value === modelValue
+                  ? 'bg-[#10AD5D]/15 text-[#10d06f]'
+                  : 'text-[#e5e5e5] hover:bg-[#303030]',
+                activeOption === option ? 'bg-[#303030]' : '',
+              ]"
+              :aria-selected="option.value === modelValue"
+              tabindex="-1"
+              @mousedown.prevent
+              @click="selectOption(option)"
+              @mouseenter="activeIndex = filteredOptions.indexOf(option)"
+            >
+              <span class="flex min-w-0 items-center gap-2">
+                <span v-if="option.icon" :class="[option.icon, 'shrink-0 text-[16px]']" aria-hidden="true"></span>
+                <span class="truncate">{{ option.label }}</span>
+              </span>
+            </button>
+          </li>
+        </ul>
+        <div v-show="!filteredOptions.length" class="px-3 py-2 text-sm text-[#8f8f8f]">{{ emptyText }}</div>
+      </div>
+    </Transition>
+  </Teleport>
+</template>
@@ -0,0 +1,138 @@
+<script setup>
+import { computed, nextTick, onBeforeUnmount, ref, watch } from "vue";
+
+const props = defineProps({
+  open: { type: Boolean, default: false },
+  title: { type: String, default: "" },
+  size: {
+    type: String,
+    default: "md",
+    validator: (value) => ["md", "lg", "xl"].includes(value),
+  },
+  closeOnBackdrop: { type: Boolean, default: true },
+  closeOnEscape: { type: Boolean, default: true },
+  closeDisabled: { type: Boolean, default: false },
+});
+
+const emit = defineEmits(["close"]);
+const panelRef = ref(null);
+const closeButtonRef = ref(null);
+let previouslyFocusedElement = null;
+
+const panelClass = computed(() => ({
+  md: "max-w-[420px]",
+  lg: "max-w-[680px]",
+  xl: "h-full max-h-[760px] max-w-[880px]",
+}[props.size]));
+
+function requestClose() {
+  if (!props.closeDisabled) {
+    emit("close");
+  }
+}
+
+function handleBackdropClick() {
+  if (props.closeOnBackdrop) {
+    requestClose();
+  }
+}
+
+function handleKeydown(event) {
+  if (event.key === "Escape" && props.open && props.closeOnEscape) {
+    requestClose();
+    return;
+  }
+  if (event.key !== "Tab" || !props.open || !panelRef.value) {
+    return;
+  }
+  const focusable = Array.from(panelRef.value.querySelectorAll(
+    "button:not([disabled]), input:not([disabled]), textarea:not([disabled]), select:not([disabled]), [tabindex]:not([tabindex='-1'])",
+  ));
+  if (focusable.length === 0) {
+    event.preventDefault();
+    return;
+  }
+  const first = focusable[0];
+  const last = focusable[focusable.length - 1];
+  if (event.shiftKey && document.activeElement === first) {
+    event.preventDefault();
+    last.focus();
+  } else if (!event.shiftKey && document.activeElement === last) {
+    event.preventDefault();
+    first.focus();
+  }
+}
+
+watch(
+  () => props.open,
+  (open) => {
+    if (open) {
+      previouslyFocusedElement = document.activeElement;
+      document.addEventListener("keydown", handleKeydown);
+      nextTick(() => {
+        const firstField = panelRef.value?.querySelector(
+          "input:not([disabled]), textarea:not([disabled]), select:not([disabled])",
+        );
+        (firstField || closeButtonRef.value)?.focus();
+      });
+      return;
+    }
+    document.removeEventListener("keydown", handleKeydown);
+    if (previouslyFocusedElement instanceof HTMLElement && document.contains(previouslyFocusedElement)) {
+      previouslyFocusedElement.focus();
+    }
+    previouslyFocusedElement = null;
+  },
+  { immediate: true },
+);
+
+onBeforeUnmount(() => {
+  document.removeEventListener("keydown", handleKeydown);
+});
+</script>
+
+<template>
+  <Teleport to="body">
+    <Transition
+      enter-active-class="transition-opacity duration-150 ease-out"
+      enter-from-class="opacity-0"
+      enter-to-class="opacity-100"
+      leave-active-class="transition-opacity duration-100 ease-in"
+      leave-from-class="opacity-100"
+      leave-to-class="opacity-0"
+    >
+      <div
+        v-show="open"
+        class="fixed  inset-0 z-[100] flex items-center justify-center bg-black/60 px-7 pb-[38px] pt-[calc(48px+env(safe-area-inset-top))]"
+        @click.self="handleBackdropClick"
+      >
+        <section
+          ref="panelRef"
+          role="dialog"
+          aria-modal="true"
+          :aria-label="title || undefined"
+          class="flex w-full max-h-[660px] min-h-0 flex-col overflow-hidden rounded-[8px] border border-[#3a3a3a] bg-[#202020] shadow-[0_24px_64px_rgba(0,0,0,0.65)]"
+          :class="panelClass"
+          @click.stop
+        >
+          <header class="flex h-12 shrink-0 items-center justify-between border-b border-[#343434] px-4">
+            <h2 class="min-w-0 truncate text-base font-medium text-white">{{ title }}</h2>
+            <button
+              ref="closeButtonRef"
+              type="button"
+              class="center-row w-[28px] h-[28px] justify-center size-8 shrink-0 rounded-[6px] text-[#8f8f8f] outline-none transition-colors hover:bg-[#303030] hover:text-white focus-visible:ring-2 focus-visible:ring-[#10AD5D]/40 disabled:cursor-not-allowed disabled:opacity-50"
+              :disabled="closeDisabled"
+              aria-label="关闭"
+              @click="requestClose"
+            >
+              <span class="icon-[mdi--close] text-[19px]"></span>
+            </button>
+          </header>
+          <div class="min-h-0 flex-1 overflow-hidden">
+            <slot />
+          </div>
+        </section>
+      </div>
+    </Transition>
+  </Teleport>
+</template>
@@ -2,56 +2,24 @@
 import { messageState, provideMessage } from "@/composables/useMessage";

 provideMessage();
-
-const MESSAGE_THEME = {
-  success: {
-    containerClass: "bg-[#10AD5D] text-white",
-    iconClass: "icon-[dashicons--yes]",
-    iconExtraClass: "",
-  },
-  error: {
-    containerClass: "bg-[#D84C4C] text-white",
-    iconClass: "",
-    iconExtraClass: "",
-  },
-  info: {
-    containerClass: "bg-[#F08A24] text-white",
-    iconClass: "",
-    iconExtraClass: "",
-  },
-  loading: {
-    containerClass: "bg-[#3a3a3a] text-white",
-    iconClass: "icon-[mingcute--loading-fill]",
-    iconExtraClass: "animate-spin",
-  },
-};
-
-function resolveTheme(type) {
-  return MESSAGE_THEME[type] || MESSAGE_THEME.info;
-}
 </script>

 <template>
-  <div class="pointer-events-none fixed inset-x-0 top-4 z-[1000] flex justify-center px-4">
-    <Transition name="message-slide" mode="out-in">
-      <div
-        v-if="messageState.current"
-        :key="messageState.current.id"
-        class="pointer-events-auto inline-flex max-w-full items-center gap-2 rounded-full px-4 py-2 text-sm shadow-[0_8px_24px_rgba(0,0,0,0.28)]"
-        :class="resolveTheme(messageState.current.type).containerClass"
-      >
-        <span
-          v-if="resolveTheme(messageState.current.type).iconClass"
-          class="text-[14px]"
-          :class="[
-            resolveTheme(messageState.current.type).iconClass,
-            resolveTheme(messageState.current.type).iconExtraClass,
-          ]"
-        />
-        <span class="leading-none whitespace-nowrap">{{ messageState.current.content }}</span>
-      </div>
-    </Transition>
-  </div>
+  <Teleport to="body">
+    <div class="pointer-events-none fixed inset-x-0 top-[calc(48px+env(safe-area-inset-top))] z-[11000] flex justify-center px-4">
+      <Transition name="message-slide" mode="out-in">
+        <div
+          v-if="messageState.current"
+          :key="messageState.current.id"
+          role="status"
+          aria-live="polite"
+          class="max-w-[min(520px,calc(100vw-32px))] rounded-[8px] border border-[#454545] bg-[#2b2b2b] px-4 py-2.5 text-center text-sm leading-5 text-[#ededed] shadow-[0_10px_30px_rgba(0,0,0,0.38)]"
+        >
+          {{ messageState.current.content }}
+        </div>
+      </Transition>
+    </div>
+  </Teleport>
 </template>

 <style scoped>
@@ -62,7 +30,7 @@ function resolveTheme(type) {

 .message-slide-enter-from {
  opacity: 0;
-  transform: translateY(-12px);
+  transform: translateY(-8px);
 }

 .message-slide-enter-to,
@@ -73,11 +41,6 @@ function resolveTheme(type) {

 .message-slide-leave-to {
  opacity: 0;
-  transform: translateY(-12px);
+  transform: translateY(-8px);
 }
 </style>
-
-
-
-
-
@@ -39,11 +39,10 @@ function onMaskClick() {
        <Transition name="modal-content">
          <div
            v-show="visible"
-            class="relative z-10 w-full max-w-[360px] overflow-hidden rounded-[8px] p-px shadow-[0_25px_50px_-12px_rgba(0,0,0,0.6)]"
-            style="background: linear-gradient(to bottom, #656565 0%, #3A3A3A 10px, #3A3A3A 100%);"
+            class="relative z-10 w-full max-w-[360px] overflow-hidden rounded-[8px] p-px shadow-[0_25px_50px_-12px_rgba(0,0,0,0.6)] border border-[#3A3A3A] bg-[#292929]"
            @click.stop
          >
-            <div class="rounded-[7px] bg-[#292929] p-5">
+            <div class="rounded-[7px]  p-5">
              <h3 class="mb-3 text-base font-medium text-white">
                {{ title }}
              </h3>
@@ -1,362 +0,0 @@
-<script setup>
-import { autoUpdate, computePosition, flip, offset, shift, size } from "@floating-ui/dom";
-import { computed, onBeforeUnmount, nextTick, ref, watch, watchPostEffect } from "vue";
-
-const props = defineProps({
-  modelValue: {
-    type: Array,
-    default: () => [],
-  },
-  options: {
-    type: Array,
-    default: () => [],
-  },
-  placeholder: { type: String, default: "请选择" },
-  disabled: { type: Boolean, default: false },
-  ariaLabel: { type: String, default: "" },
-  summaryFormatter: { type: Function, default: null },
-});
-
-const emit = defineEmits(["update:modelValue", "change"]);
-
-const rootRef = ref(null);
-const buttonRef = ref(null);
-const menuRef = ref(null);
-const selectAllRef = ref(null);
-const optionRefs = ref([]);
-const isOpen = ref(false);
-const menuStyle = ref({});
-
-// -1 表示"全选"按钮，0..n-1 表示选项，共同组成一个可循环的键盘焦点环
-const activeIndex = ref(-1);
-
-const normalizedOptions = computed(() => props.options.map((option) => {
-  if (typeof option === "string") {
-    return { label: option, value: option };
-  }
-  return {
-    label: option?.label ?? option?.value ?? "",
-    value: option?.value ?? "",
-    icon: option?.icon ?? "",
-  };
-}));
-
-const selectedValues = computed(() => new Set(props.modelValue ?? []));
-const allSelected = computed(() =>
-  normalizedOptions.value.length > 0
-  && normalizedOptions.value.every((option) => selectedValues.value.has(option.value)),
-);
-const summaryLabel = computed(() => {
-  const count = selectedValues.value.size;
-  if (count === 0) {
-    return props.placeholder;
-  }
-  if (props.summaryFormatter) {
-    return props.summaryFormatter(count, normalizedOptions.value.length);
-  }
-  return `已选择 ${count} 项`;
-});
-
-function emitSelection(values) {
-  emit("update:modelValue", values);
-  emit("change", values);
-}
-
-function toggleOption(option) {
-  const next = normalizedOptions.value
-    .filter((item) => (item.value === option.value
-      ? !selectedValues.value.has(item.value)
-      : selectedValues.value.has(item.value)))
-    .map((item) => item.value);
-  emitSelection(next);
-}
-
-function toggleSelectAll() {
-  if (allSelected.value) {
-    emitSelection([]);
-    return;
-  }
-  emitSelection(normalizedOptions.value.map((option) => option.value));
-}
-
-function setOptionRef(el, index) {
-  if (el) {
-    optionRefs.value[index] = el;
-    return;
-  }
-  delete optionRefs.value[index];
-}
-
-function focusActiveOption() {
-  nextTick(() => {
-    if (activeIndex.value < 0) {
-      selectAllRef.value?.focus();
-      return;
-    }
-    optionRefs.value[activeIndex.value]?.focus();
-  });
-}
-
-function moveActiveIndex(step) {
-  if (!isOpen.value) {
-    openMenu();
-    return;
-  }
-  const total = normalizedOptions.value.length;
-  if (total === 0) {
-    return;
-  }
-  // 焦点环长度为 total + 1（含全选），内部用 0..total 表示，再映射回 -1..total-1
-  const ringSize = total + 1;
-  const current = activeIndex.value + 1;
-  activeIndex.value = ((current + step + ringSize) % ringSize) - 1;
-  focusActiveOption();
-}
-
-function openMenu() {
-  if (props.disabled || isOpen.value) {
-    return;
-  }
-  isOpen.value = true;
-  const firstSelected = normalizedOptions.value.findIndex((option) => selectedValues.value.has(option.value));
-  activeIndex.value = firstSelected;
-  nextTick(() => {
-    updatePosition();
-    focusActiveOption();
-  });
-}
-
-function closeMenu({ restoreFocus = false } = {}) {
-  if (!isOpen.value) {
-    return;
-  }
-  isOpen.value = false;
-  activeIndex.value = -1;
-  optionRefs.value = [];
-  menuStyle.value = {};
-  if (restoreFocus) {
-    nextTick(() => buttonRef.value?.focus());
-  }
-}
-
-function toggleMenu() {
-  if (isOpen.value) {
-    closeMenu();
-    return;
-  }
-  openMenu();
-}
-
-function handleButtonKeydown(event) {
-  if (props.disabled) {
-    return;
-  }
-  switch (event.key) {
-    case "ArrowDown":
-      event.preventDefault();
-      moveActiveIndex(1);
-      break;
-    case "ArrowUp":
-      event.preventDefault();
-      moveActiveIndex(-1);
-      break;
-    case "Enter":
-    case " ":
-      event.preventDefault();
-      toggleMenu();
-      break;
-    case "Escape":
-      if (isOpen.value) {
-        event.preventDefault();
-        closeMenu();
-      }
-      break;
-    default:
-      break;
-  }
-}
-
-function handleOptionKeydown(event, option, index) {
-  switch (event.key) {
-    case "ArrowDown":
-      event.preventDefault();
-      activeIndex.value = index;
-      moveActiveIndex(1);
-      break;
-    case "ArrowUp":
-      event.preventDefault();
-      activeIndex.value = index;
-      moveActiveIndex(-1);
-      break;
-    case "Enter":
-    case " ":
-      event.preventDefault();
-      if (option) {
-        toggleOption(option);
-        break;
-      }
-      toggleSelectAll();
-      break;
-    case "Escape":
-      event.preventDefault();
-      closeMenu({ restoreFocus: true });
-      break;
-    case "Tab":
-      closeMenu();
-      break;
-    default:
-      break;
-  }
-}
-
-function handlePointerDown(event) {
-  if (rootRef.value?.contains(event.target) || menuRef.value?.contains(event.target)) {
-    return;
-  }
-  closeMenu();
-}
-
-function updatePosition() {
-  if (!buttonRef.value || !menuRef.value) {
-    return;
-  }
-  computePosition(buttonRef.value, menuRef.value, {
-    placement: "bottom-start",
-    middleware: [
-      offset(6),
-      flip({ padding: 12 }),
-      shift({ padding: 12 }),
-      size({
-        apply({ rects, elements, availableHeight }) {
-          Object.assign(elements.floating.style, {
-            minWidth: `${rects.reference.width}px`,
-            maxHeight: `${Math.max(availableHeight, 200)}px`,
-          });
-        },
-        padding: 12,
-      }),
-    ],
-  }).then(({ x, y }) => {
-    menuStyle.value = {
-      left: `${x}px`,
-      top: `${y}px`,
-    };
-  });
-}
-
-watchPostEffect((cleanup) => {
-  if (!isOpen.value || !buttonRef.value || !menuRef.value) {
-    return;
-  }
-  const stopAutoUpdate = autoUpdate(buttonRef.value, menuRef.value, updatePosition);
-  cleanup(() => {
-    stopAutoUpdate();
-  });
-});
-
-watch(isOpen, (open) => {
-  if (open) {
-    document.addEventListener("pointerdown", handlePointerDown);
-    return;
-  }
-  document.removeEventListener("pointerdown", handlePointerDown);
-});
-
-watch(() => props.disabled, (disabled) => {
-  if (disabled) {
-    closeMenu();
-  }
-});
-
-onBeforeUnmount(() => {
-  document.removeEventListener("pointerdown", handlePointerDown);
-});
-</script>
-
-<template>
-  <div ref="rootRef" class="relative">
-    <button
-      ref="buttonRef"
-      type="button"
-      :disabled="disabled"
-      class="flex h-9 w-full items-center justify-between gap-2 rounded-[6px] border border-[#3f3f3f] bg-[#232323] px-3 text-left text-sm text-[#e5e5e5] outline-none transition-colors focus:border-[#10AD5D] disabled:cursor-not-allowed disabled:opacity-60"
-      :aria-expanded="isOpen"
-      :aria-label="ariaLabel || undefined"
-      aria-haspopup="listbox"
-      @click="toggleMenu"
-      @keydown="handleButtonKeydown"
-    >
-      <span class="flex min-w-0 flex-1 items-center gap-2" :class="selectedValues.size ? 'text-[#e5e5e5]' : 'text-[#7b7b7b]'">
-        <span class="truncate">{{ summaryLabel }}</span>
-      </span>
-      <span
-        class="pointer-events-none center-row text-[#8f8f8f] transition-transform duration-200"
-        :class="isOpen ? 'rotate-180' : ''"
-      >
-        <span class="icon-[mdi--chevron-down] text-[18px]"></span>
-      </span>
-    </button>
-  </div>
-
-  <Teleport to="body">
-    <Transition
-      enter-active-class="transition duration-150 ease-out"
-      enter-from-class="translate-y-1 opacity-0"
-      enter-to-class="translate-y-0 opacity-100"
-      leave-active-class="transition duration-100 ease-in"
-      leave-from-class="translate-y-0 opacity-100"
-      leave-to-class="translate-y-1 opacity-0"
-    >
-      <div
-        v-if="isOpen"
-        ref="menuRef"
-        class="fixed z-[999] flex flex-col overflow-hidden rounded-[8px] border border-[#3f3f3f] bg-[#232323] p-1 shadow-[0_16px_30px_-12px_rgba(0,0,0,0.7)]"
-        :style="menuStyle"
-      >
-        <button
-          ref="selectAllRef"
-          type="button"
-          class="flex w-full items-center gap-2 rounded-[6px] px-3 py-2 text-left text-sm text-[#d4d4d4] outline-none transition-colors hover:bg-[#303030]"
-          :class="activeIndex === -1 ? 'bg-[#303030]' : ''"
-          @click="toggleSelectAll"
-          @mouseenter="activeIndex = -1"
-          @keydown="handleOptionKeydown($event, null, -1)"
-        >
-          <span :class="[allSelected ? 'icon-[mdi--checkbox-marked]' : 'icon-[mdi--checkbox-blank-outline]', 'text-[16px] shrink-0']"></span>
-          <span class="truncate">{{ allSelected ? "取消全选" : "全选" }}</span>
-        </button>
-
-        <ul role="listbox" aria-multiselectable="true" class="overflow-y-auto py-1">
-          <li v-for="(option, index) in normalizedOptions" :key="option.value">
-            <button
-              :ref="(el) => setOptionRef(el, index)"
-              type="button"
-              role="option"
-              class="flex w-full items-center gap-2 rounded-[6px] px-3 py-2 text-left text-sm outline-none transition-colors"
-              :class="[
-                selectedValues.has(option.value)
-                  ? 'bg-[#10AD5D]/15 text-[#10d06f]'
-                  : 'text-[#e5e5e5] hover:bg-[#303030]',
-                activeIndex === index ? 'bg-[#303030]' : '',
-              ]"
-              :aria-selected="selectedValues.has(option.value)"
-              tabindex="0"
-              @click="toggleOption(option)"
-              @mouseenter="activeIndex = index"
-              @keydown="handleOptionKeydown($event, option, index)"
-            >
-              <span
-                :class="[
-                  selectedValues.has(option.value) ? 'icon-[mdi--checkbox-marked]' : 'icon-[mdi--checkbox-blank-outline]',
-                  'text-[16px] shrink-0',
-                ]"
-              ></span>
-              <span v-if="option.icon" :class="[option.icon, 'text-[16px] shrink-0']" aria-hidden="true"></span>
-              <span class="truncate">{{ option.label }}</span>
-            </button>
-          </li>
-        </ul>
-      </div>
-    </Transition>
-  </Teleport>
-</template>
@@ -117,7 +117,7 @@ onBeforeUnmount(() => {
    <button
      ref="triggerRef"
      type="button"
-      class="center-row h-[16px] w-[16px] cursor-help rounded-full text-[#727272] transition-colors duration-150 hover:text-[#cfcfcf]"
+      class="center-row h-[16px] w-[16px] cursor-help rounded-full text-white/60 transition-colors duration-150 hover:text-white/80"
      @mouseenter="showTooltip"
      @mouseleave="scheduleHideTooltip"
      @focus="showTooltip"
@@ -35,10 +35,9 @@ function removeMessage(id, options = {}) {
  messageState.current = null;
 }

-function showMessage(options = {}) {
-  const type = typeof options.type === "string" ? options.type : "info";
-  const content = String(options.content || "").trim();
-  if (!content) {
+function showMessage(content, options = {}) {
+  const normalizedContent = String(content || "").trim();
+  if (!normalizedContent) {
    return null;
  }

@@ -48,14 +47,11 @@ function showMessage(options = {}) {

  const duration = Number.isFinite(options.duration)
    ? Math.max(0, options.duration)
-    : type === "loading"
-      ? 0
-      : 2400;
+    : 2400;
  const id = `message-${Date.now()}-${messageSeed += 1}`;
  const item = {
    id,
-    type,
-    content,
+    content: normalizedContent,
    shownAt: Date.now(),
    timer: null,
  };
@@ -70,40 +66,24 @@ function showMessage(options = {}) {
  return id;
 }

-export function createMessageApi() {
-  return {
-    state: messageState,
-    show: showMessage,
-    success(content, options = {}) {
-      return showMessage({ ...options, type: "success", content });
-    },
-    error(content, options = {}) {
-      return showMessage({ ...options, type: "error", content });
-    },
-    info(content, options = {}) {
-      return showMessage({ ...options, type: "info", content });
-    },
-    loading(content, options = {}) {
-      return showMessage({ ...options, type: "loading", content });
-    },
-    remove: removeMessage,
-    clear() {
-      if (messageState.current) {
-        removeMessage(messageState.current.id, { force: true });
-      }
-    },
-  };
+export function message(content, options = {}) {
+  return showMessage(content, options);
 }

-const defaultMessageApi = createMessageApi();
+message.remove = removeMessage;
+message.clear = () => {
+  if (messageState.current) {
+    removeMessage(messageState.current.id, { force: true });
+  }
+};

 export function provideMessage() {
-  provide(MESSAGE_API_SYMBOL, defaultMessageApi);
-  return defaultMessageApi;
+  provide(MESSAGE_API_SYMBOL, message);
+  return message;
 }

 export function useMessage() {
-  return inject(MESSAGE_API_SYMBOL, defaultMessageApi);
+  return inject(MESSAGE_API_SYMBOL, message);
 }

-export { messageState, showMessage, removeMessage };
+export { messageState, showMessage, removeMessage };
@@ -1,6 +1,5 @@
 {
  "02216368edc68816": "No release notes",
-  "02bc2e95bf49e587": "No",
  "03b11112dc970014": "Base URL",
  "04f632dd4f034d5e": "{0} context window must be a positive integer",
  "051836569928a9f9": "Edit",
@@ -10,7 +9,6 @@
  "0b0e7478e41fe677": "{0} tooltip text cannot be empty",
  "0c3b4cf7aa259edb": "Operation failed",
  "0d6b7efd5ccefd8a": "You can configure model channels. Runtime logs are stored in",
-  "0dde813d719dbd01": "Failed to open homepage",
  "1117a2f86030d03b": "Cache reads and writes are included in Prompt-side statistics.",
  "11afd2a534395b18": "Valid",
  "124be3f86f197802": "Token Usage",
@@ -29,8 +27,6 @@
  "26a3855aed1d8d17": "Service not running",
  "281eb6d08c9960d0": "{0} thinking budget token must be a positive integer",
  "28aeffc70ceb4267": "Change the display language for this interface. The setting takes effect immediately and is saved on this device.",
-  "2a24519398684ed5": "Visit Homepage",
-  "2c18d5e2d70b45db": "Model prefix",
  "2cd0f3be8738a86c": "Cancel",
  "2d706f7981b45a7b": "Local settings saved",
  "2f9daa828907b93f": "Delete",
@@ -41,15 +37,11 @@
  "3463c5585c246df9": "Total: {0}",
  "3468b57e3edbc599": "Aggregated from turn summaries scanned from the history.",
  "35076178fe79a210": "Configuration changed. Please test again.",
-  "358f07b2c1445ab1": "Author's Message",
-  "36c149a9b3e8dca0": "models configured yet.",
  "37d23612f78a2e63": "Restart Now to Update",
  "392d0dceb45998d3": "Extreme",
  "393df9bb13ea4900": "Hit",
-  "3a5040b68abf75f9": "Select all",
  "3ab8cc15939f3b5c": "Log out",
  "3af7e5489e61ea51": "Refreshing",
-  "3b2e5f2fba1bcbc7": "Enter the API address and access key",
  "3c2a9f9901109e75": "{0} type only supports OpenAI or Anthropic",
  "3d13868593ae4eeb": "Interface Language",
  "3d52574ce1500561": "Not connected",
@@ -63,19 +55,21 @@
  "472642d58d3d5a6d": "Formula: {0}",
  "4923eeb7bd75cccd": "{0} model ID cannot be empty",
  "497c85690c4cc0fc": "No data",
+  "4b5e0ae1288a9695": "No matching models",
  "4c0a929bb86ce912": "Current: {0}",
  "4d2b6e53be6002e5": "Cache Statistics Strategy: {0} ({1})",
  "4d8c1c5b42830791": "Unknown",
+  "4e30d7c9ed2b0eee": "Not set",
  "4f0982ba1d37e51b": "Current outbound requests use environment variable proxy",
-  "51194c3ad014fb29": "Retest required",
  "5205125c0e91d346": "Maximum tokens an Anthropic model may generate in a single response. Leave blank to use the default.",
+  "54e6745ff43c9c74": "Sorting failed",
  "56627c94a9decee6": "Max Output Tokens",
  "58c6b0935a7216da": "Failed to open contributor profile",
  "593a972852ba0004": "Cursor Assistant | Permanently Free | Custom API",
  "59a2195a01a8b35b": "{0} must be a valid JSON object",
-  "5a5c8318ef649672": "{0} selected",
  "5aa8f5590c940829": "Non-cache Input: {0}",
  "5beb1206c532729f": "Maximum number of tokens allowed in a single response. Leave blank to use the default.",
+  "5c55a67935af8f45": "All",
  "5d1687a4a41883fd": "Stopping...",
  "5e709712ce012f5d": "Current outbound requests use environment variable proxy: {0}",
  "6106f0a12583a334": "Refresh failed",
@@ -97,29 +91,29 @@
  "6e584e3d5ce64aa0": "Save Settings",
  "6ec87609a8769425": "Default {0} / Count as creation {1}",
  "72f6c3525c0192a7": "When enabled, cache creation is included in the denominator",
+  "736c9dc2a04c65fd": "The model configuration changed. Refresh and try again.",
  "737225e2904673fc": "Estimated output tokens: {0}",
  "7520bd50a5ee5471": "Stop testing {0}/{1}",
  "753d8bb0da9913ce": "Duplication failed",
-  "75b5f4c68c79322c": "Select at least one model to save",
  "774d6e1b7cb89751": "Default Definition",
  "77c9e582e85583af": "Test failed",
-  "7923d007483ae04c": "No models to save",
  "7a26bf794e9fb6bf": "Used only for display in the UI, so you can distinguish different models.",
  "7b6187c41e88b70c": "Testing...",
-  "7bf8e2c07e084d09": "Model Editor",
  "7df7641e5e741346": "Cache Read / (Cache Read + Cache Creation + Non-cache Input)",
  "7e9e334aeb0bdc07": "Service operation failed",
  "7f68ebad19ba6bcd": "Check for Updates",
  "80296f4aa3f4543b": "Cache Read/Write",
  "81123c56d5d880d0": "API Key",
  "8139cb3dd11f5a67": "When enabled, the JSON object will override the final request headers. Duplicate headers are determined by this field, and values must be strings.",
-  "826c0e5a4407befa": "You can select multiple models. Only selected models will be saved, with one configuration generated for each model.",
+  "8151e8704a7ca89e": "No matches",
+  "83913e71fcf7ff60": "Refresh successful",
  "83be9cac28873059": "Cursor Control Plane Account",
+  "83fcfb4c1f2c1641": "Fetch Models",
  "8672864e90417138": "Max",
  "86df7ec743047234": "Service running",
-  "891bfee3bbe52d3c": "Enter a model ID",
  "899add6275682210": "Uses 200000 by default when left blank",
  "8a4ef3e48e4e8a5a": "Enabled",
+  "8b8428f714611458": "Only select a reasoning effort when the model supports reasoning_effort. When set to Not set, the request omits this parameter. Higher values are usually more stable, but may also be slower.",
  "8c1935935600e336": "Model Test",
  "8cbcf741e727dbf7": "Model Settings",
  "8d1de152be6360ce": "Valid ratio: {0}",
@@ -130,9 +124,7 @@
  "917b1c1f18d0276b": "Saving...",
  "9196835e388d2550": "Test All",
  "91cba5c107a51892": "/ Invalid",
-  "92059fe6cd713db4": "The model name actually sent to the server, for example gpt-4.1 or claude-sonnet.",
  "93e08803675e378b": "Model ID",
-  "93faf55cd25c8319": "This software is completely free. If you were charged, you were likely scammed.\nWelcome to visit the author's homepage at https://space.bilibili.com/311706663/upload/video\nto see more updates, sharing guides, and future content.",
  "942ff2d88baca0c6": "Checking for updates...",
  "970388573a3c88c9": "Cache Read: {0} × ${1}/1M = {2}",
  "9730c15f3c1963a1": "Max",
@@ -143,7 +135,6 @@
  "9c41b3a9e12ac994": "Thinking Effort",
  "9d2ca261281a158a": "Later",
  "9d2fb46c0ba890b9": "Custom Path",
-  "9dc0825fba5422e4": "Loading...",
  "9e02529bcaef36c6": "Duplicate model channel detected. Please check the combination of url, modelID, apiKey, displayName, and endpoint",
  "a026f37e613cf48b": "Output Tokens",
  "a0d36236c523667c": "{0} Anthropic thinking effort only supports low, medium, high, xhigh, max",
@@ -157,10 +148,10 @@
  "a693d69af48bfe48": "Save and Test",
  "a98585871c5313ff": "Display Name",
  "aa9e366f68d3d097": "Low",
-  "ab607d54d86dc789": "Author leookun",
  "ac217e4d1ca410f1": "New version available",
  "ad79540418be700a": "Open the settings folder, or manage model settings separately",
  "ae5a738238463a92": "Hide API Key",
+  "aeb1e3a8ff46cda1": "No models have been configured yet.",
  "aed55419ce62f08e": "Switching...",
  "b10041a13f5c55b1": "Model Output: {0} × ${1}/1M = {2}",
  "b1c27820fec23edb": "High",
@@ -176,23 +167,24 @@
  "bb074b86a98f6911": "Context Window",
  "bc87a4121a0873b3": "Refresh Stats",
  "bd4464ea88d3f24a": "Total turns: {0}",
+  "bd4d7a3c6e5a1ac8": "{0} reasoning effort only supports Not set, low, medium, high, xhigh, and max",
  "bddd504af0c92fd0": "System PAC/automatic proxy detected; current version is handled as a direct connection",
  "bef280f9eb392495": "Conversation Turns",
  "c228558cf257fc49": "Delete failed",
  "c3d46b387eeadb23": "This only logs the Cursor account out of cursor-byok; it does not log out of the Cursor client. Continue?",
  "c5af02060847d167": "Thinking effort for Anthropic adaptive thinking. Requests will consistently use the new thinking.type=adaptive.",
+  "c6868592796ac2b2": "No {0} models have been configured yet.",
  "c69f5bce63b9f14c": "Settings Folder",
-  "c72d5dc20cd27118": "{0} / {1} models selected",
  "c8a52b66651d294c": "Failed to log out",
  "c8c14507b2d37395": "Reasoning Effort",
  "c98e118e0a43f078": "Model",
  "c9dd59beefd7144f": "Cache Read / (Cache Read + Non-cache Input)",
  "ca00a39fcea70dc6": "Starting...",
  "ca1d1059408b3837": "Invalid turns: {0}",
+  "cc5049729a2c10f1": "Test failed. Check the raw details.",
  "cd7ca5fb221e1c53": "{0} cannot be empty",
  "cfa6c803eb3fc713": "Waiting for browser login",
  "d0325067fed88e5a": "Cache hit rate {0}",
-  "d1bde4a4e057b2c7": "[MainLayout] Failed to load author info",
  "d20ab96566d33f25": "{0} display name cannot be empty",
  "d2243e1d44b2a94e": "Edit Model Settings",
  "d3209b935ae86797": "Model settings not found; cannot delete",
@@ -205,7 +197,6 @@
  "d95e5cb6bdcee553": "Include Cache Creation",
  "da590a8fe3ce4de0": "Please select",
  "daede9881787abe7": "Notes",
-  "dbb4b5be9b5723dc": "{0} reasoning effort only supports low, medium, high, xhigh, and max",
  "dbee6e7139243362": "{0} base URL cannot be empty",
  "dc82c5e8fb2ab777": "Version: v{0}",
  "de8184da1ef88d03": "Configured",
@@ -216,7 +207,6 @@
  "e4c0daa3c4bea691": "Thanks to @aike0210 for contributing the Cursor control-plane account feature.",
  "e53580f8031f13c0": "Complete login in the browser, then return to Cursor and reopen the plugin marketplace",
  "e552c2accdbf5178": "Add Model",
-  "e6943d5cbfb863e0": "Fetching models...",
  "e6faccfddce722e8": "Cache read tokens: {0}",
  "e8a0a6053998ebfa": "Logged in",
  "eaffd48cd2ea9f1a": "e.g. https://api.anthropic.com",
@@ -224,13 +214,14 @@
  "ec3b17a75db49e24": "{0} t/s | First token {1}",
  "ec99e5c45d648fd6": "Update failed",
  "ee95057c6b0335d2": "Current outbound requests use system proxy: {0}",
+  "f0b6a23368dd47cc": "Enter a model ID directly, or select one from the list returned by the server.",
+  "f1aa7326f38b4c09": "Drag to reorder",
  "f1e0fc261d42fe29": "Notes shown when hovering over the model list.",
-  "f363622480699c52": "Reasoning effort only applies to some models that support reasoning_effort. Not all models do. Higher values are usually more stable, but may also be slower.",
  "f3a76d896853c1df": "Miss",
  "f3fae6cccb9004b1": "Custom header name cannot be empty",
  "f474a4108aba4c4c": "Stop Service",
-  "f4d4bae588c4c0ff": "Deselect all",
  "f4f0ead1116b5b62": "Enable",
+  "f526ab6eff33039a": "Failed to open author page",
  "f56c6c82203b33f6": "Notice",
  "f61e03f047b786d5": "{0} max output tokens must be a positive integer",
  "f6e1c8b1a6970db5": "Current outbound requests do not use system proxy",
@@ -1,6 +1,5 @@
 {
  "02216368edc68816": "更新内容はありません",
-  "02bc2e95bf49e587": "まだ",
  "03b11112dc970014": "ベース URL",
  "04f632dd4f034d5e": "{0} のコンテキストウィンドウは正の整数である必要があります",
  "051836569928a9f9": "編集",
@@ -10,7 +9,6 @@
  "0b0e7478e41fe677": "{0} のツールチップは必須です",
  "0c3b4cf7aa259edb": "操作に失敗しました",
  "0d6b7efd5ccefd8a": "モデルチャネルを設定できます。実行ログは次にあります",
-  "0dde813d719dbd01": "ホームページを開けませんでした",
  "1117a2f86030d03b": "キャッシュの読み書きは Prompt 側の統計に含まれます。",
  "11afd2a534395b18": "有効",
  "124be3f86f197802": "Token 使用量",
@@ -29,8 +27,6 @@
  "26a3855aed1d8d17": "サービスは起動していません",
  "281eb6d08c9960d0": "{0} の思考予算 Token は正の整数である必要があります",
  "28aeffc70ceb4267": "この画面の表示言語を切り替えます。設定はすぐに反映され、この端末に保存されます",
-  "2a24519398684ed5": "ホームページへ",
-  "2c18d5e2d70b45db": "モデルのプレフィックス",
  "2cd0f3be8738a86c": "キャンセル",
  "2d706f7981b45a7b": "ローカル設定を保存しました",
  "2f9daa828907b93f": "削除",
@@ -41,15 +37,11 @@
  "3463c5585c246df9": "合計：{0}",
  "3468b57e3edbc599": "履歴からスキャンした各ターンの summary を集計しています。",
  "35076178fe79a210": "設定が変更されました。再テストしてください",
-  "358f07b2c1445ab1": "著者からのメッセージ",
-  "36c149a9b3e8dca0": "モデルは設定されていません。",
  "37d23612f78a2e63": "今すぐ再起動して更新",
  "392d0dceb45998d3": "最高",
  "393df9bb13ea4900": "ヒット",
-  "3a5040b68abf75f9": "すべて選択",
  "3ab8cc15939f3b5c": "ログアウト",
  "3af7e5489e61ea51": "更新中",
-  "3b2e5f2fba1bcbc7": "インターフェースのアドレスとアクセスキーを入力してください",
  "3c2a9f9901109e75": "{0} のタイプは OpenAI または Anthropic のみサポートします",
  "3d13868593ae4eeb": "表示言語",
  "3d52574ce1500561": "未接続",
@@ -63,19 +55,21 @@
  "472642d58d3d5a6d": "数式：{0}",
  "4923eeb7bd75cccd": "{0} のモデル ID は必須です",
  "497c85690c4cc0fc": "データなし",
+  "4b5e0ae1288a9695": "一致するモデルがありません",
  "4c0a929bb86ce912": "現在：{0}",
  "4d2b6e53be6002e5": "キャッシュ統計ポリシー：{0}（{1}）",
  "4d8c1c5b42830791": "不明",
+  "4e30d7c9ed2b0eee": "設定しない",
  "4f0982ba1d37e51b": "現在のアウトバウンドリクエストは環境変数プロキシを使用しています",
-  "51194c3ad014fb29": "再テストが必要",
  "5205125c0e91d346": "Anthropic モデルが1回の応答で生成できる最大 Token 数。空欄の場合はデフォルト値を使用します。",
+  "54e6745ff43c9c74": "並べ替えに失敗しました",
  "56627c94a9decee6": "最大出力 Token",
  "58c6b0935a7216da": "コントリビューターのプロフィールを開けませんでした",
  "593a972852ba0004": "Cursor アシスタント | 永久無料 | カスタム API",
  "59a2195a01a8b35b": "{0}は有効なJSONオブジェクトである必要があります",
-  "5a5c8318ef649672": "{0}件を選択中",
  "5aa8f5590c940829": "非キャッシュ入力：{0}",
  "5beb1206c532729f": "1回の応答で生成できる最大 Token 数。空欄の場合はデフォルト値を使用します。",
+  "5c55a67935af8f45": "すべて",
  "5d1687a4a41883fd": "停止中...",
  "5e709712ce012f5d": "現在のアウトバウンドリクエストは環境変数プロキシを使用しています：{0}",
  "6106f0a12583a334": "再読み込みに失敗しました",
@@ -97,29 +91,29 @@
  "6e584e3d5ce64aa0": "設定を保存",
  "6ec87609a8769425": "デフォルト {0} / 作成カウント {1}",
  "72f6c3525c0192a7": "有効にすると、キャッシュ作成が分母に含まれます",
+  "736c9dc2a04c65fd": "モデル設定が変更されました。更新してからもう一度お試しください。",
  "737225e2904673fc": "推定出力 Token: {0}",
  "7520bd50a5ee5471": "テスト停止 {0}/{1}",
  "753d8bb0da9913ce": "複製に失敗しました",
-  "75b5f4c68c79322c": "保存するモデルを1つ以上選択してください",
  "774d6e1b7cb89751": "デフォルト定義",
  "77c9e582e85583af": "テスト失敗",
-  "7923d007483ae04c": "保存できるモデルがありません",
  "7a26bf794e9fb6bf": "UIでモデルを区別するための表示専用です。",
  "7b6187c41e88b70c": "テスト中...",
-  "7bf8e2c07e084d09": "モデル編集",
  "7df7641e5e741346": "キャッシュ読み取り / (キャッシュ読み取り + キャッシュ作成 + 非キャッシュ入力)",
  "7e9e334aeb0bdc07": "サービス操作に失敗しました",
  "7f68ebad19ba6bcd": "アップデートを確認",
  "80296f4aa3f4543b": "キャッシュ読み書き",
  "81123c56d5d880d0": "API キー",
  "8139cb3dd11f5a67": "有効にすると、JSONオブジェクトが最終的なリクエストヘッダーを上書きします。同名のヘッダーはこの設定が優先され、値は文字列である必要があります。",
-  "826c0e5a4407befa": "複数のモデルを選択できます。保存されるのは選択したモデルだけで、モデルごとに1つの設定が作成されます。",
+  "8151e8704a7ca89e": "一致する項目がありません",
+  "83913e71fcf7ff60": "更新しました",
  "83be9cac28873059": "Cursor コントロールプレーンアカウント",
+  "83fcfb4c1f2c1641": "モデルを取得",
  "8672864e90417138": "最大",
  "86df7ec743047234": "サービス稼働中",
-  "891bfee3bbe52d3c": "モデルIDを入力してください",
  "899add6275682210": "空欄で 200000",
  "8a4ef3e48e4e8a5a": "有効",
+  "8b8428f714611458": "モデルが reasoning_effort に対応している場合のみ推論強度を選択してください。「設定しない」を選ぶと、リクエストにこのパラメータは含まれません。値が高いほど安定しやすい反面、遅くなることがあります。",
  "8c1935935600e336": "モデルテスト",
  "8cbcf741e727dbf7": "モデル設定",
  "8d1de152be6360ce": "有効率: {0}",
@@ -130,9 +124,7 @@
  "917b1c1f18d0276b": "保存中...",
  "9196835e388d2550": "すべてテスト",
  "91cba5c107a51892": "/ 異常",
-  "92059fe6cd713db4": "サーバーに実際に送信されるモデル名。例: gpt-4.1、claude-sonnet。",
  "93e08803675e378b": "モデルID",
-  "93faf55cd25c8319": "このソフトウェアは完全に無料です。もし料金を請求された場合は、詐欺の可能性が高いです。\n著者のホームページ https://space.bilibili.com/311706663/upload/video にアクセスして、更新情報や利用方法などを確認してください。",
  "942ff2d88baca0c6": "アップデートを確認中...",
  "970388573a3c88c9": "キャッシュ読み取り：{0} × ${1}/1M = {2}",
  "9730c15f3c1963a1": "最大",
@@ -143,7 +135,6 @@
  "9c41b3a9e12ac994": "思考強度",
  "9d2ca261281a158a": "後で",
  "9d2fb46c0ba890b9": "カスタムパス",
-  "9dc0825fba5422e4": "読み込み中...",
  "9e02529bcaef36c6": "モデルチャネルが重複しています。url、modelID、apiKey、displayName、endpointの組み合わせを確認してください",
  "a026f37e613cf48b": "出力 Token",
  "a0d36236c523667c": "{0} のAnthropic思考強度はlow、medium、high、xhigh、maxのみをサポートしています",
@@ -157,10 +148,10 @@
  "a693d69af48bfe48": "保存してテスト",
  "a98585871c5313ff": "表示名",
  "aa9e366f68d3d097": "低",
-  "ab607d54d86dc789": "著者 leookun",
  "ac217e4d1ca410f1": "新しいバージョンがあります",
  "ad79540418be700a": "設定フォルダーを開くか、モデル設定を個別に管理できます",
  "ae5a738238463a92": "API キーを隠す",
+  "aeb1e3a8ff46cda1": "まだモデルが設定されていません。",
  "aed55419ce62f08e": "切替中...",
  "b10041a13f5c55b1": "モデル出力：{0} × ${1}/1M = {2}",
  "b1c27820fec23edb": "高",
@@ -176,23 +167,24 @@
  "bb074b86a98f6911": "コンテキストウィンドウ",
  "bc87a4121a0873b3": "統計を更新",
  "bd4464ea88d3f24a": "総ターン: {0}",
+  "bd4d7a3c6e5a1ac8": "{0} の推論強度は「設定しない」、low、medium、high、xhigh、max のみサポートします",
  "bddd504af0c92fd0": "システムのPAC/自動プロキシが検出されました。現在のバージョンは直接接続として処理されます",
  "bef280f9eb392495": "会話ターン",
  "c228558cf257fc49": "削除に失敗しました",
  "c3d46b387eeadb23": "cursor-byok 内の Cursor アカウントからのみログアウトします。Cursor クライアントからはログアウトしません。続行しますか？",
  "c5af02060847d167": "Anthropic adaptive thinkingの思考強度。リクエストは一貫して新しいthinking.type=adaptiveを使用します。",
+  "c6868592796ac2b2": "まだ {0} モデルが設定されていません。",
  "c69f5bce63b9f14c": "設定フォルダー",
-  "c72d5dc20cd27118": "{0} / {1} モデルを選択中",
  "c8a52b66651d294c": "ログアウトに失敗しました",
  "c8c14507b2d37395": "推論強度",
  "c98e118e0a43f078": "モデル",
  "c9dd59beefd7144f": "キャッシュ読み取り / (キャッシュ読み取り + 非キャッシュ入力)",
  "ca00a39fcea70dc6": "起動中...",
  "ca1d1059408b3837": "異常ターン: {0}",
+  "cc5049729a2c10f1": "テストに失敗しました。元の詳細情報を確認してください。",
  "cd7ca5fb221e1c53": "{0}は空にできません",
  "cfa6c803eb3fc713": "ブラウザでのログインを待っています",
  "d0325067fed88e5a": "キャッシュヒット率 {0}",
-  "d1bde4a4e057b2c7": "[MainLayout] 作者情報の読み込みに失敗しました",
  "d20ab96566d33f25": "{0} の表示名は必須です",
  "d2243e1d44b2a94e": "モデル設定を編集",
  "d3209b935ae86797": "モデル設定が存在しないため削除できません",
@@ -205,7 +197,6 @@
  "d95e5cb6bdcee553": "キャッシュ作成を含める",
  "da590a8fe3ce4de0": "選択してください",
  "daede9881787abe7": "メモ",
-  "dbb4b5be9b5723dc": "{0} の推論強度は low、medium、high、xhigh、max のみサポートします",
  "dbee6e7139243362": "{0} のベース URL は必須です",
  "dc82c5e8fb2ab777": "バージョン: v{0}",
  "de8184da1ef88d03": "設定済み",
@@ -216,7 +207,6 @@
  "e4c0daa3c4bea691": "Cursor コントロールプレーンアカウント機能への @aike0210 の貢献に感謝します。",
  "e53580f8031f13c0": "ブラウザでログインを完了し、Cursor に戻ってプラグインマーケットを開き直してください",
  "e552c2accdbf5178": "モデルを追加",
-  "e6943d5cbfb863e0": "モデルを取得中...",
  "e6faccfddce722e8": "キャッシュ読込 Token: {0}",
  "e8a0a6053998ebfa": "ログイン済み",
  "eaffd48cd2ea9f1a": "例: https://api.anthropic.com",
@@ -224,13 +214,14 @@
  "ec3b17a75db49e24": "{0} t/s | 初回 Token {1}",
  "ec99e5c45d648fd6": "アップデートに失敗しました",
  "ee95057c6b0335d2": "現在のアウトバウンドリクエストはシステムプロキシを使用しています：{0}",
+  "f0b6a23368dd47cc": "モデルIDを直接入力するか、サーバーから返された一覧から選択します。",
+  "f1aa7326f38b4c09": "ドラッグして並べ替え",
  "f1e0fc261d42fe29": "モデル一覧にホバーしたときに表示されるメモです。",
-  "f363622480699c52": "推論強度は reasoning_effort をサポートする一部のモデルでのみ有効です。すべてのモデルが対応しているわけではありません。値が高いほど安定しやすい反面、遅くなることがあります。",
  "f3a76d896853c1df": "ミス",
  "f3fae6cccb9004b1": "カスタムヘッダー名は空にできません",
  "f474a4108aba4c4c": "サービスを停止",
-  "f4d4bae588c4c0ff": "すべて選択解除",
  "f4f0ead1116b5b62": "有効化",
+  "f526ab6eff33039a": "作者ページを開けませんでした",
  "f56c6c82203b33f6": "お知らせ",
  "f61e03f047b786d5": "{0} の最大出力 Token は正の整数である必要があります",
  "f6e1c8b1a6970db5": "現在のアウトバウンドリクエストはシステムプロキシを使用していません",
@@ -1,6 +1,5 @@
 {
  "02216368edc68816": "Нет примечаний к выпуску",
-  "02bc2e95bf49e587": "Пока нет настроенных",
  "03b11112dc970014": "Базовый URL",
  "04f632dd4f034d5e": "Размер контекстного окна {0} должен быть положительным целым числом",
  "051836569928a9f9": "Изменить",
@@ -10,7 +9,6 @@
  "0b0e7478e41fe677": "Текст подсказки {0} не может быть пустым",
  "0c3b4cf7aa259edb": "Не удалось выполнить операцию",
  "0d6b7efd5ccefd8a": "Здесь можно настроить каналы моделей. Журналы выполнения находятся в",
-  "0dde813d719dbd01": "Не удалось открыть домашнюю страницу",
  "1117a2f86030d03b": "Чтение и запись кеша включены в статистику Prompt.",
  "11afd2a534395b18": "Успешно",
  "124be3f86f197802": "Использование токенов",
@@ -29,8 +27,6 @@
  "26a3855aed1d8d17": "Сервис не запущен",
  "281eb6d08c9960d0": "Бюджет токенов рассуждения {0} должен быть положительным целым числом",
  "28aeffc70ceb4267": "Измените язык интерфейса. Настройка применяется сразу и сохраняется на этом устройстве.",
-  "2a24519398684ed5": "Перейти на домашнюю страницу",
-  "2c18d5e2d70b45db": "Префикс модели",
  "2cd0f3be8738a86c": "Отмена",
  "2d706f7981b45a7b": "Локальные настройки сохранены",
  "2f9daa828907b93f": "Удалить",
@@ -41,15 +37,11 @@
  "3463c5585c246df9": "Итого: {0}",
  "3468b57e3edbc599": "Сводка составлена по данным ходов, найденным в истории.",
  "35076178fe79a210": "Конфигурация изменена. Выполните проверку снова.",
-  "358f07b2c1445ab1": "Сообщение автора",
-  "36c149a9b3e8dca0": "моделей.",
  "37d23612f78a2e63": "Перезапустить и обновить",
  "392d0dceb45998d3": "Очень высокая",
  "393df9bb13ea4900": "Попадание",
-  "3a5040b68abf75f9": "Выбрать все",
  "3ab8cc15939f3b5c": "Выйти",
  "3af7e5489e61ea51": "Обновление",
-  "3b2e5f2fba1bcbc7": "Введите адрес интерфейса и ключ доступа",
  "3c2a9f9901109e75": "Тип {0} поддерживает только OpenAI или Anthropic",
  "3d13868593ae4eeb": "Язык интерфейса",
  "3d52574ce1500561": "Не подключено",
@@ -63,19 +55,21 @@
  "472642d58d3d5a6d": "Формула: {0}",
  "4923eeb7bd75cccd": "Идентификатор модели {0} не может быть пустым",
  "497c85690c4cc0fc": "Нет данных",
+  "4b5e0ae1288a9695": "Подходящих моделей нет",
  "4c0a929bb86ce912": "Сейчас: {0}",
  "4d2b6e53be6002e5": "Стратегия статистики кеша: {0} ({1})",
  "4d8c1c5b42830791": "Неизвестно",
+  "4e30d7c9ed2b0eee": "Не задано",
  "4f0982ba1d37e51b": "Исходящие запросы используют прокси из переменных окружения",
-  "51194c3ad014fb29": "Требуется повторная проверка",
  "5205125c0e91d346": "Максимальное число токенов, которое модель Anthropic может сгенерировать за один ответ. Оставьте поле пустым для значения по умолчанию.",
+  "54e6745ff43c9c74": "Не удалось изменить порядок",
  "56627c94a9decee6": "Макс. выходных токенов",
  "58c6b0935a7216da": "Не удалось открыть профиль участника",
  "593a972852ba0004": "Cursor Assistant | Всегда бесплатно | Пользовательский API",
  "59a2195a01a8b35b": "{0} должен быть допустимым объектом JSON",
-  "5a5c8318ef649672": "Выбрано: {0}",
  "5aa8f5590c940829": "Ввод без кеша: {0}",
  "5beb1206c532729f": "Максимальное число токенов в одном ответе. Оставьте поле пустым для значения по умолчанию.",
+  "5c55a67935af8f45": "Все",
  "5d1687a4a41883fd": "Остановка...",
  "5e709712ce012f5d": "Исходящие запросы используют прокси из переменных окружения: {0}",
  "6106f0a12583a334": "Не удалось обновить",
@@ -97,29 +91,29 @@
  "6e584e3d5ce64aa0": "Сохранить настройки",
  "6ec87609a8769425": "По умолчанию {0} / С учетом создания {1}",
  "72f6c3525c0192a7": "Если включено, создание кеша учитывается в знаменателе",
+  "736c9dc2a04c65fd": "Конфигурация моделей изменилась. Обновите данные и повторите попытку.",
  "737225e2904673fc": "Расчетные выходные токены: {0}",
  "7520bd50a5ee5471": "Остановить проверку {0}/{1}",
  "753d8bb0da9913ce": "Не удалось дублировать",
-  "75b5f4c68c79322c": "Выберите хотя бы одну модель для сохранения",
  "774d6e1b7cb89751": "Стандартный расчет",
  "77c9e582e85583af": "Проверка не пройдена",
-  "7923d007483ae04c": "Нет моделей для сохранения",
  "7a26bf794e9fb6bf": "Используется только для отображения в интерфейсе, чтобы различать модели.",
  "7b6187c41e88b70c": "Проверка...",
-  "7bf8e2c07e084d09": "Редактор модели",
  "7df7641e5e741346": "Чтение кеша / (Чтение кеша + Создание кеша + Ввод без кеша)",
  "7e9e334aeb0bdc07": "Не удалось выполнить операцию с сервисом",
  "7f68ebad19ba6bcd": "Проверить обновления",
  "80296f4aa3f4543b": "Чтение/запись кеша",
  "81123c56d5d880d0": "Ключ API",
  "8139cb3dd11f5a67": "Если включено, объект JSON переопределит итоговые заголовки запроса. При совпадении имен используются значения отсюда; все значения должны быть строками.",
-  "826c0e5a4407befa": "Можно выбрать несколько моделей. Будут сохранены только выбранные модели, для каждой будет создана отдельная конфигурация.",
+  "8151e8704a7ca89e": "Совпадений нет",
+  "83913e71fcf7ff60": "Обновление выполнено",
  "83be9cac28873059": "Аккаунт управляющего уровня Cursor",
+  "83fcfb4c1f2c1641": "Получить модели",
  "8672864e90417138": "Максимальная",
  "86df7ec743047234": "Сервис запущен",
-  "891bfee3bbe52d3c": "Введите идентификатор модели",
  "899add6275682210": "Если оставить пустым, используется 200000",
  "8a4ef3e48e4e8a5a": "Включено",
+  "8b8428f714611458": "Выбирайте интенсивность рассуждений только для моделей с поддержкой reasoning_effort. Если выбрать «Не задано», этот параметр не будет добавлен в запрос. Более высокие значения обычно дают более стабильный результат, но могут замедлить ответ.",
  "8c1935935600e336": "Проверка модели",
  "8cbcf741e727dbf7": "Настройки модели",
  "8d1de152be6360ce": "Доля успешных: {0}",
@@ -130,9 +124,7 @@
  "917b1c1f18d0276b": "Сохранение...",
  "9196835e388d2550": "Проверить все",
  "91cba5c107a51892": "/ Ошибочные",
-  "92059fe6cd713db4": "Имя модели, фактически отправляемое серверу, например gpt-4.1 или claude-sonnet.",
  "93e08803675e378b": "Идентификатор модели",
-  "93faf55cd25c8319": "Это программное обеспечение полностью бесплатно. Если с вас взяли плату, скорее всего, вас обманули.\\nПосетите страницу автора: https://space.bilibili.com/311706663/upload/video\\nТам публикуются обновления, руководства и другие материалы.",
  "942ff2d88baca0c6": "Проверка обновлений...",
  "970388573a3c88c9": "Чтение кеша: {0} × ${1}/1M = {2}",
  "9730c15f3c1963a1": "Макс.",
@@ -143,7 +135,6 @@
  "9c41b3a9e12ac994": "Интенсивность рассуждений",
  "9d2ca261281a158a": "Позже",
  "9d2fb46c0ba890b9": "Пользовательский путь",
-  "9dc0825fba5422e4": "Загрузка...",
  "9e02529bcaef36c6": "Обнаружен повторяющийся канал модели. Проверьте сочетание url, modelID, apiKey, displayName и endpoint",
  "a026f37e613cf48b": "Выходные токены",
  "a0d36236c523667c": "Интенсивность рассуждений Anthropic для {0} поддерживает только low, medium, high, xhigh и max",
@@ -157,10 +148,10 @@
  "a693d69af48bfe48": "Сохранить и проверить",
  "a98585871c5313ff": "Отображаемое имя",
  "aa9e366f68d3d097": "Низкая",
-  "ab607d54d86dc789": "Автор leookun",
  "ac217e4d1ca410f1": "Доступна новая версия",
  "ad79540418be700a": "Открыть папку настроек или отдельно управлять настройками моделей",
  "ae5a738238463a92": "Скрыть ключ API",
+  "aeb1e3a8ff46cda1": "Модели пока не настроены.",
  "aed55419ce62f08e": "Переключение...",
  "b10041a13f5c55b1": "Вывод модели: {0} × ${1}/1M = {2}",
  "b1c27820fec23edb": "Высокая",
@@ -176,23 +167,24 @@
  "bb074b86a98f6911": "Контекстное окно",
  "bc87a4121a0873b3": "Обновить статистику",
  "bd4464ea88d3f24a": "Всего ходов: {0}",
+  "bd4d7a3c6e5a1ac8": "Интенсивность рассуждений {0} поддерживает только значения «Не задано», low, medium, high, xhigh и max",
  "bddd504af0c92fd0": "Обнаружен системный PAC/автоматический прокси; в текущей версии используется прямое подключение",
  "bef280f9eb392495": "Ходы диалога",
  "c228558cf257fc49": "Не удалось удалить",
  "c3d46b387eeadb23": "Будет выполнен выход только из аккаунта Cursor в cursor-byok. В клиенте Cursor вы останетесь в системе. Продолжить?",
  "c5af02060847d167": "Интенсивность для адаптивных рассуждений Anthropic. В запросах всегда используется новый режим thinking.type=adaptive.",
+  "c6868592796ac2b2": "Модели {0} пока не настроены.",
  "c69f5bce63b9f14c": "Папка настроек",
-  "c72d5dc20cd27118": "Выбрано моделей: {0} / {1}",
  "c8a52b66651d294c": "Не удалось выйти",
  "c8c14507b2d37395": "Интенсивность рассуждений",
  "c98e118e0a43f078": "Модель",
  "c9dd59beefd7144f": "Чтение кеша / (Чтение кеша + Ввод без кеша)",
  "ca00a39fcea70dc6": "Запуск...",
  "ca1d1059408b3837": "Ошибочных ходов: {0}",
+  "cc5049729a2c10f1": "Тест не пройден. Проверьте исходные сведения.",
  "cd7ca5fb221e1c53": "{0} не может быть пустым",
  "cfa6c803eb3fc713": "Ожидание входа в браузере",
  "d0325067fed88e5a": "Доля попаданий в кеш: {0}",
-  "d1bde4a4e057b2c7": "[MainLayout] Не удалось загрузить сведения об авторе",
  "d20ab96566d33f25": "Отображаемое имя {0} не может быть пустым",
  "d2243e1d44b2a94e": "Изменить настройки модели",
  "d3209b935ae86797": "Настройки модели не найдены; удаление невозможно",
@@ -205,7 +197,6 @@
  "d95e5cb6bdcee553": "Учитывать создание кеша",
  "da590a8fe3ce4de0": "Выберите значение",
  "daede9881787abe7": "Примечания",
-  "dbb4b5be9b5723dc": "Интенсивность рассуждений {0} поддерживает только low, medium, high, xhigh и max",
  "dbee6e7139243362": "Базовый URL {0} не может быть пустым",
  "dc82c5e8fb2ab777": "Версия: v{0}",
  "de8184da1ef88d03": "Настроено",
@@ -216,7 +207,6 @@
  "e4c0daa3c4bea691": "Спасибо @aike0210 за вклад в функцию аккаунта панели управления Cursor.",
  "e53580f8031f13c0": "Завершите вход в браузере, затем вернитесь в Cursor и снова откройте магазин плагинов",
  "e552c2accdbf5178": "Добавить модель",
-  "e6943d5cbfb863e0": "Получение моделей...",
  "e6faccfddce722e8": "Токены чтения из кеша: {0}",
  "e8a0a6053998ebfa": "Выполнен вход",
  "eaffd48cd2ea9f1a": "например, https://api.anthropic.com",
@@ -224,13 +214,14 @@
  "ec3b17a75db49e24": "{0} т/с | Первый токен {1}",
  "ec99e5c45d648fd6": "Не удалось обновить",
  "ee95057c6b0335d2": "Исходящие запросы используют системный прокси: {0}",
+  "f0b6a23368dd47cc": "Введите идентификатор модели вручную или выберите его из списка, полученного от сервера.",
+  "f1aa7326f38b4c09": "Перетащите, чтобы изменить порядок",
  "f1e0fc261d42fe29": "Примечание, отображаемое при наведении на модель в списке.",
-  "f363622480699c52": "Интенсивность рассуждений применяется только к моделям с поддержкой reasoning_effort. Чем выше значение, тем обычно стабильнее результат, но ответ может формироваться медленнее.",
  "f3a76d896853c1df": "Промах",
  "f3fae6cccb9004b1": "Имя пользовательского заголовка не может быть пустым",
  "f474a4108aba4c4c": "Остановить сервис",
-  "f4d4bae588c4c0ff": "Снять выделение со всех",
  "f4f0ead1116b5b62": "Включить",
+  "f526ab6eff33039a": "Не удалось открыть страницу автора",
  "f56c6c82203b33f6": "Уведомление",
  "f61e03f047b786d5": "Максимальное число выходных токенов {0} должно быть положительным целым числом",
  "f6e1c8b1a6970db5": "Исходящие запросы не используют системный прокси",
@@ -1,6 +1,5 @@
 {
  "02216368edc68816": "无更新说明",
-  "02bc2e95bf49e587": "当前还没有配置任何",
  "03b11112dc970014": "接口地址",
  "04f632dd4f034d5e": "{0} 的上下文窗口必须为正整数",
  "051836569928a9f9": "编辑",
@@ -10,7 +9,6 @@
  "0b0e7478e41fe677": "{0} 的悬停提示不能为空",
  "0c3b4cf7aa259edb": "操作失败",
  "0d6b7efd5ccefd8a": "可配置模型渠道；运行日志位于",
-  "0dde813d719dbd01": "打开主页失败",
  "1117a2f86030d03b": "缓存读写已计入 Prompt 侧统计。",
  "11afd2a534395b18": "有效",
  "124be3f86f197802": "Token 消耗",
@@ -29,8 +27,6 @@
  "26a3855aed1d8d17": "服务未启动",
  "281eb6d08c9960d0": "{0} 的思考预算 Token 必须为正整数",
  "28aeffc70ceb4267": "切换当前界面显示语言，设置会立即生效并保存在本机",
-  "2a24519398684ed5": "访问主页",
-  "2c18d5e2d70b45db": "模型前缀",
  "2cd0f3be8738a86c": "取消",
  "2d706f7981b45a7b": "本地配置已保存",
  "2f9daa828907b93f": "删除",
@@ -41,15 +37,11 @@
  "3463c5585c246df9": "合计：{0}",
  "3468b57e3edbc599": "按历史记录里扫描到的回合 summary 汇总。",
  "35076178fe79a210": "配置已变更，请重新测试",
-  "358f07b2c1445ab1": "作者寄语",
-  "36c149a9b3e8dca0": "模型。",
  "37d23612f78a2e63": "立即重启更新",
  "392d0dceb45998d3": "极高",
  "393df9bb13ea4900": "命中",
-  "3a5040b68abf75f9": "全选",
  "3ab8cc15939f3b5c": "退出登录",
  "3af7e5489e61ea51": "刷新中",
-  "3b2e5f2fba1bcbc7": "请输入接口地址和访问密钥",
  "3c2a9f9901109e75": "{0} 的类型仅支持 OpenAI 或 Anthropic",
  "3d13868593ae4eeb": "界面语言",
  "3d52574ce1500561": "未连接",
@@ -63,19 +55,21 @@
  "472642d58d3d5a6d": "公式：{0}",
  "4923eeb7bd75cccd": "{0} 的模型标识不能为空",
  "497c85690c4cc0fc": "暂无数据",
+  "4b5e0ae1288a9695": "没有匹配的模型",
  "4c0a929bb86ce912": "当前：{0}",
  "4d2b6e53be6002e5": "缓存统计策略：{0}（{1}）",
  "4d8c1c5b42830791": "未知",
+  "4e30d7c9ed2b0eee": "不设置",
  "4f0982ba1d37e51b": "当前出站请求使用环境变量代理",
-  "51194c3ad014fb29": "需重测",
  "5205125c0e91d346": "Anthropic 模型单次回复允许生成的最大 Token 数。留空时使用默认值。",
+  "54e6745ff43c9c74": "排序失败",
  "56627c94a9decee6": "最大输出 Token",
  "58c6b0935a7216da": "打开贡献者主页失败",
  "593a972852ba0004": "Cursor助手｜永久免费｜自定义API",
  "59a2195a01a8b35b": "{0}必须是合法 JSON 对象",
-  "5a5c8318ef649672": "已选择 {0} 项",
  "5aa8f5590c940829": "非缓存输入：{0}",
  "5beb1206c532729f": "单次回复允许生成的最大 Token 数。留空时使用默认值。",
+  "5c55a67935af8f45": "全部",
  "5d1687a4a41883fd": "停止中...",
  "5e709712ce012f5d": "当前出站请求使用环境变量代理：{0}",
  "6106f0a12583a334": "刷新失败",
@@ -97,29 +91,29 @@
  "6e584e3d5ce64aa0": "保存配置",
  "6ec87609a8769425": "默认 {0} / 计入创建 {1}",
  "72f6c3525c0192a7": "开启后把缓存创建纳入分母",
+  "736c9dc2a04c65fd": "模型配置已发生变化，请刷新后重试",
  "737225e2904673fc": "输出推算：{0}",
  "7520bd50a5ee5471": "停止测试 {0}/{1}",
  "753d8bb0da9913ce": "复制失败",
-  "75b5f4c68c79322c": "请先选择要保存的模型",
  "774d6e1b7cb89751": "默认口径",
  "77c9e582e85583af": "测试失败",
-  "7923d007483ae04c": "没有可保存的模型",
  "7a26bf794e9fb6bf": "仅用于界面展示，便于你区分不同模型。",
  "7b6187c41e88b70c": "测试中...",
-  "7bf8e2c07e084d09": "模型编辑",
  "7df7641e5e741346": "缓存读取 /（缓存读取 + 缓存创建 + 非缓存输入）",
  "7e9e334aeb0bdc07": "服务操作失败",
  "7f68ebad19ba6bcd": "检查更新",
  "80296f4aa3f4543b": "缓存读写",
  "81123c56d5d880d0": "访问密钥",
  "8139cb3dd11f5a67": "开启后会把 JSON 对象覆盖到最终请求头。同名请求头以这里为准，值必须是字符串。",
-  "826c0e5a4407befa": "可多选。保存时只会写入选中的模型，每个模型生成一条配置。",
+  "8151e8704a7ca89e": "没有匹配项",
+  "83913e71fcf7ff60": "刷新成功",
  "83be9cac28873059": "Cursor 控制面账号",
+  "83fcfb4c1f2c1641": "获取模型",
  "8672864e90417138": "最高",
  "86df7ec743047234": "服务运行中",
-  "891bfee3bbe52d3c": "请填写模型标识",
  "899add6275682210": "留空时默认 200000",
  "8a4ef3e48e4e8a5a": "已开启",
+  "8b8428f714611458": "仅当模型支持 reasoning_effort 时才选择推理强度；选择“不设置”后，请求不会携带该参数。越高通常越稳，但也可能更慢。",
  "8c1935935600e336": "模型测试",
  "8cbcf741e727dbf7": "模型配置",
  "8d1de152be6360ce": "有效占比：{0}",
@@ -130,9 +124,7 @@
  "917b1c1f18d0276b": "保存中...",
  "9196835e388d2550": "测试全部",
  "91cba5c107a51892": "/ 异常",
-  "92059fe6cd713db4": "请求实际发送给服务端的模型名称，例如 gpt-4.1 或 claude-sonnet。",
  "93e08803675e378b": "模型标识",
-  "93faf55cd25c8319": "本软件是纯免费软件，如果你被收费，那大概率就是被骗了。\n欢迎点击访问作者主页 https://space.bilibili.com/311706663/upload/video\n查看更多更新动态、使用分享和后续内容。",
  "942ff2d88baca0c6": "检查更新中...",
  "970388573a3c88c9": "缓存读取：{0} × ${1}/1M = {2}",
  "9730c15f3c1963a1": "最大",
@@ -143,7 +135,6 @@
  "9c41b3a9e12ac994": "思考强度",
  "9d2ca261281a158a": "稍后",
  "9d2fb46c0ba890b9": "自定义路径",
-  "9dc0825fba5422e4": "加载中...",
  "9e02529bcaef36c6": "模型渠道重复，请检查 url、modelID、apiKey、displayName、endpoint 组合",
  "a026f37e613cf48b": "输出 Token",
  "a0d36236c523667c": "{0} 的 Anthropic 思考强度仅支持 low、medium、high、xhigh、max",
@@ -157,10 +148,10 @@
  "a693d69af48bfe48": "保存并测试",
  "a98585871c5313ff": "显示名称",
  "aa9e366f68d3d097": "低",
-  "ab607d54d86dc789": "作者 leookun",
  "ac217e4d1ca410f1": "发现新版本",
  "ad79540418be700a": "打开设置目录，或单独管理模型配置",
  "ae5a738238463a92": "隐藏访问密钥",
+  "aeb1e3a8ff46cda1": "当前还没有配置任何模型。",
  "aed55419ce62f08e": "切换中...",
  "b10041a13f5c55b1": "模型输出：{0} × ${1}/1M = {2}",
  "b1c27820fec23edb": "高",
@@ -176,23 +167,24 @@
  "bb074b86a98f6911": "上下文窗口",
  "bc87a4121a0873b3": "刷新统计",
  "bd4464ea88d3f24a": "总轮次：{0}",
+  "bd4d7a3c6e5a1ac8": "{0} 的推理强度仅支持不设置、low、medium、high、xhigh、max",
  "bddd504af0c92fd0": "检测到系统 PAC/自动代理，当前版本按直连处理",
  "bef280f9eb392495": "对话轮次",
  "c228558cf257fc49": "删除失败",
  "c3d46b387eeadb23": "只会退出 cursor-byok 中的 Cursor 账号，不会退出 Cursor 客户端。是否继续？",
  "c5af02060847d167": "Anthropic adaptive thinking 的思考强度。请求会固定使用新版 thinking.type=adaptive。",
+  "c6868592796ac2b2": "当前还没有配置任何 {0} 模型。",
  "c69f5bce63b9f14c": "设置文件夹",
-  "c72d5dc20cd27118": "已选择 {0} / {1} 个模型",
  "c8a52b66651d294c": "退出登录失败",
  "c8c14507b2d37395": "推理强度",
  "c98e118e0a43f078": "模型",
  "c9dd59beefd7144f": "缓存读取 /（缓存读取 + 非缓存输入）",
  "ca00a39fcea70dc6": "启动中...",
  "ca1d1059408b3837": "异常轮次：{0}",
+  "cc5049729a2c10f1": "测试失败,请查看原始信息",
  "cd7ca5fb221e1c53": "{0}不能为空",
  "cfa6c803eb3fc713": "等待浏览器登录",
  "d0325067fed88e5a": "缓存命中率 {0}",
-  "d1bde4a4e057b2c7": "[MainLayout] 加载作者信息失败",
  "d20ab96566d33f25": "{0} 的显示名称不能为空",
  "d2243e1d44b2a94e": "编辑模型配置",
  "d3209b935ae86797": "模型配置不存在，无法删除",
@@ -205,7 +197,6 @@
  "d95e5cb6bdcee553": "计入缓存创建",
  "da590a8fe3ce4de0": "请选择",
  "daede9881787abe7": "备注",
-  "dbb4b5be9b5723dc": "{0} 的推理强度仅支持 low、medium、high、xhigh、max",
  "dbee6e7139243362": "{0} 的接口地址不能为空",
  "dc82c5e8fb2ab777": "版本：v{0}",
  "de8184da1ef88d03": "已配置",
@@ -216,7 +207,6 @@
  "e4c0daa3c4bea691": "感谢 @aike0210 对 Cursor 控制面账号功能的贡献。",
  "e53580f8031f13c0": "请在浏览器完成登录，完成后返回 Cursor 重新打开插件市场",
  "e552c2accdbf5178": "新增模型",
-  "e6943d5cbfb863e0": "正在获取模型...",
  "e6faccfddce722e8": "缓存读取：{0}",
  "e8a0a6053998ebfa": "已经登录",
  "eaffd48cd2ea9f1a": "例如：https://api.anthropic.com",
@@ -224,13 +214,14 @@
  "ec3b17a75db49e24": "{0} t/s | 首字 {1}",
  "ec99e5c45d648fd6": "更新失败",
  "ee95057c6b0335d2": "当前出站请求使用系统代理：{0}",
+  "f0b6a23368dd47cc": "可以直接输入模型标识，或从服务端返回的列表中选择。",
+  "f1aa7326f38b4c09": "拖拽排序",
  "f1e0fc261d42fe29": "模型列表 hover 时显示的备注说明。",
-  "f363622480699c52": "推理强度仅对部分支持 reasoning_effort 的模型生效，并不是所有模型都支持。越高通常越稳，但也可能更慢。",
  "f3a76d896853c1df": "未命中",
  "f3fae6cccb9004b1": "自定义请求头名称不能为空",
  "f474a4108aba4c4c": "关闭服务",
-  "f4d4bae588c4c0ff": "取消全选",
  "f4f0ead1116b5b62": "启用",
+  "f526ab6eff33039a": "打开作者地址失败",
  "f56c6c82203b33f6": "提示",
  "f61e03f047b786d5": "{0} 的最大输出 Token 必须为正整数",
  "f6e1c8b1a6970db5": "当前出站请求未使用系统代理",
@@ -2,11 +2,6 @@
 import { Browser, Window } from "@wailsio/runtime";
 import LocaleSelect from "@/components/LocaleSelect.vue";
 import { useMessage } from "@/composables/useMessage";
-import { showModal } from "@/composables/useModal";
-import {
-  getFooterAuthorInfo,
-  openFooterAuthorHome,
-} from "@/services/clientApi";
 import {
  appState,
  checkForAppUpdates,
@@ -14,7 +9,7 @@ import {
  updateViewState,
 } from "@/state/appState";
 import { isWindows } from "@/utils/isWindows";
-import { computed, onMounted, onUnmounted, ref } from "vue";
+import { computed, onMounted, onUnmounted } from "vue";
 import { useRoute } from "vue-router";
 import Logo from "@/assets/logo.png";

@@ -24,18 +19,8 @@ const showIcon = computed(() => route.meta.showIcon !== false);
 const title = computed(() => route.meta.title ?? "Cursor助手｜永久免费｜自定义API");
 const directlyClose = computed(() => route.meta.directlyClose === true);
 const showFooter = computed(() => route.path === "/");
-const footerAuthorInfo = ref(null);
-
-const localizedAuthorInfo = computed(() => {
-  if (!footerAuthorInfo.value) return null;
-  return {
-    buttonText: "作者 leookun",
-    dialogTitle: "作者寄语",
-    dialogContent: "本软件是纯免费软件，如果你被收费，那大概率就是被骗了。\n欢迎点击访问作者主页 https://space.bilibili.com/311706663/upload/video\n查看更多更新动态、使用分享和后续内容。",
-    dialogConfirmText: "访问主页",
-    dialogCancelText: "关闭",
-  };
-});
+const AUTHOR_REPOSITORY_URL = "https://github.com/leookun/cursor-byok";
+const AUTHOR_LABEL = "@leookun";
 const usageDocsURL = "https://docs.leokun.cn";
 let proxyStateTimer = null;
 const proxyStatePollIntervalMs = 10000;
@@ -89,7 +74,7 @@ async function handleCheckForUpdates() {
  if (updateViewState.footerBusy || updateViewState.footerDownloading) {
    return;
  }
-  const loadingMessageID = message.loading("检查更新中...");
+  const loadingMessageID = message("检查更新中...", { duration: 0 });
  try {
    await checkForAppUpdates();
  } finally {
@@ -99,41 +84,16 @@ async function handleCheckForUpdates() {
  }
 }

-async function loadFooterAuthorInfo() {
-  try {
-    footerAuthorInfo.value = await getFooterAuthorInfo();
-  } catch (error) {
-    console.error("[MainLayout] 加载作者信息失败", error);
-  }
-}
-
-async function showActionError(title, error) {
-  await showModal({
-    title,
-    content: String(error || "操作失败").trim() || "操作失败",
-    confirmText: "确定",
-    showCancel: false,
-  });
+function showActionError(title, error) {
+  const detail = String(error || "操作失败").trim() || "操作失败";
+  message(`${title}：${detail}`);
 }

 async function handleOpenAuthorHome() {
-  if (!localizedAuthorInfo.value) {
-    return;
-  }
-  const confirmed = await showModal({
-    title: localizedAuthorInfo.value.dialogTitle,
-    content: localizedAuthorInfo.value.dialogContent,
-    confirmText: localizedAuthorInfo.value.dialogConfirmText,
-    cancelText: localizedAuthorInfo.value.dialogCancelText,
-    showCancel: true,
-  });
-  if (!confirmed) {
-    return;
-  }
  try {
-    await openFooterAuthorHome();
+    await Browser.OpenURL(AUTHOR_REPOSITORY_URL);
  } catch (error) {
-    await showActionError("打开主页失败", error);
+    showActionError("打开作者地址失败", error);
  }
 }

@@ -141,12 +101,11 @@ async function handleOpenUsageDocs() {
  try {
    await Browser.OpenURL(usageDocsURL);
  } catch (error) {
-    await showActionError("打开使用教程失败", error);
+    showActionError("打开使用教程失败", error);
  }
 }

 onMounted(() => {
-  void loadFooterAuthorInfo();
  proxyStateTimer = window.setInterval(() => {
    if (showFooter.value) {
      void syncServiceState().catch(() => {});
@@ -175,7 +134,7 @@ onUnmounted(() => {
      :class="{ '!justify-center': !isWindows }"
    >
      <div class="center-row gap-2" style="font-family: var(--font-num);">
-        <img v-if="showIcon" :src="Logo" class="w-[18px] h-[18px]" />
+        <!-- <img v-if="showIcon" :src="Logo" class="w-[18px] h-[18px]" /> -->
        <div>{{ title }}</div>
      </div>
      <div
@@ -203,7 +162,7 @@ onUnmounted(() => {

    <footer
      v-if="showFooter"
-      class="flex !pr-1 h-[30px] shrink-0 items-center gap-[8px] border-t border-[#242424] px-[14px] text-[12px] text-[#8f8f8f]"
+      class="flex !pr-1 h-[30px] shrink-0 items-center gap-[8px]  px-[14px] text-[12px] text-[#8f8f8f]"
    >
      <div
        v-if="proxyBadgeText"
@@ -232,13 +191,12 @@ onUnmounted(() => {
        <span>使用教程</span>
      </button>
      <button
-        v-if="localizedAuthorInfo"
        type="button"
        class="center-row shrink-0 gap-[6px] cursor-pointer rounded-[6px] px-[6px] py-[3px] transition-colors duration-150 hover:bg-[#1f1f1f] hover:text-[#e5e5e5]"
        @click="handleOpenAuthorHome"
      >
-        <span class="icon-[ant-design--bilibili-outlined] text-[14px]"></span>
-        <span>{{ localizedAuthorInfo.buttonText }}</span>
+        <span class="icon-[mdi--github] text-[14px]"></span>
+        <span>{{ AUTHOR_LABEL }}</span>
      </button>
      <div
        v-if="updateViewState.footerDownloading"
@@ -1,7 +1,6 @@
 import { createRouter, createWebHashHistory } from "vue-router";
 import Home from "@/views/Home.vue";
 import ModelConfig from "@/views/ModelConfig.vue";
-import ModelEditor from "@/views/ModelEditor.vue";

 const router = createRouter({
  history: createWebHashHistory(),
@@ -16,11 +15,6 @@ const router = createRouter({
      component: ModelConfig,
      meta: { showIcon: false, title: "模型配置", directlyClose: true },
    },
-    {
-      path: "/model-editor",
-      component: ModelEditor,
-      meta: { showIcon: false, title: "模型编辑", directlyClose: true },
-    },
  ],
 });

@@ -18,12 +18,10 @@ import {
  GetAppVersion,
  GetFooterAuthorInfo,
  InstallReadyUpdate,
-  GetModelEditorContext,
  OpenConfigWindow,
  OpenFooterAuthorHome,
  OpenHistoryWindow,
  OpenModelConfigWindow,
-  OpenModelEditorWindow,
 } from "@bindings/cursor/internal/bridge/windowservice.js";
 import { Call } from "@wailsio/runtime";

@@ -133,16 +131,6 @@ export function openModelConfig() {
  return withApiLogging("OpenModelConfigWindow", undefined, () => OpenModelConfigWindow());
 }

-export function openModelEditor(index, adapterJSON) {
-  return withApiLogging("OpenModelEditorWindow", { index, adapterJSON }, () =>
-    OpenModelEditorWindow(index, adapterJSON),
-  );
-}
-
-export function getModelEditorContext() {
-  return withApiLogging("GetModelEditorContext", undefined, () => GetModelEditorContext());
-}
-
 export function testModelAdapter(adapter) {
  return Call.ByName(`${PROXY_SERVICE_NAME}.TestModelAdapter`, adapter).then(
    (result) => {
@@ -12,18 +12,20 @@ import {
  loadUserConfig,
  openLogsDirectory,
  openModelConfig,
-  openModelEditor,
  saveUserConfig,
  startProxyService,
  stopProxyService,
  testModelAdapter,
  fetchModelAdapterModels,
 } from "@/services/clientApi";
+import {
+  normalizeReasoningEffort,
+  SUPPORTED_REASONING_EFFORTS,
+} from "@/state/modelAdapterReasoning";

 const APP_STATE_STORAGE_KEY = "cursor-client:runtime-state:v2";
 const GENERIC_SERVICE_ERROR = "服务错误";
 const SUPPORTED_MODEL_ADAPTER_TYPES = new Set(["openai", "anthropic"]);
-const SUPPORTED_REASONING_EFFORTS = new Set(["low", "medium", "high", "xhigh", "max"]);
 const SUPPORTED_ANTHROPIC_THINKING_EFFORTS = new Set(["low", "medium", "high", "xhigh", "max"]);
 export const ANTHROPIC_THINKING_EFFORT_DEFAULT = "xhigh";
 export const OPENAI_ENDPOINT_RESPONSES = "/v1/responses";
@@ -166,7 +168,7 @@ export function buildModelAdapterTestRequestHash(source) {
    normalizeBaseURL(adapter.baseURL),
    asString(adapter.apiKey),
    asString(adapter.modelID),
-    adapter.type === "openai" ? asString(adapter.reasoningEffort || "medium") : "",
+    adapter.type === "openai" ? asString(adapter.reasoningEffort) : "",
    adapter.type === "openai" ? normalizeOpenAIEndpoint(adapter.openAIEndpoint) : "",
    adapter.type === "openai" ? String(Boolean(adapter.openAIExtraParamsEnabled)) : "false",
    adapter.type === "openai" && adapter.openAIExtraParamsEnabled ? asString(adapter.openAIExtraParamsJSON) : "",
@@ -227,7 +229,7 @@ function normalizeModelAdapterTestResult(source) {
    rawResponse: asString(raw.rawResponse),
    testedAt: asString(raw.testedAt),
  };
-  if (!normalized.summaryText) {
+  if (status === "running" || status === "success") {
    normalized.summaryText = formatModelAdapterTestSummary(normalized);
  }
  if (status === "error" && !normalized.summaryText) {
@@ -248,13 +250,14 @@ function normalizeModelAdapterTestResults(source) {
 export function createEmptyModelAdapter() {
  return {
    id: "",
+    sort: 0,
    displayName: "",
    type: "openai",
    baseURL: "",
    apiKey: "",
    tooltipData: "备注",
    modelID: "",
-    reasoningEffort: "medium",
+    reasoningEffort: "",
    openAIEndpoint: OPENAI_ENDPOINT_RESPONSES,
    openAIExtraParamsEnabled: false,
    openAIExtraParamsJSON: OPENAI_EXTRA_PARAMS_DEFAULT_JSON,
@@ -329,7 +332,7 @@ function validateAnthropicExtraParamsJSON(value) {
 export function normalizeModelAdapter(source) {
  const raw = source && typeof source === "object" ? source : {};
  const normalizedType = asString(raw.type).toLowerCase();
-  const normalizedReasoningEffort = asString(raw.reasoningEffort || raw.reasoning_effort).toLowerCase();
+  const normalizedReasoningEffort = normalizeReasoningEffort(raw.reasoningEffort ?? raw.reasoning_effort);
  const normalizedAnthropicThinkingEffort = asString(
    raw.anthropicThinkingEffort
      ?? raw.anthropic_thinking_effort
@@ -355,15 +358,14 @@ export function normalizeModelAdapter(source) {
    : "";
  return {
    id: asString(raw.id),
+    sort: asPositiveInteger(raw.sort),
    displayName: asString(raw.displayName || raw.name),
    type: SUPPORTED_MODEL_ADAPTER_TYPES.has(normalizedType) ? normalizedType : "",
    baseURL: normalizeBaseURL(raw.baseURL || raw.url),
    apiKey: asString(raw.apiKey || raw.key),
    tooltipData: asString(raw.tooltipData),
    modelID: asString(raw.modelID),
-    reasoningEffort: SUPPORTED_REASONING_EFFORTS.has(normalizedReasoningEffort)
-      ? normalizedReasoningEffort
-      : "medium",
+    reasoningEffort: normalizedReasoningEffort,
    openAIEndpoint: normalizedType === "openai" ? normalizedOpenAIEndpoint : "",
    openAIExtraParamsEnabled,
    openAIExtraParamsJSON,
@@ -392,7 +394,29 @@ export function normalizeModelAdapter(source) {
 }

 export function normalizeModelAdapters(source) {
-  return asArray(source).map((item) => normalizeModelAdapter(item));
+  return asArray(source)
+    .map((item, sourceIndex) => ({
+      adapter: normalizeModelAdapter(item),
+      sourceIndex,
+    }))
+    .sort((left, right) => {
+      const leftSort = left.adapter.sort;
+      const rightSort = right.adapter.sort;
+      if (leftSort <= 0 && rightSort <= 0) {
+        return left.sourceIndex - right.sourceIndex;
+      }
+      if (leftSort <= 0) {
+        return 1;
+      }
+      if (rightSort <= 0) {
+        return -1;
+      }
+      return leftSort - rightSort || left.sourceIndex - right.sourceIndex;
+    })
+    .map(({ adapter }, index) => ({
+      ...adapter,
+      sort: index + 1,
+    }));
 }

 export function validateModelAdapters(source) {
@@ -400,9 +424,6 @@ export function validateModelAdapters(source) {
  const seenIdentityKeys = new Set();
  for (const [index, adapter] of adapters.entries()) {
    const prefix = `模型 ${index + 1}`;
-    if (!adapter.displayName) {
-      return `${prefix} 的显示名称不能为空`;
-    }
    if (!SUPPORTED_MODEL_ADAPTER_TYPES.has(adapter.type)) {
      return `${prefix} 的类型仅支持 OpenAI 或 Anthropic`;
    }
@@ -412,14 +433,26 @@ export function validateModelAdapters(source) {
    if (!adapter.apiKey) {
      return `${prefix} 的访问密钥不能为空`;
    }
-    if (!adapter.tooltipData) {
-      return `${prefix} 的悬停提示不能为空`;
+    if (!adapter.displayName) {
+      return `${prefix} 的显示名称不能为空`;
    }
    if (!adapter.modelID) {
      return `${prefix} 的模型标识不能为空`;
    }
+    if (adapter.contextWindowTokens && (!Number.isInteger(adapter.contextWindowTokens) || adapter.contextWindowTokens <= 0)) {
+      return `${prefix} 的上下文窗口必须为正整数`;
+    }
    if (adapter.type === "openai" && !SUPPORTED_REASONING_EFFORTS.has(adapter.reasoningEffort)) {
-      return `${prefix} 的推理强度仅支持 low、medium、high、xhigh、max`;
+      return `${prefix} 的推理强度仅支持不设置、low、medium、high、xhigh、max`;
+    }
+    if (adapter.type === "anthropic" && adapter.anthropicMaxTokens && (!Number.isInteger(adapter.anthropicMaxTokens) || adapter.anthropicMaxTokens <= 0)) {
+      return `${prefix} 的最大输出 Token 必须为正整数`;
+    }
+    if (adapter.type === "anthropic" && !SUPPORTED_ANTHROPIC_THINKING_EFFORTS.has(adapter.anthropicThinkingEffort)) {
+      return `${prefix} 的 Anthropic 思考强度仅支持 low、medium、high、xhigh、max`;
+    }
+    if (adapter.type === "openai" && adapter.maxCompletionTokens && (!Number.isInteger(adapter.maxCompletionTokens) || adapter.maxCompletionTokens <= 0)) {
+      return `${prefix} 的最大输出 Token 必须为正整数`;
    }
    if (adapter.type === "openai" && !isValidOpenAIEndpoint(adapter.openAIEndpoint)) {
      return `${prefix} 的 OpenAI 端点仅支持 /v1/responses、/v1/chat/completions 或以 / 开头的自定义路径`;
@@ -430,29 +463,20 @@ export function validateModelAdapters(source) {
        return `${prefix} 的 ${extraParamsError}`;
      }
    }
-    if (adapter.customHeadersEnabled) {
-      const customHeadersError = validateHeadersJSON(adapter.customHeadersJSON);
-      if (customHeadersError) {
-        return `${prefix} 的 ${customHeadersError}`;
-      }
-    }
    if (adapter.type === "anthropic" && adapter.anthropicExtraParamsEnabled) {
      const extraParamsError = validateAnthropicExtraParamsJSON(adapter.anthropicExtraParamsJSON);
      if (extraParamsError) {
        return `${prefix} 的 ${extraParamsError}`;
      }
    }
-    if (adapter.type === "anthropic" && !SUPPORTED_ANTHROPIC_THINKING_EFFORTS.has(adapter.anthropicThinkingEffort)) {
-      return `${prefix} 的 Anthropic 思考强度仅支持 low、medium、high、xhigh、max`;
+    if (adapter.customHeadersEnabled) {
+      const customHeadersError = validateHeadersJSON(adapter.customHeadersJSON);
+      if (customHeadersError) {
+        return `${prefix} 的 ${customHeadersError}`;
+      }
    }
-    if (adapter.contextWindowTokens && (!Number.isInteger(adapter.contextWindowTokens) || adapter.contextWindowTokens <= 0)) {
-      return `${prefix} 的上下文窗口必须为正整数`;
-    }
-    if (adapter.maxCompletionTokens && (!Number.isInteger(adapter.maxCompletionTokens) || adapter.maxCompletionTokens <= 0)) {
-      return `${prefix} 的最大输出 Token 必须为正整数`;
-    }
-    if (adapter.anthropicMaxTokens && (!Number.isInteger(adapter.anthropicMaxTokens) || adapter.anthropicMaxTokens <= 0)) {
-      return `${prefix} 的最大输出 Token 必须为正整数`;
+    if (!adapter.tooltipData) {
+      return `${prefix} 的悬停提示不能为空`;
    }
    if (adapter.thinkingBudgetTokens && (!Number.isInteger(adapter.thinkingBudgetTokens) || adapter.thinkingBudgetTokens <= 0)) {
      return `${prefix} 的思考预算 Token 必须为正整数`;
@@ -1063,6 +1087,10 @@ export async function refreshModelAdapterTestResults() {

 export function startModelAdapterTest(adapter) {
  const normalized = normalizeModelAdapter(adapter);
+  const validationError = validateModelAdapters([normalized]);
+  if (validationError) {
+    return Promise.reject(new Error(validationError));
+  }
  return testModelAdapter(normalized).then((rawResult) => {
    const result = normalizeModelAdapterTestResult(rawResult);
    if (result.adapterID) {
@@ -1151,93 +1179,6 @@ export async function fetchAvailableModelIDs(payload) {
    .filter(Boolean);
 }

-function buildPrefixedModelDisplayName(prefix, modelID) {
-  const normalizedPrefix = asString(prefix) || "模型";
-  return `${normalizedPrefix}-${asString(modelID)}`;
-}
-
-export function buildModelAdaptersFromModelIDs(source, modelIDs, prefix) {
-  const base = normalizeModelAdapter(source);
-  const seen = new Set();
-  return asArray(modelIDs)
-    .map((item) => asString(item))
-    .filter((modelID) => {
-      if (!modelID || seen.has(modelID)) {
-        return false;
-      }
-      seen.add(modelID);
-      return true;
-    })
-    .map((modelID) => normalizeModelAdapter({
-      ...base,
-      id: "",
-      modelID,
-      displayName: buildPrefixedModelDisplayName(prefix, modelID),
-      tooltipData: base.tooltipData || "备注",
-    }));
-}
-
-function findModelAdapterUpsertIndex(adapters, target) {
-  return adapters.findIndex((adapter) => {
-    const current = normalizeModelAdapter(adapter);
-    return current.type === target.type
-      && normalizeBaseURL(current.baseURL) === normalizeBaseURL(target.baseURL)
-      && current.apiKey === target.apiKey
-      && current.modelID === target.modelID
-      && current.displayName === target.displayName
-      && (current.type !== "openai" || current.openAIEndpoint === target.openAIEndpoint);
-  });
-}
-
-export async function saveModelAdaptersFromModelIDs(source, modelIDs, prefix, selectedModelID = "") {
-  const generatedAdapters = buildModelAdaptersFromModelIDs(source, modelIDs, prefix);
-  if (generatedAdapters.length === 0) {
-    return { ok: false, error: "没有可保存的模型" };
-  }
-
-  const generatedError = validateModelAdapters(generatedAdapters);
-  if (generatedError) {
-    return { ok: false, error: generatedError };
-  }
-
-  const currentConfig = await loadPersistedUserConfig();
-  const nextAdapters = normalizeModelAdapters(currentConfig.modelAdapters);
-  const targetModelID = asString(selectedModelID) || generatedAdapters[0]?.modelID || "";
-  let selectedIndex = -1;
-
-  for (const adapter of generatedAdapters) {
-    const index = findModelAdapterUpsertIndex(nextAdapters, adapter);
-    if (index >= 0) {
-      nextAdapters.splice(index, 1, adapter);
-      if (selectedIndex < 0 && adapter.modelID === targetModelID) {
-        selectedIndex = index;
-      }
-      continue;
-    }
-    nextAdapters.push(adapter);
-    if (selectedIndex < 0 && adapter.modelID === targetModelID) {
-      selectedIndex = nextAdapters.length - 1;
-    }
-  }
-
-  const result = await persistConfigPayload(
-    {
-      ...currentConfig,
-      modelAdapters: nextAdapters,
-    },
-    { modelAdaptersOnly: true },
-  );
-  if (!result.ok) {
-    return result;
-  }
-  return {
-    ...result,
-    index: selectedIndex,
-    adapter: selectedIndex >= 0 ? appState.modelAdapters[selectedIndex] ?? null : null,
-    count: generatedAdapters.length,
-  };
-}
-
 export async function deleteModelAdapterAt(index) {
  const currentConfig = await loadPersistedUserConfig();
  const nextAdapters = normalizeModelAdapters(currentConfig.modelAdapters);
@@ -1260,6 +1201,39 @@ export async function deleteModelAdapterAt(index) {
  );
 }

+export async function saveModelAdapterOrder(adapterIDs) {
+  const orderedIDs = asArray(adapterIDs)
+    .map((item) => asString(item))
+    .filter(Boolean);
+  const currentConfig = await loadPersistedUserConfig();
+  const currentAdapters = normalizeModelAdapters(currentConfig.modelAdapters);
+  const adaptersByID = new Map(currentAdapters.map((adapter) => [adapter.id, adapter]));
+  const uniqueIDs = new Set(orderedIDs);
+
+  if (
+    orderedIDs.length !== currentAdapters.length
+    || uniqueIDs.size !== currentAdapters.length
+    || orderedIDs.some((id) => !adaptersByID.has(id))
+  ) {
+    return {
+      ok: false,
+      error: "模型配置已发生变化，请刷新后重试",
+    };
+  }
+
+  const nextAdapters = orderedIDs.map((id, index) => ({
+    ...adaptersByID.get(id),
+    sort: index + 1,
+  }));
+  return persistConfigPayload(
+    {
+      ...currentConfig,
+      modelAdapters: nextAdapters,
+    },
+    { modelAdaptersOnly: true },
+  );
+}
+
 function splitDisplayNameSeed(value) {
  const text = asString(value);
  const match = text.match(/^(.*?)(?:\s*[-+](\d+))?$/);
@@ -1403,11 +1377,6 @@ export async function openModelConfigWindow() {
  await openModelConfig();
 }

-export async function openModelEditorWindow(index, adapter) {
-  const adapterJSON = JSON.stringify(normalizeModelAdapter(adapter));
-  await openModelEditor(index, adapterJSON);
-}
-
 export async function checkForAppUpdates() {
  await checkForUpdates();
 }
@@ -0,0 +1,14 @@
+export const SUPPORTED_REASONING_EFFORTS = new Set(["", "low", "medium", "high", "xhigh", "max"]);
+
+export function normalizeReasoningEffort(value) {
+  if (typeof value === "string") {
+    return value.trim().toLowerCase();
+  }
+  if (value instanceof String) {
+    return value.toString().trim().toLowerCase();
+  }
+  if (typeof value === "number" || typeof value === "boolean") {
+    return String(value).trim().toLowerCase();
+  }
+  return "";
+}
@@ -0,0 +1,20 @@
+import assert from "node:assert/strict";
+import test from "node:test";
+
+import {
+  normalizeReasoningEffort,
+  SUPPORTED_REASONING_EFFORTS,
+} from "./modelAdapterReasoning.js";
+
+test("normalizeReasoningEffort preserves blank and supported values", () => {
+  assert.equal(normalizeReasoningEffort(""), "");
+  assert.equal(normalizeReasoningEffort(" HIGH "), "high");
+  assert.equal(SUPPORTED_REASONING_EFFORTS.has(normalizeReasoningEffort("max")), true);
+});
+
+test("normalizeReasoningEffort preserves unknown values for validation", () => {
+  const normalized = normalizeReasoningEffort(" Unsupported ");
+
+  assert.equal(normalized, "unsupported");
+  assert.equal(SUPPORTED_REASONING_EFFORTS.has(normalized), false);
+});
@@ -13,8 +13,15 @@ body,
  width: 100vw;
  overflow: hidden;
  background: #191919;
-  font-family: "PingFang-Medium", system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, sans-serif;
-  color: #F7F7F7;
+  font-family:
+    "PingFang-Medium",
+    system-ui,
+    -apple-system,
+    BlinkMacSystemFont,
+    "Segoe UI",
+    Roboto,
+    sans-serif;
+  color: #f7f7f7;
  font-size: 13px;
 }

@@ -28,10 +35,41 @@ body,
  scrollbar-width: thin;
  scrollbar-color: rgba(100, 100, 100, 0.8) transparent;
 }
-:root{
+:root {
  color-scheme: dark;
+  --x-maskImage: linear-gradient(
+    to bottom,
+    rgba(0, 0, 0, 0) 0px,
+    black 18px,
+    black calc(100% - 0px),
+    rgba(0, 0, 0, 0) 100%
+  );
+  --x-WebkitMaskImage: linear-gradient(
+    to bottom,
+    rgba(0, 0, 0, 0) 0px,
+    black 18px,
+    black calc(100% - 0px),
+    rgba(0, 0, 0, 0) 100%
+  );
+}
+.scroll-shadow {
+  -webkit-mask-image: var(--x-maskImage);
+  mask-image: var(--x-maskImage);
+}
+.scroll-shadow-bottom {
+  -webkit-mask-image: linear-gradient(
+    to bottom,
+    black 0,
+    black calc(100% - 16px),
+    transparent 100%
+  );
+  mask-image: linear-gradient(
+    to bottom,
+    black 0,
+    black calc(100% - 16px),
+    transparent 100%
+  );
 }
-
 /* WebKit/Blink (Chrome, Safari, Edge, Opera) */
 ::-webkit-scrollbar {
  width: 6px;
@@ -2,7 +2,7 @@
 import Button from "@/components/ui/Button.vue";
 import Card from "@/components/ui/Card.vue";
 import LocaleSelect from "@/components/LocaleSelect.vue";
-import { showModal } from "@/composables/useModal";
+import { useMessage } from "@/composables/useMessage";
 import {
  appState,
  openModelConfigWindow,
@@ -12,30 +12,27 @@ import {
 } from "@/state/appState";
 import { onMounted } from "vue";

-async function showActionError(title, error) {
-  await showModal({
-    title,
-    content: String(error || "服务错误").trim() || "服务错误",
-  });
+const message = useMessage();
+
+function showActionError(title, error) {
+  const detail = String(error || "服务错误").trim() || "服务错误";
+  message(`${title}：${detail}`);
 }

 async function handleSaveConfig() {
  const result = await persistUserConfig();
  if (!result.ok) {
-    await showActionError("保存失败", result.error);
+    showActionError("保存失败", result.error);
    return;
  }
-  await showModal({
-    title: "提示",
-    content: "本地配置已保存",
-  });
+  message("本地配置已保存");
 }

 async function handleOpenModelConfig() {
  try {
    await openModelConfigWindow();
  } catch (error) {
-    await showActionError("打开失败", toUserError(error));
+    showActionError("打开失败", toUserError(error));
  }
 }

@@ -3,7 +3,7 @@ import Button from "@/components/ui/Button.vue";
 import Card from "@/components/ui/Card.vue";
 import HomeMetricsCard from "@/components/HomeMetricsCard.vue";
 import CursorAccountCard from "@/components/CursorAccountCard.vue";
-import { showModal } from "@/composables/useModal";
+import { useMessage } from "@/composables/useMessage";
 import { getAdRuntime } from "@/services/clientApi";
 import {
  appState,
@@ -20,6 +20,7 @@ import { computed, onBeforeUnmount, onMounted, ref } from "vue";

 const AD_UPDATED_EVENT = "ad:updated";
 const OPEN_AD_EVENT = "cursor:open-ad";
+const message = useMessage();

 const adRuntime = ref(null);
 let unsubscribeAdUpdated = null;
@@ -79,17 +80,15 @@ function handleOpenHomeAd(slotId) {
  window.dispatchEvent(new CustomEvent(OPEN_AD_EVENT, { detail: { slotId: asString(slotId) } }));
 }

-async function showActionError(title, error) {
-  await showModal({
-    title,
-    content: String(error || "服务错误").trim() || "服务错误",
-  });
+function showActionError(title, error) {
+  const detail = String(error || "服务错误").trim() || "服务错误";
+  message(`${title}：${detail}`);
 }

 async function handleToggleService() {
  const result = await toggleService();
  if (!result.ok) {
-    await showActionError("服务操作失败", result.error);
+    showActionError("服务操作失败", result.error);
  }
 }

@@ -99,19 +98,24 @@ async function handleRefreshState() {
    syncHomeMetrics(),
  ]);
  if (serviceStateResult.status === "rejected") {
-    await showActionError("刷新失败", toUserError(serviceStateResult.reason));
+    showActionError("刷新失败", toUserError(serviceStateResult.reason));
  }
 }

 async function handleRefreshMetrics() {
-  await syncHomeMetrics().catch(() => {});
+  const result = await syncHomeMetrics();
+  if (result.ok) {
+    message("刷新成功");
+    return;
+  }
+  showActionError("刷新失败", result.error);
 }

 async function handleOpenConfig() {
  try {
    await openConfigWindow();
  } catch (error) {
-    await showActionError("打开失败", toUserError(error));
+    showActionError("打开失败", toUserError(error));
  }
 }

@@ -119,7 +123,7 @@ async function handleOpenModelConfig() {
  try {
    await openModelConfigWindow();
  } catch (error) {
-    await showActionError("打开失败", toUserError(error));
+    showActionError("打开失败", toUserError(error));
  }
 }

@@ -136,7 +140,7 @@ onBeforeUnmount(() => {
 </script>

 <template>
-  <div class="flex h-full min-h-0 flex-col gap-4 overflow-y-auto p-4 pt-0 text-[#e5e5e5]">
+  <div class="flex h-full min-h-0 flex-col gap-4 overflow-y-auto scroll-shadow-bottom p-4 pt-0 text-[#e5e5e5]">
    <HomeMetricsCard
      :metrics="appState.homeMetrics"
      :loading="appState.homeMetricsLoading"
@@ -148,7 +152,7 @@ onBeforeUnmount(() => {

    <Card>
      <div class="flex flex-col gap-4">
-        <div class="flex items-start justify-between gap-4">
+        <div class="center-row justify-between gap-4">
          <div class="flex flex-col gap-1">
            <div class="text-sm" :class="appViewState.serviceStatusClass">
              {{ appViewState.serviceStatusText }}
@@ -172,7 +176,7 @@ onBeforeUnmount(() => {

    <CursorAccountCard />

-    <Card>
+    <Card class="">
      <div class="flex items-center justify-between gap-4">
        <div>
          <h2 class="text-base font-medium text-white">本地配置</h2>
@@ -1,39 +1,56 @@
 <script setup>
 import Button from "@/components/ui/Button.vue";
 import Card from "@/components/ui/Card.vue";
+import ContentModal from "@/components/ui/ContentModal.vue";
 import ModelAdapterTestCard from "@/components/ModelAdapterTestCard.vue";
-import { showModal } from "@/composables/useModal";
+import ModelEditor from "@/components/ModelEditor.vue";
+import { useMessage } from "@/composables/useMessage";
+import Sortable from "sortablejs";
 import {
  appState,
  createEmptyModelAdapter,
  deleteModelAdapterAt,
  duplicateModelAdapterAt,
  getModelAdapterTestResultByID,
-  openModelEditorWindow,
  reloadUserConfig,
  runModelAdapterTest,
+  saveModelAdapterOrder,
  startModelAdapterTest,
  toUserError,
 } from "@/state/appState";
-import { computed, onBeforeUnmount, onMounted, ref, watch } from "vue";
+import { computed, nextTick, onBeforeUnmount, onMounted, ref, watch } from "vue";

 const BATCH_TEST_CONCURRENCY = 10;
+const message = useMessage();

 const typeTabs = [
+  { label: "全部", value: "all", icon: "icon-[mdi--view-grid-outline]" },
  { label: "OpenAI", value: "openai", icon: "icon-[bxl--openai]" },
  { label: "Anthropic", value: "anthropic", icon: "icon-[logos--claude-icon]" },
 ];

-const activeType = ref("openai");
+const activeType = ref("all");
 const batchTesting = ref(false);
 const batchStopping = ref(false);
 const batchTotal = ref(0);
 const batchCompleted = ref(0);
+const editorOpen = ref(false);
+const editorIndex = ref(-1);
+const editorAdapter = ref(null);
+const editorSession = ref(0);
+const modelGrid = ref(null);
+const sortSaving = ref(false);
 const batchActiveCalls = new Set();
 let batchStopRequested = false;
+let sortable = null;

-const filteredAdapters = computed(() =>
-  appState.modelAdapters.filter((adapter) => adapter.type === activeType.value),
+const filteredAdapters = computed(() => (
+  activeType.value === "all"
+    ? appState.modelAdapters
+    : appState.modelAdapters.filter((adapter) => adapter.type === activeType.value)
+));
+const filteredAdapterOrderKey = computed(() =>
+  filteredAdapters.value.map((adapter) => adapter.id).join("\n"),
 );
 const batchButtonText = computed(() => {
  if (batchStopping.value) {
@@ -44,24 +61,30 @@ const batchButtonText = computed(() => {
  }
  return `停止测试 ${batchCompleted.value}/${batchTotal.value}`;
 });
+const editorTitle = computed(() => (editorIndex.value >= 0 ? "编辑模型配置" : "新增模型配置"));
+const emptyStateText = computed(() => (
+  activeType.value === "all"
+    ? "当前还没有配置任何模型。"
+    : `当前还没有配置任何 ${typeLabel(activeType.value)} 模型。`
+));

 watch(
  () => appState.modelAdapters,
  (adapters) => {
-    if (adapters.some((adapter) => adapter.type === activeType.value)) {
+    if (
+      activeType.value === "all"
+      || adapters.some((adapter) => adapter.type === activeType.value)
+    ) {
      return;
    }
-    const fallback = typeTabs.find((tab) => adapters.some((adapter) => adapter.type === tab.value));
-    activeType.value = fallback?.value ?? "openai";
+    activeType.value = "all";
  },
  { deep: true, immediate: true },
 );

-async function showActionError(title, error) {
-  await showModal({
-    title,
-    content: String(error || "服务错误").trim() || "服务错误",
-  });
+function showActionError(title, error) {
+  const detail = String(error || "服务错误").trim() || "服务错误";
+  message(`${title}：${detail}`);
 }

 function maskSecret(value) {
@@ -92,41 +115,167 @@ function formatHost(value) {
  }
 }

-async function openEditor(index = -1) {
-  const adapter = index >= 0
+function openEditor(index = -1) {
+  editorIndex.value = index;
+  editorAdapter.value = index >= 0
    ? appState.modelAdapters[index]
    : {
        ...createEmptyModelAdapter(),
-        type: activeType.value,
+        type: activeType.value === "anthropic" ? "anthropic" : "openai",
      };
-  try {
-    await openModelEditorWindow(index, adapter);
-  } catch (error) {
-    await showActionError("打开失败", toUserError(error));
+  editorSession.value += 1;
+  editorOpen.value = true;
+}
+
+function closeEditor() {
+  if (appState.configSaving) {
+    return;
+  }
+  editorOpen.value = false;
+}
+
+function handleEditorSaved(adapter) {
+  if (activeType.value !== "all" && adapter?.type) {
+    activeType.value = adapter.type;
  }
 }

+function destroySortable() {
+  if (!sortable) {
+    return;
+  }
+  sortable.destroy();
+  sortable = null;
+}
+
+function syncSortable() {
+  const element = modelGrid.value;
+  if (!element) {
+    destroySortable();
+    return;
+  }
+  if (!sortable || sortable.el !== element) {
+    destroySortable();
+    sortable = Sortable.create(element, {
+      animation: 160,
+      dataIdAttr: "data-model-id",
+      draggable: ".model-sort-item",
+      handle: ".model-sort-handle",
+      ghostClass: "opacity-40",
+      chosenClass: "!border-[#10AD5D]",
+      dragClass: "cursor-grabbing",
+      onEnd: (event) => {
+        void handleModelSort(event);
+      },
+    });
+  }
+  sortable.option(
+    "disabled",
+    sortSaving.value || appState.configSaving || batchTesting.value,
+  );
+  sortable.sort(filteredAdapters.value.map((adapter) => adapter.id), false);
+}
+
+async function restoreModelOrder(previousAdapters) {
+  try {
+    await reloadUserConfig({ modelAdaptersOnly: true });
+  } catch (_error) {
+    appState.modelAdapters = previousAdapters;
+  }
+}
+
+async function handleModelSort(event) {
+  const oldIndex = event.oldDraggableIndex ?? event.oldIndex;
+  const newIndex = event.newDraggableIndex ?? event.newIndex;
+  if (
+    !Number.isInteger(oldIndex)
+    || !Number.isInteger(newIndex)
+    || oldIndex === newIndex
+  ) {
+    syncSortable();
+    return;
+  }
+
+  const reorderedTypeAdapters = filteredAdapters.value.slice();
+  const [movedAdapter] = reorderedTypeAdapters.splice(oldIndex, 1);
+  if (!movedAdapter || newIndex < 0 || newIndex > reorderedTypeAdapters.length) {
+    syncSortable();
+    return;
+  }
+  reorderedTypeAdapters.splice(newIndex, 0, movedAdapter);
+
+  const previousAdapters = appState.modelAdapters.slice();
+  let nextAdapters = reorderedTypeAdapters;
+  if (activeType.value !== "all") {
+    let typeIndex = 0;
+    nextAdapters = previousAdapters.map((adapter) => {
+      if (adapter.type !== activeType.value) {
+        return adapter;
+      }
+      const nextAdapter = reorderedTypeAdapters[typeIndex];
+      typeIndex += 1;
+      return nextAdapter;
+    });
+  }
+  nextAdapters = nextAdapters
+    .map((adapter, index) => ({
+      ...adapter,
+      sort: index + 1,
+    }));
+
+  sortSaving.value = true;
+  appState.modelAdapters = nextAdapters;
+  try {
+    const result = await saveModelAdapterOrder(nextAdapters.map((adapter) => adapter.id));
+    if (!result.ok) {
+      await restoreModelOrder(previousAdapters);
+      showActionError("排序失败", result.error);
+    }
+  } catch (error) {
+    await restoreModelOrder(previousAdapters);
+    showActionError("排序失败", toUserError(error));
+  } finally {
+    sortSaving.value = false;
+    await nextTick();
+    syncSortable();
+  }
+}
+
+watch(
+  () => [
+    modelGrid.value,
+    activeType.value,
+    filteredAdapterOrderKey.value,
+    appState.configSaving,
+    batchTesting.value,
+  ],
+  () => {
+    void nextTick().then(syncSortable);
+  },
+  { flush: "post" },
+);
+
 async function handleDeleteModelAdapter(index) {
  const target = appState.modelAdapters[index];
  if (!target) {
-    await showActionError("删除失败", "模型配置不存在，无法删除");
+    showActionError("删除失败", "模型配置不存在，无法删除");
    return;
  }
  const result = await deleteModelAdapterAt(index);
  if (!result.ok) {
-    await showActionError("删除失败", result.error);
+    showActionError("删除失败", result.error);
  }
 }

 async function handleDuplicateModelAdapter(index) {
  const target = appState.modelAdapters[index];
  if (!target) {
-    await showActionError("复制失败", "模型配置不存在，无法复制");
+    showActionError("复制失败", "模型配置不存在，无法复制");
    return;
  }
  const result = await duplicateModelAdapterAt(index);
  if (!result.ok) {
-    await showActionError("复制失败", result.error);
+    showActionError("复制失败", result.error);
  }
 }

@@ -211,17 +360,20 @@ async function handleTestAllModelAdapters() {

 onMounted(async () => {
  await reloadUserConfig({ modelAdaptersOnly: true }).catch(() => { });
+  await nextTick();
+  syncSortable();
 });

 onBeforeUnmount(() => {
  void stopBatchTesting();
+  destroySortable();
 });
 </script>

 <template>
-  <div class="flex h-full min-h-0 flex-col p-4 pt-0 text-[#e5e5e5] overflow-hidden">
+  <div class="flex h-full min-h-0 flex-col  pt-0 text-[#e5e5e5] overflow-hidden">
    <div class="shrink-0 pb-4">
-      <div class="flex items-center justify-between gap-4">
+      <div class="flex items-center justify-between gap-4 px-4">
        <div class="center-row gap-2">
          <button
            v-for="tab in typeTabs"
@@ -240,37 +392,49 @@ onBeforeUnmount(() => {
        <div class="center-row gap-2">
          <Button
            variant="default"
-            :disabled="appState.configSaving || (!batchTesting && filteredAdapters.length === 0)"
+            :disabled="sortSaving || appState.configSaving || (!batchTesting && filteredAdapters.length === 0)"
            @click="handleTestAllModelAdapters"
          >
            {{ batchButtonText }}
          </Button>
-          <Button variant="primary" :disabled="appState.configSaving || batchTesting" @click="openEditor()">新增模型</Button>
+          <Button variant="primary" :disabled="sortSaving || appState.configSaving || batchTesting" @click="openEditor()">新增模型</Button>
        </div>
      </div>
    </div>

-    <div class="min-h-0 flex-1">
+    <div class="min-h-0 flex-1 ">
      <div v-if="filteredAdapters.length === 0"
-        class="flex h-full min-h-[220px] items-center justify-center rounded-[8px] border border-dashed border-[#3a3a3a] bg-[#232323] px-4 text-sm text-[#a3a3a3]">
-        当前还没有配置任何 {{ typeLabel(activeType) }} 模型。
+        class="flex h-full min-h-[220px] items-center justify-center rounded-[8px]  px-4 text-sm text-[#a3a3a3]">
+        {{ emptyStateText }}
      </div>

-      <div v-else class="h-full min-h-0 overflow-y-auto pr-1">
-        <div class="grid gap-3 pb-1 [grid-template-columns:repeat(auto-fill,minmax(250px,1fr))]">
+      <div v-else class="h-full min-h-0 overflow-y-auto  scroll-shadow-bottom p-4 pt-0">
+        <div
+          ref="modelGrid"
+          class="grid gap-3 pb-1 [grid-template-columns:repeat(auto-fill,minmax(250px,1fr))]"
+        >
          <Card
            v-for="(adapter, index) in filteredAdapters"
            :key="adapter.id || `${adapter.baseURL}-${adapter.modelID}-${index}`"
+            class="model-sort-item group relative pb-2"
+            :data-model-id="adapter.id"
          >
-            <div class="flex h-full min-h-[154px] flex-col justify-between gap-3">
+            <button
+              type="button"
+              class="model-sort-handle w-[30px] h-[30px]  center-row justify-center absolute left-2 top-2 z-10  shrink-0 touch-none cursor-grab rounded-[6px] border border-transparent bg-transparent text-transparent opacity-0 outline-none transition-[opacity,color,border-color,background-color] focus-visible:border-[#10AD5D] focus-visible:bg-[#333333] focus-visible:text-white focus-visible:opacity-100 active:cursor-grabbing group-hover:border-[#454545] group-hover:bg-[#333333] group-hover:text-white group-hover:opacity-100 disabled:cursor-not-allowed disabled:opacity-30"
+              :disabled="sortSaving || appState.configSaving || batchTesting"
+              aria-label="拖拽排序"
+              title="拖拽排序"
+              @click.stop
+            >
+              <span class="icon-[icon-park-outline--drag] text-[20px]"></span>
+            </button>
+            <div class="flex  h-[150px] flex-col justify-between gap-3">
              <div class="flex flex-col gap-2.5">
                <div class="flex items-start justify-between gap-3">
-                  <div class="min-w-0 flex-1">
+                  <div class="min-w-0 flex-1 ">
                    <div class="truncate text-base font-medium text-white">{{ adapter.displayName }}</div>
                    <div class="mt-1 truncate text-sm text-[#8f8f8f]">{{ adapter.modelID }}</div>
-                    <div v-if="adapter.type === 'openai'" class="mt-0.5 truncate text-xs text-[#737373]">
-                      {{ adapter.openAIEndpoint || "/v1/responses" }}
-                    </div>
                  </div>
                  <span
                    class="center-row shrink-0 gap-1 rounded-[999px] border border-[#3f3f3f] px-[7px] py-[4px] text-[11px] font-medium text-[#cfcfcf]"
@@ -281,17 +445,6 @@ onBeforeUnmount(() => {
                  </span>
                </div>

-                <div class="grid grid-cols-2 gap-2 text-sm text-[#a3a3a3]">
-                  <div class="rounded-[8px] bg-[#232323] px-3 py-2">
-                    <div class="text-[11px] uppercase tracking-[0.08em] text-[#666]">Host</div>
-                    <div class="mt-1 truncate text-[#d4d4d4]" :title="adapter.baseURL">{{ formatHost(adapter.baseURL) }}</div>
-                  </div>
-                  <div class="rounded-[8px] bg-[#232323] px-3 py-2">
-                    <div class="text-[11px] uppercase tracking-[0.08em] text-[#666]">API Key</div>
-                    <div class="mt-1 truncate text-[#d4d4d4]">{{ maskSecret(adapter.apiKey) }}</div>
-                  </div>
-                </div>
-
                <ModelAdapterTestCard
                  compact
                  title="测试"
@@ -300,17 +453,17 @@ onBeforeUnmount(() => {
                />
              </div>

-              <div class="center-row flex-wrap justify-end gap-2 border-t border-[#343434] pt-3">
+              <div class="center-row flex-wrap justify-end gap-2 pt-0">
                <Button
                  variant="default"
-                  :disabled="appState.configSaving || batchTesting || isAdapterTesting(adapter)"
+                  :disabled="sortSaving || appState.configSaving || batchTesting || isAdapterTesting(adapter)"
                  @click="handleTestModelAdapter(adapter)"
                >
                  {{ isAdapterTesting(adapter) ? "测试中..." : "测试" }}
                </Button>
-                <Button variant="default" :disabled="appState.configSaving" @click="openEditor(appState.modelAdapters.indexOf(adapter))">编辑</Button>
-                <Button variant="default" :disabled="appState.configSaving" @click="handleDuplicateModelAdapter(appState.modelAdapters.indexOf(adapter))">复制</Button>
-                <Button variant="text" :disabled="appState.configSaving"
+                <Button variant="default" :disabled="sortSaving || appState.configSaving" @click="openEditor(appState.modelAdapters.indexOf(adapter))">编辑</Button>
+                <Button variant="default" :disabled="sortSaving || appState.configSaving" @click="handleDuplicateModelAdapter(appState.modelAdapters.indexOf(adapter))">复制</Button>
+                <Button variant="text" :disabled="sortSaving || appState.configSaving"
                  @click="handleDeleteModelAdapter(appState.modelAdapters.indexOf(adapter))">删除</Button>
              </div>
            </div>
@@ -319,4 +472,21 @@ onBeforeUnmount(() => {
      </div>
    </div>
  </div>
+
+  <ContentModal
+    :open="editorOpen"
+    :title="editorTitle"
+    size="xl"
+    :close-disabled="appState.configSaving"
+    @close="closeEditor"
+  >
+    <ModelEditor
+      v-if="editorOpen && editorAdapter"
+      :key="editorSession"
+      :index="editorIndex"
+      :adapter="editorAdapter"
+      @saved="handleEditorSaved"
+      @close="closeEditor"
+    />
+  </ContentModal>
 </template>
@@ -1587,6 +1587,11 @@ semver@^6.3.1:
  resolved "https://registry.npmmirror.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
  integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==

+sortablejs@^1.15.7:
+  version "1.15.7"
+  resolved "https://registry.npmjs.org/sortablejs/-/sortablejs-1.15.7.tgz#83a0bddc472117ee328dea20b2e6f490fed20f86"
+  integrity sha512-Kk8wLQPlS+yi1ZEf48a4+fzHa4yxjC30M/Sr2AnQu+f/MPwvvX9XjZ6OWejiz8crBsLwSq8GHqaxaET7u6ux0A==
+
 source-map-js@^1.2.1:
  version "1.2.1"
  resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.1.tgz#1ce5650fddd87abc099eda37dcff024c2667ae46"
@@ -70,20 +70,21 @@ func Run(resources EmbeddedResources) error {
 	logger.Init()
 	netproxy.InstallDefaultTransport()

-	embeddedCACertPEM := certs.EmbeddedCACertPEM()
-	logEmbeddedCAInfo(embeddedCACertPEM)
-
-	certManager, err := certs.NewEmbeddedManager()
+	if err := appdata.EnsureAssistantHome(); err != nil {
+		return err
+	}
+	certManager, caCertPEM, err := certs.LoadOrCreateManager(appdata.CACertFilePath(), appdata.CAKeyFilePath())
 	if err != nil {
 		return err
 	}
+	logCAInfo(caCertPEM)

 	defaultBackendBaseURL := "http://" + serverconfig.DefaultBackendListenAddr
 	proxyServer, err := mitm.NewProxyServer(serverconfig.DefaultProxyListenAddr, defaultBackendBaseURL, "", "", certManager)
 	if err != nil {
 		return err
 	}
-	proxyService := bridge.NewProxyService(proxyServer, certManager, embeddedCACertPEM)
+	proxyService := bridge.NewProxyService(proxyServer, certManager, caCertPEM)
 	adAssetBaseURL := defaultBackendBaseURL
 	if cfg, err := proxyService.LoadUserConfig(); err == nil {
 		adAssetBaseURL = browserReachableLoopbackBaseURL(cfg.BackendListenAddr)
@@ -215,9 +216,9 @@ func Run(resources EmbeddedResources) error {
 	mainWindow = app.Window.NewWithOptions(application.WebviewWindowOptions{
 		Title:               appName,
 		Width:               700,
-		Height:              520,
-		MinWidth:            640,
-		MinHeight:           480,
+		Height:              530,
+		MinWidth:            700,
+		MinHeight:           530,
 		DisableResize:       false,
 		Frameless:           goruntime.GOOS == "windows",
 		URL:                 "/",
@@ -442,20 +443,20 @@ func browserReachableLoopbackBaseURL(listenAddr string) string {
 	return "http://" + net.JoinHostPort(host, port)
 }

-// logEmbeddedCAInfo 用于处理与 logEmbeddedCAInfo 相关的逻辑。
-func logEmbeddedCAInfo(certPEM []byte) {
+// logCAInfo 记录当前安装专属 CA 的公开信息。
+func logCAInfo(certPEM []byte) {
 	if len(certPEM) == 0 {
-		logger.Errorf("embedded CA is empty")
+		logger.Errorf("installation CA is empty")
 		return
 	}
-	cert, err := parseEmbeddedCert(certPEM)
+	cert, err := parseCert(certPEM)
 	if err != nil {
-		logger.Errorf("parse embedded CA failed: %v", err)
+		logger.Errorf("parse installation CA failed: %v", err)
 		return
 	}
 	sum := sha256.Sum256(cert.Raw)
 	logger.Infof(
-		"embedded CA loaded: sha256=%s subject=%s valid=%s~%s",
+		"installation CA loaded: sha256=%s subject=%s valid=%s~%s",
 		strings.ToUpper(hex.EncodeToString(sum[:])),
 		cert.Subject.String(),
 		cert.NotBefore.Format(time.RFC3339),
@@ -463,8 +464,8 @@ func logEmbeddedCAInfo(certPEM []byte) {
 	)
 }

-// parseEmbeddedCert 用于处理与 parseEmbeddedCert 相关的逻辑。
-func parseEmbeddedCert(data []byte) (*x509.Certificate, error) {
+// parseCert 解析 DER 或 PEM 编码的证书。
+func parseCert(data []byte) (*x509.Certificate, error) {
 	if block, _ := pem.Decode(data); block != nil {
 		return x509.ParseCertificate(block.Bytes)
 	}
@@ -70,3 +70,8 @@ func LogsRootPath() string {
 func CACertFilePath() string {
 	return filepath.Join(DataRootPath(), "ca.crt")
 }
+
+// CAKeyFilePath 返回仅供本安装使用的 CA 私钥路径。
+func CAKeyFilePath() string {
+	return filepath.Join(DataRootPath(), "ca.key")
+}
@@ -97,6 +97,7 @@ internal/backend/

 - `~/.cursor-local-assistant-v2/config.yaml`
 - `~/.cursor-local-assistant-v2/data/ca.crt`
+- `~/.cursor-local-assistant-v2/data/ca.key`
 - `~/.cursor-local-assistant-v2/data/ads/`
 - `~/.cursor-local-assistant-v2/history/`
 - `~/.cursor-local-assistant-v2/logs/`
@@ -104,7 +105,8 @@ internal/backend/
 约定：

 - `config.yaml` 是用户配置
- `data/ca.crt` 是注入给宿主的 CA 证书
+- `data/ca.crt` 是首次运行时为当前用户生成、注入给宿主的 CA 证书
+- `data/ca.key` 是与该证书配套的本地私钥，权限固定为 `0600`，不得打包或提交到仓库
 - `data/ads/` 是广告包与资源缓存目录
 - `history/` 是会话事实与全局 usage JSON 目录，不属于日志
 - `logs/` 只保留必要文本运行日志
@@ -2,8 +2,15 @@
 package execbridge

 import (
+	"bytes"
+	"crypto/sha256"
 	"encoding/json"
 	"fmt"
+	"image"
+	_ "image/gif"
+	_ "image/jpeg"
+	_ "image/png"
+	"net/http"
 	"strings"
 	"sync/atomic"
 	"time"
@@ -31,10 +38,18 @@ type ExecApplyResult struct {
 	ToolResultPayload string
 	// ToolCall 保存可用于发 ToolCallCompletedUpdate 的工具调用对象；当前仅对支持 ToolCall 的执行型工具可用。
 	ToolCall *agentv1.ToolCall
+	// ContentBlobs 保存需要在提交 history 前写入内容寻址存储的二进制内容。
+	ContentBlobs []ContentBlob
 	// ExecuteHookResponse 保存 execute hook 的结构化响应。
 	ExecuteHookResponse *agentv1.ExecuteHookResponse
 }

+// ContentBlob 表示由内容哈希稳定寻址的执行结果二进制数据。
+type ContentBlob struct {
+	ID   []byte
+	Data []byte
+}
+
 // OpenExecContext 表示执行桥打开请求时需要的最小上下文。
 type OpenExecContext struct {
 	ConversationID         string
@@ -145,6 +160,9 @@ func (bridge *Bridge) ApplyExecClientMessage(msg *agentv1.ExecClientMessage, pen
 		readResult := normalizeReadResultForModel(msg.GetReadResult())
 		result.ToolResultPayload = summarizeReadResult(readResult)
 		result.ToolCall = buildReadCompletedToolCall(pending.ToolCallID, pending.ArgsJSON, readResult)
+		if contentBlob, ok := readImageContentBlob(readResult); ok {
+			result.ContentBlobs = []ContentBlob{contentBlob}
+		}
 		result.IsTerminal = true
 		return result, nil
 	case "write":
@@ -2285,6 +2303,64 @@ func buildReadMcpResourceCompletedToolCall(argsJSON []byte, result *agentv1.Read
 	}
 }

+func supportedReadImageMIMEType(data []byte) string {
+	if len(data) == 0 {
+		return ""
+	}
+	detected := strings.ToLower(strings.TrimSpace(http.DetectContentType(data)))
+	configuration, format, err := image.DecodeConfig(bytes.NewReader(data))
+	if err != nil || configuration.Width <= 0 || configuration.Height <= 0 {
+		return ""
+	}
+	switch strings.ToLower(strings.TrimSpace(format)) {
+	case "png":
+		if detected == "image/png" {
+			return detected
+		}
+	case "jpeg":
+		if detected == "image/jpeg" {
+			return detected
+		}
+	case "gif":
+		if detected == "image/gif" {
+			return detected
+		}
+	}
+	return ""
+}
+
+func readImageContentBlob(result *agentv1.ReadResult) (ContentBlob, bool) {
+	success := result.GetSuccess()
+	if success == nil {
+		return ContentBlob{}, false
+	}
+	data := success.GetData()
+	if supportedReadImageMIMEType(data) == "" {
+		return ContentBlob{}, false
+	}
+	digest := sha256.Sum256(data)
+	return ContentBlob{
+		ID:   append([]byte(nil), digest[:]...),
+		Data: append([]byte(nil), data...),
+	}, true
+}
+
+func readImageBlobID(data []byte) ([]byte, bool) {
+	if supportedReadImageMIMEType(data) == "" {
+		return nil, false
+	}
+	digest := sha256.Sum256(data)
+	return append([]byte(nil), digest[:]...), true
+}
+
+func readImageDataBlobOutput(data []byte) *agentv1.ReadToolSuccess_DataBlobId {
+	blobID, ok := readImageBlobID(data)
+	if !ok {
+		return nil
+	}
+	return &agentv1.ReadToolSuccess_DataBlobId{DataBlobId: blobID}
+}
+
 // convertReadResultToReadToolResult 把 `ReadResult` 映射为 `ReadToolResult`。
 func convertReadResultToReadToolResult(result *agentv1.ReadResult) *agentv1.ReadToolResult {
 	if result == nil {
@@ -2318,7 +2394,9 @@ func convertReadResultToReadToolResult(result *agentv1.ReadResult) *agentv1.Read
 		if content != "" {
 			toolSuccess.Output = &agentv1.ReadToolSuccess_Content{Content: content}
 		} else if len(data) > 0 {
-			if len(data) > readReplayBinaryLimit {
+			if imageOutput := readImageDataBlobOutput(data); imageOutput != nil {
+				toolSuccess.Output = imageOutput
+			} else if len(data) > readReplayBinaryLimit {
 				toolSuccess.ExceededLimit = true
 				toolSuccess.Output = &agentv1.ReadToolSuccess_Content{
 					Content: replayTruncationNotice("Read binary data", readReplayBinaryLimit, 0, len(data)),
@@ -0,0 +1,125 @@
+package execbridge
+
+import (
+	"bytes"
+	"crypto/sha256"
+	"image"
+	"image/color"
+	"image/png"
+	"strings"
+	"testing"
+
+	"cursor/gen/agentv1"
+	runtimecore "cursor/internal/backend/agent/core"
+)
+
+func TestApplyExecClientMessageReturnsContentAddressedReadImage(t *testing.T) {
+	imageData := validReadTestPNG(t)
+	wantBlobID := sha256.Sum256(imageData)
+	result, err := NewBridge().ApplyExecClientMessage(&agentv1.ExecClientMessage{
+		Message: &agentv1.ExecClientMessage_ReadResult{
+			ReadResult: &agentv1.ReadResult{
+				Result: &agentv1.ReadResult_Success{
+					Success: &agentv1.ReadSuccess{
+						Path:         "diagram.png",
+						FileSize:     int64(len(imageData)),
+						OutputBlobId: append([]byte(nil), wantBlobID[:]...),
+						Output:       &agentv1.ReadSuccess_Data{Data: imageData},
+					},
+				},
+			},
+		},
+	}, runtimecore.PendingExec{
+		ExecKind:   "read",
+		ToolCallID: "call-1",
+		ArgsJSON:   []byte(`{"path":"diagram.png"}`),
+	})
+	if err != nil {
+		t.Fatalf("ApplyExecClientMessage() error = %v", err)
+	}
+	if len(result.ContentBlobs) != 1 {
+		t.Fatalf("content blob count = %d, want 1", len(result.ContentBlobs))
+	}
+	if !bytes.Equal(result.ContentBlobs[0].ID, wantBlobID[:]) || !bytes.Equal(result.ContentBlobs[0].Data, imageData) {
+		t.Fatalf("content blob = %#v", result.ContentBlobs[0])
+	}
+	readSuccess := result.ToolCall.GetReadToolCall().GetResult().GetSuccess()
+	if readSuccess == nil {
+		t.Fatal("read tool result is not successful")
+	}
+	if !bytes.Equal(readSuccess.GetDataBlobId(), wantBlobID[:]) {
+		t.Fatalf("data_blob_id = %x, want %x", readSuccess.GetDataBlobId(), wantBlobID)
+	}
+	if len(readSuccess.GetData()) != 0 {
+		t.Fatalf("read tool result retained %d image bytes", len(readSuccess.GetData()))
+	}
+}
+
+func TestApplyExecClientMessageUsesComputedImageBlobID(t *testing.T) {
+	imageData := validReadTestPNG(t)
+	wantBlobID := sha256.Sum256(imageData)
+	result, err := NewBridge().ApplyExecClientMessage(&agentv1.ExecClientMessage{
+		Message: &agentv1.ExecClientMessage_ReadResult{
+			ReadResult: &agentv1.ReadResult{
+				Result: &agentv1.ReadResult_Success{
+					Success: &agentv1.ReadSuccess{
+						Path:         "diagram.png",
+						OutputBlobId: bytes.Repeat([]byte{0xff}, sha256.Size),
+						Output:       &agentv1.ReadSuccess_Data{Data: imageData},
+					},
+				},
+			},
+		},
+	}, runtimecore.PendingExec{ExecKind: "read", ToolCallID: "call-1"})
+	if err != nil {
+		t.Fatalf("ApplyExecClientMessage() error = %v", err)
+	}
+	if !bytes.Equal(result.ContentBlobs[0].ID, wantBlobID[:]) {
+		t.Fatalf("content blob id = %x, want computed %x", result.ContentBlobs[0].ID, wantBlobID)
+	}
+}
+
+func TestConvertReadResultKeepsTextAndLimitsUnsupportedBinary(t *testing.T) {
+	textResult := convertReadResultToReadToolResult(&agentv1.ReadResult{
+		Result: &agentv1.ReadResult_Success{
+			Success: &agentv1.ReadSuccess{
+				Path:   "notes.txt",
+				Output: &agentv1.ReadSuccess_Content{Content: "hello"},
+			},
+		},
+	})
+	if got := textResult.GetSuccess().GetContent(); got != "hello" {
+		t.Fatalf("text read content = %q, want hello", got)
+	}
+
+	largeBinary := bytes.Repeat([]byte{0xff}, readReplayBinaryLimit+1)
+	binaryResult := convertReadResultToReadToolResult(&agentv1.ReadResult{
+		Result: &agentv1.ReadResult_Success{
+			Success: &agentv1.ReadSuccess{
+				Path:   "archive.bin",
+				Output: &agentv1.ReadSuccess_Data{Data: largeBinary},
+			},
+		},
+	})
+	binarySuccess := binaryResult.GetSuccess()
+	if binarySuccess == nil || !binarySuccess.GetExceededLimit() {
+		t.Fatal("large non-image binary was not limited")
+	}
+	if binarySuccess.GetData() != nil || binarySuccess.GetDataBlobId() != nil {
+		t.Fatal("large non-image binary was retained")
+	}
+	if !strings.Contains(binarySuccess.GetContent(), "Read binary data") {
+		t.Fatalf("large binary fallback = %q", binarySuccess.GetContent())
+	}
+}
+
+func validReadTestPNG(t *testing.T) []byte {
+	t.Helper()
+	value := image.NewRGBA(image.Rect(0, 0, 2, 2))
+	value.Set(0, 0, color.RGBA{R: 0x44, G: 0x88, B: 0xcc, A: 0xff})
+	var encoded bytes.Buffer
+	if err := png.Encode(&encoded, value); err != nil {
+		t.Fatalf("encode test png: %v", err)
+	}
+	return encoded.Bytes()
+}
@@ -1126,7 +1126,16 @@ func isAnthropicCacheableBlock(block map[string]any) bool {
 	case contentPartTypeText:
 		return strings.TrimSpace(anthropicStringField(block, "text")) != ""
 	case "tool_result":
-		return strings.TrimSpace(anthropicStringField(block, "content")) != ""
+		switch content := block["content"].(type) {
+		case string:
+			return strings.TrimSpace(content) != ""
+		case []map[string]any:
+			return len(content) > 0
+		case []any:
+			return len(content) > 0
+		default:
+			return false
+		}
 	case "tool_use":
 		return strings.TrimSpace(anthropicStringField(block, "id")) != "" && strings.TrimSpace(anthropicStringField(block, "name")) != ""
 	default:
@@ -1134,10 +1143,20 @@ func isAnthropicCacheableBlock(block map[string]any) bool {
 	}
 }

+// anthropicThinkingCarrier 记录请求内最近一个有 reasoning+signature 的 assistant 轮次。
+// thinking 模式下上游要求每个 assistant 轮次都回传 thinking 块；当某轮次（如 DeepSeek
+// adaptive thinking 跳过思考的 tool-call 轮次）没有 reasoning 时，用 carrier 的
+// thinking+signature 兜底，避免上游 "thinking must be passed back" 400。
+type anthropicThinkingCarrier struct {
+	reasoning string
+	signature string
+}
+
 func normalizeAnthropicProviderMessages(input []Message, thinkingEnabled bool, relocateImages bool) ([]string, []anthropicMessage, error) {
 	systemParts := make([]string, 0, len(input))
 	messages := make([]anthropicMessage, 0, len(input))
 	pendingToolResults := make([]map[string]any, 0, 2)
+	var thinkingCarrier *anthropicThinkingCarrier
 	flushToolResults := func() {
 		if len(pendingToolResults) == 0 {
 			return
@@ -1168,14 +1187,30 @@ func normalizeAnthropicProviderMessages(input []Message, thinkingEnabled bool, r
 			if toolUseID == "" {
 				return nil, nil, fmt.Errorf("anthropic tool message requires tool_call_id")
 			}
+			var content any = message.Content
+			if hasImageContentParts(message.ContentParts) {
+				contentBlocks, err := anthropicContentBlocks(message)
+				if err != nil {
+					return nil, nil, err
+				}
+				content = contentBlocks
+			}
 			pendingToolResults = append(pendingToolResults, map[string]any{
 				"type":        "tool_result",
 				"tool_use_id": toolUseID,
-				"content":     message.Content,
+				"content":     content,
 			})
 		case "user", "assistant":
 			flushToolResults()
-			contentBlocks, err := anthropicProviderContentBlocks(message, thinkingEnabled)
+			if thinkingEnabled && role == "assistant" {
+				if reasoning := strings.TrimSpace(message.ReasoningContent); reasoning != "" {
+					thinkingCarrier = &anthropicThinkingCarrier{
+						reasoning: reasoning,
+						signature: anthropicThinkingSignature(message),
+					}
+				}
+			}
+			contentBlocks, err := anthropicProviderContentBlocks(message, thinkingEnabled, thinkingCarrier)
 			if err != nil {
 				return nil, nil, err
 			}
@@ -1284,7 +1319,7 @@ func isAnthropicImageBlock(block map[string]any) bool {
 	return strings.TrimSpace(anthropicStringField(block, "type")) == "image"
 }

-func anthropicProviderContentBlocks(message Message, thinkingEnabled bool) ([]map[string]any, error) {
+func anthropicProviderContentBlocks(message Message, thinkingEnabled bool, carrier *anthropicThinkingCarrier) ([]map[string]any, error) {
 	blocks, err := anthropicContentBlocks(message)
 	if err != nil {
 		return nil, err
@@ -1293,11 +1328,17 @@ func anthropicProviderContentBlocks(message Message, thinkingEnabled bool) ([]ma
 		return blocks, nil
 	}

+	reasoning := strings.TrimSpace(message.ReasoningContent)
+	signature := anthropicThinkingSignature(message)
+	if reasoning == "" && carrier != nil {
+		reasoning = carrier.reasoning
+		signature = carrier.signature
+	}
 	thinkingBlock := map[string]any{
 		"type":     "thinking",
-		"thinking": message.ReasoningContent,
+		"thinking": reasoning,
 	}
-	if signature := anthropicThinkingSignature(message); signature != "" {
+	if signature != "" {
 		thinkingBlock["signature"] = signature
 	}
 	return append([]map[string]any{thinkingBlock}, blocks...), nil
@@ -1381,9 +1422,6 @@ func shouldIncludeAnthropicThinkingBlock(message Message, thinkingEnabled bool)
 	if strings.TrimSpace(message.Role) != "assistant" {
 		return false
 	}
-	if strings.TrimSpace(message.ReasoningContent) == "" {
-		return false
-	}
 	return true
 }

@@ -0,0 +1,164 @@
+package modeladapter
+
+import (
+	"strings"
+	"testing"
+)
+
+// TestNormalizeAnthropicProviderMessagesThinkingCarrier 验证 thinking 模式下，
+// 缺少 reasoning 的 assistant 轮次（如 DeepSeek adaptive thinking 跳过思考的
+// tool-call 轮次）会用请求内最近一个 carrier 的 thinking+signature 兜底，
+// 保证每个 assistant 轮次都有 thinking 块，避免上游 "thinking must be passed
+// back to the API" 400。
+func TestNormalizeAnthropicProviderMessagesThinkingCarrier(t *testing.T) {
+	carrierToolCall := []ToolCallDescriptor{{
+		ID:   "call-2",
+		Type: "function",
+		Function: ToolCallFunctionShape{
+			Name:      "read",
+			Arguments: `{}`,
+		},
+	}}
+	input := []Message{
+		{Role: "user", Content: "hello"},
+		{Role: "assistant", Content: "let me check", ReasoningContent: "R1", ReasoningSignature: "S1"},
+		{Role: "user", Content: "tool result 1"},
+		{Role: "assistant", ToolCalls: carrierToolCall}, // 无 reasoning → 用 carrier
+		{Role: "user", Content: "tool result 2"},
+		{Role: "assistant", Content: "done", ReasoningContent: "R2", ReasoningSignature: "S2"},
+	}
+
+	_, messages, err := normalizeAnthropicProviderMessages(input, true, false)
+	if err != nil {
+		t.Fatalf("normalize: %v", err)
+	}
+	if len(messages) != 6 {
+		t.Fatalf("expected 6 messages, got %d", len(messages))
+	}
+
+	// 第 2 条（有 reasoning）应保留自己的 thinking。
+	assertAnthropicThinkingBlock(t, messages[1], "R1", "S1")
+	// 第 4 条（无 reasoning 的 tool-call 轮次）应复用 carrier 的 thinking+signature。
+	assertAnthropicThinkingBlock(t, messages[3], "R1", "S1")
+	// 第 5 条应为 tool_result 消息（合并路径不适用时，tool-call 轮次独立成消息）。
+	if role := messages[4].Role; role != "user" {
+		t.Fatalf("expected messages[4] role=user, got %s", role)
+	}
+	// 第 6 条有自己的 thinking。
+	assertAnthropicThinkingBlock(t, messages[5], "R2", "S2")
+
+	// tool-call 轮次应包含 tool_use 块。
+	hasToolUse := false
+	for _, block := range messages[3].Content {
+		if strings.TrimSpace(anthropicStringField(block, "type")) == "tool_use" {
+			hasToolUse = true
+		}
+	}
+	if !hasToolUse {
+		t.Fatal("expected tool_use block on the carrier-fallback assistant message")
+	}
+}
+
+// TestNormalizeAnthropicProviderMessagesThinkingCarrierFirstTurn 验证请求内第一条
+// assistant 轮次就缺 reasoning 且无 carrier 时，兜底输出空 thinking 块。
+func TestNormalizeAnthropicProviderMessagesThinkingCarrierFirstTurn(t *testing.T) {
+	input := []Message{
+		{Role: "user", Content: "hello"},
+		{Role: "assistant", Content: "ok"},
+	}
+
+	_, messages, err := normalizeAnthropicProviderMessages(input, true, false)
+	if err != nil {
+		t.Fatalf("normalize: %v", err)
+	}
+	if len(messages) != 2 {
+		t.Fatalf("expected 2 messages, got %d", len(messages))
+	}
+	if got := anthropicStringField(messages[1].Content[0], "type"); got != "thinking" {
+		t.Fatalf("expected first block type=thinking, got %s", got)
+	}
+	if got := anthropicStringField(messages[1].Content[0], "thinking"); got != "" {
+		t.Fatalf("expected empty fallback thinking, got %q", got)
+	}
+}
+
+// TestNormalizeAnthropicProviderMessagesThinkingDisabled 验证 thinking 关闭时
+// 不输出任何 thinking 块（回归保护）。
+func TestNormalizeAnthropicProviderMessagesThinkingDisabled(t *testing.T) {
+	input := []Message{
+		{Role: "user", Content: "hello"},
+		{Role: "assistant", Content: "ok", ReasoningContent: "R1", ReasoningSignature: "S1"},
+		{Role: "assistant", ToolCalls: []ToolCallDescriptor{{
+			ID:   "call-2",
+			Type: "function",
+			Function: ToolCallFunctionShape{
+				Name:      "read",
+				Arguments: `{}`,
+			},
+		}}},
+	}
+
+	_, messages, err := normalizeAnthropicProviderMessages(input, false, false)
+	if err != nil {
+		t.Fatalf("normalize: %v", err)
+	}
+	for index, message := range messages {
+		for _, block := range message.Content {
+			if blockType := anthropicStringField(block, "type"); blockType == "thinking" {
+				t.Fatalf("unexpected thinking block at messages[%d]", index)
+			}
+		}
+	}
+}
+
+// TestNormalizeAnthropicProviderMessagesThinkingMerge 验证有 reasoning 的纯
+// tool-call 轮次仍按既有逻辑合并进上一条 assistant 消息（thinking 去重，无回归）。
+func TestNormalizeAnthropicProviderMessagesThinkingMerge(t *testing.T) {
+	input := []Message{
+		{Role: "user", Content: "hello"},
+		{Role: "assistant", Content: "let me check", ReasoningContent: "R1", ReasoningSignature: "S1"},
+		{Role: "assistant", ToolCalls: []ToolCallDescriptor{{
+			ID:   "call-2",
+			Type: "function",
+			Function: ToolCallFunctionShape{
+				Name:      "read",
+				Arguments: `{}`,
+			},
+		}}, ReasoningContent: "R1", ReasoningSignature: "S1"},
+	}
+
+	_, messages, err := normalizeAnthropicProviderMessages(input, true, false)
+	if err != nil {
+		t.Fatalf("normalize: %v", err)
+	}
+	if len(messages) != 2 {
+		t.Fatalf("expected 2 messages (tool-call merged), got %d", len(messages))
+	}
+	assertAnthropicThinkingBlock(t, messages[1], "R1", "S1")
+	hasToolUse := false
+	for _, block := range messages[1].Content {
+		if blockType := anthropicStringField(block, "type"); blockType == "tool_use" {
+			hasToolUse = true
+		}
+	}
+	if !hasToolUse {
+		t.Fatal("expected merged tool_use block on messages[1]")
+	}
+}
+
+func assertAnthropicThinkingBlock(t *testing.T, message anthropicMessage, wantThinking string, wantSignature string) {
+	t.Helper()
+	if len(message.Content) == 0 {
+		t.Fatalf("expected non-empty content for %s message", message.Role)
+	}
+	first := message.Content[0]
+	if blockType := anthropicStringField(first, "type"); blockType != "thinking" {
+		t.Fatalf("expected first block type=thinking, got %s", blockType)
+	}
+	if got := anthropicStringField(first, "thinking"); got != wantThinking {
+		t.Fatalf("expected thinking=%q, got %q", wantThinking, got)
+	}
+	if got := anthropicStringField(first, "signature"); got != wantSignature {
+		t.Fatalf("expected signature=%q, got %q", wantSignature, got)
+	}
+}
@@ -49,7 +49,8 @@ type openAIResponsesRequestBody struct {
 }

 type openAIResponsesReasoning struct {
-	Effort string `json:"effort,omitempty"`
+	Effort  string `json:"effort,omitempty"`
+	Summary string `json:"summary,omitempty"`
 }

 type openAIToolAccumulator struct {
@@ -839,7 +840,7 @@ func (adapter *OpenAIAdapter) streamChatCompletions(ctx context.Context, req Str
 			}
 		}

-		if choice.FinishReason != nil {
+		if choice.FinishReason != nil && strings.TrimSpace(*choice.FinishReason) != "" {
 			if err := flushTaggedContentTail(); err != nil {
 				return fail(err)
 			}
@@ -944,7 +945,7 @@ func (adapter *OpenAIAdapter) streamResponses(ctx context.Context, req StreamReq
 			requestBody.Tools = tools
 		}
 		if effort := strings.TrimSpace(req.ReasoningEffort); effort != "" {
-			requestBody.Reasoning = &openAIResponsesReasoning{Effort: effort}
+			requestBody.Reasoning = &openAIResponsesReasoning{Effort: effort, Summary: "auto"}
 			requestBody.Include = []string{"reasoning.encrypted_content"}
 		}
 		body = requestBody
@@ -1967,10 +1968,18 @@ func normalizeOpenAIResponsesInput(messages []Message) (string, []map[string]any
 		}
 		if role == "tool" && strings.TrimSpace(message.ToolCallID) != "" {
 			callID := openAIResponsesToolMessageCallID(message, responsesCallIDs)
+			var output any = openAIResponsesMessageText(message)
+			if hasImageContentParts(message.ContentParts) {
+				content, err := openAIResponsesMessageContent(message, false)
+				if err != nil {
+					return "", nil, err
+				}
+				output = content
+			}
 			items = append(items, map[string]any{
 				"type":    "function_call_output",
 				"call_id": callID,
-				"output":  openAIResponsesMessageText(message),
+				"output":  output,
 			})
 			activeAssistantReasoningKey = ""
 			continue
@@ -0,0 +1,223 @@
+package modeladapter
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"net/http"
+	"net/http/httptest"
+	"testing"
+)
+
+func TestOpenAIResponsesRequestsReasoningSummary(t *testing.T) {
+	var requestBody map[string]any
+	server := httptest.NewServer(http.HandlerFunc(func(writer http.ResponseWriter, request *http.Request) {
+		if err := json.NewDecoder(request.Body).Decode(&requestBody); err != nil {
+			http.Error(writer, err.Error(), http.StatusBadRequest)
+			return
+		}
+		writer.Header().Set("Content-Type", "text/event-stream")
+		_, _ = fmt.Fprint(writer, "data: {\"type\":\"response.reasoning_summary_text.delta\",\"delta\":\"check the request\"}\n\n")
+		_, _ = fmt.Fprint(writer, "data: {\"type\":\"response.completed\",\"response\":{\"id\":\"resp-1\",\"model\":\"gpt-5.6\",\"status\":\"completed\",\"output_text\":\"done\"}}\n\n")
+		_, _ = fmt.Fprint(writer, "data: [DONE]\n\n")
+	}))
+	defer server.Close()
+
+	adapter := &OpenAIAdapter{client: server.Client()}
+	events := make([]ModelEvent, 0, 4)
+	err := adapter.Stream(context.Background(), StreamRequest{
+		RequestID:       "request-1",
+		RunID:           "run-1",
+		ModelCallID:     "model-call-1",
+		BaseURL:         server.URL,
+		APIKey:          "test-key",
+		ProviderModelID: "gpt-5.6",
+		OpenAIEndpoint:  "/v1/responses",
+		ReasoningEffort: "high",
+		Messages:        []Message{{Role: "user", Content: "hello"}},
+		MaxTokens:       128,
+	}, func(event ModelEvent) error {
+		events = append(events, event)
+		return nil
+	})
+	if err != nil {
+		t.Fatalf("stream failed: %v", err)
+	}
+
+	reasoning, ok := requestBody["reasoning"].(map[string]any)
+	if !ok {
+		t.Fatalf("reasoning request body missing: %#v", requestBody)
+	}
+	if got := reasoning["effort"]; got != "high" {
+		t.Fatalf("reasoning.effort = %#v, want high", got)
+	}
+	if got := reasoning["summary"]; got != "auto" {
+		t.Fatalf("reasoning.summary = %#v, want auto", got)
+	}
+	include, ok := requestBody["include"].([]any)
+	if !ok || len(include) != 1 || include[0] != "reasoning.encrypted_content" {
+		t.Fatalf("reasoning include = %#v, want encrypted content", requestBody["include"])
+	}
+	assertOpenAIEventKindCount(t, events, ModelEventKindThinkingDelta, 1)
+	assertOpenAIEventKindCount(t, events, ModelEventKindThinkingCompleted, 1)
+	assertOpenAIEventKindCount(t, events, ModelEventKindTextDelta, 1)
+}
+
+func TestOpenAIResponsesOmitsReasoningWhenEffortBlank(t *testing.T) {
+	var requestBody map[string]any
+	server := httptest.NewServer(http.HandlerFunc(func(writer http.ResponseWriter, request *http.Request) {
+		if err := json.NewDecoder(request.Body).Decode(&requestBody); err != nil {
+			http.Error(writer, err.Error(), http.StatusBadRequest)
+			return
+		}
+		writer.Header().Set("Content-Type", "text/event-stream")
+		_, _ = fmt.Fprint(writer, "data: {\"type\":\"response.completed\",\"response\":{\"id\":\"resp-1\",\"model\":\"grok-composer-2.5-fast\",\"status\":\"completed\",\"output_text\":\"done\"}}\n\n")
+		_, _ = fmt.Fprint(writer, "data: [DONE]\n\n")
+	}))
+	defer server.Close()
+
+	adapter := &OpenAIAdapter{client: server.Client()}
+	err := adapter.Stream(context.Background(), StreamRequest{
+		RequestID:       "request-1",
+		RunID:           "run-1",
+		ModelCallID:     "model-call-1",
+		BaseURL:         server.URL,
+		APIKey:          "test-key",
+		ProviderModelID: "grok-composer-2.5-fast",
+		OpenAIEndpoint:  "/v1/responses",
+		Messages:        []Message{{Role: "user", Content: "hello"}},
+		MaxTokens:       128,
+	}, func(ModelEvent) error { return nil })
+	if err != nil {
+		t.Fatalf("stream failed: %v", err)
+	}
+
+	if _, exists := requestBody["reasoning"]; exists {
+		t.Fatalf("reasoning should be omitted when effort is blank: %#v", requestBody["reasoning"])
+	}
+	if _, exists := requestBody["reasoning_effort"]; exists {
+		t.Fatalf("reasoning_effort should be omitted when effort is blank: %#v", requestBody["reasoning_effort"])
+	}
+}
+
+func TestOpenAIChatCompletionsOmitsReasoningWhenEffortBlank(t *testing.T) {
+	var requestBody map[string]any
+	server := httptest.NewServer(http.HandlerFunc(func(writer http.ResponseWriter, request *http.Request) {
+		if err := json.NewDecoder(request.Body).Decode(&requestBody); err != nil {
+			http.Error(writer, err.Error(), http.StatusBadRequest)
+			return
+		}
+		writer.Header().Set("Content-Type", "text/event-stream")
+		_, _ = fmt.Fprint(writer, "data: {\"model\":\"grok-composer-2.5-fast\",\"choices\":[{\"delta\":{\"content\":\"done\"},\"finish_reason\":\"stop\"}]}\n\n")
+		_, _ = fmt.Fprint(writer, "data: [DONE]\n\n")
+	}))
+	defer server.Close()
+
+	adapter := &OpenAIAdapter{client: server.Client()}
+	err := adapter.Stream(context.Background(), StreamRequest{
+		RequestID:       "request-1",
+		RunID:           "run-1",
+		ModelCallID:     "model-call-1",
+		BaseURL:         server.URL,
+		APIKey:          "test-key",
+		ProviderModelID: "grok-composer-2.5-fast",
+		OpenAIEndpoint:  "/v1/chat/completions",
+		Messages:        []Message{{Role: "user", Content: "hello"}},
+		MaxTokens:       128,
+	}, func(ModelEvent) error { return nil })
+	if err != nil {
+		t.Fatalf("stream failed: %v", err)
+	}
+
+	for _, field := range []string{"reasoning_effort", "reasoning", "include"} {
+		if value, exists := requestBody[field]; exists {
+			t.Fatalf("%s should be omitted when effort is blank: %#v", field, value)
+		}
+	}
+}
+
+func TestOpenAIChatCompletionsIgnoresBlankFinishReason(t *testing.T) {
+	server := httptest.NewServer(http.HandlerFunc(func(writer http.ResponseWriter, request *http.Request) {
+		writer.Header().Set("Content-Type", "text/event-stream")
+		chunks := []string{
+			`{"model":"deepseek-v4-flash","choices":[{"delta":{"reasoning_content":"first"},"finish_reason":""}]}`,
+			`{"model":"deepseek-v4-flash","choices":[{"delta":{"reasoning_content":" second"},"finish_reason":""}]}`,
+			`{"model":"deepseek-v4-flash","choices":[{"delta":{"tool_calls":[{"index":0,"id":"call_1","type":"function","function":{"name":"Ls","arguments":""}}]},"finish_reason":""}]}`,
+			`{"model":"deepseek-v4-flash","choices":[{"delta":{"tool_calls":[{"index":0,"id":"","type":"function","function":{"name":"","arguments":"{\"path\":"}}]},"finish_reason":""}]}`,
+			`{"model":"deepseek-v4-flash","choices":[{"delta":{"tool_calls":[{"index":0,"id":"","type":"function","function":{"name":"","arguments":"\"/tmp\"}"}}]},"finish_reason":"tool_calls"}]}`,
+			`{"model":"deepseek-v4-flash","choices":[],"usage":{"prompt_tokens":12,"completion_tokens":7}}`,
+		}
+		for _, chunk := range chunks {
+			_, _ = fmt.Fprintf(writer, "data: %s\n\n", chunk)
+		}
+		_, _ = fmt.Fprint(writer, "data: [DONE]\n\n")
+	}))
+	defer server.Close()
+
+	adapter := &OpenAIAdapter{client: server.Client()}
+	events := make([]ModelEvent, 0, 8)
+	err := adapter.Stream(context.Background(), StreamRequest{
+		RequestID:       "request-1",
+		RunID:           "run-1",
+		ModelCallID:     "model-call-1",
+		BaseURL:         server.URL,
+		APIKey:          "test-key",
+		ProviderModelID: "deepseek-v4-flash",
+		OpenAIEndpoint:  "/v1/chat/completions",
+		Messages:        []Message{{Role: "user", Content: "list files"}},
+		MaxTokens:       128,
+		RequestKnobs:    map[string]any{},
+	}, func(event ModelEvent) error {
+		events = append(events, event)
+		return nil
+	})
+	if err != nil {
+		t.Fatalf("stream failed: %v", err)
+	}
+
+	assertOpenAIEventKindCount(t, events, ModelEventKindThinkingDelta, 2)
+	assertOpenAIEventKindCount(t, events, ModelEventKindThinkingCompleted, 1)
+	assertOpenAIEventKindCount(t, events, ModelEventKindToolLikeCompleted, 1)
+	assertOpenAIEventKindCount(t, events, ModelEventKindTurnFinished, 1)
+
+	toolEvent := firstOpenAIEventForTest(events, ModelEventKindToolLikeCompleted)
+	if toolEvent == nil || toolEvent.ToolInvocation == nil {
+		t.Fatalf("completed tool invocation missing: %#v", toolEvent)
+	}
+	if toolEvent.ToolInvocation.ToolName != "Ls" {
+		t.Fatalf("tool name = %q, want Ls", toolEvent.ToolInvocation.ToolName)
+	}
+	if got := string(toolEvent.ToolInvocation.ArgsJSON); got != `{"path":"/tmp"}` {
+		t.Fatalf("tool args = %q, want %q", got, `{"path":"/tmp"}`)
+	}
+
+	finished := firstOpenAIEventForTest(events, ModelEventKindTurnFinished)
+	if finished == nil || finished.FinishReason != "tool_calls" {
+		t.Fatalf("finish reason = %q, want tool_calls", finished.FinishReason)
+	}
+	if finished.InputTokens != 12 || finished.OutputTokens != 7 {
+		t.Fatalf("usage = input:%d output:%d, want input:12 output:7", finished.InputTokens, finished.OutputTokens)
+	}
+}
+
+func assertOpenAIEventKindCount(t *testing.T, events []ModelEvent, kind ModelEventKind, want int) {
+	t.Helper()
+	got := 0
+	for _, event := range events {
+		if event.Kind == kind {
+			got++
+		}
+	}
+	if got != want {
+		t.Fatalf("event kind %s count = %d, want %d; events=%#v", kind, got, want, events)
+	}
+}
+
+func firstOpenAIEventForTest(events []ModelEvent, kind ModelEventKind) *ModelEvent {
+	for index := range events {
+		if events[index].Kind == kind {
+			return &events[index]
+		}
+	}
+	return nil
+}
@@ -1,10 +1,64 @@
 package modeladapter

 import (
+	"context"
 	"reflect"
 	"testing"
+	"time"
+
+	legacyruntime "cursor/internal/runtime"
 )

+type recordingModelAdapter struct {
+	request StreamRequest
+}
+
+func (adapter *recordingModelAdapter) Stream(_ context.Context, req StreamRequest, _ func(ModelEvent) error) error {
+	adapter.request = req
+	return nil
+}
+
+type staticChannelResolver struct {
+	channel *legacyruntime.ResolvedChannel
+}
+
+func (resolver staticChannelResolver) SelectChannelForModel(context.Context, string) (*legacyruntime.ResolvedChannel, error) {
+	return resolver.channel, nil
+}
+
+func (staticChannelResolver) ProviderStreamIdleTimeout(context.Context) time.Duration {
+	return time.Second
+}
+
+func TestRouterRuntimeDisabledClearsReasoningEffort(t *testing.T) {
+	openAI := &recordingModelAdapter{}
+	router := &Router{
+		openai: openAI,
+		resolver: staticChannelResolver{channel: &legacyruntime.ResolvedChannel{
+			ID:              "channel-a",
+			Provider:        "openai",
+			Model:           "grok-composer-2.5-fast",
+			ReasoningEffort: "medium",
+		}},
+	}
+	requestKnobs := map[string]any{"reasoning_effort": "medium"}
+
+	err := router.Stream(context.Background(), StreamRequest{
+		ModelID:        "channel-a",
+		ThinkingEffort: "disabled",
+		RequestKnobs:   requestKnobs,
+	}, func(ModelEvent) error { return nil })
+	if err != nil {
+		t.Fatalf("Stream returned error: %v", err)
+	}
+	if got := openAI.request.ReasoningEffort; got != "" {
+		t.Fatalf("ReasoningEffort = %q, want blank", got)
+	}
+	if _, exists := openAI.request.RequestKnobs["reasoning_effort"]; exists {
+		t.Fatalf("reasoning_effort knob should be removed: %#v", openAI.request.RequestKnobs)
+	}
+}
+
 func TestSanitizeProviderMessagesMergesLegacyAssistantTextAndToolCallTurnsIdempotently(t *testing.T) {
 	input := []Message{
 		{
@@ -0,0 +1,86 @@
+package modeladapter
+
+import (
+	"strings"
+	"testing"
+)
+
+func TestToolImageProviderEncodings(t *testing.T) {
+	message := toolImageMessageForTest()
+
+	t.Run("openai_chat", func(t *testing.T) {
+		items, err := normalizeOpenAIProviderMessages([]Message{message}, false)
+		if err != nil {
+			t.Fatalf("normalizeOpenAIProviderMessages() error = %v", err)
+		}
+		if len(items) != 1 || items[0]["role"] != "tool" || items[0]["tool_call_id"] != "call-1" {
+			t.Fatalf("openai chat tool message = %#v", items)
+		}
+		content, ok := items[0]["content"].([]map[string]any)
+		if !ok || len(content) != 2 {
+			t.Fatalf("openai chat content = %#v", items[0]["content"])
+		}
+		imageURL, ok := content[1]["image_url"].(map[string]any)
+		if content[1]["type"] != "image_url" || !ok || !strings.HasPrefix(imageURL["url"].(string), "data:image/png;base64,") {
+			t.Fatalf("openai chat image part = %#v", content[1])
+		}
+	})
+
+	t.Run("openai_responses", func(t *testing.T) {
+		_, items, err := normalizeOpenAIResponsesInput([]Message{message})
+		if err != nil {
+			t.Fatalf("normalizeOpenAIResponsesInput() error = %v", err)
+		}
+		if len(items) != 1 || items[0]["type"] != "function_call_output" {
+			t.Fatalf("openai responses items = %#v", items)
+		}
+		content, ok := items[0]["output"].([]map[string]any)
+		if !ok || len(content) != 2 {
+			t.Fatalf("openai responses output = %#v", items[0]["output"])
+		}
+		if content[0]["type"] != "input_text" || content[1]["type"] != "input_image" {
+			t.Fatalf("openai responses content = %#v", content)
+		}
+	})
+
+	t.Run("anthropic", func(t *testing.T) {
+		_, messages, err := normalizeAnthropicProviderMessages([]Message{message}, false, false)
+		if err != nil {
+			t.Fatalf("normalizeAnthropicProviderMessages() error = %v", err)
+		}
+		if len(messages) != 1 || messages[0].Role != "user" || len(messages[0].Content) != 1 {
+			t.Fatalf("anthropic messages = %#v", messages)
+		}
+		toolResult := messages[0].Content[0]
+		if toolResult["type"] != "tool_result" || toolResult["tool_use_id"] != "call-1" {
+			t.Fatalf("anthropic tool result = %#v", toolResult)
+		}
+		content, ok := toolResult["content"].([]map[string]any)
+		if !ok || len(content) != 2 {
+			t.Fatalf("anthropic tool content = %#v", toolResult["content"])
+		}
+		if content[0]["type"] != "text" || content[1]["type"] != "image" {
+			t.Fatalf("anthropic content blocks = %#v", content)
+		}
+	})
+}
+
+func toolImageMessageForTest() Message {
+	return Message{
+		Role:       "tool",
+		Content:    "read binary bytes=16",
+		ToolCallID: "call-1",
+		Name:       "Read",
+		ContentParts: []ContentPart{
+			{Type: "text", Text: "read binary bytes=16"},
+			{
+				Type: "image",
+				Image: &ImageContent{
+					MIMEType: "image/png",
+					Path:     "diagram.png",
+					Data:     []byte("\x89PNG\r\n\x1a\nimage"),
+				},
+			},
+		},
+	}
+}
@@ -730,6 +730,9 @@ func (service *Service) handleProviderDoneEvent(stream *ActiveStream, payload *s
 			service.setTurnPhase(stream, TurnPhaseFailed)
 			return service.closeStreamWithProviderError(stream, conversationID, turnSeq, requestID, accumulatedText, accumulatedReasoning, accumulatedReasoningSignature, accumulatedReasoningSignatureSource, accumulatedReasoningItemID, accumulatedReasoningStatus, accumulatedReasoningSummary, usage, providerErr, !hadToolInvocation)
 		}
+		if err := service.flushAssistantText(stream, conversationID, turnSeq, requestID, accumulatedText, accumulatedReasoning, accumulatedReasoningSignature, accumulatedReasoningSignatureSource, accumulatedReasoningItemID, accumulatedReasoningStatus, accumulatedReasoningSummary, !hadToolInvocation); err != nil {
+			return service.failStream(stream, "unknown", fmt.Errorf("flush failed provider output: %w", err))
+		}
 		service.setTurnPhase(stream, TurnPhaseFailed)
 		return service.failStream(stream, "unknown", payload.Err)
 	}
@@ -19,15 +19,29 @@ type pendingCheckpointBlobWrite struct {
 	blob      CheckpointBlob
 }

-func clonePendingTurnCompletion(completion *pendingTurnCompletion) *pendingTurnCompletion {
+func successfulCheckpointTerminalAction(completion *pendingTurnCompletion) checkpointTerminalAction {
 	if completion == nil {
-		return nil
+		return checkpointTerminalAction{}
+	}
+	return checkpointTerminalAction{
+		Kind:       checkpointTerminalActionComplete,
+		Completion: *completion,
+	}
+}
+
+func failedCheckpointTerminalAction(errorCode string, errorMessage string) checkpointTerminalAction {
+	return checkpointTerminalAction{
+		Kind:         checkpointTerminalActionFail,
+		ErrorCode:    strings.TrimSpace(errorCode),
+		ErrorMessage: strings.TrimSpace(errorMessage),
 	}
-	cloned := *completion
-	return &cloned
 }

 func (service *Service) queueCheckpointProjection(stream *ActiveStream, projection *CheckpointProjection, completion *pendingTurnCompletion) error {
+	return service.queueCheckpointProjectionWithTerminal(stream, projection, successfulCheckpointTerminalAction(completion))
+}
+
+func (service *Service) queueCheckpointProjectionWithTerminal(stream *ActiveStream, projection *CheckpointProjection, terminal checkpointTerminalAction) error {
 	if service == nil || stream == nil || projection == nil || projection.State == nil {
 		return nil
 	}
@@ -43,8 +57,8 @@ func (service *Service) queueCheckpointProjection(stream *ActiveStream, projecti
 	if stream.ConfirmedCheckpointBlobs == nil {
 		stream.ConfirmedCheckpointBlobs = make(map[string]struct{})
 	}
-	if completion == nil && stream.PendingCheckpoint != nil {
-		completion = stream.PendingCheckpoint.Completion
+	if terminal.Kind == checkpointTerminalActionNone && stream.PendingCheckpoint != nil {
+		terminal = stream.PendingCheckpoint.Terminal
 	}
 	required := make(map[string]struct{}, len(projection.Blobs))
 	pendingKeys := make(map[string]struct{}, len(stream.PendingCheckpointBlobWrites))
@@ -74,11 +88,11 @@ func (service *Service) queueCheckpointProjection(stream *ActiveStream, projecti
 		toWrite = append(toWrite, pendingCheckpointBlobWrite{requestID: requestID, blob: blob})
 	}
 	stream.PendingCheckpoint = &pendingCheckpointPublish{
-		State:      state,
-		Required:   required,
-		Completion: clonePendingTurnCompletion(completion),
+		State:    state,
+		Required: required,
+		Terminal: terminal,
 	}
-	if completion != nil {
+	if terminal.Kind != checkpointTerminalActionNone {
 		stream.Phase = TurnPhaseCheckpointing
 	}
 	stream.UpdatedAt = time.Now().UTC()
@@ -94,6 +108,8 @@ func (service *Service) queueCheckpointProjection(stream *ActiveStream, projecti
 	if service.checkpointProjectionReady(stream) {
 		return service.publishReadyCheckpoint(stream)
 	}
+	// Checkpoints reference these Blob IDs, so the client must confirm every
+	// required Blob before the checkpoint becomes visible.
 	service.scheduleStreamTimer(
 		stream,
 		providerTimerKey(streamTimerCheckpointBlobs, ""),
@@ -175,21 +191,18 @@ func (service *Service) publishReadyCheckpoint(stream *ActiveStream) error {
 	}
 	stream.PendingCheckpoint = nil
 	state := pending.State
-	completion := clonePendingTurnCompletion(pending.Completion)
+	terminal := pending.Terminal
 	stream.UpdatedAt = time.Now().UTC()
 	stream.mu.Unlock()
 	clearStreamTimer(stream, providerTimerKey(streamTimerCheckpointBlobs, ""))
 	if err := service.broker.Publish(stream.RequestID, StreamEvent{Message: buildCheckpointMessage(state)}); err != nil {
-		if completion != nil {
-			log.Printf("forwarder checkpoint publish skipped before successful terminal request_id=%s err=%v", stream.RequestID, err)
-			return service.finishSuccessfulTurnAfterCheckpoint(stream, *completion)
+		if terminal.Kind != checkpointTerminalActionNone {
+			log.Printf("forwarder checkpoint publish skipped before terminal request_id=%s err=%v", stream.RequestID, err)
+			return service.finishCheckpointTerminalAction(stream, terminal)
 		}
 		return err
 	}
-	if completion != nil {
-		return service.finishSuccessfulTurnAfterCheckpoint(stream, *completion)
-	}
-	return nil
+	return service.finishCheckpointTerminalAction(stream, terminal)
 }

 func (service *Service) handleCheckpointBlobTimeout(stream *ActiveStream) error {
@@ -216,12 +229,23 @@ func (service *Service) finishAfterCheckpointSyncFailure(stream *ActiveStream, c
 	if cause != nil {
 		log.Printf("forwarder checkpoint blob sync skipped request_id=%s conversation_id=%s err=%v", stream.RequestID, stream.ConversationID, cause)
 	}
-	if pending != nil && pending.Completion != nil {
-		return service.finishSuccessfulTurnAfterCheckpoint(stream, *pending.Completion)
+	if pending != nil {
+		return service.finishCheckpointTerminalAction(stream, pending.Terminal)
 	}
 	return nil
 }

+func (service *Service) finishCheckpointTerminalAction(stream *ActiveStream, terminal checkpointTerminalAction) error {
+	switch terminal.Kind {
+	case checkpointTerminalActionComplete:
+		return service.finishSuccessfulTurnAfterCheckpoint(stream, terminal.Completion)
+	case checkpointTerminalActionFail:
+		return service.finishFailedTurnAfterCheckpoint(stream, terminal.ErrorCode, terminal.ErrorMessage)
+	default:
+		return nil
+	}
+}
+
 func (service *Service) discardPendingCheckpoint(stream *ActiveStream, reason string) {
 	if stream == nil {
 		return
@@ -8,7 +8,7 @@ import (
 	"cursor/gen/agentv1"
 )

-func TestCheckpointBlobSyncPublishesCheckpointAfterAcknowledgements(t *testing.T) {
+func TestCheckpointBlobSyncWaitsForAcknowledgementsBeforePublishingNonTerminalCheckpoint(t *testing.T) {
 	service, stream, projection := testCheckpointBlobProjection(t)
 	if err := service.queueCheckpointProjection(stream, projection, nil); err != nil {
 		t.Fatalf("queueCheckpointProjection() error = %v", err)
@@ -23,11 +23,40 @@ func TestCheckpointBlobSyncPublishesCheckpointAfterAcknowledgements(t *testing.T
 		}
 	}

+	stream.mu.Lock()
+	var firstRequestID uint32
+	for requestID := range stream.PendingCheckpointBlobWrites {
+		firstRequestID = requestID
+		break
+	}
+	stream.mu.Unlock()
+	if firstRequestID == 0 {
+		t.Fatal("checkpoint projection has no pending Blob writes")
+	}
+	if err := service.handleCheckpointBlobResult(stream, &agentv1.KvClientMessage{
+		Id: firstRequestID,
+		Message: &agentv1.KvClientMessage_SetBlobResult{
+			SetBlobResult: &agentv1.SetBlobResult{},
+		},
+	}); err != nil {
+		t.Fatalf("first Blob ACK error = %v", err)
+	}
+	for _, event := range readCheckpointTestEvents(t, service, stream) {
+		if event.Message.GetConversationCheckpointUpdate() != nil {
+			t.Fatal("checkpoint published after only a partial Blob acknowledgement")
+		}
+	}
+
 	acknowledgeCheckpointBlobs(t, service, stream)
 	events = readCheckpointTestEvents(t, service, stream)
-	checkpoint := events[len(events)-1].Message.GetConversationCheckpointUpdate()
-	if checkpoint == nil || len(checkpoint.GetTurns()) != 1 {
-		t.Fatalf("last event checkpoint = %#v, want one Blob-backed turn", checkpoint)
+	checkpointCount := 0
+	for _, event := range events {
+		if event.Message.GetConversationCheckpointUpdate() != nil {
+			checkpointCount++
+		}
+	}
+	if checkpointCount != 1 {
+		t.Fatalf("checkpoints after ACK = %d, want 1", checkpointCount)
 	}
 }

@@ -40,6 +69,12 @@ func TestCheckpointBlobSyncPublishesCheckpointBeforeSuccessfulTerminal(t *testin
 	if err := service.queueCheckpointProjection(stream, projection, completion); err != nil {
 		t.Fatalf("queueCheckpointProjection() error = %v", err)
 	}
+	eventsBeforeACK := readCheckpointTestEvents(t, service, stream)
+	for _, event := range eventsBeforeACK {
+		if event.Message.GetConversationCheckpointUpdate() != nil || event.Message.GetInteractionUpdate().GetTurnEnded() != nil || event.End {
+			t.Fatalf("event before ACK = %#v, want only Blob writes", event)
+		}
+	}
 	acknowledgeCheckpointBlobs(t, service, stream)

 	events := readCheckpointTestEvents(t, service, stream)
@@ -84,11 +119,137 @@ func TestCheckpointBlobTimeoutDoesNotFailSuccessfulTurn(t *testing.T) {
 	}
 }

-func TestCancellationDiscardsPendingCheckpointAndIgnoresLateAcknowledgements(t *testing.T) {
+func TestCheckpointBlobSyncPublishesCheckpointBeforeFailedTerminal(t *testing.T) {
+	service, stream, _ := testCheckpointBlobProjection(t)
+	if err := service.failActiveStream(
+		stream,
+		stream.ConversationID,
+		stream.RequestID,
+		"model-call-1",
+		"provider_error",
+		"provider failed",
+	); err != nil {
+		t.Fatalf("failActiveStream() error = %v", err)
+	}
+
+	for _, event := range readCheckpointTestEvents(t, service, stream) {
+		if event.Message.GetConversationCheckpointUpdate() != nil || event.End {
+			t.Fatalf("event before ACK = %#v, want only Blob writes", event)
+		}
+	}
+	stream.mu.Lock()
+	phaseBeforeACK := stream.Phase
+	statusBeforeACK := stream.Status
+	stream.mu.Unlock()
+	if phaseBeforeACK != TurnPhaseCheckpointing || isTerminalStreamStatus(statusBeforeACK) {
+		t.Fatalf("before ACK phase=%s status=%s, want checkpointing and non-terminal", phaseBeforeACK, statusBeforeACK)
+	}
+
+	acknowledgeCheckpointBlobs(t, service, stream)
+	events := readCheckpointTestEvents(t, service, stream)
+	checkpointIndex, endIndex := -1, -1
+	for index, event := range events {
+		switch {
+		case event.Message.GetConversationCheckpointUpdate() != nil:
+			checkpointIndex = index
+		case event.End:
+			endIndex = index
+			if event.TerminalErrorCode != "provider_error" || event.TerminalErrorMessage != "provider failed" {
+				t.Fatalf("terminal event = %#v, want provider error", event)
+			}
+		}
+	}
+	if checkpointIndex < 0 || endIndex <= checkpointIndex {
+		t.Fatalf("terminal order checkpoint=%d end=%d", checkpointIndex, endIndex)
+	}
+	stream.mu.Lock()
+	phaseAfterACK := stream.Phase
+	statusAfterACK := stream.Status
+	stream.mu.Unlock()
+	if phaseAfterACK != TurnPhaseFailed || statusAfterACK != StreamStatusFailed {
+		t.Fatalf("after ACK phase=%s status=%s, want failed", phaseAfterACK, statusAfterACK)
+	}
+}
+
+func TestCheckpointBlobTimeoutStillPublishesFailedTerminal(t *testing.T) {
+	service, stream, _ := testCheckpointBlobProjection(t)
+	if err := service.failActiveStream(
+		stream,
+		stream.ConversationID,
+		stream.RequestID,
+		"model-call-1",
+		"provider_error",
+		"provider failed",
+	); err != nil {
+		t.Fatalf("failActiveStream() error = %v", err)
+	}
+	if err := service.handleCheckpointBlobTimeout(stream); err != nil {
+		t.Fatalf("handleCheckpointBlobTimeout() error = %v", err)
+	}
+
+	events := readCheckpointTestEvents(t, service, stream)
+	var checkpoint, failedEnd bool
+	for _, event := range events {
+		checkpoint = checkpoint || event.Message.GetConversationCheckpointUpdate() != nil
+		failedEnd = failedEnd || event.End && event.TerminalErrorCode == "provider_error" && event.TerminalErrorMessage == "provider failed"
+	}
+	if checkpoint || !failedEnd {
+		t.Fatalf("timeout events checkpoint=%v failed_end=%v", checkpoint, failedEnd)
+	}
+}
+
+func TestManualCompactionNoopWaitsForCheckpointBeforeTerminal(t *testing.T) {
+	service, stream, _ := testCheckpointBlobProjection(t)
+	conversation, _, _, err := service.snapshotCheckpointConversation(stream)
+	if err != nil {
+		t.Fatalf("snapshotCheckpointConversation() error = %v", err)
+	}
+	if _, err := service.store.SaveConversationWithEntries(stream.ConversationID, conversation, conversation.Entries); err != nil {
+		t.Fatalf("SaveConversationWithEntries() error = %v", err)
+	}
+	if err := service.finishManualCompactionNoop(stream); err != nil {
+		t.Fatalf("finishManualCompactionNoop() error = %v", err)
+	}
+
+	for _, event := range readCheckpointTestEvents(t, service, stream) {
+		if event.Message.GetInteractionUpdate().GetTurnEnded() != nil || event.End {
+			t.Fatalf("terminal event before checkpoint Blob ACK = %#v", event)
+		}
+	}
+	acknowledgeCheckpointBlobs(t, service, stream)
+
+	events := readCheckpointTestEvents(t, service, stream)
+	checkpointIndex, turnEndedIndex, endIndex := -1, -1, -1
+	for index, event := range events {
+		switch {
+		case event.Message.GetConversationCheckpointUpdate() != nil:
+			checkpointIndex = index
+		case event.Message.GetInteractionUpdate().GetTurnEnded() != nil:
+			turnEndedIndex = index
+		case event.End:
+			endIndex = index
+		}
+	}
+	if checkpointIndex < 0 || turnEndedIndex <= checkpointIndex || endIndex <= turnEndedIndex {
+		t.Fatalf("terminal order checkpoint=%d turn_ended=%d end=%d", checkpointIndex, turnEndedIndex, endIndex)
+	}
+}
+
+func TestCancellationDiscardsUnpublishedCheckpointAndIgnoresLateAcknowledgements(t *testing.T) {
 	service, stream, projection := testCheckpointBlobProjection(t)
 	if err := service.queueCheckpointProjection(stream, projection, nil); err != nil {
 		t.Fatalf("queueCheckpointProjection() error = %v", err)
 	}
+	eventsBeforeCancel := readCheckpointTestEvents(t, service, stream)
+	checkpointBeforeCancel := 0
+	for _, event := range eventsBeforeCancel {
+		if event.Message.GetConversationCheckpointUpdate() != nil {
+			checkpointBeforeCancel++
+		}
+	}
+	if checkpointBeforeCancel != 0 {
+		t.Fatalf("checkpoints before cancel = %d, want 0", checkpointBeforeCancel)
+	}
 	stream.mu.Lock()
 	requestIDs := make([]uint32, 0, len(stream.PendingCheckpointBlobWrites))
 	for requestID := range stream.PendingCheckpointBlobWrites {
@@ -114,16 +275,19 @@ func TestCancellationDiscardsPendingCheckpointAndIgnoresLateAcknowledgements(t *
 	}

 	events := readCheckpointTestEvents(t, service, stream)
-	var checkpoint, canceledEnd bool
+	checkpointCount := 0
+	var canceledEnd bool
 	for _, event := range events {
-		checkpoint = checkpoint || event.Message.GetConversationCheckpointUpdate() != nil
+		if event.Message.GetConversationCheckpointUpdate() != nil {
+			checkpointCount++
+		}
 		canceledEnd = canceledEnd || event.End && event.TerminalErrorCode == "canceled"
 	}
 	stream.mu.Lock()
 	pending := stream.PendingCheckpoint
 	stream.mu.Unlock()
-	if checkpoint || !canceledEnd || pending != nil {
-		t.Fatalf("cancel events checkpoint=%v canceled_end=%v pending=%v", checkpoint, canceledEnd, pending != nil)
+	if checkpointCount != 0 || !canceledEnd || pending != nil {
+		t.Fatalf("cancel events checkpoints=%d canceled_end=%v pending=%v", checkpointCount, canceledEnd, pending != nil)
 	}
 }

@@ -234,7 +234,7 @@ func (service *Service) buildLegacyCompactionPlan(base *compactionPlan, conversa
 	if conversation == nil || base == nil {
 		return nil, nil
 	}
-	candidates := buildContextCompactionCandidates(checkpointProjectionEntries(conversation.Entries), base.CurrentTurnSeq, base.CurrentRequestID)
+	candidates := buildContextCompactionCandidates(replayablePromptProjectionEntries(conversation.Entries), base.CurrentTurnSeq, base.CurrentRequestID)
 	if len(candidates) == 0 {
 		return nil, nil
 	}
@@ -260,7 +260,7 @@ func (service *Service) buildAutoCompactionPlanFromHistory(base *compactionPlan,
 	if err != nil {
 		return nil, err
 	}
-	currentCandidate, hasCurrentCandidate := buildCurrentTurnCompactionCandidate(checkpointProjectionEntries(conversation.Entries), base.CurrentTurnSeq, base.CurrentRequestID)
+	currentCandidate, hasCurrentCandidate := buildCurrentTurnCompactionCandidate(replayablePromptProjectionEntries(conversation.Entries), base.CurrentTurnSeq, base.CurrentRequestID)
 	if !hasCurrentCandidate {
 		return legacyPlan, nil
 	}
@@ -447,16 +447,8 @@ func (service *Service) handleCompactionEvent(stream *ActiveStream, payload *str
 		if err := service.completeManualCompactionTurn(stream); err != nil {
 			return service.failStream(stream, "unknown", err)
 		}
-		if err := service.broker.Publish(stream.RequestID, StreamEvent{
-			Message: buildTurnEndedMessage(0, 0, 0, 0),
-		}); err != nil {
-			return service.failStream(stream, "unknown", err)
-		}
-		if err := service.broker.Complete(stream.RequestID, "", ""); err != nil {
-			return service.failStream(stream, "unknown", err)
-		}
-		service.setTurnPhase(stream, TurnPhaseCompleted)
-		return nil
+		completion := manualCompactionTurnCompletion(stream)
+		return service.publishCheckpointWithCompletion(stream.RequestID, stream.ConversationID, &completion)
 	}
 	return service.requestProviderAction(stream, providerActionResume)
 }
@@ -500,12 +492,8 @@ func (service *Service) finishManualCompactionNoop(stream *ActiveStream) error {
 	if err := service.completeManualCompactionTurn(stream); err != nil {
 		return err
 	}
-	if err := service.broker.Publish(stream.RequestID, StreamEvent{
-		Message: buildTurnEndedMessage(0, 0, 0, 0),
-	}); err != nil {
-		return err
-	}
-	return service.broker.Complete(stream.RequestID, "", "")
+	completion := manualCompactionTurnCompletion(stream)
+	return service.publishCheckpointWithCompletion(stream.RequestID, stream.ConversationID, &completion)
 }

 func (service *Service) completeManualCompactionTurn(stream *ActiveStream) error {
@@ -530,10 +518,21 @@ func (service *Service) completeManualCompactionTurn(stream *ActiveStream) error
 	if err := service.syncSummaryCarryForward(conversationID, requestID, modelCallID); err != nil {
 		return err
 	}
-	service.setTurnPhase(stream, TurnPhaseCompleted)
 	return nil
 }

+func manualCompactionTurnCompletion(stream *ActiveStream) pendingTurnCompletion {
+	if stream == nil {
+		return pendingTurnCompletion{}
+	}
+	return pendingTurnCompletion{
+		ConversationID: strings.TrimSpace(stream.ConversationID),
+		RequestID:      strings.TrimSpace(stream.RequestID),
+		TurnSeq:        stream.TurnSeq,
+		ModelCallID:    "turn:" + strings.TrimSpace(stream.RequestID),
+	}
+}
+
 func (service *Service) publishSummaryCompleted(stream *ActiveStream, hookMessage string) error {
 	if service == nil || stream == nil {
 		return nil
@@ -568,6 +567,7 @@ func (service *Service) applyCompactionPlan(stream *ActiveStream, conversationID
 	if err != nil {
 		return err
 	}
+	originalEntryCount := len(candidateConversation.Entries)
 	if err := applyCompactionToConversation(candidateConversation, plan, summaryText); err != nil {
 		return err
 	}
@@ -582,9 +582,9 @@ func (service *Service) applyCompactionPlan(stream *ActiveStream, conversationID
 	if validationErr := validateCompactionCandidateBudget(recompiled, plan); validationErr != nil {
 		return validationErr
 	}
-	replacementEntries := append([]HistoryEntry(nil), candidateConversation.Entries...)
+	compactionEntries := append([]HistoryEntry(nil), candidateConversation.Entries[originalEntryCount:]...)
 	if service.store != nil {
-		persisted, err := service.store.ReplaceEntries(conversationID, replacementEntries, func(item *ConversationFile) error {
+		persisted, _, err := service.store.AppendEntriesWithUpdate(conversationID, resetEntrySequences(compactionEntries), func(item *ConversationFile) error {
 			if item == nil {
 				return nil
 			}
@@ -605,10 +605,7 @@ func (service *Service) applyCompactionPlan(stream *ActiveStream, conversationID
 		if item == nil {
 			return nil
 		}
-		item.Entries = nil
-		item.NextEntrySeq = 1
-		item.NextTurnSeq = 1
-		appendEntriesInPlace(item, resetEntrySequences(replacementEntries))
+		appendEntriesInPlace(item, resetEntrySequences(compactionEntries))
 		item.TokenDetailsUsedTokens = 0
 		clearConversationAutoCompactionState(item)
 		return nil
@@ -643,14 +640,13 @@ func applyCompactionToConversation(conversation *ConversationFile, plan *Pending
 	if conversation == nil || plan == nil {
 		return nil
 	}
-	replacementEntries, err := buildCompactedContextEntries(conversation, plan, summaryText)
+	compactionEntries, err := buildCompactedContextEntries(conversation, plan, summaryText)
 	if err != nil {
 		return err
 	}
-	conversation.Entries = nil
-	conversation.NextEntrySeq = 1
-	conversation.NextTurnSeq = 1
-	appendEntriesInPlace(conversation, resetEntrySequences(replacementEntries))
+	// Canonical history stays append-only. The prompt projector applies the
+	// latest summary marker when constructing model-visible replay.
+	appendEntriesInPlace(conversation, resetEntrySequences(compactionEntries))
 	conversation.TokenDetailsUsedTokens = 0
 	clearConversationAutoCompactionState(conversation)
 	if conversation.TokenDetailsMaxTokens == 0 {
@@ -671,40 +667,9 @@ func buildCompactedContextEntries(conversation *ConversationFile, plan *PendingC
 	if ok {
 		entries = append(entries, runtimeEntry)
 	}
-	if conversation == nil || !plan.PreserveCurrentTurnInputs {
-		return entries, nil
-	}
-	entries = append(entries, buildAutoCompactionPreservedCurrentTurnEntries(conversation.Entries, plan)...)
 	return entries, nil
 }

-func buildAutoCompactionPreservedCurrentTurnEntries(entries []HistoryEntry, plan *PendingCompaction) []HistoryEntry {
-	if len(entries) == 0 || plan == nil || !plan.PreserveCurrentTurnInputs {
-		return nil
-	}
-	latestToolCallID := latestCompletedToolCallIDForTurn(entries, plan.CurrentTurnSeq, plan.CurrentRequestID)
-	preservedIndexes := autoCompactionPreservedEntryIndexes(entries, plan.CurrentTurnSeq, plan.CurrentRequestID, latestToolCallID)
-	if len(preservedIndexes) == 0 {
-		return nil
-	}
-	preserved := make([]HistoryEntry, 0, len(preservedIndexes))
-	for index, entry := range entries {
-		if _, ok := preservedIndexes[index]; !ok {
-			continue
-		}
-		switch strings.TrimSpace(entry.Kind) {
-		case "compaction_summary", "compacted_summary", "compaction_request":
-			continue
-		case "tool_result":
-			if rewritten, ok := rewriteAutoCompactionToolResultEntry(entry, autoCompactionPreservedToolResultLimitBytes, false); ok {
-				entry = rewritten
-			}
-		}
-		preserved = append(preserved, entry)
-	}
-	return preserved
-}
-
 func newCompactionSummaryEntry(plan *PendingCompaction, summaryText string) HistoryEntry {
 	payload, _ := json.Marshal(compactionSummaryEntryPayload{
 		Summary:                   strings.TrimSpace(summaryText),
@@ -0,0 +1,206 @@
+package forwarder
+
+import (
+	"reflect"
+	"strings"
+	"testing"
+
+	"google.golang.org/protobuf/encoding/protojson"
+
+	"cursor/gen/agentv1"
+)
+
+func TestApplyCompactionToConversationPreservesCanonicalHistory(t *testing.T) {
+	conversation := compactionAppendOnlyConversation(t)
+	originalEntries := append([]HistoryEntry(nil), conversation.Entries...)
+	plan := &PendingCompaction{
+		Trigger:          "manual",
+		CurrentTurnSeq:   2,
+		CurrentRequestID: "request-2",
+	}
+
+	if err := applyCompactionToConversation(conversation, plan, "earlier context summary"); err != nil {
+		t.Fatalf("applyCompactionToConversation() error = %v", err)
+	}
+	if len(conversation.Entries) <= len(originalEntries) {
+		t.Fatalf("entries after compaction = %d, want the %d original entries plus a summary marker", len(conversation.Entries), len(originalEntries))
+	}
+	if !reflect.DeepEqual(conversation.Entries[:len(originalEntries)], originalEntries) {
+		t.Fatal("compaction changed the canonical history prefix")
+	}
+
+	projector := NewHistoryProjector()
+	projection, err := projector.ProjectCheckpointProjection(conversation)
+	if err != nil {
+		t.Fatalf("ProjectCheckpointProjection() error = %v", err)
+	}
+	if len(projection.State.GetTurns()) != 2 {
+		t.Fatalf("checkpoint turns after compaction = %d, want 2 visible turns", len(projection.State.GetTurns()))
+	}
+	replay, err := projector.ProjectPromptReplay(conversation)
+	if err != nil {
+		t.Fatalf("ProjectPromptReplay() error = %v", err)
+	}
+	if len(replay) != 1 || replay[0].Role != "user" || !strings.Contains(replay[0].Content, "earlier context summary") {
+		t.Fatalf("prompt replay after compaction = %#v, want only the compacted summary", replay)
+	}
+}
+
+func TestCompactedPromptProjectionPlacesSummaryBeforePreservedCurrentTurn(t *testing.T) {
+	conversation := &ConversationFile{
+		ConversationID:     "conversation-1",
+		RootConversationID: "conversation-1",
+		Mode:               "agent",
+		NextTurnSeq:        1,
+		NextEntrySeq:       1,
+	}
+	appendEntriesInPlace(conversation, []HistoryEntry{
+		compactionTestUserEntry(t, 1, "request-1", "current question", "message-1"),
+		newToolCallEntry(1, "request-1", "call-1", "Read", "", "", checkpointTestReadToolCall(t, nil)),
+		newToolResultEntry(1, "request-1", "call-1", "Read", `{"path":"/tmp/example.txt"}`, "file contents", "", checkpointTestReadToolCall(t, nil)),
+	})
+	plan := &PendingCompaction{
+		Trigger:                   "auto",
+		CurrentTurnSeq:            1,
+		CurrentRequestID:          "request-1",
+		PreserveCurrentTurnInputs: true,
+	}
+	if err := applyCompactionToConversation(conversation, plan, "current progress summary"); err != nil {
+		t.Fatalf("applyCompactionToConversation() error = %v", err)
+	}
+
+	projected := compactedPromptProjectionEntries(conversation.Entries)
+	promptKinds := make([]string, 0, len(projected))
+	for _, entry := range projected {
+		if isPromptReplayEntryKind(entry.Kind) {
+			promptKinds = append(promptKinds, entry.Kind)
+		}
+	}
+	want := []string{"compacted_summary", "user_message", "tool_call", "tool_result"}
+	if !reflect.DeepEqual(promptKinds, want) {
+		t.Fatalf("compacted prompt entry order = %#v, want %#v", promptKinds, want)
+	}
+}
+
+func TestCompactionPlanningDoesNotRecompactArchivedHistory(t *testing.T) {
+	conversation := compactionAppendOnlyConversation(t)
+	if err := applyCompactionToConversation(conversation, &PendingCompaction{
+		Trigger:          "manual",
+		CurrentTurnSeq:   2,
+		CurrentRequestID: "request-2",
+	}, "archived history summary"); err != nil {
+		t.Fatalf("applyCompactionToConversation() error = %v", err)
+	}
+	appendEntriesInPlace(conversation, []HistoryEntry{
+		compactionTestUserEntry(t, 3, "request-3", "new question", "message-3"),
+	})
+
+	plan, err := (&Service{}).buildLegacyCompactionPlan(&compactionPlan{
+		CurrentTurnSeq:   3,
+		CurrentRequestID: "request-3",
+	}, conversation, false, 0)
+	if err != nil {
+		t.Fatalf("buildLegacyCompactionPlan() error = %v", err)
+	}
+	if plan != nil {
+		t.Fatalf("buildLegacyCompactionPlan() = %#v, want no already summarized candidates", plan)
+	}
+}
+
+func TestApplyCompactionPlanPersistsHistoryAppendOnly(t *testing.T) {
+	store := NewConversationFileStore(t.TempDir())
+	conversation := compactionAppendOnlyConversation(t)
+	if _, _, err := store.AppendEntries(conversation.ConversationID, resetEntrySequences(conversation.Entries)); err != nil {
+		t.Fatalf("AppendEntries() error = %v", err)
+	}
+	persisted, err := store.LoadConversation(conversation.ConversationID)
+	if err != nil {
+		t.Fatalf("initial LoadConversation() error = %v", err)
+	}
+	originalEntries := append([]HistoryEntry(nil), persisted.Entries...)
+	projector := NewHistoryProjector()
+	service := &Service{
+		store:     store,
+		projector: projector,
+		compiler:  compactionProjectionCompiler{projector: projector},
+	}
+	stream := &ActiveStream{
+		RequestID:              "request-2",
+		ConversationID:         conversation.ConversationID,
+		TurnSeq:                2,
+		Mode:                   agentv1.AgentMode_AGENT_MODE_AGENT,
+		CheckpointConversation: persisted,
+	}
+	plan := &PendingCompaction{
+		Trigger:           "manual",
+		CurrentTurnSeq:    2,
+		CurrentRequestID:  "request-2",
+		ContextWindowSize: 1_000_000,
+	}
+	if err := service.applyCompactionPlan(stream, conversation.ConversationID, plan, "persisted summary"); err != nil {
+		t.Fatalf("applyCompactionPlan() error = %v", err)
+	}
+
+	loaded, err := store.LoadConversation(conversation.ConversationID)
+	if err != nil {
+		t.Fatalf("LoadConversation() error = %v", err)
+	}
+	if len(loaded.Entries) <= len(originalEntries) {
+		t.Fatalf("persisted entries after compaction = %d, want more than %d", len(loaded.Entries), len(originalEntries))
+	}
+	for index := range originalEntries {
+		if !reflect.DeepEqual(loaded.Entries[index], originalEntries[index]) {
+			t.Fatalf("persisted history entry %d changed after compaction:\ngot  %#v\nwant %#v", index, loaded.Entries[index], originalEntries[index])
+		}
+	}
+}
+
+type compactionProjectionCompiler struct {
+	projector *HistoryProjector
+}
+
+func (compiler compactionProjectionCompiler) Compile(conversation *ConversationFile, _ agentv1.AgentMode, _ string, _ string) (CompiledConversation, error) {
+	messages, err := compiler.projector.ProjectPromptReplay(conversation)
+	return CompiledConversation{Messages: messages}, err
+}
+
+func (compactionProjectionCompiler) DerivePromptContexts(*ConversationFile, agentv1.AgentMode, string) ([]PromptContextMessage, error) {
+	return nil, nil
+}
+
+func compactionAppendOnlyConversation(t *testing.T) *ConversationFile {
+	t.Helper()
+	conversation := &ConversationFile{
+		ConversationID:         "conversation-1",
+		RootConversationID:     "conversation-1",
+		Mode:                   "agent",
+		NextTurnSeq:            1,
+		NextEntrySeq:           1,
+		TokenDetailsUsedTokens: 42_000,
+		TokenDetailsMaxTokens:  50_000,
+	}
+	appendEntriesInPlace(conversation, []HistoryEntry{
+		compactionTestUserEntry(t, 1, "request-1", "first question", "message-1"),
+		newAssistantTextEntry(1, "request-1", "first answer", "", ""),
+		compactionTestUserEntry(t, 2, "request-2", "second question", "message-2"),
+		newAssistantTextEntry(2, "request-2", "second answer", "", ""),
+	})
+	return conversation
+}
+
+func compactionTestUserEntry(t *testing.T, turnSeq int64, requestID string, text string, messageID string) HistoryEntry {
+	t.Helper()
+	payload, err := protojson.Marshal(&agentv1.UserMessage{Text: text, MessageId: messageID})
+	if err != nil {
+		t.Fatalf("marshal user message: %v", err)
+	}
+	return HistoryEntry{
+		TurnSeq:   turnSeq,
+		RequestID: requestID,
+		Role:      "user",
+		Kind:      "user_message",
+		Payload:   payload,
+	}
+}
+
+var _ PromptCompiler = compactionProjectionCompiler{}
@@ -20,16 +20,21 @@ type DefaultPromptCompiler struct {
 	catalog   ToolCatalog
 	reminders ReminderInjector
 	rules     *UserRuleStore
+	blobs     contentBlobReader
 }

 // NewPromptCompiler 创建默认 prompt 编译器。
-func NewPromptCompiler(projector *HistoryProjector, catalog ToolCatalog, reminders ReminderInjector, rules *UserRuleStore) *DefaultPromptCompiler {
-	return &DefaultPromptCompiler{
+func NewPromptCompiler(projector *HistoryProjector, catalog ToolCatalog, reminders ReminderInjector, rules *UserRuleStore, blobReaders ...contentBlobReader) *DefaultPromptCompiler {
+	compiler := &DefaultPromptCompiler{
 		projector: projector,
 		catalog:   catalog,
 		reminders: reminders,
 		rules:     rules,
 	}
+	if len(blobReaders) > 0 {
+		compiler.blobs = blobReaders[0]
+	}
+	return compiler
 }

 // Compile 生成当前 turn 应发送给 provider 的消息和工具集合。
@@ -86,6 +91,10 @@ func (compiler *DefaultPromptCompiler) Compile(conversation *ConversationFile, m
 	if err != nil {
 		return CompiledConversation{}, err
 	}
+	replayMessages, err = enrichProviderReadImages(replayMessages, conversation, compiler.blobs)
+	if err != nil {
+		return CompiledConversation{}, err
+	}
 	messages = append(messages, replayMessages...)
 	return CompiledConversation{
 		Mode:               normalizedMode,
@@ -0,0 +1,111 @@
+// content_blob_store.go 负责持久化 history 引用的内容寻址二进制数据。
+package forwarder
+
+import (
+	"bytes"
+	"crypto/sha256"
+	"encoding/hex"
+	"fmt"
+	"os"
+	"path/filepath"
+	"strings"
+)
+
+const contentBlobDirectoryName = ".blobs"
+
+// ContentBlobStore 使用 SHA-256 内容哈希保存不可变二进制数据。
+type ContentBlobStore struct {
+	root string
+}
+
+// NewContentBlobStore 创建独立于 context.json 和 checkpoint 的内容寻址存储。
+func NewContentBlobStore(historyRoot string) *ContentBlobStore {
+	historyRoot = strings.TrimSpace(historyRoot)
+	if historyRoot == "" {
+		return &ContentBlobStore{}
+	}
+	return &ContentBlobStore{root: filepath.Join(historyRoot, contentBlobDirectoryName, "sha256")}
+}
+
+// Put 校验内容哈希并幂等保存数据。
+func (store *ContentBlobStore) Put(id []byte, data []byte) error {
+	if store == nil || strings.TrimSpace(store.root) == "" {
+		return fmt.Errorf("content blob store is not initialized")
+	}
+	normalizedID, err := normalizeContentBlobID(id)
+	if err != nil {
+		return err
+	}
+	digest := sha256.Sum256(data)
+	if !bytes.Equal(normalizedID, digest[:]) {
+		return fmt.Errorf("content blob id does not match payload sha256")
+	}
+	path := store.blobPath(normalizedID)
+	if existing, err := store.Get(normalizedID); err == nil {
+		if bytes.Equal(existing, data) {
+			return nil
+		}
+		return fmt.Errorf("content blob payload conflicts with existing id")
+	} else if !os.IsNotExist(err) {
+		return err
+	}
+	if err := os.MkdirAll(store.root, 0o700); err != nil {
+		return fmt.Errorf("create content blob directory: %w", err)
+	}
+	temporary, err := os.CreateTemp(store.root, ".blob-*")
+	if err != nil {
+		return fmt.Errorf("create content blob temporary file: %w", err)
+	}
+	temporaryPath := temporary.Name()
+	defer os.Remove(temporaryPath)
+	if err := temporary.Chmod(0o600); err != nil {
+		_ = temporary.Close()
+		return fmt.Errorf("set content blob permissions: %w", err)
+	}
+	if _, err := temporary.Write(data); err != nil {
+		_ = temporary.Close()
+		return fmt.Errorf("write content blob: %w", err)
+	}
+	if err := temporary.Sync(); err != nil {
+		_ = temporary.Close()
+		return fmt.Errorf("sync content blob: %w", err)
+	}
+	if err := temporary.Close(); err != nil {
+		return fmt.Errorf("close content blob: %w", err)
+	}
+	if err := os.Rename(temporaryPath, path); err != nil {
+		return fmt.Errorf("commit content blob: %w", err)
+	}
+	return nil
+}
+
+// Get 读取内容并再次校验哈希，避免损坏数据进入模型请求。
+func (store *ContentBlobStore) Get(id []byte) ([]byte, error) {
+	if store == nil || strings.TrimSpace(store.root) == "" {
+		return nil, fmt.Errorf("content blob store is not initialized")
+	}
+	normalizedID, err := normalizeContentBlobID(id)
+	if err != nil {
+		return nil, err
+	}
+	data, err := os.ReadFile(store.blobPath(normalizedID))
+	if err != nil {
+		return nil, err
+	}
+	digest := sha256.Sum256(data)
+	if !bytes.Equal(normalizedID, digest[:]) {
+		return nil, fmt.Errorf("content blob sha256 verification failed")
+	}
+	return append([]byte(nil), data...), nil
+}
+
+func (store *ContentBlobStore) blobPath(id []byte) string {
+	return filepath.Join(store.root, hex.EncodeToString(id))
+}
+
+func normalizeContentBlobID(id []byte) ([]byte, error) {
+	if len(id) != sha256.Size {
+		return nil, fmt.Errorf("content blob id must be %d bytes", sha256.Size)
+	}
+	return append([]byte(nil), id...), nil
+}
@@ -0,0 +1,41 @@
+package forwarder
+
+import (
+	"bytes"
+	"crypto/sha256"
+	"testing"
+)
+
+func TestContentBlobStorePutGetIsIdempotent(t *testing.T) {
+	store := NewContentBlobStore(t.TempDir())
+	data := []byte("stable blob bytes")
+	id := sha256.Sum256(data)
+	if err := store.Put(id[:], data); err != nil {
+		t.Fatalf("first Put() error = %v", err)
+	}
+	if err := store.Put(id[:], append([]byte(nil), data...)); err != nil {
+		t.Fatalf("second Put() error = %v", err)
+	}
+	got, err := store.Get(id[:])
+	if err != nil {
+		t.Fatalf("Get() error = %v", err)
+	}
+	if !bytes.Equal(got, data) {
+		t.Fatalf("Get() = %q, want %q", got, data)
+	}
+	got[0] ^= 0xff
+	again, err := store.Get(id[:])
+	if err != nil {
+		t.Fatalf("second Get() error = %v", err)
+	}
+	if !bytes.Equal(again, data) {
+		t.Fatalf("stored data was mutated: %q", again)
+	}
+}
+
+func TestContentBlobStoreRejectsMismatchedID(t *testing.T) {
+	store := NewContentBlobStore(t.TempDir())
+	if err := store.Put(bytes.Repeat([]byte{0xff}, sha256.Size), []byte("payload")); err == nil {
+		t.Fatal("Put() accepted mismatched content id")
+	}
+}
@@ -201,6 +201,41 @@ func buildShellOutputDeltaMessage(delta *agentv1.ShellOutputDeltaUpdate) *agentv
 	}
 }

+// buildShellToolCallDeltaMessage maps client shell output to the delta consumed by Cursor's terminal bubble.
+func buildShellToolCallDeltaMessage(callID string, modelCallID string, output *agentv1.ShellOutputDeltaUpdate) *agentv1.AgentServerMessage {
+	if output == nil {
+		return nil
+	}
+	var delta *agentv1.ShellToolCallDelta
+	switch event := output.GetEvent().(type) {
+	case *agentv1.ShellOutputDeltaUpdate_Stdout:
+		content := event.Stdout.GetData()
+		if content == "" {
+			return nil
+		}
+		delta = &agentv1.ShellToolCallDelta{
+			Delta: &agentv1.ShellToolCallDelta_Stdout{
+				Stdout: &agentv1.ShellToolCallStdoutDelta{Content: content},
+			},
+		}
+	case *agentv1.ShellOutputDeltaUpdate_Stderr:
+		content := event.Stderr.GetData()
+		if content == "" {
+			return nil
+		}
+		delta = &agentv1.ShellToolCallDelta{
+			Delta: &agentv1.ShellToolCallDelta_Stderr{
+				Stderr: &agentv1.ShellToolCallStderrDelta{Content: content},
+			},
+		}
+	default:
+		return nil
+	}
+	return buildToolCallDeltaMessage(callID, modelCallID, &agentv1.ToolCallDelta{
+		Delta: &agentv1.ToolCallDelta_ShellToolCallDelta{ShellToolCallDelta: delta},
+	})
+}
+
 // buildTurnEndedMessage 构造 turn 结束消息，并携带标准化后的 token 统计。
 func buildTurnEndedMessage(inputTokens int64, outputTokens int64, cacheReadTokens int64, cacheWriteTokens int64) *agentv1.AgentServerMessage {
 	inputTokensValue := inputTokens
@@ -121,10 +121,15 @@ func (store *ConversationFileStore) LoadConversation(conversationID string) (*Co

 // AppendEntries 把已经发生的语义事件追加到 context.json，并同步 state.json。
 func (store *ConversationFileStore) AppendEntries(conversationID string, entries []HistoryEntry) (*ConversationFile, []HistoryEntry, error) {
+	return store.AppendEntriesWithUpdate(conversationID, entries, nil)
+}
+
+// AppendEntriesWithUpdate 原子追加 context entries，并在同一把会话锁内更新 state metadata。
+func (store *ConversationFileStore) AppendEntriesWithUpdate(conversationID string, entries []HistoryEntry, update func(*ConversationFile) error) (*ConversationFile, []HistoryEntry, error) {
 	if store == nil {
 		return nil, nil, fmt.Errorf("conversation file store is nil")
 	}
-	if len(entries) == 0 {
+	if len(entries) == 0 && update == nil {
 		conversation, err := store.LoadConversation(conversationID)
 		return conversation, nil, err
 	}
@@ -162,6 +167,11 @@ func (store *ConversationFileStore) AppendEntries(conversationID string, entries
 		conversation.Mode = alias
 	}
 	assigned := appendEntriesInPlace(conversation, entries)
+	if update != nil {
+		if err := update(conversation); err != nil {
+			return nil, nil, err
+		}
+	}
 	deriveConversationLoopState(conversation)
 	if err := store.writeConversationLocked(normalizedConversationID, conversation); err != nil {
 		return nil, nil, err
@@ -762,6 +772,7 @@ func mergeConversationMetadata(target *ConversationFile, source *ConversationFil
 	target.CurrentPlanText = source.CurrentPlanText
 	target.CurrentPlans = clonePlanRegistryEntries(source.CurrentPlans)
 	target.CurrentTodos = cloneTodoItems(source.CurrentTodos)
+	target.ImportedTurnIDs = cloneByteSlices(source.ImportedTurnIDs)
 	target.LatestRequestPrefix = cloneConversationRequestPrefix(source.LatestRequestPrefix)
 	target.LastProviderCall = cloneConversationProviderCall(source.LastProviderCall)
 	if !source.CreatedAt.IsZero() && (target.CreatedAt.IsZero() || source.CreatedAt.Before(target.CreatedAt)) {
@@ -894,6 +905,7 @@ func cloneConversationFile(conversation *ConversationFile) *ConversationFile {
 	cloned := *conversation
 	cloned.CurrentPlans = clonePlanRegistryEntries(conversation.CurrentPlans)
 	cloned.CurrentTodos = cloneTodoItems(conversation.CurrentTodos)
+	cloned.ImportedTurnIDs = cloneByteSlices(conversation.ImportedTurnIDs)
 	cloned.LatestRequestPrefix = cloneConversationRequestPrefix(conversation.LatestRequestPrefix)
 	cloned.LastProviderCall = cloneConversationProviderCall(conversation.LastProviderCall)
 	cloned.Entries = append([]HistoryEntry(nil), conversation.Entries...)
@@ -0,0 +1,167 @@
+package forwarder
+
+import (
+	"crypto/sha256"
+	"fmt"
+
+	"google.golang.org/protobuf/proto"
+
+	"cursor/gen/agentv1"
+	modeladapter "cursor/internal/backend/agent/model"
+	promptengine "cursor/internal/backend/agent/prompt"
+)
+
+type importedBlobStore map[string][]byte
+
+func newImportedBlobStore(items []*agentv1.PreFetchedBlob) (importedBlobStore, error) {
+	if len(items) == 0 {
+		return nil, nil
+	}
+	store := make(importedBlobStore, len(items))
+	for _, item := range items {
+		if item == nil || len(item.GetId()) == 0 {
+			continue
+		}
+		if len(item.GetId()) != sha256.Size {
+			return nil, fmt.Errorf("prefetched blob id length %d, want %d", len(item.GetId()), sha256.Size)
+		}
+		digest := sha256.Sum256(item.GetValue())
+		if string(digest[:]) != string(item.GetId()) {
+			return nil, fmt.Errorf("prefetched blob %x failed SHA-256 validation", item.GetId())
+		}
+		store[string(item.GetId())] = append([]byte(nil), item.GetValue()...)
+	}
+	return store, nil
+}
+
+func (store importedBlobStore) resolve(id []byte) ([]byte, bool) {
+	if len(id) == 0 || len(store) == 0 {
+		return nil, false
+	}
+	value, ok := store[string(id)]
+	return append([]byte(nil), value...), ok
+}
+
+func decodeImportedTurn(raw []byte, blobs importedBlobStore) (*agentv1.ConversationTurnStructure, []byte, error) {
+	if data, ok := blobs.resolve(raw); ok {
+		turn := &agentv1.ConversationTurnStructure{}
+		if err := proto.Unmarshal(data, turn); err != nil || turn.GetTurn() == nil {
+			return nil, nil, fmt.Errorf("decode imported turn blob %x: %w", raw, firstNonNilError(err, fmt.Errorf("turn payload is empty")))
+		}
+		return turn, append([]byte(nil), raw...), nil
+	}
+	turn := &agentv1.ConversationTurnStructure{}
+	if err := proto.Unmarshal(raw, turn); err == nil && turn.GetTurn() != nil {
+		return turn, nil, nil
+	}
+	if len(raw) == sha256.Size {
+		return nil, append([]byte(nil), raw...), nil
+	}
+	return nil, nil, fmt.Errorf("decode imported inline turn")
+}
+
+func decodeImportedUserMessage(raw []byte, blobs importedBlobStore) (*agentv1.UserMessage, error) {
+	data := raw
+	if resolved, ok := blobs.resolve(raw); ok {
+		data = resolved
+	} else if len(raw) == sha256.Size {
+		candidate := &agentv1.UserMessage{}
+		if err := proto.Unmarshal(raw, candidate); err != nil || !hasKnownUserMessageContent(candidate) {
+			return nil, fmt.Errorf("missing prefetched user message blob %x", raw)
+		}
+		return candidate, nil
+	}
+	message := &agentv1.UserMessage{}
+	if err := proto.Unmarshal(data, message); err != nil {
+		return nil, fmt.Errorf("decode imported turn user_message: %w", err)
+	}
+	return message, nil
+}
+
+func decodeImportedStep(raw []byte, blobs importedBlobStore) (*agentv1.ConversationStep, error) {
+	data := raw
+	if resolved, ok := blobs.resolve(raw); ok {
+		data = resolved
+	} else if len(raw) == sha256.Size {
+		candidate := &agentv1.ConversationStep{}
+		if err := proto.Unmarshal(raw, candidate); err != nil || candidate.GetMessage() == nil {
+			return nil, fmt.Errorf("missing prefetched conversation step blob %x", raw)
+		}
+		return candidate, nil
+	}
+	step := &agentv1.ConversationStep{}
+	if err := proto.Unmarshal(data, step); err != nil {
+		return nil, fmt.Errorf("decode imported turn step: %w", err)
+	}
+	if step.GetMessage() == nil {
+		return nil, fmt.Errorf("decode imported turn step: payload is empty")
+	}
+	return step, nil
+}
+
+func importedBlobTurnMessages(turn *agentv1.ConversationTurnStructure, blobs importedBlobStore) ([]modeladapter.Message, error) {
+	if turn == nil || turn.GetAgentConversationTurn() == nil {
+		return nil, nil
+	}
+	agentTurn := turn.GetAgentConversationTurn()
+	messages := make([]modeladapter.Message, 0, 1+len(agentTurn.GetSteps()))
+	if len(agentTurn.GetUserMessage()) > 0 {
+		userMessage, err := decodeImportedUserMessage(agentTurn.GetUserMessage(), blobs)
+		if err != nil {
+			return nil, err
+		}
+		if replay, ok := promptengine.BuildUserMessageReplayMessage(userMessage); ok {
+			messages = append(messages, toModelMessage(replay))
+		}
+	}
+	for _, rawStep := range agentTurn.GetSteps() {
+		if len(rawStep) == 0 {
+			continue
+		}
+		step, err := decodeImportedStep(rawStep, blobs)
+		if err != nil {
+			return nil, err
+		}
+		for _, replay := range promptengine.BuildLegacyMessagesFromConversationStep(step) {
+			messages = append(messages, toModelMessage(replay))
+		}
+	}
+	return messages, nil
+}
+
+func importedTurnIDs(turns [][]byte, blobs importedBlobStore) ([][]byte, error) {
+	ids := make([][]byte, 0, len(turns))
+	for _, raw := range turns {
+		if len(raw) == 0 {
+			continue
+		}
+		_, id, err := decodeImportedTurn(raw, blobs)
+		if err != nil {
+			return nil, err
+		}
+		if len(id) > 0 {
+			ids = append(ids, id)
+		}
+	}
+	return ids, nil
+}
+
+func hasKnownUserMessageContent(message *agentv1.UserMessage) bool {
+	if message == nil {
+		return false
+	}
+	return message.GetText() != "" ||
+		message.GetMessageId() != "" ||
+		message.GetSelectedContext() != nil ||
+		message.GetRichText() != "" ||
+		len(message.GetConversationStateBlobId()) > 0 ||
+		len(message.GetTextBlobId()) > 0 ||
+		len(message.GetRichTextBlobId()) > 0
+}
+
+func firstNonNilError(err error, fallback error) error {
+	if err != nil {
+		return err
+	}
+	return fallback
+}
@@ -0,0 +1,109 @@
+package forwarder
+
+import (
+	"crypto/sha256"
+	"testing"
+
+	"google.golang.org/protobuf/proto"
+
+	"cursor/gen/agentv1"
+)
+
+func TestImportedConversationStateRestoresBlobOnlyForkAndCheckpointPrefix(t *testing.T) {
+	parent := compactionAppendOnlyConversation(t)
+	parent.Entries = parent.Entries[:2]
+	parent.NextEntrySeq = 3
+	parent.NextTurnSeq = 2
+	projection, err := NewHistoryProjector().ProjectCheckpointProjection(parent)
+	if err != nil {
+		t.Fatalf("ProjectCheckpointProjection() error = %v", err)
+	}
+	prefetched := make([]*agentv1.PreFetchedBlob, 0, len(projection.Blobs))
+	for _, blob := range projection.Blobs {
+		prefetched = append(prefetched, &agentv1.PreFetchedBlob{Id: blob.ID, Value: blob.Data})
+	}
+	state := proto.Clone(projection.State).(*agentv1.ConversationStateStructure)
+	state.RootPromptMessagesJson = nil
+	conversation, err := newRuntimeConversation("fork-conversation", agentv1.AgentMode_AGENT_MODE_AGENT)
+	if err != nil {
+		t.Fatalf("newRuntimeConversation() error = %v", err)
+	}
+	entries, err := (&Service{}).importConversationState(conversation, state, prefetched)
+	if err != nil {
+		t.Fatalf("importConversationState() error = %v", err)
+	}
+	if len(conversation.ImportedTurnIDs) != 1 || conversation.NextTurnSeq != 2 {
+		t.Fatalf("imported prefix turns=%d next_turn_seq=%d, want 1 and 2", len(conversation.ImportedTurnIDs), conversation.NextTurnSeq)
+	}
+	if len(entries) != 2 {
+		t.Fatalf("imported model entries = %d, want parent user and assistant", len(entries))
+	}
+	appendEntriesInPlace(conversation, append(entries,
+		compactionTestUserEntry(t, 2, "request-2", "fork question", "message-2"),
+	))
+	forkProjection, err := NewHistoryProjector().ProjectCheckpointProjection(conversation)
+	if err != nil {
+		t.Fatalf("fork ProjectCheckpointProjection() error = %v", err)
+	}
+	if len(forkProjection.State.GetTurns()) != 2 {
+		t.Fatalf("fork checkpoint turns = %d, want imported parent plus local fork turn", len(forkProjection.State.GetTurns()))
+	}
+	if string(forkProjection.State.GetTurns()[0]) != string(projection.State.GetTurns()[0]) {
+		t.Fatal("fork checkpoint did not preserve the imported parent turn ID as its prefix")
+	}
+}
+
+func TestImportedConversationStateRejectsUnresolvedBlobTurn(t *testing.T) {
+	turnID := sha256.Sum256([]byte("missing imported turn"))
+	conversation, err := newRuntimeConversation("fork-conversation", agentv1.AgentMode_AGENT_MODE_AGENT)
+	if err != nil {
+		t.Fatalf("newRuntimeConversation() error = %v", err)
+	}
+	if _, err := (&Service{}).importConversationState(conversation, &agentv1.ConversationStateStructure{
+		Turns: [][]byte{turnID[:]},
+	}, nil); err == nil {
+		t.Fatal("importConversationState() accepted an unresolved Blob turn")
+	}
+}
+
+func TestImportedTurnIDsPersistThroughConversationStore(t *testing.T) {
+	store := NewConversationFileStore(t.TempDir())
+	turnID := sha256.Sum256([]byte("parent turn"))
+	conversation, err := newRuntimeConversation("fork-conversation", agentv1.AgentMode_AGENT_MODE_AGENT)
+	if err != nil {
+		t.Fatalf("newRuntimeConversation() error = %v", err)
+	}
+	conversation.ImportedTurnIDs = [][]byte{turnID[:]}
+	persisted, err := store.SaveConversationWithEntries(conversation.ConversationID, conversation, []HistoryEntry{
+		compactionTestUserEntry(t, 2, "request-2", "fork question", "message-2"),
+	})
+	if err != nil {
+		t.Fatalf("SaveConversationWithEntries() error = %v", err)
+	}
+	if len(persisted.ImportedTurnIDs) != 1 || string(persisted.ImportedTurnIDs[0]) != string(turnID[:]) {
+		t.Fatalf("persisted ImportedTurnIDs = %x, want %x", persisted.ImportedTurnIDs, turnID)
+	}
+	loaded, err := store.LoadConversation(conversation.ConversationID)
+	if err != nil {
+		t.Fatalf("LoadConversation() error = %v", err)
+	}
+	if len(loaded.ImportedTurnIDs) != 1 || string(loaded.ImportedTurnIDs[0]) != string(turnID[:]) {
+		t.Fatalf("loaded ImportedTurnIDs = %x, want %x", loaded.ImportedTurnIDs, turnID)
+	}
+}
+
+func TestRewindImportedTurnPrefixUsesClientForkPoint(t *testing.T) {
+	ids := make([][]byte, 3)
+	for index := range ids {
+		digest := sha256.Sum256([]byte{byte(index + 1)})
+		ids[index] = digest[:]
+	}
+	trimmed := rewindImportedTurnPrefix(ids, runRewindDecision{
+		TargetTurnSeq:      4,
+		HasClientTurnCount: true,
+		ClientTurnCount:    1,
+	})
+	if len(trimmed) != 1 || string(trimmed[0]) != string(ids[0]) {
+		t.Fatalf("rewindImportedTurnPrefix() = %x, want first imported turn only", trimmed)
+	}
+}
@@ -2,6 +2,7 @@ package forwarder

 import (
 	"encoding/json"
+	"errors"
 	"strings"
 	"testing"
 )
@@ -125,6 +126,53 @@ func TestCancelPersistsInterruptedProviderOutputIdempotently(t *testing.T) {
 	}
 }

+func TestGenericProviderFailurePersistsAccumulatedOutput(t *testing.T) {
+	service, stream, _ := testCheckpointBlobProjection(t)
+	conversation, _, _, err := service.snapshotCheckpointConversation(stream)
+	if err != nil {
+		t.Fatalf("snapshotCheckpointConversation() error = %v", err)
+	}
+	if _, err := service.store.SaveConversationWithEntries(stream.ConversationID, conversation, conversation.Entries); err != nil {
+		t.Fatalf("SaveConversationWithEntries() error = %v", err)
+	}
+
+	stream.mu.Lock()
+	stream.CurrentModelCallID = "model-call-1"
+	stream.ProviderActive = true
+	stream.ProviderAccumulatedText = "partial answer before transport failure"
+	stream.Status = StreamStatusStreaming
+	stream.Phase = TurnPhaseProviderRunning
+	stream.mu.Unlock()
+	if err := service.handleProviderDoneEvent(stream, &streamProviderEvent{
+		Done: true,
+		Err:  errors.New("transport failed"),
+	}); err != nil {
+		t.Fatalf("handleProviderDoneEvent() error = %v", err)
+	}
+
+	persisted, err := service.store.LoadConversation(stream.ConversationID)
+	if err != nil {
+		t.Fatalf("LoadConversation() error = %v", err)
+	}
+	foundPartialOutput := false
+	for _, entry := range persisted.Entries {
+		if entry.Kind != "assistant_text" {
+			continue
+		}
+		var payload assistantTextPayload
+		if err := json.Unmarshal(entry.Payload, &payload); err != nil {
+			t.Fatalf("decode assistant entry: %v", err)
+		}
+		if payload.Text == "partial answer before transport failure" {
+			foundPartialOutput = true
+			break
+		}
+	}
+	if !foundPartialOutput {
+		t.Fatal("generic provider failure discarded accumulated assistant output")
+	}
+}
+
 func TestCancelPreservesPersistedTurnActivityWithoutLiveAccumulator(t *testing.T) {
 	service, stream, _ := testCheckpointBlobProjection(t)
 	conversation, _, _, err := service.snapshotCheckpointConversation(stream)
@@ -326,20 +326,24 @@ func compactedPromptProjectionEntries(entries []HistoryEntry) []HistoryEntry {
 		latestToolCallID := latestCompletedToolCallIDForTurn(entries, compactionPayload.CurrentTurnSeq, compactionPayload.CurrentRequestID)
 		preservedIndexes = autoCompactionPreservedEntryIndexes(entries, compactionPayload.CurrentTurnSeq, compactionPayload.CurrentRequestID, latestToolCallID)
 	}
-	filtered := make([]HistoryEntry, 0, len(entries)-compactionIndex)
-	for index, entry := range entries {
-		if index < compactionIndex && isPromptReplayEntryKind(entry.Kind) {
-			if _, ok := preservedIndexes[index]; !ok {
-				continue
-			}
+	filtered := make([]HistoryEntry, 0, len(entries)-compactionIndex+len(preservedIndexes))
+	for index := 0; index < compactionIndex; index++ {
+		if !isPromptReplayEntryKind(entries[index].Kind) {
+			filtered = append(filtered, entries[index])
 		}
-		if index < compactionIndex {
-			if rewritten, ok := compactedProjectionPreservedEntry(entry); ok {
-				entry = rewritten
-			}
+	}
+	filtered = append(filtered, entries[compactionIndex])
+	for index := 0; index < compactionIndex; index++ {
+		if _, ok := preservedIndexes[index]; !ok || isCompactionSummaryKind(entries[index].Kind) {
+			continue
+		}
+		entry := entries[index]
+		if rewritten, ok := compactedProjectionPreservedEntry(entry); ok {
+			entry = rewritten
 		}
 		filtered = append(filtered, entry)
 	}
+	filtered = append(filtered, entries[compactionIndex+1:]...)
 	return filtered
 }

@@ -575,7 +579,7 @@ func (projector *HistoryProjector) ProjectCheckpointProjection(conversation *Con
 	if err != nil {
 		return nil, err
 	}
-	state.Turns = turnIDs
+	state.Turns = append(cloneByteSlices(conversation.ImportedTurnIDs), turnIDs...)
 	replayMessages, err := projector.ProjectPromptReplay(conversation)
 	if err != nil {
 		return nil, err
@@ -621,10 +625,22 @@ func projectCheckpointTurnBlobs(conversation *ConversationFile, blobs *checkpoin
 		}
 		grouped[entry.TurnSeq] = append(grouped[entry.TurnSeq], entry)
 	}
-
-	turnIDs := make([][]byte, 0, len(order))
+	logicalTurns := make([][]HistoryEntry, 0, len(order))
 	for _, turnSeq := range order {
 		entries := grouped[turnSeq]
+		if checkpointTurnHasUserMessage(entries) {
+			logicalTurns = append(logicalTurns, append([]HistoryEntry(nil), entries...))
+			continue
+		}
+		if len(logicalTurns) == 0 {
+			continue
+		}
+		last := len(logicalTurns) - 1
+		logicalTurns[last] = append(logicalTurns[last], entries...)
+	}
+
+	turnIDs := make([][]byte, 0, len(logicalTurns))
+	for _, entries := range logicalTurns {
 		completedToolCalls, err := collectCheckpointCompletedToolCalls(entries)
 		if err != nil {
 			return nil, err
@@ -734,7 +750,7 @@ func projectCheckpointTurnBlobs(conversation *ConversationFile, blobs *checkpoin
 				})
 			}
 		}
-		if len(userMessageID) == 0 && len(steps) == 0 {
+		if len(userMessageID) == 0 {
 			continue
 		}
 		stepIDs := make([][]byte, 0, len(steps))
@@ -765,6 +781,15 @@ func projectCheckpointTurnBlobs(conversation *ConversationFile, blobs *checkpoin
 	return turnIDs, nil
 }

+func checkpointTurnHasUserMessage(entries []HistoryEntry) bool {
+	for _, entry := range entries {
+		if strings.TrimSpace(entry.Kind) == "user_message" {
+			return true
+		}
+	}
+	return false
+}
+
 func collectCheckpointCompletedToolCalls(entries []HistoryEntry) (map[string]json.RawMessage, error) {
 	completed := make(map[string]json.RawMessage)
 	for _, entry := range entries {
@@ -1271,7 +1296,7 @@ func filterCheckpointPersistentToolReplay(messages []promptengine.Message) []pro
 	return filtered
 }

-func restoreImportedReplayUserMessages(messages []promptengine.Message, importedTurns [][]byte) []promptengine.Message {
+func restoreImportedReplayUserMessages(messages []promptengine.Message, importedTurns [][]byte, blobs importedBlobStore) []promptengine.Message {
 	if len(messages) == 0 || len(importedTurns) == 0 {
 		return messages
 	}
@@ -1280,16 +1305,16 @@ func restoreImportedReplayUserMessages(messages []promptengine.Message, imported
 		if len(rawTurn) == 0 {
 			continue
 		}
-		turn := &agentv1.ConversationTurnStructure{}
-		if err := proto.Unmarshal(rawTurn, turn); err != nil {
+		turn, _, err := decodeImportedTurn(rawTurn, blobs)
+		if err != nil || turn == nil {
 			continue
 		}
 		agentTurn := turn.GetAgentConversationTurn()
 		if agentTurn == nil || len(agentTurn.GetUserMessage()) == 0 {
 			continue
 		}
-		userMessage := &agentv1.UserMessage{}
-		if err := proto.Unmarshal(agentTurn.GetUserMessage(), userMessage); err != nil {
+		userMessage, err := decodeImportedUserMessage(agentTurn.GetUserMessage(), blobs)
+		if err != nil {
 			continue
 		}
 		replay, ok := promptengine.BuildUserMessageReplayMessage(userMessage)
@@ -87,6 +87,94 @@ func TestProjectCheckpointProjectionBuildsResolvableForkState(t *testing.T) {
 	}
 }

+func TestProjectCheckpointProjectionMergesResumeActivityIntoPreviousUserTurn(t *testing.T) {
+	userPayload, err := protojson.Marshal(&agentv1.UserMessage{
+		Text:      "original question",
+		MessageId: "message-1",
+	})
+	if err != nil {
+		t.Fatalf("marshal user message: %v", err)
+	}
+	firstAnswer := newAssistantTextEntry(1, "request-1", "before resume", "", "")
+	firstAnswer.Seq = 2
+	resumedAnswer := newAssistantTextEntry(2, "request-resume", "after resume", "", "")
+	resumedAnswer.Seq = 3
+	conversation := &ConversationFile{
+		ConversationID:     "conversation-1",
+		RootConversationID: "conversation-1",
+		Mode:               "agent",
+		NextTurnSeq:        3,
+		NextEntrySeq:       4,
+		Entries: []HistoryEntry{
+			{Seq: 1, TurnSeq: 1, RequestID: "request-1", Role: "user", Kind: "user_message", Payload: userPayload},
+			firstAnswer,
+			resumedAnswer,
+		},
+	}
+
+	projection, err := NewHistoryProjector().ProjectCheckpointProjection(conversation)
+	if err != nil {
+		t.Fatalf("ProjectCheckpointProjection() error = %v", err)
+	}
+	if len(projection.State.GetTurns()) != 1 {
+		t.Fatalf("checkpoint turns = %d, want one logical user turn", len(projection.State.GetTurns()))
+	}
+
+	blobs := make(map[string][]byte, len(projection.Blobs))
+	for _, blob := range projection.Blobs {
+		blobs[string(blob.ID)] = blob.Data
+	}
+	turn := &agentv1.ConversationTurnStructure{}
+	if err := proto.Unmarshal(blobs[string(projection.State.GetTurns()[0])], turn); err != nil {
+		t.Fatalf("decode checkpoint turn: %v", err)
+	}
+	agentTurn := turn.GetAgentConversationTurn()
+	if agentTurn == nil {
+		t.Fatal("checkpoint turn does not contain an agent turn")
+	}
+	if len(agentTurn.GetUserMessage()) == 0 {
+		t.Fatal("checkpoint turn lost the original user message Blob id")
+	}
+	if _, ok := blobs[string(agentTurn.GetUserMessage())]; !ok {
+		t.Fatal("checkpoint turn references a missing user message Blob")
+	}
+	if agentTurn.GetRequestId() != "request-1" {
+		t.Fatalf("checkpoint request id = %q, want original request", agentTurn.GetRequestId())
+	}
+
+	steps := checkpointProjectionSteps(t, projection)
+	if len(steps) != 2 || steps[0].GetAssistantMessage().GetText() != "before resume" || steps[1].GetAssistantMessage().GetText() != "after resume" {
+		t.Fatalf("checkpoint steps did not preserve resumed activity: %#v", steps)
+	}
+
+	replay, err := promptengine.DecodeReplayMessages(projection.State.GetRootPromptMessagesJson())
+	if err != nil {
+		t.Fatalf("decode root prompt replay: %v", err)
+	}
+	if len(replay) != 3 || replay[0].Role != "user" || replay[1].Content != "before resume" || replay[2].Content != "after resume" {
+		t.Fatalf("checkpoint turn merge changed model replay: %#v", replay)
+	}
+}
+
+func TestProjectCheckpointProjectionOmitsActivityWithoutAnyUserMessage(t *testing.T) {
+	conversation := &ConversationFile{
+		ConversationID: "conversation-1",
+		Mode:           "agent",
+		NextTurnSeq:    2,
+		Entries: []HistoryEntry{
+			newAssistantTextEntry(1, "request-resume", "orphaned resume output", "", ""),
+		},
+	}
+
+	projection, err := NewHistoryProjector().ProjectCheckpointProjection(conversation)
+	if err != nil {
+		t.Fatalf("ProjectCheckpointProjection() error = %v", err)
+	}
+	if len(projection.State.GetTurns()) != 0 || len(projection.Blobs) != 0 {
+		t.Fatalf("checkpoint emitted a turn without a user message: %#v", projection)
+	}
+}
+
 func TestProjectCheckpointProjectionKeepsForkPointIsolatedFromLaterHistory(t *testing.T) {
 	firstUser, err := protojson.Marshal(&agentv1.UserMessage{Text: "first question", MessageId: "message-1"})
 	if err != nil {
@@ -288,6 +376,7 @@ func TestProjectCheckpointProjectionKeepsStartedToolCallWhenResultPayloadIsMissi
 		Mode:           "agent",
 		NextTurnSeq:    2,
 		Entries: []HistoryEntry{
+			testCheckpointUserEntry(t),
 			newToolCallEntry(1, "request-1", "call-1", "Read", "", "", startedToolCall),
 			newToolResultEntry(1, "request-1", "call-1", "Read", `{"path":"/tmp/example.txt"}`, "read failed", "", nil),
 		},
@@ -316,6 +405,7 @@ func TestProjectCheckpointProjectionAppendsLegacyResultWithoutToolCallEntry(t *t
 		Mode:           "agent",
 		NextTurnSeq:    2,
 		Entries: []HistoryEntry{
+			testCheckpointUserEntry(t),
 			newToolResultEntry(1, "request-1", "call-1", "Read", `{"path":"/tmp/example.txt"}`, "not readable", "", completedToolCall),
 		},
 	}
@@ -0,0 +1,180 @@
+package forwarder
+
+import (
+	"bytes"
+	"crypto/sha256"
+	"encoding/base64"
+	"encoding/json"
+	"image"
+	"image/color"
+	"image/png"
+	"reflect"
+	"strings"
+	"testing"
+
+	"google.golang.org/protobuf/encoding/protojson"
+
+	"cursor/gen/agentv1"
+	modeladapter "cursor/internal/backend/agent/model"
+)
+
+func TestReadImageProjectionIsProviderOnlyAndIdempotent(t *testing.T) {
+	imageData := validForwarderTestPNG(t)
+	blobID := sha256.Sum256(imageData)
+	store := NewContentBlobStore(t.TempDir())
+	if err := store.Put(blobID[:], imageData); err != nil {
+		t.Fatalf("Put() error = %v", err)
+	}
+	conversation := readImageConversation(t, blobID[:], len(imageData))
+
+	projector := NewHistoryProjector()
+	canonical, err := projector.ProjectPromptReplay(conversation)
+	if err != nil {
+		t.Fatalf("ProjectPromptReplay() error = %v", err)
+	}
+	if len(canonical) != 2 {
+		t.Fatalf("canonical message count = %d, want 2", len(canonical))
+	}
+	if len(canonical[1].ContentParts) != 0 {
+		t.Fatalf("canonical replay contains image parts: %#v", canonical[1].ContentParts)
+	}
+
+	first, err := enrichProviderReadImages(canonical, conversation, store)
+	if err != nil {
+		t.Fatalf("first enrichment error = %v", err)
+	}
+	second, err := enrichProviderReadImages(canonical, conversation, store)
+	if err != nil {
+		t.Fatalf("second enrichment error = %v", err)
+	}
+	if !reflect.DeepEqual(first, second) {
+		t.Fatalf("provider enrichment is not idempotent\nfirst=%#v\nsecond=%#v", first, second)
+	}
+	reenriched, err := enrichProviderReadImages(first, conversation, store)
+	if err != nil {
+		t.Fatalf("re-enrichment error = %v", err)
+	}
+	if !reflect.DeepEqual(first, reenriched) {
+		t.Fatalf("provider enrichment changed an already enriched projection\nfirst=%#v\nreenriched=%#v", first, reenriched)
+	}
+	assertProviderReadImageMessage(t, first[1], imageData)
+	first[1].ContentParts[1].Image.Data[0] ^= 0xff
+	if bytes.Equal(first[1].ContentParts[1].Image.Data, second[1].ContentParts[1].Image.Data) {
+		t.Fatal("separate enrichments share mutable image bytes")
+	}
+
+	contextJSON, err := json.Marshal(conversation)
+	if err != nil {
+		t.Fatalf("marshal conversation: %v", err)
+	}
+	if bytes.Contains(contextJSON, imageData) || strings.Contains(string(contextJSON), base64.StdEncoding.EncodeToString(imageData)) {
+		t.Fatal("canonical conversation contains raw image bytes")
+	}
+	checkpoint, err := projector.ProjectCheckpointProjection(conversation)
+	if err != nil {
+		t.Fatalf("ProjectCheckpointProjection() error = %v", err)
+	}
+	checkpointJSON, err := json.Marshal(checkpoint)
+	if err != nil {
+		t.Fatalf("marshal checkpoint: %v", err)
+	}
+	if bytes.Contains(checkpointJSON, imageData) || strings.Contains(string(checkpointJSON), base64.StdEncoding.EncodeToString(imageData)) {
+		t.Fatal("checkpoint contains raw image bytes")
+	}
+}
+
+func TestProviderReadImageEnrichmentLeavesTextReadUnchanged(t *testing.T) {
+	toolCall := &agentv1.ToolCall{
+		Tool: &agentv1.ToolCall_ReadToolCall{
+			ReadToolCall: &agentv1.ReadToolCall{
+				Args: &agentv1.ReadToolArgs{Path: "notes.txt"},
+				Result: &agentv1.ReadToolResult{
+					Result: &agentv1.ReadToolResult_Success{
+						Success: &agentv1.ReadToolSuccess{
+							Path:   "notes.txt",
+							Output: &agentv1.ReadToolSuccess_Content{Content: "hello"},
+						},
+					},
+				},
+			},
+		},
+	}
+	encoded, err := protojson.Marshal(toolCall)
+	if err != nil {
+		t.Fatalf("marshal tool call: %v", err)
+	}
+	conversation := &ConversationFile{Entries: []HistoryEntry{
+		newToolResultEntry(1, "request-1", "call-1", "Read", `{"path":"notes.txt"}`, "hello", "", encoded),
+	}}
+	messages := []modeladapter.Message{{Role: "tool", ToolCallID: "call-1", Name: "Read", Content: "hello"}}
+	got, err := enrichProviderReadImages(messages, conversation, NewContentBlobStore(t.TempDir()))
+	if err != nil {
+		t.Fatalf("enrichProviderReadImages() error = %v", err)
+	}
+	if !reflect.DeepEqual(got, messages) {
+		t.Fatalf("text read changed: got=%#v want=%#v", got, messages)
+	}
+}
+
+func readImageConversation(t *testing.T, blobID []byte, fileSize int) *ConversationFile {
+	t.Helper()
+	toolCall := &agentv1.ToolCall{
+		Tool: &agentv1.ToolCall_ReadToolCall{
+			ReadToolCall: &agentv1.ReadToolCall{
+				Args: &agentv1.ReadToolArgs{Path: "diagram.png"},
+				Result: &agentv1.ReadToolResult{
+					Result: &agentv1.ReadToolResult_Success{
+						Success: &agentv1.ReadToolSuccess{
+							FileSize: uint32(fileSize),
+							Path:     "diagram.png",
+							Output:   &agentv1.ReadToolSuccess_DataBlobId{DataBlobId: append([]byte(nil), blobID...)},
+						},
+					},
+				},
+			},
+		},
+	}
+	encoded, err := protojson.Marshal(toolCall)
+	if err != nil {
+		t.Fatalf("marshal tool call: %v", err)
+	}
+	return &ConversationFile{
+		ConversationID: "conversation-1",
+		Mode:           "agent",
+		NextTurnSeq:    2,
+		Entries: []HistoryEntry{
+			newToolResultEntry(1, "request-1", "call-1", "Read", `{"path":"diagram.png"}`, "read binary bytes", "", encoded),
+		},
+	}
+}
+
+func assertProviderReadImageMessage(t *testing.T, message modeladapter.Message, imageData []byte) {
+	t.Helper()
+	if message.Role != "tool" || message.ToolCallID != "call-1" || message.Name != "Read" {
+		t.Fatalf("tool message metadata = %#v", message)
+	}
+	if len(message.ContentParts) != 2 {
+		t.Fatalf("content part count = %d, want text and image", len(message.ContentParts))
+	}
+	if message.ContentParts[0].Type != "text" || message.ContentParts[0].Text != message.Content {
+		t.Fatalf("text content part = %#v", message.ContentParts[0])
+	}
+	imagePart := message.ContentParts[1]
+	if imagePart.Type != "image" || imagePart.Image == nil {
+		t.Fatalf("image content part = %#v", imagePart)
+	}
+	if imagePart.Image.MIMEType != "image/png" || imagePart.Image.Path != "diagram.png" || !bytes.Equal(imagePart.Image.Data, imageData) {
+		t.Fatalf("image content = %#v", imagePart.Image)
+	}
+}
+
+func validForwarderTestPNG(t *testing.T) []byte {
+	t.Helper()
+	value := image.NewRGBA(image.Rect(0, 0, 2, 2))
+	value.Set(0, 0, color.RGBA{R: 0x44, G: 0x88, B: 0xcc, A: 0xff})
+	var encoded bytes.Buffer
+	if err := png.Encode(&encoded, value); err != nil {
+		t.Fatalf("encode test png: %v", err)
+	}
+	return encoded.Bytes()
+}
@@ -0,0 +1,174 @@
+// provider_read_images.go 负责在 provider 请求边界按 blob 引用补全 Read 图片。
+package forwarder
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+	"image"
+	_ "image/gif"
+	_ "image/jpeg"
+	_ "image/png"
+	"net/http"
+	"strings"
+
+	"google.golang.org/protobuf/encoding/protojson"
+
+	"cursor/gen/agentv1"
+	modeladapter "cursor/internal/backend/agent/model"
+)
+
+type contentBlobReader interface {
+	Get(id []byte) ([]byte, error)
+}
+
+type providerReadImageReference struct {
+	blobID   []byte
+	path     string
+	fileSize uint32
+}
+
+// enrichProviderReadImages 只为本次 provider 请求加载图片，不修改 canonical history 投影。
+func enrichProviderReadImages(messages []modeladapter.Message, conversation *ConversationFile, blobs contentBlobReader) ([]modeladapter.Message, error) {
+	cloned := cloneProviderEnrichmentMessages(messages)
+	references, err := collectProviderReadImageReferences(conversation)
+	if err != nil {
+		return nil, err
+	}
+	if len(references) == 0 {
+		return cloned, nil
+	}
+	for index := range cloned {
+		message := &cloned[index]
+		if strings.TrimSpace(message.Role) != "tool" {
+			continue
+		}
+		reference, ok := references[strings.TrimSpace(message.ToolCallID)]
+		if !ok {
+			continue
+		}
+		if blobs == nil {
+			return nil, fmt.Errorf("provider read image blob store is not initialized")
+		}
+		data, err := blobs.Get(reference.blobID)
+		if err != nil {
+			return nil, fmt.Errorf("load read image blob for tool call %s: %w", message.ToolCallID, err)
+		}
+		mimeType := validatedProviderReadImageMIMEType(data)
+		if mimeType == "" {
+			return nil, fmt.Errorf("read image blob for tool call %s is not a supported image", message.ToolCallID)
+		}
+		summary := "Read image file: " + reference.path
+		message.Content = summary
+		message.ContentParts = []modeladapter.ContentPart{
+			{Type: "text", Text: summary},
+			{
+				Type: "image",
+				Image: &modeladapter.ImageContent{
+					MIMEType: mimeType,
+					Path:     reference.path,
+					Data:     append([]byte(nil), data...),
+				},
+			},
+		}
+	}
+	return cloned, nil
+}
+
+func collectProviderReadImageReferences(conversation *ConversationFile) (map[string]providerReadImageReference, error) {
+	references := make(map[string]providerReadImageReference)
+	if conversation == nil {
+		return references, nil
+	}
+	for _, entry := range conversation.Entries {
+		if strings.TrimSpace(entry.Kind) != "tool_result" {
+			continue
+		}
+		var payload toolResultEntryPayload
+		if err := json.Unmarshal(entry.Payload, &payload); err != nil {
+			return nil, fmt.Errorf("decode read image tool result entry: %w", err)
+		}
+		if len(payload.ToolCall) == 0 {
+			continue
+		}
+		toolCall := &agentv1.ToolCall{}
+		if err := protojson.Unmarshal(payload.ToolCall, toolCall); err != nil {
+			return nil, fmt.Errorf("decode read image tool call: %w", err)
+		}
+		readToolCall := toolCall.GetReadToolCall()
+		if readToolCall == nil || readToolCall.GetResult().GetSuccess() == nil {
+			continue
+		}
+		success := readToolCall.GetResult().GetSuccess()
+		blobID := success.GetDataBlobId()
+		if len(blobID) == 0 {
+			continue
+		}
+		toolCallID := strings.TrimSpace(firstNonEmpty(payload.ToolCallID, entry.ToolCallID))
+		if toolCallID == "" {
+			continue
+		}
+		reference := providerReadImageReference{
+			blobID:   append([]byte(nil), blobID...),
+			path:     firstNonEmpty(strings.TrimSpace(success.GetPath()), strings.TrimSpace(readToolCall.GetArgs().GetPath())),
+			fileSize: success.GetFileSize(),
+		}
+		if existing, ok := references[toolCallID]; ok {
+			if !bytes.Equal(existing.blobID, reference.blobID) || existing.path != reference.path || existing.fileSize != reference.fileSize {
+				return nil, fmt.Errorf("conflicting read image references for tool call %s", toolCallID)
+			}
+			continue
+		}
+		references[toolCallID] = reference
+	}
+	return references, nil
+}
+
+func cloneProviderEnrichmentMessages(messages []modeladapter.Message) []modeladapter.Message {
+	if len(messages) == 0 {
+		return nil
+	}
+	cloned := make([]modeladapter.Message, 0, len(messages))
+	for _, message := range messages {
+		item := cloneReplayModelMessage(message)
+		if len(message.ContentParts) > 0 {
+			item.ContentParts = make([]modeladapter.ContentPart, len(message.ContentParts))
+			for index, part := range message.ContentParts {
+				item.ContentParts[index] = part
+				if part.Image != nil {
+					imageCopy := *part.Image
+					imageCopy.Data = append([]byte(nil), part.Image.Data...)
+					item.ContentParts[index].Image = &imageCopy
+				}
+			}
+		}
+		cloned = append(cloned, item)
+	}
+	return cloned
+}
+
+func validatedProviderReadImageMIMEType(data []byte) string {
+	if len(data) == 0 {
+		return ""
+	}
+	detected := strings.ToLower(strings.TrimSpace(http.DetectContentType(data)))
+	configuration, format, err := image.DecodeConfig(bytes.NewReader(data))
+	if err != nil || configuration.Width <= 0 || configuration.Height <= 0 {
+		return ""
+	}
+	switch strings.ToLower(strings.TrimSpace(format)) {
+	case "png":
+		if detected == "image/png" {
+			return detected
+		}
+	case "jpeg":
+		if detected == "image/jpeg" {
+			return detected
+		}
+	case "gif":
+		if detected == "image/gif" {
+			return detected
+		}
+	}
+	return ""
+}
@@ -224,6 +224,7 @@ func (service *Service) applyRunRewindToConversation(conversation *ConversationF
 	conversation.Entries = nil
 	conversation.NextEntrySeq = 1
 	conversation.NextTurnSeq = 1
+	conversation.ImportedTurnIDs = rewindImportedTurnPrefix(conversation.ImportedTurnIDs, decision)
 	appendEntriesInPlace(conversation, appendReplacementRunEntries(decision.PrefixEntries, entries))
 	applyRunRewindConversationState(conversation, intent, turnSeq)
 	deriveConversationLoopState(conversation)
@@ -269,10 +270,30 @@ func applyRunRewindMetadata(conversation *ConversationFile, source *Conversation
 		if source.TokenDetailsMaxTokens > 0 {
 			conversation.TokenDetailsMaxTokens = source.TokenDetailsMaxTokens
 		}
+		decision := runRewindDecision{TargetTurnSeq: turnSeq}
+		if intent.ConversationState != nil {
+			decision.HasClientTurnCount = true
+			decision.ClientTurnCount = len(intent.ConversationState.GetTurns())
+		}
+		conversation.ImportedTurnIDs = rewindImportedTurnPrefix(source.ImportedTurnIDs, decision)
 	}
 	applyRunRewindConversationState(conversation, intent, turnSeq)
 }

+func rewindImportedTurnPrefix(importedTurnIDs [][]byte, decision runRewindDecision) [][]byte {
+	keep := decision.TargetTurnSeq - 1
+	if decision.HasClientTurnCount {
+		keep = int64(decision.ClientTurnCount)
+	}
+	if keep <= 0 || len(importedTurnIDs) == 0 {
+		return nil
+	}
+	if keep > int64(len(importedTurnIDs)) {
+		keep = int64(len(importedTurnIDs))
+	}
+	return cloneByteSlices(importedTurnIDs[:keep])
+}
+
 func (service *Service) logRunRewindDecision(requestID string, conversationID string, eventName string, decision runRewindDecision) {
 	if service == nil || !decision.Evaluated {
 		return
@@ -50,7 +50,7 @@ func (service *Service) bootstrapRuntimeConversation(intent InboundIntent) (*Con
 	}
 	importedEntries := []HistoryEntry(nil)
 	if len(conversation.Entries) == 0 && intent.ConversationState != nil {
-		importedEntries, err = service.importConversationState(conversation, intent.ConversationState)
+		importedEntries, err = service.importConversationState(conversation, intent.ConversationState, intent.PreFetchedBlobs)
 		if err != nil {
 			return nil, agentv1.AgentMode_AGENT_MODE_AGENT, 0, nil, err
 		}
@@ -138,6 +138,7 @@ func (service *Service) syncConversationRecord(conversationID string, conversati
 		item.AutoCompactionReserveTokens = conversation.AutoCompactionReserveTokens
 		item.AutoCompactionTriggeredAt = conversation.AutoCompactionTriggeredAt
 		item.AutoCompactionSourceModelCallID = conversation.AutoCompactionSourceModelCallID
+		item.ImportedTurnIDs = cloneByteSlices(conversation.ImportedTurnIDs)
 		item.LatestRequestPrefix = cloneConversationRequestPrefix(conversation.LatestRequestPrefix)
 		item.LastProviderCall = cloneConversationProviderCall(conversation.LastProviderCall)
 		item.CreatedAt = conversation.CreatedAt
@@ -248,6 +248,7 @@ func subagentModelOverrideSummaries(overrides map[string]runtimecore.SubagentMod

 type Service struct {
 	store              *ConversationFileStore
+	contentBlobs       *ContentBlobStore
 	usageStore         *UsageFileStore
 	codebaseIndexStore *CodebaseIndexStore
 	docsIndexStore     *DocsIndexStore
@@ -274,6 +275,7 @@ type agentModelMemory interface {
 func NewService(historyRoot string, resolver modeladapter.ChannelResolver) *Service {
 	projector := NewHistoryProjector()
 	store := NewConversationFileStore(historyRoot)
+	contentBlobs := NewContentBlobStore(historyRoot)
 	broker := NewStreamBroker()
 	rules := NewUserRuleStore(appdata.RulesRootPath())
 	var modelMemory agentModelMemory
@@ -287,12 +289,13 @@ func NewService(historyRoot string, resolver modeladapter.ChannelResolver) *Serv
 	debug := newDebugRecorder(historyRoot, broker, debugConfig)
 	service := &Service{
 		store:              store,
+		contentBlobs:       contentBlobs,
 		usageStore:         NewUsageFileStore(historyRoot),
 		codebaseIndexStore: NewCodebaseIndexStore(appdata.CodebaseIndexRootPath()),
 		docsIndexStore:     NewDocsIndexStore(appdata.DocsIndexRootPath()),
 		rules:              rules,
 		projector:          projector,
-		compiler:           NewPromptCompiler(projector, NewToolCatalog(), NewReminderInjector(), rules),
+		compiler:           NewPromptCompiler(projector, NewToolCatalog(), NewReminderInjector(), rules, contentBlobs),
 		provider:           NewProviderGateway(resolver),
 		resolver:           resolver,
 		modelMemory:        modelMemory,
@@ -317,6 +320,7 @@ func newServiceWithDependencies(store *ConversationFileStore, projector *History
 	debug := newDebugRecorder(historyRoot, broker, nil)
 	return &Service{
 		store:              store,
+		contentBlobs:       NewContentBlobStore(historyRoot),
 		rules:              NewUserRuleStore(appdata.RulesRootPath()),
 		projector:          projector,
 		compiler:           compiler,
@@ -559,6 +563,7 @@ func (service *Service) decodeInboundIntent(requestID string, message *agentv1.A
 		}
 		intent.ConversationID = conversationID
 		intent.ConversationState = runRequest.GetConversationState()
+		intent.PreFetchedBlobs = runRequest.GetPreFetchedBlobs()
 		intent.UserMessage = extractUserMessage(message)
 		intent.RequestContext = extractRequestContext(message)
 		if service.shouldIgnoreEmptyResumeRunRequest(requestID, runRequest, intent.UserMessage, intent.RequestContext) {
@@ -606,6 +611,7 @@ func (service *Service) decodeInboundIntent(requestID string, message *agentv1.A
 		intent.ConversationID = conversationID
 		intent.SubagentTypeName = strings.TrimSpace(prewarmRequest.GetSubagentTypeName())
 		intent.ConversationState = prewarmRequest.GetConversationState()
+		intent.PreFetchedBlobs = prewarmRequest.GetPreFetchedBlobs()
 		intent.Mode, intent.ModeSource, intent.HasExplicitMode, err = extractPrewarmMode(prewarmRequest)
 		if err != nil {
 			return InboundIntent{}, err
@@ -1003,10 +1009,18 @@ func (service *Service) handleExecResult(intent InboundIntent) error {
 		}); err != nil {
 			return err
 		}
+		if message := buildShellToolCallDeltaMessage(pending.ToolCallID, pending.ModelCallID, result.ShellOutputDelta); message != nil {
+			if err := service.broker.Publish(intent.RequestID, StreamEvent{Message: message}); err != nil {
+				return err
+			}
+		}
 	}
 	if !result.IsTerminal {
 		return nil
 	}
+	if err := service.persistExecContentBlobs(result.ContentBlobs); err != nil {
+		return err
+	}
 	markExecCompleted(stream, pending)
 	backgroundShellToolCallID := ""
 	if strings.TrimSpace(pending.ExecKind) == "shell" && shellToolCallIsBackgrounded(result.ToolCall) {
@@ -1045,6 +1059,21 @@ func (service *Service) handleExecResult(intent InboundIntent) error {
 	return service.reconcileStream(stream)
 }

+func (service *Service) persistExecContentBlobs(blobs []execbridge.ContentBlob) error {
+	if len(blobs) == 0 {
+		return nil
+	}
+	if service == nil || service.contentBlobs == nil {
+		return fmt.Errorf("content blob store is not initialized")
+	}
+	for _, blob := range blobs {
+		if err := service.contentBlobs.Put(blob.ID, blob.Data); err != nil {
+			return fmt.Errorf("persist exec content blob: %w", err)
+		}
+	}
+	return nil
+}
+
 // handleExecControl 处理执行桥控制面结果，例如 stream_close 或 throw。
 func (service *Service) handleExecControl(intent InboundIntent) error {
 	stream, ok := service.broker.Get(intent.RequestID)
@@ -1736,6 +1765,13 @@ func (service *Service) handleToolInvocation(stream *ActiveStream, invocation ru
 	stream.ToolInvocationCount++
 	stream.UpdatedAt = time.Now().UTC()
 	stream.mu.Unlock()
+	if !isKnownToolName(trimmedToolName) {
+		displayToolName := trimmedToolName
+		if displayToolName == "" {
+			displayToolName = "<empty>"
+		}
+		return service.completePreDispatchToolError(stream, invocation, nil, false, false, fmt.Errorf("Model hallucination: attempted to invoke a nonexistent tool: %s", displayToolName))
+	}
 	if !isToolAllowedInMode(mode, subagentTypeName, trimmedToolName) {
 		return service.completePreDispatchToolError(stream, invocation, nil, false, false, fmt.Errorf("tool invocation is not enabled in mode %s: %s", mode.String(), invocation.ToolName))
 	}
@@ -2234,6 +2270,15 @@ func (service *Service) finishSuccessfulTurnAfterCheckpoint(stream *ActiveStream
 	return nil
 }

+func (service *Service) finishFailedTurnAfterCheckpoint(stream *ActiveStream, terminalCode string, terminalMessage string) error {
+	if stream == nil {
+		return nil
+	}
+	err := service.broker.Fail(stream.RequestID, terminalCode, terminalMessage)
+	service.setTurnPhase(stream, TurnPhaseFailed)
+	return err
+}
+
 func (service *Service) failStreamIfNonTerminal(stream *ActiveStream, terminalCode string, cause error) error {
 	if stream == nil || cause == nil {
 		return nil
@@ -2253,6 +2298,10 @@ func (service *Service) publishCheckpoint(requestID string, conversationID strin
 }

 func (service *Service) publishCheckpointWithCompletion(requestID string, _ string, completion *pendingTurnCompletion) error {
+	return service.publishCheckpointWithTerminalAction(requestID, successfulCheckpointTerminalAction(completion))
+}
+
+func (service *Service) publishCheckpointWithTerminalAction(requestID string, terminal checkpointTerminalAction) error {
 	stream, ok := service.broker.Get(requestID)
 	if !ok || stream == nil {
 		return fmt.Errorf("request is not active: %s", requestID)
@@ -2270,7 +2319,7 @@ func (service *Service) publishCheckpointWithCompletion(requestID string, _ stri
 	}
 	projection.State.PendingToolCalls = buildPendingToolCalls(pendingExecs, pendingInteractions)
 	service.rewriteCheckpointTokenDetailsForClient(stream, conversation, projection.State)
-	return service.queueCheckpointProjection(stream, projection, completion)
+	return service.queueCheckpointProjectionWithTerminal(stream, projection, terminal)
 }

 func (service *Service) rewriteCheckpointTokenDetailsForClient(stream *ActiveStream, conversation *ConversationFile, state *agentv1.ConversationStateStructure) {
@@ -2410,18 +2459,20 @@ func (service *Service) failActiveStream(stream *ActiveStream, conversationID st
 	if cancel != nil {
 		cancel()
 	}
-	service.setTurnPhase(stream, TurnPhaseFailed)
-	var firstErr error
-	if err := service.syncSummaryCarryForward(conversationID, requestID, modelCallID); err != nil && firstErr == nil {
-		firstErr = err
+	if err := service.syncSummaryCarryForward(conversationID, requestID, modelCallID); err != nil {
+		log.Printf(
+			"forwarder summary sync before failed terminal skipped request_id=%s model_call_id=%s err=%v",
+			strings.TrimSpace(requestID),
+			strings.TrimSpace(modelCallID),
+			err,
+		)
 	}
-	if err := service.publishCheckpoint(requestID, conversationID); err != nil && firstErr == nil {
-		firstErr = err
+	terminal := failedCheckpointTerminalAction(terminalCode, terminalMessage)
+	if err := service.publishCheckpointWithTerminalAction(requestID, terminal); err != nil {
+		log.Printf("forwarder checkpoint queue before failed terminal skipped request_id=%s err=%v", strings.TrimSpace(requestID), err)
+		return service.finishFailedTurnAfterCheckpoint(stream, terminalCode, terminalMessage)
 	}
-	if err := service.broker.Fail(requestID, terminalCode, terminalMessage); err != nil && firstErr == nil {
-		firstErr = err
-	}
-	return firstErr
+	return nil
 }

 // buildRunEntries 构造一次 run intent 需要写入 history 的首批 entry。
@@ -0,0 +1,150 @@
+package forwarder
+
+import (
+	"testing"
+
+	"cursor/gen/agentv1"
+	execbridge "cursor/internal/backend/agent/bridge/exec"
+	runtimecore "cursor/internal/backend/agent/core"
+)
+
+func TestHandleExecResultPublishesShellToolCallDelta(t *testing.T) {
+	tests := []struct {
+		name        string
+		shellStream func() *agentv1.ShellStream
+		wantStdout  string
+		wantStderr  string
+	}{
+		{
+			name: "stdout",
+			shellStream: func() *agentv1.ShellStream {
+				return &agentv1.ShellStream{Event: &agentv1.ShellStream_Stdout{
+					Stdout: &agentv1.ShellStreamStdout{Data: "stdout chunk\n"},
+				}}
+			},
+			wantStdout: "stdout chunk\n",
+		},
+		{
+			name: "stderr",
+			shellStream: func() *agentv1.ShellStream {
+				return &agentv1.ShellStream{Event: &agentv1.ShellStream_Stderr{
+					Stderr: &agentv1.ShellStreamStderr{Data: "stderr chunk\n"},
+				}}
+			},
+			wantStderr: "stderr chunk\n",
+		},
+	}
+
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+			broker := NewStreamBroker()
+			service := &Service{
+				broker:     broker,
+				execBridge: execbridge.NewBridge(),
+			}
+			stream, err := broker.OpenStream(
+				"request-1", "conversation-1", 1, "default", "default",
+				agentv1.AgentMode_AGENT_MODE_AGENT, "run command",
+			)
+			if err != nil {
+				t.Fatalf("OpenStream() error = %v", err)
+			}
+			pending := runtimecore.PendingExec{
+				MessageID:   42,
+				ExecID:      "exec-shell-1",
+				ModelCallID: "model-call-1",
+				ToolCallID:  "tool-call-1",
+				ExecKind:    "shell",
+			}
+			stream.mu.Lock()
+			stream.PendingExecs[pending.ExecID] = pending
+			stream.mu.Unlock()
+
+			if err := service.handleExecResult(InboundIntent{
+				Kind:      "exec_result",
+				RequestID: "request-1",
+				ExecClientMessage: &agentv1.ExecClientMessage{
+					Id:     pending.MessageID,
+					ExecId: pending.ExecID,
+					Message: &agentv1.ExecClientMessage_ShellStream{
+						ShellStream: test.shellStream(),
+					},
+				},
+			}); err != nil {
+				t.Fatalf("handleExecResult() error = %v", err)
+			}
+
+			events, err := broker.ReadFromCursor("request-1", 0)
+			if err != nil {
+				t.Fatalf("ReadFromCursor() error = %v", err)
+			}
+			if len(events) != 2 {
+				t.Fatalf("published events = %d, want compatibility and tool-call deltas", len(events))
+			}
+
+			var compatibilityCount, toolCallDeltaCount int
+			for _, event := range events {
+				update := event.Message.GetInteractionUpdate()
+				if update.GetShellOutputDelta() != nil {
+					compatibilityCount++
+				}
+				deltaUpdate := update.GetToolCallDelta()
+				if deltaUpdate == nil {
+					continue
+				}
+				toolCallDeltaCount++
+				if deltaUpdate.GetCallId() != pending.ToolCallID || deltaUpdate.GetModelCallId() != pending.ModelCallID {
+					t.Fatalf("tool-call delta ids = call %q model %q", deltaUpdate.GetCallId(), deltaUpdate.GetModelCallId())
+				}
+				shellDelta := deltaUpdate.GetToolCallDelta().GetShellToolCallDelta()
+				if shellDelta == nil || shellDelta.GetStdout().GetContent() != test.wantStdout || shellDelta.GetStderr().GetContent() != test.wantStderr {
+					t.Fatalf("shell tool-call delta = %#v", shellDelta)
+				}
+			}
+			if compatibilityCount != 1 || toolCallDeltaCount != 1 {
+				t.Fatalf("published compatibility=%d tool_call_delta=%d, want one each", compatibilityCount, toolCallDeltaCount)
+			}
+		})
+	}
+}
+
+func TestBuildShellToolCallDeltaMessageIgnoresNonOutputEvents(t *testing.T) {
+	tests := []struct {
+		name   string
+		output *agentv1.ShellOutputDeltaUpdate
+	}{
+		{name: "nil"},
+		{
+			name: "start",
+			output: &agentv1.ShellOutputDeltaUpdate{Event: &agentv1.ShellOutputDeltaUpdate_Start{
+				Start: &agentv1.ShellStreamStart{},
+			}},
+		},
+		{
+			name: "exit",
+			output: &agentv1.ShellOutputDeltaUpdate{Event: &agentv1.ShellOutputDeltaUpdate_Exit{
+				Exit: &agentv1.ShellStreamExit{},
+			}},
+		},
+		{
+			name: "empty stdout",
+			output: &agentv1.ShellOutputDeltaUpdate{Event: &agentv1.ShellOutputDeltaUpdate_Stdout{
+				Stdout: &agentv1.ShellStreamStdout{},
+			}},
+		},
+		{
+			name: "empty stderr",
+			output: &agentv1.ShellOutputDeltaUpdate{Event: &agentv1.ShellOutputDeltaUpdate_Stderr{
+				Stderr: &agentv1.ShellStreamStderr{},
+			}},
+		},
+	}
+
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+			if message := buildShellToolCallDeltaMessage("tool-call-1", "model-call-1", test.output); message != nil {
+				t.Fatalf("buildShellToolCallDeltaMessage() = %#v, want nil", message)
+			}
+		})
+	}
+}
@@ -45,13 +45,25 @@ func (snapshot turnUsageSnapshot) requestTokensTotal() int64 {
 	return snapshot.promptTokensTotal() + nonNegativeInt64(snapshot.OutputTokens)
 }

-func (service *Service) importConversationState(item *ConversationFile, state *agentv1.ConversationStateStructure) ([]HistoryEntry, error) {
+func (service *Service) importConversationState(item *ConversationFile, state *agentv1.ConversationStateStructure, prefetchedBlobs []*agentv1.PreFetchedBlob) ([]HistoryEntry, error) {
 	if item == nil || state == nil {
 		return nil, nil
 	}
+	blobs, err := newImportedBlobStore(prefetchedBlobs)
+	if err != nil {
+		return nil, err
+	}
+	importedIDs, err := importedTurnIDs(state.GetTurns(), blobs)
+	if err != nil {
+		return nil, err
+	}
 	item.TokenDetailsUsedTokens = state.GetTokenDetails().GetUsedTokens()
+	item.ImportedTurnIDs = importedIDs
+	if minimumNextTurnSeq := int64(len(item.ImportedTurnIDs)) + 1; item.NextTurnSeq < minimumNextTurnSeq {
+		item.NextTurnSeq = minimumNextTurnSeq
+	}
 	entries := make([]HistoryEntry, 0, 2)
-	if messages, err := importedConversationStateModelMessages(state); err != nil {
+	if messages, err := importedConversationStateModelMessagesWithBlobs(state, blobs); err != nil {
 		return nil, err
 	} else {
 		for _, message := range messages {
@@ -105,6 +117,10 @@ func (service *Service) importConversationState(item *ConversationFile, state *a
 }

 func importedConversationStateModelMessages(state *agentv1.ConversationStateStructure) ([]modeladapter.Message, error) {
+	return importedConversationStateModelMessagesWithBlobs(state, nil)
+}
+
+func importedConversationStateModelMessagesWithBlobs(state *agentv1.ConversationStateStructure, blobs importedBlobStore) ([]modeladapter.Message, error) {
 	if state == nil {
 		return nil, nil
 	}
@@ -113,7 +129,7 @@ func importedConversationStateModelMessages(state *agentv1.ConversationStateStru
 		if err != nil {
 			return nil, fmt.Errorf("decode imported replay messages: %w", err)
 		}
-		decoded = restoreImportedReplayUserMessages(decoded, state.GetTurns())
+		decoded = restoreImportedReplayUserMessages(decoded, state.GetTurns(), blobs)
 		decoded = filterLegacyPlainWriteReplay(decoded)
 		decoded = filterInternalPromptContextReplay(decoded)
 		messages := make([]modeladapter.Message, 0, len(decoded))
@@ -133,35 +149,18 @@ func importedConversationStateModelMessages(state *agentv1.ConversationStateStru
 		if len(rawTurn) == 0 {
 			continue
 		}
-		turn := &agentv1.ConversationTurnStructure{}
-		if err := proto.Unmarshal(rawTurn, turn); err != nil {
-			return nil, fmt.Errorf("decode imported turn: %w", err)
+		turn, turnID, err := decodeImportedTurn(rawTurn, blobs)
+		if err != nil {
+			return nil, err
 		}
-		agentTurn := turn.GetAgentConversationTurn()
-		if agentTurn == nil {
-			continue
+		if turn == nil && len(turnID) > 0 {
+			return nil, fmt.Errorf("missing prefetched turn blob %x", turnID)
 		}
-		if rawUser := agentTurn.GetUserMessage(); len(rawUser) > 0 {
-			userMessage := &agentv1.UserMessage{}
-			if err := proto.Unmarshal(rawUser, userMessage); err != nil {
-				return nil, fmt.Errorf("decode imported turn user_message: %w", err)
-			}
-			if replay, ok := promptengine.BuildUserMessageReplayMessage(userMessage); ok {
-				messages = append(messages, toModelMessage(replay))
-			}
-		}
-		for _, rawStep := range agentTurn.GetSteps() {
-			if len(rawStep) == 0 {
-				continue
-			}
-			step := &agentv1.ConversationStep{}
-			if err := proto.Unmarshal(rawStep, step); err != nil {
-				return nil, fmt.Errorf("decode imported turn step: %w", err)
-			}
-			for _, replay := range promptengine.BuildLegacyMessagesFromConversationStep(step) {
-				messages = append(messages, toModelMessage(replay))
-			}
+		turnMessages, err := importedBlobTurnMessages(turn, blobs)
+		if err != nil {
+			return nil, err
 		}
+		messages = append(messages, turnMessages...)
 	}
 	return normalizeReplayMessageSequence(messages), nil
 }
@@ -181,6 +181,25 @@ func supportedToolNamesForMode(mode agentv1.AgentMode) map[string]struct{} {
 	}
 }

+func isKnownToolName(toolName string) bool {
+	trimmedToolName := strings.TrimSpace(toolName)
+	if trimmedToolName == "" {
+		return false
+	}
+	for _, supported := range []map[string]struct{}{
+		agentModeToolNames,
+		askModeToolNames,
+		planModeToolNames,
+		debugModeToolNames,
+		multitaskModeToolNames,
+	} {
+		if _, ok := supported[trimmedToolName]; ok {
+			return true
+		}
+	}
+	return false
+}
+
 func isToolAllowedInMode(mode agentv1.AgentMode, subagentTypeName string, toolName string) bool {
 	trimmedToolName := strings.TrimSpace(toolName)
 	if trimmedToolName == "" {
@@ -39,6 +39,7 @@ type ConversationFile struct {
 	CurrentPlanText                 string                                `json:"current_plan_text,omitempty"`
 	CurrentPlans                    map[string]*agentv1.PlanRegistryEntry `json:"current_plans,omitempty"`
 	CurrentTodos                    []*agentv1.TodoItem                   `json:"current_todos,omitempty"`
+	ImportedTurnIDs                 [][]byte                              `json:"imported_turn_ids,omitempty"`
 	LatestRequestPrefix             *ConversationRequestPrefix            `json:"latest_request_prefix,omitempty"`
 	LastProviderCall                *ConversationProviderCall             `json:"last_provider_call,omitempty"`
 	CreatedAt                       time.Time                             `json:"created_at"`
@@ -224,10 +225,25 @@ type pendingTurnCompletion struct {
 	Disposition    pendingCompletionDisposition
 }

+type checkpointTerminalActionKind uint8
+
+const (
+	checkpointTerminalActionNone checkpointTerminalActionKind = iota
+	checkpointTerminalActionComplete
+	checkpointTerminalActionFail
+)
+
+type checkpointTerminalAction struct {
+	Kind         checkpointTerminalActionKind
+	Completion   pendingTurnCompletion
+	ErrorCode    string
+	ErrorMessage string
+}
+
 type pendingCheckpointPublish struct {
-	State      *agentv1.ConversationStateStructure
-	Required   map[string]struct{}
-	Completion *pendingTurnCompletion
+	State    *agentv1.ConversationStateStructure
+	Required map[string]struct{}
+	Terminal checkpointTerminalAction
 }

 type PendingCompaction struct {
@@ -429,6 +445,7 @@ type InboundIntent struct {
 	SubagentTypeName         string
 	SubagentModelOverrides   map[string]runtimecore.SubagentModelOverrideSelection
 	ConversationState        *agentv1.ConversationStateStructure
+	PreFetchedBlobs          []*agentv1.PreFetchedBlob
 	UserMessage              *agentv1.UserMessage
 	RequestContext           *agentv1.RequestContext
 	ClientMessage            *agentv1.AgentClientMessage
@@ -16,6 +16,7 @@ func (store *Store) LegacyRuntimeSnapshot(ctx context.Context) (legacyruntime.Ru
 	for _, item := range cfg.ModelAdapters {
 		adapters = append(adapters, legacyruntime.ModelAdapterConfig{
 			ID:                          item.ID,
+			Sort:                        item.Sort,
 			DisplayName:                 item.DisplayName,
 			Type:                        item.Type,
 			BaseURL:                     item.BaseURL,
@@ -147,6 +147,7 @@ func (manager *Manager) LegacyRuntimeSnapshot(_ context.Context) (legacyruntime.
 	for _, item := range cfg.ModelAdapters {
 		adapters = append(adapters, legacyruntime.ModelAdapterConfig{
 			ID:                       item.ID,
+			Sort:                     item.Sort,
 			DisplayName:              item.DisplayName,
 			Type:                     item.Type,
 			BaseURL:                  item.BaseURL,
@@ -5,6 +5,7 @@ import (
 	"errors"
 	"fmt"
 	"net"
+	"sort"
 	"strconv"
 	"strings"

@@ -21,6 +22,7 @@ const (

 type ModelAdapterConfig struct {
 	ID                          string `json:"id,omitempty" yaml:"-"`
+	Sort                        int    `json:"sort" yaml:"sort"`
 	DisplayName                 string `json:"displayName" yaml:"displayName"`
 	Type                        string `json:"type" yaml:"type"`
 	BaseURL                     string `json:"baseURL" yaml:"baseURL"`
@@ -104,6 +106,7 @@ func NormalizeModelAdapterConfigs(input []ModelAdapterConfig) ([]ModelAdapterCon
 		}
 		nextType := normalizeModelAdapterType(item.Type)
 		next := ModelAdapterConfig{
+			Sort:                 item.Sort,
 			DisplayName:          strings.TrimSpace(item.DisplayName),
 			Type:                 nextType,
 			BaseURL:              baseURL,
@@ -138,8 +141,8 @@ func NormalizeModelAdapterConfigs(input []ModelAdapterConfig) ([]ModelAdapterCon
 			return nil, errors.New("模型适配器 tooltipData 不能为空")
 		case next.ModelID == "":
 			return nil, errors.New("模型适配器 modelID 不能为空")
-		case next.Type == "openai" && next.ReasoningEffort == "":
-			return nil, errors.New("模型适配器 reasoningEffort 仅支持 low、medium、high、xhigh、max")
+		case next.Type == "openai" && !isSupportedReasoningEffort(next.ReasoningEffort):
+			return nil, errors.New("模型适配器 reasoningEffort 仅支持空值、low、medium、high、xhigh、max")
 		case next.Type == "openai" && next.OpenAIEndpoint == "":
 			return nil, errors.New("模型适配器 openAIEndpoint 仅支持 /v1/responses、/v1/chat/completions 或 /custom（自定义路径）")
 		case next.Type == "openai" && next.OpenAIExtraParamsEnabled:
@@ -164,9 +167,30 @@ func NormalizeModelAdapterConfigs(input []ModelAdapterConfig) ([]ModelAdapterCon
 		seenChannelIDs[next.ID] = struct{}{}
 		normalized = append(normalized, next)
 	}
+	normalizeModelAdapterSorts(normalized)
 	return normalized, nil
 }

+func normalizeModelAdapterSorts(adapters []ModelAdapterConfig) {
+	sort.SliceStable(adapters, func(leftIndex, rightIndex int) bool {
+		left := adapters[leftIndex].Sort
+		right := adapters[rightIndex].Sort
+		switch {
+		case left <= 0 && right <= 0:
+			return false
+		case left <= 0:
+			return false
+		case right <= 0:
+			return true
+		default:
+			return left < right
+		}
+	})
+	for index := range adapters {
+		adapters[index].Sort = index + 1
+	}
+}
+
 func validateJSONMap(value string, fieldName string) error {
 	text := strings.TrimSpace(value)
 	if text == "" {
@@ -200,13 +224,15 @@ func validateHeadersJSON(value string) error {
 }

 func normalizeReasoningEffort(value string) string {
-	switch strings.ToLower(strings.TrimSpace(value)) {
-	case "", "medium":
-		return "medium"
-	case "low", "high", "xhigh", "max":
-		return strings.ToLower(strings.TrimSpace(value))
+	return strings.ToLower(strings.TrimSpace(value))
+}
+
+func isSupportedReasoningEffort(value string) bool {
+	switch value {
+	case "", "low", "medium", "high", "xhigh", "max":
+		return true
 	default:
-		return ""
+		return false
 	}
 }

@@ -0,0 +1,82 @@
+package config
+
+import "testing"
+
+func testModelAdapter(displayName string, sortValue int) ModelAdapterConfig {
+	return ModelAdapterConfig{
+		Sort:            sortValue,
+		DisplayName:     displayName,
+		Type:            "openai",
+		BaseURL:         "https://api.example.com/v1",
+		APIKey:          "test-key",
+		TooltipData:     displayName,
+		ModelID:         displayName,
+		ReasoningEffort: "medium",
+		OpenAIEndpoint:  "/v1/responses",
+	}
+}
+
+func TestNormalizeModelAdapterConfigsPreservesLegacyArrayOrder(t *testing.T) {
+	adapters, err := NormalizeModelAdapterConfigs([]ModelAdapterConfig{
+		testModelAdapter("first", 0),
+		testModelAdapter("second", 0),
+		testModelAdapter("third", 0),
+	})
+	if err != nil {
+		t.Fatalf("NormalizeModelAdapterConfigs returned error: %v", err)
+	}
+
+	for index, expectedName := range []string{"first", "second", "third"} {
+		if adapters[index].DisplayName != expectedName {
+			t.Fatalf("adapter %d = %q, want %q", index, adapters[index].DisplayName, expectedName)
+		}
+		if adapters[index].Sort != index+1 {
+			t.Fatalf("adapter %d sort = %d, want %d", index, adapters[index].Sort, index+1)
+		}
+	}
+}
+
+func TestNormalizeModelAdapterConfigsUsesStableExplicitSort(t *testing.T) {
+	adapters, err := NormalizeModelAdapterConfigs([]ModelAdapterConfig{
+		testModelAdapter("legacy", 0),
+		testModelAdapter("third", 30),
+		testModelAdapter("first", 10),
+		testModelAdapter("second-a", 20),
+		testModelAdapter("second-b", 20),
+	})
+	if err != nil {
+		t.Fatalf("NormalizeModelAdapterConfigs returned error: %v", err)
+	}
+
+	expectedNames := []string{"first", "second-a", "second-b", "third", "legacy"}
+	for index, expectedName := range expectedNames {
+		if adapters[index].DisplayName != expectedName {
+			t.Fatalf("adapter %d = %q, want %q", index, adapters[index].DisplayName, expectedName)
+		}
+		if adapters[index].Sort != index+1 {
+			t.Fatalf("adapter %d sort = %d, want %d", index, adapters[index].Sort, index+1)
+		}
+	}
+}
+
+func TestNormalizeModelAdapterConfigsAllowsBlankReasoningEffort(t *testing.T) {
+	adapter := testModelAdapter("non-reasoning-model", 1)
+	adapter.ReasoningEffort = ""
+
+	adapters, err := NormalizeModelAdapterConfigs([]ModelAdapterConfig{adapter})
+	if err != nil {
+		t.Fatalf("NormalizeModelAdapterConfigs returned error: %v", err)
+	}
+	if got := adapters[0].ReasoningEffort; got != "" {
+		t.Fatalf("ReasoningEffort = %q, want blank", got)
+	}
+}
+
+func TestNormalizeModelAdapterConfigsRejectsUnknownReasoningEffort(t *testing.T) {
+	adapter := testModelAdapter("invalid-reasoning-effort", 1)
+	adapter.ReasoningEffort = "unsupported"
+
+	if _, err := NormalizeModelAdapterConfigs([]ModelAdapterConfig{adapter}); err == nil {
+		t.Fatal("NormalizeModelAdapterConfigs should reject an unknown reasoning effort")
+	}
+}
@@ -145,7 +145,7 @@ var bootstrapStatsigTemplate = statsigBootstrapTemplate{
 		bootstrapStatsigGlassCustomThemeSupport:          buildEnabledStatsigGate(bootstrapStatsigGlassCustomThemeSupport),
 		bootstrapStatsigGlassAutomationsUI:               buildEnabledStatsigGate(bootstrapStatsigGlassAutomationsUI),
 		bootstrapStatsigTerminalUI2:                      buildEnabledStatsigGate(bootstrapStatsigTerminalUI2),
-		bootstrapStatsigDisableTerminalOutputUIStreaming: buildEnabledStatsigGate(bootstrapStatsigDisableTerminalOutputUIStreaming),
+		bootstrapStatsigDisableTerminalOutputUIStreaming: buildDisabledStatsigGate(bootstrapStatsigDisableTerminalOutputUIStreaming),
 		bootstrapStatsigBrowserCanvas:                    buildEnabledStatsigGate(bootstrapStatsigBrowserCanvas),
 		bootstrapStatsigEnableMultitaskMode:              buildEnabledStatsigGate(bootstrapStatsigEnableMultitaskMode),
 		bootstrapStatsigDecomposeAlwaysLocalExtHostGate:  buildDisabledStatsigGate(bootstrapStatsigDecomposeAlwaysLocalExtHostGate),
@@ -728,8 +728,10 @@ func buildCLIModelDetails(adapters []legacyruntime.ModelAdapterConfig) []map[str
 			continue
 		}
 		models = append(models, map[string]any{
-			"modelId":        channelID,
-			"displayModelId": channelID,
+			"modelId":          channelID,
+			"displayModelId":   channelID,
+			"displayName":      strings.TrimSpace(adapter.DisplayName),
+			"displayNameShort": strings.TrimSpace(adapter.DisplayName),
 			"apiKeyCredentials": map[string]any{
 				"apiKey":  strings.TrimSpace(adapter.APIKey),
 				"baseUrl": strings.TrimSpace(adapter.BaseURL),
@@ -833,7 +835,7 @@ func defaultThinkingEffortForAdapter(adapter legacyruntime.ModelAdapterConfig) s
 	if strings.EqualFold(strings.TrimSpace(adapter.Type), "anthropic") {
 		return normalizeAvailableModelThinkingEffort(adapter.AnthropicThinkingEffort, true, "xhigh")
 	}
-	return normalizeAvailableModelThinkingEffort(adapter.ReasoningEffort, true, "medium")
+	return normalizeAvailableModelThinkingEffort(adapter.ReasoningEffort, true, "disabled")
 }

 func normalizeAvailableModelThinkingEffort(raw string, allowMax bool, fallback string) string {
@@ -11,25 +11,59 @@ import (
 	"google.golang.org/protobuf/proto"
 )

-func TestBuildCLIModelDetailsPreservesChannelCredentials(t *testing.T) {
+func TestBuildCLIModelDetailsPreservesChannelMetadata(t *testing.T) {
 	adapters := []legacyruntime.ModelAdapterConfig{
-		{ID: " channel-a ", ModelID: "model-a", APIKey: "provider-secret-a", BaseURL: "https://provider-a.example/v1"},
-		{ID: "channel-b", ModelID: "model-a"},
+		{ID: " channel-a ", DisplayName: " Model A ", ModelID: "model-a", APIKey: "provider-secret-a", BaseURL: "https://provider-a.example/v1"},
+		{ID: "channel-b", DisplayName: "Model B", ModelID: "model-a"},
 		{ID: "", ModelID: "model-c"},
 	}

 	got := buildCLIModelDetails(adapters)
 	want := []map[string]any{
-		{"modelId": "channel-a", "displayModelId": "channel-a", "apiKeyCredentials": map[string]any{"apiKey": "provider-secret-a", "baseUrl": "https://provider-a.example/v1"}},
-		{"modelId": "channel-b", "displayModelId": "channel-b", "apiKeyCredentials": map[string]any{"apiKey": "", "baseUrl": ""}},
+		{"modelId": "channel-a", "displayModelId": "channel-a", "displayName": "Model A", "displayNameShort": "Model A", "apiKeyCredentials": map[string]any{"apiKey": "provider-secret-a", "baseUrl": "https://provider-a.example/v1"}},
+		{"modelId": "channel-b", "displayModelId": "channel-b", "displayName": "Model B", "displayNameShort": "Model B", "apiKeyCredentials": map[string]any{"apiKey": "", "baseUrl": ""}},
 	}
 	if !reflect.DeepEqual(got, want) {
 		t.Fatalf("build CLI model details: got %v, want %v", got, want)
 	}
 }

+func TestDefaultThinkingEffortForOpenAIAdapterUsesDisabledWhenUnset(t *testing.T) {
+	adapter := legacyruntime.ModelAdapterConfig{Type: "openai", ReasoningEffort: ""}
+
+	if got := defaultThinkingEffortForAdapter(adapter); got != "disabled" {
+		t.Fatalf("default thinking effort = %q, want disabled", got)
+	}
+}
+
+func TestBuildAvailableModelEntriesUsesDisabledVariantWhenReasoningEffortUnset(t *testing.T) {
+	entries := buildAvailableModelEntries([]legacyruntime.ModelAdapterConfig{{
+		ID:          "channel-a",
+		DisplayName: "Model A",
+		ModelID:     "model-a",
+		Type:        "openai",
+	}})
+	if len(entries) != 1 {
+		t.Fatalf("entry count = %d, want 1", len(entries))
+	}
+
+	variants, ok := entries[0]["variants"].([]map[string]any)
+	if !ok {
+		t.Fatalf("variants type = %T, want []map[string]any", entries[0]["variants"])
+	}
+	if len(variants) == 0 {
+		t.Fatal("variants should not be empty")
+	}
+	if got := variants[0]["variantStringRepresentation"]; got != "channel-a:disabled" {
+		t.Fatalf("first variant representation = %#v, want channel-a:disabled", got)
+	}
+	if got := variants[0]["isDefaultNonMaxConfig"]; got != true {
+		t.Fatalf("disabled variant default flag = %#v, want true", got)
+	}
+}
+
 func TestEncodeCLIModelsUsesAgentModelDetailsWireFormat(t *testing.T) {
-	payload := map[string]any{"models": buildCLIModelDetails([]legacyruntime.ModelAdapterConfig{{ID: "channel-a", APIKey: "provider-secret", BaseURL: "https://provider.example/v1"}})}
+	payload := map[string]any{"models": buildCLIModelDetails([]legacyruntime.ModelAdapterConfig{{ID: "channel-a", DisplayName: "Model A", APIKey: "provider-secret", BaseURL: "https://provider.example/v1"}})}
 	encoded, err := encodeMockProto("aiserver.v1.GetUsableModelsResponse", payload)
 	if err != nil {
 		t.Fatalf("encode CLI models: %v", err)
@@ -46,6 +80,9 @@ func TestEncodeCLIModelsUsesAgentModelDetailsWireFormat(t *testing.T) {
 	if model.GetModelId() != "channel-a" || model.GetDisplayModelId() != "channel-a" {
 		t.Fatalf("decoded channel IDs: model=%q display=%q", model.GetModelId(), model.GetDisplayModelId())
 	}
+	if model.GetDisplayName() != "Model A" || model.GetDisplayNameShort() != "Model A" {
+		t.Fatalf("decoded display names: name=%q short=%q", model.GetDisplayName(), model.GetDisplayNameShort())
+	}
 	if credentials := model.GetApiKeyCredentials(); credentials == nil || credentials.GetApiKey() != "provider-secret" || credentials.GetBaseUrl() != "https://provider.example/v1" {
 		t.Fatalf("decoded relay credentials: %#v", credentials)
 	}
@@ -73,3 +110,26 @@ func TestBuildBootstrapStatsigConfigJSONDisablesAlwaysLocalDecompositionGate(t *
 		t.Fatalf("unexpected rule_id: %q", ruleID)
 	}
 }
+
+func TestBuildBootstrapStatsigConfigJSONEnablesTerminalOutputUIStreaming(t *testing.T) {
+	payload, err := buildBootstrapStatsigConfigJSON(12345, "test-auth-id")
+	if err != nil {
+		t.Fatalf("build bootstrap statsig config: %v", err)
+	}
+
+	var decoded statsigBootstrapTemplate
+	if err := json.Unmarshal(payload, &decoded); err != nil {
+		t.Fatalf("decode bootstrap statsig config: %v", err)
+	}
+
+	gate, ok := decoded.FeatureGates[bootstrapStatsigDisableTerminalOutputUIStreaming]
+	if !ok {
+		t.Fatalf("missing feature gate %q", bootstrapStatsigDisableTerminalOutputUIStreaming)
+	}
+	if value, _ := gate["value"].(bool); value {
+		t.Fatalf("expected %q to be disabled", bootstrapStatsigDisableTerminalOutputUIStreaming)
+	}
+	if ruleID, _ := gate["rule_id"].(string); ruleID != "local_disabled" {
+		t.Fatalf("unexpected rule_id: %q", ruleID)
+	}
+}
@@ -15,19 +15,11 @@ import (
 	"github.com/wailsapp/wails/v3/pkg/events"
 )

-// modelEditorContext 保存当前模型编辑器窗口的初始化上下文。
-type modelEditorContext struct {
-	Index       int    `json:"index"`
-	AdapterJSON string `json:"adapterJSON"`
-}
-
 // WindowService 定义了当前模块中的 WindowService 类型。
 type WindowService struct {
 	app               *application.App
 	updater           *updater.Manager
 	modelConfigWindow *application.WebviewWindow
-	modelEditorWindow *application.WebviewWindow
-	editorCtx         *modelEditorContext
 	mu                sync.RWMutex
 }

@@ -102,8 +94,8 @@ func (s *WindowService) OpenModelConfigWindow() {
 		Title:               "模型配置",
 		Width:               980,
 		Height:              700,
-		MinWidth:            820,
-		MinHeight:           560,
+		MinWidth:            980,
+		MinHeight:           700,
 		DisableResize:       false,
 		Frameless:           goruntime.GOOS == "windows",
 		URL:                 "/#/model-config",
@@ -144,97 +136,6 @@ func (s *WindowService) OpenModelConfigWindow() {
 	s.modelConfigWindow = win
 }

-// OpenModelEditorWindow 打开模型编辑器独立窗口。
-// index < 0 表示新增，>= 0 表示编辑对应索引的适配器。
-// adapterJSON 为编辑器初始数据的 JSON 字符串。
-func (s *WindowService) OpenModelEditorWindow(index int, adapterJSON string) {
-	s.mu.Lock()
-	defer s.mu.Unlock()
-
-	if s.app == nil {
-		return
-	}
-
-	s.editorCtx = &modelEditorContext{
-		Index:       index,
-		AdapterJSON: adapterJSON,
-	}
-
-	if s.modelEditorWindow != nil {
-		s.modelEditorWindow.Show()
-		s.modelEditorWindow.Focus()
-		return
-	}
-
-	title := "新增模型配置"
-	if index >= 0 {
-		title = "编辑模型配置"
-	}
-
-	win := s.app.Window.NewWithOptions(application.WebviewWindowOptions{
-		Title:               title,
-		Width:               840,
-		Height:              680,
-		MinWidth:            740,
-		MinHeight:           600,
-		DisableResize:       false,
-		Frameless:           goruntime.GOOS == "windows",
-		URL:                 fmt.Sprintf("/#/model-editor?index=%d", index),
-		Hidden:              false,
-		HideOnEscape:        false,
-		MinimiseButtonState: application.ButtonEnabled,
-		MaximiseButtonState: application.ButtonEnabled,
-		CloseButtonState:    application.ButtonEnabled,
-		BackgroundColour:    application.RGBA{Red: 25, Green: 25, Blue: 25, Alpha: 255},
-		Mac: application.MacWindow{
-			Backdrop:      application.MacBackdropLiquidGlass,
-			DisableShadow: false,
-			TitleBar: application.MacTitleBar{
-				AppearsTransparent:   true,
-				Hide:                 false,
-				HideTitle:            true,
-				FullSizeContent:      true,
-				UseToolbar:           false,
-				HideToolbarSeparator: true,
-			},
-			WebviewPreferences: application.MacWebviewPreferences{
-				FullscreenEnabled:                   u.False,
-				TextInteractionEnabled:              u.True,
-				AllowsBackForwardNavigationGestures: u.False,
-			},
-		},
-		Windows: application.WindowsWindow{
-			HiddenOnTaskbar: false,
-		},
-	})
-
-	win.RegisterHook(events.Common.WindowClosing, func(e *application.WindowEvent) {
-		s.mu.Lock()
-		defer s.mu.Unlock()
-		s.modelEditorWindow = nil
-		s.editorCtx = nil
-	})
-
-	s.modelEditorWindow = win
-}
-
-// GetModelEditorContext 返回当前编辑器窗口的初始化上下文。
-func (s *WindowService) GetModelEditorContext() map[string]any {
-	s.mu.RLock()
-	defer s.mu.RUnlock()
-
-	if s.editorCtx == nil {
-		return map[string]any{
-			"index":       -1,
-			"adapterJSON": "{}",
-		}
-	}
-	return map[string]any{
-		"index":       s.editorCtx.Index,
-		"adapterJSON": s.editorCtx.AdapterJSON,
-	}
-}
-
 // OpenHistoryWindow 用于处理与 OpenHistoryWindow 相关的逻辑。
 func (s *WindowService) OpenHistoryWindow() {
 	_ = os.MkdirAll(client.ResolveLogsRootPath(), 0o755)
@@ -1,6 +1,7 @@
 package certs

 import (
+	"bytes"
 	"crypto"
 	"crypto/ecdsa"
 	"crypto/ed25519"
@@ -9,33 +10,24 @@ import (
 	"crypto/tls"
 	"crypto/x509"
 	"crypto/x509/pkix"
-	_ "embed"
 	"encoding/pem"
 	"errors"
+	"fmt"
 	"math/big"
 	"net"
-	"os"
 	"strings"
 	"sync"
 	"time"
 )

-// embeddedCACertPEM 表示当前模块中的 embeddedCACertPEM 状态值。
-//
-//go:embed ca.crt
-var embeddedCACertPEM []byte
-
-// embeddedCAKeyPEM 表示当前模块中的 embeddedCAKeyPEM 状态值。
-//
-//go:embed ca.key
-var embeddedCAKeyPEM []byte
-
 // Manager 定义了当前模块中的 Manager 类型。
 type Manager struct {
 	// caCert 表示当前声明中的 caCert。
 	caCert *x509.Certificate
 	// caKey 表示当前声明中的 caKey。
 	caKey crypto.PrivateKey
+	// caCertPEM 保存可注入宿主信任存储的 CA 证书，不包含私钥。
+	caCertPEM []byte

 	// mu 表示当前声明中的 mu。
 	mu sync.Mutex
@@ -52,28 +44,26 @@ func NewManager(caCertPath, caKeyPath string) (*Manager, error) {
 	return NewManagerFromPEM(certPEM, keyPEM)
 }

-// NewEmbeddedManager 用于处理与 NewEmbeddedManager 相关的逻辑。
-func NewEmbeddedManager() (*Manager, error) {
-	return NewManagerFromPEM(embeddedCACertPEM, embeddedCAKeyPEM)
-}
-
-// EmbeddedCACertPEM 用于处理与 EmbeddedCACertPEM 相关的逻辑。
-func EmbeddedCACertPEM() []byte {
-	return cloneBytes(embeddedCACertPEM)
-}
-
-// EmbeddedCAKeyPEM 用于处理与 EmbeddedCAKeyPEM 相关的逻辑。
-func EmbeddedCAKeyPEM() []byte {
-	return cloneBytes(embeddedCAKeyPEM)
-}
-
 // NewManagerFromPEM 用于处理与 NewManagerFromPEM 相关的逻辑。
 func NewManagerFromPEM(caCertPEM, caKeyPEM []byte) (*Manager, error) {
 	caCert, caKey, err := loadCAFromPEM(caCertPEM, caKeyPEM)
 	if err != nil {
 		return nil, err
 	}
-	return &Manager{caCert: caCert, caKey: caKey, cache: make(map[string]*tls.Certificate)}, nil
+	return &Manager{
+		caCert:    caCert,
+		caKey:     caKey,
+		caCertPEM: cloneBytes(caCertPEM),
+		cache:     make(map[string]*tls.Certificate),
+	}, nil
+}
+
+// CACertPEM 返回当前 Manager 使用的 CA 证书。返回值不包含私钥。
+func (m *Manager) CACertPEM() []byte {
+	if m == nil {
+		return nil
+	}
+	return cloneBytes(m.caCertPEM)
 }

 // CATLSCertificate 用于处理与 CATLSCertificate 相关的逻辑。
@@ -185,19 +175,6 @@ func marshalPrivateKeyPEM(key any) ([]byte, error) {
 	}
 }

-// loadCAPEMFromFiles 用于处理与 loadCAPEMFromFiles 相关的逻辑。
-func loadCAPEMFromFiles(certPath, keyPath string) ([]byte, []byte, error) {
-	certPEM, err := os.ReadFile(certPath)
-	if err != nil {
-		return nil, nil, err
-	}
-	keyPEM, err := os.ReadFile(keyPath)
-	if err != nil {
-		return nil, nil, err
-	}
-	return certPEM, keyPEM, nil
-}
-
 // loadCAFromPEM 用于处理与 loadCAFromPEM 相关的逻辑。
 func loadCAFromPEM(certPEM, keyPEM []byte) (*x509.Certificate, crypto.PrivateKey, error) {
 	certBlock, _ := pem.Decode(certPEM)
@@ -214,28 +191,49 @@ func loadCAFromPEM(certPEM, keyPEM []byte) (*x509.Certificate, crypto.PrivateKey
 		return nil, nil, errors.New("invalid CA key PEM")
 	}

+	var caKey crypto.PrivateKey
 	switch keyBlock.Type {
 	case "RSA PRIVATE KEY":
 		key, err := x509.ParsePKCS1PrivateKey(keyBlock.Bytes)
 		if err != nil {
 			return nil, nil, err
 		}
-		return caCert, key, nil
+		caKey = key
 	case "EC PRIVATE KEY":
 		key, err := x509.ParseECPrivateKey(keyBlock.Bytes)
 		if err != nil {
 			return nil, nil, err
 		}
-		return caCert, key, nil
+		caKey = key
 	case "PRIVATE KEY":
 		key, err := x509.ParsePKCS8PrivateKey(keyBlock.Bytes)
 		if err != nil {
 			return nil, nil, err
 		}
-		return caCert, key, nil
+		caKey = key
 	default:
 		return nil, nil, errors.New("unsupported CA key format")
 	}
+
+	if !caCert.IsCA || !caCert.BasicConstraintsValid || caCert.KeyUsage&x509.KeyUsageCertSign == 0 {
+		return nil, nil, errors.New("certificate is not a valid signing CA")
+	}
+	signer, ok := caKey.(crypto.Signer)
+	if !ok {
+		return nil, nil, errors.New("CA private key cannot sign certificates")
+	}
+	certPublicKey, err := x509.MarshalPKIXPublicKey(caCert.PublicKey)
+	if err != nil {
+		return nil, nil, fmt.Errorf("marshal CA certificate public key: %w", err)
+	}
+	privatePublicKey, err := x509.MarshalPKIXPublicKey(signer.Public())
+	if err != nil {
+		return nil, nil, fmt.Errorf("marshal CA private key public key: %w", err)
+	}
+	if !bytes.Equal(certPublicKey, privatePublicKey) {
+		return nil, nil, errors.New("CA certificate and private key do not match")
+	}
+	return caCert, caKey, nil
 }

 // normalizeHost 用于处理与 normalizeHost 相关的逻辑。
@@ -1,27 +0,0 @@
-----BEGIN RSA PRIVATE KEY-----
-MIIEpAIBAAKCAQEAyh3jND/aFusuRjGTmhQtX2hkF1qroNjEEKCxWPlfprvdl8Tx
-upxNv1TQcm+K9KsS7OxnKYP4Qtv068XLbaCCGuoA/xpor6enrT85KulBq0j8z/g1
-y0VWxjz3xN9F9ND13h9yxDZCn76egbRkhFxpXow67jLsIlrqWDSltERlTKh2cJ1g
-hTRuQNSr7jtKQgFAR3aQ6dTzOP4fCOtLYn63jL4+YcxdGoK66tx8eFHq8oBLYvsc
-LNjjkaAHilZFwA4Jr7zHBofTRBg04eZum2UTaRqmSyT65ifXm4vRdQa4k1FS1gnq
-hPMhIjST8b6RkxvbLNmFpkOfI9eCMRpFG7y+NQIDAQABAoIBAATU9ZVOcHmLSkop
-zcBJerM09O2dAIziGb/XA55fqdJ728aQ0gGW0oIANlKCCaWjQFrTJP04VzNL/F01
-l5EpnOqlTPxMRpPqc2cAI677sBL29fpH0gtnvzUSiI7Xkp3RcAtNH6qCrJGSlkn+
-BMgoSGmW+yKuK3h/yWnt6kc2umA8fN+bHKhS3pI56PMW8qVnny9n92RaCA7Uf/4j
-XDewIreiH5jRqRwrPbOpjDFmv+W18LWZQiTwwxfY6sRZiZpsfsHidzfFGUFZXMlq
-2P3FCqoF4oMM1rRgBlHhDR7JHmSkFpZG639HJTXLllpyDbj3H86nsjIj9WZYKn+h
-B9k9bcECgYEA1HDzRCqoRZh6cL46KiYjv+LwmEKMa3nPb4ljywgLbRkzTMyVs0MK
-fDsDoTLFY9PBhveypU5gjTbQqtyBsDtbU+dH9Eks1FdL9P8bJf0ZOJFRiEB7uB4a
-z3V9tcXHwH4l2bCWbWThQGFwRudDAoY0EH89oSA/WHayjOKe1Wi4ovUCgYEA848B
-cYi+Qbkk+fOv9gSJn8KS1LH/jE28S/e7E4YkTfYUuu+7wr8bdRKUNpPIsLX0Fo9R
-KpJX0Oyjjady9n/8ARZRmD8Upl+F7Sl7Ro6F8+nfqQUrxbVDiIL3b+aZF+cDfFrB
-/xL5kyZZqTtFfP360tfYnlS6Sssd4E2Jsj0fJkECgYEA0gG+WbqZkgMDtwQ114jQ
-elZLZRkUWwKVjzsQDZssQHNTBS6RJh619M0Z73aTLvYcL+IZFdT/GVoAuYc2JRLo
-W28c8F6OFHMfwVeWbN1g20y8fqbQJtiLxF3vIYwcxStvG123tvisu8oXBeCDm7Ez
-MsO2FtwcAsWECEXWojzdmSkCgYEA18GvPawtHnuszd+Z2Q5b/DKZb+Hex6N1Ura5
-+qmyL333D0Kfyf0RjbxPn6l690+4UuPSuyu4r1Nx72KO7N6jlzL2RTBcUqX8NgOx
-OOe4skJT5561EAdrM9sQ5wgYRpxW8ipUAGoGvNwUQV5ISFmVgIHFWz0jam5UoQcP
-G94ZYgECgYBN4PB8BuAwMRqhTCLL5RJKtcdC/Ls9xdWrmswtQQ4OSBUTLGdeMhEN
-E23F0d+NdtiTWDYRDJ7z6KAF8CcOwWMt2sNbrxgNRuDzyfLqbuVLOM8iY3xA50Nl
-clZWujKILWp47+gA6/AqJLv2lA2LK8gM8zYzzm/nCuLCBLYH/hOiCA==
-----END RSA PRIVATE KEY-----
@@ -0,0 +1,191 @@
+package certs
+
+import (
+	"crypto/rand"
+	"crypto/rsa"
+	"crypto/sha256"
+	"crypto/x509"
+	"crypto/x509/pkix"
+	"encoding/hex"
+	"encoding/pem"
+	"errors"
+	"fmt"
+	"math/big"
+	"os"
+	"path/filepath"
+	"strings"
+	"time"
+)
+
+const legacySharedCASHA256 = "836E6BB84F6C3E63316DBB4EC257223AF09F7490E7AAE09030B8515ED61EE9FF"
+
+// LoadOrCreateManager loads the installation-specific CA, generating it on
+// first run. The private key is persisted only in the supplied local path.
+func LoadOrCreateManager(certPath, keyPath string) (*Manager, []byte, error) {
+	certPEM, certErr := os.ReadFile(certPath)
+	keyPEM, keyErr := os.ReadFile(keyPath)
+
+	if certErr == nil && isLegacySharedCA(certPEM) {
+		return generateAndPersistManager(certPath, keyPath)
+	}
+	if certErr == nil && keyErr == nil {
+		manager, err := NewManagerFromPEM(certPEM, keyPEM)
+		if err != nil {
+			return nil, nil, fmt.Errorf("load installation CA: %w", err)
+		}
+		if err := os.Chmod(keyPath, 0o600); err != nil {
+			return nil, nil, fmt.Errorf("restrict installation CA private key permissions: %w", err)
+		}
+		return manager, manager.CACertPEM(), nil
+	}
+	if errors.Is(certErr, os.ErrNotExist) && errors.Is(keyErr, os.ErrNotExist) {
+		return generateAndPersistManager(certPath, keyPath)
+	}
+	// A key without a certificate cannot have been installed as a trusted root.
+	// This is safe to recover if the first-run write was interrupted.
+	if errors.Is(certErr, os.ErrNotExist) && keyErr == nil {
+		return generateAndPersistManager(certPath, keyPath)
+	}
+	if certErr != nil && !errors.Is(certErr, os.ErrNotExist) {
+		return nil, nil, fmt.Errorf("read installation CA certificate: %w", certErr)
+	}
+	if keyErr != nil && !errors.Is(keyErr, os.ErrNotExist) {
+		return nil, nil, fmt.Errorf("read installation CA private key: %w", keyErr)
+	}
+	return nil, nil, errors.New("installation CA is incomplete; both certificate and private key are required")
+}
+
+// NewGeneratedManager creates an in-memory CA suitable for short-lived tools.
+func NewGeneratedManager() (*Manager, []byte, error) {
+	certPEM, keyPEM, err := generateCA()
+	if err != nil {
+		return nil, nil, err
+	}
+	manager, err := NewManagerFromPEM(certPEM, keyPEM)
+	if err != nil {
+		return nil, nil, err
+	}
+	return manager, manager.CACertPEM(), nil
+}
+
+func generateAndPersistManager(certPath, keyPath string) (*Manager, []byte, error) {
+	if filepath.Dir(certPath) != filepath.Dir(keyPath) {
+		return nil, nil, errors.New("installation CA certificate and key must share a directory")
+	}
+	certPEM, keyPEM, err := generateCA()
+	if err != nil {
+		return nil, nil, err
+	}
+	if err := os.MkdirAll(filepath.Dir(certPath), 0o700); err != nil {
+		return nil, nil, fmt.Errorf("create installation CA directory: %w", err)
+	}
+	// Write the private key first so a crash cannot leave a new certificate
+	// without the signing key needed by the proxy.
+	if err := writeLocalCAFile(keyPath, keyPEM, 0o600); err != nil {
+		return nil, nil, fmt.Errorf("persist installation CA private key: %w", err)
+	}
+	if err := writeLocalCAFile(certPath, certPEM, 0o644); err != nil {
+		return nil, nil, fmt.Errorf("persist installation CA certificate: %w", err)
+	}
+	manager, err := NewManagerFromPEM(certPEM, keyPEM)
+	if err != nil {
+		return nil, nil, err
+	}
+	return manager, manager.CACertPEM(), nil
+}
+
+func generateCA() ([]byte, []byte, error) {
+	privateKey, err := rsa.GenerateKey(rand.Reader, 3072)
+	if err != nil {
+		return nil, nil, fmt.Errorf("generate installation CA private key: %w", err)
+	}
+	serial, err := rand.Int(rand.Reader, new(big.Int).Lsh(big.NewInt(1), 128))
+	if err != nil {
+		return nil, nil, fmt.Errorf("generate installation CA serial: %w", err)
+	}
+	publicKeyDER, err := x509.MarshalPKIXPublicKey(&privateKey.PublicKey)
+	if err != nil {
+		return nil, nil, fmt.Errorf("marshal installation CA public key: %w", err)
+	}
+	subjectKeyID := sha256.Sum256(publicKeyDER)
+	now := time.Now()
+	template := &x509.Certificate{
+		SerialNumber: serial,
+		Subject: pkix.Name{
+			CommonName:   "Cursor BYOK Local CA",
+			Organization: []string{"Cursor BYOK"},
+		},
+		NotBefore:             now.Add(-5 * time.Minute),
+		NotAfter:              now.AddDate(10, 0, 0),
+		KeyUsage:              x509.KeyUsageDigitalSignature | x509.KeyUsageCertSign | x509.KeyUsageCRLSign,
+		BasicConstraintsValid: true,
+		IsCA:                  true,
+		MaxPathLen:            0,
+		MaxPathLenZero:        true,
+		SubjectKeyId:          append([]byte(nil), subjectKeyID[:20]...),
+	}
+	der, err := x509.CreateCertificate(rand.Reader, template, template, &privateKey.PublicKey, privateKey)
+	if err != nil {
+		return nil, nil, fmt.Errorf("create installation CA certificate: %w", err)
+	}
+	certPEM := pem.EncodeToMemory(&pem.Block{Type: "CERTIFICATE", Bytes: der})
+	keyPEM := pem.EncodeToMemory(&pem.Block{Type: "RSA PRIVATE KEY", Bytes: x509.MarshalPKCS1PrivateKey(privateKey)})
+	return certPEM, keyPEM, nil
+}
+
+func writeLocalCAFile(path string, data []byte, mode os.FileMode) error {
+	temp, err := os.CreateTemp(filepath.Dir(path), ".ca-*")
+	if err != nil {
+		return err
+	}
+	tempPath := temp.Name()
+	defer os.Remove(tempPath)
+	if err := temp.Chmod(mode); err != nil {
+		_ = temp.Close()
+		return err
+	}
+	if _, err := temp.Write(data); err != nil {
+		_ = temp.Close()
+		return err
+	}
+	if err := temp.Sync(); err != nil {
+		_ = temp.Close()
+		return err
+	}
+	if err := temp.Close(); err != nil {
+		return err
+	}
+	if err := os.Remove(path); err != nil && !errors.Is(err, os.ErrNotExist) {
+		return err
+	}
+	if err := os.Rename(tempPath, path); err != nil {
+		return err
+	}
+	return os.Chmod(path, mode)
+}
+
+func isLegacySharedCA(certPEM []byte) bool {
+	block, _ := pem.Decode(certPEM)
+	if block == nil {
+		return false
+	}
+	cert, err := x509.ParseCertificate(block.Bytes)
+	if err != nil {
+		return false
+	}
+	sum := sha256.Sum256(cert.Raw)
+	return strings.EqualFold(hex.EncodeToString(sum[:]), legacySharedCASHA256)
+}
+
+// loadCAPEMFromFiles reads an explicitly supplied CA pair.
+func loadCAPEMFromFiles(certPath, keyPath string) ([]byte, []byte, error) {
+	certPEM, err := os.ReadFile(certPath)
+	if err != nil {
+		return nil, nil, err
+	}
+	keyPEM, err := os.ReadFile(keyPath)
+	if err != nil {
+		return nil, nil, err
+	}
+	return certPEM, keyPEM, nil
+}
@@ -0,0 +1,125 @@
+package certs
+
+import (
+	"bytes"
+	"crypto/x509"
+	"encoding/pem"
+	"os"
+	"path/filepath"
+	"runtime"
+	"testing"
+)
+
+func TestLoadOrCreateManagerPersistsAndReusesInstallationCA(t *testing.T) {
+	dir := t.TempDir()
+	certPath := filepath.Join(dir, "ca.crt")
+	keyPath := filepath.Join(dir, "ca.key")
+
+	manager, certPEM, err := LoadOrCreateManager(certPath, keyPath)
+	if err != nil {
+		t.Fatalf("LoadOrCreateManager() error = %v", err)
+	}
+	if isLegacySharedCA(certPEM) {
+		t.Fatal("generated CA reused the legacy shared certificate")
+	}
+	keyInfo, err := os.Stat(keyPath)
+	if err != nil {
+		t.Fatalf("stat private key: %v", err)
+	}
+	if runtime.GOOS != "windows" && keyInfo.Mode().Perm() != 0o600 {
+		t.Fatalf("private key mode = %o, want 600", keyInfo.Mode().Perm())
+	}
+
+	leaf, err := manager.CertificateForServerName("api2.cursor.sh")
+	if err != nil {
+		t.Fatalf("CertificateForServerName() error = %v", err)
+	}
+	ca := parseCertificatePEM(t, certPEM)
+	roots := x509.NewCertPool()
+	roots.AddCert(ca)
+	if _, err := leaf.Leaf.Verify(x509.VerifyOptions{DNSName: "api2.cursor.sh", Roots: roots}); err != nil {
+		t.Fatalf("verify generated leaf: %v", err)
+	}
+
+	_, reusedCertPEM, err := LoadOrCreateManager(certPath, keyPath)
+	if err != nil {
+		t.Fatalf("second LoadOrCreateManager() error = %v", err)
+	}
+	if !bytes.Equal(certPEM, reusedCertPEM) {
+		t.Fatal("installation CA changed between loads")
+	}
+}
+
+func TestLoadOrCreateManagerCreatesUniqueCAsPerInstallation(t *testing.T) {
+	firstDir := t.TempDir()
+	secondDir := t.TempDir()
+	_, firstCert, err := LoadOrCreateManager(filepath.Join(firstDir, "ca.crt"), filepath.Join(firstDir, "ca.key"))
+	if err != nil {
+		t.Fatalf("create first CA: %v", err)
+	}
+	_, secondCert, err := LoadOrCreateManager(filepath.Join(secondDir, "ca.crt"), filepath.Join(secondDir, "ca.key"))
+	if err != nil {
+		t.Fatalf("create second CA: %v", err)
+	}
+	if bytes.Equal(firstCert, secondCert) {
+		t.Fatal("separate installations received the same CA certificate")
+	}
+}
+
+func TestLoadOrCreateManagerReplacesLegacySharedCertificate(t *testing.T) {
+	dir := t.TempDir()
+	certPath := filepath.Join(dir, "ca.crt")
+	keyPath := filepath.Join(dir, "ca.key")
+	legacyCert, err := os.ReadFile(filepath.Join("testdata", "legacy_shared_ca.crt"))
+	if err != nil {
+		t.Fatalf("read legacy certificate fixture: %v", err)
+	}
+	if !isLegacySharedCA(legacyCert) {
+		t.Fatal("legacy certificate fixture fingerprint changed")
+	}
+	if err := os.WriteFile(certPath, legacyCert, 0o644); err != nil {
+		t.Fatalf("write legacy certificate: %v", err)
+	}
+
+	_, generatedCert, err := LoadOrCreateManager(certPath, keyPath)
+	if err != nil {
+		t.Fatalf("migrate legacy certificate: %v", err)
+	}
+	if bytes.Equal(legacyCert, generatedCert) || isLegacySharedCA(generatedCert) {
+		t.Fatal("legacy shared certificate was not replaced")
+	}
+	if _, err := os.Stat(keyPath); err != nil {
+		t.Fatalf("generated private key missing: %v", err)
+	}
+}
+
+func TestNewManagerFromPEMRejectsMismatchedKey(t *testing.T) {
+	firstDir := t.TempDir()
+	secondDir := t.TempDir()
+	_, _, err := LoadOrCreateManager(filepath.Join(firstDir, "ca.crt"), filepath.Join(firstDir, "ca.key"))
+	if err != nil {
+		t.Fatalf("create first CA: %v", err)
+	}
+	_, _, err = LoadOrCreateManager(filepath.Join(secondDir, "ca.crt"), filepath.Join(secondDir, "ca.key"))
+	if err != nil {
+		t.Fatalf("create second CA: %v", err)
+	}
+	certPEM, _ := os.ReadFile(filepath.Join(firstDir, "ca.crt"))
+	keyPEM, _ := os.ReadFile(filepath.Join(secondDir, "ca.key"))
+	if _, err := NewManagerFromPEM(certPEM, keyPEM); err == nil {
+		t.Fatal("NewManagerFromPEM() accepted a mismatched private key")
+	}
+}
+
+func parseCertificatePEM(t *testing.T, certPEM []byte) *x509.Certificate {
+	t.Helper()
+	block, _ := pem.Decode(certPEM)
+	if block == nil {
+		t.Fatal("certificate PEM is invalid")
+	}
+	cert, err := x509.ParseCertificate(block.Bytes)
+	if err != nil {
+		t.Fatalf("parse certificate: %v", err)
+	}
+	return cert
+}
@@ -5,6 +5,7 @@ import (
 	goruntime "runtime"

 	"cursor/internal/cursor"
+	"cursor/internal/logger"
 )

 // ApplyCursorSettings 用于处理与 ApplyCursorSettings 相关的逻辑。
@@ -21,6 +22,9 @@ func (s *ProxyService) ApplyCursorSettings() error {
 	if err != nil {
 		return fmt.Errorf("ensure ca cert file: %w", err)
 	}
+	if err := cursor.EnsureLegacySharedCACertRemoved(); err != nil {
+		logger.Errorf("remove legacy shared ca cert failed, continuing with installation CA: %v", err)
+	}

 	switch goruntime.GOOS {
 	case "windows":
@@ -8,7 +8,6 @@ import (
 	"fmt"
 	"hash/fnv"
 	"io"
-	"math"
 	"net/http"
 	"net/url"
 	"sort"
@@ -438,7 +437,6 @@ func (s *ProxyService) TestModelAdapter(adapter serverconfig.ModelAdapterConfig)
 		AdapterID:   normalized.ID,
 		RequestHash: requestHash,
 		Status:      string(ModelAdapterTestStatusRunning),
-		SummaryText: "测试中...",
 		TestedAt:    time.Now().UTC().Format(time.RFC3339Nano),
 	}
 	s.storeAndEmitModelAdapterTestResult(running)
@@ -516,7 +514,6 @@ func (s *ProxyService) runModelAdapterTest(adapter serverconfig.ModelAdapterConf
 		TestedAt:         time.Now().UTC().Format(time.RFC3339Nano),
 		RawResponse:      strings.TrimSpace(metrics.rawResponse),
 	}
-	result.SummaryText = buildModelAdapterTestSummaryText(result)
 	return result, nil
 }

@@ -747,13 +744,6 @@ func buildErroredModelAdapterTestResult(adapterID string, requestHash string, er
 	}
 }

-func buildModelAdapterTestSummaryText(result ModelAdapterTestResult) string {
-	if strings.TrimSpace(result.Status) != string(ModelAdapterTestStatusSuccess) {
-		return firstNonEmptyTrimmed(result.SummaryText, "测试失败")
-	}
-	return fmt.Sprintf("%d t/s | 首字 %s", int(math.Round(maxFloat64(result.TokensPerSecond, 0))), formatModelAdapterTestDuration(result.FirstTextTokenMS))
-}
-
 func buildModelAdapterHTTPStatusError(prefix string, resp *http.Response) error {
 	if resp == nil {
 		return fmt.Errorf("%s response is nil", strings.TrimSpace(prefix))
@@ -849,17 +839,6 @@ func buildModelAdapterTestErrorSummary(err error) string {
 	}
 }

-func formatModelAdapterTestDuration(durationMS int64) string {
-	if durationMS < 1000 {
-		if durationMS < 0 {
-			durationMS = 0
-		}
-		return fmt.Sprintf("%d ms", durationMS)
-	}
-	seconds := float64(durationMS) / 1000
-	return fmt.Sprintf("%.1f s", seconds)
-}
-
 func estimateBenchmarkTextTokens(text string) int64 {
 	trimmed := strings.TrimSpace(text)
 	if trimmed == "" {
@@ -971,6 +950,8 @@ func normalizeModelAdapterTestType(value string) string {

 func normalizeModelAdapterTestReasoning(value string) string {
 	switch strings.ToLower(strings.TrimSpace(value)) {
+	case "":
+		return ""
 	case "low", "medium", "high", "xhigh", "max":
 		return strings.ToLower(strings.TrimSpace(value))
 	default:
@@ -1056,13 +1037,6 @@ func normalizeModelAdapterTestInt(value int) int {
 	return value
 }

-func maxFloat64(value float64, fallback float64) float64 {
-	if value < fallback {
-		return fallback
-	}
-	return value
-}
-
 func firstNonEmptyTrimmed(values ...string) string {
 	for _, value := range values {
 		trimmed := strings.TrimSpace(value)
@@ -0,0 +1,15 @@
+package client
+
+import (
+	"testing"
+
+	serverconfig "cursor/internal/backend/server/config"
+)
+
+func TestNormalizeModelAdapterTestProviderReasoningPreservesBlank(t *testing.T) {
+	adapter := serverconfig.ModelAdapterConfig{Type: "openai", ReasoningEffort: ""}
+
+	if got := normalizeModelAdapterTestProviderReasoning(adapter); got != "" {
+		t.Fatalf("reasoning effort = %q, want blank", got)
+	}
+}
@@ -16,6 +16,7 @@ import (
 const (
 	darwinSecurityExe       = "security"
 	darwinLoginKeychainName = "login.keychain-db"
+	legacySharedCASHA1      = "C14B7488C5AB83F098BEB2603F1135595A381FC0"
 )

 func getCertSHA1Fingerprint(certPEM []byte) (string, error) {
@@ -36,7 +37,10 @@ func isCACertInstalled(certPEM []byte) (bool, error) {
 	if err != nil {
 		return false, fmt.Errorf("获取证书指纹失败: %w", err)
 	}
+	return isCACertFingerprintInstalled(fingerprint)
+}

+func isCACertFingerprintInstalled(fingerprint string) (bool, error) {
 	out, err := exec.Command(darwinSecurityExe, "find-certificate", "-a", "-Z", darwinLoginKeychainName).CombinedOutput()
 	if err != nil {
 		return false, fmt.Errorf("检查 macOS 登录钥匙串失败: %w: %s", err, strings.TrimSpace(string(out)))
@@ -50,6 +54,36 @@ func isCACertInstalled(certPEM []byte) (bool, error) {
 	return installed, nil
 }

+// EnsureLegacySharedCACertRemoved removes the compromised CA shipped by older versions.
+func EnsureLegacySharedCACertRemoved() error {
+	installed, err := isCACertFingerprintInstalled(legacySharedCASHA1)
+	if err != nil {
+		return fmt.Errorf("检查旧版共享 CA 失败: %w", err)
+	}
+	if !installed {
+		return nil
+	}
+	out, err := exec.Command(
+		darwinSecurityExe,
+		"delete-certificate",
+		"-Z", legacySharedCASHA1,
+		"-t",
+		darwinLoginKeychainName,
+	).CombinedOutput()
+	if err != nil {
+		return fmt.Errorf("从 macOS 登录钥匙串删除旧版共享 CA 失败: %w: %s", err, strings.TrimSpace(string(out)))
+	}
+	installed, err = isCACertFingerprintInstalled(legacySharedCASHA1)
+	if err != nil {
+		return fmt.Errorf("验证旧版共享 CA 删除状态失败: %w", err)
+	}
+	if installed {
+		return fmt.Errorf("删除命令已执行，但 macOS 登录钥匙串中仍存在旧版共享 CA")
+	}
+	logger.Infof("ensureLegacySharedCACertRemoved: legacy shared CA removed from macOS login keychain")
+	return nil
+}
+
 func installCACertToDarwinKeychain(certPEM []byte, certPath string) error {
 	fingerprint, err := getCertSHA1Fingerprint(certPEM)
 	if err != nil {
@@ -30,6 +30,7 @@ const (
 var cursorStateDisabledStatsigGates = []string{
 	"decompose_always_local_ext_host",
 	"cursor_extensions_isolation_v2",
+	"disable_terminal_output_ui_streaming",
 }

 // InjectCursorUserInfo synchronizes the Cursor user-level auth cache used by the
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
leokun	a3ec2a0dfc	release: 0.0.48	2026-08-12 20:32:19 +08:00
leokunandGitHub	38472a3c63	Merge pull request #299 from leookun/fix/issue-298-per-user-ca Fix shared root CA by generating one per installation	2026-08-12 20:11:43 +08:00
leokun	2b8d1c9e3d	fix: generate a per-installation root CA	2026-08-12 20:04:29 +08:00
leokunandGitHub	7a67e76617	Merge pull request #270 from zfscgy/feat/image-read Feat/image read: 本地文件读取工具支持读取图片	2026-08-12 01:22:35 +08:00
leookun	08ce12aa55	Merge branch 'main' into codex/pr270-content-addressed-read-images # Conflicts: # frontend/src/i18n/generated/catalog.json	2026-08-12 01:14:24 +08:00
leookun	8f8d28880d	feat(forwarder): persist read images by content hash	2026-08-12 01:10:14 +08:00
leokunandGitHub	988ba63d40	Merge pull request #291 from Sxuan-Coder/feat/optional-reasoning-effort fix(model): 支持不设置 reasoning effort	2026-08-11 23:44:52 +08:00
上玄	edd59dc684	fix(model): 支持不设置推理强度	2026-08-11 21:18:10 +08:00
leokunandGitHub	da5fa34a4d	更新 README-CN.md	2026-08-10 23:19:34 +08:00
leokunandGitHub	4bd2359282	Update README-CN.md	2026-08-10 23:14:14 +08:00
leokunandGitHub	7838ffc6a2	Update README.md	2026-08-10 23:13:48 +08:00
leokunandGitHub	ee30775be1	Update Chinese translation link in README	2026-08-10 23:10:17 +08:00
leokunandGitHub	80a5093aa9	Update README.md	2026-08-10 23:09:41 +08:00
leokunandGitHub	b9742b1667	Update README-CN.md	2026-08-10 23:09:04 +08:00
leokunandGitHub	7d3e74be59	Update README.md	2026-08-10 23:08:36 +08:00
leokunandGitHub	1285bf9d62	Update README-CN.md	2026-08-10 23:05:44 +08:00
leokunandGitHub	7a724595eb	Update README.md	2026-08-10 23:05:31 +08:00
leokunandGitHub	00aec40e50	Update README.md	2026-08-10 23:03:50 +08:00
leokunandGitHub	c10a2d475d	Merge pull request #285 from leookun/release/0.0.47 release: 0.0.47	2026-08-10 22:56:00 +08:00
leookun	4864d3675b	release: 0.0.47	2026-08-10 22:55:16 +08:00
leokunandGitHub	3f95318a49	Merge pull request #284 from leookun/fix/compress Enhance checkpoint handling and error management in forwarder	2026-08-10 22:34:40 +08:00
leookun	9373e57ebf	Enhance checkpoint handling and error management in forwarder - Added flushing of assistant text during provider completion to ensure no output is lost on transport failure. - Updated checkpoint blob synchronization tests to validate behavior under various conditions, including terminal and non-terminal states. - Introduced new functions for managing checkpoint terminal actions, improving clarity and maintainability of the code. - Implemented additional tests for imported blob handling and conversation state restoration, ensuring robustness in data integrity across operations.	2026-08-10 22:25:37 +08:00
leokunandGitHub	f1992b0cfe	Merge pull request #281 from jiah0231/fix/openai-reasoning-summary fix: request OpenAI Responses reasoning summaries	2026-08-10 10:24:45 +08:00
haoge0211	67a9c27931	fix: request OpenAI Responses reasoning summaries	2026-08-08 20:48:07 +08:00
leookun	3cf8bdbc3c	docs: make English README the default Keep the Chinese documentation available through a dedicated language link.	2026-08-08 16:22:12 +08:00
leokunandGitHub	684953a80b	Merge pull request #279 from leookun/fix/cli-model-name refactor: update model details handling in CLI	2026-08-08 15:46:22 +08:00
leookun	297b56aed0	refactor: update model details handling in CLI - Renamed test function to better reflect its purpose. - Enhanced model details structure by adding DisplayName and DisplayNameShort fields in buildCLIModelDetails. - Updated test cases to validate the new fields and ensure correct functionality.	2026-08-08 15:45:59 +08:00
leookun	2393df1cb8	Remove Chinese README file and update English README links for consistency	2026-08-08 01:00:24 +08:00
leookun	7d622dd039	Enhance README and UI components with improved user guidance and account identifier masking - Updated README.md to provide clearer project information, features, and quick start instructions. - Added a function to mask the user's account identifier in CursorAccountCard.vue for enhanced privacy. - Adjusted localization files to remove outdated entries and improve clarity across multiple languages. - Refactored MainLayout.vue to streamline author information handling and improve user experience.	2026-08-08 00:54:02 +08:00
leokunandGitHub	1a7a20c519	Merge pull request #277 from leookun/feat/shell-tool-streaming feat: add shell tool call delta message handling	2026-08-07 22:40:56 +08:00
leookun	9eb24bb4d4	feat: add shell tool call delta message handling Implemented the buildShellToolCallDeltaMessage function to map client shell output to the delta format for Cursor's terminal bubble. This includes handling both stdout and stderr events. Updated the service to publish these messages when processing execution results. Additionally, added a test for enabling terminal output UI streaming in the bootstrap statsig configuration.	2026-08-07 22:39:58 +08:00
leokunandGitHub	426bdd6592	Merge pull request #276 from widwei/fix/anthropic-thinking-carrier fix(anthropic): pass back thinking block for assistant turns without reasoning	2026-08-07 17:43:00 +08:00
weiwei	fa36dc2c60	fix(anthropic): pass back thinking block for assistant turns without reasoning DeepSeek 类 thinking 模型在 adaptive thinking 下部分 tool-call 轮次不输出 thinking 块,重放时适配器不生成 thinking 块,上游 Anthropic 兼容 API 在 thinking 模式下要求每个 assistant 轮次回传 thinking 块,导致 "The content[].thinking in the thinking mode must be passed back to the API." 400 且毒化会话历史,后续所有请求持续失败。引入 thinking carrier:缺 reasoning 的轮次复用请求内最近一个有 reasoning+signature 的 assistant 轮次兜底,无 carrier 时输出空 thinking 块; thinking 关闭时行为不变。与 openai.go 已有空 reasoning_content 兜底对称。 Closes #268	2026-08-07 17:17:03 +08:00
leokunandGitHub	4e649d676f	Merge pull request #272 from leookun/release/0.0.46 Release/0.0.46	2026-08-07 02:41:46 +08:00
leookun	917a711b42	release: 0.0.46	2026-08-07 02:41:14 +08:00
leookun	270bcdb54e	Merge branch 'main' into release/0.0.46	2026-08-07 02:28:54 +08:00
leokunandGitHub	c6d719d9b9	Merge pull request #271 from leookun/feat/shangtang refactor: checkpoint ui	2026-08-07 02:21:54 +08:00
leookun	a7f9494828	fix: checkpoint	2026-08-07 02:19:29 +08:00
leookun	225de8bb85	refactor: UI	2026-08-07 01:50:20 +08:00
leookun	5bd39ed317	docs: update PULL_REQUEST_TEMPLATE	2026-08-06 21:56:19 +08:00
leokunandGitHub	26502ebec8	Merge pull request #269 from leookun/feat/idempotent-checkpoint-recovery Feat/idempotent checkpoint recovery	2026-08-06 21:13:56 +08:00
郑非	85a43115c7	read image tests	2026-08-06 21:06:13 +08:00
郑非	b475166ba8	Support read image	2026-08-06 21:05:08 +08:00
leookun	da15109312	Merge branch 'hotfix/fork-chat' into release/0.0.46	2026-08-05 23:35:12 +08:00