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

..

cleanup-ingress-reject-logs

fix: 过滤入口拒绝日志并强化鉴权边界

2026-07-18 00:11:18 +08:00

jwtgen

feat(security): 操作审计日志 + 会话IP/UA绑定 + 敏感操作 step-up 2FA

2026-07-16 13:47:50 +08:00

profit-preview

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

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

server

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

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