mirror of
https://github.com/dataelement/bisheng.git
synced 2026-10-28 03:40:25 +08:00
dolphin
056c3b0252
Carries the 2.6 work that landed after the fix2 release onto the 2.7 trunk. feat/2.7-common now equals origin/main (2.6.0 + hotfix1 + hotfix2) plus everything feat/2.6.0 added since. The nine conflicts are the same "mainline fixed it / the 2.6 line changed it" files resolved in the feat/2.7-ui merge, and they are resolved identically here so the two branches stay reconcilable: - chat_service.py: mainline's interrupted-stream persistence plus the 2.6 line's classified error payload. - redis_callback.py: mainline — the 2.6 line still referenced the outer `node_id` inside the closure instead of its `one_node_id` parameter. - chatApi.ts: all three error fields (errorText, errorType, errorDetail). - useAiChat.ts / useAiChatSSE.ts: the 2.6 line's 3-arg onError and classification payload, with mainline's localized connection-lost copy. - AiMessageBubble.tsx: mainline's rule that a partially streamed answer still renders, with the 2.6 line's rich ChatErrorCard below it. - PlusMenu.tsx / Roles.tsx / linsight.py: the 2.6 line's icon, its extracted roleMenuSelection module, and mainline's comment wording. Housekeeping matches the UI merge: froze mainline's lint violations, added the missing 11059 error copy in zh-Hans/en/ja, guarded one optional-typed artifact preview callback. Both apps lint clean; platform typecheck clean; i18n parity clean. The six remaining client typecheck errors are byte-identical to main.