fix: explain blocked export evidence and show batch results before refresh

This commit is contained in:
阿白叔 committed 2026-11-12 17:36:34 +08:00
1 parent 466f400514
commit 9eea9a4c20
13 files changed
+229 -19

No files matched your search

+10 -1
View File
@@ -2,7 +2,7 @@
当前临时分支的备份策略(2026-11-03):应用不再自动备份中心库或 CBB 工程。新增、替换、移除、校验、ICDB 维护和恢复在执行前提示手动备份;请自行保留可用副本。导入暂存、恢复用隔离验证库和轻量操作证据仍会生成,Mentor 原生 Repair 自身的备份行为保持不变。详见[自动备份检查与调整](docs/releases/2026-11-03-manual-backup.md)。此条优先于下方历史版本的备份说明。
当前开发版本:**[0.2.4b2 生命周期候选](docs/releases/2026-11-06-runtime-lifecycle-candidate.md)(待评审、待现场验收)**。ICDB 批量检查在后台逐项运行,普通校验、管理和恢复可排队;READY 工程在实际执行前再次排除。检查不自动 Repair、Restore 或选择历史版本,也不代表中心库 READY。
当前开发版本:**[0.2.4b2 生命周期候选](docs/releases/2026-11-06-runtime-lifecycle-candidate.md)(开发候选,待现场验收)**。ICDB 批量检查在后台逐项运行,普通校验、管理和恢复可排队;READY 工程在实际执行前再次排除。检查不自动 Repair、Restore 或选择历史版本,也不代表中心库 READY。
停止、超时或应用失联只停止后续原生动作,不结束正在 Save/Close 的调用进程。普通停止等待 5 秒,可能正在写入时最多等待 120 秒后交给后台观察;这不是强制结束时限。保存结果、关闭结果和资源释放分别记录。相关库等待释放,独立库可以排队继续;界面、筛选和日志保持可用。重启只核对未完成会话,不重放管理写操作。legacy 状态读取只观察已打开且匹配库的 LM,不启动 LM 或回答弹窗;无法读取保持 UNKNOWN。
@@ -17,6 +17,15 @@
[iCDB 旧服务器会话失联分析](docs/diagnostics/2026-10-27-icdb-lost-server-session.md)。
当前应用入口仅检查工程打开情况,不自动 Repair。需要修复或回退时由用户在原生版本与备份界面选择,操作前请手动备份;共享符号库故障不得通过修复无关的 CBB 工程替代。
## 当前验证范围与已知限制
Windows 11 / Mentor EE7.9.5 隔离库已完成原生更新、备份恢复、校验到 READY 和释放验证,记录见 [2026-11-12 验证](docs/releases/2026-11-12-scoped-release-validation.md)。历史候选包仅证明对应提交,后续代码合并不等同于现场验收或正式发布。
- A/B 输入的原生 EDIF 导出曾返回 `0xC0000005`,根因尚未定位,相关输入继续按失败处理。
- Windows 10、跨机器共享库和现场服务器会话失联的一致故障副本尚未验收。跨机器释放依赖 SMB 共享模式语义,目前没有跨机器实测证明。
- 自动 ICDB Repair 保持关闭。共享库原生服务器若无法删除自身地址文件,或早停后仍有原生弹窗,需要继续核对;不以进程列表为空或端口不可达代替释放证明。
- 验收文档中的本机路径、原始日志、截图、测试 XML 和冻结包不随 Git 分发;仓库保留说明及摘要,原始材料须在验收机器查看或另行归档。
## 功能边界
| 工具 | 处理对象 | 核心动作 | 结果 |
+6
View File
@@ -38,6 +38,12 @@
程序回退须先关闭当前客户端,再运行此前候选包;它不恢复丢失更改或被中断的原生事务。工程恢复另行在隔离副本验证,保留前后证据并重新校验。Windows 10、共享库跨机器并发和现场服务器失联恢复仍待验收,fake 测试和文件头损坏试验不代替现场验收。
## 已知限制与证据位置
A/B 输入的原生 EDIF 导出曾返回 `0xC0000005`,尚未定位,不能将该输入记成导入通过。Windows 10、跨机器共享库和现场失联故障副本仍待验收;跨机释放依赖 SMB 共享模式语义,目前没有跨机实测。自动 ICDB Repair 保持关闭,共享数据库地址残留或晚到弹窗按现场状态继续核对。
代码合并不表示现场验收完成。文档中的本机路径、日志、截图、测试 XML 和候选包未入库;仓库仅保留验证摘要,原始材料需在验收机器查看或另行归档。
## 历史上传校验检查表
## 1. 输入与证据
@@ -1,5 +1,7 @@
# 当前程序流程、阻塞点与错误节点
> 证据路径说明:本文的本机绝对路径、日志名、截图、测试 XML 和冻结包指向验收机器上的原始材料,未纳入 Git;仓库仅保留说明和验证摘要。
> 这是修改前 `42d0ceb` 的流程快照。后续修复及真实复测见 [占用范围验证](2026-11-12-scoped-release-validation.md)。
依据提交 `42d0cebc54191681b53dcecb120f53236c1963bb` 的代码及 2026-11-12 冻结程序原生验收记录。本文件只分析当前行为,没有实施下面建议的调整,也没有新增原生验收。
@@ -1,5 +1,7 @@
# 误判复核与优化顺序
> 证据路径说明:本文的本机绝对路径、日志名、截图、测试 XML 和冻结包指向验收机器上的原始材料,未纳入 Git;仓库仅保留说明和验证摘要。
> 这是当天早期的复核与建议;后续实施结果见 [占用范围验证](2026-11-12-scoped-release-validation.md),不将早期未通过项追记为成功。
依据 `42d0ceb` 的六处修复记录、真实冻结程序验收,以及 13:44–13:46 的外部进程归属交叉核对。本轮只做分类和优化建议,没有修改业务代码。统计单位是已知问题根因,不能据此估算整个程序的缺陷率。
@@ -1,5 +1,7 @@
# 2026-11-12 冻结程序与 Mentor 原生验收
> 证据路径说明:本文的本机绝对路径、日志名、截图、测试 XML 和冻结包指向验收机器上的原始材料,未纳入 Git;仓库仅保留说明和验证摘要。
**结论:未通过整体验收,不合并发布、不关闭工单。**
本轮实际运行冻结 EXE、Mentor EE7.9.5、原生 COM/命令和私有桌面窗口;点击使用真实 UIA/Win32 控件,没有替换业务服务、伪造原生结果或抢占前台鼠标。此前 48 按钮 Qt 模拟结果不计为本次原生验收。
@@ -1,5 +1,7 @@
# 阻塞进程来源核查
> 证据路径说明:本文的本机绝对路径、日志名、截图、测试 XML 和冻结包指向验收机器上的原始材料,未纳入 Git;仓库仅保留说明和验证摘要。
> 本文保留当时的只读归属结论;后续代码修改及试验见 [占用范围验证](2026-11-12-scoped-release-validation.md)。
2026-11-12 13:44–13:46 进行了只读核查。结论:此前阻止整库释放的两个未知会话来自 `dxdesigner-part-replacement` 测试,不是本 CBB 程序拉起;其他软件并行测试暴露了本程序的归属和释放判定漏洞。本次没有修改业务代码或关闭进程。
@@ -0,0 +1,19 @@
# PR #13 评论 391:合并前补充修复
> 证据路径说明:本文的本机绝对路径、日志、截图、测试 XML 和冻结包位于验收机器,未纳入 Git;仓库仅保留说明和验证摘要。
针对 [评论 391](https://git.simgreek.com/Skyworth_Digital_Hardware/cbb-refresh-verify-795/pulls/13#issuecomment-391),以 `466f400` 为修改前基线。用户已明确授权补齐后依次合并 #10、#11、#12、#13;代码合并不等同于现场验收或发布。
- 导出进程证据缺失、损坏或不是 JSON 对象时,日志及占用错误保留 `exclusion_unavailable`、具体文件或目录、PID 和原因。仍拒绝把无法核实的活跃句柄认定为已释放。
- 批次结果在原生操作及报告完成后立即显示,权威状态刷新继续通过原生队列串行执行。刷新前不以 PASS 将清单改成 READY;等待/执行刷新有明确状态。刷新期间关闭结果窗口不重建窗口;取消排队刷新保留已完成结果,并将未复核清单状态记为 UNKNOWN。
- 11 月 12 日验收文档统一标明本机证据未入库,README/SOP 保留 EDIF 原生崩溃、SMB/跨机、Windows 10、现场失联副本及自动 Repair 的限制。
验证记录位于 `F:\CbbAccept-20261112`。新增用例先复现失败,再验证修复;私有桌面 `CbbReview391NativeUi` 下实际 Windows Qt 控件和进程句柄的 6 项回归通过。覆盖正常刷新、提前关闭结果、取消排队刷新,以及缺失/坏 JSON/错误结构的诊断与保守保护。独立合并前代码复核未发现新增阻断项。
最终完整回归 **1,886 passed**,1 条既有 pywinauto STA 警告,记录 `review391-final.xml`。编译及 diff-check 通过。未完成的早期全量运行已停止,不计作通过;坏 JSON、缺失证据、错误结构及结果延迟的失败复现记录分别保留为 `review391-red.xml`、`review391-ui-red.xml`、`review391-shape-red.xml`。
新冻结包为 `candidate-review391/dist/CbbRefreshVerify-Background/CbbRefreshVerify.exe`,SHA-256 为 `eb9200c06cf8b054dbbfe678fad14c5f5a16f634526e38d2487f5960e07760ab`。64 个冻结模块逐一与当前源码编译结果一致,资源及 PE 图标一致。私有桌面启动、三个实际菜单切换及正常退出通过,详见 `review391-frozen-smoke.json`;机器摘要见 [验证 JSON](2026-11-12-review391-validation.json)。
本轮没有在生产库执行操作,也没有重新验收现场 ICDB 故障;此前 Mentor 隔离库完整恢复至 READY 的证据见 [占用范围验证](2026-11-12-scoped-release-validation.md),该历史包与本轮新包分别记录,不混用源码与二进制证据。
依赖链合并时,#10 先进入 main,再将 #11、#12、#13 逐项改为以 main 为目标并合并,保留分支。逐项核对 head SHA,最后比较 main 与被测最终 head 的文件树;不把只合进中间分支当成全部进入 main。
@@ -0,0 +1,63 @@
{
"created": "2026-11-12T17:35:46.043003+08:00",
"base_commit": "466f400514acc8531a219db8e75641be35304a3f",
"review_comment": "https://git.simgreek.com/Skyworth_Digital_Hardware/cbb-refresh-verify-795/pulls/13#issuecomment-391",
"full_suite": {
"path": "F:\\CbbAccept-20261112\\review391-final.xml",
"tests": 1886,
"failures": 0,
"errors": 0,
"skipped": 0
},
"windows_private_desktop_suite": {
"path": "F:\\CbbAccept-20261112\\review391-native-ui.xml",
"tests": 6,
"failures": 0,
"errors": 0,
"skipped": 0
},
"bundle": {
"module_count": 64,
"source_and_frozen_code_equal": true,
"source_sha256_checked": true,
"packaged_assets_equal": true,
"exe_icon_images_equal": true,
"executable_sha256": "eb9200c06cf8b054dbbfe678fad14c5f5a16f634526e38d2487f5960e07760ab"
},
"frozen_smoke": {
"executable": "F:\\CbbAccept-20261112\\candidate-review391\\dist\\CbbRefreshVerify-Background\\CbbRefreshVerify.exe",
"sha256": "eb9200c06cf8b054dbbfe678fad14c5f5a16f634526e38d2487f5960e07760ab",
"tabs": [
"检验",
"ICDB 维护",
"中心库管理"
],
"exit_code": 0,
"private_desktop": "CbbReview391Frozen"
},
"source_sha256": {
"src/cbb_refresh_verify/native_export_guard.py": "c3eeadd557d2f89bfce855c0736c953043ebe97bc81aa74e40bd370780a54741",
"src/cbb_refresh_verify/ui/main_window.py": "af65fcd8e41f35f412e8c23f525821c92b2cfb78b9d0fd4f88c515249dbd24e1",
"tests/test_review391.py": "304d46d63af87ea4a9bca83834b77cc44c5c9addf7b0f3752431304ee612568c",
"tests/test_batch_item_yield.py": "ed4be6d1e854b18d054a75c92171cd46b6b64411c2f74e9a3caf31fba3c7366b"
},
"independent_code_review": "No actionable critical, important or minor issues; read-only review, no additional tests run.",
"merge_plan": {
"pull_requests": [
10,
11,
12,
13
],
"target": "main",
"retarget_stacked_pull_requests": true,
"preserve_branches": true,
"force_merge": false
},
"evidence_location": "Raw logs/XML/packages are local-only; repository contains this summary.",
"native_mentor_retested": false,
"known_limits": [
"Field ICDB loss-of-session recovery, Windows 10 and cross-machine SMB remain unverified.",
"Automatic ICDB Repair remains disabled; EDIF 0xC0000005 on A/B remains unresolved."
]
}
@@ -1,5 +1,7 @@
# 占用范围、单项队列及原生确认验证
> 证据路径说明:本文的本机绝对路径、日志名、截图、测试 XML 和冻结包指向验收机器上的原始材料,未纳入 Git;仓库仅保留说明和验证摘要。
本次基于 `42d0ceb`,沿用 `codex/runtime-lifecycle-safety`。当天较早的进程归属、误判分析和完整流程图是修改前快照;本记录描述后续实现及验收,不追溯改写先前失败。
## 修改
+16 -2
View File
@@ -1,6 +1,7 @@
"""Export-copy ownership bound to the existing per-library lease checkpoint."""
from contextlib import contextmanager, ExitStack
import json
import logging
from pathlib import Path
from uuid import uuid4
@@ -31,18 +32,31 @@ def assert_retained_exports_idle(library=None):
and Path(scope['library']).resolve() != Path(library).resolve()):
continue
excluded = set()
exclusion_error = ''
if scope.get('analysis_root') and getattr(process, 'pid', None):
evidence_path = Path(scope['analysis_root'])
try:
matched = False
for path in Path(scope['analysis_root']).glob('*-process.json'):
evidence_path = path
record = json.loads(path.read_text('utf-8'))
if not isinstance(record, dict):
raise ValueError('Export process evidence must be a JSON object')
if record.get('pid') == process.pid:
matched = True
excluded.update(_preexisting_export_pids(record))
except (OSError, ValueError, KeyError, TypeError):
if not matched:
raise ValueError(f'No process evidence matches exporter PID {process.pid}')
except (OSError, ValueError, KeyError, TypeError) as error:
excluded.clear()
exclusion_error = f'exclusion_unavailable: {evidence_path}: {error}'
logging.getLogger(__name__).warning('%s; library=%s; pid=%s',
exclusion_error, scope.get('library'), process.pid)
if process.poll() is None or any(pid not in excluded
and win32event.WaitForSingleObject(handle, 0) != win32con.WAIT_OBJECT_0
for pid, handle in handles.items()):
raise LibraryBusy('Native identity exporter or descendant has not released.')
raise LibraryBusy('Native identity exporter or descendant has not released.'
+ (' '+exclusion_error if exclusion_error else ''))
def begin_export_analysis(library, root, project):
+37 -15
View File
@@ -57,6 +57,7 @@ from cbb_refresh_verify.verify_runner import (VerifyRequest, preflight_skip_reas
class ProgressSignals(QObject):
event = Signal(object)
version_choice = Signal(object)
batch_ready = Signal(object)
STATUS_LABELS = {
@@ -153,6 +154,7 @@ class MainWindow(QWidget):
self._global_icdb_run = False
self._icdb_completed = 0
self.signals = ProgressSignals(self); self.signals.event.connect(self._progress)
self.signals.batch_ready.connect(self._batch_done)
if hasattr(self.management_adapter, 'session_progress'):
self.management_adapter.session_progress = self.signals.event.emit
self.signals.version_choice.connect(self._show_version_choice)
@@ -841,18 +843,21 @@ class MainWindow(QWidget):
self.worker.signals.finished.connect(self._finished)
self.pool.start(self.worker)
def _queued_action(self, action):
def _queued_action(self, action, *, label=''):
from cbb_refresh_verify.session_record import library_available, library_wait_reason
library = getattr(self, 'mentor_lmc_path', None) or self.lmc_edit.text()
def execute():
self.signals.event.emit({'stage': 'native_slot_acquired', 'library': str(library)})
event = {'stage': 'native_slot_acquired', 'library': str(library)}
if label:
event['detail'] = label+'中…'
self.signals.event.emit(event)
return action()
return lambda: self.native_queue.run(execute, stop=self.stop,
ready=lambda: library_available(library),
wait_state=lambda: library_wait_reason(library),
waiting=lambda: self.signals.event.emit({'stage': 'waiting_native_slot',
'library': str(library), 'retained': not library_available(library),
'detail': library_wait_reason(library) or '已排队,等待当前原生操作结束'}))
'detail': (label+':' if label else '')+(library_wait_reason(library) or '已排队,等待当前原生操作结束')}))
def _icdb_active(self):
return self.icdb_task is not None and self.icdb_task.active
@@ -1384,9 +1389,17 @@ class MainWindow(QWidget):
self.signals.event.emit({'stage': 'report_failed', 'detail': str(error)})
affected = [req.block_name for req, result in zip(requests, results) if result.status != 'SKIPPED']
safe = all(result.safe_to_continue for result in results)
refresh = self._queued_action(lambda: self._read_affected_records(affected))() if safe and not self.stop.is_set() else None
self.signals.batch_ready.emit((results, report))
refresh = None
if safe and not self.stop.is_set():
from cbb_refresh_verify.operation_queue import QueueCancelled
try:
refresh = self._queued_action(lambda: self._read_affected_records(affected),
label='批次已结束,状态刷新')()
except QueueCancelled:
pass # Cancelling the refresh must not erase completed item results.
return results, report, affected, refresh
self._start(action, self._batch_done, queued=False)
self._start(action, self._batch_refreshed, queued=False)
def _read_affected_records(self, names):
"""Worker-only read; never derive library state from action outcomes."""
@@ -1449,9 +1462,8 @@ class MainWindow(QWidget):
self._apply_filters()
return tuple(self._records_by_name[name] for name in names if name in self._records_by_name)
def _defer_status_refresh(self, names):
self._apply_refreshed_records((tuple(names), {}, None,
'会话或数据库安全未确认;暂缓原生状态复核,请确认释放后重新读取。'))
def _defer_status_refresh(self, names, reason='会话或数据库安全未确认;暂缓原生状态复核,请确认释放后重新读取。'):
self._apply_refreshed_records((tuple(names), {}, None, reason))
def refresh_affected_records(self, names, callback=None):
"""Start an affected-only authoritative refresh once native owners release.
@@ -1483,7 +1495,7 @@ class MainWindow(QWidget):
self.status_label.setText(event.get('detail', '已排队,等待执行'))
self._queue_waiting(event)
elif event.get('stage') == 'native_slot_acquired':
self.status_label.setText('正在执行当前任务…')
self.status_label.setText(event.get('detail') or '正在执行当前任务…')
self._update()
if event.get('stage') in ('session_handoff', 'save_stop_requested'):
self.status_label.setText(event.get('detail', '当前状态无法确认'))
@@ -1558,6 +1570,21 @@ class MainWindow(QWidget):
if hasattr(task, 'recovery_action'):
del task.recovery_action
def _batch_refreshed(self, outcome):
if len(outcome) <= 2:
return
results, _, affected, refresh = outcome
if refresh is None:
reason = ('状态尚未复核,请重新读取。' if all(r.safe_to_continue for r in results)
else '会话或数据库安全未确认;暂缓原生状态复核,请确认释放后重新读取。')
self._defer_status_refresh(affected, reason)
else:
self._apply_refreshed_records(refresh)
from shiboken6 import isValid
summary = getattr(self, 'summary', None)
self.status_label.setText(summary.text().replace('\n', ' ') if summary is not None and isValid(summary)
else '批次已结束。')
def _batch_done(self, outcome):
results, report = outcome[:2]
failure_report = failure_report_path(report) if report is not None else '未写入'
@@ -1566,12 +1593,7 @@ class MainWindow(QWidget):
self._reimport_offers = tuple((req, self._batch_records[req.block_name], result)
for req, result in zip(self._batch_requests, results)
if req.maintenance and req.block_name in self._batch_records and offers_reimport(result))
if len(outcome) > 2:
_, _, affected, refresh = outcome
if refresh is None:
self._defer_status_refresh(affected)
else:
self._apply_refreshed_records(refresh)
self._batch_refreshed(outcome)
if self.library_lease is not None and any(not result.safe_to_continue for result in results):
self._retain_path_lease(self.library_lease, hold_busy=True)
for result in results:
+1 -1
View File
@@ -65,7 +65,7 @@ def test_verify_failure_recheck_finishes_before_yielding_native_queue(qtbot,tmp_
window=load_window(qtbot,tmp_path,monkeypatch,
verifier=lambda req:VerifyResult('FAIL',safe_to_continue=False))
active=[];seen=[]
def queued(action):
def queued(action, **kwargs):
def run():
active.append(True)
try:return action()
+67
View File
@@ -0,0 +1,67 @@
import logging
import os
from threading import Event, Thread
from types import SimpleNamespace
import pytest
@pytest.mark.parametrize('damage', ['broken', 'missing', 'wrong_shape'])
def test_unreadable_export_evidence_explains_why_exclusion_is_unavailable(tmp_path, monkeypatch, caplog, damage):
import win32api, win32con
from cbb_refresh_verify import native_engineering_identity as identity
from cbb_refresh_verify.library_lock import LibraryBusy
from cbb_refresh_verify.native_export_guard import assert_retained_exports_idle
root=tmp_path/'analysis';root.mkdir()
if damage=='broken':(root/'ascii-process.json').write_text('{broken','utf-8')
if damage=='wrong_shape':(root/'ascii-process.json').write_text('[]','utf-8')
library=tmp_path/'library/lib.lmc'
handle=win32api.OpenProcess(win32con.SYNCHRONIZE,False,os.getpid())
monkeypatch.setattr(identity,'_retained_exports',[(SimpleNamespace(pid=123456,poll=lambda:0),
{os.getpid():handle},dict(library=str(library),analysis_root=str(root)))])
try:
with caplog.at_level(logging.WARNING),pytest.raises(LibraryBusy) as error:
assert_retained_exports_idle(library)
assert 'exclusion_unavailable' in str(error.value)
assert str(root) in str(error.value)
assert 'exclusion_unavailable' in caplog.text and str(root) in caplog.text
assert ('123456' in caplog.text if damage=='missing' else 'ascii-process.json' in caplog.text)
finally:handle.Close()
@pytest.mark.parametrize('after_result', ['refresh', 'close_summary', 'cancel_refresh'])
def test_batch_result_is_visible_before_queued_refresh_and_survives_user_actions(
qtbot,tmp_path,monkeypatch,after_result):
from test_ui_filters import load_window
from cbb_refresh_verify.verify_runner import VerifyResult
started,release,other_started,other_release,refreshed=(Event() for _ in range(5))
def verify(request):
started.set();release.wait(5)
return VerifyResult('PASS',library_flag='GREEN')
def refresh(names,library):
refreshed.set()
return {'Beta':'READY'}
window=load_window(qtbot,tmp_path,monkeypatch,verifier=verify,status_refresher=refresh)
window.search_edit.setText('Beta')
window._run(['Beta'])
qtbot.waitUntil(started.is_set)
def other():
other_started.set();other_release.wait(5)
thread=Thread(target=lambda:window.native_queue.run(other));thread.start()
try:
qtbot.waitUntil(lambda:len(window.native_queue.pending)==1)
release.set();qtbot.waitUntil(other_started.is_set)
qtbot.waitUntil(lambda:getattr(window,'summary',None) is not None,timeout=1500)
assert window.summary.isVisible() and window.busy
assert not refreshed.is_set()
assert window._records_by_name['Beta'].status=='PENDING'
assert '已结束' in window.status_label.text()
if after_result=='close_summary':window.summary.close()
if after_result=='cancel_refresh':window.request_stop()
finally:
release.set();other_release.set();thread.join(6)
qtbot.waitUntil(lambda:not window.busy,timeout=7000)
assert window._records_by_name['Beta'].status==('UNKNOWN' if after_result=='cancel_refresh' else 'READY')
if after_result=='close_summary':assert window.summary is None
else:assert '成功 1' in window.summary.detailedText()
assert refreshed.is_set() is (after_result!='cancel_refresh')