Ð޸´ȫÏîĿÉó²éÎÊÌⲢ·¢²¼ v1.1.9

¸ÄÓñ¾»ú¶ÀÁ¢ CA£¬»ָ´ CLI TLS УÑ飬±£»¤ƾ¾ÝÓëÅäÖò¢·¢±£´档
Ð޸´ Cursor Êý¾ݡ¢»Ự·¾¶¡¢´úÀíÉúÃüÖÜÆڡ¢ģÐÍÇëÇóÓë Skills Îļþ²Ù×÷¡£
Ϊ¶ÀÁ¢ Tab ·þÎñÔö¼ӿͻ§¶˼øȨ£¬Éý¼¶ÒÀÀµÓ빤¾ßÁ´£¬ÍêÉƷ¢²¼ԪÐÅϢͬ²½¡£

Ñé֤£ºÁ½¸ö Go ģ¿éµIJâÊÔ/vet¡¢¹ؼüģ¿é race¡¢ǰ¶˲âÊÔ/Éú²ú¹¹½¨/Éó¼ơ¢
Go ¿ɴ勇´ɨÃèÓë macOS/Linux ¿ÉÐÐģ¿齻²æ±àÒë¾ùͨ¹ý¡£
Windows ¸ôÀëÆô¶¯ͨ¹ý£»δÍê³ɵĵã»÷ðÑ̺ÍԭÉúƽ̨Ñé֤¼ûÉó²鱨¸档

internal/backend/agent/bridge/interaction/bridge.go

@@ -5,6 +5,7 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
+	"google.golang.org/protobuf/proto"
 	"html"
 	"io"
 	"mime"
@@ -325,7 +326,7 @@ func (bridge *Bridge) openSwitchMode(toolCall runtimecore.ToolInvocation) (*agen
 			},
 		},
 	}
-	argsPayload, _ := json.Marshal(args)
+	argsPayload, _ := json.Marshal(&args)
 	return serverMessage, runtimecore.PendingInteraction{
 		InteractionID:   fmt.Sprintf("%d", messageID),
 		ArgsJSON:        argsPayload,
@@ -679,7 +680,7 @@ func truncateWebSearchReplay(searchTerm string, references []*agentv1.WebSearchR
 		if reference == nil {
 			continue
 		}
-		next := *reference
+		next := proto.Clone(reference).(*agentv1.WebSearchReference)
 		title := truncateInteractionText("WebSearch title", next.GetTitle(), webSearchTitleLimit)
 		chunk := truncateInteractionText("WebSearch snippet", next.GetChunk(), webSearchChunkLimit)
 		if title != next.GetTitle() || chunk != next.GetChunk() {
@@ -687,7 +688,7 @@ func truncateWebSearchReplay(searchTerm string, references []*agentv1.WebSearchR
 		}
 		next.Title = title
 		next.Chunk = chunk
-		nextReferences = append(nextReferences, &next)
+		nextReferences = append(nextReferences, next)
 	}
 	nextPayload := formatWebSearchPayload(searchTerm, nextReferences)
 	if strings.TrimSpace(payload) != "" && len(nextPayload) == 0 {

internal/backend/agent/model/http_integration_test.go

@@ -0,0 +1,94 @@
+package modeladapter
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"io"
+	"net/http"
+	"net/http/httptest"
+	"strings"
+	"testing"
+	"time"
+)
+
+func TestProvidersForwardAuthenticationOverridesAndFinishStream(t *testing.T) {
+	for _, provider := range []string{"openai", "anthropic"} {
+		t.Run(provider, func(t *testing.T) {
+			server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+				if r.Header.Get("X-Gateway-Key") != "fixture-gateway" || r.Host != "gateway.fixture" {
+					t.Error("custom headers not applied")
+				}
+				if provider == "openai" && r.Header.Get("Authorization") != "Bearer fixture-key" {
+					t.Error("OpenAI authentication missing")
+				}
+				if provider == "anthropic" && r.Header.Get("x-api-key") != "fixture-key" {
+					t.Error("Anthropic authentication missing")
+				}
+				var body map[string]any
+				if err := json.NewDecoder(r.Body).Decode(&body); err != nil {
+					t.Error(err)
+				}
+				if body["model"] != "fixture-model" {
+					t.Error("model mapping lost")
+				}
+				w.Header().Set("Content-Type", "text/event-stream")
+				if provider == "openai" {
+					fmt.Fprint(w, "data: {\"choices\":[{\"delta\":{\"content\":\"ok\"},\"finish_reason\":null}]}\n\ndata: {\"choices\":[{\"delta\":{},\"finish_reason\":\"stop\"}],\"usage\":{\"prompt_tokens\":1,\"completion_tokens\":1}}\n\ndata: [DONE]\n\n")
+				} else {
+					for _, event := range []string{`{"type":"message_start","message":{"id":"fixture","type":"message","role":"assistant","content":[],"model":"fixture-model","usage":{"input_tokens":1,"output_tokens":0}}}`, `{"type":"content_block_start","index":0,"content_block":{"type":"text","text":""}}`, `{"type":"content_block_delta","index":0,"delta":{"type":"text_delta","text":"ok"}}`, `{"type":"content_block_stop","index":0}`, `{"type":"message_delta","delta":{"stop_reason":"end_turn","stop_sequence":null},"usage":{"output_tokens":1}}`, `{"type":"message_stop"}`} {
+						var envelope struct {
+							Type string `json:"type"`
+						}
+						_ = json.Unmarshal([]byte(event), &envelope)
+						fmt.Fprintf(w, "event: %s\ndata: %s\n\n", envelope.Type, event)
+					}
+				}
+			}))
+			defer server.Close()
+			req := StreamRequest{BaseURL: server.URL, APIKey: "fixture-key", ProviderModelID: "fixture-model", ModelID: "fixture-model", OpenAIEndpoint: "/v1/chat/completions", Messages: []Message{{Role: "user", Content: "hello"}}, MaxTokens: 32, Stream: true, CustomHeadersEnabled: true, CustomHeadersJSON: `{"X-Gateway-Key":"fixture-gateway","Host":"gateway.fixture"}`}
+			var text strings.Builder
+			finished := false
+			sink := func(event ModelEvent) error {
+				if event.Kind == ModelEventKindTextDelta {
+					text.WriteString(event.Text)
+				}
+				if event.Kind == ModelEventKindTurnFinished {
+					finished = true
+				}
+				return nil
+			}
+			ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
+			defer cancel()
+			var err error
+			if provider == "openai" {
+				adapter := NewOpenAIAdapter()
+				adapter.client = server.Client()
+				err = adapter.Stream(ctx, req, sink)
+			} else {
+				adapter := NewAnthropicAdapter()
+				adapter.client = server.Client()
+				err = adapter.Stream(ctx, req, sink)
+			}
+			if err != nil {
+				t.Fatal(err)
+			}
+			if text.String() != "ok" || !finished {
+				t.Fatalf("stream did not finish correctly: %q %t", text.String(), finished)
+			}
+		})
+	}
+}
+
+func TestProviderDeadlineCancelsPendingHTTPResponse(t *testing.T) {
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { _, _ = io.Copy(io.Discard, r.Body); <-r.Context().Done() }))
+	defer server.Close()
+	ctx, cancel := context.WithTimeout(context.Background(), 25*time.Millisecond)
+	defer cancel()
+	_, err := DoProviderRequestWithRetry(ctx, server.Client(), "fixture", "", "", func(ctx context.Context) (*http.Request, error) {
+		return http.NewRequestWithContext(ctx, http.MethodPost, server.URL, strings.NewReader("fixture"))
+	})
+	if err == nil || ctx.Err() == nil {
+		t.Fatal("provider ignored cancellation")
+	}
+}

internal/backend/agent/model/request_override.go

@@ -85,7 +85,11 @@ func ApplyCustomHeaders(httpReq *http.Request, enabled bool, headersJSON string)
 		if name == "" {
 			continue
 		}
-		httpReq.Header.Set(name, value)
+		if strings.EqualFold(name, "Host") {
+			httpReq.Host = value
+		} else {
+			httpReq.Header.Set(name, value)
+		}
 	}
 	return nil
 }

internal/backend/agent/model/retry.go

@@ -3,6 +3,7 @@ package modeladapter
 
 import (
 	"context"
+	"cursor/internal/netproxy"
 	"net/http"
 )
 
@@ -33,7 +34,7 @@ func doProviderRequestWithRetry(
 	if err != nil {
 		return nil, err
 	}
-	resp, err := client.Do(httpReq)
+	resp, err := netproxy.CredentialSafeClient(client).Do(httpReq)
 	if err != nil {
 		if resp != nil && resp.Body != nil {
 			_ = resp.Body.Close()