Implement checkpoint blob handling in forwarder service

- Added support for checkpointing phases and blob management in the forwarder. - Introduced new types and methods for handling checkpoint blobs, including queuing and publishing checkpoints. - Enhanced the projector to build checkpoint projections with content-addressed blobs. - Implemented tests to ensure proper checkpoint blob synchronization and handling of cancellation scenarios.
Implement tests for ProjectLegacyCheckpoint to ensure proper handling of conversation state and message imports. This includes verifying that no dangling inline blobs are present and that the correct user and assistant messages are imported.
2026-08-18 20:19:18 +08:00 · 2026-08-05 02:09:45 +08:00 · 2026-08-05 01:46:47 +08:00 · 2026-08-05 01:26:22 +08:00 · 2026-08-05 01:25:39 +08:00
44 changed files with 10555 additions and 30053 deletions
@@ -15,7 +15,6 @@ 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-*
@@ -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 /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 ./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。"
    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}}'
@@ -8,7 +8,7 @@ info:
  description: "Cursor助手"
  copyright: "© 2026, Cursor助手"
  comments: "Cursor助手"
-  version: "0.0.44"
+  version: "0.0.45"

 dev_mode:
  root_path: .
@@ -17,9 +17,9 @@
 		<key>CFBundlePackageType</key>
 		<string>APPL</string>
 		<key>CFBundleShortVersionString</key>
-		<string>0.0.44</string>
+		<string>0.0.45</string>
 		<key>CFBundleVersion</key>
-		<string>0.0.44</string>
+		<string>0.0.45</string>
 		<key>LSMinimumSystemVersion</key>
 		<string>12.0.0</string>
 		<key>LSUIElement</key>
@@ -17,9 +17,9 @@
 		<key>CFBundlePackageType</key>
 		<string>APPL</string>
 		<key>CFBundleShortVersionString</key>
-		<string>0.0.44</string>
+		<string>0.0.45</string>
 		<key>CFBundleVersion</key>
-		<string>0.0.44</string>
+		<string>0.0.45</string>
 		<key>LSMinimumSystemVersion</key>
 		<string>12.0.0</string>
 		<key>LSUIElement</key>
@@ -6,7 +6,7 @@
 name: "Cursor助手"
 arch: ${GOARCH}
 platform: "linux"
-version: "0.0.44"
+version: "0.0.45"
 section: "default"
 priority: "extra"
 maintainer: ${GIT_COMMITTER_NAME} <${GIT_COMMITTER_EMAIL}>
@@ -1,10 +1,10 @@
 {
 	"fixed": {
-		"file_version": "0.0.44"
+		"file_version": "0.0.45"
 	},
 	"info": {
 		"0000": {
-			"ProductVersion": "0.0.44",
+			"ProductVersion": "0.0.45",
 			"CompanyName": "Cursor助手",
 			"FileDescription": "Cursor助手",
 			"LegalCopyright": "© 2026, Cursor助手",
@@ -14,7 +14,7 @@
    !define INFO_PRODUCTNAME "Cursor助手"
 !endif
 !ifndef INFO_PRODUCTVERSION
-    !define INFO_PRODUCTVERSION "0.0.44"
+    !define INFO_PRODUCTVERSION "0.0.45"
 !endif
 !ifndef INFO_COPYRIGHT
    !define INFO_COPYRIGHT "© 2026, Cursor助手"
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
-    <assemblyIdentity type="win32" name="com.cursor.wuxianxubei" version="0.0.44" processorArchitecture="*"/>
+    <assemblyIdentity type="win32" name="com.cursor.wuxianxubei" version="0.0.45" processorArchitecture="*"/>
    <dependency>
        <dependentAssembly>
            <assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="*" publicKeyToken="6595b64144ccf1df" language="*"/>
@@ -2,7 +2,7 @@

 [中文](README.md) | [English](README.en.md)

-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.
+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.

 ## Start

@@ -51,8 +51,6 @@ 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.
@@ -2,7 +2,7 @@

 [中文](README.md) | [English](README.en.md)

-这是一个独立运行的本地 HTTPS 调试代理，用于观察 Cursor 的 `BidiAppend`、`RunSSE` 和 Fork Chat 相关通信。它不会修改 Cursor、系统代理或已安装客户端。
+这是一个独立运行的本地 HTTPS 调试代理，用于观察 Cursor 的 `BidiAppend` 和 `RunSSE` 通信。它不会修改 Cursor、系统代理或已安装客户端。

 ## 启动

@@ -51,8 +51,6 @@ 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` 过滤。
 - 调试界面支持简体中文和英文，可跟随浏览器语言并记住手动选择。
 - 抓包只保留在当前进程内存中；关闭进程后消失。
@@ -20,13 +20,6 @@ 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
@@ -147,9 +140,10 @@ func decompressPayload(payload []byte, codec string) ([]byte, error) {
 	return decoded, nil
 }

-func decodeUnaryRequest(path string, payload []byte) (decodedJSON string, kind string, requestID string, err error) {
+func decodeUnary(path string, payload []byte) (decodedJSON string, kind string, requestID string, err error) {
+	var message proto.Message
 	switch path {
-	case bidiAppendPath:
+	case "/aiserver.v1.BidiService/BidiAppend":
 		request := &aiserverv1.BidiAppendRequest{}
 		if err := proto.Unmarshal(payload, request); err != nil {
 			return "", "", "", err
@@ -171,65 +165,13 @@ func decodeUnaryRequest(path string, payload []byte) (decodedJSON string, kind s
 		}
 		formatted, marshalErr := json.MarshalIndent(combined, "", "  ")
 		return string(formatted), clientKind, requestID, marshalErr
+	default:
+		message = nil
 	}
-	message, kind := unaryRequestMessage(path)
 	if message == nil {
 		return "", "", "", 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
+	return marshalProtoJSON(message), activeOneofName(message), "", nil
 }

 func newMessage(messageType string) proto.Message {
@@ -1,242 +0,0 @@
-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()
-}
@@ -226,29 +226,28 @@ 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 = responseCodec
+		exchange.Response.ContentCodec = responseContentCodec(response.Header)
 	})
 	if response.Body == nil {
-		server.finishResponseBody(id, path, responseCodec, nil, 0, false, nil)
+		server.finishResponseBody(id, 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",
-			responseCodec,
+			response.Header.Get("Connect-Content-Encoding"),
 			server.config.MaxFrames,
 			func(frame FrameView) { server.appendResponseFrame(id, frame) },
 		)
@@ -265,7 +264,7 @@ func (server *Server) captureResponse(response *http.Response, context *goproxy.
 			if frameDecoder != nil {
 				frameDecoder.Close()
 			}
-			server.finishResponseBody(id, path, responseCodec, captured, size, truncated, readErr)
+			server.finishResponseBody(id, captured, size, truncated, readErr)
 		},
 	)
 	return response
@@ -274,14 +273,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 decodesUnaryRequest(path) && truncated {
+	if path == "/aiserver.v1.BidiService/BidiAppend" && truncated {
 		contentDecodeErr = errors.New("请求正文超过抓取上限，无法完整解码")
-	} else if decodesUnaryRequest(path) && codec != "" && !strings.EqualFold(codec, "identity") {
+	} else if path == "/aiserver.v1.BidiService/BidiAppend" && codec != "" && !strings.EqualFold(codec, "identity") {
 		decodePayload, contentDecodeErr = decompressPayload(captured, codec)
 	}
 	decodedJSON, kind, requestID, decodeErr := "", "", "", contentDecodeErr
 	if decodeErr == nil {
-		decodedJSON, kind, requestID, decodeErr = decodeUnaryRequest(path, decodePayload)
+		decodedJSON, kind, requestID, decodeErr = decodeUnary(path, decodePayload)
 	}
 	server.store.update(id, func(exchange *Exchange) {
 		exchange.RequestBytes = size
@@ -313,44 +312,19 @@ func requestContentCodec(path string, headers http.Header) string {
 	return strings.TrimSpace(headers.Get("Content-Encoding"))
 }

-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
-		}
+func responseContentCodec(headers http.Header) string {
+	if codec := strings.TrimSpace(headers.Get("Connect-Content-Encoding")); codec != "" {
+		return codec
 	}
 	return strings.TrimSpace(headers.Get("Content-Encoding"))
 }

-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)
-	}
+func (server *Server) finishResponseBody(id string, captured []byte, size int64, truncated bool, readErr error) {
 	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) {
@@ -138,7 +138,6 @@ 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)]
@@ -152,13 +151,6 @@ 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 });
@@ -22,7 +22,6 @@ const messages = {
    "filters.requestIdPlaceholder": "按 Request ID 过滤",
    "filters.endpoint": "接口过滤",
    "filters.all": "全部",
-    "filters.fork": "Fork",
    "filters.sort": "排序方向",
    "filters.ascending": "正序",
    "filters.descending": "倒序",
@@ -82,7 +81,6 @@ 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",
@@ -46,7 +46,6 @@
          <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>
@@ -23,6 +23,7 @@ const (
 	TurnPhaseWaitingExternal TurnPhase = "waiting_external"
 	TurnPhaseAwaitingUser    TurnPhase = "awaiting_user"
 	TurnPhaseCompacting      TurnPhase = "compacting"
+	TurnPhaseCheckpointing   TurnPhase = "checkpointing"
 	TurnPhaseCompleted       TurnPhase = "completed"
 	TurnPhaseFailed          TurnPhase = "failed"
 	TurnPhaseCanceled        TurnPhase = "canceled"
@@ -66,6 +67,7 @@ const (
 	streamTimerNonStreamingRecovery streamTimerKind = "non_streaming_recovery"
 	streamTimerShellForeground      streamTimerKind = "shell_foreground"
 	streamTimerShellTransportClose  streamTimerKind = "shell_transport_close"
+	streamTimerCheckpointBlobs      streamTimerKind = "checkpoint_blobs"
 	streamTimerOrphanCancel         streamTimerKind = "orphan_cancel"
 )

@@ -318,6 +320,9 @@ func (service *Service) handleStreamCommand(stream *ActiveStream, command stream
 	case streamCommandCancel:
 		return service.handleCancelIntent(command.Intent)
 	case streamCommandMetadata:
+		if strings.TrimSpace(command.Intent.Kind) == "kv_result" {
+			return service.handleCheckpointBlobResult(stream, command.Intent.KVClientMessage)
+		}
 		return service.handleMetadataIntent(command.Intent)
 	case streamCommandExecResult:
 		return service.handleExecResult(command.Intent)
@@ -1003,6 +1008,8 @@ func (service *Service) handleTimerEvent(stream *ActiveStream, payload *streamTi
 			return nil
 		}
 		return service.recoverShellWithoutTerminal(stream, current, shellRecoveryReasonTransportClosed)
+	case streamTimerCheckpointBlobs:
+		return service.handleCheckpointBlobTimeout(stream)
 	case streamTimerOrphanCancel:
 		stream.mu.Lock()
 		subscriberCount := len(stream.Subscribers)
@@ -76,6 +76,12 @@ func (broker *StreamBroker) OpenStream(requestID string, conversationID string,
 		if existing.BackgroundShellActions == nil {
 			existing.BackgroundShellActions = make(map[string]time.Time)
 		}
+		if existing.PendingCheckpointBlobWrites == nil {
+			existing.PendingCheckpointBlobWrites = make(map[uint32]string)
+		}
+		if existing.ConfirmedCheckpointBlobs == nil {
+			existing.ConfirmedCheckpointBlobs = make(map[string]struct{})
+		}
 		existing.UpdatedAt = time.Now().UTC()
 		existing.mu.Unlock()
 		return existing, nil
@@ -102,6 +108,8 @@ func (broker *StreamBroker) OpenStream(requestID string, conversationID string,
 		BackgroundShellsByMessageID: make(map[uint32]string),
 		BackgroundShellsByExecID:    make(map[string]string),
 		BackgroundShellActions:      make(map[string]time.Time),
+		PendingCheckpointBlobWrites: make(map[uint32]string),
+		ConfirmedCheckpointBlobs:    make(map[string]struct{}),
 		CreatedAt:                   now,
 		UpdatedAt:                   now,
 	}
@@ -0,0 +1,238 @@
+package forwarder
+
+import (
+	"encoding/hex"
+	"fmt"
+	"log"
+	"strings"
+	"time"
+
+	"google.golang.org/protobuf/proto"
+
+	"cursor/gen/agentv1"
+)
+
+const checkpointBlobWriteTimeout = 5 * time.Second
+
+type pendingCheckpointBlobWrite struct {
+	requestID uint32
+	blob      CheckpointBlob
+}
+
+func clonePendingTurnCompletion(completion *pendingTurnCompletion) *pendingTurnCompletion {
+	if completion == nil {
+		return nil
+	}
+	cloned := *completion
+	return &cloned
+}
+
+func (service *Service) queueCheckpointProjection(stream *ActiveStream, projection *CheckpointProjection, completion *pendingTurnCompletion) error {
+	if service == nil || stream == nil || projection == nil || projection.State == nil {
+		return nil
+	}
+	state, ok := proto.Clone(projection.State).(*agentv1.ConversationStateStructure)
+	if !ok || state == nil {
+		return fmt.Errorf("clone checkpoint state")
+	}
+
+	stream.mu.Lock()
+	if stream.PendingCheckpointBlobWrites == nil {
+		stream.PendingCheckpointBlobWrites = make(map[uint32]string)
+	}
+	if stream.ConfirmedCheckpointBlobs == nil {
+		stream.ConfirmedCheckpointBlobs = make(map[string]struct{})
+	}
+	if completion == nil && stream.PendingCheckpoint != nil {
+		completion = stream.PendingCheckpoint.Completion
+	}
+	required := make(map[string]struct{}, len(projection.Blobs))
+	pendingKeys := make(map[string]struct{}, len(stream.PendingCheckpointBlobWrites))
+	for _, key := range stream.PendingCheckpointBlobWrites {
+		pendingKeys[key] = struct{}{}
+	}
+	toWrite := make([]pendingCheckpointBlobWrite, 0, len(projection.Blobs))
+	for _, blob := range projection.Blobs {
+		key := string(blob.ID)
+		if key == "" {
+			continue
+		}
+		required[key] = struct{}{}
+		if _, confirmed := stream.ConfirmedCheckpointBlobs[key]; confirmed {
+			continue
+		}
+		if _, pending := pendingKeys[key]; pending {
+			continue
+		}
+		stream.NextCheckpointBlobRequestID++
+		if stream.NextCheckpointBlobRequestID == 0 {
+			stream.NextCheckpointBlobRequestID++
+		}
+		requestID := stream.NextCheckpointBlobRequestID
+		stream.PendingCheckpointBlobWrites[requestID] = key
+		pendingKeys[key] = struct{}{}
+		toWrite = append(toWrite, pendingCheckpointBlobWrite{requestID: requestID, blob: blob})
+	}
+	stream.PendingCheckpoint = &pendingCheckpointPublish{
+		State:      state,
+		Required:   required,
+		Completion: clonePendingTurnCompletion(completion),
+	}
+	if completion != nil {
+		stream.Phase = TurnPhaseCheckpointing
+	}
+	stream.UpdatedAt = time.Now().UTC()
+	stream.mu.Unlock()
+
+	for _, write := range toWrite {
+		if err := service.broker.Publish(stream.RequestID, StreamEvent{
+			Message: buildSetCheckpointBlobMessage(write.requestID, write.blob),
+		}); err != nil {
+			return service.finishAfterCheckpointSyncFailure(stream, fmt.Errorf("publish checkpoint blob: %w", err))
+		}
+	}
+	if service.checkpointProjectionReady(stream) {
+		return service.publishReadyCheckpoint(stream)
+	}
+	service.scheduleStreamTimer(
+		stream,
+		providerTimerKey(streamTimerCheckpointBlobs, ""),
+		checkpointBlobWriteTimeout,
+		streamTimerCheckpointBlobs,
+		"",
+		0,
+		"checkpoint blob write timeout",
+	)
+	return nil
+}
+
+func (service *Service) checkpointProjectionReady(stream *ActiveStream) bool {
+	if stream == nil {
+		return false
+	}
+	stream.mu.Lock()
+	defer stream.mu.Unlock()
+	if stream.PendingCheckpoint == nil {
+		return false
+	}
+	for key := range stream.PendingCheckpoint.Required {
+		if _, confirmed := stream.ConfirmedCheckpointBlobs[key]; !confirmed {
+			return false
+		}
+	}
+	return true
+}
+
+func (service *Service) handleCheckpointBlobResult(stream *ActiveStream, message *agentv1.KvClientMessage) error {
+	if service == nil || stream == nil || message == nil || message.GetSetBlobResult() == nil {
+		return nil
+	}
+	stream.mu.Lock()
+	key, ok := stream.PendingCheckpointBlobWrites[message.GetId()]
+	if ok {
+		delete(stream.PendingCheckpointBlobWrites, message.GetId())
+	}
+	required := false
+	if ok && stream.PendingCheckpoint != nil {
+		_, required = stream.PendingCheckpoint.Required[key]
+	}
+	if ok && message.GetSetBlobResult().GetError() == nil {
+		stream.ConfirmedCheckpointBlobs[key] = struct{}{}
+	}
+	stream.UpdatedAt = time.Now().UTC()
+	stream.mu.Unlock()
+	if !ok {
+		return nil
+	}
+	if blobErr := message.GetSetBlobResult().GetError(); blobErr != nil && required {
+		return service.finishAfterCheckpointSyncFailure(stream, fmt.Errorf(
+			"client rejected checkpoint blob %s: %s",
+			hex.EncodeToString([]byte(key)),
+			firstNonEmpty(strings.TrimSpace(blobErr.GetMessage()), "unknown error"),
+		))
+	}
+	if service.checkpointProjectionReady(stream) {
+		return service.publishReadyCheckpoint(stream)
+	}
+	return nil
+}
+
+func (service *Service) publishReadyCheckpoint(stream *ActiveStream) error {
+	if service == nil || stream == nil {
+		return nil
+	}
+	stream.mu.Lock()
+	pending := stream.PendingCheckpoint
+	if pending == nil {
+		stream.mu.Unlock()
+		return nil
+	}
+	for key := range pending.Required {
+		if _, confirmed := stream.ConfirmedCheckpointBlobs[key]; !confirmed {
+			stream.mu.Unlock()
+			return nil
+		}
+	}
+	stream.PendingCheckpoint = nil
+	state := pending.State
+	completion := clonePendingTurnCompletion(pending.Completion)
+	stream.UpdatedAt = time.Now().UTC()
+	stream.mu.Unlock()
+	clearStreamTimer(stream, providerTimerKey(streamTimerCheckpointBlobs, ""))
+	if err := service.broker.Publish(stream.RequestID, StreamEvent{Message: buildCheckpointMessage(state)}); err != nil {
+		if completion != nil {
+			log.Printf("forwarder checkpoint publish skipped before successful terminal request_id=%s err=%v", stream.RequestID, err)
+			return service.finishSuccessfulTurnAfterCheckpoint(stream, *completion)
+		}
+		return err
+	}
+	if completion != nil {
+		return service.finishSuccessfulTurnAfterCheckpoint(stream, *completion)
+	}
+	return nil
+}
+
+func (service *Service) handleCheckpointBlobTimeout(stream *ActiveStream) error {
+	if stream == nil {
+		return nil
+	}
+	stream.mu.Lock()
+	pendingCount := len(stream.PendingCheckpointBlobWrites)
+	stream.mu.Unlock()
+	return service.finishAfterCheckpointSyncFailure(stream, fmt.Errorf("%d checkpoint blob writes timed out", pendingCount))
+}
+
+func (service *Service) finishAfterCheckpointSyncFailure(stream *ActiveStream, cause error) error {
+	if stream == nil {
+		return nil
+	}
+	stream.mu.Lock()
+	pending := stream.PendingCheckpoint
+	stream.PendingCheckpoint = nil
+	stream.PendingCheckpointBlobWrites = make(map[uint32]string)
+	stream.UpdatedAt = time.Now().UTC()
+	stream.mu.Unlock()
+	clearStreamTimer(stream, providerTimerKey(streamTimerCheckpointBlobs, ""))
+	if cause != nil {
+		log.Printf("forwarder checkpoint blob sync skipped request_id=%s conversation_id=%s err=%v", stream.RequestID, stream.ConversationID, cause)
+	}
+	if pending != nil && pending.Completion != nil {
+		return service.finishSuccessfulTurnAfterCheckpoint(stream, *pending.Completion)
+	}
+	return nil
+}
+
+func (service *Service) discardPendingCheckpoint(stream *ActiveStream, reason string) {
+	if stream == nil {
+		return
+	}
+	stream.mu.Lock()
+	stream.PendingCheckpoint = nil
+	stream.PendingCheckpointBlobWrites = make(map[uint32]string)
+	stream.UpdatedAt = time.Now().UTC()
+	stream.mu.Unlock()
+	clearStreamTimer(stream, providerTimerKey(streamTimerCheckpointBlobs, ""))
+	if strings.TrimSpace(reason) != "" {
+		log.Printf("forwarder pending checkpoint discarded request_id=%s conversation_id=%s reason=%s", stream.RequestID, stream.ConversationID, strings.TrimSpace(reason))
+	}
+}
@@ -0,0 +1,208 @@
+package forwarder
+
+import (
+	"testing"
+
+	"google.golang.org/protobuf/encoding/protojson"
+
+	"cursor/gen/agentv1"
+)
+
+func TestCheckpointBlobSyncPublishesCheckpointAfterAcknowledgements(t *testing.T) {
+	service, stream, projection := testCheckpointBlobProjection(t)
+	if err := service.queueCheckpointProjection(stream, projection, nil); err != nil {
+		t.Fatalf("queueCheckpointProjection() error = %v", err)
+	}
+	events := readCheckpointTestEvents(t, service, stream)
+	if len(events) != len(projection.Blobs) {
+		t.Fatalf("events before ACK = %d, want %d Blob writes", len(events), len(projection.Blobs))
+	}
+	for _, event := range events {
+		if event.Message.GetKvServerMessage().GetSetBlobArgs() == nil {
+			t.Fatalf("event before ACK = %#v, want set_blob_args", event.Message)
+		}
+	}
+
+	acknowledgeCheckpointBlobs(t, service, stream)
+	events = readCheckpointTestEvents(t, service, stream)
+	checkpoint := events[len(events)-1].Message.GetConversationCheckpointUpdate()
+	if checkpoint == nil || len(checkpoint.GetTurns()) != 1 {
+		t.Fatalf("last event checkpoint = %#v, want one Blob-backed turn", checkpoint)
+	}
+}
+
+func TestCheckpointBlobSyncPublishesCheckpointBeforeSuccessfulTerminal(t *testing.T) {
+	service, stream, projection := testCheckpointBlobProjection(t)
+	completion := &pendingTurnCompletion{
+		RequestID: stream.RequestID,
+		Usage:     turnUsageSnapshot{InputTokens: 11, OutputTokens: 7},
+	}
+	if err := service.queueCheckpointProjection(stream, projection, completion); err != nil {
+		t.Fatalf("queueCheckpointProjection() error = %v", err)
+	}
+	acknowledgeCheckpointBlobs(t, service, stream)
+
+	events := readCheckpointTestEvents(t, service, stream)
+	checkpointIndex, turnEndedIndex, endIndex := -1, -1, -1
+	for index, event := range events {
+		switch {
+		case event.Message.GetConversationCheckpointUpdate() != nil:
+			checkpointIndex = index
+		case event.Message.GetInteractionUpdate().GetTurnEnded() != nil:
+			turnEndedIndex = index
+		case event.End:
+			endIndex = index
+		}
+	}
+	if checkpointIndex < 0 || turnEndedIndex <= checkpointIndex || endIndex <= turnEndedIndex {
+		t.Fatalf("terminal order checkpoint=%d turn_ended=%d end=%d", checkpointIndex, turnEndedIndex, endIndex)
+	}
+}
+
+func TestCheckpointBlobTimeoutDoesNotFailSuccessfulTurn(t *testing.T) {
+	service, stream, projection := testCheckpointBlobProjection(t)
+	completion := &pendingTurnCompletion{
+		RequestID: stream.RequestID,
+		Usage:     turnUsageSnapshot{InputTokens: 11, OutputTokens: 7},
+	}
+	if err := service.queueCheckpointProjection(stream, projection, completion); err != nil {
+		t.Fatalf("queueCheckpointProjection() error = %v", err)
+	}
+	if err := service.handleCheckpointBlobTimeout(stream); err != nil {
+		t.Fatalf("handleCheckpointBlobTimeout() error = %v", err)
+	}
+
+	events := readCheckpointTestEvents(t, service, stream)
+	var checkpoint, turnEnded, successfulEnd bool
+	for _, event := range events {
+		checkpoint = checkpoint || event.Message.GetConversationCheckpointUpdate() != nil
+		turnEnded = turnEnded || event.Message.GetInteractionUpdate().GetTurnEnded() != nil
+		successfulEnd = successfulEnd || event.End && event.TerminalErrorCode == ""
+	}
+	if checkpoint || !turnEnded || !successfulEnd {
+		t.Fatalf("timeout events checkpoint=%v turn_ended=%v successful_end=%v", checkpoint, turnEnded, successfulEnd)
+	}
+}
+
+func TestCancellationDiscardsPendingCheckpointAndIgnoresLateAcknowledgements(t *testing.T) {
+	service, stream, projection := testCheckpointBlobProjection(t)
+	if err := service.queueCheckpointProjection(stream, projection, nil); err != nil {
+		t.Fatalf("queueCheckpointProjection() error = %v", err)
+	}
+	stream.mu.Lock()
+	requestIDs := make([]uint32, 0, len(stream.PendingCheckpointBlobWrites))
+	for requestID := range stream.PendingCheckpointBlobWrites {
+		requestIDs = append(requestIDs, requestID)
+	}
+	stream.mu.Unlock()
+	if err := service.handleCancelIntent(InboundIntent{
+		Kind:         "cancel",
+		RequestID:    stream.RequestID,
+		CancelReason: "user stopped",
+	}); err != nil {
+		t.Fatalf("handleCancelIntent() error = %v", err)
+	}
+	for _, requestID := range requestIDs {
+		if err := service.handleCheckpointBlobResult(stream, &agentv1.KvClientMessage{
+			Id: requestID,
+			Message: &agentv1.KvClientMessage_SetBlobResult{
+				SetBlobResult: &agentv1.SetBlobResult{},
+			},
+		}); err != nil {
+			t.Fatalf("late ACK %d error = %v", requestID, err)
+		}
+	}
+
+	events := readCheckpointTestEvents(t, service, stream)
+	var checkpoint, canceledEnd bool
+	for _, event := range events {
+		checkpoint = checkpoint || event.Message.GetConversationCheckpointUpdate() != nil
+		canceledEnd = canceledEnd || event.End && event.TerminalErrorCode == "canceled"
+	}
+	stream.mu.Lock()
+	pending := stream.PendingCheckpoint
+	stream.mu.Unlock()
+	if checkpoint || !canceledEnd || pending != nil {
+		t.Fatalf("cancel events checkpoint=%v canceled_end=%v pending=%v", checkpoint, canceledEnd, pending != nil)
+	}
+}
+
+func testCheckpointBlobProjection(t *testing.T) (*Service, *ActiveStream, *CheckpointProjection) {
+	t.Helper()
+	broker := NewStreamBroker()
+	service := &Service{
+		store:     NewConversationFileStore(t.TempDir()),
+		projector: NewHistoryProjector(),
+		broker:    broker,
+	}
+	stream, err := broker.OpenStream(
+		"request-1", "conversation-1", 1, "default", "default",
+		agentv1.AgentMode_AGENT_MODE_AGENT, "hello",
+	)
+	if err != nil {
+		t.Fatalf("OpenStream() error = %v", err)
+	}
+	conversation := &ConversationFile{
+		ConversationID:        "conversation-1",
+		RootConversationID:    "conversation-1",
+		Mode:                  "agent",
+		NextTurnSeq:           2,
+		NextEntrySeq:          3,
+		TokenDetailsMaxTokens: projectedConversationMaxTokens,
+		Entries: []HistoryEntry{
+			testCheckpointUserEntry(t),
+			newAssistantTextEntry(1, "request-1", "hi", "", ""),
+		},
+	}
+	projection, err := service.projector.ProjectCheckpointProjection(conversation)
+	if err != nil {
+		t.Fatalf("ProjectCheckpointProjection() error = %v", err)
+	}
+	if err := service.replaceCheckpointConversation(stream, conversation); err != nil {
+		t.Fatalf("replaceCheckpointConversation() error = %v", err)
+	}
+	return service, stream, projection
+}
+
+func testCheckpointUserEntry(t *testing.T) HistoryEntry {
+	t.Helper()
+	payload, err := protojson.Marshal(&agentv1.UserMessage{Text: "hello", MessageId: "message-1"})
+	if err != nil {
+		t.Fatalf("marshal user message: %v", err)
+	}
+	return HistoryEntry{Seq: 1, TurnSeq: 1, RequestID: "request-1", Role: "user", Kind: "user_message", Payload: payload}
+}
+
+func acknowledgeCheckpointBlobs(t *testing.T, service *Service, stream *ActiveStream) {
+	t.Helper()
+	for {
+		stream.mu.Lock()
+		requestIDs := make([]uint32, 0, len(stream.PendingCheckpointBlobWrites))
+		for requestID := range stream.PendingCheckpointBlobWrites {
+			requestIDs = append(requestIDs, requestID)
+		}
+		stream.mu.Unlock()
+		if len(requestIDs) == 0 {
+			return
+		}
+		for _, requestID := range requestIDs {
+			if err := service.handleCheckpointBlobResult(stream, &agentv1.KvClientMessage{
+				Id: requestID,
+				Message: &agentv1.KvClientMessage_SetBlobResult{
+					SetBlobResult: &agentv1.SetBlobResult{},
+				},
+			}); err != nil {
+				t.Fatalf("handleCheckpointBlobResult(%d) error = %v", requestID, err)
+			}
+		}
+	}
+}
+
+func readCheckpointTestEvents(t *testing.T, service *Service, stream *ActiveStream) []StreamEvent {
+	t.Helper()
+	events, err := service.broker.ReadFromCursor(stream.RequestID, 0)
+	if err != nil {
+		t.Fatalf("ReadFromCursor() error = %v", err)
+	}
+	return events
+}
@@ -245,6 +245,22 @@ func buildCheckpointMessage(state *agentv1.ConversationStateStructure) *agentv1.
 	}
 }

+func buildSetCheckpointBlobMessage(id uint32, blob CheckpointBlob) *agentv1.AgentServerMessage {
+	return &agentv1.AgentServerMessage{
+		Message: &agentv1.AgentServerMessage_KvServerMessage{
+			KvServerMessage: &agentv1.KvServerMessage{
+				Id: id,
+				Message: &agentv1.KvServerMessage_SetBlobArgs{
+					SetBlobArgs: &agentv1.SetBlobArgs{
+						BlobId:   append([]byte(nil), blob.ID...),
+						BlobData: append([]byte(nil), blob.Data...),
+					},
+				},
+			},
+		},
+	}
+}
+
 // buildExecAbortMessage 构造对客户端执行桥的 abort 控制消息。
 func buildExecAbortMessage(pending runtimecore.PendingExec) *agentv1.AgentServerMessage {
 	return &agentv1.AgentServerMessage{
@@ -2,6 +2,7 @@
 package forwarder

 import (
+	"crypto/sha256"
 	"encoding/json"
 	"fmt"
 	"strings"
@@ -19,6 +20,51 @@ const projectedConversationMaxTokens = 130000
 type HistoryProjector struct {
 }

+type CheckpointBlob struct {
+	ID   []byte
+	Data []byte
+}
+
+type CheckpointProjection struct {
+	State *agentv1.ConversationStateStructure
+	Blobs []CheckpointBlob
+}
+
+type checkpointBlobGraph struct {
+	blobs map[[sha256.Size]byte][]byte
+	order [][sha256.Size]byte
+}
+
+func newCheckpointBlobGraph() *checkpointBlobGraph {
+	return &checkpointBlobGraph{blobs: make(map[[sha256.Size]byte][]byte)}
+}
+
+func (graph *checkpointBlobGraph) add(data []byte) []byte {
+	if graph == nil || len(data) == 0 {
+		return nil
+	}
+	id := sha256.Sum256(data)
+	if _, exists := graph.blobs[id]; !exists {
+		graph.blobs[id] = append([]byte(nil), data...)
+		graph.order = append(graph.order, id)
+	}
+	return append([]byte(nil), id[:]...)
+}
+
+func (graph *checkpointBlobGraph) list() []CheckpointBlob {
+	if graph == nil || len(graph.order) == 0 {
+		return nil
+	}
+	blobs := make([]CheckpointBlob, 0, len(graph.order))
+	for _, id := range graph.order {
+		blobs = append(blobs, CheckpointBlob{
+			ID:   append([]byte(nil), id[:]...),
+			Data: append([]byte(nil), graph.blobs[id]...),
+		})
+	}
+	return blobs
+}
+
 // NewHistoryProjector 创建 history 投影器。
 func NewHistoryProjector() *HistoryProjector {
 	return &HistoryProjector{}
@@ -475,6 +521,16 @@ func isHistoricalReplayToolResult(conversation *ConversationFile, entry HistoryE

 // ProjectLegacyCheckpoint 按需从 JSON history 投影出兼容旧客户端的 checkpoint 结构。
 func (projector *HistoryProjector) ProjectLegacyCheckpoint(conversation *ConversationFile) (*agentv1.ConversationStateStructure, error) {
+	projection, err := projector.ProjectCheckpointProjection(conversation)
+	if err != nil || projection == nil {
+		return nil, err
+	}
+	return projection.State, nil
+}
+
+// ProjectCheckpointProjection 同时返回 checkpoint 状态及其引用的内容寻址 Blob。
+func (projector *HistoryProjector) ProjectCheckpointProjection(conversation *ConversationFile) (*CheckpointProjection, error) {
+	blobs := newCheckpointBlobGraph()
 	state := &agentv1.ConversationStateStructure{
 		TokenDetails: &agentv1.ConversationTokenDetails{
 			UsedTokens: conversationTokenDetailsUsedTokens(conversation),
@@ -488,7 +544,7 @@ func (projector *HistoryProjector) ProjectLegacyCheckpoint(conversation *Convers
 	if conversation == nil {
 		mode := agentv1.AgentMode_AGENT_MODE_AGENT
 		state.Mode = &mode
-		return state, nil
+		return &CheckpointProjection{State: state}, nil
 	}
 	mode, err := parseModeAlias(conversation.Mode)
 	if err != nil {
@@ -506,158 +562,11 @@ func (projector *HistoryProjector) ProjectLegacyCheckpoint(conversation *Convers
 	if structuredState.HasTodos {
 		state.Todos = encodeConversationTodoBytes(structuredState.Todos)
 	}
-	grouped := make(map[int64][]HistoryEntry)
-	order := make([]int64, 0, conversation.NextTurnSeq)
-	for _, entry := range checkpointProjectionEntries(conversation.Entries) {
-		if entry.TurnSeq <= 0 {
-			continue
-		}
-		if _, ok := grouped[entry.TurnSeq]; !ok {
-			order = append(order, entry.TurnSeq)
-		}
-		grouped[entry.TurnSeq] = append(grouped[entry.TurnSeq], entry)
-	}
-
-	for _, turnSeq := range order {
-		entries := grouped[turnSeq]
-		var rawUserMessage []byte
-		var turnRequestID string
-		steps := make([][]byte, 0, len(entries))
-		seenToolCalls := make(map[string]struct{})
-		openToolCalls := make(map[string]struct{})
-		for _, entry := range entries {
-			if turnRequestID == "" {
-				turnRequestID = strings.TrimSpace(entry.RequestID)
-			}
-			switch strings.TrimSpace(entry.Kind) {
-			case "user_message":
-				userMessage := &agentv1.UserMessage{}
-				if err := protojson.Unmarshal(entry.Payload, userMessage); err != nil {
-					return nil, fmt.Errorf("decode checkpoint user_message: %w", err)
-				}
-				payload, err := proto.Marshal(userMessage)
-				if err != nil {
-					return nil, err
-				}
-				rawUserMessage = payload
-			case "assistant_text":
-				var payload assistantTextPayload
-				if err := json.Unmarshal(entry.Payload, &payload); err != nil {
-					return nil, err
-				}
-				if strings.TrimSpace(payload.Text) == "" && strings.TrimSpace(payload.ReasoningContent) != "" && len(openToolCalls) > 0 {
-					continue
-				}
-				if strings.TrimSpace(payload.ReasoningContent) != "" {
-					stepPayload, err := marshalThinkingStep(payload.ReasoningContent)
-					if err != nil {
-						return nil, err
-					}
-					steps = append(steps, stepPayload)
-				}
-				if strings.TrimSpace(payload.Text) == "" {
-					continue
-				}
-				stepPayload, err := proto.Marshal(&agentv1.ConversationStep{
-					Message: &agentv1.ConversationStep_AssistantMessage{
-						AssistantMessage: &agentv1.AssistantMessage{Text: strings.TrimSpace(payload.Text)},
-					},
-				})
-				if err != nil {
-					return nil, err
-				}
-				steps = append(steps, stepPayload)
-			case "tool_call":
-				var payload toolCallEntryPayload
-				if err := json.Unmarshal(entry.Payload, &payload); err != nil {
-					return nil, err
-				}
-				if strings.TrimSpace(payload.ReasoningContent) != "" {
-					stepPayload, err := marshalThinkingStep(payload.ReasoningContent)
-					if err != nil {
-						return nil, err
-					}
-					steps = append(steps, stepPayload)
-				}
-				toolCall := &agentv1.ToolCall{}
-				if err := protojson.Unmarshal(payload.ToolCall, toolCall); err != nil {
-					return nil, err
-				}
-				if !shouldPersistToolResultName(firstNonEmpty(strings.TrimSpace(payload.ToolName), inferToolName(toolCall))) {
-					continue
-				}
-				stepPayload, err := proto.Marshal(&agentv1.ConversationStep{
-					Message: &agentv1.ConversationStep_ToolCall{
-						ToolCall: toolCall,
-					},
-				})
-				if err != nil {
-					return nil, err
-				}
-				steps = append(steps, stepPayload)
-				if toolCallID := strings.TrimSpace(payload.ToolCallID); toolCallID != "" {
-					seenToolCalls[toolCallID] = struct{}{}
-					openToolCalls[toolCallID] = struct{}{}
-				}
-			case "tool_result":
-				var payload toolResultEntryPayload
-				if err := json.Unmarshal(entry.Payload, &payload); err != nil {
-					return nil, err
-				}
-				if toolCallID := strings.TrimSpace(payload.ToolCallID); toolCallID != "" {
-					if _, ok := seenToolCalls[toolCallID]; ok {
-						delete(openToolCalls, toolCallID)
-						continue
-					}
-				}
-				if strings.TrimSpace(payload.ReasoningContent) != "" {
-					stepPayload, err := marshalThinkingStep(payload.ReasoningContent)
-					if err != nil {
-						return nil, err
-					}
-					steps = append(steps, stepPayload)
-				}
-				if len(payload.ToolCall) == 0 {
-					continue
-				}
-				toolCall := &agentv1.ToolCall{}
-				if err := protojson.Unmarshal(payload.ToolCall, toolCall); err != nil {
-					return nil, err
-				}
-				if !shouldPersistToolResultName(firstNonEmpty(strings.TrimSpace(payload.ToolName), inferToolName(toolCall))) {
-					continue
-				}
-				stepPayload, err := proto.Marshal(&agentv1.ConversationStep{
-					Message: &agentv1.ConversationStep_ToolCall{
-						ToolCall: toolCall,
-					},
-				})
-				if err != nil {
-					return nil, err
-				}
-				steps = append(steps, stepPayload)
-			}
-		}
-		if len(rawUserMessage) == 0 && len(steps) == 0 {
-			continue
-		}
-		agentTurn := &agentv1.AgentConversationTurnStructure{
-			UserMessage: rawUserMessage,
-			Steps:       steps,
-		}
-		if turnRequestID != "" {
-			agentTurn.RequestId = &turnRequestID
-		}
-		turnPayload, err := proto.Marshal(&agentv1.ConversationTurnStructure{
-			Turn: &agentv1.ConversationTurnStructure_AgentConversationTurn{
-				AgentConversationTurn: agentTurn,
-			},
-		})
-		if err != nil {
-			return nil, err
-		}
-		state.Turns = append(state.Turns, turnPayload)
+	turnIDs, err := projectCheckpointTurnBlobs(conversation, blobs)
+	if err != nil {
+		return nil, err
 	}
+	state.Turns = turnIDs
 	replayMessages, err := projector.ProjectPromptReplay(conversation)
 	if err != nil {
 		return nil, err
@@ -685,15 +594,183 @@ func (projector *HistoryProjector) ProjectLegacyCheckpoint(conversation *Convers
 		return nil, err
 	}
 	state.RootPromptMessagesJson = rootPromptMessages
-	return state, nil
+	return &CheckpointProjection{State: state, Blobs: blobs.list()}, nil
 }

-func marshalThinkingStep(text string) ([]byte, error) {
-	return proto.Marshal(&agentv1.ConversationStep{
-		Message: &agentv1.ConversationStep_ThinkingMessage{
-			ThinkingMessage: &agentv1.ThinkingMessage{Text: text},
-		},
-	})
+func projectCheckpointTurnBlobs(conversation *ConversationFile, blobs *checkpointBlobGraph) ([][]byte, error) {
+	if conversation == nil || blobs == nil {
+		return nil, nil
+	}
+	grouped := make(map[int64][]HistoryEntry)
+	order := make([]int64, 0, conversation.NextTurnSeq)
+	for _, entry := range checkpointProjectionEntries(conversation.Entries) {
+		if entry.TurnSeq <= 0 {
+			continue
+		}
+		if _, ok := grouped[entry.TurnSeq]; !ok {
+			order = append(order, entry.TurnSeq)
+		}
+		grouped[entry.TurnSeq] = append(grouped[entry.TurnSeq], entry)
+	}
+
+	turnIDs := make([][]byte, 0, len(order))
+	for _, turnSeq := range order {
+		entries := grouped[turnSeq]
+		var userMessageID []byte
+		var turnRequestID string
+		stepIDs := make([][]byte, 0, len(entries))
+		seenToolCalls := make(map[string]struct{})
+		openToolCalls := make(map[string]struct{})
+		for _, entry := range entries {
+			if turnRequestID == "" {
+				turnRequestID = strings.TrimSpace(entry.RequestID)
+			}
+			switch strings.TrimSpace(entry.Kind) {
+			case "user_message":
+				userMessage := &agentv1.UserMessage{}
+				if err := protojson.Unmarshal(entry.Payload, userMessage); err != nil {
+					return nil, fmt.Errorf("decode checkpoint user_message: %w", err)
+				}
+				payload, err := proto.Marshal(userMessage)
+				if err != nil {
+					return nil, err
+				}
+				userMessageID = blobs.add(payload)
+			case "assistant_text":
+				var payload assistantTextPayload
+				if err := json.Unmarshal(entry.Payload, &payload); err != nil {
+					return nil, err
+				}
+				if strings.TrimSpace(payload.Text) == "" && strings.TrimSpace(payload.ReasoningContent) != "" && len(openToolCalls) > 0 {
+					continue
+				}
+				if strings.TrimSpace(payload.ReasoningContent) != "" {
+					stepID, err := addCheckpointStepBlob(blobs, &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{
+					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{
+						Message: &agentv1.ConversationStep_ThinkingMessage{
+							ThinkingMessage: &agentv1.ThinkingMessage{Text: payload.ReasoningContent},
+						},
+					})
+					if err != nil {
+						return nil, err
+					}
+					stepIDs = append(stepIDs, stepID)
+				}
+				toolCall := &agentv1.ToolCall{}
+				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 {
+					return nil, err
+				}
+				stepIDs = append(stepIDs, stepID)
+				if toolCallID := strings.TrimSpace(payload.ToolCallID); toolCallID != "" {
+					seenToolCalls[toolCallID] = struct{}{}
+					openToolCalls[toolCallID] = struct{}{}
+				}
+			case "tool_result":
+				var payload toolResultEntryPayload
+				if err := json.Unmarshal(entry.Payload, &payload); err != nil {
+					return nil, err
+				}
+				if toolCallID := strings.TrimSpace(payload.ToolCallID); toolCallID != "" {
+					if _, ok := seenToolCalls[toolCallID]; ok {
+						delete(openToolCalls, toolCallID)
+						continue
+					}
+				}
+				if strings.TrimSpace(payload.ReasoningContent) != "" {
+					stepID, err := addCheckpointStepBlob(blobs, &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
+				}
+				toolCall := &agentv1.ToolCall{}
+				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 {
+					return nil, err
+				}
+				stepIDs = append(stepIDs, stepID)
+			}
+		}
+		if len(userMessageID) == 0 && len(stepIDs) == 0 {
+			continue
+		}
+		agentTurn := &agentv1.AgentConversationTurnStructure{
+			UserMessage: userMessageID,
+			Steps:       stepIDs,
+		}
+		if turnRequestID != "" {
+			agentTurn.RequestId = &turnRequestID
+		}
+		turnPayload, err := proto.Marshal(&agentv1.ConversationTurnStructure{
+			Turn: &agentv1.ConversationTurnStructure_AgentConversationTurn{
+				AgentConversationTurn: agentTurn,
+			},
+		})
+		if err != nil {
+			return nil, err
+		}
+		turnIDs = append(turnIDs, blobs.add(turnPayload))
+	}
+	return turnIDs, nil
+}
+
+func addCheckpointStepBlob(blobs *checkpointBlobGraph, step *agentv1.ConversationStep) ([]byte, error) {
+	payload, err := proto.Marshal(step)
+	if err != nil {
+		return nil, err
+	}
+	return blobs.add(payload), nil
 }

 func conversationTokenDetailsUsedTokens(conversation *ConversationFile) uint32 {
@@ -0,0 +1,140 @@
+package forwarder
+
+import (
+	"crypto/sha256"
+	"strings"
+	"testing"
+
+	"google.golang.org/protobuf/encoding/protojson"
+	"google.golang.org/protobuf/proto"
+
+	"cursor/gen/agentv1"
+)
+
+func TestProjectCheckpointProjectionBuildsResolvableForkState(t *testing.T) {
+	userPayload, err := protojson.Marshal(&agentv1.UserMessage{
+		Text:      "parent question",
+		MessageId: "message-1",
+	})
+	if err != nil {
+		t.Fatalf("marshal user message: %v", err)
+	}
+	conversation := &ConversationFile{
+		ConversationID:        "conversation-1",
+		RootConversationID:    "conversation-1",
+		Mode:                  "agent",
+		NextTurnSeq:           2,
+		NextEntrySeq:          3,
+		TokenDetailsMaxTokens: projectedConversationMaxTokens,
+		Entries: []HistoryEntry{
+			{Seq: 1, TurnSeq: 1, RequestID: "request-1", Role: "user", Kind: "user_message", Payload: userPayload},
+			newAssistantTextEntry(1, "request-1", "parent answer", "", ""),
+		},
+	}
+
+	projection, err := NewHistoryProjector().ProjectCheckpointProjection(conversation)
+	if err != nil {
+		t.Fatalf("ProjectCheckpointProjection() error = %v", err)
+	}
+	state := projection.State
+	if len(state.GetTurns()) != 1 {
+		t.Fatalf("ProjectCheckpointProjection() turns = %d, want 1 Blob-backed turn", len(state.GetTurns()))
+	}
+	blobs := make(map[string][]byte, len(projection.Blobs))
+	for _, blob := range projection.Blobs {
+		digest := sha256.Sum256(blob.Data)
+		if len(blob.ID) != sha256.Size || string(blob.ID) != string(digest[:]) {
+			t.Fatalf("invalid content-addressed Blob id=%x", blob.ID)
+		}
+		blobs[string(blob.ID)] = blob.Data
+	}
+	turnPayload, ok := blobs[string(state.GetTurns()[0])]
+	if !ok {
+		t.Fatal("turn references a missing Blob")
+	}
+	turn := &agentv1.ConversationTurnStructure{}
+	if err := proto.Unmarshal(turnPayload, turn); err != nil {
+		t.Fatalf("decode turn Blob: %v", err)
+	}
+	agentTurn := turn.GetAgentConversationTurn()
+	if agentTurn == nil {
+		t.Fatal("turn Blob does not contain an agent turn")
+	}
+	if _, ok := blobs[string(agentTurn.GetUserMessage())]; !ok {
+		t.Fatal("turn references a missing user message Blob")
+	}
+	for _, stepID := range agentTurn.GetSteps() {
+		if _, ok := blobs[string(stepID)]; !ok {
+			t.Fatal("turn references a missing step Blob")
+		}
+	}
+
+	messages, err := importedConversationStateModelMessages(state)
+	if err != nil {
+		t.Fatalf("importedConversationStateModelMessages() error = %v", err)
+	}
+	if len(messages) != 2 {
+		t.Fatalf("imported messages = %d, want parent user and assistant context", len(messages))
+	}
+	if messages[0].Role != "user" || !strings.Contains(messages[0].Content, "parent question") {
+		t.Fatalf("first imported message = %#v", messages[0])
+	}
+	if messages[1].Role != "assistant" || messages[1].Content != "parent answer" {
+		t.Fatalf("second imported message = %#v", messages[1])
+	}
+}
+
+func TestProjectCheckpointProjectionKeepsForkPointIsolatedFromLaterHistory(t *testing.T) {
+	firstUser, err := protojson.Marshal(&agentv1.UserMessage{Text: "first question", MessageId: "message-1"})
+	if err != nil {
+		t.Fatalf("marshal first user message: %v", err)
+	}
+	conversation := &ConversationFile{
+		ConversationID:        "conversation-1",
+		RootConversationID:    "conversation-1",
+		Mode:                  "agent",
+		NextTurnSeq:           2,
+		NextEntrySeq:          3,
+		TokenDetailsMaxTokens: projectedConversationMaxTokens,
+		Entries: []HistoryEntry{
+			{Seq: 1, TurnSeq: 1, RequestID: "request-1", Role: "user", Kind: "user_message", Payload: firstUser},
+			newAssistantTextEntry(1, "request-1", "first answer", "", ""),
+		},
+	}
+	projector := NewHistoryProjector()
+	midpoint, err := projector.ProjectCheckpointProjection(conversation)
+	if err != nil {
+		t.Fatalf("midpoint projection: %v", err)
+	}
+
+	secondUser, err := protojson.Marshal(&agentv1.UserMessage{Text: "second question", MessageId: "message-2"})
+	if err != nil {
+		t.Fatalf("marshal second user message: %v", err)
+	}
+	appendEntriesInPlace(conversation, []HistoryEntry{
+		{TurnSeq: 2, RequestID: "request-2", Role: "user", Kind: "user_message", Payload: secondUser},
+		newAssistantTextEntry(2, "request-2", "second answer", "", ""),
+	})
+	latest, err := projector.ProjectCheckpointProjection(conversation)
+	if err != nil {
+		t.Fatalf("latest projection: %v", err)
+	}
+
+	midpointMessages, err := importedConversationStateModelMessages(midpoint.State)
+	if err != nil {
+		t.Fatalf("import midpoint messages: %v", err)
+	}
+	latestMessages, err := importedConversationStateModelMessages(latest.State)
+	if err != nil {
+		t.Fatalf("import latest messages: %v", err)
+	}
+	if len(midpoint.State.GetTurns()) != 1 || len(midpointMessages) != 2 {
+		t.Fatalf("midpoint turns=%d messages=%d, want 1 turn and 2 messages", len(midpoint.State.GetTurns()), len(midpointMessages))
+	}
+	if len(latest.State.GetTurns()) != 2 || len(latestMessages) != 4 {
+		t.Fatalf("latest turns=%d messages=%d, want 2 turns and 4 messages", len(latest.State.GetTurns()), len(latestMessages))
+	}
+	if midpointMessages[1].Content != "first answer" || latestMessages[3].Content != "second answer" {
+		t.Fatalf("fork snapshots are not isolated: midpoint=%#v latest=%#v", midpointMessages, latestMessages)
+	}
+}
@@ -858,9 +858,7 @@ func (service *Service) handleCancelIntent(intent InboundIntent) error {
 		})
 	}
 	if hasCheckpoint {
-		if err := service.publishCheckpoint(stream.RequestID, stream.ConversationID); err != nil {
-			return err
-		}
+		service.discardPendingCheckpoint(stream, "checkpoint superseded by cancellation")
 	}
 	clearPendingProviderCompletion(stream)
 	stream.mu.Lock()
@@ -2122,9 +2120,15 @@ func (service *Service) completeSuccessfulTurn(stream *ActiveStream, completion
 			err,
 		)
 	}
-	if err := service.publishCheckpoint(requestID, conversationID); err != nil {
-		return err
+	return service.publishCheckpointWithCompletion(requestID, conversationID, &completion)
+}
+
+func (service *Service) finishSuccessfulTurnAfterCheckpoint(stream *ActiveStream, completion pendingTurnCompletion) error {
+	if stream == nil {
+		return nil
 	}
+	requestID := firstNonEmpty(strings.TrimSpace(completion.RequestID), strings.TrimSpace(stream.RequestID))
+	usage := completion.Usage
 	if err := service.broker.Publish(requestID, StreamEvent{
 		Message: buildTurnEndedMessage(usage.InputTokens, usage.OutputTokens, usage.CacheReadTokens, usage.CacheWriteTokens),
 	}); err != nil {
@@ -2151,7 +2155,11 @@ func (service *Service) failStreamIfNonTerminal(stream *ActiveStream, terminalCo
 }

 // publishCheckpoint 按当前内存会话镜像投影出 checkpoint，并广播给所有 RunSSE 订阅者。
-func (service *Service) publishCheckpoint(requestID string, _ string) error {
+func (service *Service) publishCheckpoint(requestID string, conversationID string) error {
+	return service.publishCheckpointWithCompletion(requestID, conversationID, nil)
+}
+
+func (service *Service) publishCheckpointWithCompletion(requestID string, _ string, completion *pendingTurnCompletion) error {
 	stream, ok := service.broker.Get(requestID)
 	if !ok || stream == nil {
 		return fmt.Errorf("request is not active: %s", requestID)
@@ -2160,15 +2168,16 @@ func (service *Service) publishCheckpoint(requestID string, _ string) error {
 	if err != nil {
 		return err
 	}
-	state, err := service.projector.ProjectLegacyCheckpoint(conversation)
+	projection, err := service.projector.ProjectCheckpointProjection(conversation)
 	if err != nil {
 		return err
 	}
-	state.PendingToolCalls = buildPendingToolCalls(pendingExecs, pendingInteractions)
-	service.rewriteCheckpointTokenDetailsForClient(stream, conversation, state)
-	return service.broker.Publish(requestID, StreamEvent{
-		Message: buildCheckpointMessage(state),
-	})
+	if projection == nil || projection.State == nil {
+		return fmt.Errorf("checkpoint projection is empty")
+	}
+	projection.State.PendingToolCalls = buildPendingToolCalls(pendingExecs, pendingInteractions)
+	service.rewriteCheckpointTokenDetailsForClient(stream, conversation, projection.State)
+	return service.queueCheckpointProjection(stream, projection, completion)
 }

 func (service *Service) rewriteCheckpointTokenDetailsForClient(stream *ActiveStream, conversation *ConversationFile, state *agentv1.ConversationStateStructure) {
@@ -163,6 +163,10 @@ type ActiveStream struct {
 	ProviderUsage                               turnUsageSnapshot
 	ProviderTerminalToolInvocation              bool
 	PendingCompaction                           *PendingCompaction
+	PendingCheckpointBlobWrites                 map[uint32]string
+	ConfirmedCheckpointBlobs                    map[string]struct{}
+	NextCheckpointBlobRequestID                 uint32
+	PendingCheckpoint                           *pendingCheckpointPublish

 	Backlog                     []StreamEvent
 	Subscribers                 map[string]*StreamSubscriber
@@ -219,6 +223,12 @@ type pendingTurnCompletion struct {
 	Disposition    pendingCompletionDisposition
 }

+type pendingCheckpointPublish struct {
+	State      *agentv1.ConversationStateStructure
+	Required   map[string]struct{}
+	Completion *pendingTurnCompletion
+}
+
 type PendingCompaction struct {
 	Trigger                   string
 	ContextTokens             int64
@@ -101,28 +101,24 @@ func SetStrictMode(enabled bool) {
 var activeDiagnostics *extractionDiagnostics

 var (
-	noRe                 = regexp.MustCompile(`(?:^|[,{]\s*)no:\s*(\d+)`)
-	nameRe               = regexp.MustCompile(`(?:^|[,{]\s*)name:\s*["']([^"']+)["']`)
-	kindRe               = regexp.MustCompile(`(?:^|[,{]\s*)kind:\s*["']([^"']+)["']`)
-	enumTypeRe           = regexp.MustCompile(`[,\s]T:\s*[\w$.]+\.getEnumType\s*\(\s*([\w$.]+)\s*\)`)
-	tRe                  = regexp.MustCompile(`[,\s]T:\s*([\w$.]+)`)
-	oneofRe              = regexp.MustCompile(`oneof:\s*["']([^"']+)["']`)
-	repeatedRe           = regexp.MustCompile(`repeated:\s*(!0|true)`)
-	optRe                = regexp.MustCompile(`opt:\s*(!0|true)`)
-	keyRe                = regexp.MustCompile(`[,\s]K:\s*(\d+)`)
-	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*;`)
+	noRe          = regexp.MustCompile(`(?:^|[,{]\s*)no:\s*(\d+)`)
+	nameRe        = regexp.MustCompile(`(?:^|[,{]\s*)name:\s*["']([^"']+)["']`)
+	kindRe        = regexp.MustCompile(`(?:^|[,{]\s*)kind:\s*["']([^"']+)["']`)
+	enumTypeRe    = regexp.MustCompile(`[,\s]T:\s*[\w$.]+\.getEnumType\s*\(\s*([\w$.]+)\s*\)`)
+	tRe           = regexp.MustCompile(`[,\s]T:\s*([\w$.]+)`)
+	oneofRe       = regexp.MustCompile(`oneof:\s*["']([^"']+)["']`)
+	repeatedRe    = regexp.MustCompile(`repeated:\s*(!0|true)`)
+	optRe         = regexp.MustCompile(`opt:\s*(!0|true)`)
+	keyRe         = regexp.MustCompile(`[,\s]K:\s*(\d+)`)
+	mapValueRe    = regexp.MustCompile(`V:\s*\{([^}]*)\}`)
+	mapValueKRe   = regexp.MustCompile(`(?:^|[,{]\s*)kind:\s*["'](\w+)["']`)
+	mapValueTRe   = regexp.MustCompile(`[,\s]T:\s*([\w$.]+)`)
+	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*(?:[,;])`)
+	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*;`)
 )

 type Field struct {
@@ -189,18 +185,13 @@ type symbolDef struct {
 }

 type TypeResolver struct {
-	bySymbol      map[string][]symbolDef
-	byAlias       map[string][]symbolDef
-	byShort       map[string][]symbolDef
-	moduleImports map[int]map[string]int
+	bySymbol map[string][]symbolDef
+	byShort  map[string][]symbolDef
 }

-type aliasIndex map[int]map[string][]string
-
-func newTypeResolver(messages []Message, enums []Enum, aliases aliasIndex, exportAliases aliasIndex) *TypeResolver {
+func newTypeResolver(messages []Message, enums []Enum, aliases map[string][]string) *TypeResolver {
 	resolver := &TypeResolver{
 		bySymbol: make(map[string][]symbolDef),
-		byAlias:  make(map[string][]symbolDef),
 		byShort:  make(map[string][]symbolDef),
 	}

@@ -227,64 +218,43 @@ func newTypeResolver(messages []Message, enums []Enum, aliases aliasIndex, expor
 			}
 		}
 	}
-	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.ModuleStart], msg.VarName, msg.InternalName) {
-			addAlias(alias, 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 _, enum := range enums {
 		add(enum.VarName, 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")
+		for _, alias := range aliasesForSymbols(aliases, enum.VarName) {
+			add(alias, enum.TypeName, enum.Pos, enum.ModuleStart, "enum")
 		}
 	}

 	return resolver
 }

-func buildAliasIndex(text string, moduleStarts []int) aliasIndex {
-	matches := varAliasRe.FindAllStringSubmatchIndex(text, -1)
-	directByModule := make(map[int]map[string]string)
+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))
 	for _, match := range matches {
-		alias := strings.TrimSpace(text[match[2]:match[3]])
-		target := strings.TrimSpace(text[match[4]:match[5]])
+		alias := strings.TrimSpace(match[1])
+		target := strings.TrimSpace(match[2])
 		if alias == "" || target == "" || alias == target {
 			continue
 		}
-		moduleStart := moduleStartForPos(moduleStarts, match[0])
-		if directByModule[moduleStart] == nil {
-			directByModule[moduleStart] = make(map[string]string)
-		}
-		directByModule[moduleStart][alias] = target
+		direct[alias] = target
 	}

-	resolveRoot := func(direct map[string]string, symbol string) string {
+	resolveRoot := func(symbol string) string {
 		seen := make(map[string]bool)
 		current := symbol
 		for {
@@ -300,90 +270,16 @@ func buildAliasIndex(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
-	}
-
-	for moduleStart, direct := range directByModule {
-		for alias := range direct {
-			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 {
+	aliases := make(map[string][]string)
+	for alias := range direct {
+		root := resolveRoot(alias)
+		if root == alias {
 			continue
 		}
-		block := text[blockStart:blockEnd]
-		for _, entry := range webpackExportEntryRe.FindAllStringSubmatch(block, -1) {
-			addAlias(moduleStart, entry[2], entry[1])
-		}
+		aliases[root] = append(aliases[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])
-		}
+	for root := range aliases {
+		sort.Strings(aliases[root])
 	}
 	return aliases
 }
@@ -422,10 +318,11 @@ func pickBestDefinition(candidates []symbolDef, contextPos int, contextModuleSta
 	}

 	filtered := candidates
-	if strings.TrimSpace(expectedKind) != "" {
+	if strings.TrimSpace(preferredPkg) != "" {
 		tmp := make([]symbolDef, 0, len(candidates))
 		for _, item := range candidates {
-			if item.Kind == expectedKind {
+			pkg, _ := parseTypeName(item.TypeName)
+			if pkg == preferredPkg {
 				tmp = append(tmp, item)
 			}
 		}
@@ -434,11 +331,10 @@ func pickBestDefinition(candidates []symbolDef, contextPos int, contextModuleSta
 		}
 	}

-	if strings.TrimSpace(preferredPkg) != "" {
+	if strings.TrimSpace(expectedKind) != "" {
 		tmp := make([]symbolDef, 0, len(filtered))
 		for _, item := range filtered {
-			pkg, _ := parseTypeName(item.TypeName)
-			if pkg == preferredPkg {
+			if item.Kind == expectedKind {
 				tmp = append(tmp, item)
 			}
 		}
@@ -520,17 +416,6 @@ 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 {
@@ -550,30 +435,17 @@ 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
 		}
@@ -601,7 +473,7 @@ func absInt(value int) int {
 	return value
 }

-var moduleStartRe = regexp.MustCompile(`(?:^|,)\s*(\d+)\s*:\s*(?:function\s*\(\s*[\w$,\s]*\s*\)|\(\s*[\w$,\s]*\s*\)\s*=>)\s*\{`)
+var moduleStartRe = regexp.MustCompile(`(?:^|,)(\d+):(?:function\([\w$,]*\)|\([\w$,]*\)=>)\{`)

 func buildModuleStarts(text string) []int {
 	matches := moduleStartRe.FindAllStringSubmatchIndex(text, -1)
@@ -625,38 +497,6 @@ 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()
@@ -672,8 +512,7 @@ func ExtractProtos(inputFile, outputDir string) {

 	text := string(content)
 	moduleStarts := buildModuleStarts(text)
-	aliases := buildAliasIndex(text, moduleStarts)
-	exportAliases := buildWebpackExportAliasIndex(text, moduleStarts)
+	aliases := buildAliasIndex(text)

 	// Extract messages, enums, and services
 	messages := extractMessages(text, moduleStarts)
@@ -685,8 +524,7 @@ func ExtractProtos(inputFile, outputDir string) {
 		}
 	}

-	resolver := newTypeResolver(messages, enums, aliases, exportAliases)
-	resolver.moduleImports = buildModuleImportIndex(text, moduleStarts)
+	resolver := newTypeResolver(messages, enums, aliases)

 	// Generate proto files
 	generateProtos(messages, enums, services, resolver, outputDir)
@@ -1062,8 +900,6 @@ func parseFieldObject(obj string) (*Field, error) {
 			} else {
 				field.T = tMatch[1]
 			}
-		} else if shorthandTRe.MatchString(obj) {
-			field.T = "T"
 		}
 	}

@@ -1359,9 +1195,8 @@ 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, preferredPkg, msg.Pos, msg.ModuleStart, resolver, neededTypes, localTypes)
+				collectFieldRefsSimple(f, pkgName, msg.Pos, msg.ModuleStart, resolver, neededTypes, localTypes)
 			}
 		}
 		for _, svc := range result.services {
@@ -1433,7 +1268,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, preferredPkg string, contextPos int, contextModuleStart int, resolver *TypeResolver,
+func collectFieldRefsSimple(f Field, currentPkg string, contextPos int, contextModuleStart int, resolver *TypeResolver,
 	neededTypes map[string]bool, localTypes map[string]bool) {

 	type refWithKind struct {
@@ -1454,7 +1289,7 @@ func collectFieldRefsSimple(f Field, currentPkg string, preferredPkg string, con
 	}

 	for _, item := range refs {
-		typeName, ok := resolver.ResolveTypeName(item.ref, contextPos, contextModuleStart, preferredPkg, item.kind)
+		typeName, ok := resolver.ResolveTypeName(item.ref, contextPos, contextModuleStart, currentPkg, item.kind)
 		if !ok {
 			continue
 		}
@@ -1802,7 +1637,6 @@ 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)
@@ -1818,7 +1652,7 @@ func writeMessageFields(msg *Message, sb *strings.Builder, resolver *TypeResolve

 	// Write regular fields
 	for _, f := range regularFields {
-		fieldType := resolveFieldTypeWithPkg(f, resolver, msgPath, currentPkg, preferredPkg, msg.Pos, msg.ModuleStart)
+		fieldType := resolveFieldTypeWithPkg(f, resolver, msgPath, currentPkg, msg.Pos, msg.ModuleStart)
 		prefix := ""
 		if f.Repeated {
 			prefix = "repeated "
@@ -1839,7 +1673,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, preferredPkg, msg.Pos, msg.ModuleStart)
+			fieldType := resolveFieldTypeWithPkg(f, resolver, msgPath, currentPkg, 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))
@@ -1887,15 +1721,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, preferredPkg string, contextPos int, contextModuleStart int) string {
+func resolveFieldTypeWithPkg(f Field, resolver *TypeResolver, parentPath string, currentPkg string, contextPos int, contextModuleStart int) string {
 	resolveNamedType := func(ref string, expectedKind string) string {
-		typeName, ok := resolver.ResolveTypeName(ref, contextPos, contextModuleStart, preferredPkg, expectedKind)
+		typeName, ok := resolver.ResolveTypeName(ref, contextPos, contextModuleStart, currentPkg, expectedKind)
 		if !ok {
 			activeDiagnostics.addUnresolvedType(expectedKind + ":" + ref)
 			return fallbackTypeToken(ref)
@@ -1,72 +0,0 @@
-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)
-	}
-}
@@ -0,0 +1,2 @@
+src/proto/**
+media/index.js
@@ -0,0 +1 @@
+{"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"}}
@@ -0,0 +1 @@
+{"displayName":"Cursor Always Local","description":"Experimentation @ cursor.sh"}
@@ -0,0 +1 @@
+{"$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}
@@ -0,0 +1,15 @@
+#!/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
@@ -0,0 +1,29 @@
+#!/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
+)
@@ -2,8 +2,22 @@
 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"
-INPUT_DEFAULT="$INSTALLED_CURSOR_DEFAULT"
+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}"
@@ -43,8 +57,7 @@ fi

 if [[ ! -f "$INPUT_PATH" ]]; then
  echo "Input JS not found: $INPUT_PATH" >&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
+  echo "Usage: $0 [input-js-file-or-extensions-dir] [output-dir]" >&2
  exit 1
 fi

@@ -1,809 +0,0 @@
-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;
-}
-
@@ -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: Mn)
+// Copied from: local:internapi.v1.BlobData (var: hxe)
 message BlobData {
  BlobType blob_type = 1;
  bytes blob_id = 2;
@@ -14,12 +14,12 @@ message BlobData {
  }
 }

-// Copied from: local:internapi.v1.BlobDataPerMessage (var: Ln)
+// Copied from: local:internapi.v1.BlobDataPerMessage (var: Txe)
 message BlobDataPerMessage {
  repeated BlobData blob_data = 1;
 }

-// Copied from: local:internapi.v1.BlobType (var: Nn)
+// Copied from: local:internapi.v1.BlobType (var: Axe)
 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: bn)
+// Copied from: local:internapi.v1.ImageBlobData (var: pxe)
 message ImageBlobData {
  string mime_type = 1;
 }
@@ -9,4 +9,5 @@ Tg群组:
 https://t.me/cursor_byok

 - 支持cursor-cli
+- 修复对话中错误可能导致的消失问题
Author	SHA1	Message	Date
leookun	d3adfffbd8	Implement checkpoint blob handling in forwarder service - Added support for checkpointing phases and blob management in the forwarder. - Introduced new types and methods for handling checkpoint blobs, including queuing and publishing checkpoints. - Enhanced the projector to build checkpoint projections with content-addressed blobs. - Implemented tests to ensure proper checkpoint blob synchronization and handling of cancellation scenarios.	2026-08-05 02:09:45 +08:00
leookun	4e9335d82f	Implement tests for ProjectLegacyCheckpoint to ensure proper handling of conversation state and message imports. This includes verifying that no dangling inline blobs are present and that the correct user and assistant messages are imported.	2026-08-05 01:46:47 +08:00
leokunandGitHub	374ff9c217	Merge pull request #259 from leookun/release/0.0.45 Release/0.0.45	2026-08-05 01:26:22 +08:00
leookun	06ab0d8dae	chore(release): update version to 0.0.45 and fix conversation disappearance issue - Updated version number to 0.0.45 across all relevant files. - Fixed an issue that could cause conversations to disappear.	2026-08-05 01:25:39 +08:00
				`@@ -0,0 +1 @@`
				{"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"}}
				`@@ -0,0 +1 @@`
				`{"displayName":"Cursor Always Local","description":"Experimentation @ cursor.sh"}`
				`@@ -0,0 +1 @@`
				{"$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}