mirror of
https://github.com/dataelement/bisheng.git
synced 2026-08-29 01:22:31 +08:00
dolphin
f519954911
Rebases the UI line onto the released mainline: feat/2.7-ui starts from origin/main (2.6.0 + hotfix1 + hotfix2) and takes in all the UI work that accumulated on feat/2.6.0-ui — which had already merged feat/2.6.0, so the 2.6 feature work rides along in the same merge. Both sides forked before hotfix2, so the twelve conflicts are the same "mainline fixed it / the UI line rewrote it" files. Resolution rule: mainline wins on logic, the UI line wins on presentation and design tokens. - chat_service.py: mainline's interrupted-stream persistence plus the UI line's classified error payload. - redis_callback.py: mainline — the UI 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 UI 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 UI line's rich ChatErrorCard below it. - ContextChips.tsx / SaveAsButton.tsx: mainline — it unified the uploading/uploaded chip lists and added download-without-preview. - PlusMenu.tsx / WorkspacePanel.tsx: the UI line's semantic color tokens, kept together with mainline's icon choice and its no-flex-1 layout fix. - Roles.tsx: the UI line's extracted roleMenuSelection module (constants verified identical to mainline's inline copy). Housekeeping: froze mainline's lint violations (its branch carries no suppressions file), added the missing 11059 error copy in zh-Hans/en/ja, and 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 and predate this merge.
v2.6.0 Feature 索引
版本目标：承载审批中心统一化等跨模块产品能力，作为 v2.5.x 之后的新一轮功能版本。
版本契约：release-contract.md
开发主线分支：2.6.0-PM
Feature 列表
| # | Feature | 优先级 | 状态 | 依赖 |
|---|---|---|---|---|
| F025 | approval-center-unification | P0 | 🔲 规格已生成，待评审 | F005, F011, F012, F013 |
| F028 | conversation-export-import | P0 | 🔲 规格已生成，待评审 | F004, F008 |
SDD 工作流
- Spec Discovery → 对齐 PRD 不确定性
- 编写 spec.md →
/sdd-review spec - 编写 tasks.md →
/sdd-review tasks - 创建 Feature 分支
feat/v2.6.0/{NNN}-{name}，基于2.6.0-PM - 逐任务执行 →
/task-review→ 打勾 /e2e-test（强制）/code-review --base 2.6.0-PM- 合并回
2.6.0-PM
变更历史
| 日期 | 变更 |
|---|---|
| 2026-05-18 | 初始化 v2.6.0 版本目录，并迁入 F025-approval-center-unification 规格与任务。 |
| 2026-05-30 | 新增 F028-conversation-export-import 规格：工作台会话回答级导出与导入知识空间。 |