feat(forwarder): make checkpoint recovery idempotent

Preserve interrupted provider output, keep checkpoint projections deterministic, and enforce proto snapshot synchronization.

.agents/skills/coding-guidance/SKILL.md

@@ -342,3 +342,15 @@ go run ./cmd/cursor-proxy-debugger
   - `PendingInteraction`
 - 同一 backend 进程内的 `RunSSE` 重连，要优先看 checkpoint / `pending_tool_calls` 里的 live pending
 - backend 重启后，不要把 checkpoint 当持久恢复点；跨轮承接与持久恢复只看 `history/<conversationId>/state.json` + `history/<conversationId>/context.json`
+
+### 5.1 checkpoint 投影必须幂等且只有一个事实源
+
+- 把 checkpoint 当作 `state.json + context.json` 的纯投影，不要把它写成第二套语义历史。
+- 不要创建或维护 `checkpoint.json`、checkpoint history、独立 checkpoint entry 序列等持久化事实源。
+- 允许在当前 stream 内存中保留 latest checkpoint 供 retry/resume 使用；进程重启后必须能从唯一事实源重新投影。
+- 对同一份 semantic history 重复投影时，要求 state、turn 顺序、blob ID 和 blob 内容在语义上完全一致；投影函数不得修改输入 history。
+- 把重复发送视为同一快照的幂等覆盖，不要追加一条新的会话历史；内容寻址 blob 的重复写入必须可安全忽略。
+- 将 `turns` 投影为 UI 可恢复的完整结构，保留所有需要展示的 `ThinkingMessage`、`ToolCall` 和工具结果；不要为了模型 prompt 过滤而删除 UI step。
+- 将 `root_prompt_messages_json` 单独投影为模型 replay；只在这条投影上应用 provider/context 过滤，不能反向改变 `turns`。
+- 将工具完成结果合并回同一 `ToolCall`，保留开始态的 `args`、调用 ID 和开始时间，再补齐 `result` 与完成时间；不要制造协议不存在的独立 `ToolResult` step。
+- 用 TDD 覆盖至少这些性质：重复投影相等、投影不修改 history、开始态字段在结果合并后仍存在、UI turns 保留思考/工具内容而模型 replay 仍遵守独立过滤规则。

.gitignore

@@ -15,6 +15,7 @@ server-go/log/
 .cursor-local-assistant
 .cursor-local-assistant-v2
 .cursor-app-formatted/
+proto/extensions-cursor-app/
 ads-server-linux-amd64.tar
 cmd/ads-server/*.db
 cmd/ads-server/*.db-*

build/Taskfile.yml

@@ -13,8 +13,8 @@ tasks:
     preconditions:
       - sh: 'test -z "{{.PROTO_INPUT}}" || test -f "{{.PROTO_INPUT}}"'
         msg: "PROTO_INPUT 指向的 Cursor 扩展 bundle 不存在。"
-      - sh: 'test -n "{{.PROTO_INPUT}}" || test -f ./proto/extensions-cursor-app/cursor-always-local/dist/main.js || test -f /Applications/Cursor.app/Contents/Resources/app/extensions/cursor-always-local/dist/main.js'
-        msg: "未找到 Cursor 扩展 bundle；请传入 PROTO_INPUT=/path/to/cursor-always-local/dist/main.js。"
+      - sh: 'test -n "{{.PROTO_INPUT}}" || test -f /Applications/Cursor.app/Contents/Resources/app/extensions/cursor-always-local/dist/main.js'
+        msg: "未找到已安装 Cursor 的扩展 bundle；请传入 PROTO_INPUT=/path/to/cursor-always-local/dist/main.js。"
     cmds:
       - chmod +x ./proto/extract_extensions_proto.sh
       - '{{if .PROTO_INPUT}}./proto/extract_extensions_proto.sh "{{.PROTO_INPUT}}"{{else}}./proto/extract_extensions_proto.sh{{end}}'
@@ -29,9 +29,16 @@ tasks:
       - cp ./proto/from_extensions/aiserver_v1.proto ./proto/aiserver_v1.proto
       - perl -0pi -e 's|option go_package = "react-admin/cursor-server/gen/agent/v1;agentv1";|option go_package = "cursor/gen/agentv1;agentv1";|' ./proto/agent_v1.proto
       - perl -0pi -e 's|option go_package = "react-admin/cursor-server/gen/aiserver/v1;aiserverv1";|option go_package = "cursor/gen/aiserverv1;aiserverv1";|' ./proto/aiserver_v1.proto
+      - ./proto/check_proto_sync.sh
       - rm -rf ./gen/agentv1 ./gen/aiserverv1
       - task: generate:proto
 
+  check:proto:
+    summary: 检查根 proto 与扩展提取快照是否一致
+    dir: '{{.ROOT_DIR}}'
+    cmds:
+      - ./proto/check_proto_sync.sh
+
   generate:proto:
     summary: 生成 proto Go/Connect 代码
     dir: '{{.ROOT_DIR}}'

cursor-proxy-debugger/README.en.md

@@ -2,7 +2,7 @@
 
 [中文](README.md) | [English](README.en.md)
 
-This standalone local HTTPS debugging proxy captures Cursor's `BidiAppend` and `RunSSE` traffic. It does not modify Cursor, the system proxy, or the installed client.
+This standalone local HTTPS debugging proxy captures Cursor's `BidiAppend`, `RunSSE`, and Fork Chat traffic. It does not modify Cursor, the system proxy, or the installed client.
 
 ## Start
 
@@ -51,6 +51,8 @@ go build -o bin/cursor-proxy-debugger ./cmd/cursor-proxy-debugger
 - HTTPS MITM is applied only to `target-host`; other CONNECT traffic passes through unchanged.
 - `RunSSE` is decoded incrementally using the 5-byte Connect frame header and supports per-frame gzip decompression.
 - `BidiAppendRequest.data` is further decoded as `agent.v1.AgentClientMessage`.
+- Fork Chat's `ForkBackgroundComposer`, `NotifyConversationClone`, and `UploadConversationBlobs` traffic is decoded bidirectionally as protobuf JSON.
+- Local Fork Chat is primarily client-side and only emits `NotifyConversationClone` and `UploadConversationBlobs` when clone blob synchronization is enabled and privacy settings allow it.
 - Requests can be sorted chronologically or in reverse chronological order and filtered by protocol `request_id`.
 - The UI supports Simplified Chinese and English, follows the browser language, and remembers a manual selection.
 - Captured traffic is stored only in process memory and is discarded when the process exits.

cursor-proxy-debugger/README.md

@@ -2,7 +2,7 @@
 
 [中文](README.md) | [English](README.en.md)
 
-这是一个独立运行的本地 HTTPS 调试代理，用于观察 Cursor 的 `BidiAppend` 和 `RunSSE` 通信。它不会修改 Cursor、系统代理或已安装客户端。
+这是一个独立运行的本地 HTTPS 调试代理，用于观察 Cursor 的 `BidiAppend`、`RunSSE` 和 Fork Chat 相关通信。它不会修改 Cursor、系统代理或已安装客户端。
 
 ## 启动
 
@@ -51,6 +51,8 @@ go build -o bin/cursor-proxy-debugger ./cmd/cursor-proxy-debugger
 - 仅对 `target-host` 执行 HTTPS MITM，其他 CONNECT 流量直接透传。
 - `RunSSE` 按 5 字节 Connect 帧头增量拆帧，支持逐帧 gzip 解压。
 - `BidiAppendRequest.data` 会继续解码为 `agent.v1.AgentClientMessage`。
+- Fork Chat 相关的 `ForkBackgroundComposer`、`NotifyConversationClone` 和 `UploadConversationBlobs` 会双向解码为 protobuf JSON。
+- 本地 Fork Chat 主要在客户端完成，只有启用克隆 blob 同步且隐私设置允许时才会产生 `NotifyConversationClone` 和 `UploadConversationBlobs` 流量。
 - 请求列表支持按抓包时间正序/倒序排列，并可按协议中的 `request_id` 过滤。
 - 调试界面支持简体中文和英文，可跟随浏览器语言并记住手动选择。
 - 抓包只保留在当前进程内存中；关闭进程后消失。

cursor-proxy-debugger/decode.go

@@ -20,6 +20,13 @@ import (
 
 const maxConnectFrameBytes = 64 << 20
 
+const (
+	bidiAppendPath              = "/aiserver.v1.BidiService/BidiAppend"
+	forkBackgroundComposerPath  = "/aiserver.v1.BackgroundComposerService/ForkBackgroundComposer"
+	notifyConversationClonePath = "/agent.v1.AgentService/NotifyConversationClone"
+	uploadConversationBlobsPath = "/agent.v1.AgentService/UploadConversationBlobs"
+)
+
 type connectFrameDecoder struct {
 	buffer      []byte
 	messageType string
@@ -140,10 +147,9 @@ func decompressPayload(payload []byte, codec string) ([]byte, error) {
 	return decoded, nil
 }
 
-func decodeUnary(path string, payload []byte) (decodedJSON string, kind string, requestID string, err error) {
-	var message proto.Message
+func decodeUnaryRequest(path string, payload []byte) (decodedJSON string, kind string, requestID string, err error) {
 	switch path {
-	case "/aiserver.v1.BidiService/BidiAppend":
+	case bidiAppendPath:
 		request := &aiserverv1.BidiAppendRequest{}
 		if err := proto.Unmarshal(payload, request); err != nil {
 			return "", "", "", err
@@ -165,13 +171,65 @@ func decodeUnary(path string, payload []byte) (decodedJSON string, kind string,
 		}
 		formatted, marshalErr := json.MarshalIndent(combined, "", "  ")
 		return string(formatted), clientKind, requestID, marshalErr
-	default:
-		message = nil
 	}
+	message, kind := unaryRequestMessage(path)
 	if message == nil {
 		return "", "", "", nil
 	}
-	return marshalProtoJSON(message), activeOneofName(message), "", nil
+	if err := proto.Unmarshal(payload, message); err != nil {
+		return "", "", "", err
+	}
+	return marshalProtoJSON(message), kind, "", nil
+}
+
+func decodeUnaryResponse(path string, payload []byte) (decodedJSON string, kind string, err error) {
+	message, kind := unaryResponseMessage(path)
+	if message == nil {
+		return "", "", nil
+	}
+	if err := proto.Unmarshal(payload, message); err != nil {
+		return "", "", err
+	}
+	return marshalProtoJSON(message), kind, nil
+}
+
+func unaryRequestMessage(path string) (proto.Message, string) {
+	switch path {
+	case forkBackgroundComposerPath:
+		return &aiserverv1.ForkBackgroundComposerRequest{}, "fork_background_composer_request"
+	case notifyConversationClonePath:
+		return &agentv1.NotifyConversationCloneRequest{}, "notify_conversation_clone_request"
+	case uploadConversationBlobsPath:
+		return &agentv1.UploadConversationBlobsRequest{}, "upload_conversation_blobs_request"
+	default:
+		return nil, ""
+	}
+}
+
+func unaryResponseMessage(path string) (proto.Message, string) {
+	switch path {
+	case forkBackgroundComposerPath:
+		return &aiserverv1.ForkBackgroundComposerResponse{}, "fork_background_composer_response"
+	case notifyConversationClonePath:
+		return &agentv1.NotifyConversationCloneResponse{}, "notify_conversation_clone_response"
+	case uploadConversationBlobsPath:
+		return &agentv1.UploadConversationBlobsResponse{}, "upload_conversation_blobs_response"
+	default:
+		return nil, ""
+	}
+}
+
+func decodesUnaryRequest(path string) bool {
+	if path == bidiAppendPath {
+		return true
+	}
+	message, _ := unaryRequestMessage(path)
+	return message != nil
+}
+
+func decodesUnaryResponse(path string) bool {
+	message, _ := unaryResponseMessage(path)
+	return message != nil
 }
 
 func newMessage(messageType string) proto.Message {

cursor-proxy-debugger/decode_test.go

@@ -0,0 +1,242 @@
+package proxydebugger
+
+import (
+	"bytes"
+	"compress/gzip"
+	"encoding/json"
+	"strings"
+	"testing"
+	"time"
+
+	"cursor/gen/agentv1"
+	"cursor/gen/aiserverv1"
+
+	"google.golang.org/protobuf/proto"
+)
+
+func TestDecodeForkTrafficRequests(t *testing.T) {
+	t.Parallel()
+
+	tests := []struct {
+		name     string
+		path     string
+		message  proto.Message
+		kind     string
+		contains []string
+	}{
+		{
+			name: "fork background composer",
+			path: forkBackgroundComposerPath,
+			message: &aiserverv1.ForkBackgroundComposerRequest{
+				SourceBcId: "bc-source",
+				Mode:       aiserverv1.ForkBackgroundComposerMode_FORK_BACKGROUND_COMPOSER_MODE_CONVERSATION,
+				Name:       proto.String("forked chat"),
+				TurnCount:  proto.Uint32(4),
+			},
+			kind:     "fork_background_composer_request",
+			contains: []string{`"source_bc_id":"bc-source"`, `"turn_count":4`},
+		},
+		{
+			name: "notify conversation clone",
+			path: notifyConversationClonePath,
+			message: &agentv1.NotifyConversationCloneRequest{
+				ConversationId:       "new-conversation",
+				SourceConversationId: "source-conversation",
+				SourceRequestId:      "source-request",
+			},
+			kind:     "notify_conversation_clone_request",
+			contains: []string{`"conversation_id":"new-conversation"`, `"source_conversation_id":"source-conversation"`},
+		},
+		{
+			name: "upload conversation blobs",
+			path: uploadConversationBlobsPath,
+			message: &agentv1.UploadConversationBlobsRequest{
+				ConversationId: "new-conversation",
+				Blobs: []*agentv1.BlobEntry{{
+					Id:    []byte{1, 2},
+					Value: []byte("blob-value"),
+				}},
+				ChunkIndex:  1,
+				TotalChunks: 2,
+			},
+			kind:     "upload_conversation_blobs_request",
+			contains: []string{`"conversation_id":"new-conversation"`, `"total_chunks":2`, `"value":"YmxvYi12YWx1ZQ=="`},
+		},
+	}
+
+	for _, test := range tests {
+		test := test
+		t.Run(test.name, func(t *testing.T) {
+			t.Parallel()
+			payload, err := proto.Marshal(test.message)
+			if err != nil {
+				t.Fatal(err)
+			}
+			decoded, kind, requestID, err := decodeUnaryRequest(test.path, payload)
+			if err != nil {
+				t.Fatalf("decode request: %v", err)
+			}
+			if kind != test.kind {
+				t.Fatalf("kind = %q, want %q", kind, test.kind)
+			}
+			if requestID != "" {
+				t.Fatalf("request ID = %q, want empty", requestID)
+			}
+			compact := compactJSON(t, decoded)
+			for _, expected := range test.contains {
+				if !strings.Contains(compact, expected) {
+					t.Errorf("decoded JSON does not contain %q:\n%s", expected, decoded)
+				}
+			}
+		})
+	}
+}
+
+func TestDecodeForkTrafficResponses(t *testing.T) {
+	t.Parallel()
+
+	tests := []struct {
+		name     string
+		path     string
+		message  proto.Message
+		kind     string
+		contains string
+	}{
+		{
+			name: "fork background composer",
+			path: forkBackgroundComposerPath,
+			message: &aiserverv1.ForkBackgroundComposerResponse{
+				BcId:       "bc-fork",
+				SourceBcId: "bc-source",
+				Mode:       aiserverv1.ForkBackgroundComposerMode_FORK_BACKGROUND_COMPOSER_MODE_CONVERSATION,
+			},
+			kind:     "fork_background_composer_response",
+			contains: `"bc_id":"bc-fork"`,
+		},
+		{
+			name:     "notify conversation clone",
+			path:     notifyConversationClonePath,
+			message:  &agentv1.NotifyConversationCloneResponse{},
+			kind:     "notify_conversation_clone_response",
+			contains: `{}`,
+		},
+		{
+			name:     "upload conversation blobs",
+			path:     uploadConversationBlobsPath,
+			message:  &agentv1.UploadConversationBlobsResponse{},
+			kind:     "upload_conversation_blobs_response",
+			contains: `{}`,
+		},
+	}
+
+	for _, test := range tests {
+		test := test
+		t.Run(test.name, func(t *testing.T) {
+			t.Parallel()
+			payload, err := proto.Marshal(test.message)
+			if err != nil {
+				t.Fatal(err)
+			}
+			decoded, kind, err := decodeUnaryResponse(test.path, payload)
+			if err != nil {
+				t.Fatalf("decode response: %v", err)
+			}
+			if kind != test.kind {
+				t.Fatalf("kind = %q, want %q", kind, test.kind)
+			}
+			if !strings.Contains(compactJSON(t, decoded), test.contains) {
+				t.Errorf("decoded JSON does not contain %q:\n%s", test.contains, decoded)
+			}
+		})
+	}
+}
+
+func TestFinishResponseBodyDecodesCompressedForkResponse(t *testing.T) {
+	t.Parallel()
+
+	payload, err := proto.Marshal(&aiserverv1.ForkBackgroundComposerResponse{
+		BcId:       "bc-fork",
+		SourceBcId: "bc-source",
+	})
+	if err != nil {
+		t.Fatal(err)
+	}
+	var compressed bytes.Buffer
+	writer := gzip.NewWriter(&compressed)
+	if _, err := writer.Write(payload); err != nil {
+		t.Fatal(err)
+	}
+	if err := writer.Close(); err != nil {
+		t.Fatal(err)
+	}
+
+	server := &Server{store: newExchangeStore(1)}
+	server.store.create(&Exchange{
+		ExchangeSummary: ExchangeSummary{ID: "1", StartedAt: time.Now()},
+	})
+	server.finishResponseBody("1", forkBackgroundComposerPath, "gzip", compressed.Bytes(), int64(compressed.Len()), false, nil)
+
+	exchange, ok := server.store.get("1")
+	if !ok {
+		t.Fatal("exchange was not stored")
+	}
+	if exchange.ResponseKind != "fork_background_composer_response" {
+		t.Fatalf("response kind = %q", exchange.ResponseKind)
+	}
+	if !strings.Contains(compactJSON(t, exchange.Response.DecodedJSON), `"bc_id":"bc-fork"`) {
+		t.Fatalf("unexpected decoded response:\n%s", exchange.Response.DecodedJSON)
+	}
+	if exchange.Response.DecodeError != "" {
+		t.Fatalf("decode error = %q", exchange.Response.DecodeError)
+	}
+}
+
+func TestFinishRequestBodyDecodesCompressedCloneRequest(t *testing.T) {
+	t.Parallel()
+
+	payload, err := proto.Marshal(&agentv1.NotifyConversationCloneRequest{
+		ConversationId:       "new-conversation",
+		SourceConversationId: "source-conversation",
+		SourceRequestId:      "source-request",
+	})
+	if err != nil {
+		t.Fatal(err)
+	}
+	var compressed bytes.Buffer
+	writer := gzip.NewWriter(&compressed)
+	if _, err := writer.Write(payload); err != nil {
+		t.Fatal(err)
+	}
+	if err := writer.Close(); err != nil {
+		t.Fatal(err)
+	}
+
+	server := &Server{store: newExchangeStore(1)}
+	server.store.create(&Exchange{
+		ExchangeSummary: ExchangeSummary{ID: "1", StartedAt: time.Now()},
+	})
+	server.finishRequestBody("1", notifyConversationClonePath, "gzip", compressed.Bytes(), int64(compressed.Len()), false, nil)
+
+	exchange, ok := server.store.get("1")
+	if !ok {
+		t.Fatal("exchange was not stored")
+	}
+	if exchange.RequestKind != "notify_conversation_clone_request" {
+		t.Fatalf("request kind = %q", exchange.RequestKind)
+	}
+	if !strings.Contains(compactJSON(t, exchange.Request.DecodedJSON), `"source_conversation_id":"source-conversation"`) {
+		t.Fatalf("unexpected decoded request:\n%s", exchange.Request.DecodedJSON)
+	}
+	if exchange.Request.DecodeError != "" {
+		t.Fatalf("decode error = %q", exchange.Request.DecodeError)
+	}
+}
+
+func compactJSON(t *testing.T, value string) string {
+	t.Helper()
+	var compact bytes.Buffer
+	if err := json.Compact(&compact, []byte(value)); err != nil {
+		t.Fatalf("compact JSON: %v\n%s", err, value)
+	}
+	return compact.String()
+}

cursor-proxy-debugger/proxy.go

@@ -226,28 +226,29 @@ func (server *Server) captureResponse(response *http.Response, context *goproxy.
 	if id == "" || response == nil {
 		return response
 	}
+	path := ""
+	if response.Request != nil && response.Request.URL != nil {
+		path = response.Request.URL.Path
+	}
+	responseCodec := responseContentCodec(path, response.Header)
 	server.store.update(id, func(exchange *Exchange) {
 		exchange.Status = response.StatusCode
 		exchange.State = "streaming"
 		exchange.DurationMS = elapsedMS(exchange.StartedAt)
 		exchange.Response.Headers = sortedHeaders(response.Header)
 		exchange.Response.ContentType = response.Header.Get("Content-Type")
-		exchange.Response.ContentCodec = responseContentCodec(response.Header)
+		exchange.Response.ContentCodec = responseCodec
 	})
 	if response.Body == nil {
-		server.finishResponseBody(id, nil, 0, false, nil)
+		server.finishResponseBody(id, path, responseCodec, nil, 0, false, nil)
 		return response
 	}
 
-	path := ""
-	if response.Request != nil && response.Request.URL != nil {
-		path = response.Request.URL.Path
-	}
 	var frameDecoder *connectFrameDecoder
 	if path == "/agent.v1.AgentService/RunSSE" {
 		frameDecoder = newConnectFrameDecoder(
 			"agent.v1.AgentServerMessage",
-			response.Header.Get("Connect-Content-Encoding"),
+			responseCodec,
 			server.config.MaxFrames,
 			func(frame FrameView) { server.appendResponseFrame(id, frame) },
 		)
@@ -264,7 +265,7 @@ func (server *Server) captureResponse(response *http.Response, context *goproxy.
 			if frameDecoder != nil {
 				frameDecoder.Close()
 			}
-			server.finishResponseBody(id, captured, size, truncated, readErr)
+			server.finishResponseBody(id, path, responseCodec, captured, size, truncated, readErr)
 		},
 	)
 	return response
@@ -273,14 +274,14 @@ func (server *Server) captureResponse(response *http.Response, context *goproxy.
 func (server *Server) finishRequestBody(id, path string, codec string, captured []byte, size int64, truncated bool, readErr error) {
 	decodePayload := captured
 	var contentDecodeErr error
-	if path == "/aiserver.v1.BidiService/BidiAppend" && truncated {
+	if decodesUnaryRequest(path) && truncated {
 		contentDecodeErr = errors.New("请求正文超过抓取上限，无法完整解码")
-	} else if path == "/aiserver.v1.BidiService/BidiAppend" && codec != "" && !strings.EqualFold(codec, "identity") {
+	} else if decodesUnaryRequest(path) && codec != "" && !strings.EqualFold(codec, "identity") {
 		decodePayload, contentDecodeErr = decompressPayload(captured, codec)
 	}
 	decodedJSON, kind, requestID, decodeErr := "", "", "", contentDecodeErr
 	if decodeErr == nil {
-		decodedJSON, kind, requestID, decodeErr = decodeUnary(path, decodePayload)
+		decodedJSON, kind, requestID, decodeErr = decodeUnaryRequest(path, decodePayload)
 	}
 	server.store.update(id, func(exchange *Exchange) {
 		exchange.RequestBytes = size
@@ -312,19 +313,44 @@ func requestContentCodec(path string, headers http.Header) string {
 	return strings.TrimSpace(headers.Get("Content-Encoding"))
 }
 
-func responseContentCodec(headers http.Header) string {
+func responseContentCodec(path string, headers http.Header) string {
+	if path == "/agent.v1.AgentService/RunSSE" {
+		return strings.TrimSpace(headers.Get("Connect-Content-Encoding"))
+	}
+	if !decodesUnaryResponse(path) {
 		if codec := strings.TrimSpace(headers.Get("Connect-Content-Encoding")); codec != "" {
 			return codec
 		}
+	}
 	return strings.TrimSpace(headers.Get("Content-Encoding"))
 }
 
-func (server *Server) finishResponseBody(id string, captured []byte, size int64, truncated bool, readErr error) {
+func (server *Server) finishResponseBody(id, path, codec string, captured []byte, size int64, truncated bool, readErr error) {
+	decodePayload := captured
+	var contentDecodeErr error
+	if decodesUnaryResponse(path) && truncated {
+		contentDecodeErr = errors.New("响应正文超过抓取上限，无法完整解码")
+	} else if decodesUnaryResponse(path) && codec != "" && !strings.EqualFold(codec, "identity") {
+		decodePayload, contentDecodeErr = decompressPayload(captured, codec)
+	}
+	decodedJSON, kind, decodeErr := "", "", contentDecodeErr
+	if decodeErr == nil {
+		decodedJSON, kind, decodeErr = decodeUnaryResponse(path, decodePayload)
+	}
 	server.store.update(id, func(exchange *Exchange) {
 		exchange.ResponseBytes = size
 		exchange.Response.Size = size
 		exchange.Response.RawHex = rawHex(captured)
 		exchange.Response.RawTruncated = truncated
+		if decodedJSON != "" {
+			exchange.Response.DecodedJSON = decodedJSON
+		}
+		if kind != "" {
+			exchange.ResponseKind = kind
+		}
+		if decodeErr != nil {
+			exchange.Response.DecodeError = decodeErr.Error()
+		}
 		exchange.DurationMS = elapsedMS(exchange.StartedAt)
 		exchange.State = "completed"
 		if readErr != nil && !errors.Is(readErr, io.EOF) {

cursor-proxy-debugger/web/app.js

@@ -138,6 +138,7 @@ function filteredExchanges() {
     .filter((item) => {
       if (state.endpoint === "runsse" && !item.path.toLowerCase().includes("runsse")) return false;
       if (state.endpoint === "bidiappend" && !item.path.toLowerCase().includes("bidiappend")) return false;
+      if (state.endpoint === "fork" && !isForkTrafficPath(item.path)) return false;
       if (requestId && !String(item.requestId || "").toLowerCase().includes(requestId)) return false;
       if (!query) return true;
       return [item.url, item.requestId, item.requestKind, item.responseKind, item.state, String(item.status)]
@@ -151,6 +152,13 @@ function filteredExchanges() {
     });
 }
 
+function isForkTrafficPath(path) {
+  const normalized = String(path || "").toLowerCase();
+  return ["forkbackgroundcomposer", "notifyconversationclone", "uploadconversationblobs"].some((endpoint) =>
+    normalized.includes(endpoint),
+  );
+}
+
 function renderList() {
   const exchanges = filteredExchanges();
   elements.requestCount.textContent = t("count.requests", { count: exchanges.length });

cursor-proxy-debugger/web/i18n.js

@@ -22,6 +22,7 @@ const messages = {
     "filters.requestIdPlaceholder": "按 Request ID 过滤",
     "filters.endpoint": "接口过滤",
     "filters.all": "全部",
+    "filters.fork": "Fork",
     "filters.sort": "排序方向",
     "filters.ascending": "正序",
     "filters.descending": "倒序",
@@ -81,6 +82,7 @@ const messages = {
     "filters.requestIdPlaceholder": "Filter by Request ID",
     "filters.endpoint": "Endpoint filter",
     "filters.all": "All",
+    "filters.fork": "Fork",
     "filters.sort": "Sort order",
     "filters.ascending": "Oldest first",
     "filters.descending": "Newest first",

cursor-proxy-debugger/web/index.html

@@ -46,6 +46,7 @@
           <button class="active" type="button" data-value="all" data-i18n="filters.all">全部</button>
           <button type="button" data-value="runsse">RunSSE</button>
           <button type="button" data-value="bidiappend">BidiAppend</button>
+          <button type="button" data-value="fork" data-i18n="filters.fork">Fork</button>
         </div>
         <div id="sort-order" class="segmented-control sort-control" role="group" aria-label="排序方向" data-i18n-aria-label="filters.sort">
           <button type="button" data-value="asc" data-i18n="filters.ascending">正序</button>

frontend/src/components/ui/MultiSelect.vue

@@ -0,0 +1,362 @@
+<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>

frontend/src/i18n/locales/en-US.json

@@ -18,6 +18,7 @@
   "15d124b200ddabed": "Maximum number of context tokens the model can accept in a single request. Leave blank to use the default.",
   "185aebe19c77425d": "{0} must be a JSON object",
   "18b7312022cd1840": "Start Service",
+  "1afed6a81a2512d2": "Select model",
   "1baddde657dd2720": "Current outbound requests use system proxy",
   "1bc77f5ab979f4c1": "Add Model Settings",
   "1c631615c1d85c9e": "Log in to Cursor",
@@ -29,6 +30,7 @@
   "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",
@@ -44,8 +46,10 @@
   "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",
@@ -69,6 +73,7 @@
   "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.",
   "5d1687a4a41883fd": "Stopping...",
@@ -95,8 +100,10 @@
   "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",
@@ -106,15 +113,16 @@
   "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.",
   "83be9cac28873059": "Cursor Control Plane Account",
   "8672864e90417138": "Max",
   "86df7ec743047234": "Service running",
+  "891bfee3bbe52d3c": "Enter a model ID",
   "899add6275682210": "Uses 200000 by default when left blank",
   "8a4ef3e48e4e8a5a": "Enabled",
   "8c1935935600e336": "Model Test",
   "8cbcf741e727dbf7": "Model Settings",
   "8d1de152be6360ce": "Valid ratio: {0}",
-  "8e2dc7b0d2e8f6f8": "e.g. OpenAI - GPT-4.1",
   "8f6f8d979c981ced": "Copied",
   "8f8baf5d18dd0492": "When enabled, the JSON object will override the OpenAI request body. Duplicate fields are determined by this field. OpenAI service_tier supports auto, default, flex, scale, priority; priority can be used for high-priority/Fast scenarios.",
   "8faa670b512b6b9b": "Open Model Settings",
@@ -160,6 +168,7 @@
   "b571037dc396a00c": "Total request tokens include both prompt and model output.",
   "b765005f69fa971f": "e.g. gpt-4.1",
   "b76a22622020f849": "Select interface protocol endpoint. When selecting 'Custom Path', please enter the complete request URL in the API address bar (including the /chat/completions or /responses suffix). The system will automatically detect the protocol type based on the trailing segment.",
+  "b7ceef2fbfeb4a85": "e.g. GPT-5",
   "b870928f8f9a24c4": "API Endpoint",
   "b90a8ac9c488ce46": "Select language",
   "ba3c66f90fd11725": "System proxy identified",
@@ -173,6 +182,7 @@
   "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.",
   "c69f5bce63b9f14c": "Settings Folder",
+  "c72d5dc20cd27118": "{0} / {1} models selected",
   "c8a52b66651d294c": "Failed to log out",
   "c8c14507b2d37395": "Reasoning Effort",
   "c98e118e0a43f078": "Model",
@@ -206,6 +216,7 @@
   "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",
@@ -218,6 +229,7 @@
   "f3a76d896853c1df": "Miss",
   "f3fae6cccb9004b1": "Custom header name cannot be empty",
   "f474a4108aba4c4c": "Stop Service",
+  "f4d4bae588c4c0ff": "Deselect all",
   "f4f0ead1116b5b62": "Enable",
   "f56c6c82203b33f6": "Notice",
   "f61e03f047b786d5": "{0} max output tokens must be a positive integer",

frontend/src/i18n/locales/ja-JP.json

@@ -18,6 +18,7 @@
   "15d124b200ddabed": "モデルが1回のリクエストで受け取れる最大コンテキスト Token 数。空欄の場合はデフォルト値を使用します。",
   "185aebe19c77425d": "{0}はJSONオブジェクトである必要があります",
   "18b7312022cd1840": "サービスを開始",
+  "1afed6a81a2512d2": "モデルを選択",
   "1baddde657dd2720": "現在のアウトバウンドリクエストはシステムプロキシを使用しています",
   "1bc77f5ab979f4c1": "モデル設定を追加",
   "1c631615c1d85c9e": "Cursor にログイン",
@@ -29,6 +30,7 @@
   "281eb6d08c9960d0": "{0} の思考予算 Token は正の整数である必要があります",
   "28aeffc70ceb4267": "この画面の表示言語を切り替えます。設定はすぐに反映され、この端末に保存されます",
   "2a24519398684ed5": "ホームページへ",
+  "2c18d5e2d70b45db": "モデルのプレフィックス",
   "2cd0f3be8738a86c": "キャンセル",
   "2d706f7981b45a7b": "ローカル設定を保存しました",
   "2f9daa828907b93f": "削除",
@@ -44,8 +46,10 @@
   "37d23612f78a2e63": "今すぐ再起動して更新",
   "392d0dceb45998d3": "最高",
   "393df9bb13ea4900": "ヒット",
+  "3a5040b68abf75f9": "すべて選択",
   "3ab8cc15939f3b5c": "ログアウト",
   "3af7e5489e61ea51": "更新中",
+  "3b2e5f2fba1bcbc7": "インターフェースのアドレスとアクセスキーを入力してください",
   "3c2a9f9901109e75": "{0} のタイプは OpenAI または Anthropic のみサポートします",
   "3d13868593ae4eeb": "表示言語",
   "3d52574ce1500561": "未接続",
@@ -69,6 +73,7 @@
   "58c6b0935a7216da": "コントリビューターのプロフィールを開けませんでした",
   "593a972852ba0004": "Cursor アシスタント | 永久無料 | カスタム API",
   "59a2195a01a8b35b": "{0}は有効なJSONオブジェクトである必要があります",
+  "5a5c8318ef649672": "{0}件を選択中",
   "5aa8f5590c940829": "非キャッシュ入力：{0}",
   "5beb1206c532729f": "1回の応答で生成できる最大 Token 数。空欄の場合はデフォルト値を使用します。",
   "5d1687a4a41883fd": "停止中...",
@@ -95,9 +100,11 @@
   "737225e2904673fc": "推定出力 Token: {0}",
   "7520bd50a5ee5471": "テスト停止 {0}/{1}",
   "753d8bb0da9913ce": "複製に失敗しました",
+  "75b5f4c68c79322c": "保存するモデルを1つ以上選択してください",
   "774d6e1b7cb89751": "デフォルト定義",
   "77c9e582e85583af": "テスト失敗",
-  "7a26bf794e9fb6bf": "UI 上の表示専用で、異なるモデルを見分けやすくします。",
+  "7923d007483ae04c": "保存できるモデルがありません",
+  "7a26bf794e9fb6bf": "UIでモデルを区別するための表示専用です。",
   "7b6187c41e88b70c": "テスト中...",
   "7bf8e2c07e084d09": "モデル編集",
   "7df7641e5e741346": "キャッシュ読み取り / (キャッシュ読み取り + キャッシュ作成 + 非キャッシュ入力)",
@@ -106,15 +113,16 @@
   "80296f4aa3f4543b": "キャッシュ読み書き",
   "81123c56d5d880d0": "API キー",
   "8139cb3dd11f5a67": "有効にすると、JSONオブジェクトが最終的なリクエストヘッダーを上書きします。同名のヘッダーはこの設定が優先され、値は文字列である必要があります。",
+  "826c0e5a4407befa": "複数のモデルを選択できます。保存されるのは選択したモデルだけで、モデルごとに1つの設定が作成されます。",
   "83be9cac28873059": "Cursor コントロールプレーンアカウント",
   "8672864e90417138": "最大",
   "86df7ec743047234": "サービス稼働中",
+  "891bfee3bbe52d3c": "モデルIDを入力してください",
   "899add6275682210": "空欄で 200000",
   "8a4ef3e48e4e8a5a": "有効",
   "8c1935935600e336": "モデルテスト",
   "8cbcf741e727dbf7": "モデル設定",
   "8d1de152be6360ce": "有効率: {0}",
-  "8e2dc7b0d2e8f6f8": "例: OpenAI - GPT-4.1",
   "8f6f8d979c981ced": "コピーしました",
   "8f8baf5d18dd0492": "有効にすると、JSONオブジェクトがOpenAIのリクエストボディを上書きします。同名のフィールドはこの設定が優先されます。OpenAIのservice_tierはauto、default、flex、scale、priorityをサポートしており、priorityは高優先度/Fastのシナリオで使用できます。",
   "8faa670b512b6b9b": "モデル設定を開く",
@@ -122,7 +130,7 @@
   "917b1c1f18d0276b": "保存中...",
   "9196835e388d2550": "すべてテスト",
   "91cba5c107a51892": "/ 異常",
-  "92059fe6cd713db4": "実際にサーバーへ送信されるモデル名です。例: gpt-4.1 または claude-sonnet。",
+  "92059fe6cd713db4": "サーバーに実際に送信されるモデル名。例: gpt-4.1、claude-sonnet。",
   "93e08803675e378b": "モデルID",
   "93faf55cd25c8319": "このソフトウェアは完全に無料です。もし料金を請求された場合は、詐欺の可能性が高いです。\n著者のホームページ https://space.bilibili.com/311706663/upload/video にアクセスして、更新情報や利用方法などを確認してください。",
   "942ff2d88baca0c6": "アップデートを確認中...",
@@ -160,6 +168,7 @@
   "b571037dc396a00c": "総リクエスト Token には Prompt とモデル出力の両方が含まれます。",
   "b765005f69fa971f": "例: gpt-4.1",
   "b76a22622020f849": "インターフェースプロトコルのエンドポイントを選択します。「カスタムパス」を選択する場合は、APIアドレスバーに完全なリクエストURL（/chat/completions または /responses のサフィックスを含む）を入力してください。システムは末尾 of セグメントに基づいてプロトコルタイプを自動的に判断します。",
+  "b7ceef2fbfeb4a85": "例: GPT-5",
   "b870928f8f9a24c4": "APIエンドポイント",
   "b90a8ac9c488ce46": "言語を選択",
   "ba3c66f90fd11725": "システムプロキシを認識しました",
@@ -173,6 +182,7 @@
   "c3d46b387eeadb23": "cursor-byok 内の Cursor アカウントからのみログアウトします。Cursor クライアントからはログアウトしません。続行しますか？",
   "c5af02060847d167": "Anthropic adaptive thinkingの思考強度。リクエストは一貫して新しいthinking.type=adaptiveを使用します。",
   "c69f5bce63b9f14c": "設定フォルダー",
+  "c72d5dc20cd27118": "{0} / {1} モデルを選択中",
   "c8a52b66651d294c": "ログアウトに失敗しました",
   "c8c14507b2d37395": "推論強度",
   "c98e118e0a43f078": "モデル",
@@ -206,6 +216,7 @@
   "e4c0daa3c4bea691": "Cursor コントロールプレーンアカウント機能への @aike0210 の貢献に感謝します。",
   "e53580f8031f13c0": "ブラウザでログインを完了し、Cursor に戻ってプラグインマーケットを開き直してください",
   "e552c2accdbf5178": "モデルを追加",
+  "e6943d5cbfb863e0": "モデルを取得中...",
   "e6faccfddce722e8": "キャッシュ読込 Token: {0}",
   "e8a0a6053998ebfa": "ログイン済み",
   "eaffd48cd2ea9f1a": "例: https://api.anthropic.com",
@@ -218,6 +229,7 @@
   "f3a76d896853c1df": "ミス",
   "f3fae6cccb9004b1": "カスタムヘッダー名は空にできません",
   "f474a4108aba4c4c": "サービスを停止",
+  "f4d4bae588c4c0ff": "すべて選択解除",
   "f4f0ead1116b5b62": "有効化",
   "f56c6c82203b33f6": "お知らせ",
   "f61e03f047b786d5": "{0} の最大出力 Token は正の整数である必要があります",

frontend/src/i18n/locales/ru-RU.json

@@ -18,6 +18,7 @@
   "15d124b200ddabed": "Максимальное число токенов контекста, которое модель может принять за один запрос. Оставьте поле пустым для значения по умолчанию.",
   "185aebe19c77425d": "{0} должен быть объектом JSON",
   "18b7312022cd1840": "Запустить сервис",
+  "1afed6a81a2512d2": "Выберите модель",
   "1baddde657dd2720": "Исходящие запросы используют системный прокси",
   "1bc77f5ab979f4c1": "Добавить настройки модели",
   "1c631615c1d85c9e": "Войти в Cursor",
@@ -29,6 +30,7 @@
   "281eb6d08c9960d0": "Бюджет токенов рассуждения {0} должен быть положительным целым числом",
   "28aeffc70ceb4267": "Измените язык интерфейса. Настройка применяется сразу и сохраняется на этом устройстве.",
   "2a24519398684ed5": "Перейти на домашнюю страницу",
+  "2c18d5e2d70b45db": "Префикс модели",
   "2cd0f3be8738a86c": "Отмена",
   "2d706f7981b45a7b": "Локальные настройки сохранены",
   "2f9daa828907b93f": "Удалить",
@@ -44,8 +46,10 @@
   "37d23612f78a2e63": "Перезапустить и обновить",
   "392d0dceb45998d3": "Очень высокая",
   "393df9bb13ea4900": "Попадание",
+  "3a5040b68abf75f9": "Выбрать все",
   "3ab8cc15939f3b5c": "Выйти",
   "3af7e5489e61ea51": "Обновление",
+  "3b2e5f2fba1bcbc7": "Введите адрес интерфейса и ключ доступа",
   "3c2a9f9901109e75": "Тип {0} поддерживает только OpenAI или Anthropic",
   "3d13868593ae4eeb": "Язык интерфейса",
   "3d52574ce1500561": "Не подключено",
@@ -69,6 +73,7 @@
   "58c6b0935a7216da": "Не удалось открыть профиль участника",
   "593a972852ba0004": "Cursor Assistant | Всегда бесплатно | Пользовательский API",
   "59a2195a01a8b35b": "{0} должен быть допустимым объектом JSON",
+  "5a5c8318ef649672": "Выбрано: {0}",
   "5aa8f5590c940829": "Ввод без кеша: {0}",
   "5beb1206c532729f": "Максимальное число токенов в одном ответе. Оставьте поле пустым для значения по умолчанию.",
   "5d1687a4a41883fd": "Остановка...",
@@ -95,9 +100,11 @@
   "737225e2904673fc": "Расчетные выходные токены: {0}",
   "7520bd50a5ee5471": "Остановить проверку {0}/{1}",
   "753d8bb0da9913ce": "Не удалось дублировать",
+  "75b5f4c68c79322c": "Выберите хотя бы одну модель для сохранения",
   "774d6e1b7cb89751": "Стандартный расчет",
   "77c9e582e85583af": "Проверка не пройдена",
-  "7a26bf794e9fb6bf": "Используется только для отображения в интерфейсе и помогает различать модели.",
+  "7923d007483ae04c": "Нет моделей для сохранения",
+  "7a26bf794e9fb6bf": "Используется только для отображения в интерфейсе, чтобы различать модели.",
   "7b6187c41e88b70c": "Проверка...",
   "7bf8e2c07e084d09": "Редактор модели",
   "7df7641e5e741346": "Чтение кеша / (Чтение кеша + Создание кеша + Ввод без кеша)",
@@ -106,15 +113,16 @@
   "80296f4aa3f4543b": "Чтение/запись кеша",
   "81123c56d5d880d0": "Ключ API",
   "8139cb3dd11f5a67": "Если включено, объект JSON переопределит итоговые заголовки запроса. При совпадении имен используются значения отсюда; все значения должны быть строками.",
+  "826c0e5a4407befa": "Можно выбрать несколько моделей. Будут сохранены только выбранные модели, для каждой будет создана отдельная конфигурация.",
   "83be9cac28873059": "Аккаунт управляющего уровня Cursor",
   "8672864e90417138": "Максимальная",
   "86df7ec743047234": "Сервис запущен",
+  "891bfee3bbe52d3c": "Введите идентификатор модели",
   "899add6275682210": "Если оставить пустым, используется 200000",
   "8a4ef3e48e4e8a5a": "Включено",
   "8c1935935600e336": "Проверка модели",
   "8cbcf741e727dbf7": "Настройки модели",
   "8d1de152be6360ce": "Доля успешных: {0}",
-  "8e2dc7b0d2e8f6f8": "например, OpenAI - GPT-4.1",
   "8f6f8d979c981ced": "Скопировано",
   "8f8baf5d18dd0492": "Если включено, объект JSON переопределит тело запроса OpenAI. При совпадении полей используются значения отсюда. OpenAI service_tier поддерживает auto, default, flex, scale и priority; priority можно использовать для сценариев с высоким приоритетом/Fast.",
   "8faa670b512b6b9b": "Открыть настройки модели",
@@ -122,7 +130,7 @@
   "917b1c1f18d0276b": "Сохранение...",
   "9196835e388d2550": "Проверить все",
   "91cba5c107a51892": "/ Ошибочные",
-  "92059fe6cd713db4": "Имя модели, которое фактически отправляется серверу, например gpt-4.1 или claude-sonnet.",
+  "92059fe6cd713db4": "Имя модели, фактически отправляемое серверу, например gpt-4.1 или claude-sonnet.",
   "93e08803675e378b": "Идентификатор модели",
   "93faf55cd25c8319": "Это программное обеспечение полностью бесплатно. Если с вас взяли плату, скорее всего, вас обманули.\\nПосетите страницу автора: https://space.bilibili.com/311706663/upload/video\\nТам публикуются обновления, руководства и другие материалы.",
   "942ff2d88baca0c6": "Проверка обновлений...",
@@ -160,6 +168,7 @@
   "b571037dc396a00c": "Общее число токенов запроса включает Prompt и вывод модели.",
   "b765005f69fa971f": "например, gpt-4.1",
   "b76a22622020f849": "Выберите конечную точку протокола. Для варианта «Пользовательский путь» укажите полный URL запроса в поле адреса API, включая суффикс /chat/completions или /responses. Тип протокола будет определен автоматически по последнему сегменту.",
+  "b7ceef2fbfeb4a85": "например, GPT-5",
   "b870928f8f9a24c4": "Конечная точка API",
   "b90a8ac9c488ce46": "Выберите язык",
   "ba3c66f90fd11725": "Обнаружен системный прокси",
@@ -173,6 +182,7 @@
   "c3d46b387eeadb23": "Будет выполнен выход только из аккаунта Cursor в cursor-byok. В клиенте Cursor вы останетесь в системе. Продолжить?",
   "c5af02060847d167": "Интенсивность для адаптивных рассуждений Anthropic. В запросах всегда используется новый режим thinking.type=adaptive.",
   "c69f5bce63b9f14c": "Папка настроек",
+  "c72d5dc20cd27118": "Выбрано моделей: {0} / {1}",
   "c8a52b66651d294c": "Не удалось выйти",
   "c8c14507b2d37395": "Интенсивность рассуждений",
   "c98e118e0a43f078": "Модель",
@@ -206,6 +216,7 @@
   "e4c0daa3c4bea691": "Спасибо @aike0210 за вклад в функцию аккаунта панели управления Cursor.",
   "e53580f8031f13c0": "Завершите вход в браузере, затем вернитесь в Cursor и снова откройте магазин плагинов",
   "e552c2accdbf5178": "Добавить модель",
+  "e6943d5cbfb863e0": "Получение моделей...",
   "e6faccfddce722e8": "Токены чтения из кеша: {0}",
   "e8a0a6053998ebfa": "Выполнен вход",
   "eaffd48cd2ea9f1a": "например, https://api.anthropic.com",
@@ -218,6 +229,7 @@
   "f3a76d896853c1df": "Промах",
   "f3fae6cccb9004b1": "Имя пользовательского заголовка не может быть пустым",
   "f474a4108aba4c4c": "Остановить сервис",
+  "f4d4bae588c4c0ff": "Снять выделение со всех",
   "f4f0ead1116b5b62": "Включить",
   "f56c6c82203b33f6": "Уведомление",
   "f61e03f047b786d5": "Максимальное число выходных токенов {0} должно быть положительным целым числом",

frontend/src/i18n/locales/zh-CN.json

@@ -18,6 +18,7 @@
   "15d124b200ddabed": "模型单次可接受的最大上下文 Token 数。留空时使用默认值。",
   "185aebe19c77425d": "{0}必须是 JSON 对象",
   "18b7312022cd1840": "启动服务",
+  "1afed6a81a2512d2": "选择模型",
   "1baddde657dd2720": "当前出站请求使用系统代理",
   "1bc77f5ab979f4c1": "新增模型配置",
   "1c631615c1d85c9e": "登录 Cursor",
@@ -29,6 +30,7 @@
   "281eb6d08c9960d0": "{0} 的思考预算 Token 必须为正整数",
   "28aeffc70ceb4267": "切换当前界面显示语言，设置会立即生效并保存在本机",
   "2a24519398684ed5": "访问主页",
+  "2c18d5e2d70b45db": "模型前缀",
   "2cd0f3be8738a86c": "取消",
   "2d706f7981b45a7b": "本地配置已保存",
   "2f9daa828907b93f": "删除",
@@ -44,8 +46,10 @@
   "37d23612f78a2e63": "立即重启更新",
   "392d0dceb45998d3": "极高",
   "393df9bb13ea4900": "命中",
+  "3a5040b68abf75f9": "全选",
   "3ab8cc15939f3b5c": "退出登录",
   "3af7e5489e61ea51": "刷新中",
+  "3b2e5f2fba1bcbc7": "请输入接口地址和访问密钥",
   "3c2a9f9901109e75": "{0} 的类型仅支持 OpenAI 或 Anthropic",
   "3d13868593ae4eeb": "界面语言",
   "3d52574ce1500561": "未连接",
@@ -69,6 +73,7 @@
   "58c6b0935a7216da": "打开贡献者主页失败",
   "593a972852ba0004": "Cursor助手｜永久免费｜自定义API",
   "59a2195a01a8b35b": "{0}必须是合法 JSON 对象",
+  "5a5c8318ef649672": "已选择 {0} 项",
   "5aa8f5590c940829": "非缓存输入：{0}",
   "5beb1206c532729f": "单次回复允许生成的最大 Token 数。留空时使用默认值。",
   "5d1687a4a41883fd": "停止中...",
@@ -95,8 +100,10 @@
   "737225e2904673fc": "输出推算：{0}",
   "7520bd50a5ee5471": "停止测试 {0}/{1}",
   "753d8bb0da9913ce": "复制失败",
+  "75b5f4c68c79322c": "请先选择要保存的模型",
   "774d6e1b7cb89751": "默认口径",
   "77c9e582e85583af": "测试失败",
+  "7923d007483ae04c": "没有可保存的模型",
   "7a26bf794e9fb6bf": "仅用于界面展示，便于你区分不同模型。",
   "7b6187c41e88b70c": "测试中...",
   "7bf8e2c07e084d09": "模型编辑",
@@ -106,15 +113,16 @@
   "80296f4aa3f4543b": "缓存读写",
   "81123c56d5d880d0": "访问密钥",
   "8139cb3dd11f5a67": "开启后会把 JSON 对象覆盖到最终请求头。同名请求头以这里为准，值必须是字符串。",
+  "826c0e5a4407befa": "可多选。保存时只会写入选中的模型，每个模型生成一条配置。",
   "83be9cac28873059": "Cursor 控制面账号",
   "8672864e90417138": "最高",
   "86df7ec743047234": "服务运行中",
+  "891bfee3bbe52d3c": "请填写模型标识",
   "899add6275682210": "留空时默认 200000",
   "8a4ef3e48e4e8a5a": "已开启",
   "8c1935935600e336": "模型测试",
   "8cbcf741e727dbf7": "模型配置",
   "8d1de152be6360ce": "有效占比：{0}",
-  "8e2dc7b0d2e8f6f8": "例如：OpenAI - GPT-4.1",
   "8f6f8d979c981ced": "已复制",
   "8f8baf5d18dd0492": "开启后会把 JSON 对象覆盖到 OpenAI 请求体。同名字段以这里为准。OpenAI service_tier 支持 auto、default、flex、scale、priority；priority 可用于高优先级/Fast 类场景。",
   "8faa670b512b6b9b": "打开模型配置",
@@ -160,6 +168,7 @@
   "b571037dc396a00c": "总请求 Token 包含 Prompt 和模型输出。",
   "b765005f69fa971f": "例如：gpt-4.1",
   "b76a22622020f849": "选择接口协议端点。选“自定义路径”时，请在接口地址栏填写完整请求地址（含 /chat/completions 或 /responses 路径后缀），系统会根据末段自动判断协议形态。",
+  "b7ceef2fbfeb4a85": "例如：GPT-5",
   "b870928f8f9a24c4": "接口端点",
   "b90a8ac9c488ce46": "选择语言",
   "ba3c66f90fd11725": "已识别系统代理",
@@ -173,6 +182,7 @@
   "c3d46b387eeadb23": "只会退出 cursor-byok 中的 Cursor 账号，不会退出 Cursor 客户端。是否继续？",
   "c5af02060847d167": "Anthropic adaptive thinking 的思考强度。请求会固定使用新版 thinking.type=adaptive。",
   "c69f5bce63b9f14c": "设置文件夹",
+  "c72d5dc20cd27118": "已选择 {0} / {1} 个模型",
   "c8a52b66651d294c": "退出登录失败",
   "c8c14507b2d37395": "推理强度",
   "c98e118e0a43f078": "模型",
@@ -206,6 +216,7 @@
   "e4c0daa3c4bea691": "感谢 @aike0210 对 Cursor 控制面账号功能的贡献。",
   "e53580f8031f13c0": "请在浏览器完成登录，完成后返回 Cursor 重新打开插件市场",
   "e552c2accdbf5178": "新增模型",
+  "e6943d5cbfb863e0": "正在获取模型...",
   "e6faccfddce722e8": "缓存读取：{0}",
   "e8a0a6053998ebfa": "已经登录",
   "eaffd48cd2ea9f1a": "例如：https://api.anthropic.com",
@@ -218,6 +229,7 @@
   "f3a76d896853c1df": "未命中",
   "f3fae6cccb9004b1": "自定义请求头名称不能为空",
   "f474a4108aba4c4c": "关闭服务",
+  "f4d4bae588c4c0ff": "取消全选",
   "f4f0ead1116b5b62": "启用",
   "f56c6c82203b33f6": "提示",
   "f61e03f047b786d5": "{0} 的最大输出 Token 必须为正整数",

frontend/src/services/clientApi.js

@@ -161,3 +161,9 @@ export function getModelAdapterTestResults() {
     Call.ByName(`${PROXY_SERVICE_NAME}.GetModelAdapterTestResults`),
   );
 }
+
+export function fetchModelAdapterModels(payload) {
+  return withApiLogging("FetchModelAdapterModels", payload, () =>
+    Call.ByName(`${PROXY_SERVICE_NAME}.FetchModelAdapterModels`, payload),
+  );
+}

frontend/src/state/appState.js

@@ -17,6 +17,7 @@ import {
   startProxyService,
   stopProxyService,
   testModelAdapter,
+  fetchModelAdapterModels,
 } from "@/services/clientApi";
 
 const APP_STATE_STORAGE_KEY = "cursor-client:runtime-state:v2";
@@ -1143,6 +1144,100 @@ export async function saveModelAdapterAt(index, adapter) {
   };
 }
 
+export async function fetchAvailableModelIDs(payload) {
+  const result = await fetchModelAdapterModels(payload);
+  return asArray(result?.models)
+    .map((item) => asString(item))
+    .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);

frontend/src/views/ModelEditor.vue

@@ -2,6 +2,7 @@
 import Button from "@/components/ui/Button.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";
@@ -9,9 +10,11 @@ import {
   ANTHROPIC_THINKING_EFFORT_DEFAULT,
   appState,
   buildModelAdapterTestRequestHash,
+  buildModelAdaptersFromModelIDs,
   createEmptyModelAdapter,
   CUSTOM_HEADERS_DEFAULT_JSON,
   EXTRA_PARAMS_DEFAULT_JSON,
+  fetchAvailableModelIDs,
   getModelAdapterTestResult,
   getModelAdapterTestResultByID,
   isModelAdapterTestResultStale,
@@ -22,11 +25,12 @@ import {
   OPENAI_EXTRA_PARAMS_DEFAULT_JSON,
   runModelAdapterTest,
   saveModelAdapterAt,
+  saveModelAdaptersFromModelIDs,
   toUserError,
   validateModelAdapters,
 } from "@/state/appState";
 import { Window } from "@wailsio/runtime";
-import { computed, onMounted, reactive, ref, watch } from "vue";
+import { computed, onBeforeUnmount, onMounted, reactive, ref, watch } from "vue";
 
 const modelTypeTabs = [
   { label: "OpenAI", value: "openai", icon: "icon-[bxl--openai]" },
@@ -61,6 +65,14 @@ const errorMessage = ref("");
 const loading = ref(true);
 const lastTestAdapterID = ref("");
 const localTestFailure = ref("");
+const modelPrefix = ref("");
+const existingModelPrefixCleared = ref(false);
+const availableModelIDs = ref([]);
+const selectedModelIDs = ref([]);
+const modelSelectionMode = ref("auto");
+const modelListLoading = ref(false);
+const modelListRequestSeq = ref(0);
+let modelListDebounceTimer = 0;
 
 function createOptionalPositiveIntegerModel(key) {
   return computed({
@@ -80,14 +92,44 @@ const contextWindowTokensInput = createOptionalPositiveIntegerModel("contextWind
 const interfacePlaceholder = computed(() =>
   draft.type === "anthropic" ? "例如：https://api.anthropic.com" : "例如：https://api.openai.com/v1",
 );
-const currentRequestHash = computed(() => buildModelAdapterTestRequestHash(draft));
-const directModelTestResult = computed(() => getModelAdapterTestResult(draft));
+const modelOptions = computed(() => availableModelIDs.value.map((modelID) => ({
+  label: 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 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 currentRequestHash = computed(() => buildModelAdapterTestRequestHash(selectedTestAdapter.value));
+const directModelTestResult = computed(() => getModelAdapterTestResult(selectedTestAdapter.value));
 const rememberedModelTestResult = computed(() =>
   lastTestAdapterID.value ? getModelAdapterTestResultByID(lastTestAdapterID.value) : null,
 );
 const activeModelTestResult = computed(() => directModelTestResult.value || rememberedModelTestResult.value);
 const modelTestResultStale = computed(() =>
-  isModelAdapterTestResultStale(draft, activeModelTestResult.value),
+  isModelAdapterTestResultStale(selectedTestAdapter.value, activeModelTestResult.value),
 );
 const isCurrentConfigTesting = computed(() => directModelTestResult.value?.status === "running");
 const modelTestSummary = computed(() => {
@@ -125,7 +167,8 @@ function ensureAnthropicThinkingEffort() {
 
 const fieldTips = {
   displayName: "仅用于界面展示，便于你区分不同模型。",
-  modelID: "请求实际发送给服务端的模型名称，例如 gpt-4.1 或 claude-sonnet。",
+  modelID: "可多选。保存时只会写入选中的模型，每个模型生成一条配置。",
+  manualModelID: "请求实际发送给服务端的模型名称，例如 gpt-4.1 或 claude-sonnet。",
   baseURL: "模型服务的 API 根地址，通常为兼容 OpenAI 或 Anthropic 的接口入口。",
   apiKey: "调用该模型服务需要使用的访问密钥。",
   contextWindowTokens: "模型单次可接受的最大上下文 Token 数。留空时使用默认值。",
@@ -146,6 +189,11 @@ async function loadContext() {
     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";
     }
@@ -157,8 +205,81 @@ async function loadContext() {
   }
 }
 
+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();
+    return [];
+  }
+
+  const requestSeq = modelListRequestSeq.value + 1;
+  modelListRequestSeq.value = requestSeq;
+  modelSelectionMode.value = "auto";
+  modelListLoading.value = true;
+  try {
+    const models = await fetchAvailableModelIDs({
+      type: draft.type,
+      baseURL,
+      apiKey,
+      customHeadersEnabled: draft.customHeadersEnabled,
+      customHeadersJSON: draft.customHeadersJSON,
+    });
+    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 {
+    if (requestSeq === modelListRequestSeq.value) {
+      modelListLoading.value = false;
+    }
+  }
+}
+
 async function persistDraft() {
-  const adapter = normalizeModelAdapter(draft);
+  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 singleCheck = validateModelAdapters([adapter]);
   if (singleCheck) {
@@ -166,7 +287,9 @@ async function persistDraft() {
     return { ok: false, error: singleCheck, adapter: null };
   }
 
-  const result = await saveModelAdapterAt(editorIndex.value, adapter);
+  const result = isManualModelInput.value
+    ? await saveModelAdapterAt(editorIndex.value, adapter)
+    : await saveModelAdaptersFromModelIDs(adapter, models, modelPrefix.value, selectedModelID);
   if (!result.ok) {
     errorMessage.value = result.error;
     return { ok: false, error: result.error, adapter: null };
@@ -177,12 +300,14 @@ async function persistDraft() {
   }
   if (result.adapter) {
     Object.assign(draft, normalizeModelAdapter(result.adapter));
+  } else {
+    Object.assign(draft, adapter);
   }
   errorMessage.value = "";
   return {
     ok: true,
     error: "",
-    adapter: result.adapter ? normalizeModelAdapter(result.adapter) : normalizeModelAdapter(draft),
+    adapter: result.adapter ? normalizeModelAdapter(result.adapter) : normalizeModelAdapter(adapter),
   };
 }
 
@@ -200,6 +325,10 @@ async function handleCancel() {
 
 function handleModelTypeChange(type) {
   draft.type = type;
+  modelSelectionMode.value = "auto";
+  availableModelIDs.value = [];
+  selectedModelIDs.value = [];
+  draft.modelID = "";
   if (type === "openai" && !draft.openAIEndpoint) {
     draft.openAIEndpoint = OPENAI_ENDPOINT_RESPONSES;
   } else if (type === "anthropic") {
@@ -273,9 +402,32 @@ watch(
   },
 );
 
+watch(
+  () => [draft.type, draft.baseURL, draft.apiKey, draft.customHeadersEnabled, draft.customHeadersJSON],
+  () => {
+    window.clearTimeout(modelListDebounceTimer);
+    const baseURL = String(draft.baseURL || "").trim();
+    const apiKey = String(draft.apiKey || "").trim();
+    if (!baseURL || !apiKey) {
+      modelSelectionMode.value = "auto";
+      modelListLoading.value = false;
+      availableModelIDs.value = draft.modelID ? [draft.modelID] : [];
+      syncSelectionWithAvailable();
+      return;
+    }
+    modelListDebounceTimer = window.setTimeout(() => {
+      void refreshModelList();
+    }, 600);
+  },
+);
+
 onMounted(async () => {
   await loadContext();
 });
+
+onBeforeUnmount(() => {
+  window.clearTimeout(modelListDebounceTimer);
+});
 </script>
 
 <template>
@@ -318,26 +470,13 @@ onMounted(async () => {
         <div class="grid grid-cols-1 gap-3 md:grid-cols-2">
           <label class="flex flex-col gap-1">
             <span class="center-row justify-start gap-1.5 text-sm text-[#d4d4d4]">
-              <Tooltip :content="fieldTips.displayName" />
-              <span>显示名称</span>
+              <Tooltip :content="fieldTips.baseURL" />
+              <span>接口地址</span>
             </span>
             <input
-              v-model="draft.displayName"
+              v-model="draft.baseURL"
               type="text"
-              placeholder="例如：OpenAI - GPT-4.1"
-              class="h-9 rounded-[6px] border border-[#3f3f3f] bg-[#232323] px-3 text-sm text-[#e5e5e5] outline-none focus:border-[#10AD5D]"
-            />
-          </label>
-
-          <label class="flex flex-col gap-1">
-            <span class="center-row justify-start gap-1.5 text-sm text-[#d4d4d4]">
-              <Tooltip :content="fieldTips.modelID" />
-              <span>模型标识</span>
-            </span>
-            <input
-              v-model="draft.modelID"
-              type="text"
-              placeholder="例如：gpt-4.1"
+              :placeholder="interfacePlaceholder"
               class="h-9 rounded-[6px] border border-[#3f3f3f] bg-[#232323] px-3 text-sm text-[#e5e5e5] outline-none focus:border-[#10AD5D]"
             />
           </label>
@@ -358,17 +497,41 @@ onMounted(async () => {
 
           <label class="flex flex-col gap-1">
             <span class="center-row justify-start gap-1.5 text-sm text-[#d4d4d4]">
-              <Tooltip :content="fieldTips.baseURL" />
-              <span>接口地址</span>
+              <Tooltip :content="isManualModelInput ? fieldTips.displayName : fieldTips.modelID" />
+              <span>{{ isManualModelInput ? "显示名称" : "模型前缀" }}</span>
             </span>
             <input
-              v-model="draft.baseURL"
+              v-model="modelPrefix"
               type="text"
-              :placeholder="interfacePlaceholder"
+              placeholder="例如：GPT-5"
               class="h-9 rounded-[6px] border border-[#3f3f3f] bg-[#232323] px-3 text-sm text-[#e5e5e5] outline-none focus:border-[#10AD5D]"
             />
           </label>
 
+          <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>
+            </span>
+            <input
+              v-if="isManualModelInput"
+              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} 个模型`"
+              aria-label="选择模型"
+              @update:model-value="handleModelSelectionChange"
+            />
+          </div>
+
           <label class="flex flex-col gap-1">
             <span class="center-row justify-start gap-1.5 text-sm text-[#d4d4d4]">
               <Tooltip :content="fieldTips.contextWindowTokens" />

internal/app/runner.go

@@ -8,7 +8,9 @@ import (
 	"encoding/pem"
 	"io/fs"
 	"net"
+	"os"
 	goruntime "runtime"
+	"strconv"
 	"strings"
 	"time"
 
@@ -37,6 +39,8 @@ const (
 	appName = "Cursor助手"
 	// adRefreshInterval 表示后台广告拉取间隔。
 	adRefreshInterval = 3 * time.Minute
+	// disableWebViewSandboxEnv allows affected VDI users to opt out of the WebView2 sandbox.
+	disableWebViewSandboxEnv = "CURSOR_BYOK_DISABLE_WEBVIEW_SANDBOX"
 )
 
 // EmbeddedResources 定义了当前模块中的 EmbeddedResources 类型。
@@ -134,6 +138,9 @@ func Run(resources EmbeddedResources) error {
 		Assets: application.AssetOptions{
 			Handler: application.AssetFileServerFS(resources.Assets),
 		},
+		Windows: application.WindowsOptions{
+			AdditionalBrowserArgs: windowsAdditionalBrowserArgs(),
+		},
 		Mac: application.MacOptions{
 			ActivationPolicy: application.ActivationPolicyAccessory,
 			ApplicationShouldTerminateAfterLastWindowClosed: false,
@@ -415,6 +422,14 @@ func Run(resources EmbeddedResources) error {
 	return app.Run()
 }
 
+func windowsAdditionalBrowserArgs() []string {
+	disableSandbox, err := strconv.ParseBool(strings.TrimSpace(os.Getenv(disableWebViewSandboxEnv)))
+	if err != nil || !disableSandbox {
+		return nil
+	}
+	return []string{"--no-sandbox"}
+}
+
 func browserReachableLoopbackBaseURL(listenAddr string) string {
 	host, port, err := net.SplitHostPort(strings.TrimSpace(listenAddr))
 	if err != nil || strings.TrimSpace(port) == "" {

internal/app/runner_test.go

@@ -0,0 +1,29 @@
+package app
+
+import (
+	"reflect"
+	"testing"
+)
+
+func TestWindowsAdditionalBrowserArgs(t *testing.T) {
+	tests := []struct {
+		name string
+		env  string
+		want []string
+	}{
+		{name: "unset"},
+		{name: "enabled with one", env: "1", want: []string{"--no-sandbox"}},
+		{name: "enabled with true", env: " true ", want: []string{"--no-sandbox"}},
+		{name: "disabled", env: "false"},
+		{name: "invalid", env: "yes"},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			t.Setenv(disableWebViewSandboxEnv, tt.env)
+			if got := windowsAdditionalBrowserArgs(); !reflect.DeepEqual(got, tt.want) {
+				t.Fatalf("windowsAdditionalBrowserArgs() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}

internal/backend/forwarder/file_store.go

@@ -690,9 +690,21 @@ func appendEntriesInPlace(conversation *ConversationFile, entries []HistoryEntry
 	}
 	now := time.Now().UTC()
 	assigned := make([]HistoryEntry, 0, len(entries))
+	existingIdempotencyKeys := make(map[string]struct{})
+	for _, existing := range conversation.Entries {
+		if key := strings.TrimSpace(existing.IdempotencyKey); key != "" {
+			existingIdempotencyKeys[key] = struct{}{}
+		}
+	}
 	maxTurnSeq := conversation.NextTurnSeq - 1
 	for _, entry := range entries {
 		next := entry
+		if key := strings.TrimSpace(next.IdempotencyKey); key != "" {
+			if _, exists := existingIdempotencyKeys[key]; exists {
+				continue
+			}
+			existingIdempotencyKeys[key] = struct{}{}
+		}
 		if next.CreatedAt.IsZero() {
 			next.CreatedAt = now
 		}

internal/backend/forwarder/interrupted_output_test.go

@@ -0,0 +1,187 @@
+package forwarder
+
+import (
+	"encoding/json"
+	"strings"
+	"testing"
+)
+
+func TestAppendEntriesDeduplicatesIdempotencyKey(t *testing.T) {
+	store := NewConversationFileStore(t.TempDir())
+	entry := HistoryEntry{
+		TurnSeq:        1,
+		RequestID:      "request-1",
+		IdempotencyKey: "provider-interrupted-output:test",
+		Role:           "assistant",
+		Kind:           "assistant_text",
+		Payload:        json.RawMessage(`{"text":"partial"}`),
+	}
+
+	if _, assigned, err := store.AppendEntries("conversation-1", []HistoryEntry{entry}); err != nil {
+		t.Fatalf("first AppendEntries() error = %v", err)
+	} else if len(assigned) != 1 {
+		t.Fatalf("first AppendEntries() assigned = %d, want 1", len(assigned))
+	}
+	if _, assigned, err := store.AppendEntries("conversation-1", []HistoryEntry{entry}); err != nil {
+		t.Fatalf("duplicate AppendEntries() error = %v", err)
+	} else if len(assigned) != 0 {
+		t.Fatalf("duplicate AppendEntries() assigned = %d, want 0", len(assigned))
+	}
+
+	conversation, err := store.LoadConversation("conversation-1")
+	if err != nil {
+		t.Fatalf("LoadConversation() error = %v", err)
+	}
+	if len(conversation.Entries) != 1 {
+		t.Fatalf("persisted entries = %d, want 1", len(conversation.Entries))
+	}
+}
+
+func TestCancelPersistsInterruptedProviderOutputIdempotently(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.ProviderAccumulatedText = "partial answer"
+	stream.ProviderAccumulatedReasoning = "partial reasoning"
+	stream.mu.Unlock()
+
+	cancel := InboundIntent{
+		Kind:         "cancel",
+		RequestID:    stream.RequestID,
+		CancelReason: "[canceled] Superseded by newer request",
+	}
+	if err := service.handleCancelIntent(cancel); err != nil {
+		t.Fatalf("first handleCancelIntent() error = %v", err)
+	}
+	stream.mu.Lock()
+	stream.ProviderAccumulatedText = "late duplicate fragment"
+	stream.mu.Unlock()
+	if err := service.handleCancelIntent(cancel); err != nil {
+		t.Fatalf("duplicate handleCancelIntent() error = %v", err)
+	}
+
+	persisted, err := service.store.LoadConversation(stream.ConversationID)
+	if err != nil {
+		t.Fatalf("LoadConversation() error = %v", err)
+	}
+	assistantEntries := 0
+	cancelEntries := 0
+	for _, entry := range persisted.Entries {
+		if entry.Kind == "metadata" {
+			var payload metadataPayload
+			if err := json.Unmarshal(entry.Payload, &payload); err != nil {
+				t.Fatalf("decode metadata entry: %v", err)
+			}
+			if payload.Type == "control" && readStringValue(payload.Value["status"]) == "canceled" {
+				cancelEntries++
+			}
+		}
+		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" {
+			assistantEntries++
+		}
+	}
+	if assistantEntries != 1 {
+		t.Fatalf("persisted interrupted assistant entries = %d, want 1", assistantEntries)
+	}
+	if cancelEntries != 1 {
+		t.Fatalf("persisted cancel metadata entries = %d, want 1", cancelEntries)
+	}
+
+	replay, err := service.projector.ProjectPromptReplay(persisted)
+	if err != nil {
+		t.Fatalf("ProjectPromptReplay() error = %v", err)
+	}
+	found := false
+	for _, message := range replay {
+		if message.Role == "assistant" && strings.TrimSpace(message.Content) == "partial answer" && strings.TrimSpace(message.ReasoningContent) == "partial reasoning" {
+			found = true
+			break
+		}
+	}
+	if !found {
+		t.Fatalf("replay = %#v, want interrupted assistant output", replay)
+	}
+	checkpoint, err := service.projector.ProjectCheckpointProjection(persisted)
+	if err != nil {
+		t.Fatalf("ProjectCheckpointProjection() error = %v", err)
+	}
+	if checkpoint == nil || checkpoint.State == nil || len(checkpoint.State.GetTurns()) != 1 {
+		t.Fatalf("checkpoint state = %#v, want interrupted turn", checkpoint)
+	}
+}
+
+func TestCancelPreservesPersistedTurnActivityWithoutLiveAccumulator(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.handleCancelIntent(InboundIntent{
+		Kind:         "cancel",
+		RequestID:    stream.RequestID,
+		CancelReason: "new_message_submitted",
+	}); err != nil {
+		t.Fatalf("handleCancelIntent() error = %v", err)
+	}
+
+	persisted, err := service.store.LoadConversation(stream.ConversationID)
+	if err != nil {
+		t.Fatalf("LoadConversation() error = %v", err)
+	}
+	replay, err := service.projector.ProjectPromptReplay(persisted)
+	if err != nil {
+		t.Fatalf("ProjectPromptReplay() error = %v", err)
+	}
+	for _, message := range replay {
+		if message.Role == "assistant" && strings.TrimSpace(message.Content) == "hi" {
+			return
+		}
+	}
+	t.Fatalf("replay = %#v, want persisted assistant activity", replay)
+}
+
+func TestProjectPromptReplayPreservesLegacyCanceledTurnActivity(t *testing.T) {
+	cancelEntry := newMetadataEntry(1, "request-1", "control", map[string]any{
+		"status":        "canceled",
+		"reason":        "new_message_submitted",
+		"replay_policy": cancelReplayPolicyKeepStableInput,
+	})
+	conversation := &ConversationFile{
+		ConversationID: "conversation-1",
+		NextTurnSeq:    2,
+		Entries: []HistoryEntry{
+			newAssistantTextEntry(1, "request-1", "persisted activity", "", ""),
+			cancelEntry,
+		},
+	}
+
+	replay, err := NewHistoryProjector().ProjectPromptReplay(conversation)
+	if err != nil {
+		t.Fatalf("ProjectPromptReplay() error = %v", err)
+	}
+	for _, message := range replay {
+		if message.Role == "assistant" && strings.TrimSpace(message.Content) == "persisted activity" {
+			return
+		}
+	}
+	t.Fatalf("replay = %#v, want legacy canceled activity", replay)
+}

internal/backend/forwarder/projector.go

@@ -355,6 +355,7 @@ const (
 	cancelReplayPolicyDropTurn        = "drop_turn"
 	cancelReplayPolicyDropUnstarted   = "drop_unstarted_turn"
 	cancelReplayPolicyKeepStableInput = "keep_stable_input"
+	cancelReplayPolicyKeepInterrupted = "keep_interrupted_output"
 )
 
 func sanitizeCanceledReplayEntries(entries []HistoryEntry) []HistoryEntry {
@@ -370,12 +371,18 @@ func sanitizeCanceledReplayEntries(entries []HistoryEntry) []HistoryEntry {
 	for _, entry := range entries {
 		if entry.TurnSeq > 0 {
 			if policy, canceled := canceledTurns[entry.TurnSeq]; canceled {
-				if policy == cancelReplayPolicyDropUnstarted {
-					if _, active := activeCanceledTurns[entry.TurnSeq]; active {
-						policy = cancelReplayPolicyKeepStableInput
-					} else {
-						policy = cancelReplayPolicyDropTurn
+				if policy == cancelReplayPolicyKeepInterrupted {
+					filtered = append(filtered, entry)
+					continue
 				}
+				if policy != cancelReplayPolicyDropTurn {
+					if _, active := activeCanceledTurns[entry.TurnSeq]; active {
+						filtered = append(filtered, entry)
+						continue
+					}
+				}
+				if policy == cancelReplayPolicyDropUnstarted {
+					policy = cancelReplayPolicyDropTurn
 				}
 				if policy == cancelReplayPolicyDropTurn || !isStableCanceledTurnInputEntry(entry) {
 					continue
@@ -450,6 +457,8 @@ func normalizeCancelReplayPolicy(policy string, reason string) string {
 		return cancelReplayPolicyDropUnstarted
 	case cancelReplayPolicyKeepStableInput:
 		return cancelReplayPolicyKeepStableInput
+	case cancelReplayPolicyKeepInterrupted:
+		return cancelReplayPolicyKeepInterrupted
 	default:
 		return cancelReplayPolicyForReason(reason)
 	}
@@ -616,9 +625,13 @@ func projectCheckpointTurnBlobs(conversation *ConversationFile, blobs *checkpoin
 	turnIDs := make([][]byte, 0, len(order))
 	for _, turnSeq := range order {
 		entries := grouped[turnSeq]
+		completedToolCalls, err := collectCheckpointCompletedToolCalls(entries)
+		if err != nil {
+			return nil, err
+		}
 		var userMessageID []byte
 		var turnRequestID string
-		stepIDs := make([][]byte, 0, len(entries))
+		steps := make([]*agentv1.ConversationStep, 0, len(entries))
 		seenToolCalls := make(map[string]struct{})
 		openToolCalls := make(map[string]struct{})
 		for _, entry := range entries {
@@ -645,59 +658,48 @@ func projectCheckpointTurnBlobs(conversation *ConversationFile, blobs *checkpoin
 					continue
 				}
 				if strings.TrimSpace(payload.ReasoningContent) != "" {
-					stepID, err := addCheckpointStepBlob(blobs, &agentv1.ConversationStep{
+					steps = append(steps, &agentv1.ConversationStep{
 						Message: &agentv1.ConversationStep_ThinkingMessage{
 							ThinkingMessage: &agentv1.ThinkingMessage{Text: payload.ReasoningContent},
 						},
 					})
-					if err != nil {
-						return nil, err
-					}
-					stepIDs = append(stepIDs, stepID)
 				}
 				if strings.TrimSpace(payload.Text) == "" {
 					continue
 				}
-				stepID, err := addCheckpointStepBlob(blobs, &agentv1.ConversationStep{
+				steps = append(steps, &agentv1.ConversationStep{
 					Message: &agentv1.ConversationStep_AssistantMessage{
 						AssistantMessage: &agentv1.AssistantMessage{Text: strings.TrimSpace(payload.Text)},
 					},
 				})
-				if err != nil {
-					return nil, err
-				}
-				stepIDs = append(stepIDs, stepID)
 			case "tool_call":
 				var payload toolCallEntryPayload
 				if err := json.Unmarshal(entry.Payload, &payload); err != nil {
 					return nil, err
 				}
 				if strings.TrimSpace(payload.ReasoningContent) != "" {
-					stepID, err := addCheckpointStepBlob(blobs, &agentv1.ConversationStep{
+					steps = append(steps, &agentv1.ConversationStep{
 						Message: &agentv1.ConversationStep_ThinkingMessage{
 							ThinkingMessage: &agentv1.ThinkingMessage{Text: payload.ReasoningContent},
 						},
 					})
-					if err != nil {
-						return nil, err
-					}
-					stepIDs = append(stepIDs, stepID)
 				}
 				toolCall := &agentv1.ToolCall{}
+				toolCallID := strings.TrimSpace(payload.ToolCallID)
 				if err := protojson.Unmarshal(payload.ToolCall, toolCall); err != nil {
 					return nil, err
 				}
-				if !shouldPersistToolResultName(firstNonEmpty(strings.TrimSpace(payload.ToolName), inferToolName(toolCall))) {
-					continue
-				}
-				stepID, err := addCheckpointStepBlob(blobs, &agentv1.ConversationStep{
-					Message: &agentv1.ConversationStep_ToolCall{ToolCall: toolCall},
-				})
-				if err != nil {
+				if completedPayload := completedToolCalls[toolCallID]; len(completedPayload) > 0 {
+					completedToolCall := &agentv1.ToolCall{}
+					if err := protojson.Unmarshal(completedPayload, completedToolCall); err != nil {
 						return nil, err
 					}
-				stepIDs = append(stepIDs, stepID)
-				if toolCallID := strings.TrimSpace(payload.ToolCallID); toolCallID != "" {
+					proto.Merge(toolCall, completedToolCall)
+				}
+				steps = append(steps, &agentv1.ConversationStep{
+					Message: &agentv1.ConversationStep_ToolCall{ToolCall: toolCall},
+				})
+				if toolCallID != "" {
 					seenToolCalls[toolCallID] = struct{}{}
 					openToolCalls[toolCallID] = struct{}{}
 				}
@@ -706,22 +708,19 @@ func projectCheckpointTurnBlobs(conversation *ConversationFile, blobs *checkpoin
 				if err := json.Unmarshal(entry.Payload, &payload); err != nil {
 					return nil, err
 				}
-				if toolCallID := strings.TrimSpace(payload.ToolCallID); toolCallID != "" {
-					if _, ok := seenToolCalls[toolCallID]; ok {
+				toolCallID := strings.TrimSpace(payload.ToolCallID)
+				if toolCallID != "" {
 					delete(openToolCalls, toolCallID)
+				}
+				if _, ok := seenToolCalls[toolCallID]; ok {
 					continue
 				}
-				}
 				if strings.TrimSpace(payload.ReasoningContent) != "" {
-					stepID, err := addCheckpointStepBlob(blobs, &agentv1.ConversationStep{
+					steps = append(steps, &agentv1.ConversationStep{
 						Message: &agentv1.ConversationStep_ThinkingMessage{
 							ThinkingMessage: &agentv1.ThinkingMessage{Text: payload.ReasoningContent},
 						},
 					})
-					if err != nil {
-						return nil, err
-					}
-					stepIDs = append(stepIDs, stepID)
 				}
 				if len(payload.ToolCall) == 0 {
 					continue
@@ -730,21 +729,22 @@ func projectCheckpointTurnBlobs(conversation *ConversationFile, blobs *checkpoin
 				if err := protojson.Unmarshal(payload.ToolCall, toolCall); err != nil {
 					return nil, err
 				}
-				if !shouldPersistToolResultName(firstNonEmpty(strings.TrimSpace(payload.ToolName), inferToolName(toolCall))) {
-					continue
-				}
-				stepID, err := addCheckpointStepBlob(blobs, &agentv1.ConversationStep{
+				steps = append(steps, &agentv1.ConversationStep{
 					Message: &agentv1.ConversationStep_ToolCall{ToolCall: toolCall},
 				})
+			}
+		}
+		if len(userMessageID) == 0 && len(steps) == 0 {
+			continue
+		}
+		stepIDs := make([][]byte, 0, len(steps))
+		for _, step := range steps {
+			stepID, err := addCheckpointStepBlob(blobs, step)
 			if err != nil {
 				return nil, err
 			}
 			stepIDs = append(stepIDs, stepID)
 		}
-		}
-		if len(userMessageID) == 0 && len(stepIDs) == 0 {
-			continue
-		}
 		agentTurn := &agentv1.AgentConversationTurnStructure{
 			UserMessage: userMessageID,
 			Steps:       stepIDs,
@@ -765,6 +765,23 @@ func projectCheckpointTurnBlobs(conversation *ConversationFile, blobs *checkpoin
 	return turnIDs, nil
 }
 
+func collectCheckpointCompletedToolCalls(entries []HistoryEntry) (map[string]json.RawMessage, error) {
+	completed := make(map[string]json.RawMessage)
+	for _, entry := range entries {
+		if strings.TrimSpace(entry.Kind) != "tool_result" {
+			continue
+		}
+		var payload toolResultEntryPayload
+		if err := json.Unmarshal(entry.Payload, &payload); err != nil {
+			return nil, err
+		}
+		if toolCallID := strings.TrimSpace(payload.ToolCallID); toolCallID != "" && len(payload.ToolCall) > 0 {
+			completed[toolCallID] = payload.ToolCall
+		}
+	}
+	return completed, nil
+}
+
 func addCheckpointStepBlob(blobs *checkpointBlobGraph, step *agentv1.ConversationStep) ([]byte, error) {
 	payload, err := proto.Marshal(step)
 	if err != nil {
@@ -1209,7 +1226,7 @@ func trimReplayDanglingAssistantToolCalls(messages []modeladapter.Message) []mod
 	return trimmed
 }
 
-func shouldPersistToolResultName(toolName string) bool {
+func shouldPersistCheckpointReplayToolResultName(toolName string) bool {
 	switch strings.TrimSpace(toolName) {
 	case "PatchEdit", "PatchEditLines", "PatchEditSpan", "Edit", "Write", "GenerateImage":
 		return true
@@ -1218,60 +1235,6 @@ func shouldPersistToolResultName(toolName string) bool {
 	}
 }
 
-func filterCheckpointTurns(rawTurns [][]byte) [][]byte {
-	if len(rawTurns) == 0 {
-		return nil
-	}
-	filtered := make([][]byte, 0, len(rawTurns))
-	for _, rawTurn := range rawTurns {
-		if len(rawTurn) == 0 {
-			continue
-		}
-		turn := &agentv1.ConversationTurnStructure{}
-		if err := proto.Unmarshal(rawTurn, turn); err != nil {
-			filtered = append(filtered, append([]byte(nil), rawTurn...))
-			continue
-		}
-		agentTurn := turn.GetAgentConversationTurn()
-		if agentTurn == nil {
-			filtered = append(filtered, append([]byte(nil), rawTurn...))
-			continue
-		}
-
-		nextSteps := make([][]byte, 0, len(agentTurn.GetSteps()))
-		for _, rawStep := range agentTurn.GetSteps() {
-			if len(rawStep) == 0 {
-				continue
-			}
-			step := &agentv1.ConversationStep{}
-			if err := proto.Unmarshal(rawStep, step); err != nil {
-				continue
-			}
-			if toolCall := step.GetToolCall(); toolCall != nil && !shouldPersistToolResultName(inferToolName(toolCall)) {
-				continue
-			}
-			nextSteps = append(nextSteps, append([]byte(nil), rawStep...))
-		}
-		if len(agentTurn.GetUserMessage()) == 0 && len(nextSteps) == 0 {
-			continue
-		}
-		encoded, err := proto.Marshal(&agentv1.ConversationTurnStructure{
-			Turn: &agentv1.ConversationTurnStructure_AgentConversationTurn{
-				AgentConversationTurn: &agentv1.AgentConversationTurnStructure{
-					UserMessage: append([]byte(nil), agentTurn.GetUserMessage()...),
-					Steps:       nextSteps,
-				},
-			},
-		})
-		if err != nil {
-			filtered = append(filtered, append([]byte(nil), rawTurn...))
-			continue
-		}
-		filtered = append(filtered, encoded)
-	}
-	return filtered
-}
-
 func filterCheckpointPersistentToolReplay(messages []promptengine.Message) []promptengine.Message {
 	if len(messages) == 0 {
 		return nil
@@ -1282,7 +1245,7 @@ func filterCheckpointPersistentToolReplay(messages []promptengine.Message) []pro
 		if strings.TrimSpace(message.Role) == "assistant" && len(message.ToolCalls) > 0 {
 			nextToolCalls := make([]promptengine.ToolCallDescriptor, 0, len(message.ToolCalls))
 			for _, toolCall := range message.ToolCalls {
-				if !shouldPersistToolResultName(toolCall.Function.Name) {
+				if !shouldPersistCheckpointReplayToolResultName(toolCall.Function.Name) {
 					skippedToolCallIDs[strings.TrimSpace(toolCall.ID)] = struct{}{}
 					continue
 				}
@@ -1299,7 +1262,7 @@ func filterCheckpointPersistentToolReplay(messages []promptengine.Message) []pro
 			if _, ok := skippedToolCallIDs[strings.TrimSpace(message.ToolCallID)]; ok {
 				continue
 			}
-			if !shouldPersistToolResultName(message.Name) {
+			if !shouldPersistCheckpointReplayToolResultName(message.Name) {
 				continue
 			}
 		}

internal/backend/forwarder/projector_fork_test.go

@@ -1,7 +1,9 @@
 package forwarder
 
 import (
+	"bytes"
 	"crypto/sha256"
+	"encoding/json"
 	"strings"
 	"testing"
 
@@ -9,6 +11,7 @@ import (
 	"google.golang.org/protobuf/proto"
 
 	"cursor/gen/agentv1"
+	promptengine "cursor/internal/backend/agent/prompt"
 )
 
 func TestProjectCheckpointProjectionBuildsResolvableForkState(t *testing.T) {
@@ -138,3 +141,240 @@ func TestProjectCheckpointProjectionKeepsForkPointIsolatedFromLaterHistory(t *te
 		t.Fatalf("fork snapshots are not isolated: midpoint=%#v latest=%#v", midpointMessages, latestMessages)
 	}
 }
+
+func TestProjectCheckpointProjectionMergesToolCallWithCompletedResult(t *testing.T) {
+	userPayload, err := protojson.Marshal(&agentv1.UserMessage{Text: "inspect file", MessageId: "message-1"})
+	if err != nil {
+		t.Fatalf("marshal user message: %v", err)
+	}
+	startedAt := uint64(100)
+	toolCallID := "call-1"
+	startedToolCall := checkpointTestToolCallPayload(t, &agentv1.ToolCall{
+		ToolCallId:  &toolCallID,
+		StartedAtMs: &startedAt,
+		Tool: &agentv1.ToolCall_ReadToolCall{
+			ReadToolCall: &agentv1.ReadToolCall{
+				Args: &agentv1.ReadToolArgs{Path: "/tmp/example.txt"},
+			},
+		},
+	})
+	completedAt := uint64(200)
+	completedToolCall := checkpointTestToolCallPayload(t, &agentv1.ToolCall{
+		CompletedAtMs: &completedAt,
+		Tool: &agentv1.ToolCall_ReadToolCall{
+			ReadToolCall: &agentv1.ReadToolCall{
+				Result: &agentv1.ReadToolResult{
+					Result: &agentv1.ReadToolResult_Success{
+						Success: &agentv1.ReadToolSuccess{
+							Path:       "/tmp/example.txt",
+							TotalLines: 1,
+							Output:     &agentv1.ReadToolSuccess_Content{Content: "file contents"},
+						},
+					},
+				},
+			},
+		},
+	})
+	conversation := &ConversationFile{
+		ConversationID: "conversation-1",
+		Mode:           "agent",
+		NextTurnSeq:    2,
+		Entries: []HistoryEntry{
+			{Seq: 1, TurnSeq: 1, RequestID: "request-1", Role: "user", Kind: "user_message", Payload: userPayload},
+			newAssistantTextEntry(1, "request-1", "before", "", ""),
+			newToolCallEntry(1, "request-1", "call-1", "Read", "", "", startedToolCall),
+			newToolResultEntry(1, "request-1", "call-1", "Read", `{"path":"/tmp/example.txt"}`, "file contents", "", completedToolCall),
+			newAssistantTextEntry(1, "request-1", "after", "", ""),
+		},
+	}
+
+	projection, err := NewHistoryProjector().ProjectCheckpointProjection(conversation)
+	if err != nil {
+		t.Fatalf("ProjectCheckpointProjection() error = %v", err)
+	}
+	if len(projection.Blobs) != 5 {
+		t.Fatalf("checkpoint blobs = %d, want user, three final steps, and turn", len(projection.Blobs))
+	}
+	steps := checkpointProjectionSteps(t, projection)
+	if len(steps) != 3 {
+		t.Fatalf("checkpoint steps = %d, want assistant, completed Read, assistant", len(steps))
+	}
+	if steps[0].GetAssistantMessage().GetText() != "before" || steps[2].GetAssistantMessage().GetText() != "after" {
+		t.Fatalf("checkpoint step ordering changed: %#v", steps)
+	}
+	mergedToolCall := steps[1].GetToolCall()
+	readCall := mergedToolCall.GetReadToolCall()
+	if readCall == nil || readCall.GetResult().GetSuccess().GetContent() != "file contents" {
+		t.Fatalf("checkpoint Read step does not contain completed result: %#v", steps[1].GetToolCall())
+	}
+	if readCall.GetArgs().GetPath() != "/tmp/example.txt" || mergedToolCall.GetToolCallId() != toolCallID || mergedToolCall.GetStartedAtMs() != startedAt || mergedToolCall.GetCompletedAtMs() != completedAt {
+		t.Fatalf("checkpoint Read step lost started-call fields: %#v", mergedToolCall)
+	}
+
+	replay, err := promptengine.DecodeReplayMessages(projection.State.GetRootPromptMessagesJson())
+	if err != nil {
+		t.Fatalf("decode root prompt replay: %v", err)
+	}
+	for _, message := range replay {
+		if message.Name == "Read" || len(message.ToolCalls) > 0 {
+			t.Fatalf("UI-only Read result leaked into root prompt replay: %#v", replay)
+		}
+	}
+}
+
+func TestProjectCheckpointProjectionIsIdempotentAndDoesNotMutateHistory(t *testing.T) {
+	userPayload, err := protojson.Marshal(&agentv1.UserMessage{Text: "inspect file", MessageId: "message-1"})
+	if err != nil {
+		t.Fatalf("marshal user message: %v", err)
+	}
+	completedToolCall := checkpointTestReadToolCall(t, &agentv1.ReadToolResult{
+		Result: &agentv1.ReadToolResult_Success{
+			Success: &agentv1.ReadToolSuccess{
+				Path:       "/tmp/example.txt",
+				TotalLines: 1,
+				Output:     &agentv1.ReadToolSuccess_Content{Content: "file contents"},
+			},
+		},
+	})
+	conversation := &ConversationFile{
+		ConversationID: "conversation-1",
+		Mode:           "agent",
+		NextTurnSeq:    2,
+		Entries: []HistoryEntry{
+			{Seq: 1, TurnSeq: 1, RequestID: "request-1", Role: "user", Kind: "user_message", Payload: userPayload},
+			newToolCallEntry(1, "request-1", "call-1", "Read", "", "", checkpointTestReadToolCall(t, nil)),
+			newToolResultEntry(1, "request-1", "call-1", "Read", `{"path":"/tmp/example.txt"}`, "file contents", "", completedToolCall),
+		},
+	}
+	before, err := json.Marshal(conversation)
+	if err != nil {
+		t.Fatalf("marshal conversation before projection: %v", err)
+	}
+
+	projector := NewHistoryProjector()
+	first, err := projector.ProjectCheckpointProjection(conversation)
+	if err != nil {
+		t.Fatalf("first projection: %v", err)
+	}
+	second, err := projector.ProjectCheckpointProjection(conversation)
+	if err != nil {
+		t.Fatalf("second projection: %v", err)
+	}
+
+	if !proto.Equal(first.State, second.State) {
+		t.Fatalf("repeated projection changed checkpoint state: first=%#v second=%#v", first.State, second.State)
+	}
+	if len(first.Blobs) != len(second.Blobs) {
+		t.Fatalf("repeated projection changed blob count: first=%d second=%d", len(first.Blobs), len(second.Blobs))
+	}
+	for index := range first.Blobs {
+		if !bytes.Equal(first.Blobs[index].ID, second.Blobs[index].ID) || !bytes.Equal(first.Blobs[index].Data, second.Blobs[index].Data) {
+			t.Fatalf("repeated projection changed blob %d", index)
+		}
+	}
+	after, err := json.Marshal(conversation)
+	if err != nil {
+		t.Fatalf("marshal conversation after projection: %v", err)
+	}
+	if !bytes.Equal(before, after) {
+		t.Fatalf("checkpoint projection mutated semantic history:\nbefore=%s\nafter=%s", before, after)
+	}
+}
+
+func TestProjectCheckpointProjectionKeepsStartedToolCallWhenResultPayloadIsMissing(t *testing.T) {
+	startedToolCall := checkpointTestReadToolCall(t, nil)
+	conversation := &ConversationFile{
+		ConversationID: "conversation-1",
+		Mode:           "agent",
+		NextTurnSeq:    2,
+		Entries: []HistoryEntry{
+			newToolCallEntry(1, "request-1", "call-1", "Read", "", "", startedToolCall),
+			newToolResultEntry(1, "request-1", "call-1", "Read", `{"path":"/tmp/example.txt"}`, "read failed", "", nil),
+		},
+	}
+
+	projection, err := NewHistoryProjector().ProjectCheckpointProjection(conversation)
+	if err != nil {
+		t.Fatalf("ProjectCheckpointProjection() error = %v", err)
+	}
+	steps := checkpointProjectionSteps(t, projection)
+	if len(steps) != 1 {
+		t.Fatalf("checkpoint steps = %d, want the original Read step", len(steps))
+	}
+	readCall := steps[0].GetToolCall().GetReadToolCall()
+	if readCall == nil || readCall.GetArgs().GetPath() != "/tmp/example.txt" || readCall.GetResult() != nil {
+		t.Fatalf("checkpoint did not preserve the original Read call: %#v", steps[0].GetToolCall())
+	}
+}
+
+func TestProjectCheckpointProjectionAppendsLegacyResultWithoutToolCallEntry(t *testing.T) {
+	completedToolCall := checkpointTestReadToolCall(t, &agentv1.ReadToolResult{
+		Result: &agentv1.ReadToolResult_Error{Error: &agentv1.ReadToolError{ErrorMessage: "not readable"}},
+	})
+	conversation := &ConversationFile{
+		ConversationID: "conversation-1",
+		Mode:           "agent",
+		NextTurnSeq:    2,
+		Entries: []HistoryEntry{
+			newToolResultEntry(1, "request-1", "call-1", "Read", `{"path":"/tmp/example.txt"}`, "not readable", "", completedToolCall),
+		},
+	}
+
+	projection, err := NewHistoryProjector().ProjectCheckpointProjection(conversation)
+	if err != nil {
+		t.Fatalf("ProjectCheckpointProjection() error = %v", err)
+	}
+	steps := checkpointProjectionSteps(t, projection)
+	if len(steps) != 1 || steps[0].GetToolCall().GetReadToolCall().GetResult().GetError().GetErrorMessage() != "not readable" {
+		t.Fatalf("legacy result-only Read step was not preserved: %#v", steps)
+	}
+}
+
+func checkpointTestReadToolCall(t *testing.T, result *agentv1.ReadToolResult) []byte {
+	t.Helper()
+	return checkpointTestToolCallPayload(t, &agentv1.ToolCall{
+		Tool: &agentv1.ToolCall_ReadToolCall{
+			ReadToolCall: &agentv1.ReadToolCall{
+				Args:   &agentv1.ReadToolArgs{Path: "/tmp/example.txt"},
+				Result: result,
+			},
+		},
+	})
+}
+
+func checkpointTestToolCallPayload(t *testing.T, toolCall *agentv1.ToolCall) []byte {
+	t.Helper()
+	payload, err := protojson.Marshal(toolCall)
+	if err != nil {
+		t.Fatalf("marshal Read tool call: %v", err)
+	}
+	return payload
+}
+
+func checkpointProjectionSteps(t *testing.T, projection *CheckpointProjection) []*agentv1.ConversationStep {
+	t.Helper()
+	if projection == nil || projection.State == nil || len(projection.State.GetTurns()) != 1 {
+		t.Fatalf("checkpoint turns = %#v, want exactly one turn", projection)
+	}
+	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")
+	}
+	steps := make([]*agentv1.ConversationStep, 0, len(agentTurn.GetSteps()))
+	for _, stepID := range agentTurn.GetSteps() {
+		step := &agentv1.ConversationStep{}
+		if err := proto.Unmarshal(blobs[string(stepID)], step); err != nil {
+			t.Fatalf("decode checkpoint step: %v", err)
+		}
+		steps = append(steps, step)
+	}
+	return steps
+}

internal/backend/forwarder/service.go

@@ -3,6 +3,8 @@ package forwarder
 
 import (
 	"context"
+	"crypto/sha256"
+	"encoding/hex"
 	"encoding/json"
 	"errors"
 	"fmt"
@@ -834,14 +836,22 @@ func (service *Service) handleCancelIntent(intent InboundIntent) error {
 	}
 	hasCheckpoint := checkpointConversationInitialized(stream)
 	if hasCheckpoint {
+		preservedInterruptedOutput, err := service.persistInterruptedProviderOutput(stream)
+		if err != nil {
+			return err
+		}
 		cancelReason := firstNonEmpty(intent.CancelReason, "user aborted")
-		_, err := service.appendConversationEntries(stream, stream.ConversationID, []HistoryEntry{
-			newMetadataEntry(stream.TurnSeq, intent.RequestID, "control", map[string]any{
+		replayPolicy := cancelReplayPolicyForReason(cancelReason)
+		if preservedInterruptedOutput || checkpointTurnHasReplayActivity(stream) {
+			replayPolicy = cancelReplayPolicyKeepInterrupted
+		}
+		cancelEntry := newMetadataEntry(stream.TurnSeq, intent.RequestID, "control", map[string]any{
 			"status":        "canceled",
 			"reason":        cancelReason,
-				"replay_policy": cancelReplayPolicyForReason(cancelReason),
-			}),
+			"replay_policy": replayPolicy,
 		})
+		cancelEntry.IdempotencyKey = cancelMetadataIdempotencyKey(stream.TurnSeq, intent.RequestID)
+		_, err = service.appendConversationEntries(stream, stream.ConversationID, []HistoryEntry{cancelEntry})
 		if err != nil {
 			return err
 		}
@@ -869,6 +879,89 @@ func (service *Service) handleCancelIntent(intent InboundIntent) error {
 	return service.broker.Cancel(intent.RequestID, firstNonEmpty(intent.CancelReason, "[canceled] User aborted request"))
 }
 
+func checkpointTurnHasReplayActivity(stream *ActiveStream) bool {
+	if stream == nil {
+		return false
+	}
+	stream.mu.Lock()
+	defer stream.mu.Unlock()
+	if stream.CheckpointConversation == nil {
+		return false
+	}
+	for _, entry := range stream.CheckpointConversation.Entries {
+		if entry.TurnSeq == stream.TurnSeq && isCanceledTurnActivityEntry(entry) {
+			return true
+		}
+	}
+	return false
+}
+
+// persistInterruptedProviderOutput commits the current provider pass before cancellation.
+// The entry key is stable for this provider pass, so repeated cancellation handling is a no-op.
+func (service *Service) persistInterruptedProviderOutput(stream *ActiveStream) (bool, error) {
+	if stream == nil {
+		return false, nil
+	}
+	stream.mu.Lock()
+	turnSeq := stream.TurnSeq
+	requestID := strings.TrimSpace(stream.RequestID)
+	modelCallID := strings.TrimSpace(stream.CurrentModelCallID)
+	providerPass := stream.ProviderPassCount
+	text := stream.ProviderAccumulatedText
+	reasoning := stream.ProviderAccumulatedReasoning
+	reasoningSignature := stream.ProviderAccumulatedReasoningSignature
+	reasoningSignatureSource := stream.ProviderAccumulatedReasoningSignatureSource
+	reasoningItemID := stream.ProviderAccumulatedReasoningItemID
+	reasoningStatus := stream.ProviderAccumulatedReasoningStatus
+	reasoningSummary := append([]byte(nil), stream.ProviderAccumulatedReasoningSummary...)
+	stream.mu.Unlock()
+	if strings.TrimSpace(text) == "" && !hasReplayableReasoningPayload(reasoning, reasoningSignature, reasoningSignatureSource) {
+		return false, nil
+	}
+	key := interruptedProviderOutputIdempotencyKey(turnSeq, requestID, modelCallID, providerPass)
+	_, err := service.appendConversationEntries(stream, stream.ConversationID, []HistoryEntry{
+		{
+			TurnSeq:        turnSeq,
+			RequestID:      requestID,
+			IdempotencyKey: key,
+			Role:           "assistant",
+			Kind:           "assistant_text",
+			Payload: newAssistantTextPayload(
+				text,
+				reasoning,
+				reasoningSignature,
+				reasoningSignatureSource,
+				reasoningItemID,
+				reasoningStatus,
+				reasoningSummary,
+			),
+		},
+	})
+	return true, err
+}
+
+func interruptedProviderOutputIdempotencyKey(turnSeq int64, requestID string, modelCallID string, providerPass int) string {
+	payload := strings.Join([]string{
+		"provider_interrupted_output",
+		fmt.Sprintf("%d", turnSeq),
+		strings.TrimSpace(requestID),
+		strings.TrimSpace(modelCallID),
+		fmt.Sprintf("%d", providerPass),
+	}, "\x00")
+	digest := sha256.Sum256([]byte(payload))
+	return "provider-interrupted-output:" + hex.EncodeToString(digest[:])
+}
+
+func cancelMetadataIdempotencyKey(turnSeq int64, requestID string) string {
+	payload := strings.Join([]string{
+		"cancel",
+		fmt.Sprintf("%d", turnSeq),
+		strings.TrimSpace(requestID),
+	}, "\x00")
+	digest := sha256.Sum256([]byte(payload))
+	return "cancel:" + hex.EncodeToString(digest[:])
+}
+
 // handleExecResult 处理客户端返回的执行桥结果，并在终态时把 tool_result 写回 history。
 func (service *Service) handleExecResult(intent InboundIntent) error {
 	stream, ok := service.broker.Get(intent.RequestID)
@@ -2431,6 +2524,16 @@ func newAssistantTextEntry(turnSeq int64, requestID string, text string, reasoni
 }
 
 func newAssistantTextEntryWithProviderMetadata(turnSeq int64, requestID string, text string, reasoningContent string, reasoningSignature string, reasoningSignatureSource string, reasoningItemID string, reasoningStatus string, reasoningSummary json.RawMessage) HistoryEntry {
+	return HistoryEntry{
+		TurnSeq:   turnSeq,
+		RequestID: strings.TrimSpace(requestID),
+		Role:      "assistant",
+		Kind:      "assistant_text",
+		Payload:   newAssistantTextPayload(text, reasoningContent, reasoningSignature, reasoningSignatureSource, reasoningItemID, reasoningStatus, reasoningSummary),
+	}
+}
+
+func newAssistantTextPayload(text string, reasoningContent string, reasoningSignature string, reasoningSignatureSource string, reasoningItemID string, reasoningStatus string, reasoningSummary json.RawMessage) json.RawMessage {
 	payload, _ := json.Marshal(assistantTextPayload{
 		Text:                     text,
 		ReasoningContent:         reasoningContent,
@@ -2440,13 +2543,7 @@ func newAssistantTextEntryWithProviderMetadata(turnSeq int64, requestID string,
 		ReasoningStatus:          strings.TrimSpace(reasoningStatus),
 		ReasoningSummary:         append(json.RawMessage(nil), reasoningSummary...),
 	})
-	return HistoryEntry{
-		TurnSeq:   turnSeq,
-		RequestID: strings.TrimSpace(requestID),
-		Role:      "assistant",
-		Kind:      "assistant_text",
-		Payload:   payload,
-	}
+	return payload
 }
 
 // newToolCallEntry 构造 tool_call entry。

internal/backend/forwarder/types.go

@@ -79,6 +79,7 @@ type HistoryEntry struct {
 	Seq              int64           `json:"seq"`
 	TurnSeq          int64           `json:"turn_seq"`
 	RequestID        string          `json:"request_id,omitempty"`
+	IdempotencyKey   string          `json:"idempotency_key,omitempty"`
 	Role             string          `json:"role"`
 	Kind             string          `json:"kind"`
 	ToolCallID       string          `json:"tool_call_id,omitempty"`

internal/bridge/proxy.go

@@ -24,6 +24,12 @@ type ModelAdapterTestResult = client.ModelAdapterTestResult
 // ModelAdapterTestResultsPayload 定义测速结果事件载荷。
 type ModelAdapterTestResultsPayload = client.ModelAdapterTestResultsPayload
 
+// ModelAdapterModelsRequest 定义模型列表查询请求。
+type ModelAdapterModelsRequest = client.ModelAdapterModelsRequest
+
+// ModelAdapterModelsResult 定义模型列表查询结果。
+type ModelAdapterModelsResult = client.ModelAdapterModelsResult
+
 // CursorAccountStatus 是可安全展示给桌面前端的独立 Cursor 账号状态。
 type CursorAccountStatus = client.CursorAccountStatus
 
@@ -119,6 +125,11 @@ func (s *ProxyService) GetModelAdapterTestResults() []ModelAdapterTestResult {
 	return s.core.GetModelAdapterTestResults()
 }
 
+// FetchModelAdapterModels 用于从模型服务读取可用模型列表。
+func (s *ProxyService) FetchModelAdapterModels(input ModelAdapterModelsRequest) (ModelAdapterModelsResult, error) {
+	return s.core.FetchModelAdapterModels(input)
+}
+
 // GetDeviceID 用于处理与 GetDeviceID 相关的逻辑。
 func (s *ProxyService) GetDeviceID() (string, error) {
 	return s.core.GetDeviceID()

internal/client/model_adapter_benchmark.go

@@ -10,6 +10,7 @@ import (
 	"io"
 	"math"
 	"net/http"
+	"net/url"
 	"sort"
 	"strconv"
 	"strings"
@@ -31,8 +32,48 @@ const (
 	modelAdapterTestDefaultMaxTokens  = 65_536
 	modelAdapterTestEmptyTextError    = "未收到文本输出，无法计算测速结果"
 	modelAdapterTestMaxErrorBodyBytes = 8192
+	modelAdapterListTimeout           = 20 * time.Second
+	modelAdapterListMaxBodyBytes      = 8 << 20
+	modelAdapterListPageSize          = 1000
+	modelAdapterListMaxPages          = 50
 )
 
+// modelListProviderRule 收敛各家模型列表接口的协议差异，避免判断散落到多个函数。
+type modelListProviderRule struct {
+	// paths 按优先级排列，逐个尝试直到某个返回可用模型
+	paths       []string
+	authHeader  string
+	authPrefix  string
+	extraHeader map[string]string
+	// paginated 为真时按 limit + after_id 游标翻页，直到 has_more 为 false
+	paginated bool
+}
+
+var modelListProviderRules = map[string]modelListProviderRule{
+	"openai": {
+		paths:      []string{"/models"},
+		authHeader: "Authorization",
+		authPrefix: "Bearer ",
+	},
+	"anthropic": {
+		paths:       []string{"/models"},
+		authHeader:  "x-api-key",
+		extraHeader: map[string]string{"anthropic-version": "2023-06-01"},
+		paginated:   true,
+	},
+}
+
+// modelListVersionSegments 用于判断 base url 是否已带版本前缀，带了就不再补 /v1。
+var modelListVersionSegments = map[string]bool{
+	"v1":         true,
+	"v1beta":     true,
+	"v2":         true,
+	"beta":       true,
+	"openai":     true,
+	"compat":     true,
+	"compatible": true,
+}
+
 type ModelAdapterTestStatus string
 
 const (
@@ -58,6 +99,20 @@ type ModelAdapterTestResult struct {
 	TestedAt         string  `json:"testedAt"`
 }
 
+// ModelAdapterModelsRequest 定义从兼容接口读取模型列表所需的最小配置。
+type ModelAdapterModelsRequest struct {
+	Type                 string `json:"type"`
+	BaseURL              string `json:"baseURL"`
+	APIKey               string `json:"apiKey"`
+	CustomHeadersEnabled bool   `json:"customHeadersEnabled"`
+	CustomHeadersJSON    string `json:"customHeadersJSON"`
+}
+
+// ModelAdapterModelsResult 定义可供前端下拉选择的模型列表。
+type ModelAdapterModelsResult struct {
+	Models []string `json:"models"`
+}
+
 // ModelAdapterTestResultsPayload 用于向前端广播当前测速结果快照。
 type ModelAdapterTestResultsPayload struct {
 	Results []ModelAdapterTestResult `json:"results"`
@@ -108,6 +163,254 @@ func (s *ProxyService) GetModelAdapterTestResults() []ModelAdapterTestResult {
 	return s.snapshotModelAdapterTestResults()
 }
 
+func (s *ProxyService) FetchModelAdapterModels(input ModelAdapterModelsRequest) (ModelAdapterModelsResult, error) {
+	_ = s
+	provider := strings.ToLower(strings.TrimSpace(input.Type))
+	baseURL := strings.TrimSpace(input.BaseURL)
+	apiKey := strings.TrimSpace(input.APIKey)
+	rule, supported := modelListProviderRules[provider]
+	if !supported {
+		return ModelAdapterModelsResult{}, errors.New("模型类型仅支持 OpenAI 或 Anthropic")
+	}
+	if baseURL == "" {
+		return ModelAdapterModelsResult{}, errors.New("接口地址不能为空")
+	}
+	if apiKey == "" {
+		return ModelAdapterModelsResult{}, errors.New("访问密钥不能为空")
+	}
+
+	ctx, cancel := context.WithTimeout(context.Background(), modelAdapterListTimeout)
+	defer cancel()
+
+	var lastErr error
+	for _, endpoint := range buildModelListEndpointCandidates(rule, baseURL) {
+		models, err := fetchModelListEndpoint(ctx, rule, endpoint, apiKey, input)
+		if err == nil {
+			return ModelAdapterModelsResult{Models: models}, nil
+		}
+		lastErr = err
+	}
+	if lastErr != nil {
+		return ModelAdapterModelsResult{}, lastErr
+	}
+	return ModelAdapterModelsResult{}, errors.New("未找到可用的模型列表接口")
+}
+
+func buildModelListEndpointCandidates(rule modelListProviderRule, rawBaseURL string) []string {
+	base := strings.TrimRight(strings.TrimSpace(rawBaseURL), "/")
+	for _, suffix := range []string{"/chat/completions", "/responses", "/messages"} {
+		if strings.HasSuffix(strings.ToLower(base), suffix) {
+			base = base[:len(base)-len(suffix)]
+		}
+	}
+	base = strings.TrimRight(base, "/")
+
+	tail := strings.ToLower(base[strings.LastIndex(base, "/")+1:])
+	var candidates []string
+	switch {
+	case tail == "models" || tail == "model":
+		// 用户已经填到模型列表地址本身，直接用
+		candidates = []string{base}
+	case modelListVersionSegments[tail]:
+		candidates = prefixModelListPaths(base, "", rule.paths)
+	default:
+		// base 没带版本段，优先试 /v1，再退回裸路径
+		candidates = append(
+			prefixModelListPaths(base, "/v1", rule.paths),
+			prefixModelListPaths(base, "", rule.paths)...,
+		)
+	}
+
+	seen := map[string]struct{}{}
+	endpoints := make([]string, 0, len(candidates))
+	for _, endpoint := range candidates {
+		if _, err := url.ParseRequestURI(endpoint); err != nil {
+			continue
+		}
+		if _, exists := seen[endpoint]; exists {
+			continue
+		}
+		seen[endpoint] = struct{}{}
+		endpoints = append(endpoints, endpoint)
+	}
+	return endpoints
+}
+
+func prefixModelListPaths(base string, version string, paths []string) []string {
+	endpoints := make([]string, 0, len(paths))
+	for _, path := range paths {
+		endpoints = append(endpoints, base+version+path)
+	}
+	return endpoints
+}
+
+func fetchModelListEndpoint(ctx context.Context, rule modelListProviderRule, endpoint string, apiKey string, input ModelAdapterModelsRequest) ([]string, error) {
+	collected := []string{}
+	cursor := ""
+	for page := 0; page < modelAdapterListMaxPages; page++ {
+		requestURL := endpoint
+		if rule.paginated {
+			requestURL = appendModelListCursor(endpoint, cursor)
+		}
+		payload, err := requestModelListPayload(ctx, rule, requestURL, apiKey, input)
+		if err != nil {
+			return nil, err
+		}
+		collected = append(collected, extractModelIDs(payload)...)
+		if !rule.paginated {
+			break
+		}
+		cursor = nextModelListCursor(payload)
+		if cursor == "" {
+			break
+		}
+		if page == modelAdapterListMaxPages-1 {
+			return nil, fmt.Errorf("模型列表分页超过 %d 页，结果可能不完整", modelAdapterListMaxPages)
+		}
+	}
+
+	models := normalizeFetchedModelIDs(collected)
+	if len(models) == 0 {
+		return nil, errors.New("模型列表响应中没有可用模型")
+	}
+	return models, nil
+}
+
+func requestModelListPayload(
+	ctx context.Context,
+	rule modelListProviderRule,
+	requestURL string,
+	apiKey string,
+	input ModelAdapterModelsRequest,
+) (any, error) {
+	req, err := http.NewRequestWithContext(ctx, http.MethodGet, requestURL, nil)
+	if err != nil {
+		return nil, err
+	}
+	req.Header.Set(rule.authHeader, rule.authPrefix+apiKey)
+	for key, value := range rule.extraHeader {
+		req.Header.Set(key, value)
+	}
+	req.Header.Set("Accept", "application/json")
+	applyModelListCustomHeaders(req.Header, input)
+
+	resp, err := http.DefaultClient.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	defer resp.Body.Close()
+	body, readErr := io.ReadAll(io.LimitReader(resp.Body, modelAdapterListMaxBodyBytes))
+	if readErr != nil {
+		return nil, readErr
+	}
+	if resp.StatusCode < 200 || resp.StatusCode >= 300 {
+		message := strings.TrimSpace(string(body))
+		if len(message) > modelAdapterTestMaxErrorBodyBytes {
+			message = message[:modelAdapterTestMaxErrorBodyBytes]
+		}
+		if message == "" {
+			message = resp.Status
+		}
+		return nil, fmt.Errorf("读取模型列表失败：%s", message)
+	}
+
+	var payload any
+	if err := json.Unmarshal(body, &payload); err != nil {
+		return nil, fmt.Errorf("模型列表响应不是合法 JSON：%w", err)
+	}
+	return payload, nil
+}
+
+func appendModelListCursor(endpoint string, cursor string) string {
+	query := url.Values{}
+	query.Set("limit", strconv.Itoa(modelAdapterListPageSize))
+	if cursor != "" {
+		query.Set("after_id", cursor)
+	}
+	separator := "?"
+	if strings.Contains(endpoint, "?") {
+		separator = "&"
+	}
+	return endpoint + separator + query.Encode()
+}
+
+func nextModelListCursor(payload any) string {
+	object, ok := payload.(map[string]any)
+	if !ok {
+		return ""
+	}
+	if hasMore, _ := object["has_more"].(bool); !hasMore {
+		return ""
+	}
+	cursor, _ := object["last_id"].(string)
+	return strings.TrimSpace(cursor)
+}
+
+func applyModelListCustomHeaders(header http.Header, input ModelAdapterModelsRequest) {
+	if !input.CustomHeadersEnabled || strings.TrimSpace(input.CustomHeadersJSON) == "" {
+		return
+	}
+	var parsed map[string]string
+	if err := json.Unmarshal([]byte(input.CustomHeadersJSON), &parsed); err != nil {
+		return
+	}
+	for key, value := range parsed {
+		if strings.TrimSpace(key) == "" {
+			continue
+		}
+		header.Set(key, value)
+	}
+}
+
+func extractModelIDs(value any) []string {
+	switch typed := value.(type) {
+	case string:
+		if strings.TrimSpace(typed) == "" {
+			return []string{}
+		}
+		return []string{typed}
+	case []any:
+		models := make([]string, 0, len(typed))
+		for _, item := range typed {
+			models = append(models, extractModelIDs(item)...)
+		}
+		return models
+	case map[string]any:
+		for _, key := range []string{"id", "name"} {
+			if text, ok := typed[key].(string); ok && strings.TrimSpace(text) != "" {
+				return []string{text}
+			}
+		}
+		models := []string{}
+		for _, key := range []string{"data", "models"} {
+			if child, ok := typed[key]; ok {
+				models = append(models, extractModelIDs(child)...)
+			}
+		}
+		return models
+	default:
+		return []string{}
+	}
+}
+
+func normalizeFetchedModelIDs(input []string) []string {
+	seen := map[string]struct{}{}
+	models := make([]string, 0, len(input))
+	for _, item := range input {
+		model := strings.TrimSpace(item)
+		if model == "" {
+			continue
+		}
+		if _, exists := seen[model]; exists {
+			continue
+		}
+		seen[model] = struct{}{}
+		models = append(models, model)
+	}
+	sort.Strings(models)
+	return models
+}
+
 func (s *ProxyService) TestModelAdapter(adapter serverconfig.ModelAdapterConfig) (ModelAdapterTestResult, error) {
 	requestHash := buildModelAdapterTestRequestHash(adapter)
 	adapterID := buildModelAdapterTestCacheKey(adapter, requestHash)

internal/client/model_adapter_models_test.go

@@ -0,0 +1,351 @@
+package client
+
+import (
+	"encoding/json"
+	"net/http"
+	"net/http/httptest"
+	"reflect"
+	"strconv"
+	"strings"
+	"testing"
+)
+
+func TestBuildModelListEndpointCandidates(t *testing.T) {
+	tests := []struct {
+		name     string
+		provider string
+		baseURL  string
+		want     []string
+	}{
+		{
+			name:     "openai 带版本段不再补 v1",
+			provider: "openai",
+			baseURL:  "https://api.openai.com/v1",
+			want:     []string{"https://api.openai.com/v1/models"},
+		},
+		{
+			name:     "openai 裸域名优先试 v1",
+			provider: "openai",
+			baseURL:  "https://api.openai.com",
+			want:     []string{"https://api.openai.com/v1/models", "https://api.openai.com/models"},
+		},
+		{
+			name:     "anthropic 裸域名优先试 v1",
+			provider: "anthropic",
+			baseURL:  "https://api.anthropic.com",
+			want:     []string{"https://api.anthropic.com/v1/models", "https://api.anthropic.com/models"},
+		},
+		{
+			name:     "anthropic 带版本段不再补 v1",
+			provider: "anthropic",
+			baseURL:  "https://api.anthropic.com/v1",
+			want:     []string{"https://api.anthropic.com/v1/models"},
+		},
+		{
+			name:     "剥离 chat completions 后缀",
+			provider: "openai",
+			baseURL:  "https://api.example.com/v1/chat/completions",
+			want:     []string{"https://api.example.com/v1/models"},
+		},
+		{
+			name:     "剥离 responses 后缀",
+			provider: "openai",
+			baseURL:  "https://api.example.com/v1/responses",
+			want:     []string{"https://api.example.com/v1/models"},
+		},
+		{
+			name:     "剥离 anthropic messages 后缀",
+			provider: "anthropic",
+			baseURL:  "https://api.example.com/v1/messages",
+			want:     []string{"https://api.example.com/v1/models"},
+		},
+		{
+			name:     "已填到 models 地址本身则原样使用",
+			provider: "openai",
+			baseURL:  "https://api.example.com/openai/v1/models",
+			want:     []string{"https://api.example.com/openai/v1/models"},
+		},
+		{
+			name:     "自定义网关前缀会补 v1",
+			provider: "openai",
+			baseURL:  "https://gateway.example.com/proxy",
+			want: []string{
+				"https://gateway.example.com/proxy/v1/models",
+				"https://gateway.example.com/proxy/models",
+			},
+		},
+		{
+			name:     "尾部斜杠不影响推导",
+			provider: "anthropic",
+			baseURL:  "  https://api.anthropic.com/v1/  ",
+			want:     []string{"https://api.anthropic.com/v1/models"},
+		},
+	}
+
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+			rule, ok := modelListProviderRules[test.provider]
+			if !ok {
+				t.Fatalf("provider %q 没有对应规则", test.provider)
+			}
+			got := buildModelListEndpointCandidates(rule, test.baseURL)
+			if !reflect.DeepEqual(got, test.want) {
+				t.Fatalf("buildModelListEndpointCandidates(%q) = %v, want %v", test.baseURL, got, test.want)
+			}
+		})
+	}
+}
+
+func TestFetchModelAdapterModelsOpenAIUsesBearer(t *testing.T) {
+	var gotPath string
+	var gotAuth string
+	var gotAnthropicVersion string
+	var gotAPIKeyHeader string
+
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		gotPath = r.URL.Path
+		gotAuth = r.Header.Get("Authorization")
+		gotAnthropicVersion = r.Header.Get("anthropic-version")
+		gotAPIKeyHeader = r.Header.Get("x-api-key")
+		w.Header().Set("Content-Type", "application/json")
+		_, _ = w.Write([]byte(`{"data":[{"id":"gpt-5"},{"id":"gpt-4o"}]}`))
+	}))
+	defer server.Close()
+
+	service := &ProxyService{}
+	result, err := service.FetchModelAdapterModels(ModelAdapterModelsRequest{
+		Type:    "openai",
+		BaseURL: server.URL + "/v1",
+		APIKey:  "sk-test",
+	})
+	if err != nil {
+		t.Fatalf("FetchModelAdapterModels 返回错误：%v", err)
+	}
+
+	if gotPath != "/v1/models" {
+		t.Fatalf("请求路径 = %q, want /v1/models", gotPath)
+	}
+	if gotAuth != "Bearer sk-test" {
+		t.Fatalf("Authorization = %q, want Bearer sk-test", gotAuth)
+	}
+	if gotAPIKeyHeader != "" {
+		t.Fatalf("openai 不应发送 x-api-key，实际 = %q", gotAPIKeyHeader)
+	}
+	if gotAnthropicVersion != "" {
+		t.Fatalf("openai 不应发送 anthropic-version，实际 = %q", gotAnthropicVersion)
+	}
+	want := []string{"gpt-4o", "gpt-5"}
+	if !reflect.DeepEqual(result.Models, want) {
+		t.Fatalf("Models = %v, want %v", result.Models, want)
+	}
+}
+
+func TestFetchModelAdapterModelsAnthropicUsesAPIKeyHeader(t *testing.T) {
+	var gotAuth string
+	var gotAPIKeyHeader string
+	var gotAnthropicVersion string
+
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		gotAuth = r.Header.Get("Authorization")
+		gotAPIKeyHeader = r.Header.Get("x-api-key")
+		gotAnthropicVersion = r.Header.Get("anthropic-version")
+		w.Header().Set("Content-Type", "application/json")
+		_, _ = w.Write([]byte(`{"data":[{"id":"claude-sonnet-4"}],"has_more":false}`))
+	}))
+	defer server.Close()
+
+	service := &ProxyService{}
+	result, err := service.FetchModelAdapterModels(ModelAdapterModelsRequest{
+		Type:    "anthropic",
+		BaseURL: server.URL + "/v1",
+		APIKey:  "sk-ant-test",
+	})
+	if err != nil {
+		t.Fatalf("FetchModelAdapterModels 返回错误：%v", err)
+	}
+
+	if gotAPIKeyHeader != "sk-ant-test" {
+		t.Fatalf("x-api-key = %q, want sk-ant-test", gotAPIKeyHeader)
+	}
+	if gotAnthropicVersion != "2023-06-01" {
+		t.Fatalf("anthropic-version = %q, want 2023-06-01", gotAnthropicVersion)
+	}
+	if gotAuth != "" {
+		t.Fatalf("anthropic 不应发送 Authorization，实际 = %q", gotAuth)
+	}
+	want := []string{"claude-sonnet-4"}
+	if !reflect.DeepEqual(result.Models, want) {
+		t.Fatalf("Models = %v, want %v", result.Models, want)
+	}
+}
+
+func TestFetchModelAdapterModelsAnthropicFollowsCursor(t *testing.T) {
+	var requestedQueries []string
+
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		requestedQueries = append(requestedQueries, r.URL.RawQuery)
+		w.Header().Set("Content-Type", "application/json")
+		switch r.URL.Query().Get("after_id") {
+		case "":
+			_, _ = w.Write([]byte(`{"data":[{"id":"claude-a"}],"has_more":true,"last_id":"claude-a"}`))
+		case "claude-a":
+			_, _ = w.Write([]byte(`{"data":[{"id":"claude-b"}],"has_more":true,"last_id":"claude-b"}`))
+		default:
+			_, _ = w.Write([]byte(`{"data":[{"id":"claude-c"}],"has_more":false}`))
+		}
+	}))
+	defer server.Close()
+
+	service := &ProxyService{}
+	result, err := service.FetchModelAdapterModels(ModelAdapterModelsRequest{
+		Type:    "anthropic",
+		BaseURL: server.URL + "/v1",
+		APIKey:  "sk-ant-test",
+	})
+	if err != nil {
+		t.Fatalf("FetchModelAdapterModels 返回错误：%v", err)
+	}
+
+	want := []string{"claude-a", "claude-b", "claude-c"}
+	if !reflect.DeepEqual(result.Models, want) {
+		t.Fatalf("Models = %v, want %v", result.Models, want)
+	}
+	if len(requestedQueries) != 3 {
+		t.Fatalf("请求次数 = %d, want 3（两次翻页后停止）", len(requestedQueries))
+	}
+	for _, query := range requestedQueries {
+		if !strings.Contains(query, "limit=1000") {
+			t.Fatalf("翻页请求缺少 limit 参数：%q", query)
+		}
+	}
+	if !strings.Contains(requestedQueries[1], "after_id=claude-a") {
+		t.Fatalf("第二页未带上游标：%q", requestedQueries[1])
+	}
+}
+
+func TestFetchModelAdapterModelsOpenAIDoesNotPaginate(t *testing.T) {
+	requestCount := 0
+
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		requestCount++
+		if r.URL.RawQuery != "" {
+			t.Errorf("openai 不应附加分页参数，实际 = %q", r.URL.RawQuery)
+		}
+		w.Header().Set("Content-Type", "application/json")
+		_, _ = w.Write([]byte(`{"data":[{"id":"gpt-5"}],"has_more":true,"last_id":"gpt-5"}`))
+	}))
+	defer server.Close()
+
+	service := &ProxyService{}
+	if _, err := service.FetchModelAdapterModels(ModelAdapterModelsRequest{
+		Type:    "openai",
+		BaseURL: server.URL + "/v1",
+		APIKey:  "sk-test",
+	}); err != nil {
+		t.Fatalf("FetchModelAdapterModels 返回错误：%v", err)
+	}
+
+	if requestCount != 1 {
+		t.Fatalf("请求次数 = %d, want 1（openai 忽略 has_more）", requestCount)
+	}
+}
+
+func TestFetchModelAdapterModelsReadsLargeBody(t *testing.T) {
+	models := make([]map[string]string, 0, 400)
+	for index := 0; index < 400; index++ {
+		models = append(models, map[string]string{
+			"id": "vendor/model-with-a-fairly-long-identifier-" + strings.Repeat("x", 40) + "-" + string(rune('a'+index%26)) + strconv.Itoa(index),
+		})
+	}
+	body, err := json.Marshal(map[string]any{"data": models})
+	if err != nil {
+		t.Fatalf("构造响应失败：%v", err)
+	}
+	if len(body) <= modelAdapterTestMaxErrorBodyBytes {
+		t.Fatalf("测试响应体只有 %d 字节，需要大于 %d 才能覆盖截断场景", len(body), modelAdapterTestMaxErrorBodyBytes)
+	}
+
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) {
+		w.Header().Set("Content-Type", "application/json")
+		_, _ = w.Write(body)
+	}))
+	defer server.Close()
+
+	service := &ProxyService{}
+	result, err := service.FetchModelAdapterModels(ModelAdapterModelsRequest{
+		Type:    "openai",
+		BaseURL: server.URL + "/v1",
+		APIKey:  "sk-test",
+	})
+	if err != nil {
+		t.Fatalf("FetchModelAdapterModels 返回错误：%v", err)
+	}
+	if len(result.Models) != len(models) {
+		t.Fatalf("Models 数量 = %d, want %d", len(result.Models), len(models))
+	}
+}
+
+func TestFetchModelAdapterModelsSupportsStringItems(t *testing.T) {
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) {
+		w.Header().Set("Content-Type", "application/json")
+		_, _ = w.Write([]byte(`{"data":["gpt-4o","gpt-4.1"]}`))
+	}))
+	defer server.Close()
+
+	service := &ProxyService{}
+	result, err := service.FetchModelAdapterModels(ModelAdapterModelsRequest{
+		Type:    "openai",
+		BaseURL: server.URL + "/v1",
+		APIKey:  "sk-test",
+	})
+	if err != nil {
+		t.Fatalf("FetchModelAdapterModels 返回错误：%v", err)
+	}
+	want := []string{"gpt-4.1", "gpt-4o"}
+	if !reflect.DeepEqual(result.Models, want) {
+		t.Fatalf("Models = %v, want %v", result.Models, want)
+	}
+}
+
+func TestFetchModelAdapterModelsRejectsPaginationTruncation(t *testing.T) {
+	requestCount := 0
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) {
+		requestCount++
+		w.Header().Set("Content-Type", "application/json")
+		_, _ = w.Write([]byte(`{"data":[{"id":"claude-model"}],"has_more":true,"last_id":"next"}`))
+	}))
+	defer server.Close()
+
+	service := &ProxyService{}
+	_, err := service.FetchModelAdapterModels(ModelAdapterModelsRequest{
+		Type:    "anthropic",
+		BaseURL: server.URL + "/v1",
+		APIKey:  "sk-ant-test",
+	})
+	if err == nil || !strings.Contains(err.Error(), "结果可能不完整") {
+		t.Fatalf("期望分页截断错误，实际 = %v", err)
+	}
+	if requestCount != modelAdapterListMaxPages {
+		t.Fatalf("请求次数 = %d, want %d", requestCount, modelAdapterListMaxPages)
+	}
+}
+
+func TestFetchModelAdapterModelsRejectsInvalidInput(t *testing.T) {
+	tests := []struct {
+		name    string
+		request ModelAdapterModelsRequest
+	}{
+		{name: "未知类型", request: ModelAdapterModelsRequest{Type: "gemini", BaseURL: "https://x.com", APIKey: "k"}},
+		{name: "缺少地址", request: ModelAdapterModelsRequest{Type: "openai", APIKey: "k"}},
+		{name: "缺少密钥", request: ModelAdapterModelsRequest{Type: "openai", BaseURL: "https://x.com"}},
+	}
+
+	service := &ProxyService{}
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+			if _, err := service.FetchModelAdapterModels(test.request); err == nil {
+				t.Fatal("期望返回错误，实际为 nil")
+			}
+		})
+	}
+}

proto/check_proto_sync.sh

@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+TEMP_DIR="$(mktemp -d "${TMPDIR:-/tmp}/cursor-proto-sync.XXXXXX")"
+
+cleanup() {
+  rm -rf "$TEMP_DIR"
+}
+trap cleanup EXIT
+
+for PROTO_NAME in agent_v1.proto aiserver_v1.proto; do
+  ROOT_PROTO="$SCRIPT_DIR/$PROTO_NAME"
+  EXTRACTED_PROTO="$SCRIPT_DIR/from_extensions/$PROTO_NAME"
+  if [[ ! -f "$ROOT_PROTO" || ! -f "$EXTRACTED_PROTO" ]]; then
+    echo "Missing proto pair for $PROTO_NAME" >&2
+    exit 1
+  fi
+
+  sed -E 's|^option go_package = ".*";$|option go_package = "__NORMALIZED__";|' "$ROOT_PROTO" > "$TEMP_DIR/root-$PROTO_NAME"
+  sed -E 's|^option go_package = ".*";$|option go_package = "__NORMALIZED__";|' "$EXTRACTED_PROTO" > "$TEMP_DIR/extracted-$PROTO_NAME"
+  if ! cmp -s "$TEMP_DIR/root-$PROTO_NAME" "$TEMP_DIR/extracted-$PROTO_NAME"; then
+    echo "Proto snapshot is out of sync: $PROTO_NAME" >&2
+    diff -u "$TEMP_DIR/root-$PROTO_NAME" "$TEMP_DIR/extracted-$PROTO_NAME" >&2 || true
+    exit 1
+  fi
+done

proto/ext_tool/extractor.go

@@ -113,10 +113,14 @@ var (
 	mapValueRe           = regexp.MustCompile(`V:\s*\{([^}]*)\}`)
 	mapValueKRe          = regexp.MustCompile(`(?:^|[,{]\s*)kind:\s*["'](\w+)["']`)
 	mapValueTRe          = regexp.MustCompile(`[,\s]T:\s*([\w$.]+)`)
+	shorthandTRe         = regexp.MustCompile(`(?:^|[,\{])\s*T\s*(?:[,\}])`)
 	oneofNameRe          = regexp.MustCompile(`^[A-Za-z_][A-Za-z0-9_]*$`)
 	fieldNameRe          = regexp.MustCompile(`^[A-Za-z_][A-Za-z0-9_]*$`)
 	placeholderRe        = regexp.MustCompile(`^\s*(optional\s+|repeated\s+)?[A-Za-z_][A-Za-z0-9_.<>]*\s+(field_\d+|unknown(?:_[A-Za-z0-9_]+)?)\s*=\s*\d+\s*;`)
 	varAliasRe           = regexp.MustCompile(`\b(?:let|const|var)\s+([\w$]+)\s*=\s*([\w$]+)\s*(?:[,;])`)
+	webpackExportBlockRe = regexp.MustCompile(`[\w$]+\.d\(\s*[\w$]+\s*,\s*\{`)
+	webpackExportEntryRe = regexp.MustCompile(`(?:^|[,\{])\s*([\w$]+)\s*:\s*\(\s*\)\s*=>\s*([\w$]+)`)
+	moduleImportRe       = regexp.MustCompile(`(?:\b(?:var|let|const)\s+|,)\s*([\w$]+)\s*=\s*[\w$]+\(\s*(\d+)\s*\)`)
 	streamCloseRe        = regexp.MustCompile(`(?s)message\s+ExecClientControlMessage\s*\{.*?ExecClientStreamClose\s+stream_close\s*=\s*1\s*;`)
 	shellStdoutRe        = regexp.MustCompile(`(?s)message\s+ShellStream\s*\{.*?ShellStreamStdout\s+stdout\s*=\s*1\s*;`)
 )
@@ -186,12 +190,17 @@ type symbolDef struct {
 
 type TypeResolver struct {
 	bySymbol      map[string][]symbolDef
+	byAlias       map[string][]symbolDef
 	byShort       map[string][]symbolDef
+	moduleImports map[int]map[string]int
 }
 
-func newTypeResolver(messages []Message, enums []Enum, aliases map[string][]string) *TypeResolver {
+type aliasIndex map[int]map[string][]string
+
+func newTypeResolver(messages []Message, enums []Enum, aliases aliasIndex, exportAliases aliasIndex) *TypeResolver {
 	resolver := &TypeResolver{
 		bySymbol: make(map[string][]symbolDef),
+		byAlias:  make(map[string][]symbolDef),
 		byShort:  make(map[string][]symbolDef),
 	}
 
@@ -218,43 +227,64 @@ func newTypeResolver(messages []Message, enums []Enum, aliases map[string][]stri
 			}
 		}
 	}
+	addAlias := func(symbol, typeName string, pos int, moduleStart int, kind string) {
+		symbol = strings.TrimSpace(symbol)
+		typeName = strings.TrimSpace(typeName)
+		if symbol == "" || typeName == "" {
+			return
+		}
+		resolver.byAlias[symbol] = append(resolver.byAlias[symbol], symbolDef{
+			TypeName: typeName, Pos: pos, ModuleStart: moduleStart, Kind: kind,
+		})
+	}
 
 	for _, msg := range messages {
 		add(msg.VarName, msg.TypeName, msg.Pos, msg.ModuleStart, "message")
 		if msg.InternalName != "" && msg.InternalName != msg.VarName {
 			add(msg.InternalName, msg.TypeName, msg.Pos, msg.ModuleStart, "message")
 		}
-		for _, alias := range aliasesForSymbols(aliases, msg.VarName, msg.InternalName) {
-			add(alias, msg.TypeName, msg.Pos, msg.ModuleStart, "message")
+		for _, alias := range aliasesForSymbols(aliases[msg.ModuleStart], msg.VarName, msg.InternalName) {
+			addAlias(alias, msg.TypeName, msg.Pos, msg.ModuleStart, "message")
 		}
 	}
 	for _, enum := range enums {
 		add(enum.VarName, enum.TypeName, enum.Pos, enum.ModuleStart, "enum")
-		for _, alias := range aliasesForSymbols(aliases, enum.VarName) {
-			add(alias, enum.TypeName, enum.Pos, enum.ModuleStart, "enum")
+		for _, alias := range aliasesForSymbols(aliases[enum.ModuleStart], enum.VarName) {
+			addAlias(alias, enum.TypeName, enum.Pos, enum.ModuleStart, "enum")
+		}
+	}
+
+	for _, msg := range messages {
+		for _, alias := range aliasesForSymbols(exportAliases[msg.ModuleStart], msg.VarName, msg.InternalName) {
+			addAlias(alias, msg.TypeName, msg.Pos, msg.ModuleStart, "message")
+		}
+	}
+	for _, enum := range enums {
+		for _, alias := range aliasesForSymbols(exportAliases[enum.ModuleStart], enum.VarName) {
+			addAlias(alias, enum.TypeName, enum.Pos, enum.ModuleStart, "enum")
 		}
 	}
 
 	return resolver
 }
 
-func buildAliasIndex(text string) map[string][]string {
-	matches := varAliasRe.FindAllStringSubmatch(text, -1)
-	if len(matches) == 0 {
-		return nil
-	}
-
-	direct := make(map[string]string, len(matches))
+func buildAliasIndex(text string, moduleStarts []int) aliasIndex {
+	matches := varAliasRe.FindAllStringSubmatchIndex(text, -1)
+	directByModule := make(map[int]map[string]string)
 	for _, match := range matches {
-		alias := strings.TrimSpace(match[1])
-		target := strings.TrimSpace(match[2])
+		alias := strings.TrimSpace(text[match[2]:match[3]])
+		target := strings.TrimSpace(text[match[4]:match[5]])
 		if alias == "" || target == "" || alias == target {
 			continue
 		}
-		direct[alias] = target
+		moduleStart := moduleStartForPos(moduleStarts, match[0])
+		if directByModule[moduleStart] == nil {
+			directByModule[moduleStart] = make(map[string]string)
+		}
+		directByModule[moduleStart][alias] = target
 	}
 
-	resolveRoot := func(symbol string) string {
+	resolveRoot := func(direct map[string]string, symbol string) string {
 		seen := make(map[string]bool)
 		current := symbol
 		for {
@@ -270,16 +300,90 @@ func buildAliasIndex(text string) map[string][]string {
 		}
 	}
 
-	aliases := make(map[string][]string)
+	aliasSets := make(map[int]map[string]map[string]bool)
+	addAlias := func(moduleStart int, root string, alias string) {
+		root = strings.TrimSpace(root)
+		alias = strings.TrimSpace(alias)
+		if root == "" || alias == "" || root == alias {
+			return
+		}
+		if aliasSets[moduleStart] == nil {
+			aliasSets[moduleStart] = make(map[string]map[string]bool)
+		}
+		if aliasSets[moduleStart][root] == nil {
+			aliasSets[moduleStart][root] = make(map[string]bool)
+		}
+		aliasSets[moduleStart][root][alias] = true
+	}
+
+	for moduleStart, direct := range directByModule {
 		for alias := range direct {
-		root := resolveRoot(alias)
-		if root == alias {
+			root := resolveRoot(direct, alias)
+			addAlias(moduleStart, root, alias)
+		}
+	}
+
+	if len(aliasSets) == 0 {
+		return nil
+	}
+	aliases := make(aliasIndex, len(aliasSets))
+	for moduleStart, roots := range aliasSets {
+		aliases[moduleStart] = make(map[string][]string, len(roots))
+		for root, set := range roots {
+			for alias := range set {
+				aliases[moduleStart][root] = append(aliases[moduleStart][root], alias)
+			}
+			sort.Strings(aliases[moduleStart][root])
+		}
+	}
+	return aliases
+}
+
+func buildWebpackExportAliasIndex(text string, moduleStarts []int) aliasIndex {
+	aliasSets := make(map[int]map[string]map[string]bool)
+	addAlias := func(moduleStart int, root string, alias string) {
+		root = strings.TrimSpace(root)
+		alias = strings.TrimSpace(alias)
+		if root == "" || alias == "" || root == alias {
+			return
+		}
+		if aliasSets[moduleStart] == nil {
+			aliasSets[moduleStart] = make(map[string]map[string]bool)
+		}
+		if aliasSets[moduleStart][root] == nil {
+			aliasSets[moduleStart][root] = make(map[string]bool)
+		}
+		aliasSets[moduleStart][root][alias] = true
+	}
+
+	// Webpack exposes module members through tables such as
+	// n.d(t, { KS: () => T }). Service descriptors refer to the exported
+	// name (r.KS), while message definitions use the local symbol (T).
+	for _, blockMatch := range webpackExportBlockRe.FindAllStringIndex(text, -1) {
+		moduleStart := moduleStartForPos(moduleStarts, blockMatch[0])
+		blockStart := blockMatch[1] - 1
+		blockEnd := findMatchingBrace(text, blockStart)
+		if blockEnd == -1 {
 			continue
 		}
-		aliases[root] = append(aliases[root], alias)
+		block := text[blockStart:blockEnd]
+		for _, entry := range webpackExportEntryRe.FindAllStringSubmatch(block, -1) {
+			addAlias(moduleStart, entry[2], entry[1])
+		}
+	}
+
+	if len(aliasSets) == 0 {
+		return nil
+	}
+	aliases := make(aliasIndex, len(aliasSets))
+	for moduleStart, roots := range aliasSets {
+		aliases[moduleStart] = make(map[string][]string, len(roots))
+		for root, set := range roots {
+			for alias := range set {
+				aliases[moduleStart][root] = append(aliases[moduleStart][root], alias)
+			}
+			sort.Strings(aliases[moduleStart][root])
 		}
-	for root := range aliases {
-		sort.Strings(aliases[root])
 	}
 	return aliases
 }
@@ -318,11 +422,10 @@ func pickBestDefinition(candidates []symbolDef, contextPos int, contextModuleSta
 	}
 
 	filtered := candidates
-	if strings.TrimSpace(preferredPkg) != "" {
+	if strings.TrimSpace(expectedKind) != "" {
 		tmp := make([]symbolDef, 0, len(candidates))
 		for _, item := range candidates {
-			pkg, _ := parseTypeName(item.TypeName)
-			if pkg == preferredPkg {
+			if item.Kind == expectedKind {
 				tmp = append(tmp, item)
 			}
 		}
@@ -331,10 +434,11 @@ func pickBestDefinition(candidates []symbolDef, contextPos int, contextModuleSta
 		}
 	}
 
-	if strings.TrimSpace(expectedKind) != "" {
+	if strings.TrimSpace(preferredPkg) != "" {
 		tmp := make([]symbolDef, 0, len(filtered))
 		for _, item := range filtered {
-			if item.Kind == expectedKind {
+			pkg, _ := parseTypeName(item.TypeName)
+			if pkg == preferredPkg {
 				tmp = append(tmp, item)
 			}
 		}
@@ -416,6 +520,17 @@ func (resolver *TypeResolver) ResolveTypeName(ref string, contextPos int, contex
 		}
 		return best.TypeName, true
 	}
+	resolveByAlias := func(symbol string, targetModuleStart int) (string, bool) {
+		candidates := resolver.byAlias[symbol]
+		if len(candidates) == 0 {
+			return "", false
+		}
+		best, ok := pickBestDefinition(candidates, contextPos, targetModuleStart, preferredPkg, expectedKind)
+		if !ok {
+			return "", false
+		}
+		return best.TypeName, true
+	}
 	resolveByShort := func(symbol string, preferSameModule bool) (string, bool) {
 		candidates := resolver.byShort[symbol]
 		if len(candidates) == 0 {
@@ -435,17 +550,30 @@ func (resolver *TypeResolver) ResolveTypeName(ref string, contextPos int, contex
 	if typeName, ok := resolveBySymbol(trimmed, !strings.Contains(trimmed, ".")); ok {
 		return typeName, true
 	}
+	if typeName, ok := resolveByAlias(trimmed, 0); ok {
+		return typeName, true
+	}
 	if typeName, ok := resolveByShort(trimmed, !strings.Contains(trimmed, ".")); ok {
 		return typeName, true
 	}
 
 	if strings.Contains(trimmed, ".") {
 		parts := strings.Split(trimmed, ".")
+		first := parts[0]
 		last := parts[len(parts)-1]
+		targetModuleStart := 0
+		if imports := resolver.moduleImports[contextModuleStart]; imports != nil {
+			targetModuleStart = imports[first]
+		}
+		if typeName, ok := resolveByAlias(last, targetModuleStart); ok {
+			return typeName, true
+		}
+		if typeName, ok := resolveBySymbol(last, false); ok {
+			return typeName, true
+		}
 		if typeName, ok := resolveByShort(last, false); ok {
 			return typeName, true
 		}
-		first := parts[0]
 		if typeName, ok := resolveBySymbol(first, false); ok {
 			return typeName, true
 		}
@@ -473,7 +601,7 @@ func absInt(value int) int {
 	return value
 }
 
-var moduleStartRe = regexp.MustCompile(`(?:^|,)(\d+):(?:function\([\w$,]*\)|\([\w$,]*\)=>)\{`)
+var moduleStartRe = regexp.MustCompile(`(?:^|,)\s*(\d+)\s*:\s*(?:function\s*\(\s*[\w$,\s]*\s*\)|\(\s*[\w$,\s]*\s*\)\s*=>)\s*\{`)
 
 func buildModuleStarts(text string) []int {
 	matches := moduleStartRe.FindAllStringSubmatchIndex(text, -1)
@@ -497,6 +625,38 @@ func moduleStartForPos(moduleStarts []int, pos int) int {
 	return moduleStarts[index]
 }
 
+func buildModuleImportIndex(text string, moduleStarts []int) map[int]map[string]int {
+	if len(moduleStarts) == 0 {
+		return nil
+	}
+
+	moduleMatches := moduleStartRe.FindAllStringSubmatchIndex(text, -1)
+	moduleStartByID := make(map[string]int, len(moduleMatches))
+	for _, match := range moduleMatches {
+		moduleStartByID[text[match[2]:match[3]]] = match[0]
+	}
+
+	importsByModule := make(map[int]map[string]int)
+	for index, moduleStart := range moduleStarts {
+		moduleEnd := len(text)
+		if index+1 < len(moduleStarts) {
+			moduleEnd = moduleStarts[index+1]
+		}
+		body := text[moduleStart:moduleEnd]
+		for _, match := range moduleImportRe.FindAllStringSubmatch(body, -1) {
+			targetModuleStart, ok := moduleStartByID[match[2]]
+			if !ok {
+				continue
+			}
+			if importsByModule[moduleStart] == nil {
+				importsByModule[moduleStart] = make(map[string]int)
+			}
+			importsByModule[moduleStart][match[1]] = targetModuleStart
+		}
+	}
+	return importsByModule
+}
+
 // ExtractProtos extracts proto definitions from formatted JS file
 func ExtractProtos(inputFile, outputDir string) {
 	activeDiagnostics = newExtractionDiagnostics()
@@ -512,7 +672,8 @@ func ExtractProtos(inputFile, outputDir string) {
 
 	text := string(content)
 	moduleStarts := buildModuleStarts(text)
-	aliases := buildAliasIndex(text)
+	aliases := buildAliasIndex(text, moduleStarts)
+	exportAliases := buildWebpackExportAliasIndex(text, moduleStarts)
 
 	// Extract messages, enums, and services
 	messages := extractMessages(text, moduleStarts)
@@ -524,7 +685,8 @@ func ExtractProtos(inputFile, outputDir string) {
 		}
 	}
 
-	resolver := newTypeResolver(messages, enums, aliases)
+	resolver := newTypeResolver(messages, enums, aliases, exportAliases)
+	resolver.moduleImports = buildModuleImportIndex(text, moduleStarts)
 
 	// Generate proto files
 	generateProtos(messages, enums, services, resolver, outputDir)
@@ -900,6 +1062,8 @@ func parseFieldObject(obj string) (*Field, error) {
 			} else {
 				field.T = tMatch[1]
 			}
+		} else if shorthandTRe.MatchString(obj) {
+			field.T = "T"
 		}
 	}
 
@@ -1195,8 +1359,9 @@ func copyAllExternalTypes(pkgName string, pkg struct {
 		neededTypes := make(map[string]bool)
 
 		for _, msg := range result.messages {
+			preferredPkg, _ := parseTypeName(msg.TypeName)
 			for _, f := range msg.Fields {
-				collectFieldRefsSimple(f, pkgName, msg.Pos, msg.ModuleStart, resolver, neededTypes, localTypes)
+				collectFieldRefsSimple(f, pkgName, preferredPkg, msg.Pos, msg.ModuleStart, resolver, neededTypes, localTypes)
 			}
 		}
 		for _, svc := range result.services {
@@ -1268,7 +1433,7 @@ func copyAllExternalTypes(pkgName string, pkg struct {
 }
 
 // collectFieldRefsSimple collects external type references from a field (non-recursive, just this field)
-func collectFieldRefsSimple(f Field, currentPkg string, contextPos int, contextModuleStart int, resolver *TypeResolver,
+func collectFieldRefsSimple(f Field, currentPkg string, preferredPkg string, contextPos int, contextModuleStart int, resolver *TypeResolver,
 	neededTypes map[string]bool, localTypes map[string]bool) {
 
 	type refWithKind struct {
@@ -1289,7 +1454,7 @@ func collectFieldRefsSimple(f Field, currentPkg string, contextPos int, contextM
 	}
 
 	for _, item := range refs {
-		typeName, ok := resolver.ResolveTypeName(item.ref, contextPos, contextModuleStart, currentPkg, item.kind)
+		typeName, ok := resolver.ResolveTypeName(item.ref, contextPos, contextModuleStart, preferredPkg, item.kind)
 		if !ok {
 			continue
 		}
@@ -1637,6 +1802,7 @@ func writeMessageFields(msg *Message, sb *strings.Builder, resolver *TypeResolve
 	// Get the current message's path prefix for relative type resolution
 	msgPath := msg.ShortName
 	currentPkg := msg.Package
+	preferredPkg, _ := parseTypeName(msg.TypeName)
 
 	// Group fields by oneof
 	oneofGroups := make(map[string][]Field)
@@ -1652,7 +1818,7 @@ func writeMessageFields(msg *Message, sb *strings.Builder, resolver *TypeResolve
 
 	// Write regular fields
 	for _, f := range regularFields {
-		fieldType := resolveFieldTypeWithPkg(f, resolver, msgPath, currentPkg, msg.Pos, msg.ModuleStart)
+		fieldType := resolveFieldTypeWithPkg(f, resolver, msgPath, currentPkg, preferredPkg, msg.Pos, msg.ModuleStart)
 		prefix := ""
 		if f.Repeated {
 			prefix = "repeated "
@@ -1673,7 +1839,7 @@ func writeMessageFields(msg *Message, sb *strings.Builder, resolver *TypeResolve
 		fields := oneofGroups[oneofName]
 		sb.WriteString(fmt.Sprintf("%soneof %s {\n", indentStr, oneofName))
 		for _, f := range fields {
-			fieldType := resolveFieldTypeWithPkg(f, resolver, msgPath, currentPkg, msg.Pos, msg.ModuleStart)
+			fieldType := resolveFieldTypeWithPkg(f, resolver, msgPath, currentPkg, preferredPkg, msg.Pos, msg.ModuleStart)
 			sb.WriteString(fmt.Sprintf("%s  %s %s = %d;\n", indentStr, fieldType, f.Name, f.No))
 		}
 		sb.WriteString(fmt.Sprintf("%s}\n", indentStr))
@@ -1721,15 +1887,15 @@ func getNestedPath(shortName string) []string {
 }
 
 func resolveFieldType(f Field, resolver *TypeResolver, contextPos int, contextModuleStart int) string {
-	return resolveFieldTypeWithPkg(f, resolver, "", "", contextPos, contextModuleStart)
+	return resolveFieldTypeWithPkg(f, resolver, "", "", "", contextPos, contextModuleStart)
 }
 
 // resolveFieldTypeWithPkg resolves field type with package awareness
 // parentPath is like "ConversationMessage" or "ConversationMessage.ToolResult"
 // currentPkg is the package of the current message being written (e.g., "agent.v1")
-func resolveFieldTypeWithPkg(f Field, resolver *TypeResolver, parentPath string, currentPkg string, contextPos int, contextModuleStart int) string {
+func resolveFieldTypeWithPkg(f Field, resolver *TypeResolver, parentPath string, currentPkg string, preferredPkg string, contextPos int, contextModuleStart int) string {
 	resolveNamedType := func(ref string, expectedKind string) string {
-		typeName, ok := resolver.ResolveTypeName(ref, contextPos, contextModuleStart, currentPkg, expectedKind)
+		typeName, ok := resolver.ResolveTypeName(ref, contextPos, contextModuleStart, preferredPkg, expectedKind)
 		if !ok {
 			activeDiagnostics.addUnresolvedType(expectedKind + ":" + ref)
 			return fallbackTypeToken(ref)

proto/ext_tool/extractor_test.go

@@ -0,0 +1,72 @@
+package main
+
+import "testing"
+
+func TestParseFieldObjectSupportsShorthandType(t *testing.T) {
+	field, err := parseFieldObject(`{no:4,name:"file_not_found",kind:"message",T,oneof:"result"}`)
+	if err != nil {
+		t.Fatalf("parse shorthand T: %v", err)
+	}
+	if field.T != "T" {
+		t.Fatalf("parsed shorthand T as %#v, want T", field.T)
+	}
+}
+
+func TestWebpackExportAliasResolvesServiceMessageType(t *testing.T) {
+	const bundle = `
+1:(e,t,n)=>{
+  n.d(t,{KS:()=>T,_B:()=>r});
+  var r;
+  class T {}
+  T.typeName="agent.v1.AgentClientMessage";
+  n.proto3.util.setEnumType(r,"agent.v1.DiagnosticSeverity",[]);
+},
+2:(e,t,n)=>{
+  var r=n(1);
+  const service={typeName:"agent.v1.AgentService",methods:{run:{name:"Run",I:r.KS,O:r.KS,kind:n.MethodKind.BiDiStreaming}}};
+}`
+
+	moduleStarts := buildModuleStarts(bundle)
+	messages := []Message{{
+		TypeName:     "agent.v1.AgentClientMessage",
+		VarName:      "T",
+		InternalName: "T",
+		Package:      "agent.v1",
+		Pos:          35,
+		ModuleStart:  moduleStartForPos(moduleStarts, 35),
+	}}
+	enums := []Enum{{
+		TypeName:    "agent.v1.DiagnosticSeverity",
+		VarName:     "r",
+		Package:     "agent.v1",
+		Pos:         100,
+		ModuleStart: moduleStartForPos(moduleStarts, 100),
+	}}
+
+	resolver := newTypeResolver(messages, enums, buildAliasIndex(bundle, moduleStarts), buildWebpackExportAliasIndex(bundle, moduleStarts))
+	resolver.moduleImports = buildModuleImportIndex(bundle, moduleStarts)
+	typeName, ok := resolver.ResolveTypeName("r.KS", len(bundle)-1, moduleStartForPos(moduleStarts, len(bundle)-1), "agent.v1", "message")
+	if !ok {
+		t.Fatal("expected webpack export alias to resolve")
+	}
+	if typeName != "agent.v1.AgentClientMessage" {
+		t.Fatalf("resolved r.KS to %q, want agent.v1.AgentClientMessage", typeName)
+	}
+}
+
+func TestResolverPrefersExpectedKindOverCurrentPackage(t *testing.T) {
+	resolver := &TypeResolver{bySymbol: map[string][]symbolDef{
+		"nt": {
+			{TypeName: "git_forge.v1.GetTagResponse", Kind: "message", Pos: 10, ModuleStart: 1},
+			{TypeName: "origin.v1.TeamGroupKind", Kind: "enum", Pos: 20, ModuleStart: 1},
+		},
+	}}
+
+	typeName, ok := resolver.ResolveTypeName("nt", 30, 1, "origin.v1", "message")
+	if !ok {
+		t.Fatal("expected cross-package message type to resolve")
+	}
+	if typeName != "git_forge.v1.GetTagResponse" {
+		t.Fatalf("resolved nt to %q, want git_forge.v1.GetTagResponse", typeName)
+	}
+}

proto/extensions-cursor-app/cursor-always-local/.gitignore

@@ -1,2 +0,0 @@
-src/proto/**
-media/index.js

proto/extensions-cursor-app/cursor-always-local/package.json

@@ -1 +0,0 @@
-{"name":"cursor-always-local","description":"Implements experimentation features for Cursor","author":"Anysphere, Inc.","publisher":"anysphere","version":"0.0.1","private":true,"repository":{"type":"git","url":"https://github.com/anysphere/vscode"},"extensionKind":["ui"],"engines":{"vscode":"^1.43.0","yarn":"please-use-npm"},"activationEvents":["onStartupFinished","onResolveRemoteAuthority:background-composer"],"enabledApiProposals":["cursor","control","externalUriOpener","contribSourceControlInputBoxMenu"],"main":"./dist/main","contributes":{"commands":[],"keybindings":[],"menus":{"scm/inputBox":[{"command":"cursor.generateGitCommitMessage","when":"scmProvider == git"}]},"jsonValidation":[{"fileMatch":".cursor/environment.json","url":"./schemas/environment.schema.json"}],"configuration":{"type":"object","title":"Cursor Always Local"}},"optionalDependencies":{"@vscode/windows-ca-certs":"^0.3.3"}}

proto/extensions-cursor-app/cursor-always-local/package.nls.json

@@ -1 +0,0 @@
-{"displayName":"Cursor Always Local","description":"Experimentation @ cursor.sh"}

proto/extensions-cursor-app/cursor-always-local/schemas/environment.schema.json

@@ -1 +0,0 @@
-{"$schema":"https://json-schema.org/draft/2019-09/schema","description":"Defines a dev environment","allowComments":true,"allowTrailingCommas":false,"definitions":{"common":{"type":"object","properties":{"name":{"type":"string","description":"The name of the environment."},"user":{"type":"string","description":"The user to run the environment as."},"install":{"type":"string","description":"The update command to run on VM startup (after pulling latest changes) to refresh dependencies."},"start":{"type":"string","description":"The start command to run when the environment is started."},"repositoryDependencies":{"type":"array","description":"Repositories that are required for the environment to work, and need to be included in the GitHub access token that is generated for the environment.","items":{"type":"string","description":"The URL of the dependent repository, e.g. `github.com/org/repo`."}},"ports":{"type":"array","description":"Ports to expose from the container. Similar to devcontainers port forwarding.","items":{"type":"object","required":["port"],"properties":{"name":{"type":"string","description":"A descriptive name for the port (e.g., 'web server', 'api')."},"port":{"type":"integer","minimum":1,"maximum":65535,"description":"The port number inside the container to expose."}}}},"terminals":{"type":"array","description":"The terminals to run when the environment is started.","items":{"oneOf":[{"type":"array","items":{"type":"object","required":["command"],"properties":{"name":{"type":"string","description":"The name of the terminal."},"command":{"type":"string","description":"The command to run in the terminal."},"description":{"type":"string","description":"A description of what the terminal does. This is displayed to the agent."}}}},{"type":"object","required":["command"],"properties":{"name":{"type":"string","description":"The name of the terminal."},"command":{"type":"string","description":"The command to run in the terminal."},"description":{"type":"string","description":"A description of what the terminal does. This is displayed to the agent."}}}]}}}},"container":{"type":"object","properties":{"build":{"type":"object","description":"Docker build-related options.","properties":{"dockerfile":{"type":"string","description":"The location of the Dockerfile that defines the contents of the container. The path is relative to the folder containing the `environment.json` file."},"context":{"type":"string","description":"The location of the context folder for building the Docker image. The path is relative to the folder containing the `environment.json` file."}},"required":["dockerfile"],"unevaluatedProperties":false},"snapshot":{"type":"string","description":"A snapshot ID for the base environment."},"agentCanUpdateSnapshot":{"type":"boolean","description":"Whether the agent can update the snapshot."}},"required":[]}},"allOf":[{"$ref":"#/definitions/container"},{"$ref":"#/definitions/common"}],"unevaluatedProperties":false}

proto/extensions-cursor-app/cursor-always-local/scripts/run_tests.sh

@@ -1,15 +0,0 @@
-#!/usr/bin/env bash
-
-# Run vitest with any additional arguments passed after --
-npx vitest run --config vitest.config.ts "$@"
-
-# Capture the exit code
-exit_code=$?
-
-# If tests failed, echo the colored error message
-if [ $exit_code -ne 0 ]; then
-	echo -e "\033[1;31m❌ Test failed -- you can set CURSOR_EXT_TEST_LOG_LEVEL=info to see more logs\033[0m"
-fi
-
-# Exit with the same code as vitest
-exit $exit_code

proto/extensions-cursor-app/cursor-always-local/scripts/tsc-some-files.sh

@@ -1,29 +0,0 @@
-#!/bin/bash
-include_files=()
-for f in "$@"; do
-  include_files+=("${f#$PWD/}")
-done
-node_modules/.bin/tsc --noEmit -p . | (
-  status=0
-  show_continuation=false
-  while IFS='' read -r line; do
-    case "$line" in
-    (' '*)
-      if $show_continuation; then
-        echo "$line" >&2
-      fi
-      ;;
-    (*)
-      file="${line%%(*}"
-      if [[ " ${include_files[@]} " =~ " ${file} " ]]; then
-        show_continuation=true
-        echo "$line" >&2
-        status=1
-      else
-        show_continuation=false
-      fi
-      ;;
-    esac
-  done
-  exit $status
-)

proto/extract_extensions_proto.sh

@@ -2,27 +2,30 @@
 set -euo pipefail
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-SNAPSHOT_DEFAULT="$SCRIPT_DIR/extensions-cursor-app/cursor-always-local"
 INSTALLED_CURSOR_DEFAULT="/Applications/Cursor.app/Contents/Resources/app/extensions/cursor-always-local/dist/main.js"
-LATEST_EXT_DIR="$(
-  find "$SCRIPT_DIR" -maxdepth 1 -type d -name 'extensions-*' 2>/dev/null \
-    | sort -V \
-    | tail -n 1
-)"
-if [[ -f "$SNAPSHOT_DEFAULT/dist/main.js" ]]; then
-  INPUT_DEFAULT="$SNAPSHOT_DEFAULT"
-elif [[ -f "$INSTALLED_CURSOR_DEFAULT" ]]; then
 INPUT_DEFAULT="$INSTALLED_CURSOR_DEFAULT"
-elif [[ -n "$LATEST_EXT_DIR" ]]; then
-  INPUT_DEFAULT="$LATEST_EXT_DIR"
-else
-  INPUT_DEFAULT="$SCRIPT_DIR/extensions-2.6.19"
-fi
 OUTPUT_DEFAULT="$SCRIPT_DIR/from_extensions"
 
 INPUT_PATH="${1:-$INPUT_DEFAULT}"
 OUTPUT_DIR="${2:-$OUTPUT_DEFAULT}"
 
+canonicalize_path() {
+  local path="$1"
+  local parent
+  local base
+  if [[ -d "$path" ]]; then
+    (cd "$path" && pwd -P)
+    return
+  fi
+  parent="$(dirname "$path")"
+  base="$(basename "$path")"
+  if [[ ! -d "$parent" ]]; then
+    echo "Parent directory does not exist: $parent" >&2
+    return 1
+  fi
+  printf '%s/%s\n' "$(cd "$parent" && pwd -P)" "$base"
+}
+
 # Resolve input: accept either a single JS file or an extensions root directory.
 if [[ -d "$INPUT_PATH" ]]; then
   CANDIDATES=(
@@ -40,7 +43,10 @@ if [[ -d "$INPUT_PATH" ]]; then
   if [[ -n "$FOUND_CANDIDATE" ]]; then
     INPUT_PATH="$FOUND_CANDIDATE"
   else
-    mapfile -t JS_FILES < <(find "$INPUT_PATH" -type f -path "*/dist/main.js" | sort)
+    JS_FILES=()
+    while IFS= read -r JS_FILE; do
+      JS_FILES+=("$JS_FILE")
+    done < <(find "$INPUT_PATH" -type f -path "*/dist/main.js" | sort)
     if [[ ${#JS_FILES[@]} -eq 1 ]]; then
       INPUT_PATH="${JS_FILES[0]}"
     elif [[ ${#JS_FILES[@]} -eq 0 ]]; then
@@ -57,15 +63,62 @@ fi
 
 if [[ ! -f "$INPUT_PATH" ]]; then
   echo "Input JS not found: $INPUT_PATH" >&2
-  echo "Usage: $0 [input-js-file-or-extensions-dir] [output-dir]" >&2
+  echo "Install/update Cursor, or pass an explicit input bundle:" >&2
+  echo "  $0 /path/to/cursor-always-local/dist/main.js [output-dir]" >&2
   exit 1
 fi
 
-rm -rf "$OUTPUT_DIR"
-mkdir -p "$OUTPUT_DIR"
+INPUT_PATH="$(canonicalize_path "$INPUT_PATH")"
+OUTPUT_DIR="$(canonicalize_path "$OUTPUT_DIR")"
+REPO_ROOT="$(cd "$SCRIPT_DIR/.." && pwd -P)"
+CURRENT_DIR="$(pwd -P)"
+
+case "$OUTPUT_DIR" in
+  "/"|"$HOME"|"$REPO_ROOT"|"$SCRIPT_DIR"|"$CURRENT_DIR")
+    echo "Refusing unsafe output directory: $OUTPUT_DIR" >&2
+    exit 1
+    ;;
+esac
+case "$INPUT_PATH" in
+  "$OUTPUT_DIR"|"$OUTPUT_DIR"/*)
+    echo "Refusing output directory that contains the input bundle: $OUTPUT_DIR" >&2
+    exit 1
+    ;;
+esac
+
+OUTPUT_PARENT="$(dirname "$OUTPUT_DIR")"
+OUTPUT_BASENAME="$(basename "$OUTPUT_DIR")"
+TEMP_DIR="$(mktemp -d "$OUTPUT_PARENT/.${OUTPUT_BASENAME}.tmp.XXXXXX")"
+BACKUP_DIR=""
+
+cleanup() {
+  if [[ -n "$TEMP_DIR" && -d "$TEMP_DIR" ]]; then
+    rm -rf "$TEMP_DIR"
+  fi
+  if [[ -n "$BACKUP_DIR" && -e "$BACKUP_DIR" ]]; then
+    if [[ ! -e "$OUTPUT_DIR" ]]; then
+      mv "$BACKUP_DIR" "$OUTPUT_DIR"
+    else
+      rm -rf "$BACKUP_DIR"
+    fi
+  fi
+}
+trap cleanup EXIT
 
 go run "$SCRIPT_DIR/ext_tool" \
   -input "$INPUT_PATH" \
-  -output "$OUTPUT_DIR" \
+  -output "$TEMP_DIR" \
   -skip-format \
   -strict
+
+if [[ -e "$OUTPUT_DIR" ]]; then
+  BACKUP_DIR="$(mktemp -d "$OUTPUT_PARENT/.${OUTPUT_BASENAME}.backup.XXXXXX")"
+  rmdir "$BACKUP_DIR"
+  mv "$OUTPUT_DIR" "$BACKUP_DIR"
+fi
+mv "$TEMP_DIR" "$OUTPUT_DIR"
+TEMP_DIR=""
+if [[ -n "$BACKUP_DIR" ]]; then
+  rm -rf "$BACKUP_DIR"
+  BACKUP_DIR=""
+fi

proto/from_extensions/git_forge_v1.proto

@@ -0,0 +1,809 @@
+syntax = "proto3";
+
+package git_forge.v1;
+
+option go_package = "react-admin/cursor-server/gen/git_forge/v1;git_forgev1";
+
+// Copied from: local:git_forge.v1.BatchGetRepoContentRequest (var: Qt)
+message BatchGetRepoContentRequest {
+  string repo_uuid = 1;
+  string revision = 2;
+  repeated string paths = 3;
+}
+
+// Copied from: local:git_forge.v1.BatchGetRepoContentResponse (var: Ht)
+message BatchGetRepoContentResponse {
+  repeated BatchRepoContentResult results = 1;
+  string resolved_commit_sha = 2;
+}
+
+// Copied from: local:git_forge.v1.BatchRepoContentResult (var: Gt)
+message BatchRepoContentResult {
+  string path = 1;
+  bool found = 2;
+  oneof content {
+    FileContent file_content = 3;
+    DirectoryContent directory_content = 4;
+  }
+}
+
+// Copied from: local:git_forge.v1.BlameChunk (var: sn)
+message BlameChunk {
+  repeated ShortCommit commits = 1;
+  repeated BlameLineRange line_ranges = 2;
+}
+
+// Copied from: local:git_forge.v1.BlameLineRange (var: rn)
+message BlameLineRange {
+  bytes commit_sha = 1;
+  uint32 start_in_blamed_file = 2;
+  uint32 len = 3;
+}
+
+// Copied from: local:git_forge.v1.CanMergeRequest (var: ft)
+message CanMergeRequest {
+  string repo_uuid = 1;
+  string ours = 2;
+  string theirs = 3;
+  uint64 change_number = 4;
+  MergeMode mode = 7;
+}
+
+// Copied from: local:git_forge.v1.CanMergeResponse (var: gt)
+message CanMergeResponse {
+  bool can_merge_without_conflicts = 1;
+  optional bytes merged_tree_sha = 2;
+  repeated string conflicted_paths = 3;
+}
+
+// Copied from: local:git_forge.v1.ChangeKind (var: _)
+enum ChangeKind {
+  CHANGE_KIND_UNSPECIFIED = 0;
+  CHANGE_KIND_ADDED = 1;
+  CHANGE_KIND_DELETED = 2;
+  CHANGE_KIND_MODIFIED = 3;
+  CHANGE_KIND_RENAMED = 4;
+  CHANGE_KIND_COPIED = 5;
+}
+
+// Copied from: local:git_forge.v1.ChangedFile (var: Nn)
+message ChangedFile {
+  string path = 1;
+  optional string old_path = 2;
+  ChangeKind change_kind = 3;
+  optional FileMode old_mode = 4;
+  optional FileMode new_mode = 5;
+  optional string old_sha = 6;
+  optional string new_sha = 7;
+}
+
+// Copied from: local:git_forge.v1.ChangedFileWithStats (var: Pn)
+message ChangedFileWithStats {
+  string path = 1;
+  optional string old_path = 2;
+  ChangeKind change_kind = 3;
+  bool is_binary = 4;
+  int32 additions = 5;
+  int32 deletions = 6;
+  optional FileMode old_mode = 7;
+  optional FileMode new_mode = 8;
+  optional string old_sha = 9;
+  optional string new_sha = 10;
+}
+
+// Copied from: local:git_forge.v1.Commit (var: bt)
+message Commit {
+  string sha = 1;
+  string message = 2;
+  Signature author = 3;
+  Signature committer = 4;
+  repeated string parent_shas = 5;
+  string tree_sha = 7;
+  optional string change_id = 8;
+}
+
+// Copied from: local:git_forge.v1.CommitDiffChunk (var: Jn)
+message CommitDiffChunk {
+  optional CommitDiffHeader header = 1;
+  repeated FileDiff file_diffs = 2;
+}
+
+// Copied from: local:git_forge.v1.CommitDiffHeader (var: Bn)
+message CommitDiffHeader {
+  Commit commit = 1;
+  optional string base_commit_sha = 2;
+  CommitDiffStats stats = 3;
+  repeated ChangedFileWithStats changed_files = 4;
+  bool has_more = 5;
+  optional string next_page_cursor = 6;
+}
+
+// Copied from: local:git_forge.v1.CommitDiffStats (var: Rn)
+message CommitDiffStats {
+  uint32 files_changed = 1;
+  int32 additions = 2;
+  int32 deletions = 3;
+}
+
+// Copied from: local:git_forge.v1.CommitFileDelete (var: Ct)
+message CommitFileDelete {
+}
+
+// Copied from: local:git_forge.v1.CommitFileMode (var: g)
+enum CommitFileMode {
+  COMMIT_FILE_MODE_UNSPECIFIED = 0;
+  COMMIT_FILE_MODE_REGULAR = 1;
+  COMMIT_FILE_MODE_EXECUTABLE = 2;
+  COMMIT_FILE_MODE_SYMLINK = 3;
+}
+
+// Copied from: local:git_forge.v1.CommitFileOperation (var: Nt)
+message CommitFileOperation {
+  string path = 1;
+  oneof operation {
+    CommitFileUpsert upsert = 2;
+    CommitFileDelete delete = 3;
+  }
+}
+
+// Copied from: local:git_forge.v1.CommitFileUpsert (var: Jt)
+message CommitFileUpsert {
+  bytes content = 1;
+  CommitFileMode mode = 2;
+}
+
+// Copied from: local:git_forge.v1.CompareCommitsRequest (var: dt)
+message CompareCommitsRequest {
+  string repo_uuid = 1;
+  string base_revision = 2;
+  string head_revision = 3;
+}
+
+// Copied from: local:git_forge.v1.CompareCommitsResponse (var: pt)
+message CompareCommitsResponse {
+  CompareCommitsStatus status = 1;
+  int32 ahead_by = 2;
+  int32 behind_by = 3;
+  string base_commit_sha = 4;
+  string head_commit_sha = 5;
+  string merge_base_commit_sha = 6;
+}
+
+// Copied from: local:git_forge.v1.CompareCommitsStatus (var: p)
+enum CompareCommitsStatus {
+  COMPARE_COMMITS_STATUS_UNSPECIFIED = 0;
+  COMPARE_COMMITS_STATUS_IDENTICAL = 1;
+  COMPARE_COMMITS_STATUS_AHEAD = 2;
+  COMPARE_COMMITS_STATUS_BEHIND = 3;
+  COMPARE_COMMITS_STATUS_DIVERGED = 4;
+}
+
+// Copied from: local:git_forge.v1.ComputeMergeCommitRequest (var: _t)
+message ComputeMergeCommitRequest {
+  string repo_uuid = 1;
+  string ours_sha = 2;
+  string theirs_sha = 3;
+  string message = 4;
+  Signature author = 5;
+  Signature committer = 6;
+  MergeMode mode = 7;
+}
+
+// Copied from: local:git_forge.v1.ComputeMergeCommitResponse (var: Tt)
+message ComputeMergeCommitResponse {
+  string merge_commit_sha = 1;
+  bytes packfile = 2;
+}
+
+// Copied from: local:git_forge.v1.CreateCommitFromFilesRequest (var: Rt)
+message CreateCommitFromFilesRequest {
+  string repo_uuid = 1;
+  string target_ref = 2;
+  optional string expected_head_sha = 3;
+  string message = 4;
+  Signature author = 5;
+  optional Signature committer = 6;
+  repeated CommitFileOperation files = 7;
+}
+
+// Copied from: local:git_forge.v1.CreateCommitFromFilesResponse (var: Pt)
+message CreateCommitFromFilesResponse {
+  string commit_sha = 1;
+  string tree_sha = 2;
+  string old_head_sha = 3;
+  string wal_entry_key = 4;
+}
+
+// Copied from: local:git_forge.v1.CreateMergeCommitRequest (var: ht)
+message CreateMergeCommitRequest {
+  string repo_uuid = 1;
+  optional string ours_sha = 2;
+  optional string theirs_sha = 3;
+  string ours_ref = 4;
+  string theirs_ref = 5;
+  string message = 6;
+  Signature author = 7;
+  Signature committer = 8;
+  uint64 change_number = 9;
+  MergeMode mode = 10;
+}
+
+// Copied from: local:git_forge.v1.CreateMergeCommitResponse (var: At)
+message CreateMergeCommitResponse {
+  string merge_commit_sha = 1;
+  string wal_entry_key = 2;
+}
+
+// Copied from: local:git_forge.v1.CreateRepoRequest (var: wn)
+message CreateRepoRequest {
+  string repo_uuid = 1;
+}
+
+// Copied from: local:git_forge.v1.CreateRepoResponse (var: En)
+message CreateRepoResponse {
+}
+
+// Copied from: local:git_forge.v1.DiffHeader (var: Cn)
+message DiffHeader {
+  string merge_base_commit_sha = 1;
+  repeated ChangedFile files = 2;
+  repeated ChangedFileWithStats files_with_stats = 3;
+  bool has_more = 4;
+  optional string next_page_cursor = 5;
+}
+
+// Copied from: local:git_forge.v1.DirectoryContent (var: qt)
+message DirectoryContent {
+  repeated RepoContentEntry entries = 1;
+  string sha = 2;
+}
+
+// Copied from: local:git_forge.v1.FastForwardRefRequest (var: qn)
+message FastForwardRefRequest {
+  string repo_uuid = 1;
+  string target_ref = 2;
+  string expected_head_sha = 3;
+  string new_head_sha = 4;
+}
+
+// Copied from: local:git_forge.v1.FastForwardRefResponse (var: Dn)
+message FastForwardRefResponse {
+  string old_head_sha = 1;
+  string new_head_sha = 2;
+  string wal_entry_key = 3;
+  bool unchanged = 4;
+}
+
+// Copied from: local:git_forge.v1.FileContent (var: Ft)
+message FileContent {
+  string size = 1;
+  string encoding = 2;
+  string content = 3;
+  string sha = 4;
+}
+
+// Copied from: local:git_forge.v1.FileDiff (var: bn)
+message FileDiff {
+  string path = 1;
+  optional string old_path = 2;
+  bool is_binary = 3;
+  string patch = 4;
+  int32 additions = 5;
+  int32 deletions = 6;
+  optional FileMode old_mode = 7;
+  optional FileMode new_mode = 8;
+  optional string old_sha = 9;
+  optional string new_sha = 10;
+}
+
+// Copied from: local:git_forge.v1.FileHistoryCommitEntry (var: Zt)
+message FileHistoryCommitEntry {
+  ShortCommit commit = 1;
+  optional string diff_base_commit_sha = 2;
+  optional FileHistoryPathStats path_stats = 8;
+}
+
+// Copied from: local:git_forge.v1.FileHistoryPathStats (var: Xt)
+message FileHistoryPathStats {
+  int32 additions = 1;
+  int32 deletions = 2;
+  bool is_binary = 3;
+}
+
+// Copied from: local:git_forge.v1.FileHistoryWithDiffStatsChunk (var: en)
+message FileHistoryWithDiffStatsChunk {
+  repeated FileHistoryCommitEntry entries = 1;
+  bool exhausted = 2;
+}
+
+// Copied from: local:git_forge.v1.FileMode (var: A)
+enum FileMode {
+  FILE_MODE_UNSPECIFIED = 0;
+  FILE_MODE_REGULAR = 1;
+  FILE_MODE_EXECUTABLE = 2;
+  FILE_MODE_SYMLINK = 3;
+  FILE_MODE_GITLINK = 4;
+}
+
+// Copied from: local:git_forge.v1.GetBlameRequest (var: nn)
+message GetBlameRequest {
+  string repo_uuid = 1;
+  string start_commit_sha = 2;
+  string path = 3;
+}
+
+// Copied from: local:git_forge.v1.GetBlobRequest (var: $e)
+message GetBlobRequest {
+  string repo_uuid = 1;
+  string blob_sha = 2;
+}
+
+// Copied from: local:git_forge.v1.GetBlobResponse (var: et)
+message GetBlobResponse {
+  FileContent blob = 1;
+}
+
+// Copied from: local:git_forge.v1.GetCommitDiffRequest (var: vn)
+message GetCommitDiffRequest {
+  string repo_uuid = 1;
+  string commit_sha = 2;
+  optional string base_commit_sha = 3;
+  bool include_patches = 4;
+  repeated string paths = 5;
+  optional uint32 page_size = 6;
+  optional string page_cursor = 7;
+}
+
+// Copied from: local:git_forge.v1.GetCommitRequest (var: Xe)
+message GetCommitRequest {
+  string repo_uuid = 1;
+  string commit_sha = 2;
+}
+
+// Copied from: local:git_forge.v1.GetCommitResponse (var: Ze)
+message GetCommitResponse {
+  Commit commit = 1;
+}
+
+// Copied from: local:git_forge.v1.GetFileHistoryPageWithDiffStatsResponse (var: tn)
+message GetFileHistoryPageWithDiffStatsResponse {
+  repeated FileHistoryCommitEntry entries = 1;
+  bool has_more = 2;
+  optional string next_cursor = 3;
+}
+
+// Copied from: local:git_forge.v1.GetFileHistoryRequest (var: Wt)
+message GetFileHistoryRequest {
+  string repo_uuid = 1;
+  string start_commit_sha = 2;
+  optional string path = 3;
+  uint32 max_commits = 4;
+}
+
+// Copied from: local:git_forge.v1.GetFileHistoryResponse (var: zt)
+message GetFileHistoryResponse {
+  repeated ShortCommit commits = 1;
+}
+
+// Copied from: local:git_forge.v1.GetFileHistoryWithDiffStatsRequest (var: jt)
+message GetFileHistoryWithDiffStatsRequest {
+  string repo_uuid = 1;
+  string start_commit_sha = 2;
+  optional string path = 3;
+  uint32 max_commits = 4;
+  optional string next_cursor = 5;
+  bool include_diff_stats = 6;
+}
+
+// Copied from: local:git_forge.v1.GetFileHistoryWithDiffStatsResponse (var: $t)
+message GetFileHistoryWithDiffStatsResponse {
+  repeated FileHistoryCommitEntry entries = 1;
+  bool has_more = 2;
+  optional string next_cursor = 3;
+}
+
+// Copied from: local:git_forge.v1.GetFuzzyPathsRequest (var: un)
+message GetFuzzyPathsRequest {
+  string repo_uuid = 1;
+  string commit_sha = 2;
+  string query = 3;
+  uint32 limit = 4;
+}
+
+// Copied from: local:git_forge.v1.GetFuzzyPathsResponse (var: mn)
+message GetFuzzyPathsResponse {
+  repeated string paths = 1;
+  bool has_more = 2;
+}
+
+// Copied from: local:git_forge.v1.GetLocalDevInfoRequest (var: ze)
+message GetLocalDevInfoRequest {
+}
+
+// Copied from: local:git_forge.v1.GetLocalDevInfoResponse (var: je)
+message GetLocalDevInfoResponse {
+  string repo_uuid = 1;
+  string git_forge_root_dir = 2;
+}
+
+// Copied from: local:git_forge.v1.GetPullRequestDiffRequest (var: Sn)
+message GetPullRequestDiffRequest {
+  string repo_uuid = 1;
+  string head_commit_sha = 2;
+  string base_commit_sha = 3;
+  optional bool include_patches = 4;
+  optional uint32 page_size = 5;
+  optional string page_cursor = 6;
+  optional bool include_file_stats = 7;
+}
+
+// Copied from: local:git_forge.v1.GetRepoContentDetailsRequest (var: Yt)
+message GetRepoContentDetailsRequest {
+  string repo_uuid = 1;
+  PathIdentifier path_identifier = 2;
+}
+
+// Copied from: local:git_forge.v1.GetRepoContentDetailsResponse (var: Kt)
+message GetRepoContentDetailsResponse {
+  optional RepoContentDetails details = 1;
+  PathIdentifier path_identifier = 2;
+  string resolved_commit_sha = 3;
+}
+
+// Copied from: local:git_forge.v1.GetRepoContentRequest (var: Ut)
+message GetRepoContentRequest {
+  string repo_uuid = 1;
+  oneof id {
+    PathIdentifier path_identifier = 2;
+    string ref_and_path = 3;
+  }
+}
+
+// Copied from: local:git_forge.v1.GetRepoContentResponse (var: xt)
+message GetRepoContentResponse {
+  PathIdentifier path_identifier = 3;
+  string resolved_commit_sha = 4;
+  oneof content {
+    FileContent file_content = 1;
+    DirectoryContent directory_content = 2;
+  }
+}
+
+// Copied from: local:git_forge.v1.GetTagRequest (var: tt)
+message GetTagRequest {
+  string repo_uuid = 1;
+  string tag_sha = 2;
+}
+
+// Copied from: local:git_forge.v1.GetTagResponse (var: nt)
+message GetTagResponse {
+  Tag tag = 1;
+}
+
+// Copied from: local:git_forge.v1.GetTreeBlameRequest (var: on)
+message GetTreeBlameRequest {
+  string repo_uuid = 1;
+  string start_commit_sha = 2;
+  string path = 3;
+}
+
+// Copied from: local:git_forge.v1.GetTreeBlameResponse (var: ln)
+message GetTreeBlameResponse {
+  repeated TreeEntryBlame entries = 1;
+}
+
+// Copied from: local:git_forge.v1.GetTreeRequest (var: rt)
+message GetTreeRequest {
+  string repo_uuid = 1;
+  string tree_sha = 2;
+  bool recursive = 3;
+}
+
+// Copied from: local:git_forge.v1.GetTreeResponse (var: st)
+message GetTreeResponse {
+  Tree tree = 1;
+}
+
+// Copied from: local:git_forge.v1.GrepLineKind (var: h)
+enum GrepLineKind {
+  GREP_LINE_KIND_UNSPECIFIED = 0;
+  GREP_LINE_KIND_MATCH = 1;
+  GREP_LINE_KIND_CONTEXT = 2;
+}
+
+// Copied from: local:git_forge.v1.GrepMatch (var: hn)
+message GrepMatch {
+  string path = 1;
+  string lines = 2;
+  uint32 line_number = 3;
+  uint64 absolute_offset = 4;
+  repeated GrepSubmatch submatches = 5;
+  GrepLineKind kind = 6;
+}
+
+// Copied from: local:git_forge.v1.GrepRepoChunk (var: An)
+message GrepRepoChunk {
+  repeated GrepMatch matches = 1;
+  bool limit_hit = 2;
+}
+
+// Copied from: local:git_forge.v1.GrepRepoRequest (var: fn)
+message GrepRepoRequest {
+  string repo_uuid = 1;
+  string revision = 2;
+  string query = 3;
+  GrepSearchOptions options = 4;
+  uint32 max_results = 5;
+}
+
+// Copied from: local:git_forge.v1.GrepSearchOptions (var: pn)
+message GrepSearchOptions {
+  bool literal = 1;
+  bool case_insensitive = 2;
+  bool whole_word = 3;
+  uint32 context_before = 4;
+  uint32 context_after = 5;
+  optional uint64 max_lines = 6;
+  optional string filter_path = 7;
+  repeated string includes = 8;
+  repeated string excludes = 9;
+}
+
+// Copied from: local:git_forge.v1.GrepSubmatch (var: gn)
+message GrepSubmatch {
+  uint32 start = 1;
+  uint32 end = 2;
+}
+
+// Copied from: local:git_forge.v1.ListCommitsInRangeRequest (var: mt)
+message ListCommitsInRangeRequest {
+  string repo_uuid = 1;
+  string base_revision = 2;
+  string head_revision = 3;
+  optional int32 max_commits = 4;
+  bool oldest_first = 5;
+  ListCommitsSort sort = 6;
+}
+
+// Copied from: local:git_forge.v1.ListCommitsInRangeResponse (var: ct)
+message ListCommitsInRangeResponse {
+  repeated Commit commits = 1;
+  string base_commit_sha = 2;
+  string head_commit_sha = 3;
+  string merge_base_commit_sha = 4;
+  bool truncated = 5;
+}
+
+// Copied from: local:git_forge.v1.ListCommitsRequest (var: lt)
+message ListCommitsRequest {
+  string repo_uuid = 1;
+  string revision = 2;
+  int32 page = 3;
+  int32 per_page = 4;
+  ListCommitsSort sort = 5;
+}
+
+// Copied from: local:git_forge.v1.ListCommitsResponse (var: ut)
+message ListCommitsResponse {
+  repeated Commit commits = 1;
+  optional int32 next_page = 2;
+}
+
+// Copied from: local:git_forge.v1.ListCommitsSort (var: y)
+enum ListCommitsSort {
+  LIST_COMMITS_SORT_UNSPECIFIED = 0;
+  LIST_COMMITS_SORT_COMMIT_TIME = 1;
+  LIST_COMMITS_SORT_TOPOLOGICAL = 2;
+}
+
+// Copied from: local:git_forge.v1.ListRefsFilter (var: T)
+enum ListRefsFilter {
+  LIST_REFS_FILTER_UNSPECIFIED = 0;
+  LIST_REFS_FILTER_ALL = 1;
+  LIST_REFS_FILTER_BRANCHES = 2;
+  LIST_REFS_FILTER_TAGS = 3;
+}
+
+// Copied from: local:git_forge.v1.ListRefsRequest (var: Mn)
+message ListRefsRequest {
+  string repo_uuid = 1;
+  ListRefsFilter filter = 2;
+  bool names_only = 3;
+  string prefix = 4;
+}
+
+// Copied from: local:git_forge.v1.ListRefsResponse (var: Fn)
+message ListRefsResponse {
+  repeated string refs = 1;
+  repeated RefInfo ref_infos = 2;
+}
+
+// Copied from: local:git_forge.v1.ListTreePathsRequest (var: cn)
+message ListTreePathsRequest {
+  string repo_uuid = 1;
+  string revision = 2;
+  repeated string includes = 3;
+  repeated string excludes = 4;
+  uint32 limit = 5;
+}
+
+// Copied from: local:git_forge.v1.ListTreePathsResponse (var: dn)
+message ListTreePathsResponse {
+  repeated string paths = 1;
+  bool has_more = 2;
+}
+
+// Copied from: local:git_forge.v1.MergeMode (var: f)
+enum MergeMode {
+  MERGE_MODE_UNSPECIFIED = 0;
+  MERGE_MODE_MERGE_COMMIT = 1;
+  MERGE_MODE_SQUASH = 2;
+}
+
+// Copied from: local:git_forge.v1.NotifyRepoPushedRequest (var: _n)
+message NotifyRepoPushedRequest {
+  string repo_uuid = 1;
+}
+
+// Copied from: local:git_forge.v1.NotifyRepoPushedResponse (var: Tn)
+message NotifyRepoPushedResponse {
+}
+
+// Copied from: local:git_forge.v1.PathIdentifier (var: Lt)
+message PathIdentifier {
+  string revision = 1;
+  string path = 2;
+}
+
+// Copied from: local:git_forge.v1.PrepareChangeMergeRequest (var: yt)
+message PrepareChangeMergeRequest {
+  string repo_uuid = 1;
+  string base_ref = 2;
+  string head_ref = 3;
+  uint64 change_number = 4;
+  optional string expected_base_sha = 5;
+  optional string expected_head_sha = 6;
+  MergeMode mode = 7;
+}
+
+// Copied from: local:git_forge.v1.PrepareChangeMergeResponse (var: kt)
+message PrepareChangeMergeResponse {
+  bool mergeable = 1;
+  optional string merged_tree_sha = 2;
+  optional string change_merge_ref = 3;
+  optional string dummy_commit_sha = 4;
+}
+
+// Copied from: local:git_forge.v1.PullRequestDiffChunk (var: In)
+message PullRequestDiffChunk {
+  optional DiffHeader header = 1;
+  repeated FileDiff file_diffs = 2;
+}
+
+// Copied from: local:git_forge.v1.RebaseStackBranch (var: Et)
+message RebaseStackBranch {
+  string head_ref = 1;
+  string expected_old_oid = 2;
+}
+
+// Copied from: local:git_forge.v1.RebaseStackBranchUpdate (var: vt)
+message RebaseStackBranchUpdate {
+  string head_ref = 1;
+  string old_oid = 2;
+  string new_oid = 3;
+}
+
+// Copied from: local:git_forge.v1.RebaseStackConflict (var: Bt)
+message RebaseStackConflict {
+  string conflicted_head_ref = 1;
+  repeated string conflicted_paths = 2;
+}
+
+// Copied from: local:git_forge.v1.RebaseStackRequest (var: wt)
+message RebaseStackRequest {
+  string repo_uuid = 1;
+  string onto_ref = 2;
+  optional string expected_onto_oid = 3;
+  repeated RebaseStackBranch branches = 4;
+}
+
+// Copied from: local:git_forge.v1.RebaseStackResponse (var: St)
+message RebaseStackResponse {
+  oneof result {
+    RebaseStackSuccess success = 1;
+    RebaseStackConflict conflict = 2;
+  }
+}
+
+// Copied from: local:git_forge.v1.RebaseStackSuccess (var: It)
+message RebaseStackSuccess {
+  string wal_entry_key = 1;
+  repeated RebaseStackBranchUpdate updates = 2;
+}
+
+// Copied from: local:git_forge.v1.RefInfo (var: Ln)
+message RefInfo {
+  string name = 1;
+  string target_sha = 2;
+  string object_sha = 3;
+  string object_type = 4;
+}
+
+// Copied from: local:git_forge.v1.RepoContentDetails (var: Vt)
+message RepoContentDetails {
+  string type = 1;
+  optional uint64 size = 2;
+  bool is_binary = 3;
+  bool too_large_to_introspect = 4;
+}
+
+// Copied from: local:git_forge.v1.RepoContentEntry (var: kn)
+message RepoContentEntry {
+  string type = 1;
+  string name = 2;
+  string path = 3;
+  string sha = 4;
+  optional uint64 size = 5;
+}
+
+// Copied from: local:git_forge.v1.ResolveRefPathRequest (var: Dt)
+message ResolveRefPathRequest {
+  string repo_uuid = 1;
+  string ref_path = 2;
+}
+
+// Copied from: local:git_forge.v1.ResolveRefPathResponse (var: Ot)
+message ResolveRefPathResponse {
+  PathIdentifier path_identifier = 1;
+  string resolved_commit_sha = 2;
+}
+
+// Copied from: local:git_forge.v1.ShortCommit (var: yn)
+message ShortCommit {
+  bytes sha = 1;
+  string summary = 2;
+  string author_name = 3;
+  string author_email = 4;
+  int64 timestamp = 5;
+}
+
+// Copied from: local:git_forge.v1.Signature (var: Mt)
+message Signature {
+  string name = 1;
+  string email = 2;
+  int64 timestamp = 3;
+  int32 timezone_offset = 4;
+}
+
+// Copied from: local:git_forge.v1.Tag (var: at)
+message Tag {
+  string sha = 1;
+  string name = 2;
+  string message = 3;
+  Signature tagger = 4;
+  string object_sha = 5;
+  string object_type = 6;
+}
+
+// Copied from: local:git_forge.v1.Tree (var: ot)
+message Tree {
+  string sha = 1;
+  repeated TreeEntry tree = 2;
+  bool truncated = 3;
+}
+
+// Copied from: local:git_forge.v1.TreeEntry (var: it)
+message TreeEntry {
+  string path = 1;
+  string mode = 2;
+  string type = 3;
+  string sha = 4;
+  optional uint64 size = 5;
+}
+
+// Copied from: local:git_forge.v1.TreeEntryBlame (var: an)
+message TreeEntryBlame {
+  string name = 1;
+  ShortCommit last_commit = 2;
+}
+

proto/from_extensions/internapi_v1.proto

@@ -4,7 +4,7 @@ package internapi.v1;
 
 option go_package = "react-admin/cursor-server/gen/internapi/v1;internapiv1";
 
-// Copied from: local:internapi.v1.BlobData (var: hxe)
+// Copied from: local:internapi.v1.BlobData (var: Mn)
 message BlobData {
   BlobType blob_type = 1;
   bytes blob_id = 2;
@@ -14,12 +14,12 @@ message BlobData {
   }
 }
 
-// Copied from: local:internapi.v1.BlobDataPerMessage (var: Txe)
+// Copied from: local:internapi.v1.BlobDataPerMessage (var: Ln)
 message BlobDataPerMessage {
   repeated BlobData blob_data = 1;
 }
 
-// Copied from: local:internapi.v1.BlobType (var: Axe)
+// Copied from: local:internapi.v1.BlobType (var: Nn)
 enum BlobType {
   BLOB_TYPE_UNSPECIFIED = 0;
   BLOB_TYPE_IMAGE = 1;
@@ -34,7 +34,7 @@ enum BlobType {
   BLOB_TYPE_VIDEO = 10;
 }
 
-// Copied from: local:internapi.v1.ImageBlobData (var: pxe)
+// Copied from: local:internapi.v1.ImageBlobData (var: bn)
 message ImageBlobData {
   string mime_type = 1;
 }