Repository navigation
v2.8.4 - #4288
Merged
Merged
v2.8.4#4288
Conversation
jeffwu-1999
requested review from
Dallas98,
Jasonxia007,
WMC001,
YehongPan and
hhhhsc701
as code owners
November 3, 2026 11:46
Codecov Report✅ All modified and coverable lines are covered by tests. 📢 Thoughts on this report? Let us know! |
jeffwu-1999
pushed a commit
that referenced
this pull request
Nov 3, 2026
将 develop 同步进 hotfix/v2.8.4，消除 PR #4290 的全部冲突。 / Sync develop into hotfix/v2.8.4, clearing every conflict of PR #4290. 背景：v2.8.3 内容此前经 #4273 以 squash 方式进入 develop，提交历史未 接上，PR #4290 因此把整条发版线识别为全新变更（25 处冲突均为历史对 账，非真实冲突）。 / Background: v2.8.3 content entered develop via the squashed #4273 without commit history, so PR #4290 presented the whole release line as new (all 25 conflicts are history reconciliation). 带入的 PR / PRs carried: - #4288 v2.8.4（含 #4283 SQL 迁移简化、#4287 回滚 #4277）——对 develop 的净内容变更为离线包流水线固定 ubuntu-24.04 执行器；#4283 的 SQL 在 develop 上字节一致，#4287 的回滚对 develop 为空操作。 Net content change versus develop is only the offline workflow runner pin; #4283's SQL is byte-identical on develop and #4287's revert is a no-op there. - #4272 / #4264 / #4271 / #4265 / #4262 / #4261 / #4260（v2.8.3 线）—— 内容已由 #4273 在 develop 发布，本次接入真实提交历史，后续合并不再 重复冲突。 / Content already released via #4273; this merge attaches the real commit history so future merges stop re-conflicting. 冲突处理 / Conflicts: - modify/delete（backend/agents/create_agent_info.py、backend/apps/ northbound_app.py、backend/consts/const.py）取 develop 的删除，#4160 重构已迁移至新路径。 / Took develop's deletions for old-path files (#4160 moved them). - 内容冲突一律取 develop 侧（等价内容已在迁移后路径上演进），包括 execution.py、Dockerfile、repository.py 等。 / Took develop's side for content conflicts; the equivalent content already lives on the migrated paths, including the byte-newer repository.py with the correct management.db.models import. - workflow 由 git 自动合并：保留 develop 的组件列表（#4248 已移除 supabase），采纳 ubuntu-24.04 钉版。 / Workflow auto-merged: develop's component list (no supabase after #4248) with the pinned runner. 验证 / Verification: 合并树与 origin/develop 的差异仅剩 workflow 的 runs-on 一行；核心 UT（agent_service、northbound final-answer、 background stream、execution-result-read-db 共 532 项）通过。 / The merged tree differs from origin/develop by the runs-on line only; core suites (532 tests) pass.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.