🔀 将已部署主线整合回 dev:标注复审、源索引切片与平台稳定性 #52
Loading…
x
Reference in New Issue
Block a user
No description provided.
Delete Branch "codex/dev-mainline-20261019"
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?
Summary
将近期分散在多个分支、已部署到 Fanyu 的改动统一合入
dev,使主线对应线上963b530f。这是完整主线整合,包含 316 个提交、452 个文件;关联 #49、#51,并包含 #44、#45 的提交历史。最后一组修复使等待源校验的修订按 2s 起步、上限 1min 退避,最多等待 1h,超时保留编辑内容;使用候选标称帧率及整数媒体时间戳验证固定帧序,容忍时间单位量化而继续拒绝丢帧。源索引明确记录零 IMU 样本时,可完成仅含表头的 CSV 交付,仍校验实际计数,历史物理修订保持非空要求。
Evidence
8379b666的真实媒体反例中,30fps / 1ms 时间单位的 121 帧视频被误拒;10fps 原生时间单位下的丢帧被放过;零 IMU 切片在完整打包入口再次校验时失败。After: 增加不同帧长、分数帧率和半 tick 精度边界回归;正常视频通过、丢帧拒绝。真实媒体交付、舍弃、part-index 和迁移相关 Python 回归 42 passed,0 skipped;源索引/时钟/等待和项目写锁的定向竞态检查通过。
npm run lint、npm run format:check、前端/Go 构建及算子生成副本一致性检查通过。test:go:gate、test:frontend:gate均无新增失败;仍有 70 个 Go、13 个前端已知基线失败,不声明全量测试全绿。963b530f,12 个 Pod 就绪;实际 Deployment 与批准的镜像/构建标记及源索引打包镜像变更一致。API / Worker ready · 963b530。deployed_pending_acceptance。Merge Danger
Door: two-way(源码合并可撤回;运行版本回退有兼容条件)
已有源索引修订需要保留兼容的 API/Worker/打包读者;启用 striped 锁后,回退旧二进制前须按 ADR 0011 切回 barrier 并确认写入者和租约排空。不能将旧
dev直接当作运行回退目标,也不能恢复整库覆盖客户新增数据。兼容范围见 ADR 0010、0011。Blast Radius: platform
涵盖标注/返工/质检/终审、切片交付、API 路由及后台任务。合并范围较大,应按上述业务领域审阅;线上只读检查不代表完整生产业务验收或 100 人容量验收。CI 配置随 PR 提交,远端运行结果须另行核对。
- ReworkBaselineRecord: frozen at formal quality rejection via a new decision effect (idempotent apply); embeds original opinions, reject comment, and the reviewed revision's slice/action summaries - self-contained by design so revision pruning can never orphan it and no customer data is deleted - ReworkFeedbackRecord + GET/PUT /api/human-items/{id}/rework-feedback: writer restricted to the directed owner (incl. admin-reassigned owner) or manager; entries must reference baseline opinions; CAS version conflicts; readable by the reviewer; missing-baseline rounds return a graceful conflict - GET /rework-baseline returns null baseline for legacy rounds (degraded read, never blocks the flow) - ReviewDraft.Confirmations (D7): canonical validation against the current round's baseline (unknown/duplicate opinions rejected; unresolved requires note or a current-round opinion; no-baseline rounds must stay empty); frozen into AnnotationReviewRecord at the formal decision, matching the irreversible-verdict principle - tests: baseline freeze+embedded evidence, feedback contract (403/400/CAS/ reviewer-read), confirmation validation+freeze, graceful-missing - all green; internal/api failures identical to baseline (65), zero new- GET /api/human-items/{id}/source-opinions: per-source projection of rework baselines (round, frozen problems incl. timestamps, comment) and formal quality reviews (round, decision, reviewer, frozen D7 confirmations); aggregate items only - multi-source coordination detail: requireAcceptanceSourceReady and the decision gate now name the pending sources (itemKey + stage + status) instead of a generic message - AcceptanceSourceOpinions panel in the final-acceptance workspace: collapsible per-source history labelled who/which-round - rework_review badge extends to prepackage_acceptance rounds - tests: pending-gate names source then approves after ready; projection carries baselines/reviews/confirmations and rejects non-aggregate items; api failures identical to baseline (65), frontend zero new, tsc clean- delete ReworkFeedback concept (editor, domain, API, store) per user decision - add /rework-handling API: one-click skip ('no change') with CAS + trace for re-review - add rework-emphasis pure lib: baseline-vs-workspace diff auto-clears red, merge reattach, multi-round (latest red, older dimmed), J/K jump order - workbench: red slice blocks + count badges, red/gray action blocks, red timestamp markers, per-slice opinion cards, summary strip above track, soft submit gate, help entries, one-line notice pointer - QC ripple: skipped chips replace feedback read in ReviewProblemPanel - docs: CONTEXT.md glossary (意见处理状态), ADR 0006, manual rewrite@zhanghongming 10月19日审查:固定 head=963b530f,目标 dev=03db2a28;核对完整整合树及
ad47b733之后的增量。结论:仍有已复现的 P2 权限阻断,暂缓合并。Standards
internal/api/rework_handling.go:50-53、69-74 仍只按当前 AssignedUserID/管理员判断 PUT 权限,且允许 query 改轮次,未限制标注角色、返工阶段、当前轮次。已在本 PR 精确快照用真实 HTTP handler + 隔离内存数据复现:当前第2轮、quality_review阶段、当前领取人为质检员,PUT 当前轮及 ?round=1 均返回200并写入 skippedOpinionIds/version=1。路由拆分没有消除该缺口。请补角色/可编辑阶段/当前轮次门禁及质检、历史轮写入拒绝测试,管理员例外须明确约束。
另有非阻断文档差异:supplier_project_stripes.go 非分区集合写入现为 gate-only,ADR0011 第11条仍写 exclusive,建议同步升级/回退契约。
Spec
ADR0007 与返工规格规定“不改了”属于标注员处理记录,复审员仅核对;上述写入违反职责边界。源索引时钟、零IMU、等待退避和租约增量检查未发现新的确定性需求阻断。不能因 PR 已部署说明而忽略权限问题。
本轮验证:TypeScript、35项相关前端测试通过;源索引/媒体时钟/等待及 Worker 定向 Go 用例通过,Mongo锁/负载用例因未启用隔离库跳过。Python交付回归23通过、7跳过(缺导出媒体fixture),不是42项真实媒体全验收。TestRouteSnapshot 本地失败:242条差异的路径/方法/角色矩阵相同,差异来自编译器闭包符号,未发现由此造成的权限路由变化;需稳定化快照比较。未宣称全套门禁通过,未部署或写客户数据。
@zhanghongming 10月22日复核:当前 head=e5387ae5 已按依赖合入 #55→#54→#53。已用 Git tree 核对,与本轮实际测试的
d6fe5e9b代码树完全一致,未带入 #56/#57。Standards
上一轮 P2 rework-handling 权限阻断已由630a95c8解除,15项真实 HTTP 权限边界回归通过;角色、归属、可编辑阶段、送检锁及当前轮次限制生效,历史记录保持不变。ADR0011 gate-only 说明已同步。后续字幕、审核编辑保护、v3交付增量分别审查通过。
Spec
本轮未发现该整合树仍存在已确认的需求阻断。#56 快照失效后导出恢复、#57 小型内部审计持久化问题属于后续独立PR,不进入本次主线。
验证:TypeScript、28项相关前端、权限/统计/返工Go定向及v3/part-index Python16项通过;官方前端基线门禁通过,13个既有失败无新增。官方Go门禁仍因 TestRouteSnapshot 未通过;检查原始差异242删/242增,方法/路径/全部角色响应完全相同,仅编译器闭包符号变化,与此前本机已核查现象一致,不作为产品权限回归,但不能声称全套Go门禁全绿,快照可移植性仍应修正。未修改失败基线。
结论:此前功能阻断已闭环,可按用户授权合入dev。合并不等于线上验收,不执行部署、回滚、工作流激活或客户数据写入。