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
..
2026-07-20 16:06:59 +08:00
2026-08-08 11:12:56 +08:00
2026-01-12 11:44:34 +08:00
2026-01-05 13:54:43 +08:00
2026-01-05 10:06:31 +08:00
2026-01-06 11:36:38 +08:00
2026-07-20 16:06:59 +08:00
2026-07-25 11:45:42 +08:00
2026-08-08 10:48:42 +08:00
2025-12-26 00:10:44 -08:00
2026-01-16 19:49:33 +08:00
2026-02-02 22:13:50 +08:00
2025-12-18 13:50:39 +08:00
2026-07-18 20:39:00 +08:00
2026-05-20 11:09:18 +08:00