diff --git a/backend/internal/handler/admin/usage_handler.go b/backend/internal/handler/admin/usage_handler.go index ad336b3e..c7b983f1 100644 --- a/backend/internal/handler/admin/usage_handler.go +++ b/backend/internal/handler/admin/usage_handler.go @@ -144,7 +144,7 @@ func (h *UsageHandler) List(c *gin.Context) { out := make([]dto.UsageLog, 0, len(records)) for i := range records { - out = append(out, *dto.UsageLogFromService(&records[i])) + out = append(out, *dto.UsageLogFromServiceAdmin(&records[i])) } response.Paginated(c, out, result.Total, page, pageSize) } diff --git a/backend/internal/handler/dto/mappers.go b/backend/internal/handler/dto/mappers.go index 764a4132..bf15e9dc 100644 --- a/backend/internal/handler/dto/mappers.go +++ b/backend/internal/handler/dto/mappers.go @@ -234,7 +234,21 @@ func RedeemCodeFromService(rc *service.RedeemCode) *RedeemCode { } } -func UsageLogFromService(l *service.UsageLog) *UsageLog { +// AccountSummaryFromService returns a minimal AccountSummary for usage log display. +// Only includes ID and Name - no sensitive fields like Credentials, Proxy, etc. +func AccountSummaryFromService(a *service.Account) *AccountSummary { + if a == nil { + return nil + } + return &AccountSummary{ + ID: a.ID, + Name: a.Name, + } +} + +// usageLogFromServiceBase is a helper that converts service UsageLog to DTO. +// The account parameter allows caller to control what Account info is included. +func usageLogFromServiceBase(l *service.UsageLog, account *AccountSummary) *UsageLog { if l == nil { return nil } @@ -269,12 +283,27 @@ func UsageLogFromService(l *service.UsageLog) *UsageLog { CreatedAt: l.CreatedAt, User: UserFromServiceShallow(l.User), APIKey: APIKeyFromService(l.APIKey), - Account: AccountFromService(l.Account), + Account: account, Group: GroupFromServiceShallow(l.Group), Subscription: UserSubscriptionFromService(l.Subscription), } } +// UsageLogFromService converts a service UsageLog to DTO for regular users. +// It excludes Account details - users should not see account information. +func UsageLogFromService(l *service.UsageLog) *UsageLog { + return usageLogFromServiceBase(l, nil) +} + +// UsageLogFromServiceAdmin converts a service UsageLog to DTO for admin users. +// It includes minimal Account info (ID, Name only). +func UsageLogFromServiceAdmin(l *service.UsageLog) *UsageLog { + if l == nil { + return nil + } + return usageLogFromServiceBase(l, AccountSummaryFromService(l.Account)) +} + func SettingFromService(s *service.Setting) *Setting { if s == nil { return nil diff --git a/backend/internal/handler/dto/types.go b/backend/internal/handler/dto/types.go index a11662fe..bb953fae 100644 --- a/backend/internal/handler/dto/types.go +++ b/backend/internal/handler/dto/types.go @@ -184,11 +184,18 @@ type UsageLog struct { User *User `json:"user,omitempty"` APIKey *APIKey `json:"api_key,omitempty"` - Account *Account `json:"account,omitempty"` + Account *AccountSummary `json:"account,omitempty"` // Use minimal AccountSummary to prevent data leakage Group *Group `json:"group,omitempty"` Subscription *UserSubscription `json:"subscription,omitempty"` } +// AccountSummary is a minimal account info for usage log display. +// It intentionally excludes sensitive fields like Credentials, Proxy, etc. +type AccountSummary struct { + ID int64 `json:"id"` + Name string `json:"name"` +} + type Setting struct { ID int64 `json:"id"` Key string `json:"key"` diff --git a/backend/internal/pkg/antigravity/client.go b/backend/internal/pkg/antigravity/client.go index 32e8e4c1..8ff75f57 100644 --- a/backend/internal/pkg/antigravity/client.go +++ b/backend/internal/pkg/antigravity/client.go @@ -7,28 +7,53 @@ import ( "encoding/json" "fmt" "io" - "log" "net/http" "net/url" "strings" "time" ) +// resolveHost 从 URL 解析 host +func resolveHost(urlStr string) string { + parsed, err := url.Parse(urlStr) + if err != nil { + return "" + } + return parsed.Host +} + // NewAPIRequest 创建 Antigravity API 请求（v1internal 端点） func NewAPIRequest(ctx context.Context, action, accessToken string, body []byte) (*http.Request, error) { + // 构建 URL，流式请求添加 ?alt=sse 参数 apiURL := fmt.Sprintf("%s/v1internal:%s", BaseURL, action) + isStream := action == "streamGenerateContent" + if isStream { + apiURL += "?alt=sse" + } + req, err := http.NewRequestWithContext(ctx, http.MethodPost, apiURL, bytes.NewReader(body)) if err != nil { return nil, err } + + // 基础 Headers req.Header.Set("Content-Type", "application/json") req.Header.Set("Authorization", "Bearer "+accessToken) req.Header.Set("User-Agent", UserAgent) - req.Header.Set("requestType", "agent") - // 打印完整 HTTP 请求 - log.Printf("[NewAPIRequest] POST %s\nHeaders: Content-Type=%s, Authorization=Bearer %s..., requestType=%s, User-Agent=%s\nBody: %s", - apiURL, req.Header.Get("Content-Type"), accessToken[:20], req.Header.Get("requestType"), req.Header.Get("User-Agent"), string(body)) + // Accept Header 根据请求类型设置 + if isStream { + req.Header.Set("Accept", "text/event-stream") + } else { + req.Header.Set("Accept", "application/json") + } + + // 显式设置 Host Header + if host := resolveHost(apiURL); host != "" { + req.Host = host + } + + // 注意：requestType 已在 JSON body 的 V1InternalRequest 中设置，不需要 HTTP Header return req, nil } diff --git a/backend/internal/pkg/antigravity/oauth.go b/backend/internal/pkg/antigravity/oauth.go index bdc018f2..e88c203b 100644 --- a/backend/internal/pkg/antigravity/oauth.go +++ b/backend/internal/pkg/antigravity/oauth.go @@ -33,10 +33,11 @@ const ( "https://www.googleapis.com/auth/experimentsandconfigs" // API 端点 - BaseURL = "https://cloudcode-pa.googleapis.com" + // 优先使用 sandbox daily URL，配额更宽松 + BaseURL = "https://daily-cloudcode-pa.sandbox.googleapis.com" - // User-Agent - UserAgent = "antigravity/1.11.9 windows/amd64" + // User-Agent（模拟官方客户端） + UserAgent = "antigravity/1.104.0 darwin/arm64" // Session 过期时间 SessionTTL = 30 * time.Minute diff --git a/backend/internal/pkg/antigravity/request_transformer.go b/backend/internal/pkg/antigravity/request_transformer.go index ce199cee..4ccb7d12 100644 --- a/backend/internal/pkg/antigravity/request_transformer.go +++ b/backend/internal/pkg/antigravity/request_transformer.go @@ -1,16 +1,46 @@ package antigravity import ( + "crypto/sha256" + "encoding/binary" "encoding/json" "fmt" "log" + "math/rand" "os" + "strconv" "strings" "sync" + "time" "github.com/gin-gonic/gin" + "github.com/google/uuid" ) +var ( + sessionRand = rand.New(rand.NewSource(time.Now().UnixNano())) + sessionRandMutex sync.Mutex +) + +// generateStableSessionID 基于用户消息内容生成稳定的 session ID +func generateStableSessionID(contents []GeminiContent) string { + // 查找第一个 user 消息的文本 + for _, content := range contents { + if content.Role == "user" && len(content.Parts) > 0 { + if text := content.Parts[0].Text; text != "" { + h := sha256.Sum256([]byte(text)) + n := int64(binary.BigEndian.Uint64(h[:8])) & 0x7FFFFFFFFFFFFFFF + return "-" + strconv.FormatInt(n, 10) + } + } + } + // 回退：生成随机 session ID + sessionRandMutex.Lock() + n := sessionRand.Int63n(9_000_000_000_000_000_000) + sessionRandMutex.Unlock() + return "-" + strconv.FormatInt(n, 10) +} + type TransformOptions struct { EnableIdentityPatch bool // IdentityPatch 可选：自定义注入到 systemInstruction 开头的身份防护提示词； @@ -66,8 +96,15 @@ func TransformClaudeToGeminiWithOptions(claudeReq *ClaudeRequest, projectID, map // 5. 构建内部请求 innerRequest := GeminiRequest{ - Contents: contents, - SafetySettings: DefaultSafetySettings, + Contents: contents, + // 总是设置 toolConfig，与官方客户端一致 + ToolConfig: &GeminiToolConfig{ + FunctionCallingConfig: &GeminiFunctionCallingConfig{ + Mode: "VALIDATED", + }, + }, + // 总是生成 sessionId，基于用户消息内容 + SessionID: generateStableSessionID(contents), } if systemInstruction != nil { @@ -78,52 +115,57 @@ func TransformClaudeToGeminiWithOptions(claudeReq *ClaudeRequest, projectID, map } if len(tools) > 0 { innerRequest.Tools = tools - innerRequest.ToolConfig = &GeminiToolConfig{ - FunctionCallingConfig: &GeminiFunctionCallingConfig{ - Mode: "VALIDATED", - }, - } } - // 如果提供了 metadata.user_id，复用为 sessionId + // 如果提供了 metadata.user_id，优先使用 if claudeReq.Metadata != nil && claudeReq.Metadata.UserID != "" { innerRequest.SessionID = claudeReq.Metadata.UserID } // 6. 包装为 v1internal 请求 v1Req := V1InternalRequest{ - Model: mappedModel, - Request: innerRequest, + Project: projectID, + RequestID: "agent-" + uuid.New().String(), + UserAgent: "antigravity", // 固定值，与官方客户端一致 + RequestType: "agent", + Model: mappedModel, + Request: innerRequest, } return json.Marshal(v1Req) } -func defaultIdentityPatch(modelName string) string { - // Antigravity 身份系统指令 - return "\\nYou are Antigravity, a powerful agentic AI coding assistant designed by the Google Deepmind team working on Advanced Agentic Coding.\\nYou are pair programming with a USER to solve their coding task. The task may require creating a new codebase, modifying or debugging an existing codebase, or simply answering a question.\\nThe USER will send you requests, which you must always prioritize addressing. Along with each USER request, we will attach additional metadata about their current state, such as what files they have open and where their cursor is.\\nThis information may or may not be relevant to the coding task, it is up for you to decide.\\n\\n\\n\\nCall tools as you normally would. The following list provides additional guidance to help you avoid errors:\\n - **Absolute paths only**. When using tools that accept file path arguments, ALWAYS use the absolute file path.\\n\\n\\n\\n## Technology Stack,\\nYour web applications should be built using the following technologies:,\\n1. **Core**: Use HTML for structure and Javascript for logic.\\n2. **Styling (CSS)**: Use Vanilla CSS for maximum flexibility and control. Avoid using TailwindCSS unless the USER explicitly requests it; in this case, first confirm which TailwindCSS version to use.\\n3. **Web App**: If the USER specifies that they want a more complex web app, use a framework like Next.js or Vite. Only do this if the USER explicitly requests a web app.\\n4. **New Project Creation**: If you need to use a framework for a new app, use `npx` with the appropriate script, but there are some rules to follow:,\\n - Use `npx -y` to automatically install the script and its dependencies\\n - You MUST run the command with `--help` flag to see all available options first, \\n - Initialize the app in the current directory with `./` (example: `npx -y create-vite-app@latest ./`),\\n - You should run in non-interactive mode so that the user doesn't need to input anything,\\n5. **Running Locally**: When running locally, use `npm run dev` or equivalent dev server. Only build the production bundle if the USER explicitly requests it or you are validating the code for correctness.\\n\\n# Design Aesthetics,\\n1. **Use Rich Aesthetics**: The USER should be wowed at first glance by the design. Use best practices in modern web design (e.g. vibrant colors, dark modes, glassmorphism, and dynamic animations) to create a stunning first impression. Failure to do this is UNACCEPTABLE.\\n2. **Prioritize Visual Excellence**: Implement designs that will WOW the user and feel extremely premium:\\n\\t\\t- Avoid generic colors (plain red, blue, green). Use curated, harmonious color palettes (e.g., HSL tailored colors, sleek dark modes).\\n - Using modern typography (e.g., from Google Fonts like Inter, Roboto, or Outfit) instead of browser defaults.\\n\\t\\t- Use smooth gradients,\\n\\t\\t- Add subtle micro-animations for enhanced user experience,\\n3. **Use a Dynamic Design**: An interface that feels responsive and alive encourages interaction. Achieve this with hover effects and interactive elements. Micro-animations, in particular, are highly effective for improving user engagement.\\n4. **Premium Designs**. Make a design that feels premium and state of the art. Avoid creating simple minimum viable products.\\n4. **Don't use placeholders**. If you need an image, use your generate_image tool to create a working demonstration.,\\n\\n## Implementation Workflow,\\nFollow this systematic approach when building web applications:,\\n1. **Plan and Understand**:,\\n\\t\\t- Fully understand the user's requirements,\\n\\t\\t- Draw inspiration from modern, beautiful, and dynamic web designs,\\n\\t\\t- Outline the features needed for the initial version,\\n2. **Build the Foundation**:,\\n\\t\\t- Start by creating/modifying `index.css`,\\n\\t\\t- Implement the core design system with all tokens and utilities,\\n3. **Create Components**:,\\n\\t\\t- Build necessary components using your design system,\\n\\t\\t- Ensure all components use predefined styles, not ad-hoc utilities,\\n\\t\\t- Keep components focused and reusable,\\n4. **Assemble Pages**:,\\n\\t\\t- Update the main application to incorporate your design and components,\\n\\t\\t- Ensure proper routing and navigation,\\n\\t\\t- Implement responsive layouts,\\n5. **Polish and Optimize**:,\\n\\t\\t- Review the overall user experience,\\n\\t\\t- Ensure smooth interactions and transitions,\\n\\t\\t- Optimize performance where needed,\\n\\n## SEO Best Practices,\\nAutomatically implement SEO best practices on every page:,\\n- **Title Tags**: Include proper, descriptive title tags for each page,\\n- **Meta Descriptions**: Add compelling meta descriptions that accurately summarize page content,\\n- **Heading Structure**: Use a single `

` per page with proper heading hierarchy,\\n- **Semantic HTML**: Use appropriate HTML5 semantic elements,\\n- **Unique IDs**: Ensure all interactive elements have unique, descriptive IDs for browser testing,\\n- **Performance**: Ensure fast page load times through optimization,\\nCRITICAL REMINDER: AESTHETICS ARE VERY IMPORTANT. If your web app looks simple and basic then you have FAILED!\\n\\n\\nThere will be an appearing in the conversation at times. This is not coming from the user, but instead injected by the system as important information to pay attention to. \\nDo not respond to nor acknowledge those messages, but do follow them strictly.\\n\\n\\n\\n\\n- **Formatting**. Format your responses in github-style markdown to make your responses easier for the USER to parse. For example, use headers to organize your responses and bolded or italicized text to highlight important keywords. Use backticks to format file, directory, function, and class names. If providing a URL to the user, format this in markdown as well, for example `[label](example.com)`.\\n- **Proactiveness**. As an agent, you are allowed to be proactive, but only in the course of completing the user's task. For example, if the user asks you to add a new component, you can edit the code, verify build and test statuses, and take any other obvious follow-up actions, such as performing additional research. However, avoid surprising the user. For example, if the user asks HOW to approach something, you should answer their question and instead of jumping into editing a file.\\n- **Helpfulness**. Respond like a helpful software engineer who is explaining your work to a friendly collaborator on the project. Acknowledge mistakes or any backtracking you do as a result of new information.\\n- **Ask for clarification**. If you are unsure about the USER's intent, always ask for clarification rather than making assumptions.\\n" +// antigravityIdentity Antigravity identity 提示词 +const antigravityIdentity = ` +You are Antigravity, a powerful agentic AI coding assistant designed by the Google Deepmind team working on Advanced Agentic Coding. +You are pair programming with a USER to solve their coding task. The task may require creating a new codebase, modifying or debugging an existing codebase, or simply answering a question. +The USER will send you requests, which you must always prioritize addressing. Along with each USER request, we will attach additional metadata about their current state, such as what files they have open and where their cursor is. +This information may or may not be relevant to the coding task, it is up for you to decide. + + +- **Proactiveness**. As an agent, you are allowed to be proactive, but only in the course of completing the user's task. For example, if the user asks you to add a new component, you can edit the code, verify build and test statuses, and take any other obvious follow-up actions, such as performing additional research. However, avoid surprising the user. For example, if the user asks HOW to approach something, you should answer their question and instead of jumping into editing a file.` + +func defaultIdentityPatch(_ string) string { + return antigravityIdentity } // buildSystemInstruction 构建 systemInstruction func buildSystemInstruction(system json.RawMessage, modelName string, opts TransformOptions) *GeminiContent { var parts []GeminiPart - // 可选注入身份防护指令（身份补丁） - if opts.EnableIdentityPatch { - identityPatch := strings.TrimSpace(opts.IdentityPatch) - if identityPatch == "" { - identityPatch = defaultIdentityPatch(modelName) - } - parts = append(parts, GeminiPart{Text: identityPatch}) - } + // 先解析用户的 system prompt，检测是否已包含 Antigravity identity + userHasAntigravityIdentity := false + var userSystemParts []GeminiPart - // 解析 system prompt if len(system) > 0 { // 尝试解析为字符串 var sysStr string if err := json.Unmarshal(system, &sysStr); err == nil { if strings.TrimSpace(sysStr) != "" { - parts = append(parts, GeminiPart{Text: sysStr}) + userSystemParts = append(userSystemParts, GeminiPart{Text: sysStr}) + if strings.Contains(sysStr, "You are Antigravity") { + userHasAntigravityIdentity = true + } } } else { // 尝试解析为数组 @@ -131,17 +173,28 @@ func buildSystemInstruction(system json.RawMessage, modelName string, opts Trans if err := json.Unmarshal(system, &sysBlocks); err == nil { for _, block := range sysBlocks { if block.Type == "text" && strings.TrimSpace(block.Text) != "" { - parts = append(parts, GeminiPart{Text: block.Text}) + userSystemParts = append(userSystemParts, GeminiPart{Text: block.Text}) + if strings.Contains(block.Text, "You are Antigravity") { + userHasAntigravityIdentity = true + } } } } } } - // identity patch 模式下，用分隔符包裹 system prompt，便于上游识别/调试；关闭时尽量保持原始 system prompt。 - //if opts.EnableIdentityPatch && len(parts) > 0 { - // parts = append(parts, GeminiPart{Text: "\n--- [SYSTEM_PROMPT_END] ---"}) - //} + // 仅在用户未提供 Antigravity identity 时注入 + if opts.EnableIdentityPatch && !userHasAntigravityIdentity { + identityPatch := strings.TrimSpace(opts.IdentityPatch) + if identityPatch == "" { + identityPatch = defaultIdentityPatch(modelName) + } + parts = append(parts, GeminiPart{Text: identityPatch}) + } + + // 添加用户的 system prompt + parts = append(parts, userSystemParts...) + if len(parts) == 0 { return nil } diff --git a/backend/internal/service/antigravity_gateway_service.go b/backend/internal/service/antigravity_gateway_service.go index 2145b6c4..ec79cc73 100644 --- a/backend/internal/service/antigravity_gateway_service.go +++ b/backend/internal/service/antigravity_gateway_service.go @@ -182,12 +182,17 @@ func (s *AntigravityGatewayService) TestConnection(ctx context.Context, account return nil, fmt.Errorf("构建请求失败: %w", err) } - // 构建 HTTP 请求（非流式） - req, err := antigravity.NewAPIRequest(ctx, "generateContent", accessToken, requestBody) + // 构建 HTTP 请求（总是使用流式 endpoint，与官方客户端一致） + req, err := antigravity.NewAPIRequest(ctx, "streamGenerateContent", accessToken, requestBody) if err != nil { return nil, err } + // DEBUG: 打印请求 header 和 body + log.Printf("[DEBUG] Antigravity TestConnection - URL: %s", req.URL.String()) + log.Printf("[DEBUG] Antigravity TestConnection - Headers: %v", req.Header) + log.Printf("[DEBUG] Antigravity TestConnection - Body: %s", string(requestBody)) + // 代理 URL proxyURL := "" if account.ProxyID != nil && account.Proxy != nil { @@ -211,14 +216,8 @@ func (s *AntigravityGatewayService) TestConnection(ctx context.Context, account return nil, fmt.Errorf("API 返回 %d: %s", resp.StatusCode, string(respBody)) } - // 解包 v1internal 响应 - unwrapped, err := s.unwrapV1InternalResponse(respBody) - if err != nil { - return nil, fmt.Errorf("解包响应失败: %w", err) - } - - // 提取响应文本 - text := extractGeminiResponseText(unwrapped) + // 解析流式响应，提取文本 + text := extractTextFromSSEResponse(respBody) return &TestConnectionResult{ Text: text, @@ -268,38 +267,66 @@ func (s *AntigravityGatewayService) getClaudeTransformOptions(ctx context.Contex return opts } -// extractGeminiResponseText 从 Gemini 响应中提取文本 -func extractGeminiResponseText(respBody []byte) string { - var resp map[string]any - if err := json.Unmarshal(respBody, &resp); err != nil { - return "" - } - - candidates, ok := resp["candidates"].([]any) - if !ok || len(candidates) == 0 { - return "" - } - - candidate, ok := candidates[0].(map[string]any) - if !ok { - return "" - } - - content, ok := candidate["content"].(map[string]any) - if !ok { - return "" - } - - parts, ok := content["parts"].([]any) - if !ok { - return "" - } - +// extractTextFromSSEResponse 从 SSE 流式响应中提取文本 +func extractTextFromSSEResponse(respBody []byte) string { var texts []string - for _, part := range parts { - if partMap, ok := part.(map[string]any); ok { - if text, ok := partMap["text"].(string); ok && text != "" { - texts = append(texts, text) + lines := bytes.Split(respBody, []byte("\n")) + + for _, line := range lines { + line = bytes.TrimSpace(line) + if len(line) == 0 { + continue + } + + // 跳过 SSE 前缀 + if bytes.HasPrefix(line, []byte("data:")) { + line = bytes.TrimPrefix(line, []byte("data:")) + line = bytes.TrimSpace(line) + } + + // 跳过非 JSON 行 + if len(line) == 0 || line[0] != '{' { + continue + } + + // 解析 JSON + var data map[string]any + if err := json.Unmarshal(line, &data); err != nil { + continue + } + + // 尝试从 response.candidates[0].content.parts[].text 提取 + response, ok := data["response"].(map[string]any) + if !ok { + // 尝试直接从 candidates 提取（某些响应格式） + response = data + } + + candidates, ok := response["candidates"].([]any) + if !ok || len(candidates) == 0 { + continue + } + + candidate, ok := candidates[0].(map[string]any) + if !ok { + continue + } + + content, ok := candidate["content"].(map[string]any) + if !ok { + continue + } + + parts, ok := content["parts"].([]any) + if !ok { + continue + } + + for _, part := range parts { + if partMap, ok := part.(map[string]any); ok { + if text, ok := partMap["text"].(string); ok && text != "" { + texts = append(texts, text) + } } } } @@ -317,7 +344,7 @@ func (s *AntigravityGatewayService) wrapV1InternalRequest(projectID, model strin wrapped := map[string]any{ "project": projectID, "requestId": "agent-" + uuid.New().String(), - "userAgent": "sub2api", + "userAgent": "antigravity", // 固定值，与官方客户端一致 "requestType": "agent", "model": model, "request": request, @@ -398,10 +425,10 @@ func (s *AntigravityGatewayService) Forward(ctx context.Context, c *gin.Context, return nil, fmt.Errorf("transform request: %w", err) } - // 构建上游 action + // 构建上游 action（NewAPIRequest 会自动处理 ?alt=sse 和 Accept Header） action := "generateContent" if claudeReq.Stream { - action = "streamGenerateContent?alt=sse" + action = "streamGenerateContent" } // 重试循环 @@ -908,14 +935,11 @@ func (s *AntigravityGatewayService) ForwardGemini(ctx context.Context, c *gin.Co return nil, err } - // 构建上游 action + // 构建上游 action（NewAPIRequest 会自动处理 ?alt=sse 和 Accept Header） upstreamAction := action if action == "generateContent" && stream { upstreamAction = "streamGenerateContent" } - if stream || upstreamAction == "streamGenerateContent" { - upstreamAction += "?alt=sse" - } // 重试循环 var resp *http.Response