IanShaw027 1f58e25ab3 Merge upstream/main into feat/grok-complete-integration ...

冲突集中在 chat completions / messages 两条 Responses 转发路径：
upstream 给 OpenAIForwardResult 增加了 UpstreamResponseModel 与
UpstreamResponseModelConflict（配套 beginUpstreamResponseModelObservation
观测器），本分支在同样位置把返回值改成了具名变量以便挂 Grok 原生搜索计数。
两侧不互斥，合并结果同时保留上游的响应模型观测字段与 Grok SearchCount 逻辑。

frontend/pnpm-lock.yaml 取 upstream 版本：package.json 与 upstream 完全一致，
本地差异只是 pnpm install 的重解析噪音。

2026-08-08 11:12:56 +08:00

..

account_mapper_redact_test.go

feat(ollama): 支持 Cloud 官方用量自动刷新

2026-07-23 15:50:44 +08:00

announcement.go

feat: announcement支持强制弹窗通知

2026-03-07 15:06:13 +08:00

api_key_mapper_last_used_test.go

feat(api-key): show last used IP

2026-07-08 15:26:54 +08:00

channel_monitor.go

feat(monitor): admin channel monitor MVP with SSRF protection and batch aggregation

2026-04-20 20:21:02 +08:00

credentials_redact_test.go

feat(openai): 支持 Agent Identity 认证

2026-07-14 17:05:46 +08:00

credentials_redact.go

fix(security): 屏蔽 admin 账号接口返回的敏感凭证字段

2026-05-08 03:44:04 +08:00

group_mapper_profit_visibility_test.go

fix(profit-control): stop leaking profit policy, close veto livelock, restore passthrough turn pricing

2026-08-01 22:39:33 +08:00

mappers_deleted_user_test.go

feat(usage): 在 /admin/usage 支持查看已删除用户的历史使用情况

2026-05-30 17:52:18 +08:00

mappers_usage_test.go

feat(usage): audit upstream response models

2026-08-07 09:40:11 -04:00

mappers.go

Merge upstream/main into feat/grok-complete-integration

2026-08-08 11:12:56 +08:00

notify_email_entry.go

fix: audit fixes for websearch, notifications, and channel pricing

2026-04-14 09:26:32 +08:00

public_settings_injection_schema_test.go

revert: remove fork-only changes from release sync

2026-04-23 21:40:58 +08:00

settings.go

fix(grok): restore base URL resolution and operator settings wiring

2026-08-08 01:07:19 +08:00

types.go

Merge upstream/main into feat/grok-complete-integration

2026-08-08 11:12:56 +08:00

user_mapper_activity_test.go

refactor(admin): remove auth migration reports

2026-04-21 17:34:18 +08:00